[49081] trunk/dports/net/nss/Portfile

[jeremyhu at macports.org]

Revision: 49081
          http://trac.macports.org/changeset/49081
Author:   jeremyhu at macports.org
Date:     2009-04-03 00:48:13 -0700 (Fri, 03 Apr 2009)
Log Message:
-----------
nss: revision bump to put nss in its own dir.  This allows firefox to dlopen it without requiring all of /opt/local/lib to be in DYLD_LIBRARY_PATH and is what other distros have done to work around the issue...

Modified Paths:
--------------
    trunk/dports/net/nss/Portfile

Modified: trunk/dports/net/nss/Portfile
===================================================================
--- trunk/dports/net/nss/Portfile	2009-04-03 07:48:00 UTC (rev 49080)
+++ trunk/dports/net/nss/Portfile	2009-04-03 07:48:13 UTC (rev 49081)
@@ -7,6 +7,7 @@
 set NSS_VMAJOR 3
 set NSS_VMINOR 12
 set NSS_VPATCH 0
+revision        1
 categories	net
 maintainers	jeremyhu openmaintainer
 description	Network Security Service libraries.
@@ -36,7 +37,7 @@
 		patch-Darwin.mk.diff
 
 post-patch {
-        reinplace "s|@executable_path|${prefix}/lib|g" \
+        reinplace "s|@executable_path|${prefix}/lib/nss|g" \
 		${worksrcpath}/mozilla/security/coreconf/Darwin.mk \
 		${worksrcpath}/mozilla/security/nss/cmd/platlibs.mk \
 		${worksrcpath}/mozilla/security/nss/lib/smime/config.mk \
@@ -53,7 +54,7 @@
 		${worksrcpath}/mozilla/security/coreconf/Darwin.mk
 }
 
-build {system "cd ${worksrcdir} && make -C mozilla/security/coreconf/nsinstall && make -C mozilla/security/dbm && make -C mozilla/security/nss"}
+build {system "cd ${worksrcdir} && make -C mozilla/security/coreconf/nsinstall && make -C mozilla/security/dbm && make -C mozilla/security/nss NSPR_LIB_DIR=${prefix}/lib/nspr NSS_USE_SYSTEM_SQLITE=1"}
 
 destroot {
 	xinstall -m 755 -d ${destroot}${prefix}/include/nss
@@ -63,10 +64,9 @@
 	foreach f [glob ${worksrcpath}/mozilla/dist/Darwin*/bin/*] {
 		xinstall -m 755 $f ${destroot}${prefix}/bin/nss-[file tail $f]
 	}
-	xinstall -m 755 -d ${destroot}${prefix}/lib
-	eval xinstall -m 755 [glob ${worksrcpath}/mozilla/dist/Darwin*/lib/*.dylib] ${destroot}${prefix}/lib
-	eval xinstall -m 644 [glob ${worksrcpath}/mozilla/dist/Darwin*/lib/libcrmf.a] ${destroot}${prefix}/lib
-	eval delete [glob ${destroot}${prefix}/lib/libsqlite*]
+	xinstall -m 755 -d ${destroot}${prefix}/lib/nss
+	eval xinstall -m 755 [glob ${worksrcpath}/mozilla/dist/Darwin*/lib/*.dylib] ${destroot}${prefix}/lib/nss
+	eval xinstall -m 644 [glob ${worksrcpath}/mozilla/dist/Darwin*/lib/libcrmf.a] ${destroot}${prefix}/lib/nss
 
 	xinstall -m 755 -d ${destroot}${prefix}/lib/pkgconfig
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090403/c2bb144c/attachment.html>