Only install what's necessary for ports that depend on nss. This avoids

library conflicts and file CONFLICTS.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8051 df743ca5-7f9a-e211-a948-0013205c9059

2 files changed, 18 insertions, 42 deletions

diff --git a/security/nss/Makefile b/security/nss/Makefile
index 61297e6de..c1a8920bd 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/security/nss/Makefile,v 1.4 2006/12/09 16:59:42 ahze Exp $
+#    $MCom: ports/security/nss/Makefile,v 1.5 2006/12/17 18:42:25 ahze Exp $
 
 PORTNAME=	nss
 PORTVERSION=	${_MAJOR}.${_MINOR}.${_PATCH}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
@@ -15,13 +15,13 @@ MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Libraries to support development of security-enabled applications
 
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+LIB_DEPENDS=	nspr4.1:${PORTSDIR}/devel/nspr
+
 _MAJOR=	3
 _MINOR=	11
 _PATCH=	4
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	nspr4.1:${PORTSDIR}/devel/nspr
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/mozilla/security/nss
 
 USE_LDCONFIG=	${PREFIX}/lib/nss
@@ -46,6 +46,11 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf -	\
 
 BINS=${DIST}/${OPSYS}${OSREL}_OPT.OBJ
 
+INSTALL_BINS=	certcgi certutil checkcert cmsutil crlutil derdump makepqg \
+		mangle modutil ocspclnt oidcalc p7content p7env p7sign \
+		p7verify pk12util rsaperf shlibsign signtool signver \
+		ssltap strsclnt symkeyutil vfychain vfyserv
+
 test:
 	cd ${WRKSRC}/tests;	\
 		${SETENV} PATH="${BINS}/bin:${PATH}" \
@@ -77,10 +82,16 @@ do-install:
 	${MKDIR} ${PREFIX}/include/nss ${PREFIX}/lib/nss
 	${TAR} -C ${DIST}/public --dereference -cf - . | \
 		${TAR} -C ${PREFIX}/include/nss -xf -
-	${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/* \
+	${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/*.so.1 \
 		${PREFIX}/lib/nss
-	${INSTALL_PROGRAM} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/bin/* \
+	${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/libcrmf.a \
+	    	${PREFIX}/lib/nss
+.for bin in ${INSTALL_BINS}
+	${INSTALL_PROGRAM} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/bin/${bin} \
 		${PREFIX}/bin
+.endfor
+	cd ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib && \
+	    	${TAR} -cf - *.so | ${TAR} --unlink -C ${PREFIX}/lib/nss -xf -
 	${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/nss.pc ${PREFIX}/libdata/pkgconfig
 
diff --git a/security/nss/pkg-plist b/security/nss/pkg-plist
index e19cb7c12..cc12145c7 100644
--- a/security/nss/pkg-plist
+++ b/security/nss/pkg-plist
@@ -1,18 +1,9 @@
-bin/addbuiltin
-bin/atob
-bin/bltest
-bin/btoa
 bin/certcgi
 bin/certutil
 bin/checkcert
-bin/client
 bin/cmsutil
 bin/crlutil
-bin/crmftest
-bin/dbtest
 bin/derdump
-bin/digest
-bin/fipstest
 bin/makepqg
 bin/mangle
 bin/modutil
@@ -24,18 +15,13 @@ bin/p7env
 bin/p7sign
 bin/p7verify
 bin/pk12util
-bin/pp
 bin/rsaperf
-bin/sdrtest
-bin/selfserv
-bin/server
 bin/shlibsign
 bin/signtool
 bin/signver
 bin/ssltap
 bin/strsclnt
 bin/symkeyutil
-bin/tstclnt
 bin/vfychain
 bin/vfyserv
 include/nss/nss/base64.h
@@ -128,38 +114,17 @@ include/nss/nss/sslerr.h
 include/nss/nss/sslproto.h
 include/nss/nss/sslt.h
 include/nss/nss/watcomfx.h
-lib/nss/libasn1.a
-lib/nss/libcertdb.a
-lib/nss/libcerthi.a
 lib/nss/libcrmf.a
-lib/nss/libcryptohi.a
-lib/nss/libfreebl.a
-lib/nss/libfreebl3.chk
 lib/nss/libfreebl3.so
 lib/nss/libfreebl3.so.1
-lib/nss/libjar.a
-lib/nss/libnss.a
 lib/nss/libnss3.so
 lib/nss/libnss3.so.1
-lib/nss/libnssb.a
 lib/nss/libnssckbi.so
 lib/nss/libnssckbi.so.1
-lib/nss/libnssckfw.a
-lib/nss/libnssdev.a
-lib/nss/libnsspki.a
-lib/nss/libpk11wrap.a
-lib/nss/libpkcs12.a
-lib/nss/libpkcs7.a
-lib/nss/libsectool.a
-lib/nss/libsecutil.a
-lib/nss/libsmime.a
 lib/nss/libsmime3.so
 lib/nss/libsmime3.so.1
-lib/nss/libsoftokn.a
-lib/nss/libsoftokn3.chk
 lib/nss/libsoftokn3.so
 lib/nss/libsoftokn3.so.1
-lib/nss/libssl.a
 lib/nss/libssl3.so
 lib/nss/libssl3.so.1
 libdata/pkgconfig/nss.pc