Modify packages that set PKG_USERS and PKG_GROUPS to follow the new

syntax as specified in pkgsrc/mk/install/bsd.pkginstall.mk:1.47.

14 files changed, 72 insertions, 30 deletions

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 584842e2255..fc2b089b9aa 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:10:42 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/23 00:12:41 jlam Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -56,7 +56,12 @@ FILES_SUBST+=		AMAVIS_DIR=${AMAVIS_DIR:Q}
 FILES_SUBST+=		AMAVIS_QUARANTINE=${AMAVIS_QUARANTINE:Q}
 
 PKG_GROUPS=	${AMAVIS_GROUP}
-PKG_USERS=	${AMAVIS_USER}:${AMAVIS_GROUP}::Virus\ Scanning\ Account:${AMAVIS_DIR}:${SH}
+PKG_USERS=	${AMAVIS_USER}:${AMAVIS_GROUP}
+
+PKG_GECOS.${AMAVIS_USER}=	AMaViS Virus Scanning Account
+PKG_HOME.${AMAVIS_USER}=	${AMAVIS_DIR}
+PKG_SHELL.${AMAVIS_USER}=	${SH}
+
 RCD_SCRIPTS=	amavisd
 CONF_FILES=	${EGDIR}/amavisd.conf-minimal ${PKG_SYSCONFDIR}/amavisd.conf
 
diff --git a/security/courier-authlib/Makefile.common b/security/courier-authlib/Makefile.common
index 20df1bed0a7..f58800bec5e 100644
--- a/security/courier-authlib/Makefile.common
+++ b/security/courier-authlib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/12/29 06:22:09 jlam Exp $
+# $NetBSD: Makefile.common,v 1.8 2006/04/23 00:12:41 jlam Exp $
 
 COURIER_USER?=		courier
 COURIER_GROUP?=		mail
@@ -6,7 +6,7 @@ FILES_SUBST+=		COURIER_USER=${COURIER_USER:Q}
 FILES_SUBST+=		COURIER_GROUP=${COURIER_GROUP:Q}
 
 PKG_GROUPS=		${COURIER_GROUP}
-PKG_USERS=		${COURIER_USER}:${COURIER_GROUP}::Courier\ user
+PKG_USERS=		${COURIER_USER}:${COURIER_GROUP}
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-mailuser=${COURIER_USER:Q}
diff --git a/security/cvm/Makefile b/security/cvm/Makefile
index b17ade0d815..cae4ee11e1b 100644
--- a/security/cvm/Makefile
+++ b/security/cvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/04/22 09:22:14 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/23 00:12:41 jlam Exp $
 #
 
 DISTNAME=		cvm-0.76
@@ -22,7 +22,7 @@ SUBST_MESSAGE.paths=	Fixing paths.
 
 RCD_SCRIPTS=		cvm
 PKG_GROUPS+=		cvmlog
-PKG_USERS+=		cvmlog:cvmlog::cvmlog
+PKG_USERS+=		cvmlog:cvmlog
 
 DJB_CONFIG_CMDS=							\
 	${ECHO} ${DJB_CONFIG_PREFIX}/include > conf-include;		\
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 6efb9de59fa..97a9bcce839 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/04/18 17:41:30 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2006/04/23 00:12:41 jlam Exp $
 
 .include "Makefile.common"
 
@@ -57,7 +57,8 @@ FILES_SUBST+=		ROOT_USER=${ROOT_USER:Q}
 BUILD_DEFS+=		CYRUS_USER CYRUS_GROUP
 
 PKG_GROUPS=		${CYRUS_GROUP}
-PKG_USERS=		${CYRUS_USER}:${CYRUS_GROUP}::::${SH}
+PKG_USERS=		${CYRUS_USER}:${CYRUS_GROUP}
+PKG_SHELL.${CYRUS_USER}=${SH}
 
 MESSAGE_SUBST+=		PLUGINDIR=${PLUGINDIR:Q}
 
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 4607fb0e64b..daa8e5e612b 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/31 23:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/23 00:12:41 jlam Exp $
 #
 
 DISTNAME=		dirmngr-0.9.3
@@ -17,7 +17,9 @@ COMMENT=		X509 certificate and CRL downloader
 DIRMNGR_USER?=		dirmngr
 DIRMNGR_GROUP?=		dirmngr
 PKG_GROUPS=		${DIRMNGR_GROUP}
-PKG_USERS=		${DIRMNGR_USER}:${DIRMNGR_GROUP}::pseudo\ user:${VARBASE}/dirmngr:
+PKG_USERS=		${DIRMNGR_USER}:${DIRMNGR_GROUP}
+
+PKG_SHELL.${DIRMNGR_USER}=	${VARBASE}/dirmngr
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gawk
diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 090c38704d6..25e924752c4 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/04/12 19:40:51 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/23 00:12:41 jlam Exp $
 #
 DISTNAME=		libprelude-0.9.7
 PKGREVISION=		1
@@ -26,8 +26,12 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 PRELUDE_USER?=		_prelude
 PRELUDE_GROUP?=		_prelude
 PRELUDE_HOME?=		${VARBASE:Q}/spool/prelude
-PKG_USERS=	${PRELUDE_USER}:${PRELUDE_GROUP}::Prelude\ IDS:${PRELUDE_HOME}:${NOLOGIN}
+
 PKG_GROUPS=	${PRELUDE_GROUP}
+PKG_USERS=	${PRELUDE_USER}:${PRELUDE_GROUP}
+
+PKG_GECOS.${PRELUDE_USER}=	Prelude IDS
+PKG_HOME.${PRELUDE_USER}=	${PRELUDE_HOME}
 
 CONF_FILES+=	${PREFIX}/share/examples/libprelude/client.conf ${PKG_SYSCONFDIR}/client.conf
 CONF_FILES+=	${PREFIX}/share/examples/libprelude/global.conf ${PKG_SYSCONFDIR}/global.conf
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index 18d8ca28244..8392a6350a4 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/03/14 01:14:33 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/23 00:12:41 jlam Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -44,8 +44,13 @@ INSTALL_TARGET=		install-nokeys
 PLIST_SRC=		# empty
 MESSAGE_SRC=		${.CURDIR}/MESSAGE
 
-PKG_USERS=		${OPENSSH_USER}:${OPENSSH_GROUP}:${OPENSSH_UID}:sshd\ privsep:${OPENSSH_CHROOT}:${NOLOGIN}
-PKG_GROUPS=             ${OPENSSH_GROUP}:${OPENSSH_GID}
+PKG_GROUPS=		${OPENSSH_GROUP}:${OPENSSH_GID}
+PKG_USERS=		${OPENSSH_USER}:${OPENSSH_GROUP}
+
+PKG_GID.${OPENSSH_GROUP}=	${OPENSSH_GID}
+PKG_UID.${OPENSSH_USER}=	${OPENSSH_UID}
+PKG_GECOS.${OPENSSH_USER}=	sshd privsep pseudo-user
+PKG_HOME.${OPENSSH_USER}=	${OPENSSH_CHROOT}
 
 SSH_PID_DIR=		/var/run	# default directory for PID files
 
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 326339771fa..7afbd784bf7 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.166 2006/03/14 01:14:33 jlam Exp $
+# $NetBSD: Makefile,v 1.167 2006/04/23 00:12:41 jlam Exp $
 
 DISTNAME=		openssh-4.3p1
 PKGNAME=		openssh-4.3.1
@@ -48,8 +48,13 @@ LIBS+=			-lbind -ldb -lcrypt
 
 .else # not Interix
 
-PKG_USERS=		${OPENSSH_USER}:${OPENSSH_GROUP}:${OPENSSH_UID}:sshd\ privsep:${OPENSSH_CHROOT}:${NOLOGIN}
 PKG_GROUPS=             ${OPENSSH_GROUP}:${OPENSSH_GID}
+PKG_USERS=		${OPENSSH_USER}:${OPENSSH_GROUP}
+
+PKG_GID.${OPENSSH_GROUP}=	${OPENSSH_GID}
+PKG_UID.${OPENSSH_USER}=	${OPENSSH_UID}
+PKG_GECOS.${OPENSSH_USER}=	sshd privsep pseudo-user
+PKG_HOME.${OPENSSH_USER}=	${OPENSSH_CHROOT}
 
 .endif
 
diff --git a/security/pflkm/Makefile b/security/pflkm/Makefile
index ffc47bc560c..da45f073768 100644
--- a/security/pflkm/Makefile
+++ b/security/pflkm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/20 23:03:56 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/23 00:12:42 jlam Exp $
 
 DISTNAME=		pflkm-20050511
 PKGREVISION=		1
@@ -13,7 +13,10 @@ ONLY_FOR_PLATFORM=	NetBSD-2.[0-9]*-*
 
 NO_CONFIGURE=		yes
 
-PKG_USERS=		_pflogd:nogroup::pflogd\ pseudo-user:${VARBASE}/chroot/pflogd:${NOLOGIN}
+PKG_GROUPS=		nogroup
+PKG_USERS=		_pflogd:nogroup
+PKG_GECOS._pflogd=	pflogd pseudo-user
+PKG_HOME._pflogd=	${VARBASE}/chroot/pflogd
 
 RCD_SCRIPTS=		pf pflogd
 PKG_SYSCONFSUBDIR=	pf
diff --git a/security/pks/Makefile b/security/pks/Makefile
index 1e4837f3284..0b9b5238d01 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/04/22 09:22:14 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2006/04/23 00:12:42 jlam Exp $
 
 DISTNAME=	pks-0.9.4
 PKGREVISION=	3
@@ -23,8 +23,11 @@ PKS_GROUP=	pks
 PKS_SERVER?=	localhost
 PKS_HOME=	${VARBASE}/pks
 
-PKG_USERS=	${PKS_USER}:${PKS_GROUP}::PGP\ Key\ Server:${PKS_HOME}:${NOLOGIN}
 PKG_GROUPS=	${PKS_GROUP}
+PKG_USERS=	${PKS_USER}:${PKS_GROUP}
+
+PKG_GECOS.${PKS_USER}=	PGP Key Server
+PKG_HOME.${PKS_USER}=	${PKS_HOME}
 
 BDB_ACCEPTED=	db2
 
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index 588ee286c87..deb415e7b2a 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/10 22:49:37 shannonjr Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/23 00:12:42 jlam Exp $
 #
 
 DISTNAME=		prelude-lml-0.9.4
@@ -27,8 +27,13 @@ PRELUDE_USER?=		_prelude
 PRELUDE_GROUP?=		_prelude
 PRELUDE_LML_PID_DIR=	${VARBASE:Q}/run/prelude-lml
 PRELUDE_HOME=		${VARBASE:Q}/prelude-lml
-PKG_USERS=	${PRELUDE_USER}:${PRELUDE_GROUP}::Prelude\ IDS:${PRELUDE_HOME}:${NOLOGIN}
+
 PKG_GROUPS=	${PRELUDE_GROUP}
+PKG_USERS=	${PRELUDE_USER}:${PRELUDE_GROUP}
+
+PKG_GECOS.${PRELUDE_USER}=	Prelude IDS
+PKG_HOME.${PRELUDE_USER}=	${PRELUDE_HOME}
+
 FILES_SUBST+=	PRELUDE_LML_PID_DIR=${PRELUDE_LML_PID_DIR:Q}
 FILES_SUBST+=	PRELUDE_USER=${PRELUDE_USER:Q}
 FILES_SUBST+=	PRELUDE_GROUP=${PRELUDE_GROUP:Q}
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index 1fc4a660fd4..81400ab957e 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/06 00:18:22 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/23 00:12:42 jlam Exp $
 #
 
 DISTNAME=		prelude-manager-0.9.3
@@ -24,8 +24,13 @@ PRELUDE_MANAGER_PID_DIR=	${VARBASE}/run/prelude-manager
 PRELUDE_USER?=		_prelude
 PRELUDE_GROUP?=		_prelude
 PRELUDE_HOME?=		/var/spool/prelude-manager
-PKG_USERS=      ${PRELUDE_USER}:${PRELUDE_GROUP}::Prelude\ IDS\ manager:${PRELUDE_HOME}:${NOLOGIN}
+
 PKG_GROUPS=     ${PRELUDE_GROUP}
+PKG_USERS=      ${PRELUDE_USER}:${PRELUDE_GROUP}
+
+PKG_GECOS.${PRELUDE_USER}=	Prelude IDS manager
+PKG_HOME.${PRELUDE_USER}=	${PRELUDE_HOME}
+
 FILES_SUBST+=	PRELUDE_MANAGER_PID_DIR=${PRELUDE_MANAGER_PID_DIR:Q}
 FILES_SUBST+=   PRELUDE_USER=${PRELUDE_USER:Q}
 FILES_SUBST+=   PRELUDE_GROUP=${PRELUDE_USER:Q}
diff --git a/security/py-prewikka/Makefile b/security/py-prewikka/Makefile
index 95085ee7af0..68c6ef3622e 100644
--- a/security/py-prewikka/Makefile
+++ b/security/py-prewikka/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/06 00:18:22 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/04/23 00:12:42 jlam Exp $
 #
 
 DISTNAME=		prewikka-0.9.3
@@ -21,8 +21,11 @@ PREWIKKA_GROUP?=	prewikka
 PREWIKKA_HOME=		/nonexistent
 RCD_SCRIPTS=		prewikka
 
-PKG_USERS=	${PREWIKKA_USER}:${PREWIKKA_GROUP}::Prelude\-IDS\ console:${PREWIKKA_HOME}:${NOLOGIN}
 PKG_GROUPS=	${PREWIKKA_GROUP}
+PKG_USERS=	${PREWIKKA_USER}:${PREWIKKA_GROUP}
+
+PKG_GECOS.${PREWIKKA_USER}=	Prelude-IDS console
+PKG_HOME.${PREWIKKA_USER}=	${PREWIKKA_HOME}
 
 SUBST_CLASSES+=		code
 SUBST_STAGE.code=	post-patch
diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index 1c052e87885..8da6d55d54f 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/04/07 15:28:49 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/04/23 00:12:42 jlam Exp $
 #
 
 DISTNAME=		sfs-0.7.2
@@ -25,9 +25,10 @@ GCC_REQD+=		2.95.3
 
 INFO_FILES=		# PLIST
 
-PKG_USERS=		sfs:sfs::Self-certifying\ file\ system:/
-PKG_GROUPS=		sfs
 PKG_SYSCONFSUBDIR=	sfs
+PKG_GROUPS=		sfs
+PKG_USERS=		sfs:sfs
+PKG_GECOS.sfs=		Self-certifying file system pseudo-user
 
 RCD_SCRIPTS=		sfscd sfssd