CVS commit: pkgsrc/www/firefox78

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Sep 16 19:49:15 UTC 2021

Modified Files:
        pkgsrc/www/firefox78: Makefile PLIST options.mk

Log Message:
firefox78: Install various icon sizes. Explicitly use "unofficial" branding.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/www/firefox78/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/firefox78/PLIST \
    pkgsrc/www/firefox78/options.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/firefox78/Makefile
diff -u pkgsrc/www/firefox78/Makefile:1.35 pkgsrc/www/firefox78/Makefile:1.36
--- pkgsrc/www/firefox78/Makefile:1.35  Fri Sep 10 11:37:53 2021
+++ pkgsrc/www/firefox78/Makefile       Thu Sep 16 19:49:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2021/09/10 11:37:53 nia Exp $
+# $NetBSD: Makefile,v 1.36 2021/09/16 19:49:15 nia Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            78.14
@@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR=       .0esr
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox78-/}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz
@@ -63,11 +64,13 @@ CHECK_INTERPRETER_SKIP+=    lib/firefox-sdk
 CHECK_WRKREF_SKIP+=    lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html
 
 MOZILLA=       ${PKGBASE}
-MOZILLA_ICON=  ${WRKSRC}/${OBJDIR}/dist/${MOZILLA}/browser/chrome/icons/default/default48.png
+
 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
-MOZILLA_NAME=  Firefox
+MOZILLA_NAME=          Firefox
+MOZILLA_BRANDING=      official
 .else
-MOZILLA_NAME=  Browser
+MOZILLA_NAME=          Browser
+MOZILLA_BRANDING=      unofficial
 .endif
 
 #
@@ -113,7 +116,6 @@ post-build:
          > ${WRKDIR}/desktop
 
 INSTALLATION_DIRS+=    share/applications
-INSTALLATION_DIRS+=    share/pixmaps
 
 post-install:
        ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA}
@@ -122,8 +124,12 @@ post-install:
        ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA}
        ${INSTALL_DATA} ${WRKDIR}/desktop                               \
          ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
-       ${INSTALL_DATA} ${MOZILLA_ICON}                                 \
-         ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
+.for i in 16 22 24 32 48 64 128 256
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
+       ${INSTALL_DATA} ${WRKSRC}/browser/branding/${MOZILLA_BRANDING}/default${i}.png \
+         ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/${MOZILLA}.png
+.endfor
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/firefox78/PLIST
diff -u pkgsrc/www/firefox78/PLIST:1.3 pkgsrc/www/firefox78/PLIST:1.4
--- pkgsrc/www/firefox78/PLIST:1.3      Tue Jun  1 21:07:21 2021
+++ pkgsrc/www/firefox78/PLIST  Thu Sep 16 19:49:15 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2021/06/01 21:07:21 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/09/16 19:49:15 nia Exp $
 bin/firefox78
 lib/firefox78/actors/AboutHttpsOnlyErrorChild.jsm
 lib/firefox78/actors/AboutHttpsOnlyErrorParent.jsm
@@ -5732,4 +5732,11 @@ lib/firefox78/res/table-remove-row-activ
 lib/firefox78/res/table-remove-row-hover.gif
 lib/firefox78/res/table-remove-row.gif
 share/applications/firefox78.desktop
-share/pixmaps/firefox78.png
+share/icons/hicolor/128x128/apps/firefox78.png
+share/icons/hicolor/16x16/apps/firefox78.png
+share/icons/hicolor/22x22/apps/firefox78.png
+share/icons/hicolor/24x24/apps/firefox78.png
+share/icons/hicolor/256x256/apps/firefox78.png
+share/icons/hicolor/32x32/apps/firefox78.png
+share/icons/hicolor/48x48/apps/firefox78.png
+share/icons/hicolor/64x64/apps/firefox78.png
Index: pkgsrc/www/firefox78/options.mk
diff -u pkgsrc/www/firefox78/options.mk:1.3 pkgsrc/www/firefox78/options.mk:1.4
--- pkgsrc/www/firefox78/options.mk:1.3 Wed Nov 18 22:38:22 2020
+++ pkgsrc/www/firefox78/options.mk     Thu Sep 16 19:49:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2020/11/18 22:38:22 riastradh Exp $
+# $NetBSD: options.mk,v 1.4 2021/09/16 19:49:15 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 
@@ -72,6 +72,8 @@ LICENSE=              mozilla-trademark-license
 RESTRICTED=            Trademark holder prohibits distribution of modified versions.
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
+.else
+CONFIGURE_ARGS+=       --with-branding=browser/branding/unofficial
 .endif
 
 PLIST_VARS+=           webrtc