1 files changed, 36 insertions, 28 deletions

diff --git a/hints/rhapsody.sh b/hints/rhapsody.sh
index c564c8827e..933081ba09 100644
--- a/hints/rhapsody.sh
+++ b/hints/rhapsody.sh
@@ -3,57 +3,65 @@
 # Wilfredo Sanchez <wsanchez@apple.com>
 ##
 
-# Since we can build fat, the archname doesn't need the processor type
-archname='rhapsody';
+##
+# Paths
+##
 
-# Perl5.003 precedes this platform
-d_bincompat3='undef';
+# BSD paths
+prefix='/usr';
+siteprefix='/usr/local';
+vendorprefix='/usr/local'; usevendorprefix='define';
 
-# Libc is in libsystem.
-libc='/System/Library/Frameworks/System.framework/System';
+# 4BSD uses /usr/share/man, not /usr/man.
+# Don't put man pages in /usr/lib; that's goofy.
+man1dir='/usr/share/man/man1';
+man3dir='/usr/share/man/man3';
+
+# Where to put modules.
+privlib='/System/Library/Perl';
+sitelib='/Local/Library/Perl';
+vendorlib='/Network/Library/Perl';
+
+##
+# Tool chain settings
+##
+
+# Since we can build fat, the archname doesn't need the processor type
+archname='rhapsody';
 
 # nm works.
 usenm='true';
+  
+# Libc is in libsystem.
+libc='/System/Library/Frameworks/System.framework/System';
 
 # Optimize.
 optimize='-O3';
 
 # We have a prototype for telldir.
-# We are not NeXTStep.
-ccflags="${ccflags} -pipe -fno-common -DHAS_TELLDIR_PROTOTYPE -UNeXT -U__NeXT__";
+ccflags="${ccflags} -pipe -fno-common -DHAS_TELLDIR_PROTOTYPE";
 
-# Don't use /usr/local/lib; we may have junk there.
-libpth='/lib /usr/lib';
-
-# Shared library extension in .dylib.
-# Bundle extension in .bundle.
+# Shared library extension is .dylib.
+# Bundle extension is .bundle.
 ld='cc';
 so='dylib';
 dlext='bundle';
-dlsrc='dl_rhapsody.xs';
+dlsrc='dl_dyld.xs';
+usedl='define';
 cccdlflags='';
 lddlflags="${ldflags} -bundle -undefined suppress";
+ldlibpthname='DYLD_LIBRARY_PATH';
 useshrplib='true';
-libperl='Perl';
-framework_path='/System/Library/Frameworks/Perl.framework';
 base_address='0x4be00000';
 
-# 4BSD uses /usr/share/man, not /usr/man.
-# Don't put man pages in /usr/lib; that's goofy.
-man1dir='/usr/share/man/man1';
-man3dir='/usr/share/man/man3';
-
-# Where to put modules.
-privlib='/System/Library/Perl';
-sitelib='/Local/Library/Perl';
-
+##
+# System libraries
+##
+  
 # vfork works
 usevfork='true';
 
 # malloc works
 usemymalloc='n';
 
-case "$ldlibpthname" in
-'') ldlibpthname=DYLD_LIBRARY_PATH ;;
-esac