[SVN-Commit] r732 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-beta mail/thunderbird-esr mail/thunderbird3 www/firefox www/firefox-beta www/firefox-esr www/firefox36 www/kompozer www/libxul www/seamonkey www/seamonkey-beta

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Fri Jun  8 14:12:50 2012
New Revision: 732

Log:
move DBUS option to bsd.gecko.mk, its ifdef is already there

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   branches/experimental/mail/thunderbird-beta/Makefile
   branches/experimental/mail/thunderbird-esr/Makefile
   branches/experimental/mail/thunderbird/Makefile
   branches/experimental/mail/thunderbird3/Makefile
   branches/experimental/www/firefox-beta/Makefile
   branches/experimental/www/firefox-esr/Makefile
   branches/experimental/www/firefox/Makefile
   branches/experimental/www/firefox36/Makefile
   branches/experimental/www/kompozer/Makefile
   branches/experimental/www/libxul/Makefile
   branches/experimental/www/seamonkey-beta/Makefile
   branches/experimental/www/seamonkey/Makefile

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Fri Jun  8 14:11:16 2012	(r731)
+++ branches/experimental/Mk/bsd.gecko.mk	Fri Jun  8 14:12:50 2012	(r732)
@@ -555,12 +555,13 @@
 CFLAGS+=		${PTHREAD_CFLAGS}
 LIBS+=			${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv
 
-_USE_GECKO_OPTIONS_ALL=	java debug logging optimized_cflags
+_USE_GECKO_OPTIONS_ALL=	java dbus debug logging optimized_cflags
 
 .if !defined(USE_GECKO_OPTIONS)
-USE_GECKO_OPTIONS=	debug logging optimized_cflags
+USE_GECKO_OPTIONS=	dbus debug logging optimized_cflags
 .endif
 
+dbus_OPTION=	"Enable D-BUS support" on
 debug_OPTION=	"Build a debugging image" off
 java_OPTION=	"Enable JAVA xpcom" off
 logging_OPTION=	"Enable additional log messages" off
@@ -684,6 +685,13 @@
 CFLAGS:=	${CFLAGS} ${EXTRA_CFLAGS}
 .endif
 
+.if defined(WITH_DBUS)
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+				notify.4:${PORTSDIR}/devel/libnotify
+.else
+MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
+.endif
+
 .if defined(WITH_SMB)
 USE_GNOME+=		gnomevfs2
 MOZ_OPTIONS+=	--enable-gnomevfs

Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-beta/Makefile	Fri Jun  8 14:11:16 2012	(r731)
+++ branches/experimental/mail/thunderbird-beta/Makefile	Fri Jun  8 14:12:50 2012	(r732)
@@ -78,13 +78,6 @@
 MOZ_OPTIONS+=	--disable-gnomeui
 .endif
 
-.if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
-.else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.4:${PORTSDIR}/devel/libnotify
-.endif
-
 .if ${ARCH} == amd64 || ${ARCH} == i386
 BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
 .endif

Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile	Fri Jun  8 14:11:16 2012	(r731)
+++ branches/experimental/mail/thunderbird-esr/Makefile	Fri Jun  8 14:12:50 2012	(r732)
@@ -79,13 +79,6 @@
 MOZ_OPTIONS+=	--disable-gnomeui
 .endif
 
-.if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
-.else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.4:${PORTSDIR}/devel/libnotify
-.endif
-
 .if ${ARCH} == amd64 || ${ARCH} == i386
 BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
 .endif

Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile	Fri Jun  8 14:11:16 2012	(r731)
+++ branches/experimental/mail/thunderbird/Makefile	Fri Jun  8 14:12:50 2012	(r732)
@@ -82,13 +82,6 @@
 MOZ_OPTIONS+=	--disable-gnomeui
 .endif
 
-.if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
-.else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.4:${PORTSDIR}/devel/libnotify
-.endif
-
 .if ${ARCH} == amd64 || ${ARCH} == i386
 BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
 .endif

Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile	Fri Jun  8 14:11:16 2012	(r731)
+++ branches/experimental/mail/thunderbird3/Makefile	Fri Jun  8 14:12:50 2012	(r732)
@@ -76,13 +76,6 @@
 MOZ_OPTIONS+=	--disable-gnomeui
 .endif
 
-.if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
-.else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.4:${PORTSDIR}/devel/libnotify
-.endif
-
 post-extract:
 	${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \
 		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop

Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile	Fri Jun  8 14:11:16 2012	(r731)
+++ branches/experimental/www/firefox-beta/Makefile	Fri Jun  8 14:12:50 2012	(r732)
@@ -52,8 +52,7 @@
 		--enable-official-branding --disable-updater \
 		--enable-canvas --enable-libxul --disable-necko-wifi
 
-OPTIONS=	DBUS "Enable D-BUS support" on \
-		PGO "Enable Profile-Guided Optimization" off
+OPTIONS=	PGO "Enable Profile-Guided Optimization" off
 
 .include <bsd.port.pre.mk>
 
@@ -66,13 +65,6 @@
 MOZ_OPTIONS+=	--disable-gnomeui
 .endif
 
-.if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
-.else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.4:${PORTSDIR}/devel/libnotify
-.endif
-
 .if defined(WITH_PGO)
 BROKEN=		does not build with PGO option enabled
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3

Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile	Fri Jun  8 14:11:16 2012	(r731)
+++ branches/experimental/www/firefox-esr/Makefile	Fri Jun  8 14:12:50 2012	(r732)
@@ -52,8 +52,7 @@
 		--enable-official-branding --disable-updater \
 		--enable-canvas --enable-libxul --disable-necko-wifi
 
-OPTIONS=	DBUS "Enable D-BUS support" on \
-		PGO "Enable Profile-Guided Optimization" off
+OPTIONS=	PGO "Enable Profile-Guided Optimization" off
 
 .include <bsd.port.pre.mk>
 
@@ -66,13 +65,6 @@
 MOZ_OPTIONS+=	--disable-gnomeui
 .endif
 
-.if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
-.else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.4:${PORTSDIR}/devel/libnotify
-.endif
-
 .if defined(WITH_PGO)
 BROKEN=		does not build with PGO option enabled
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3

Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile	Fri Jun  8 14:11:16 2012	(r731)
+++ branches/experimental/www/firefox/Makefile	Fri Jun  8 14:12:50 2012	(r732)
@@ -51,8 +51,7 @@
 		--enable-official-branding --disable-updater \
 		--enable-canvas --enable-libxul --disable-necko-wifi
 
-OPTIONS=	DBUS "Enable D-BUS support" on \
-		PGO "Enable Profile-Guided Optimization" off
+OPTIONS=	PGO "Enable Profile-Guided Optimization" off
 
 .include <bsd.port.pre.mk>
 
@@ -65,13 +64,6 @@
 MOZ_OPTIONS+=	--disable-gnomeui
 .endif
 
-.if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
-.else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.4:${PORTSDIR}/devel/libnotify
-.endif
-
 .if defined(WITH_PGO)
 BROKEN=		does not build with PGO option enabled
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3

Modified: branches/experimental/www/firefox36/Makefile
==============================================================================
--- branches/experimental/www/firefox36/Makefile	Fri Jun  8 14:11:16 2012	(r731)
+++ branches/experimental/www/firefox36/Makefile	Fri Jun  8 14:12:50 2012	(r732)
@@ -49,8 +49,7 @@
 		--enable-canvas --enable-libxul --disable-necko-wifi \
 		--disable-ipc
 
-OPTIONS=	DBUS "Enable D-BUS support" on \
-		SMB "Enable smb:// URI support using gnomevfs" off
+OPTIONS=	SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
 
@@ -74,13 +73,6 @@
 MOZ_OPTIONS+=	--disable-gnomeui
 .endif
 
-.if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
-.else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.4:${PORTSDIR}/devel/libnotify
-.endif
-
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \

Modified: branches/experimental/www/kompozer/Makefile
==============================================================================
--- branches/experimental/www/kompozer/Makefile	Fri Jun  8 14:11:16 2012	(r731)
+++ branches/experimental/www/kompozer/Makefile	Fri Jun  8 14:12:50 2012	(r732)
@@ -25,6 +25,7 @@
 MAKEFILE=	client.mk
 ALL_TARGET=	build_all
 USE_MOZILLA=	-event -ffi -sqlite -vpx
+USE_GECKO_OPTIONS=debug logging optimized_cflags
 MOZ_EXTENSIONS=	wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck
 MOZ_OPTIONS=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
 				--enable-application=composer \

Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile	Fri Jun  8 14:11:16 2012	(r731)
+++ branches/experimental/www/libxul/Makefile	Fri Jun  8 14:12:50 2012	(r732)
@@ -51,8 +51,6 @@
 MOZ_PKGCONFIG_FILES=	libxul-embedding libxul mozilla-js mozilla-nss \
 			mozilla-plugin
 
-OPTIONS=	DBUS "Enable D-BUS support" on
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == powerpc64
@@ -64,13 +62,6 @@
 .endif
 .endif
 
-.if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
-.else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.4:${PORTSDIR}/devel/libnotify
-.endif
-
 .if ${ARCH} == amd64 || ${ARCH} == i386
 BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
 .endif

Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile	Fri Jun  8 14:11:16 2012	(r731)
+++ branches/experimental/www/seamonkey-beta/Makefile	Fri Jun  8 14:12:50 2012	(r732)
@@ -60,7 +60,6 @@
 	LDAP "Enable LDAP support for Mailnews" on \
 	CHATZILLA "Enable the Chatzilla IRC module" on \
 	LIGHTNING "Enable calendar extension" off \
-	DBUS "Enable D-BUS support" on \
 	SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
@@ -102,13 +101,6 @@
 MOZ_OPTIONS+=	--disable-composer
 .endif
 
-.if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
-.else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.4:${PORTSDIR}/devel/libnotify
-.endif
-
 .if ${ARCH} == amd64 || ${ARCH} == i386
 BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
 .endif

Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile	Fri Jun  8 14:11:16 2012	(r731)
+++ branches/experimental/www/seamonkey/Makefile	Fri Jun  8 14:12:50 2012	(r732)
@@ -60,7 +60,6 @@
 	LDAP "Enable LDAP support for Mailnews" on \
 	CHATZILLA "Enable the Chatzilla IRC module" on \
 	LIGHTNING "Enable calendar extension" off \
-	DBUS "Enable D-BUS support" on \
 	SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
@@ -102,13 +101,6 @@
 MOZ_OPTIONS+=	--disable-composer
 .endif
 
-.if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
-.else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.4:${PORTSDIR}/devel/libnotify
-.endif
-
 .if ${ARCH} == amd64 || ${ARCH} == i386
 BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
 .endif