Make this build under Mac OS X.

3 files changed, 61 insertions, 6 deletions

diff --git a/lang/spidermonkey/Makefile b/lang/spidermonkey/Makefile
index 5f7fdfb350c..47f515366cc 100644
--- a/lang/spidermonkey/Makefile
+++ b/lang/spidermonkey/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/04 21:29:56 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.5 2006/08/04 13:22:11 tron Exp $
 
 DISTNAME=	js-1.5
 PKGNAME=	${DISTNAME:S/js/spidermonkey/}
@@ -22,13 +21,24 @@ INSTALLATION_DIRS=	bin include lib
 DIST_HEADERS=	jsapi.h jsautocfg.h jscompat.h jslong.h	\
 	       	jsosdep.h jsotypes.h jspubtd.h jstypes.h
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \
+    ${OPSYS} == "DragonFly" || ${OPSYS} == "OpenBSD"
+BUILDDIRPREFIX=	pkgsrc
+.else
+BUILDDIRPREFIX=	${OPSYS}
+.endif
+
 post-extract:
 	${CP} ${FILESDIR}/pkgsrc.mk ${WRKSRC}/config
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pkgsrc_DBG.OBJ/js ${PREFIX}/bin
-	${INSTALL_LIB} ${WRKSRC}/pkgsrc_DBG.OBJ/libjs.so ${PREFIX}/lib
-	${CP} ${WRKSRC}/pkgsrc_DBG.OBJ/jsautocfg.h ${WRKSRC}
+	${INSTALL_PROGRAM} ${WRKSRC}/${BUILDDIRPREFIX}_DBG.OBJ/js \
+	  ${PREFIX}/bin
+	${INSTALL_LIB} ${WRKSRC}/${BUILDDIRPREFIX}_DBG.OBJ/libjs.so \
+	  ${PREFIX}/lib
+	${CP} ${WRKSRC}/${BUILDDIRPREFIX}_DBG.OBJ/jsautocfg.h ${WRKSRC}
 .for f in ${DIST_HEADERS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/include
 .endfor
diff --git a/lang/spidermonkey/distinfo b/lang/spidermonkey/distinfo
index 774d2c5c011..7a9f4219fd7 100644
--- a/lang/spidermonkey/distinfo
+++ b/lang/spidermonkey/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2006/02/26 20:36:58 joerg Exp $
+$NetBSD: distinfo,v 1.3 2006/08/04 13:22:11 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) = 06627df12b3e39a33164257beecff7d8bf89ed6f
 SHA1 (patch-ab) = 9f78175b240add7ed2dc3d49c90367c9fa5d16ea
+SHA1 (patch-ac) = 2a9a4834dcc82dbab04d1bfc9a58c3e2b41f17dc
diff --git a/lang/spidermonkey/patches/patch-ac b/lang/spidermonkey/patches/patch-ac
new file mode 100644
index 00000000000..4aba82c8a24
--- /dev/null
+++ b/lang/spidermonkey/patches/patch-ac
@@ -0,0 +1,44 @@
+$NetBSD: patch-ac,v 1.1 2006/08/04 13:22:11 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
+@@ -43,13 +43,13 @@
+ # Just ripped from Linux config
+ #
+ 
+-CC = cc
++CC = gcc
+ CCC = g++
+-CFLAGS +=  -Wall -Wno-format
++CFLAGS +=  -Wall -Wno-format -no-cpp-precomp -fno-common -pipe
+ OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DDARWIN
+ 
+ RANLIB = ranlib
+-MKSHLIB = libtool $(XMKSHLIBOPTS) -framework System
++MKSHLIB = $(CC) -framework System -dynamiclib $(XMKSHLIBOPTS)
+ 
+ #.c.o:
+ #      $(CC) -c -MD $*.d $(CFLAGS) $<
+@@ -57,7 +57,6 @@
+ CPU_ARCH = $(shell uname -m)
+ ifeq (86,$(findstring 86,$(CPU_ARCH)))
+ CPU_ARCH = x86
+-OS_CFLAGS+= -DX86_LINUX
+ endif
+ GFX_ARCH = x
+ 
+@@ -65,14 +64,6 @@
+ 
+ ASFLAGS += -x assembler-with-cpp
+ 
+-ifeq ($(CPU_ARCH),alpha)
+-
+-# Ask the C compiler on alpha linux to let us work with denormalized
+-# double values, which are required by the ECMA spec.
+-
+-OS_CFLAGS += -mieee
+-endif
+-
+ # Use the editline library to provide line-editing support.
+ JS_EDITLINE = 1
+