[SVN-Commit] r1239 - 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: Tue Apr 16 12:55:15 2013
New Revision: 1239

Log:
swap default audio backend in 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	Mon Apr 15 21:04:21 2013	(r1238)
+++ trunk/mail/thunderbird/Makefile	Tue Apr 16 12:55:15 2013	(r1239)
@@ -55,6 +55,9 @@
 OPTIONS_DEFAULT=ENIGMAIL LIGHTNING
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
+
+OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/ALSA/OSS/}
+
 .include <bsd.port.pre.mk>
 
 WRKSRC=		${WRKDIR}/comm-esr17

Modified: trunk/www/firefox-esr/Makefile
==============================================================================
--- trunk/www/firefox-esr/Makefile	Mon Apr 15 21:04:21 2013	(r1238)
+++ trunk/www/firefox-esr/Makefile	Tue Apr 16 12:55:15 2013	(r1239)
@@ -49,9 +49,6 @@
 OPTIONS_DEFAULT=GIO
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
-
-OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/OSS/ALSA/}
-
 .include <bsd.port.pre.mk>
 
 WRKSRC:=	${WRKDIR}/mozilla-esr17

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Mon Apr 15 21:04:21 2013	(r1238)
+++ trunk/www/firefox-nightly/Makefile	Tue Apr 16 12:55:15 2013	(r1239)
@@ -54,7 +54,6 @@
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 # OSS is gone after bug 852401
-OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/OSS/ALSA/}
 OPTIONS_SINGLE_AUDIO:=${OPTIONS_SINGLE_AUDIO:S/OSS//}
 
 .include <bsd.port.pre.mk>

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Mon Apr 15 21:04:21 2013	(r1238)
+++ trunk/www/firefox/Makefile	Tue Apr 16 12:55:15 2013	(r1239)
@@ -50,9 +50,6 @@
 OPTIONS_DEFAULT=GIO WEBRTC
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
-
-OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/OSS/ALSA/}
-
 .include <bsd.port.pre.mk>
 
 WRKSRC:=	${WRKDIR}/mozilla-beta

Modified: trunk/www/firefox/Makefile.options
==============================================================================
--- trunk/www/firefox/Makefile.options	Mon Apr 15 21:04:21 2013	(r1238)
+++ trunk/www/firefox/Makefile.options	Tue Apr 16 12:55:15 2013	(r1239)
@@ -2,7 +2,7 @@
 
 OPTIONS_DEFINE+=	DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 LIBPROXY \
 			LOGGING OPTIMIZED_CFLAGS
-OPTIONS_DEFAULT+=	DBUS LOGGING OSS
+OPTIONS_DEFAULT+=	ALSA DBUS LOGGING
 
 OPTIONS_SINGLE+=	AUDIO
 OPTIONS_SINGLE_AUDIO=	ALSA OSS PULSEAUDIO

Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile	Mon Apr 15 21:04:21 2013	(r1238)
+++ trunk/www/libxul/Makefile	Tue Apr 16 12:55:15 2013	(r1239)
@@ -51,9 +51,6 @@
 OPTIONS_DEFAULT=GIO
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
-
-OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/OSS/ALSA/}
-
 .include <bsd.port.pre.mk>
 
 .if ${USE_MOZILLA:M-nss}

Modified: trunk/www/libxul19/Makefile
==============================================================================
--- trunk/www/libxul19/Makefile	Mon Apr 15 21:04:21 2013	(r1238)
+++ trunk/www/libxul19/Makefile	Tue Apr 16 12:55:15 2013	(r1239)
@@ -54,6 +54,7 @@
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
+OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/ALSA/OSS/}
 OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY:NGIO}
 OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT}
 

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Mon Apr 15 21:04:21 2013	(r1238)
+++ trunk/www/seamonkey/Makefile	Tue Apr 16 12:55:15 2013	(r1239)
@@ -56,9 +56,6 @@
 MAILNEWS_DESC?=	Mail and News modules
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
-
-OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/OSS/ALSA/}
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCHATZILLA}