[pkgsrc/trunk]: pkgsrc/www/firefox Add a "gnome" option which toggles gnome-v...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d08316ebe5db
branches:  trunk
changeset: 564168:d08316ebe5db
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Aug 29 10:34:37 2009 +0000

description:
Add a "gnome" option which toggles gnome-vfs (and dbus) support.
Enable this by default.
Bump revision.

diffstat:

 www/firefox/Makefile   |   7 +++----
 www/firefox/options.mk |  12 ++++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 17a16cfbe23d -r d08316ebe5db www/firefox/Makefile
--- a/www/firefox/Makefile      Sat Aug 29 10:02:42 2009 +0000
+++ b/www/firefox/Makefile      Sat Aug 29 10:34:37 2009 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.53 2009/08/26 19:58:26 sno Exp $
+# $NetBSD: Makefile,v 1.54 2009/08/29 10:34:37 tnn Exp $
 #
 
 DISTNAME=      firefox-${FIREFOX_VER}-source
 PKGNAME=       firefox-${FIREFOX_VER}
 FIREFOX_VER=   3.5.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.bz2
@@ -37,8 +37,7 @@
 CONFIGURE_ARGS+=       --disable-tests --disable-pedantic
 CONFIGURE_ARGS+=       --enable-crypto
 CONFIGURE_ARGS+=       --enable-optimize=-O2 --with-pthreads
-CONFIGURE_ARGS+=       --disable-gnomevfs --disable-gnomeui
-CONFIGURE_ARGS+=       --disable-dbus --disable-javaxpcom
+CONFIGURE_ARGS+=       --disable-gnomeui --disable-javaxpcom
 CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk2
 CONFIGURE_ARGS+=       --enable-svg --enable-mathml
 CONFIGURE_ARGS+=       --enable-system-cairo --enable-system-lcms
diff -r 17a16cfbe23d -r d08316ebe5db www/firefox/options.mk
--- a/www/firefox/options.mk    Sat Aug 29 10:02:42 2009 +0000
+++ b/www/firefox/options.mk    Sat Aug 29 10:34:37 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2009/08/09 21:13:39 tnn Exp $
+# $NetBSD: options.mk,v 1.3 2009/08/29 10:34:37 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
-PKG_SUPPORTED_OPTIONS= debug official-mozilla-branding mozilla-jemalloc
+PKG_SUPPORTED_OPTIONS= debug official-mozilla-branding mozilla-jemalloc gnome
+PKG_SUGGESTED_OPTIONS+=        gnome
 
 PLIST_VARS+=           branding
 
@@ -17,6 +18,13 @@
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mgnome)
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-gnomevfs --enable-dbus
+.else
+CONFIGURE_ARGS+=       --disable-gnomevfs --disable-dbus
+.endif
+
 .if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
 CONFIGURE_ARGS+=       --enable-jemalloc
 . if ${OPSYS} == "SunOS"