diff options
| author | tron <tron@pkgsrc.org> | 2006-08-08 21:08:14 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2006-08-08 21:08:14 +0000 |
| commit | e4e66c2fa68a6851b856685bb059d4435dd672cd (patch) | |
| tree | 9653a10fea90d9c0a19351a3069a52587b3d2388 | |
| parent | d74765bfe66aa0dc013ee745dce4ad57bca02dc5 (diff) | |
| download | pkgsrc-e4e66c2fa68a6851b856685bb059d4435dd672cd.tar.gz | |
Fix broken shared library build under Mac OS X. "avidemux2" (from the
"avidemux" package) now works with the "js" library provided by this
package. Bump package revision of this package.
Vital hint provided by Amitai Schlair in private e-mail.
| -rw-r--r-- | lang/spidermonkey/Makefile | 4 | ||||
| -rw-r--r-- | lang/spidermonkey/buildlink3.mk | 6 | ||||
| -rw-r--r-- | lang/spidermonkey/distinfo | 3 | ||||
| -rw-r--r-- | lang/spidermonkey/patches/patch-ad | 18 |
4 files changed, 27 insertions, 4 deletions
diff --git a/lang/spidermonkey/Makefile b/lang/spidermonkey/Makefile index 8e6f59d1d13..fbc902b17ba 100644 --- a/lang/spidermonkey/Makefile +++ b/lang/spidermonkey/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2006/08/08 09:50:33 tron Exp $ +# $NetBSD: Makefile,v 1.7 2006/08/08 21:08:14 tron Exp $ DISTNAME= js-1.5 PKGNAME= ${DISTNAME:S/js/spidermonkey/} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= lang MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/js/ diff --git a/lang/spidermonkey/buildlink3.mk b/lang/spidermonkey/buildlink3.mk index e9dd6c7503d..7340c1fa041 100644 --- a/lang/spidermonkey/buildlink3.mk +++ b/lang/spidermonkey/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2006/08/08 21:08:14 tron Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SPIDERMONKEY_BUILDLINK3_MK:= ${SPIDERMONKEY_BUILDLINK3_MK}+ @@ -13,7 +13,11 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}spidermonkey .if !empty(SPIDERMONKEY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.spidermonkey+= spidermonkey>=1.5 +.if ${OPSYS} == "Darwin" +BUILDLINK_ABI_DEPENDS.spidermonkey?= spidermonkey>=1.5nb4 +.else BUILDLINK_ABI_DEPENDS.spidermonkey?= spidermonkey>=1.5nb1 +.endif BUILDLINK_PKGSRCDIR.spidermonkey?= ../../lang/spidermonkey .endif # SPIDERMONKEY_BUILDLINK3_MK diff --git a/lang/spidermonkey/distinfo b/lang/spidermonkey/distinfo index 7e988ff255f..b8d529f4fa6 100644 --- a/lang/spidermonkey/distinfo +++ b/lang/spidermonkey/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2006/08/08 09:50:33 tron Exp $ +$NetBSD: distinfo,v 1.5 2006/08/08 21:08:14 tron Exp $ SHA1 (js-1.5.tar.gz) = 707755be3a94207d5d10ccd1011ca00babe0a689 RMD160 (js-1.5.tar.gz) = a1f23d53c259a9fa354f29eecdc1c56472f4f626 @@ -6,3 +6,4 @@ Size (js-1.5.tar.gz) = 958135 bytes SHA1 (patch-aa) = 25de332b3ec78da45727cedf33f695caee416519 SHA1 (patch-ab) = 9f78175b240add7ed2dc3d49c90367c9fa5d16ea SHA1 (patch-ac) = 2a9a4834dcc82dbab04d1bfc9a58c3e2b41f17dc +SHA1 (patch-ad) = 25619a532bcf023bc751fdff7f6694a0ff0b309b diff --git a/lang/spidermonkey/patches/patch-ad b/lang/spidermonkey/patches/patch-ad new file mode 100644 index 00000000000..fd6e9c019c0 --- /dev/null +++ b/lang/spidermonkey/patches/patch-ad @@ -0,0 +1,18 @@ +$NetBSD: patch-ad,v 1.1 2006/08/08 21:08:14 tron Exp $ + +--- rules.mk.orig 2003-11-15 00:11:04.000000000 +0000 ++++ rules.mk 2006-08-08 21:45:40.000000000 +0100 +@@ -115,9 +115,13 @@ + $(RANLIB) $@ + + $(SHARED_LIBRARY): $(LIB_OBJS) ++ifeq ($(OS_ARCH),Darwin) ++ $(MKSHLIB) -o $@ $(LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS) -install_name $(PREFIX)/lib/$(notdir $@) ++else + $(MKSHLIB) -o $@ $(LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS) + endif + endif ++endif + + # Java stuff + $(CLASSDIR)/$(OBJDIR)/$(JARPATH)/%.class: %.java |