diff options
-rw-r--r-- | lang/ruby/rubyversion.mk | 4 | ||||
-rw-r--r-- | lang/ruby193-base/Makefile | 3 | ||||
-rw-r--r-- | lang/ruby193-base/distinfo | 13 | ||||
-rw-r--r-- | lang/ruby193-base/patches/patch-configure | 18 | ||||
-rw-r--r-- | lang/ruby193-base/patches/patch-configure.in | 18 | ||||
-rw-r--r-- | lang/ruby193-base/patches/patch-ext_tk_extconf.rb | 15 |
6 files changed, 27 insertions, 44 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index 6d28ea6a643..56869bbaed7 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.104 2013/11/06 12:42:35 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.105 2013/11/24 14:17:19 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -207,7 +207,7 @@ RUBY200_VERSION= 2.0.0 # patch RUBY18_PATCHLEVEL= pl374 -RUBY193_PATCHLEVEL= p448 +RUBY193_PATCHLEVEL= p484 RUBY200_PATCHLEVEL= p247 # current API compatible version; used for version of shared library diff --git a/lang/ruby193-base/Makefile b/lang/ruby193-base/Makefile index 7bb5ef86ff4..68864ba6f7a 100644 --- a/lang/ruby193-base/Makefile +++ b/lang/ruby193-base/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.35 2013/09/30 03:15:03 taca Exp $ +# $NetBSD: Makefile,v 1.36 2013/11/24 14:17:19 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} -PKGREVISION= 5 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo index 9b9e8ac2aa3..ab3049a5a01 100644 --- a/lang/ruby193-base/distinfo +++ b/lang/ruby193-base/distinfo @@ -1,13 +1,12 @@ -$NetBSD: distinfo,v 1.27 2013/10/25 21:47:20 joerg Exp $ +$NetBSD: distinfo,v 1.28 2013/11/24 14:17:19 taca Exp $ -SHA1 (ruby-1.9.3-p448.tar.bz2) = 4bd9140bd4760409f771d4dd55138c22d3ff2995 -RMD160 (ruby-1.9.3-p448.tar.bz2) = e012b5b506092406a4e35711d57290932ba557c6 -Size (ruby-1.9.3-p448.tar.bz2) = 10052488 bytes -SHA1 (patch-configure) = 5d1af2b62784cf09999aa31dad54664d7ee123b4 -SHA1 (patch-configure.in) = cef794d185fa41cd144d55558fcee320f9385f94 +SHA1 (ruby-1.9.3-p484.tar.bz2) = 81dbaf390b16157069d8d1dd5b787db44d5f881c +RMD160 (ruby-1.9.3-p484.tar.bz2) = 21b4acab12b974d1f99d994a40cdfe3fe8d0be95 +Size (ruby-1.9.3-p484.tar.bz2) = 10041514 bytes +SHA1 (patch-configure) = 0ef7e10bbff37118c48053e7189f87528a3e408b +SHA1 (patch-configure.in) = 09dfe819b6a9bd7c9af704eeaef659857d33d0c3 SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5 SHA1 (patch-ext_dl_extconf.rb) = aed210606893d2b9c463d794df039f06003848e4 -SHA1 (patch-ext_tk_extconf.rb) = b9872caef2233145e57b974f5f8ef332e3f99f6b SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8 SHA1 (patch-lib_rubygems.rb) = 2aed4990a868dc92668a78da7bcff2050ff3dd66 SHA1 (patch-lib_rubygems_command.rb) = 916a93372e714b56a741acc15350536194f34c77 diff --git a/lang/ruby193-base/patches/patch-configure b/lang/ruby193-base/patches/patch-configure index f092c2a8ed3..aa028881823 100644 --- a/lang/ruby193-base/patches/patch-configure +++ b/lang/ruby193-base/patches/patch-configure @@ -1,9 +1,9 @@ -$NetBSD: patch-configure,v 1.10 2013/06/27 16:35:44 taca Exp $ +$NetBSD: patch-configure,v 1.11 2013/11/24 14:17:19 taca Exp $ * Adding Interix and MirBSD support. * Ignore doxygen. ---- configure.orig 2013-06-27 11:31:36.000000000 +0000 +--- configure.orig 2013-11-22 04:24:15.000000000 +0000 +++ configure @@ -10741,6 +10741,9 @@ esac superux*) : @@ -49,7 +49,7 @@ $NetBSD: patch-configure,v 1.10 2013/06/27 16:35:44 taca Exp $ # else # ifdef HAVE_ALLOCA_H # include <alloca.h> -@@ -15820,7 +15834,7 @@ done +@@ -15832,7 +15846,7 @@ done MAINLIBS="-pthread $MAINLIBS" ;; #( *) : case "$target_os" in #( @@ -58,7 +58,7 @@ $NetBSD: patch-configure,v 1.10 2013/06/27 16:35:44 taca Exp $ LIBS="-pthread $LIBS" ;; #( *) : LIBS="-l$pthread_lib $LIBS" ;; -@@ -16270,7 +16284,9 @@ esac ;; #( +@@ -16282,7 +16296,9 @@ esac ;; #( interix*) : : ${LDSHARED='$(CC) -shared'} XLDFLAGS="$XLDFLAGS -Wl,-E" @@ -68,7 +68,7 @@ $NetBSD: patch-configure,v 1.10 2013/06/27 16:35:44 taca Exp $ rb_cv_dlopen=yes ;; #( freebsd*|dragonfly*) : -@@ -16282,7 +16298,7 @@ esac ;; #( +@@ -16294,7 +16310,7 @@ esac ;; #( test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" fi rb_cv_dlopen=yes ;; #( @@ -77,7 +77,7 @@ $NetBSD: patch-configure,v 1.10 2013/06/27 16:35:44 taca Exp $ : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-E" -@@ -16813,7 +16829,7 @@ _ACEOF +@@ -16825,7 +16841,7 @@ _ACEOF freebsd*|dragonfly*) : SOLIBS='$(LIBS)' @@ -86,7 +86,7 @@ $NetBSD: patch-configure,v 1.10 2013/06/27 16:35:44 taca Exp $ if test "$rb_cv_binary_elf" != "yes" ; then LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_ALIASES='' -@@ -16830,7 +16846,7 @@ _ACEOF +@@ -16842,7 +16858,7 @@ _ACEOF LIBRUBY_ALIASES="" fi ;; #( @@ -95,7 +95,7 @@ $NetBSD: patch-configure,v 1.10 2013/06/27 16:35:44 taca Exp $ SOLIBS='$(LIBS)' LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}` -@@ -16891,7 +16907,12 @@ esac +@@ -16903,7 +16919,12 @@ esac ;; #( interix*) : @@ -109,7 +109,7 @@ $NetBSD: patch-configure,v 1.10 2013/06/27 16:35:44 taca Exp $ ;; #( *) : ;; -@@ -16954,11 +16975,7 @@ if test "$install_doc" != no; then +@@ -16966,11 +16987,7 @@ if test "$install_doc" != no; then else RDOCTARGET="nodoc" fi diff --git a/lang/ruby193-base/patches/patch-configure.in b/lang/ruby193-base/patches/patch-configure.in index b19f9bd3728..e9ca4ef7979 100644 --- a/lang/ruby193-base/patches/patch-configure.in +++ b/lang/ruby193-base/patches/patch-configure.in @@ -1,9 +1,9 @@ -$NetBSD: patch-configure.in,v 1.9 2013/06/27 16:35:44 taca Exp $ +$NetBSD: patch-configure.in,v 1.10 2013/11/24 14:17:19 taca Exp $ * Adding Interix and MirBSD support. * Ignore doxygen. ---- configure.in.orig 2013-05-29 12:05:44.000000000 +0000 +--- configure.in.orig 2013-10-31 14:32:59.000000000 +0000 +++ configure.in @@ -1138,6 +1138,8 @@ main() ], @@ -38,7 +38,7 @@ $NetBSD: patch-configure.in,v 1.9 2013/06/27 16:35:44 taca Exp $ @%:@endif]) AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H -@@ -1803,7 +1813,7 @@ if test x"$enable_pthread" = xyes; then +@@ -1804,7 +1814,7 @@ if test x"$enable_pthread" = xyes; then [root], [], [c_r], [MAINLIBS="-pthread $MAINLIBS"], [AS_CASE(["$target_os"], @@ -47,7 +47,7 @@ $NetBSD: patch-configure.in,v 1.9 2013/06/27 16:35:44 taca Exp $ [LIBS="-l$pthread_lib $LIBS"])]) else AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled") -@@ -2034,7 +2044,9 @@ if test "$with_dln_a_out" != yes; then +@@ -2035,7 +2045,9 @@ if test "$with_dln_a_out" != yes; then rb_cv_dlopen=yes], [interix*], [ : ${LDSHARED='$(CC) -shared'} XLDFLAGS="$XLDFLAGS -Wl,-E" @@ -57,7 +57,7 @@ $NetBSD: patch-configure.in,v 1.9 2013/06/27 16:35:44 taca Exp $ rb_cv_dlopen=yes], [freebsd*|dragonfly*], [ : ${LDSHARED='$(CC) -shared'} -@@ -2045,7 +2057,7 @@ if test "$with_dln_a_out" != yes; then +@@ -2046,7 +2058,7 @@ if test "$with_dln_a_out" != yes; then test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" fi rb_cv_dlopen=yes], @@ -66,7 +66,7 @@ $NetBSD: patch-configure.in,v 1.9 2013/06/27 16:35:44 taca Exp $ if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-E" fi -@@ -2346,7 +2358,7 @@ AS_CASE("$enable_shared", [yes], [ +@@ -2347,7 +2359,7 @@ AS_CASE("$enable_shared", [yes], [ ], [freebsd*|dragonfly*], [ SOLIBS='$(LIBS)' @@ -75,7 +75,7 @@ $NetBSD: patch-configure.in,v 1.9 2013/06/27 16:35:44 taca Exp $ if test "$rb_cv_binary_elf" != "yes" ; then LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_ALIASES='' -@@ -2362,7 +2374,7 @@ AS_CASE("$enable_shared", [yes], [ +@@ -2363,7 +2375,7 @@ AS_CASE("$enable_shared", [yes], [ LIBRUBY_ALIASES="" fi ], @@ -84,7 +84,7 @@ $NetBSD: patch-configure.in,v 1.9 2013/06/27 16:35:44 taca Exp $ SOLIBS='$(LIBS)' LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}` ], -@@ -2412,7 +2424,12 @@ AS_CASE("$enable_shared", [yes], [ +@@ -2413,7 +2425,12 @@ AS_CASE("$enable_shared", [yes], [ LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib' ], [interix*], [ @@ -98,7 +98,7 @@ $NetBSD: patch-configure.in,v 1.9 2013/06/27 16:35:44 taca Exp $ ]) ], [ LIBRUBYARG_SHARED= -@@ -2457,11 +2474,7 @@ if test "$install_doc" != no; then +@@ -2458,11 +2475,7 @@ if test "$install_doc" != no; then else RDOCTARGET="nodoc" fi diff --git a/lang/ruby193-base/patches/patch-ext_tk_extconf.rb b/lang/ruby193-base/patches/patch-ext_tk_extconf.rb deleted file mode 100644 index 18a5f95e5c4..00000000000 --- a/lang/ruby193-base/patches/patch-ext_tk_extconf.rb +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ext_tk_extconf.rb,v 1.1 2013/07/19 15:32:58 taca Exp $ - -* Fix trivial bug fix. - ---- ext/tk/extconf.rb.orig 2013-06-26 07:57:49.000000000 +0000 -+++ ext/tk/extconf.rb -@@ -315,7 +315,7 @@ def find_macosx_framework - paths.map{|dir| dir.strip.chomp('/')}.each{|dir| - next unless File.exist?(File.join(dir, "Tcl.framework", "Headers")) - next unless File.directory?(tcldir = File.join(dir, "Tcl.framework")) -- next unless File.exist?(File.join(dir, "Tk.framework"), "Headers") -+ next unless File.exist?(File.join(dir, "Tk.framework", "Headers")) - next unless File.directory?(tkdir = File.join(dir, "Tk.framework")) - TkLib_Config["tcltk-framework"] = dir - return [tcldir, tkdir] |