From 8c117bab0d1641895a6c2fd0d5755766dfed4d50 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 12 Aug 2007 03:04:32 +0000 Subject: Update to 1.60, provided by Blair Sadewitz in private mail. * JS 1.6.0 is based on the same branch (1.8.0.9) as Firefox 1.5.0.9 and includes the same stability and security fixes. * JS 1.6.0 includes support for JavaScript 1.6 with support for E4X, several new Array methods, and Array and String generics. --- lang/spidermonkey/Makefile | 13 +++++++------ lang/spidermonkey/distinfo | 22 +++++++++++++--------- lang/spidermonkey/files/pkgsrc.mk | 2 +- lang/spidermonkey/patches/patch-aa | 19 ++++++++++++++----- lang/spidermonkey/patches/patch-ab | 31 +++++++++++++++++++++++++++++++ lang/spidermonkey/patches/patch-ac | 10 +++++----- lang/spidermonkey/patches/patch-ad | 10 +++++----- lang/spidermonkey/patches/patch-ae | 14 +++++++------- lang/spidermonkey/patches/patch-af | 6 +++--- lang/spidermonkey/patches/patch-ah | 14 ++++++++++++++ lang/spidermonkey/patches/patch-ai | 35 +++++++++++++++++++++++++++++++++++ lang/spidermonkey/patches/patch-aj | 19 +++++++++++++++++++ 12 files changed, 154 insertions(+), 41 deletions(-) create mode 100644 lang/spidermonkey/patches/patch-ab create mode 100644 lang/spidermonkey/patches/patch-ah create mode 100644 lang/spidermonkey/patches/patch-ai create mode 100644 lang/spidermonkey/patches/patch-aj (limited to 'lang') diff --git a/lang/spidermonkey/Makefile b/lang/spidermonkey/Makefile index f005e8710c8..7a871e7ee47 100644 --- a/lang/spidermonkey/Makefile +++ b/lang/spidermonkey/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2007/01/24 19:58:19 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2007/08/12 03:04:32 wiz Exp $ -DISTNAME= js-1.5 +DISTNAME= js-1.60 PKGNAME= ${DISTNAME:S/js/spidermonkey/} -PKGREVISION= 9 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_MOZILLA:=js/} @@ -10,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.mozilla.org/js/spidermonkey/ COMMENT= Standalone JavaScript implementation in C +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/js/src NO_CONFIGURE= yes @@ -49,12 +50,12 @@ post-extract: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${BUILDDIRPREFIX}_OPT.OBJ/js \ - ${PREFIX}/bin + ${DESTDIR}${PREFIX}/bin ${INSTALL_LIB} ${WRKSRC}/${BUILDDIRPREFIX}_OPT.OBJ/libjs.${SO_SUFFIX} \ - ${PREFIX}/lib + ${DESTDIR}${PREFIX}/lib ${CP} ${WRKSRC}/${BUILDDIRPREFIX}_OPT.OBJ/jsautocfg.h ${WRKSRC} .for f in ${DIST_HEADERS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/include .endfor .include "../../devel/nspr/buildlink3.mk" diff --git a/lang/spidermonkey/distinfo b/lang/spidermonkey/distinfo index bab154c23dd..41099ef7a80 100644 --- a/lang/spidermonkey/distinfo +++ b/lang/spidermonkey/distinfo @@ -1,10 +1,14 @@ -$NetBSD: distinfo,v 1.8 2007/01/24 19:35:26 rillig Exp $ +$NetBSD: distinfo,v 1.9 2007/08/12 03:04:32 wiz 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) = f115560c19852b658ee7b008338a42858c5239ef -SHA1 (patch-ad) = 80550041ceb7f067d1b4bca1eb471b5bd6c59a7a -SHA1 (patch-ae) = 22effe11d88ad370074ae547882959f6d1a765bb -SHA1 (patch-af) = a2f144828b85d600eb32c3b024b4ba0f00c44c52 +SHA1 (js-1.60.tar.gz) = db1457c28d2a55080520d7565a2c271eb1599064 +RMD160 (js-1.60.tar.gz) = 630e0f5606d9cc398daa41e71ca3f98c04e3aed2 +Size (js-1.60.tar.gz) = 1081150 bytes +SHA1 (patch-aa) = bdd0e741483c5261837948b288c68d040c95e2a9 +SHA1 (patch-ab) = 1ea712aa7a8d2d48acf4980db3df74f70e616252 +SHA1 (patch-ac) = 75ccc29f5075d95b087b28dba25fb8ee78cee706 +SHA1 (patch-ad) = ca651bfc31b5ad06e45010d40309121c7300807a +SHA1 (patch-ae) = 928b2f441fe026538f3d1281a725dd362d1c11ed +SHA1 (patch-af) = 353a2b119f56974cc1ae0c2a646d014c075eb5fd +SHA1 (patch-ah) = a8a486353bc164cff0ba57efc6ad4e82ff339e3e +SHA1 (patch-ai) = 5835ce03309d45f607a1613062b609e39cc1b974 +SHA1 (patch-aj) = f63d5ef988e3bda111af78f68152019abd0b1ac9 diff --git a/lang/spidermonkey/files/pkgsrc.mk b/lang/spidermonkey/files/pkgsrc.mk index fbfdeed11ab..e2df0b59a9c 100644 --- a/lang/spidermonkey/files/pkgsrc.mk +++ b/lang/spidermonkey/files/pkgsrc.mk @@ -90,4 +90,4 @@ endif JS_READLINE = 1 OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy -OS_CFLAGS += -DPIC -fPIC +OS_CFLAGS += -DPIC -fPIC -DJS_HAVE_LONG_LONG -DHAVE_INTTYPES_H diff --git a/lang/spidermonkey/patches/patch-aa b/lang/spidermonkey/patches/patch-aa index f34a91af6c8..e68a5895ffc 100644 --- a/lang/spidermonkey/patches/patch-aa +++ b/lang/spidermonkey/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2006/08/08 09:50:33 tron Exp $ +$NetBSD: patch-aa,v 1.4 2007/08/12 03:04:32 wiz Exp $ ---- config.mk.orig 2003-11-15 00:10:55.000000000 +0000 -+++ config.mk 2006-08-08 10:35:24.000000000 +0100 -@@ -96,10 +96,26 @@ +--- config.mk.orig 2003-11-14 19:10:55.000000000 -0500 ++++ config.mk +@@ -96,10 +96,26 @@ else ifeq ($(OS_ARCH),Darwin) OS_CONFIG := Darwin else @@ -29,7 +29,16 @@ $NetBSD: patch-aa,v 1.3 2006/08/08 09:50:33 tron Exp $ ASFLAGS = DEFINES = -@@ -126,7 +142,11 @@ +@@ -113,7 +129,7 @@ CP = cp + endif + + ifdef BUILD_OPT +-OPTIMIZER = -O ++#OPTIMIZER = + DEFINES += -UDEBUG -DNDEBUG -UDEBUG_$(shell whoami) + OBJDIR_TAG = _OPT + else +@@ -126,7 +142,11 @@ DEFINES += -DDEBUG -DDEBUG_$(shell wh OBJDIR_TAG = _DBG endif diff --git a/lang/spidermonkey/patches/patch-ab b/lang/spidermonkey/patches/patch-ab new file mode 100644 index 00000000000..ceb69af573b --- /dev/null +++ b/lang/spidermonkey/patches/patch-ab @@ -0,0 +1,31 @@ +$NetBSD: patch-ab,v 1.3 2007/08/12 03:04:33 wiz Exp $ + +--- js.c.orig 2006-11-29 19:34:45.000000000 -0500 ++++ js.c +@@ -900,7 +900,7 @@ SrcNotes(JSContext *cx, JSScript *script + for (sn = notes; !SN_IS_TERMINATOR(sn); sn = SN_NEXT(sn)) { + delta = SN_DELTA(sn); + offset += delta; +- fprintf(gOutFile, "%3u: %5u [%4u] %-8s", ++ fprintf(gOutFile, "%3tu: %5u [%4u] %-8s", + PTRDIFF(sn, notes, jssrcnote), offset, delta, + js_SrcNoteSpec[SN_TYPE(sn)].name); + type = (JSSrcNoteType) SN_TYPE(sn); +@@ -985,7 +985,7 @@ TryNotes(JSContext *cx, JSScript *script + return JS_TRUE; + fprintf(gOutFile, "\nException table:\nstart\tend\tcatch\n"); + while (tn->start && tn->catchStart) { +- fprintf(gOutFile, " %d\t%d\t%d\n", ++ fprintf(gOutFile, " %td\t%td\t%td\n", + tn->start, tn->start + tn->length, tn->catchStart); + tn++; + } +@@ -1205,7 +1205,7 @@ DumpScope(JSContext *cx, JSObject *obj, + DUMP_ATTR(SETTER); + #undef DUMP_ATTR + +- fprintf(fp, " slot %lu flags %x shortid %d\n", ++ fprintf(fp, " slot %u flags %x shortid %d\n", + sprop->slot, sprop->flags, sprop->shortid); + } + } diff --git a/lang/spidermonkey/patches/patch-ac b/lang/spidermonkey/patches/patch-ac index 59428468b7c..c99076c9e63 100644 --- a/lang/spidermonkey/patches/patch-ac +++ b/lang/spidermonkey/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.2 2006/12/05 18:04:18 tron Exp $ +$NetBSD: patch-ac,v 1.3 2007/08/12 03:04:33 wiz Exp $ ---- config/Darwin.mk.orig 2005-02-12 20:10:33.000000000 +0000 -+++ config/Darwin.mk 2006-12-05 16:41:04.000000000 +0000 +--- config/Darwin.mk.orig 2005-02-12 15:10:33.000000000 -0500 ++++ config/Darwin.mk @@ -43,13 +43,13 @@ # Just ripped from Linux config # @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.2 2006/12/05 18:04:18 tron Exp $ #.c.o: # $(CC) -c -MD $*.d $(CFLAGS) $< -@@ -57,7 +57,6 @@ +@@ -57,7 +57,6 @@ MKSHLIB = libtool $(XMKSHLIBOPTS) -frame CPU_ARCH = $(shell uname -m) ifeq (86,$(findstring 86,$(CPU_ARCH))) CPU_ARCH = x86 @@ -28,7 +28,7 @@ $NetBSD: patch-ac,v 1.2 2006/12/05 18:04:18 tron Exp $ endif GFX_ARCH = x -@@ -65,14 +64,6 @@ +@@ -65,14 +64,6 @@ OS_LIBS = -lc -framework System ASFLAGS += -x assembler-with-cpp diff --git a/lang/spidermonkey/patches/patch-ad b/lang/spidermonkey/patches/patch-ad index 1be0a3a9235..bace4749413 100644 --- a/lang/spidermonkey/patches/patch-ad +++ b/lang/spidermonkey/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2006/12/03 10:11:50 xtraeme Exp $ +$NetBSD: patch-ad,v 1.3 2007/08/12 03:04:33 wiz Exp $ ---- rules.mk.orig 2003-11-15 01:11:04.000000000 +0100 -+++ rules.mk 2006-12-02 20:58:07.000000000 +0100 -@@ -58,7 +58,7 @@ +--- rules.mk.orig 2003-11-14 19:11:04.000000000 -0500 ++++ rules.mk +@@ -58,7 +58,7 @@ ifdef USE_MSVC # TARGETS = $(LIBRARY) # $(PROGRAM) not supported for MSVC yet TARGETS += $(SHARED_LIBRARY) $(PROGRAM) # it is now else @@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.2 2006/12/03 10:11:50 xtraeme Exp $ endif all: -@@ -115,9 +115,13 @@ +@@ -115,9 +115,13 @@ $(LIBRARY): $(LIB_OBJS) $(RANLIB) $@ $(SHARED_LIBRARY): $(LIB_OBJS) diff --git a/lang/spidermonkey/patches/patch-ae b/lang/spidermonkey/patches/patch-ae index 6250d669f54..b7f66733ae3 100644 --- a/lang/spidermonkey/patches/patch-ae +++ b/lang/spidermonkey/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1 2006/12/03 10:11:50 xtraeme Exp $ +$NetBSD: patch-ae,v 1.2 2007/08/12 03:04:33 wiz Exp $ ---- Makefile.ref.orig 2003-11-15 01:10:55.000000000 +0100 -+++ Makefile.ref 2006-12-03 11:01:14.000000000 +0100 -@@ -55,8 +55,6 @@ +--- Makefile.ref.orig 2006-08-21 14:58:45.000000000 -0400 ++++ Makefile.ref +@@ -55,8 +55,6 @@ include config.mk ifdef USE_MSVC OTHER_LIBS += fdlibm/$(OBJDIR)/fdlibm.lib @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.1 2006/12/03 10:11:50 xtraeme Exp $ endif ifdef JS_THREADSAFE -@@ -80,7 +78,8 @@ +@@ -80,7 +78,8 @@ endif # # XCFLAGS may be set in the environment or on the gmake command line # @@ -21,7 +21,7 @@ $NetBSD: patch-ae,v 1.1 2006/12/03 10:11:50 xtraeme Exp $ LDFLAGS = $(XLDFLAGS) -@@ -241,12 +240,9 @@ +@@ -248,12 +247,9 @@ JS_CFILES = \ prmjtime.c \ $(NULL) @@ -34,7 +34,7 @@ $NetBSD: patch-ae,v 1.1 2006/12/03 10:11:50 xtraeme Exp $ endif JSMATH_PRELINK = $(OBJDIR)/jsmathtemp.o # Flag for incremental linking -@@ -300,9 +296,9 @@ +@@ -307,9 +303,9 @@ ifdef USE_MSVC $(PROGRAM): $(PROG_OBJS) $(LIBRARY) $(FDLIBM_LIBRARY) link.exe -out:"$@" $(EXE_LINK_FLAGS) $^ else diff --git a/lang/spidermonkey/patches/patch-af b/lang/spidermonkey/patches/patch-af index 2ed72c38af6..88c45b7fca1 100644 --- a/lang/spidermonkey/patches/patch-af +++ b/lang/spidermonkey/patches/patch-af @@ -1,10 +1,10 @@ -$NetBSD: patch-af,v 1.1 2007/01/24 19:35:26 rillig Exp $ +$NetBSD: patch-af,v 1.2 2007/08/12 03:04:33 wiz Exp $ Only define JS_USE_FDLIBM_MATH if the user (generally) or pkgsrc (in this case) hasn't decided. ---- jslibmath.h.orig 2003-11-15 01:10:57.000000000 +0100 -+++ jslibmath.h 2007-01-24 20:38:03.000000000 +0100 +--- jslibmath.h.orig 2005-04-29 09:33:47.000000000 -0400 ++++ jslibmath.h @@ -54,6 +54,7 @@ * by default since there can be problems with endian-ness and such. */ diff --git a/lang/spidermonkey/patches/patch-ah b/lang/spidermonkey/patches/patch-ah new file mode 100644 index 00000000000..8295e32ffd9 --- /dev/null +++ b/lang/spidermonkey/patches/patch-ah @@ -0,0 +1,14 @@ +$NetBSD: patch-ah,v 1.1 2007/08/12 03:04:34 wiz Exp $ + +--- jslock.c.orig 2004-12-08 20:32:19.000000000 -0500 ++++ jslock.c +@@ -193,7 +193,9 @@ js_FinishLock(JSThinLock *tl) + #endif + } + ++#ifndef NSPR_LOCK + static void js_Dequeue(JSThinLock *); ++#endif + + #ifdef DEBUG_SCOPE_COUNT + diff --git a/lang/spidermonkey/patches/patch-ai b/lang/spidermonkey/patches/patch-ai new file mode 100644 index 00000000000..d2054375358 --- /dev/null +++ b/lang/spidermonkey/patches/patch-ai @@ -0,0 +1,35 @@ +$NetBSD: patch-ai,v 1.1 2007/08/12 03:04:34 wiz Exp $ + +--- jsopcode.c.orig 2006-11-29 19:34:45.000000000 -0500 ++++ jsopcode.c +@@ -183,7 +183,7 @@ js_Disassemble1(JSContext *cx, JSScript + case JOF_JUMP: + case JOF_JUMPX: + off = GetJumpOffset(pc, pc); +- fprintf(fp, " %u (%d)", loc + off, off); ++ fprintf(fp, " %tu (%td)", loc + off, off); + break; + + case JOF_CONST: +@@ -214,10 +214,10 @@ js_Disassemble1(JSContext *cx, JSScript + pc2 += JUMP_OFFSET_LEN; + high = GET_JUMP_OFFSET(pc2); + pc2 += JUMP_OFFSET_LEN; +- fprintf(fp, " defaultOffset %d low %d high %d", off, low, high); ++ fprintf(fp, " defaultOffset %td low %d high %d", off, low, high); + for (i = low; i <= high; i++) { + off = GetJumpOffset(pc, pc2); +- fprintf(fp, "\n\t%d: %d", i, off); ++ fprintf(fp, "\n\t%d: %td", i, off); + pc2 += jmplen; + } + len = 1 + pc2 - pc; +@@ -237,7 +237,7 @@ js_Disassemble1(JSContext *cx, JSScript + pc2 += jmplen; + npairs = GET_ATOM_INDEX(pc2); + pc2 += ATOM_INDEX_LEN; +- fprintf(fp, " offset %d npairs %u", off, (uintN) npairs); ++ fprintf(fp, " offset %td npairs %u", off, (uintN) npairs); + while (npairs) { + atom = GET_ATOM(cx, script, pc2); + pc2 += ATOM_INDEX_LEN; diff --git a/lang/spidermonkey/patches/patch-aj b/lang/spidermonkey/patches/patch-aj new file mode 100644 index 00000000000..a913583fc81 --- /dev/null +++ b/lang/spidermonkey/patches/patch-aj @@ -0,0 +1,19 @@ +$NetBSD: patch-aj,v 1.1 2007/08/12 03:04:34 wiz Exp $ + +--- jstypes.h.orig 2005-09-18 00:35:05.000000000 -0400 ++++ jstypes.h +@@ -387,8 +387,14 @@ typedef JSUint8 JSPackedBool; + /* + ** A JSWord is an integer that is the same size as a void* + */ ++#ifndef HAVE_INTTYPES_H + typedef long JSWord; + typedef unsigned long JSUword; ++#else ++#include ++typedef intptr_t JSWord; ++typedef uintptr_t JSUword; ++#endif /* HAVE_INTTYPES_H */ + + #include "jsotypes.h" + -- cgit v1.2.3