Date: Sun, 25 Jul 2010 17:19:30 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r365 - branches/experimental/www/libxul Message-ID: <201007251719.o6PHJU8r018847@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007251719.o6PHJU8r018847>