Thu Sep 16 20:47:40 2021 UTC ()
firefox: we no longer install to share/pixmaps


(nia)
diff -r1.492 -r1.493 pkgsrc/www/firefox/Makefile
cvs diff -r1.492 -r1.493 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2021/09/16 16:46:24 1.492
+++ pkgsrc/www/firefox/Makefile 2021/09/16 20:47:40 1.493
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.492 2021/09/16 16:46:24 nia Exp $ 1# $NetBSD: Makefile,v 1.493 2021/09/16 20:47:40 nia Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 91.0 4MOZ_BRANCH= 91.0
5MOZ_BRANCH_MINOR= .2 5MOZ_BRANCH_MINOR= .2
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//} 8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
9PKGREVISION= 2 9PKGREVISION= 2
10CATEGORIES= www 10CATEGORIES= www
11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
12EXTRACT_SUFX= .tar.xz 12EXTRACT_SUFX= .tar.xz
13 13
14DISTFILES= ${DEFAULT_DISTFILES} nodejs-output-91.0.tgz 14DISTFILES= ${DEFAULT_DISTFILES} nodejs-output-91.0.tgz
@@ -141,27 +141,28 @@ maintainer-files: @@ -141,27 +141,28 @@ maintainer-files:
141 '/^\+\.\//{ printf("dist/bin/browser/chrome/%s\n", gensub(/^\+\.\//, "", "")) }' \ 141 '/^\+\.\//{ printf("dist/bin/browser/chrome/%s\n", gensub(/^\+\.\//, "", "")) }' \
142 > "${NODE_FILES}" 142 > "${NODE_FILES}"
143 cd ${WRKSRC}/${OBJDIR} && tar -c -T "${NODE_FILES}" -z \ 143 cd ${WRKSRC}/${OBJDIR} && tar -c -T "${NODE_FILES}" -z \
144 -f ${FILESDIR}/nodejs-output-${PKGVERSION_NOREV}.tgz 144 -f ${FILESDIR}/nodejs-output-${PKGVERSION_NOREV}.tgz
145.endif 145.endif
146 146
147post-build: 147post-build:
148 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ 148 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
149 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ 149 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \
150 -e 's|@FIREFOX_ICON@|${MOZILLA}|g' \ 150 -e 's|@FIREFOX_ICON@|${MOZILLA}|g' \
151 < ${FILESDIR}/desktop.in \ 151 < ${FILESDIR}/desktop.in \
152 > ${WRKDIR}/desktop 152 > ${WRKDIR}/desktop
153 153
154INSTALLATION_DIRS+= share/applications share/pixmaps 154INSTALLATION_DIRS+= share/applications
 155
155post-install: 156post-install:
156 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA} 157 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA}
157 ${ECHO} '${PREFIX}/lib/${MOZILLA}/${MOZILLA} "$$@"' >> \ 158 ${ECHO} '${PREFIX}/lib/${MOZILLA}/${MOZILLA} "$$@"' >> \
158 ${DESTDIR}${PREFIX}/bin/${MOZILLA} 159 ${DESTDIR}${PREFIX}/bin/${MOZILLA}
159 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA} 160 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA}
160 ${INSTALL_DATA} ${WRKDIR}/desktop \ 161 ${INSTALL_DATA} ${WRKDIR}/desktop \
161 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop 162 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
162.for i in 16 22 24 32 48 64 128 256 163.for i in 16 22 24 32 48 64 128 256
163 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps 164 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
164 ${INSTALL_DATA} ${WRKSRC}/browser/branding/${MOZILLA_BRANDING}/default${i}.png \ 165 ${INSTALL_DATA} ${WRKSRC}/browser/branding/${MOZILLA_BRANDING}/default${i}.png \
165 ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/${MOZILLA}.png 166 ${DESTDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/${MOZILLA}.png
166.endfor 167.endfor
167 168