aboutsummaryrefslogtreecommitdiffstats
path: root/mail/thunderbird/files
diff options
context:
space:
mode:
authorahze <ahze@FreeBSD.org>2004-12-28 08:51:58 +0800
committerahze <ahze@FreeBSD.org>2004-12-28 08:51:58 +0800
commitfa516ef1cea0579f4a1a2d568206325c0d3350a5 (patch)
tree968e5b3d038694e0b6100efa6b85b9d38987ad0c /mail/thunderbird/files
parent22e63a2f70d0e41fed5e1f2ef0ba9c94b1e60abc (diff)
downloadfreebsd-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 'mail/thunderbird/files')
-rw-r--r--mail/thunderbird/files/mozconfig.in3
-rw-r--r--mail/thunderbird/files/patch-mail_app_mozilla.in20
2 files changed, 21 insertions, 2 deletions
diff --git a/mail/thunderbird/files/mozconfig.in b/mail/thunderbird/files/mozconfig.in
index d5faf34896bb..d6e40db19291 100644
--- a/mail/thunderbird/files/mozconfig.in
+++ b/mail/thunderbird/files/mozconfig.in
@@ -18,6 +18,9 @@ ac_add_options --enable-extensions=wallet,spellcheck,xmlextras,webservices
ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data
ac_add_options --enable-image-decoders=default,-xbm
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/mail/thunderbird/files/patch-mail_app_mozilla.in b/mail/thunderbird/files/patch-mail_app_mozilla.in
index 12eed67ff3ef..aec8e60c4bcb 100644
--- a/mail/thunderbird/files/patch-mail_app_mozilla.in
+++ b/mail/thunderbird/files/patch-mail_app_mozilla.in
@@ -1,5 +1,21 @@
---- mail/app/mozilla.in.orig Thu Nov 11 23:14:17 2004
-+++ mail/app/mozilla.in Thu Nov 11 23:15:43 2004
+--- mail/app/mozilla.in.orig Sat Jul 24 19:58:06 2004
++++ mail/app/mozilla.in Mon Dec 27 18:40:04 2004
+@@ -167,12 +167,12 @@
+ done #others arg
+
+ #???: needs check if othersopt begin with -* ?
+-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}"
+-elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
++ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
++elif [ `expr -- "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
+ _NEW_WINDOW=1
+ fi
+ ################################################################ Parse Arguments
@@ -218,12 +218,31 @@
script_args="$script_args -d $2"
shift 2