Upgrade to Apache 1.3.14

PR:		23104
Submitted by:	Scot W. Hetzel <hetzels@westbend.net> MAINTAINER

6 files changed, 72 insertions, 56 deletions

diff --git a/www/apache13-fp/Makefile b/www/apache13-fp/Makefile
index 37db44526097..67933bf40bf5 100644
--- a/www/apache13-fp/Makefile
+++ b/www/apache13-fp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	apache_fp
-PORTVERSION=	1.3.12
+PORTVERSION=	1.3.14
 CATEGORIES=	www
 MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.microsoft.com/products/frontpage/ \
@@ -27,7 +27,7 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.mtnranch.net/pub/apache/dist/ \
 		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
 		ftp://apache.nextpath.com/pub/apache/dist/
-DISTNAME=	apache_1.3.12
+DISTNAME=	apache_${PORTVERSION}
 DISTFILES=	${APACHE} ${FRONTPAGE} powerlogo.gif fplogo.gif
 
 MAINTAINER=	hetzels@westbend.net
@@ -89,11 +89,11 @@ OPTIM=		-DHARD_SERVER_LIMIT=512 \
 
 #By default create an Optimized package.
 .if ${BATCH} == YES
-APACHE_PERF_TUNING= YES
+APACHE_PERF_TUNING=	YES
 .endif
 
 .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
-OPTIM+= 	-DBUFFERED_LOGS -DFD_SETSIZE=1024
+OPTIM+=		-DBUFFERED_LOGS -DFD_SETSIZE=1024
 CFLAGS+=	-O6 -funroll-loops -fstrength-reduce -fomit-frame-pointer \
 		-fexpensive-optimizations -ffast-math
 .endif
@@ -108,12 +108,12 @@ MAN8=	ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
 .if defined(SUEXEC)
 HTTPD_USER?=www
 USER_DIR?=public_html
-CONFIGURE_ARGS+= --enable-suexec \
-		 --suexec-caller=${HTTPD_USER} \
-		 --suexec-docroot=${PREFIX}/www/data \
-		 --suexec-logfile=/var/log/httpd-suexec.log \
-		 --suexec-userdir=${USER_DIR} \
-		 --suexec-safepath='/bin:/usr/bin:${PREFIX}/bin'
+CONFIGURE_ARGS+=	--enable-suexec \
+			--suexec-caller=${HTTPD_USER} \
+			--suexec-docroot=${PREFIX}/www/data \
+			--suexec-logfile=/var/log/httpd-suexec.log \
+			--suexec-userdir=${USER_DIR} \
+			--suexec-safepath='/bin:/usr/bin:${PREFIX}/bin'
 MAN8+=	suexec.8
 .endif
 
diff --git a/www/apache13-fp/distinfo b/www/apache13-fp/distinfo
index 8e281e1a7fbc..f759d0a6a37c 100644
--- a/www/apache13-fp/distinfo
+++ b/www/apache13-fp/distinfo
@@ -1,4 +1,4 @@
-MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
+MD5 (apache_1.3.14.tar.gz) = 34803e3d83a0a9ed981b571657b33109
 MD5 (fp40.bsdi.tar.z) = f469ea85b69d69f80f32c58fb0d273c4
 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
 MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6
diff --git a/www/apache13-fp/files/patch-ac b/www/apache13-fp/files/patch-ac
deleted file mode 100644
index bcbeb3171d11..000000000000
--- a/www/apache13-fp/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Configure.bak	Sun Feb  6 04:27:19 2000
-+++ src/Configure	Sun Mar 19 21:51:00 2000
-@@ -1043,7 +1043,7 @@
- 	    LDFLAGS_SHLIB_EXPORT=""
- 	    SHLIB_SUFFIX_DEPTH=2
- 	    ;;
--	*-freebsd3*|*-freebsd4*)
-+	*-freebsd[3-9]*)
- 		LD_SHLIB="gcc"
- 	    CFLAGS_SHLIB="-fpic"
- 	    LDFLAGS_SHLIB="-shared"
diff --git a/www/apache13-fp/files/patch-ag b/www/apache13-fp/files/patch-ag
index 333ef6a30786..d2122e7dbfca 100644
--- a/www/apache13-fp/files/patch-ag
+++ b/www/apache13-fp/files/patch-ag
@@ -1,5 +1,5 @@
---- conf/httpd.conf-dist.orig	Wed May  5 15:17:59 1999
-+++ conf/httpd.conf-dist	Wed Oct 27 21:37:07 1999
+--- conf/httpd.conf-dist.orig	Thu Sep 28 08:12:36 2000
++++ conf/httpd.conf-dist	Sat Nov 25 11:40:39 2000
 @@ -97,6 +97,9 @@
  #ResourceConfig conf/srm.conf
  #AccessConfig conf/access.conf
@@ -21,7 +21,7 @@
  #
  # BindAddress: You can support virtual hosts with this option. This directive
  # is used to tell the server which IP address to listen to. It can either
-@@ -274,7 +281,7 @@
+@@ -278,7 +285,7 @@
  # documents. By default, all requests are taken from this directory, but
  # symbolic links and aliases may be used to point to other locations.
  #
@@ -30,7 +30,7 @@
  
  #
  # Each directory to which Apache has access, can be configured with respect
-@@ -315,7 +322,16 @@
+@@ -319,7 +326,16 @@
  # override. Can also be "All", or any combination of "Options", "FileInfo", 
  # "AuthConfig", and "Limit"
  #
@@ -48,8 +48,8 @@
  
  #
  # Controls who can get stuff from this server.
-@@ -347,6 +363,15 @@
- #    </Limit>
+@@ -353,12 +369,36 @@
+ #    </LimitExcept>
  #</Directory>
  
 +### In Order for FrontPage to work in User and Virtual ###
@@ -64,7 +64,29 @@
  #
  # DirectoryIndex: Name of the file or files to use as a pre-written HTML
  # directory index.  Separate multiple entries with spaces.
-@@ -467,7 +492,7 @@
+ #
+ <IfModule mod_dir.c>
+-    DirectoryIndex index.html
++    <IfModule mod_php3.c>
++        <IfModule mod_php4.c>
++            DirectoryIndex index.php index.php3 index.html
++        </IfModule>
++        <IfModule !mod_php4.c>
++            DirectoryIndex index.php3 index.html
++        </IfModule>
++    </IfModule>
++    <IfModule !mod_php3.c>
++        <IfModule mod_php4.c>
++            DirectoryIndex index.php index.html
++        </IfModule>
++        <IfModule !mod_php4.c>
++            DirectoryIndex index.html
++        </IfModule>
++    </IfModule>
+ </IfModule>
+ 
+ #
+@@ -477,7 +517,7 @@
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
  #
@@ -73,7 +95,7 @@
  
  #
  # If you would like to have agent and referer logfiles, uncomment the
-@@ -480,7 +505,7 @@
+@@ -490,7 +530,7 @@
  # If you prefer a single logfile with access, agent, and referer information
  # (Combined Logfile Format) you can use the following directive.
  #
@@ -82,10 +104,32 @@
  
  #
  # Optionally add a line containing the server version and virtual host
-@@ -852,3 +877,48 @@
+@@ -729,13 +769,17 @@
+     # For example, the PHP 3.x module (not part of the Apache distribution - see
+     # http://www.php.net) will typically use:
+     #
+-    #AddType application/x-httpd-php3 .php3
+-    #AddType application/x-httpd-php3-source .phps
++    <IfModule mod_php3.c>
++	AddType application/x-httpd-php3 .php3
++	AddType application/x-httpd-php3-source .php3s
++    </IfModule>
+     #
+     # And for PHP 4.x, use:
+     #
+-    #AddType application/x-httpd-php .php
+-    #AddType application/x-httpd-php-source .phps
++    <IfModule mod_php4.c>
++	AddType application/x-httpd-php .php
++	AddType application/x-httpd-php-source .phps
++    </IfModule>
  
- #<VirtualHost _default_:*>
- #</VirtualHost>
+     AddType application/x-tar .tgz
+ 
+@@ -854,6 +898,51 @@
+ #    Deny from all
+ #    Allow from .your_domain.com
+ #</Location>
 +
 +# This virtual Host allows access to the Apache & Frontpage Docs on port 8080
 +<VirtualHost _default_:8080>
@@ -131,3 +175,6 @@
 +    ServerName @@HOSTNAME@@
 +</VirtualHost>
 +
+ 
+ #
+ # Allow remote server configuration reports, with the URL of
diff --git a/www/apache13-fp/files/patch-al b/www/apache13-fp/files/patch-al
index f473a3127fa0..b355a697b4ab 100644
--- a/www/apache13-fp/files/patch-al
+++ b/www/apache13-fp/files/patch-al
@@ -1,5 +1,5 @@
---- src/support/log_server_status.orig	Fri Jun  4 10:54:19 1999
-+++ src/support/log_server_status	Sat Nov 13 19:42:02 1999
+--- src/support/log_server_status.orig	Fri Jun  4 19:54:19 1999
++++ src/support/log_server_status	Fri Sep  3 15:53:16 1999
 @@ -67,10 +67,10 @@
  #
  require 'sys/socket.ph';
@@ -13,16 +13,7 @@
  
  sub tcp_connect
  {
-@@ -93,14 +93,14 @@
- ### Main
- 
- {
--        $year=`date +%y`;
-+        $year=`LC_TIME=C date +%y`;
- 	chomp($year);
- 	$year += ($year < 70) ? 2000 : 1900;
--	$date = $year . `date +%m%d:%H%M%S`;
-+	$date = $year . `LC_TIME=C date +%m%d:%H%M%S`;
+@@ -100,7 +100,7 @@
  	chomp($date);
  	($day,$time)=split(/:/,$date);
  	$res=&tcp_connect($server,$port);
diff --git a/www/apache13-fp/files/patch-as b/www/apache13-fp/files/patch-as
deleted file mode 100644
index d7ecc4a04cf3..000000000000
--- a/www/apache13-fp/files/patch-as
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.layout.orig	Thu Jul 29 13:12:43 1999
-+++ config.layout	Thu Aug 19 22:30:39 1999
-@@ -41,7 +41,7 @@
-     sysconfdir:    $prefix/etc+
-     datadir:       $prefix/share+
-     iconsdir:      $datadir/icons
--    htdocsdir:     $datadir/htdocs
-+    htdocsdir:     $datadir/data
-     cgidir:        $datadir/cgi-bin
-     includedir:    $prefix/include+
-     localstatedir: $prefix/var+