Update PHP4 package and all PHP4 modules to version 4.3.6.

Changes are bug-fixes mostly, but also synchronizes bundled GD
with GD 2.0.22 and updates PCRE to version 4.5. Several NetBSD
patches were integrated too, so future pkgsrc updates would
be even more smooth.

Full list of changes since PHP 4.3.4 is available at:
	http://www.php.net/ChangeLog-4.php#4.3.6
	http://www.php.net/ChangeLog-4.php#4.3.5

16 files changed, 87 insertions, 104 deletions

diff --git a/databases/php4-ldap/Makefile b/databases/php4-ldap/Makefile
index e38ed5adf2a..cdc334376ff 100644
--- a/databases/php4-ldap/Makefile
+++ b/databases/php4-ldap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/03/26 02:27:36 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/20 19:19:23 jdolecek Exp $
 
 MODNAME=		ldap
-PKGREVISION=		2
+PKGREVISION=		# empty
 CATEGORIES+=		databases
 COMMENT=		PHP4 extension for LDAP database access
 
diff --git a/doc/CHANGES b/doc/CHANGES
index ff4229f0c3f..d5f323bf8ff 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5689 2004/04/20 18:05:06 ben Exp $
+$NetBSD: CHANGES,v 1.5690 2004/04/20 19:19:23 jdolecek Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -2191,3 +2191,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated mathomatic to 11.0bnb1 [minskim 2004-04-20]
 	Added portaudio-18.1 [ben 2004-04-20]
 	Updated audacity to 1.2.0 [ben 2004-04-20]
+	Update php4 to 4.3.6 [jdolecek 2003-04-20]
diff --git a/graphics/php4-gd/Makefile b/graphics/php4-gd/Makefile
index bd4aeb0f23c..c2f016352e4 100644
--- a/graphics/php4-gd/Makefile
+++ b/graphics/php4-gd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2004/02/20 12:48:13 jdolecek Exp $
+# $NetBSD: Makefile,v 1.16 2004/04/20 19:19:23 jdolecek Exp $
 
 MODNAME=		gd
 CATEGORIES+=		graphics
-PKGREVISION=		1
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for GD graphics library
 
 USE_BUILDLINK2=		YES
diff --git a/mail/php4-imap/distinfo b/mail/php4-imap/distinfo
index 21bbaa64547..1f4f0951736 100644
--- a/mail/php4-imap/distinfo
+++ b/mail/php4-imap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2004/01/16 15:04:54 jdolecek Exp $
+$NetBSD: distinfo,v 1.10 2004/04/20 19:19:23 jdolecek Exp $
 
-SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
-Size (php-4.3.4.tar.bz2) = 3774324 bytes
+SHA1 (php-4.3.6.tar.bz2) = c5696d778f0684fae94ee2ca6463f37c97228441
+Size (php-4.3.6.tar.bz2) = 3957796 bytes
 SHA1 (patch-aa) = 73333018762ba63adf026ff91ccb6d6edd461f42
 SHA1 (patch-ab) = 594c9ebf5e7979e049399d7ba9dcb00614bfc95e
diff --git a/math/php4-bcmath/Makefile b/math/php4-bcmath/Makefile
index ac6e36a4e55..f362c2e15c1 100644
--- a/math/php4-bcmath/Makefile
+++ b/math/php4-bcmath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/09/19 12:23:06 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/20 19:19:23 jdolecek Exp $
 
 MODNAME=		bcmath
 CATEGORIES+=		math
@@ -6,7 +6,6 @@ PKGREVISION=		# empty
 COMMENT=		PHP4 extension for bc-style arbitrary precision math
 
 USE_BUILDLINK2=		YES
-DISTINFO_FILE=		${.CURDIR}/distinfo
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/math/php4-bcmath/distinfo b/math/php4-bcmath/distinfo
deleted file mode 100644
index 6ad1c74a935..00000000000
--- a/math/php4-bcmath/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.9 2003/12/01 14:23:51 jdolecek Exp $
-
-SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
-Size (php-4.3.4.tar.bz2) = 3774324 bytes
-SHA1 (patch-aa) = fca498749e3e9b3eace88734ee6dd63685f5ccca
-SHA1 (patch-ab) = fd34fd321799e337c3d126aec0eb4323267e891f
diff --git a/math/php4-bcmath/patches/patch-aa b/math/php4-bcmath/patches/patch-aa
deleted file mode 100644
index 11e322faae0..00000000000
--- a/math/php4-bcmath/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/12/01 14:23:51 jdolecek Exp $
-
-This is PHP CVS tree now, remove patch from pkgsrc on next PHP update.
-
---- config.m4.orig	2003-11-29 14:53:04.000000000 +0100
-+++ config.m4	2003-11-29 14:53:13.000000000 +0100
-@@ -7,7 +7,7 @@
- 
- if test "$PHP_BCMATH" != "no"; then
-   AC_DEFINE(WITH_BCMATH, 1, [Whether you have bcmath])
--  PHP_NEW_EXTENSION(bcmath, bcmath.c number.c \
-+  PHP_NEW_EXTENSION(bcmath, bcmath.c \
- libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
- libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
- libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
diff --git a/math/php4-bcmath/patches/patch-ab b/math/php4-bcmath/patches/patch-ab
deleted file mode 100644
index fbdef80d6e1..00000000000
--- a/math/php4-bcmath/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/12/01 14:23:51 jdolecek Exp $
-
-This is PHP CVS tree now, remove patch from pkgsrc on next PHP update.
-
---- libbcmath/src/bcmath.h.orig	2002-11-22 10:27:08.000000000 +0100
-+++ libbcmath/src/bcmath.h	2003-12-01 15:12:34.000000000 +0100
-@@ -52,8 +52,11 @@
- 			   in the case of leading zeros generated. */
-     } bc_struct;
- 
--#include <php.h>
--#include <ext/bcmath/php_bcmath.h>
-+#include "php.h"
-+#ifdef HAVE_CONFIG_H
-+#include "../../config.h"
-+#endif
-+#include "../../php_bcmath.h"
- 
- 
- /* The base used in storing the numbers in n_value above.
diff --git a/net/php4-ftp/Makefile b/net/php4-ftp/Makefile
index d75b239ed95..48f72de53d2 100644
--- a/net/php4-ftp/Makefile
+++ b/net/php4-ftp/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2004/03/26 02:27:49 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/20 19:19:23 jdolecek Exp $
 
 MODNAME=		ftp
-PKGREVISION=		3
+PKGREVISION=		# empty
 CATEGORIES+=		net
 COMMENT=		PHP4 extension for FTP access
 
 USE_BUILDLINK2=		YES
-DISTINFO_FILE=		${.CURDIR}/distinfo
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/net/php4-ftp/distinfo b/net/php4-ftp/distinfo
deleted file mode 100644
index 9e11b60edea..00000000000
--- a/net/php4-ftp/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.9 2004/01/13 19:32:06 jdolecek Exp $
-
-SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
-Size (php-4.3.4.tar.bz2) = 3774324 bytes
-SHA1 (patch-aa) = f1feb347127b63067a1da0df0230e04ead694288
diff --git a/net/php4-ftp/patches/patch-aa b/net/php4-ftp/patches/patch-aa
deleted file mode 100644
index be45a77ef6c..00000000000
--- a/net/php4-ftp/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/01/13 19:32:06 jdolecek Exp $
-
---- ftp.c.orig	2003-09-09 23:15:20.000000000 +0200
-+++ ftp.c
-@@ -21,2 +21,6 @@
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "php.h"
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index 0c71642df9c..eb6a67f4e3a 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2004/02/14 01:09:42 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.35 2004/04/20 19:19:23 jdolecek Exp $
 
 DISTNAME?=		php-${PHP_DIST_VERS}
 CATEGORIES+=		www php4
@@ -15,9 +15,9 @@ HOMEPAGE?=		http://www.php.net/
 # PHP_DIST_VERS		version number on the php distfile
 # PHP_BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
 #
-PHP_DIST_VERS=		4.3.4
+PHP_DIST_VERS=		4.3.6
 PHP_BASE_VERS=		${PHP_DIST_VERS}
-PKGREVISION=		1
+PKGREVISION=		# empty
 
 DISTFILES?=		${PHP_DISTFILE}
 PHP_DISTFILE=		${DISTNAME}${EXTRACT_SUFX}
diff --git a/www/php4/PLIST b/www/php4/PLIST
index b293aa54f6d..1485ebc7a36 100644
--- a/www/php4/PLIST
+++ b/www/php4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/11/08 06:58:10 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/04/20 19:19:23 jdolecek Exp $
 bin/pear
 bin/php
 bin/php-config
@@ -131,6 +131,20 @@ include/php/ext/xml/expat/expat.h
 include/php/ext/xml/expat/asciitab.h
 include/php/ext/xml/expat/xmltok_impl.h
 include/php/ext/xml/php_xml.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_string.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_language.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h
+include/php/ext/mbstring/libmbfl/mbfl/mbfilter.h
 include/php/ext/mbstring/unicode_data.h
 include/php/ext/mbstring/php_unicode.h
 include/php/ext/mbstring/php_mbregex.h
@@ -191,24 +205,26 @@ lib/php/.registry/xml_rpc.reg
 lib/php/.filemap
 lib/php/Archive/Tar.php
 lib/php/Console/Getopt.php
-lib/php/PEAR/Command.php
+lib/php/PEAR/Registry.php
+lib/php/PEAR/Packager.php
+lib/php/PEAR/Installer.php
+lib/php/PEAR/Frontend/CLI.php
+lib/php/PEAR/ErrorStack.php
+lib/php/PEAR/Downloader.php
+lib/php/PEAR/Dependency.php
+lib/php/PEAR/Config.php
 lib/php/PEAR/Common.php
-lib/php/PEAR/Command/Build.php
-lib/php/PEAR/Command/Common.php
-lib/php/PEAR/Command/Config.php
-lib/php/PEAR/Command/Install.php
-lib/php/PEAR/Command/Package.php
-lib/php/PEAR/Command/Registry.php
 lib/php/PEAR/Command/Remote.php
+lib/php/PEAR/Command/Registry.php
+lib/php/PEAR/Command/Package.php
 lib/php/PEAR/Command/Mirror.php
+lib/php/PEAR/Command/Install.php
+lib/php/PEAR/Command/Config.php
+lib/php/PEAR/Command/Common.php
+lib/php/PEAR/Command/Build.php
 lib/php/PEAR/Command/Auth.php
-lib/php/PEAR/Config.php
-lib/php/PEAR/Dependency.php
+lib/php/PEAR/Command.php
 lib/php/PEAR/Builder.php
-lib/php/PEAR/Frontend/CLI.php
-lib/php/PEAR/Installer.php
-lib/php/PEAR/Packager.php
-lib/php/PEAR/Registry.php
 lib/php/PEAR/Remote.php
 lib/php/PEAR/Autoloader.php
 lib/php/doc/Archive_Tar/docs/Archive_Tar.txt
@@ -222,6 +238,7 @@ lib/php/DB/ibase.php
 lib/php/DB/ifx.php
 lib/php/DB/msql.php
 lib/php/DB/mssql.php
+lib/php/DB/mysqli.php
 lib/php/DB/mysql.php
 lib/php/DB/oci8.php
 lib/php/DB/odbc.php
@@ -244,6 +261,7 @@ lib/php/DB.php
 lib/php/Mail/sendmail.php
 lib/php/Mail/smtp.php
 lib/php/Mail/RFC822.php
+lib/php/Mail/null.php
 lib/php/Mail/mail.php
 lib/php/test/DB/tests/db_parsedsn.phpt
 lib/php/test/DB/tests/db_factory.phpt
@@ -252,16 +270,17 @@ lib/php/test/DB/tests/db_error2.phpt
 lib/php/test/DB/tests/errors.inc
 lib/php/test/DB/tests/fetchmode_object.inc
 lib/php/test/DB/tests/fetchmodes.inc
-lib/php/test/DB/tests/fetchrow.inc
 lib/php/test/DB/tests/include.inc
 lib/php/test/DB/tests/limit.inc
 lib/php/test/DB/tests/numcols.inc
 lib/php/test/DB/tests/numrows.inc
 lib/php/test/DB/tests/prepexe.inc
+lib/php/test/DB/tests/run.cvs
 lib/php/test/DB/tests/sequences.inc
 lib/php/test/DB/tests/simplequery.inc
-lib/php/test/DB/tests/tableinfo.inc
+lib/php/test/DB/tests/skipif.inc
 lib/php/test/DB/tests/transactions.inc
+lib/php/test/DB/tests/driver/01connect.phpt
 lib/php/test/DB/tests/driver/02fetch.phpt
 lib/php/test/DB/tests/driver/03simplequery.phpt
 lib/php/test/DB/tests/driver/04numcols.phpt
@@ -270,15 +289,19 @@ lib/php/test/DB/tests/driver/06prepexec.phpt
 lib/php/test/DB/tests/driver/08affectedrows.phpt
 lib/php/test/DB/tests/driver/09numrows.phpt
 lib/php/test/DB/tests/driver/10errormap.phpt
+lib/php/test/DB/tests/driver/11transactions.phpt
 lib/php/test/DB/tests/driver/13limit.phpt
 lib/php/test/DB/tests/driver/14fetchmode_object.phpt
 lib/php/test/DB/tests/driver/15quote.phpt
+lib/php/test/DB/tests/driver/16tableinfo.phpt
+lib/php/test/DB/tests/driver/17query.phpt
+lib/php/test/DB/tests/driver/18get.phpt
 lib/php/test/DB/tests/driver/bug22328.phpt
 lib/php/test/DB/tests/driver/connect.inc
 lib/php/test/DB/tests/driver/mktable.inc
-lib/php/test/DB/tests/driver/setup.inc
+lib/php/test/DB/tests/driver/run.cvs
 lib/php/test/DB/tests/driver/skipif.inc
-lib/php/test/DB/tests/driver/01connect.phpt
+lib/php/test/DB/tests/driver/setup.inc.cvs
 lib/php/test/DB/tests/db_error.phpt
 lib/php/test/XML_Parser/tests/002.phpt
 lib/php/test/XML_Parser/tests/003.phpt
@@ -333,6 +356,8 @@ share/php/php.gif
 @dirrm include/php/main
 @dirrm include/php/ext/xml/expat
 @dirrm include/php/ext/xml
+@dirrm include/php/ext/mbstring/libmbfl/mbfl
+@dirrm include/php/ext/mbstring/libmbfl
 @dirrm include/php/ext/mbstring
 @dirrm include/php/ext/pgsql
 @dirrm include/php/ext/standard
diff --git a/www/php4/buildlink2.mk b/www/php4/buildlink2.mk
index f8dae53568a..817c9ed8281 100644
--- a/www/php4/buildlink2.mk
+++ b/www/php4/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/03/29 05:05:46 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/04/20 19:19:23 jdolecek Exp $
 
 .if !defined(PHP4_BUILDLINK2_MK)
 PHP4_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		php4
 BUILDLINK_PKGBASE.php4?=	php
-BUILDLINK_DEPENDS.php4?=	php>=4.3.4
+BUILDLINK_DEPENDS.php4?=	php>=4.3.6
 BUILDLINK_PKGSRCDIR.php4?=	../../www/php4
 
 # This adds a build-dependency as php4 has no libraries.
diff --git a/www/php4/distinfo b/www/php4/distinfo
index 2e02f57ae19..dff7429498d 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.25 2004/02/14 01:09:42 jdolecek Exp $
+$NetBSD: distinfo,v 1.26 2004/04/20 19:19:23 jdolecek Exp $
 
-SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
-Size (php-4.3.4.tar.bz2) = 3774324 bytes
-SHA1 (patch-ab) = a670f6f5dcc7a5624e89d9e39ae97a9e44747e42
+SHA1 (php-4.3.6.tar.bz2) = c5696d778f0684fae94ee2ca6463f37c97228441
+Size (php-4.3.6.tar.bz2) = 3957796 bytes
+SHA1 (patch-ab) = cc7785755774377d4eb2d3d4816cea61234da167
 SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4
 SHA1 (patch-ah) = 0ac37bd35c4594cb58f1ea85ef811154b644a931
diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab
index 69135de6e4f..d01c1148a88 100644
--- a/www/php4/patches/patch-ab
+++ b/www/php4/patches/patch-ab
@@ -1,20 +1,36 @@
-$NetBSD: patch-ab,v 1.14 2003/11/08 06:58:10 jdolecek Exp $
+$NetBSD: patch-ab,v 1.15 2004/04/20 19:19:23 jdolecek Exp $
 
---- scripts/phpize.in.orig	2003-08-27 19:57:32.000000000 +0200
-+++ scripts/phpize.in	2003-11-07 21:44:48.000000000 +0100
-@@ -54,11 +54,15 @@
+--- scripts/phpize.in.orig	2003-11-14 04:21:15.000000000 +0100
++++ scripts/phpize.in	2004-04-02 20:23:49.000000000 +0200
+@@ -54,18 +54,25 @@
  
  touch install-sh mkinstalldirs missing
  
 -aclocal || exit 1
 -autoconf || exit 1
 -autoheader || exit 1
--libtoolize=`$builddir/build/shtool path glibtoolize libtoolize`
--$libtoolize -f -c || exit 1
+-test -x $builddir/build/shtool || chmod +x $builddir/build/shtool
+-if test ! -x $builddir/build/shtool; then
+-  echo "shtool at '$builddir/build/shtool' not executable. "
+-  echo "Make sure that the file exists and is executable and then rerun this script. "
+-  echo 
+-  exit 1
 +if [ -z "$ACLOCAL" ]; then ACLOCAL=aclocal; fi
 +if [ -z "$AUTOCONF" ]; then AUTOCONF=autoconf; fi
 +if [ -z "$AUTOHEADER" ]; then AUTOHEADER=autoheader; fi
-+if [ -z "$LIBTOOLIZE" ]; then LIBTOOLIZE=`$builddir/build/shtool path glibtoolize libtoolize`; fi
++if [ -z "$LIBTOOLIZE" ]; then
++	test -x $builddir/build/shtool || chmod +x $builddir/build/shtool
++	if test ! -x $builddir/build/shtool; then
++	  echo "shtool at '$builddir/build/shtool' not executable. "
++	  echo "Make sure that the file exists and is executable and then rerun this script. "
++	  echo 
++	  exit 1
++	fi
++
++	LIBTOOLIZE=`$builddir/build/shtool path glibtoolize libtoolize`;
+ fi
+-libtoolize=`$builddir/build/shtool path glibtoolize libtoolize`
+-$libtoolize -f -c || exit 1
 +
 +$ACLOCAL || exit 1
 +$AUTOCONF || exit 1