[pkgsrc/trunk]: pkgsrc/x11/gnome-control-center enable hal, bump PKGREVISION

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/680b7460ad7c
branches:  trunk
changeset: 550599:680b7460ad7c
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Mon Nov 24 14:05:40 2008 +0000

description:
enable hal, bump PKGREVISION

diffstat:

 x11/gnome-control-center/Makefile |  19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r 4db6a7a5a80b -r 680b7460ad7c x11/gnome-control-center/Makefile
--- a/x11/gnome-control-center/Makefile Mon Nov 24 14:04:11 2008 +0000
+++ b/x11/gnome-control-center/Makefile Mon Nov 24 14:05:40 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2008/10/24 23:45:34 jnemeth Exp $
+# $NetBSD: Makefile,v 1.18 2008/11/24 14:05:40 jmcneill Exp $
 #
 
 DISTNAME=      gnome-control-center-2.24.0.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11 gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gnome-control-center/2.24/}
 EXTRACT_SUFX=  .tar.bz2
@@ -21,8 +21,6 @@
 
 CONFLICTS+=            gnome2-control-center-[0-9]* control-center-[0-9]*
 
-CONFIGURE_ARGS+=       --disable-hal
-
 CPPFLAGS+=             -DDBUS_API_SUBJECT_TO_CHANGE
 
 #PKGCONFIG_OVERRIDE+=  gnome-settings-daemon/gnome-settings-daemon.pc.in
@@ -49,14 +47,20 @@
 BUILDLINK_API_DEPENDS.Xft2+=   Xft2>=2.1.2
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gnome-control-center
-PKG_SUPPORTED_OPTIONS= evolution
-PKG_SUGGESTED_OPTIONS= evolution
+PKG_SUPPORTED_OPTIONS= evolution hal
+PKG_SUGGESTED_OPTIONS= evolution hal
 .include "../../mk/bsd.options.mk"
 PLIST_VARS+=           evolution
 .if !empty(PKG_OPTIONS:Mevolution)
 CONFIGURE_ARGS+=       --enable-aboutme
 PLIST.evolution=       yes
 .endif
+.if !empty(PKG_OPTIONS:Mhal)
+CONFIGURE_ARGS+=       --enable-hal
+.else
+CONFIGURE_ARGS+=       --disable-hal
+.endif
+
 
 _TOOLS_USE_MSGFMT_SH=  yes
 
@@ -91,6 +95,9 @@
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mhal)
+.include "../../sysutils/hal/buildlink3.mk"
+.endif
 .include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"