Now that spidermonkey 1.8.5 is in ports use that for gjs.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17126 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 4 insertions, 311 deletions

diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index 485a815fa..a19d73f2a 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -1,13 +1,10 @@
-# New ports collection makefile for:   gjs
-# Date created:        14 Aug 2009
-# Whom:                Pawel Worach <pawel.worach@gmail.com>
-#
+# Created by: Pawel Worach <pawel.worach@gmail.com>
 # $FreeBSD$
-#   $MCom: ports/lang/gjs/Makefile,v 1.25 2012/08/17 19:06:44 kwm Exp $
-#
+#   $MCom: ports/lang/gjs/Makefile,v 1.26 2012/09/19 11:49:44 kwm Exp $
 
 PORTNAME=	gjs
 PORTVERSION=	1.32.0
+PORTREVISION=	1
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,7 +13,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME Javascript binding
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
-		spidermonkey>=1.8.5:${PORTSDIR}/lang/spidermonkey
+		spidermonkey==1.8.5:${PORTSDIR}/lang/spidermonkey185
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		cairo:${PORTSDIR}/graphics/cairo \
 		mozjs185.1:${PORTSDIR}/lang/spidermonkey
diff --git a/lang/spidermonkey/Makefile b/lang/spidermonkey/Makefile
deleted file mode 100644
index 542ff450c..000000000
--- a/lang/spidermonkey/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-# Ports collection makefile for:	spidermonkey
-# Date created:		Fri Apr 18, 2003
-# Whom:			Dan Rench <citric@cubicone.tmetic.com>
-#
-# $FreeBSD$
-
-PORTNAME=	spidermonkey
-PORTVERSION=	1.8.5
-CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR=	js
-DISTNAME=	js185-1.0.0
-
-MAINTAINER=	citric@cubicone.tmetic.com
-COMMENT=	A standalone JavaScript interpreter from the Mozilla project
-
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	nspr4.1:${PORTSDIR}/devel/nspr
-
-USE_PERL5_BUILD=yes
-USE_PYTHON_BUILD=2.5-2.7
-USE_GMAKE=	YES
-USE_GNOME=	gnomehack
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-pthreads \
-		--enable-static=no \
-		--enable-threadsafe \
-		--with-system-nspr
-#		--enable-cpp-rtti \
-USE_LDCONFIG=	yes
-
-WRKSRC=		${WRKDIR}/js-${PORTVERSION}/js/src/
-
-OPTIONS=	UTF8 "Treat strings as UTF8 instead of ISO-8859-1" Off
-
-.include <bsd.port.options.mk>
-
-.if defined(WITH_UTF8)
-CFLAGS+=	-DJS_C_STRINGS_ARE_UTF8
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-PLIST_SUB+=	AMD64=""
-.else
-PLIST_SUB+=	AMD64="@comment "
-.endif
-
-.if ${ARCH} == "i386"
-PLIST_SUB+=	I386=""
-.else
-PLIST_SUB+=	I386="@comment "
-.endif
-
-.if ${ARCH} == "arm"
-PLIST_SUB+=	ARM=""
-.else
-PLIST_SUB+=	ARM="@comment "
-.endif
-
-.if ${ARCH} == "mips"
-PLIST_SUB+=	MIPS=""
-.else
-PLIST_SUB+=	MIPS="@comment "
-.endif
-
-.if ${ARCH} == "powerpc" || ${ARCH} == "powerpc64"
-PLIST_SUB+=	PPC=""
-.else
-PLIST_SUB+=	PPC="@comment "
-.endif
-
-.if ${ARCH} == "sparc64"
-PLIST_SUB+=	SPARC=""
-.else
-PLIST_SUB+=	SPARC="@comment "
-.endif
-
-# This comes from bsd.gecko.mk, fixes linking issues on 9.0 and higher.
-post-configure:
-	${ECHO_CMD} "fenv.h" >> ${WRKSRC}/config/system-headers
-	${ECHO_CMD} "pthread_np.h" >> ${WRKSRC}/config/system-headers
-
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/shell/js ${PREFIX}/bin/js
-
-.include <bsd.port.post.mk>
diff --git a/lang/spidermonkey/distinfo b/lang/spidermonkey/distinfo
deleted file mode 100644
index ac820e9f4..000000000
--- a/lang/spidermonkey/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (js185-1.0.0.tar.gz) = 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687
-SIZE (js185-1.0.0.tar.gz) = 6164605
diff --git a/lang/spidermonkey/files/patch-Makefile.in b/lang/spidermonkey/files/patch-Makefile.in
deleted file mode 100644
index ce2c5c6b1..000000000
--- a/lang/spidermonkey/files/patch-Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- Makefile.in.orig	2012-02-26 18:16:19.000000000 +0100
-+++ Makefile.in	2012-02-26 18:16:41.000000000 +0100
-@@ -71,8 +71,8 @@
- DIRS += tests
- endif
- 
--SRCREL_VERSION      = 1.0.0
--SRCREL_ABI_VERSION  := $(word 1,$(subst ., ,$(SRCREL_VERSION))).$(word 2,$(subst ., ,$(SRCREL_VERSION)))
-+SRCREL_VERSION      = 1
-+SRCREL_ABI_VERSION  := 1
- 
- MODULE		    = js
- ifeq (,$(HOST_BIN_SUFFIX))
-@@ -876,10 +876,6 @@
- endif
- 
- install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
--ifneq (,$(LIBRARY))
--	$(SYSINSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
--	mv -f $(DESTDIR)$(libdir)/$(LIBRARY) $(subst $(STATIC_LIBRARY_NAME),mozjs185-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(LIBRARY))
--endif
- ifneq (,$(SHARED_LIBRARY))
- ifeq (,$(HOST_BIN_SUFFIX))
- 	@[ ! -h $(SHLIB_ANY_VER) ] || rm -f $(SHLIB_ANY_VER)
-@@ -888,7 +884,6 @@
- ifeq (,$(HOST_BIN_SUFFIX))
- 	mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
- 	@[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
--	ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
- 	ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
- endif
- endif
diff --git a/lang/spidermonkey/files/patch-configure b/lang/spidermonkey/files/patch-configure
deleted file mode 100644
index f29f68ab4..000000000
--- a/lang/spidermonkey/files/patch-configure
+++ /dev/null
@@ -1,74 +0,0 @@
---- configure.orig	2012-02-19 15:18:58.000000000 +0100
-+++ configure	2012-02-19 15:38:03.000000000 +0100
-@@ -5797,7 +5797,7 @@
-     CPU_ARCH=sparc
-     ;;
- 
--x86_64 | ia64)
-+x86_64 | amd64 | ia64)
-     CPU_ARCH="$OS_TEST"
-     ;;
- 
-@@ -5817,7 +5817,7 @@
- 
- INTEL_ARCHITECTURE=
- case "$OS_TEST" in
--    x86_64|i?86)
-+    x86_64|i?86|amd64)
-       INTEL_ARCHITECTURE=1
- esac
- 
-@@ -6350,7 +6350,7 @@
-     esac
- 
-     case "${host_cpu}" in
--    x86_64)
-+    x86_64|amd64)
-         HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_"
-         ;;
-     esac
-@@ -7303,7 +7303,7 @@
- EOF
- 
- 	;;
--    x86_64-*)
-+    x86_64-*|amd64-*)
-         cat >> confdefs.h <<\EOF
- #define _AMD64_ 1
- EOF
-@@ -7325,7 +7325,7 @@
-     fi
-     ;;
- 
--*-netbsd*)
-+*-netbsd*|*-freebsd*)
-     DSO_CFLAGS=''
-     CFLAGS="$CFLAGS -Dunix"
-     CXXFLAGS="$CXXFLAGS -Dunix"
-@@ -7879,7 +7879,7 @@
- EOF
- 
-     ;;
--x86_64*-*)
-+x86_64*-*|amd64*-*)
-     ENABLE_TRACEJIT=1
-     NANOJIT_ARCH=X64
-     ENABLE_METHODJIT=1
-@@ -8040,7 +8040,7 @@
- EOF
- 
-     ;;
--x86_64*-*)
-+x86_64*-*|amd64*-*)
-     cat >> confdefs.h <<\EOF
- #define AVMPLUS_AMD64 1
- EOF
-@@ -16154,7 +16154,7 @@
-     # autotools can't quite handle an MSVC build environment yet.
-     ac_configure_args="$ac_configure_args LD=link CPP=\"cl -nologo -EP\" SHELL=sh.exe"
-     case "${target_cpu}" in
--    x86_64)
-+    x86_64|amd64)
-       # Need target since MSYS tools into mozilla-build may be 32bit
-       ac_configure_args="$ac_configure_args CC=\"$_topsrcdir/ctypes/libffi/msvcc.sh -m64\" --build=$build --host=$target"
-       ;;
diff --git a/lang/spidermonkey/pkg-descr b/lang/spidermonkey/pkg-descr
deleted file mode 100644
index db4318240..000000000
--- a/lang/spidermonkey/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Spidermonkey is the JavaScript interpreter from the Mozilla project.
-
-WWW: http://www.mozilla.org/js/spidermonkey/
diff --git a/lang/spidermonkey/pkg-plist b/lang/spidermonkey/pkg-plist
deleted file mode 100644
index 6e0a509a3..000000000
--- a/lang/spidermonkey/pkg-plist
+++ /dev/null
@@ -1,105 +0,0 @@
-bin/js
-bin/js-config
-include/js/Allocator.h
-include/js/Assembler.h
-include/js/CodeAlloc.h
-include/js/Containers.h
-include/js/Fragmento.h
-include/js/LIR.h
-include/js/LIRopcode.tbl
-include/js/Native.h
-include/js/NativeCommon.h
-%%ARM%%/include/js/NativeARM.h
-%%MIPS%%/include/js/NativeMIPS.h
-%%PPC%%/include/js/NativePPC.h
-%%SPARC%%/include/js/NativeSparc.h
-%%AMD64%%include/js/NativeX64.h
-%%I386%%include/js/Nativei386.h
-include/js/RegAlloc.h
-include/js/VMPI.h
-include/js/Writer.h
-include/js/avmplus.h
-include/js/js-config.h
-include/js/js.msg
-include/js/jsanalyze.h
-include/js/jsapi.h
-include/js/jsarena.h
-include/js/jsarray.h
-include/js/jsatom.h
-include/js/jsautocfg.h
-include/js/jsautokw.h
-include/js/jsbit.h
-include/js/jsbool.h
-include/js/jsbuiltins.h
-include/js/jscell.h
-include/js/jsclist.h
-include/js/jsclone.h
-include/js/jscntxt.h
-include/js/jscompartment.h
-include/js/jscompat.h
-include/js/jsdate.h
-include/js/jsdbgapi.h
-include/js/jsdhash.h
-include/js/jsdtoa.h
-include/js/jsemit.h
-include/js/jsfriendapi.h
-include/js/jsfun.h
-include/js/jsgc.h
-include/js/jsgcchunk.h
-include/js/jsgcstats.h
-include/js/jshash.h
-include/js/jshashtable.h
-include/js/jshotloop.h
-include/js/jsinterp.h
-include/js/jsinttypes.h
-include/js/jsiter.h
-include/js/jslock.h
-include/js/jslong.h
-include/js/jsmath.h
-include/js/jsobj.h
-include/js/jsobjinlines.h
-include/js/json.h
-include/js/jsopcode.h
-include/js/jsopcode.tbl
-include/js/jsopcodeinlines.h
-include/js/jsotypes.h
-include/js/jsparse.h
-include/js/jsperf.h
-include/js/jsprf.h
-include/js/jsprobes.h
-include/js/jspropertycache.h
-include/js/jspropertycacheinlines.h
-include/js/jspropertytree.h
-include/js/jsproto.tbl
-include/js/jsproxy.h
-include/js/jsprvtd.h
-include/js/jspubtd.h
-include/js/jsreflect.h
-include/js/jsregexp.h
-include/js/jsscan.h
-include/js/jsscope.h
-include/js/jsscript.h
-include/js/jsscriptinlines.h
-include/js/jsstaticcheck.h
-include/js/jsstdint.h
-include/js/jsstr.h
-include/js/jstl.h
-include/js/jstracer.h
-include/js/jstypedarray.h
-include/js/jstypes.h
-include/js/jsutil.h
-include/js/jsval.h
-include/js/jsvalue.h
-include/js/jsvector.h
-include/js/jsversion.h
-include/js/jswrapper.h
-include/js/jsxdrapi.h
-include/js/jsxml.h
-include/js/nanojit.h
-include/js/njconfig.h
-include/js/njcpudetect.h
-include/js/prmjtime.h
-lib/libmozjs185.so
-lib/libmozjs185.so.1
-libdata/pkgconfig/mozjs185.pc
-@dirrm include/js