spidermonkey17: remove obsolete and unused package

23 files changed, 1 insertions, 514 deletions

diff --git a/lang/Makefile b/lang/Makefile
index d07180fc0a2..e29175baacf 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.476 2018/04/29 05:11:35 wiz Exp $
+# $NetBSD: Makefile,v 1.477 2018/04/29 05:55:14 wiz Exp $
 #
 
 COMMENT=	Programming languages
@@ -240,7 +240,6 @@ SUBDIR+=	smlnj
 SUBDIR+=	smlnj11072
 SUBDIR+=	snobol
 SUBDIR+=	spidermonkey
-SUBDIR+=	spidermonkey17
 SUBDIR+=	spidermonkey185
 SUBDIR+=	spidermonkey52
 SUBDIR+=	spl
diff --git a/lang/spidermonkey17/DESCR b/lang/spidermonkey17/DESCR
deleted file mode 100644
index f69433e9e47..00000000000
--- a/lang/spidermonkey17/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-SpiderMonkey is the code-name for the Mozilla's C implementation of JavaScript.
-This package contains SpiderMonkey 17.
diff --git a/lang/spidermonkey17/Makefile b/lang/spidermonkey17/Makefile
deleted file mode 100644
index 26db9cc0fb5..00000000000
--- a/lang/spidermonkey17/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2018/03/21 12:04:30 fhajny Exp $
-
-DISTNAME=	mozjs17.0.0
-PKGNAME=	${DISTNAME:S/mozjs/spidermonkey17-/}
-PKGREVISION=	1
-CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_MOZILLA:=js/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://developer.mozilla.org/en/SpiderMonkey
-COMMENT=	Standalone JavaScript implementation in C
-LICENSE=	mpl-2.0
-
-# Spidermonkey never worked here and unlikely will
-# https://bugzilla.mozilla.org/show_bug.cgi?id=577056
-BROKEN_ON_PLATFORM=	SunOS-*-x86_64
-
-MAKE_JOBS_SAFE=	no
-
-GNU_CONFIGURE=	yes
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	pkg-config perl gmake
-
-CONFIGURE_ARGS+=	--with-system-nspr
-CONFIGURE_ARGS+=	--with-system-zlib
-CONFIGURE_ARGS+=	--with-pthreads
-CONFIGURE_ARGS+=	--enable-threadsafe
-CONFIGURE_ARGS+=	--enable-system-ffi
-
-CONFIGURE_DIRS=		js/src
-
-PKGCONFIG_OVERRIDE+=	js/src/ctypes/libffi/libffi.pc.in
-PKGCONFIG_OVERRIDE+=	js/src/js.pc.in
-
-TEST_TARGET=		check
-
-.include "../../mk/bsd.prefs.mk"
-
-post-install:
-.if ${OPSYS} == "Darwin"
-	install_name_tool -id ${PREFIX}/lib/libmozjs-17.0.dylib \
-		${DESTDIR}${PREFIX}/lib/libmozjs-17.0.dylib
-.endif
-	${CHMOD} -x ${DESTDIR}${PREFIX}/include/js-17.0/*.*
-	${CHMOD} -x ${DESTDIR}${PREFIX}/include/js-17.0/*/*.*
-	${CHMOD} -x ${DESTDIR}${PREFIX}/lib/libmozjs-17.0.a
-	${CHMOD} -x ${DESTDIR}${PREFIX}/lib/pkgconfig/mozjs-17.0.pc
-
-PYTHON_VERSIONS_ACCEPTED=	27
-PYTHON_FOR_BUILD_ONLY=	yes
-.include "../../lang/python/tool.mk"
-.include "../../devel/libffi/buildlink3.mk"
-.include "../../devel/nspr/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/spidermonkey17/PLIST b/lang/spidermonkey17/PLIST
deleted file mode 100644
index 40fdab126dd..00000000000
--- a/lang/spidermonkey17/PLIST
+++ /dev/null
@@ -1,68 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2016/05/20 18:45:22 youri Exp $
-bin/js17
-bin/js17-config
-include/js-17.0/ds/BitArray.h
-include/js-17.0/gc/Barrier.h
-include/js-17.0/gc/Heap.h
-include/js-17.0/gc/Root.h
-include/js-17.0/gc/Statistics.h
-include/js-17.0/gc/StoreBuffer.h
-include/js-17.0/js-config.h
-include/js-17.0/js.msg
-include/js-17.0/js/HashTable.h
-include/js-17.0/js/LegacyIntTypes.h
-include/js-17.0/js/MemoryMetrics.h
-include/js-17.0/js/RequiredDefines.h
-include/js-17.0/js/TemplateLib.h
-include/js-17.0/js/Utility.h
-include/js-17.0/js/Vector.h
-include/js-17.0/jsalloc.h
-include/js-17.0/jsapi.h
-include/js-17.0/jsatom.h
-include/js-17.0/jsatom.tbl
-include/js-17.0/jsclass.h
-include/js-17.0/jsclist.h
-include/js-17.0/jscpucfg.h
-include/js-17.0/jsdbgapi.h
-include/js-17.0/jsdhash.h
-include/js-17.0/jsfriendapi.h
-include/js-17.0/jsgc.h
-include/js-17.0/jslock.h
-include/js-17.0/json.h
-include/js-17.0/jsperf.h
-include/js-17.0/jsprf.h
-include/js-17.0/jsproto.tbl
-include/js-17.0/jsproxy.h
-include/js-17.0/jsprvtd.h
-include/js-17.0/jspubtd.h
-include/js-17.0/jstypes.h
-include/js-17.0/jsutil.h
-include/js-17.0/jsval.h
-include/js-17.0/jsversion.h
-include/js-17.0/jswrapper.h
-include/js-17.0/mozilla/Assertions.h
-include/js-17.0/mozilla/Attributes.h
-include/js-17.0/mozilla/BloomFilter.h
-include/js-17.0/mozilla/CheckedInt.h
-include/js-17.0/mozilla/Constants.h
-include/js-17.0/mozilla/FloatingPoint.h
-include/js-17.0/mozilla/GuardObjects.h
-include/js-17.0/mozilla/HashFunctions.h
-include/js-17.0/mozilla/Likely.h
-include/js-17.0/mozilla/LinkedList.h
-include/js-17.0/mozilla/MSStdInt.h
-include/js-17.0/mozilla/MathAlgorithms.h
-include/js-17.0/mozilla/NullPtr.h
-include/js-17.0/mozilla/RangedPtr.h
-include/js-17.0/mozilla/RefPtr.h
-include/js-17.0/mozilla/SHA1.h
-include/js-17.0/mozilla/Scoped.h
-include/js-17.0/mozilla/StandardInteger.h
-include/js-17.0/mozilla/ThreadLocal.h
-include/js-17.0/mozilla/TypeTraits.h
-include/js-17.0/mozilla/Types.h
-include/js-17.0/mozilla/Util.h
-include/js-17.0/mozilla/WeakPtr.h
-lib/libmozjs-17.0.a
-lib/libmozjs-17.0.so
-lib/pkgconfig/mozjs-17.0.pc
diff --git a/lang/spidermonkey17/buildlink3.mk b/lang/spidermonkey17/buildlink3.mk
deleted file mode 100644
index abcce8ecddf..00000000000
--- a/lang/spidermonkey17/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/05/20 18:45:22 youri Exp $
-
-BUILDLINK_TREE+=	spidermonkey17
-
-.if !defined(SPIDERMONKEY17_BUILDLINK3_MK)
-SPIDERMONKEY17_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.spidermonkey17+=	spidermonkey17>=17.0.0
-BUILDLINK_PKGSRCDIR.spidermonkey17?=	../../lang/spidermonkey17
-
-.include "../../devel/libffi/buildlink3.mk"
-.include "../../devel/nspr/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.endif	# SPIDERMONKEY17_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-spidermonkey17
diff --git a/lang/spidermonkey17/distinfo b/lang/spidermonkey17/distinfo
deleted file mode 100644
index f3dbce3f39b..00000000000
--- a/lang/spidermonkey17/distinfo
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: distinfo,v 1.8 2017/05/24 13:22:36 jperkin Exp $
-
-SHA1 (mozjs17.0.0.tar.gz) = 7805174898c34e5d3c3b256117af9944ba825c89
-RMD160 (mozjs17.0.0.tar.gz) = 2fa3a891da2a7a09019f67c1555c03bcdc51e6c5
-SHA512 (mozjs17.0.0.tar.gz) = 39b68aeb9f712f146778d8b68ee795709a1372c8ab893a222af4eb34882427d6f5cf877e743d6cb2f1b4348c194d8f3774f00cb775b03515b34b49560b748be4
-Size (mozjs17.0.0.tar.gz) = 6778934 bytes
-SHA1 (patch-ak) = 7cebf3e58ad14598fbe98c3d730c8a548c0bda1e
-SHA1 (patch-as) = c8e3aa309ae5115a8f4c17d477674f93afead538
-SHA1 (patch-bd) = c8ed2110c8b699d6880723dccf62e6976edfa65e
-SHA1 (patch-bf) = 7d18ec3cad441174a71770e7fa22b1cd2029d55b
-SHA1 (patch-js_src_assembler_assembler_MIPSAssembler.h) = 7912848726ec0e7f6181ec70a20c04bcf3ce4ee2
-SHA1 (patch-js_src_config_milestone.pl) = 84dbc588e82ba1a6bcc901abe9b77ba316acac15
-SHA1 (patch-js_src_config_system-headers) = a9c5bc2d2c822eb3bd5e8f4ba43407f89b57c009
-SHA1 (patch-js_src_jscpucfg.h) = a65222bcf99e91cd00d6ad40d6fcedd0c3d67ec9
-SHA1 (patch-js_src_jsgc.cpp) = 0e617094a4b7d87cdf801d9bc4ac1f52d909a12a
-SHA1 (patch-js_src_jsinterp.cpp) = bee8bdde7dd951dbfbe5b049eb502f7412fbf8e6
-SHA1 (patch-js_src_jsmath.cpp) = 04b0081e5abc1de3df5bdfc78db3971fe77da3d4
-SHA1 (patch-js_src_jsopcode.cpp) = 47d5c742b9d91af1d035f61fd38d491233c1ee87
-SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = f2b12fa554ec319b5848b1cc13ec17ef967b08d7
-SHA1 (patch-js_src_methodjit_TrampolineMIPS.cpp) = d162f8e9a903bd55cf7c92c345a169a8ec050d10
-SHA1 (patch-js_src_shell_jsoptparse.cpp) = d4a8d85c5da316c00409601403fad88dac7882df
-SHA1 (patch-mfbt_double-conversion_utils.h) = d4f2a7c1eb7aa72a147c7f1f4147dfb5fe38ac92
-SHA1 (patch-ml) = fdb4452a613f7ca185cd6b936538bec9ef97c4c1
diff --git a/lang/spidermonkey17/patches/patch-ak b/lang/spidermonkey17/patches/patch-ak
deleted file mode 100644
index 87bb9653897..00000000000
--- a/lang/spidermonkey17/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2016/05/20 18:45:22 youri Exp $
-
---- js/src/ctypes/libffi/configure.orig	2012-08-24 22:55:39.000000000 +0000
-+++ js/src/ctypes/libffi/configure
-@@ -11278,7 +11278,7 @@ case "$host" in
-   powerpc-*-aix* | rs6000-*-aix*)
- 	TARGET=POWERPC_AIX; TARGETDIR=powerpc
- 	;;
--  powerpc-*-freebsd* | powerpc-*-openbsd*)
-+  powerpc-*-freebsd* | powerpc-*-openbsd* | powerpc-*-netbsd*)
- 	TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
- 	;;
-   powerpc*-*-rtems*)
diff --git a/lang/spidermonkey17/patches/patch-as b/lang/spidermonkey17/patches/patch-as
deleted file mode 100644
index 238cbcef0ff..00000000000
--- a/lang/spidermonkey17/patches/patch-as
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-as,v 1.1 2016/05/20 18:45:22 youri Exp $
-
-Treat DragonFly like FreeBSD.
-
---- js/src/configure.in.orig	2012-11-19 17:00:00.000000000 +0000
-+++ js/src/configure.in
-@@ -2701,7 +2701,7 @@ then
-     fi
- 
- 	case "$target" in
--	    *-*-freebsd*)
-+	    *-*-freebsd*|*-dragonfly*)
- 			AC_DEFINE(_REENTRANT)
- 			AC_DEFINE(_THREAD_SAFE)
- 			dnl -pthread links in -lpthread, so don't specify it explicitly.
-@@ -3545,7 +3545,7 @@ if test "$MOZ_MEMORY"; then
-   *-darwin*)
-     AC_DEFINE(MOZ_MEMORY_DARWIN)
-     ;;
--  *-*freebsd*)
-+  *-*freebsd*|*-*dragonfly*)
-     AC_DEFINE(MOZ_MEMORY_BSD)
-     ;;
-   *-android*|*-linuxandroid*)
diff --git a/lang/spidermonkey17/patches/patch-bd b/lang/spidermonkey17/patches/patch-bd
deleted file mode 100644
index bad8021d058..00000000000
--- a/lang/spidermonkey17/patches/patch-bd
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2016/05/20 18:45:22 youri Exp $
-
---- js/src/ctypes/CTypes.cpp.orig	2012-08-24 22:55:39.000000000 +0000
-+++ js/src/ctypes/CTypes.cpp
-@@ -5,6 +5,23 @@
- 
- #include "mozilla/FloatingPoint.h"
- 
-+#if defined(__NetBSD__)
-+#include <stdint.h>
-+/* XXX why do we have those funky __ #defines in stdint.h? */
-+#warning this is a retarded workaround
-+#define uint8_t uint8_t
-+#define uint16_t uint16_t
-+#define uint32_t uint32_t
-+#define uint64_t uint64_t
-+#define int8_t int8_t
-+#define int16_t int16_t
-+#define int32_t int32_t
-+#define int64_t int64_t
-+#define intptr_t intptr_t
-+#define uintptr_t uintptr_t
-+#define off_t off_t
-+#endif
-+
- #include "CTypes.h"
- #include "Library.h"
- #include "jsnum.h"
diff --git a/lang/spidermonkey17/patches/patch-bf b/lang/spidermonkey17/patches/patch-bf
deleted file mode 100644
index db24a120dfc..00000000000
--- a/lang/spidermonkey17/patches/patch-bf
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2016/05/20 18:45:22 youri Exp $
-
---- js/src/jsnativestack.cpp.orig	2012-08-24 22:55:40.000000000 +0000
-+++ js/src/jsnativestack.cpp
-@@ -19,10 +19,16 @@
- #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
- # include <pthread.h>
- 
--# if defined(__FreeBSD__) || defined(__OpenBSD__)
-+# if defined(__OpenBSD__) || defined(__DragonFly__)
- #  include <pthread_np.h>
- # endif
- 
-+# if defined(__FreeBSD__) 
-+_Pragma("GCC visibility push(default)")
-+#  include <pthread_np.h>
-+_Pragma("GCC visibility pop")
-+# endif
-+
- #else
- # error "Unsupported platform"
- 
-@@ -114,7 +120,7 @@ GetNativeStackBaseImpl()
-     pthread_attr_init(&sattr);
- #  if defined(__OpenBSD__)
-     stack_t ss;
--#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD)
-+#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(__DragonFly__) || defined(NETBSD) || defined(__NetBSD__) /* XXX tnn not sure why NETBSD isn't defined, it looks like it should be ... */
-     /* e.g. on FreeBSD 4.8 or newer, neundorf@kde.org */
-     pthread_attr_get_np(thread, &sattr);
- #  else
diff --git a/lang/spidermonkey17/patches/patch-js_src_assembler_assembler_MIPSAssembler.h b/lang/spidermonkey17/patches/patch-js_src_assembler_assembler_MIPSAssembler.h
deleted file mode 100644
index 0c569c82b0c..00000000000
--- a/lang/spidermonkey17/patches/patch-js_src_assembler_assembler_MIPSAssembler.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-js_src_assembler_assembler_MIPSAssembler.h,v 1.1 2016/10/03 02:46:47 maya Exp $
-
-blindly convert all nops to EHB / SSNOP
-nop doesn't eliminate hazards in a superscalar CPU
-
---- js/src/assembler/assembler/MIPSAssembler.h.orig	2013-02-11 22:33:22.000000000 +0000
-+++ js/src/assembler/assembler/MIPSAssembler.h
-@@ -243,7 +243,10 @@ public:
- 
-     void nop()
-     {
--        emitInst(0x00000000);
-+	/* nop is insufficient for eliminating hazards
-+	 * in a superscalar CPU. blindly convert all to
-+	 * MIPSNNR6 ehb / ssnop, at a performance cost. */
-+        emitInst(0x000000c0);
-     }
- 
-     /* Need to insert one load data delay nop for mips1.  */
diff --git a/lang/spidermonkey17/patches/patch-js_src_config_milestone.pl b/lang/spidermonkey17/patches/patch-js_src_config_milestone.pl
deleted file mode 100644
index c01ef7cd963..00000000000
--- a/lang/spidermonkey17/patches/patch-js_src_config_milestone.pl
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-js_src_config_milestone.pl,v 1.1 2016/05/20 18:45:22 youri Exp $
-
-Use of defined() for aggregates (array or hashes) is deprecated.
-
---- js/src/config/milestone.pl.orig	2013-02-11 22:33:22.000000000 +0000
-+++ js/src/config/milestone.pl
-@@ -55,7 +55,7 @@ $MILESTONE_FILE  = "$TOPSRCDIR/config/mi
- #
- my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE);
- 
--if (defined(@TEMPLATE_FILE)) {
-+if (@TEMPLATE_FILE) {
-   my $TFILE;
- 
-   foreach $TFILE (@TEMPLATE_FILE) {
diff --git a/lang/spidermonkey17/patches/patch-js_src_config_system-headers b/lang/spidermonkey17/patches/patch-js_src_config_system-headers
deleted file mode 100644
index 53e108b8dd5..00000000000
--- a/lang/spidermonkey17/patches/patch-js_src_config_system-headers
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-js_src_config_system-headers,v 1.1 2016/05/20 18:45:22 youri Exp $
-
---- js/src/config/system-headers.orig	2013-03-28 18:07:55.000000000 +0000
-+++ js/src/config/system-headers
-@@ -1065,5 +1065,9 @@ gst/gst.h
- gst/app/gstappsink.h
- gst/app/gstappsrc.h
- gst/video/video.h
-+sys/thr.h
-+sys/user.h
-+kvm.h
-+spawn.h
- sys/msg.h
- sys/ipc.h
diff --git a/lang/spidermonkey17/patches/patch-js_src_jscpucfg.h b/lang/spidermonkey17/patches/patch-js_src_jscpucfg.h
deleted file mode 100644
index f1ad4154d6c..00000000000
--- a/lang/spidermonkey17/patches/patch-js_src_jscpucfg.h
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-js_src_jscpucfg.h,v 1.2 2016/09/05 11:43:23 jperkin Exp $
-
-Support alternate endian definitions.
-
---- js/src/jscpucfg.h.orig	2013-02-11 22:33:22.000000000 +0000
-+++ js/src/jscpucfg.h
-@@ -44,6 +44,21 @@
- #  define IS_BIG_ENDIAN 1
- # endif
- 
-+#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__MirBSD__) || defined(__DragonFly__)
-+#include <sys/endian.h>
-+
-+#if defined(_BYTE_ORDER)
-+#if _BYTE_ORDER == _LITTLE_ENDIAN
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#elif _BYTE_ORDER == _BIG_ENDIAN
-+#undef  IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+#endif
-+#else /* !defined(_BYTE_ORDER) */
-+#error "sys/endian.h does not define _BYTE_ORDER. Cannot determine endianness."
-+#endif
-+
- #elif defined(JS_HAVE_ENDIAN_H)
- # include <endian.h>
- 
-@@ -55,6 +70,14 @@
- #   undef  IS_LITTLE_ENDIAN
- #   define IS_BIG_ENDIAN 1
- #  endif
-+# elif defined(BYTE_ORDER)
-+#  if BYTE_ORDER == LITTLE_ENDIAN
-+#   define IS_LITTLE_ENDIAN 1
-+#   undef  IS_BIG_ENDIAN
-+#  elif BYTE_ORDER == BIG_ENDIAN
-+#   undef  IS_LITTLE_ENDIAN
-+#   define IS_BIG_ENDIAN 1
-+#  endif
- # else /* !defined(__BYTE_ORDER) */
- #  error "endian.h does not define __BYTE_ORDER. Cannot determine endianness."
- # endif
diff --git a/lang/spidermonkey17/patches/patch-js_src_jsgc.cpp b/lang/spidermonkey17/patches/patch-js_src_jsgc.cpp
deleted file mode 100644
index 22c60f9268a..00000000000
--- a/lang/spidermonkey17/patches/patch-js_src_jsgc.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-js_src_jsgc.cpp,v 1.1 2016/05/20 18:45:22 youri Exp $
-
-http://gnats.netbsd.org/46622
-
---- js/src/jsgc.cpp.orig	2012-08-24 22:55:40.000000000 +0000
-+++ js/src/jsgc.cpp
-@@ -2635,8 +2635,12 @@ GetCPUCount()
-         GetSystemInfo(&sysinfo);
-         ncpus = unsigned(sysinfo.dwNumberOfProcessors);
- # else
-+#  ifdef _SC_NPROCESSORS_ONLN
-         long n = sysconf(_SC_NPROCESSORS_ONLN);
-         ncpus = (n > 0) ? unsigned(n) : 1;
-+#  else
-+       ncpus = 1;
-+#  endif
- # endif
-     }
-     return ncpus;
diff --git a/lang/spidermonkey17/patches/patch-js_src_jsinterp.cpp b/lang/spidermonkey17/patches/patch-js_src_jsinterp.cpp
deleted file mode 100644
index c7953b0c8be..00000000000
--- a/lang/spidermonkey17/patches/patch-js_src_jsinterp.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-js_src_jsinterp.cpp,v 1.1 2016/05/20 18:45:22 youri Exp $
-
---- js/src/jsinterp.cpp.orig	2012-11-04 13:25:04.000000000 +0000
-+++ js/src/jsinterp.cpp
-@@ -3684,6 +3684,7 @@ BEGIN_CASE(JSOP_LEAVEBLOCK)
- BEGIN_CASE(JSOP_LEAVEFORLETIN)
- BEGIN_CASE(JSOP_LEAVEBLOCKEXPR)
- {
-+  {
-     DebugOnly<uint32_t> blockDepth = regs.fp()->blockChain().stackDepth();
- 
-     regs.fp()->popBlock(cx);
-@@ -3698,7 +3699,9 @@ BEGIN_CASE(JSOP_LEAVEBLOCKEXPR)
-         regs.sp -= GET_UINT16(regs.pc);
-         JS_ASSERT(regs.stackDepth() == blockDepth + 1);
-         regs.sp[-1] = *vp;
--    } else {
-+    }
-+  }
-+    if (op != JSOP_LEAVEBLOCK && op != JSOP_LEAVEBLOCKEXPR)  {
-         /* Another op will pop; nothing to do here. */
-         len = JSOP_LEAVEFORLETIN_LENGTH;
-         DO_NEXT_OP(len);
diff --git a/lang/spidermonkey17/patches/patch-js_src_jsmath.cpp b/lang/spidermonkey17/patches/patch-js_src_jsmath.cpp
deleted file mode 100644
index c51e5873429..00000000000
--- a/lang/spidermonkey17/patches/patch-js_src_jsmath.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-js_src_jsmath.cpp,v 1.1 2016/05/20 18:45:22 youri Exp $
-
-Fix build on SunOS
-
---- js/src/jsmath.cpp.orig	2013-02-11 22:33:22.000000000 +0000
-+++ js/src/jsmath.cpp
-@@ -196,7 +196,7 @@ math_atan2_kernel(double x, double y)
- 
- #if defined(SOLARIS) && defined(__GNUC__)
-     if (x == 0) {
--        if (MOZ_DOUBLE_IS_NEGZERO(y))
-+        if (MOZ_DOUBLE_IS_NEGATIVE_ZERO(y))
-             return js_copysign(M_PI, x);
-         if (y == 0)
-             return x;
diff --git a/lang/spidermonkey17/patches/patch-js_src_jsopcode.cpp b/lang/spidermonkey17/patches/patch-js_src_jsopcode.cpp
deleted file mode 100644
index 1e1da9e6d7f..00000000000
--- a/lang/spidermonkey17/patches/patch-js_src_jsopcode.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-js_src_jsopcode.cpp,v 1.1 2016/12/15 23:57:33 joerg Exp $
-
-Comparing char * with 0 makes no sense.
-
---- js/src/jsopcode.cpp.orig	2016-12-10 20:52:30.687253594 +0000
-+++ js/src/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) != 0;
- }
- 
- JSAtom *
diff --git a/lang/spidermonkey17/patches/patch-js_src_methodjit_MethodJIT.cpp b/lang/spidermonkey17/patches/patch-js_src_methodjit_MethodJIT.cpp
deleted file mode 100644
index 2530d5b3c6a..00000000000
--- a/lang/spidermonkey17/patches/patch-js_src_methodjit_MethodJIT.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-js_src_methodjit_MethodJIT.cpp,v 1.1 2016/05/20 18:45:22 youri Exp $
-
-# This does not only apply to linux, but all ELF platforms (otherwise the
-# generated code will not be PIC)
-
---- js/src/methodjit/MethodJIT.cpp.orig	2012-08-24 22:55:40.000000000 +0000
-+++ js/src/methodjit/MethodJIT.cpp
-@@ -135,7 +135,7 @@ PopActiveVMFrame(VMFrame &f)
- 
- JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0);
- 
--#if defined(__linux__) && defined(JS_CPU_X64)
-+#if defined(__ELF__) && defined(JS_CPU_X64)
- # define SYMBOL_STRING_RELOC(name) #name "@plt"
- #else
- # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name)
diff --git a/lang/spidermonkey17/patches/patch-js_src_methodjit_TrampolineMIPS.cpp b/lang/spidermonkey17/patches/patch-js_src_methodjit_TrampolineMIPS.cpp
deleted file mode 100644
index 61223a24aa2..00000000000
--- a/lang/spidermonkey17/patches/patch-js_src_methodjit_TrampolineMIPS.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-js_src_methodjit_TrampolineMIPS.cpp,v 1.1 2016/10/04 02:30:46 maya Exp $
-
-shut up linker error about not being PIC
-the previous code was just an expansion of this macro
-
---- js/src/methodjit/TrampolineMIPS.cpp.orig	2013-02-11 22:33:23.000000000 +0000
-+++ js/src/methodjit/TrampolineMIPS.cpp
-@@ -107,9 +107,7 @@ asm (
-     ".type  JaegerTrampoline,@function" "\n"
- "JaegerTrampoline:"     "\n"
- #if defined(__PIC__)
--    "lui    $28,%hi(_gp_disp)"  "\n"
--    "addiu  $28,$28,%lo(_gp_disp)"      "\n"
--    "addu   $28,$28,$25"    "\n"
-+    ".cpload $25"  "\n"
- #endif
-     "addiu  $29,$29,-112"   "\n"
-     "sw     $31,104($29)"   "\n"
diff --git a/lang/spidermonkey17/patches/patch-js_src_shell_jsoptparse.cpp b/lang/spidermonkey17/patches/patch-js_src_shell_jsoptparse.cpp
deleted file mode 100644
index e36ac56e904..00000000000
--- a/lang/spidermonkey17/patches/patch-js_src_shell_jsoptparse.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-js_src_shell_jsoptparse.cpp,v 1.1 2017/05/24 13:22:36 jperkin Exp $
-
-Pointer fix.
-
---- js/src/shell/jsoptparse.cpp.orig	2013-02-11 22:33:23.000000000 +0000
-+++ js/src/shell/jsoptparse.cpp
-@@ -243,7 +243,7 @@ OptionParser::extractValue(size_t argc,
-     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;
-     }
diff --git a/lang/spidermonkey17/patches/patch-mfbt_double-conversion_utils.h b/lang/spidermonkey17/patches/patch-mfbt_double-conversion_utils.h
deleted file mode 100644
index c21ce6288c7..00000000000
--- a/lang/spidermonkey17/patches/patch-mfbt_double-conversion_utils.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-mfbt_double-conversion_utils.h,v 1.1 2016/08/30 07:45:51 richard Exp $
-deal with aarch64
---- mfbt/double-conversion/utils.h.orig	2013-02-11 22:33:28.000000000 +0000
-+++ mfbt/double-conversion/utils.h
-@@ -58,7 +58,7 @@
-     defined(__mips__) || defined(__powerpc__) || \
-     defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
-     defined(__SH4__) || defined(__alpha__) || \
--    defined(_MIPS_ARCH_MIPS32R2)
-+    defined(_MIPS_ARCH_MIPS32R2) || defined(__aarch64__)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
- #if defined(_WIN32)
diff --git a/lang/spidermonkey17/patches/patch-ml b/lang/spidermonkey17/patches/patch-ml
deleted file mode 100644
index dfbceabdbd9..00000000000
--- a/lang/spidermonkey17/patches/patch-ml
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ml,v 1.1 2016/05/20 18:45:22 youri Exp $
-
-o Treat DragonFly like FreeBSD.
-o XXX: Kludge to add the shebang in the js-config script.
-
---- js/src/Makefile.in.orig	2013-03-25 20:34:20.000000000 +0000
-+++ js/src/Makefile.in
-@@ -682,6 +682,9 @@ endif # _MSC_VER
- ifeq ($(OS_ARCH),FreeBSD)
- EXTRA_LIBS	+= -pthread
- endif
-+ifeq ($(OS_ARCH),DragonFly)
-+EXTRA_LIBS	+= -pthread
-+endif
- ifeq ($(OS_ARCH),Linux)
- EXTRA_LIBS	+= -ldl
- endif
-@@ -778,7 +781,8 @@ JS_CONFIG_SUBSTITUTIONS=\
- 
- $(JS_CONFIG_NAME): js-config.in Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk $(topsrcdir)/config/rules.mk
- 	$(RM) $@.tmp
--	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(JS_CONFIG_SUBSTITUTIONS) $< > $@.tmp \
-+	echo '#!/bin/sh' > $@.tmp \
-+	&& $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(JS_CONFIG_SUBSTITUTIONS) $< >> $@.tmp \
- 	&& mv $@.tmp $@ && chmod +x $@
- 
- SCRIPTS = $(JS_CONFIG_NAME)