Changeset 37600

Timestamp:

06/15/08 04:23:17 (6 months ago)

Author:

pguyot@…

Message:

lang/ruby: update to 1.8.7, added getaddrinfo patch, fixes #15177, #15231, #15528

Location:

trunk/dports/lang/ruby

Files:

• Portfile (modified) (4 diffs)
• files/dot-darwin.diff (deleted)
• files/etc-irbrc.diff (deleted)
• files/ignore-gsetcontext.diff (deleted)
• files/md5_sha1_commoncrypto.diff (deleted)
• files/patch-Makefile.in (modified) (1 diff)
• files/patch-configure.in (deleted)
• files/patch-instruby.rb (deleted)
• files/patch-lib-rexml-document.rb.diff (deleted)
• files/patch-mkconfig.rb (deleted)
• files/patch-mkmf.rb (modified) (3 diffs)
• files/patch-ruby.c (deleted)
• files/patch-socket.c (added)
• files/patch-test_socket.rb (added)
• files/patch-thread-hooks (modified) (6 diffs)
• files/use-dyld.diff (deleted)
• files/use-setreugid.diff (deleted)
• files/words-bigendian-from-arch.diff (deleted)

trunk/dports/lang/ruby/Portfile

@@ -4 +4 @@
 
 name                    ruby
-version                 1.8.6-p114
+version                 1.8.7
 
 categories              lang ruby
@@ -19 +19 @@
                                 
 dist_subdir             ruby
-checksums               ruby-${version}.tar.gz \
-                                        md5     500a9f11613d6c8ab6dcf12bec1b3ed3 \
-                    sha1    149d19caa3059de9faef34f80630642fd61651ad \
-                    rmd160  9363ea3f3dede38dce3b26bfe69ccbf7eac00f78
-                                        
+checksums               ruby-${version}.tar.bz2 \
+                                        md5             f17f14c8d55e731b3ce1bc35c42f0a6c \
+                    sha1    297282d0e4b885176336f5b26f986f9cf5f47133 \
+                    rmd160  ea8b631de65469cb5496328e4b2dcd5a8e951d51
+
+use_bzip2               yes
+
 platforms               darwin
 
@@ -33 +35 @@
                                 
 patchfiles              patch-Makefile.in \
-                                patch-configure.in \
-                                patch-instruby.rb \
-                                patch-mkconfig.rb \
                                 patch-mkmf.rb \
-                                patch-ruby.c \
-                                patch-lib-rexml-document.rb.diff
+                                patch-socket.c \
+                                patch-test_socket.rb
 
 use_autoconf    yes
@@ -73 +72 @@
 }
 
-platform darwin 9 {
-        patchfiles-append       dot-darwin.diff \
-                                                        etc-irbrc.diff \
-                                                        ignore-gsetcontext.diff \
-                                                        md5_sha1_commoncrypto.diff \
-                                                        use-dyld.diff \
-                                                        use-setreugid.diff \
-                                                        words-bigendian-from-arch.diff
-}
-
 variant tk conflicts mactk {
         configure.args-delete   --without-tk 

trunk/dports/lang/ruby/files/patch-Makefile.in

@@ -10 +10 @@
  TESTUI = console
  TESTS =
-@@ -98,11 +100,11 @@
+@@ -101,11 +103,11 @@
  
  miniruby$(EXEEXT):

trunk/dports/lang/ruby/files/patch-mkmf.rb

@@ -1 @@
---- lib/mkmf.rb.orig    2007-02-28 22:23:42.000000000 +0900
-+++ lib/mkmf.rb 2007-03-15 13:39:26.000000000 +0900
-@@ -51,6 +51,9 @@
- $sitedir = CONFIG["sitedir"]
- $sitelibdir = CONFIG["sitelibdir"]
- $sitearchdir = CONFIG["sitearchdir"]
-+$vendordir = CONFIG["vendordir"]
-+$vendorlibdir = CONFIG["vendorlibdir"]
-+$vendorarchdir = CONFIG["vendorarchdir"]
- 
- $mswin = /mswin/ =~ RUBY_PLATFORM
- $bccwin = /bccwin/ =~ RUBY_PLATFORM
-@@ -417,7 +420,7 @@
+--- lib/mkmf.rb.orig    2008-05-29 13:23:36.000000000 +0200
++++ lib/mkmf.rb 2008-06-15 11:08:36.000000000 +0200
+@@ -461,7 +461,7 @@
  
  def try_func(func, libs, headers = nil, &b)
@@ -20 +10 @@
  #{headers}
  /*top*/
-@@ -429,6 +435,11 @@
+@@ -473,6 +473,11 @@
  int main() { return 0; }
  int t() { #{func}(); return 0; }
@@ -32 +22 @@
  
  def try_var(var, headers = nil, &b)
-@@ -1097,6 +1105,7 @@
+@@ -1307,6 +1312,7 @@
  RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
  arch = #{CONFIG['arch']}

trunk/dports/lang/ruby/files/patch-thread-hooks

@@ -3 +3 @@
 --- ruby.h      (/trunk)        (revision 16)
 +++ ruby.h      (/branches/thread-hooks)        (revision 16)
-@@ -749,6 +749,19 @@
+@@ -766,6 +766,19 @@
  void ruby_native_thread_kill _((int));
  #endif
@@ -27 +27 @@
 --- eval.c      (/trunk)        (revision 16)
 +++ eval.c      (/branches/thread-hooks)        (revision 16)
-@@ -218,6 +218,25 @@
+@@ -215,6 +215,25 @@
  
  #include <sys/stat.h>
@@ -53 +53 @@
  VALUE rb_cBinding;
  static VALUE proc_invoke _((VALUE,VALUE,VALUE,VALUE));
-@@ -10167,6 +10186,8 @@
+@@ -10474,6 +10493,8 @@
  thread_free(th)
      rb_thread_t th;
@@ -61 +61 @@
      if (th->stk_ptr) free(th->stk_ptr);
      th->stk_ptr = 0;
- #ifdef __ia64__
-@@ -10219,6 +10240,8 @@
+ #ifdef __ia64
+@@ -10526,6 +10547,8 @@
      VALUE *pos;
      int len;
@@ -71 +71 @@
      len = ruby_stack_length(&pos);
      th->stk_len = 0;
-@@ -10418,6 +10441,8 @@
- 
-     if (!th->stk_ptr) rb_bug("unsaved context");
+@@ -10725,6 +10748,8 @@
+ #define STACK_PAD_SIZE 1024
+     VALUE space[STACK_PAD_SIZE];
  
 +    EXEC_THREADSWITCH_HOOK(RUBY_THREADSWITCH_RESTORE,th->thread);
 +
  #if STACK_GROW_DIRECTION < 0
-     if (&v > th->stk_pos) stack_extend(th, exit);
+     if (addr_in_prev_frame > th->stk_pos) stack_extend(th, exit, &space[0]);
  #elif STACK_GROW_DIRECTION > 0
-@@ -10534,6 +10559,41 @@
+@@ -10841,6 +10866,41 @@
      rb_thread_main_jump(e, RESTORE_RAISE);
  }
@@ -122 +122 @@
  copy_fds(dst, src, max)
      fd_set *dst, *src;
-@@ -11770,6 +11830,8 @@
+@@ -12068,6 +12128,8 @@
      THREAD_ALLOC(th);
      th->thread = Data_Wrap_Struct(klass, thread_mark, thread_free, th);