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.

17 files changed, 83 insertions, 45 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index ccfee36a876..c3bb71b3f25 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/04/07 11:20:37 grant Exp $
+# $NetBSD: Makefile,v 1.57 2006/04/23 00:12:38 jlam Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -32,7 +32,7 @@ MESSAGE_SUBST+=	CLAMAV_USER=${CLAMAV_USER}
 
 RCD_SCRIPTS=	clamd freshclamd
 PKG_GROUPS+=	${CLAMAV_GROUP}
-PKG_USERS+=	${CLAMAV_USER}:${CLAMAV_GROUP}::Clamav\ User
+PKG_USERS+=	${CLAMAV_USER}:${CLAMAV_GROUP}
 
 VIRUSDBDIR=	${VARBASE}/clamav
 EGDIR=		${PREFIX}/share/examples/clamav
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 5a2ed2b61cc..e0de0d8f43f 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2006/04/14 19:01:53 ghen Exp $
+# $NetBSD: Makefile,v 1.50 2006/04/23 00:12:38 jlam Exp $
 
 DISTNAME=		dovecot-1.0.beta7
 PKGNAME=		${DISTNAME:S/.beta/beta/}
@@ -26,7 +26,9 @@ RCD_SCRIPTS=		dovecot
 DOVECOT_USER?=		dovecot
 DOVECOT_GROUP?=		dovecot
 PKG_GROUPS=		${DOVECOT_GROUP}
-PKG_USERS=		${DOVECOT_USER}:${DOVECOT_GROUP}::Dovecot\ IMAP/POP3\ user
+PKG_USERS=		${DOVECOT_USER}:${DOVECOT_GROUP}
+
+PKG_GECOS.${DOVECOT_USER}=	Dovecot IMAP/POP3 user
 
 EGDIR=			${PREFIX}/share/examples/dovecot
 CONF_FILES=		${EGDIR}/dovecot.conf.default ${PKG_SYSCONFDIR}/dovecot.conf
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 5727340cc7f..e3b0f9bd45c 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2006/01/08 18:35:09 xtraeme Exp $
+# $NetBSD: Makefile,v 1.75 2006/04/23 00:12:38 jlam Exp $
 
 DISTNAME=	exim-4.54
 PKGREVISION=	2
@@ -26,7 +26,11 @@ MAKE_FLAGS+=	FULLECHO=''
 BUILD_DEFS+=	EXIM_USER EXIM_GROUP EXIM_DB
 
 PKG_GROUPS=	${EXIM_GROUP}
-PKG_USERS=	${EXIM_USER}:${EXIM_GROUP}::Exim\ mail\ server\ user:${VARBASE}/mail:${NOLOGIN}
+PKG_USERS=	${EXIM_USER}:${EXIM_GROUP}
+
+PKG_GECOS.${EXIM_USER}=	Exim mail server user
+PKG_HOME.${EXIM_USER}=	${VARBASE}/mail
+PKG_SHELL.${EXIM_USER}=	${NOLOGIN}
 
 PKG_SYSCONFSUBDIR?=	exim
 EXAMPLESDIR=		${PREFIX}/share/examples/exim
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index e55ee200920..23719ebd51d 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/03/06 22:49:16 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2006/04/23 00:12:38 jlam Exp $
 
 DISTNAME=	exim-3.36
 PKGREVISION=	7
@@ -28,8 +28,13 @@ RCD_SCRIPTS=		exim
 OWN_DIRS_PERMS=		/var/log/exim ${EXIM_USER} ${EXIM_GROUP} 0750
 OWN_DIRS_PERMS+=	/var/spool/exim ${EXIM_USER} ${EXIM_GROUP} 0750
 
-PKG_USERS=		${EXIM_USER}:${EXIM_GROUP}:8:Exim\ mail\ server\ user:/var/mail:${NOLOGIN}
 PKG_GROUPS=		${EXIM_GROUP}
+PKG_USERS=		${EXIM_USER}:${EXIM_GROUP}
+
+PKG_UID.${EXIM_USER}?=	8
+PKG_GECOS.${EXIM_USER}=	Exim mail server user
+PKG_HOME.${EXIM_USER}=	${VARBASE}/mail
+PKG_SHELL.${EXIM_USER}=	${NOLOGIN}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/gld/Makefile b/mail/gld/Makefile
index 3589560c41d..b67ebce36a1 100644
--- a/mail/gld/Makefile
+++ b/mail/gld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:00 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/23 00:12:38 jlam Exp $
 #
 
 DISTNAME=		gld-1.6
@@ -20,7 +20,8 @@ RCD_SCRIPTS=		gld
 GLD_USER?=		gld
 GLD_GROUP?=		gld
 PKG_GROUPS=             ${GLD_GROUP}
-PKG_USERS=              ${GLD_USER}:${GLD_GROUP}::Greylisting\ Daemon\ user
+PKG_USERS=              ${GLD_USER}:${GLD_GROUP}
+PKG_GECOS.${GLD_USER}=	Greylisting Daemon user
 
 SUBST_CLASSES+=		gld users
 SUBST_STAGE.gld=	post-patch
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index e185da36d4b..2ee80d3ad0e 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/04/13 18:27:24 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2006/04/23 00:12:38 jlam Exp $
 
 DISTNAME=	mailman-2.1.8rc1
 CATEGORIES=	mail www
@@ -35,7 +35,10 @@ PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 PLIST_SUBST+=		MAILMAN_CGIEXT=${MAILMAN_CGIEXT:S/none//}
 
 PKG_GROUPS=		${MAILMAN_GROUP}
-PKG_USERS=		${MAILMAN_USER}:${MAILMAN_GROUP}::Mailman\ user::${SH}
+PKG_USERS=		${MAILMAN_USER}:${MAILMAN_GROUP}
+
+PKG_GECOS.${MAILMAN_USER}=	Mailman user
+PKG_SHELL.${MAILMAN_USER}=	${SH}
 
 REQD_DIRS_PERMS+=	${EXECDIR} root ${MAILMAN_GROUP} 775
 OWN_DIRS_PERMS+=	${MAILMAN_DATADIR} ${MAILMAN_USER} ${MAILMAN_GROUP} 775
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index b88ea2a8d2f..7060843ab4d 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/02/11 23:14:15 seb Exp $
+# $NetBSD: Makefile,v 1.25 2006/04/23 00:12:38 jlam Exp $
 
 DISTNAME=	milter-greylist-2.1.2
 PKGREVISION=	2
@@ -17,8 +17,10 @@ CONFIGURE_ARGS+=--with-libspf_alt=${PREFIX:Q}
 CONFIGURE_ARGS+=--prefix=${PREFIX:Q}
 BUILD_TARGET=	milter-greylist
 
-PKG_GROUPS=	smmsp
-PKG_USERS=	smmsp:smmsp::Sendmail\ Message\ Submission\ Program
+PKG_GROUPS=		smmsp
+PKG_USERS=		smmsp:smmsp
+PKG_GECOS.smmsp=	Sendmail Message Submission Program
+
 RCD_SCRIPTS=	milter-greylist
 
 post-install:
diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile
index 5dbfca40f9d..ee0c71c1e4c 100644
--- a/mail/milter-regex/Makefile
+++ b/mail/milter-regex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/08 22:01:21 tron Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/23 00:12:38 jlam Exp $
 
 DISTNAME=	milter-regex-1.6
 CATEGORIES=	mail
@@ -10,8 +10,10 @@ COMMENT=	Milter enabling regular expression filtering
 
 INSTALLATION_DIRS=	man/man8 sbin
 
-PKG_GROUPS=	smmsp
-PKG_USERS=	smmsp:smmsp::Sendmail\ Message\ Submission\ Program
+PKG_GROUPS=		smmsp
+PKG_USERS=		smmsp:smmsp
+PKG_GECOS.smmsp=	Sendmail Message Submission Program
+
 RCD_SCRIPTS=	milter-regex
 
 SUBST_CLASSES+=		etc
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 3f38d43d3ed..f53569de975 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2006/04/07 09:26:43 martti Exp $
+# $NetBSD: Makefile,v 1.62 2006/04/23 00:12:38 jlam Exp $
 
 DISTNAME=	postfix-2.3-20060405
 #PKGREVISION=	1
@@ -93,7 +93,9 @@ OWN_DIRS+=		${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc
 MAKE_DIRS+=		${PKG_SYSCONFDIR}
 
 PKG_GROUPS?=		postfix maildrop
-PKG_USERS?=		postfix:postfix::Postfix\ User:${POSTFIX_QUEUE_DIR}
+PKG_USERS?=		postfix:postfix
+PKG_GECOS.postfix=	Postfix User
+PKG_HOME.postfix=	${POSTFIX_QUEUE_DIR}
 
 CONF_FILES=		# empty
 .for _file_ in main.cf master.cf postfix-files
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index b61f5b0a41c..25021991a1e 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.179 2006/04/07 09:08:29 martti Exp $
+# $NetBSD: Makefile,v 1.180 2006/04/23 00:12:38 jlam Exp $
 
 DISTNAME=	postfix-2.2.10
 #PKGREVISION=	1
@@ -92,7 +92,9 @@ OWN_DIRS+=		${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc
 MAKE_DIRS+=		${PKG_SYSCONFDIR}
 
 PKG_GROUPS?=		postfix maildrop
-PKG_USERS?=		postfix:postfix::Postfix\ User:${POSTFIX_QUEUE_DIR}
+PKG_USERS?=		postfix:postfix
+PKG_GECOS.postfix=	Postfix User
+PKG_HOME.postfix=	${POSTFIX_QUEUE_DIR}
 
 CONF_FILES=		# empty
 .for _file_ in main.cf master.cf postfix-files
diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
index 996197b8164..bc21c6ac72b 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/30 09:06:16 is Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/23 00:12:38 jlam Exp $
 #
 
 DISTNAME=	postgrey-1.24
@@ -30,7 +30,9 @@ EGDIR=			share/examples/${PKGBASE}
 
 RCD_SCRIPTS=		postgrey
 PKG_GROUPS=		${POSTGREY_GROUP}
-PKG_USERS=		${POSTGREY_USER}:${POSTGREY_GROUP}::Postgrey\ Daemon
+PKG_USERS=		${POSTGREY_USER}:${POSTGREY_GROUP}
+
+PKG_GECOS.${POSTGREY_USER}=	Postgrey Daemon User
 
 .for i in postgrey_whitelist_clients postgrey_whitelist_recipients
 CONF_FILES+=		${PREFIX}/${EGDIR}/${i} \
diff --git a/mail/qmail-users/Makefile b/mail/qmail-users/Makefile
index b53c81bdf48..f61f45cf446 100644
--- a/mail/qmail-users/Makefile
+++ b/mail/qmail-users/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/12/29 06:21:53 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/23 00:12:38 jlam Exp $
 #
 
 DISTNAME=	qmail-users-1.0
@@ -15,13 +15,19 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 PKG_GROUPS=	qmail nofiles
 
-PKG_USERS+=	alias:nofiles::alias:${QMAILDIR}/alias
-PKG_USERS+=	qmaill:nofiles::qmaill:${QMAILDIR}
-PKG_USERS+=	qmaild:nofiles::qmaild:${QMAILDIR}
-PKG_USERS+=	qmailp:nofiles::qmailp:${QMAILDIR}
-PKG_USERS+=	qmailq:qmail::qmailq:${QMAILDIR}
-PKG_USERS+=	qmailr:qmail::qmailr:${QMAILDIR}
-PKG_USERS+=	qmails:qmail::qmails:${QMAILDIR}
+PKG_USERS+=	alias:nofiles
+PKG_USERS+=	qmaill:nofiles
+PKG_USERS+=	qmaild:nofiles
+PKG_USERS+=	qmailp:nofiles
+PKG_USERS+=	qmailq:qmail
+PKG_USERS+=	qmailr:qmail
+PKG_USERS+=	qmails:qmail
+
+.for user in ${PKG_USERS:C/\:.*//}
+PKG_GECOS.${user}=	qmail ${user} pseudo-user
+PKG_HOME.${user}=	${QMAILDIR}
+.endfor
+PKG_HOME.alias=		${QMAILDIR}/alias
 
 WRKSRC=		${WRKDIR}
 NO_BUILD=	YES
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 108a61e152b..e81cd6b285f 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2006/03/22 19:56:36 adrianp Exp $
+# $NetBSD: Makefile,v 1.85 2006/04/23 00:12:39 jlam Exp $
 
 .include "../../mail/sendmail/Makefile.common"
 
@@ -88,8 +88,9 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/op/op.me ${PREFIX}/share/doc/sendmail
 	${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${PREFIX}/share/doc/sendmail
 
-PKG_GROUPS=	smmsp
-PKG_USERS=	smmsp:smmsp::Sendmail\ Message\ Submission\ Program
+PKG_GROUPS=		smmsp
+PKG_USERS=		smmsp:smmsp
+PKG_GECOS.smmsp=	Sendmail Message Submission Program
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
index 2849997eb0a..b597f3bdac7 100644
--- a/mail/sendmail812/Makefile
+++ b/mail/sendmail812/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/22 21:19:06 tv Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/23 00:12:39 jlam Exp $
 
 .include "options.mk"
 .include "../../mail/sendmail812/Makefile.common"
@@ -12,8 +12,9 @@ CONFLICTS+=	postfix-[0-9]* fastforward>=0.51nb2
 MESSAGE_SRC=	${WRKDIR}/.MESSAGE_SRC
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
-PKG_GROUPS=	smmsp
-PKG_USERS=	smmsp:smmsp::Sendmail\ Message\ Submission\ Program
+PKG_GROUPS=		smmsp
+PKG_USERS=		smmsp:smmsp
+PKG_GECOS.smmsp=	Sendmail Message Submission Program
 
 post-patch: make-sendmail-siteconfig
 .if !empty(PKG_OPTIONS:Mtcpwrappers)
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index 77013a46b7e..83ac64b99c3 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/04/01 12:14:27 peter Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/23 00:12:39 jlam Exp $
 
 DISTNAME=		spamd-20060330
 CATEGORIES=		mail
@@ -20,8 +20,10 @@ CPPFLAGS+=		-DPATH_SPAMD_DB=\"${VARBASE}/db/spamd\"
 CPPFLAGS+=		-DPATH_PFCTL=\"${PFCTL}\"
 CPPFLAGS+=		-DPATH_SPAMD_CONF=\"${SPAMD_CONF}\"
 
-PKG_USERS=		_spamd:_spamd::Spam\ Daemon:${SPAMD_HOME}:/sbin/nologin
 PKG_GROUPS=		_spamd
+PKG_USERS=		_spamd:_spamd
+PKG_GECOS._spamd=	Spam Daemon User
+PKG_HOME._spamd=	${SPAMD_HOME}
 
 RCD_SCRIPTS=            pfspamd
 
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index cf31e4627d7..3bbd87b9220 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/04 21:30:02 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/23 00:12:39 jlam Exp $
 #
 
 DISTNAME=	sympa-4.1.2
@@ -84,7 +84,9 @@ SYMPA_SPOOL=	${SYMPA_VARBASE}/spool
 SYMPA_BIN=	${SYMPA_PREFIX}/bin
 
 PKG_GROUPS=	${SYMPA_GROUP}
-PKG_USERS=	${SYMPA_USER}:${SYMPA_GROUP}::Sympa\ user:${SYMPA_VARBASE}
+PKG_USERS=	${SYMPA_USER}:${SYMPA_GROUP}
+
+PKG_HOME.${SYMPA_USER}=		${SYMPA_VARBASE}
 
 .for d in sympa sympa/create_list_templates sympa/general_task_models \
 	sympa/scenari sympa/task_models sympa/templates sympa/wws_templates
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 7be510429b7..56903714ab6 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/02/05 23:09:59 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/23 00:12:39 jlam Exp $
 #
 
 DISTNAME=	tmda-1.0.3
@@ -18,8 +18,9 @@ PKG_SYSCONFSUBDIR=	${PKGBASE}
 
 PYTHON_VERSIONS_ACCEPTED=	24 23 22
 
-PKG_GROUPS=	tofmipd
-PKG_USERS=	tofmipd:tofmipd::TMDA\ ofmipd\ User
+PKG_GROUPS=		tofmipd
+PKG_USERS=		tofmipd:tofmipd
+PKG_GECOS.tofmipd=	TMDA ofmipd User
 
 RCD_SCRIPTS=	tofmipd
 FILES_SUBST+=	PYTHONBIN=${PYTHONBIN:Q}