diff options
author | tron <tron@pkgsrc.org> | 2006-12-05 17:43:06 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2006-12-05 17:43:06 +0000 |
commit | 8948c0658ef7402acd3952817a271d7c255a9c12 (patch) | |
tree | 51a9dc401aba98a3181bfbad5ef669c2b0ee241b | |
parent | 9644be18d632cf8106e7c670f060638185453701 (diff) | |
download | pkgsrc-8948c0658ef7402acd3952817a271d7c255a9c12.tar.gz |
- Fix broken shared library generation under Mac OS X.
- Fix permission problems in "include/nspr".
Bump package revision because of these changes.
-rw-r--r-- | devel/nspr/Makefile | 13 | ||||
-rw-r--r-- | devel/nspr/buildlink3.mk | 6 |
2 files changed, 16 insertions, 3 deletions
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index 77883143d55..89c7e5f153a 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2006/12/04 13:32:42 tron Exp $ +# $NetBSD: Makefile,v 1.19 2006/12/05 17:43:06 tron Exp $ DISTNAME= nspr-4.6.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_MOZILLA:S/mozilla\//nspr\//g:=v4.6.1/src/} @@ -53,8 +53,17 @@ PLIST_SUBST+= SUN4U_32=${SUN4U_32} .if ${OPSYS} == "Darwin" && exists(/Developer/Headers/FlatCarbon) BUILDLINK_PASSTHRU_DIRS+= /Developer/Headers/FlatCarbon + +SUBST_CLASSES+= libpath +SUBST_STAGE.libpath= post-configure +SUBST_FILES.libpath= config/autoconf.mk +SUBST_SED.libpath= -e 's,@executable_path/$$@,${PREFIX}/lib/nspr/$$(notdir $$@),' .endif +post-extract: + ${CHMOD} -R g-w ${WRKSRC}/.. + ${CHMOD} -x ${WRKSRC}/../pr/include/prvrsion.h + pre-configure: cd ${WRKSRC}/.. && autoconf diff --git a/devel/nspr/buildlink3.mk b/devel/nspr/buildlink3.mk index ab2c42f02d4..4f258d19dbc 100644 --- a/devel/nspr/buildlink3.mk +++ b/devel/nspr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:47 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2006/12/05 17:43:06 tron Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NSPR_BUILDLINK3_MK:= ${NSPR_BUILDLINK3_MK}+ @@ -13,7 +13,11 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nspr .if !empty(NSPR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.nspr+= nspr>=4.4.1nb1 +.if ${OPSYS} == "Darwin" +BUILDLINK_ABI_DEPENDS.nspr+= nspr>=4.6.1nb3 +.else BUILDLINK_ABI_DEPENDS.nspr+= nspr>=4.6.1nb1 +.endif BUILDLINK_PKGSRCDIR.nspr?= ../../devel/nspr BUILDLINK_FILES.nspr+= lib/nspr/* |