From 8e3abdaab29314f8565485fb9ae6d4e07098d90a Mon Sep 17 00:00:00 2001 From: kili Date: Fri, 8 Dec 2006 19:21:30 +0000 Subject: [PATCH] Remove all static libraries except libcrmf.a, since some of them conflict with libraries in /usr/lib. Mark the port SHARED_ONLY. From maintainer, after some discussions with kurt@ and me. ok kurt@ --- security/nss/Makefile | 10 +++++----- security/nss/pkg/PLIST | 22 +--------------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/security/nss/Makefile b/security/nss/Makefile index 243cb7562b2..e038015e2a1 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -1,9 +1,12 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2006/12/04 17:19:54 kurt Exp $ +# $OpenBSD: Makefile,v 1.2 2006/12/08 19:21:30 kili Exp $ + +SHARED_ONLY= Yes COMMENT= "libraries to support development of security-enabled apps" VERSION= 3.11.4 DISTNAME= nss-${VERSION} +PKGNAME= ${DISTNAME}p0 SO_VERSION= 18.0 .for _lib in freebl3 nss3 nssckbi smime3 softokn3 ssl3 SHARED_LIBS+= ${_lib} ${SO_VERSION} @@ -49,15 +52,12 @@ do-install: @cd ${NSSOBJ}/lib && ${TAR} -chf - *.so.${SO_VERSION} | \ ${TAR} -xf - -C ${PREFIX}/lib @chmod 444 ${PREFIX}/lib/*.so.${SO_VERSION} - ${INSTALL_DATA} ${NSSOBJ}/lib/*.{chk,a} ${PREFIX}/lib/ + ${INSTALL_DATA} ${NSSOBJ}/lib/{libcrmf.a,*.chk} ${PREFIX}/lib/ ${INSTALL_PROGRAM} ${NSSOBJ}/bin/* ${PREFIX}/bin/ ${INSTALL_SCRIPT} ${FILESDIR}/nss-config ${PREFIX}/bin/ ${INSTALL_DATA} ${FILESDIR}/nss.pc ${PREFIX}/lib/pkgconfig/ @perl -pi -e 's|!!PREFIX!!|${TRUEPREFIX}|g; s|!!VERSION!!|${VERSION}|g' \ ${PREFIX}/bin/nss-config ${PREFIX}/lib/pkgconfig/nss.pc -# unknown manpage type -# ${INSTALL_MAN} ${WRKSRC}/cmd/symkeyutil/symkey.man \ -# ${PREFIX}/man/man1/symkeyutil.1 do-regress: cd ${WRKSRC}/tests && ${SETENV} PATH="${NSSOBJ}/bin:${PATH}" \ diff --git a/security/nss/pkg/PLIST b/security/nss/pkg/PLIST index cf7fb092d06..b5b2af9e3f3 100644 --- a/security/nss/pkg/PLIST +++ b/security/nss/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2006/12/04 17:19:54 kurt Exp $ +@comment $OpenBSD: PLIST,v 1.2 2006/12/08 19:21:30 kili Exp $ %%SHARED%% bin/addbuiltin @comment bin/atob @@ -131,28 +131,8 @@ include/nss/sslerr.h include/nss/sslproto.h include/nss/sslt.h include/nss/watcomfx.h -lib/libasn1.a -lib/libcertdb.a -lib/libcerthi.a lib/libcrmf.a -lib/libcryptohi.a -lib/libdbm.a -lib/libfreebl.a lib/libfreebl3.chk -lib/libjar.a -lib/libnss.a -lib/libnssb.a -lib/libnssckfw.a -lib/libnssdev.a -lib/libnsspki.a -lib/libpk11wrap.a -lib/libpkcs12.a -lib/libpkcs7.a -lib/libsectool.a -lib/libsecutil.a -lib/libsmime.a -lib/libsoftokn.a lib/libsoftokn3.chk -lib/libssl.a lib/pkgconfig/ lib/pkgconfig/nss.pc