From owner-freebsd-gecko@FreeBSD.ORG  Sun Jul  8 12:46:17 2012
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 90301106566C
	for <freebsd-gecko@freebsd.org>; Sun,  8 Jul 2012 12:46:17 +0000 (UTC)
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
	[217.150.245.56])
	by mx1.freebsd.org (Postfix) with ESMTP id 1C7828FC14
	for <freebsd-gecko@freebsd.org>; Sun,  8 Jul 2012 12:46:16 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.245.56])
	by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q68CkG3K029589
	for <freebsd-gecko@freebsd.org>; Sun, 8 Jul 2012 12:46:16 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q68CkBbo029191
	for freebsd-gecko@freebsd.org; Sun, 8 Jul 2012 12:46:11 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Sun, 8 Jul 2012 12:46:11 GMT
Message-Id: <201207081246.q68CkBbo029191@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
	svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [SVN-Commit] r855 - in branches/experimental: Mk www/kompozer
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Jul 2012 12:46:17 -0000

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}