Prefix rpath options with -Wl.

8 files changed, 81 insertions, 26 deletions

diff --git a/net/amule/distinfo b/net/amule/distinfo
index 09cabe9c87b..fdcdbd83729 100644
--- a/net/amule/distinfo
+++ b/net/amule/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2013/06/15 02:34:19 ryoon Exp $
+$NetBSD: distinfo,v 1.20 2013/10/20 18:00:57 joerg Exp $
 
 SHA1 (aMule-2.3.1.tar.bz2) = 25bcef92b06cb34849afaf052e2cd66b4a8454c2
 RMD160 (aMule-2.3.1.tar.bz2) = 7bc5ceea196f9ba0aa0687a694cc82354a0210fc
 Size (aMule-2.3.1.tar.bz2) = 4565232 bytes
-SHA1 (patch-aa) = adf28d4ef0f693fea3e103c02c632ac91423b303
+SHA1 (patch-aa) = af77036649caac372890c45840d24a404ab1a7d6
 SHA1 (patch-src_OScopeCtrl.cpp) = d9ee907eeb49c3f54972b4d1cabdd64c6d4b88d5
 SHA1 (patch-src_ObservableQueue.h) = 7d6b402662a3b9b67f0324d1b6d3119623d8ea77
diff --git a/net/amule/patches/patch-aa b/net/amule/patches/patch-aa
index dd723fbc99f..4f0995d426b 100644
--- a/net/amule/patches/patch-aa
+++ b/net/amule/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2013/06/15 02:34:19 ryoon Exp $
+$NetBSD: patch-aa,v 1.11 2013/10/20 18:00:57 joerg Exp $
 
 * pthread flags portabilities
 * avoid check for gettext>=0.11.5
@@ -6,7 +6,16 @@ $NetBSD: patch-aa,v 1.10 2013/06/15 02:34:19 ryoon Exp $
 
 --- configure.orig	2011-11-11 20:59:26.000000000 +0000
 +++ configure
-@@ -3364,7 +3364,8 @@ case $host_os in *\ *) host_os=`echo "$h
+@@ -3345,8 +3345,6 @@ case $host_os in *\ *) host_os=`echo "$h
+ 		# Now this is against autoconf recommendation that configure should not modify CPPFLAGS and LDFLAGS
+ 		# However, these values in NetBSD are required even to run the tests, and this is the easiest way to do it.
+ 		# Still, we prepend them, instead of adding, so the user may override them.
+-		CPPFLAGS="-I/usr/pkg/include $CPPFLAGS"
+-		LDFLAGS="-R/usr/pkg/lib -L/usr/pkg/lib $LDFLAGS"
+ 		;;
+ 	*irix*)
+ 		SYS=irix
+@@ -3364,7 +3362,8 @@ case $host_os in *\ *) host_os=`echo "$h
  $as_echo_n "checking if this is a FreeBSD 4 or earlier system... " >&6; }
  		if test x"`uname -s`" = xFreeBSD && test 0`uname -r | cut -c 1` -lt 5; then :
  
@@ -16,7 +25,7 @@ $NetBSD: patch-aa,v 1.10 2013/06/15 02:34:19 ryoon Exp $
  			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
-@@ -13760,7 +13761,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>co
+@@ -13760,7 +13759,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>co
    INCINTL=-I\${top_builddir}/intl
  fi
  
@@ -25,7 +34,7 @@ $NetBSD: patch-aa,v 1.10 2013/06/15 02:34:19 ryoon Exp $
  
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for autopoint" >&5
  $as_echo_n "checking for autopoint... " >&6; }
-@@ -13800,7 +13801,7 @@ $as_echo_n "checking for requested langu
+@@ -13800,7 +13799,7 @@ $as_echo_n "checking for requested langu
  
  	if test ${enable_amule_daemon:-no} = yes; then :
  
@@ -34,7 +43,7 @@ $NetBSD: patch-aa,v 1.10 2013/06/15 02:34:19 ryoon Exp $
    AMULE_DAEMON_MANPAGES=`ls -1 ${srcdir}/docs/man/amuled.* | sed -e 's:.*/::g'`
  else
  
-@@ -13818,7 +13819,7 @@ fi
+@@ -13818,7 +13817,7 @@ fi
  
  	if test ${enable_amulecmd:-no} = yes; then :
  
@@ -43,7 +52,7 @@ $NetBSD: patch-aa,v 1.10 2013/06/15 02:34:19 ryoon Exp $
    AMULECMD_MANPAGES=`ls -1 ${srcdir}/docs/man/amulecmd.* | sed -e 's:.*/::g'`
  else
  
-@@ -13836,7 +13837,7 @@ fi
+@@ -13836,7 +13835,7 @@ fi
  
  	if test ${enable_webserver:-no} = yes; then :
  
@@ -52,7 +61,7 @@ $NetBSD: patch-aa,v 1.10 2013/06/15 02:34:19 ryoon Exp $
    WEBSERVER_MANPAGES=`ls -1 ${srcdir}/docs/man/amuleweb.* | sed -e 's:.*/::g'`
  else
  
-@@ -13854,7 +13855,7 @@ fi
+@@ -13854,7 +13853,7 @@ fi
  
  	if test ${enable_amule_gui:-no} = yes; then :
  
@@ -61,7 +70,7 @@ $NetBSD: patch-aa,v 1.10 2013/06/15 02:34:19 ryoon Exp $
    AMULE_GUI_MANPAGES=`ls -1 ${srcdir}/docs/man/amulegui.* | sed -e 's:.*/::g'`
  else
  
-@@ -13872,7 +13873,7 @@ fi
+@@ -13872,7 +13871,7 @@ fi
  
  	if test ${enable_cas:-no} = yes; then :
  
@@ -70,7 +79,7 @@ $NetBSD: patch-aa,v 1.10 2013/06/15 02:34:19 ryoon Exp $
    CAS_MANPAGES=`ls -1 ${srcdir}/src/utils/cas/docs/cas.* | sed -e 's:.*/::g'`
  else
  
-@@ -13890,7 +13891,7 @@ fi
+@@ -13890,7 +13889,7 @@ fi
  
  	if test ${enable_wxcas:-no} = yes; then :
  
@@ -79,7 +88,7 @@ $NetBSD: patch-aa,v 1.10 2013/06/15 02:34:19 ryoon Exp $
    WXCAS_MANPAGES=`ls -1 ${srcdir}/src/utils/wxCas/docs/wxcas.* | sed -e 's:.*/::g'`
  else
  
-@@ -13908,7 +13909,7 @@ fi
+@@ -13908,7 +13907,7 @@ fi
  
  	if test ${enable_ed2k:-yes} = yes; then :
  
@@ -88,7 +97,7 @@ $NetBSD: patch-aa,v 1.10 2013/06/15 02:34:19 ryoon Exp $
    ED2K_MANPAGES=`ls -1 ${srcdir}/docs/man/ed2k.* | sed -e 's:.*/::g'`
  else
  
-@@ -13926,7 +13927,7 @@ fi
+@@ -13926,7 +13925,7 @@ fi
  
  	if test ${enable_alc:-no} = yes; then :
  
@@ -97,7 +106,7 @@ $NetBSD: patch-aa,v 1.10 2013/06/15 02:34:19 ryoon Exp $
    ALC_MANPAGES=`ls -1 ${srcdir}/src/utils/aLinkCreator/docs/alc.* | sed -e 's:.*/::g'`
  else
  
-@@ -13944,7 +13945,7 @@ fi
+@@ -13944,7 +13943,7 @@ fi
  
  	if test ${enable_alcc:-no} = yes; then :
  
@@ -106,7 +115,7 @@ $NetBSD: patch-aa,v 1.10 2013/06/15 02:34:19 ryoon Exp $
    ALCC_MANPAGES=`ls -1 ${srcdir}/src/utils/aLinkCreator/docs/alcc.* | sed -e 's:.*/::g'`
  else
  
-@@ -13962,7 +13963,7 @@ fi
+@@ -13962,7 +13961,7 @@ fi
  
  	if test ${enable_monolithic:-yes} = yes; then :
  
diff --git a/net/bird/distinfo b/net/bird/distinfo
index b7285afe657..025de13560c 100644
--- a/net/bird/distinfo
+++ b/net/bird/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2012/08/07 19:20:39 marino Exp $
+$NetBSD: distinfo,v 1.4 2013/10/20 18:00:57 joerg Exp $
 
 SHA1 (bird-1.3.6.tar.gz) = 8fdc7afb99b5896e3dec85b8b3ba194c8287bf32
 RMD160 (bird-1.3.6.tar.gz) = d4670d79509fc3975ff86d0b67d60bb507bbbcc6
 Size (bird-1.3.6.tar.gz) = 864775 bytes
-SHA1 (patch-configure) = 3c2aec3e4ec5824753a518cc517b2788d050ba26
+SHA1 (patch-configure) = fb6999b955383425a7635d0c94a1a46125db9989
 SHA1 (patch-lib_lists.h) = 7068c6b73841e19a540a08e822658b0455c53a77
 SHA1 (patch-sysdep_bsd_sysio.h) = ff510970668766c95a926948c7a96286da7eca22
 SHA1 (patch-tools_Makefile.in) = b6faf3bc1c866bfc311d74235a92cf3b1f34636f
diff --git a/net/bird/patches/patch-configure b/net/bird/patches/patch-configure
index 8d46bac1b62..71adaa9432b 100644
--- a/net/bird/patches/patch-configure
+++ b/net/bird/patches/patch-configure
@@ -1,8 +1,19 @@
-$NetBSD: patch-configure,v 1.1 2012/08/07 19:20:41 marino Exp $
+$NetBSD: patch-configure,v 1.2 2013/10/20 18:00:57 joerg Exp $
 
 --- configure.orig	2012-01-20 17:04:39.000000000 +0000
 +++ configure
-@@ -4377,6 +4377,10 @@ $as_echo "$bird_cv_sys_linux_version" >&
+@@ -4366,17 +4366,17 @@ $as_echo "$bird_cv_sys_linux_version" >&
+ 					esac
+ 				;;
+ 		ipv6:netbsd*)	sysdesc=bsd-v6
+-				CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
+-				LDFLAGS="$LDFLAGS -L/usr/pkg/lib -R/usr/pkg/lib"
+ 				;;
+ 		ipv4:netbsd*)	sysdesc=bsd
+-				CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
+-				LDFLAGS="$LDFLAGS -L/usr/pkg/lib -R/usr/pkg/lib"
+ 				;;
+ 		ipv6:freebsd*)	sysdesc=bsd-v6
  				;;
  		ipv4:freebsd*)	sysdesc=bsd
  				;;
diff --git a/net/hping3/distinfo b/net/hping3/distinfo
index 0f322e96aa6..0848630a565 100644
--- a/net/hping3/distinfo
+++ b/net/hping3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/03/14 18:37:58 pettai Exp $
+$NetBSD: distinfo,v 1.2 2013/10/20 18:00:57 joerg Exp $
 
 SHA1 (hping3-alpha-2.tar.gz) = 4115f74f234730e1bd6470f4ffb0f30e3759e56d
 RMD160 (hping3-alpha-2.tar.gz) = a1e43a2e4be64657dd7aa49a8211692d6b1673c3
 Size (hping3-alpha-2.tar.gz) = 573396 bytes
 SHA1 (patch-aa) = 25c2d447d8cc0374a27fa3de4e8bc0c1cfa2ce6c
-SHA1 (patch-ab) = 1e180dc738365757103316d8b00f81873db28e9b
+SHA1 (patch-ab) = 46aa447ee7efa477a07fe46119524de8b93708f7
 SHA1 (patch-ac) = cef340ccd49c676093d920797c65ce2ece7eb577
diff --git a/net/hping3/patches/patch-ab b/net/hping3/patches/patch-ab
index ca337963030..6acf436e498 100644
--- a/net/hping3/patches/patch-ab
+++ b/net/hping3/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/03/14 18:37:58 pettai Exp $
+$NetBSD: patch-ab,v 1.2 2013/10/20 18:00:57 joerg Exp $
 
 --- Makefile.in.orig	2004-04-10 01:38:56.000000000 +0200
 +++ Makefile.in	2010-01-26 23:35:22.000000000 +0100
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2010/03/14 18:37:58 pettai Exp $
  
  hping3: byteorder.h $(OBJ)
 -	$(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
-+	$(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L@PREFIX@/lib -R@PREFIX@/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
++	$(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L@PREFIX@/lib ${COMPILER_RPATH_FLAG}@PREFIX@/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@
  	@echo
  	./hping3 -v
  	@echo "use \`make strip' to strip hping3 binary"
diff --git a/net/ttt/distinfo b/net/ttt/distinfo
index 49367678e85..acb18f40bfd 100644
--- a/net/ttt/distinfo
+++ b/net/ttt/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2010/02/19 17:03:36 joerg Exp $
+$NetBSD: distinfo,v 1.11 2013/10/20 18:00:57 joerg Exp $
 
 SHA1 (ttt-1.8.2.tar.gz) = 8b52a1e90de17202c22f062f44025b7ae0e21454
 RMD160 (ttt-1.8.2.tar.gz) = 8f1877904087d9260e61e76f869196111de585c0
 Size (ttt-1.8.2.tar.gz) = 138877 bytes
-SHA1 (patch-aa) = 6d119e544ef3ae578b70c5d13a032f2a1529dde5
+SHA1 (patch-aa) = 730f0b67cd4407b7996e515b82caf1eb8033eb14
 SHA1 (patch-ab) = 4ced63fabf7c4d7360fc3f1a249fb08256b1a745
 SHA1 (patch-ac) = f513d90f7c8ef2389aa868d76795a82c91052e86
 SHA1 (patch-ad) = 40ad417dfb240240468513258132bcc64f510273
diff --git a/net/ttt/patches/patch-aa b/net/ttt/patches/patch-aa
index 053521834f0..794b295876e 100644
--- a/net/ttt/patches/patch-aa
+++ b/net/ttt/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2007/09/07 13:53:44 obache Exp $
+$NetBSD: patch-aa,v 1.6 2013/10/20 18:00:57 joerg Exp $
 
 --- configure.orig	2004-08-14 12:26:59.000000000 +0000
 +++ configure
@@ -14,3 +14,38 @@ $NetBSD: patch-aa,v 1.5 2007/09/07 13:53:44 obache Exp $
  tttFlags=""
  
  ttt_ckcmd_tcl_home=""
+@@ -5710,11 +5710,11 @@ tttLibraries="${tttLibraries} ${LIBS}"
+ 
+ case $target in
+   *-solaris2*)
+-    LDFLAGS="-R ${tttRunPath}"
++    LDFLAGS="${COMPILER_RPATH_FLAG}${tttRunPath}"
+     tttLibraries="${tttLibraries} -ldl"
+     pcapLibrary="${pcapLibrary} -ldl"
+     if test "x${pcapRunPath}" != "x" ; then
+-       PCAP_LDFLAGS="-R ${pcapRunPath}"
++       PCAP_LDFLAGS="${COMPILER_RPATH_FLAG}${pcapRunPath}"
+     fi
+     ;;
+ 
+@@ -5722,9 +5722,9 @@ case $target in
+     ;;
+ 
+   *-netbsd*|*-openbsd*)
+-    LDFLAGS="-R ${tttRunPath}"
++    LDFLAGS="${COMPILER_RPATH_FLAG}${tttRunPath}"
+     if test "x${pcapRunPath}" != "x" ; then
+-       PCAP_LDFLAGS="-R ${pcapRunPath}"
++       PCAP_LDFLAGS="${COMPILER_RPATH_FLAG}${pcapRunPath}"
+     fi
+     ;;
+ 
+@@ -5738,7 +5738,7 @@ case $target in
+     tttLibraries="${tttLibraries} -ldl"
+     pcapLibrary="${pcapLibrary} -ldl"
+     if test "x${pcapRunPath}" != "x" ; then
+-       PCAP_LDFLAGS="-R ${pcapRunPath}"
++       PCAP_LDFLAGS="${COMPILER_RPATH_FLAG}${pcapRunPath}"
+     fi
+     ;;
+