Index: branches/2018Q1/lang/spidermonkey170/Makefile
===================================================================
--- branches/2018Q1/lang/spidermonkey170/Makefile	(revision 458009)
+++ branches/2018Q1/lang/spidermonkey170/Makefile	(revision 458010)
@@ -1,80 +1,80 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=		spidermonkey170
 PORTVERSION=		17.0.0
-PORTREVISION=	7
+PORTREVISION=		8
 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 <bsd.port.pre.mk>
 
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
 
 .if ${PORT_OPTIONS:MDTRACE}
 STRIP_CMD=	${TRUE}
 .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 <bsd.port.post.mk>
Index: branches/2018Q1/lang/spidermonkey170/files/patch-bug894240
===================================================================
--- branches/2018Q1/lang/spidermonkey170/files/patch-bug894240	(nonexistent)
+++ branches/2018Q1/lang/spidermonkey170/files/patch-bug894240	(revision 458010)
@@ -0,0 +1,20 @@
+commit 19a4ba5c90a9
+Author: Mike Hommey <mh+mozilla@glandium.org>
+Date:   Wed Jul 17 16:16:55 2013 +0900
+
+    Bug 894240 - Fix pointer dereference in js::cli::OptionParser::extractValue. r=Waldo
+---
+ js/src/shell/jsoptparse.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- shell/jsoptparse.cpp.orig	2013-02-11 22:33:23 UTC
++++ shell/jsoptparse.cpp
+@@ -243,7 +243,7 @@ OptionParser::extractValue(size_t argc, char **argv, s
+     char *eq = strchr(argv[*i], '=');
+     if (eq) {
+         *value = eq + 1;
+-        if (value[0] == '\0')
++        if (*value[0] == '\0')
+             return error("A value is required for option %.*s", eq - argv[*i], argv[*i]);
+         return Okay;
+     }

Property changes on: branches/2018Q1/lang/spidermonkey170/files/patch-bug894240
___________________________________________________________________
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: branches/2018Q1
===================================================================
--- branches/2018Q1	(revision 458009)
+++ branches/2018Q1	(revision 458010)

Property changes on: branches/2018Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r458008