diff options
| author | pho <pho@pkgsrc.org> | 2014-05-25 23:45:58 +0000 |
|---|---|---|
| committer | pho <pho@pkgsrc.org> | 2014-05-25 23:45:58 +0000 |
| commit | 471dedff7511950cab412a7b78fd4c45e930bc11 (patch) | |
| tree | 5f4b72286346b385e2b1712d84427abd3da29135 /devel/nss | |
| parent | 37b8ba43e86b7f014eb5bfa665eb6609a8b7bb8f (diff) | |
| download | pkgsrc-471dedff7511950cab412a7b78fd4c45e930bc11.tar.gz | |
Correct wrong install_name for Darwin.
Makefile had a SUBST for this but it wasn't working.
Diffstat (limited to 'devel/nss')
| -rw-r--r-- | devel/nss/Makefile | 5 | ||||
| -rw-r--r-- | devel/nss/distinfo | 3 | ||||
| -rw-r--r-- | devel/nss/patches/patch-nss_lib_freebl_config.mk | 15 |
3 files changed, 19 insertions, 4 deletions
diff --git a/devel/nss/Makefile b/devel/nss/Makefile index c2c2e93e661..e41f96f02f2 100644 --- a/devel/nss/Makefile +++ b/devel/nss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2014/05/16 13:59:17 ryoon Exp $ +# $NetBSD: Makefile,v 1.82 2014/05/25 23:45:58 pho Exp $ DISTNAME= nss-${NSS_RELEASE:S/.0$//} NSS_RELEASE= 3.16.1 @@ -24,8 +24,7 @@ USE_TOOLS+= gmake perl pax pkg-config SUBST_CLASSES+= exec_path SUBST_STAGE.exec_path= pre-configure SUBST_MESSAGE.exec_path= Fixing @executable_path -SUBST_FILES.exec_path= nss/lib/freebl/config.mk -SUBST_FILES.exec_path= coreconf/Darwin.mk +SUBST_FILES.exec_path= nss/coreconf/Darwin.mk SUBST_SED.exec_path= -e 's,@executable_path,${PREFIX}/lib/nss,g' .endif diff --git a/devel/nss/distinfo b/devel/nss/distinfo index 80eb7bf999a..ff670bc4cf4 100644 --- a/devel/nss/distinfo +++ b/devel/nss/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.36 2014/05/16 13:59:17 ryoon Exp $ +$NetBSD: distinfo,v 1.37 2014/05/25 23:45:58 pho Exp $ SHA1 (nss-3.16.1.tar.gz) = 450a88dde8c7e4533507ac8340dbf94be28a759b RMD160 (nss-3.16.1.tar.gz) = 1df5a115d446864919961dbe311744206a1d2e69 @@ -13,4 +13,5 @@ SHA1 (patch-mh) = a46d3098a85c3a4a57895a9845bc1741fc5e9561 SHA1 (patch-mj) = 08ca1a37afce99e0292a20348fc6855547f44e8a SHA1 (patch-mn) = ab5820ecca7e1a3aef7785763115d38fa55109b4 SHA1 (patch-nss_coreconf_OpenBSD.mk) = fa545c993038e99bf9f59b59ec1d0bd1f6c192a9 +SHA1 (patch-nss_lib_freebl_config.mk) = 1c198177da8ba7928cbfbd23e385503be99ebe27 SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 7948b7b502a4c148ee185836dde8a84d3aa388af diff --git a/devel/nss/patches/patch-nss_lib_freebl_config.mk b/devel/nss/patches/patch-nss_lib_freebl_config.mk new file mode 100644 index 00000000000..a899b6a9f15 --- /dev/null +++ b/devel/nss/patches/patch-nss_lib_freebl_config.mk @@ -0,0 +1,15 @@ +$NetBSD: patch-nss_lib_freebl_config.mk,v 1.1 2014/05/25 23:45:58 pho Exp $ + +Do not override the installation path of NSPR libraries. + +--- nss/lib/freebl/config.mk.orig 2014-05-02 03:27:18.000000000 +0000 ++++ nss/lib/freebl/config.mk +@@ -90,8 +90,4 @@ EXTRA_SHARED_LIBS += \ + endif + endif + +-ifeq ($(OS_ARCH), Darwin) +-EXTRA_SHARED_LIBS += -dylib_file @executable_path/libplc4.dylib:$(DIST)/lib/libplc4.dylib -dylib_file @executable_path/libplds4.dylib:$(DIST)/lib/libplds4.dylib +-endif +- + endif |