From 25b72e4357594691dd303d6f9638e0c22a4e453d Mon Sep 17 00:00:00 2001 From: ahze Date: Wed, 23 Nov 2005 04:54:59 +0000 Subject: - Convert the rest of mozconfig.in to port vars. - Add support for optional extensions in mozilla and seamonkey - Add support for 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 --- deskutils/sunbird/Makefile | 8 +++++++- deskutils/sunbird/files/mozconfig.in | 12 ------------ mail/thunderbird-devel/Makefile | 10 +++++++++- mail/thunderbird-devel/files/mozconfig.in | 14 -------------- mail/thunderbird/Makefile | 13 ++++++++++--- www/firefox/Makefile | 7 ++++++- www/firefox/files/mozconfig.in | 10 ---------- www/firefox10/Makefile | 7 ++++++- www/firefox10/files/mozconfig.in | 10 ---------- www/mozilla/Makefile | 11 +++++------ www/mozilla/Makefile.common | 31 ++++++++++++++++++++++--------- www/seamonkey/Makefile | 7 ++----- 12 files changed, 67 insertions(+), 73 deletions(-) delete mode 100644 deskutils/sunbird/files/mozconfig.in delete mode 100644 mail/thunderbird-devel/files/mozconfig.in delete mode 100644 www/firefox/files/mozconfig.in delete mode 100644 www/firefox10/files/mozconfig.in diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile index 0b239ac34..a98930956 100644 --- a/deskutils/sunbird/Makefile +++ b/deskutils/sunbird/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson # # $FreeBSD$ -# $MCom: ports/deskutils/sunbird/Makefile,v 1.11 2005/11/18 08:46:49 ahze Exp $ +# $MCom: ports/deskutils/sunbird/Makefile,v 1.12 2005/11/22 21:29:13 ahze Exp $ # PORTNAME= sunbird @@ -28,6 +28,12 @@ SUNBIRD= ${PORTNAME} SUNBIRD_ICON_SRC= ${PREFIX}/lib/sunbird/icons/default.xpm SUNBIRD_ICON= ${PORTNAME}.xpm +MOZ_PROTOCOLS= about,http,ftp,file,jar,res +MOZ_OPTIONS= --enable-application=calendar \ + --enable-plaintext-editor-only \ + --disable-plugins --disable-cookies +MOZ_MK_OPTIONS= MOZ_CO_PROJECT=calendar + .include .include "${.CURDIR}/../../www/mozilla/Makefile.common" diff --git a/deskutils/sunbird/files/mozconfig.in b/deskutils/sunbird/files/mozconfig.in deleted file mode 100644 index ca5d39483..000000000 --- a/deskutils/sunbird/files/mozconfig.in +++ /dev/null @@ -1,12 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -# $MCom: ports/deskutils/sunbird/files/mozconfig.in,v 1.3 2005/06/28 05:39:59 adamw Exp $ -###################################################################### -# standard opts from README -mk_add_options MOZ_CO_PROJECT=calendar -ac_add_options --enable-application=calendar -ac_add_options --enable-plaintext-editor-only -ac_add_options --enable-necko-protocols=about,http,ftp,file,jar,res -ac_add_options --disable-plugins -ac_add_options --disable-cookies - 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 # # $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 # # $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 .include "${.CURDIR}/../../www/mozilla/Makefile.common" diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 89a5992cb..70cb812b3 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,7 +3,7 @@ # Whom: Alan Eldridge # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.21 2005/11/19 07:34:00 marcus Exp $ +# $MCom: ports/www/firefox/Makefile,v 1.22 2005/11/22 21:29:14 ahze Exp $ # PORTNAME= firefox @@ -30,6 +30,11 @@ USE_GCC= 3.4+ FIREFOX_ICON= ${MOZILLA}.xpm FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm +MOZ_OPTIONS= --enable-application=browser \ + --enable-svg-renderer=cairo \ + --enable-system-cairo \ + --enable-official-branding \ + --enable-canvas SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome diff --git a/www/firefox/files/mozconfig.in b/www/firefox/files/mozconfig.in deleted file mode 100644 index c4e584980..000000000 --- a/www/firefox/files/mozconfig.in +++ /dev/null @@ -1,10 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -# $MCom: ports/www/firefox/files/mozconfig.in,v 1.9 2005/11/12 02:06:57 ahze Exp $ -###################################################################### -ac_add_options --enable-application=browser -ac_add_options --enable-svg-renderer=cairo -ac_add_options --enable-system-cairo -# 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/www/firefox10/Makefile b/www/firefox10/Makefile index 89a5992cb..70cb812b3 100644 --- a/www/firefox10/Makefile +++ b/www/firefox10/Makefile @@ -3,7 +3,7 @@ # Whom: Alan Eldridge # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.21 2005/11/19 07:34:00 marcus Exp $ +# $MCom: ports/www/firefox/Makefile,v 1.22 2005/11/22 21:29:14 ahze Exp $ # PORTNAME= firefox @@ -30,6 +30,11 @@ USE_GCC= 3.4+ FIREFOX_ICON= ${MOZILLA}.xpm FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm +MOZ_OPTIONS= --enable-application=browser \ + --enable-svg-renderer=cairo \ + --enable-system-cairo \ + --enable-official-branding \ + --enable-canvas SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome diff --git a/www/firefox10/files/mozconfig.in b/www/firefox10/files/mozconfig.in deleted file mode 100644 index c4e584980..000000000 --- a/www/firefox10/files/mozconfig.in +++ /dev/null @@ -1,10 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -# $MCom: ports/www/firefox/files/mozconfig.in,v 1.9 2005/11/12 02:06:57 ahze Exp $ -###################################################################### -ac_add_options --enable-application=browser -ac_add_options --enable-svg-renderer=cairo -ac_add_options --enable-system-cairo -# 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/www/mozilla/Makefile b/www/mozilla/Makefile index da569c550..2b68c6e0d 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -3,7 +3,7 @@ # Whom: eivind/dima/jseger # # $FreeBSD$ -# $MCom: ports/www/mozilla/Makefile,v 1.27 2005/11/14 20:03:15 ahze Exp $ +# $MCom: ports/www/mozilla/Makefile,v 1.28 2005/11/22 21:29:15 ahze Exp $ # PORTNAME= mozilla @@ -31,9 +31,9 @@ HAS_CONFIGURE= yes MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin ALL_TARGET= default -MOZ_EXTENSIONS= # Empty CONFIGURE_ENV= LOCALBASE=${LOCALBASE} +MOZ_EXTENSIONS= default MOZ_EXPORT+= MOZ_INTERNAL_LIBART_LGPL=1 MOZ_MK_OPTIONS+=MOZ_INTERNAL_LIBART_LGPL=1 MOZ_OPTIONS+= --enable-svg-renderer-libart --enable-svg \ @@ -78,14 +78,13 @@ MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif .endif -# TODO, fix option extensions!! .if !defined(WITHOUT_CHATZILLA) -#MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc +MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc .endif + .if !defined(WITHOUT_XMLTERM) && defined(WITH_JAVASCRIPT_DEBUGGER) -#MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},xmlterm +MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},xmlterm .endif -#CONFIGURE_ENV+= MOZ_EXTENSIONS="${MOZ_EXTENSIONS}" .if defined(WITH_JAVASCRIPT_DEBUGGER) MOZ_OPTIONS+= --enable-jsd \ diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index dba98fadd..9cf2f0db0 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -4,7 +4,7 @@ # Whom: Michael Johnson # # $FreeBSD$ -# $MCom: ports/www/mozilla/Makefile.common,v 1.11 2005/11/23 01:30:15 ahze Exp $ +# $MCom: ports/www/mozilla/Makefile.common,v 1.12 2005/11/23 02:09:31 ahze Exp $ # Ports can use the following: # @@ -22,11 +22,13 @@ # MOZ_OPTIONS Add more configure arguments to .mozconfig # MOZ_MK_OPTIONS Add more make arguments to .mozconfig # MOZ_EXPORT Add export variables to .mozconfig +# MOZ_EXTENSIONS Override "default" extensions +# MOZ_GRAPHICS Override "default" graphics decoders +# MOZ_PROTOCOLS Override "default" protocols # -# if ${FILESDIR}/mozconfig.in exists and NOMOZCONFIG is not defined -# contents of ${FILESDIR}/mozconfig.in will be filtered through MOZCONFIG_SED -# and added the the end of .mozconfig -# +# PORT_MOZCONFIG Defaults to ${FILESDIR}/mozconfig.in, but can +# be set to a generic mozconfig included with +# the port BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ @@ -105,9 +107,21 @@ MOZ_OPTIONS+= --enable-crypto \ # Configure options for install MOZ_OPTIONS+= --x-includes=${X11BASE}/include \ --x-libraries=${X11BASE}/lib -# Extensions -# TODO: Add support for other extensions +.if !defined(MOZ_EXTENSIONS) MOZ_OPTIONS+= --enable-extensions=default +.else +MOZ_OPTIONS+= --enable-extensions=${MOZ_EXTENSIONS} +.endif +.if !defined(MOZ_GRAPHICS) +MOZ_OPTIONS+= --enable-image-decoders=default +.else +MOZ_OPTIONS+= --enable-image-decoders=${MOZ_GRAPHICS} +.endif +.if !defined(MOZ_PROTOCOLS) +MOZ_OPTIONS+= --enable-necko-protocols=default +.else +MOZ_OPTIONS+= --enable-necko-protocols=${MOZ_PROTOCOLS} +.endif # others MOZ_OPTIONS+= --with-system-jpeg=${LOCALBASE} \ --with-system-zlib=/usr \ @@ -128,8 +142,7 @@ MOZ_OPTIONS+= --with-system-jpeg=${LOCALBASE} \ --disable-pedantic \ --disable-bidi \ --disable-xterm-updates \ - --enable-xinerama \ - --enable-image-decoders=png,gif,jpeg,bmp + --enable-xinerama MOZ_MK_OPTIONS+= XP_UNIX=1 \ PERL=${PERL} #MOZ_EXPORT+= CPPFLAGS=${CPPFLAGS} \ diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index ffc5ceaa2..8ffe667dc 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -3,7 +3,7 @@ # Whom: eivind/dima/jseger # # $FreeBSD$ -# $MCom: ports/www/seamonkey/Makefile,v 1.31 2005/11/18 09:29:37 ahze Exp $ +# $MCom: ports/www/seamonkey/Makefile,v 1.32 2005/11/22 21:29:16 ahze Exp $ # PORTNAME?= seamonkey @@ -28,9 +28,9 @@ MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/cairo" -MOZ_EXTENSIONS= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} +MOZ_EXTENSIONS= default MOZ_OPTIONS+= --enable-application=suite \ --enable-svg-renderer=cairo \ --enable-system-cairo @@ -69,12 +69,9 @@ MOZ_OPTIONS+= --disable-ldap --enable-mailnews MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif .endif -.if 0 # TODO: Extensions are broken .if !defined(WITHOUT_CHATZILLA) MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc .endif -CONFIGURE_ARGS+= --enable-extensions=${MOZ_EXTENSIONS} -.endif .if defined(WITH_JAVASCRIPT_DEBUGGER) MOZ_OPTIONS+= --enable-jsd \ --enable-dtd-debug -- cgit v1.2.3