[SVN-Commit] r787 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-beta mail/thunderbird-esr mail/thunderbird3 www/firefox www/firefox-beta www/firefox-esr www/firefox-nightly www/libxul www/libxul19 www/seamonkey www/seamonkey-beta

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Thu Jun 21 12:08:06 2012
New Revision: 787

Log:
fix default options for BATCH mode after r733

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   branches/experimental/mail/thunderbird-beta/Makefile
   branches/experimental/mail/thunderbird-esr/Makefile
   branches/experimental/mail/thunderbird/Makefile
   branches/experimental/mail/thunderbird3/Makefile
   branches/experimental/www/firefox-beta/Makefile
   branches/experimental/www/firefox-esr/Makefile
   branches/experimental/www/firefox-nightly/Makefile
   branches/experimental/www/firefox/Makefile
   branches/experimental/www/libxul/Makefile
   branches/experimental/www/libxul19/Makefile
   branches/experimental/www/seamonkey-beta/Makefile
   branches/experimental/www/seamonkey/Makefile

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Thu Jun 21 12:06:29 2012	(r786)
+++ branches/experimental/Mk/bsd.gecko.mk	Thu Jun 21 12:08:06 2012	(r787)
@@ -560,8 +560,6 @@
 LOGGING_DESC?=	Enable additional log messages
 SMB?=			Enable smb:// URI support using gnomevfs
 
-OPTIONS_DEFAULT+=DBUS GSTREAMER
-
 .for use in ${USE_GECKO_OPTIONS}
 ${use:S/-/_WITHOUT_/}=	${TRUE}
 .endfor

Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-beta/Makefile	Thu Jun 21 12:06:29 2012	(r786)
+++ branches/experimental/mail/thunderbird-beta/Makefile	Thu Jun 21 12:08:06 2012	(r787)
@@ -55,6 +55,7 @@
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
 MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 
+OPTIONS_DEFAULT=DBUS
 OPTIONS=	LIGHTNING	"Enable calendar extension" off
 
 .include <bsd.port.pre.mk>

Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile	Thu Jun 21 12:06:29 2012	(r786)
+++ branches/experimental/mail/thunderbird-esr/Makefile	Thu Jun 21 12:08:06 2012	(r787)
@@ -56,6 +56,7 @@
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
 MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 
+OPTIONS_DEFAULT=DBUS
 OPTIONS=	LIGHTNING	"Enable calendar extension" off
 
 .include <bsd.port.pre.mk>

Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile	Thu Jun 21 12:06:29 2012	(r786)
+++ branches/experimental/mail/thunderbird/Makefile	Thu Jun 21 12:08:06 2012	(r787)
@@ -55,6 +55,7 @@
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
 MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 
+OPTIONS_DEFAULT=DBUS
 OPTIONS=	LIGHTNING	"Enable calendar extension" off
 
 .include <bsd.port.pre.mk>

Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile	Thu Jun 21 12:06:29 2012	(r786)
+++ branches/experimental/mail/thunderbird3/Makefile	Thu Jun 21 12:08:06 2012	(r787)
@@ -54,6 +54,7 @@
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
 MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 
+OPTIONS_DEFAULT=DBUS
 OPTIONS=
 
 .include <bsd.port.pre.mk>

Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile	Thu Jun 21 12:06:29 2012	(r786)
+++ branches/experimental/www/firefox-beta/Makefile	Thu Jun 21 12:08:06 2012	(r787)
@@ -51,6 +51,7 @@
 		--disable-updater \
 		--disable-necko-wifi
 
+OPTIONS_DEFAULT=DBUS
 OPTIONS=	PGO "Enable Profile-Guided Optimization" off
 
 .include <bsd.port.pre.mk>

Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile	Thu Jun 21 12:06:29 2012	(r786)
+++ branches/experimental/www/firefox-esr/Makefile	Thu Jun 21 12:08:06 2012	(r787)
@@ -52,6 +52,7 @@
 		--disable-updater \
 		--disable-necko-wifi
 
+OPTIONS_DEFAULT=DBUS
 OPTIONS=	PGO "Enable Profile-Guided Optimization" off
 
 .include <bsd.port.pre.mk>

Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile	Thu Jun 21 12:06:29 2012	(r786)
+++ branches/experimental/www/firefox-nightly/Makefile	Thu Jun 21 12:08:06 2012	(r787)
@@ -53,6 +53,7 @@
 		--disable-updater \
 		--disable-necko-wifi
 
+OPTIONS_DEFAULT=DBUS GSTREAMER
 OPTIONS_DEFINE=	PGO
 PGO_DESC=	Enable Profile-Guided Optimization
 

Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile	Thu Jun 21 12:06:29 2012	(r786)
+++ branches/experimental/www/firefox/Makefile	Thu Jun 21 12:08:06 2012	(r787)
@@ -51,6 +51,7 @@
 		--disable-updater \
 		--disable-necko-wifi
 
+OPTIONS_DEFAULT=DBUS
 OPTIONS=	PGO "Enable Profile-Guided Optimization" off
 
 .include <bsd.port.pre.mk>

Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile	Thu Jun 21 12:06:29 2012	(r786)
+++ branches/experimental/www/libxul/Makefile	Thu Jun 21 12:08:06 2012	(r787)
@@ -43,6 +43,7 @@
 		--disable-updater \
 		--disable-necko-wifi
 MOZ_EXTENSIONS=	default,cookie,permissions
+OPTIONS_DEFAULT=DBUS
 OPTIONS=	# Empty, used for generic gecko OPTIONS
 USE_GECKO=	gecko
 MOZILLA_EXEC_NAME=xulrunner

Modified: branches/experimental/www/libxul19/Makefile
==============================================================================
--- branches/experimental/www/libxul19/Makefile	Thu Jun 21 12:06:29 2012	(r786)
+++ branches/experimental/www/libxul19/Makefile	Thu Jun 21 12:08:06 2012	(r787)
@@ -38,6 +38,7 @@
 		--disable-updater \
 		--disable-necko-wifi
 MOZ_EXTENSIONS=	default,cookie,permissions
+OPTIONS_DEFAULT=DBUS
 OPTIONS=	# Empty, used for generic gecko OPTIONS
 USE_GECKO=	gecko
 MOZILLA_EXEC_NAME=xulrunner

Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile	Thu Jun 21 12:06:29 2012	(r786)
+++ branches/experimental/www/seamonkey-beta/Makefile	Thu Jun 21 12:08:06 2012	(r787)
@@ -52,6 +52,7 @@
 
 NOT_FOR_ARCHS=	ia64
 
+OPTIONS_DEFAULT=DBUS
 OPTIONS=MAILNEWS "Enable Mail and News modules" on \
 	COMPOSER "Enable the HTML Composer module" on \
 	LDAP "Enable LDAP support for Mailnews" on \

Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile	Thu Jun 21 12:06:29 2012	(r786)
+++ branches/experimental/www/seamonkey/Makefile	Thu Jun 21 12:08:06 2012	(r787)
@@ -52,6 +52,7 @@
 
 NOT_FOR_ARCHS=	ia64
 
+OPTIONS_DEFAULT=DBUS
 OPTIONS=MAILNEWS "Enable Mail and News modules" on \
 	COMPOSER "Enable the HTML Composer module" on \
 	LDAP "Enable LDAP support for Mailnews" on \