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

[mcalhoun at macports.org]

Revision: 147860
          https://trac.macports.org/changeset/147860
Author:   mcalhoun at macports.org
Date:     2016-04-18 17:44:41 -0700 (Mon, 18 Apr 2016)
Log Message:
-----------
nss: no functional changes (comments, whitespace, and code order)

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

Modified: trunk/dports/net/nss/Portfile
===================================================================
--- trunk/dports/net/nss/Portfile	2016-04-19 00:34:43 UTC (rev 147859)
+++ trunk/dports/net/nss/Portfile	2016-04-19 00:44:41 UTC (rev 147860)
@@ -41,6 +41,7 @@
 universal_variant no
 
 post-patch {
+    # libraries are not relative to any main executable, so no need for @executable_path
     reinplace "s|@executable_path|${prefix}/lib/nss|g" \
         ${worksrcpath}/mozilla/security/coreconf/Darwin.mk \
         ${worksrcpath}/mozilla/security/nss/lib/freebl/config.mk
@@ -85,26 +86,28 @@
 
     xinstall -m 755 -d ${destroot}${prefix}/lib/pkgconfig
 
-    xinstall ${filespath}/nss.pc.in ${destroot}${prefix}/lib/pkgconfig/nss.pc
-    xinstall -m 755 ${filespath}/nss-config.in ${destroot}${prefix}/bin/nss-config
+    # applications seem to expect an nss-config executable and nss.pc file, but nss does not provide them
+    # see https://bugzilla.mozilla.org/show_bug.cgi?id=530672
 
-    reinplace "s, at libdir@,${prefix}/lib/nss,g" ${destroot}${prefix}/bin/nss-config
-    reinplace "s, at prefix@,${prefix},g" ${destroot}${prefix}/bin/nss-config
-    reinplace "s, at exec_prefix@,${prefix},g" ${destroot}${prefix}/bin/nss-config
+    xinstall  -m 0755 ${filespath}/nss-config.in       ${destroot}${prefix}/bin/nss-config
+    reinplace "s, at libdir@,${prefix}/lib/nss,g"         ${destroot}${prefix}/bin/nss-config
+    reinplace "s, at prefix@,${prefix},g"                 ${destroot}${prefix}/bin/nss-config
+    reinplace "s, at exec_prefix@,${prefix},g"            ${destroot}${prefix}/bin/nss-config
     reinplace "s, at includedir@,${prefix}/include/nss,g" ${destroot}${prefix}/bin/nss-config
-    reinplace "s, at MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" ${destroot}${prefix}/bin/nss-config
-    reinplace "s, at MOD_MINOR_VERSION@,${NSS_VMINOR},g" ${destroot}${prefix}/bin/nss-config
-    reinplace "s, at MOD_PATCH_VERSION@,${NSS_VPATCH},g" ${destroot}${prefix}/bin/nss-config
+    reinplace "s, at MOD_MAJOR_VERSION@,${NSS_VMAJOR},g"  ${destroot}${prefix}/bin/nss-config
+    reinplace "s, at MOD_MINOR_VERSION@,${NSS_VMINOR},g"  ${destroot}${prefix}/bin/nss-config
+    reinplace "s, at MOD_PATCH_VERSION@,${NSS_VPATCH},g"  ${destroot}${prefix}/bin/nss-config
 
     set nspr_version [exec ${prefix}/bin/nspr-config --version]
-    set nss_version [exec ${destroot}${prefix}/bin/nss-config --version]
+    set nss_version  [exec ${destroot}${prefix}/bin/nss-config --version]
 
-    reinplace "s, at libdir@,${prefix}/lib/nss,g" ${destroot}${prefix}/lib/pkgconfig/nss.pc
-    reinplace "s, at prefix@,${prefix},g" ${destroot}${prefix}/lib/pkgconfig/nss.pc
-    reinplace "s, at exec_prefix@,${prefix},g" ${destroot}${prefix}/lib/pkgconfig/nss.pc
+    xinstall  ${filespath}/nss.pc.in                  ${destroot}${prefix}/lib/pkgconfig/nss.pc
+    reinplace "s, at libdir@,${prefix}/lib/nss,g"        ${destroot}${prefix}/lib/pkgconfig/nss.pc
+    reinplace "s, at prefix@,${prefix},g"                ${destroot}${prefix}/lib/pkgconfig/nss.pc
+    reinplace "s, at exec_prefix@,${prefix},g"           ${destroot}${prefix}/lib/pkgconfig/nss.pc
     reinplace "s, at includedir@,${prefix}/include/nss," ${destroot}${prefix}/lib/pkgconfig/nss.pc
-    reinplace "s, at NSPR_VERSION@,${nspr_version},g"  ${destroot}${prefix}/lib/pkgconfig/nss.pc
-    reinplace "s, at NSS_VERSION@,${nss_version},g" ${destroot}${prefix}/lib/pkgconfig/nss.pc
+    reinplace "s, at NSPR_VERSION@,${nspr_version},g"    ${destroot}${prefix}/lib/pkgconfig/nss.pc
+    reinplace "s, at NSS_VERSION@,${nss_version},g"      ${destroot}${prefix}/lib/pkgconfig/nss.pc
 }
 
 livecheck.type    regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160418/b89928e4/attachment.html>