[SVN-Commit] r1041 - in trunk/www: firefox kompozer

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Sat Sep 29 06:08:00 2012
New Revision: 1041

Log:
get rid of GNOME option, it hinders turning subptions on by default

Modified:
   trunk/www/firefox/Makefile.options
   trunk/www/kompozer/Makefile

Modified: trunk/www/firefox/Makefile.options
==============================================================================
--- trunk/www/firefox/Makefile.options	Sat Sep 29 04:02:46 2012	(r1040)
+++ trunk/www/firefox/Makefile.options	Sat Sep 29 06:08:00 2012	(r1041)
@@ -1,6 +1,7 @@
 # -*- makefile-bsdmake -*-
 
-OPTIONS_DEFINE+=	DBUS DEBUG GNOME LIBPROXY LOGGING OPTIMIZED_CFLAGS
+OPTIONS_DEFINE+=	DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 LIBPROXY \
+			LOGGING OPTIMIZED_CFLAGS
 OPTIONS_DEFAULT+=	DBUS GIO GTK2 LOGGING OSS
 
 OPTIONS_SINGLE+=	AUDIO
@@ -9,9 +10,6 @@
 OPTIONS_SINGLE+=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	GTK2 QT4
 
-OPTIONS_MULTI+=		GNOME
-OPTIONS_MULTI_GNOME=	GCONF GIO GNOMEUI GNOMEVFS2
-
 ENIGMAIL_DESC?=		Enigmail extension
 GIO_DESC?=		GIO for file I/O # move to bsd.options.desc.mk
 GNOMEUI_DESC?=		libgnomeui support module

Modified: trunk/www/kompozer/Makefile
==============================================================================
--- trunk/www/kompozer/Makefile	Sat Sep 29 04:02:46 2012	(r1040)
+++ trunk/www/kompozer/Makefile	Sat Sep 29 06:08:00 2012	(r1041)
@@ -46,7 +46,6 @@
 
 OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS:NGIO:NLIBPROXY}
 OPTIONS_SINGLE:=${OPTIONS_SINGLE:NAUDIO:NTOOLKIT}
-OPTIONS_MULTI_GNOME:=${OPTIONS_MULTI_GNOME:NGIO}
 
 .include <bsd.port.pre.mk>