Split /usr/local/etc/apache/* in more reasonable way

Warning: SSL part not updated completely

14 files changed, 47 insertions, 277 deletions

diff --git a/www/apache13-ssl/pkg-plist b/www/apache13-ssl/pkg-plist
index 0a00eaf51a6c..268b466f9f89 100644
--- a/www/apache13-ssl/pkg-plist
+++ b/www/apache13-ssl/pkg-plist
@@ -1,12 +1,12 @@
 etc/rc.d/apache.sh
-@exec mkdir %D/etc/apache/logs %D/www/cgi-bin %D/www/data
+@exec mkdir %D/www/cgi-bin %D/www/data
 @unexec rm %D/etc/rc.d/apache.sh
-etc/apache/conf/httpd.conf
-etc/apache/conf/httpd.conf-SSL
-etc/apache/conf/srm.conf
-etc/apache/conf/access.conf
-etc/apache/conf/mime.types
-etc/apache/conf/mime.types-SSL
+etc/apache/httpd.conf
+etc/apache/httpd.conf-SSL
+etc/apache/srm.conf
+etc/apache/access.conf
+etc/apache/mime.types
+etc/apache/mime.types-SSL
 sbin/httpsd
 www/icons/README
 www/icons/a.gif
diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab
index e353e501c8dc..6ad43dec5264 100644
--- a/www/apache13/files/patch-ab
+++ b/www/apache13/files/patch-ab
@@ -34,52 +34,6 @@
   AllowOverride None
   Options None
   </Directory>
-*** conf/httpd.conf-dist.orig	Sat Jun  8 00:56:47 1996
---- conf/httpd.conf-dist	Fri Jul  5 06:25:42 1996
-***************
-*** 33,44 ****
-  # ServerAdmin: Your address, where problems with the server should be
-  # e-mailed.
-  
-! ServerAdmin you@your.address
-  
-  # ServerRoot: The directory the server's config, error, and log files
-  # are kept in
-  
-! ServerRoot /usr/local/etc/httpd
-  
-  # BindAddress: You can support virtual hosts with this option. This option
-  # is used to tell the server which IP address to listen to. It can either
---- 33,44 ----
-  # ServerAdmin: Your address, where problems with the server should be
-  # e-mailed.
-  
-! ServerAdmin you@your.address.domain
-  
-  # ServerRoot: The directory the server's config, error, and log files
-  # are kept in
-  
-! ServerRoot /usr/local/etc/apache
-  
-  # BindAddress: You can support virtual hosts with this option. This option
-  # is used to tell the server which IP address to listen to. It can either
-***************
-*** 161,167 ****
-   
-  #<VirtualHost host.foo.com>
-  #ServerAdmin webmaster@host.foo.com
-! #DocumentRoot /www/docs/host.foo.com
-  #ServerName host.foo.com
-  #ErrorLog logs/host.foo.com-error_log
-  #TransferLog logs/host.foo.com-access_log
---- 161,167 ----
-   
-  #<VirtualHost host.foo.com>
-  #ServerAdmin webmaster@host.foo.com
-! #DocumentRoot /usr/local/www/host.foo.com/data
-  #ServerName host.foo.com
-  #ErrorLog logs/host.foo.com-error_log
-  #TransferLog logs/host.foo.com-access_log
 *** conf/srm.conf-dist.orig	Thu Jun 13 06:04:43 1996
 --- conf/srm.conf-dist	Fri Jul  5 06:37:24 1996
 ***************
diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist
index d8a356236faf..24858158998a 100644
--- a/www/apache13/pkg-plist
+++ b/www/apache13/pkg-plist
@@ -1,10 +1,10 @@
 etc/rc.d/apache.sh
-@exec mkdir %D/etc/apache/logs %D/www/cgi-bin %D/www/data
+@exec mkdir %D/www/cgi-bin %D/www/data
 @unexec rm %D/etc/rc.d/apache.sh
-etc/apache/conf/httpd.conf
-etc/apache/conf/srm.conf
-etc/apache/conf/access.conf
-etc/apache/conf/mime.types
+etc/apache/httpd.conf
+etc/apache/srm.conf
+etc/apache/access.conf
+etc/apache/mime.types
 sbin/httpd
 www/icons/README
 www/icons/a.gif
diff --git a/www/apache2/files/patch-ab b/www/apache2/files/patch-ab
index e353e501c8dc..6ad43dec5264 100644
--- a/www/apache2/files/patch-ab
+++ b/www/apache2/files/patch-ab
@@ -34,52 +34,6 @@
   AllowOverride None
   Options None
   </Directory>
-*** conf/httpd.conf-dist.orig	Sat Jun  8 00:56:47 1996
---- conf/httpd.conf-dist	Fri Jul  5 06:25:42 1996
-***************
-*** 33,44 ****
-  # ServerAdmin: Your address, where problems with the server should be
-  # e-mailed.
-  
-! ServerAdmin you@your.address
-  
-  # ServerRoot: The directory the server's config, error, and log files
-  # are kept in
-  
-! ServerRoot /usr/local/etc/httpd
-  
-  # BindAddress: You can support virtual hosts with this option. This option
-  # is used to tell the server which IP address to listen to. It can either
---- 33,44 ----
-  # ServerAdmin: Your address, where problems with the server should be
-  # e-mailed.
-  
-! ServerAdmin you@your.address.domain
-  
-  # ServerRoot: The directory the server's config, error, and log files
-  # are kept in
-  
-! ServerRoot /usr/local/etc/apache
-  
-  # BindAddress: You can support virtual hosts with this option. This option
-  # is used to tell the server which IP address to listen to. It can either
-***************
-*** 161,167 ****
-   
-  #<VirtualHost host.foo.com>
-  #ServerAdmin webmaster@host.foo.com
-! #DocumentRoot /www/docs/host.foo.com
-  #ServerName host.foo.com
-  #ErrorLog logs/host.foo.com-error_log
-  #TransferLog logs/host.foo.com-access_log
---- 161,167 ----
-   
-  #<VirtualHost host.foo.com>
-  #ServerAdmin webmaster@host.foo.com
-! #DocumentRoot /usr/local/www/host.foo.com/data
-  #ServerName host.foo.com
-  #ErrorLog logs/host.foo.com-error_log
-  #TransferLog logs/host.foo.com-access_log
 *** conf/srm.conf-dist.orig	Thu Jun 13 06:04:43 1996
 --- conf/srm.conf-dist	Fri Jul  5 06:37:24 1996
 ***************
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index d8a356236faf..24858158998a 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -1,10 +1,10 @@
 etc/rc.d/apache.sh
-@exec mkdir %D/etc/apache/logs %D/www/cgi-bin %D/www/data
+@exec mkdir %D/www/cgi-bin %D/www/data
 @unexec rm %D/etc/rc.d/apache.sh
-etc/apache/conf/httpd.conf
-etc/apache/conf/srm.conf
-etc/apache/conf/access.conf
-etc/apache/conf/mime.types
+etc/apache/httpd.conf
+etc/apache/srm.conf
+etc/apache/access.conf
+etc/apache/mime.types
 sbin/httpd
 www/icons/README
 www/icons/a.gif
diff --git a/www/apache20/files/patch-ab b/www/apache20/files/patch-ab
index e353e501c8dc..6ad43dec5264 100644
--- a/www/apache20/files/patch-ab
+++ b/www/apache20/files/patch-ab
@@ -34,52 +34,6 @@
   AllowOverride None
   Options None
   </Directory>
-*** conf/httpd.conf-dist.orig	Sat Jun  8 00:56:47 1996
---- conf/httpd.conf-dist	Fri Jul  5 06:25:42 1996
-***************
-*** 33,44 ****
-  # ServerAdmin: Your address, where problems with the server should be
-  # e-mailed.
-  
-! ServerAdmin you@your.address
-  
-  # ServerRoot: The directory the server's config, error, and log files
-  # are kept in
-  
-! ServerRoot /usr/local/etc/httpd
-  
-  # BindAddress: You can support virtual hosts with this option. This option
-  # is used to tell the server which IP address to listen to. It can either
---- 33,44 ----
-  # ServerAdmin: Your address, where problems with the server should be
-  # e-mailed.
-  
-! ServerAdmin you@your.address.domain
-  
-  # ServerRoot: The directory the server's config, error, and log files
-  # are kept in
-  
-! ServerRoot /usr/local/etc/apache
-  
-  # BindAddress: You can support virtual hosts with this option. This option
-  # is used to tell the server which IP address to listen to. It can either
-***************
-*** 161,167 ****
-   
-  #<VirtualHost host.foo.com>
-  #ServerAdmin webmaster@host.foo.com
-! #DocumentRoot /www/docs/host.foo.com
-  #ServerName host.foo.com
-  #ErrorLog logs/host.foo.com-error_log
-  #TransferLog logs/host.foo.com-access_log
---- 161,167 ----
-   
-  #<VirtualHost host.foo.com>
-  #ServerAdmin webmaster@host.foo.com
-! #DocumentRoot /usr/local/www/host.foo.com/data
-  #ServerName host.foo.com
-  #ErrorLog logs/host.foo.com-error_log
-  #TransferLog logs/host.foo.com-access_log
 *** conf/srm.conf-dist.orig	Thu Jun 13 06:04:43 1996
 --- conf/srm.conf-dist	Fri Jul  5 06:37:24 1996
 ***************
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index d8a356236faf..24858158998a 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -1,10 +1,10 @@
 etc/rc.d/apache.sh
-@exec mkdir %D/etc/apache/logs %D/www/cgi-bin %D/www/data
+@exec mkdir %D/www/cgi-bin %D/www/data
 @unexec rm %D/etc/rc.d/apache.sh
-etc/apache/conf/httpd.conf
-etc/apache/conf/srm.conf
-etc/apache/conf/access.conf
-etc/apache/conf/mime.types
+etc/apache/httpd.conf
+etc/apache/srm.conf
+etc/apache/access.conf
+etc/apache/mime.types
 sbin/httpd
 www/icons/README
 www/icons/a.gif
diff --git a/www/apache21/files/patch-ab b/www/apache21/files/patch-ab
index e353e501c8dc..6ad43dec5264 100644
--- a/www/apache21/files/patch-ab
+++ b/www/apache21/files/patch-ab
@@ -34,52 +34,6 @@
   AllowOverride None
   Options None
   </Directory>
-*** conf/httpd.conf-dist.orig	Sat Jun  8 00:56:47 1996
---- conf/httpd.conf-dist	Fri Jul  5 06:25:42 1996
-***************
-*** 33,44 ****
-  # ServerAdmin: Your address, where problems with the server should be
-  # e-mailed.
-  
-! ServerAdmin you@your.address
-  
-  # ServerRoot: The directory the server's config, error, and log files
-  # are kept in
-  
-! ServerRoot /usr/local/etc/httpd
-  
-  # BindAddress: You can support virtual hosts with this option. This option
-  # is used to tell the server which IP address to listen to. It can either
---- 33,44 ----
-  # ServerAdmin: Your address, where problems with the server should be
-  # e-mailed.
-  
-! ServerAdmin you@your.address.domain
-  
-  # ServerRoot: The directory the server's config, error, and log files
-  # are kept in
-  
-! ServerRoot /usr/local/etc/apache
-  
-  # BindAddress: You can support virtual hosts with this option. This option
-  # is used to tell the server which IP address to listen to. It can either
-***************
-*** 161,167 ****
-   
-  #<VirtualHost host.foo.com>
-  #ServerAdmin webmaster@host.foo.com
-! #DocumentRoot /www/docs/host.foo.com
-  #ServerName host.foo.com
-  #ErrorLog logs/host.foo.com-error_log
-  #TransferLog logs/host.foo.com-access_log
---- 161,167 ----
-   
-  #<VirtualHost host.foo.com>
-  #ServerAdmin webmaster@host.foo.com
-! #DocumentRoot /usr/local/www/host.foo.com/data
-  #ServerName host.foo.com
-  #ErrorLog logs/host.foo.com-error_log
-  #TransferLog logs/host.foo.com-access_log
 *** conf/srm.conf-dist.orig	Thu Jun 13 06:04:43 1996
 --- conf/srm.conf-dist	Fri Jul  5 06:37:24 1996
 ***************
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index d8a356236faf..24858158998a 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -1,10 +1,10 @@
 etc/rc.d/apache.sh
-@exec mkdir %D/etc/apache/logs %D/www/cgi-bin %D/www/data
+@exec mkdir %D/www/cgi-bin %D/www/data
 @unexec rm %D/etc/rc.d/apache.sh
-etc/apache/conf/httpd.conf
-etc/apache/conf/srm.conf
-etc/apache/conf/access.conf
-etc/apache/conf/mime.types
+etc/apache/httpd.conf
+etc/apache/srm.conf
+etc/apache/access.conf
+etc/apache/mime.types
 sbin/httpd
 www/icons/README
 www/icons/a.gif
diff --git a/www/apache22/files/patch-ab b/www/apache22/files/patch-ab
index e353e501c8dc..6ad43dec5264 100644
--- a/www/apache22/files/patch-ab
+++ b/www/apache22/files/patch-ab
@@ -34,52 +34,6 @@
   AllowOverride None
   Options None
   </Directory>
-*** conf/httpd.conf-dist.orig	Sat Jun  8 00:56:47 1996
---- conf/httpd.conf-dist	Fri Jul  5 06:25:42 1996
-***************
-*** 33,44 ****
-  # ServerAdmin: Your address, where problems with the server should be
-  # e-mailed.
-  
-! ServerAdmin you@your.address
-  
-  # ServerRoot: The directory the server's config, error, and log files
-  # are kept in
-  
-! ServerRoot /usr/local/etc/httpd
-  
-  # BindAddress: You can support virtual hosts with this option. This option
-  # is used to tell the server which IP address to listen to. It can either
---- 33,44 ----
-  # ServerAdmin: Your address, where problems with the server should be
-  # e-mailed.
-  
-! ServerAdmin you@your.address.domain
-  
-  # ServerRoot: The directory the server's config, error, and log files
-  # are kept in
-  
-! ServerRoot /usr/local/etc/apache
-  
-  # BindAddress: You can support virtual hosts with this option. This option
-  # is used to tell the server which IP address to listen to. It can either
-***************
-*** 161,167 ****
-   
-  #<VirtualHost host.foo.com>
-  #ServerAdmin webmaster@host.foo.com
-! #DocumentRoot /www/docs/host.foo.com
-  #ServerName host.foo.com
-  #ErrorLog logs/host.foo.com-error_log
-  #TransferLog logs/host.foo.com-access_log
---- 161,167 ----
-   
-  #<VirtualHost host.foo.com>
-  #ServerAdmin webmaster@host.foo.com
-! #DocumentRoot /usr/local/www/host.foo.com/data
-  #ServerName host.foo.com
-  #ErrorLog logs/host.foo.com-error_log
-  #TransferLog logs/host.foo.com-access_log
 *** conf/srm.conf-dist.orig	Thu Jun 13 06:04:43 1996
 --- conf/srm.conf-dist	Fri Jul  5 06:37:24 1996
 ***************
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index d8a356236faf..24858158998a 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -1,10 +1,10 @@
 etc/rc.d/apache.sh
-@exec mkdir %D/etc/apache/logs %D/www/cgi-bin %D/www/data
+@exec mkdir %D/www/cgi-bin %D/www/data
 @unexec rm %D/etc/rc.d/apache.sh
-etc/apache/conf/httpd.conf
-etc/apache/conf/srm.conf
-etc/apache/conf/access.conf
-etc/apache/conf/mime.types
+etc/apache/httpd.conf
+etc/apache/srm.conf
+etc/apache/access.conf
+etc/apache/mime.types
 sbin/httpd
 www/icons/README
 www/icons/a.gif
diff --git a/www/mod_php3/pkg-plist b/www/mod_php3/pkg-plist
index d8a356236faf..24858158998a 100644
--- a/www/mod_php3/pkg-plist
+++ b/www/mod_php3/pkg-plist
@@ -1,10 +1,10 @@
 etc/rc.d/apache.sh
-@exec mkdir %D/etc/apache/logs %D/www/cgi-bin %D/www/data
+@exec mkdir %D/www/cgi-bin %D/www/data
 @unexec rm %D/etc/rc.d/apache.sh
-etc/apache/conf/httpd.conf
-etc/apache/conf/srm.conf
-etc/apache/conf/access.conf
-etc/apache/conf/mime.types
+etc/apache/httpd.conf
+etc/apache/srm.conf
+etc/apache/access.conf
+etc/apache/mime.types
 sbin/httpd
 www/icons/README
 www/icons/a.gif
diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist
index d8a356236faf..24858158998a 100644
--- a/www/mod_php4/pkg-plist
+++ b/www/mod_php4/pkg-plist
@@ -1,10 +1,10 @@
 etc/rc.d/apache.sh
-@exec mkdir %D/etc/apache/logs %D/www/cgi-bin %D/www/data
+@exec mkdir %D/www/cgi-bin %D/www/data
 @unexec rm %D/etc/rc.d/apache.sh
-etc/apache/conf/httpd.conf
-etc/apache/conf/srm.conf
-etc/apache/conf/access.conf
-etc/apache/conf/mime.types
+etc/apache/httpd.conf
+etc/apache/srm.conf
+etc/apache/access.conf
+etc/apache/mime.types
 sbin/httpd
 www/icons/README
 www/icons/a.gif
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
index d8a356236faf..24858158998a 100644
--- a/www/mod_php5/pkg-plist
+++ b/www/mod_php5/pkg-plist
@@ -1,10 +1,10 @@
 etc/rc.d/apache.sh
-@exec mkdir %D/etc/apache/logs %D/www/cgi-bin %D/www/data
+@exec mkdir %D/www/cgi-bin %D/www/data
 @unexec rm %D/etc/rc.d/apache.sh
-etc/apache/conf/httpd.conf
-etc/apache/conf/srm.conf
-etc/apache/conf/access.conf
-etc/apache/conf/mime.types
+etc/apache/httpd.conf
+etc/apache/srm.conf
+etc/apache/access.conf
+etc/apache/mime.types
 sbin/httpd
 www/icons/README
 www/icons/a.gif