Index: unstable/main/finkinfo/languages/ruby18.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/ruby18.info,v
retrieving revision 1.18
diff -u -r1.18 ruby18.info
--- unstable/main/finkinfo/languages/ruby18.info	23 May 2008 20:23:09 -0000	1.18
+++ unstable/main/finkinfo/languages/ruby18.info	12 Aug 2008 10:28:41 -0000
@@ -1,5 +1,5 @@
 Package: ruby18
-Version: 1.8.6-p114
+Version: 1.8.6-p287
 Revision: 1
 Description: Interpreted, object-oriented language (binaries)
 License: GPL
@@ -16,7 +16,7 @@
 
 # Unpack Phase.
 Source: ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-%v.tar.bz2
-Source-MD5: b4d0c74497f684814bcfbb41b7384a71
+Source-MD5: 80b5f3db12531d36e6c81fac6d05dda9
 Source2: http://rubyidentity.org/ruby-logo-kit.zip
 Source2-MD5: c80f11569f8a841d4bb2ff5fd8a8ff95
 SourceDirectory: ruby-%v
@@ -33,7 +33,7 @@
 # Compile Phase.
 SetCPPFLAGS: -I%p/lib/system-openssl/include
 SetCFLAGS: -g -Os -fno-schedule-insns2
-SetLDFLAGS: -L%p/lib/system-openssl/lib -L%b
+SetLDFLAGS: -L%p/lib/system-openssl/lib
 ConfigureParams: --program-suffix=1.8 --mandir='${prefix}/share/man' --enable-shared --with-default-kcode=none --with-dbm-type=gdbm_compat --with-bundled-md5 --with-bundled-rmd160 --with-bundled-sha1
 CompileScript: <<
   #!/bin/sh -ex
@@ -65,16 +65,20 @@
   cp ../ruby-kit/ruby.png ../ruby-kit/LICENSE %i/share/doc/%n/logo
 <<
 PostInstScript: <<
-#/Developer/Tools/Rez -t APPL Carbon.r -o %p/bin/ruby-aqua1.8
-sips -i %p/share/doc/%n/logo/ruby.png
-cp %p/share/doc/%n/logo/ruby.png/rsrc %p/bin/ruby-aqua1.8/rsrc
-/Developer/Tools/SetFile -a C -t APPL %p/bin/ruby-aqua1.8
+# this sets the icon
+sips -i %p/share/doc/%n/logo/ruby.png || true
+cp %p/share/doc/%n/logo/ruby.png/rsrc %p/bin/ruby-aqua1.8/rsrc || true
+# this allows running Aqua applications with ruby
+/Developer/Tools/SetFile -a C -t APPL %p/bin/ruby-aqua1.8 || true
 <<
 DocFiles: COPYING COPYING.ja ChangeLog GPL LEGAL LGPL README README.EXT README.EXT.ja README.ja ToDo
 
 SplitOff: <<
   Package: ruby
-  Depends: %N (= %v-%r)
+  Depends: ri18 (= %v-%r), %N (= %v-%r)
+  Conflicts: ri
+  Replaces: ri
+  Provides: ri
   Description: Interpreted, object-oriented language (symlinks)
   DocFiles: COPYING COPYING.ja ChangeLog GPL LEGAL LGPL README README.EXT README.EXT.ja README.ja ToDo
   Files: <<
@@ -85,6 +89,7 @@
     bin/rubyw
     bin/ruby-aqua
     bin/testrb
+    bin/ri
     share/man/man1/ruby.1
   <<
 <<
@@ -120,17 +125,6 @@
 <<
 
 SplitOff4: <<
-  Package: ri
-  Description: Interpreted, object-oriented language (documentation symlink)
-  Depends: ri18 (= %v-%r)
-  Conflicts: ruby (<< 1.8.3-3)
-  DocFiles: COPYING COPYING.ja ChangeLog GPL LEGAL LGPL README README.EXT README.EXT.ja README.ja ToDo
-  Files: <<
-    bin/ri
-  <<
-<<
-
-SplitOff5: <<
   Package: %N-shlibs
   Shlibs: %p/lib/libruby.1.8.dylib 1.8.0 %n (>= 1.8.0-1)
   Description: Interpreted, object-oriented language (shared libraries)
@@ -147,10 +141,9 @@
   but in the sense of Smalltalk: no exceptions.
 <<
 DescPackaging: <<
-The ruby interpreter does not load extensions from the default location if it
-is named miniruby. This is required to fix the build system. There are usually
-old extensions from the previously installed ruby which would crash the
-interpreter.
+
+The top level configure complains about extra parameters but it should pass them
+to extensions anyway.
 
 The Ruby tcltk extension is packaged separately and links against Fink's X11
 version of tcltk. It could be replaced with a version linked against an Aqua
Index: unstable/main/finkinfo/languages/ruby18.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/ruby18.patch,v
retrieving revision 1.9
diff -u -r1.9 ruby18.patch
--- unstable/main/finkinfo/languages/ruby18.patch	19 Apr 2008 18:44:01 -0000	1.9
+++ unstable/main/finkinfo/languages/ruby18.patch	12 Aug 2008 10:28:42 -0000
@@ -21,50 +21,6 @@
    AC_FUNC_ALLOCA
    ;;
 
-## Leopard-specific
---- configure.in~	2008-04-18 16:25:45.000000000 +0200
-+++ configure.in	2008-04-18 16:52:46.000000000 +0200
-@@ -964,7 +964,7 @@
- AC_SUBST(LIBEXT)dnl
- 
- STATIC=
--: ${LIBPATHFLAG=' -L"%s"'}
-+: ${LIBPATHFLAG=' -L%s'}
- : ${PATHFLAG=''}
- 
- if test "$with_dln_a_out" != yes; then
-
-## make miniruby not load already installed extensions
-##--- ruby.c	2007-02-13 00:01:19.000000000 +0100
-##+++ ruby.c	2007-04-25 14:53:32.000000000 +0200
-##@@ -235,6 +235,7 @@
- void
- ruby_init_loadpath()
- {
-+    char *argvptr;
- #if defined LOAD_RELATIVE
-     char libpath[FILENAME_MAX+1];
-     char *p;
-##@@ -287,6 +288,10 @@
- 	ruby_incpush(getenv("RUBYLIB"));
-     }
- 
-+
-+    argvptr = strrchr(origargv[0], '/');
-+    if(!argvptr) argvptr = origargv[0];
-+    if(!strstr(argvptr, "miniruby")) {
- #ifdef RUBY_SEARCH_PATH
-     ruby_incpush(RUBY_RELATIVE(RUBY_SEARCH_PATH));
- #endif
-##@@ -307,6 +312,7 @@
-     if (rb_safe_level() == 0) {
- 	ruby_incpush(".");
-     }
-+    }
- }
- 
- struct req_list {
-
 ##--- configure.in~       2007-04-25 15:31:14.000000000 +0200
 ##+++ configure.in        2007-04-25 15:58:49.000000000 +0200
 ##@@ -1277,7 +1277,7 @@