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

4 files changed, 1 insertions, 43 deletions

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.