- Fix rpath problem with SunPro Compiler on Solaris. No other platform

  should not be affected by this change.
- Some white space clean up.

Bump PKGREVISION.

5 files changed, 57 insertions, 12 deletions

diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index 378c243063a..627f6e71788 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2006/03/15 08:18:45 taca Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/22 23:05:39 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
+PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -52,9 +53,9 @@ FILES_SUBST+=	DATE=${DATE:Q}
 # IRIX work around which should be fixed.
 #
 .if ${OPSYS} == "IRIX"
-PLIST_SUBST+=  HAS_IO="@comment "
+PLIST_SUBST+=	HAS_IO="@comment "
 .else
-PLIST_SUBST+=  HAS_IO=
+PLIST_SUBST+=	HAS_IO=
 .endif
 
 #
diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo
index 072aef78806..01bd1425928 100644
--- a/lang/ruby18-base/distinfo
+++ b/lang/ruby18-base/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2006/01/03 14:37:24 taca Exp $
+$NetBSD: distinfo,v 1.10 2006/03/22 23:05:39 taca Exp $
 
 SHA1 (ruby-1.8.4.tar.gz) = 93999577c7fc4decc6b2fe8fefa96e743f278fbf
 RMD160 (ruby-1.8.4.tar.gz) = 1c0572a4ee369af57a3db68027b2566052eac944
 Size (ruby-1.8.4.tar.gz) = 4312965 bytes
-SHA1 (patch-aa) = 01e457e3133dfd4089941dcfa691382d603cca6f
-SHA1 (patch-ab) = 4cfb46508d50e34999c3f5ac173b628ac0345703
+SHA1 (patch-aa) = 0f70b20256882d20e7bb52d0892c99b027b35134
+SHA1 (patch-ab) = e7d73482bf2f9d50c260aa9870e443dd0cda6713
 SHA1 (patch-ad) = d30c8a267ef1eb54e875f6899461b30f8c323d6d
 SHA1 (patch-ae) = dfa9c5296c75f6193c790fca8d3eb15ad4a9f228
 SHA1 (patch-af) = d00e67015793b04498418bfa12a28aaeb0c93d3b
diff --git a/lang/ruby18-base/hacks.mk b/lang/ruby18-base/hacks.mk
index 465c5af44da..959a9cd36c3 100644
--- a/lang/ruby18-base/hacks.mk
+++ b/lang/ruby18-base/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2005/06/06 13:49:25 seb Exp $
+# $NetBSD: hacks.mk,v 1.2 2006/03/22 23:05:39 taca Exp $
 
 .if !defined(RUBY18_BASE_HACKS_MK)
 RUBY18_BASE_HACKS_MK=	defined
@@ -14,7 +14,7 @@ RUBY18_BASE_HACKS_MK=	defined
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
 .  if !empty(CC_VERSION:Mgcc-3.3.*)
 PKG_HACKS+=		optimisation
-BUILDLINK_TRANSFORM+=   rm:-O[0-9]*
+BUILDLINK_TRANSFORM+=	rm:-O[0-9]*
 .  endif
 .endif
 
diff --git a/lang/ruby18-base/patches/patch-aa b/lang/ruby18-base/patches/patch-aa
index 47d4fafeeb0..facf5cfa465 100644
--- a/lang/ruby18-base/patches/patch-aa
+++ b/lang/ruby18-base/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2006/01/03 14:37:24 taca Exp $
+$NetBSD: patch-aa,v 1.5 2006/03/22 23:05:39 taca Exp $
 
 --- configure.in.orig	2005-11-24 21:07:18.000000000 +0900
 +++ configure.in
@@ -26,7 +26,16 @@ $NetBSD: patch-aa,v 1.4 2006/01/03 14:37:24 taca Exp $
  	interix*) 	: ${LDSHARED="$CC -shared"}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
  			LIBPATHFLAG=" -L'%1\$-s'"
-@@ -1266,6 +1276,14 @@ if test "$enable_shared" = 'yes'; then
+@@ -1232,8 +1242,6 @@ if test "$enable_shared" = 'yes'; then
+ 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so'
+ 	if test "$GCC" = yes; then
+ 	    LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)'
+-	else
+-	    enable_rpath=no
+ 	fi
+ 	XLDFLAGS="$XLDFLAGS "'-R${libdir}'
+  	;;
+@@ -1266,6 +1274,14 @@ if test "$enable_shared" = 'yes'; then
  	LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
  	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
  	;;
@@ -41,3 +50,16 @@ $NetBSD: patch-aa,v 1.4 2006/01/03 14:37:24 taca Exp $
      interix*)
  	LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
  	;;
+@@ -1274,7 +1290,11 @@ if test "$enable_shared" = 'yes'; then
+   esac
+ fi
+ if test "$enable_rpath" = yes; then
+-    LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
++    if test "$GCC" = yes; then
++	LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
++    else
++	LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
++    fi
+ fi
+ 
+ XLDFLAGS="$XLDFLAGS -L."
diff --git a/lang/ruby18-base/patches/patch-ab b/lang/ruby18-base/patches/patch-ab
index a5215f03b30..342053bcfaf 100644
--- a/lang/ruby18-base/patches/patch-ab
+++ b/lang/ruby18-base/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2006/01/03 14:37:24 taca Exp $
+$NetBSD: patch-ab,v 1.5 2006/03/22 23:05:39 taca Exp $
 
 --- configure.orig	2005-12-24 21:36:33.000000000 +0900
 +++ configure
@@ -26,7 +26,16 @@ $NetBSD: patch-ab,v 1.4 2006/01/03 14:37:24 taca Exp $
  	interix*) 	: ${LDSHARED="$CC -shared"}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
  			LIBPATHFLAG=" -L'%1\$-s'"
-@@ -15155,6 +15165,14 @@ if test "$enable_shared" = 'yes'; then
+@@ -15121,8 +15131,6 @@ if test "$enable_shared" = 'yes'; then
+ 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so'
+ 	if test "$GCC" = yes; then
+ 	    LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)'
+-	else
+-	    enable_rpath=no
+ 	fi
+ 	XLDFLAGS="$XLDFLAGS "'-R${libdir}'
+  	;;
+@@ -15155,6 +15163,14 @@ if test "$enable_shared" = 'yes'; then
  	LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
  	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
  	;;
@@ -41,3 +50,16 @@ $NetBSD: patch-ab,v 1.4 2006/01/03 14:37:24 taca Exp $
      interix*)
  	LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
  	;;
+@@ -15163,7 +15179,11 @@ if test "$enable_shared" = 'yes'; then
+   esac
+ fi
+ if test "$enable_rpath" = yes; then
+-    LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
++    if test "$GCC" = yes; then
++	LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
++    else
++	LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
++    fi
+ fi
+ 
+ XLDFLAGS="$XLDFLAGS -L."