Upgrade to 1.1.1

OK-ed by: gpalmer

22 files changed, 227 insertions, 256 deletions

diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 81575c1b2c22..4fefa7a61fbe 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -1,25 +1,21 @@
 # New ports collection makefile for:    apache HTTPD
-# Version required:     1.0.5
+# Version required:     1.1.1
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.12 1996/06/15 16:58:06 jkh Exp $
+# $Id: Makefile,v 1.13 1996/06/15 17:51:08 jkh Exp $
 #
 
-DISTNAME=       apache_1.0.5
-PKGNAME=        apache-1.0.5
+DISTNAME=       apache_1.1.1
+PKGNAME=        apache-1.1.1
 CATEGORIES+=	www
-MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
-		ftp://www.apache.org/apache/dist/contrib/modules/
-DISTFILES=      ${DISTNAME}.tar.gz mod_env.c
+MASTER_SITES=   ftp://www.apache.org/apache/dist/
+DISTFILES=      ${DISTNAME}.tar.gz
 
 MAINTAINER=	pst@freebsd.org
 
 EXTRACT_ONLY=   ${DISTNAME}.tar.gz
 
-post-extract:
-	cp ${DISTDIR}/mod_env.c ${WRKSRC}/src
-
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 81575c1b2c22..4fefa7a61fbe 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -1,25 +1,21 @@
 # New ports collection makefile for:    apache HTTPD
-# Version required:     1.0.5
+# Version required:     1.1.1
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.12 1996/06/15 16:58:06 jkh Exp $
+# $Id: Makefile,v 1.13 1996/06/15 17:51:08 jkh Exp $
 #
 
-DISTNAME=       apache_1.0.5
-PKGNAME=        apache-1.0.5
+DISTNAME=       apache_1.1.1
+PKGNAME=        apache-1.1.1
 CATEGORIES+=	www
-MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
-		ftp://www.apache.org/apache/dist/contrib/modules/
-DISTFILES=      ${DISTNAME}.tar.gz mod_env.c
+MASTER_SITES=   ftp://www.apache.org/apache/dist/
+DISTFILES=      ${DISTNAME}.tar.gz
 
 MAINTAINER=	pst@freebsd.org
 
 EXTRACT_ONLY=   ${DISTNAME}.tar.gz
 
-post-extract:
-	cp ${DISTDIR}/mod_env.c ${WRKSRC}/src
-
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
diff --git a/www/apache13/distinfo b/www/apache13/distinfo
index f9a8d1e1a60a..1426022ab32e 100644
--- a/www/apache13/distinfo
+++ b/www/apache13/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.0.5.tar.gz) = b69c2ba49679dbdc2b21091b8372815a
-MD5 (mod_env.c) = 5845f6e9f86623d2cebe534012004ae2
+MD5 (apache_1.1.1.tar.gz) = 0dc9c3a3148d2acf419dd926018003c3
diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab
index 94477e1f69fe..d1b72bd99cb4 100644
--- a/www/apache13/files/patch-ab
+++ b/www/apache13/files/patch-ab
@@ -1,14 +1,7 @@
-*** conf/access.conf-dist	Fri Sep 29 09:50:58 1995
---- conf/access.conf-dist	Fri Sep 29 09:51:50 1995
+*** conf/access.conf-dist.orig	Wed Jul  3 21:18:11 1996
+--- conf/access.conf-dist	Fri Jul  5 06:32:54 1996
 ***************
-*** 10,23 ****
-  
-  # Originally by Rob McCool
-  
-! # /usr/local/etc/httpd/ should be changed to whatever you set ServerRoot to.
-! <Directory /usr/local/etc/httpd/cgi-bin>
-  Options Indexes FollowSymLinks
-  </Directory>
+*** 12,18 ****
   
   # This should be changed to whatever you set DocumentRoot to.
   
@@ -16,14 +9,7 @@
   
   # This may also be "None", "All", or any combination of "Indexes",
   # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
---- 10,23 ----
-  
-  # Originally by Rob McCool
-  
-! # /usr/local/www/ should be changed to whatever you set ServerRoot to.
-! <Directory /usr/local/www/cgi-bin>
-  Options Indexes FollowSymLinks
-  </Directory>
+--- 12,18 ----
   
   # This should be changed to whatever you set DocumentRoot to.
   
@@ -31,10 +17,27 @@
   
   # This may also be "None", "All", or any combination of "Indexes",
   # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
-*** conf/httpd.conf-dist.orig	Tue Aug  1 04:45:22 1995
---- conf/httpd.conf-dist	Fri Sep 29 09:52:42 1995
 ***************
-*** 29,40 ****
+*** 38,44 ****
+  # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
+  # CGI directory exists, if you have that configured.
+  
+! <Directory /usr/local/etc/httpd/cgi-bin>
+  AllowOverride None
+  Options None
+  </Directory>
+--- 38,44 ----
+  # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
+  # CGI directory exists, if you have that configured.
+  
+! <Directory /usr/local/www/cgi-bin>
+  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.
   
@@ -47,7 +50,7 @@
   
   # 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
---- 29,40 ----
+--- 33,44 ----
   # ServerAdmin: Your address, where problems with the server should be
   # e-mailed.
   
@@ -61,7 +64,7 @@
   # 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
 ***************
-*** 124,130 ****
+*** 161,167 ****
    
   #<VirtualHost host.foo.com>
   #ServerAdmin webmaster@host.foo.com
@@ -69,7 +72,7 @@
   #ServerName host.foo.com
   #ErrorLog logs/host.foo.com-error_log
   #TransferLog logs/host.foo.com-access_log
---- 124,130 ----
+--- 161,167 ----
    
   #<VirtualHost host.foo.com>
   #ServerAdmin webmaster@host.foo.com
@@ -77,8 +80,8 @@
   #ServerName host.foo.com
   #ErrorLog logs/host.foo.com-error_log
   #TransferLog logs/host.foo.com-access_log
-*** conf/srm.conf-dist	Sun Aug 20 18:23:53 1995
---- conf/srm.conf-dist	Fri Sep 29 09:50:45 1995
+*** conf/srm.conf-dist.orig	Thu Jun 13 06:04:43 1996
+--- conf/srm.conf-dist	Fri Jul  5 06:37:24 1996
 ***************
 *** 12,18 ****
   # documents. By default, all requests are taken from this directory, but
@@ -97,20 +100,20 @@
   # UserDir: The name of the directory which is appended onto a user's home
   # directory if a ~user request is recieved.
 ***************
-*** 118,129 ****
+*** 131,142 ****
   # Aliases: Add here as many aliases as you need (with no limit). The format is 
   # Alias fakename realname
   
-! Alias /icons/ /usr/local/etc/httpd/icons/
+! #Alias /icons/ /usr/local/etc/httpd/icons/
   
   # ScriptAlias: This controls which directories contain server scripts.
   # Format: ScriptAlias fakename realname
   
-! ScriptAlias /cgi-bin/ /usr/local/etc/httpd/cgi-bin/
+! #ScriptAlias /cgi-bin/ /usr/local/etc/httpd/cgi-bin/
   
   # If you want to use server side includes, or CGI outside
   # ScriptAliased directories, uncomment the following lines.
---- 118,129 ----
+--- 131,142 ----
   # Aliases: Add here as many aliases as you need (with no limit). The format is 
   # Alias fakename realname
   
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 81575c1b2c22..4fefa7a61fbe 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,25 +1,21 @@
 # New ports collection makefile for:    apache HTTPD
-# Version required:     1.0.5
+# Version required:     1.1.1
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.12 1996/06/15 16:58:06 jkh Exp $
+# $Id: Makefile,v 1.13 1996/06/15 17:51:08 jkh Exp $
 #
 
-DISTNAME=       apache_1.0.5
-PKGNAME=        apache-1.0.5
+DISTNAME=       apache_1.1.1
+PKGNAME=        apache-1.1.1
 CATEGORIES+=	www
-MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
-		ftp://www.apache.org/apache/dist/contrib/modules/
-DISTFILES=      ${DISTNAME}.tar.gz mod_env.c
+MASTER_SITES=   ftp://www.apache.org/apache/dist/
+DISTFILES=      ${DISTNAME}.tar.gz
 
 MAINTAINER=	pst@freebsd.org
 
 EXTRACT_ONLY=   ${DISTNAME}.tar.gz
 
-post-extract:
-	cp ${DISTDIR}/mod_env.c ${WRKSRC}/src
-
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index f9a8d1e1a60a..1426022ab32e 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.0.5.tar.gz) = b69c2ba49679dbdc2b21091b8372815a
-MD5 (mod_env.c) = 5845f6e9f86623d2cebe534012004ae2
+MD5 (apache_1.1.1.tar.gz) = 0dc9c3a3148d2acf419dd926018003c3
diff --git a/www/apache2/files/patch-ab b/www/apache2/files/patch-ab
index 94477e1f69fe..d1b72bd99cb4 100644
--- a/www/apache2/files/patch-ab
+++ b/www/apache2/files/patch-ab
@@ -1,14 +1,7 @@
-*** conf/access.conf-dist	Fri Sep 29 09:50:58 1995
---- conf/access.conf-dist	Fri Sep 29 09:51:50 1995
+*** conf/access.conf-dist.orig	Wed Jul  3 21:18:11 1996
+--- conf/access.conf-dist	Fri Jul  5 06:32:54 1996
 ***************
-*** 10,23 ****
-  
-  # Originally by Rob McCool
-  
-! # /usr/local/etc/httpd/ should be changed to whatever you set ServerRoot to.
-! <Directory /usr/local/etc/httpd/cgi-bin>
-  Options Indexes FollowSymLinks
-  </Directory>
+*** 12,18 ****
   
   # This should be changed to whatever you set DocumentRoot to.
   
@@ -16,14 +9,7 @@
   
   # This may also be "None", "All", or any combination of "Indexes",
   # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
---- 10,23 ----
-  
-  # Originally by Rob McCool
-  
-! # /usr/local/www/ should be changed to whatever you set ServerRoot to.
-! <Directory /usr/local/www/cgi-bin>
-  Options Indexes FollowSymLinks
-  </Directory>
+--- 12,18 ----
   
   # This should be changed to whatever you set DocumentRoot to.
   
@@ -31,10 +17,27 @@
   
   # This may also be "None", "All", or any combination of "Indexes",
   # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
-*** conf/httpd.conf-dist.orig	Tue Aug  1 04:45:22 1995
---- conf/httpd.conf-dist	Fri Sep 29 09:52:42 1995
 ***************
-*** 29,40 ****
+*** 38,44 ****
+  # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
+  # CGI directory exists, if you have that configured.
+  
+! <Directory /usr/local/etc/httpd/cgi-bin>
+  AllowOverride None
+  Options None
+  </Directory>
+--- 38,44 ----
+  # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
+  # CGI directory exists, if you have that configured.
+  
+! <Directory /usr/local/www/cgi-bin>
+  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.
   
@@ -47,7 +50,7 @@
   
   # 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
---- 29,40 ----
+--- 33,44 ----
   # ServerAdmin: Your address, where problems with the server should be
   # e-mailed.
   
@@ -61,7 +64,7 @@
   # 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
 ***************
-*** 124,130 ****
+*** 161,167 ****
    
   #<VirtualHost host.foo.com>
   #ServerAdmin webmaster@host.foo.com
@@ -69,7 +72,7 @@
   #ServerName host.foo.com
   #ErrorLog logs/host.foo.com-error_log
   #TransferLog logs/host.foo.com-access_log
---- 124,130 ----
+--- 161,167 ----
    
   #<VirtualHost host.foo.com>
   #ServerAdmin webmaster@host.foo.com
@@ -77,8 +80,8 @@
   #ServerName host.foo.com
   #ErrorLog logs/host.foo.com-error_log
   #TransferLog logs/host.foo.com-access_log
-*** conf/srm.conf-dist	Sun Aug 20 18:23:53 1995
---- conf/srm.conf-dist	Fri Sep 29 09:50:45 1995
+*** conf/srm.conf-dist.orig	Thu Jun 13 06:04:43 1996
+--- conf/srm.conf-dist	Fri Jul  5 06:37:24 1996
 ***************
 *** 12,18 ****
   # documents. By default, all requests are taken from this directory, but
@@ -97,20 +100,20 @@
   # UserDir: The name of the directory which is appended onto a user's home
   # directory if a ~user request is recieved.
 ***************
-*** 118,129 ****
+*** 131,142 ****
   # Aliases: Add here as many aliases as you need (with no limit). The format is 
   # Alias fakename realname
   
-! Alias /icons/ /usr/local/etc/httpd/icons/
+! #Alias /icons/ /usr/local/etc/httpd/icons/
   
   # ScriptAlias: This controls which directories contain server scripts.
   # Format: ScriptAlias fakename realname
   
-! ScriptAlias /cgi-bin/ /usr/local/etc/httpd/cgi-bin/
+! #ScriptAlias /cgi-bin/ /usr/local/etc/httpd/cgi-bin/
   
   # If you want to use server side includes, or CGI outside
   # ScriptAliased directories, uncomment the following lines.
---- 118,129 ----
+--- 131,142 ----
   # Aliases: Add here as many aliases as you need (with no limit). The format is 
   # Alias fakename realname
   
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 81575c1b2c22..4fefa7a61fbe 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -1,25 +1,21 @@
 # New ports collection makefile for:    apache HTTPD
-# Version required:     1.0.5
+# Version required:     1.1.1
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.12 1996/06/15 16:58:06 jkh Exp $
+# $Id: Makefile,v 1.13 1996/06/15 17:51:08 jkh Exp $
 #
 
-DISTNAME=       apache_1.0.5
-PKGNAME=        apache-1.0.5
+DISTNAME=       apache_1.1.1
+PKGNAME=        apache-1.1.1
 CATEGORIES+=	www
-MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
-		ftp://www.apache.org/apache/dist/contrib/modules/
-DISTFILES=      ${DISTNAME}.tar.gz mod_env.c
+MASTER_SITES=   ftp://www.apache.org/apache/dist/
+DISTFILES=      ${DISTNAME}.tar.gz
 
 MAINTAINER=	pst@freebsd.org
 
 EXTRACT_ONLY=   ${DISTNAME}.tar.gz
 
-post-extract:
-	cp ${DISTDIR}/mod_env.c ${WRKSRC}/src
-
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
diff --git a/www/apache20/distinfo b/www/apache20/distinfo
index f9a8d1e1a60a..1426022ab32e 100644
--- a/www/apache20/distinfo
+++ b/www/apache20/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.0.5.tar.gz) = b69c2ba49679dbdc2b21091b8372815a
-MD5 (mod_env.c) = 5845f6e9f86623d2cebe534012004ae2
+MD5 (apache_1.1.1.tar.gz) = 0dc9c3a3148d2acf419dd926018003c3
diff --git a/www/apache20/files/patch-ab b/www/apache20/files/patch-ab
index 94477e1f69fe..d1b72bd99cb4 100644
--- a/www/apache20/files/patch-ab
+++ b/www/apache20/files/patch-ab
@@ -1,14 +1,7 @@
-*** conf/access.conf-dist	Fri Sep 29 09:50:58 1995
---- conf/access.conf-dist	Fri Sep 29 09:51:50 1995
+*** conf/access.conf-dist.orig	Wed Jul  3 21:18:11 1996
+--- conf/access.conf-dist	Fri Jul  5 06:32:54 1996
 ***************
-*** 10,23 ****
-  
-  # Originally by Rob McCool
-  
-! # /usr/local/etc/httpd/ should be changed to whatever you set ServerRoot to.
-! <Directory /usr/local/etc/httpd/cgi-bin>
-  Options Indexes FollowSymLinks
-  </Directory>
+*** 12,18 ****
   
   # This should be changed to whatever you set DocumentRoot to.
   
@@ -16,14 +9,7 @@
   
   # This may also be "None", "All", or any combination of "Indexes",
   # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
---- 10,23 ----
-  
-  # Originally by Rob McCool
-  
-! # /usr/local/www/ should be changed to whatever you set ServerRoot to.
-! <Directory /usr/local/www/cgi-bin>
-  Options Indexes FollowSymLinks
-  </Directory>
+--- 12,18 ----
   
   # This should be changed to whatever you set DocumentRoot to.
   
@@ -31,10 +17,27 @@
   
   # This may also be "None", "All", or any combination of "Indexes",
   # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
-*** conf/httpd.conf-dist.orig	Tue Aug  1 04:45:22 1995
---- conf/httpd.conf-dist	Fri Sep 29 09:52:42 1995
 ***************
-*** 29,40 ****
+*** 38,44 ****
+  # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
+  # CGI directory exists, if you have that configured.
+  
+! <Directory /usr/local/etc/httpd/cgi-bin>
+  AllowOverride None
+  Options None
+  </Directory>
+--- 38,44 ----
+  # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
+  # CGI directory exists, if you have that configured.
+  
+! <Directory /usr/local/www/cgi-bin>
+  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.
   
@@ -47,7 +50,7 @@
   
   # 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
---- 29,40 ----
+--- 33,44 ----
   # ServerAdmin: Your address, where problems with the server should be
   # e-mailed.
   
@@ -61,7 +64,7 @@
   # 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
 ***************
-*** 124,130 ****
+*** 161,167 ****
    
   #<VirtualHost host.foo.com>
   #ServerAdmin webmaster@host.foo.com
@@ -69,7 +72,7 @@
   #ServerName host.foo.com
   #ErrorLog logs/host.foo.com-error_log
   #TransferLog logs/host.foo.com-access_log
---- 124,130 ----
+--- 161,167 ----
    
   #<VirtualHost host.foo.com>
   #ServerAdmin webmaster@host.foo.com
@@ -77,8 +80,8 @@
   #ServerName host.foo.com
   #ErrorLog logs/host.foo.com-error_log
   #TransferLog logs/host.foo.com-access_log
-*** conf/srm.conf-dist	Sun Aug 20 18:23:53 1995
---- conf/srm.conf-dist	Fri Sep 29 09:50:45 1995
+*** conf/srm.conf-dist.orig	Thu Jun 13 06:04:43 1996
+--- conf/srm.conf-dist	Fri Jul  5 06:37:24 1996
 ***************
 *** 12,18 ****
   # documents. By default, all requests are taken from this directory, but
@@ -97,20 +100,20 @@
   # UserDir: The name of the directory which is appended onto a user's home
   # directory if a ~user request is recieved.
 ***************
-*** 118,129 ****
+*** 131,142 ****
   # Aliases: Add here as many aliases as you need (with no limit). The format is 
   # Alias fakename realname
   
-! Alias /icons/ /usr/local/etc/httpd/icons/
+! #Alias /icons/ /usr/local/etc/httpd/icons/
   
   # ScriptAlias: This controls which directories contain server scripts.
   # Format: ScriptAlias fakename realname
   
-! ScriptAlias /cgi-bin/ /usr/local/etc/httpd/cgi-bin/
+! #ScriptAlias /cgi-bin/ /usr/local/etc/httpd/cgi-bin/
   
   # If you want to use server side includes, or CGI outside
   # ScriptAliased directories, uncomment the following lines.
---- 118,129 ----
+--- 131,142 ----
   # Aliases: Add here as many aliases as you need (with no limit). The format is 
   # Alias fakename realname
   
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 81575c1b2c22..4fefa7a61fbe 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -1,25 +1,21 @@
 # New ports collection makefile for:    apache HTTPD
-# Version required:     1.0.5
+# Version required:     1.1.1
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.12 1996/06/15 16:58:06 jkh Exp $
+# $Id: Makefile,v 1.13 1996/06/15 17:51:08 jkh Exp $
 #
 
-DISTNAME=       apache_1.0.5
-PKGNAME=        apache-1.0.5
+DISTNAME=       apache_1.1.1
+PKGNAME=        apache-1.1.1
 CATEGORIES+=	www
-MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
-		ftp://www.apache.org/apache/dist/contrib/modules/
-DISTFILES=      ${DISTNAME}.tar.gz mod_env.c
+MASTER_SITES=   ftp://www.apache.org/apache/dist/
+DISTFILES=      ${DISTNAME}.tar.gz
 
 MAINTAINER=	pst@freebsd.org
 
 EXTRACT_ONLY=   ${DISTNAME}.tar.gz
 
-post-extract:
-	cp ${DISTDIR}/mod_env.c ${WRKSRC}/src
-
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
diff --git a/www/apache21/distinfo b/www/apache21/distinfo
index f9a8d1e1a60a..1426022ab32e 100644
--- a/www/apache21/distinfo
+++ b/www/apache21/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.0.5.tar.gz) = b69c2ba49679dbdc2b21091b8372815a
-MD5 (mod_env.c) = 5845f6e9f86623d2cebe534012004ae2
+MD5 (apache_1.1.1.tar.gz) = 0dc9c3a3148d2acf419dd926018003c3
diff --git a/www/apache21/files/patch-ab b/www/apache21/files/patch-ab
index 94477e1f69fe..d1b72bd99cb4 100644
--- a/www/apache21/files/patch-ab
+++ b/www/apache21/files/patch-ab
@@ -1,14 +1,7 @@
-*** conf/access.conf-dist	Fri Sep 29 09:50:58 1995
---- conf/access.conf-dist	Fri Sep 29 09:51:50 1995
+*** conf/access.conf-dist.orig	Wed Jul  3 21:18:11 1996
+--- conf/access.conf-dist	Fri Jul  5 06:32:54 1996
 ***************
-*** 10,23 ****
-  
-  # Originally by Rob McCool
-  
-! # /usr/local/etc/httpd/ should be changed to whatever you set ServerRoot to.
-! <Directory /usr/local/etc/httpd/cgi-bin>
-  Options Indexes FollowSymLinks
-  </Directory>
+*** 12,18 ****
   
   # This should be changed to whatever you set DocumentRoot to.
   
@@ -16,14 +9,7 @@
   
   # This may also be "None", "All", or any combination of "Indexes",
   # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
---- 10,23 ----
-  
-  # Originally by Rob McCool
-  
-! # /usr/local/www/ should be changed to whatever you set ServerRoot to.
-! <Directory /usr/local/www/cgi-bin>
-  Options Indexes FollowSymLinks
-  </Directory>
+--- 12,18 ----
   
   # This should be changed to whatever you set DocumentRoot to.
   
@@ -31,10 +17,27 @@
   
   # This may also be "None", "All", or any combination of "Indexes",
   # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
-*** conf/httpd.conf-dist.orig	Tue Aug  1 04:45:22 1995
---- conf/httpd.conf-dist	Fri Sep 29 09:52:42 1995
 ***************
-*** 29,40 ****
+*** 38,44 ****
+  # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
+  # CGI directory exists, if you have that configured.
+  
+! <Directory /usr/local/etc/httpd/cgi-bin>
+  AllowOverride None
+  Options None
+  </Directory>
+--- 38,44 ----
+  # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
+  # CGI directory exists, if you have that configured.
+  
+! <Directory /usr/local/www/cgi-bin>
+  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.
   
@@ -47,7 +50,7 @@
   
   # 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
---- 29,40 ----
+--- 33,44 ----
   # ServerAdmin: Your address, where problems with the server should be
   # e-mailed.
   
@@ -61,7 +64,7 @@
   # 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
 ***************
-*** 124,130 ****
+*** 161,167 ****
    
   #<VirtualHost host.foo.com>
   #ServerAdmin webmaster@host.foo.com
@@ -69,7 +72,7 @@
   #ServerName host.foo.com
   #ErrorLog logs/host.foo.com-error_log
   #TransferLog logs/host.foo.com-access_log
---- 124,130 ----
+--- 161,167 ----
    
   #<VirtualHost host.foo.com>
   #ServerAdmin webmaster@host.foo.com
@@ -77,8 +80,8 @@
   #ServerName host.foo.com
   #ErrorLog logs/host.foo.com-error_log
   #TransferLog logs/host.foo.com-access_log
-*** conf/srm.conf-dist	Sun Aug 20 18:23:53 1995
---- conf/srm.conf-dist	Fri Sep 29 09:50:45 1995
+*** conf/srm.conf-dist.orig	Thu Jun 13 06:04:43 1996
+--- conf/srm.conf-dist	Fri Jul  5 06:37:24 1996
 ***************
 *** 12,18 ****
   # documents. By default, all requests are taken from this directory, but
@@ -97,20 +100,20 @@
   # UserDir: The name of the directory which is appended onto a user's home
   # directory if a ~user request is recieved.
 ***************
-*** 118,129 ****
+*** 131,142 ****
   # Aliases: Add here as many aliases as you need (with no limit). The format is 
   # Alias fakename realname
   
-! Alias /icons/ /usr/local/etc/httpd/icons/
+! #Alias /icons/ /usr/local/etc/httpd/icons/
   
   # ScriptAlias: This controls which directories contain server scripts.
   # Format: ScriptAlias fakename realname
   
-! ScriptAlias /cgi-bin/ /usr/local/etc/httpd/cgi-bin/
+! #ScriptAlias /cgi-bin/ /usr/local/etc/httpd/cgi-bin/
   
   # If you want to use server side includes, or CGI outside
   # ScriptAliased directories, uncomment the following lines.
---- 118,129 ----
+--- 131,142 ----
   # Aliases: Add here as many aliases as you need (with no limit). The format is 
   # Alias fakename realname
   
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 81575c1b2c22..4fefa7a61fbe 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,25 +1,21 @@
 # New ports collection makefile for:    apache HTTPD
-# Version required:     1.0.5
+# Version required:     1.1.1
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.12 1996/06/15 16:58:06 jkh Exp $
+# $Id: Makefile,v 1.13 1996/06/15 17:51:08 jkh Exp $
 #
 
-DISTNAME=       apache_1.0.5
-PKGNAME=        apache-1.0.5
+DISTNAME=       apache_1.1.1
+PKGNAME=        apache-1.1.1
 CATEGORIES+=	www
-MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
-		ftp://www.apache.org/apache/dist/contrib/modules/
-DISTFILES=      ${DISTNAME}.tar.gz mod_env.c
+MASTER_SITES=   ftp://www.apache.org/apache/dist/
+DISTFILES=      ${DISTNAME}.tar.gz
 
 MAINTAINER=	pst@freebsd.org
 
 EXTRACT_ONLY=   ${DISTNAME}.tar.gz
 
-post-extract:
-	cp ${DISTDIR}/mod_env.c ${WRKSRC}/src
-
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index f9a8d1e1a60a..1426022ab32e 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.0.5.tar.gz) = b69c2ba49679dbdc2b21091b8372815a
-MD5 (mod_env.c) = 5845f6e9f86623d2cebe534012004ae2
+MD5 (apache_1.1.1.tar.gz) = 0dc9c3a3148d2acf419dd926018003c3
diff --git a/www/apache22/files/patch-ab b/www/apache22/files/patch-ab
index 94477e1f69fe..d1b72bd99cb4 100644
--- a/www/apache22/files/patch-ab
+++ b/www/apache22/files/patch-ab
@@ -1,14 +1,7 @@
-*** conf/access.conf-dist	Fri Sep 29 09:50:58 1995
---- conf/access.conf-dist	Fri Sep 29 09:51:50 1995
+*** conf/access.conf-dist.orig	Wed Jul  3 21:18:11 1996
+--- conf/access.conf-dist	Fri Jul  5 06:32:54 1996
 ***************
-*** 10,23 ****
-  
-  # Originally by Rob McCool
-  
-! # /usr/local/etc/httpd/ should be changed to whatever you set ServerRoot to.
-! <Directory /usr/local/etc/httpd/cgi-bin>
-  Options Indexes FollowSymLinks
-  </Directory>
+*** 12,18 ****
   
   # This should be changed to whatever you set DocumentRoot to.
   
@@ -16,14 +9,7 @@
   
   # This may also be "None", "All", or any combination of "Indexes",
   # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
---- 10,23 ----
-  
-  # Originally by Rob McCool
-  
-! # /usr/local/www/ should be changed to whatever you set ServerRoot to.
-! <Directory /usr/local/www/cgi-bin>
-  Options Indexes FollowSymLinks
-  </Directory>
+--- 12,18 ----
   
   # This should be changed to whatever you set DocumentRoot to.
   
@@ -31,10 +17,27 @@
   
   # This may also be "None", "All", or any combination of "Indexes",
   # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
-*** conf/httpd.conf-dist.orig	Tue Aug  1 04:45:22 1995
---- conf/httpd.conf-dist	Fri Sep 29 09:52:42 1995
 ***************
-*** 29,40 ****
+*** 38,44 ****
+  # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
+  # CGI directory exists, if you have that configured.
+  
+! <Directory /usr/local/etc/httpd/cgi-bin>
+  AllowOverride None
+  Options None
+  </Directory>
+--- 38,44 ----
+  # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
+  # CGI directory exists, if you have that configured.
+  
+! <Directory /usr/local/www/cgi-bin>
+  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.
   
@@ -47,7 +50,7 @@
   
   # 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
---- 29,40 ----
+--- 33,44 ----
   # ServerAdmin: Your address, where problems with the server should be
   # e-mailed.
   
@@ -61,7 +64,7 @@
   # 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
 ***************
-*** 124,130 ****
+*** 161,167 ****
    
   #<VirtualHost host.foo.com>
   #ServerAdmin webmaster@host.foo.com
@@ -69,7 +72,7 @@
   #ServerName host.foo.com
   #ErrorLog logs/host.foo.com-error_log
   #TransferLog logs/host.foo.com-access_log
---- 124,130 ----
+--- 161,167 ----
    
   #<VirtualHost host.foo.com>
   #ServerAdmin webmaster@host.foo.com
@@ -77,8 +80,8 @@
   #ServerName host.foo.com
   #ErrorLog logs/host.foo.com-error_log
   #TransferLog logs/host.foo.com-access_log
-*** conf/srm.conf-dist	Sun Aug 20 18:23:53 1995
---- conf/srm.conf-dist	Fri Sep 29 09:50:45 1995
+*** conf/srm.conf-dist.orig	Thu Jun 13 06:04:43 1996
+--- conf/srm.conf-dist	Fri Jul  5 06:37:24 1996
 ***************
 *** 12,18 ****
   # documents. By default, all requests are taken from this directory, but
@@ -97,20 +100,20 @@
   # UserDir: The name of the directory which is appended onto a user's home
   # directory if a ~user request is recieved.
 ***************
-*** 118,129 ****
+*** 131,142 ****
   # Aliases: Add here as many aliases as you need (with no limit). The format is 
   # Alias fakename realname
   
-! Alias /icons/ /usr/local/etc/httpd/icons/
+! #Alias /icons/ /usr/local/etc/httpd/icons/
   
   # ScriptAlias: This controls which directories contain server scripts.
   # Format: ScriptAlias fakename realname
   
-! ScriptAlias /cgi-bin/ /usr/local/etc/httpd/cgi-bin/
+! #ScriptAlias /cgi-bin/ /usr/local/etc/httpd/cgi-bin/
   
   # If you want to use server side includes, or CGI outside
   # ScriptAliased directories, uncomment the following lines.
---- 118,129 ----
+--- 131,142 ----
   # Aliases: Add here as many aliases as you need (with no limit). The format is 
   # Alias fakename realname
   
diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index 81575c1b2c22..4fefa7a61fbe 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -1,25 +1,21 @@
 # New ports collection makefile for:    apache HTTPD
-# Version required:     1.0.5
+# Version required:     1.1.1
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.12 1996/06/15 16:58:06 jkh Exp $
+# $Id: Makefile,v 1.13 1996/06/15 17:51:08 jkh Exp $
 #
 
-DISTNAME=       apache_1.0.5
-PKGNAME=        apache-1.0.5
+DISTNAME=       apache_1.1.1
+PKGNAME=        apache-1.1.1
 CATEGORIES+=	www
-MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
-		ftp://www.apache.org/apache/dist/contrib/modules/
-DISTFILES=      ${DISTNAME}.tar.gz mod_env.c
+MASTER_SITES=   ftp://www.apache.org/apache/dist/
+DISTFILES=      ${DISTNAME}.tar.gz
 
 MAINTAINER=	pst@freebsd.org
 
 EXTRACT_ONLY=   ${DISTNAME}.tar.gz
 
-post-extract:
-	cp ${DISTDIR}/mod_env.c ${WRKSRC}/src
-
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
diff --git a/www/mod_php3/distinfo b/www/mod_php3/distinfo
index f9a8d1e1a60a..1426022ab32e 100644
--- a/www/mod_php3/distinfo
+++ b/www/mod_php3/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.0.5.tar.gz) = b69c2ba49679dbdc2b21091b8372815a
-MD5 (mod_env.c) = 5845f6e9f86623d2cebe534012004ae2
+MD5 (apache_1.1.1.tar.gz) = 0dc9c3a3148d2acf419dd926018003c3
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 81575c1b2c22..4fefa7a61fbe 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -1,25 +1,21 @@
 # New ports collection makefile for:    apache HTTPD
-# Version required:     1.0.5
+# Version required:     1.1.1
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.12 1996/06/15 16:58:06 jkh Exp $
+# $Id: Makefile,v 1.13 1996/06/15 17:51:08 jkh Exp $
 #
 
-DISTNAME=       apache_1.0.5
-PKGNAME=        apache-1.0.5
+DISTNAME=       apache_1.1.1
+PKGNAME=        apache-1.1.1
 CATEGORIES+=	www
-MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
-		ftp://www.apache.org/apache/dist/contrib/modules/
-DISTFILES=      ${DISTNAME}.tar.gz mod_env.c
+MASTER_SITES=   ftp://www.apache.org/apache/dist/
+DISTFILES=      ${DISTNAME}.tar.gz
 
 MAINTAINER=	pst@freebsd.org
 
 EXTRACT_ONLY=   ${DISTNAME}.tar.gz
 
-post-extract:
-	cp ${DISTDIR}/mod_env.c ${WRKSRC}/src
-
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index f9a8d1e1a60a..1426022ab32e 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.0.5.tar.gz) = b69c2ba49679dbdc2b21091b8372815a
-MD5 (mod_env.c) = 5845f6e9f86623d2cebe534012004ae2
+MD5 (apache_1.1.1.tar.gz) = 0dc9c3a3148d2acf419dd926018003c3
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 81575c1b2c22..4fefa7a61fbe 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -1,25 +1,21 @@
 # New ports collection makefile for:    apache HTTPD
-# Version required:     1.0.5
+# Version required:     1.1.1
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.12 1996/06/15 16:58:06 jkh Exp $
+# $Id: Makefile,v 1.13 1996/06/15 17:51:08 jkh Exp $
 #
 
-DISTNAME=       apache_1.0.5
-PKGNAME=        apache-1.0.5
+DISTNAME=       apache_1.1.1
+PKGNAME=        apache-1.1.1
 CATEGORIES+=	www
-MASTER_SITES=	ftp://www.apache.org/apache/dist/ \
-		ftp://www.apache.org/apache/dist/contrib/modules/
-DISTFILES=      ${DISTNAME}.tar.gz mod_env.c
+MASTER_SITES=   ftp://www.apache.org/apache/dist/
+DISTFILES=      ${DISTNAME}.tar.gz
 
 MAINTAINER=	pst@freebsd.org
 
 EXTRACT_ONLY=   ${DISTNAME}.tar.gz
 
-post-extract:
-	cp ${DISTDIR}/mod_env.c ${WRKSRC}/src
-
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index f9a8d1e1a60a..1426022ab32e 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,2 +1 @@
-MD5 (apache_1.0.5.tar.gz) = b69c2ba49679dbdc2b21091b8372815a
-MD5 (mod_env.c) = 5845f6e9f86623d2cebe534012004ae2
+MD5 (apache_1.1.1.tar.gz) = 0dc9c3a3148d2acf419dd926018003c3