Upgrade to 1.2b11

22 files changed, 61 insertions, 291 deletions

diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 8a2c091c315f..98bb0f48b00d 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    apache HTTPD and HTTPSD
-# Version required:     1.2b10
+# Version required:     1.2b11
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.29 1997/04/14 18:54:26 ache Exp $
+# $Id: Makefile,v 1.30 1997/05/02 18:22:03 ache Exp $
 #
 
-DISTNAME=       apache_1.2b10
-PKGNAME=        apache-1.2b10
+DISTNAME=       apache_1.2b11
+PKGNAME=        apache-1.2b11
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
@@ -23,7 +23,7 @@ MAINTAINER=	markm@freebsd.org
 # SECURE_SERVER - build Apache with SSL
 
 .if defined(DIR_ACHE)
-PATCH_SITES+=   http://www.nagual.ru/~ache/
+PATCH_SITES+=   http://www.nagual.pp.ru/~ache/
 PATCHFILES+=    dir.patch
 VERS_ID=        dir/ache
 .endif
diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 8a2c091c315f..98bb0f48b00d 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    apache HTTPD and HTTPSD
-# Version required:     1.2b10
+# Version required:     1.2b11
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.29 1997/04/14 18:54:26 ache Exp $
+# $Id: Makefile,v 1.30 1997/05/02 18:22:03 ache Exp $
 #
 
-DISTNAME=       apache_1.2b10
-PKGNAME=        apache-1.2b10
+DISTNAME=       apache_1.2b11
+PKGNAME=        apache-1.2b11
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
@@ -23,7 +23,7 @@ MAINTAINER=	markm@freebsd.org
 # SECURE_SERVER - build Apache with SSL
 
 .if defined(DIR_ACHE)
-PATCH_SITES+=   http://www.nagual.ru/~ache/
+PATCH_SITES+=   http://www.nagual.pp.ru/~ache/
 PATCHFILES+=    dir.patch
 VERS_ID=        dir/ache
 .endif
diff --git a/www/apache13/distinfo b/www/apache13/distinfo
index a8005b576604..157900f9faa1 100644
--- a/www/apache13/distinfo
+++ b/www/apache13/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2b10.tar.gz) = c02f12c9da63fcc0a2c28ed6faed3820
-MD5 (dir.patch) = ebc8d7d2b1970cd02b179f747c1209c5
+MD5 (apache_1.2b11.tar.gz) = 56b492e80c693e7f490c95d91a7036c5
+MD5 (dir.patch) = b6170b285243300221867d03db55da8b
diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab
index 6ad43dec5264..19eed9e69a58 100644
--- a/www/apache13/files/patch-ab
+++ b/www/apache13/files/patch-ab
@@ -34,49 +34,3 @@
   AllowOverride None
   Options None
   </Directory>
-*** 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
-  # symbolic links and aliases may be used to point to other locations.
-  
-! DocumentRoot /usr/local/etc/httpd/htdocs
-  
-  # UserDir: The name of the directory which is appended onto a user's home
-  # directory if a ~user request is recieved.
---- 12,18 ----
-  # documents. By default, all requests are taken from this directory, but
-  # symbolic links and aliases may be used to point to other locations.
-  
-! DocumentRoot /usr/local/www/data
-  
-  # UserDir: The name of the directory which is appended onto a user's home
-  # directory if a ~user request is recieved.
-***************
-*** 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/
-  
-  # ScriptAlias: This controls which directories contain server scripts.
-  # Format: ScriptAlias fakename realname
-  
-! #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.
---- 131,142 ----
-  # Aliases: Add here as many aliases as you need (with no limit). The format is 
-  # Alias fakename realname
-  
-! Alias /icons/ /usr/local/www/icons/
-  
-  # ScriptAlias: This controls which directories contain server scripts.
-  # Format: ScriptAlias fakename realname
-  
-! ScriptAlias /cgi-bin/ /usr/local/www/cgi-bin/
-  
-  # If you want to use server side includes, or CGI outside
-  # ScriptAliased directories, uncomment the following lines.
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 8a2c091c315f..98bb0f48b00d 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    apache HTTPD and HTTPSD
-# Version required:     1.2b10
+# Version required:     1.2b11
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.29 1997/04/14 18:54:26 ache Exp $
+# $Id: Makefile,v 1.30 1997/05/02 18:22:03 ache Exp $
 #
 
-DISTNAME=       apache_1.2b10
-PKGNAME=        apache-1.2b10
+DISTNAME=       apache_1.2b11
+PKGNAME=        apache-1.2b11
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
@@ -23,7 +23,7 @@ MAINTAINER=	markm@freebsd.org
 # SECURE_SERVER - build Apache with SSL
 
 .if defined(DIR_ACHE)
-PATCH_SITES+=   http://www.nagual.ru/~ache/
+PATCH_SITES+=   http://www.nagual.pp.ru/~ache/
 PATCHFILES+=    dir.patch
 VERS_ID=        dir/ache
 .endif
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index a8005b576604..157900f9faa1 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2b10.tar.gz) = c02f12c9da63fcc0a2c28ed6faed3820
-MD5 (dir.patch) = ebc8d7d2b1970cd02b179f747c1209c5
+MD5 (apache_1.2b11.tar.gz) = 56b492e80c693e7f490c95d91a7036c5
+MD5 (dir.patch) = b6170b285243300221867d03db55da8b
diff --git a/www/apache2/files/patch-ab b/www/apache2/files/patch-ab
index 6ad43dec5264..19eed9e69a58 100644
--- a/www/apache2/files/patch-ab
+++ b/www/apache2/files/patch-ab
@@ -34,49 +34,3 @@
   AllowOverride None
   Options None
   </Directory>
-*** 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
-  # symbolic links and aliases may be used to point to other locations.
-  
-! DocumentRoot /usr/local/etc/httpd/htdocs
-  
-  # UserDir: The name of the directory which is appended onto a user's home
-  # directory if a ~user request is recieved.
---- 12,18 ----
-  # documents. By default, all requests are taken from this directory, but
-  # symbolic links and aliases may be used to point to other locations.
-  
-! DocumentRoot /usr/local/www/data
-  
-  # UserDir: The name of the directory which is appended onto a user's home
-  # directory if a ~user request is recieved.
-***************
-*** 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/
-  
-  # ScriptAlias: This controls which directories contain server scripts.
-  # Format: ScriptAlias fakename realname
-  
-! #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.
---- 131,142 ----
-  # Aliases: Add here as many aliases as you need (with no limit). The format is 
-  # Alias fakename realname
-  
-! Alias /icons/ /usr/local/www/icons/
-  
-  # ScriptAlias: This controls which directories contain server scripts.
-  # Format: ScriptAlias fakename realname
-  
-! ScriptAlias /cgi-bin/ /usr/local/www/cgi-bin/
-  
-  # If you want to use server side includes, or CGI outside
-  # ScriptAliased directories, uncomment the following lines.
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 8a2c091c315f..98bb0f48b00d 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    apache HTTPD and HTTPSD
-# Version required:     1.2b10
+# Version required:     1.2b11
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.29 1997/04/14 18:54:26 ache Exp $
+# $Id: Makefile,v 1.30 1997/05/02 18:22:03 ache Exp $
 #
 
-DISTNAME=       apache_1.2b10
-PKGNAME=        apache-1.2b10
+DISTNAME=       apache_1.2b11
+PKGNAME=        apache-1.2b11
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
@@ -23,7 +23,7 @@ MAINTAINER=	markm@freebsd.org
 # SECURE_SERVER - build Apache with SSL
 
 .if defined(DIR_ACHE)
-PATCH_SITES+=   http://www.nagual.ru/~ache/
+PATCH_SITES+=   http://www.nagual.pp.ru/~ache/
 PATCHFILES+=    dir.patch
 VERS_ID=        dir/ache
 .endif
diff --git a/www/apache20/distinfo b/www/apache20/distinfo
index a8005b576604..157900f9faa1 100644
--- a/www/apache20/distinfo
+++ b/www/apache20/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2b10.tar.gz) = c02f12c9da63fcc0a2c28ed6faed3820
-MD5 (dir.patch) = ebc8d7d2b1970cd02b179f747c1209c5
+MD5 (apache_1.2b11.tar.gz) = 56b492e80c693e7f490c95d91a7036c5
+MD5 (dir.patch) = b6170b285243300221867d03db55da8b
diff --git a/www/apache20/files/patch-ab b/www/apache20/files/patch-ab
index 6ad43dec5264..19eed9e69a58 100644
--- a/www/apache20/files/patch-ab
+++ b/www/apache20/files/patch-ab
@@ -34,49 +34,3 @@
   AllowOverride None
   Options None
   </Directory>
-*** 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
-  # symbolic links and aliases may be used to point to other locations.
-  
-! DocumentRoot /usr/local/etc/httpd/htdocs
-  
-  # UserDir: The name of the directory which is appended onto a user's home
-  # directory if a ~user request is recieved.
---- 12,18 ----
-  # documents. By default, all requests are taken from this directory, but
-  # symbolic links and aliases may be used to point to other locations.
-  
-! DocumentRoot /usr/local/www/data
-  
-  # UserDir: The name of the directory which is appended onto a user's home
-  # directory if a ~user request is recieved.
-***************
-*** 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/
-  
-  # ScriptAlias: This controls which directories contain server scripts.
-  # Format: ScriptAlias fakename realname
-  
-! #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.
---- 131,142 ----
-  # Aliases: Add here as many aliases as you need (with no limit). The format is 
-  # Alias fakename realname
-  
-! Alias /icons/ /usr/local/www/icons/
-  
-  # ScriptAlias: This controls which directories contain server scripts.
-  # Format: ScriptAlias fakename realname
-  
-! ScriptAlias /cgi-bin/ /usr/local/www/cgi-bin/
-  
-  # If you want to use server side includes, or CGI outside
-  # ScriptAliased directories, uncomment the following lines.
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 8a2c091c315f..98bb0f48b00d 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    apache HTTPD and HTTPSD
-# Version required:     1.2b10
+# Version required:     1.2b11
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.29 1997/04/14 18:54:26 ache Exp $
+# $Id: Makefile,v 1.30 1997/05/02 18:22:03 ache Exp $
 #
 
-DISTNAME=       apache_1.2b10
-PKGNAME=        apache-1.2b10
+DISTNAME=       apache_1.2b11
+PKGNAME=        apache-1.2b11
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
@@ -23,7 +23,7 @@ MAINTAINER=	markm@freebsd.org
 # SECURE_SERVER - build Apache with SSL
 
 .if defined(DIR_ACHE)
-PATCH_SITES+=   http://www.nagual.ru/~ache/
+PATCH_SITES+=   http://www.nagual.pp.ru/~ache/
 PATCHFILES+=    dir.patch
 VERS_ID=        dir/ache
 .endif
diff --git a/www/apache21/distinfo b/www/apache21/distinfo
index a8005b576604..157900f9faa1 100644
--- a/www/apache21/distinfo
+++ b/www/apache21/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2b10.tar.gz) = c02f12c9da63fcc0a2c28ed6faed3820
-MD5 (dir.patch) = ebc8d7d2b1970cd02b179f747c1209c5
+MD5 (apache_1.2b11.tar.gz) = 56b492e80c693e7f490c95d91a7036c5
+MD5 (dir.patch) = b6170b285243300221867d03db55da8b
diff --git a/www/apache21/files/patch-ab b/www/apache21/files/patch-ab
index 6ad43dec5264..19eed9e69a58 100644
--- a/www/apache21/files/patch-ab
+++ b/www/apache21/files/patch-ab
@@ -34,49 +34,3 @@
   AllowOverride None
   Options None
   </Directory>
-*** 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
-  # symbolic links and aliases may be used to point to other locations.
-  
-! DocumentRoot /usr/local/etc/httpd/htdocs
-  
-  # UserDir: The name of the directory which is appended onto a user's home
-  # directory if a ~user request is recieved.
---- 12,18 ----
-  # documents. By default, all requests are taken from this directory, but
-  # symbolic links and aliases may be used to point to other locations.
-  
-! DocumentRoot /usr/local/www/data
-  
-  # UserDir: The name of the directory which is appended onto a user's home
-  # directory if a ~user request is recieved.
-***************
-*** 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/
-  
-  # ScriptAlias: This controls which directories contain server scripts.
-  # Format: ScriptAlias fakename realname
-  
-! #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.
---- 131,142 ----
-  # Aliases: Add here as many aliases as you need (with no limit). The format is 
-  # Alias fakename realname
-  
-! Alias /icons/ /usr/local/www/icons/
-  
-  # ScriptAlias: This controls which directories contain server scripts.
-  # Format: ScriptAlias fakename realname
-  
-! ScriptAlias /cgi-bin/ /usr/local/www/cgi-bin/
-  
-  # If you want to use server side includes, or CGI outside
-  # ScriptAliased directories, uncomment the following lines.
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 8a2c091c315f..98bb0f48b00d 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    apache HTTPD and HTTPSD
-# Version required:     1.2b10
+# Version required:     1.2b11
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.29 1997/04/14 18:54:26 ache Exp $
+# $Id: Makefile,v 1.30 1997/05/02 18:22:03 ache Exp $
 #
 
-DISTNAME=       apache_1.2b10
-PKGNAME=        apache-1.2b10
+DISTNAME=       apache_1.2b11
+PKGNAME=        apache-1.2b11
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
@@ -23,7 +23,7 @@ MAINTAINER=	markm@freebsd.org
 # SECURE_SERVER - build Apache with SSL
 
 .if defined(DIR_ACHE)
-PATCH_SITES+=   http://www.nagual.ru/~ache/
+PATCH_SITES+=   http://www.nagual.pp.ru/~ache/
 PATCHFILES+=    dir.patch
 VERS_ID=        dir/ache
 .endif
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index a8005b576604..157900f9faa1 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2b10.tar.gz) = c02f12c9da63fcc0a2c28ed6faed3820
-MD5 (dir.patch) = ebc8d7d2b1970cd02b179f747c1209c5
+MD5 (apache_1.2b11.tar.gz) = 56b492e80c693e7f490c95d91a7036c5
+MD5 (dir.patch) = b6170b285243300221867d03db55da8b
diff --git a/www/apache22/files/patch-ab b/www/apache22/files/patch-ab
index 6ad43dec5264..19eed9e69a58 100644
--- a/www/apache22/files/patch-ab
+++ b/www/apache22/files/patch-ab
@@ -34,49 +34,3 @@
   AllowOverride None
   Options None
   </Directory>
-*** 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
-  # symbolic links and aliases may be used to point to other locations.
-  
-! DocumentRoot /usr/local/etc/httpd/htdocs
-  
-  # UserDir: The name of the directory which is appended onto a user's home
-  # directory if a ~user request is recieved.
---- 12,18 ----
-  # documents. By default, all requests are taken from this directory, but
-  # symbolic links and aliases may be used to point to other locations.
-  
-! DocumentRoot /usr/local/www/data
-  
-  # UserDir: The name of the directory which is appended onto a user's home
-  # directory if a ~user request is recieved.
-***************
-*** 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/
-  
-  # ScriptAlias: This controls which directories contain server scripts.
-  # Format: ScriptAlias fakename realname
-  
-! #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.
---- 131,142 ----
-  # Aliases: Add here as many aliases as you need (with no limit). The format is 
-  # Alias fakename realname
-  
-! Alias /icons/ /usr/local/www/icons/
-  
-  # ScriptAlias: This controls which directories contain server scripts.
-  # Format: ScriptAlias fakename realname
-  
-! ScriptAlias /cgi-bin/ /usr/local/www/cgi-bin/
-  
-  # If you want to use server side includes, or CGI outside
-  # ScriptAliased directories, uncomment the following lines.
diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index 8a2c091c315f..98bb0f48b00d 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    apache HTTPD and HTTPSD
-# Version required:     1.2b10
+# Version required:     1.2b11
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.29 1997/04/14 18:54:26 ache Exp $
+# $Id: Makefile,v 1.30 1997/05/02 18:22:03 ache Exp $
 #
 
-DISTNAME=       apache_1.2b10
-PKGNAME=        apache-1.2b10
+DISTNAME=       apache_1.2b11
+PKGNAME=        apache-1.2b11
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
@@ -23,7 +23,7 @@ MAINTAINER=	markm@freebsd.org
 # SECURE_SERVER - build Apache with SSL
 
 .if defined(DIR_ACHE)
-PATCH_SITES+=   http://www.nagual.ru/~ache/
+PATCH_SITES+=   http://www.nagual.pp.ru/~ache/
 PATCHFILES+=    dir.patch
 VERS_ID=        dir/ache
 .endif
diff --git a/www/mod_php3/distinfo b/www/mod_php3/distinfo
index a8005b576604..157900f9faa1 100644
--- a/www/mod_php3/distinfo
+++ b/www/mod_php3/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2b10.tar.gz) = c02f12c9da63fcc0a2c28ed6faed3820
-MD5 (dir.patch) = ebc8d7d2b1970cd02b179f747c1209c5
+MD5 (apache_1.2b11.tar.gz) = 56b492e80c693e7f490c95d91a7036c5
+MD5 (dir.patch) = b6170b285243300221867d03db55da8b
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 8a2c091c315f..98bb0f48b00d 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    apache HTTPD and HTTPSD
-# Version required:     1.2b10
+# Version required:     1.2b11
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.29 1997/04/14 18:54:26 ache Exp $
+# $Id: Makefile,v 1.30 1997/05/02 18:22:03 ache Exp $
 #
 
-DISTNAME=       apache_1.2b10
-PKGNAME=        apache-1.2b10
+DISTNAME=       apache_1.2b11
+PKGNAME=        apache-1.2b11
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
@@ -23,7 +23,7 @@ MAINTAINER=	markm@freebsd.org
 # SECURE_SERVER - build Apache with SSL
 
 .if defined(DIR_ACHE)
-PATCH_SITES+=   http://www.nagual.ru/~ache/
+PATCH_SITES+=   http://www.nagual.pp.ru/~ache/
 PATCHFILES+=    dir.patch
 VERS_ID=        dir/ache
 .endif
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index a8005b576604..157900f9faa1 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2b10.tar.gz) = c02f12c9da63fcc0a2c28ed6faed3820
-MD5 (dir.patch) = ebc8d7d2b1970cd02b179f747c1209c5
+MD5 (apache_1.2b11.tar.gz) = 56b492e80c693e7f490c95d91a7036c5
+MD5 (dir.patch) = b6170b285243300221867d03db55da8b
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 8a2c091c315f..98bb0f48b00d 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    apache HTTPD and HTTPSD
-# Version required:     1.2b10
+# Version required:     1.2b11
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.29 1997/04/14 18:54:26 ache Exp $
+# $Id: Makefile,v 1.30 1997/05/02 18:22:03 ache Exp $
 #
 
-DISTNAME=       apache_1.2b10
-PKGNAME=        apache-1.2b10
+DISTNAME=       apache_1.2b11
+PKGNAME=        apache-1.2b11
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
@@ -23,7 +23,7 @@ MAINTAINER=	markm@freebsd.org
 # SECURE_SERVER - build Apache with SSL
 
 .if defined(DIR_ACHE)
-PATCH_SITES+=   http://www.nagual.ru/~ache/
+PATCH_SITES+=   http://www.nagual.pp.ru/~ache/
 PATCHFILES+=    dir.patch
 VERS_ID=        dir/ache
 .endif
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index a8005b576604..157900f9faa1 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2b10.tar.gz) = c02f12c9da63fcc0a2c28ed6faed3820
-MD5 (dir.patch) = ebc8d7d2b1970cd02b179f747c1209c5
+MD5 (apache_1.2b11.tar.gz) = 56b492e80c693e7f490c95d91a7036c5
+MD5 (dir.patch) = b6170b285243300221867d03db55da8b