[pkgsrc/trunk]: pkgsrc/www/firefox firefox: Clean up some problems identified...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/da30c6a30ddc
branches:  trunk
changeset: 441802:da30c6a30ddc
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed Nov 11 10:11:21 2020 +0000

description:
firefox: Clean up some problems identified by pkglint.

Most of these PLIST variables are no longer used.

diffstat:

 www/firefox/Makefile          |   4 ++--
 www/firefox/mozilla-common.mk |  36 ++++--------------------------------
 www/firefox/options.mk        |   9 ++-------
 3 files changed, 8 insertions(+), 41 deletions(-)

diffs (126 lines):

diff -r 00e08f4fd750 -r da30c6a30ddc www/firefox/Makefile
--- a/www/firefox/Makefile      Wed Nov 11 09:52:37 2020 +0000
+++ b/www/firefox/Makefile      Wed Nov 11 10:11:21 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.456 2020/11/09 15:07:47 maya Exp $
+# $NetBSD: Makefile,v 1.457 2020/11/11 10:11:21 nia Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            82.0
@@ -81,7 +81,7 @@
 
 #CKSUM_CRATES+=        third_party/rust/libc
 
-# patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs 
+# patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
 #CKSUMS+=      a3540eab4dbc52e006e84e288bad17e1dae3865fea49020e0ed8b5a7724a9532
 #CKSUMS+=      5e58a2109f5eff0f497dfac150c161c1d517a2227b49e086da96c3d66522ac3a
 
diff -r 00e08f4fd750 -r da30c6a30ddc www/firefox/mozilla-common.mk
--- a/www/firefox/mozilla-common.mk     Wed Nov 11 09:52:37 2020 +0000
+++ b/www/firefox/mozilla-common.mk     Wed Nov 11 10:11:21 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.182 2020/10/20 20:15:29 maya Exp $
+# $NetBSD: mozilla-common.mk,v 1.183 2020/11/11 10:11:21 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -11,10 +11,10 @@
 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
@@ -141,12 +141,7 @@
 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*) || \
@@ -155,29 +150,6 @@
 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 -r 00e08f4fd750 -r da30c6a30ddc www/firefox/options.mk
--- a/www/firefox/options.mk    Wed Nov 11 09:52:37 2020 +0000
+++ b/www/firefox/options.mk    Wed Nov 11 10:11:21 2020 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.60 2020/09/02 10:00:23 ryoon Exp $
+# $NetBSD: options.mk,v 1.61 2020/11/11 10:11:21 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 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
-PLIST.jemalloc=                yes
 CONFIGURE_ARGS+=       --enable-jemalloc
 CONFIGURE_ARGS+=       --enable-replace-malloc
 .else
@@ -67,16 +66,12 @@
 CONFIGURE_ARGS+=       --disable-dbus
 .endif
 
-#PLIST_VARS+=          branding nobranding
 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
 CONFIGURE_ARGS+=       --enable-official-branding
 LICENSE=               mozilla-trademark-license
 RESTRICTED=            Trademark holder prohibits distribution of modified versions.
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
-#PLIST.branding=               yes
-.else
-#PLIST.nobranding=     yes
 .endif
 
 PLIST_VARS+=           webrtc