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.

15 files changed, 30 insertions, 30 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index d8ec2c963e6..4727d42366a 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/07/26 07:53:50 grant Exp $
+# $NetBSD: Makefile,v 1.44 2005/08/23 11:48:48 rillig Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -34,7 +34,7 @@ DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
 
 RCD_SCRIPTS=	clamd freshclamd
 PKG_GROUPS+=	${CLAMAV_GROUP}
-PKG_USERS+=	${CLAMAV_USER}:${CLAMAV_GROUP}::Clamav\\ User
+PKG_USERS+=	${CLAMAV_USER}:${CLAMAV_GROUP}::Clamav\ User
 
 VIRUSDBDIR=	${VARBASE}/clamav
 EGDIR=		${PREFIX}/share/examples/clamav
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 64fac1462e2..5a80b8c5528 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/08/19 04:57:01 grant Exp $
+# $NetBSD: Makefile,v 1.38 2005/08/23 11:48:48 rillig Exp $
 
 DISTNAME=		dovecot-0.99.14
 PKGREVISION=		1
@@ -28,7 +28,7 @@ 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}::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 dbf6265267d..6c75bf1de41 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2005/07/21 03:06:13 grant Exp $
+# $NetBSD: Makefile,v 1.62 2005/08/23 11:48:48 rillig Exp $
 
 DISTNAME=	exim-4.52
 CATEGORIES=	mail net
@@ -24,7 +24,7 @@ MAKE_FLAGS+=	FULLECHO=''
 BUILD_DEFS=	EXIM_USER EXIM_GROUP EXIM_DB EXIM_USE_LOOKUP_WHOSON
 
 PKG_GROUPS=	${EXIM_GROUP}
-PKG_USERS=	${EXIM_USER}:${EXIM_GROUP}::Exim\\ mail\\ server\\ user:/var/mail:${NOLOGIN}
+PKG_USERS=	${EXIM_USER}:${EXIM_GROUP}::Exim\ mail\ server\ user:/var/mail:${NOLOGIN}
 
 PKG_SYSCONFSUBDIR?=	exim
 EXAMPLESDIR=		${PREFIX}/share/examples/exim
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index fb7bf05bd41..aabeab82e7d 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/21 03:04:21 grant Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/23 11:48:48 rillig Exp $
 
 DISTNAME=	exim-3.36
 PKGREVISION=	4
@@ -29,7 +29,7 @@ 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_USERS=		${EXIM_USER}:${EXIM_GROUP}:8:Exim\ mail\ server\ user:/var/mail:${NOLOGIN}
 PKG_GROUPS=		${EXIM_GROUP}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/mail/gld/Makefile b/mail/gld/Makefile
index 863b5a711a5..050622d63fa 100644
--- a/mail/gld/Makefile
+++ b/mail/gld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/21 11:46:13 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/23 11:48:48 rillig Exp $
 #
 
 DISTNAME=		gld-1.5.2
@@ -21,7 +21,7 @@ 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}::Greylisting\ Daemon\ user
 
 SUBST_CLASSES+=		gld users
 SUBST_STAGE.gld=	post-patch
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index eaf4b6c9545..9b5477e1592 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/06/01 23:25:07 bouyer Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/23 11:48:48 rillig Exp $
 
 DISTNAME=	mailman-2.1.6
 PKGREVISION=	# empty
@@ -43,7 +43,7 @@ PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 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}::Mailman\ user::${SH}
 
 OWN_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 bbe06b7cc09..e2c74b85ec6 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/26 18:05:25 tron Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/23 11:48:48 rillig Exp $
 
 DISTNAME=	milter-greylist-2.0
 CATEGORIES=	mail
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX}
 BUILD_TARGET=	milter-greylist
 
 PKG_GROUPS=	smmsp
-PKG_USERS=	smmsp:smmsp::Sendmail\\ Message\\ Submission\\ Program
+PKG_USERS=	smmsp:smmsp::Sendmail\ Message\ Submission\ Program
 RCD_SCRIPTS=	milter-greylist
 
 post-install:
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index d9c8dae36a9..6631e41dd95 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/08/14 21:51:02 christos Exp $
+# $NetBSD: Makefile,v 1.44 2005/08/23 11:48:49 rillig Exp $
 
 DISTNAME=	postfix-2.3-20050726
 CATEGORIES=	mail
@@ -88,7 +88,7 @@ OWN_DIRS+=		${POSTFIX_QUEUE_DIR}
 MAKE_DIRS+=		${PKG_SYSCONFDIR}
 
 PKG_GROUPS?=		postfix maildrop
-PKG_USERS?=		postfix:postfix::Postfix\\ User:${POSTFIX_QUEUE_DIR}
+PKG_USERS?=		postfix:postfix::Postfix\ User:${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 6b6b48e3f7f..4497ca28dc7 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.166 2005/07/31 03:46:05 grant Exp $
+# $NetBSD: Makefile,v 1.167 2005/08/23 11:48:48 rillig Exp $
 
 DISTNAME=	postfix-2.2.5
 CATEGORIES=	mail
@@ -88,7 +88,7 @@ OWN_DIRS+=		${POSTFIX_QUEUE_DIR}
 MAKE_DIRS+=		${PKG_SYSCONFDIR}
 
 PKG_GROUPS?=		postfix maildrop
-PKG_USERS?=		postfix:postfix::Postfix\\ User:${POSTFIX_QUEUE_DIR}
+PKG_USERS?=		postfix:postfix::Postfix\ User:${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 970f523b9a1..2cfd05d2227 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:13 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/23 11:48:49 rillig Exp $
 #
 
 DISTNAME=	postgrey-1.21
@@ -32,7 +32,7 @@ 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}::Postgrey\ Daemon
 
 .for i in postgrey_whitelist_clients postgrey_whitelist_recipients
 CONF_FILES+=		${PREFIX}/${EGDIR}/${i} \
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index ca4d871e5c3..e433e1133b2 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2005/08/01 15:30:52 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2005/08/23 11:48:49 rillig Exp $
 
 .include "../../mail/sendmail/Makefile.common"
 
@@ -89,7 +89,7 @@ post-install:
 
 USE_PKGINSTALL=	yes
 PKG_GROUPS=	smmsp
-PKG_USERS=	smmsp:smmsp::Sendmail\\ Message\\ Submission\\ Program
+PKG_USERS=	smmsp:smmsp::Sendmail\ Message\ Submission\ Program
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
index 4cd08b4af20..3fb4a77777a 100644
--- a/mail/sendmail812/Makefile
+++ b/mail/sendmail812/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/08/01 14:54:33 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/23 11:48:49 rillig Exp $
 
 .include "options.mk"
 .include "../../mail/sendmail812/Makefile.common"
@@ -14,7 +14,7 @@ PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
 USE_PKGINSTALL=	yes
 PKG_GROUPS=	smmsp
-PKG_USERS=	smmsp:smmsp::Sendmail\\ Message\\ Submission\\ Program
+PKG_USERS=	smmsp: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 bbc249a9c08..5c9a8a31548 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/07/26 11:13:41 peter Exp $
+# $NetBSD: Makefile,v 1.3 2005/08/23 11:48:49 rillig Exp $
 
 DISTNAME=		spamd-20050726
 CATEGORIES=		mail
@@ -13,7 +13,7 @@ ONLY_FOR_PLATFORM=	NetBSD-[2-9]*-*
 USE_PKGINSTALL=		yes
 NO_CONFIGURE=		yes
 
-PKG_USERS=		_spamd:_spamd::Spam\\ Daemon:${VARBASE}/chroot/spamd:/sbin/nologin
+PKG_USERS=		_spamd:_spamd::Spam\ Daemon:${VARBASE}/chroot/spamd:/sbin/nologin
 PKG_GROUPS=		_spamd
 
 OWN_DIRS=		${VARBASE}/chroot/spamd
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 83b5e417a93..3a3683a06e9 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/08/06 06:19:22 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/23 11:48:49 rillig Exp $
 #
 
 DISTNAME=	sympa-4.1.2
@@ -85,7 +85,7 @@ 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}::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 646e4022fb7..3a38789dbdc 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/06/16 06:58:08 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/08/23 11:48:49 rillig Exp $
 #
 
 DISTNAME=	tmda-1.0.3
@@ -20,7 +20,7 @@ PKG_SYSCONFSUBDIR=	${PKGBASE}
 PYTHON_VERSIONS_ACCEPTED=	24 23 22
 
 PKG_GROUPS=	tofmipd
-PKG_USERS=	tofmipd:tofmipd::TMDA\\ ofmipd\\ User
+PKG_USERS=	tofmipd:tofmipd::TMDA\ ofmipd\ User
 
 RCD_SCRIPTS=	tofmipd
 FILES_SUBST+=	PYTHONBIN=${PYTHONBIN}