[pkgsrc/trunk]: pkgsrc/lang/spidermonkey Fix broken shared library build unde...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/87dd40a6a65d
branches:  trunk
changeset: 517329:87dd40a6a65d
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Aug 08 21:08:14 2006 +0000

description:
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.

diffstat:

 lang/spidermonkey/Makefile         |   4 ++--
 lang/spidermonkey/buildlink3.mk    |   6 +++++-
 lang/spidermonkey/distinfo         |   3 ++-
 lang/spidermonkey/patches/patch-ad |  18 ++++++++++++++++++
 4 files changed, 27 insertions(+), 4 deletions(-)

diffs (71 lines):

diff -r 50fee5d89afc -r 87dd40a6a65d lang/spidermonkey/Makefile
--- a/lang/spidermonkey/Makefile        Tue Aug 08 19:55:21 2006 +0000
+++ b/lang/spidermonkey/Makefile        Tue Aug 08 21:08:14 2006 +0000
@@ -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 -r 50fee5d89afc -r 87dd40a6a65d lang/spidermonkey/buildlink3.mk
--- a/lang/spidermonkey/buildlink3.mk   Tue Aug 08 19:55:21 2006 +0000
+++ b/lang/spidermonkey/buildlink3.mk   Tue Aug 08 21:08:14 2006 +0000
@@ -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 @@
 
 .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 -r 50fee5d89afc -r 87dd40a6a65d lang/spidermonkey/distinfo
--- a/lang/spidermonkey/distinfo        Tue Aug 08 19:55:21 2006 +0000
+++ b/lang/spidermonkey/distinfo        Tue Aug 08 21:08:14 2006 +0000
@@ -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 @@
 SHA1 (patch-aa) = 25de332b3ec78da45727cedf33f695caee416519
 SHA1 (patch-ab) = 9f78175b240add7ed2dc3d49c90367c9fa5d16ea
 SHA1 (patch-ac) = 2a9a4834dcc82dbab04d1bfc9a58c3e2b41f17dc
+SHA1 (patch-ad) = 25619a532bcf023bc751fdff7f6694a0ff0b309b
diff -r 50fee5d89afc -r 87dd40a6a65d lang/spidermonkey/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/spidermonkey/patches/patch-ad        Tue Aug 08 21:08:14 2006 +0000
@@ -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