Pass rpath options with the correct -Wl prefix.

4 files changed, 14 insertions, 12 deletions

diff --git a/www/screws/distinfo b/www/screws/distinfo
index ddc605b18e3..15d7dbab72a 100644
--- a/www/screws/distinfo
+++ b/www/screws/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.15 2012/12/20 21:33:57 joerg Exp $
+$NetBSD: distinfo,v 1.16 2013/10/20 17:48:26 joerg Exp $
 
 SHA1 (screws-0.56.tar.gz) = 3335e7e7116561499ee7164831c31df4ecebe403
 RMD160 (screws-0.56.tar.gz) = 5d7f1af67a42cd5726f0d4708713bb13c4c8fe21
 Size (screws-0.56.tar.gz) = 256862 bytes
 SHA1 (patch-aa) = 0101b7083bb45358371a3853783f9c65cc5b2435
-SHA1 (patch-ab) = d5f8997c9e1ed2795591e4d29605e9208351bf81
+SHA1 (patch-ab) = 2a4a70f70828d473fdc02b3903bbff8c43833aeb
 SHA1 (patch-ac) = 13a9b9c2dcd7f4121c0fd8ab693b9e769d475f38
 SHA1 (patch-ad) = 984fa51aff7d17ba69f3ea1c0b9cf4bbb70e3973
-SHA1 (patch-ae) = 75eb9410182c7c21d1090b02cc4bebc3739b1cb7
+SHA1 (patch-ae) = cf5ba9fce094f64d74d1c7295e2ff5e4b258f00f
 SHA1 (patch-af) = 9ac19813079a67c8f01ea5d2b3a85c309db00f95
-SHA1 (patch-ag) = cfb6127800ea749c67e1638d5a4b23c7650a0c17
+SHA1 (patch-ag) = fc8ff7957dffaaceaee16b3f8c0b7cd7abc122b9
 SHA1 (patch-ah) = 90ba05b735295caa1ce6974ac5d7c1d35799c49f
 SHA1 (patch-ai) = 76c15330b3f3ba3c9d7442d98ea461e6b89ce33d
 SHA1 (patch-aj) = f2b4c3d70c309a5221fea0d6ff008a597c9f8411
diff --git a/www/screws/patches/patch-ab b/www/screws/patches/patch-ab
index 54eaacbb632..b8a8f059c43 100644
--- a/www/screws/patches/patch-ab
+++ b/www/screws/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2006/01/10 18:28:06 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2013/10/20 17:48:26 joerg Exp $
 
 --- src/Server/Makefile.orig	Mon Nov 22 01:04:00 2004
 +++ src/Server/Makefile	Mon Nov 22 01:04:44 2004
@@ -9,7 +9,7 @@ $NetBSD: patch-ab,v 1.3 2006/01/10 18:28:06 joerg Exp $
 -	"NetBSD"|"FreeBSD"|"OpenBSD") \
 -	 echo -L/usr/pkg/lib -lssl -lcrypto >> .opts ;; \
 +	"NetBSD"|"FreeBSD"|"OpenBSD"|"DragonFly") \
-+	 echo -L${PREFIX}/lib -R${PREFIX}/lib -lssl -lcrypto >> .opts ;; \
++	 echo -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lssl -lcrypto >> .opts ;; \
  	*) \
  	 echo -lssl >> .opts ; esac ; fi
  	@if [ "`uname`" = "Linux" ]; then echo " * USE_DLOPEN" ; \
diff --git a/www/screws/patches/patch-ae b/www/screws/patches/patch-ae
index a2a29ae9469..5133b713599 100644
--- a/www/screws/patches/patch-ae
+++ b/www/screws/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.4 2008/08/17 20:09:12 dholland Exp $
+$NetBSD: patch-ae,v 1.5 2013/10/20 17:48:26 joerg Exp $
 
 --- src/Hsml/Makefile.orig	2004-11-08 17:41:48.000000000 -0500
 +++ src/Hsml/Makefile	2008-08-17 15:34:05.000000000 -0400
@@ -27,7 +27,7 @@ $NetBSD: patch-ae,v 1.4 2008/08/17 20:09:12 dholland Exp $
  opts:
  	echo > .opts
 -	if [ "${INCORE_LUA}" = "1" ]; then echo "-llualib -L /usr/pkg/lib -R /usr/pkg/lib -llua -lm " > .opts ; \
-+	if [ "${INCORE_LUA}" = "1" ]; then echo "-L /usr/pkg/lib -R /usr/pkg/lib -llua -lm " > .opts ; \
++	if [ "${INCORE_LUA}" = "1" ]; then echo "-L /usr/pkg/lib ${COMPILER_RPATH_FLAG}/usr/pkg/lib -llua -lm " > .opts ; \
  	else echo "" > .opts ; fi
  	if [ "`uname`" = "Linux" ]; then echo " -ldl " >> .opts ; fi
  
diff --git a/www/screws/patches/patch-ag b/www/screws/patches/patch-ag
index e95f23df78e..82f9387dfb0 100644
--- a/www/screws/patches/patch-ag
+++ b/www/screws/patches/patch-ag
@@ -1,16 +1,18 @@
-$NetBSD: patch-ag,v 1.2 2008/08/17 20:09:12 dholland Exp $
+$NetBSD: patch-ag,v 1.3 2013/10/20 17:48:26 joerg Exp $
 
 --- src/Modules/Makefile.orig	2004-09-16 18:05:58.000000000 -0400
 +++ src/Modules/Makefile	2008-08-17 15:31:09.000000000 -0400
-@@ -5,6 +5,7 @@ HSMLEXEC_MOD=HsmlExec.so
+@@ -5,15 +5,16 @@ HSMLEXEC_MOD=HsmlExec.so
  HSMLEXEC_OBJS=HsmlExec.o ../Hsml/Cache.o ../Hsml/Headers.o ../Hsml/SubLang.o
  CFLAGS+=${DEFS}
  CFLAGS+=-I/usr/pkg/include 
 +PICFLAGS?=-fPIC
  #libscrews.a
- LDFLAGS+=-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -L. 
+-LDFLAGS+=-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -L. 
++LDFLAGS+=${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib -L. 
  #-lscrews
-@@ -13,7 +14,7 @@ all: hsmlexec
+ 
+ all: hsmlexec
  	@if [ "${DLOPEN}" = "1" ]; then \
  	for A in $(MODS); do  \
  		echo "[modules] $$A.so";  \