summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--shells/fish/distinfo4
-rw-r--r--shells/fish/patches/patch-configure11
2 files changed, 12 insertions, 3 deletions
diff --git a/shells/fish/distinfo b/shells/fish/distinfo
index 4f1d8e32fc6..9a035b832b6 100644
--- a/shells/fish/distinfo
+++ b/shells/fish/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1 2012/12/12 13:21:42 wiz Exp $
+$NetBSD: distinfo,v 1.2 2013/10/20 17:53:26 joerg Exp $
SHA1 (fish-1.23.1.tar.gz) = 7b839ffc5b260f1bd1782e4adf84300f5438f833
RMD160 (fish-1.23.1.tar.gz) = b77fe7ffec4ae52b82c1c86b2dc7037306c5fede
Size (fish-1.23.1.tar.gz) = 1152997 bytes
SHA1 (patch-Makefile.in) = d92c531cb15e511f1a712d98a64e222b3316fcdd
-SHA1 (patch-configure) = 3d4cd5ed6cff65768f4f99ae196449e01d3f7ef1
+SHA1 (patch-configure) = 40a27c297ec56bdba7f34ff6f18a415ae88b504d
SHA1 (patch-proc.h) = 7ac0b704f6ee1b1e966f0bfdc87dfa1e23e9c338
SHA1 (patch-screen.c) = eae536bb965bd2a236a5cd3ff44e5ddbeb24f519
diff --git a/shells/fish/patches/patch-configure b/shells/fish/patches/patch-configure
index f756c2d2f31..928c4c115c8 100644
--- a/shells/fish/patches/patch-configure
+++ b/shells/fish/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.1 2012/12/12 13:21:42 wiz Exp $
+$NetBSD: patch-configure,v 1.2 2013/10/20 17:53:26 joerg Exp $
Expand variable where it's defined
@@ -13,3 +13,12 @@ Expand variable where it's defined
infodir='${datarootdir}/info'
htmldir='${docdir}'
dvidir='${docdir}'
+@@ -1848,7 +1848,7 @@ echo $ECHO_N "checking for $i/lib librar
+ if test -d $i/lib; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+- LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/"
++ LDFLAGS="$LDFLAGS -L$i/lib/ ${COMPILER_RPATH_FLAG}$i/lib/"
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }