[pkgsrc/trunk]: pkgsrc/lang/spidermonkey Add thread support for Mac OS X. Bum...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/be723e895a87
branches:  trunk
changeset: 522201:be723e895a87
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Dec 05 18:04:18 2006 +0000

description:
Add thread support for Mac OS X. Bump package revision.

diffstat:

 lang/spidermonkey/Makefile         |  4 ++--
 lang/spidermonkey/buildlink3.mk    |  6 +++++-
 lang/spidermonkey/distinfo         |  4 ++--
 lang/spidermonkey/patches/patch-ac |  9 +++++----
 4 files changed, 14 insertions(+), 9 deletions(-)

diffs (79 lines):

diff -r ab5575675941 -r be723e895a87 lang/spidermonkey/Makefile
--- a/lang/spidermonkey/Makefile        Tue Dec 05 17:43:43 2006 +0000
+++ b/lang/spidermonkey/Makefile        Tue Dec 05 18:04:18 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2006/12/05 16:31:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2006/12/05 18:04:18 tron Exp $
 
 DISTNAME=      js-1.5
 PKGNAME=       ${DISTNAME:S/js/spidermonkey/}
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=js/}
 
diff -r ab5575675941 -r be723e895a87 lang/spidermonkey/buildlink3.mk
--- a/lang/spidermonkey/buildlink3.mk   Tue Dec 05 17:43:43 2006 +0000
+++ b/lang/spidermonkey/buildlink3.mk   Tue Dec 05 18:04:18 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/12/03 10:11:49 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/12/05 18:04:18 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.5nb6
+.else
+BUILDLINK_ABI_DEPENDS.spidermonkey?=   spidermonkey>=1.5nb8
+.endif
 BUILDLINK_PKGSRCDIR.spidermonkey?=     ../../lang/spidermonkey
 .endif # SPIDERMONKEY_BUILDLINK3_MK
 
diff -r ab5575675941 -r be723e895a87 lang/spidermonkey/distinfo
--- a/lang/spidermonkey/distinfo        Tue Dec 05 17:43:43 2006 +0000
+++ b/lang/spidermonkey/distinfo        Tue Dec 05 18:04:18 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2006/12/03 10:11:49 xtraeme Exp $
+$NetBSD: distinfo,v 1.7 2006/12/05 18:04:18 tron Exp $
 
 SHA1 (js-1.5.tar.gz) = 707755be3a94207d5d10ccd1011ca00babe0a689
 RMD160 (js-1.5.tar.gz) = a1f23d53c259a9fa354f29eecdc1c56472f4f626
 Size (js-1.5.tar.gz) = 958135 bytes
 SHA1 (patch-aa) = 25de332b3ec78da45727cedf33f695caee416519
-SHA1 (patch-ac) = 2a9a4834dcc82dbab04d1bfc9a58c3e2b41f17dc
+SHA1 (patch-ac) = f115560c19852b658ee7b008338a42858c5239ef
 SHA1 (patch-ad) = 80550041ceb7f067d1b4bca1eb471b5bd6c59a7a
 SHA1 (patch-ae) = 22effe11d88ad370074ae547882959f6d1a765bb
diff -r ab5575675941 -r be723e895a87 lang/spidermonkey/patches/patch-ac
--- a/lang/spidermonkey/patches/patch-ac        Tue Dec 05 17:43:43 2006 +0000
+++ b/lang/spidermonkey/patches/patch-ac        Tue Dec 05 18:04:18 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2006/08/04 13:22:11 tron Exp $
+$NetBSD: patch-ac,v 1.2 2006/12/05 18:04:18 tron Exp $
 
 --- config/Darwin.mk.orig      2005-02-12 20:10:33.000000000 +0000
-+++ config/Darwin.mk   2006-08-04 13:58:18.000000000 +0100
++++ config/Darwin.mk   2006-12-05 16:41:04.000000000 +0000
 @@ -43,13 +43,13 @@
  # Just ripped from Linux config
  #
@@ -10,12 +10,13 @@
 +CC = gcc
  CCC = g++
 -CFLAGS +=  -Wall -Wno-format
+-OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DDARWIN
 +CFLAGS +=  -Wall -Wno-format -no-cpp-precomp -fno-common -pipe
- OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DDARWIN
++OS_CFLAGS = -DJS_THREADSAFE -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DDARWIN
  
  RANLIB = ranlib
 -MKSHLIB = libtool $(XMKSHLIBOPTS) -framework System
-+MKSHLIB = $(CC) -framework System -dynamiclib $(XMKSHLIBOPTS)
++MKSHLIB = $(CC) -framework System -dynamiclib $(XMKSHLIBOPTS) -lm -lplds4 -lplc4 -lnspr4 $(LDFLAGS)
  
  #.c.o:
  #      $(CC) -c -MD $*.d $(CFLAGS) $<