diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache/Makefile | 4 | ||||
| -rw-r--r-- | www/apache2/Makefile | 4 | ||||
| -rw-r--r-- | www/privoxy/Makefile | 4 | ||||
| -rw-r--r-- | www/squid/Makefile | 7 | ||||
| -rw-r--r-- | www/tinyproxy/Makefile | 4 | ||||
| -rw-r--r-- | www/zope3/Makefile | 4 |
6 files changed, 16 insertions, 11 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 68a13e13149..defb9c1d94a 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.184 2006/03/04 21:30:57 jlam Exp $ +# $NetBSD: Makefile,v 1.185 2006/04/23 00:12:42 jlam 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). @@ -165,7 +165,7 @@ SUBST_SED.paths+= -e 's,@VARBASE@,${VARBASE},g' SUBST_STAGE.paths= post-patch PKG_GROUPS= ${APACHE_GROUP} -PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}::Apache\ user +PKG_USERS= ${APACHE_USER}:${APACHE_GROUP} MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q} XARGS=${XARGS:Q} MAKE_ENV+= FIND=${FIND:Q} CHGRP=${CHGRP:Q} diff --git a/www/apache2/Makefile b/www/apache2/Makefile index a375a408677..fa6ad497682 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.97 2006/04/22 09:22:16 rillig Exp $ +# $NetBSD: Makefile,v 1.98 2006/04/23 00:12:42 jlam Exp $ .include "Makefile.common" @@ -67,7 +67,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} PKG_SYSCONFVAR= apache PKG_SYSCONFSUBDIR?= httpd diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile index 0adff984f81..927f9fb01b0 100644 --- a/www/privoxy/Makefile +++ b/www/privoxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:34 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2006/04/23 00:12:42 jlam Exp $ # DISTNAME= ${PKGNAME_NOREV}-stable-src @@ -21,7 +21,7 @@ PKG_SYSCONFSUBDIR?= privoxy RCD_SCRIPTS= privoxy PKG_GROUPS= ${PRIVOXY_GROUP} -PKG_USERS= ${PRIVOXY_USER}:${PRIVOXY_GROUP}::Privoxy\ user +PKG_USERS= ${PRIVOXY_USER}:${PRIVOXY_GROUP} EGDIR= ${PREFIX}/share/examples/privoxy diff --git a/www/squid/Makefile b/www/squid/Makefile index c4fd3c756a4..3ecd9297e3d 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.174 2006/03/12 12:12:19 taca Exp $ +# $NetBSD: Makefile,v 1.175 2006/04/23 00:12:42 jlam Exp $ DISTNAME= squid-2.5.STABLE13 PKGNAME= squid-2.5.13 @@ -36,7 +36,10 @@ 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} + +PKG_GECOS.${SQUID_USER}= 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 75e50529b3b..96ff2ea6f36 100644 --- a/www/tinyproxy/Makefile +++ b/www/tinyproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/03/04 21:31:04 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2006/04/23 00:12:42 jlam Exp $ # DISTNAME= tinyproxy-1.6.2 @@ -18,7 +18,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} FILES_SUBST+= TINYPROXY_USER=${TINYPROXY_USER:Q} FILES_SUBST+= TINYPROXY_GROUP=${TINYPROXY_GROUP:Q} diff --git a/www/zope3/Makefile b/www/zope3/Makefile index c5a4ccbc78b..dbc7f112062 100644 --- a/www/zope3/Makefile +++ b/www/zope3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/02/05 23:11:30 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/04/23 00:12:42 jlam Exp $ # DISTNAME= Zope-3.2.0 @@ -32,6 +32,8 @@ RCD_SCRIPTS= zope3 zss3 PKG_GROUPS= ${ZOPE3_GROUP} PKG_USERS= ${ZOPE3_USER}:${ZOPE3_GROUP}::Zope3\ user +PKG_GECOS.${ZOPE3_USER}= Zope3 user + MESSAGE_SUBST+= ZOPE3_USER=${ZOPE3_USER:Q} \ ZOPE3_GROUP=${ZOPE3_GROUP:Q} \ VARBASE=${VARBASE:Q} |