Pass rpath options with correct -Wl prefix.

9 files changed, 154 insertions, 14 deletions

diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index b1651844d79..94937214339 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2013/09/30 06:24:09 obache Exp $
+$NetBSD: distinfo,v 1.28 2013/10/20 17:56:02 joerg Exp $
 
 SHA1 (cyrus-sasl-2.1.26.tar.gz) = d6669fb91434192529bd13ee95737a8a5040241c
 RMD160 (cyrus-sasl-2.1.26.tar.gz) = 861a06d663cf3da37a198d0f971d99b249b5f4b8
@@ -6,6 +6,8 @@ Size (cyrus-sasl-2.1.26.tar.gz) = 5220231 bytes
 SHA1 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch) = a3913afc26a37cd6e4681c7bf1e09db001c15d57
 RMD160 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch) = 8228d02e2b2cbb54da77d7767f8b9951c3423349
 Size (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch) = 3836 bytes
+SHA1 (patch-configure) = 473e4bb41d6e5c6ac136288b673880bd123853cf
+SHA1 (patch-configure.in) = c1bc731ea44e13943dc3952c46a0e588364c1dc7
 SHA1 (patch-include_sasl.h) = 315e9e8236108b49955dbf304a56b17cd028a8d6
 SHA1 (patch-saslauthd_Makefile.in) = b7962486aef16ec1e5b27a05a3405d79540f8e20
 SHA1 (patch-saslauthd_auth__rimap.c) = cc3e04ae0cf049eeb507df3226a2098528afaaab
diff --git a/security/cyrus-sasl/patches/patch-configure b/security/cyrus-sasl/patches/patch-configure
new file mode 100644
index 00000000000..5579a69e111
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-configure
@@ -0,0 +1,49 @@
+$NetBSD: patch-configure,v 1.1 2013/10/20 17:56:02 joerg Exp $
+
+--- configure.orig	2013-10-20 15:45:41.000000000 +0000
++++ configure
+@@ -4346,9 +4346,9 @@ if test "${andrew_cv_runpath_switch+set}
+   $as_echo_n "(cached) " >&6
+ else
+ 
+-    # first, try -R
++    # first, try ${COMPILER_RPATH_FLAG}
+     SAVE_LDFLAGS="${LDFLAGS}"
+-    LDFLAGS="-R /usr/lib"
++    LDFLAGS="${COMPILER_RPATH_FLAG} /usr/lib"
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -4385,7 +4385,7 @@ $as_echo "$ac_try_echo") >&5
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
+-  andrew_cv_runpath_switch="-R"
++  andrew_cv_runpath_switch="${COMPILER_RPATH_FLAG}"
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -14591,9 +14591,9 @@ case "$with_sqlite" in
+ $as_echo "$as_me: WARNING: SQLite Library not found" >&2;}; true;;
+     *)
+      if test -d ${with_sqlite}/lib; then
+-         LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
++         LIB_SQLITE="-L${with_sqlite}/lib ${COMPILER_RPATH_FLAG}${with_sqlite}/lib"
+      else
+-         LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
++         LIB_SQLITE="-L${with_sqlite} ${COMPILER_RPATH_FLAG}${with_sqlite}"
+      fi
+ 
+      LIB_SQLITE_DIR=$LIB_SQLITE
+@@ -14721,9 +14721,9 @@ case "$with_sqlite3" in
+ $as_echo "$as_me: WARNING: SQLite3 Library not found" >&2;}; true;;
+     *)
+      if test -d ${with_sqlite3}/lib; then
+-         LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
++         LIB_SQLITE3="-L${with_sqlite3}/lib ${COMPILER_RPATH_FLAG}${with_sqlite3}/lib"
+      else
+-         LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
++         LIB_SQLITE3="-L${with_sqlite3} ${COMPILER_RPATH_FLAG}${with_sqlite3}"
+      fi
+ 
+      LIB_SQLITE3_DIR=$LIB_SQLITE3
diff --git a/security/cyrus-sasl/patches/patch-configure.in b/security/cyrus-sasl/patches/patch-configure.in
new file mode 100644
index 00000000000..4a9b30d34d8
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-configure.in
@@ -0,0 +1,28 @@
+$NetBSD: patch-configure.in,v 1.1 2013/10/20 17:56:02 joerg Exp $
+
+--- configure.in.orig	2013-10-20 15:45:39.000000000 +0000
++++ configure.in
+@@ -861,9 +861,9 @@ case "$with_sqlite" in
+     notfound) AC_WARN([SQLite Library not found]); true;;
+     *)
+      if test -d ${with_sqlite}/lib; then
+-         LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
++         LIB_SQLITE="-L${with_sqlite}/lib ${COMPILER_RPATH_FLAG}${with_sqlite}/lib"
+      else
+-         LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
++         LIB_SQLITE="-L${with_sqlite} ${COMPILER_RPATH_FLAG}${with_sqlite}"
+      fi
+ 
+      LIB_SQLITE_DIR=$LIB_SQLITE
+@@ -913,9 +913,9 @@ case "$with_sqlite3" in
+     notfound) AC_WARN([SQLite3 Library not found]); true;;
+     *)
+      if test -d ${with_sqlite3}/lib; then
+-         LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
++         LIB_SQLITE3="-L${with_sqlite3}/lib ${COMPILER_RPATH_FLAG}${with_sqlite3}/lib"
+      else
+-         LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
++         LIB_SQLITE3="-L${with_sqlite3} ${COMPILER_RPATH_FLAG}${with_sqlite3}"
+      fi
+ 
+      LIB_SQLITE3_DIR=$LIB_SQLITE3
diff --git a/security/lua-sec/distinfo b/security/lua-sec/distinfo
index 00ae2fca5e9..55c2974939c 100644
--- a/security/lua-sec/distinfo
+++ b/security/lua-sec/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2013/09/13 14:32:19 fhajny Exp $
+$NetBSD: distinfo,v 1.4 2013/10/20 17:56:02 joerg Exp $
 
 SHA1 (luasec-0.4.1.tar.gz) = fe4588676e15eab7b34b84dbbfda6e68f6692f9a
 RMD160 (luasec-0.4.1.tar.gz) = 6a7084441352240acb2f0b8b599a6dc59e7e2e81
 Size (luasec-0.4.1.tar.gz) = 28695 bytes
-SHA1 (patch-aa) = f21b7212ee9650044bc1f56ea8dbdc71bcf525fc
+SHA1 (patch-aa) = f0c8575451e83998dea95cd88aa251d4be0ede44
 SHA1 (patch-ab) = 1944a859495b2494d37cfd524895c9a2bd8001ac
diff --git a/security/lua-sec/patches/patch-aa b/security/lua-sec/patches/patch-aa
index 026cee64004..b6d01a549eb 100644
--- a/security/lua-sec/patches/patch-aa
+++ b/security/lua-sec/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2013/09/13 14:32:19 fhajny Exp $
+$NetBSD: patch-aa,v 1.3 2013/10/20 17:56:02 joerg Exp $
 
 Pass installation dirs properly, fix search paths, add Solaris support
 
@@ -16,7 +16,7 @@ Pass installation dirs properly, fix search paths, add Solaris support
 -#INCDIR=-I/usr/local/lua-5.1/include -I/usr/local/openssl-0.9.8/include
 -#LIBDIR=-L/usr/local/openssl-0.9.8/lib -R/usr/local/openssl-0.9.8/lib
 +INCDIR=-I${PREFIX}/include
-+LIBDIR=-L${PREFIX}/lib -R${PREFIX}/lib
++LIBDIR=-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib
  
  # For Mac OS X: set the system version
  MACOSX_VERSION=10.4
diff --git a/security/mit-krb5/distinfo b/security/mit-krb5/distinfo
index 60ddb03fd05..ffd25acf9a1 100644
--- a/security/mit-krb5/distinfo
+++ b/security/mit-krb5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2013/08/30 12:59:22 joerg Exp $
+$NetBSD: distinfo,v 1.46 2013/10/20 17:56:02 joerg Exp $
 
 SHA1 (krb5-1.10.6-signed.tar) = e998a54d9ddf64b13e839873c7e3c7a1077c4bac
 RMD160 (krb5-1.10.6-signed.tar) = ac1fb2e4096f4e8c0010678c06fd551924dbae56
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 941848a1773dfbe51dff3134d4b8504a850a958d
 SHA1 (patch-ad) = b56a7218007560470179dd811c84b8c690c966ac
 SHA1 (patch-ae) = c7395b9de5baf6612b8787fad55dbc051a680bfd
 SHA1 (patch-af) = 1edab3a5f7eb6a7c5dc287e94ae4401c389dbabf
-SHA1 (patch-ag) = 48c0ce35324f5757134c1c5da666bb0cb7a3aaa6
+SHA1 (patch-ag) = 69daa2cf6b231eeb7c9ed57a41bb7b800f6b926f
 SHA1 (patch-ah) = 4e40f36e8969974b3c2f68b2e3636921133c57ba
 SHA1 (patch-aj) = 8a00ca30db3c9c3c9a2f7506cdc4c5b20f7f42c6
 SHA1 (patch-ak) = 19d9b15048a5920ee15c82b33da50c40cf400e46
diff --git a/security/mit-krb5/patches/patch-ag b/security/mit-krb5/patches/patch-ag
index fd73aa0e867..511130a1806 100644
--- a/security/mit-krb5/patches/patch-ag
+++ b/security/mit-krb5/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.7 2012/07/16 19:12:33 adam Exp $
+$NetBSD: patch-ag,v 1.8 2013/10/20 17:56:02 joerg Exp $
 
 Add --enable-pkgsrc-libtool option
 
---- config/shlib.conf.orig	2012-05-31 23:49:44.000000000 +0000
+--- config/shlib.conf.orig	2013-06-05 22:53:29.000000000 +0000
 +++ config/shlib.conf
 @@ -22,6 +22,7 @@ SHLIBVEXT=.so.v-nobuild
  SHLIBSEXT=.so.s-nobuild
@@ -20,7 +20,16 @@ Add --enable-pkgsrc-libtool option
  # Default for systems w/o shared libraries
  CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
  CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)'
-@@ -287,7 +289,7 @@ mips-*-netbsd*)
+@@ -274,7 +276,7 @@ mips-*-netbsd*)
+ 	SHLIBSEXT='.so.$(LIBMAJOR)'
+ 	SHLIBEXT=.so
+ 	LDCOMBINE='ld -shared -soname $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT)'
+-	SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
++	SHLIB_RPATH_FLAGS='${COMPILER_RPATH_FLAG}$(SHLIB_RDIRS)'
+ 	SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	RPATH_FLAG='-Wl,-rpath -Wl,'
+ 	PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+@@ -287,14 +289,14 @@ mips-*-netbsd*)
  	PROFFLAGS=-pg
  	;;
  
@@ -29,6 +38,36 @@ Add --enable-pkgsrc-libtool option
  	PICFLAGS=-fPIC
  	SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
  	SHLIBEXT=.so
+ 	LDCOMBINE='$(CC) -shared'
+-	SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
++	SHLIB_RPATH_FLAGS='${COMPILER_RPATH_FLAG}$(SHLIB_RDIRS)'
+ 	SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+-	RPATH_FLAG=-R
++	RPATH_FLAG=${COMPILER_RPATH_FLAG}
+ 	PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+ 	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+@@ -324,7 +326,7 @@ mips-*-netbsd*)
+ 	CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
+ 	SHLIBEXT=.so
+ 	LDCOMBINE='ld -Bshareable'
+-	SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
++	SHLIB_RPATH_FLAGS='${COMPILER_RPATH_FLAG}$(SHLIB_RDIRS)'
+ 	SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ 	CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)'
+@@ -338,9 +340,9 @@ mips-*-netbsd*)
+ 	SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 	SHLIBEXT=.so
+ 	LDCOMBINE='ld -Bshareable'
+-	SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
++	SHLIB_RPATH_FLAGS='${COMPILER_RPATH_FLAG}$(SHLIB_RDIRS)'
+ 	SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+-	RPATH_FLAG=-R
++	RPATH_FLAG=${COMPILER_RPATH_FLAG}
+ 	PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+ 	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
 @@ -367,7 +369,7 @@ mips-*-netbsd*)
  	for lib in libkrb5support.1.1.dylib libkadm5srv.5.1.dylib libkdb5.4.0.dylib; do
  	    LDCOMBINE_TAIL="$LDCOMBINE_TAIL -dylib_file \"\$(KRB5_LIBDIR)/$lib\":\$(TOPLIBD)/$lib"
@@ -38,6 +77,28 @@ Add --enable-pkgsrc-libtool option
  	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -dynamic $(CFLAGS) $(LDFLAGS)'
  	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
  	CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) -dynamic $(CXXFLAGS) $(LDFLAGS)'
+@@ -399,10 +401,10 @@ mips-*-netbsd*)
+ 	SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 	SHLIBSEXT='.so.$(LIBMAJOR)'
+ 	SHLIBEXT=.so
+-	SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
++	SHLIB_RPATH_FLAGS='${COMPILER_RPATH_FLAG}$(SHLIB_RDIRS)'
+ 	SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	PROFFLAGS=-pg
+-	RPATH_FLAG=-R
++	RPATH_FLAG=${COMPILER_RPATH_FLAG}
+ 	PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+ 	CC_LINK_SHARED='$(PURE) $(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ 	CC_LINK_STATIC='$(PURE) $(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+@@ -454,7 +456,7 @@ mips-*-netbsd*)
+ 	SHLIBVEXT='.so.$(LIBMAJOR)'
+ 	SHLIBEXT=.so
+ 	LDCOMBINE='ld -Bshareable'
+-	SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
++	SHLIB_RPATH_FLAGS='${COMPILER_RPATH_FLAG}$(SHLIB_RDIRS)'
+ 	SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	PROG_RPATH_FLAGS='-Wl,-rpath,$(PROG_RPATH)'
+ 	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS)'
 @@ -486,7 +488,7 @@ mips-*-netbsd*)
  	# Assume initialization always delayed.
  	INIT_FINI_PREP="wl=${wl_prefix}; "'i=1; initfini=; for f in . $(LIBFINIFUNC); do if test $$f != .; then initfini="$$initfini $${wl}-binitfini::$$f:$$i"; else :; fi; i=`expr $$i + 1`; done'
diff --git a/security/tcl-tls/distinfo b/security/tcl-tls/distinfo
index 914b4675d25..d8dc83f959d 100644
--- a/security/tcl-tls/distinfo
+++ b/security/tcl-tls/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2012/11/23 12:27:03 drochner Exp $
+$NetBSD: distinfo,v 1.6 2013/10/20 17:56:02 joerg Exp $
 
 SHA1 (tls1.5.0-src.tar.gz) = 66611f384f4b1c5e126ac8fc1cd03040bbe8ac16
 RMD160 (tls1.5.0-src.tar.gz) = fa37bc819ffc63f93991c876ffd318405e6bad85
 Size (tls1.5.0-src.tar.gz) = 113600 bytes
 SHA1 (patch-aa) = 0d2637038ce203dabdc4c4e9ea36d09a99978d15
-SHA1 (patch-ab) = 6d18f2f85e41007336cb8997e8bfd0d55bb6ea69
+SHA1 (patch-ab) = 19b2a615f710f5b9524dc58cb89f96089f6573d8
 SHA1 (patch-ac) = 350f1b3fc999c27522b2e17e6ba65072095e9b45
 SHA1 (patch-ad) = 59a302a2bd17ae5d5fa55788949de02744cd1d04
diff --git a/security/tcl-tls/patches/patch-ab b/security/tcl-tls/patches/patch-ab
index dc0cdd5bac4..4c065673158 100644
--- a/security/tcl-tls/patches/patch-ab
+++ b/security/tcl-tls/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2010/06/25 06:28:09 obache Exp $
+$NetBSD: patch-ab,v 1.4 2013/10/20 17:56:02 joerg Exp $
 
 --- Makefile.in.orig	2004-02-04 04:02:17.000000000 +0000
 +++ Makefile.in
@@ -15,7 +15,7 @@ $NetBSD: patch-ab,v 1.3 2010/06/25 06:28:09 obache Exp $
  RANLIB = @RANLIB@
  SHLIB_CFLAGS = @SHLIB_CFLAGS@
 -SHLIB_LD = @SHLIB_LD@
-+SHLIB_LD = @SHLIB_LD@ $(LINKER_RPATH_FLAG) ${TCLLIB}
++SHLIB_LD = @SHLIB_LD@ $(COMPILER_RPATH_FLAG)${TCLLIB}
  SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
  SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
  STLIB_LD = @STLIB_LD@