[pkgsrc/trunk]: pkgsrc/lang/ruby16 nb1: Add entirely ugly but ultimately nece...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b61281bbf4bc
branches:  trunk
changeset: 487896:b61281bbf4bc
user:      tv <tv%pkgsrc.org@localhost>
date:      Fri Jan 21 16:36:41 2005 +0000

description:
nb1: Add entirely ugly but ultimately necessary workaround for Interix,
fortunately not required for ruby 1.8.

Rather than printf-interpolating $DLDFLAGS, which screws with % characters,
put %s in its place and supply $DLDFLAGS as an arg to printf.

diffstat:

 lang/ruby16/Makefile         |   3 ++-
 lang/ruby16/distinfo         |   7 ++++---
 lang/ruby16/patches/patch-aa |   4 ++--
 lang/ruby16/patches/patch-ab |   4 ++--
 lang/ruby16/patches/patch-ak |  16 ++++++++++++++++
 5 files changed, 26 insertions(+), 8 deletions(-)

diffs (91 lines):

diff -r caa0854c64ca -r b61281bbf4bc lang/ruby16/Makefile
--- a/lang/ruby16/Makefile      Fri Jan 21 16:30:11 2005 +0000
+++ b/lang/ruby16/Makefile      Fri Jan 21 16:36:41 2005 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/27 14:14:05 taca Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/21 16:36:41 tv Exp $
 #
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-${RUBY_VERSION}
+PKGREVISION=   1
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
diff -r caa0854c64ca -r b61281bbf4bc lang/ruby16/distinfo
--- a/lang/ruby16/distinfo      Fri Jan 21 16:30:11 2005 +0000
+++ b/lang/ruby16/distinfo      Fri Jan 21 16:36:41 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2005/01/21 06:13:36 tv Exp $
+$NetBSD: distinfo,v 1.3 2005/01/21 16:36:41 tv Exp $
 
 SHA1 (ruby/ruby-1.6.8.tar.gz) = 4b475ac1c837cd62b6dfe85359e1502a71b08cd1
 Size (ruby/ruby-1.6.8.tar.gz) = 1023403 bytes
-SHA1 (patch-aa) = ba4551cc3de31036a3cf8d50478bfdcbcadee38b
-SHA1 (patch-ab) = 57abd1b0e6af14b20c3a284615160c144c18cfdc
+SHA1 (patch-aa) = b0f161d45194860cc0785f9d7961c6455824b0d9
+SHA1 (patch-ab) = 1bf657ee3facce8e3fb4909e11e03eee1aa7a121
 SHA1 (patch-ac) = 19f520406a9b699a4bbe53b0e9e2b69b4eb7d96a
 SHA1 (patch-ad) = 8a3e5eb250f517f10bea7f52fbfe8b05957b7bb4
 SHA1 (patch-ae) = 2e096dcb882be923d2ff775a4271a300954a9dec
@@ -12,3 +12,4 @@
 SHA1 (patch-ah) = 72461b10296cb9a03fc37bba6af69650c8777741
 SHA1 (patch-ai) = 38b4293845c0078c5c5ae40d328c0ac7842fcdbc
 SHA1 (patch-aj) = 03e15c32b0865d11339f609b2e98613fc09083b4
+SHA1 (patch-ak) = ce23ee5dc472ebebe0c05adcb6956a50cecc4fcd
diff -r caa0854c64ca -r b61281bbf4bc lang/ruby16/patches/patch-aa
--- a/lang/ruby16/patches/patch-aa      Fri Jan 21 16:30:11 2005 +0000
+++ b/lang/ruby16/patches/patch-aa      Fri Jan 21 16:36:41 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2005/01/21 06:13:36 tv Exp $
+$NetBSD: patch-aa,v 1.3 2005/01/21 16:36:41 tv Exp $
 
 --- configure.in.orig  2002-11-13 13:59:18.000000000 -0500
 +++ configure.in
@@ -123,7 +123,7 @@
 +      interix3*)      LDSHARED='${CC} -shared'
 +                      LDFLAGS="-Wl,-E"
 +                      # use special random-slot linkage in 0x[56]XXXXXXX
-+                      DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %%4096/2*262144+1342177280))'
++                      DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
 +                      LIBPATHFLAG=' -L%1$-s'
 +                      RPATHFLAG=' -Wl,-R%1$-s'
 +                      rb_cv_dlopen=yes ;;
diff -r caa0854c64ca -r b61281bbf4bc lang/ruby16/patches/patch-ab
--- a/lang/ruby16/patches/patch-ab      Fri Jan 21 16:30:11 2005 +0000
+++ b/lang/ruby16/patches/patch-ab      Fri Jan 21 16:36:41 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2005/01/21 06:13:36 tv Exp $
+$NetBSD: patch-ab,v 1.3 2005/01/21 16:36:41 tv Exp $
 
 --- configure.orig     2002-11-19 06:49:26.000000000 -0500
 +++ configure
@@ -413,7 +413,7 @@
 +      interix3*)      LDSHARED='${CC} -shared'
 +                      LDFLAGS="-Wl,-E"
 +                      # use special random-slot linkage in 0x[56]XXXXXXX
-+                      DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %%4096/2*262144+1342177280))'
++                      DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
 +                      LIBPATHFLAG=' -L%1$-s'
 +                      RPATHFLAG=' -Wl,-R%1$-s'
 +                      rb_cv_dlopen=yes ;;
diff -r caa0854c64ca -r b61281bbf4bc lang/ruby16/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ruby16/patches/patch-ak      Fri Jan 21 16:36:41 2005 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ak,v 1.1 2005/01/21 16:36:41 tv Exp $
+
+--- ext/extmk.rb.in.orig       2005-01-21 11:23:45.000000000 -0500
++++ ext/extmk.rb.in
+@@ -423,9 +423,9 @@ CC = @CC@
+ 
+ CFLAGS   = %s #{CFLAGS} #$CFLAGS
+ CPPFLAGS = -I$(topdir) -I$(hdrdir) %s #$CPPFLAGS
+-DLDFLAGS = #$DLDFLAGS #$LDFLAGS
++DLDFLAGS = %s #$LDFLAGS
+ LDSHARED = @LDSHARED@ #{defflag}
+-", if $static then "" else "@CCDLFLAGS@" end, $defs.join(" ")
++", if $static then "" else "@CCDLFLAGS@" end, $defs.join(" "), $DLDFLAGS
+   mfile.puts "LIBPATH = #{libpath}" if libpath
+ 
+   mfile.puts ".SUFFIXES: .@OBJEXT@" unless "@OBJEXT@" == "o"