diff options
| -rw-r--r-- | lang/ruby/rubyversion.mk | 6 | ||||
| -rw-r--r-- | lang/ruby200-base/distinfo | 4 | ||||
| -rw-r--r-- | lang/ruby200-base/patches/patch-configure | 31 |
3 files changed, 35 insertions, 6 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index 0e58ca8ddac..bd7a10f10e1 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.101 2013/07/21 02:27:45 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.102 2013/10/28 14:26:59 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -338,7 +338,11 @@ RUBY_SHLIBVER= ${RUBY_VER} RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}${_RUBY_API_MINOR} .endif .elif ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD" +.if ${_RUBY_VER_MINOR} == 0 +RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_API_MINOR} +.else RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_API_MINOR} +.endif .elif ${OPSYS} == "Darwin" RUBY_SHLIB= ${RUBY_VER}.${RUBY_SHLIBVER}.${RUBY_SLEXT} .if ${RUBY_VER} == "18" diff --git a/lang/ruby200-base/distinfo b/lang/ruby200-base/distinfo index 53e45cfba87..6bbc37fe4ac 100644 --- a/lang/ruby200-base/distinfo +++ b/lang/ruby200-base/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2013/10/25 21:47:20 joerg Exp $ +$NetBSD: distinfo,v 1.6 2013/10/28 14:26:59 taca Exp $ SHA1 (ruby-2.0.0-p247.tar.bz2) = 9d3e5758c87a2c8016aec246f278b7551f8cb675 RMD160 (ruby-2.0.0-p247.tar.bz2) = 4a3b6653f17c145c6938c538022c199f830a0dee Size (ruby-2.0.0-p247.tar.bz2) = 10804581 bytes -SHA1 (patch-configure) = ddd8dd57b86f3e77d5004287a5be7883a78cd0be +SHA1 (patch-configure) = f8d9591dacfb8723c0c1dd8eb37309fe80905061 SHA1 (patch-defs_default__gems) = 28a47952e27c22055bac6ad151d092572b96b1ec SHA1 (patch-ext_dl_extconf.rb) = f6c71db3c3076216c9b5db92692c7c8dad012af0 SHA1 (patch-ext_tk_extconf.rb) = 537db204c7a766602529ce48ef89a2fc7cbda19f diff --git a/lang/ruby200-base/patches/patch-configure b/lang/ruby200-base/patches/patch-configure index c2ccc2e0c50..c432dc15bb8 100644 --- a/lang/ruby200-base/patches/patch-configure +++ b/lang/ruby200-base/patches/patch-configure @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.2 2013/08/15 16:27:35 joerg Exp $ +$NetBSD: patch-configure,v 1.3 2013/10/28 14:26:59 taca Exp $ * Adding Interix and MirBSD support. * Ignore doxygen. @@ -58,7 +58,7 @@ $NetBSD: patch-configure,v 1.2 2013/08/15 16:27:35 joerg Exp $ SOLIBS='$(LIBS)' - LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' -+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)\$(TEENY)' ++ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)' if test "$rb_cv_binary_elf" != "yes" ; then LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_ALIASES='' @@ -107,7 +107,32 @@ $NetBSD: patch-configure,v 1.2 2013/08/15 16:27:35 joerg Exp $ else RDOCTARGET="nodoc" CAPITARGET="nodoc" -@@ -20884,17 +20893,7 @@ which seems to be undefined. Please mak +@@ -19210,9 +19219,13 @@ unexpand_shvar() { + test "$#" -eq 0 && return + for n do + eval v='"$'$n'"' +- v="`echo \"$v\" | sed -e 's/${[^${}\"]*}/\"&\"/g' -e 's/[][$|.\\?*]/\\\\&/g'`" ++ v="`echo \"$v\" | sed -e 's/\${[^${}\"]*}/\"&\"/g' -e 's/[][$|.\\?*]/\\\\&/g'`" + if test -n "$v"; then +- expr="${expr};s|"'\("[^$"]*\)'"$v|\\1\${$n}\"|g" ++ if test -n "$expr"; then ++ expr="${expr};s|"'\("[^$"]*\)'"$v|\\1\${$n}\"|g" ++ else ++ expr="s|"'\("[^$"]*\)'"$v|\\1\${$n}\"|g" ++ fi + case "$v" in #( + *'${'*'}'*) : + expr="$expr;s|$v|\"\${$n}\"|g" ;; #( +@@ -19221,7 +19234,7 @@ unexpand_shvar() { + esac + fi + done +- expr='s/${[^${}"]*}/"&"/g;'"${expr};"'s/"\(\${[^${}"]*}\)"/\1/g' ++ expr='s/\${[^${}"]*}/"&"/g;'"${expr};"'s/"\(\${[^${}"]*}\)"/\1/g' + eval $var='"`echo \"\\\"${'$var'}\\\"\" | sed \"$expr;s/\\\"//g\"`"' + } + +@@ -20884,17 +20897,7 @@ which seems to be undefined. Please mak "Makefile":F) tmpmk=confmk$$.tmp { |