The real user name in PKG_USERS does not need to be escaped with double

backslashes anymore. A single backslash is enough. Changed the
definition in all affected packages. For those that are not caught, an
additional check is placed into bsd.pkginstall.mk.

6 files changed, 12 insertions, 12 deletions

diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile
index 06951a1e6d5..2fa3092f88b 100644
--- a/databases/gnats/Makefile
+++ b/databases/gnats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/08/20 19:16:21 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/23 11:48:47 rillig Exp $
 #
 
 DISTNAME=	gnats-4.0.1
@@ -23,7 +23,7 @@ INFO_FILES=	gnats.info gnats-faq.info
 CONFIGURE_ARGS= --with-lispdir=${PREFIX}/share/emacs/site-lisp
 
 GNATS_HOME=	${PREFIX}/share/gnats/gnats-db
-PKG_USERS=	gnats:daemon::GNATS\\ database\\ owner:${GNATS_HOME}:${SH}
+PKG_USERS=	gnats:daemon::GNATS\ database\ owner:${GNATS_HOME}:${SH}
 
 REQD_DIRS=		${PREFIX}/share/gnats
 REQD_DIRS+=		${PREFIX}/libexec/gnats
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index c7ef60c4007..8b4c5505800 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2005/04/11 21:45:12 tv Exp $
+# $NetBSD: Makefile,v 1.65 2005/08/23 11:48:47 rillig Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 SVR4_PKGNAME=		mysqs
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=	--with-pthreads
 USE_PKGINSTALL=		YES
 DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
 
-PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}::MySQL\\ database\\ administrator:${MYSQL_DATADIR}:${SH}
+PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH}
 PKG_GROUPS=		${MYSQL_GROUP}
 RCD_SCRIPTS=		mysqld
 
diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile
index 1b8e54ffda7..63ba96c1605 100644
--- a/databases/mysql4-server/Makefile
+++ b/databases/mysql4-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/29 21:02:35 xtraeme Exp $
+# $NetBSD: Makefile,v 1.21 2005/08/23 11:48:47 rillig Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 #PKGREVISION=		1
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--with-pthreads
 USE_PKGINSTALL=		YES
 DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
 
-PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}::MySQL\\ database\\ administrator:${MYSQL_DATADIR}:${SH}
+PKG_USERS=		${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH}
 PKG_GROUPS=		${MYSQL_GROUP}
 RCD_SCRIPTS=		mysqld
 
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 66b98d6533c..02f63d7aab5 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/15 18:27:48 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/23 11:48:47 rillig Exp $
 
 PKGNAME=		postgresql73-server-${BASE_VERS}
 PKGREVISION=		# empty
@@ -47,7 +47,7 @@ FILES_SUBST+=		PGGROUP=${PGGROUP}
 FILES_SUBST+=		PGHOME=${PGHOME}
 BUILD_DEFS=		PGUSER PGGROUP PGHOME
 
-PKG_USERS=		${PGUSER}:${PGGROUP}::PostgreSQL\\ database\\ administrator:${PGHOME}:${SH}
+PKG_USERS=		${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH}
 PKG_GROUPS=		${PGGROUP}
 
 RCD_SCRIPTS=		pgsql
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index c5c2f9c69bf..af72038639f 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/15 18:27:48 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/23 11:48:47 rillig Exp $
 
 PKGNAME=		postgresql74-server-${BASE_VERS}
 PKGREVISION=		# empty
@@ -47,7 +47,7 @@ FILES_SUBST+=		PGGROUP=${PGGROUP}
 FILES_SUBST+=		PGHOME=${PGHOME}
 BUILD_DEFS=		PGUSER PGGROUP PGHOME
 
-PKG_USERS=		${PGUSER}:${PGGROUP}::PostgreSQL\\ database\\ administrator:${PGHOME}:${SH}
+PKG_USERS=		${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH}
 PKG_GROUPS=		${PGGROUP}
 
 RCD_SCRIPTS=		pgsql
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 316fdea7470..94d93104d1a 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/08 23:09:43 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/23 11:48:47 rillig Exp $
 
 PKGNAME=	postgresql80-server-${BASE_VERS}
 PKGREVISION=	2
@@ -62,7 +62,7 @@ FILES_SUBST+=		PGGROUP=${PGGROUP}
 FILES_SUBST+=		PGHOME=${PGHOME}
 BUILD_DEFS+=		PGUSER PGGROUP PGHOME
 
-PKG_USERS=		${PGUSER}:${PGGROUP}::PostgreSQL\\ database\\ administrator:${PGHOME}:${SH}
+PKG_USERS=		${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH}
 PKG_GROUPS=		${PGGROUP}
 
 RCD_SCRIPTS=		pgsql