Upgrade to Apache 1.3.9 and mod_ssl 2.4.0.

12 files changed, 69 insertions, 18 deletions

diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index 6cfdc83630f8..3075a2b813c6 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.85 1999/08/19 11:26:45 dirk Exp $
+# $Id: Makefile,v 1.86 1999/08/19 11:55:29 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -47,7 +47,7 @@ Y2K=		http://www.php.net/y2k.php3
 
 PHP_DISTDIR=	distributions
 
-VERSION_APACHE=	1.3.6
+VERSION_APACHE=	1.3.9
 VERSION_PHP=	3.0.12
 
 USE_PERL5=	yes
diff --git a/www/mod_php3/distinfo b/www/mod_php3/distinfo
index 30a70d8d14d0..dc24208d18c9 100644
--- a/www/mod_php3/distinfo
+++ b/www/mod_php3/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
+MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
 MD5 (php-3.0.12.tar.gz) = 0d3b9517f8af17f1cd8c994d6fa26dd7
-MD5 (mod_ssl-2.3.11-1.3.6.tar.gz) = f1c0c7aea63ab09391516999af11e65b
+MD5 (mod_ssl-2.4.0-1.3.9.tar.gz) = 225c82d5d54a0e1c872bfcc7ffdfb0d8
diff --git a/www/mod_php3/pkg-plist b/www/mod_php3/pkg-plist
index fa9eb38c83d0..7a04a7340ad7 100644
--- a/www/mod_php3/pkg-plist
+++ b/www/mod_php3/pkg-plist
@@ -17,6 +17,7 @@ include/apache/ap_config_auto.h
 include/apache/ap_ctype.h
 include/apache/ap_md5.h
 include/apache/ap_mmn.h
+include/apache/ap_sha1.h
 include/apache/buff.h
 include/apache/compat.h
 include/apache/conf.h
@@ -41,6 +42,18 @@ include/apache/util_date.h
 include/apache/util_md5.h
 include/apache/util_script.h
 include/apache/util_uri.h
+include/apache/xml/asciitab.h
+include/apache/xml/hashtable.h
+include/apache/xml/iasciitab.h
+include/apache/xml/latin1tab.h
+include/apache/xml/nametab.h
+include/apache/xml/utf8tab.h
+include/apache/xml/xmldef.h
+include/apache/xml/xmlparse.h
+include/apache/xml/xmlrole.h
+include/apache/xml/xmltok.h
+include/apache/xml/xmltok_impl.h
+libexec/apache/httpd.exp
 libexec/apache/libproxy.so
 libexec/apache/mod_access.so
 libexec/apache/mod_actions.so
@@ -71,6 +84,7 @@ libexec/apache/mod_status.so
 libexec/apache/mod_unique_id.so
 libexec/apache/mod_userdir.so
 libexec/apache/mod_usertrack.so
+libexec/apache/mod_vhost_alias.so
 sbin/ab
 sbin/apache
 sbin/apachectl
@@ -144,6 +158,7 @@ share/apache/htdocs/manual/mod/mod_auth.html
 share/apache/htdocs/manual/mod/mod_auth_anon.html
 share/apache/htdocs/manual/mod/mod_auth_db.html
 share/apache/htdocs/manual/mod/mod_auth_dbm.html
+share/apache/htdocs/manual/mod/mod_auth_digest.html
 share/apache/htdocs/manual/mod/mod_autoindex.html
 share/apache/htdocs/manual/mod/mod_browser.html
 share/apache/htdocs/manual/mod/mod_cern_meta.html
@@ -178,6 +193,7 @@ share/apache/htdocs/manual/mod/mod_status.html
 share/apache/htdocs/manual/mod/mod_unique_id.html
 share/apache/htdocs/manual/mod/mod_userdir.html
 share/apache/htdocs/manual/mod/mod_usertrack.html
+share/apache/htdocs/manual/mod/mod_vhost_alias.html
 share/apache/htdocs/manual/multilogs.html
 share/apache/htdocs/manual/new_features_1_0.html
 share/apache/htdocs/manual/new_features_1_1.html
@@ -326,6 +342,7 @@ share/doc/apache/README
 share/doc/php/CODING_STANDARDS
 share/doc/php/LICENSE
 @dirrm etc/apache
+@dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
 @dirrm share/apache/cgi-bin
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index c39fb7f2d3cd..52bcba29d17c 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -117,11 +117,11 @@ BUILD_DEPENDS+=	openssl:\${PORTSDIR}/security/openssl \\
 		\${PREFIX}/lib/libmm.a:\${PORTSDIR}/devel/mm
 RUN_DEPENDS+=	openssl:\${PORTSDIR}/security/openssl
 
-VERSION_MODSSL=	2.3.11
+VERSION_MODSSL=	2.4.0
 
 RESTRICTED=	"Contains cryptography"
 
-CONFIGURE_ARGS+=--enable-module=ssl \
+CONFIGURE_ARGS+=--enable-module=ssl \\
 		--enable-module=define
 CONFIGURE_ENV+=	SSL_BASE='SYSTEM' EAPI_MM='SYSTEM' PATH="\${PREFIX}/bin:\${PATH}"
 
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index e0150e536574..484c80934192 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.88 1999/08/19 11:26:47 dirk Exp $
+# $Id: Makefile,v 1.89 1999/08/19 11:55:29 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -47,7 +47,7 @@ Y2K=		http://www.php.net/y2k.php3
 
 PHP_DISTDIR=	version4/downloads
 
-VERSION_APACHE=	1.3.6
+VERSION_APACHE=	1.3.9
 VERSION_PHP=	4.0b2
 
 NO_LATEST_LINK=	yes
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index 907baf0b96fd..efd4922c0ae8 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
+MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
 MD5 (php-4.0b2.tar.gz) = 509c245c2ec36d227985dd550e94240c
-MD5 (mod_ssl-2.3.11-1.3.6.tar.gz) = f1c0c7aea63ab09391516999af11e65b
+MD5 (mod_ssl-2.4.0-1.3.9.tar.gz) = 225c82d5d54a0e1c872bfcc7ffdfb0d8
diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist
index b0b57499c856..13f394b419cd 100644
--- a/www/mod_php4/pkg-plist
+++ b/www/mod_php4/pkg-plist
@@ -17,6 +17,7 @@ include/apache/ap_config_auto.h
 include/apache/ap_ctype.h
 include/apache/ap_md5.h
 include/apache/ap_mmn.h
+include/apache/ap_sha1.h
 include/apache/buff.h
 include/apache/compat.h
 include/apache/conf.h
@@ -41,6 +42,18 @@ include/apache/util_date.h
 include/apache/util_md5.h
 include/apache/util_script.h
 include/apache/util_uri.h
+include/apache/xml/asciitab.h
+include/apache/xml/hashtable.h
+include/apache/xml/iasciitab.h
+include/apache/xml/latin1tab.h
+include/apache/xml/nametab.h
+include/apache/xml/utf8tab.h
+include/apache/xml/xmldef.h
+include/apache/xml/xmlparse.h
+include/apache/xml/xmlrole.h
+include/apache/xml/xmltok.h
+include/apache/xml/xmltok_impl.h
+libexec/apache/httpd.exp
 libexec/apache/libproxy.so
 libexec/apache/mod_access.so
 libexec/apache/mod_actions.so
@@ -71,6 +84,7 @@ libexec/apache/mod_status.so
 libexec/apache/mod_unique_id.so
 libexec/apache/mod_userdir.so
 libexec/apache/mod_usertrack.so
+libexec/apache/mod_vhost_alias.so
 sbin/ab
 sbin/apache
 sbin/apachectl
@@ -144,6 +158,7 @@ share/apache/htdocs/manual/mod/mod_auth.html
 share/apache/htdocs/manual/mod/mod_auth_anon.html
 share/apache/htdocs/manual/mod/mod_auth_db.html
 share/apache/htdocs/manual/mod/mod_auth_dbm.html
+share/apache/htdocs/manual/mod/mod_auth_digest.html
 share/apache/htdocs/manual/mod/mod_autoindex.html
 share/apache/htdocs/manual/mod/mod_browser.html
 share/apache/htdocs/manual/mod/mod_cern_meta.html
@@ -178,6 +193,7 @@ share/apache/htdocs/manual/mod/mod_status.html
 share/apache/htdocs/manual/mod/mod_unique_id.html
 share/apache/htdocs/manual/mod/mod_userdir.html
 share/apache/htdocs/manual/mod/mod_usertrack.html
+share/apache/htdocs/manual/mod/mod_vhost_alias.html
 share/apache/htdocs/manual/multilogs.html
 share/apache/htdocs/manual/new_features_1_0.html
 share/apache/htdocs/manual/new_features_1_1.html
@@ -322,6 +338,7 @@ share/doc/apache/README
 share/doc/php/CODING_STANDARDS
 share/doc/php/LICENSE
 @dirrm etc/apache
+@dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
 @dirrm share/apache/cgi-bin
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index c39fb7f2d3cd..52bcba29d17c 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -117,11 +117,11 @@ BUILD_DEPENDS+=	openssl:\${PORTSDIR}/security/openssl \\
 		\${PREFIX}/lib/libmm.a:\${PORTSDIR}/devel/mm
 RUN_DEPENDS+=	openssl:\${PORTSDIR}/security/openssl
 
-VERSION_MODSSL=	2.3.11
+VERSION_MODSSL=	2.4.0
 
 RESTRICTED=	"Contains cryptography"
 
-CONFIGURE_ARGS+=--enable-module=ssl \
+CONFIGURE_ARGS+=--enable-module=ssl \\
 		--enable-module=define
 CONFIGURE_ENV+=	SSL_BASE='SYSTEM' EAPI_MM='SYSTEM' PATH="\${PREFIX}/bin:\${PATH}"
 
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index e0150e536574..484c80934192 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  21 Jun 1998 16:09:39 CEST
 # Whom:			Stefan Herrmann <stefan@asterix.webaffairs.net>
 #
-# $Id: Makefile,v 1.88 1999/08/19 11:26:47 dirk Exp $
+# $Id: Makefile,v 1.89 1999/08/19 11:55:29 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -47,7 +47,7 @@ Y2K=		http://www.php.net/y2k.php3
 
 PHP_DISTDIR=	version4/downloads
 
-VERSION_APACHE=	1.3.6
+VERSION_APACHE=	1.3.9
 VERSION_PHP=	4.0b2
 
 NO_LATEST_LINK=	yes
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index 907baf0b96fd..efd4922c0ae8 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
+MD5 (apache_1.3.9.tar.gz) = 880af89251943c67e3614bf2ffb89b32
 MD5 (php-4.0b2.tar.gz) = 509c245c2ec36d227985dd550e94240c
-MD5 (mod_ssl-2.3.11-1.3.6.tar.gz) = f1c0c7aea63ab09391516999af11e65b
+MD5 (mod_ssl-2.4.0-1.3.9.tar.gz) = 225c82d5d54a0e1c872bfcc7ffdfb0d8
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
index b0b57499c856..13f394b419cd 100644
--- a/www/mod_php5/pkg-plist
+++ b/www/mod_php5/pkg-plist
@@ -17,6 +17,7 @@ include/apache/ap_config_auto.h
 include/apache/ap_ctype.h
 include/apache/ap_md5.h
 include/apache/ap_mmn.h
+include/apache/ap_sha1.h
 include/apache/buff.h
 include/apache/compat.h
 include/apache/conf.h
@@ -41,6 +42,18 @@ include/apache/util_date.h
 include/apache/util_md5.h
 include/apache/util_script.h
 include/apache/util_uri.h
+include/apache/xml/asciitab.h
+include/apache/xml/hashtable.h
+include/apache/xml/iasciitab.h
+include/apache/xml/latin1tab.h
+include/apache/xml/nametab.h
+include/apache/xml/utf8tab.h
+include/apache/xml/xmldef.h
+include/apache/xml/xmlparse.h
+include/apache/xml/xmlrole.h
+include/apache/xml/xmltok.h
+include/apache/xml/xmltok_impl.h
+libexec/apache/httpd.exp
 libexec/apache/libproxy.so
 libexec/apache/mod_access.so
 libexec/apache/mod_actions.so
@@ -71,6 +84,7 @@ libexec/apache/mod_status.so
 libexec/apache/mod_unique_id.so
 libexec/apache/mod_userdir.so
 libexec/apache/mod_usertrack.so
+libexec/apache/mod_vhost_alias.so
 sbin/ab
 sbin/apache
 sbin/apachectl
@@ -144,6 +158,7 @@ share/apache/htdocs/manual/mod/mod_auth.html
 share/apache/htdocs/manual/mod/mod_auth_anon.html
 share/apache/htdocs/manual/mod/mod_auth_db.html
 share/apache/htdocs/manual/mod/mod_auth_dbm.html
+share/apache/htdocs/manual/mod/mod_auth_digest.html
 share/apache/htdocs/manual/mod/mod_autoindex.html
 share/apache/htdocs/manual/mod/mod_browser.html
 share/apache/htdocs/manual/mod/mod_cern_meta.html
@@ -178,6 +193,7 @@ share/apache/htdocs/manual/mod/mod_status.html
 share/apache/htdocs/manual/mod/mod_unique_id.html
 share/apache/htdocs/manual/mod/mod_userdir.html
 share/apache/htdocs/manual/mod/mod_usertrack.html
+share/apache/htdocs/manual/mod/mod_vhost_alias.html
 share/apache/htdocs/manual/multilogs.html
 share/apache/htdocs/manual/new_features_1_0.html
 share/apache/htdocs/manual/new_features_1_1.html
@@ -322,6 +338,7 @@ share/doc/apache/README
 share/doc/php/CODING_STANDARDS
 share/doc/php/LICENSE
 @dirrm etc/apache
+@dirrm include/apache/xml
 @dirrm include/apache
 @dirrm libexec/apache
 @dirrm share/apache/cgi-bin
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index c39fb7f2d3cd..52bcba29d17c 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -117,11 +117,11 @@ BUILD_DEPENDS+=	openssl:\${PORTSDIR}/security/openssl \\
 		\${PREFIX}/lib/libmm.a:\${PORTSDIR}/devel/mm
 RUN_DEPENDS+=	openssl:\${PORTSDIR}/security/openssl
 
-VERSION_MODSSL=	2.3.11
+VERSION_MODSSL=	2.4.0
 
 RESTRICTED=	"Contains cryptography"
 
-CONFIGURE_ARGS+=--enable-module=ssl \
+CONFIGURE_ARGS+=--enable-module=ssl \\
 		--enable-module=define
 CONFIGURE_ENV+=	SSL_BASE='SYSTEM' EAPI_MM='SYSTEM' PATH="\${PREFIX}/bin:\${PATH}"