- Convert the rest of mozconfig.in to port vars.

- Add support for optional extensions in mozilla and seamonkey
- Add support for <canvas> in firefox [1]
- Add 3 new vars
  MOZ_EXTENSIONS       Override "default" extensions
  MOZ_GRAPHICS         Override "default" graphics decoders
  MOZ_PROTOCOLS        Override "default" protocol

[1] I hesitated adding this but it is default on for fedora, suse, gentoo
    see http://developer.mozilla.org/en/docs/Category:HTML:Canvas for
    more details


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5189 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 19 insertions, 18 deletions

diff --git a/mail/thunderbird-devel/Makefile b/mail/thunderbird-devel/Makefile
index a1d5db37c..aa9712b03 100644
--- a/mail/thunderbird-devel/Makefile
+++ b/mail/thunderbird-devel/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/mail/thunderbird-devel/Makefile,v 1.13 2005/11/18 10:05:25 ahze Exp $
+#    $MCom: ports/mail/thunderbird-devel/Makefile,v 1.14 2005/11/22 21:29:14 ahze Exp $
 #
 
 PORTNAME=	thunderbird
@@ -25,6 +25,14 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
+MOZ_EXTENSIONS=	wallet,spellcheck,xmlextras,webservices
+MOZ_PROTOCOLS=	http,file,jar,viewsource,res,data
+MOZ_GRAPHICS=	default,-xbm
+MOZ_OPTIONS=	--enable-single-profile --disable-profilesharing	\
+		--enable-application=mail -enable-official-branding
+MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1
+MOZ_EXPORT=	MOZ_THUNDERBIRD=1
+
 PORTNAME_ICON=	${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
 
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
diff --git a/mail/thunderbird-devel/files/mozconfig.in b/mail/thunderbird-devel/files/mozconfig.in
deleted file mode 100644
index 438693856..000000000
--- a/mail/thunderbird-devel/files/mozconfig.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# .mozconfig.in -*-shell-script-*-
-# $FreeBSD$
-#    $MCom: ports/mail/thunderbird/files/mozconfig.in,v 1.7 2005/11/14 04:12:07 ahze Exp $
-######################################################################
-# standard opts from README
-export MOZ_THUNDERBIRD=1
-mk_add_options MOZ_MOZ_THUNDERBIRD=1
-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-application=mail
-# 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
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index b58d21c6d..2b3f2edcf 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/mail/thunderbird/Makefile,v 1.8 2005/11/14 04:12:06 ahze Exp $
+#    $MCom: ports/mail/thunderbird/Makefile,v 1.9 2005/11/22 21:29:13 ahze Exp $
 #
 
 PORTNAME=	thunderbird
@@ -25,12 +25,19 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
-PORTNAME_ICON=	${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
+MOZ_EXTENSIONS=	wallet,spellcheck,xmlextras,webservices
+MOZ_PROTOCOLS=	http,file,jar,viewsource,res,data
+MOZ_GRAPHICS=	default,-xbm
+MOZ_OPTIONS=	--enable-single-profile --disable-profilesharing \
+		--enable-official-branding
+MOZ_EXPORT=	MOZ_THUNDERBIRD=1
+MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1
 
+PORTNAME_ICON=	${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
 MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 
-CONFLICTS=	thunderbird-1.5*
+CONFLICTS=	thunerbird*-1.5*
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../../www/mozilla/Makefile.common"