[105018] trunk/dports/lang
cal at macports.org
cal at macports.org
Sun Apr 7 13:27:13 PDT 2013
Revision: 105018
https://trac.macports.org/changeset/105018
Author: cal at macports.org
Date: 2013-04-07 13:27:13 -0700 (Sun, 07 Apr 2013)
Log Message:
-----------
spidermonkey: update to 1.8.5 in a new port, closes #29446
Modified Paths:
--------------
trunk/dports/lang/spidermonkey185/Portfile
Added Paths:
-----------
trunk/dports/lang/spidermonkey185/
trunk/dports/lang/spidermonkey185/files/patch-DESTDIR.diff
trunk/dports/lang/spidermonkey185/files/patch-includedir.diff
Removed Paths:
-------------
trunk/dports/lang/spidermonkey185/files/patch-config-Darwin.mk
trunk/dports/lang/spidermonkey185/files/patch-jsprf.c
trunk/dports/lang/spidermonkey185/files/spidermonkey-1.5-build.patch
trunk/dports/lang/spidermonkey185/files/spidermonkey-1.5-header.diff
trunk/dports/lang/spidermonkey185/files/spidermonkey-1.5-threadsafe.diff
Modified: trunk/dports/lang/spidermonkey185/Portfile
===================================================================
--- trunk/dports/lang/spidermonkey/Portfile 2013-04-07 15:03:21 UTC (rev 105007)
+++ trunk/dports/lang/spidermonkey185/Portfile 2013-04-07 20:27:13 UTC (rev 105018)
@@ -2,12 +2,10 @@
# $Id$
PortSystem 1.0
-PortGroup muniversal 1.0
-name spidermonkey
-epoch 1
-version 1.7.0
-revision 6
+set js_version 1.8.5
+name spidermonkey[strsed ${js_version} {g/\.//}]
+version 1.0.0
categories lang
platforms darwin
maintainers akitada openmaintainer
@@ -20,57 +18,36 @@
ftp://ftp.mozilla.org/pub/mozilla.org/js/ \
http://ftp.mozilla.org/pub/mozilla.org/js/older-packages/ \
ftp://ftp.mozilla.org/pub/mozilla.org/js/older-packages/
-distname js-${version}
-checksums md5 5571134c3863686b623ebe4e6b1f6fe6 \
- sha1 1a99e8e10cb6600a03ea98895583a8ed42136d1f \
- rmd160 6eadf1ac7c10a13b3db3d499856c9e18ddbcdfdb
+distname js[strsed ${js_version} {g/\.//}]-${version}
+checksums rmd160 23e6ddc81d5b63e015aecc1a104b2d3d3ced5005 \
+ sha256 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687
depends_lib port:nspr \
port:readline
-worksrcdir js/src
+worksrcdir js-${js_version}/js/src
-patchfiles spidermonkey-1.5-build.patch \
- spidermonkey-1.5-threadsafe.diff \
- spidermonkey-1.5-header.diff \
- patch-config-Darwin.mk \
- patch-jsprf.c
+patchfiles patch-DESTDIR.diff \
+ patch-includedir.diff
-post-patch {
- reinplace "s|__PREFIX__|${prefix}|g" \
- ${worksrcpath}/Makefile.ref
- reinplace "s|__USER__|${install.user}|g" \
- ${worksrcpath}/Makefile.ref
- reinplace "s|__GROUP__|${install.group}|g" \
- ${worksrcpath}/Makefile.ref
-}
+configure.args --enable-readline \
+ --enable-threadsafe \
+ --enable-macos-target=${macosx_deployment_target} \
+ --with-system-nspr
-use_configure no
+test.run yes
+test.target check
-use_parallel_build no
-
-build.args -f Makefile.ref \
- LIBDIR="/lib" \
- SO_SUFFIX=dylib \
- JS_THREADSAFE=1 \
- JS_READLINE=1
-
-if { ![variant_isset universal] } {
- build.args-append CC='${configure.cc} -arch ${build_arch}'
-} else {
- set merger_must_run_binaries "yes"
- foreach arch {i386 x86_64 ppc ppc64} {
- lappend merger_build_args(${arch}) CC='${configure.cc} -arch ${arch}'
- }
+post-destroot {
+ # The script name is not versioned so it would conflict with other
+ # spidermonkey versions. And the script isn't generated correctly on Darwin
+ # anyway: https://developer.mozilla.org/en/SpiderMonkey/1.8.5#js-config
+ # Programs should use "pkg-config mozjs185" instead of js-config.
+ delete ${destroot}${prefix}/bin/js-config
}
-variant fileobject description {add File object support} {
- build.args-append \
- JS_HAS_FILE_OBJECT=1
-}
+universal_variant no
-destroot.args -f Makefile.ref LIBDIR="/lib" SO_SUFFIX=dylib
-
livecheck.type regex
livecheck.url http://ftp.mozilla.org/pub/mozilla.org/js/
-livecheck.regex {js-(\d+(?:\.\d+){2,})\.}
+livecheck.regex js[strsed ${js_version} {g/\.//}]-(\[0-9.\]+)${extract.suffix}
Added: trunk/dports/lang/spidermonkey185/files/patch-DESTDIR.diff
===================================================================
--- trunk/dports/lang/spidermonkey185/files/patch-DESTDIR.diff (rev 0)
+++ trunk/dports/lang/spidermonkey185/files/patch-DESTDIR.diff 2013-04-07 20:27:13 UTC (rev 105018)
@@ -0,0 +1,24 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2012-01-07
+Initial Package Version: 1.0.0
+Upstream Status: unknown
+Origin: see below
+Description: Fixes symlinks on libmozjs185.so when DESTDIR is used,
+so that they do not point to the build tree.
+
+# See discussion in https://bugzilla.mozilla.org/show_bug.cgi?id=628723
+# Patch created by Colin Walters <walters at verbum.org>
+
+--- Makefile.in.orig 2011-03-31 20:08:36.000000000 +0100
++++ Makefile.in 2012-01-07 02:22:58.000000000 +0000
+@@ -888,8 +888,8 @@
+ 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)
++ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER)
++ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER)
+ endif
+ endif
+ ifneq (,$(IMPORT_LIBRARY))
Deleted: trunk/dports/lang/spidermonkey185/files/patch-config-Darwin.mk
===================================================================
--- trunk/dports/lang/spidermonkey/files/patch-config-Darwin.mk 2013-04-07 15:03:21 UTC (rev 105007)
+++ trunk/dports/lang/spidermonkey185/files/patch-config-Darwin.mk 2013-04-07 20:27:13 UTC (rev 105018)
@@ -1,43 +0,0 @@
---- config/Darwin.mk.orig 2008-03-27 00:54:53.000000000 +0900
-+++ config/Darwin.mk 2008-03-27 00:57:23.000000000 +0900
-@@ -43,13 +43,13 @@
- # Just ripped from Linux config
- #
-
--CC = cc
-+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 = -DJS_THREADSAFE -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DDARWIN -DJS_C_STRINGS_ARE_UTF8
-
- RANLIB = ranlib
--MKSHLIB = $(CC) -dynamiclib $(XMKSHLIBOPTS) -framework System
-+MKSHLIB = $(CC) -framework System -dynamiclib $(XMKSHLIBOPTS) -lm -lplds4 -lplc4 -lnspr4 $(LDFLAGS)
-
- SO_SUFFIX = dylib
-
-@@ -59,7 +59,6 @@
- CPU_ARCH = $(shell uname -m)
- ifeq (86,$(findstring 86,$(CPU_ARCH)))
- CPU_ARCH = x86
--OS_CFLAGS+= -DX86_LINUX
- endif
- GFX_ARCH = x
-
-@@ -67,14 +66,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
-
Added: trunk/dports/lang/spidermonkey185/files/patch-includedir.diff
===================================================================
--- trunk/dports/lang/spidermonkey185/files/patch-includedir.diff (rev 0)
+++ trunk/dports/lang/spidermonkey185/files/patch-includedir.diff 2013-04-07 20:27:13 UTC (rev 105018)
@@ -0,0 +1,19 @@
+--- Makefile.in.orig 2011-03-31 14:08:36.000000000 -0500
++++ Makefile.in 2012-05-19 17:51:45.000000000 -0500
+@@ -74,7 +74,7 @@
+ SRCREL_VERSION = 1.0.0
+ SRCREL_ABI_VERSION := $(word 1,$(subst ., ,$(SRCREL_VERSION))).$(word 2,$(subst ., ,$(SRCREL_VERSION)))
+
+-MODULE = js
++MODULE = mozjs185
+ ifeq (,$(HOST_BIN_SUFFIX))
+ LIBRARY_NAME = mozjs185
+ else
+--- mozjs185.pc.in.orig 2011-03-31 14:08:36.000000000 -0500
++++ mozjs185.pc.in 2012-05-19 17:37:45.000000000 -0500
+@@ -7,4 +7,4 @@
+ Version: %MOZILLA_VERSION%
+ Requires: nspr >= 4.7
+ Libs: -L${libdir} -lmozjs185
+-Cflags: -I${includedir}/js
++Cflags: -I${includedir}/mozjs185
Deleted: trunk/dports/lang/spidermonkey185/files/patch-jsprf.c
===================================================================
--- trunk/dports/lang/spidermonkey/files/patch-jsprf.c 2013-04-07 15:03:21 UTC (rev 105007)
+++ trunk/dports/lang/spidermonkey185/files/patch-jsprf.c 2013-04-07 20:27:13 UTC (rev 105018)
@@ -1,11 +0,0 @@
---- jsprf.c.orig 2009-07-26 12:32:01.000000000 -0700
-+++ jsprf.c 2009-07-26 12:33:12.000000000 -0700
-@@ -58,6 +58,8 @@
- */
- #ifdef HAVE_VA_COPY
- #define VARARGS_ASSIGN(foo, bar) VA_COPY(foo,bar)
-+#elif defined(va_copy)
-+#define VARARGS_ASSIGN(foo, bar) va_copy(foo,bar)
- #elif defined(HAVE_VA_LIST_AS_ARRAY)
- #define VARARGS_ASSIGN(foo, bar) foo[0] = bar[0]
- #else
Deleted: trunk/dports/lang/spidermonkey185/files/spidermonkey-1.5-build.patch
===================================================================
--- trunk/dports/lang/spidermonkey/files/spidermonkey-1.5-build.patch 2013-04-07 15:03:21 UTC (rev 105007)
+++ trunk/dports/lang/spidermonkey185/files/spidermonkey-1.5-build.patch 2013-04-07 20:27:13 UTC (rev 105018)
@@ -1,140 +0,0 @@
---- Makefile.ref.org
-+++ Makefile.ref
-@@ -127,7 +127,7 @@ endif
- ifdef JS_READLINE
- # For those platforms with the readline library installed.
- DEFINES += -DEDITLINE
--PROG_LIBS += -lreadline -ltermcap
-+PROG_LIBS += -lreadline
- else
- ifdef JS_EDITLINE
- # Use the editline library, built locally.
-@@ -370,3 +370,18 @@ TARFILES = files `cat files`
- SUFFIXES: .i
- %.i: %.c
- $(CC) -C -E $(CFLAGS) $< > $*.i
-+
-+DESTDIR :=
-+PREFIX := __PREFIX__
-+BINDIR := $(PREFIX)/bin
-+MY_LIBDIR := $(PREFIX)/$(LIBDIR)
-+INCLUDEDIR := $(PREFIX)/include/js
-+USER := __USER__
-+GROUP := __GROUP__
-+INSTALL := install -g $(GROUP) -o $(USER)
-+install:
-+ $(INSTALL) -m 755 -d $(DESTDIR)$(INCLUDEDIR) $(DESTDIR)$(MY_LIBDIR) $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DESTDIR)$(MY_LIBDIR)
-+ $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(MY_LIBDIR)
-+ $(INSTALL) -m 755 $(OBJDIR)/js $(OBJDIR)/jscpucfg $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 644 $(HFILES) $(DESTDIR)$(INCLUDEDIR)
---- config/Linux_All.mk.org
-+++ config/Linux_All.mk
-@@ -41,37 +41,15 @@
- # Config for all versions of Linux
- #
-
--CC = gcc
--CCC = g++
- CFLAGS += -Wall -Wno-format
- OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
-
- RANLIB = echo
--MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS)
-+MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS) -soname $(notdir $@)
-
- #.c.o:
- # $(CC) -c -MD $*.d $(CFLAGS) $<
-
--CPU_ARCH = $(shell uname -m)
--# don't filter in x86-64 architecture
--ifneq (x86_64,$(CPU_ARCH))
--ifeq (86,$(findstring 86,$(CPU_ARCH)))
--CPU_ARCH = x86
--OS_CFLAGS+= -DX86_LINUX
--
--ifeq (gcc, $(CC))
--# if using gcc on x86, check version for opt bug
--# (http://bugzilla.mozilla.org/show_bug.cgi?id=24892)
--GCC_VERSION := $(shell gcc -v 2>&1 | grep version | awk '{ print $$3 }')
--GCC_LIST:=$(sort 2.91.66 $(GCC_VERSION) )
--
--ifeq (2.91.66, $(firstword $(GCC_LIST)))
--CFLAGS+= -DGCC_OPT_BUG
--endif
--endif
--endif
--endif
--
- GFX_ARCH = x
-
- OS_LIBS = -lm -lc
-@@ -88,16 +66,6 @@
- endif
-
- # Use the editline library to provide line-editing support.
--JS_EDITLINE = 1
-+JS_READLINE = 1
-
--ifeq ($(CPU_ARCH),x86_64)
--# Use VA_COPY() standard macro on x86-64
--# FIXME: better use it everywhere
- OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
--endif
--
--ifeq ($(CPU_ARCH),x86_64)
--# We need PIC code for shared libraries
--# FIXME: better patch rules.mk & fdlibm/Makefile*
--OS_CFLAGS += -DPIC -fPIC
--endif
---- rules.mk.org
-+++ rules.mk
-@@ -82,6 +82,10 @@ $(OBJDIR)/%.o: %.c
- @$(MAKE_OBJDIR)
- $(CC) -o $@ -c $(CFLAGS) $*.c
-
-+$(OBJDIR)/%.lo: %.c
-+ @$(MAKE_OBJDIR)
-+ $(CC) -o $@ -c $(CFLAGS) $*.c -fPIC
-+
- $(OBJDIR)/%.o: %.s
- @$(MAKE_OBJDIR)
- $(AS) -o $@ $(ASFLAGS) $*.s
-@@ -111,11 +115,12 @@ $(SHARED_LIBRARY): $(LIB_OBJS)
- /implib:"$(OBJDIR)/$(@F:.dll=.lib)" $^
- else
- $(LIBRARY): $(LIB_OBJS)
-- $(AR) rv $@ $?
-+ $(AR) cr $@ $?
- $(RANLIB) $@
-
--$(SHARED_LIBRARY): $(LIB_OBJS)
-- $(MKSHLIB) -o $@ $(LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS)
-+SHARED_LIB_OBJS := $(LIB_OBJS:.o=.lo)
-+$(SHARED_LIBRARY): $(SHARED_LIB_OBJS)
-+ $(MKSHLIB) -o $@ $(SHARED_LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS) -install_name $(PREFIX)/lib/$(notdir $@)
- endif
- endif
-
---- fdlibm/Makefile.ref.org
-+++ fdlibm/Makefile.ref
-@@ -151,7 +151,7 @@
-
- $(OBJDIR)/%.o: %.c
- @$(MAKE_OBJDIR)
-- $(CC) -o $@ -c $(CFLAGS) $*.c
-+ $(CC) -o $@ -c $(CFLAGS) $*.c -fPIC
-
- $(OBJDIR)/%.o: %.s
- @$(MAKE_OBJDIR)
---- config.mk.org
-+++ config.mk
-@@ -112,6 +112,8 @@
- CP = cp
- endif
-
-+BUILD_OPT := 1
-+
- ifdef BUILD_OPT
- OPTIMIZER = -O
- DEFINES += -UDEBUG -DNDEBUG -UDEBUG_$(shell whoami)
Deleted: trunk/dports/lang/spidermonkey185/files/spidermonkey-1.5-header.diff
===================================================================
--- trunk/dports/lang/spidermonkey/files/spidermonkey-1.5-header.diff 2013-04-07 15:03:21 UTC (rev 105007)
+++ trunk/dports/lang/spidermonkey185/files/spidermonkey-1.5-header.diff 2013-04-07 20:27:13 UTC (rev 105018)
@@ -1,11 +0,0 @@
---- Makefile.ref.org 2006-08-21 11:58:45.000000000 -0700
-+++ Makefile.ref 2007-01-08 14:05:14.000000000 -0800
-@@ -185,6 +185,8 @@
- jsstr.h \
- jsxdrapi.h \
- jsxml.h \
-+ jsutil.h \
-+ jsprf.h \
- $(NULL)
-
- API_HFILES = \
Deleted: trunk/dports/lang/spidermonkey185/files/spidermonkey-1.5-threadsafe.diff
===================================================================
--- trunk/dports/lang/spidermonkey/files/spidermonkey-1.5-threadsafe.diff 2013-04-07 15:03:21 UTC (rev 105007)
+++ trunk/dports/lang/spidermonkey185/files/spidermonkey-1.5-threadsafe.diff 2013-04-07 20:27:13 UTC (rev 105018)
@@ -1,16 +0,0 @@
---- Makefile.ref.orig 2008-03-27 00:51:10.000000000 +0900
-+++ Makefile.ref 2008-03-27 00:52:01.000000000 +0900
-@@ -63,11 +63,11 @@
-
- ifdef JS_THREADSAFE
- DEFINES += -DJS_THREADSAFE
--INCLUDES += -I$(DIST)/include/nspr
-+INCLUDES += -I__PREFIX__/include/nspr
- ifdef USE_MSVC
- OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib
- else
--OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX)
-+OTHER_LIBS += -L__PREFIX__/lib/nspr -lnspr$(NSPR_LIBSUFFIX)
- endif
- endif
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130407/f1679c0e/attachment.html>
More information about the macports-changes
mailing list