From owner-freebsd-gecko@FreeBSD.ORG  Sun Jul 25 17:19:37 2010
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 AD9DF1065678
	for <freebsd-gecko@freebsd.org>; Sun, 25 Jul 2010 17:19:37 +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 784478FC1F
	for <freebsd-gecko@freebsd.org>; Sun, 25 Jul 2010 17:19:36 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.245.56])
	by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id o6PHJZUG019021
	for <freebsd-gecko@freebsd.org>; Sun, 25 Jul 2010 17:19:35 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id o6PHJU8r018847
	for freebsd-gecko@freebsd.org; Sun, 25 Jul 2010 17:19:30 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Sun, 25 Jul 2010 17:19:30 GMT
Message-Id: <201007251719.o6PHJU8r018847@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] r365 - branches/experimental/www/libxul
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, 25 Jul 2010 17:19:37 -0000

Author: beat
Date: Sun Jul 25 17:19:30 2010
New Revision: 365

Log:
- Sync with www/firefox: Make D-BUS support optional

Modified:
   branches/experimental/www/libxul/Makefile

Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile	Sat Jul 24 15:12:09 2010	(r364)
+++ branches/experimental/www/libxul/Makefile	Sun Jul 25 17:19:30 2010	(r365)
@@ -15,9 +15,6 @@
 MAINTAINER?=	gecko@FreeBSD.org
 COMMENT?=	Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps
 
-LIB_DEPENDS?=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.1:${PORTSDIR}/devel/libnotify
-
 WRKSRC=		${WRKDIR}/mozilla-1.9.2
 CONFLICTS=	mozilla-[0-9]*
 GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
@@ -50,6 +47,8 @@
 MOZ_PKGCONFIG_FILES=	libxul-embedding libxul mozilla-gtkmozembed-embedding \
 		mozilla-gtkmozembed mozilla-js mozilla-nss mozilla-plugin
 
+OPTIONS=	DBUS "Enable D-BUS support" on
+
 .include <bsd.port.pre.mk>
 
 GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED
@@ -62,6 +61,13 @@
 EXTRA_PATCHES=	${FILESDIR}/libsydney_oss
 .endif
 
+.if defined(WITHOUT_DBUS)
+MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
+.else
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		notify.1:${PORTSDIR}/devel/libnotify
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
 	    	${WRKSRC}/storage/build/Makefile.in \