firefox68: Remove patches for NetBSD 7, rust dropped support for NetBSD 7

4 files changed, 3 insertions, 64 deletions

diff --git a/www/firefox68/Makefile b/www/firefox68/Makefile
index 2b1f53027b0..bebe6d5bf46 100644
--- a/www/firefox68/Makefile
+++ b/www/firefox68/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/06/15 10:04:03 nia Exp $
+# $NetBSD: Makefile,v 1.26 2020/06/17 17:57:25 nia Exp $
 
 FIREFOX_VER=		${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=		68.9
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR=	.0esr
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox68-/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES+=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/www/firefox68/mozilla-common.mk b/www/firefox68/mozilla-common.mk
index bb7adaf86c5..04cab28a194 100644
--- a/www/firefox68/mozilla-common.mk
+++ b/www/firefox68/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.11 2020/06/14 15:33:28 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.12 2020/06/17 17:57:25 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -109,12 +109,6 @@ SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
 SUBST_FILES.fix-paths+=		${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp
 SUBST_SED.fix-paths+=		-e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
 
-SUBST_CLASSES+=			prefix
-SUBST_STAGE.prefix=		pre-configure
-SUBST_MESSAGE.prefix=		Setting PREFIX
-SUBST_FILES.prefix+=		${MOZILLA_DIR}xpcom/build/BinaryPath.h
-SUBST_VARS.prefix+=		PREFIX
-
 CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}js/src/build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}nsprpub/build/autoconf/config.guess
diff --git a/www/firefox68/patches/patch-ipc_chromium_src_base_lock__impl__posix.cc b/www/firefox68/patches/patch-ipc_chromium_src_base_lock__impl__posix.cc
deleted file mode 100644
index b93f30d4b2a..00000000000
--- a/www/firefox68/patches/patch-ipc_chromium_src_base_lock__impl__posix.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ipc_chromium_src_base_lock__impl__posix.cc,v 1.1 2019/09/21 07:31:44 ryoon Exp $
-
-- Fix build on NetBSD 7.1 (which doesn't have PTHREAD_PRIO_INHERIT)
-
---- ipc/chromium/src/base/lock_impl_posix.cc.orig	2019-03-07 16:53:35.000000000 +0000
-+++ ipc/chromium/src/base/lock_impl_posix.cc
-@@ -22,7 +22,7 @@ namespace internal {
- // Lock::PriorityInheritanceAvailable still must be checked as the code may
- // compile but the underlying platform still may not correctly support priority
- // inheritance locks.
--#if defined(OS_NACL) || defined(OS_ANDROID)
-+#if defined(OS_NACL) || defined(OS_ANDROID) || (defined(__NetBSD__) && !defined(PTHREAD_PRIO_INHERIT))
- #  define PRIORITY_INHERITANCE_LOCKS_POSSIBLE() 0
- #else
- #  define PRIORITY_INHERITANCE_LOCKS_POSSIBLE() 1
diff --git a/www/firefox68/patches/patch-xpcom_build_BinaryPath.h b/www/firefox68/patches/patch-xpcom_build_BinaryPath.h
deleted file mode 100644
index 00d0eaa126a..00000000000
--- a/www/firefox68/patches/patch-xpcom_build_BinaryPath.h
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-xpcom_build_BinaryPath.h,v 1.1 2019/09/21 07:31:44 ryoon Exp $
-
-* Fix build under netbsd-7, PR pkg/52956
-
---- xpcom/build/BinaryPath.h.orig	2019-03-07 16:53:45.000000000 +0000
-+++ xpcom/build/BinaryPath.h
-@@ -21,7 +21,8 @@
-     defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
- #  include <sys/sysctl.h>
- #endif
--#if defined(__OpenBSD__)
-+#if defined(__OpenBSD__) || \
-+    (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
- #  include <sys/stat.h>
- #endif
- #include "mozilla/UniquePtr.h"
-@@ -164,7 +165,8 @@ class BinaryPath {
-   }
- 
- #elif defined(__FreeBSD__) || defined(__DragonFly__) || \
--    defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-+      defined(__FreeBSD_kernel__) || \
-+      (defined(__NetBSD__) && defined(KERN_PROC_PATHNAME))
-   static nsresult Get(char aResult[MAXPATHLEN]) {
-     int mib[4];
-     mib[0] = CTL_KERN;
-@@ -246,6 +248,13 @@ class BinaryPath {
-     return NS_ERROR_FAILURE;
-   }
- 
-+#elif (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
-+  static nsresult Get(char aResult[MAXPATHLEN])
-+  {
-+    char path[] = "@PREFIX@/lib/firefox/firefox";
-+    sprintf(aResult, "%s", path);
-+    return NS_OK;
-+  }
- #else
- #  error Oops, you need platform-specific code here
- #endif