Mon Oct 1 11:29:35 2012 UTC ()
Fix build on OS X/Darwin.
Fix embedding @executable_path, and make package errors.


(ryoon)
diff -r1.57 -r1.58 pkgsrc/devel/nss/Makefile
diff -r1.23 -r1.24 pkgsrc/devel/nss/distinfo
cvs diff -r1.57 -r1.58 pkgsrc/devel/nss/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/nss/Makefile 2012/09/30 09:06:19 1.57
+++ pkgsrc/devel/nss/Makefile 2012/10/01 11:29:35 1.58
@@ -1,37 +1,46 @@ @@ -1,37 +1,46 @@
1# $NetBSD: Makefile,v 1.57 2012/09/30 09:06:19 ryoon Exp $ 1# $NetBSD: Makefile,v 1.58 2012/10/01 11:29:35 ryoon Exp $
2 2
3DISTNAME= nss-${NSS_RELEASE} 3DISTNAME= nss-${NSS_RELEASE}
4PKGREVISION= 2 4PKGREVISION= 2
5NSS_RELEASE= 3.13.6 5NSS_RELEASE= 3.13.6
6CATEGORIES= security 6CATEGORIES= security
7MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_3_13_6_RTM/src/} 7MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_3_13_6_RTM/src/}
8 8
9MAINTAINER= tnn@NetBSD.org 9MAINTAINER= tnn@NetBSD.org
10HOMEPAGE= http://www.mozilla.org/projects/security/pki/nss/ 10HOMEPAGE= http://www.mozilla.org/projects/security/pki/nss/
11COMMENT= Libraries to support development of security-enabled applications 11COMMENT= Libraries to support development of security-enabled applications
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 14CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
15CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 15CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
16CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/configure 16CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/configure
17CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}configure 17CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}configure
18 18
19WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla 19WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla
20 20
21USE_TOOLS+= gmake perl pax pkg-config 21USE_TOOLS+= gmake perl pax pkg-config
22 22
23.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
24 24
 25.if ${OPSYS} == "Darwin"
 26SUBST_CLASSES+= exec_path
 27SUBST_STAGE.exec_path= pre-configure
 28SUBST_MESSAGE.exec_path= Fixing @executable_path
 29SUBST_FILES.exec_path= security/nss/lib/freebl/config.mk
 30SUBST_FILES.exec_path= security/coreconf/Darwin.mk
 31SUBST_SED.exec_path= -e 's,@executable_path,${PREFIX}/lib/nss,g'
 32.endif
 33
25.if ${OPSYS} == "Linux" 34.if ${OPSYS} == "Linux"
26MAKE_ENV+= FREEBL_NO_DEPEND=0 35MAKE_ENV+= FREEBL_NO_DEPEND=0
27.endif 36.endif
28 37
29.if ${OBJECT_FMT} == "ELF" 38.if ${OBJECT_FMT} == "ELF"
30SO_SUFFIX= so 39SO_SUFFIX= so
31.elif ${OBJECT_FMT} == "Mach-O" 40.elif ${OBJECT_FMT} == "Mach-O"
32SO_SUFFIX= dylib 41SO_SUFFIX= dylib
33.else 42.else
34SO_SUFFIX= so.1.0 43SO_SUFFIX= so.1.0
35.endif 44.endif
36PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} 45PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q}
37 46
@@ -53,29 +62,29 @@ MAKE_ENV+= EXTRA_SHARED_LIBS="-Wl,-R${BU @@ -53,29 +62,29 @@ MAKE_ENV+= EXTRA_SHARED_LIBS="-Wl,-R${BU
53 62
54post-extract: 63post-extract:
55 find ${WRKSRC} -type f | xargs ${CHMOD} 644 64 find ${WRKSRC} -type f | xargs ${CHMOD} 644
56 find ${WRKSRC} -type d | xargs ${CHMOD} 755 65 find ${WRKSRC} -type d | xargs ${CHMOD} 755
57 66
58do-build: 67do-build:
59 cd ${WRKSRC}/security/nss && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \ 68 cd ${WRKSRC}/security/nss && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
60 build_coreconf build_dbm all 69 build_coreconf build_dbm all
61 70
62INSTALLATION_DIRS= include/nss lib/nss lib/pkgconfig 71INSTALLATION_DIRS= include/nss lib/nss lib/pkgconfig
63DIST= ${WRKSRC}/dist 72DIST= ${WRKSRC}/dist
64 73
65do-install: 74do-install:
66 (cd ${DIST}/public && pax -Lrwpe . ${DESTDIR}${PREFIX}/include/nss/ ) 75 (cd ${DIST}/public && pax -Lrw . ${DESTDIR}${PREFIX}/include/nss/ )
67 (cd ${DIST}/*_OPT.OBJ/lib && \ 76 (cd ${DIST}/*_OPT.OBJ/lib && \
68 pax -Lrwpe *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ ) 77 pax -Lrw *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ )
69 ${INSTALL_LIB} ${DIST}/*_OPT.OBJ/lib/libcrmf.a \ 78 ${INSTALL_LIB} ${DIST}/*_OPT.OBJ/lib/libcrmf.a \
70 ${DESTDIR}${PREFIX}/lib/nss/ 79 ${DESTDIR}${PREFIX}/lib/nss/
71 set -e; \ 80 set -e; \
72 { ${ECHO} "Name: NSS"; \ 81 { ${ECHO} "Name: NSS"; \
73 ${ECHO} "Description: Mozilla Network Security Services"; \ 82 ${ECHO} "Description: Mozilla Network Security Services"; \
74 ${ECHO} "Version: ${PKGVERSION_NOREV}"; \ 83 ${ECHO} "Version: ${PKGVERSION_NOREV}"; \
75 ${ECHO} "Requires: nspr >= 4.8.2"; \ 84 ${ECHO} "Requires: nspr >= 4.8.2"; \
76 ${ECHO} "Cflags: -I${PREFIX}/include/nss/nss -I${PREFIX}/include/nss"; \ 85 ${ECHO} "Cflags: -I${PREFIX}/include/nss/nss -I${PREFIX}/include/nss"; \
77 ${ECHO} "Libs: -L${PREFIX}/lib/nss" \ 86 ${ECHO} "Libs: -L${PREFIX}/lib/nss" \
78 "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss" \ 87 "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss" \
79 "-lnss3 -lsmime3 -lssl3 -lsoftokn3 -lnssutil3" \ 88 "-lnss3 -lsmime3 -lssl3 -lsoftokn3 -lnssutil3" \
80 ${BUILDLINK_LIBS.pthread:Q}; \ 89 ${BUILDLINK_LIBS.pthread:Q}; \
81 } >${DESTDIR}${PREFIX}/lib/pkgconfig/nss.pc 90 } >${DESTDIR}${PREFIX}/lib/pkgconfig/nss.pc
cvs diff -r1.23 -r1.24 pkgsrc/devel/nss/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/nss/distinfo 2012/08/12 15:29:16 1.23
+++ pkgsrc/devel/nss/distinfo 2012/10/01 11:29:35 1.24
@@ -1,16 +1,18 @@ @@ -1,16 +1,18 @@
1$NetBSD: distinfo,v 1.23 2012/08/12 15:29:16 ryoon Exp $ 1$NetBSD: distinfo,v 1.24 2012/10/01 11:29:35 ryoon Exp $
2 2
3SHA1 (nss-3.13.6.tar.gz) = 1f86a7c787e8fe3ebd1dd1cce127e57fb347dac3 3SHA1 (nss-3.13.6.tar.gz) = 1f86a7c787e8fe3ebd1dd1cce127e57fb347dac3
4RMD160 (nss-3.13.6.tar.gz) = 5391eb9341a0eb9ccb4815a35fb52e51a2d850d1 4RMD160 (nss-3.13.6.tar.gz) = 5391eb9341a0eb9ccb4815a35fb52e51a2d850d1
5Size (nss-3.13.6.tar.gz) = 6109538 bytes 5Size (nss-3.13.6.tar.gz) = 6109538 bytes
6SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a 6SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a
7SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220 7SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220
8SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7 8SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7
9SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393 9SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393
10SHA1 (patch-me) = f5a8e29fc004ef7696b67d260384ab23fd1658c2 10SHA1 (patch-me) = f5a8e29fc004ef7696b67d260384ab23fd1658c2
11SHA1 (patch-mf) = de2d47132013a1f6fd12a0893d21eb34dd843b3e 11SHA1 (patch-mf) = de2d47132013a1f6fd12a0893d21eb34dd843b3e
12SHA1 (patch-mg) = 75ddcceaffae0bdb6ecb4efd1b5ffca68a8ae8a8 12SHA1 (patch-mg) = 75ddcceaffae0bdb6ecb4efd1b5ffca68a8ae8a8
13SHA1 (patch-mh) = 0318566ecddafd00d4abd22a08ccab3eb72eabe3 13SHA1 (patch-mh) = 0318566ecddafd00d4abd22a08ccab3eb72eabe3
14SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f 14SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f
15SHA1 (patch-mn) = a59f31b58547657b96a45a2753aab93866940203 15SHA1 (patch-mn) = a59f31b58547657b96a45a2753aab93866940203
 16SHA1 (patch-security_coreconf_Darwin.mk) = 51b83c95df2aa8fcc5f5ade095787e16bbf6cb73
16SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 0f4a691aacd5f58ab59ce7f11e22b4f6714e6938 17SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 0f4a691aacd5f58ab59ce7f11e22b4f6714e6938
 18SHA1 (patch-security_nss_lib_freebl_config.mk) = 7e6ca7ea0e48d6e473e95fab932a1110e53fd883