Use PKG_{USERS,GROUPS} instead of PKG_{USER,GROUP}.

9 files changed, 36 insertions, 41 deletions

diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index 7069a6cba01..164175806be 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/11/25 18:59:45 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/26 20:38:31 jlam Exp $
 #
 
 DISTNAME=	gale-0.99a
@@ -24,8 +24,8 @@ CPPFLAGS+=		-I${BUILDLINK_DIR}/include/w3c-libwww
 PKG_SYSCONFSUBDIR?=	gale
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 
-PKG_USER=		gale
-PKG_GROUP=		gale
+PKG_GROUPS=		gale
+PKG_USERS=		gale:gale
 
 SUPPORT_FILES=		${EGDIR}/COPYING ${PKG_SYSCONFDIR}/gale/COPYING
 SUPPORT_FILES+=		${EGDIR}/ROOT ${PKG_SYSCONFDIR}/gale/auth/trusted/ROOT
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index c60506f8b46..117ab1970c8 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/11/21 15:44:22 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/11/26 20:38:31 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
@@ -27,13 +27,12 @@ DIRS_TO_BUILD=		src/backend
 PGUSER?=		pgsql
 PGGROUP?=		pgsql
 PGHOME?=		${PREFIX}/${PGUSER}
+FILES_SUBST+=		PGUSER=${PGUSER}
+FILES_SUBST+=		PGHOME=${PGHOME}
 BUILD_DEFS=		PGUSER PGROUP PGHOME
 
-PKG_USER=		${PGUSER}
-PKG_USER_DESCR=		PostgreSQL database administrator
-PKG_USER_HOME=		${PGHOME}
-PKG_USER_SHELL=		${SH}
-PKG_GROUP=		${PGGROUP}
+PKG_USERS=		${PGUSER}:${PGGROUP}::PostgreSQL\\ database\\ administrator:${PGHOME}:${SH}
+PKG_GROUPS=		${PGGROUP}
 
 RCD_SCRIPTS=		pgsql
 OWN_DIRS_PERMS=		${PGHOME} ${PGUSER} ${PGGROUP} 0755
diff --git a/databases/postgresql-server/files/pgsql.sh b/databases/postgresql-server/files/pgsql.sh
index c3a19767ed2..be054a1eb0c 100644
--- a/databases/postgresql-server/files/pgsql.sh
+++ b/databases/postgresql-server/files/pgsql.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: pgsql.sh,v 1.5 2001/11/19 16:23:08 jlam Exp $
+# $NetBSD: pgsql.sh,v 1.6 2001/11/26 20:38:31 jlam Exp $
 #
 # PostgreSQL database rc.d control script
 #
@@ -8,11 +8,11 @@
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 
-PGHOME=@PKG_USER_HOME@
+PGHOME="@PGHOME@"
 
 name="pgsql"
 rcvar=$name
-pgsql_user="@PKG_USER@"
+pgsql_user="@PGUSER@"
 command="@PREFIX@/bin/pg_ctl"
 command_args="-s -D ${PGHOME}/data -l ${PGHOME}/errlog"
 
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index 17ad1185ef4..bd051df9e7b 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/11/25 23:55:35 zuntum Exp $
+# $NetBSD: Makefile,v 1.15 2001/11/26 20:38:31 jlam Exp $
 #
 
 DISTNAME=	popa3d-0.4.9.4
@@ -12,10 +12,8 @@ MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://www.openwall.com/popa3d/
 COMMENT=	secure, reliable, performant, and small pop3 server
 
-PKG_GROUP=	popa3d
-PKG_USER=	popa3d
-PKG_USER_HOME=	/nonexistent
-PKG_USER_SHELL=	/sbin/nologin
+PKG_GROUPS=	popa3d
+PKG_USERS=	popa3d:popa3d
 
 INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
 DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 7894d407893..e658fce68e7 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2001/11/25 18:59:47 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2001/11/26 20:38:31 jlam Exp $
 
 DISTNAME=		cups-${DIST_VERS}-source
 PKGNAME=		cups-${VERS}
@@ -61,9 +61,8 @@ BUILD_DEFS+=		CUPS_USER CUPS_GROUP
 DOCDIR=			${PREFIX}/share/doc/cups
 EGDIR=			${PREFIX}/share/examples/cups
 
-PKG_USER=		${CUPS_USER}
-PKG_USER_DESCR=		Common UNIX Printing System user
-PKG_GROUP=		${CUPS_GROUP}
+PKG_GROUPS=	${CUPS_GROUP}
+PKG_USERS=	${CUPS_USER}:${CUPS_GROUP}::Common\\ UNIX\\ Printing\\ System\\ user:${SH}
 
 CONF_FILES=	${EGDIR}/client.conf ${PKG_SYSCONFDIR}/cups/client.conf
 CONF_FILES+=	${EGDIR}/cupsd.conf ${PKG_SYSCONFDIR}/cups/cupsd.conf
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 4ce2be0e963..70a90cd4254 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/11/25 18:59:47 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2001/11/26 20:38:32 jlam Exp $
 
 DISTNAME=		cyrus-sasl-1.5.24
 PKGNAME=		${DISTNAME}nb3
@@ -27,6 +27,7 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
 #
 CYRUS_USER?=		cyrus
 CYRUS_GROUP?=		mail
+FILES_SUBST+=		CYRUS_USER=${CYRUS_USER}
 
 HTMLDIR=		${PREFIX}/share/doc/html/cyrus-sasl
 PWCHECKDIR=		/var/pwcheck
@@ -76,11 +77,10 @@ CONFIGURE_ARGS+=	--with-pam=${PREFIX}
 .include "../../security/PAM/buildlink.mk"
 .endif
 
-PKG_USER=		${CYRUS_USER}
-PKG_USER_SHELL=		${SH}
-PKG_GROUP=		${CYRUS_GROUP}
+PKG_GROUPS=		${CYRUS_GROUP}
+PKG_USERS=		${CYRUS_USER}:${CYRUS_GROUP}::::${SH}
 RCD_SCRIPTS=		sasl_pwcheck
-OWN_DIRS_PERMS=		${PWCHECKDIR} ${PKG_USER} ${ROOT_GROUP} 0700
+OWN_DIRS_PERMS=		${PWCHECKDIR} ${CYRUS_USER} ${ROOT_GROUP} 0700
 
 DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
 
diff --git a/security/cyrus-sasl/files/sasl_pwcheck.sh b/security/cyrus-sasl/files/sasl_pwcheck.sh
index 3b983c76147..b50636f2d38 100644
--- a/security/cyrus-sasl/files/sasl_pwcheck.sh
+++ b/security/cyrus-sasl/files/sasl_pwcheck.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: sasl_pwcheck.sh,v 1.3 2001/11/26 07:34:05 jlam Exp $
+# $NetBSD: sasl_pwcheck.sh,v 1.4 2001/11/26 20:38:32 jlam Exp $
 #
 # The pwcheck daemon allows UNIX password authentication with Cyrus SASL.
 #
@@ -32,7 +32,7 @@ sasl_pwcheck_dbinit()
 	else
 		@ECHO@ password | ${saslpasswd} -p user
 		${saslpasswd} -d user
-		@CHOWN@ @PKG_USER@ ${sasldb}
+		@CHOWN@ @CYRUS_USER@ ${sasldb}
 		@CHMOD@ 0600 ${sasldb}
 	fi
 	)
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index b06203e0346..5eec1c5adfe 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/11/20 07:00:13 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2001/11/26 20:38:32 jlam Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -34,10 +34,8 @@ CONFIGURE_ENV+=		ac_cv_lib_ncurses_tgetent=no
 CONFIGURE_ENV+=		ac_cv_lib_ncurses_tgetent=no
 CONFIGURE_ENV+=		ac_cv_lib_readline_readline=no
 
-PKG_USER=		${AMANDA_USER}
-PKG_USER_DESCR=		Amanda user
-PKG_USER_SHELL=		${SH}
-PKG_GROUP=		${AMANDA_GROUP}
+PKG_GROUPS=		${AMANDA_GROUP}
+PKG_USERS=		${AMANDA_USER}:${AMANDA_GROUP}::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
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index c45109d98be..f1efe442964 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/11/25 18:59:48 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/11/26 20:38:32 jlam Exp $
 #
 
 DISTNAME=		nut-0.45.2
@@ -15,8 +15,8 @@ BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
 USE_BUILDLINK_ONLY=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${NUT_CONFDIR}			\
-			--with-user=${PKG_USER}				\
-			--with-group=${PKG_GROUP}			\
+			--with-user=${NUT_USER}				\
+			--with-group=${NUT_GROUP}			\
 			--with-statepath=${NUT_STATEDIR}		\
 			--with-modelpath=${LOCALBASE}/sbin/ups-drivers
 
@@ -26,13 +26,14 @@ NUT_DOCDIR=		${PREFIX}/share/doc/nut
 NUT_EGDIR=		${PREFIX}/share/examples/nut
 NUT_STATEDIR=		/var/db/nut
 
+NUT_USER?=		nut
+NUT_GROUP?=		nut
+
 FILES_SUBST+=		NUT_CONFDIR=${NUT_CONFDIR}
 FILES_SUBST+=		NUT_STATEDIR=${NUT_STATEDIR}
 
-PKG_USER=		nut
-PKG_USER_DESCR=		Network UPS Tools
-PKG_USER_SHELL=		${SH}
-PKG_GROUP=		nut
+PKG_GROUPS=		${NUT_GROUP}
+PKG_USERS=		${NUT_USER}:${NUT_GROUP}::Network\\ UPS\\ Tools::${SH}
 
 CONF_FILES=	${NUT_EGDIR}/hosts.conf.sample ${NUT_CONFDIR}/hosts.conf
 CONF_FILES+=	${NUT_EGDIR}/multimon.conf.sample ${NUT_CONFDIR}/multimon.conf
@@ -52,7 +53,7 @@ CONF_FILES_PERMS+=	${NUT_EGDIR}/upsd.users.sample			\
 RCD_SCRIPTS=		ups upsd upsdriver upslog upsmon
 
 OWN_DIRS=		${NUT_CONFDIR}
-OWN_DIRS_PERMS=		${NUT_STATEDIR} ${PKG_USER} ${PKG_GROUP} 0770
+OWN_DIRS_PERMS=		${NUT_STATEDIR} ${NUT_USER} ${NUT_GROUP} 0770
 
 pre-configure:
 	cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf --force