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.

7 files changed, 14 insertions, 14 deletions

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 3489fb2ac25..fc0aabd86e5 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/08/22 09:47:30 cube Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/23 11:48:50 rillig Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -56,7 +56,7 @@ FILES_SUBST+=		AMAVIS_DIR=${AMAVIS_DIR}
 FILES_SUBST+=		AMAVIS_QUARANTINE=${AMAVIS_QUARANTINE}
 
 PKG_GROUPS=	${AMAVIS_GROUP}
-PKG_USERS=	${AMAVIS_USER}:${AMAVIS_GROUP}::Virus\\ Scanning\\ Account:${AMAVIS_DIR}:${SH}
+PKG_USERS=	${AMAVIS_USER}:${AMAVIS_GROUP}::Virus\ Scanning\ Account:${AMAVIS_DIR}:${SH}
 RCD_SCRIPTS=	amavisd
 CONF_FILES=	${EGDIR}/amavisd.conf-minimal ${PKG_SYSCONFDIR}/amavisd.conf
 
diff --git a/security/courier-authlib/Makefile.common b/security/courier-authlib/Makefile.common
index 8d762bbe2c7..2bcab23a910 100644
--- a/security/courier-authlib/Makefile.common
+++ b/security/courier-authlib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/02/18 22:12:43 jlam Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/08/23 11:48:51 rillig Exp $
 
 COURIER_USER?=		courier
 COURIER_GROUP?=		mail
@@ -7,7 +7,7 @@ FILES_SUBST+=		COURIER_GROUP=${COURIER_GROUP}
 
 USE_PKGINSTALL=		yes
 PKG_GROUPS=		${COURIER_GROUP}
-PKG_USERS=		${COURIER_USER}:${COURIER_GROUP}::Courier\\ user
+PKG_USERS=		${COURIER_USER}:${COURIER_GROUP}::Courier\ user
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-mailuser=${COURIER_USER}
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 4818a38866c..a472dfa4118 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:29 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/23 11:48:51 rillig Exp $
 #
 
 DISTNAME=		dirmngr-0.9.1
@@ -16,7 +16,7 @@ COMMENT=		X509 certificate and CRL downloader
 DIRMNGR_USER?=		dirmngr
 DIRMNGR_GROUP?=		dirmngr
 PKG_GROUPS=		${DIRMNGR_GROUP}
-PKG_USERS=		${DIRMNGR_USER}:${DIRMNGR_GROUP}::pseudo\\ user:${VARBASE}/dirmngr:
+PKG_USERS=		${DIRMNGR_USER}:${DIRMNGR_GROUP}::pseudo\ user:${VARBASE}/dirmngr:
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gawk
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index e6d67708bb6..3c84beed023 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/08/19 18:12:38 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/23 11:48:51 rillig Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -44,7 +44,7 @@ INSTALL_TARGET=		install-nokeys
 PLIST_SRC=		# empty
 MESSAGE_SRC=		${.CURDIR}/MESSAGE
 
-PKG_USERS=		${OPENSSH_USER}:${OPENSSH_GROUP}:${OPENSSH_UID}:sshd\\ privsep:${OPENSSH_CHROOT}:${NOLOGIN}
+PKG_USERS=		${OPENSSH_USER}:${OPENSSH_GROUP}:${OPENSSH_UID}:sshd\ privsep:${OPENSSH_CHROOT}:${NOLOGIN}
 PKG_GROUPS=             ${OPENSSH_GROUP}:${OPENSSH_GID}
 
 SSH_PID_DIR=		/var/run	# default directory for PID files
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index ca81dbcd71d..cdf42ff2e3a 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.155 2005/08/19 18:12:38 jlam Exp $
+# $NetBSD: Makefile,v 1.156 2005/08/23 11:48:51 rillig Exp $
 
 DISTNAME=		openssh-3.9p1
 PKGNAME=		openssh-3.9.1
@@ -49,7 +49,7 @@ LIBS+=			-lbind -ldb -lcrypt
 
 .else # not Interix
 
-PKG_USERS=		${OPENSSH_USER}:${OPENSSH_GROUP}:${OPENSSH_UID}:sshd\\ privsep:${OPENSSH_CHROOT}:${NOLOGIN}
+PKG_USERS=		${OPENSSH_USER}:${OPENSSH_GROUP}:${OPENSSH_UID}:sshd\ privsep:${OPENSSH_CHROOT}:${NOLOGIN}
 PKG_GROUPS=             ${OPENSSH_GROUP}:${OPENSSH_GID}
 
 .endif
diff --git a/security/pflkm/Makefile b/security/pflkm/Makefile
index a3c2f4fc61a..f5edb880d41 100644
--- a/security/pflkm/Makefile
+++ b/security/pflkm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/12 04:15:50 grant Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/23 11:48:51 rillig Exp $
 
 DISTNAME=		pflkm-20050511
 CATEGORIES=		security
@@ -13,7 +13,7 @@ ONLY_FOR_PLATFORM=	NetBSD-[2-9]*-*
 USE_PKGINSTALL=		yes
 NO_CONFIGURE=		yes
 
-PKG_USERS=		_pflogd:nogroup::pflogd\\ pseudo-user:${VARBASE}/chroot/pflogd:${NOLOGIN}
+PKG_USERS=		_pflogd:nogroup::pflogd\ pseudo-user:${VARBASE}/chroot/pflogd:${NOLOGIN}
 
 RCD_SCRIPTS=		pf pflogd
 PKG_SYSCONFSUBDIR=	pf
diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index e37f4c90e79..caa26b105cb 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/16 01:19:19 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/23 11:48:51 rillig Exp $
 #
 
 DISTNAME=		sfs-0.7.2
@@ -24,7 +24,7 @@ USE_TOOLS+=		perl:run
 
 GCC_REQD+=		2.95.3
 
-PKG_USERS=		sfs:sfs::Self-certifying\\ file\\ system:/
+PKG_USERS=		sfs:sfs::Self-certifying\ file\ system:/
 PKG_GROUPS=		sfs
 PKG_SYSCONFSUBDIR=	sfs