diff options
| author | ryoon <ryoon> | 2012-10-01 11:29:35 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2012-10-01 11:29:35 +0000 |
| commit | e05a7b7ab7a11b72dca92fdba6ecb56362eeaad7 (patch) | |
| tree | 2df4561158e507d46cd8beaad1546762f061454d /devel/nss | |
| parent | 3bad6eff44809c7571b4ff2d36d31d9902cb009c (diff) | |
| download | pkgsrc-e05a7b7ab7a11b72dca92fdba6ecb56362eeaad7.tar.gz | |
Fix build on OS X/Darwin.
Fix embedding @executable_path, and make package errors.
Diffstat (limited to 'devel/nss')
| -rw-r--r-- | devel/nss/Makefile | 15 | ||||
| -rw-r--r-- | devel/nss/distinfo | 4 |
2 files changed, 15 insertions, 4 deletions
diff --git a/devel/nss/Makefile b/devel/nss/Makefile index 0a1d985f224..2733e103567 100644 --- a/devel/nss/Makefile +++ b/devel/nss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2012/09/30 09:06:19 ryoon Exp $ +# $NetBSD: Makefile,v 1.58 2012/10/01 11:29:35 ryoon Exp $ DISTNAME= nss-${NSS_RELEASE} PKGREVISION= 2 @@ -22,6 +22,15 @@ USE_TOOLS+= gmake perl pax pkg-config .include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == "Darwin" +SUBST_CLASSES+= exec_path +SUBST_STAGE.exec_path= pre-configure +SUBST_MESSAGE.exec_path= Fixing @executable_path +SUBST_FILES.exec_path= security/nss/lib/freebl/config.mk +SUBST_FILES.exec_path= security/coreconf/Darwin.mk +SUBST_SED.exec_path= -e 's,@executable_path,${PREFIX}/lib/nss,g' +.endif + .if ${OPSYS} == "Linux" MAKE_ENV+= FREEBL_NO_DEPEND=0 .endif @@ -63,9 +72,9 @@ INSTALLATION_DIRS= include/nss lib/nss lib/pkgconfig DIST= ${WRKSRC}/dist do-install: - (cd ${DIST}/public && pax -Lrwpe . ${DESTDIR}${PREFIX}/include/nss/ ) + (cd ${DIST}/public && pax -Lrw . ${DESTDIR}${PREFIX}/include/nss/ ) (cd ${DIST}/*_OPT.OBJ/lib && \ - pax -Lrwpe *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ ) + pax -Lrw *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ ) ${INSTALL_LIB} ${DIST}/*_OPT.OBJ/lib/libcrmf.a \ ${DESTDIR}${PREFIX}/lib/nss/ set -e; \ diff --git a/devel/nss/distinfo b/devel/nss/distinfo index 73d94079aec..f779a813576 100644 --- a/devel/nss/distinfo +++ b/devel/nss/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2012/08/12 15:29:16 ryoon Exp $ +$NetBSD: distinfo,v 1.24 2012/10/01 11:29:35 ryoon Exp $ SHA1 (nss-3.13.6.tar.gz) = 1f86a7c787e8fe3ebd1dd1cce127e57fb347dac3 RMD160 (nss-3.13.6.tar.gz) = 5391eb9341a0eb9ccb4815a35fb52e51a2d850d1 @@ -13,4 +13,6 @@ SHA1 (patch-mg) = 75ddcceaffae0bdb6ecb4efd1b5ffca68a8ae8a8 SHA1 (patch-mh) = 0318566ecddafd00d4abd22a08ccab3eb72eabe3 SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f SHA1 (patch-mn) = a59f31b58547657b96a45a2753aab93866940203 +SHA1 (patch-security_coreconf_Darwin.mk) = 51b83c95df2aa8fcc5f5ade095787e16bbf6cb73 SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 0f4a691aacd5f58ab59ce7f11e22b4f6714e6938 +SHA1 (patch-security_nss_lib_freebl_config.mk) = 7e6ca7ea0e48d6e473e95fab932a1110e53fd883 |