diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2005-04-26 19:30:55 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2005-04-26 19:30:55 +0000 |
| commit | 5baac38237e80003034c2ce49d503df27d51d927 (patch) | |
| tree | 685c60de4b2d71378f64c4efcf71ec1cc6e55a36 /www/firefox | |
| parent | 3c879ce4c56cf0a8a4238db0f7bc050de0bbb03a (diff) | |
| download | ports-5baac38237e80003034c2ce49d503df27d51d927.tar.gz ports-5baac38237e80003034c2ce49d503df27d51d927.zip | |
- Install .desktop file in share/applications instead of
share/gnome/applications so we can remove the gnomehier
dependency so non-gnome users don't have to install a bunch
of un-needed gnome directories.
- Remove WITH_MENU option from mozilla[-devel], .desktop file
will always be installed now.
Notes
Notes:
svn path=/head/; revision=134223
Diffstat (limited to 'www/firefox')
| -rw-r--r-- | www/firefox/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 92ff29ca8e18..c710a0b39e36 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -48,8 +48,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ FIREFOX= ${PORTNAME} FF_VER= ${PORTVERSION} -FIREFOX_ICON= firefox.png -FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png +FIREFOX_ICON= ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \ firefox-nspr firefox-nss firefox-plugin @@ -187,8 +186,7 @@ pre-install: Makefile ${MAKE_ARGS} install @${MKDIR} ${SCRIPTS_DIR} @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST} - ${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/applications/firefox.desktop' >> ${PLIST} ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ s|${FIREFOX}-${FF_VER}|${FIREFOX}|' \ ${FAKEDIR}/bin/firefox \ @@ -265,8 +263,8 @@ post-install: .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor - ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} - ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications + ${MKDIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \ ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm @-update-desktop-database |