[pkgsrc/trunk]: pkgsrc/sysutils/system-tools-backends Pull in policykit and h...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/be614ac49470
branches:  trunk
changeset: 550516:be614ac49470
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Sun Nov 23 16:21:05 2008 +0000

description:
Pull in policykit and hal, fix handling of dbus config files.

diffstat:

 sysutils/system-tools-backends/Makefile |  23 +++++++++++++++++++++--
 sysutils/system-tools-backends/PLIST    |   5 +++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diffs (74 lines):

diff -r 800d94fb0252 -r be614ac49470 sysutils/system-tools-backends/Makefile
--- a/sysutils/system-tools-backends/Makefile   Sun Nov 23 16:20:19 2008 +0000
+++ b/sysutils/system-tools-backends/Makefile   Sun Nov 23 16:21:05 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/11/15 18:28:56 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2008/11/23 16:21:05 jmcneill Exp $
 #
 
 DISTNAME=              system-tools-backends-2.6.0
+PKGREVISION=           1
 CATEGORIES=            sysutils
 MASTER_SITES=          http://system-tools-backends.freedesktop.org/downloads/2.6/
 
@@ -11,14 +12,32 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+PKG_OPTIONS_VAR=       PKG_OPTIONS.system-tools-backends
+PKG_SUPPORTED_OPTIONS+=        hal
+PKG_SUGGESTED_OPTIONS+=        hal
+
+.include "../../mk/bsd.options.mk"
+.if !empty(PKG_OPTIONS:Mhal)
+.include "../../security/policykit/buildlink3.mk"
+.include "../../sysutils/hal/buildlink3.mk"
+.endif
+
+EGDIR=         ${PREFIX}/share/examples/system-tools-backends
+CONF_FILES+=   ${EGDIR}/system-tools-backends.conf ${PKG_SYSCONFDIR}/dbus-1/system.d/system-tools-backends.conf
+
 GNU_CONFIGURE=         YES
 USE_DIRS+=             xdg-1.4
 USE_PKGLOCALEDIR=      YES
 USE_TOOLS+=            gmake intltool msgfmt perl pkg-config
 USE_LIBTOOL=           YES
 
-CONFIGURE_ARGS+=       --with-stb-group=${ROOT_GROUP}
+STB_GROUP?=            stb-admin
+PKG_GROUPS=            ${STB_GROUP}
+PKG_GROUPS_VARS+=      STB_GROUP
+
+CONFIGURE_ARGS+=       --with-stb-group=${STB_GROUP}
 CONFIGURE_ARGS+=       --localstatedir=/var
+CONFIGURE_ARGS+=       --with-dbus-sys=${EGDIR}
 
 DEPENDS+=      p5-XML-Twig>=3.32:../../textproc/p5-XML-Twig
 DEPENDS+=      p5-Net-DBus>=0.33.6:../../net/p5-Net-DBus
diff -r 800d94fb0252 -r be614ac49470 sysutils/system-tools-backends/PLIST
--- a/sysutils/system-tools-backends/PLIST      Sun Nov 23 16:20:19 2008 +0000
+++ b/sysutils/system-tools-backends/PLIST      Sun Nov 23 16:21:05 2008 +0000
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/11/15 18:28:56 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/11/23 16:21:05 jmcneill Exp $
 bin/system-tools-backends
-etc/dbus-1/system.d/system-tools-backends.conf
 lib/pkgconfig/system-tools-backends-2.0.pc
 share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.GroupsConfig.service
 share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.HostsConfig.service
@@ -14,6 +13,7 @@
 share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UserConfig.service
 share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UsersConfig.service
 share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.service
+share/examples/system-tools-backends/system-tools-backends.conf
 share/system-tools-backends-2.0/files/general_gprs_chatscript
 share/system-tools-backends-2.0/files/general_isdn_ppp_options
 share/system-tools-backends-2.0/files/general_pppoe_ppp_options
@@ -51,6 +51,7 @@
 share/system-tools-backends-2.0/scripts/Utils/Report.pm
 share/system-tools-backends-2.0/scripts/Utils/Util.pm
 share/system-tools-backends-2.0/scripts/Utils/XML.pm
+@dirrm share/examples/system-tools-backends
 @dirrm share/system-tools-backends-2.0/scripts/Utils
 @dirrm share/system-tools-backends-2.0/scripts/Users
 @dirrm share/system-tools-backends-2.0/scripts/Time