From owner-freebsd-gecko@FreeBSD.ORG  Sat Jan  9 16:14:07 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 CFC26106568D
	for <freebsd-gecko@freebsd.org>; Sat,  9 Jan 2010 16:14:07 +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 476338FC13
	for <freebsd-gecko@freebsd.org>; Sat,  9 Jan 2010 16:14:06 +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 o09GE5Vt082467
	for <freebsd-gecko@freebsd.org>; Sat, 9 Jan 2010 16:14:05 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id o09GE0d1082202
	for freebsd-gecko@freebsd.org; Sat, 9 Jan 2010 16:14:00 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Sat, 9 Jan 2010 16:14:00 GMT
Message-Id: <201001091614.o09GE0d1082202@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] r235 - branches/experimental/www/firefox3-devel
	trunk/www/firefox3-devel
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: Sat, 09 Jan 2010 16:14:07 -0000

Author: beat
Date: Sat Jan  9 16:14:00 2010
New Revision: 235

Log:
- Disable libnotify when dbus is disabled to avoid installing of dbus as a
  dependency from libnotify.

Reported and tested by:	Stefan Thurner <thurners AT nicsys.de>

Modified:
   branches/experimental/www/firefox3-devel/Makefile
   trunk/www/firefox3-devel/Makefile

Modified: branches/experimental/www/firefox3-devel/Makefile
==============================================================================
--- branches/experimental/www/firefox3-devel/Makefile	Fri Jan  8 19:48:11 2010	(r234)
+++ branches/experimental/www/firefox3-devel/Makefile	Sat Jan  9 16:14:00 2010	(r235)
@@ -17,7 +17,6 @@
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.8:${PORTSDIR}/devel/nspr
-LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify
 
 USE_AUTOTOOLS=	autoconf:213
 LATEST_LINK=	firefox3-devel
@@ -79,9 +78,10 @@
 .endif
 
 .if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus
+MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		notify.1:${PORTSDIR}/devel/libnotify
 .endif
 
 post-extract::

Modified: trunk/www/firefox3-devel/Makefile
==============================================================================
--- trunk/www/firefox3-devel/Makefile	Fri Jan  8 19:48:11 2010	(r234)
+++ trunk/www/firefox3-devel/Makefile	Sat Jan  9 16:14:00 2010	(r235)
@@ -17,7 +17,6 @@
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.8:${PORTSDIR}/devel/nspr
-LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify
 
 USE_AUTOTOOLS=	autoconf:213
 LATEST_LINK=	firefox3-devel
@@ -79,9 +78,10 @@
 .endif
 
 .if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus
+MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		notify.1:${PORTSDIR}/devel/libnotify
 .endif
 
 post-extract::