diff options
author | ahze <ahze@FreeBSD.org> | 2004-12-28 08:51:58 +0800 |
---|---|---|
committer | ahze <ahze@FreeBSD.org> | 2004-12-28 08:51:58 +0800 |
commit | fa516ef1cea0579f4a1a2d568206325c0d3350a5 (patch) | |
tree | 968e5b3d038694e0b6100efa6b85b9d38987ad0c /www/firefox/Makefile | |
parent | 22e63a2f70d0e41fed5e1f2ef0ba9c94b1e60abc (diff) | |
download | freebsd-ports-gnome-fa516ef1cea0579f4a1a2d568206325c0d3350a5.tar.gz freebsd-ports-gnome-fa516ef1cea0579f4a1a2d568206325c0d3350a5.tar.zst freebsd-ports-gnome-fa516ef1cea0579f4a1a2d568206325c0d3350a5.zip |
- Remove WITH_NEW_ICON knob
- Mozilla license team has approved the FreeBSD Gnome team to
use official branding for firefox and thunderbird [1]
o Add --enable-official-branding to mozconfig
o Install official thunderbird/firefox icon as default.xpm icon
- Fix error when running firefox/thunderbird -v [2]
- Bump PORTREVISION
References:
http://www.mozilla.org/foundation/licensing.html [1]
http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt [1]
PR: ports/75262 [2]
Submitted by: girgen [2]
Diffstat (limited to 'www/firefox/Makefile')
-rw-r--r-- | www/firefox/Makefile | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 3a517a8a51cb..dcfe38d03564 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -7,7 +7,7 @@ PORTNAME= firefox PORTVERSION= 1.0 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -66,8 +66,7 @@ OPTIONS= DEBUG "Build a debugging image" off \ LOGGING "Enable additional log messages" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ XFT "Enable support for anti-aliased fonts" on \ - SMB "Enable smb:// URI support using gnomevfs" off \ - NEW_ICON "Install the new Firefox branding icon" off + SMB "Enable smb:// URI support using gnomevfs" off .include <bsd.port.pre.mk> @@ -237,11 +236,9 @@ post-install: .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor -.if defined(WITH_NEW_ICON) - ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \ - ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm -.endif # defined(WITH_NEW_ICON) ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications + ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \ + ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm .include <bsd.port.post.mk> |