Changeset 147860 for trunk


Ignore:
Timestamp:
Apr 19, 2016, 12:44:41 AM (4 years ago)
Author:
mcalhoun@…
Message:

nss: no functional changes (comments, whitespace, and code order)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/net/nss/Portfile

    r147859 r147860  
    4242
    4343post-patch {
     44    # libraries are not relative to any main executable, so no need for @executable_path
    4445    reinplace "s|@executable_path|${prefix}/lib/nss|g" \
    4546        ${worksrcpath}/mozilla/security/coreconf/Darwin.mk \
     
    8687    xinstall -m 755 -d ${destroot}${prefix}/lib/pkgconfig
    8788
    88     xinstall ${filespath}/nss.pc.in ${destroot}${prefix}/lib/pkgconfig/nss.pc
    89     xinstall -m 755 ${filespath}/nss-config.in ${destroot}${prefix}/bin/nss-config
     89    # applications seem to expect an nss-config executable and nss.pc file, but nss does not provide them
     90    # see https://bugzilla.mozilla.org/show_bug.cgi?id=530672
    9091
    91     reinplace "s,@libdir@,${prefix}/lib/nss,g" ${destroot}${prefix}/bin/nss-config
    92     reinplace "s,@prefix@,${prefix},g" ${destroot}${prefix}/bin/nss-config
    93     reinplace "s,@exec_prefix@,${prefix},g" ${destroot}${prefix}/bin/nss-config
     92    xinstall  -m 0755 ${filespath}/nss-config.in       ${destroot}${prefix}/bin/nss-config
     93    reinplace "s,@libdir@,${prefix}/lib/nss,g"         ${destroot}${prefix}/bin/nss-config
     94    reinplace "s,@prefix@,${prefix},g"                 ${destroot}${prefix}/bin/nss-config
     95    reinplace "s,@exec_prefix@,${prefix},g"            ${destroot}${prefix}/bin/nss-config
    9496    reinplace "s,@includedir@,${prefix}/include/nss,g" ${destroot}${prefix}/bin/nss-config
    95     reinplace "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" ${destroot}${prefix}/bin/nss-config
    96     reinplace "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" ${destroot}${prefix}/bin/nss-config
    97     reinplace "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" ${destroot}${prefix}/bin/nss-config
     97    reinplace "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g"  ${destroot}${prefix}/bin/nss-config
     98    reinplace "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g"  ${destroot}${prefix}/bin/nss-config
     99    reinplace "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g"  ${destroot}${prefix}/bin/nss-config
    98100
    99101    set nspr_version [exec ${prefix}/bin/nspr-config --version]
    100     set nss_version [exec ${destroot}${prefix}/bin/nss-config --version]
     102    set nss_version  [exec ${destroot}${prefix}/bin/nss-config --version]
    101103
    102     reinplace "s,@libdir@,${prefix}/lib/nss,g" ${destroot}${prefix}/lib/pkgconfig/nss.pc
    103     reinplace "s,@prefix@,${prefix},g" ${destroot}${prefix}/lib/pkgconfig/nss.pc
    104     reinplace "s,@exec_prefix@,${prefix},g" ${destroot}${prefix}/lib/pkgconfig/nss.pc
     104    xinstall  ${filespath}/nss.pc.in                  ${destroot}${prefix}/lib/pkgconfig/nss.pc
     105    reinplace "s,@libdir@,${prefix}/lib/nss,g"        ${destroot}${prefix}/lib/pkgconfig/nss.pc
     106    reinplace "s,@prefix@,${prefix},g"                ${destroot}${prefix}/lib/pkgconfig/nss.pc
     107    reinplace "s,@exec_prefix@,${prefix},g"           ${destroot}${prefix}/lib/pkgconfig/nss.pc
    105108    reinplace "s,@includedir@,${prefix}/include/nss," ${destroot}${prefix}/lib/pkgconfig/nss.pc
    106     reinplace "s,@NSPR_VERSION@,${nspr_version},g"  ${destroot}${prefix}/lib/pkgconfig/nss.pc
    107     reinplace "s,@NSS_VERSION@,${nss_version},g" ${destroot}${prefix}/lib/pkgconfig/nss.pc
     109    reinplace "s,@NSPR_VERSION@,${nspr_version},g"    ${destroot}${prefix}/lib/pkgconfig/nss.pc
     110    reinplace "s,@NSS_VERSION@,${nss_version},g"      ${destroot}${prefix}/lib/pkgconfig/nss.pc
    108111}
    109112
Note: See TracChangeset for help on using the changeset viewer.