[SVN-Commit] r1100 - in trunk: Mk www/firefox

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Sat Nov 24 02:29:23 2012
New Revision: 1100

Log:
revert r856, it causes too much confusion for kde users

Suggested by:	flo

Modified:
   trunk/Mk/bsd.gecko.mk
   trunk/www/firefox/Makefile.options

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Mon Nov 19 21:01:48 2012	(r1099)
+++ trunk/Mk/bsd.gecko.mk	Sat Nov 24 02:29:23 2012	(r1100)
@@ -663,12 +663,10 @@
 LIBS+=		-Wl,--as-needed,-lcxxrt,--no-as-needed
 .endif
 
-.if ${PORT_OPTIONS:MQT4}
-MOZ_TOOLKIT=	cairo-qt
-USE_MOZILLA+=	-cairo # ports/169343
-.endif
-
 .if ${MOZ_TOOLKIT:Mcairo-qt}
+# don't use - transparent backgrounds (bug 521582),
+USE_MOZILLA+=	-cairo # ports/169343
+USE_DISPLAY=yes # install
 USE_GNOME+=	pango
 USE_QT4+=	moc_build gui network opengl
 MOZ_OPTIONS+=	--with-qtdir= # pkg-config

Modified: trunk/www/firefox/Makefile.options
==============================================================================
--- trunk/www/firefox/Makefile.options	Mon Nov 19 21:01:48 2012	(r1099)
+++ trunk/www/firefox/Makefile.options	Sat Nov 24 02:29:23 2012	(r1100)
@@ -2,18 +2,14 @@
 
 OPTIONS_DEFINE+=	DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 LIBPROXY \
 			LOGGING OPTIMIZED_CFLAGS
-OPTIONS_DEFAULT+=	DBUS GTK2 LOGGING OSS
+OPTIONS_DEFAULT+=	DBUS LOGGING OSS
 
 OPTIONS_SINGLE+=	AUDIO
 OPTIONS_SINGLE_AUDIO=	ALSA OSS PULSEAUDIO
 
-OPTIONS_SINGLE+=	TOOLKIT
-OPTIONS_SINGLE_TOOLKIT=	GTK2 QT4
-
 ENIGMAIL_DESC?=		Enigmail extension
 GIO_DESC?=		GIO for file I/O # move to bsd.options.desc.mk
 GNOMEUI_DESC?=		libgnomeui support module
 LIBPROXY_DESC?=		Proxy support via libproxy
 LIGHTNING_DESC?=	Calendar extension
 LOGGING_DESC?=		Additional log messages
-QT4_DESC?=		Qt GUI (EXPERIMENTAL, bug 521582)