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, 44 deletions

diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 8226bdb3d68..af845a079f4 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2005/12/29 06:21:57 jlam Exp $
+# $NetBSD: Makefile,v 1.76 2006/04/23 00:12:39 jlam Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 CATEGORIES=	net
@@ -26,8 +26,11 @@ CONFIGURE_ARGS+=--with-libtool=yes \
 # include at the bottom to use OpenSSL shipped with BIND9.
 CONFIGURE_ARGS+=--with-openssl=${SSLBASE:Q}
 
-PKG_USERS=	${BIND_USER}:${BIND_GROUP}::Named\ pseudo-user:${BIND_DIR}:${NOLOGIN}
 PKG_GROUPS=	${BIND_GROUP}
+PKG_USERS=	${BIND_USER}:${BIND_GROUP}
+
+PKG_GECOS.${BIND_USER}=	Named pseudo-user
+PKG_HOME.${BIND_USER}=	${BIND_DIR}
 
 PTHREAD_OPTS+=	native
 
diff --git a/net/djbdns-run/Makefile b/net/djbdns-run/Makefile
index 9e94e3e9367..c24f27d0e72 100644
--- a/net/djbdns-run/Makefile
+++ b/net/djbdns-run/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/14 01:14:31 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/23 00:12:39 jlam Exp $
 #
 
 DISTNAME=		djbdns-run-20050415
@@ -26,14 +26,18 @@ MAKE_DIRS+=		${PKG_SYSCONFDIR}/dnscache/servers
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/rbldns
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/tinydns
 PKG_GROUPS=		djbdns
-PKG_USERS+=		dnslog:djbdns::dnslog
-PKG_USERS+=		axfrdns:djbdns::axfrdns
-PKG_USERS+=		dnscache:djbdns::dnscache
-PKG_USERS+=		rbldns:djbdns::rbldns
-PKG_USERS+=		tinydns:djbdns::tinydns
+PKG_USERS+=		dnslog:djbdns
+PKG_USERS+=		axfrdns:djbdns
+PKG_USERS+=		dnscache:djbdns
+PKG_USERS+=		rbldns:djbdns
+PKG_USERS+=		tinydns:djbdns
 RCD_SCRIPTS=		axfrdns djbdns dnscache rbldns tinydns
 FILES_SUBST+=		PKGNAME=${PKGNAME:Q}
 
+.for user in ${PKG_USERS:C/\:.*//}
+PKG_GECOS.${user}=	djbdns ${user} pseudo-user
+.endfor
+
 INSTALLATION_DIRS=	bin share/doc/djbdns-run
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/gofish/Makefile b/net/gofish/Makefile
index 88bb3fcf64a..35123e1a2ae 100644
--- a/net/gofish/Makefile
+++ b/net/gofish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/12/29 06:21:59 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/04/23 00:12:39 jlam Exp $
 
 DISTNAME=		gofish-1.1
 PKGREVISION=		1
@@ -23,8 +23,12 @@ GOPHER_USER=    	gopher
 GOPHER_GROUP=   	gopher
 GOPHER_UID=		30
 GOPHER_GID=		30
-PKG_GROUPS=     	${GOPHER_GROUP}:${GOPHER_GID}
-PKG_USERS=      	${GOPHER_USER}:${GOPHER_GROUP}:${GOPHER_UID}
+
+PKG_GROUPS=     		${GOPHER_GROUP}
+PKG_USERS=      		${GOPHER_USER}:${GOPHER_GROUP}
+PKG_GID.${GOPHER_GROUP}=	${GOPHER_GID}
+PKG_UID.${GOPHER_USER}=		${GOPHER_UID}
+
 OWN_DIRS_PERMS= 	${RUNTIMEDIR} ${GOPHER_USER} ${GOPHER_GROUP} 0750
 
 RCD_SCRIPTS=		gopherd
diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile
index d57c156261a..236de5e80b9 100644
--- a/net/hobbitmon/Makefile
+++ b/net/hobbitmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/04/17 13:46:43 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/23 00:12:39 jlam Exp $
 #
 
 DISTNAME=	hobbit-4.0-beta6
@@ -28,7 +28,10 @@ BBCGIURL?=	/cgi-bin
 BBHOSTIP?=	127.0.0.1
 
 PKG_GROUPS=	${BBGROUP}
-PKG_USERS=	${BBUSER:Q}:${BBGROUP:Q}::Hobbit\ monitor:${BBTOPDIR:Q}
+PKG_USERS=	${BBUSER:Q}:${BBGROUP:Q}
+
+PKG_GECOS.${BBUSER}=	Hobbit monitor
+PKG_HOME.${BBUSER}=	${BBTOPDIR}
 
 CONFIGURE_ENV+=	TARGET=hobbit
 CONFIGURE_ENV+=	FPING=${PREFIX:Q}/sbin/fping
diff --git a/net/howl/Makefile b/net/howl/Makefile
index 4ac6106efd6..69834a1732c 100644
--- a/net/howl/Makefile
+++ b/net/howl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/12 05:26:39 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/23 00:12:39 jlam Exp $
 
 DISTNAME=		howl-1.0.0
 CATEGORIES=		net
@@ -15,7 +15,8 @@ PTHREAD_AUTO_VARS=	yes
 
 RCD_SCRIPTS=		howl
 PKG_GROUPS+=		${HOWL_GROUP}
-PKG_USERS+=		${HOWL_USER:Q}:${HOWL_GROUP:Q}::Zeroconf\ user
+PKG_USERS+=		${HOWL_USER:Q}:${HOWL_GROUP:Q}
+PKG_GECOS.${HOWL_USER}=	Zeroconf user
 
 BUILD_DEFS+=		HOWL_GROUP HOWL_USER
 
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index 804ebe373d2..02314e48995 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/03/14 01:14:31 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2006/04/23 00:12:39 jlam Exp $
 
 DISTNAME=		samba-${SAMBA_VERSION}-ja-${JA_VERSION}
 PKGNAME=		ja-samba-${SAMBA_VERSION}.${JA_PKG_VERSION}
@@ -122,7 +122,9 @@ OWN_DIRS_PERMS=		${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500
 RCD_SCRIPTS=		samba nmbd smbd winbindd
 
 PKG_GROUPS=		${SAMBA_GROUP}
-PKG_USERS=		${SAMBA_USER}:${SAMBA_GROUP}::Samba\ pseudo-user
+PKG_USERS=		${SAMBA_USER}:${SAMBA_GROUP}
+
+PKG_GECOS.${SAMBA_USER}=	Samba pseudo-user
 
 BUILD_DEFS+=		SAMBA_USER SAMBA_GROUP
 MAKE_FLAGS+=		CFLAGS='-DGUEST_ACCOUNT=\"${SAMBA_USER:Q}\"'
diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile
index 6040c0305bf..403242a3977 100644
--- a/net/lambdamoo/Makefile
+++ b/net/lambdamoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:31 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/23 00:12:39 jlam Exp $
 
 DISTNAME=		LambdaMOO-1.8.1
 PKGNAME=		lambdamoo-1.8.1
@@ -20,8 +20,9 @@ LAMBDAMOO_HOME?=	${PREFIX}/share/${LAMBDAMOO_USER}
 
 PKG_GROUPS=		${LAMBDAMOO_GROUP}
 PKG_USERS=		${LAMBDAMOO_USER}:${LAMBDAMOO_GROUP}
-_PKG_USER_HOME=		${LAMBDAMOO_HOME}
-_PKG_USER_SHELL=	${SH}
+
+PKG_HOME.${LAMBDAMOO_USER}=	${LAMBDAMOO_HOME}
+PKG_SHELL.${LAMBDAMOO_USER}=	${SH}
 
 FILES_SUBST+=		LAMBDAMOO_HOME=${LAMBDAMOO_HOME:Q}
 
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 7313f4967d0..705ca4cbaf4 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/04/17 14:52:11 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2006/04/23 00:12:39 jlam Exp $
 #
 
 .include "Makefile.common"
@@ -11,7 +11,11 @@ BUILD_DEFS+=		MLDONKEY_GROUP MLDONKEY_HOME MLDONKEY_USER
 OWN_DIRS_PERMS=		${MLDONKEY_HOME} ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700
 
 PKG_GROUPS=		${MLDONKEY_GROUP}
-PKG_USERS=		${MLDONKEY_USER}:${MLDONKEY_GROUP}::Dedicated\ mldonkey\ server:${MLDONKEY_HOME}:${SH}
+PKG_USERS=		${MLDONKEY_USER}:${MLDONKEY_GROUP}
+
+PKG_GECOS.${MLDONKEY_USER}=	Dedicated mldonkey server
+PKG_HOME.${MLDONKEY_USER}=	${MLDONKEY_HOME}
+PKG_SHELL.${MLDONKEY_USER}=	${SH}
 
 FILES_SUBST+=		MLDONKEY_GROUP=${MLDONKEY_GROUP:Q}
 FILES_SUBST+=		MLDONKEY_HOME=${MLDONKEY_HOME:Q}
diff --git a/net/mydns-pgsql/Makefile.common b/net/mydns-pgsql/Makefile.common
index 261ab9dc0db..488fbe81029 100644
--- a/net/mydns-pgsql/Makefile.common
+++ b/net/mydns-pgsql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2006/03/05 16:27:27 jlam Exp $
+# $NetBSD: Makefile.common,v 1.12 2006/04/23 00:12:39 jlam Exp $
 
 DISTNAME=		mydns-1.1.0
 CATEGORIES=		net
@@ -31,7 +31,7 @@ CONF_FILES_PERMS=	${EGDIR}/mydns.conf ${PKG_SYSCONFDIR}/mydns.conf ${MYDNS_PERMS
 RCD_SCRIPTS=		mydns
 
 PKG_GROUPS=		${MYDNS_GROUP}
-PKG_USERS=		${MYDNS_USER}:${MYDNS_GROUP}::MyDNS\ user
+PKG_USERS=		${MYDNS_USER}:${MYDNS_GROUP}
 
 post-install:
 		${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile
index 68640b8010f..a968349b3c2 100644
--- a/net/nagios-base/Makefile
+++ b/net/nagios-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/04/17 13:46:44 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/23 00:12:40 jlam Exp $
 #
 
 DISTNAME=	nagios-2.0
@@ -34,8 +34,13 @@ INSTALL_TARGET=		install install-config
 PKG_GROUPS+=	${NAGIOS_GROUP}
 PKG_GROUPS+=	${NAGIOSADM_GROUP}
 
-PKG_USERS+=	${NAGIOS_USER}:${NAGIOS_GROUP}::Nagios\ Runtime\ User
-PKG_USERS+=	${NAGIOSADM_USER}:${NAGIOSADM_GROUP}::Nagios\ Administrator:${PREFIX}/etc/nagios:${SH}
+PKG_USERS+=	${NAGIOS_USER}:${NAGIOS_GROUP}
+PKG_USERS+=	${NAGIOSADM_USER}:${NAGIOSADM_GROUP}
+
+PKG_GECOS.${NAGIOS_USER}=	Nagios Runtime User
+PKG_GECOS.${NAGIOSADM_USER}=	Nagios Administrator
+PKG_HOME.${NAGIOSADM_USER}=	${PKG_SYSCONFDIR}
+PKG_SHELL.${NAGIOSADM_USER}=	${SH}
 
 EGDIR=		${PREFIX}/share/examples/nagios
 EGFILES=	cgi.cfg checkcommands.cfg contactgroups.cfg contacts.cfg	\
diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile
index b8a1567e60c..a9a6cc8d0dc 100644
--- a/net/netdisco/Makefile
+++ b/net/netdisco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/14 01:14:31 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/23 00:12:40 jlam Exp $
 #
 
 DISTNAME=		netdisco-0.94_with_mibs
@@ -80,8 +80,12 @@ NETDISCOUSER?=	netdisco
 NETDISCOGROUP?=	netdisco
 BUILD_DEFS+=	NETDISCOUSER NETDISCOGROUP
 
-PKG_USERS=	${NETDISCOUSER:Q}:${NETDISCOGROUP:Q}::Netdisco\ administrator:${PREFIX:Q}/netdisco:${SH:Q}
 PKG_GROUPS=	${NETDISCOGROUP}
+PKG_USERS=	${NETDISCOUSER:Q}:${NETDISCOGROUP:Q}
+
+PKG_GECOS.${NETDISCOUSER}=	Netdisco administrator
+PKG_HOME.${NETDISCOUSER}=	${PREFIX}/netdisco
+PKG_SHELL.${NETDISCOUSER}=	${SH}
 
 PKG_SYSCONFVAR=		netdisco
 PKG_SYSCONFDIR.netdisco=	${PREFIX}/netdisco
diff --git a/net/netsaint-base/Makefile.common b/net/netsaint-base/Makefile.common
index 0cd9ce8fd31..b35f944cfd5 100644
--- a/net/netsaint-base/Makefile.common
+++ b/net/netsaint-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2005/12/05 23:55:14 rillig Exp $
+# $NetBSD: Makefile.common,v 1.12 2006/04/23 00:12:40 jlam Exp $
 #
 
 CATEGORIES=		net sysutils
@@ -12,8 +12,13 @@ NETSTADM_GROUP?=	${NETSTADM_USER}
 PKG_GROUPS+=	${NETSAINT_GROUP}
 PKG_GROUPS+=	${NETSTADM_GROUP}
 
-PKG_USERS+=	${NETSAINT_USER}:${NETSAINT_GROUP}::NetSaint\ Runtime\ User
-PKG_USERS+=	${NETSTADM_USER}:${NETSTADM_GROUP}::NetSaint\ Administrator:${PREFIX}/etc/netsaint:${SH}
+PKG_USERS+=	${NETSAINT_USER}:${NETSAINT_GROUP}
+PKG_USERS+=	${NETSTADM_USER}:${NETSTADM_GROUP}
+
+PKG_GECOS.${NETSAINT_USER}=	NetSaint Runtime User
+PKG_GECOS.${NETSTADM_USER}=	NetSaint Administrator
+PKG_HOME.${NETSTADM_USER}=	${PKG_SYSCONFDIR}
+PKG_SHELL.${NETSTADM_USER}=	${SH}
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake perl:run
diff --git a/net/nsd/Makefile b/net/nsd/Makefile
index aa1b4e7c22f..11f7ce50512 100644
--- a/net/nsd/Makefile
+++ b/net/nsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/04/06 06:22:34 reed Exp $
+# $NetBSD: Makefile,v 1.36 2006/04/23 00:12:40 jlam Exp $
 
 DISTNAME=	nsd-2.3.3
 CATEGORIES=	net
@@ -29,11 +29,11 @@ CONFIGURE_ARGS+=--with-dbfile=${VARBASE}/db/nsd.db
 RCD_SCRIPTS=	nsd
 FILES_SUBST+=	NSDDB=${VARBASE}/db/nsd.db
 
-PKG_GROUPS?=		nsd
-PKG_USERS?=		nsd:nsd::nsd\ pseudo-user
+PKG_GROUPS?=	nsd
+PKG_USERS?=	nsd:nsd
 
 .for _file_ in nsd.zones nsdc.conf
-CONF_FILES+=		${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/nsd/${_file_}
+CONF_FILES+=	${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/nsd/${_file_}
 .endfor
 
 post-install:
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index 523357c5652..cc5ff012b36 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/12/29 06:22:01 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/23 00:12:40 jlam Exp $
 
 DISTNAME=		openntpd-3.7p1
 CATEGORIES=		net
@@ -22,8 +22,9 @@ EGDIR=			${PREFIX}/share/examples/openntpd
 CONF_FILES=		${EGDIR}/ntpd.conf ${PKG_SYSCONFDIR}/ntpd.conf
 
 RCD_SCRIPTS=		openntpd
-PKG_USERS=		_ntp:_ntp::ntpd\ pseudo-user:${VARBASE}/chroot/ntpd:${NOLOGIN}
 PKG_GROUPS=		_ntp
+PKG_USERS=		_ntp:_ntp
+PKG_HOME._ntp=		${VARBASE}/chroot/ntpd
 
 OWN_DIRS=		${VARBASE}/chroot/ntpd
 INSTALLATION_DIRS=	man/man5 man/man8 sbin
diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common
index 49f1059a30b..b641b8e08fc 100644
--- a/net/snort/Makefile.common
+++ b/net/snort/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2006/04/18 22:39:32 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.34 2006/04/23 00:12:41 jlam Exp $
 #
 
 DISTNAME=		snort-2.4.4
@@ -23,7 +23,7 @@ RCD_SCRIPTS=		snort
 SNORT_USER?=		snort
 SNORT_GROUP?=		snort
 PKG_GROUPS=		${SNORT_GROUP}
-PKG_USERS=		${SNORT_USER}:${SNORT_GROUP}::Snort\ user
+PKG_USERS=		${SNORT_USER}:${SNORT_GROUP}
 FILES_SUBST+=		SNORT_USER=${SNORT_USER:Q} SNORT_GROUP=${SNORT_GROUP:Q}
 
 OWN_DIRS_PERMS=		${VARBASE}/log/snort ${SNORT_USER} ${SNORT_GROUP} 700
diff --git a/net/tor/Makefile b/net/tor/Makefile
index 6e9aaa686b3..25852588cdb 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/04/06 06:22:35 reed Exp $
+# $NetBSD: Makefile,v 1.28 2006/04/23 00:12:41 jlam Exp $
 #
 
 DISTNAME=		tor-0.1.0.17
@@ -20,7 +20,9 @@ PKG_HOME?=		/var/chroot/tor
 
 RCD_SCRIPTS=            tor
 PKG_GROUPS=		${TOR_GROUP}
-PKG_USERS=              ${TOR_USER}:${TOR_GROUP}::Torifier:${PKG_HOME}
+PKG_USERS=              ${TOR_USER}:${TOR_GROUP}
+PKG_GECOS.${TOR_USER}=	Torifier
+PKG_HOME.${TOR_USER}=	${PKG_HOME}
 USER_GROUP=		${TOR_USER} ${TOR_GROUP}
 
 OWN_DIR_PERMS+=		${PKG_HOME} ${USER_GROUP} 0755
diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index 20805845710..b7c567b7e12 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:30:25 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/23 00:12:41 jlam Exp $
 #
 
 DISTNAME=	vsftpd-2.0.4
@@ -18,7 +18,7 @@ RCD_SCRIPTS=	vsftpd
 VSFTPD_USER?=	vsftpd
 VSFTPD_GROUP?=	vsftpd
 PKG_GROUPS=	${VSFTPD_GROUP}
-PKG_USERS=	${VSFTPD_USER}:${VSFTPD_GROUP}::vsftpd\ user
+PKG_USERS=	${VSFTPD_USER}:${VSFTPD_GROUP}
 
 DOCDIR=		${PREFIX}/share/doc/vsftpd
 EGDIR=		${PREFIX}/share/examples/vsftpd