From 47e4458dad4a3f51b7c3aa5ed9c9cd8e4cef1869 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Tue, 23 Aug 2005 11:48:47 +0000
Subject: 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.

---
 www/apache/Makefile    | 4 ++--
 www/apache2/Makefile   | 4 ++--
 www/privoxy/Makefile   | 4 ++--
 www/squid/Makefile     | 4 ++--
 www/tinyproxy/Makefile | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'www')

diff --git a/www/apache/Makefile b/www/apache/Makefile
index 426f7e214e3..6fe08c0c4a3 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.169 2005/08/20 19:16:22 jlam Exp $
+# $NetBSD: Makefile,v 1.170 2005/08/23 11:48:51 rillig Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -149,7 +149,7 @@ OWN_DIRS+=		${VARBASE}/log/httpd
 OWN_DIRS_PERMS+=	${VARBASE}/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
 
 PKG_GROUPS=		${APACHE_GROUP}
-PKG_USERS=		${APACHE_USER}:${APACHE_GROUP}::Apache\\ user
+PKG_USERS=		${APACHE_USER}:${APACHE_GROUP}::Apache\ user
 
 MAKE_ENV+=		CHMOD="${CHMOD}" CHOWN="${CHOWN}" XARGS="${XARGS}"
 MAKE_ENV+=		FIND="${FIND}" CHGRP="${CHGRP}"
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 351a5c01ef7..97c089c7288 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2005/08/20 03:36:25 jlam Exp $
+# $NetBSD: Makefile,v 1.80 2005/08/23 11:48:51 rillig Exp $
 
 .include "Makefile.common"
 
@@ -66,7 +66,7 @@ BUILD_DEFS+=		APACHE_MODULES
 APACHE_USER?=		www
 APACHE_GROUP?=		www
 PKG_GROUPS=		${APACHE_GROUP}
-PKG_USERS=		${APACHE_USER}:${APACHE_GROUP}::Apache\\ user
+PKG_USERS=		${APACHE_USER}:${APACHE_GROUP}::Apache\ user
 
 PKG_SYSCONFVAR=		apache
 PKG_SYSCONFSUBDIR?=	httpd
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index cc3092fabb9..354b3b0272b 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:26 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/23 11:48:51 rillig Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV}-stable-src
@@ -22,7 +22,7 @@ PKG_SYSCONFSUBDIR?=	privoxy
 USE_PKGINSTALL=		YES
 RCD_SCRIPTS=		privoxy
 PKG_GROUPS=		${PRIVOXY_GROUP}
-PKG_USERS=		${PRIVOXY_USER}:${PRIVOXY_GROUP}::Privoxy\\ user
+PKG_USERS=		${PRIVOXY_USER}:${PRIVOXY_GROUP}::Privoxy\ user
 
 EGDIR=			${PREFIX}/share/examples/privoxy
 
diff --git a/www/squid/Makefile b/www/squid/Makefile
index eab0d79df79..6f203a0ea8c 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.155 2005/08/09 15:48:29 taca Exp $
+# $NetBSD: Makefile,v 1.156 2005/08/23 11:48:51 rillig Exp $
 
 DISTNAME=	squid-2.5.STABLE10
 PKGNAME=	squid-2.5.10
@@ -58,7 +58,7 @@ PLIST_SRC=	${WRKDIR}/PLIST
 RCD_SCRIPTS=	squid
 
 PKG_GROUPS=	${SQUID_GROUP}
-PKG_USERS=	${SQUID_USER}:${SQUID_GROUP}::Squid\\ Web-Cache\\ pseudo-user
+PKG_USERS=	${SQUID_USER}:${SQUID_GROUP}::Squid\ Web-Cache\ pseudo-user
 CONF_FILES+=	${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf
 CONF_FILES+=	${EXAMPLESDIR}/squid.conf ${PKG_SYSCONFDIR}/squid.conf
 CONF_FILES+=	${EXAMPLESDIR}/msntauth.conf ${PKG_SYSCONFDIR}/msntauth.conf
diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index 04eaa64018a..89caa6c469c 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/23 11:48:52 rillig Exp $
 #
 
 DISTNAME=	tinyproxy-1.6.2
@@ -19,7 +19,7 @@ PKG_SYSCONFSUBDIR=	tinyproxy
 TINYPROXY_USER?=	tinyproxy
 TINYPROXY_GROUP?=	tinyproxy
 PKG_GROUPS=		${TINYPROXY_GROUP}
-PKG_USERS=		${TINYPROXY_USER}:${TINYPROXY_GROUP}::Tinyproxy\\ user
+PKG_USERS=		${TINYPROXY_USER}:${TINYPROXY_GROUP}::Tinyproxy\ user
 FILES_SUBST+=		TINYPROXY_USER="${TINYPROXY_USER}"
 FILES_SUBST+=		TINYPROXY_GROUP="${TINYPROXY_GROUP}"
 
-- 
cgit v1.2.3