diff options
Diffstat (limited to 'security/nss')
| -rw-r--r-- | security/nss/Makefile | 51 | ||||
| -rw-r--r-- | security/nss/files/nss-config.in | 137 | ||||
| -rw-r--r-- | security/nss/files/nss.pc.in | 11 | ||||
| -rw-r--r-- | security/nss/files/patch-..::coreconf::command.mk | 2 | ||||
| -rw-r--r-- | security/nss/files/patch-..::coreconf::rules.mk | 3 | ||||
| -rw-r--r-- | security/nss/files/patch-cmd::platlibs.mk | 3 | ||||
| -rw-r--r-- | security/nss/pkg-plist | 29 |
7 files changed, 201 insertions, 35 deletions
diff --git a/security/nss/Makefile b/security/nss/Makefile index fd577e810831..4af25df2ef7e 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -3,10 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/security/nss/Makefile,v 1.6 2006/12/17 21:46:42 marcus Exp $ PORTNAME= nss -PORTVERSION= 3.11.4 +PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH} +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src @@ -17,9 +18,13 @@ 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 + WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla/security/nss -USE_LDCONFIG= yes +USE_LDCONFIG= ${PREFIX}/lib/nss USE_GMAKE= yes USE_PERL5_BUILD=yes MAKE_ENV= BSD_LDOPTS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \ @@ -39,12 +44,13 @@ EXTERNALS= CVS dbm security/nss/cmd/zlib nsprpub security/dbm EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ ${EXTERNALS:C,^,--exclude ${DISTNAME}/mozilla/,} -post-patch: - @${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \ - ${WRKSRC:H:H}/security/coreconf/FreeBSD.mk - 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}" \ @@ -58,18 +64,35 @@ test: echo "All tests succeeded. Good news."; \ fi +post-patch: + @${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \ + ${WRKSRC:H:H}/security/coreconf/FreeBSD.mk + @${SED} -e 's|@exec_prefix@|${PREFIX}|; \ + s|@includedir@|${PREFIX}/include/nss|; \ + s|@libdir@|${PREFIX}/lib/nss|; \ + s|@prefix@|${PREFIX}|' \ + ${FILESDIR}/nss-config.in >${WRKDIR}/nss-config + @${SED} -e 's|@PREFIX@|${PREFIX}|; s|@PORTVERSION@|${PORTVERSION}|' \ + ${FILESDIR}/nss.pc.in >${WRKDIR}/nss.pc +.for i in MAJOR MINOR PATCH + @${SED} -i.${i} -e 's|@${i}@|${_${i}}|' ${WRKDIR}/nss-config +.endfor + do-install: - ${MKDIR} ${PREFIX}/include/nss + ${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/*.so.1 \ - ${PREFIX}/lib + ${PREFIX}/lib/nss ${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/libcrmf.a \ - ${PREFIX}/lib - ${INSTALL_PROGRAM} `${SED} \ - -e 's|^bin/|${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/bin/|' \ - -e t -e d ${PLIST}` ${PREFIX}/bin/ + ${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 -xf - + ${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 .include <bsd.port.post.mk> diff --git a/security/nss/files/nss-config.in b/security/nss/files/nss-config.in new file mode 100644 index 000000000000..d2605fec9d02 --- /dev/null +++ b/security/nss/files/nss-config.in @@ -0,0 +1,137 @@ +#!/bin/sh + +prefix=@prefix@ + +major_version=@MAJOR@ +minor_version=@MINOR@ +patch_version=@PATCH@ + +usage() +{ + cat <<EOF +Usage: nss-config [OPTIONS] [LIBRARIES] +Options: + [--prefix[=DIR]] + [--exec-prefix[=DIR]] + [--includedir[=DIR]] + [--libdir[=DIR]] + [--version] + [--libs] + [--cflags] +Dynamic Libraries: + nss + ssl + smime +EOF + exit $1 +} + +if test $# -eq 0; then + usage 1 1>&2 +fi + +lib_ssl=yes +lib_smime=yes +lib_nss=yes + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + ;; + --prefix) + echo_prefix=yes + ;; + --exec-prefix=*) + exec_prefix=$optarg + ;; + --exec-prefix) + echo_exec_prefix=yes + ;; + --includedir=*) + includedir=$optarg + ;; + --includedir) + echo_includedir=yes + ;; + --libdir=*) + libdir=$optarg + ;; + --libdir) + echo_libdir=yes + ;; + --version) + echo ${major_version}.${minor_version}.${patch_version} + ;; + --cflags) + echo_cflags=yes + ;; + --libs) + echo_libs=yes + ;; + ssl) + lib_ssl=yes + ;; + smime) + lib_smime=yes + ;; + nss) + lib_nss=yes + ;; + *) + usage 1 1>&2 + ;; + esac + shift +done + +# Set variables that may be dependent upon other variables +if test -z "$exec_prefix"; then + exec_prefix=@exec_prefix@ +fi +if test -z "$includedir"; then + includedir=@includedir@ +fi +if test -z "$libdir"; then + libdir=@libdir@ +fi + +if test "$echo_prefix" = "yes"; then + echo $prefix +fi + +if test "$echo_exec_prefix" = "yes"; then + echo $exec_prefix +fi + +if test "$echo_includedir" = "yes"; then + echo $includedir +fi + +if test "$echo_libdir" = "yes"; then + echo $libdir +fi + +if test "$echo_cflags" = "yes"; then + echo -I$includedir +fi + +if test "$echo_libs" = "yes"; then + libdirs="-Wl,-R$libdir -L$libdir" + if test -n "$lib_ssl"; then + libdirs="$libdirs -lssl${major_version}" + fi + if test -n "$lib_smime"; then + libdirs="$libdirs -lsmime${major_version}" + fi + if test -n "$lib_nss"; then + libdirs="$libdirs -lnss${major_version}" + fi + echo $libdirs +fi + diff --git a/security/nss/files/nss.pc.in b/security/nss/files/nss.pc.in new file mode 100644 index 000000000000..7b17143747d4 --- /dev/null +++ b/security/nss/files/nss.pc.in @@ -0,0 +1,11 @@ +prefix=@PREFIX@ +exec_prefix=@PREFIX@ +libdir=@PREFIX@/lib/nss +includedir=@PREFIX@/include + +Name: NSS +Description: Mozilla Network Security Services +Version: @PORTVERSION@ +Requires: nspr +Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 +Cflags: -I${includedir}/nss -I${includedir}/nss/nss diff --git a/security/nss/files/patch-..::coreconf::command.mk b/security/nss/files/patch-..::coreconf::command.mk index 1a5bae069f27..1e3de66f7ae2 100644 --- a/security/nss/files/patch-..::coreconf::command.mk +++ b/security/nss/files/patch-..::coreconf::command.mk @@ -1,5 +1,3 @@ -$FreeBSD$ - --- ../coreconf/command.mk Mon Oct 10 19:46:12 2005 +++ ../coreconf/command.mk Wed Jan 18 17:23:28 2006 @@ -46,5 +46,5 @@ diff --git a/security/nss/files/patch-..::coreconf::rules.mk b/security/nss/files/patch-..::coreconf::rules.mk index 42663ca87070..59178ff6da50 100644 --- a/security/nss/files/patch-..::coreconf::rules.mk +++ b/security/nss/files/patch-..::coreconf::rules.mk @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- ../coreconf/rules.mk.orig Thu Apr 3 16:48:00 2003 +++ ../coreconf/rules.mk Fri Apr 11 01:01:50 2003 @@ -110,6 +110,7 @@ diff --git a/security/nss/files/patch-cmd::platlibs.mk b/security/nss/files/patch-cmd::platlibs.mk index 635107cd0648..4ac01e3e47e0 100644 --- a/security/nss/files/patch-cmd::platlibs.mk +++ b/security/nss/files/patch-cmd::platlibs.mk @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- cmd/platlibs.mk Wed Apr 6 17:35:41 2005 +++ cmd/platlibs.mk Wed Jul 27 22:22:59 2005 @@ -72,5 +72,4 @@ diff --git a/security/nss/pkg-plist b/security/nss/pkg-plist index dc892d004315..cc12145c7be2 100644 --- a/security/nss/pkg-plist +++ b/security/nss/pkg-plist @@ -7,6 +7,7 @@ bin/derdump bin/makepqg bin/mangle bin/modutil +bin/nss-config bin/ocspclnt bin/oidcalc bin/p7content @@ -113,18 +114,20 @@ include/nss/nss/sslerr.h include/nss/nss/sslproto.h include/nss/nss/sslt.h include/nss/nss/watcomfx.h -lib/libcrmf.a -lib/libfreebl3.so -lib/libfreebl3.so.1 -lib/libnss3.so -lib/libnss3.so.1 -lib/libnssckbi.so -lib/libnssckbi.so.1 -lib/libsmime3.so -lib/libsmime3.so.1 -lib/libsoftokn3.so -lib/libsoftokn3.so.1 -lib/libssl3.so -lib/libssl3.so.1 +lib/nss/libcrmf.a +lib/nss/libfreebl3.so +lib/nss/libfreebl3.so.1 +lib/nss/libnss3.so +lib/nss/libnss3.so.1 +lib/nss/libnssckbi.so +lib/nss/libnssckbi.so.1 +lib/nss/libsmime3.so +lib/nss/libsmime3.so.1 +lib/nss/libsoftokn3.so +lib/nss/libsoftokn3.so.1 +lib/nss/libssl3.so +lib/nss/libssl3.so.1 +libdata/pkgconfig/nss.pc +@dirrm lib/nss @dirrm include/nss/nss @dirrm include/nss |