Index: lang/spidermonkey/Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/spidermonkey/Makefile,v
retrieving revision 1.28
diff -a -u -r1.28 Makefile
--- lang/spidermonkey/Makefile	22 Dec 2011 10:51:36 -0000	1.28
+++ lang/spidermonkey/Makefile	26 May 2012 12:01:40 -0000
@@ -5,47 +5,34 @@
 # $FreeBSD: ports/lang/spidermonkey/Makefile,v 1.28 2011/12/22 10:51:36 linimon Exp $
 
 PORTNAME=	spidermonkey
-DISTVERSION=	1.7.0
-PORTREVISION=	1
+PORTVERSION=	1.8.5
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	js
-DISTNAME=	js-${DISTVERSION}
+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
 
-CONFLICTS=	njs-[0-9]*
-
-MAKE_ARGS+=	JS_THREADSAFE=YES \
-		PROG_LIBS="-lreadline -ltermcap -lm ${PTHREAD_LIBS}" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CFLAGS+=	-I${LOCALBASE}/include/nspr
-
+USE_PERL5_BUILD=yes
+USE_PYTHON_BUILD=2.5-2.7
 USE_GMAKE=	YES
-MAKEFILE=	Makefile.ref
-ALL_TARGET=	${OPSYS}`${UNAME} -r`_DBG.OBJ/js
-MAKE_ENV+=	CCC="${CXX}"
+USE_GNOME=	gnomehack
+GNU_CONFIGURE=	YES
+CONFIGURE_ARGS=	--with-pthreads \
+		--enable-static=no \
+		--enable-threadsafe \
+		--with-system-nspr
+#		--enable-cpp-rtti \
+#MAKE_ENV+=	BUILD_OPT=1
 USE_LDCONFIG=	yes
-SRC_DIR=	js/src
 
-JSH=		jsapi.h jsarena.h jsarray.h jsatom.h jsautocfg.h jsbool.h \
-		jsclist.h jscntxt.h jscompat.h jsconfig.h jsdate.h jsdhash.h \
-		jsdtoa.h jsemit.h jsexn.h jsfun.h jsgc.h jshash.h jsinterp.h \
-		jsiter.h jslibmath.h jslock.h jslong.h jsmath.h jsnum.h jsobj.h \
-		jsopcode.h jsosdep.h jsotypes.h jsparse.h jsprf.h jsprvtd.h \
-		jspubtd.h jsutil.h jsregexp.h jsscan.h jsscope.h jsscript.h \
-		jsstr.h jstypes.h jsxdrapi.h jsxml.h \
-		js.msg jsproto.tbl
-
-PLIST_FILES=	bin/js lib/libjs.so lib/libjs.so.1 ${JSH:S,^,include/,}
-WRKSRC=		${WRKDIR}/${SRC_DIR}
-EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
-		--exclude js/jsd
+WRKSRC=		${WRKDIR}/js-${PORTVERSION}/js/src/
 
-OPTIONS=	UTF8 "Enable UTF8 support" Off
+OPTIONS=	UTF8 "Treat strings as UTF8 instead of ISO-8859-1" Off
 
 .include <bsd.port.options.mk>
 
@@ -53,23 +40,50 @@
 CFLAGS+=	-DJS_C_STRINGS_ARE_UTF8
 .endif
 
-do-configure:
-	${CP} ${WRKSRC}/config/Linux_All.mk \
-		${WRKSRC}/config/${OPSYS}`${UNAME} -r`.mk && \
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${OPSYS}`${UNAME} -r`_DBG.OBJ/js \
-		${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/${OPSYS}`${UNAME} -r`_DBG.OBJ/libjs.so \
-		${PREFIX}/lib
-	${LN} -sf ${PREFIX}/lib/libjs.so ${PREFIX}/lib/libjs.so.1
-	${CP} ${WRKSRC}/${OPSYS}`${UNAME} -r`_DBG.OBJ/jsautocfg.h ${WRKSRC}
-	@${INSTALL_DATA} ${JSH:S,^,${WRKSRC}/,} ${PREFIX}/include/
-
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "sparc64" && ${OSVERSION} > 900000
-BROKEN=		Does not build on sparc64-9: fails to link
+.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>
Index: lang/spidermonkey/distinfo
===================================================================
RCS file: /home/pcvs/ports/lang/spidermonkey/distinfo,v
retrieving revision 1.11
diff -a -u -r1.11 distinfo
--- lang/spidermonkey/distinfo	3 Jul 2011 13:45:31 -0000	1.11
+++ lang/spidermonkey/distinfo	26 May 2012 12:01:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (js-1.7.0.tar.gz) = 44363f0f3895800ee6010763eae90c0d15ed28e07d783bc7b3c607ce98d8668b
-SIZE (js-1.7.0.tar.gz) = 1165607
+SHA256 (js185-1.0.0.tar.gz) = 5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687
+SIZE (js185-1.0.0.tar.gz) = 6164605
Index: lang/spidermonkey/pkg-plist
===================================================================
RCS file: lang/spidermonkey/pkg-plist
diff -N lang/spidermonkey/pkg-plist
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lang/spidermonkey/pkg-plist	26 May 2012 12:01:40 -0000
@@ -0,0 +1,105 @@
+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
Index: lang/spidermonkey/files/patch-Makefile
===================================================================
RCS file: lang/spidermonkey/files/patch-Makefile
diff -N lang/spidermonkey/files/patch-Makefile
--- lang/spidermonkey/files/patch-Makefile	8 Jul 2008 18:03:31 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
---- Makefile.ref	2006-07-26 21:16:47.000000000 +0200
-+++ Makefile.ref	2008-06-18 17:43:04.000000000 +0200
-@@ -335,8 +335,8 @@
- $(PROGRAM): $(PROG_OBJS) $(LIBRARY)
- 	link.exe -out:"$@" $(EXE_LINK_FLAGS) $^
- else
--$(PROGRAM): $(PROG_OBJS) $(LIBRARY)
--	$(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \
-+$(PROGRAM): $(PROG_OBJS) $(SHARED_LIBRARY)
-+	$(CC) -o $@ $(CFLAGS) $(PROG_OBJS) -L$(OBJDIR) -ljs $(LDFLAGS) $(OTHER_LIBS) \
- 	    $(PROG_LIBS)
- endif
- 
Index: lang/spidermonkey/files/patch-Makefile.in
===================================================================
RCS file: lang/spidermonkey/files/patch-Makefile.in
diff -N lang/spidermonkey/files/patch-Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lang/spidermonkey/files/patch-Makefile.in	26 May 2012 12:01:40 -0000
@@ -0,0 +1,32 @@
+--- 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
Index: lang/spidermonkey/files/patch-config
===================================================================
RCS file: lang/spidermonkey/files/patch-config
diff -N lang/spidermonkey/files/patch-config
--- lang/spidermonkey/files/patch-config	8 Jul 2008 18:03:31 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
---- config/Linux_All.mk	2005-05-10 21:53:44.000000000 +0200
-+++ config/Linux_All.mk	2008-06-18 14:26:06.000000000 +0200
-@@ -41,8 +41,8 @@
- # Config for all versions of Linux
- #
- 
--CC = gcc
--CCC = g++
-+CC ?= gcc
-+CCC ?= g++
- CFLAGS +=  -Wall -Wno-format
- OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
- 
-@@ -74,7 +74,7 @@
- 
- GFX_ARCH = x
- 
--OS_LIBS = -lm -lc
-+OS_LIBS = -lm
- 
- ASFLAGS += -x assembler-with-cpp
- 
-@@ -88,16 +88,12 @@
- 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*
-+ifeq ($(CPU_ARCH),sparc64)
- OS_CFLAGS += -DPIC -fPIC
-+else
-+OS_CFLAGS += -DPIC -fpic
- endif
Index: lang/spidermonkey/files/patch-configure
===================================================================
RCS file: lang/spidermonkey/files/patch-configure
diff -N lang/spidermonkey/files/patch-configure
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lang/spidermonkey/files/patch-configure	26 May 2012 12:01:40 -0000
@@ -0,0 +1,74 @@
+--- 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"
+       ;;
Index: lang/spidermonkey/files/patch-jslock.c
===================================================================
RCS file: lang/spidermonkey/files/patch-jslock.c
diff -N lang/spidermonkey/files/patch-jslock.c
--- lang/spidermonkey/files/patch-jslock.c	8 Jul 2008 18:03:31 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
---- jslock.c	2007-03-29 23:55:35.000000000 +0200
-+++ jslock.c	2008-06-19 16:08:19.000000000 +0200
-@@ -224,7 +224,9 @@
- #endif
- }
- 
-+#ifndef NSPR_LOCK
- static void js_Dequeue(JSThinLock *);
-+#endif
- 
- #ifdef DEBUG_SCOPE_COUNT
- 
Index: lang/spidermonkey/files/patch-jsopcode.c
===================================================================
RCS file: lang/spidermonkey/files/patch-jsopcode.c
diff -N lang/spidermonkey/files/patch-jsopcode.c
--- lang/spidermonkey/files/patch-jsopcode.c	8 Jul 2008 18:03:31 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- jsopcode.c	2007-09-27 20:30:18.000000000 +0200
-+++ jsopcode.c	2008-06-19 16:10:44.000000000 +0200
-@@ -262,7 +262,7 @@
-         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;
Index: lang/spidermonkey/files/patch-jsosdep.h
===================================================================
RCS file: lang/spidermonkey/files/patch-jsosdep.h
diff -N lang/spidermonkey/files/patch-jsosdep.h
--- lang/spidermonkey/files/patch-jsosdep.h	8 Jul 2008 18:03:31 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- jsosdep.h	2006-07-07 04:12:02.000000000 +0200
-+++ jsosdep.h	2008-06-19 16:32:12.000000000 +0200
-@@ -89,7 +89,7 @@
- #elif defined(SOLARIS)
- #define JS_HAVE_LONG_LONG
- 
--#elif defined(FREEBSD)
-+#elif defined(FREEBSD) || defined(__FreeBSD__)
- #define JS_HAVE_LONG_LONG
- 
- #elif defined(SUNOS4)
Index: lang/spidermonkey/files/patch-jsstr.c
===================================================================
RCS file: lang/spidermonkey/files/patch-jsstr.c
diff -N lang/spidermonkey/files/patch-jsstr.c
--- lang/spidermonkey/files/patch-jsstr.c	8 Jul 2008 18:03:31 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- jsstr.c	2006-11-22 09:28:44.000000000 +0100
-+++ jsstr.c	2008-06-19 16:14:49.000000000 +0200
-@@ -1815,6 +1815,8 @@
-     jsint i, j;
-     uint32 len, limit;
- 
-+    bzero(&tmp,sizeof(tmp));
-+
-     str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
-     if (!str)
-         return JS_FALSE;
Index: lang/spidermonkey/files/patch-warnings
===================================================================
RCS file: lang/spidermonkey/files/patch-warnings
diff -N lang/spidermonkey/files/patch-warnings
--- lang/spidermonkey/files/patch-warnings	8 Jul 2008 18:03:31 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,118 +0,0 @@
---- jsdtoa.c	2007-01-18 00:56:12.000000000 +0100
-+++ jsdtoa.c	2008-06-19 16:34:02.000000000 +0200
-@@ -247,7 +247,8 @@
- #define word1(x)        JSDOUBLE_LO32(x)
- #define set_word1(x, y) JSDOUBLE_SET_LO32(x, y)
- 
--#define Storeinc(a,b,c) (*(a)++ = (b) << 16 | (c) & 0xffff)
-+#define Storeinc(a,b,c) (*(a)++ = (b) << 16 | ((c) & 0xffff))
-+
- 
- /* #define P DBL_MANT_DIG */
- /* Ten_pmax = floor(P*log(2)/log(5)) */
---- jspubtd.h	2007-06-23 01:13:21.000000000 +0200
-+++ jspubtd.h	2008-06-19 16:26:08.000000000 +0200
-@@ -616,7 +616,7 @@
- typedef JSBool
- (* JS_DLL_CALLBACK JSArgumentFormatter)(JSContext *cx, const char *format,
-                                         JSBool fromJS, jsval **vpp,
--                                        va_list *app);
-+                                        va_list app);
- #endif
- 
- typedef JSBool
---- jsapi.c	2007-10-03 16:36:48.000000000 +0200
-+++ jsapi.c	2008-06-19 17:17:52.000000000 +0200
-@@ -134,7 +134,7 @@
- 
- static JSBool
- TryArgumentFormatter(JSContext *cx, const char **formatp, JSBool fromJS,
--                     jsval **vpp, va_list *app)
-+                     jsval **vpp, va_list app)
- {
-     const char *format;
-     JSArgumentFormatMap *map;
-@@ -263,8 +263,7 @@
-             break;
-           default:
-             format--;
--            if (!TryArgumentFormatter(cx, &format, JS_TRUE, &sp,
--                                      JS_ADDRESSOF_VA_LIST(ap))) {
-+            if (!TryArgumentFormatter(cx, &format, JS_TRUE, &sp, ap)) {
-                 return JS_FALSE;
-             }
-             /* NB: the formatter already updated sp, so we continue here. */
-@@ -366,8 +365,7 @@
-             break;
-           default:
-             format--;
--            if (!TryArgumentFormatter(cx, &format, JS_FALSE, &sp,
--                                      JS_ADDRESSOF_VA_LIST(ap))) {
-+            if (!TryArgumentFormatter(cx, &format, JS_FALSE, &sp, ap)) {
-                 goto bad;
-             }
-             /* NB: the formatter already updated sp, so we continue here. */
---- js.c	2007-04-20 20:45:18.000000000 +0200
-+++ js.c	2008-06-19 18:17:29.000000000 +0200
-@@ -978,7 +978,7 @@
-                 }
-             }
-         }
--        fprintf(gOutFile, "%3u: %5u [%4u] %-8s",
-+        fprintf(gOutFile, "%3tu: %5u [%4u] %-8s",
-                 PTRDIFF(sn, notes, jssrcnote), offset, delta, name);
-         switch (type) {
-           case SRC_SETLINE:
---- jscntxt.h	2007-04-06 22:53:21.000000000 +0200
-+++ jscntxt.h	2008-06-19 18:36:28.000000000 +0200
-@@ -598,7 +598,7 @@
- 
- #define JS_PUSH_TEMP_ROOT(cx,cnt,arr,tvr)                                     \
-     JS_BEGIN_MACRO                                                            \
--        JS_ASSERT((ptrdiff_t)(cnt) >= 0);                                     \
-+        JS_ASSERT((int)(cnt) >= 0);                                           \
-         (tvr)->count = (ptrdiff_t)(cnt);                                      \
-         (tvr)->u.array = (arr);                                               \
-         JS_PUSH_TEMP_ROOT_COMMON(cx, tvr);                                    \
---- jsxml.c	2007-04-19 04:18:25.000000000 +0200
-+++ jsxml.c	2008-06-19 18:49:44.000000000 +0200
-@@ -1058,7 +1058,10 @@
-             free(array->vector);
-         vector = NULL;
-     } else {
--        if ((size_t)capacity > ~(size_t)0 / sizeof(void *) ||
-+        if ( 
-+#if JS_BITS_PER_WORD == 32 
-+        	(size_t)capacity > ~(size_t)0 / sizeof(void *) ||  
-+#endif
-             !(vector = (void **)
-                        realloc(array->vector, capacity * sizeof(void *)))) {
-             if (cx)
-@@ -1153,7 +1156,10 @@
-                 JS_CEILING_LOG2(log2, capacity);
-                 capacity = JS_BIT(log2);
-             }
--            if ((size_t)capacity > ~(size_t)0 / sizeof(void *) ||
-+            if ( 
-+#if JS_BITS_PER_WORD == 32 
-+                (size_t)capacity > ~(size_t)0 / sizeof(void *) ||  
-+#endif
-                 !(vector = (void **)
-                            realloc(array->vector, capacity * sizeof(void *)))) {
-                 JS_ReportOutOfMemory(cx);
---- jsarray.c	2007-09-29 01:29:52.000000000 +0200
-+++ jsarray.c	2008-06-19 19:12:02.000000000 +0200
-@@ -1051,10 +1051,12 @@
-      * Check that its size does not overflow size_t, which would allow for
-      * indexing beyond the end of the malloc'd vector.
-      */
--    if (len > ((size_t) -1) / sizeof(jsval)) {
-+#if JS_BITS_PER_WORD == 32
-+    if ((size_t)len > ~(size_t)0 / sizeof(jsval)) {
-         JS_ReportOutOfMemory(cx);
-         return JS_FALSE;
-     }
-+#endif
- 
-     vec = (jsval *) JS_malloc(cx, ((size_t) len) * sizeof(jsval));
-     if (!vec)