Add a generous dose of -Wl,-R so this builds on ELF platforms.

5 files changed, 52 insertions, 53 deletions

diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index 31444d5e317..6d211ed86bb 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.24 1999/05/24 20:39:45 tv Exp $
-# FreeBSD Id: Makefile,v 1.4 1997/09/11 03:54:43 fenner Exp 
+# $NetBSD: Makefile,v 1.25 1999/06/04 15:11:27 mycroft Exp $
 #
 
 DISTNAME=		vat-4.0b2
diff --git a/mbone/vat/patches/patch-aa b/mbone/vat/patches/patch-aa
index 01ea3b8a23d..973c312de01 100644
--- a/mbone/vat/patches/patch-aa
+++ b/mbone/vat/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:10:02 agc Exp $
+$NetBSD: patch-aa,v 1.3 1999/06/04 15:11:27 mycroft Exp $
 
 --- configure.orig	Thu May 16 01:03:58 1996
 +++ configure	Tue Sep  9 11:36:10 1997
@@ -827,11 +827,11 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:02 agc Exp $
 -			V_LIB_TCL=$dir
 +	for p in $tclposs; do
 +		if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
-+			V_LIB_TCL="-L$d/lib -l$p"
++			V_LIB_TCL="-Wl,-R$d/lib -L$d/lib -l$p"
 +			break
 +		fi
 +		if test -r $d/lib/lib$p.a ; then
-+			V_LIB_TCL="-L$d/lib -l$p"
++			V_LIB_TCL="-Wl,-R$d/lib -L$d/lib -l$p"
  			break
  		fi
  	done
@@ -950,11 +950,11 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:02 agc Exp $
 -				V_LIB_TCL="-L$dir -ltcl"
 +			for p in $tclposs; do
 +				if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
-+					V_LIB_TCL="-L$dir -l$p"
++					V_LIB_TCL="-Wl,-R$dir -L$dir -l$p"
 +					break
 +				fi
 +				if test -r $dir/lib$p.a ; then
-+					V_LIB_TCL="-L$dir -l$p"
++					V_LIB_TCL="-Wl,-R$dir -L$dir -l$p"
 +					break
 +				fi
 +			done
@@ -1008,11 +1008,11 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:02 agc Exp $
 -			V_LIB_TK=$dir
 +	for p in $tkposs; do
 +		if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
-+			V_LIB_TK="-L$d/lib -l$p"
++			V_LIB_TK="-Wl,-R$d/lib -L$d/lib -l$p"
 +			break
 +		fi
 +		if test -r $d/lib/lib$p.a ; then
-+			V_LIB_TK="-L$d/lib -l$p"
++			V_LIB_TK="-Wl,-R$d/lib -L$d/lib -l$p"
  			break
  		fi
  	done
@@ -1123,11 +1123,11 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:02 agc Exp $
 -				V_LIB_TK="-L$dir -ltk"
 +			for p in $tkposs; do
 +				if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
-+					V_LIB_TK="-L$dir -l$p"
++					V_LIB_TK="-Wl,-R$dir -L$dir -l$p"
 +					break
 +				fi
 +				if test -r $dir/lib$p.a ; then
-+					V_LIB_TK="-L$dir -l$p"
++					V_LIB_TK="-Wl,-R$dir -L$dir -l$p"
 +					break
 +				fi
 +			done
@@ -1459,7 +1459,7 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:02 agc Exp $
 --- configure.in.tk.orig	Thu May 16 01:06:05 1996
 +++ configure.in.tk	Tue Sep  9 11:35:45 1997
 @@ -2,6 +2,7 @@
- dnl $Header: /cvsroot/pkgsrc/mbone/vat/patches/patch-aa,v 1.2 1998/08/07 11:10:02 agc Exp $ (LBL)
+ dnl $Header: /cvsroot/pkgsrc/mbone/vat/patches/patch-aa,v 1.3 1999/06/04 15:11:27 mycroft Exp $ (LBL)
  
  AC_ARG_WITH(tcl,	--with-tcl=path	specify a pathname for tcl, d=$withval, d="")
 +tclposs="tcl8.0 tcl80 tcl"
@@ -1480,11 +1480,11 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:02 agc Exp $
 -			V_LIB_TCL=$dir
 +	for p in $tclposs; do
 +		if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
-+			V_LIB_TCL="-L$d/lib -l$p"
++			V_LIB_TCL="-Wl,-R$d/lib -L$d/lib -l$p"
 +			break
 +		fi
 +		if test -r $d/lib/lib$p.a ; then
-+			V_LIB_TCL="-L$d/lib -l$p"
++			V_LIB_TCL="-Wl,-R$d/lib -L$d/lib -l$p"
  			break
  		fi
  	done
@@ -1545,11 +1545,11 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:02 agc Exp $
 -				V_LIB_TCL="-L$dir -ltcl"
 +			for p in $tclposs; do
 +				if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
-+					V_LIB_TCL="-L$dir -l$p"
++					V_LIB_TCL="-Wl,-R$dir -L$dir -l$p"
 +					break
 +				fi
 +				if test -r $dir/lib$p.a ; then
-+					V_LIB_TCL="-L$dir -l$p"
++					V_LIB_TCL="-Wl,-R$dir -L$dir -l$p"
 +					break
 +				fi
 +			done
@@ -1603,11 +1603,11 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:02 agc Exp $
 -			V_LIB_TK=$dir
 +	for p in $tkposs; do
 +		if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
-+			V_LIB_TK="-L$d/lib -l$p"
++			V_LIB_TK="-Wl,-R$d/lib -L$d/lib -l$p"
 +			break
 +		fi
 +		if test -r $d/lib/lib$p.a ; then
-+			V_LIB_TK="-L$d/lib -l$p"
++			V_LIB_TK="-Wl,-R$d/lib -L$d/lib -l$p"
  			break
  		fi
  	done
@@ -1668,11 +1668,11 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:02 agc Exp $
 -				V_LIB_TK="-L$dir -ltk"
 +			for p in $tkposs; do
 +				if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
-+					V_LIB_TK="-L$dir -l$p"
++					V_LIB_TK="-Wl,-R$dir -L$dir -l$p"
 +					break
 +				fi
 +				if test -r $dir/lib$p.a ; then
-+					V_LIB_TK="-L$dir -l$p"
++					V_LIB_TK="-Wl,-R$dir -L$dir -l$p"
 +					break
 +				fi
 +			done
diff --git a/mbone/vat/patches/patch-ae b/mbone/vat/patches/patch-ae
index 09f2d820451..4f879bfbcf4 100644
--- a/mbone/vat/patches/patch-ae
+++ b/mbone/vat/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:10:04 agc Exp $
+$NetBSD: patch-ae,v 1.3 1999/06/04 15:11:27 mycroft Exp $
 
 --- configure.in.tk.freebsd	Thu Nov 20 13:22:35 1997
 +++ configure.in.tk	Fri Nov 21 13:35:46 1997
@@ -21,11 +21,11 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 11:10:04 agc Exp $
  	V_LIB_TCL=FAIL
 -	for p in $tclposs; do
 -		if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
--			V_LIB_TCL="-L$d/lib -l$p"
+-			V_LIB_TCL="-Wl,-R$d/lib -L$d/lib -l$p"
 -			break
 -		fi
 -		if test -r $d/lib/lib$p.a ; then
--			V_LIB_TCL="-L$d/lib -l$p"
+-			V_LIB_TCL="-Wl,-R$d/lib -L$d/lib -l$p"
 +	for dir in $places; do
 +		if test -r $dir ; then
 +			V_LIB_TCL=$dir
@@ -67,21 +67,21 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 11:10:04 agc Exp $
  		for dir in $places; do
 -			for p in $tclposs; do
 -				if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
--					V_LIB_TCL="-L$dir -l$p"
+-					V_LIB_TCL="-Wl,-R$dir -L$dir -l$p"
 -					break
 -				fi
 -				if test -r $dir/lib$p.a ; then
--					V_LIB_TCL="-L$dir -l$p"
+-					V_LIB_TCL="-Wl,-R$dir -L$dir -l$p"
 -					break
 -				fi
 -			done
 -			if test "$V_LIB_TCL" != FAIL; then
 +			if test -r $dir/libtcl80.so -o -r $dir/libtcl80.a; then
-+				V_LIB_TCL="-L$dir -ltcl80"
++				V_LIB_TCL="-Wl,-R$dir -L$dir -ltcl80"
 +				break
 +			fi
 +			if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
-+				V_LIB_TCL="-L$dir -ltcl"
++				V_LIB_TCL="-Wl,-R$dir -L$dir -ltcl"
  				break
  			fi
  		done
@@ -120,11 +120,11 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 11:10:04 agc Exp $
  	V_LIB_TK=FAIL
 -	for p in $tkposs; do
 -		if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
--			V_LIB_TK="-L$d/lib -l$p"
+-			V_LIB_TK="-Wl,-R$d/lib -L$d/lib -l$p"
 -			break
 -		fi
 -		if test -r $d/lib/lib$p.a ; then
--			V_LIB_TK="-L$d/lib -l$p"
+-			V_LIB_TK="-Wl,-R$d/lib -L$d/lib -l$p"
 +	for dir in $places; do
 +		if test -r $dir ; then
 +			V_LIB_TK=$dir
@@ -168,21 +168,21 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 11:10:04 agc Exp $
  		for dir in $places; do
 -			for p in $tkposs; do
 -				if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
--					V_LIB_TK="-L$dir -l$p"
+-					V_LIB_TK="-Wl,-R$dir -L$dir -l$p"
 -					break
 -				fi
 -				if test -r $dir/lib$p.a ; then
--					V_LIB_TK="-L$dir -l$p"
+-					V_LIB_TK="-Wl,-R$dir -L$dir -l$p"
 -					break
 -				fi
 -			done
 -			if test "$V_LIB_TK" != FAIL; then
 +			if test -r $dir/libtk80.so -o -r $dir/libtk80.a; then
-+				V_LIB_TK="-L$dir -ltk80"
++				V_LIB_TK="-Wl,-R$dir -L$dir -ltk80"
 +				break
 +			fi
 +			if test -r $dir/libtk.so -o -r $dir/libtk.a; then
-+				V_LIB_TK="-L$dir -ltk"
++				V_LIB_TK="-Wl,-R$dir -L$dir -ltk"
  				break
  			fi
  		done
@@ -215,11 +215,11 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 11:10:04 agc Exp $
  	V_LIB_TCL=FAIL
 -	for p in $tclposs; do
 -		if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
--			V_LIB_TCL="-L$d/lib -l$p"
+-			V_LIB_TCL="-Wl,-R$d/lib -L$d/lib -l$p"
 -			break
 -		fi
 -		if test -r $d/lib/lib$p.a ; then
--			V_LIB_TCL="-L$d/lib -l$p"
+-			V_LIB_TCL="-Wl,-R$d/lib -L$d/lib -l$p"
 +	for dir in $places; do
 +		if test -r $dir ; then
 +			V_LIB_TCL=$dir
@@ -293,21 +293,21 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 11:10:04 agc Exp $
  		for dir in $places; do
 -			for p in $tclposs; do
 -				if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
--					V_LIB_TCL="-L$dir -l$p"
+-					V_LIB_TCL="-Wl,-R$dir -L$dir -l$p"
 -					break
 -				fi
 -				if test -r $dir/lib$p.a ; then
--					V_LIB_TCL="-L$dir -l$p"
+-					V_LIB_TCL="-Wl,-R$dir -L$dir -l$p"
 -					break
 -				fi
 -			done
 -			if test "$V_LIB_TCL" != FAIL; then
 +			if test -r $dir/libtcl80.so -o -r $dir/libtcl80.a; then
-+				V_LIB_TCL="-L$dir -ltcl80"
++				V_LIB_TCL="-Wl,-R$dir -L$dir -ltcl80"
 +				break
 +			fi
 +			if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
-+				V_LIB_TCL="-L$dir -ltcl"
++				V_LIB_TCL="-Wl,-R$dir -L$dir -ltcl"
  				break
  			fi
  		done
@@ -346,11 +346,11 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 11:10:04 agc Exp $
  	V_LIB_TK=FAIL
 -	for p in $tkposs; do
 -		if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
--			V_LIB_TK="-L$d/lib -l$p"
+-			V_LIB_TK="-Wl,-R$d/lib -L$d/lib -l$p"
 -			break
 -		fi
 -		if test -r $d/lib/lib$p.a ; then
--			V_LIB_TK="-L$d/lib -l$p"
+-			V_LIB_TK="-Wl,-R$d/lib -L$d/lib -l$p"
 +	for dir in $places; do
 +		if test -r $dir ; then
 +			V_LIB_TK=$dir
@@ -432,21 +432,21 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 11:10:04 agc Exp $
  		for dir in $places; do
 -			for p in $tkposs; do
 -				if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
--					V_LIB_TK="-L$dir -l$p"
+-					V_LIB_TK="-Wl,-R$dir -L$dir -l$p"
 -					break
 -				fi
 -				if test -r $dir/lib$p.a ; then
--					V_LIB_TK="-L$dir -l$p"
+-					V_LIB_TK="-Wl,-R$dir -L$dir -l$p"
 -					break
 -				fi
 -			done
 -			if test "$V_LIB_TK" != FAIL; then
 +			if test -r $dir/libtk80.so -o -r $dir/libtk80.a; then
-+				V_LIB_TK="-L$dir -ltk80"
++				V_LIB_TK="-Wl,-R$dir -L$dir -ltk80"
 +				break
 +			fi
 +			if test -r $dir/libtk.so -o -r $dir/libtk.a; then
-+				V_LIB_TK="-L$dir -ltk"
++				V_LIB_TK="-Wl,-R$dir -L$dir -ltk"
  				break
  			fi
  		done
diff --git a/mbone/vat/patches/patch-ag b/mbone/vat/patches/patch-ag
index cf0760b997a..e394797019c 100644
--- a/mbone/vat/patches/patch-ag
+++ b/mbone/vat/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 11:10:04 agc Exp $
+$NetBSD: patch-ag,v 1.3 1999/06/04 15:11:27 mycroft Exp $
 
 --- configure.in.freebsd	Thu Nov 20 13:27:04 1997
 +++ configure.in	Tue Nov 25 17:24:32 1997
@@ -20,7 +20,7 @@ $NetBSD: patch-ag,v 1.2 1998/08/07 11:10:04 agc Exp $
  *-*-netbsd*)
  	V_TARCMD="tar -h -c -f"
 -	V_LIB="$V_LIB -L/usr/local/lib"
-+	V_LIB="$V_LIB -L/usr/pkg/lib"
++	V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib"
  	;;
  *-*-hpux*)
  	V_DEFINE="$V_DEFINE"
@@ -44,7 +44,7 @@ $NetBSD: patch-ag,v 1.2 1998/08/07 11:10:04 agc Exp $
  *-*-netbsd*)
  	V_TARCMD="tar -h -c -f"
 -	V_LIB="$V_LIB -L/usr/local/lib"
-+	V_LIB="$V_LIB -L/usr/pkg/lib"
++	V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib"
  	;;
  *-*-hpux*)
  	V_DEFINE="$V_DEFINE"
diff --git a/mbone/vat/patches/patch-ah b/mbone/vat/patches/patch-ah
index b2c30370095..a7435e01a7c 100644
--- a/mbone/vat/patches/patch-ah
+++ b/mbone/vat/patches/patch-ah
@@ -1,12 +1,12 @@
-$NetBSD$
+$NetBSD: patch-ah,v 1.2 1998/08/07 11:10:04 agc Exp $
 
 --- configure.in.original	Thu Dec 11 18:14:48 1997
 +++ configure.in	Thu Dec 11 18:14:58 1997
 @@ -166,6 +166,7 @@
  *-*-netbsd*)
  	V_TARCMD="tar -h -c -f"
--	V_LIB="$V_LIB -L/usr/pkg/lib"
-+	V_LIB="$V_LIB -L/usr/pkg/lib -lossaudio"
+-	V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib"
++	V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lossaudio"
 +	V_OBJ_AUDIO="audio-voxware.o"
  	;;
  *-*-hpux*)
@@ -16,8 +16,8 @@ $NetBSD$
 @@ -2179,6 +2179,7 @@
  *-*-netbsd*)
  	V_TARCMD="tar -h -c -f"
--	V_LIB="$V_LIB -L/usr/pkg/lib"
-+	V_LIB="$V_LIB -L/usr/pkg/lib -lossaudio"
+-	V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib"
++	V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lossaudio"
 +	V_OBJ_AUDIO="audio-voxware.o"
  	;;
  *-*-hpux*)