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.

5 files changed, 10 insertions, 10 deletions

diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile
index 0151792901e..57e4bda9642 100644
--- a/chat/bitlbee/Makefile
+++ b/chat/bitlbee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/08/10 20:56:13 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/08/23 11:48:47 rillig Exp $
 #
 
 DISTNAME=		bitlbee-0.92
@@ -32,7 +32,7 @@ STATEDIR=		${VARBASE}/db/bitlbee
 
 OWN_DIRS_PERMS=		${STATEDIR} bitlbee nobody 700
 
-PKG_USERS=		bitlbee:nobody::Bitlbee\\ user:${VARBASE}/db/bitlbee
+PKG_USERS=		bitlbee:nobody::Bitlbee\ user:${VARBASE}/db/bitlbee
 
 INSTALLATION_DIRS=	man/man8 sbin
 
diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile
index f37e62dc001..0eb0aa6e0fd 100644
--- a/chat/ircd-hybrid/Makefile
+++ b/chat/ircd-hybrid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/08/19 18:12:36 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/23 11:48:47 rillig Exp $
 #
 
 DISTNAME=	ircd-hybrid-6.2
@@ -107,7 +107,7 @@ FILES_SUBST+=		SYSLOG_FACILITY=${IRCD_HYBRID_SYSLOG_FACILITY}
 
 RCD_SCRIPTS=		ircd-hybrid
 
-PKG_USERS=		${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}::IRC\\ User::${NOLOGIN}
+PKG_USERS=		${IRCD_HYBRID_IRC_USER}:${IRCD_HYBRID_IRC_GROUP}::IRC\ User::${NOLOGIN}
 PKG_GROUPS=		${IRCD_HYBRID_IRC_GROUP}
 
 CONF_FILES=		${PREFIX}/share/examples/ircd-hybrid/opers.txt \
diff --git a/chat/ircu/Makefile b/chat/ircu/Makefile
index a5785adb75c..69763298c0f 100644
--- a/chat/ircu/Makefile
+++ b/chat/ircu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/16 06:57:42 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/23 11:48:47 rillig Exp $
 #
 
 DISTNAME=	ircu2.10.11.07
@@ -43,7 +43,7 @@ FILES_SUBST+=		IRCD_USER=${IRCD_USER}
 MESSAGE_SUBST+=		IRCD_USER=${IRCD_USER}
 MESSAGE_SUBST+=		IRCD_GROUP=${IRCD_GROUP}
 PKG_GROUPS=		${IRCD_GROUP}
-PKG_USERS=		${IRCD_USER}:${IRCD_GROUP}::IRC\\ server\\ user:/nonexistant:${SH}
+PKG_USERS=		${IRCD_USER}:${IRCD_GROUP}::IRC\ server\ user:/nonexistant:${SH}
 
 SUBST_CLASSES=		paths
 SUBST_STAGE.paths=	post-patch
diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile
index 6750f0e2267..1d6e8d02404 100644
--- a/chat/jabberd/Makefile
+++ b/chat/jabberd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/08/19 18:12:37 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/23 11:48:47 rillig Exp $
 #
 
 DISTNAME=		jabber-1.4.2
@@ -39,7 +39,7 @@ BUILD_DEFS+=		JABBERD_USER	JABBERD_GROUP \
 			JABBERD_PIDDIR
 
 PKG_GROUPS=             ${JABBERD_GROUP}
-PKG_USERS=              ${JABBERD_USER}:${JABBERD_GROUP}::Jabberd\\ user
+PKG_USERS=              ${JABBERD_USER}:${JABBERD_GROUP}::Jabberd\ user
 
 FILES_SUBST+=		JABBERD_USER="${JABBERD_USER}"
 FILES_SUBST+=		JABBERD_GROUP="${JABBERD_GROUP}"
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 51c3e99076f..9f5349899a9 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/06/19 01:22:17 salo Exp $
+# $NetBSD: Makefile,v 1.41 2005/08/23 11:48:47 rillig Exp $
 #
 
 DISTNAME=		silc-server-1.0
@@ -26,7 +26,7 @@ DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 SILCD_USER?=		silcd
 SILCD_GROUP?=		silcd
 PKG_GROUPS=		${SILCD_GROUP}
-PKG_USERS=		${SILCD_USER}:${SILCD_GROUP}::SILC\\ Server\\ user
+PKG_USERS=		${SILCD_USER}:${SILCD_GROUP}::SILC\ Server\ user
 
 PKG_SYSCONFSUBDIR?=	${PKGBASE}