Update php-apc package to 3.1.10.

- Add PHP 5.4 support (Dmitry, Anatoliy, Pierre)
- Fixed bug #22679: Fix apc_bin_dump for constants. Use IS_CONSTANT_TYPE_MASK
  to handle all the constants, including the unqalified ones (instead of
  ~IS_CONSTANT_INDEX check)
- Fixed bug #23822, php crashes on apache restart

4 files changed, 6 insertions, 42 deletions

diff --git a/www/php-apc/Makefile b/www/php-apc/Makefile
index d2ed1be79ea..9137c4f71d8 100644
--- a/www/php-apc/Makefile
+++ b/www/php-apc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2011/12/17 13:46:28 obache Exp $
+# $NetBSD: Makefile,v 1.17 2012/04/29 16:38:14 taca Exp $
 
 MODNAME=	apc
-PECL_VERSION=	3.1.9
-PKGREVISION=	1
+PECL_VERSION=	3.1.10
 PECL_LEGACY_VERSION_SCHEME=	yes
 CATEGORIES+=	sysutils
 
diff --git a/www/php-apc/distinfo b/www/php-apc/distinfo
index f1699dd2d78..87f6307b8cc 100644
--- a/www/php-apc/distinfo
+++ b/www/php-apc/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.10 2011/06/20 15:09:51 taca Exp $
+$NetBSD: distinfo,v 1.11 2012/04/29 16:38:14 taca Exp $
 
-SHA1 (php-apc/apc-3.1.9.tgz) = 417b95e63496de7f785b4917166098c6ac996008
-RMD160 (php-apc/apc-3.1.9.tgz) = 67288c957a0234a82912f06e51c6f60f4ed4c66c
-Size (php-apc/apc-3.1.9.tgz) = 155540 bytes
-SHA1 (patch-apc__cache.c) = e2f99914ee85ceb0192a1fb18c2382b3f7bd11f7
-SHA1 (patch-apc__lock.h) = 46a28dc40254b32251b559ada3a1133600db2f55
+SHA1 (php-apc/apc-3.1.10.tgz) = 02c8a2f60c5b1789e7cccd9c1b421d822ca77734
+RMD160 (php-apc/apc-3.1.10.tgz) = cc0ad2d7f335d519819856b806f069069b0447f3
+Size (php-apc/apc-3.1.10.tgz) = 156208 bytes
diff --git a/www/php-apc/patches/patch-apc__cache.c b/www/php-apc/patches/patch-apc__cache.c
deleted file mode 100644
index 7b7073f4cb8..00000000000
--- a/www/php-apc/patches/patch-apc__cache.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-apc__cache.c,v 1.1 2011/06/20 15:09:52 taca Exp $
-
-- Fix pollution of the slots table with unoccupied slots from 
-  repository r311376.
-
---- apc_cache.c.orig	2011-05-14 22:14:56.000000000 +0000
-+++ apc_cache.c
-@@ -1290,7 +1290,9 @@ zval* apc_cache_info(apc_cache_t* cache,
-                 add_next_index_zval(list, link);
-                 j++;
-             }
--            add_next_index_long(slots, j);
-+	    if(j != 0) {
-+		add_next_index_long(slots, j);
-+	    }
-         }
- 
-         /* For each slot pending deletion */
diff --git a/www/php-apc/patches/patch-apc__lock.h b/www/php-apc/patches/patch-apc__lock.h
deleted file mode 100644
index d8dd9711a19..00000000000
--- a/www/php-apc/patches/patch-apc__lock.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-apc__lock.h,v 1.1 2011/06/20 15:09:52 taca Exp $
-
-- Fix fcntl lock error from repository r311339.
-
---- apc_lock.h.orig	2011-05-14 22:14:56.000000000 +0000
-+++ apc_lock.h
-@@ -154,7 +154,7 @@
- # define apc_lck_nb_lock(a)    apc_fcntl_nonblocking_lock(a TSRMLS_CC)
- # define apc_lck_rdlock(a)     apc_fcntl_rdlock(a TSRMLS_CC)
- # define apc_lck_unlock(a)     apc_fcntl_unlock(a TSRMLS_CC)
--# define apc_lck_rdunlock(a)   apc_fcntl_unlock(&a TSRMLS_CC)
-+# define apc_lck_rdunlock(a)   apc_fcntl_unlock(a TSRMLS_CC)
- #endif
- 
- #endif