Use -install_name option with absolute path on Darwin.

It makes us free from DYLD_LIBRARY_PATH. Bump PKGREVISION to nb2.

4 files changed, 25 insertions, 7 deletions

diff --git a/lang/ruby-base/Makefile b/lang/ruby-base/Makefile
index f76c3838291..8ae0007ee88 100644
--- a/lang/ruby-base/Makefile
+++ b/lang/ruby-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2002/03/21 16:29:19 fredb Exp $
+# $NetBSD: Makefile,v 1.8 2002/05/13 15:00:02 yyamano Exp $
 # FreeBSD Id: ports/lang/ruby/Makefile,v 1.39 2000/10/20 19:56:03 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGNAMEPREFIX}base-${RUBY_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
diff --git a/lang/ruby-base/distinfo b/lang/ruby-base/distinfo
index c54931bfb01..4c292f1b249 100644
--- a/lang/ruby-base/distinfo
+++ b/lang/ruby-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2002/03/02 09:10:54 taca Exp $
+$NetBSD: distinfo,v 1.5 2002/05/13 15:00:02 yyamano Exp $
 
 SHA1 (ruby/ruby-1.6.7.tar.gz) = fd1523f17e64fd80741f2e6a77050fde16164053
 Size (ruby/ruby-1.6.7.tar.gz) = 998151 bytes
-SHA1 (patch-aa) = 72df10493784e1ef63c19e5963f6e8840a89bc42
-SHA1 (patch-ab) = 169f1927fafbc64ddcf1c0b91487e88a1af67dd8
+SHA1 (patch-aa) = 62f1bd7d422a1e644896fb6548f182b709d57f23
+SHA1 (patch-ab) = 75b6b2fd6fa5c472c8b2ee0cae5bab19f8edc989
 SHA1 (patch-ac) = 5b897041345ec4077fa2165e3c4c58a6671b942d
 SHA1 (patch-ae) = 294af53a7509372f0d7c17230c605d790f1e7bb2
 SHA1 (patch-af) = 0eb2fd9784b5924bcc233d3b81128821130c578c
diff --git a/lang/ruby-base/patches/patch-aa b/lang/ruby-base/patches/patch-aa
index db18abd7bd7..9a52e069529 100644
--- a/lang/ruby-base/patches/patch-aa
+++ b/lang/ruby-base/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2002/03/02 09:10:55 taca Exp $
+$NetBSD: patch-aa,v 1.4 2002/05/13 15:00:02 yyamano Exp $
 
 --- configure.in.orig	Wed Feb  6 18:13:15 2002
 +++ configure.in
+@@ -872,7 +872,7 @@
+     darwin*)
+ 	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib'
+ 	LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace'
+-	LIBRUBY_DLDFLAGS='-install_name lib$(RUBY_INSTALL_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
++	LIBRUBY_DLDFLAGS='-install_name $(prefix)/lib/lib$(RUBY_INSTALL_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
+ 	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
+ 	;;
+     *)
 @@ -951,6 +951,7 @@
  	;;	
  esac
diff --git a/lang/ruby-base/patches/patch-ab b/lang/ruby-base/patches/patch-ab
index 497d5fd0608..010dff7271c 100644
--- a/lang/ruby-base/patches/patch-ab
+++ b/lang/ruby-base/patches/patch-ab
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.2 2002/03/02 09:10:55 taca Exp $
+$NetBSD: patch-ab,v 1.3 2002/05/13 15:00:02 yyamano Exp $
 
 --- configure.orig	Mon Feb 11 03:05:48 2002
 +++ configure
+@@ -5054,7 +5054,7 @@
+     darwin*)
+ 	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib'
+ 	LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace'
+-	LIBRUBY_DLDFLAGS='-install_name lib$(RUBY_INSTALL_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
++	LIBRUBY_DLDFLAGS='-install_name $(prefix)/lib/lib$(RUBY_INSTALL_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
+ 	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
+ 	;;
+     *)
 @@ -5444,6 +5444,7 @@
  s%@setup@%$setup%g
  s%@MINIRUBY@%$MINIRUBY%g