9 files changed, 27 insertions, 18 deletions
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index 18a5bf263c4..3d1b41b9c62 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/10/02 21:05:44 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2007/07/04 20:54:59 jlam Exp $
 
 PKGNAME=		amanda-common-${VERS}
 PKGREVISION=		4
@@ -34,6 +34,6 @@ PKG_SHELL.${AMANDA_USER}=	${SH}
 
 OWN_DIRS_PERMS=		${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0700
 OWN_DIRS_PERMS+=	${AMANDA_VAR}/gnutar-lists  ${AMANDA_USER} ${AMANDA_GROUP} 0700
-BUILD_DEFS+=		AMANDA_VAR AMANDA_USER AMANDA_GROUP
+BUILD_DEFS+=		AMANDA_VAR
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index 453cb529c1d..8efb9d2f19a 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2007/01/05 12:47:27 obache Exp $
+# $NetBSD: Makefile.common,v 1.25 2007/07/04 20:54:59 jlam Exp $
 #
 # common make file fragment shared by all amanda-* pkgs.
 #
@@ -24,8 +24,9 @@ AMANDA_USER?=		backup
 AMANDA_TMP?=		/tmp/amanda
 AMANDA_VAR?=		${VARBASE}/amanda
 
-BUILD_DEFS+=		AMANDA_USER AMANDA_GROUP AMANDA_SMB
-BUILD_DEFS+=		AMANDA_TMP AMANDA_VAR VARBASE
+PKG_GROUPS_VARS+=	AMANDA_GROUP
+PKG_USERS_VARS+=	AMANDA_USER
+BUILD_DEFS+=		AMANDA_SMB AMANDA_TMP AMANDA_VAR VARBASE
 
 USE_LIBTOOL=		yes
 
diff --git a/sysutils/bacula-clientonly/Makefile b/sysutils/bacula-clientonly/Makefile
index cb01137fc32..e06e7c55b92 100644
--- a/sysutils/bacula-clientonly/Makefile
+++ b/sysutils/bacula-clientonly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/03 08:18:45 ghen Exp $
+# $NetBSD: Makefile,v 1.6 2007/07/04 20:54:59 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-clientonly-/}
 COMMENT=		The Network Backup Solution (client only)
@@ -13,8 +13,6 @@ PLIST_SRC=		${.CURDIR}/../../sysutils/bacula/PLIST.common
 
 CONFIGURE_ARGS+=	--enable-client-only
 
-BUILD_DEFS+=		BACULA_GROUP
-
 OWN_DIRS_PERMS+=	${BACULA_WORKINGDIR} root ${BACULA_GROUP} 770
 
 PKG_GROUPS=		${BACULA_GROUP}
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 6699231edc5..eefc3e84c3e 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/01/04 12:16:57 ghen Exp $
+# $NetBSD: Makefile,v 1.21 2007/07/04 20:54:59 jlam Exp $
 
 CONFLICTS+=		bacula-client-[0-9]* bacula-clientonly-[0-9]*
 
@@ -14,8 +14,6 @@ MESSAGE_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV:Q}
 CONFIGURE_ARGS+=	--with-dir-user=${BACULA_DIR_USER:Q} --with-dir-group=${BACULA_GROUP:Q}
 CONFIGURE_ARGS+=	--with-sd-user=${BACULA_SD_USER:Q} --with-sd-group=${BACULA_GROUP:Q}
 
-BUILD_DEFS+=		BACULA_DIR_USER BACULA_SD_USER BACULA_GROUP
-
 OWN_DIRS_PERMS+=	${BACULA_WORKINGDIR} ${ROOT_USER} ${BACULA_GROUP} 770
 
 PKG_USERS=		${BACULA_DIR_USER}:${BACULA_GROUP}
diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index bc780f1c907..0bcaf7eb55d 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2007/04/16 16:10:42 ghen Exp $
+# $NetBSD: Makefile.common,v 1.39 2007/07/04 20:55:00 jlam Exp $
 
 DISTNAME=		bacula-2.0.3
 CATEGORIES=		sysutils
@@ -18,6 +18,9 @@ BACULA_GROUP?=		bacula
 BACULA_DIR_USER?=	bacula-dir
 BACULA_SD_USER?=	bacula-sd
 
+PKG_GROUPS_VARS+=	BACULA_GROUP
+PKG_USERS_VARS+=	BACULA_DIR_USER BACULA_SD_USER
+
 PKG_SYSCONFSUBDIR?=	bacula
 BACULA_PIDDIR?=		${VARBASE}/run
 BACULA_WORKINGDIR?=	${VARBASE}/spool/bacula
diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index 2661bd2de50..fb07ee76171 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/01/17 02:46:59 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.24 2007/07/04 20:55:00 jlam Exp $
 #
 
 DISTNAME=	dbus-1.0.2
@@ -66,7 +66,8 @@ INSTALLATION_DIRS=	${EGDIR}
 
 RCD_SCRIPTS=		dbus
 
-BUILD_DEFS+=		DBUS_USER DBUS_GROUP
+PKG_GROUPS_VARS+=	DBUS_GROUP
+PKG_USERS_VARS+=	DBUS_USER
 
 PKG_GROUPS=		${DBUS_GROUP}
 PKG_USERS=		${DBUS_USER}:${DBUS_GROUP}
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index 7a023922a87..2f80d87a03a 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/12/05 14:53:32 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2007/07/04 20:55:00 jlam Exp $
 #
 
 DISTNAME=	munin_${VER}
@@ -21,6 +21,9 @@ USE_PKGINSTALL=	YES
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S:_:-:}
 
+PKG_GROUPS_VARS+=	MUNIN_GROUP
+PKG_USERS_VARS+=	MUNIN_USER
+
 MUNIN_GROUP?=	munin
 MUNIN_USER?=	munin
 
diff --git a/sysutils/munin-server/Makefile b/sysutils/munin-server/Makefile
index 824f038776f..f2cbebe0d25 100644
--- a/sysutils/munin-server/Makefile
+++ b/sysutils/munin-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/12/05 14:53:32 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2007/07/04 20:55:00 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV:S:-server-:_:}
@@ -25,6 +25,9 @@ PERL5_CONFIGURE=NO
 WRKSRC=		${WRKDIR}/${DISTNAME:S:_:-:}
 CHECK_PORTABILITY_SKIP+=	node/node.d/*
 
+PKG_GROUPS_VARS+=	MUNIN_GROUP
+PKG_USERS_VARS+=	MUNIN_USER
+
 MUNIN_GROUP?=	munin
 MUNIN_USER?=	munin
 
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index 75ff6532a00..9b72039736f 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/08/16 13:15:54 ghen Exp $
+# $NetBSD: Makefile,v 1.48 2007/07/04 20:55:01 jlam Exp $
 
 .include "Makefile.common"
 
@@ -14,7 +14,9 @@ CONFIGURE_ARGS+=	--with-pidpath=${NUT_STATEDIR:Q}
 NUT_USER?=		nut
 NUT_GROUP?=		nut
 
-BUILD_DEFS+=		NUT_STATEDIR NUT_USER NUT_GROUP
+PKG_GROUPS_VARS+=	NUT_GROUP
+PKG_USERS_VARS+=	NUT_USER
+BUILD_DEFS+=		NUT_STATEDIR
 
 FILES_SUBST+=		NUT_CONFDIR=${NUT_CONFDIR:Q}
 FILES_SUBST+=		NUT_STATEDIR=${NUT_STATEDIR:Q}