Tell Irix where to find the right libs for the used ABI. Subsequent

ruby-packages link correctly then.  Also, this way,
ruby builds completely and we don't need various RUBY_NO_FOO variables.

5 files changed, 38 insertions, 43 deletions

diff --git a/lang/ruby-base/Makefile b/lang/ruby-base/Makefile
index e58d36eb96e..db1ce579b20 100644
--- a/lang/ruby-base/Makefile
+++ b/lang/ruby-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/03/30 23:45:57 jschauma Exp $
+# $NetBSD: Makefile,v 1.15 2003/06/23 21:40:22 jschauma Exp $
 # FreeBSD Id: ports/lang/ruby/Makefile,v 1.39 2000/10/20 19:56:03 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -44,6 +44,12 @@ REPLACE_RUBY=	bin/irb \
 
 .include "Makefile.common"
 
+.if ${OPSYS} == "IRIX"
+# X111BASE, *not* X11PREFIX:  X11PREFIX == PREFIX, but we need to point
+# to the ABI-specific libraries
+CONFIGURE_ENV+=	X11BASE="${X11BASE}"
+.endif
+
 .if !empty(RUBY_SUFFIX)
 CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}"
 .endif
diff --git a/lang/ruby-base/Makefile.common b/lang/ruby-base/Makefile.common
index 8d6c1bb40b3..85ef82dd078 100644
--- a/lang/ruby-base/Makefile.common
+++ b/lang/ruby-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2003/06/05 14:52:34 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.14 2003/06/23 21:40:22 jschauma Exp $
 # FreeBSD: ports/Mk/bsd.ruby.mk,v 1.11 2000/11/16 17:59:40 knu Exp
 # Makefile.common: ruby common makefile, based on FreeBSD's bsd.ruby.mk.
 
@@ -103,13 +103,6 @@ RUBY_SHLIBVER?=		${RUBY_VERSION}
 
 .if ${OPSYS} == "IRIX"
 RUBY_NOSHLIBMAJOR=	"@comment "
-RUBY_NOEXT_CURSES=	"@comment "
-RUBY_NOEXT_DBM=		"@comment "
-RUBY_NOEXT_ETC=		"@comment "
-RUBY_NOEXT_PTY=		"@comment "
-RUBY_NOEXT_SOCK=	"@comment "
-RUBY_NOEXT_SYSL=	"@comment "
-RUBY_NOEXT_EXPECT=	"@comment "
 .endif
 
 RUBY_SHLIBMAJOR?=	${_RUBY_SUFFIX}
@@ -145,11 +138,6 @@ PLIST_SUBST+=		RUBY_VERSION="${RUBY_VERSION}" \
 			RUBY_NAME="${RUBY_NAME}" \
 			RUBY_NOEXT_CURSES=${RUBY_NOEXT_CURSES} \
 			RUBY_NOEXT_DBM=${RUBY_NOEXT_DBM} \
-			RUBY_NOEXT_ETC=${RUBY_NOEXT_ETC} \
-			RUBY_NOEXT_PTY=${RUBY_NOEXT_PTY} \
-			RUBY_NOEXT_SOCK=${RUBY_NOEXT_SOCK} \
-			RUBY_NOEXT_SYSL=${RUBY_NOEXT_SYSL} \
-			RUBY_NOEXT_EXPECT=${RUBY_NOEXT_EXPECT} \
 			RUBY_NOSHLIBMAJOR=${RUBY_NOSHLIBMAJOR} \
 			RUBY_COMMENT=${RUBY_COMMENT} \
 			${PLIST_RUBY_DIRS:S,DIR="${LOCALBASE}/,DIR=",}
diff --git a/lang/ruby-base/PLIST b/lang/ruby-base/PLIST
index 941248b210b..a3ddac50d63 100644
--- a/lang/ruby-base/PLIST
+++ b/lang/ruby-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/06/05 14:52:35 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/06/23 21:40:22 jschauma Exp $
 bin/irb
 bin/ruby
 bin/ruby${_RUBY_SUFFIX}
@@ -11,13 +11,13 @@ ${RUBY_NOEXT_DBM}${RUBY_ARCHLIBDIR}/dbm.so
 ${RUBY_ARCHLIBDIR}/defines.h
 ${RUBY_ARCHLIBDIR}/dln.h
 ${RUBY_ARCHLIBDIR}/env.h
-${RUBY_NOEXT_ETC}${RUBY_ARCHLIBDIR}/etc.so
+${RUBY_ARCHLIBDIR}/etc.so
 ${RUBY_ARCHLIBDIR}/fcntl.so
 ${RUBY_ARCHLIBDIR}/intern.h
 ${RUBY_ARCHLIBDIR}/lib${RUBY_NAME}.a
 ${RUBY_ARCHLIBDIR}/nkf.so
 ${RUBY_ARCHLIBDIR}/node.h
-${RUBY_NOEXT_PTY}${RUBY_ARCHLIBDIR}/pty.so
+${RUBY_ARCHLIBDIR}/pty.so
 ${RUBY_ARCHLIBDIR}/rbconfig.rb
 ${RUBY_ARCHLIBDIR}/re.h
 ${RUBY_ARCHLIBDIR}/regex.h
@@ -25,9 +25,9 @@ ${RUBY_ARCHLIBDIR}/ruby.h
 ${RUBY_ARCHLIBDIR}/rubyio.h
 ${RUBY_ARCHLIBDIR}/rubysig.h
 ${RUBY_ARCHLIBDIR}/sdbm.so
-${RUBY_NOEXT_SOCK}${RUBY_ARCHLIBDIR}/socket.so
+${RUBY_ARCHLIBDIR}/socket.so
 ${RUBY_ARCHLIBDIR}/st.h
-${RUBY_NOEXT_SYSL}${RUBY_ARCHLIBDIR}/syslog.so
+${RUBY_ARCHLIBDIR}/syslog.so
 ${RUBY_ARCHLIBDIR}/util.h
 ${RUBY_ARCHLIBDIR}/version.h
 ${RUBY_LIBDIR}/English.rb
@@ -44,7 +44,7 @@ ${RUBY_LIBDIR}/debug.rb
 ${RUBY_LIBDIR}/delegate.rb
 ${RUBY_LIBDIR}/e2mmap.rb
 ${RUBY_LIBDIR}/eregex.rb
-${RUBY_NOEXT_EXPECT}${RUBY_LIBDIR}/expect.rb
+${RUBY_LIBDIR}/expect.rb
 ${RUBY_LIBDIR}/final.rb
 ${RUBY_LIBDIR}/finalize.rb
 ${RUBY_LIBDIR}/find.rb
diff --git a/lang/ruby-base/distinfo b/lang/ruby-base/distinfo
index 757770922c1..4ac38ed477f 100644
--- a/lang/ruby-base/distinfo
+++ b/lang/ruby-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2003/03/30 23:45:57 jschauma Exp $
+$NetBSD: distinfo,v 1.10 2003/06/23 21:40:22 jschauma Exp $
 
 SHA1 (ruby/ruby-1.6.8.tar.gz) = 4b475ac1c837cd62b6dfe85359e1502a71b08cd1
 Size (ruby/ruby-1.6.8.tar.gz) = 1023403 bytes
 SHA1 (patch-aa) = 654efb008caadf7973c78cabc70f76c8eab09266
-SHA1 (patch-ab) = e5760150aaa1f186bcc9a47fea3c12c8702ac6c3
+SHA1 (patch-ab) = 9151af68fd069e03b9d3a12818a001deb6407f8e
 SHA1 (patch-ac) = 5b897041345ec4077fa2165e3c4c58a6671b942d
 SHA1 (patch-ae) = 8c9925dcb7d4fdb9aad5432befbc3b21c56eb884
 SHA1 (patch-af) = 33aa9f1e524e2f4a6dd2f1310ce7358744b83a8c
diff --git a/lang/ruby-base/patches/patch-ab b/lang/ruby-base/patches/patch-ab
index ffe3282f703..c3a6f19fdff 100644
--- a/lang/ruby-base/patches/patch-ab
+++ b/lang/ruby-base/patches/patch-ab
@@ -1,22 +1,23 @@
-$NetBSD: patch-ab,v 1.6 2003/03/30 23:45:58 jschauma Exp $
+$NetBSD: patch-ab,v 1.7 2003/06/23 21:40:24 jschauma Exp $
 
---- configure.orig	Tue Nov 19 06:49:26 2002
-+++ configure	Sun Mar 30 18:31:40 2003
-@@ -4550,6 +4550,9 @@
- 	osf*) 		LDSHARED="$CC -shared"
- 			rb_cv_dlopen=yes ;;
- 	linux*) 	LDSHARED="$CC -shared"
-+			if test "$rb_cv_binary_elf" = yes; then
-+				LDFLAGS="-Wl,-rpath,${PREFIX}/lib"
-+			fi
- 			rb_cv_dlopen=yes ;;
- 	freebsd*)       LDSHARED="$CC -shared"
- 			if test "$rb_cv_binary_elf" = yes; then
-@@ -5516,6 +5519,7 @@
- s%@setup@%$setup%g
- s%@MINIRUBY@%$MINIRUBY%g
- s%@PREP@%$PREP%g
-+s%@X11BASE@%$X11BASE%g
- s%@LIBRUBY_LDSHARED@%$LIBRUBY_LDSHARED%g
- s%@LIBRUBY_DLDFLAGS@%$LIBRUBY_DLDFLAGS%g
- s%@RUBY_INSTALL_NAME@%$RUBY_INSTALL_NAME%g
+--- configure.orig	Tue Nov 19 03:49:26 2002
++++ configure	Mon Jun 23 11:47:50 2003
+@@ -4524,7 +4524,7 @@
+ 
+   case "$target_os" in
+ 	hpux*)		DLDFLAGS="-E"
+-			LDSHARED='ld -b'
++			LDSHARED="ld -b $LDSHARED"
+ 			LDFLAGS="-Wl,-E"
+ 			rb_cv_dlopen=yes;;
+ 	solaris*) 	if test "$GCC" = yes; then
+@@ -4539,7 +4539,8 @@
+ 			rb_cv_dlopen=yes;;
+ 	sunos*) 	LDSHARED='ld -assert nodefinitions'
+ 			rb_cv_dlopen=yes;;
+-	irix*)		LDSHARED='ld -shared'
++	irix*)		LDSHARED='ld -shared -L${X11BASE}/lib${ABI}'
++			LDFLAGS="-L${X11BASE}/lib${ABI} ${LDFLAGS}"
+ 			rb_cv_dlopen=yes;;
+ 	sysv4*) 	LDSHARED='ld -G'
+ 			rb_cv_dlopen=yes;;