[SVN-Commit] r855 - in branches/experimental: Mk www/kompozer

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Sun Jul  8 12:46:10 2012
New Revision: 855

Log:
move gnome options to its group

PulseAudio is supposed to be there

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   branches/experimental/www/kompozer/Makefile

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Sun Jul  8 12:46:02 2012	(r854)
+++ branches/experimental/Mk/bsd.gecko.mk	Sun Jul  8 12:46:10 2012	(r855)
@@ -552,11 +552,14 @@
 CFLAGS+=		${PTHREAD_CFLAGS}
 LIBS+=			${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv
 
-OPTIONS_DEFINE+=DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 LIBPROXY LOGGING OPTIMIZED_CFLAGS
+OPTIONS_DEFINE+=		DBUS DEBUG GNOME LIBPROXY LOGGING OPTIMIZED_CFLAGS
 
 OPTIONS_SINGLE+=		AUDIO
 OPTIONS_SINGLE_AUDIO=	ALSA OSS PULSEAUDIO
 
+OPTIONS_MULTI+=			GNOME
+OPTIONS_MULTI_GNOME=	GCONF GIO GNOMEUI GNOMEVFS2
+
 GIO_DESC?=		GIO for file I/O # move to bsd.options.desc.mk
 GNOMEUI_DESC?=	libgnomeui support module
 LIGHTNING_DESC?=Calendar extension

Modified: branches/experimental/www/kompozer/Makefile
==============================================================================
--- branches/experimental/www/kompozer/Makefile	Sun Jul  8 12:46:02 2012	(r854)
+++ branches/experimental/www/kompozer/Makefile	Sun Jul  8 12:46:10 2012	(r855)
@@ -44,8 +44,9 @@
 
 .include <bsd.port.pre.mk>
 
-OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS:NGIO:NLIBPROXY}
+OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS:NLIBPROXY}
 OPTIONS_SINGLE:=${OPTIONS_SINGLE:NAUDIO}
+OPTIONS_MULTI_GNOME:=${OPTIONS_MULTI_GNOME:NGIO}
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}