4 files changed, 8 insertions, 54 deletions
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,