Sun Jan 23 11:18:51 2011 UTC ()
set FREEBL_NO_DEPEND=0 in MAKE_ENV otherwise Linux2.6 defaults to
FREEBL_NO_DEPEND=1 and files not in PLIST are installed.
OKed by tnn.


(markd)
diff -r1.39 -r1.40 pkgsrc/devel/nss/Makefile
cvs diff -r1.39 -r1.40 pkgsrc/devel/nss/Makefile (switch to unified diff)

--- pkgsrc/devel/nss/Makefile 2010/10/21 10:31:00 1.39
+++ pkgsrc/devel/nss/Makefile 2011/01/23 11:18:51 1.40
@@ -1,80 +1,84 @@ @@ -1,80 +1,84 @@
1# $NetBSD: Makefile,v 1.39 2010/10/21 10:31:00 tnn Exp $ 1# $NetBSD: Makefile,v 1.40 2011/01/23 11:18:51 markd Exp $
2 2
3.include "../../devel/xulrunner/dist.mk" 3.include "../../devel/xulrunner/dist.mk"
4PKGNAME= nss-${NSS_RELEASE}${MOZ_BRANCH_MINOR} 4PKGNAME= nss-${NSS_RELEASE}${MOZ_BRANCH_MINOR}
5NSS_RELEASE= 3.12.8.0 5NSS_RELEASE= 3.12.8.0
6CATEGORIES= security 6CATEGORIES= security
7 7
8MAINTAINER= tnn@NetBSD.org 8MAINTAINER= tnn@NetBSD.org
9HOMEPAGE= http://www.mozilla.org/projects/security/pki/nss/ 9HOMEPAGE= http://www.mozilla.org/projects/security/pki/nss/
10COMMENT= Libraries to support development of security-enabled applications 10COMMENT= Libraries to support development of security-enabled applications
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 13CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
14CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 14CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
15 15
16USE_TOOLS+= gmake perl pax pkg-config 16USE_TOOLS+= gmake perl pax pkg-config
17 17
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
19 19
 20.if ${OPSYS} == "Linux"
 21MAKE_ENV+= FREEBL_NO_DEPEND=0
 22.endif
 23
20.if ${OBJECT_FMT} == "ELF" 24.if ${OBJECT_FMT} == "ELF"
21SO_SUFFIX= so 25SO_SUFFIX= so
22.elif ${OBJECT_FMT} == "Mach-O" 26.elif ${OBJECT_FMT} == "Mach-O"
23SO_SUFFIX= dylib 27SO_SUFFIX= dylib
24.else 28.else
25SO_SUFFIX= so.1.0 29SO_SUFFIX= so.1.0
26.endif 30.endif
27PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} 31PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q}
28 32
29.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc) 33.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc)
30MAKE_ENV+= NS_USE_GCC=YES 34MAKE_ENV+= NS_USE_GCC=YES
31.endif 35.endif
32 36
33.for platform in ${LP64PLATFORMS} 37.for platform in ${LP64PLATFORMS}
34. if ${MACHINE_PLATFORM:M${platform}} 38. if ${MACHINE_PLATFORM:M${platform}}
35MAKE_ENV+= USE_64=1 39MAKE_ENV+= USE_64=1
36. endif 40. endif
37.endfor 41.endfor
38 42
39MAKE_ENV+= BUILD_OPT=1 43MAKE_ENV+= BUILD_OPT=1
40#MAKE_ENV+= OPTIMIZER=${CFLAGS:Q} 44#MAKE_ENV+= OPTIMIZER=${CFLAGS:Q}
41MAKE_ENV+= INCLUDES=-I${BUILDLINK_PREFIX.nspr}/include/nspr 45MAKE_ENV+= INCLUDES=-I${BUILDLINK_PREFIX.nspr}/include/nspr
42MAKE_ENV+= NSS_USE_SYSTEM_SQLITE=1 46MAKE_ENV+= NSS_USE_SYSTEM_SQLITE=1
43MAKE_ENV+= EXTRA_SHARED_LIBS="-Wl,-R${BUILDLINK_PREFIX.nspr}/lib/nspr -Wl,-R,${PREFIX}/lib/nss -L${BUILDLINK_PREFIX.nspr}/lib/nspr -lplc4 -lplds4 -lnspr4" 47MAKE_ENV+= EXTRA_SHARED_LIBS="-Wl,-R${BUILDLINK_PREFIX.nspr}/lib/nspr -Wl,-R,${PREFIX}/lib/nss -L${BUILDLINK_PREFIX.nspr}/lib/nspr -lplc4 -lplds4 -lnspr4"
44 48
45pre-configure: 49pre-configure:
46# sanity check: make sure the nss release is what we think it is. 50# sanity check: make sure the nss release is what we think it is.
47 @set -e; if [ '"${NSS_RELEASE}"' != \ 51 @set -e; if [ '"${NSS_RELEASE}"' != \
48 "`${AWK} '/NSS_VERSION/ {print $$3}' < \ 52 "`${AWK} '/NSS_VERSION/ {print $$3}' < \
49 ${WRKSRC}/security/nss/lib/nss/nss.h`" ]; then \ 53 ${WRKSRC}/security/nss/lib/nss/nss.h`" ]; then \
50 ${ECHO} "package is out of date"; \ 54 ${ECHO} "package is out of date"; \
51 exit 1; \ 55 exit 1; \
52 fi 56 fi
53 57
54do-build: 58do-build:
55 cd ${WRKSRC}/security/nss && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \ 59 cd ${WRKSRC}/security/nss && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
56 build_coreconf build_dbm all 60 build_coreconf build_dbm all
57 61
58INSTALLATION_DIRS= include/nss lib/nss lib/pkgconfig 62INSTALLATION_DIRS= include/nss lib/nss lib/pkgconfig
59DIST= ${WRKSRC}/dist 63DIST= ${WRKSRC}/dist
60 64
61do-install: 65do-install:
62 (cd ${DIST}/public && pax -Lrwpe . ${DESTDIR}${PREFIX}/include/nss/ ) 66 (cd ${DIST}/public && pax -Lrwpe . ${DESTDIR}${PREFIX}/include/nss/ )
63 (cd ${DIST}/*_OPT.OBJ/lib && \ 67 (cd ${DIST}/*_OPT.OBJ/lib && \
64 pax -Lrwpe *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ ) 68 pax -Lrwpe *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ )
65 set -e; \ 69 set -e; \
66 { ${ECHO} "Name: NSS"; \ 70 { ${ECHO} "Name: NSS"; \
67 ${ECHO} "Description: Mozilla Network Security Services"; \ 71 ${ECHO} "Description: Mozilla Network Security Services"; \
68 ${ECHO} "Version: ${PKGVERSION}"; \ 72 ${ECHO} "Version: ${PKGVERSION}"; \
69 ${ECHO} "Requires: nspr >= 4.8.2"; \ 73 ${ECHO} "Requires: nspr >= 4.8.2"; \
70 ${ECHO} "Cflags: -I${PREFIX}/include/nss/nss -I${PREFIX}/include/nss"; \ 74 ${ECHO} "Cflags: -I${PREFIX}/include/nss/nss -I${PREFIX}/include/nss"; \
71 ${ECHO} "Libs: -L${PREFIX}/lib/nss" \ 75 ${ECHO} "Libs: -L${PREFIX}/lib/nss" \
72 "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss" \ 76 "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss" \
73 "-lnss3 -lsmime3 -lssl3 -lsoftokn3 "${BUILDLINK_LIBS.pthread:Q}; \ 77 "-lnss3 -lsmime3 -lssl3 -lsoftokn3 "${BUILDLINK_LIBS.pthread:Q}; \
74 } >${DESTDIR}${PREFIX}/lib/pkgconfig/nss.pc 78 } >${DESTDIR}${PREFIX}/lib/pkgconfig/nss.pc
75 79
76.include "../../databases/sqlite3/buildlink3.mk" 80.include "../../databases/sqlite3/buildlink3.mk"
77.include "../../devel/nspr/buildlink3.mk" 81.include "../../devel/nspr/buildlink3.mk"
78.include "../../devel/zlib/buildlink3.mk" 82.include "../../devel/zlib/buildlink3.mk"
79.include "../../mk/pthread.buildlink3.mk" 83.include "../../mk/pthread.buildlink3.mk"
80.include "../../mk/bsd.pkg.mk" 84.include "../../mk/bsd.pkg.mk"