From 4ed2a2bb858a59e565ca3153a209d60124e0f686 Mon Sep 17 00:00:00 2001
From: clement <clement@FreeBSD.org>
Date: Wed, 13 Oct 2004 14:03:06 +0000
Subject: - Use ${WWWOWN} and ${WWWGRP} for apache's user. (instead of harcoded
   www/www).   It should help to keep consistancy in www-related ports.

---
 www/apache20/Makefile                                | 4 +++-
 www/apache20/files/patch-docs:conf:httpd-std.conf.in | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'www/apache20')

diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index ecaad59fbe21..4b21f69232c1 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -224,7 +224,9 @@ pre-configure:
 
 post-configure:
 	@FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\
-	${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$$FTPUSERS," \
+	${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$$FTPUSERS, ; \
+			s,%%WWWOWN%%,${WWWOWN}, ; \
+			s,%%WWWGRP%%,${WWWGRP}, " \
 			${WRKSRC}/docs/conf/httpd-std.conf
 
 pre-install:
diff --git a/www/apache20/files/patch-docs:conf:httpd-std.conf.in b/www/apache20/files/patch-docs:conf:httpd-std.conf.in
index 12128e97a5a1..16abb83030ba 100644
--- a/www/apache20/files/patch-docs:conf:httpd-std.conf.in
+++ b/www/apache20/files/patch-docs:conf:httpd-std.conf.in
@@ -15,8 +15,8 @@
  #
 -User nobody
 -Group #-1
-+User www
-+Group www
++User %%WWWOWN%%
++Group %%WWWGRP%%
  </IfModule>
  </IfModule>
  
-- 
cgit