Index: head/lang/spidermonkey170/Makefile =================================================================== --- head/lang/spidermonkey170/Makefile (revision 431334) +++ head/lang/spidermonkey170/Makefile (revision 431335) @@ -1,85 +1,85 @@ # Created by: Kubilay Kocak # $FreeBSD$ PORTNAME= spidermonkey170 PORTVERSION= 17.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= MOZILLA/js DISTNAME= mozjs${PORTVERSION} MAINTAINER= kwm@FreeBSD.org COMMENT= Standalone JavaScript based from Mozilla 17-esr BUILD_DEPENDS= zip:archivers/zip LIB_DEPENDS= libnspr4.so:devel/nspr CONFLICTS= njs-[0-9]* GNU_CONFIGURE= yes USES= gmake pathfix perl5 python:2,build USE_PERL5= build USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/mozjs${PORTVERSION}/js/src CONFIGURE_ARGS= --with-pthreads \ --with-system-nspr OPTIONS_DEFINE= DEBUG DTRACE GCZEAL JEMALLOC METHODJIT OPTIMIZE READLINE \ THREADSAFE TRACEJIT UTF8 OPTIONS_DEFAULT= METHODJIT OPTIMIZE READLINE THREADSAFE TRACEJIT OPTIONS_SUB= yes DEBUG_CONFIGURE_ENABLE= debug debug-symbols DEBUG_CONFIGURE_DISABLE=debug DTRACE_DESC= Build with DTrace probes # move to bsd.options.desc.mk DTRACE_CONFIGURE_ENABLE=dtrace profiling DTRACE_LIBS= -lelf GCZEAL_DESC= Enable Zealous garbage collecting GCZEAL_CONFIGURE_ENABLE=gczeal JEMALLOC_DESC= Use jemalloc as memory allocator JEMALLOC_CONFIGURE_ENABLE= jemalloc METHODJIT_DESC= Enable method JIT support METHODJIT_CONFIGURE_ENABLE= methodjit OPTIMIZE_DESC= Enable compiler optimizations OPTIMIZE_CONFIGURE_ENABLE= optimize READLINE_DESC= Link js shell to system readline library READLINE_CONFIGURE_ENABLE= readline READLINE_USES= readline THREADSAFE_DESC= Enable multiple thread support THREADSAFE_CONFIGURE_ENABLE= threadsafe TRACEJIT_DESC= Enable tracing JIT support TRACEJIT_CONFIGURE_ENABLE= tracejit UTF8_DESC= Treat strings as UTF8 instead of ISO-8859-1 UTF8_CFLAGS= -DJS_C_STRINGS_ARE_UTF8 .include CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL} .if ${PORT_OPTIONS:MDTRACE} STRIP_CMD= ${TRUE} .endif # ARM needs GCC until https://llvm.org/bugs/show_bug.cgi?id=23244 is fixed .if ${ARCH} == "armv6" USE_GCC= yes .endif regression-test: build @${ECHO_MSG} -n "===> Running jstests.py: " @cd ${WRKSRC} && ${SETENV} TZ=PST8PDT ${PYTHON_CMD} tests/jstests.py \ --no-progress ./js17 .if ${PORT_OPTIONS:MMETHODJIT} || ${PORT_OPTIONS:MTRACEJIT} @${ECHO_MSG} -n "===> Running jit_test.py: " @cd ${WRKSRC} && ${SETENV} TZ=PST8PDT ${PYTHON_CMD} jit-test/jit_test.py \ --no-progress --jitflags=,m,j,mj,mjp,am,amj,amjp,amd ./js17 .endif post-install: ${LN} -s libmozjs-17.0.so ${STAGEDIR}${PREFIX}/lib/libmozjs-17.0.so.1 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/js17 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs-17.0.* .include Index: head/lang/spidermonkey170/files/patch-bug1012971 =================================================================== --- head/lang/spidermonkey170/files/patch-bug1012971 (nonexistent) +++ head/lang/spidermonkey170/files/patch-bug1012971 (revision 431335) @@ -0,0 +1,32 @@ +commit ad6d8397a05a +Author: Dan Gohman +Date: Thu May 22 11:15:06 2014 -0700 + + Bug 1012971 - SpiderMonkey: Fix various warnings. r=nbp +--- + js/public/RootingAPI.h | 4 +++- + js/src/configure.in | 1 + + js/src/jit/IonFrames.h | 17 ++++++++--------- + js/src/jit/MIR.h | 12 +++++------- + js/src/jit/PerfSpewer.cpp | 12 ++++++------ + js/src/jit/RegisterSets.h | 2 +- + js/src/jscntxt.h | 2 +- + js/src/jsgcinlines.h | 4 ++-- + js/src/jsopcode.cpp | 2 +- + js/src/jsscript.cpp | 6 +++--- + js/src/shell/js.cpp | 2 +- + js/src/vm/ArrayBufferObject.h | 16 ++++++++-------- + js/src/vm/TypedArrayObject.cpp | 26 +++++++++++++------------- + 13 files changed, 53 insertions(+), 53 deletions(-) + +--- jsopcode.cpp.orig 2013-02-11 22:33:23 UTC ++++ jsopcode.cpp +@@ -6067,7 +6067,7 @@ ExpressionDecompiler::write(JSString *s) + bool + ExpressionDecompiler::quote(JSString *s, uint32_t quote) + { +- return QuoteString(&sprinter, s, quote) >= 0; ++ return QuoteString(&sprinter, s, quote) != NULL; + } + + JSAtom * Property changes on: head/lang/spidermonkey170/files/patch-bug1012971 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/spidermonkey24/Makefile =================================================================== --- head/lang/spidermonkey24/Makefile (revision 431334) +++ head/lang/spidermonkey24/Makefile (revision 431335) @@ -1,80 +1,80 @@ # Created by: Kubilay Kocak # $FreeBSD$ PORTNAME= spidermonkey24 PORTVERSION= 24.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= MOZILLA/js #http://people.mozilla.org/~sstangl/ DISTNAME= mozjs-${PORTVERSION} MAINTAINER= kwm@FreeBSD.org COMMENT= Standalone JavaScript based from Mozilla 24-esr BUILD_DEPENDS= zip:archivers/zip LIB_DEPENDS= libnspr4.so:devel/nspr CONFLICTS= njs-[0-9]* GNU_CONFIGURE= yes USES= compiler:c++11-lib gmake pathfix perl5 python:2,build \ readline tar:bzip2 USE_PERL5= build USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/mozjs-${PORTVERSION}/js/src CONFIGURE_ARGS= --with-pthreads \ --with-system-nspr OPTIONS_DEFINE= DEBUG GCZEAL JEMALLOC METHODJIT OPTIMIZE READLINE \ THREADSAFE TRACEJIT UTF8 DTRACE OPTIONS_DEFAULT= METHODJIT OPTIMIZE READLINE THREADSAFE TRACEJIT OPTIONS_SUB= yes DEBUG_CONFIGURE_ENABLE= debug debug-symbols DEBUG_CONFIGURE_DISABLE=debug DTRACE_CONFIGURE_ENABLE=dtrace profiling DTRACE_LIBS= -lelf GCZEAL_DESC= Enable Zealous garbage collecting GCZEAL_CONFIGURE_ENABLE=gczeal JEMALLOC_DESC= Use jemalloc as memory allocator JEMALLOC_CONFIGURE_ENABLE= jemalloc METHODJIT_DESC= Enable method JIT support METHODJIT_CONFIGURE_ENABLE= methodjit OPTIMIZE_DESC= Enable compiler optimizations OPTIMIZE_CONFIGURE_ENABLE= optimize READLINE_DESC= Link js shell to system readline library READLINE_CONFIGURE_ENABLE= readline THREADSAFE_DESC= Enable multiple thread support THREADSAFE_CONFIGURE_ENABLE= threadsafe TRACEJIT_DESC= Enable tracing JIT support TRACEJIT_CONFIGURE_ENABLE= tracejit UTF8_DESC= Treat strings as UTF8 instead of ISO-8859-1 UTF8_CFLAGS= -DJS_C_STRINGS_ARE_UTF8 .include .if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} .endif regression-test: build @${ECHO_MSG} -n "===> Running jstests.py: " @cd ${WRKSRC} && ${SETENV} TZ=PST8PDT ${PYTHON_CMD} tests/jstests.py \ --no-progress ./js24 .if ${PORT_OPTIONS:MMETHODJIT} || ${PORT_OPTIONS:MTRACEJIT} @${ECHO_MSG} -n "===> Running jit_test.py: " @cd ${WRKSRC} && ${SETENV} TZ=PST8PDT ${PYTHON_CMD} jit-test/jit_test.py \ --no-progress --jitflags=,m,j,mj,mjp,am,amj,amjp,amd ./js24 .endif post-install: ${LN} -s libmozjs-24.so ${STAGEDIR}${PREFIX}/lib/libmozjs-24.so.1 .if ! ${PORT_OPTIONS:MDTRACE} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/js24 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs-24.* .endif .include Index: head/lang/spidermonkey24/files/patch-bug1012971 =================================================================== --- head/lang/spidermonkey24/files/patch-bug1012971 (nonexistent) +++ head/lang/spidermonkey24/files/patch-bug1012971 (revision 431335) @@ -0,0 +1,32 @@ +commit ad6d8397a05a +Author: Dan Gohman +Date: Thu May 22 11:15:06 2014 -0700 + + Bug 1012971 - SpiderMonkey: Fix various warnings. r=nbp +--- + js/public/RootingAPI.h | 4 +++- + js/src/configure.in | 1 + + js/src/jit/IonFrames.h | 17 ++++++++--------- + js/src/jit/MIR.h | 12 +++++------- + js/src/jit/PerfSpewer.cpp | 12 ++++++------ + js/src/jit/RegisterSets.h | 2 +- + js/src/jscntxt.h | 2 +- + js/src/jsgcinlines.h | 4 ++-- + js/src/jsopcode.cpp | 2 +- + js/src/jsscript.cpp | 6 +++--- + js/src/shell/js.cpp | 2 +- + js/src/vm/ArrayBufferObject.h | 16 ++++++++-------- + js/src/vm/TypedArrayObject.cpp | 26 +++++++++++++------------- + 13 files changed, 53 insertions(+), 53 deletions(-) + +--- jsopcode.cpp.orig 2013-02-11 22:33:23 UTC ++++ jsopcode.cpp +@@ -6067,7 +6067,7 @@ ExpressionDecompiler::write(JSString *s) + bool + ExpressionDecompiler::quote(JSString *s, uint32_t quote) + { +- return QuoteString(&sprinter, s, quote) >= 0; ++ return QuoteString(&sprinter, s, quote) != NULL; + } + + JSAtom * Property changes on: head/lang/spidermonkey24/files/patch-bug1012971 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property