Date: Fri, 24 Nov 2017 08:52:51 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454813 - in head/www/firefox: . files Message-ID: <201711240852.vAO8qpJm009054@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Nov 24 08:52:51 2017 New Revision: 454813 URL: https://svnweb.freebsd.org/changeset/ports/454813 Log: www/firefox: update .desktop file to Ubuntu Snap version Deleted: head/www/firefox/files/firefox.desktop.in Modified: head/www/firefox/Makefile (contents, props changed) Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Fri Nov 24 08:04:35 2017 (r454812) +++ head/www/firefox/Makefile Fri Nov 24 08:52:51 2017 (r454813) @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 57.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -36,13 +36,13 @@ USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -soundtouch -MOZILLA_NAME= Firefox USE_GL= gl USES= tar:xz FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png +FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding @@ -50,12 +50,9 @@ OPTIONS_DEFAULT= BUNDLED_CAIRO .include "${.CURDIR}/../../www/firefox/Makefile.options" -post-extract: - @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ - -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ - <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop - post-patch: + @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ + ${FIREFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp @@ -64,8 +61,8 @@ pre-configure: (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: + ${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711240852.vAO8qpJm009054>