[SVN-Commit] r235 - branches/experimental/www/firefox3-devel trunk/www/firefox3-devel

[svn-freebsd-gecko at chruetertee.ch]

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::