summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-08-23 11:48:47 +0000
committerrillig <rillig@pkgsrc.org>2005-08-23 11:48:47 +0000
commit7a95adad42b3c7b40d157d5aad4d76454fc61dfd (patch)
tree47a0e07bf95d82fd146b551a36227c5d1c0676ab
parentb6e31cb4fa6ac9424537a0ed5dbca1d213ba4144 (diff)
downloadpkgsrc-7a95adad42b3c7b40d157d5aad4d76454fc61dfd.tar.gz
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.
-rw-r--r--audio/icecast/Makefile4
-rw-r--r--chat/bitlbee/Makefile4
-rw-r--r--chat/ircd-hybrid/Makefile4
-rw-r--r--chat/ircu/Makefile4
-rw-r--r--chat/jabberd/Makefile4
-rw-r--r--chat/silc-server/Makefile4
-rw-r--r--comms/fidogate/Makefile4
-rw-r--r--databases/gnats/Makefile4
-rw-r--r--databases/mysql-server/Makefile4
-rw-r--r--databases/mysql4-server/Makefile4
-rw-r--r--databases/postgresql73-server/Makefile4
-rw-r--r--databases/postgresql74-server/Makefile4
-rw-r--r--databases/postgresql80-server/Makefile4
-rw-r--r--devel/distcc/Makefile4
-rw-r--r--devel/monotone-server/Makefile4
-rw-r--r--devel/p4d/Makefile4
-rw-r--r--inputmethod/canna-server/Makefile4
-rw-r--r--inputmethod/ja-freewnn-server-bin/Makefile4
-rw-r--r--mail/clamav/Makefile4
-rw-r--r--mail/dovecot/Makefile4
-rw-r--r--mail/exim/Makefile4
-rw-r--r--mail/exim3/Makefile4
-rw-r--r--mail/gld/Makefile4
-rw-r--r--mail/mailman/Makefile4
-rw-r--r--mail/milter-greylist/Makefile4
-rw-r--r--mail/postfix-current/Makefile4
-rw-r--r--mail/postfix/Makefile4
-rw-r--r--mail/postgrey/Makefile4
-rw-r--r--mail/sendmail/Makefile4
-rw-r--r--mail/sendmail812/Makefile4
-rw-r--r--mail/spamd/Makefile4
-rw-r--r--mail/sympa/Makefile4
-rw-r--r--mail/tmda/Makefile4
-rw-r--r--mk/install/bsd.pkginstall.mk42
-rw-r--r--net/bind9/Makefile4
-rw-r--r--net/hobbitmon/Makefile4
-rw-r--r--net/howl/Makefile4
-rw-r--r--net/ja-samba/Makefile4
-rw-r--r--net/mldonkey/Makefile4
-rw-r--r--net/netdisco/Makefile4
-rw-r--r--net/netsaint-base/Makefile.common6
-rw-r--r--net/openntpd/Makefile4
-rw-r--r--net/snort/Makefile.common4
-rw-r--r--net/vsftpd/Makefile4
-rw-r--r--news/inn/Makefile4
-rw-r--r--news/leafnode/Makefile4
-rw-r--r--parallel/sge/Makefile4
-rw-r--r--print/cups/Makefile4
-rw-r--r--security/amavisd-new/Makefile4
-rw-r--r--security/courier-authlib/Makefile.common4
-rw-r--r--security/dirmngr/Makefile4
-rw-r--r--security/openssh+gssapi/Makefile4
-rw-r--r--security/openssh/Makefile4
-rw-r--r--security/pflkm/Makefile4
-rw-r--r--security/sfs/Makefile4
-rw-r--r--sysutils/amanda-common/Makefile4
-rw-r--r--sysutils/dbus/Makefile4
-rw-r--r--sysutils/ups-nut/Makefile4
-rw-r--r--www/apache/Makefile4
-rw-r--r--www/apache2/Makefile4
-rw-r--r--www/privoxy/Makefile4
-rw-r--r--www/squid/Makefile4
-rw-r--r--www/tinyproxy/Makefile4
63 files changed, 148 insertions, 144 deletions
diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
index 73c37097dc0..0a9c55dc204 100644
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/11 21:44:53 tv Exp $
+# $NetBSD: Makefile,v 1.34 2005/08/23 11:48:47 rillig Exp $
#
DISTNAME= icecast-2.2.0
@@ -27,7 +27,7 @@ ICECAST_USER?= icecast
ICECAST_GROUP?= icecast
PKG_GROUPS= ${ICECAST_GROUP}
-PKG_USERS= ${ICECAST_USER}:${ICECAST_GROUP}::Icecast2\\ user
+PKG_USERS= ${ICECAST_USER}:${ICECAST_GROUP}::Icecast2\ user
EGDIR= ${PREFIX}/share/examples/icecast
CONF_FILES= ${EGDIR}/icecast.xml ${PKG_SYSCONFDIR}/icecast.xml
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}
diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index bcd937e27dc..8ec0442806a 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/08/17 11:43:27 tv Exp $
+# $NetBSD: Makefile,v 1.42 2005/08/23 11:48:47 rillig Exp $
#
DISTNAME= fidogate-4.4.10
@@ -21,7 +21,7 @@ EGDIR= ${PREFIX}/share/examples/fidogate
CONF_FILES= ${EGDIR}/fidogate.conf ${PKG_SYSCONFDIR}/fidogate/fidogate.conf
RCD_SCRIPTS= fidogate
-PKG_USERS= news:news::Network\\ News:/var/spool/news:${NOLOGIN}
+PKG_USERS= news:news::Network\ News:/var/spool/news:${NOLOGIN}
PKG_GROUPS= news
post-extract:
diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile
index 06951a1e6d5..2fa3092f88b 100644
--- a/databases/gnats/Makefile
+++ b/databases/gnats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/08/20 19:16:21 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/23 11:48:47 rillig Exp $
#
DISTNAME= gnats-4.0.1
@@ -23,7 +23,7 @@ INFO_FILES= gnats.info gnats-faq.info
CONFIGURE_ARGS= --with-lispdir=${PREFIX}/share/emacs/site-lisp
GNATS_HOME= ${PREFIX}/share/gnats/gnats-db
-PKG_USERS= gnats:daemon::GNATS\\ database\\ owner:${GNATS_HOME}:${SH}
+PKG_USERS= gnats:daemon::GNATS\ database\ owner:${GNATS_HOME}:${SH}
REQD_DIRS= ${PREFIX}/share/gnats
REQD_DIRS+= ${PREFIX}/libexec/gnats
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index c7ef60c4007..8b4c5505800 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2005/04/11 21:45:12 tv Exp $
+# $NetBSD: Makefile,v 1.65 2005/08/23 11:48:47 rillig Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
SVR4_PKGNAME= mysqs
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --with-pthreads
USE_PKGINSTALL= YES
DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
-PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\\ database\\ administrator:${MYSQL_DATADIR}:${SH}
+PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH}
PKG_GROUPS= ${MYSQL_GROUP}
RCD_SCRIPTS= mysqld
diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile
index 1b8e54ffda7..63ba96c1605 100644
--- a/databases/mysql4-server/Makefile
+++ b/databases/mysql4-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/29 21:02:35 xtraeme Exp $
+# $NetBSD: Makefile,v 1.21 2005/08/23 11:48:47 rillig Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
#PKGREVISION= 1
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --with-pthreads
USE_PKGINSTALL= YES
DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL
-PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\\ database\\ administrator:${MYSQL_DATADIR}:${SH}
+PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH}
PKG_GROUPS= ${MYSQL_GROUP}
RCD_SCRIPTS= mysqld
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 66b98d6533c..02f63d7aab5 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/15 18:27:48 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/23 11:48:47 rillig Exp $
PKGNAME= postgresql73-server-${BASE_VERS}
PKGREVISION= # empty
@@ -47,7 +47,7 @@ FILES_SUBST+= PGGROUP=${PGGROUP}
FILES_SUBST+= PGHOME=${PGHOME}
BUILD_DEFS= PGUSER PGGROUP PGHOME
-PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\\ database\\ administrator:${PGHOME}:${SH}
+PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH}
PKG_GROUPS= ${PGGROUP}
RCD_SCRIPTS= pgsql
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index c5c2f9c69bf..af72038639f 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/15 18:27:48 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/23 11:48:47 rillig Exp $
PKGNAME= postgresql74-server-${BASE_VERS}
PKGREVISION= # empty
@@ -47,7 +47,7 @@ FILES_SUBST+= PGGROUP=${PGGROUP}
FILES_SUBST+= PGHOME=${PGHOME}
BUILD_DEFS= PGUSER PGGROUP PGHOME
-PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\\ database\\ administrator:${PGHOME}:${SH}
+PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH}
PKG_GROUPS= ${PGGROUP}
RCD_SCRIPTS= pgsql
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 316fdea7470..94d93104d1a 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/08 23:09:43 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/23 11:48:47 rillig Exp $
PKGNAME= postgresql80-server-${BASE_VERS}
PKGREVISION= 2
@@ -62,7 +62,7 @@ FILES_SUBST+= PGGROUP=${PGGROUP}
FILES_SUBST+= PGHOME=${PGHOME}
BUILD_DEFS+= PGUSER PGGROUP PGHOME
-PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\\ database\\ administrator:${PGHOME}:${SH}
+PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH}
PKG_GROUPS= ${PGGROUP}
RCD_SCRIPTS= pgsql
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 56afd36ed27..28c089e252f 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/13 15:30:23 adam Exp $
+# $NetBSD: Makefile,v 1.24 2005/08/23 11:48:47 rillig Exp $
DISTNAME= distcc-2.18.3
CATEGORIES= devel
@@ -21,7 +21,7 @@ RCD_SCRIPTS= distccd
DISTCC_USER?= distcc
DISTCC_GROUP?= distcc
PKG_GROUPS= ${DISTCC_GROUP}
-PKG_USERS= ${DISTCC_USER}:${DISTCC_GROUP}::Distccd\\ user
+PKG_USERS= ${DISTCC_USER}:${DISTCC_GROUP}::Distccd\ user
DISTCC_PIDDIR?= ${VARBASE}/run/distccd
OWN_DIRS_PERMS= ${DISTCC_PIDDIR} ${DISTCC_USER} ${DISTCC_GROUP} 0750
diff --git a/devel/monotone-server/Makefile b/devel/monotone-server/Makefile
index 4e332962cd2..470bffba637 100644
--- a/devel/monotone-server/Makefile
+++ b/devel/monotone-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/08/13 11:19:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/23 11:48:47 rillig Exp $
#
DISTNAME= monotone-server-0.22
@@ -33,7 +33,7 @@ CONF_FILES_PERMS+= ${EXAMPLEDIR}/hooks.conf \
${PKG_SYSCONFDIR}/hooks.conf \
${MONOTONE_USER} ${MONOTONE_GROUP} 600
-PKG_USERS= ${MONOTONE_USER}:${MONOTONE_GROUP}::Monotone\\ dedicated\\ server:${VARBASE}/monotone:${SH}
+PKG_USERS= ${MONOTONE_USER}:${MONOTONE_GROUP}::Monotone\ dedicated\ server:${VARBASE}/monotone:${SH}
PKG_GROUPS= ${MONOTONE_GROUP}
SUBST_CLASSES+= vars
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile
index e0a3fd566a2..ef38fc162c8 100644
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:47 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/23 11:48:47 rillig Exp $
#
DISTNAME= p4d
@@ -19,7 +19,7 @@ FILES_SUBST+= P4LOG=${P4LOG:Q}
FILES_SUBST+= P4JOURNAL=${P4JOURNAL:Q}
PKG_GROUPS?= ${P4GROUP}
-PKG_USERS?= ${P4USER}:${P4GROUP}::Perforce\\ Server:${P4ROOT}
+PKG_USERS?= ${P4USER}:${P4GROUP}::Perforce\ Server:${P4ROOT}
OWN_DIRS_PERMS= ${P4ROOT} ${P4USER} ${P4GROUP} 750
diff --git a/inputmethod/canna-server/Makefile b/inputmethod/canna-server/Makefile
index 7ad48b4eef6..c99dd5dd218 100644
--- a/inputmethod/canna-server/Makefile
+++ b/inputmethod/canna-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:11 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/23 11:48:47 rillig Exp $
#
.include "../canna/Makefile.common"
@@ -18,7 +18,7 @@ MESSAGE_SUBST+= CANNA_USER="${CANNA_USER}"
MESSAGE_SUBST+= CANNA_GROUP="${CANNA_GROUP}"
PKG_GROUPS= ${CANNA_GROUP}
-PKG_USERS= ${CANNA_USER}:${CANNA_GROUP}::Canna\\ user
+PKG_USERS= ${CANNA_USER}:${CANNA_GROUP}::Canna\ user
OWN_DIRS_PERMS= ${CANNA_SPOOL} ${CANNA_USER} ${CANNA_GROUP} ${CANNA_MODE}
diff --git a/inputmethod/ja-freewnn-server-bin/Makefile b/inputmethod/ja-freewnn-server-bin/Makefile
index e874a7a3c77..ebb4c80830b 100644
--- a/inputmethod/ja-freewnn-server-bin/Makefile
+++ b/inputmethod/ja-freewnn-server-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/05 19:37:23 kei Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/23 11:48:48 rillig Exp $
#
PKGNAME= ja-FreeWnn-server-bin-1.10
@@ -28,7 +28,7 @@ FREEWNN_GROUP?= jserver
BUILD_DEFS+= FREEWNN_USER FREEWNN_GROUP
PKG_GROUPS= ${FREEWNN_GROUP}
-PKG_USERS= ${FREEWNN_USER}:${FREEWNN_GROUP}::Freewnn\\ user
+PKG_USERS= ${FREEWNN_USER}:${FREEWNN_GROUP}::Freewnn\ user
.include "../ja-freewnn-lib/buildlink3.mk"
.include "../ja-freewnn-lib/Makefile.common"
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}
diff --git a/mk/install/bsd.pkginstall.mk b/mk/install/bsd.pkginstall.mk
index d6bc1063eb1..75c763727c2 100644
--- a/mk/install/bsd.pkginstall.mk
+++ b/mk/install/bsd.pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.22 2005/08/23 10:00:50 rillig Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.23 2005/08/23 11:48:50 rillig Exp $
#
# This Makefile fragment is included by bsd.pkg.mk to use the common
# INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply:
@@ -99,10 +99,10 @@ FILES_SUBST+= PKG_INSTALLATION_TYPE=${PKG_INSTALLATION_TYPE}
#
# Only the user and group are required; everything else is optional,
# but the colons must be in the right places when specifying optional
-# bits. Note that if the description contains spaces, then spaces
-# should be double backslash-escaped, e.g.
+# bits. Note that if the description contains spaces, they must
+# be escaped as usual, e.g.
#
-# foo:foogrp::The\\ Foomister
+# foo:foogrp::The\ Foomister
#
# PKG_GROUPS represents the groups to create for the package. It is a
# space-separated list of elements of the form
@@ -118,6 +118,10 @@ _PKG_USER_SHELL?= ${NOLOGIN}
FILES_SUBST+= PKG_USER_HOME=${_PKG_USER_HOME}
FILES_SUBST+= PKG_USER_SHELL=${_PKG_USER_SHELL}
+.if !empty(PKG_USERS:M*\\\\*)
+PKG_FAIL_REASON+= "[bsd.pkginstall.mk] PKG_USERS must not contain double backslashes."
+.endif
+
# Interix is very Special in that users are groups cannot have the
# same name. Interix.mk tries to work around this by overriding
# some specific package defaults. If we get here and there's still a
@@ -159,12 +163,12 @@ ${INSTALL_USERGROUP_FILE}: ../../mk/install/usergroup
${ECHO} " \$${CAT} > ./+USERGROUP << 'EOF_USERGROUP'"; \
${SED} ${FILES_SUBST_SED} ../../mk/install/usergroup; \
${ECHO} ""; \
- eval set -- dummy ${PKG_GROUPS}; shift; \
+ set -- dummy ${PKG_GROUPS}; shift; \
while ${TEST} $$# -gt 0; do \
i="$$1"; shift; \
${ECHO} "# GROUP: $$i"; \
done; \
- eval set -- dummy ${PKG_USERS}; shift; \
+ set -- dummy ${PKG_USERS}; shift; \
while ${TEST} $$# -gt 0; do \
i="$$1"; shift; \
${ECHO} "# USER: $$i"; \
@@ -221,7 +225,7 @@ ${INSTALL_PERMS_FILE}: ../../mk/install/perms
${ECHO} " \$${CAT} > ./+PERMS << 'EOF_PERMS'"; \
${SED} ${FILES_SUBST_SED} ../../mk/install/perms; \
${ECHO} ""; \
- eval set -- dummy ${SPECIAL_PERMS}; shift; \
+ set -- dummy ${SPECIAL_PERMS}; shift; \
while ${TEST} $$# -gt 0; do \
file="$$1"; owner="$$2"; group="$$3"; mode="$$4"; \
shift; shift; shift; shift; \
@@ -303,7 +307,7 @@ ${INSTALL_FILES_FILE}: ../../mk/install/files
${SED} ${FILES_SUBST_SED} ../../mk/install/files; \
${ECHO} ""
${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
- eval set -- dummy ${RCD_SCRIPTS}; shift; \
+ set -- dummy ${RCD_SCRIPTS}; shift; \
exec 1>>${.TARGET}.tmp; \
while ${TEST} $$# -gt 0; do \
script="$$1"; shift; \
@@ -312,7 +316,7 @@ ${INSTALL_FILES_FILE}: ../../mk/install/files
${ECHO} "# FILE: $$file cr $$egfile ${RCD_SCRIPTS_MODE}"; \
done
${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
- eval set -- dummy ${CONF_FILES}; shift; \
+ set -- dummy ${CONF_FILES}; shift; \
exec 1>>${.TARGET}.tmp; \
while ${TEST} $$# -gt 0; do \
egfile="$$1"; file="$$2"; \
@@ -322,7 +326,7 @@ ${INSTALL_FILES_FILE}: ../../mk/install/files
${ECHO} "# FILE: $$file c $$egfile ${CONF_FILES_MODE}"; \
done
${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
- eval set -- dummy ${REQD_FILES}; shift; \
+ set -- dummy ${REQD_FILES}; shift; \
exec 1>>${.TARGET}.tmp; \
while ${TEST} $$# -gt 0; do \
egfile="$$1"; file="$$2"; \
@@ -332,7 +336,7 @@ ${INSTALL_FILES_FILE}: ../../mk/install/files
${ECHO} "# FILE: $$file cf $$egfile ${REQD_FILES_MODE}"; \
done
${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
- eval set -- dummy ${CONF_FILES_PERMS}; shift; \
+ set -- dummy ${CONF_FILES_PERMS}; shift; \
exec 1>>${.TARGET}.tmp; \
while ${TEST} $$# -gt 0; do \
egfile="$$1"; file="$$2"; \
@@ -343,7 +347,7 @@ ${INSTALL_FILES_FILE}: ../../mk/install/files
${ECHO} "# FILE: $$file c $$egfile $$mode $$owner $$group"; \
done
${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
- eval set -- dummy ${REQD_FILES_PERMS}; shift; \
+ set -- dummy ${REQD_FILES_PERMS}; shift; \
exec 1>>${.TARGET}.tmp; \
while ${TEST} $$# -gt 0; do \
egfile="$$1"; file="$$2"; \
@@ -430,19 +434,19 @@ ${INSTALL_DIRS_FILE}: ../../mk/install/dirs
esac
${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
exec 1>>${.TARGET}.tmp; \
- eval set -- dummy ${MAKE_DIRS}; shift; \
+ set -- dummy ${MAKE_DIRS}; shift; \
while ${TEST} $$# -gt 0; do \
dir="$$1"; shift; \
dir=`strip_prefix "$$dir"`; \
${ECHO} "# DIR: $$dir m"; \
done; \
- eval set -- dummy ${REQD_DIRS}; shift; \
+ set -- dummy ${REQD_DIRS}; shift; \
while ${TEST} $$# -gt 0; do \
dir="$$1"; shift; \
dir=`strip_prefix "$$dir"`; \
${ECHO} "# DIR: $$dir fm"; \
done; \
- eval set -- dummy ${OWN_DIRS}; shift; \
+ set -- dummy ${OWN_DIRS}; shift; \
while ${TEST} $$# -gt 0; do \
dir="$$1"; shift; \
dir=`strip_prefix "$$dir"`; \
@@ -450,21 +454,21 @@ ${INSTALL_DIRS_FILE}: ../../mk/install/dirs
done
${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \
exec 1>>${.TARGET}.tmp; \
- eval set -- dummy ${MAKE_DIRS_PERMS}; shift; \
+ set -- dummy ${MAKE_DIRS_PERMS}; shift; \
while ${TEST} $$# -gt 0; do \
dir="$$1"; owner="$$2"; group="$$3"; mode="$$4"; \
shift; shift; shift; shift; \
dir=`strip_prefix "$$dir"`; \
${ECHO} "# DIR: $$dir m $$owner $$group $$mode"; \
done; \
- eval set -- dummy ${REQD_DIRS_PERMS}; shift; \
+ set -- dummy ${REQD_DIRS_PERMS}; shift; \
while ${TEST} $$# -gt 0; do \
dir="$$1"; owner="$$2"; group="$$3"; mode="$$4"; \
shift; shift; shift; shift; \
dir=`strip_prefix "$$dir"`; \
${ECHO} "# DIR: $$dir fm $$owner $$group $$mode"; \
done; \
- eval set -- dummy ${OWN_DIRS_PERMS}; shift; \
+ set -- dummy ${OWN_DIRS_PERMS}; shift; \
while ${TEST} $$# -gt 0; do \
dir="$$1"; owner="$$2"; group="$$3"; mode="$$4"; \
shift; shift; shift; shift; \
@@ -511,7 +515,7 @@ ${INSTALL_SHELL_FILE}: ../../mk/install/shell
${ECHO} " \$${CAT} > ./+SHELL << 'EOF_SHELL'"; \
${SED} ${FILES_SUBST_SED} ../../mk/install/shell; \
${ECHO} ""; \
- eval set -- dummy ${PKG_SHELL}; shift; \
+ set -- dummy ${PKG_SHELL}; shift; \
while ${TEST} $$# -gt 0; do \
shell="$$1"; shift; \
shell=`strip_prefix "$$shell"`; \
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
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 70cbe44f1fd..8c695005bfe 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2005/08/06 06:19:29 jlam Exp $
+# $NetBSD: Makefile,v 1.70 2005/08/23 11:48:50 rillig Exp $
DISTNAME= inn-2.4.1
PKGREVISION= 7
@@ -43,7 +43,7 @@ CONFIGURE_ENV+= _PATH_SORT="${TOOLS_SORT}"
CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD:Q}
USE_TOOLS+= awk egrep gzip perl:run sed sh sort yacc
-PKG_USERS= ${INN_USER}:${INN_GROUP}::Internet\\ News:${INN_DATA_DIR}:${SH}
+PKG_USERS= ${INN_USER}:${INN_GROUP}::Internet\ News:${INN_DATA_DIR}:${SH}
PKG_GROUPS= ${INN_GROUP}
PKG_SYSCONFDIR.inn= ${INN_DATA_DIR}/etc
diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index ef5b6e61c9e..18e6663c85e 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/06/09 18:21:23 salo Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/23 11:48:50 rillig Exp $
DISTNAME= leafnode-1.11.3.rel
PKGNAME= ${DISTNAME:S/.rel//}
@@ -24,7 +24,7 @@ LEAFNODE_CONFDIR?= ${PKG_SYSCONFDIR}/leafnode
# Default data dir, login and group are the same as used by inn
#
BUILD_DEFS+= LEAFNODE_DATA_DIR LEAFNODE_GROUP LEAFNODE_USER
-PKG_USERS= ${LEAFNODE_USER}:${LEAFNODE_GROUP}::Internet\\ News:${LEAFNODE_DATA_DIR}:${SH}
+PKG_USERS= ${LEAFNODE_USER}:${LEAFNODE_GROUP}::Internet\ News:${LEAFNODE_DATA_DIR}:${SH}
PKG_GROUPS= ${LEAFNODE_GROUP}
LEAFNODE_HOME?= ${INN_DATA_DIR}
diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile
index ce68e0a93bf..4fa91751586 100644
--- a/parallel/sge/Makefile
+++ b/parallel/sge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:17 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/23 11:48:50 rillig Exp $
#
DISTNAME= sge-5.3p6
@@ -27,7 +27,7 @@ USE_PKGINSTALL= YES
SGE_USER?= sgeadmin
SGE_GROUP?= sgeadmin
PKG_GROUPS= ${SGE_GROUP}
-PKG_USERS= ${SGE_USER}:${SGE_GROUP}::Sun\\ Grid\\ Engine\\ Administrator
+PKG_USERS= ${SGE_USER}:${SGE_GROUP}::Sun\ Grid\ Engine\ Administrator
EVAL_PREFIX+= PKGSRC_SSL_PREFIX=openssl
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 30052c1037d..dff316cf701 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2005/08/19 18:12:38 jlam Exp $
+# $NetBSD: Makefile,v 1.97 2005/08/23 11:48:50 rillig Exp $
#
# The CUPS author is very good about taking back changes into the main
# CUPS distribution. The correct place to send patches or bug-fixes is:
@@ -87,7 +87,7 @@ CUPS_LOGDIR= /var/log/cups
CUPS_REQUESTS= /var/spool/cups
PKG_GROUPS= ${CUPS_GROUP}
-PKG_USERS= ${CUPS_USER}:${CUPS_GROUP}::Common\\ UNIX\\ Printing\\ System\\ user::${SH}
+PKG_USERS= ${CUPS_USER}:${CUPS_GROUP}::Common\\ UNIX\ Printing\ System\ user::${SH}
SPECIAL_PERMS= ${PREFIX}/bin/lppasswd ${CUPS_USER} ${CUPS_GROUP} 4755
CONF_FILES= ${EGDIR}/client.conf ${CUPS_CONFDIR}/client.conf
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
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index 9e703761bc6..a9e3be35d9f 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/08/02 09:26:06 seb Exp $
+# $NetBSD: Makefile,v 1.36 2005/08/23 11:48:51 rillig Exp $
PKGNAME= amanda-common-${VERS}
PKGREVISION= 2
@@ -28,7 +28,7 @@ CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
PKG_GROUPS= ${AMANDA_GROUP}
-PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP}::Amanda\\ user::${SH}
+PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP}::Amanda\ user::${SH}
OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0700
OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0700
diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index d93b913088f..4fac22e0a39 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2005/07/12 04:15:50 grant Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/23 11:48:51 rillig Exp $
#
.include "Makefile.common"
-PKG_USERS= messagebus:messagebus::System\\ message\\ bus:${VARBASE}/run/dbus:${NOLOGIN}
+PKG_USERS= messagebus:messagebus::System\ message\ bus:${VARBASE}/run/dbus:${NOLOGIN}
PKG_GROUPS= messagebus
MAKE_DIRS= ${PKG_SYSCONFDIR}/event.d
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index 37a9f5fd474..0bf986b6399 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/05/21 01:44:57 lukem Exp $
+# $NetBSD: Makefile,v 1.36 2005/08/23 11:48:51 rillig Exp $
#
DISTNAME= nut-2.0.1
@@ -41,7 +41,7 @@ MESSAGE_SUBST+= NUT_EGDIR=${NUT_EGDIR}
MESSAGE_SUBST+= NUT_DOCDIR=${NUT_DOCDIR}
PKG_GROUPS= ${NUT_GROUP}
-PKG_USERS= ${NUT_USER}:${NUT_GROUP}::Network\\ UPS\\ Tools::${SH}
+PKG_USERS= ${NUT_USER}:${NUT_GROUP}::Network\ UPS\ Tools::${SH}
CONF_FILES= ${NUT_EGDIR}/ups.conf.sample ${NUT_CONFDIR}/ups.conf
CONF_FILES+= ${NUT_EGDIR}/upssched.conf.sample \
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}"