firefox68: Clean up pkglint problems.

While here, note why this package is kept around.

3 files changed, 9 insertions, 36 deletions

diff --git a/www/firefox68/DESCR b/www/firefox68/DESCR
index a4429d7f556..c872dc4d719 100644
--- a/www/firefox68/DESCR
+++ b/www/firefox68/DESCR
@@ -9,4 +9,6 @@ Firefox also offers excellent bookmark and history management, and it
 can be extended by developers using industry standards such as XML,
 CSS, JavaScript, C++, etc. Many extensions are available.
 
-This package provides Firefox 68 ESR.
+This package provides Firefox 68 ESR. It is now unsupported and is
+provided only for older NetBSD releases (8.x) that cannot run newer
+versions.
diff --git a/www/firefox68/mozilla-common.mk b/www/firefox68/mozilla-common.mk
index 8835d540c76..c7318568899 100644
--- a/www/firefox68/mozilla-common.mk
+++ b/www/firefox68/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.14 2020/06/29 11:59:42 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.15 2020/11/11 10:21:34 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -13,10 +13,10 @@ PYTHON_VERSIONS_ACCEPTED=	27
 PYTHON_FOR_BUILD_ONLY=		tool
 .if !empty(PYTHON_VERSION_DEFAULT:M3[6789])
 TOOL_DEPENDS+=			python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
-ALL_ENV+=			PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./}
+ALL_ENV+=			PYTHON3=${PREFIX}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./}
 .else
 TOOL_DEPENDS+=			python37-[0-9]*:../../lang/python37
-ALL_ENV+=			PYTHON3=${LOCALBASE}/bin/python3.7
+ALL_ENV+=			PYTHON3=${PREFIX}/bin/python3.7
 .endif
 
 HAS_CONFIGURE=		yes
@@ -127,12 +127,7 @@ OBJDIR=			../build
 CONFIGURE_DIRS=		${OBJDIR}
 CONFIGURE_SCRIPT=	${WRKSRC}/configure
 
-PLIST_VARS+=	sps vorbis tremor glskia throwwrapper mozglue ffvpx
-
-.include "../../mk/endian.mk"
-.if ${MACHINE_ENDIAN} == "little"
-PLIST.glskia=	yes
-.endif
+PLIST_VARS+=	ffvpx
 
 .if ${MACHINE_ARCH} == "aarch64" || \
     !empty(MACHINE_ARCH:M*arm*) || \
@@ -141,29 +136,6 @@ PLIST.glskia=	yes
 PLIST.ffvpx=	yes	# see media/ffvpx/ffvpxcommon.mozbuild
 .endif
 
-.if ${MACHINE_ARCH} != "sparc64"
-# For some reasons the configure test for GCC bug 26905 still triggers on
-# sparc64, which makes mozilla skip the installation of a few wrapper headers.
-# Other archs end up with one additional file in the SDK headers
-PLIST.throwwrapper=	yes
-.endif
-
-.if !empty(MACHINE_PLATFORM:S/i386/x86/:MLinux-*-x86*)
-PLIST.sps=	yes
-.endif
-
-.if !empty(MACHINE_PLATFORM:MLinux-*-arm*)
-PLIST.tremor=	yes
-.else
-PLIST.vorbis=	yes
-.endif
-
-# See ${WRKSRC}/mozglue/build/moz.build: libmozglue is built and
-# installed as a shared library on these platforms.
-.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin" # or Android
-PLIST.mozglue=	yes
-.endif
-
 # See ${WRKSRC}/security/sandbox/mac/Sandbox.mm: On Darwin, sandboxing
 # support is only available when the toolkit is cairo-cocoa.
 CONFIGURE_ARGS.Darwin+=	--disable-sandbox
diff --git a/www/firefox68/options.mk b/www/firefox68/options.mk
index 7b4e8d0e527..e5932627230 100644
--- a/www/firefox68/options.mk
+++ b/www/firefox68/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.10 2020/07/16 19:51:48 riastradh Exp $
+# $NetBSD: options.mk,v 1.11 2020/11/11 10:21:34 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.firefox
 
 PKG_SUPPORTED_OPTIONS=	official-mozilla-branding
 PKG_SUPPORTED_OPTIONS+=	debug debug-info mozilla-jemalloc webrtc
 PKG_SUPPORTED_OPTIONS+=	alsa pulseaudio dbus
-PLIST_VARS+=		jemalloc debug
+PLIST_VARS+=		debug
 
 .if ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=	pulseaudio mozilla-jemalloc dbus webrtc
@@ -27,7 +27,6 @@ CONFIGURE_ARGS+=	--disable-alsa
 .endif
 
 .if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
-PLIST.jemalloc=		yes
 CONFIGURE_ARGS+=	--enable-jemalloc
 CONFIGURE_ARGS+=	--enable-replace-malloc
 .else