diff options
author | joerg <joerg@pkgsrc.org> | 2013-10-20 18:15:32 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-10-20 18:15:32 +0000 |
commit | ea1f42f4c5d7732f103e2ff09ba59f8094c2ca33 (patch) | |
tree | 7d33f7c2b8fb9f886661f6c8df0d7d1c40a04702 /editors | |
parent | b63ac157af9cdc747be96df6251f97d154cfd812 (diff) | |
download | pkgsrc-ea1f42f4c5d7732f103e2ff09ba59f8094c2ca33.tar.gz |
Fix rpath options.
Diffstat (limited to 'editors')
-rw-r--r-- | editors/elvis/distinfo | 4 | ||||
-rw-r--r-- | editors/elvis/patches/patch-ab | 20 |
2 files changed, 21 insertions, 3 deletions
diff --git a/editors/elvis/distinfo b/editors/elvis/distinfo index 27c538f77aa..dce1aa98b2f 100644 --- a/editors/elvis/distinfo +++ b/editors/elvis/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2009/10/03 10:13:36 ahoka Exp $ +$NetBSD: distinfo,v 1.10 2013/10/20 18:15:32 joerg Exp $ SHA1 (elvis-2.2_0.tar.gz) = 8c16574b6d36529735b8ced70972ddaf6275a477 RMD160 (elvis-2.2_0.tar.gz) = 9867a3941a84a3db0bcfe4e36dd14132fbcf5805 Size (elvis-2.2_0.tar.gz) = 1439293 bytes -SHA1 (patch-ab) = 285a3a5728a8f26af4741361b3d0bf159043c402 +SHA1 (patch-ab) = 9bc99e5f13926e5c2d8570c88526249e5a449203 SHA1 (patch-ac) = a866461c14dd7518f2ee5790a366a5eb7ffbee3c SHA1 (patch-ad) = 702b08ec1182c3673721de62690a3a7c32983b8a SHA1 (patch-ae) = 2a8eb92b44fa932fcc51e7af999f1363dd53ff74 diff --git a/editors/elvis/patches/patch-ab b/editors/elvis/patches/patch-ab index 6292aeca1a1..f3efc569bae 100644 --- a/editors/elvis/patches/patch-ab +++ b/editors/elvis/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2008/04/22 16:23:57 jlam Exp $ +$NetBSD: patch-ab,v 1.4 2013/10/20 18:15:32 joerg Exp $ --- configure.orig 2003-10-20 22:32:25.000000000 -0400 +++ configure @@ -67,6 +67,24 @@ $NetBSD: patch-ab,v 1.3 2008/04/22 16:23:57 jlam Exp $ --prefix=*) PREFIX=`echo "$i"|sed 's/^--prefix=//'` args="$args $i" +@@ -726,7 +733,7 @@ case "$SYS" in + if [ "$GUI_X11" = "define" ] + then + xlibdir=`dirname "$xlib"` +- XLIBS=" -R$xlibdir$XLIBS" ++ XLIBS=" ${COMPILER_RPATH_FLAG}$xlibdir$XLIBS" + fi + if [ -f /usr/ccs/lib/libtermcap.a ] + then +@@ -804,7 +811,7 @@ case "$SYS" in + if [ "$GUI_X11" = "define" ] + then + xlibdir=`dirname "$xlib"` +- XLIBS=" -R$xlibdir$XLIBS" ++ XLIBS=" ${COMPILER_RPATH_FLAG}$xlibdir$XLIBS" + fi + ;; + @@ -886,6 +893,7 @@ echo "Compiler: $CC" echo "Bin dir: "`echo "$BINDIR" |sed s,'$(PREFIX)',"$PREFIX",` echo "Data dir: "`echo "$DATADIR"|sed s,'$(PREFIX)',"$PREFIX",` |