Prefix rpath options with -Wl.

2 files changed, 24 insertions, 15 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 :