Upgrade to 1.3b5

3 files changed, 53 insertions, 19 deletions

diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index fb8b0e276a9e..46ac81bab613 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -1,18 +1,19 @@
 # New ports collection makefile for:    apache HTTPD
-# Version required:     1.3b3
+# Version required:     1.3
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.42 1997/11/21 21:10:15 ache Exp $
+# $Id: Makefile,v 1.43 1998/01/07 22:19:03 ache Exp $
 #
 
-DISTNAME=       apache_1.3b3
-PKGNAME=        apache-1.3b3
+DISTNAME=       apache_1.3b5
+PKGNAME=        apache-1.3b5
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
-PATCH_SITES=    ftp://www.apache.org/apache/dist/patches/apply_to_1.3b3/
-PATCHFILES=     no2slash-loop-fix.patch
-PATCH_DIST_ARGS= -d ${WRKSRC}/src/main -E -p0
+
+#PATCH_SITES=    ftp://www.apache.org/apache/dist/patches/apply_to_1.3b5/
+#PATCHFILES=
+#PATCH_DIST_ARGS= -d ${WRKSRC}/src/main -E -p0
 
 MAINTAINER=     ache@freebsd.org
 
diff --git a/www/apache21/distinfo b/www/apache21/distinfo
index 3fa6c1261426..47b5c0f31ad4 100644
--- a/www/apache21/distinfo
+++ b/www/apache21/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.3b3.tar.gz) = befabda0148e3a26a93920c8721c5918
-MD5 (no2slash-loop-fix.patch) = e56db42ebe5a79a7004afae8868570b4
+MD5 (apache_1.3b5.tar.gz) = d8ce21fe9fda2673fdd749f6281f331d
diff --git a/www/apache21/files/patch-ag b/www/apache21/files/patch-ag
index 9e439016a195..4abfaa985725 100644
--- a/www/apache21/files/patch-ag
+++ b/www/apache21/files/patch-ag
@@ -1,5 +1,5 @@
-*** conf/httpd.conf-dist.orig	Thu Oct 16 22:55:54 1997
---- conf/httpd.conf-dist	Wed Oct 22 20:58:36 1997
+*** conf/httpd.conf-dist.orig	Wed Feb  4 22:42:29 1998
+--- conf/httpd.conf-dist	Fri Feb 20 13:36:27 1998
 ***************
 *** 34,40 ****
   #  suggested workaround is to create a user www and use that user.
@@ -18,7 +18,24 @@
   # ServerAdmin: Your address, where problems with the server should be
   # e-mailed.
 ***************
-*** 56,76 ****
+*** 47,53 ****
+  # mounted filesystem then please read the LockFile documentation,
+  # you will save yourself a lot of trouble.
+  
+! ServerRoot @@ServerRoot@@
+  
+  # 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
+--- 47,53 ----
+  # mounted filesystem then please read the LockFile documentation,
+  # you will save yourself a lot of trouble.
+  
+! 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
+***************
+*** 59,79 ****
   # ErrorLog: The location of the error log file. If this does not start
   # with /, ServerRoot is prepended to it.
   
@@ -38,9 +55,9 @@
   # no two invocations of Apache share the same scoreboard file.
 ! ScoreBoardFile logs/apache_status
   
-  # ServerName allows you to set a host name which is sent back to clients for
-  # your server if it's different than the one the program would get (i.e. use
---- 56,78 ----
+  # The LockFile directive sets the path to the lockfile used when Apache
+  # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
+--- 59,81 ----
   # ErrorLog: The location of the error log file. If this does not start
   # with /, ServerRoot is prepended to it.
   
@@ -62,10 +79,27 @@
   # no two invocations of Apache share the same scoreboard file.
 ! ScoreBoardFile /var/run/apache_runtime_status
   
-  # ServerName allows you to set a host name which is sent back to clients for
-  # your server if it's different than the one the program would get (i.e. use
+  # The LockFile directive sets the path to the lockfile used when Apache
+  # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
+***************
+*** 172,178 ****
+  
+  # To enable the cache as well, edit and uncomment the following lines:
+  
+! #CacheRoot @@ServerRoot@@/proxy
+  #CacheSize 5
+  #CacheGcInterval 4
+  #CacheMaxExpire 24
+--- 174,180 ----
+  
+  # To enable the cache as well, edit and uncomment the following lines:
+  
+! #CacheRoot /usr/local/etc/apache/proxy
+  #CacheSize 5
+  #CacheGcInterval 4
+  #CacheMaxExpire 24
 ***************
-*** 175,184 ****
+*** 196,205 ****
    
   #<VirtualHost host.some_domain.com>
   #ServerAdmin webmaster@host.some_domain.com
@@ -76,7 +110,7 @@
   #</VirtualHost>
   
   
---- 177,186 ----
+--- 198,207 ----
    
   #<VirtualHost host.some_domain.com>
   #ServerAdmin webmaster@host.some_domain.com