[SVN-Commit] r767 - in branches/experimental/www: firefox firefox-beta firefox-esr firefox36 kompozer libxul seamonkey seamonkey-beta

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Mon Jun 18 13:42:58 2012
New Revision: 767

Log:
format, remove duplicate and obsolete options

--enable-libxul obsolete since 2011/05/23 (bug#638429, bug#648911)
--enable-canvas obsolete since 2006/09/27 (bug#353702, bug#513924)
--enable-svg obsolete since 2006/09/27 (bug#353702, bug#585020)
--enable-svg-renderer obsolete since 2005/10/26 (bug#310957, bug#330516)
--enable-system-cairo is handled by bsd.gecko.mk

Modified:
   branches/experimental/www/firefox-beta/Makefile
   branches/experimental/www/firefox-esr/Makefile
   branches/experimental/www/firefox/Makefile
   branches/experimental/www/firefox36/Makefile
   branches/experimental/www/kompozer/Makefile
   branches/experimental/www/libxul/Makefile
   branches/experimental/www/seamonkey-beta/Makefile
   branches/experimental/www/seamonkey/Makefile

Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile	Mon Jun 18 13:42:27 2012	(r766)
+++ branches/experimental/www/firefox-beta/Makefile	Mon Jun 18 13:42:58 2012	(r767)
@@ -46,10 +46,10 @@
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
 MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
 		--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
-		--enable-svg --enable-svg-renderer=cairo \
 		--enable-application=browser \
-		--enable-official-branding --disable-updater \
-		--enable-canvas --enable-libxul --disable-necko-wifi
+		--enable-official-branding \
+		--disable-updater \
+		--disable-necko-wifi
 
 OPTIONS=	PGO "Enable Profile-Guided Optimization" off
 

Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile	Mon Jun 18 13:42:27 2012	(r766)
+++ branches/experimental/www/firefox-esr/Makefile	Mon Jun 18 13:42:58 2012	(r767)
@@ -47,10 +47,10 @@
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
 MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
 		--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
-		--enable-svg --enable-svg-renderer=cairo \
 		--enable-application=browser \
-		--enable-official-branding --disable-updater \
-		--enable-canvas --enable-libxul --disable-necko-wifi
+		--enable-official-branding \
+		--disable-updater \
+		--disable-necko-wifi
 
 OPTIONS=	PGO "Enable Profile-Guided Optimization" off
 

Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile	Mon Jun 18 13:42:27 2012	(r766)
+++ branches/experimental/www/firefox/Makefile	Mon Jun 18 13:42:58 2012	(r767)
@@ -46,10 +46,10 @@
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
 MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
 		--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
-		--enable-svg --enable-svg-renderer=cairo \
 		--enable-application=browser \
-		--enable-official-branding --disable-updater \
-		--enable-canvas --enable-libxul --disable-necko-wifi
+		--enable-official-branding \
+		--disable-updater \
+		--disable-necko-wifi
 
 OPTIONS=	PGO "Enable Profile-Guided Optimization" off
 

Modified: branches/experimental/www/firefox36/Makefile
==============================================================================
--- branches/experimental/www/firefox36/Makefile	Mon Jun 18 13:42:27 2012	(r766)
+++ branches/experimental/www/firefox36/Makefile	Mon Jun 18 13:42:58 2012	(r767)
@@ -43,11 +43,12 @@
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
 MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
 		--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
-		--enable-svg --enable-svg-renderer=cairo \
 		--enable-application=browser \
-		--enable-official-branding --disable-updater \
-		--enable-canvas --enable-libxul --disable-necko-wifi \
-		--disable-ipc
+		--enable-official-branding \
+		--enable-libxul \
+		--disable-ipc \
+		--disable-updater \
+		--disable-necko-wifi
 
 .include <bsd.port.pre.mk>
 

Modified: branches/experimental/www/kompozer/Makefile
==============================================================================
--- branches/experimental/www/kompozer/Makefile	Mon Jun 18 13:42:27 2012	(r766)
+++ branches/experimental/www/kompozer/Makefile	Mon Jun 18 13:42:58 2012	(r767)
@@ -28,8 +28,7 @@
 USE_GECKO_OPTIONS=-dbus
 MOZ_EXTENSIONS=	wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck
 MOZ_OPTIONS=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
-				--enable-application=composer \
-				--enable-system-cairo
+		--enable-application=composer
 PORT_MOZCONFIG=	${WRKSRC}/composer/config/mozconfig.linux
 
 DESKTOP_ENTRIES="Kompozer" "${COMMENT}" \

Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile	Mon Jun 18 13:42:27 2012	(r766)
+++ branches/experimental/www/libxul/Makefile	Mon Jun 18 13:42:58 2012	(r767)
@@ -38,8 +38,8 @@
 
 PORT_MOZCONFIG=	${WRKSRC}/xulrunner/config/mozconfig
 MOZ_OPTIONS?=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
-		--disable-javaxpcom --enable-canvas \
-		--enable-system-cairo --disable-updater \
+		--disable-javaxpcom \
+		--disable-updater \
 		--disable-necko-wifi
 MOZ_EXTENSIONS=	default,cookie,permissions
 OPTIONS=	# Empty, used for generic gecko OPTIONS

Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile	Mon Jun 18 13:42:27 2012	(r766)
+++ branches/experimental/www/seamonkey-beta/Makefile	Mon Jun 18 13:42:58 2012	(r767)
@@ -40,13 +40,9 @@
 MOZ_EXTENSIONS=	default
 MOZ_OPTIONS+=	--program-transform-name='s/seamonkey/${MOZILLA}/' \
 		--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
-		--enable-svg \
-		--enable-application=suite	\
-		--enable-svg-renderer=cairo	\
-		--enable-system-cairo		\
-		--enable-canvas			\
-		--disable-necko-wifi		\
-		--disable-updater
+		--enable-application=suite \
+		--disable-updater \
+		--disable-necko-wifi
 
 USE_MOZILLA=	-nss -dbm
 USE_GECKO_OPTIONS=+smb

Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile	Mon Jun 18 13:42:27 2012	(r766)
+++ branches/experimental/www/seamonkey/Makefile	Mon Jun 18 13:42:58 2012	(r767)
@@ -40,13 +40,9 @@
 MOZ_EXTENSIONS=	default
 MOZ_OPTIONS+=	--program-transform-name='s/seamonkey/${MOZILLA}/' \
 		--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
-		--enable-svg \
-		--enable-application=suite	\
-		--enable-svg-renderer=cairo	\
-		--enable-system-cairo		\
-		--enable-canvas			\
-		--disable-necko-wifi		\
-		--disable-updater
+		--enable-application=suite \
+		--disable-updater \
+		--disable-necko-wifi
 
 USE_MOZILLA=	-nss -dbm
 USE_GECKO_OPTIONS=+smb