Upgrade to Apache 1.3.4 and mod_ssl 2.1.7.

12 files changed, 123 insertions, 15 deletions

diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index 14495a3a0f4b..b26e89a9d681 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -22,7 +22,7 @@ MAINTAINER=	dirk@FreeBSD.ORG
 
 Y2K=		http://www.php.net/y2k.php3
 
-VERSION_APACHE=	1.3.3
+VERSION_APACHE=	1.3.4
 VERSION_PHP3=	3.0.6
 
 #
@@ -31,6 +31,7 @@ VERSION_PHP3=	3.0.6
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= \
+		 --with-layout=GNU \
 		 --sysconfdir=${PREFIX}/etc/apache \
 		 --includedir=${PREFIX}/include/apache \
 		 --logfiledir=/var/log \
diff --git a/www/mod_php3/distinfo b/www/mod_php3/distinfo
index 20fabdf78798..7cdbf002a0bd 100644
--- a/www/mod_php3/distinfo
+++ b/www/mod_php3/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae
+MD5 (apache_1.3.4.tar.gz) = eab1d93bc17e7d9fcf87dc9fa744a9d3
 MD5 (php-3.0.6.tar.gz) = 96515bee666334462ce3c8562334ab8c
-MD5 (mod_ssl-2.1.6-1.3.3.tar.gz) = 1c2d245c199421de0ae94f127eba03fc
+MD5 (mod_ssl-2.1.7-1.3.4.tar.gz) = 03e0db5d710b40481bab9e66ba5e36ad
diff --git a/www/mod_php3/pkg-plist b/www/mod_php3/pkg-plist
index f87fa9c662eb..aded546511f5 100644
--- a/www/mod_php3/pkg-plist
+++ b/www/mod_php3/pkg-plist
@@ -36,6 +36,7 @@ include/apache/http_request.h
 include/apache/http_vhost.h
 include/apache/httpd.h
 include/apache/multithread.h
+include/apache/os-inline.c
 include/apache/os.h
 include/apache/rfc1413.h
 include/apache/scoreboard.h
@@ -89,6 +90,7 @@ share/doc/apache/manual/images/mod_rewrite_fig2.fig
 share/doc/apache/manual/images/mod_rewrite_fig2.gif
 share/doc/apache/manual/images/sub.gif
 share/doc/apache/manual/index.html
+share/doc/apache/manual/install-tpf.html
 share/doc/apache/manual/install.html
 share/doc/apache/manual/invoking.html
 share/doc/apache/manual/keepalive.html
@@ -170,10 +172,12 @@ share/doc/apache/manual/new_features_1_1.html
 share/doc/apache/manual/new_features_1_2.html
 share/doc/apache/manual/new_features_1_3.html
 share/doc/apache/manual/process-model.html
+share/doc/apache/manual/readme-tpf.html
 share/doc/apache/manual/sections.html
 share/doc/apache/manual/sourcereorg.html
 share/doc/apache/manual/stopping.html
 share/doc/apache/manual/suexec.html
+share/doc/apache/manual/suexec_1_2.html
 share/doc/apache/manual/unixware.html
 share/doc/apache/manual/upgrading_to_1_3.html
 share/doc/apache/manual/vhosts/details.html
@@ -260,6 +264,36 @@ www/icons/right.gif
 www/icons/screw1.gif
 www/icons/screw2.gif
 www/icons/script.gif
+www/icons/small/README.txt
+www/icons/small/back.gif
+www/icons/small/binary.gif
+www/icons/small/binhex.gif
+www/icons/small/blank.gif
+www/icons/small/broken.gif
+www/icons/small/burst.gif
+www/icons/small/comp1.gif
+www/icons/small/comp2.gif
+www/icons/small/compressed.gif
+www/icons/small/continued.gif
+www/icons/small/dir.gif
+www/icons/small/dir2.gif
+www/icons/small/forward.gif
+www/icons/small/generic.gif
+www/icons/small/generic2.gif
+www/icons/small/generic3.gif
+www/icons/small/image.gif
+www/icons/small/image2.gif
+www/icons/small/index.gif
+www/icons/small/key.gif
+www/icons/small/movie.gif
+www/icons/small/rainbow.gif
+www/icons/small/sound.gif
+www/icons/small/sound2.gif
+www/icons/small/tar.gif
+www/icons/small/text.gif
+www/icons/small/transfer.gif
+www/icons/small/unknown.gif
+www/icons/small/uu.gif
 www/icons/sound1.gif
 www/icons/sound2.gif
 www/icons/sphere1.gif
@@ -290,6 +324,7 @@ www/data/index.html
 www/data/manual
 @dirrm www/cgi-bin
 @dirrm www/data
+@dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy
 @dirrm www
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index ae64efca8b32..df97a974aefe 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -80,7 +80,7 @@ while [ "$1" ]; do
 			;;
 		\"modssl\")
 			cat << EOF >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-PKGNAME=	apache-php\${VERSION_PHP3}-\${VERSION_APACHE}+mod_ssl-\${VERSION_MODSSL}
+PKGNAME=	apache-php3-\${VERSION_APACHE}+mod_ssl-\${VERSION_MODSSL}
 MASTER_SITES+=	http://www.engelschall.com/sw/mod_ssl/distrib/ \\
 		ftp://ftp.engelschall.com/sw/mod_ssl/ \\
 		ftp://ftp.nvg.ntnu.no/pub/unix/mod_ssl/ \\
@@ -98,7 +98,7 @@ BUILD_DEPENDS+=	ssleay:\${PORTSDIR}/security/openssl \\
 		\${PREFIX}/lib/libcrypto.a:\${PORTSDIR}/security/openssl
 RUN_DEPENDS+=	ssleay:\${PORTSDIR}/security/openssl
 
-VERSION_MODSSL=	2.1.6
+VERSION_MODSSL=	2.1.7
 
 RESTRICTED=	"Contains cryptography"
 
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 14495a3a0f4b..b26e89a9d681 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -22,7 +22,7 @@ MAINTAINER=	dirk@FreeBSD.ORG
 
 Y2K=		http://www.php.net/y2k.php3
 
-VERSION_APACHE=	1.3.3
+VERSION_APACHE=	1.3.4
 VERSION_PHP3=	3.0.6
 
 #
@@ -31,6 +31,7 @@ VERSION_PHP3=	3.0.6
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= \
+		 --with-layout=GNU \
 		 --sysconfdir=${PREFIX}/etc/apache \
 		 --includedir=${PREFIX}/include/apache \
 		 --logfiledir=/var/log \
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index 20fabdf78798..7cdbf002a0bd 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae
+MD5 (apache_1.3.4.tar.gz) = eab1d93bc17e7d9fcf87dc9fa744a9d3
 MD5 (php-3.0.6.tar.gz) = 96515bee666334462ce3c8562334ab8c
-MD5 (mod_ssl-2.1.6-1.3.3.tar.gz) = 1c2d245c199421de0ae94f127eba03fc
+MD5 (mod_ssl-2.1.7-1.3.4.tar.gz) = 03e0db5d710b40481bab9e66ba5e36ad
diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist
index f87fa9c662eb..aded546511f5 100644
--- a/www/mod_php4/pkg-plist
+++ b/www/mod_php4/pkg-plist
@@ -36,6 +36,7 @@ include/apache/http_request.h
 include/apache/http_vhost.h
 include/apache/httpd.h
 include/apache/multithread.h
+include/apache/os-inline.c
 include/apache/os.h
 include/apache/rfc1413.h
 include/apache/scoreboard.h
@@ -89,6 +90,7 @@ share/doc/apache/manual/images/mod_rewrite_fig2.fig
 share/doc/apache/manual/images/mod_rewrite_fig2.gif
 share/doc/apache/manual/images/sub.gif
 share/doc/apache/manual/index.html
+share/doc/apache/manual/install-tpf.html
 share/doc/apache/manual/install.html
 share/doc/apache/manual/invoking.html
 share/doc/apache/manual/keepalive.html
@@ -170,10 +172,12 @@ share/doc/apache/manual/new_features_1_1.html
 share/doc/apache/manual/new_features_1_2.html
 share/doc/apache/manual/new_features_1_3.html
 share/doc/apache/manual/process-model.html
+share/doc/apache/manual/readme-tpf.html
 share/doc/apache/manual/sections.html
 share/doc/apache/manual/sourcereorg.html
 share/doc/apache/manual/stopping.html
 share/doc/apache/manual/suexec.html
+share/doc/apache/manual/suexec_1_2.html
 share/doc/apache/manual/unixware.html
 share/doc/apache/manual/upgrading_to_1_3.html
 share/doc/apache/manual/vhosts/details.html
@@ -260,6 +264,36 @@ www/icons/right.gif
 www/icons/screw1.gif
 www/icons/screw2.gif
 www/icons/script.gif
+www/icons/small/README.txt
+www/icons/small/back.gif
+www/icons/small/binary.gif
+www/icons/small/binhex.gif
+www/icons/small/blank.gif
+www/icons/small/broken.gif
+www/icons/small/burst.gif
+www/icons/small/comp1.gif
+www/icons/small/comp2.gif
+www/icons/small/compressed.gif
+www/icons/small/continued.gif
+www/icons/small/dir.gif
+www/icons/small/dir2.gif
+www/icons/small/forward.gif
+www/icons/small/generic.gif
+www/icons/small/generic2.gif
+www/icons/small/generic3.gif
+www/icons/small/image.gif
+www/icons/small/image2.gif
+www/icons/small/index.gif
+www/icons/small/key.gif
+www/icons/small/movie.gif
+www/icons/small/rainbow.gif
+www/icons/small/sound.gif
+www/icons/small/sound2.gif
+www/icons/small/tar.gif
+www/icons/small/text.gif
+www/icons/small/transfer.gif
+www/icons/small/unknown.gif
+www/icons/small/uu.gif
 www/icons/sound1.gif
 www/icons/sound2.gif
 www/icons/sphere1.gif
@@ -290,6 +324,7 @@ www/data/index.html
 www/data/manual
 @dirrm www/cgi-bin
 @dirrm www/data
+@dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy
 @dirrm www
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index ae64efca8b32..df97a974aefe 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -80,7 +80,7 @@ while [ "$1" ]; do
 			;;
 		\"modssl\")
 			cat << EOF >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-PKGNAME=	apache-php\${VERSION_PHP3}-\${VERSION_APACHE}+mod_ssl-\${VERSION_MODSSL}
+PKGNAME=	apache-php3-\${VERSION_APACHE}+mod_ssl-\${VERSION_MODSSL}
 MASTER_SITES+=	http://www.engelschall.com/sw/mod_ssl/distrib/ \\
 		ftp://ftp.engelschall.com/sw/mod_ssl/ \\
 		ftp://ftp.nvg.ntnu.no/pub/unix/mod_ssl/ \\
@@ -98,7 +98,7 @@ BUILD_DEPENDS+=	ssleay:\${PORTSDIR}/security/openssl \\
 		\${PREFIX}/lib/libcrypto.a:\${PORTSDIR}/security/openssl
 RUN_DEPENDS+=	ssleay:\${PORTSDIR}/security/openssl
 
-VERSION_MODSSL=	2.1.6
+VERSION_MODSSL=	2.1.7
 
 RESTRICTED=	"Contains cryptography"
 
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 14495a3a0f4b..b26e89a9d681 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -22,7 +22,7 @@ MAINTAINER=	dirk@FreeBSD.ORG
 
 Y2K=		http://www.php.net/y2k.php3
 
-VERSION_APACHE=	1.3.3
+VERSION_APACHE=	1.3.4
 VERSION_PHP3=	3.0.6
 
 #
@@ -31,6 +31,7 @@ VERSION_PHP3=	3.0.6
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= \
+		 --with-layout=GNU \
 		 --sysconfdir=${PREFIX}/etc/apache \
 		 --includedir=${PREFIX}/include/apache \
 		 --logfiledir=/var/log \
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index 20fabdf78798..7cdbf002a0bd 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache_1.3.3.tar.gz) = bb6f14bbb369097a55969482d395d1ae
+MD5 (apache_1.3.4.tar.gz) = eab1d93bc17e7d9fcf87dc9fa744a9d3
 MD5 (php-3.0.6.tar.gz) = 96515bee666334462ce3c8562334ab8c
-MD5 (mod_ssl-2.1.6-1.3.3.tar.gz) = 1c2d245c199421de0ae94f127eba03fc
+MD5 (mod_ssl-2.1.7-1.3.4.tar.gz) = 03e0db5d710b40481bab9e66ba5e36ad
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
index f87fa9c662eb..aded546511f5 100644
--- a/www/mod_php5/pkg-plist
+++ b/www/mod_php5/pkg-plist
@@ -36,6 +36,7 @@ include/apache/http_request.h
 include/apache/http_vhost.h
 include/apache/httpd.h
 include/apache/multithread.h
+include/apache/os-inline.c
 include/apache/os.h
 include/apache/rfc1413.h
 include/apache/scoreboard.h
@@ -89,6 +90,7 @@ share/doc/apache/manual/images/mod_rewrite_fig2.fig
 share/doc/apache/manual/images/mod_rewrite_fig2.gif
 share/doc/apache/manual/images/sub.gif
 share/doc/apache/manual/index.html
+share/doc/apache/manual/install-tpf.html
 share/doc/apache/manual/install.html
 share/doc/apache/manual/invoking.html
 share/doc/apache/manual/keepalive.html
@@ -170,10 +172,12 @@ share/doc/apache/manual/new_features_1_1.html
 share/doc/apache/manual/new_features_1_2.html
 share/doc/apache/manual/new_features_1_3.html
 share/doc/apache/manual/process-model.html
+share/doc/apache/manual/readme-tpf.html
 share/doc/apache/manual/sections.html
 share/doc/apache/manual/sourcereorg.html
 share/doc/apache/manual/stopping.html
 share/doc/apache/manual/suexec.html
+share/doc/apache/manual/suexec_1_2.html
 share/doc/apache/manual/unixware.html
 share/doc/apache/manual/upgrading_to_1_3.html
 share/doc/apache/manual/vhosts/details.html
@@ -260,6 +264,36 @@ www/icons/right.gif
 www/icons/screw1.gif
 www/icons/screw2.gif
 www/icons/script.gif
+www/icons/small/README.txt
+www/icons/small/back.gif
+www/icons/small/binary.gif
+www/icons/small/binhex.gif
+www/icons/small/blank.gif
+www/icons/small/broken.gif
+www/icons/small/burst.gif
+www/icons/small/comp1.gif
+www/icons/small/comp2.gif
+www/icons/small/compressed.gif
+www/icons/small/continued.gif
+www/icons/small/dir.gif
+www/icons/small/dir2.gif
+www/icons/small/forward.gif
+www/icons/small/generic.gif
+www/icons/small/generic2.gif
+www/icons/small/generic3.gif
+www/icons/small/image.gif
+www/icons/small/image2.gif
+www/icons/small/index.gif
+www/icons/small/key.gif
+www/icons/small/movie.gif
+www/icons/small/rainbow.gif
+www/icons/small/sound.gif
+www/icons/small/sound2.gif
+www/icons/small/tar.gif
+www/icons/small/text.gif
+www/icons/small/transfer.gif
+www/icons/small/unknown.gif
+www/icons/small/uu.gif
 www/icons/sound1.gif
 www/icons/sound2.gif
 www/icons/sphere1.gif
@@ -290,6 +324,7 @@ www/data/index.html
 www/data/manual
 @dirrm www/cgi-bin
 @dirrm www/data
+@dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy
 @dirrm www
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index ae64efca8b32..df97a974aefe 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -80,7 +80,7 @@ while [ "$1" ]; do
 			;;
 		\"modssl\")
 			cat << EOF >> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-PKGNAME=	apache-php\${VERSION_PHP3}-\${VERSION_APACHE}+mod_ssl-\${VERSION_MODSSL}
+PKGNAME=	apache-php3-\${VERSION_APACHE}+mod_ssl-\${VERSION_MODSSL}
 MASTER_SITES+=	http://www.engelschall.com/sw/mod_ssl/distrib/ \\
 		ftp://ftp.engelschall.com/sw/mod_ssl/ \\
 		ftp://ftp.nvg.ntnu.no/pub/unix/mod_ssl/ \\
@@ -98,7 +98,7 @@ BUILD_DEPENDS+=	ssleay:\${PORTSDIR}/security/openssl \\
 		\${PREFIX}/lib/libcrypto.a:\${PORTSDIR}/security/openssl
 RUN_DEPENDS+=	ssleay:\${PORTSDIR}/security/openssl
 
-VERSION_MODSSL=	2.1.6
+VERSION_MODSSL=	2.1.7
 
 RESTRICTED=	"Contains cryptography"