diff --git a/devel/spidermonkey68/Makefile b/devel/spidermonkey68/Makefile index 84dedcfa2cc..9d33cbc285d 100644 --- a/devel/spidermonkey68/Makefile +++ b/devel/spidermonkey68/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2020/06/29 12:25:37 landry Exp $ +# $OpenBSD: Makefile,v 1.9 2020/06/30 10:21:32 ajacoutot Exp $ # see patch-js_src_old-configure_in USE_WXNEEDED = Yes @@ -16,13 +16,12 @@ COMMENT = C/C++ Mozilla's JavaScript engine implementation #' MOZILLA_VERSION = 68 SUBST_VARS = MOZILLA_VERSION -V = ${MOZILLA_VERSION}.9.0 +V = ${MOZILLA_VERSION}.10.0 DISTNAME = firefox-${V}esr.source EXTRACT_SUFX = .tar.bz2 PKGNAME = spidermonkey${MOZILLA_VERSION}-${V} # cargocult when 78 is released to ease upgrade path EPOCH = 1 -REVISION = 1 SHARED_LIBS = mozjs-68 0.0 diff --git a/devel/spidermonkey68/distinfo b/devel/spidermonkey68/distinfo index 7dd71513a0d..b97c267d136 100644 --- a/devel/spidermonkey68/distinfo +++ b/devel/spidermonkey68/distinfo @@ -1,2 +1,2 @@ -SHA256 (firefox-68.9.0esr.source.tar.xz) = k1EF4aipfWTa/7NyaQ4rVmtfB2QfAUcJKdu8gtINRAc= -SIZE (firefox-68.9.0esr.source.tar.xz) = 317469120 +SHA256 (firefox-68.10.0esr.source.tar.xz) = LsjCYn5G6A/CCFhJZqLe16Cp/3a1X/zOwGI7ibmN7Ss= +SIZE (firefox-68.10.0esr.source.tar.xz) = 314526224 diff --git a/devel/spidermonkey68/patches/patch-moz_configure b/devel/spidermonkey68/patches/patch-moz_configure index 80d9055a816..253cd282e33 100644 --- a/devel/spidermonkey68/patches/patch-moz_configure +++ b/devel/spidermonkey68/patches/patch-moz_configure @@ -1,4 +1,4 @@ -$OpenBSD: patch-moz_configure,v 1.2 2020/06/25 21:13:17 cwen Exp $ +$OpenBSD: patch-moz_configure,v 1.3 2020/06/30 10:21:32 ajacoutot Exp $ - Fix awk detection - Remove unused LLVM and Rust build dependencies, from: @@ -16,10 +16,11 @@ Index: moz.configure # Until the AWK variable is not necessary in old-configure @depends(awk) -@@ -598,36 +598,6 @@ set_config('MAKENSISU_FLAGS', nsis_flags) +@@ -597,36 +597,6 @@ def nsis_flags(host): + set_config('MAKENSISU_FLAGS', nsis_flags) check_prog('7Z', ('7z', '7za'), allow_missing=True, when=target_is_windows) - +- - -@depends(host_c_compiler, c_compiler, bindgen_config_paths) -def llvm_objdump(host_c_compiler, c_compiler, bindgen_config_paths): @@ -49,7 +50,6 @@ Index: moz.configure - -add_old_configure_assignment('LLVM_OBJDUMP', llvm_objdump) - -- + # Please do not add configure checks from here on. - # Fallthrough to autoconf-based configure diff --git a/devel/spidermonkey68/pkg/PLIST b/devel/spidermonkey68/pkg/PLIST index 53afd893e7d..6786ffc1720 100644 --- a/devel/spidermonkey68/pkg/PLIST +++ b/devel/spidermonkey68/pkg/PLIST @@ -1,6 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.3 2020/06/29 12:25:37 landry Exp $ -@pkgpath devel/spidermonkey60 +@comment $OpenBSD: PLIST,v 1.4 2020/06/30 10:21:32 ajacoutot Exp $ @conflict spidermonkey-<=60.9.0v1 +@pkgpath devel/spidermonkey60 bin/js${MOZILLA_VERSION}-config include/mozjs-${MOZILLA_VERSION}/ include/mozjs-${MOZILLA_VERSION}/double-conversion/