apache13-php4 was repository copied from apache13-php3 (Thanks Satoshi).

Update to PHP-4.0b2:

"PHP 4.0 offers drastic improvements in every aspect - performance
and scalability, features, platform support and extendibility."

See http://www.php.net/version4/ for details.

6 files changed, 12 insertions, 26 deletions

diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 3600db3f800d..79ed1883aad1 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.83 1999/08/10 16:07:26 dirk Exp $
+# $Id: Makefile,v 1.84 1999/08/16 18:41:11 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -36,7 +36,7 @@ MAINTAINER=	dirk@FreeBSD.org
 Y2K=		http://www.php.net/y2k.php3
 
 VERSION_APACHE=	1.3.6
-VERSION_PHP=	3.0.12
+VERSION_PHP=	4.0b2
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
@@ -60,7 +60,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--enable-module=auth_db \
 		--disable-module=auth_dbm \
 		--enable-shared=max \
-		--activate-module=src/modules/php3/libphp3.a
+		--activate-module=src/modules/php4/libphp4.a
 
 OPTIM=		-DHARD_SERVER_LIMIT=512 \
 		-DDEFAULT_PATH=\\"${PREFIX}/bin:/bin:/usr/bin\\"
@@ -120,10 +120,7 @@ post-install:
 		${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
-	${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/php3.ini-dist ${PREFIX}/etc
-.for i in php2 php3 phpi phps
-	${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/extra/icons/$i.gif ${PREFIX}/share/apache/icons
-.endfor
+	${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/php.ini-dist ${PREFIX}/etc
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${APACHEDOCDIR} ${PHPDOCDIR}
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index 258cf6675f98..297f25185fc6 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,3 +1,3 @@
 MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
-MD5 (php-3.0.12.tar.gz) = 0d3b9517f8af17f1cd8c994d6fa26dd7
+MD5 (php-4.0b2.tar.gz) = 509c245c2ec36d227985dd550e94240c
 MD5 (mod_ssl-2.3.10-1.3.6.tar.gz) = be0e441c4a37482387e7651691506102
diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist
index fa9eb38c83d0..b0b57499c856 100644
--- a/www/mod_php4/pkg-plist
+++ b/www/mod_php4/pkg-plist
@@ -7,7 +7,7 @@ etc/apache/magic
 etc/apache/magic.default
 etc/apache/mime.types
 etc/apache/mime.types.default
-etc/php3.ini-dist
+etc/php.ini-dist
 etc/rc.d/apache.sh
 include/apache/alloc.h
 include/apache/ap.h
@@ -253,10 +253,6 @@ share/apache/icons/movie.gif
 share/apache/icons/p.gif
 share/apache/icons/patch.gif
 share/apache/icons/pdf.gif
-share/apache/icons/php2.gif
-share/apache/icons/php3.gif
-share/apache/icons/phpi.gif
-share/apache/icons/phps.gif
 share/apache/icons/pie0.gif
 share/apache/icons/pie1.gif
 share/apache/icons/pie2.gif
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 3600db3f800d..79ed1883aad1 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.83 1999/08/10 16:07:26 dirk Exp $
+# $Id: Makefile,v 1.84 1999/08/16 18:41:11 dirk Exp $
 #
 
 DISTNAME=	apache_${VERSION_APACHE}
@@ -36,7 +36,7 @@ MAINTAINER=	dirk@FreeBSD.org
 Y2K=		http://www.php.net/y2k.php3
 
 VERSION_APACHE=	1.3.6
-VERSION_PHP=	3.0.12
+VERSION_PHP=	4.0b2
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
@@ -60,7 +60,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--enable-module=auth_db \
 		--disable-module=auth_dbm \
 		--enable-shared=max \
-		--activate-module=src/modules/php3/libphp3.a
+		--activate-module=src/modules/php4/libphp4.a
 
 OPTIM=		-DHARD_SERVER_LIMIT=512 \
 		-DDEFAULT_PATH=\\"${PREFIX}/bin:/bin:/usr/bin\\"
@@ -120,10 +120,7 @@ post-install:
 		${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
-	${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/php3.ini-dist ${PREFIX}/etc
-.for i in php2 php3 phpi phps
-	${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/extra/icons/$i.gif ${PREFIX}/share/apache/icons
-.endfor
+	${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP}/php.ini-dist ${PREFIX}/etc
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${APACHEDOCDIR} ${PHPDOCDIR}
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index 258cf6675f98..297f25185fc6 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,3 +1,3 @@
 MD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
-MD5 (php-3.0.12.tar.gz) = 0d3b9517f8af17f1cd8c994d6fa26dd7
+MD5 (php-4.0b2.tar.gz) = 509c245c2ec36d227985dd550e94240c
 MD5 (mod_ssl-2.3.10-1.3.6.tar.gz) = be0e441c4a37482387e7651691506102
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
index fa9eb38c83d0..b0b57499c856 100644
--- a/www/mod_php5/pkg-plist
+++ b/www/mod_php5/pkg-plist
@@ -7,7 +7,7 @@ etc/apache/magic
 etc/apache/magic.default
 etc/apache/mime.types
 etc/apache/mime.types.default
-etc/php3.ini-dist
+etc/php.ini-dist
 etc/rc.d/apache.sh
 include/apache/alloc.h
 include/apache/ap.h
@@ -253,10 +253,6 @@ share/apache/icons/movie.gif
 share/apache/icons/p.gif
 share/apache/icons/patch.gif
 share/apache/icons/pdf.gif
-share/apache/icons/php2.gif
-share/apache/icons/php3.gif
-share/apache/icons/phpi.gif
-share/apache/icons/phps.gif
 share/apache/icons/pie0.gif
 share/apache/icons/pie1.gif
 share/apache/icons/pie2.gif