[SVN-Commit] r1246 - in trunk: mail/thunderbird www/firefox www/firefox-esr www/firefox-nightly www/libxul www/libxul19 www/seamonkey

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Wed Apr 17 20:07:59 2013
New Revision: 1246

Log:
move GIO as default and GSTREAMER option to Makefile.options

Modified:
   trunk/mail/thunderbird/Makefile
   trunk/www/firefox-esr/Makefile
   trunk/www/firefox-nightly/Makefile
   trunk/www/firefox/Makefile
   trunk/www/firefox/Makefile.options
   trunk/www/libxul/Makefile
   trunk/www/libxul19/Makefile
   trunk/www/seamonkey/Makefile

Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile	Wed Apr 17 17:55:40 2013	(r1245)
+++ trunk/mail/thunderbird/Makefile	Wed Apr 17 20:07:59 2013	(r1246)
@@ -50,7 +50,7 @@
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
 MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 
-OPTIONS_DEFINE=	ENIGMAIL GSTREAMER LIGHTNING
+OPTIONS_DEFINE=	ENIGMAIL LIGHTNING
 OPTIONS_DEFAULT=ENIGMAIL LIGHTNING
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"

Modified: trunk/www/firefox-esr/Makefile
==============================================================================
--- trunk/www/firefox-esr/Makefile	Wed Apr 17 17:55:40 2013	(r1245)
+++ trunk/www/firefox-esr/Makefile	Wed Apr 17 20:07:59 2013	(r1246)
@@ -44,8 +44,7 @@
 		--enable-application=browser \
 		--enable-official-branding
 
-OPTIONS_DEFINE=	GSTREAMER PGO
-OPTIONS_DEFAULT=GIO
+OPTIONS_DEFINE=	PGO
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.pre.mk>

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Wed Apr 17 17:55:40 2013	(r1245)
+++ trunk/www/firefox-nightly/Makefile	Wed Apr 17 20:07:59 2013	(r1246)
@@ -48,8 +48,8 @@
 MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
 		--enable-application=browser
 
-OPTIONS_DEFINE=	GSTREAMER PGO WEBRTC
-OPTIONS_DEFAULT=GIO GSTREAMER WEBRTC
+OPTIONS_DEFINE=	PGO WEBRTC
+OPTIONS_DEFAULT=GSTREAMER WEBRTC
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Wed Apr 17 17:55:40 2013	(r1245)
+++ trunk/www/firefox/Makefile	Wed Apr 17 20:07:59 2013	(r1246)
@@ -46,8 +46,8 @@
 		--enable-application=browser \
 		--enable-official-branding
 
-OPTIONS_DEFINE=	GSTREAMER PGO WEBRTC
-OPTIONS_DEFAULT=GIO WEBRTC
+OPTIONS_DEFINE=	PGO WEBRTC
+OPTIONS_DEFAULT=WEBRTC
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.pre.mk>

Modified: trunk/www/firefox/Makefile.options
==============================================================================
--- trunk/www/firefox/Makefile.options	Wed Apr 17 17:55:40 2013	(r1245)
+++ trunk/www/firefox/Makefile.options	Wed Apr 17 20:07:59 2013	(r1246)
@@ -1,8 +1,8 @@
 # -*- makefile-bsdmake -*-
 
-OPTIONS_DEFINE+=	DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 LIBPROXY \
-			LOGGING OPTIMIZED_CFLAGS
-OPTIONS_DEFAULT+=	ALSA DBUS LOGGING
+OPTIONS_DEFINE+=	DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 GSTREAMER \
+			LIBPROXY LOGGING OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT+=	ALSA DBUS GIO LOGGING
 
 OPTIONS_SINGLE+=	AUDIO
 OPTIONS_SINGLE_AUDIO=	ALSA OSS PULSEAUDIO

Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile	Wed Apr 17 17:55:40 2013	(r1245)
+++ trunk/www/libxul/Makefile	Wed Apr 17 20:07:59 2013	(r1246)
@@ -46,9 +46,6 @@
 MOZ_PKGCONFIG_FILES=	libxul-embedding libxul mozilla-js \
 			mozilla-plugin
 
-OPTIONS_DEFINE=	GSTREAMER
-OPTIONS_DEFAULT=GIO
-
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.pre.mk>
 

Modified: trunk/www/libxul19/Makefile
==============================================================================
--- trunk/www/libxul19/Makefile	Wed Apr 17 17:55:40 2013	(r1245)
+++ trunk/www/libxul19/Makefile	Wed Apr 17 20:07:59 2013	(r1246)
@@ -53,8 +53,8 @@
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
-OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/ALSA/OSS/}
-OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY:NGIO}
+OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:NGIO:S/ALSA/OSS/}
+OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY:NGIO:NGSTREAMER}
 OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT}
 
 .include <bsd.port.pre.mk>

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Wed Apr 17 17:55:40 2013	(r1245)
+++ trunk/www/seamonkey/Makefile	Wed Apr 17 20:07:59 2013	(r1246)
@@ -47,8 +47,8 @@
 
 NOT_FOR_ARCHS=	ia64
 
-OPTIONS_DEFINE=	CHATZILLA COMPOSER ENIGMAIL GSTREAMER LDAP LIGHTNING MAILNEWS WEBRTC
-OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL GIO LDAP LIGHTNING MAILNEWS WEBRTC
+OPTIONS_DEFINE=	CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS WEBRTC
+OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS WEBRTC
 
 CHATZILLA_DESC?=Chatzilla IRC module
 COMPOSER_DESC?=	HTML Composer module