Date: Fri, 6 Jul 2012 16:33:48 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r847 - in branches/experimental: Mk mail/thunderbird3 www/firefox36 www/kompozer www/libxul19 Message-ID: <201207061633.q66GXm1A086661@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Jul 6 16:33:47 2012
New Revision: 847
Log:
add GIO, GCONF, LIBPROXY common options
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/mail/thunderbird3/Makefile
branches/experimental/www/firefox36/Makefile
branches/experimental/www/kompozer/Makefile
branches/experimental/www/libxul19/Makefile
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Fri Jul 6 16:33:38 2012 (r846)
+++ branches/experimental/Mk/bsd.gecko.mk Fri Jul 6 16:33:47 2012 (r847)
@@ -552,11 +552,13 @@
CFLAGS+= ${PTHREAD_CFLAGS}
LIBS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv
-OPTIONS_DEFINE+=DBUS DEBUG GNOMEVFS2 LOGGING OPTIMIZED_CFLAGS
+OPTIONS_DEFINE+=DBUS DEBUG GCONF GIO GNOMEVFS2 LIBPROXY LOGGING OPTIMIZED_CFLAGS
+GIO_DESC?= Use GIO for file I/O # move to bsd.options.desc.mk
LIGHTNING_DESC?=Enable calendar extension
LOGGING_DESC?= Enable additional log messages
PGO_DESC?= Enable Profile-Guided Optimization # move to bsd.options.desc.mk
+LIBPROXY_DESC?= Enable proxy support via libproxy
# Standard depends
_ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip
@@ -685,6 +687,19 @@
MOZ_OPTIONS+= --disable-gstreamer
.endif
+.if ${PORT_OPTIONS:MGCONF}
+USE_GNOME+= gconf2
+MOZ_OPTIONS+= --enable-gconf
+.else
+MOZ_OPTIONS+= --disable-gconf
+.endif
+
+.if ${PORT_OPTIONS:MGIO}
+MOZ_OPTIONS+= --enable-gio
+.else
+MOZ_OPTIONS+= --disable-gio
+.endif
+
.if ${PORT_OPTIONS:MGNOMEVFS2}
USE_GNOME+= gnomevfs2
MOZ_OPTIONS+= --enable-gnomevfs
@@ -692,6 +707,13 @@
MOZ_OPTIONS+= --disable-gnomevfs
.endif
+.if ${PORT_OPTIONS:MLIBPROXY}
+LIB_DEPENDS+= proxy:${PORTSDIR}/net/libproxy
+MOZ_OPTIONS+= --enable-libproxy
+.else
+MOZ_OPTIONS+= --disable-libproxy
+.endif
+
.if !defined(STRIP) || ${STRIP} == ""
MOZ_OPTIONS+= --disable-strip --disable-install-strip
.else
Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile Fri Jul 6 16:33:38 2012 (r846)
+++ branches/experimental/mail/thunderbird3/Makefile Fri Jul 6 16:33:47 2012 (r847)
@@ -56,6 +56,8 @@
.include <bsd.port.pre.mk>
+OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY}
+
WRKSRC= ${WRKDIR}/comm-1.9.2
MOZSRC:= ${WRKSRC}/mozilla
Modified: branches/experimental/www/firefox36/Makefile
==============================================================================
--- branches/experimental/www/firefox36/Makefile Fri Jul 6 16:33:38 2012 (r846)
+++ branches/experimental/www/firefox36/Makefile Fri Jul 6 16:33:47 2012 (r847)
@@ -53,6 +53,8 @@
.include <bsd.port.pre.mk>
+OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY}
+
EXTRA_PATCHES= ${FILESDIR}/libsydney_oss
.if ${ARCH} == amd64
Modified: branches/experimental/www/kompozer/Makefile
==============================================================================
--- branches/experimental/www/kompozer/Makefile Fri Jul 6 16:33:38 2012 (r846)
+++ branches/experimental/www/kompozer/Makefile Fri Jul 6 16:33:47 2012 (r847)
@@ -44,7 +44,7 @@
.include <bsd.port.pre.mk>
-OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS}
+OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS:NGIO:NLIBPROXY}
.if ${ARCH} == amd64
CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
Modified: branches/experimental/www/libxul19/Makefile
==============================================================================
--- branches/experimental/www/libxul19/Makefile Fri Jul 6 16:33:38 2012 (r846)
+++ branches/experimental/www/libxul19/Makefile Fri Jul 6 16:33:47 2012 (r847)
@@ -52,6 +52,8 @@
.include <bsd.port.pre.mk>
+OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY}
+
.if ${USE_MOZILLA:M-nss}
MOZ_PKGCONFIG_FILES+= mozilla-nss
.endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207061633.q66GXm1A086661>