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/files | |
| 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/files')
| -rw-r--r-- | www/firefox/files/mozconfig.in | 3 | ||||
| -rw-r--r-- | www/firefox/files/patch-browser_app_mozilla.in | 20 |
2 files changed, 20 insertions, 3 deletions
diff --git a/www/firefox/files/mozconfig.in b/www/firefox/files/mozconfig.in index a2c8dccba3ac..a354709bf72a 100644 --- a/www/firefox/files/mozconfig.in +++ b/www/firefox/files/mozconfig.in @@ -9,6 +9,9 @@ ac_add_options --disable-tests ac_add_options --disable-mailnews ac_add_options --disable-composer ac_add_options --enable-default-toolkit=gtk2 +# See the following URL for approval email for using official branding +# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt +ac_add_options --enable-official-branding ###################################################################### # FBSD specific export CPPFLAGS="@CPPFLAGS@" diff --git a/www/firefox/files/patch-browser_app_mozilla.in b/www/firefox/files/patch-browser_app_mozilla.in index 3d5c7203e32b..d576c95816b8 100644 --- a/www/firefox/files/patch-browser_app_mozilla.in +++ b/www/firefox/files/patch-browser_app_mozilla.in @@ -1,5 +1,5 @@ ---- browser/app/mozilla.in.orig Sat Nov 13 00:54:51 2004 -+++ browser/app/mozilla.in Sat Nov 13 00:57:22 2004 +--- browser/app/mozilla.in.orig Tue Oct 26 05:26:11 2004 ++++ browser/app/mozilla.in Mon Dec 27 19:15:52 2004 @@ -110,6 +110,7 @@ # Check default compile-time libdir if [ -x "$moz_libdir/run-mozilla.sh" ]; then @@ -8,7 +8,21 @@ else echo "Cannot find mozilla runtime directory. Exiting." exit 1 -@@ -207,12 +207,31 @@ +@@ -160,11 +161,11 @@ + _optLast="${i}" + done #last arg + +-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then ++if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then + # Last argument seems to be a local file/directory + # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file) + # If it is just "relatively" (./file) specified, make it absolutely +- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}" ++ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}" + fi + ################################################################ Parse Arguments + +@@ -207,12 +208,31 @@ script_args="$script_args -d $2" shift 2 ;; |