svn commit: r525484 - in head: . security/nss security/nss/files
Li-Wen Hsu
lwhsu at FreeBSD.org
Fri Feb 7 13:32:01 UTC 2020
Author: lwhsu
Date: Fri Feb 7 13:32:00 2020
New Revision: 525484
URL: https://svnweb.freebsd.org/changeset/ports/525484
Log:
Reduce the duplicated 'nss' in include and lib path
From jbeich:
This appeared after r78824 which failed to adjust do-install. Arch, Debian,
Gentoo, OpenBSD use include/nss/, Fedora uses include/nss3/, NetBSD/PkgSrc
uses include/nss/nss/.
PR: 243835
Reviewed by: jbeich
Differential Revision: https://reviews.freebsd.org/D23424
Modified:
head/UPDATING
head/security/nss/Makefile
head/security/nss/files/nss-config.in
head/security/nss/files/nss.pc.in
head/security/nss/pkg-plist
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Fri Feb 7 13:27:35 2020 (r525483)
+++ head/UPDATING Fri Feb 7 13:32:00 2020 (r525484)
@@ -5,6 +5,13 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20200207:
+ AFFECTS: users of security/nss
+ AUTHOR: lwhsu at FreeBSD.org
+
+ NSS header files and libraries have been moved from ${PREFIX}/include/nss/nss
+ and ${PREFIX}/lib/nss to ${PREFIX}/include/nss and ${PREFIX}/lib
+
20200204:
AFFECTS: users of editors/vim
AUTHOR: adamw at FreeBSD.org
Modified: head/security/nss/Makefile
==============================================================================
--- head/security/nss/Makefile Fri Feb 7 13:27:35 2020 (r525483)
+++ head/security/nss/Makefile Fri Feb 7 13:32:00 2020 (r525484)
@@ -3,6 +3,7 @@
PORTNAME= nss
PORTVERSION= 3.49.2
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
@@ -85,13 +86,13 @@ post-patch:
${XARGS} ${REINPLACE_CMD} -e 's|"nspr.h"|<nspr.h>|'
do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/include/nss/nss ${STAGEDIR}${PREFIX}/lib/nss
+ ${MKDIR} ${STAGEDIR}${PREFIX}/include/nss ${STAGEDIR}${PREFIX}/lib
${FIND} ${DIST}/public/nss -type l \
- -exec ${INSTALL_DATA} {} ${STAGEDIR}${PREFIX}/include/nss/nss \;
+ -exec ${INSTALL_DATA} {} ${STAGEDIR}${PREFIX}/include/nss \;
${INSTALL_LIB} ${BINS}/lib/*.so \
- ${STAGEDIR}${PREFIX}/lib/nss
+ ${STAGEDIR}${PREFIX}/lib/
${INSTALL_DATA} ${BINS}/lib/libcrmf.a \
- ${STAGEDIR}${PREFIX}/lib/nss
+ ${STAGEDIR}${PREFIX}/lib/
.for bin in ${INSTALL_BINS}
${INSTALL_PROGRAM} ${BINS}/bin/${bin} \
${STAGEDIR}${PREFIX}/bin
Modified: head/security/nss/files/nss-config.in
==============================================================================
--- head/security/nss/files/nss-config.in Fri Feb 7 13:27:35 2020 (r525483)
+++ head/security/nss/files/nss-config.in Fri Feb 7 13:32:00 2020 (r525484)
@@ -101,10 +101,10 @@ if test -z "$exec_prefix"; then
exec_prefix=$prefix
fi
if test -z "$includedir"; then
- includedir=$prefix/include/nss
+ includedir=$prefix/include
fi
if test -z "$libdir"; then
- libdir=$prefix/lib/nss
+ libdir=$prefix/lib
fi
if test "$echo_prefix" = "yes"; then
@@ -142,5 +142,4 @@ if test "$echo_libs" = "yes"; then
libdirs="$libdirs -lnssutil3"
fi
echo $libdirs
-fi
-
+fi
Modified: head/security/nss/files/nss.pc.in
==============================================================================
--- head/security/nss/files/nss.pc.in Fri Feb 7 13:27:35 2020 (r525483)
+++ head/security/nss/files/nss.pc.in Fri Feb 7 13:32:00 2020 (r525484)
@@ -1,6 +1,6 @@
prefix=%%PREFIX%%
exec_prefix=%%PREFIX%%
-libdir=%%PREFIX%%/lib/nss
+libdir=%%PREFIX%%/lib
includedir=%%PREFIX%%/include
Name: NSS
@@ -8,4 +8,4 @@ Description: Mozilla Network Security Services
Version: %%PORTVERSION%%
Requires: nspr
Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lnssutil3
-Cflags: -I${includedir}/nss -I${includedir}/nss/nss
+Cflags: -I${includedir} -I${includedir}/nss
Modified: head/security/nss/pkg-plist
==============================================================================
--- head/security/nss/pkg-plist Fri Feb 7 13:27:35 2020 (r525483)
+++ head/security/nss/pkg-plist Fri Feb 7 13:32:00 2020 (r525484)
@@ -22,116 +22,116 @@ bin/strsclnt
bin/symkeyutil
bin/vfychain
bin/vfyserv
-include/nss/nss/sslexp.h
-include/nss/nss/base64.h
-include/nss/nss/blapit.h
-include/nss/nss/cert.h
-include/nss/nss/certdb.h
-include/nss/nss/certt.h
-include/nss/nss/ciferfam.h
-include/nss/nss/cmmf.h
-include/nss/nss/cmmft.h
-include/nss/nss/cms.h
-include/nss/nss/cmsreclist.h
-include/nss/nss/cmst.h
-include/nss/nss/crmf.h
-include/nss/nss/crmft.h
-include/nss/nss/cryptohi.h
-include/nss/nss/cryptoht.h
-include/nss/nss/eccutil.h
-include/nss/nss/ecl-exp.h
-include/nss/nss/hasht.h
-include/nss/nss/jar-ds.h
-include/nss/nss/jar.h
-include/nss/nss/jarfile.h
-include/nss/nss/key.h
-include/nss/nss/keyhi.h
-include/nss/nss/keyt.h
-include/nss/nss/keythi.h
-include/nss/nss/lowkeyi.h
-include/nss/nss/lowkeyti.h
-include/nss/nss/nss.h
-include/nss/nss/nssb64.h
-include/nss/nss/nssb64t.h
-include/nss/nss/nssbase.h
-include/nss/nss/nssbaset.h
-include/nss/nss/nssck.api
-include/nss/nss/nssckbi.h
-include/nss/nss/nssckepv.h
-include/nss/nss/nssckft.h
-include/nss/nss/nssckfw.h
-include/nss/nss/nssckfwc.h
-include/nss/nss/nssckfwt.h
-include/nss/nss/nssckg.h
-include/nss/nss/nssckmdt.h
-include/nss/nss/nssckt.h
-include/nss/nss/nssilckt.h
-include/nss/nss/nssilock.h
-include/nss/nss/nsslocks.h
-include/nss/nss/nsslowhash.h
-include/nss/nss/nssrwlk.h
-include/nss/nss/nssrwlkt.h
-include/nss/nss/nssutil.h
-include/nss/nss/ocsp.h
-include/nss/nss/ocspt.h
-include/nss/nss/p12.h
-include/nss/nss/p12plcy.h
-include/nss/nss/p12t.h
-include/nss/nss/pk11func.h
-include/nss/nss/pk11pqg.h
-include/nss/nss/pk11priv.h
-include/nss/nss/pk11pub.h
-include/nss/nss/pk11sdr.h
-include/nss/nss/pkcs11.h
-include/nss/nss/pkcs1sig.h
-include/nss/nss/pkcs11f.h
-include/nss/nss/pkcs11n.h
-include/nss/nss/pkcs11p.h
-include/nss/nss/pkcs11t.h
-include/nss/nss/pkcs11u.h
-include/nss/nss/pkcs11uri.h
-include/nss/nss/pkcs12.h
-include/nss/nss/pkcs12t.h
-include/nss/nss/pkcs7t.h
-include/nss/nss/portreg.h
-include/nss/nss/preenc.h
-include/nss/nss/secasn1.h
-include/nss/nss/secasn1t.h
-include/nss/nss/seccomon.h
-include/nss/nss/secder.h
-include/nss/nss/secdert.h
-include/nss/nss/secdig.h
-include/nss/nss/secdigt.h
-include/nss/nss/secerr.h
-include/nss/nss/sechash.h
-include/nss/nss/secitem.h
-include/nss/nss/secmime.h
-include/nss/nss/secmod.h
-include/nss/nss/secmodt.h
-include/nss/nss/secoid.h
-include/nss/nss/secoidt.h
-include/nss/nss/secpkcs5.h
-include/nss/nss/secpkcs7.h
-include/nss/nss/secport.h
-include/nss/nss/shsign.h
-include/nss/nss/smime.h
-include/nss/nss/ssl.h
-include/nss/nss/sslerr.h
-include/nss/nss/sslproto.h
-include/nss/nss/sslt.h
-include/nss/nss/utilmodt.h
-include/nss/nss/utilpars.h
-include/nss/nss/utilparst.h
-include/nss/nss/utilrename.h
-lib/nss/libcrmf.a
-lib/nss/libfreebl3.so
-lib/nss/libfreeblpriv3.so
-lib/nss/libnss3.so
- at comment lib/nss/libnssckbi-testlib.so
-lib/nss/libnssckbi.so
-lib/nss/libnssdbm3.so
-lib/nss/libnssutil3.so
-lib/nss/libsmime3.so
-lib/nss/libsoftokn3.so
-lib/nss/libssl3.so
+include/nss/sslexp.h
+include/nss/base64.h
+include/nss/blapit.h
+include/nss/cert.h
+include/nss/certdb.h
+include/nss/certt.h
+include/nss/ciferfam.h
+include/nss/cmmf.h
+include/nss/cmmft.h
+include/nss/cms.h
+include/nss/cmsreclist.h
+include/nss/cmst.h
+include/nss/crmf.h
+include/nss/crmft.h
+include/nss/cryptohi.h
+include/nss/cryptoht.h
+include/nss/eccutil.h
+include/nss/ecl-exp.h
+include/nss/hasht.h
+include/nss/jar-ds.h
+include/nss/jar.h
+include/nss/jarfile.h
+include/nss/key.h
+include/nss/keyhi.h
+include/nss/keyt.h
+include/nss/keythi.h
+include/nss/lowkeyi.h
+include/nss/lowkeyti.h
+include/nss/nss.h
+include/nss/nssb64.h
+include/nss/nssb64t.h
+include/nss/nssbase.h
+include/nss/nssbaset.h
+include/nss/nssck.api
+include/nss/nssckbi.h
+include/nss/nssckepv.h
+include/nss/nssckft.h
+include/nss/nssckfw.h
+include/nss/nssckfwc.h
+include/nss/nssckfwt.h
+include/nss/nssckg.h
+include/nss/nssckmdt.h
+include/nss/nssckt.h
+include/nss/nssilckt.h
+include/nss/nssilock.h
+include/nss/nsslocks.h
+include/nss/nsslowhash.h
+include/nss/nssrwlk.h
+include/nss/nssrwlkt.h
+include/nss/nssutil.h
+include/nss/ocsp.h
+include/nss/ocspt.h
+include/nss/p12.h
+include/nss/p12plcy.h
+include/nss/p12t.h
+include/nss/pk11func.h
+include/nss/pk11pqg.h
+include/nss/pk11priv.h
+include/nss/pk11pub.h
+include/nss/pk11sdr.h
+include/nss/pkcs11.h
+include/nss/pkcs1sig.h
+include/nss/pkcs11f.h
+include/nss/pkcs11n.h
+include/nss/pkcs11p.h
+include/nss/pkcs11t.h
+include/nss/pkcs11u.h
+include/nss/pkcs11uri.h
+include/nss/pkcs12.h
+include/nss/pkcs12t.h
+include/nss/pkcs7t.h
+include/nss/portreg.h
+include/nss/preenc.h
+include/nss/secasn1.h
+include/nss/secasn1t.h
+include/nss/seccomon.h
+include/nss/secder.h
+include/nss/secdert.h
+include/nss/secdig.h
+include/nss/secdigt.h
+include/nss/secerr.h
+include/nss/sechash.h
+include/nss/secitem.h
+include/nss/secmime.h
+include/nss/secmod.h
+include/nss/secmodt.h
+include/nss/secoid.h
+include/nss/secoidt.h
+include/nss/secpkcs5.h
+include/nss/secpkcs7.h
+include/nss/secport.h
+include/nss/shsign.h
+include/nss/smime.h
+include/nss/ssl.h
+include/nss/sslerr.h
+include/nss/sslproto.h
+include/nss/sslt.h
+include/nss/utilmodt.h
+include/nss/utilpars.h
+include/nss/utilparst.h
+include/nss/utilrename.h
+lib/libcrmf.a
+lib/libfreebl3.so
+lib/libfreeblpriv3.so
+lib/libnss3.so
+ at comment lib/libnssckbi-testlib.so
+lib/libnssckbi.so
+lib/libnssdbm3.so
+lib/libnssutil3.so
+lib/libsmime3.so
+lib/libsoftokn3.so
+lib/libssl3.so
libdata/pkgconfig/nss.pc
More information about the svn-ports-head
mailing list