CVS commit: pkgsrc/www/firefox

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Feb 26 20:55:43 UTC 2020

Modified Files:
        pkgsrc/www/firefox: Makefile PLIST
Added Files:
        pkgsrc/www/firefox: PLIST.Linux

Log Message:
firefox: fix PLIST on linux.

A bunch of files that are mysteriously not on linux, and a bunch of files
that are mysteriously OS-specific (probably missing "else").

And a sandboxing library.


To generate a diff of this commit:
cvs rdiff -u -r1.411 -r1.412 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.154 -r1.155 pkgsrc/www/firefox/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/www/firefox/PLIST.Linux

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.411 pkgsrc/www/firefox/Makefile:1.412
--- pkgsrc/www/firefox/Makefile:1.411   Fri Feb 21 15:13:12 2020
+++ pkgsrc/www/firefox/Makefile Wed Feb 26 20:55:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.411 2020/02/21 15:13:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.412 2020/02/26 20:55:43 maya Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            73.0
@@ -67,6 +67,11 @@ MOZILLA_NAME=        Firefox
 MOZILLA_NAME=  Browser
 .endif
 
+PLIST_VARS+=   notlinux
+.if ${OPSYS} != "Linux"
+PLIST.notlinux=        yes
+.endif
+
 post-extract:
        mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S
 # XXX Hack taken from lang/rust.

Index: pkgsrc/www/firefox/PLIST
diff -u pkgsrc/www/firefox/PLIST:1.154 pkgsrc/www/firefox/PLIST:1.155
--- pkgsrc/www/firefox/PLIST:1.154      Wed Feb 12 16:36:50 2020
+++ pkgsrc/www/firefox/PLIST    Wed Feb 26 20:55:43 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.154 2020/02/12 16:36:50 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.155 2020/02/26 20:55:43 maya Exp $
 bin/firefox
 lib/firefox/actors/AudioPlaybackChild.jsm
 lib/firefox/actors/AudioPlaybackParent.jsm
@@ -1133,7 +1133,7 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/home.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icon.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/illustrations/error-session-restore.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/import-export.svg
+${PLIST.notlinux}lib/firefox/browser/chrome/browser/skin/classic/browser/import-export.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/info.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/library-bookmark-animation.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/library-pocket-animation.svg
@@ -1267,7 +1267,7 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/sidebars.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/sign-out.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/slowStartup-16.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/sort.svg
+${PLIST.notlinux}lib/firefox/browser/chrome/browser/skin/classic/browser/sort.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/stop-to-reload.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/stop.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/sync.svg

Added files:

Index: pkgsrc/www/firefox/PLIST.Linux
diff -u /dev/null pkgsrc/www/firefox/PLIST.Linux:1.1
--- /dev/null   Wed Feb 26 20:55:43 2020
+++ pkgsrc/www/firefox/PLIST.Linux      Wed Feb 26 20:55:43 2020
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2020/02/26 20:55:43 maya Exp $
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/autocomplete-item.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/editDialog.css
+lib/firefox/fonts/TwemojiMozilla.ttf
+lib/firefox/libmozsandbox.so