Fri May 20 11:53:18 2016 UTC ()
Add nss-config script to match most Linux distributions.

Create nss.pc file earlier, not during installation.

Bump PKGREVISION.


(wiz)
diff -r1.113 -r1.114 pkgsrc/devel/nss/Makefile
diff -r1.15 -r1.16 pkgsrc/devel/nss/PLIST
diff -r0 -r1.1 pkgsrc/devel/nss/files/nss-config.in
diff -r0 -r1.1 pkgsrc/devel/nss/files/nss.pc.in
cvs diff -r1.113 -r1.114 pkgsrc/devel/nss/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/nss/Makefile 2016/04/17 19:27:10 1.113
+++ pkgsrc/devel/nss/Makefile 2016/05/20 11:53:18 1.114
@@ -1,34 +1,37 @@ @@ -1,34 +1,37 @@
1# $NetBSD: Makefile,v 1.113 2016/04/17 19:27:10 ryoon Exp $ 1# $NetBSD: Makefile,v 1.114 2016/05/20 11:53:18 wiz Exp $
2 2
3DISTNAME= nss-${NSS_RELEASE:S/.0$//} 3DISTNAME= nss-${NSS_RELEASE:S/.0$//}
 4PKGREVISION= 1
4NSS_RELEASE= 3.23.0 5NSS_RELEASE= 3.23.0
5CATEGORIES= security 6CATEGORIES= security
6MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_RELEASE:S/.0$//:S/./_/g}_RTM/src/} 7MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_MAJOR_VERSION}_${NSS_MINOR_VERSION}_RTM/src/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.mozilla.org/projects/security/pki/nss/ 10HOMEPAGE= http://www.mozilla.org/projects/security/pki/nss/
10COMMENT= Libraries to support development of security-enabled applications 11COMMENT= Libraries to support development of security-enabled applications
11LICENSE= mpl-2.0 12LICENSE= mpl-2.0
12 13
13CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}nss/tests/libpkix/libpkix.sh 14CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}nss/tests/libpkix/libpkix.sh
14CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}nss/tests/multinit/multinit.sh 15CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}nss/tests/multinit/multinit.sh
15CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/configure 16CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/configure
16CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}configure 17CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}configure
17 18
18USE_GCC_RUNTIME= yes 19USE_GCC_RUNTIME= yes
19USE_TOOLS+= gmake perl pax pkg-config 20USE_TOOLS+= gmake perl pax pkg-config
20MAKE_JOBS_SAFE= no 21MAKE_JOBS_SAFE= no
21 22
 23BUILD_DIRS= nss
 24
22.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
23 26
24SUBST_CLASSES.Darwin+= exec_path 27SUBST_CLASSES.Darwin+= exec_path
25SUBST_STAGE.exec_path= pre-configure 28SUBST_STAGE.exec_path= pre-configure
26SUBST_MESSAGE.exec_path= Fixing @executable_path 29SUBST_MESSAGE.exec_path= Fixing @executable_path
27SUBST_FILES.exec_path= nss/coreconf/Darwin.mk 30SUBST_FILES.exec_path= nss/coreconf/Darwin.mk
28SUBST_SED.exec_path= -e 's,@executable_path,${PREFIX}/lib/nss,g' 31SUBST_SED.exec_path= -e 's,@executable_path,${PREFIX}/lib/nss,g'
29 32
30SUBST_CLASSES+= zlib 33SUBST_CLASSES+= zlib
31SUBST_STAGE.zlib= pre-configure 34SUBST_STAGE.zlib= pre-configure
32SUBST_MESSAGE.zlib= Use ZLIB_LIBS from environment 35SUBST_MESSAGE.zlib= Use ZLIB_LIBS from environment
33SUBST_FILES.zlib= nss/coreconf/*.mk 36SUBST_FILES.zlib= nss/coreconf/*.mk
34SUBST_SED.zlib= -e 's,^ZLIB_LIBS,\#ZLIB_LIBS,g' 37SUBST_SED.zlib= -e 's,^ZLIB_LIBS,\#ZLIB_LIBS,g'
@@ -60,46 +63,53 @@ MAKE_ENV+= USE_64=1 @@ -60,46 +63,53 @@ MAKE_ENV+= USE_64=1
60MAKE_ENV+= BUILD_OPT=1 63MAKE_ENV+= BUILD_OPT=1
61#MAKE_ENV+= OPTIMIZER=${CFLAGS:Q} 64#MAKE_ENV+= OPTIMIZER=${CFLAGS:Q}
62MAKE_ENV+= INCLUDES=-I${BUILDLINK_PREFIX.nspr}/include/nspr 65MAKE_ENV+= INCLUDES=-I${BUILDLINK_PREFIX.nspr}/include/nspr
63MAKE_ENV+= NSS_USE_SYSTEM_SQLITE=1 66MAKE_ENV+= NSS_USE_SYSTEM_SQLITE=1
64MAKE_ENV+= ZLIB_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib -L${BUILDLINK_PREFIX.zlib}/lib -lz" 67MAKE_ENV+= ZLIB_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib -L${BUILDLINK_PREFIX.zlib}/lib -lz"
65MAKE_ENV+= USE_SYSTEM_ZLIB=1 68MAKE_ENV+= USE_SYSTEM_ZLIB=1
66MAKE_ENV+= EXTRA_SHARED_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss -L${BUILDLINK_PREFIX.nspr}/lib/nspr -lplc4 -lplds4 -lnspr4" 69MAKE_ENV+= EXTRA_SHARED_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss -L${BUILDLINK_PREFIX.nspr}/lib/nspr -lplc4 -lplds4 -lnspr4"
67MAKE_ENV+= NSS_DISABLE_GTESTS=yes 70MAKE_ENV+= NSS_DISABLE_GTESTS=yes
68.include "../../mk/compiler.mk" 71.include "../../mk/compiler.mk"
69.if !empty(CC_VERSION:Mgcc-4.[0-7]*) 72.if !empty(CC_VERSION:Mgcc-4.[0-7]*)
70CFLAGS+= -DNSS_NO_GCC48 73CFLAGS+= -DNSS_NO_GCC48
71.endif 74.endif
72 75
 76NSS_MAJOR_VERSION= ${NSS_RELEASE:C/\.[0-9.]*//}
 77NSS_MINOR_VERSION= ${NSS_RELEASE:S/3.//:C/\.[0-9]*//}
 78NSS_PATCH_VERSION= ${NSS_RELEASE:C/[0-9.]*\.//}
 79
 80SUBST_CLASSES+= config
 81SUBST_SED.config+= -e "s,@PREFIX@,${PREFIX},g"
 82SUBST_SED.config+= -e "s,@NSS_MAJOR_VERSION@,${NSS_MAJOR_VERSION},"
 83SUBST_SED.config+= -e "s,@NSS_MINOR_VERSION@,${NSS_MINOR_VERSION},"
 84SUBST_SED.config+= -e "s,@NSS_PATCH_VERSION@,${NSS_PATCH_VERSION},"
 85SUBST_SED.config+= -e "s!@COMPILER_RPATH_FLAG@!${COMPILER_RPATH_FLAG}!"
 86SUBST_SED.config+= -e "s,@PTHREAD@,${BUILDLINK_LIBS.pthread:Q},"
 87SUBST_STAGE.config= pre-build
 88SUBST_MESSAGE.config= Preparing *-config files.
 89SUBST_FILES.config+= nss.pc nss-config
 90
 91INSTALLATION_DIRS= bin include/nss lib/nss lib/pkgconfig
 92DIST= ${WRKSRC}/dist
 93
73post-extract: 94post-extract:
74 find ${WRKSRC} -type f | xargs ${CHMOD} 644 95 find ${WRKSRC} -type f | xargs ${CHMOD} 644
75 find ${WRKSRC} -type d | xargs ${CHMOD} 755 96 find ${WRKSRC} -type d | xargs ${CHMOD} 755
76 97 ${CP} ${FILESDIR}/nss.pc.in ${WRKSRC}/nss.pc
77BUILD_DIRS= nss 98 ${CP} ${FILESDIR}/nss-config.in ${WRKSRC}/nss-config
78INSTALLATION_DIRS= include/nss lib/nss lib/pkgconfig 
79DIST= ${WRKSRC}/dist 
80 99
81do-install: 100do-install:
82 (cd ${DIST}/public && pax -Lrw . ${DESTDIR}${PREFIX}/include/nss/ ) 101 (cd ${DIST}/public && pax -Lrw . ${DESTDIR}${PREFIX}/include/nss/ )
83 (cd ${DIST}/*_OPT.OBJ/lib && \ 102 (cd ${DIST}/*_OPT.OBJ/lib && \
84 pax -Lrw *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ ) 103 pax -Lrw *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ )
85 ${INSTALL_LIB} ${DIST}/*_OPT.OBJ/lib/libcrmf.a \ 104 ${INSTALL_LIB} ${DIST}/*_OPT.OBJ/lib/libcrmf.a \
86 ${DESTDIR}${PREFIX}/lib/nss/ 105 ${DESTDIR}${PREFIX}/lib/nss/
87 set -e; \ 106 ${INSTALL_DATA} ${WRKSRC}/nss.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/nss.pc
88 { ${ECHO} "Name: NSS"; \ 107 ${INSTALL_SCRIPT} ${WRKSRC}/nss-config ${DESTDIR}${PREFIX}/bin/nss-config
89 ${ECHO} "Description: Mozilla Network Security Services"; \ 
90 ${ECHO} "Version: ${NSS_RELEASE}"; \ 
91 ${ECHO} "Requires: nspr >= 4.11.0"; \ 
92 ${ECHO} "Cflags: -I${PREFIX}/include/nss/nss -I${PREFIX}/include/nss"; \ 
93 ${ECHO} "Libs: -L${PREFIX}/lib/nss" \ 
94 "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss" \ 
95 "-lnss3 -lsmime3 -lssl3 -lsoftokn3 -lnssutil3" \ 
96 ${BUILDLINK_LIBS.pthread:Q}; \ 
97 } >${DESTDIR}${PREFIX}/lib/pkgconfig/nss.pc 
98 108
99# For consistency of libxul.so link in www/firefox. 109# For consistency of libxul.so link in www/firefox.
100BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.8.4.2 110BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.8.4.2
101.include "../../databases/sqlite3/buildlink3.mk" 111.include "../../databases/sqlite3/buildlink3.mk"
102.include "../../devel/nspr/buildlink3.mk" 112.include "../../devel/nspr/buildlink3.mk"
103.include "../../devel/zlib/buildlink3.mk" 113.include "../../devel/zlib/buildlink3.mk"
104.include "../../mk/pthread.buildlink3.mk" 114.include "../../mk/pthread.buildlink3.mk"
105.include "../../mk/bsd.pkg.mk" 115.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/devel/nss/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/nss/PLIST 2015/08/20 10:54:24 1.15
+++ pkgsrc/devel/nss/PLIST 2016/05/20 11:53:18 1.16
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1@comment $NetBSD: PLIST,v 1.15 2015/08/20 10:54:24 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.16 2016/05/20 11:53:18 wiz Exp $
 2bin/nss-config
2include/nss/dbm/mcom_db.h 3include/nss/dbm/mcom_db.h
3include/nss/dbm/ncompat.h 4include/nss/dbm/ncompat.h
4include/nss/dbm/winfile.h 5include/nss/dbm/winfile.h
5include/nss/nss/base64.h 6include/nss/nss/base64.h
6include/nss/nss/blapit.h 7include/nss/nss/blapit.h
7include/nss/nss/cert.h 8include/nss/nss/cert.h
8include/nss/nss/certdb.h 9include/nss/nss/certdb.h
9include/nss/nss/certt.h 10include/nss/nss/certt.h
10include/nss/nss/ciferfam.h 11include/nss/nss/ciferfam.h
11include/nss/nss/cmmf.h 12include/nss/nss/cmmf.h
12include/nss/nss/cmmft.h 13include/nss/nss/cmmft.h
13include/nss/nss/cms.h 14include/nss/nss/cms.h
14include/nss/nss/cmsreclist.h 15include/nss/nss/cmsreclist.h
File Added: pkgsrc/devel/nss/files/Attic/nss-config.in
#!/bin/sh

prefix=@PREFIX@

major_version=@NSS_MAJOR_VERSION@
minor_version=@NSS_MINOR_VERSION@
patch_version=@NSS_PATCH_VERSION@

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
	nssutil
EOF
	exit $1
}

if test $# -eq 0; then
	usage 1 1>&2
fi

lib_ssl=yes
lib_smime=yes
lib_nss=yes
lib_nssutil=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
      ;;
    nssutil)
      lib_nssutil=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=`pkg-config --variable=exec_prefix nss`
    if test -z "$exec_prefix"; then
        exec_prefix=`pkg-config --variable=prefix nss`/bin
    fi
fi
if test -z "$includedir"; then
    includedir=`pkg-config --variable=includedir nss`
fi
if test -z "$libdir"; then
    libdir=`pkg-config --variable=libdir nss`
fi

if test -z "$cflags"; then
    cflags=`pkg-config --cflags nss`
fi

if test -z "$libs"; then
    libs=`pkg-config --libs nss`
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 $cflags
fi

if test "$echo_libs" = "yes"; then
   echo $libs
fi
File Added: pkgsrc/devel/nss/files/Attic/nss.pc.in
prefix=@PREFIX@
exec_prefix=@PREFIX@/bin
libdir=@PREFIX@/lib/nss
includedir=@PREFIX@/include/nss

Name: NSS
Description: Mozilla Network Security Services
Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
Requires: nspr >= 4.10.3
Cflags: -I${includedir}
Libs: @COMPILER_RPATH_FLAG@${libdir} -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3 -lnssutil3 @PTHREAD@