Update lang/php5 to version 5.2.10 - according to the release annoucement:

Security Enhancements and Fixes in PHP 5.2.10:
    * Fixed bug #48378 (exif_read_data() segfaults on certain corrupted .jpeg files). (Pierre)

Key enhancements in PHP 5.2.10 include:
    * Added "ignore_errors" option to http fopen wrapper. (David Zulke, Sara)
    * Fixed memory corruptions while reading properties of zip files. (Ilia)
    * Fixed memory leak in ob_get_clean/ob_get_flush. (Christian)
    * Fixed segfault on invalid session.save_path. (Hannes)
    * Fixed leaks in imap when a mail_criteria is used. (Pierre)
    * Changed default value of array_unique()'s optional sorting type parameter back to SORT_STRING to fix backwards compatibility breakage introduced in PHP 5.2.9. (Moriyoshi)
    * Fixed bug #47940 (memory leaks in imap_body). (Pierre, Jake Levitt)
    * Fixed bug #47903 ("@" operator does not work with string offsets). (Felipe)
    * Fixed bug #47644 (Valid integers are truncated with json_decode()). (Scott)
    * Fixed bug #47564 (unpacking unsigned long 32bit big endian returns wrong result). (Ilia)
    * Fixed bug #47365 (ip2long() may allow some invalid values on certain 64bit systems).
    * Over 100 bug fixes.

4 files changed, 12 insertions, 29 deletions

diff --git a/lang/php5/Makefile.common b/lang/php5/Makefile.common
index 30a768a69a1..7352eef9769 100644
--- a/lang/php5/Makefile.common
+++ b/lang/php5/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2009/03/02 22:52:17 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.36 2009/07/07 21:57:28 jdolecek Exp $
 # used by lang/php5/Makefile.php
 # used by lang/php/ext.mk
 
@@ -26,7 +26,7 @@ EXTRACT_SUFX?=		.tar.bz2
 MAINTAINER?=		jdolecek@NetBSD.org
 HOMEPAGE?=		http://www.php.net/
 
-PHP_BASE_VERS=		5.2.9
+PHP_BASE_VERS=		5.2.10
 
 PHP_EXTENSION_DIR=	lib/php/20040412
 PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php
index 2ac3c409ff4..63b5ad7901a 100644
--- a/lang/php5/Makefile.php
+++ b/lang/php5/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.34 2009/03/05 23:22:24 adrianp Exp $
+# $NetBSD: Makefile.php,v 1.35 2009/07/07 21:57:28 jdolecek Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -20,6 +20,7 @@ PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS+=	--with-config-file-path=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-config-file-scan-dir=${PKG_SYSCONFDIR:Q}/php.d
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 
@@ -55,7 +56,7 @@ SUBST_MESSAGE.ini=	Fixing default ini files.
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Msuhosin)
-SUHOSIN_PHPVER=		5.2.9
+SUHOSIN_PHPVER=		5.2.10
 . if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS}
 PKG_FAIL_REASON+=	"The suhosin patch is currently not available for"
 PKG_FAIL_REASON+=	"this version of PHP.  You may have to wait until"
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 73f41aa24b7..bde2caff9ba 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.63 2009/06/26 21:56:40 jdolecek Exp $
+$NetBSD: distinfo,v 1.64 2009/07/07 21:57:28 jdolecek Exp $
 
-SHA1 (php-5.2.9/php-5.2.9.tar.bz2) = 1c738dbd7e3f8d723b6ce2e0fbc90a69e249f5f0
-RMD160 (php-5.2.9/php-5.2.9.tar.bz2) = fc2b316ff05462667704027cf2a1a4ac0a238422
-Size (php-5.2.9/php-5.2.9.tar.bz2) = 10203122 bytes
-SHA1 (php-5.2.9/suhosin-patch-5.2.9-0.9.7.patch.gz) = 4197644330a4f182f4dd64beb9db29406ed300ca
-RMD160 (php-5.2.9/suhosin-patch-5.2.9-0.9.7.patch.gz) = 1d2e01a935c4bbc9e858796f8f6004b4f75950b3
-Size (php-5.2.9/suhosin-patch-5.2.9-0.9.7.patch.gz) = 23026 bytes
+SHA1 (php-5.2.10/php-5.2.10.tar.bz2) = 9a287e2791d28928fb1ee1a1167290c5005feccd
+RMD160 (php-5.2.10/php-5.2.10.tar.bz2) = 9a9ec823eda9d6b3c085967e7a71f776071fc78f
+Size (php-5.2.10/php-5.2.10.tar.bz2) = 8808759 bytes
+SHA1 (php-5.2.10/suhosin-patch-5.2.10-0.9.7.patch.gz) = 3768bbded0bb2376414322b26308342452cb927a
+RMD160 (php-5.2.10/suhosin-patch-5.2.10-0.9.7.patch.gz) = 18df1686a48d652f581591115b51461e9dacf5a4
+Size (php-5.2.10/suhosin-patch-5.2.10-0.9.7.patch.gz) = 23072 bytes
 SHA1 (patch-aa) = 20bc3831e435182d014b11ae9f1f6c537a21af20
 SHA1 (patch-ad) = b324c33b1e70adee5b89dcecdd7690dcadcc18ec
 SHA1 (patch-ag) = 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e
diff --git a/lang/php5/patches/patch-ad b/lang/php5/patches/patch-ad
deleted file mode 100644
index 7306b696b20..00000000000
--- a/lang/php5/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/08/01 01:40:08 taca Exp $
-
-Adapt NetBSD's remap(2).
-
---- Zend/zend_alloc.c.orig	2007-05-28 19:07:50.000000000 +0900
-+++ Zend/zend_alloc.c
-@@ -148,7 +148,11 @@ static zend_mm_segment* zend_mm_mem_mmap
- {
- 	zend_mm_segment *ret;
- #ifdef HAVE_MREMAP
-+#if defined(__NetBSD__)
-+	ret = (zend_mm_segment*)mremap(segment, segment->size, segment, size, MREMAP_MAYMOVE);
-+#else
- 	ret = (zend_mm_segment*)mremap(segment, segment->size, size, MREMAP_MAYMOVE);
-+#endif
- 	if (ret == MAP_FAILED) {
- #endif
- 		ret = storage->handlers->_alloc(storage, size);