Update php5 to version 5.0.5. This is maintenance release, aimed at

bug fixes only with only few and minor new features.

Full changelog available at:
        http://mirrors.inway.cz/ChangeLog-5.php#5.0.5

4 files changed, 12 insertions, 25 deletions

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 3624a83f390..c04106275d1 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.15 2005/09/04 20:13:59 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/09/08 18:49:01 jdolecek Exp $
 #
 
 PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		1
+PKGREVISION=		# empty
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
 COMMENT=		PHP Hypertext Preprocessor version 5
 
 USE_PKGINSTALL=		YES
-USE_TOOLS+=		gmake gzcat
+USE_TOOLS+=		gmake
 LIBTOOL_OVERRIDE=	# empty
 
 .include "Makefile.php"
@@ -20,19 +20,9 @@ CONFIGURE_ARGS+=	--enable-force-cgi-redirect
 CGIDIR=			${PREFIX}/libexec/cgi-bin
 EGDIR=			${PREFIX}/share/examples/php
 
-EXTRACT_ONLY=			${DISTNAME}${EXTRACT_SUFX}
-XMLRPC_DISTFILE=		XML_RPC-1.4.0.tgz
-SITES_${XMLRPC_DISTFILE}=	http://pear.php.net/get/
-DISTFILES=			${EXTRACT_ONLY} ${XMLRPC_DISTFILE}
-
 CONF_FILES=		${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini
 OWN_DIRS=		${PREFIX}/${PHP_EXTENSION_DIR}
 
-post-extract:
-	${RM} -f ${WRKSRC}/pear/packages/XML_RPC-1.2.2.tar
-	${GZCAT} ${DISTDIR}/${XMLRPC_DISTFILE} \
-		>${WRKSRC}/pear/packages/${XMLRPC_DISTFILE:S/.tgz/.tar/}
-
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${PREFIX}/bin/php
 	${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/man/man1/php.1
diff --git a/lang/php5/Makefile.common b/lang/php5/Makefile.common
index bb403215d82..1333ec429c9 100644
--- a/lang/php5/Makefile.common
+++ b/lang/php5/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2005/05/09 18:36:57 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.11 2005/09/08 18:49:01 jdolecek Exp $
 #
 
 DISTNAME?=		php-${PHP_BASE_VERS}
@@ -14,7 +14,7 @@ EXTRACT_SUFX?=		.tar.bz2
 MAINTAINER?=		jdolecek@NetBSD.org
 HOMEPAGE?=		http://www.php.net/
 
-PHP_BASE_VERS=		5.0.4
+PHP_BASE_VERS=		5.0.5
 
 PHP_EXTENSION_DIR=	lib/php/20040412
 PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
diff --git a/lang/php5/PLIST b/lang/php5/PLIST
index b360dea3aec..be90f9d8120 100644
--- a/lang/php5/PLIST
+++ b/lang/php5/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2005/09/03 13:37:36 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/09/08 18:49:01 jdolecek Exp $
 bin/pear
 bin/php
 bin/php-config
-bin/phpextdist
 bin/phpize
 etc/pear.conf
 include/php/TSRM/TSRM.h
@@ -160,7 +159,6 @@ include/php/ext/xml/expat_compat.h
 include/php/ext/xml/php_xml.h
 include/php/main/SAPI.h
 include/php/main/build-defs.h
-include/php/main/config.nw.h
 include/php/main/config.w32.h
 include/php/main/fopen_wrappers.h
 include/php/main/internal_functions_registry.h
@@ -282,7 +280,9 @@ lib/php/test/HTML_Template_IT/tests/test.php
 lib/php/test/XML_RPC/tests/protoport.php
 lib/php/test/XML_RPC/tests/test_Dump.php
 libexec/cgi-bin/php
+man/man1/php-config.1
 man/man1/php.1
+man/man1/phpize.1
 share/examples/php/php.ini-dist
 share/examples/php/php.ini-recommended
 share/php/php.gif
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 5eafb0708b0..001c1693ffd 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.7 2005/09/03 13:37:36 adrianp Exp $
+$NetBSD: distinfo,v 1.8 2005/09/08 18:49:01 jdolecek Exp $
 
-SHA1 (php-5.0.4.tar.bz2) = 37780b89acbc492e0e5c0ace956d1dc1e93bf779
-RMD160 (php-5.0.4.tar.bz2) = c0e0126637527d2e7352b123e102a4231349784e
-Size (php-5.0.4.tar.bz2) = 4731383 bytes
-SHA1 (XML_RPC-1.4.0.tgz) = 461f0b70675a37f524043d19078e9c0502dd13ac
-RMD160 (XML_RPC-1.4.0.tgz) = 8647565c7fa973ac800683d91c32d781fce9437c
-Size (XML_RPC-1.4.0.tgz) = 26776 bytes
+SHA1 (php-5.0.5.tar.bz2) = ffcc050f879265eb96f2c8dc79fa895047da9d4a
+RMD160 (php-5.0.5.tar.bz2) = 6a9a892affba229770154407860cd1c2a098eaf9
+Size (php-5.0.5.tar.bz2) = 4895556 bytes
 SHA1 (patch-aj) = cc68ce876dc5998becbe2f1f74288b5da5bbaca3
 SHA1 (patch-ak) = 0faa523103e0a9a3c01c78c2fe9a64c0a9b2fc43
 SHA1 (patch-al) = 28ad9006b387e2b9984ad49beea21c9d46e63b46