From 5ac76d39cea82e53c6f60dc8fa0b8d88de7097a7 Mon Sep 17 00:00:00 2001
From: "Philip M. Gollucci" <pgollucci@FreeBSD.org>
Date: Thu, 6 May 2010 23:10:20 +0000
Subject: - Regenerate patch files with make makepatch for they have   piled up
 and additional patches conflict.   This also will help when we try to
 syncronize www/apache20&www/apache22

With Hat:   apache@
---
 .../files/patch-docs:conf:httpd-std.conf.in        | 127 ---------------------
 1 file changed, 127 deletions(-)
 delete mode 100644 www/apache20/files/patch-docs:conf:httpd-std.conf.in

(limited to 'www/apache20/files/patch-docs:conf:httpd-std.conf.in')

diff --git a/www/apache20/files/patch-docs:conf:httpd-std.conf.in b/www/apache20/files/patch-docs:conf:httpd-std.conf.in
deleted file mode 100644
index 7a09e89ea821..000000000000
--- a/www/apache20/files/patch-docs:conf:httpd-std.conf.in
+++ /dev/null
@@ -1,127 +0,0 @@
---- docs/conf/httpd-std.conf.in.orig	Mon Aug 16 01:43:56 2004
-+++ docs/conf/httpd-std.conf.in	Sun Dec 12 12:34:08 2004
-@@ -68,7 +68,7 @@
- #
- <IfModule !mpm_netware.c>
- <IfModule !perchild.c>
--#ScoreBoardFile @rel_logfiledir@/apache_runtime_status
-+#ScoreBoardFile @rel_runtimedir@/apache_runtime_status
- </IfModule>
- </IfModule>
- 
-@@ -265,8 +265,8 @@
- #  when the value of (unsigned)Group is above 60000; 
- #  don't use Group #-1 on these systems!
- #
--User nobody
--Group #-1
-+User %%WWWOWN%%
-+Group %%WWWGRP%%
- </IfModule>
- </IfModule>
- 
-@@ -314,10 +314,11 @@
- #
- # First, we configure the "default" to be a very restrictive set of 
- # features.  
--#
-+# 
- <Directory />
--    Options FollowSymLinks
-     AllowOverride None
-+    Order Deny,Allow
-+    Deny from all 
- </Directory>
- 
- #
-@@ -330,7 +331,7 @@
- #
- # This should be changed to whatever you set DocumentRoot to.
- #
--<Directory "@exp_htdocsdir@">
-+<Directory "%%WWWBASEDIR%%">
- 
- #
- # Possible values for the Options directive are "None", "All",
-@@ -365,24 +366,29 @@
- # UserDir: The name of the directory that is appended onto a user's home
- # directory if a ~user request is received.
- #
-+<IfModule mod_userdir.c>
- UserDir public_html
- 
-+UserDir disabled %%FTPUSERS%%
-+
- #
- # Control access to UserDir directories.  The following is an example
- # for a site where these directories are restricted to read-only.
- #
--#<Directory /home/*/public_html>
--#    AllowOverride FileInfo AuthConfig Limit Indexes
--#    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
--#    <Limit GET POST OPTIONS PROPFIND>
--#        Order allow,deny
--#        Allow from all
--#    </Limit>
--#    <LimitExcept GET POST OPTIONS PROPFIND>
--#        Order deny,allow
--#        Deny from all
--#    </LimitExcept>
--#</Directory>
-+<Directory /home/*/public_html>
-+    AllowOverride FileInfo AuthConfig Limit Indexes
-+    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-+    <Limit GET POST OPTIONS PROPFIND>
-+        Order allow,deny
-+        Allow from all
-+    </Limit>
-+    <LimitExcept GET POST OPTIONS PROPFIND>
-+        Order deny,allow
-+        Deny from all
-+    </LimitExcept>
-+</Directory>
-+
-+</IfModule>
- 
- #
- # DirectoryIndex: sets the file that Apache will serve if a directory
-@@ -472,7 +478,7 @@
- # logged here.  If you *do* define an error logfile for a <VirtualHost>
- # container, that host's errors will be logged there and not here.
- #
--ErrorLog @rel_logfiledir@/error_log
-+ErrorLog @rel_logfiledir@/httpd-error.log
- 
- #
- # LogLevel: Control the number of messages logged to the error_log.
-@@ -500,20 +506,20 @@
- # define per-<VirtualHost> access logfiles, transactions will be
- # logged therein and *not* in this file.
- #
--CustomLog @rel_logfiledir@/access_log common
-+#CustomLog @rel_logfiledir@/httpd-access.log common
- 
- #
- # If you would like to have agent and referer logfiles, uncomment the
- # following directives.
- #
--#CustomLog @rel_logfiledir@/referer_log referer
--#CustomLog @rel_logfiledir@/agent_log agent
-+#CustomLog @rel_logfiledir@/httpd-referer.log referer
-+#CustomLog @rel_logfiledir@/httpd-agent.log agent
- 
- #
- # If you prefer a single logfile with access, agent, and referer information
- # (Combined Logfile Format) you can use the following directive.
- #
--#CustomLog @rel_logfiledir@/access_log combined
-+CustomLog @rel_logfiledir@/httpd-access.log combined
- 
- #
- # ServerTokens
-@@ -1043,3 +1049,5 @@
- #    ErrorLog @rel_logfiledir@/dummy-host.example.com-error_log
- #    CustomLog @rel_logfiledir@/dummy-host.example.com-access_log common
- #</VirtualHost>
-+
-+Include @rel_sysconfdir@/Includes/*.conf
-- 
cgit v1.2.3