firefox91: install scalable icons, bump PKGREVISION

2 files changed, 23 insertions, 37 deletions

diff --git a/www/firefox91/Makefile b/www/firefox91/Makefile
index 61dcfff0702..987717efe68 100644
--- a/www/firefox91/Makefile
+++ b/www/firefox91/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/09/09 11:13:59 nia Exp $
+# $NetBSD: Makefile,v 1.3 2021/09/16 17:47:13 nia Exp $
 
 FIREFOX_VER=		${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=		91.1
@@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR=	.0esr
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox91-/}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES+=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=	.tar.xz
@@ -94,41 +95,15 @@ CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/xpt.py
 CHECK_WRKREF_SKIP+=	lib/${MOZILLA}/omni.ja
 
 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
 
-#
-# Generate list of subst entries for various .cargo-checksum.json files.  These
-# are all handled together in one big substitution to simplify things rather
-# than one substitution entry per file, but are kept separate below to ease
-# updating and verification.
-#
-
-#CKSUM_CRATES+=	third_party/rust/libc
-
-# patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
-#CKSUMS+=	a3540eab4dbc52e006e84e288bad17e1dae3865fea49020e0ed8b5a7724a9532
-#CKSUMS+=	5e58a2109f5eff0f497dfac150c161c1d517a2227b49e086da96c3d66522ac3a
-
-#CKSUM_CRATES+=	third_party/rust/getrandom
-
-# patch-third__party_rust_getrandom_src_lib.rs
-#CKSUMS+=	0e52f6bde42d7bb05c297ce1c25b9879d61b28caba98f6226a152bff538db6c2
-#CKSUMS+=	394425b4ba03c21c494e64d993678f7014575b1e3d590b9ee452b5c2d83ec4ac
-
-#SUBST_CLASSES+=	cksum
-#SUBST_STAGE.cksum=	pre-configure
-#.for crate in ${CKSUM_CRATES}
-#SUBST_FILES.cksum+=	${crate}/.cargo-checksum.json
-#.endfor
-#.for from to in ${CKSUMS}
-#SUBST_SED.cksum+=	-e 's,${from},${to},g'
-#.endfor
-
 pre-configure:
 	cd ${WRKSRC} && autoconf
 	cd ${WRKSRC}/js/src && autoconf
@@ -174,7 +149,7 @@ maintainer-files:
 post-build:
 	${SED} -e 's|@MOZILLA@|${MOZILLA}|g'				\
 	  -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g'			\
-	  -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g'			\
+	  -e 's|@FIREFOX_ICON@|${MOZILLA}|g'				\
 	  < ${FILESDIR}/desktop.in					\
 	  > ${WRKDIR}/desktop
 
@@ -186,8 +161,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"
diff --git a/www/firefox91/PLIST b/www/firefox91/PLIST
index 368eea769f3..bf220284d26 100644
--- a/www/firefox91/PLIST
+++ b/www/firefox91/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/09/08 22:19:50 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/09/16 17:47:13 nia Exp $
 bin/firefox91
 lib/firefox91/application.ini
 lib/firefox91/browser/chrome/icons/default/default128.png
@@ -33,4 +33,11 @@ lib/firefox91/platform.ini
 lib/firefox91/plugin-container
 lib/firefox91/removed-files
 share/applications/firefox91.desktop
-share/pixmaps/firefox91.png
+share/icons/hicolor/128x128/apps/firefox91.png
+share/icons/hicolor/16x16/apps/firefox91.png
+share/icons/hicolor/22x22/apps/firefox91.png
+share/icons/hicolor/24x24/apps/firefox91.png
+share/icons/hicolor/256x256/apps/firefox91.png
+share/icons/hicolor/32x32/apps/firefox91.png
+share/icons/hicolor/48x48/apps/firefox91.png
+share/icons/hicolor/64x64/apps/firefox91.png