[pkgsrc/trunk]: pkgsrc/devel/xulrunner export gnome dependencies in bl3.mk wh...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5e9bd8a2689e
branches:  trunk
changeset: 564985:5e9bd8a2689e
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Sep 13 19:10:10 2009 +0000

description:
export gnome dependencies in bl3.mk when gnome option is on

diffstat:

 devel/xulrunner/Makefile      |   7 +++----
 devel/xulrunner/buildlink3.mk |  11 +++++++----
 devel/xulrunner/options.mk    |   8 ++++----
 3 files changed, 14 insertions(+), 12 deletions(-)

diffs (76 lines):

diff -r 0e609a3b7f3e -r 5e9bd8a2689e devel/xulrunner/Makefile
--- a/devel/xulrunner/Makefile  Sun Sep 13 17:56:56 2009 +0000
+++ b/devel/xulrunner/Makefile  Sun Sep 13 19:10:10 2009 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2009/09/13 13:39:41 tnn Exp $
+# $NetBSD: Makefile,v 1.19 2009/09/13 19:10:10 tnn Exp $
 #
 
 DISTNAME=      xulrunner-${XULRUNNER_VER}-source
 PKGNAME=       ${DISTNAME:S/-source//}
 XULRUNNER_VER= 1.9.1.3
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel www
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=xulrunner/releases/${XULRUNNER_VER}/source/}
 EXTRACT_SUFX=  .tar.bz2
@@ -48,8 +48,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-javaxpcom
 CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk2
 CONFIGURE_ARGS+=       --enable-svg --enable-mathml
 CONFIGURE_ARGS+=       --enable-system-cairo
diff -r 0e609a3b7f3e -r 5e9bd8a2689e devel/xulrunner/buildlink3.mk
--- a/devel/xulrunner/buildlink3.mk     Sun Sep 13 17:56:56 2009 +0000
+++ b/devel/xulrunner/buildlink3.mk     Sun Sep 13 19:10:10 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/08/26 19:56:54 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/09/13 19:10:10 tnn Exp $
 
 BUILDLINK_TREE+=       xulrunner
 
@@ -9,9 +9,12 @@
 BUILDLINK_ABI_DEPENDS.xulrunner?=      xulrunner>=1.9.1.2nb3
 BUILDLINK_PKGSRCDIR.xulrunner?=        ../../devel/xulrunner
 
-#.include "../../net/libIDL/buildlink3.mk"
-#.include "../../x11/gtk2/buildlink3.mk"
-#.include "../../x11/libXt/buildlink3.mk"
+pkgbase := xulrunner
+.include "../../mk/pkg-build-options.mk"
+.if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome)
+. include "../../devel/libgnomeui/buildlink3.mk"
+. include "../../sysutils/gnome-vfs/buildlink3.mk"
+.endif
 .endif # XULRUNNER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -xulrunner
diff -r 0e609a3b7f3e -r 5e9bd8a2689e devel/xulrunner/options.mk
--- a/devel/xulrunner/options.mk        Sun Sep 13 17:56:56 2009 +0000
+++ b/devel/xulrunner/options.mk        Sun Sep 13 19:10:10 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2009/09/13 17:56:56 tnn Exp $
+# $NetBSD: options.mk,v 1.5 2009/09/13 19:10:10 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xulrunner
 PKG_SUPPORTED_OPTIONS= debug mozilla-jemalloc gnome
@@ -21,12 +21,12 @@
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgnome)
-.include "../../devel/libgnome/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-gnomevfs --enable-dbus
+CONFIGURE_ARGS+=       --enable-gnomevfs --enable-dbus --enable-gnomeui
 PLIST.gnome=           yes
 .else
-CONFIGURE_ARGS+=       --disable-gnomevfs --disable-dbus
+CONFIGURE_ARGS+=       --disable-gnomevfs --disable-dbus --disable-gnomeui
 .endif
 
 .if !empty(PKG_OPTIONS:Mmozilla-jemalloc)