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.

6 files changed, 21 insertions, 12 deletions

diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile
index 4709c5e1532..86b5ff446ba 100644
--- a/chat/bitlbee/Makefile
+++ b/chat/bitlbee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/04/08 21:42:26 tonio Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/23 00:12:35 jlam Exp $
 #
 
 DISTNAME=		bitlbee-1.0.2
@@ -31,7 +31,8 @@ STATEDIR=		${VARBASE}/db/bitlbee
 
 OWN_DIRS_PERMS=		${STATEDIR} bitlbee nobody 700
 
-PKG_USERS=		bitlbee:nobody::Bitlbee\ user:${VARBASE}/db/bitlbee
+PKG_USERS=		bitlbee:nobody
+PKG_HOME.bitlbee=	${VARBASE}/db/bitlbee
 
 INSTALLATION_DIRS=	man/man5 man/man8 sbin
 
diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile
index dccc38bd31f..8731b514a85 100644
--- a/chat/ircd-hybrid/Makefile
+++ b/chat/ircd-hybrid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/14 01:14:26 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/23 00:12:36 jlam Exp $
 
 DISTNAME=	ircd-hybrid-7.2.0
 EXTRACT_SUFX=	.tgz
@@ -38,8 +38,8 @@ FILES_SUBST+=		IRCD_HYBRID_IRC_USER=${IRCD_HYBRID_IRC_USER:Q}
 FILES_SUBST+=		IRCD_HYBRID_IRC_GROUP=${IRCD_HYBRID_IRC_GROUP:Q}
 FILES_SUBST+=		VARBASE=${VARBASE:Q}
 
-PKG_USERS=		${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}::ircd-hybrid\ User::${NOLOGIN}
 PKG_GROUPS=		${IRCD_HYBRID_IRC_GROUP}
+PKG_USERS=		${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
diff --git a/chat/ircu/Makefile b/chat/ircu/Makefile
index ff979811399..50bb508423a 100644
--- a/chat/ircu/Makefile
+++ b/chat/ircu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/04/22 09:22:06 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/23 00:12:36 jlam Exp $
 #
 
 DISTNAME=	ircu2.10.11.07
@@ -43,8 +43,12 @@ RCD_SCRIPTS=		ircd
 FILES_SUBST+=		IRCD_USER=${IRCD_USER:Q}
 MESSAGE_SUBST+=		IRCD_USER=${IRCD_USER}
 MESSAGE_SUBST+=		IRCD_GROUP=${IRCD_GROUP}
+
 PKG_GROUPS=		${IRCD_GROUP}
-PKG_USERS=		${IRCD_USER}:${IRCD_GROUP}::IRC\ server\ user:/nonexistant:${SH}
+PKG_USERS=		${IRCD_USER}:${IRCD_GROUP}
+
+PKG_GECOS.${IRCD_USER}=	IRC server user
+PKG_SHELL.${IRCD_USER}=	${SH}
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	post-patch
diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile
index 7253c871a86..569f6f1046f 100644
--- a/chat/jabberd/Makefile
+++ b/chat/jabberd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:29:03 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/23 00:12:36 jlam Exp $
 #
 
 DISTNAME=		jabber-1.4.2
@@ -37,7 +37,7 @@ BUILD_DEFS+=		JABBERD_USER	JABBERD_GROUP \
 			JABBERD_PIDDIR
 
 PKG_GROUPS=             ${JABBERD_GROUP}
-PKG_USERS=              ${JABBERD_USER}:${JABBERD_GROUP}::Jabberd\ user
+PKG_USERS=              ${JABBERD_USER}:${JABBERD_GROUP}
 
 FILES_SUBST+=		JABBERD_USER=${JABBERD_USER:Q}
 FILES_SUBST+=		JABBERD_GROUP=${JABBERD_GROUP:Q}
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 5bfd69d8d50..335ff5515f0 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2006/03/14 01:14:27 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2006/04/23 00:12:36 jlam Exp $
 #
 
 DISTNAME=		silc-server-1.0.2
@@ -23,7 +23,7 @@ SHLIBTOOL_OVERRIDE=	libtool */*/*/libtool
 SILCD_USER?=		silcd
 SILCD_GROUP?=		silcd
 PKG_GROUPS=		${SILCD_GROUP}
-PKG_USERS=		${SILCD_USER}:${SILCD_GROUP}::SILC\ Server\ user
+PKG_USERS=		${SILCD_USER}:${SILCD_GROUP}
 
 PKG_SYSCONFSUBDIR?=	${PKGBASE}
 
diff --git a/chat/unrealircd/Makefile b/chat/unrealircd/Makefile
index 87f1aeefdf0..c8602a7150f 100644
--- a/chat/unrealircd/Makefile
+++ b/chat/unrealircd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/04/06 06:21:39 reed Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/23 00:12:36 jlam Exp $
 
 DISTNAME=	Unreal3.2.4
 PKGNAME=	unrealircd-3.2.4
@@ -75,8 +75,12 @@ CONF_FILES_PERMS=	${IRCD_EG:Q}/example.conf \
 			${UIRCD_HOME:Q}/unrealircd.conf \
 			${UIRCD_USER} ${UIRCD_GROUP} 0660
 
-PKG_USERS=	${UIRCD_USER:Q}:${UIRCD_GROUP:Q}::UnrealIRCD\ user:${UIRCD_HOME:Q}:${NOLOGIN:Q}
 PKG_GROUPS=	${UIRCD_GROUP:Q}
+PKG_USERS=	${UIRCD_USER:Q}:${UIRCD_GROUP:Q}
+
+PKG_GECOS.${UIRCD_USER}=	UnrealIRCD user
+PKG_HOME.${UIRCD_USER}=		${UIRCD_HOME}
+
 RCD_SCRIPTS=	unrealircd
 
 MESSAGE_SRC+=	${WRKDIR}/.MESSAGE_SRC