CVS commit: pkgsrc/www/firefox

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Nov  9 00:04:43 UTC 2023

Modified Files:
        pkgsrc/www/firefox: Makefile PLIST mozilla-common.mk

Log Message:
firefox: clean some pkglint


To generate a diff of this commit:
cvs rdiff -u -r1.576 -r1.577 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.187 -r1.188 pkgsrc/www/firefox/PLIST
cvs rdiff -u -r1.268 -r1.269 pkgsrc/www/firefox/mozilla-common.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.576 pkgsrc/www/firefox/Makefile:1.577
--- pkgsrc/www/firefox/Makefile:1.576   Wed Nov  8 13:21:17 2023
+++ pkgsrc/www/firefox/Makefile Thu Nov  9 00:04:43 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.576 2023/11/08 13:21:17 wiz Exp $
+# $NetBSD: Makefile,v 1.577 2023/11/09 00:04:43 wiz Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            119.0
-MOZ_BRANCH_MINOR=      
+MOZ_BRANCH_MINOR=
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}

Index: pkgsrc/www/firefox/PLIST
diff -u pkgsrc/www/firefox/PLIST:1.187 pkgsrc/www/firefox/PLIST:1.188
--- pkgsrc/www/firefox/PLIST:1.187      Fri Nov  3 10:20:03 2023
+++ pkgsrc/www/firefox/PLIST    Thu Nov  9 00:04:43 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.187 2023/11/03 10:20:03 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.188 2023/11/09 00:04:43 wiz Exp $
 bin/firefox
 lib/firefox/application.ini
 lib/firefox/browser/chrome/icons/default/default128.png
@@ -20,8 +20,8 @@ lib/firefox/fonts/TwemojiMozilla.ttf
 lib/firefox/glxtest
 lib/firefox/gmp-clearkey/0.1/libclearkey.so
 lib/firefox/gmp-clearkey/0.1/manifest.json
-lib/firefox/libipcclientcerts.so
 lib/firefox/libgkcodecs.so
+lib/firefox/libipcclientcerts.so
 lib/firefox/liblgpllibs.so
 ${PLIST.ffvpx}lib/firefox/libmozavcodec.so
 ${PLIST.ffvpx}lib/firefox/libmozavutil.so

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.268 pkgsrc/www/firefox/mozilla-common.mk:1.269
--- pkgsrc/www/firefox/mozilla-common.mk:1.268  Fri Nov  3 16:22:12 2023
+++ pkgsrc/www/firefox/mozilla-common.mk        Thu Nov  9 00:04:43 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.268 2023/11/03 16:22:12 tsutsui Exp $
+# $NetBSD: mozilla-common.mk,v 1.269 2023/11/09 00:04:43 wiz Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -44,7 +44,7 @@ CFLAGS+=              -msse2
 # This is to work around build failures where an upstream configuration script
 # is confused by having more than one approximate match to MACHINE_GNU_PLATFORM
 # "i486" when attempting to select the Rust compiler target.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
+.if ${MACHINE_PLATFORM:MNetBSD-*-i386}
 CONFIGURE_ARGS+=       --target=i586-unknown-netbsd
 CONFIGURE_ARGS+=       --host=i586-unknown-netbsd
 .else
@@ -135,16 +135,16 @@ SUBST_MESSAGE.fix-libpci-soname=  Fixing 
 SUBST_FILES.fix-libpci-soname+=                ${MOZILLA_DIR}toolkit/xre/glxtest/glxtest.cpp
 SUBST_SED.fix-libpci-soname+=          -e 's,"libpci.so, "lib${PCIUTILS_LIBNAME}.so,'
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
-SQLITE3OPTFLAG=                '-O0',
+.if ${MACHINE_PLATFORM:MNetBSD-*-i386}
+SQLITE3OPTFLAG=                        '-O0',
 .else
-SQLITE3OPTFLAG=                # empty
+SQLITE3OPTFLAG=                        # empty
 .endif
-SUBST_CLASSES+=                                sqlite3-opt
-SUBST_STAGE.sqlite3-opt=               pre-configure
-SUBST_MESSAGE.sqlite3-opt=             Fixing segfault in libmozsqlite3.so
-SUBST_FILES.sqlite3-opt+=              ${MOZILLA_DIR}third_party/sqlite3/src/moz.build
-SUBST_VARS.sqlite3-opt+=               SQLITE3OPTFLAG
+SUBST_CLASSES+=                        sqlite3-opt
+SUBST_STAGE.sqlite3-opt=       pre-configure
+SUBST_MESSAGE.sqlite3-opt=     Fixing segfault in libmozsqlite3.so
+SUBST_FILES.sqlite3-opt+=      ${MOZILLA_DIR}third_party/sqlite3/src/moz.build
+SUBST_VARS.sqlite3-opt+=       SQLITE3OPTFLAG
 
 # Do not pass '-j1 -j1' for MAKE_JOBS=1 for NetBSD 9.3 or rearlier.
 RUST_MAKE_JOBS=                # empty by default
@@ -191,10 +191,10 @@ CONFIGURE_SCRIPT= ${WRKSRC}/configure
 
 PLIST_VARS+=   v4l2_decode ffvpx
 
-PLIST_VARS+=   v4l2_decode
+PLIST_VARS+=           v4l2_decode
 .if ${MACHINE_ARCH} == "aarch64" || \
     ${MACHINE_ARCH:M*arm*} || \
-    ${MACHINE_ARCH:Mriscv64}
+    ${MACHINE_ARCH} == riscv64
 PLIST.v4l2_decode=     yes     # see toolkit/moz.configure
 .endif