Update php4 package to 4.3.7.

Change list from release notes:

* Synchronized bundled GD library with GD 2.0.23.
* Fixed a bug that prevented compilation of GD extensions against
  FreeType 2.1.0-2.1.2.
* Fixed thread safety issue with informix connection id.
* Fixed incorrect resolving of relative paths by glob() in windows.
* Fixed mapping of Greek letters to html entities.
* Fixed a bug that caused an on shutdown crash when using PHP with Apache
  2.0.49.
* Fixed a number of crashes inside pgsql, cpdf and gd extensions.

All in all this release fixes over 30 bugs that have been discovered
and resolved since the 4.3.6 release.

13 files changed, 27 insertions, 73 deletions

diff --git a/databases/php4-mysql/distinfo b/databases/php4-mysql/distinfo
index fe8b0c258bc..e79fd0dd862 100644
--- a/databases/php4-mysql/distinfo
+++ b/databases/php4-mysql/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2004/04/21 11:14:40 tron Exp $
+$NetBSD: distinfo,v 1.10 2004/07/06 19:52:01 jdolecek Exp $
 
-SHA1 (php-4.3.6.tar.bz2) = c5696d778f0684fae94ee2ca6463f37c97228441
-Size (php-4.3.6.tar.bz2) = 3957796 bytes
+SHA1 (php-4.3.7.tar.bz2) = f6171d71282b2e50333d1e96859fe907da068c34
+Size (php-4.3.7.tar.bz2) = 3963734 bytes
 SHA1 (patch-aa) = 8f7027758c3fe1d59187e7777ee46e73d126738a
diff --git a/databases/php4-pgsql/Makefile b/databases/php4-pgsql/Makefile
index e2b2df95346..17df39e38e7 100644
--- a/databases/php4-pgsql/Makefile
+++ b/databases/php4-pgsql/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/04/25 01:12:49 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2004/07/06 19:52:01 jdolecek Exp $
 
 MODNAME=		pgsql
-PKGREVISION=		1
+PKGREVISION=		# empty
 CATEGORIES+=		databases
 COMMENT=		PHP4 extension for PostgreSQL databases
 
diff --git a/doc/CHANGES b/doc/CHANGES
index 21638b96998..483f638b71e 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6473 2004/07/06 18:06:44 agc Exp $
+$NetBSD: CHANGES,v 1.6474 2004/07/06 19:52:01 jdolecek Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -3283,3 +3283,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated py-libxslt to 1.1.8 [recht 2004-07-06]
 	Added rfstool-0.14 [agc 2004-07-06]
 	Added libfwbuilder-1.0.2 [agc 2004-07-06]
+	Updated php4 to 4.3.7 [jdolecek 2004-07-06]
diff --git a/mail/php4-imap/Makefile b/mail/php4-imap/Makefile
index 8ee6082f986..c897efb00ac 100644
--- a/mail/php4-imap/Makefile
+++ b/mail/php4-imap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/04/25 00:22:40 xtraeme Exp $
+# $NetBSD: Makefile,v 1.16 2004/07/06 19:52:01 jdolecek Exp $
 
 MODNAME=		imap
-PKGREVISION=		1
+PKGREVISION=		# empty
 CATEGORIES+=		mail
 COMMENT=		PHP4 extension for IMAP (Internet Mailbox Access Protocol)
 
diff --git a/mail/php4-imap/distinfo b/mail/php4-imap/distinfo
index 1f4f0951736..f2ad37aeef0 100644
--- a/mail/php4-imap/distinfo
+++ b/mail/php4-imap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2004/04/20 19:19:23 jdolecek Exp $
+$NetBSD: distinfo,v 1.11 2004/07/06 19:52:01 jdolecek Exp $
 
-SHA1 (php-4.3.6.tar.bz2) = c5696d778f0684fae94ee2ca6463f37c97228441
-Size (php-4.3.6.tar.bz2) = 3957796 bytes
+SHA1 (php-4.3.7.tar.bz2) = f6171d71282b2e50333d1e96859fe907da068c34
+Size (php-4.3.7.tar.bz2) = 3963734 bytes
 SHA1 (patch-aa) = 73333018762ba63adf026ff91ccb6d6edd461f42
 SHA1 (patch-ab) = 594c9ebf5e7979e049399d7ba9dcb00614bfc95e
diff --git a/print/php4-pdflib/Makefile b/print/php4-pdflib/Makefile
index 71ebec0cd88..bc50e123ca1 100644
--- a/print/php4-pdflib/Makefile
+++ b/print/php4-pdflib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/04/24 23:41:32 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/06 19:52:01 jdolecek Exp $
 
 MODNAME=		pdf
 PKGNAME=		php-pdflib-${PHP_BASE_VERS}
-PKGREVISION=		1
 CATEGORIES+=		print
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for PDFlib on-the-fly PDF generation
diff --git a/security/php4-openssl/Makefile b/security/php4-openssl/Makefile
index 6acf8d96090..45fea81319e 100644
--- a/security/php4-openssl/Makefile
+++ b/security/php4-openssl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/04/24 23:35:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/06 19:52:01 jdolecek Exp $
 
 MODNAME=		openssl
-PKGREVISION=		2
 CATEGORIES+=		security
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for the OpenSSL library
 
 USE_BUILDLINK3=		YES
diff --git a/textproc/php4-domxml/Makefile b/textproc/php4-domxml/Makefile
index fa04d8e3011..92239a53450 100644
--- a/textproc/php4-domxml/Makefile
+++ b/textproc/php4-domxml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/07/06 16:28:53 recht Exp $
+# $NetBSD: Makefile,v 1.18 2004/07/06 19:52:01 jdolecek Exp $
 
 MODNAME=		domxml
 CATEGORIES+=		textproc
-PKGREVISION=		4
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for DOM support
 
 USE_BUILDLINK3=		YES
diff --git a/textproc/php4-xslt/Makefile b/textproc/php4-xslt/Makefile
index c182e6cb129..b121640e309 100644
--- a/textproc/php4-xslt/Makefile
+++ b/textproc/php4-xslt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/04/25 00:52:39 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/06 19:52:01 jdolecek Exp $
 
 MODNAME=		xslt
-PKGREVISION=		# empty
 CATEGORIES+=		textproc
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for XSLT functions (Sablotron backend)
 
 USE_BUILDLINK3=		YES
diff --git a/www/php4-curl/Makefile b/www/php4-curl/Makefile
index f5431de2e51..860cfa34f54 100644
--- a/www/php4-curl/Makefile
+++ b/www/php4-curl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/04/24 23:03:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/06 19:52:01 jdolecek Exp $
 
 MODNAME=		curl
-PKGREVISION=		1
+PKGREVISION=		# empty
 CATEGORIES+=		www
 COMMENT=		PHP4 extension for curl functions
 
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index 718f78574ae..b8257d2ab4e 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2004/05/20 21:12:14 wiz Exp $
+# $NetBSD: Makefile.common,v 1.40 2004/07/06 19:52:01 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.6
+PHP_DIST_VERS=		4.3.7
 PHP_BASE_VERS=		${PHP_DIST_VERS}
-PKGREVISION=		2
+PKGREVISION=		# empty
 
 DISTFILES?=		${PHP_DISTFILE}
 PHP_DISTFILE=		${DISTNAME}${EXTRACT_SUFX}
diff --git a/www/php4/distinfo b/www/php4/distinfo
index 083faf224d6..d6a3f1b087b 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.28 2004/05/18 18:32:28 cjones Exp $
+$NetBSD: distinfo,v 1.29 2004/07/06 19:52:01 jdolecek Exp $
 
-SHA1 (php-4.3.6.tar.bz2) = c5696d778f0684fae94ee2ca6463f37c97228441
-Size (php-4.3.6.tar.bz2) = 3957796 bytes
+SHA1 (php-4.3.7.tar.bz2) = f6171d71282b2e50333d1e96859fe907da068c34
+Size (php-4.3.7.tar.bz2) = 3963734 bytes
 SHA1 (patch-aa) = feb064407950d0fc732b7240e65cac84420d2407
 SHA1 (patch-ab) = cc7785755774377d4eb2d3d4816cea61234da167
 SHA1 (patch-ac) = 870b04c7021dad21e0a927441c0d9a204cd60f7c
diff --git a/www/php4/patches/patch-ac b/www/php4/patches/patch-ac
deleted file mode 100644
index 74609b916de..00000000000
--- a/www/php4/patches/patch-ac
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2004/05/18 18:30:39 cjones Exp $
-
---- ext/pcre/php_pcre.c.orig	Fri Apr 16 09:21:14 2004
-+++ ext/pcre/php_pcre.c	Fri Apr 16 09:23:36 2004
-@@ -106,15 +106,6 @@
- 	REGISTER_LONG_CONSTANT("PREG_SPLIT_DELIM_CAPTURE", PREG_SPLIT_DELIM_CAPTURE, CONST_CS | CONST_PERSISTENT);
- 	REGISTER_LONG_CONSTANT("PREG_SPLIT_OFFSET_CAPTURE", PREG_SPLIT_OFFSET_CAPTURE, CONST_CS | CONST_PERSISTENT);
- 	REGISTER_LONG_CONSTANT("PREG_GREP_INVERT", PREG_GREP_INVERT, CONST_CS | CONST_PERSISTENT);
--
--	pcre_malloc = php_pcre_malloc;
--	pcre_free = php_pcre_free;
--
--#ifdef NO_RECURSE
--	pcre_stack_malloc = php_pcre_malloc;
--	pcre_stack_free = php_pcre_free;
--#endif
--	
- 	return SUCCESS;
- }
- /* }}} */
-@@ -130,6 +121,16 @@
- }
- /* }}} */
- 
-+/* {{{ PHP_RINIT_FUNCTION(pcre) */
-+static PHP_RINIT_FUNCTION(pcre)
-+{
-+	pcre_malloc = php_pcre_malloc;
-+	pcre_free = php_pcre_free;
-+
-+	return SUCCESS;
-+}
-+/* }}} */
-+
- /* {{{ pcre_get_compiled_regex
-  */
- PHPAPI pcre* pcre_get_compiled_regex(char *regex, pcre_extra **extra, int *preg_options) {
-@@ -1527,7 +1528,7 @@
- 	pcre_functions,
- 	PHP_MINIT(pcre),
- 	PHP_MSHUTDOWN(pcre),
--	NULL,
-+	PHP_RINIT(pcre),
- 	NULL,
- 	PHP_MINFO(pcre),
- 	NO_VERSION_YET,