aboutsummaryrefslogtreecommitdiff
path: root/mail/thunderbird-esr
diff options
context:
space:
mode:
authorMichael Johnson <ahze@FreeBSD.org>2004-12-28 00:51:58 +0000
committerMichael Johnson <ahze@FreeBSD.org>2004-12-28 00:51:58 +0000
commitb18bfe20763cad5c0ccbb4d65a2c21b9fce3cd92 (patch)
treea5c2f71b53741700d64b54e5ed12ab71016fa830 /mail/thunderbird-esr
parent5387a16e23212ffcaefb4d9ba26bb4f5410a2db0 (diff)
downloadports-b18bfe20763cad5c0ccbb4d65a2c21b9fce3cd92.tar.gz
ports-b18bfe20763cad5c0ccbb4d65a2c21b9fce3cd92.zip
Notes
Diffstat (limited to 'mail/thunderbird-esr')
-rw-r--r--mail/thunderbird-esr/Makefile14
-rw-r--r--mail/thunderbird-esr/files/mozconfig.in3
-rw-r--r--mail/thunderbird-esr/files/patch-mail_app_mozilla.in20
3 files changed, 25 insertions, 12 deletions
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index 34893b74ea76..458ff72ffb55 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= thunderbird
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/source
@@ -50,8 +51,7 @@ THUNDERBIRD_ICON_SRC= ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm
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 \
- NEW_ICON "Install the new Thunderbird branding icon" off
+ XFT "Enable support for anti-aliased fonts" on
.include <bsd.port.pre.mk>
@@ -201,15 +201,9 @@ post-install:
${LOCAL_PREFIX}/bin/thunderbird-config
${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} \
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g'
-.if defined(WITH_NEW_ICON)
- ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm \
- ${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm
- ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/mozicon50.xpm \
- ${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/messengerWindow.xpm
- ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/mozicon50.xpm \
- ${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/messengerWindow16.xpm
-.endif # defined(WITH_NEW_ICON)
${INSTALL_DATA} ${THUNDERBIRD_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${THUNDERBIRD_ICON}
${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/gnome/applications
+ ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm \
+ ${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm
.include <bsd.port.post.mk>
diff --git a/mail/thunderbird-esr/files/mozconfig.in b/mail/thunderbird-esr/files/mozconfig.in
index d5faf34896bb..d6e40db19291 100644
--- a/mail/thunderbird-esr/files/mozconfig.in
+++ b/mail/thunderbird-esr/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-esr/files/patch-mail_app_mozilla.in b/mail/thunderbird-esr/files/patch-mail_app_mozilla.in
index 12eed67ff3ef..aec8e60c4bcb 100644
--- a/mail/thunderbird-esr/files/patch-mail_app_mozilla.in
+++ b/mail/thunderbird-esr/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