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.

7 files changed, 41 insertions, 14 deletions

diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile
index 4a382b01544..cca949d49ad 100644
--- a/databases/gnats/Makefile
+++ b/databases/gnats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/03/30 03:44:41 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2006/04/23 00:12:36 jlam Exp $
 
 DISTNAME=	gnats-4.1.0
 PKGREVISION=	2
@@ -31,7 +31,12 @@ GNATS_USER?=	gnats
 GNATS_GROUP?=	daemon
 GNATS_SERVICE?=	support
 GNATS_HOME?=	${VARBASE}/db/gnats
-PKG_USERS=	${GNATS_USER}:${GNATS_GROUP}::GNATS\ database\ owner:${GNATS_HOME}:${SH}
+PKG_GROUPS=	${GNATS_GROUP}
+PKG_USERS=	${GNATS_USER}:${GNATS_GROUP}
+
+PKG_GECOS.${GNATS_USER}=	GNATS database owner
+PKG_HOME.${GNATS_USER}=		${GNATS_HOME}
+PKG_SHELL.${GNATS_USER}=	${SH}
 
 GNATS_USER_FILE?=	${PKG_SYSCONFDIR}/gnatsd.user_access
 GNATS_HOST_FILE?=	${PKG_SYSCONFDIR}/gnatsd.host_access
diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile
index 8072e41831c..92bb48cfb90 100644
--- a/databases/mysql4-server/Makefile
+++ b/databases/mysql4-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/03/14 01:14:27 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/04/23 00:12:36 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 PKGREVISION=		1
@@ -19,8 +19,13 @@ CONFIGURE_ARGS+=	--with-mysqld-user=${MYSQL_USER:Q}
 PTHREAD_OPTS+=		require
 CONFIGURE_ARGS+=	--with-pthreads
 
-PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH}
 PKG_GROUPS=		${MYSQL_GROUP}
+PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}
+
+PKG_GECOS.${MYSQL_USER}=	MySQL database administrator
+PKG_HOME.${MYSQL_USER}=		${MYSQL_DATADIR}
+PKG_SHELL.${MYSQL_USER}=	${SH}
+
 RCD_SCRIPTS=		mysqld
 
 FILES_SUBST+=		HOSTNAME_CMD=${HOSTNAME_CMD:Q} \
diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile
index f39ee2b601d..56dbbb8da1e 100644
--- a/databases/mysql5-server/Makefile
+++ b/databases/mysql5-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/04/17 11:21:41 tron Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/23 00:12:37 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 PKGREVISION=		1
@@ -18,8 +18,13 @@ CONFIGURE_ARGS+=	--with-mysqld-user=${MYSQL_USER:Q}
 PTHREAD_OPTS+=		require
 CONFIGURE_ARGS+=	--with-pthreads
 
-PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH}
 PKG_GROUPS=		${MYSQL_GROUP}
+PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}
+
+PKG_GECOS.${MYSQL_USER}=	MySQL database administrator
+PKG_HOME.${MYSQL_USER}=		${MYSQL_DATADIR}
+PKG_SHELL.${MYSQL_USER}=	${SH}
+
 RCD_SCRIPTS=		mysqld
 
 FILES_SUBST+=		HOSTNAME_CMD=${HOSTNAME_CMD:Q} \
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 61f43421b61..f115dd66ab8 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/14 01:14:27 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/23 00:12:37 jlam Exp $
 
 PKGNAME=		postgresql73-server-${BASE_VERS}
 SVR4_PKGNAME=		pstgs
@@ -43,8 +43,11 @@ FILES_SUBST+=		PGGROUP=${PGGROUP:Q}
 FILES_SUBST+=		PGHOME=${PGHOME:Q}
 BUILD_DEFS+=		PGUSER PGGROUP PGHOME
 
-PKG_USERS=		${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH}
 PKG_GROUPS=		${PGGROUP}
+PKG_USERS=		${PGUSER}:${PGGROUP}
+PKG_GECOS.${PGUSER}=	PostgreSQL database administrator
+PKG_HOME.${PGUSER}=	${PGHOME}
+PKG_SHELL.${PGUSER}=	${SH}
 
 RCD_SCRIPTS=		pgsql
 
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 79b10c8929d..a890abe4534 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:27 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2006/04/23 00:12:37 jlam Exp $
 
 PKGNAME=		postgresql74-server-${BASE_VERS}
 SVR4_PKGNAME=		pstgs
@@ -44,8 +44,11 @@ FILES_SUBST+=		PGGROUP=${PGGROUP:Q}
 FILES_SUBST+=		PGHOME=${PGHOME:Q}
 BUILD_DEFS+=		PGUSER PGGROUP PGHOME
 
-PKG_USERS=		${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH}
 PKG_GROUPS=		${PGGROUP}
+PKG_USERS=		${PGUSER}:${PGGROUP}
+PKG_GECOS.${PGUSER}=	PostgreSQL database administrator
+PKG_HOME.${PGUSER}=	${PGHOME}
+PKG_SHELL.${PGUSER}=	${SH}
 
 RCD_SCRIPTS=		pgsql
 
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index e6aa9cdbcdf..5f04b56a27c 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/14 01:14:27 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/23 00:12:37 jlam Exp $
 
 PKGNAME=	postgresql80-server-${BASE_VERS}
 COMMENT=	PostgreSQL database server programs
@@ -59,8 +59,11 @@ FILES_SUBST+=		PGGROUP=${PGGROUP:Q}
 FILES_SUBST+=		PGHOME=${PGHOME:Q}
 BUILD_DEFS+=		PGUSER PGGROUP PGHOME
 
-PKG_USERS=		${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH}
 PKG_GROUPS=		${PGGROUP}
+PKG_USERS=		${PGUSER}:${PGGROUP}
+PKG_GECOS.${PGUSER}=	PostgreSQL database administrator
+PKG_HOME.${PGUSER}=	${PGHOME}
+PKG_SHELL.${PGUSER}=	${SH}
 
 RCD_SCRIPTS=		pgsql
 
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index eb00bd4e4f9..576d8f7dd28 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/28 19:48:22 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/04/23 00:12:37 jlam Exp $
 
 PKGNAME=	postgresql81-server-${BASE_VERS}
 COMMENT=	PostgreSQL database server programs
@@ -59,8 +59,11 @@ FILES_SUBST+=		PGGROUP=${PGGROUP}
 FILES_SUBST+=		PGHOME=${PGHOME}
 BUILD_DEFS+=		PGUSER PGGROUP PGHOME
 
-PKG_USERS=		${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH}
 PKG_GROUPS=		${PGGROUP}
+PKG_USERS=		${PGUSER}:${PGGROUP}
+PKG_GECOS.${PGUSER}=	PostgreSQL database administrator
+PKG_HOME.${PGUSER}=	${PGHOME}
+PKG_SHELL.${PGUSER}=	${SH}
 
 RCD_SCRIPTS=		pgsql