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.

10 files changed, 21 insertions, 21 deletions

diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 2b0d66556ef..fb4e20cbf8d 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2005/06/01 22:23:19 tron Exp $
+# $NetBSD: Makefile,v 1.72 2005/08/23 11:48:50 rillig Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	bind-${BIND_VERSION}
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=--with-libtool=yes \
 # include at the bottom to use OpenSSL shipped with BIND9.
 CONFIGURE_ARGS+=--with-openssl=${SSLBASE}
 
-PKG_USERS=	${BIND_USER}:${BIND_GROUP}::Named\\ pseudo-user:${BIND_DIR}:${NOLOGIN}
+PKG_USERS=	${BIND_USER}:${BIND_GROUP}::Named\ pseudo-user:${BIND_DIR}:${NOLOGIN}
 PKG_GROUPS=	${BIND_GROUP}
 
 PTHREAD_OPTS+=	native
diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile
index 5ee8a0e04e7..eaaf4f79b02 100644
--- a/net/hobbitmon/Makefile
+++ b/net/hobbitmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:24 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/23 11:48:50 rillig Exp $
 #
 
 DISTNAME=	hobbit-4.0-beta6
@@ -29,7 +29,7 @@ BBCGIURL?=	/cgi-bin
 BBHOSTIP?=	127.0.0.1
 
 PKG_GROUPS=	${BBGROUP}
-PKG_USERS=	${BBUSER}:${BBGROUP}::Hobbit\\ monitor:${BBTOPDIR}
+PKG_USERS=	${BBUSER}:${BBGROUP}::Hobbit\ monitor:${BBTOPDIR}
 
 CONFIGURE_ENV+=	TARGET=hobbit
 CONFIGURE_ENV+=	FPING=${PREFIX}/sbin/fping
diff --git a/net/howl/Makefile b/net/howl/Makefile
index ad80c406065..22ec8e9593e 100644
--- a/net/howl/Makefile
+++ b/net/howl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:22 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/23 11:48:50 rillig Exp $
 
 DISTNAME=		howl-0.9.10
 CATEGORIES=		net
@@ -16,7 +16,7 @@ PTHREAD_AUTO_VARS=	yes
 
 RCD_SCRIPTS=		howl
 PKG_GROUPS+=		howl
-PKG_USERS+=		howl:howl::Zeroconf\\ user
+PKG_USERS+=		howl:howl::Zeroconf\ user
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index edf5c14d361..ee97fae2853 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/08/19 18:12:38 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/08/23 11:48:50 rillig Exp $
 
 DISTNAME=		samba-${SAMBA_VERSION}-ja-${JA_VERSION}
 PKGNAME=		ja-samba-${SAMBA_VERSION}.${JA_PKG_VERSION}
@@ -124,7 +124,7 @@ OWN_DIRS_PERMS=		${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500
 RCD_SCRIPTS=		samba nmbd smbd winbindd
 
 PKG_GROUPS=		${SAMBA_GROUP}
-PKG_USERS=		${SAMBA_USER}:${SAMBA_GROUP}::Samba\\ pseudo-user
+PKG_USERS=		${SAMBA_USER}:${SAMBA_GROUP}::Samba\ pseudo-user
 
 BUILD_DEFS+=		SAMBA_USER SAMBA_GROUP
 MAKE_FLAGS=		CFLAGS='-DGUEST_ACCOUNT=\"${SAMBA_USER:Q}\"'
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index f14e1e47c29..19cba1dd588 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/07/25 01:39:10 kristerw Exp $
+# $NetBSD: Makefile,v 1.29 2005/08/23 11:48:50 rillig Exp $
 #
 
 .include "Makefile.common"
@@ -14,7 +14,7 @@ BUILD_DEFS+=		MLDONKEY_GROUP MLDONKEY_HOME MLDONKEY_USER
 OWN_DIRS_PERMS=		${MLDONKEY_HOME} ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700
 
 PKG_GROUPS=		${MLDONKEY_GROUP}
-PKG_USERS=		${MLDONKEY_USER}:${MLDONKEY_GROUP}::Dedicated\\ mldonkey\\ server:${MLDONKEY_HOME}:${SH}
+PKG_USERS=		${MLDONKEY_USER}:${MLDONKEY_GROUP}::Dedicated\ mldonkey\ server:${MLDONKEY_HOME}:${SH}
 
 FILES_SUBST+=		MLDONKEY_GROUP="${MLDONKEY_GROUP}"
 FILES_SUBST+=		MLDONKEY_HOME="${MLDONKEY_HOME}"
diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile
index 0c9df957584..7cf65e72018 100644
--- a/net/netdisco/Makefile
+++ b/net/netdisco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/08/20 19:16:21 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/23 11:48:50 rillig Exp $
 #
 
 DISTNAME=		netdisco-0.94_with_mibs
@@ -83,7 +83,7 @@ NETDISCOUSER?=	netdisco
 NETDISCOGROUP?=	netdisco
 BUILD_DEFS=	NETDISCOUSER NETDISCOGROUP
 
-PKG_USERS=	${NETDISCOUSER}:${NETDISCOGROUP}::Netdisco\\ administrator:${PREFIX}/netdisco:${SH}
+PKG_USERS=	${NETDISCOUSER}:${NETDISCOGROUP}::Netdisco\ administrator:${PREFIX}/netdisco:${SH}
 PKG_GROUPS=	${NETDISCOGROUP}
 
 PKG_SYSCONFVAR=		netdisco
diff --git a/net/netsaint-base/Makefile.common b/net/netsaint-base/Makefile.common
index 67901b6eb4c..e6a1f6cc221 100644
--- a/net/netsaint-base/Makefile.common
+++ b/net/netsaint-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2005/07/16 01:19:16 jlam Exp $
+# $NetBSD: Makefile.common,v 1.10 2005/08/23 11:48:50 rillig Exp $
 #
 
 CATEGORIES=		net sysutils
@@ -12,8 +12,8 @@ NETSTADM_GROUP?=	${NETSTADM_USER}
 PKG_GROUPS+=	${NETSAINT_GROUP}
 PKG_GROUPS+=	${NETSTADM_GROUP}
 
-PKG_USERS+=	${NETSAINT_USER}:${NETSAINT_GROUP}::NetSaint\\ Runtime\\ User
-PKG_USERS+=	${NETSTADM_USER}:${NETSTADM_GROUP}::NetSaint\\ Administrator:${PREFIX}/etc/netsaint:${SH}
+PKG_USERS+=	${NETSAINT_USER}:${NETSAINT_GROUP}::NetSaint\ Runtime\ User
+PKG_USERS+=	${NETSTADM_USER}:${NETSTADM_GROUP}::NetSaint\ Administrator:${PREFIX}/etc/netsaint:${SH}
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake perl:run
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index bbf4dfda8db..f54605092da 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/12 04:15:50 grant Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/23 11:48:50 rillig Exp $
 
 DISTNAME=		openntpd-3.7p1
 CATEGORIES=		net
@@ -23,7 +23,7 @@ EGDIR=			${PREFIX}/share/examples/openntpd
 CONF_FILES=		${EGDIR}/ntpd.conf ${PKG_SYSCONFDIR}/ntpd.conf
 
 RCD_SCRIPTS=		openntpd
-PKG_USERS=		_ntp:_ntp::ntpd\\ pseudo-user:${VARBASE}/chroot/ntpd:${NOLOGIN}
+PKG_USERS=		_ntp:_ntp::ntpd\ pseudo-user:${VARBASE}/chroot/ntpd:${NOLOGIN}
 PKG_GROUPS=		_ntp
 
 OWN_DIRS=		${VARBASE}/chroot/ntpd
diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common
index c75f44bcd3e..7a089288d8e 100644
--- a/net/snort/Makefile.common
+++ b/net/snort/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2005/08/19 18:12:38 jlam Exp $
+# $NetBSD: Makefile.common,v 1.23 2005/08/23 11:48:50 rillig Exp $
 #
 
 DISTNAME=		snort-2.4.0
@@ -24,7 +24,7 @@ RCD_SCRIPTS=		snort
 SNORT_USER?=		snort
 SNORT_GROUP?=		snort
 PKG_GROUPS=		${SNORT_GROUP}
-PKG_USERS=		${SNORT_USER}:${SNORT_GROUP}::Snort\\ user
+PKG_USERS=		${SNORT_USER}:${SNORT_GROUP}::Snort\ user
 FILES_SUBST+=		SNORT_USER="${SNORT_USER}" SNORT_GROUP="${SNORT_GROUP}"
 
 OWN_DIRS_PERMS=		${VARBASE}/log/snort ${SNORT_USER} ${SNORT_GROUP} 700
diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index e4d2eb44690..a0289b79239 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:02 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/23 11:48:50 rillig Exp $
 #
 
 DISTNAME=	vsftpd-1.2.2
@@ -20,7 +20,7 @@ RCD_SCRIPTS=	vsftpd
 VSFTPD_USER?=	vsftpd
 VSFTPD_GROUP?=	vsftpd
 PKG_GROUPS=	${VSFTPD_GROUP}
-PKG_USERS=	${VSFTPD_USER}:${VSFTPD_GROUP}::vsftpd\\ user
+PKG_USERS=	${VSFTPD_USER}:${VSFTPD_GROUP}::vsftpd\ user
 
 DOCDIR=		${PREFIX}/share/doc/vsftpd
 EGDIR=		${PREFIX}/share/examples/vsftpd