From 984b7edbe0c59b243c8203c5060f72f4828686b4 Mon Sep 17 00:00:00 2001
From: taca <taca@pkgsrc.org>
Date: Sun, 29 Oct 2006 02:45:42 +0000
Subject: Adding some fixes:

    (1) Don't use make's varibalbe in DESCR; fixes PR pkg/34920.
    (2) Use --enable-wide-getaddrinfo on not only Linux but Solaris.
    (3) Make sure to link libruby.so with proper -R linker option.

Thanks for Dan McMahill who reported and suggested fix to (2) and (3)
with private mail.  And thanks for Takayoshi Kochi who reports PR pkg/34920.

Bump PKGREVISION.
---
 lang/ruby18-base/DESCR            |  2 +-
 lang/ruby18-base/Makefile         |  8 ++++----
 lang/ruby18-base/distinfo         |  6 +++---
 lang/ruby18-base/patches/patch-aa | 15 +++++++++++++--
 lang/ruby18-base/patches/patch-ab | 13 ++++++++++++-
 5 files changed, 33 insertions(+), 11 deletions(-)

(limited to 'lang/ruby18-base')

diff --git a/lang/ruby18-base/DESCR b/lang/ruby18-base/DESCR
index 9fa97bc9f0b..984ff4d31ee 100644
--- a/lang/ruby18-base/DESCR
+++ b/lang/ruby18-base/DESCR
@@ -16,4 +16,4 @@ Features of Ruby are shown below.
   + Highly Portable (works on many UNIX machines, and on DOS,
     Windows, Mac, BeOS etc.)
 
-This package is Ruby ${RUBY_VER} based release.
+This package is Ruby 1.8 based release.
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index 01ee05c5e4f..4473593c5f1 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2006/09/13 12:57:44 taca Exp $
+# $NetBSD: Makefile,v 1.27 2006/10/29 02:45:42 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -55,9 +55,9 @@ PLIST_SUBST+=	HAS_IO=
 .endif
 
 #
-# Linux work around for getaddrinfo(3)
+# work around for getaddrinfo(3)
 #
-.if ${OPSYS} == "Linux"
+.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=	--enable-wide-getaddrinfo
 .endif
 
diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo
index 34d6fc2bf9e..64199dcdde9 100644
--- a/lang/ruby18-base/distinfo
+++ b/lang/ruby18-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2006/09/07 15:40:00 taca Exp $
+$NetBSD: distinfo,v 1.15 2006/10/29 02:45:42 taca Exp $
 
 SHA1 (ruby-1.8.5-base-20060906.patch.bz2) = 99c283e6d9df4f90ab6d765041b91d37c70dd3ee
 RMD160 (ruby-1.8.5-base-20060906.patch.bz2) = 3b51a6b1d9badd76dc50735971411fa0800d2e85
@@ -6,6 +6,6 @@ Size (ruby-1.8.5-base-20060906.patch.bz2) = 27294 bytes
 SHA1 (ruby-1.8.5.tar.gz) = 0638ea26e1088fc9f4237abde8c85331689ce77c
 RMD160 (ruby-1.8.5.tar.gz) = 991899146c23c9ea30ac09f41b7077fa0c8686b6
 Size (ruby-1.8.5.tar.gz) = 4438603 bytes
-SHA1 (patch-aa) = b6b1faedbfcb7df387b56243493fd1d196e2b2e4
-SHA1 (patch-ab) = b2ab7dc336d48a9b72398070e547261a1ac524d4
+SHA1 (patch-aa) = c5413c506b93657d909bc3cbdcdb51e7c216491e
+SHA1 (patch-ab) = a1a76abd093a08e76be61678febd5f8c8cba164d
 SHA1 (patch-ae) = dfa9c5296c75f6193c790fca8d3eb15ad4a9f228
diff --git a/lang/ruby18-base/patches/patch-aa b/lang/ruby18-base/patches/patch-aa
index c8222c64328..d4cbfd3951c 100644
--- a/lang/ruby18-base/patches/patch-aa
+++ b/lang/ruby18-base/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2006/09/07 15:40:01 taca Exp $
+$NetBSD: patch-aa,v 1.7 2006/10/29 02:45:42 taca Exp $
 
---- configure.in.orig	2006-09-06 16:06:24.000000000 +0900
+--- configure.in.orig	2006-10-29 11:16:01.000000000 +0900
 +++ configure.in
 @@ -409,6 +409,9 @@ msdosdjgpp*)	LIBS="-lm $LIBS"
  		;;
@@ -41,3 +41,14 @@ $NetBSD: patch-aa,v 1.6 2006/09/07 15:40:01 taca Exp $
      interix*)
  	LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
  	;;
+@@ -1381,8 +1399,10 @@ fi
+ if test "$enable_rpath" = yes; then
+     if test "$GCC" = yes; then
+        LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
++       LIBRUBY_DLDFLAGS='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBY_DLDFLAGS"
+     else
+        LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
++       LIBRUBY_DLDFLAGS='-R $(libdir) -L$(libdir) -L. '"$LIBRUBY_DLDFLAGS"
+     fi
+ fi
+ 
diff --git a/lang/ruby18-base/patches/patch-ab b/lang/ruby18-base/patches/patch-ab
index 5ce5c8003d4..ab160cc2f4f 100644
--- a/lang/ruby18-base/patches/patch-ab
+++ b/lang/ruby18-base/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2006/09/07 15:40:01 taca Exp $
+$NetBSD: patch-ab,v 1.7 2006/10/29 02:45:42 taca Exp $
 
 --- configure.orig	2006-08-25 17:34:16.000000000 +0900
 +++ configure
@@ -300,3 +300,14 @@ $NetBSD: patch-ab,v 1.6 2006/09/07 15:40:01 taca Exp $
      interix*)
  	LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
  	;;
+@@ -19017,8 +19225,10 @@ fi
+ if test "$enable_rpath" = yes; then
+     if test "$GCC" = yes; then
+        LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
++       LIBRUBY_DLDFLAGS='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBY_DLDFLAGS"
+     else
+        LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
++       LIBRUBY_DLDFLAGS='-R $(libdir) -L$(libdir) -L. '"$LIBRUBY_DLDFLAGS"
+     fi
+ fi
+ 
-- 
cgit v1.2.3