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.

5 files changed, 26 insertions, 8 deletions

diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 1306e952cf7..bd6dbf2a33f 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -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 --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo
index 40ee98de5a2..3686485c880 100644
--- a/lang/ruby16/distinfo
+++ b/lang/ruby16/distinfo
@@ -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-ag) = cf9f16f056c2f5df2493b6f04232fb62edf4448f
 SHA1 (patch-ah) = 72461b10296cb9a03fc37bba6af69650c8777741
 SHA1 (patch-ai) = 38b4293845c0078c5c5ae40d328c0ac7842fcdbc
 SHA1 (patch-aj) = 03e15c32b0865d11339f609b2e98613fc09083b4
+SHA1 (patch-ak) = ce23ee5dc472ebebe0c05adcb6956a50cecc4fcd
diff --git a/lang/ruby16/patches/patch-aa b/lang/ruby16/patches/patch-aa
index fb9f7edc026..9c8c5be3e51 100644
--- a/lang/ruby16/patches/patch-aa
+++ b/lang/ruby16/patches/patch-aa
@@ -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 @@ $NetBSD: patch-aa,v 1.2 2005/01/21 06:13:36 tv Exp $
 +	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 --git a/lang/ruby16/patches/patch-ab b/lang/ruby16/patches/patch-ab
index 7055951dc14..641a4b1ca83 100644
--- a/lang/ruby16/patches/patch-ab
+++ b/lang/ruby16/patches/patch-ab
@@ -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 @@ $NetBSD: patch-ab,v 1.2 2005/01/21 06:13:36 tv Exp $
 +	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 --git a/lang/ruby16/patches/patch-ak b/lang/ruby16/patches/patch-ak
new file mode 100644
index 00000000000..63d48b9c194
--- /dev/null
+++ b/lang/ruby16/patches/patch-ak
@@ -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"