summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorriz <riz>2006-11-20 17:06:03 +0000
committerriz <riz>2006-11-20 17:06:03 +0000
commit9305f915597eab807027925ec89f23b50b57109c (patch)
treeef602c64e5dcdbfcb11f6a5158c3eb3280bc5be6
parent7a47bf1148fed4f3f3f33ae087b74191754926dd (diff)
downloadpkgsrc-9305f915597eab807027925ec89f23b50b57109c.tar.gz
Fix up DYLD_LIBRARY_PATH so that MacOS X looks for nspr in the correct
place.
-rw-r--r--devel/nss/distinfo4
-rw-r--r--devel/nss/patches/patch-ag13
2 files changed, 10 insertions, 7 deletions
diff --git a/devel/nss/distinfo b/devel/nss/distinfo
index 686e8ea1d35..ca8d16dcc0d 100644
--- a/devel/nss/distinfo
+++ b/devel/nss/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2006/10/22 15:32:47 dmcmahill Exp $
+$NetBSD: distinfo,v 1.16 2006/11/20 17:06:03 riz Exp $
SHA1 (nss-3.11.tar.gz) = 0abccde9a351fb9fa662c75754eb980e04fad482
RMD160 (nss-3.11.tar.gz) = 90be4b42e490084c23451ce8abcf089150357d1e
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = d2b5f4213c35e667866279f398fe9297232d27d1
SHA1 (patch-ab) = 371e04afd51d4182a1324cbd04c1d93bdbb8949a
SHA1 (patch-ae) = 1f4982d77ddf7dbf708ebc5a1737345010dddbf9
SHA1 (patch-af) = c0e5a68911eb6503224c569552a5e94cfa036364
-SHA1 (patch-ag) = a25943a7df9093a8eb67515b0bb0eb73955ece45
+SHA1 (patch-ag) = ead4d79ac6ebe718230ce47fb3e296b2b4f7584b
SHA1 (patch-ah) = 01e8644a0a1dfc70985aed213fc753f376560865
SHA1 (patch-ai) = 995add5e536bb0fba425295cc7972b8725f4e10d
SHA1 (patch-ak) = 4816bf73acfa3edcd0a74d0e235eee7974b42dd6
diff --git a/devel/nss/patches/patch-ag b/devel/nss/patches/patch-ag
index 311f6297c92..9c13cb6bf3e 100644
--- a/devel/nss/patches/patch-ag
+++ b/devel/nss/patches/patch-ag
@@ -1,13 +1,16 @@
-$NetBSD: patch-ag,v 1.3 2006/07/12 16:30:04 rillig Exp $
+$NetBSD: patch-ag,v 1.4 2006/11/20 17:06:03 riz Exp $
---- mozilla/security/nss/cmd/shlibsign/sign.sh.orig 2005-11-16 03:17:36.000000000 +0100
-+++ mozilla/security/nss/cmd/shlibsign/sign.sh 2006-07-12 17:51:33.000000000 +0200
-@@ -44,7 +44,7 @@ OpenVMS)
+--- mozilla/security/nss/cmd/shlibsign/sign.sh.orig 2005-11-15 18:17:36.000000000 -0800
++++ mozilla/security/nss/cmd/shlibsign/sign.sh 2006-11-20 00:34:34.000000000 -0800
+@@ -44,9 +44,9 @@
export LIBPATH
SHLIB_PATH=${1}/lib:${4}:$SHLIB_PATH
export SHLIB_PATH
- LD_LIBRARY_PATH=${1}/lib:${4}:$LD_LIBRARY_PATH
+ LD_LIBRARY_PATH=${1}/lib:${4}:$PREFIX/lib
export LD_LIBRARY_PATH
- DYLD_LIBRARY_PATH=${1}/lib:${4}:$DYLD_LIBRARY_PATH
+- DYLD_LIBRARY_PATH=${1}/lib:${4}:$DYLD_LIBRARY_PATH
++ DYLD_LIBRARY_PATH=${1}/lib:${4}:$PREFIX/lib/nspr:$DYLD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
+ LIBRARY_PATH=${1}/lib:${4}:$LIBRARY_PATH
+ export LIBRARY_PATH