diff options
author | taca <taca@pkgsrc.org> | 2007-09-24 21:58:27 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2007-09-24 21:58:27 +0000 |
commit | 2b9b7665d2af96cfbe9d5b3448d8f297db774f56 (patch) | |
tree | af700ca044728b88721eb463f8d692b5dbc87991 /lang/ruby18-base | |
parent | ea19802b12751d7bbdc6beced68e12e23a84494f (diff) | |
download | pkgsrc-2b9b7665d2af96cfbe9d5b3448d8f297db774f56.tar.gz |
Update Ruby to 1.8.6-p110.
Approved by wiz@.
This is bug fix release of Ruby 1.8.6. Especially it fixes thread/eval
function problem on Mac OS X. It also contains an openssl extention's
portablity problem which was bad patch by pkgsrc.
For more detail, please refer CHANGES file.
Diffstat (limited to 'lang/ruby18-base')
-rw-r--r-- | lang/ruby18-base/PLIST | 5 | ||||
-rw-r--r-- | lang/ruby18-base/PLIST.common_end | 3 | ||||
-rw-r--r-- | lang/ruby18-base/distinfo | 15 | ||||
-rw-r--r-- | lang/ruby18-base/options.mk | 3 | ||||
-rw-r--r-- | lang/ruby18-base/patches/patch-aa | 8 | ||||
-rw-r--r-- | lang/ruby18-base/patches/patch-ab | 14 | ||||
-rw-r--r-- | lang/ruby18-base/patches/patch-ae | 15 | ||||
-rw-r--r-- | lang/ruby18-base/patches/patch-bk | 14 | ||||
-rw-r--r-- | lang/ruby18-base/patches/patch-dg | 15 |
9 files changed, 25 insertions, 67 deletions
diff --git a/lang/ruby18-base/PLIST b/lang/ruby18-base/PLIST index 0b53c1cc200..0ff58ed75c8 100644 --- a/lang/ruby18-base/PLIST +++ b/lang/ruby18-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2007/03/15 16:41:30 taca Exp $ +@comment $NetBSD: PLIST,v 1.11 2007/09/24 21:58:27 taca Exp $ bin/erb${RUBY_VER} bin/h2rb${RUBY_VER} bin/irb${RUBY_VER} @@ -274,6 +274,9 @@ ${RUBY_LIBDIR}/rexml/encodings/US-ASCII.rb ${RUBY_LIBDIR}/rexml/encodings/UTF-16.rb ${RUBY_LIBDIR}/rexml/encodings/UTF-8.rb ${RUBY_LIBDIR}/rexml/entity.rb +${RUBY_LIBDIR}/rexml/formatters/default.rb +${RUBY_LIBDIR}/rexml/formatters/pretty.rb +${RUBY_LIBDIR}/rexml/formatters/transitive.rb ${RUBY_LIBDIR}/rexml/functions.rb ${RUBY_LIBDIR}/rexml/instruction.rb ${RUBY_LIBDIR}/rexml/light/node.rb diff --git a/lang/ruby18-base/PLIST.common_end b/lang/ruby18-base/PLIST.common_end index 514ed2d4961..2367b3ec6c4 100644 --- a/lang/ruby18-base/PLIST.common_end +++ b/lang/ruby18-base/PLIST.common_end @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common_end,v 1.4 2007/03/15 16:41:30 taca Exp $ +@comment $NetBSD: PLIST.common_end,v 1.5 2007/09/24 21:58:27 taca Exp $ @dirrm ${RUBY_LIBDIR}/bigdecimal @dirrm ${RUBY_LIBDIR}/cgi/session @dirrm ${RUBY_LIBDIR}/cgi @@ -38,6 +38,7 @@ ${HAS_IO}@dirrm ${RUBY_LIBDIR}/io @dirrm ${RUBY_LIBDIR}/rdoc @dirrm ${RUBY_LIBDIR}/rexml/dtd @dirrm ${RUBY_LIBDIR}/rexml/encodings +@dirrm ${RUBY_LIBDIR}/rexml/formatters @dirrm ${RUBY_LIBDIR}/rexml/light @dirrm ${RUBY_LIBDIR}/rexml/parsers @dirrm ${RUBY_LIBDIR}/rexml/validation diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo index d6ffd221031..ca47954ab3e 100644 --- a/lang/ruby18-base/distinfo +++ b/lang/ruby18-base/distinfo @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.20 2007/09/09 14:17:13 taca Exp $ +$NetBSD: distinfo,v 1.21 2007/09/24 21:58:27 taca Exp $ -SHA1 (ruby-1.8.6-p36.tar.bz2) = 680375cfbe817b656e2e97c34a5a937733d66012 -RMD160 (ruby-1.8.6-p36.tar.bz2) = 44f5cb95422d3f97628101aa4e425ab9f372a282 -Size (ruby-1.8.6-p36.tar.bz2) = 3905975 bytes -SHA1 (patch-aa) = 931e50a45198bb38e3cf2e37eca47899e85f5b9a -SHA1 (patch-ab) = 2bf3a1f828eba04eeb65f0dd36060b4a736906ad +SHA1 (ruby-1.8.6-p110.tar.bz2) = b9c980dabd6c99f3663d463a586b18f2637c9e5b +RMD160 (ruby-1.8.6-p110.tar.bz2) = 7acff85e7604ec8cb14590967a147dd953079dd6 +Size (ruby-1.8.6-p110.tar.bz2) = 3918377 bytes +SHA1 (patch-aa) = eb218253249d7fc8fe32c5d1ad00f355714861f9 +SHA1 (patch-ab) = 973e36950d5b497c7283b928153e9f0ae9fe023e SHA1 (patch-ac) = b84bc931ab3dd7fe619cca846a300673fa71f48e -SHA1 (patch-ae) = dfa9c5296c75f6193c790fca8d3eb15ad4a9f228 -SHA1 (patch-bk) = dad868e5b79fee3171a55c9887debd2ad0592bcc -SHA1 (patch-dg) = 5bd5e051f70abd6c95128f20867bff24c4483727 diff --git a/lang/ruby18-base/options.mk b/lang/ruby18-base/options.mk index cf1f68df22e..48e8fa48567 100644 --- a/lang/ruby18-base/options.mk +++ b/lang/ruby18-base/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2007/09/09 14:17:13 taca Exp $ +# $NetBSD: options.mk,v 1.4 2007/09/24 21:58:28 taca Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ruby PKG_SUPPORTED_OPTIONS= ruby-build-ri-db @@ -8,5 +8,6 @@ PKG_SUGGESTED_OPTIONS= ruby-build-ri-db .if !empty(PKG_OPTIONS:Mruby-build-ri-db) CONFIGURE_ARGS+= --enable-install-doc +PRIVILEGED_STAGES+= clean RUBY_DYNAMIC_DIRS+= ${RUBY_SYSRIDIR} .endif diff --git a/lang/ruby18-base/patches/patch-aa b/lang/ruby18-base/patches/patch-aa index 2d569cdabb6..0377a12698b 100644 --- a/lang/ruby18-base/patches/patch-aa +++ b/lang/ruby18-base/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.9 2007/09/09 14:17:13 taca Exp $ +$NetBSD: patch-aa,v 1.10 2007/09/24 21:58:28 taca Exp $ ---- configure.in.orig 2007-05-23 03:19:07.000000000 +0900 +--- configure.in.orig 2007-09-07 16:38:51.000000000 +0900 +++ configure.in @@ -421,6 +421,9 @@ msdosdjgpp*) LIBS="-lm $LIBS" ;; @@ -44,8 +44,8 @@ $NetBSD: patch-aa,v 1.9 2007/09/09 14:17:13 taca Exp $ @@ -1385,6 +1403,7 @@ if test "$enable_shared" = 'yes'; then fi if test "$enable_rpath" = yes; then - LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L. -L\$(libdir) $LIBRUBYARG_SHARED" -+ LIBRUBY_DLDFLAGS="${linker_flag}-R ${linker_flag}\$(libdir) -L. -L\$(libdir) $LIBRUBY_DLDFLAGS" + LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED" ++ LIBRUBY_DLDFLAGS="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBY_DLDFLAGS" fi LDFLAGS="-L. $LDFLAGS" diff --git a/lang/ruby18-base/patches/patch-ab b/lang/ruby18-base/patches/patch-ab index af2a6d3de72..643995fde02 100644 --- a/lang/ruby18-base/patches/patch-ab +++ b/lang/ruby18-base/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.9 2007/09/09 14:17:13 taca Exp $ +$NetBSD: patch-ab,v 1.10 2007/09/24 21:58:28 taca Exp $ ---- configure.orig 2007-06-08 17:51:42.000000000 +0900 +--- configure.orig 2007-09-23 15:19:34.000000000 +0900 +++ configure @@ -10351,6 +10351,9 @@ msdosdjgpp*) LIBS="-lm $LIBS" ;; @@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.9 2007/09/09 14:17:13 taca Exp $ freebsd*) LIBS="-lm $LIBS" { echo "$as_me:$LINENO: checking whether -lxpg4 has to be linked" >&5 echo $ECHO_N "checking whether -lxpg4 has to be linked... $ECHO_C" >&6; } -@@ -15952,6 +15955,13 @@ echo $ECHO_N "checking whether OS depend +@@ -15953,6 +15956,13 @@ echo $ECHO_N "checking whether OS depend LDFLAGS="$LDFLAGS -Wl,-export-dynamic" fi rb_cv_dlopen=yes ;; @@ -26,7 +26,7 @@ $NetBSD: patch-ab,v 1.9 2007/09/09 14:17:13 taca Exp $ interix*) : ${LDSHARED="$CC -shared"} XLDFLAGS="$XLDFLAGS -Wl,-E" LIBPATHFLAG=" -L'%1\$-s'" -@@ -16707,6 +16717,14 @@ if test "$enable_shared" = 'yes'; then +@@ -16708,6 +16718,14 @@ if test "$enable_shared" = 'yes'; then LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)' LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib' ;; @@ -41,11 +41,11 @@ $NetBSD: patch-ab,v 1.9 2007/09/09 14:17:13 taca Exp $ interix*) LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' ;; -@@ -16716,6 +16734,7 @@ if test "$enable_shared" = 'yes'; then +@@ -16717,6 +16735,7 @@ if test "$enable_shared" = 'yes'; then fi if test "$enable_rpath" = yes; then - LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L. -L\$(libdir) $LIBRUBYARG_SHARED" -+ LIBRUBY_DLDFLAGS="${linker_flag}-R ${linker_flag}\$(libdir) -L. -L\$(libdir) $LIBRUBY_DLDFLAGS" + LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED" ++ LIBRUBY_DLDFLAGS="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBY_DLDFLAGS" fi LDFLAGS="-L. $LDFLAGS" diff --git a/lang/ruby18-base/patches/patch-ae b/lang/ruby18-base/patches/patch-ae deleted file mode 100644 index c121f8714bd..00000000000 --- a/lang/ruby18-base/patches/patch-ae +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2005/11/02 08:56:40 taca Exp $ - ---- ext/openssl/ossl_config.c.orig 2004-12-15 10:54:39.000000000 +0900 -+++ ext/openssl/ossl_config.c -@@ -245,7 +245,9 @@ set_conf_section_i(VALUE i, VALUE *arg) - static VALUE - ossl_config_set_section(VALUE self, VALUE section, VALUE hash) - { -- VALUE arg[2] = { self, section }; -+ VALUE arg[2]; -+ arg[0] = self; -+ arg[1] = self; - rb_iterate(rb_each, hash, set_conf_section_i, (VALUE)arg); - return hash; - } diff --git a/lang/ruby18-base/patches/patch-bk b/lang/ruby18-base/patches/patch-bk deleted file mode 100644 index e4aa9cd0e0f..00000000000 --- a/lang/ruby18-base/patches/patch-bk +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bk,v 1.3 2007/09/09 14:17:13 taca Exp $ - -This is a fix for ruby-1.8.6 patchlevel 36. - ---- intern.h.orig 2007-06-07 21:40:01.000000000 +0900 -+++ intern.h -@@ -204,7 +204,6 @@ int rb_thread_alone _((void)); - void rb_thread_polling _((void)); - void rb_thread_sleep _((int)); - void rb_thread_sleep_forever _((void)); --enum rb_thread_status rb_thread_status _((VALUE)); - VALUE rb_thread_stop _((void)); - VALUE rb_thread_wakeup _((VALUE)); - VALUE rb_thread_wakeup_alive _((VALUE)); diff --git a/lang/ruby18-base/patches/patch-dg b/lang/ruby18-base/patches/patch-dg deleted file mode 100644 index 64dc4d35e57..00000000000 --- a/lang/ruby18-base/patches/patch-dg +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-dg,v 1.1 2007/09/09 14:17:13 taca Exp $ - -This is a fix for ruby-1.8.6 patchlevel 36. - ---- lib/base64.rb.orig 2007-02-27 20:51:55.000000000 +0900 -+++ lib/base64.rb -@@ -110,7 +110,7 @@ module Base64 - # UnVieQ== - - def b64encode(bin, len = 60) -- encode64(bin).scan(/.{1,#{len}}/o) do -+ encode64(bin).scan(/.{1,#{len}}/) do - print $&, "\n" - end - end |