Update php-apcu to 5.1.5

Changes:
- PHP 7 compatibility
- provide APC compatibility in "apc" optional extension
- move APCIterator to APC compatibility extension
- add APCuIterator without cache argument
- drop apcu_bin_* functions
- add apcu_entry(key, callback, ttl) function
- fix race on refcount of entry when using rwlocks (or on windows)

NOTE: apc-compatible interfaces moved into separate module

6 files changed, 52 insertions, 30 deletions

diff --git a/www/php-apcu/MESSAGE b/www/php-apcu/MESSAGE
new file mode 100644
index 00000000000..fe5be74fd67
--- /dev/null
+++ b/www/php-apcu/MESSAGE
@@ -0,0 +1,6 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2016/07/26 09:22:40 jdolecek Exp $
+
+php-apcu 5.x no longer defines apc-compabile wrappers apc_*(). Install
+php-apcu_bc to get these.
+===========================================================================
diff --git a/www/php-apcu/Makefile b/www/php-apcu/Makefile
index c26c69f7942..f49f0157abd 100644
--- a/www/php-apcu/Makefile
+++ b/www/php-apcu/Makefile
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2015/12/19 14:27:15 taca Exp $
+# $NetBSD: Makefile,v 1.3 2016/07/26 09:22:40 jdolecek Exp $
 
 MODNAME=	apcu
-PECL_VERSION=	4.0.7
+PECL_VERSION=	5.1.5
 CATEGORIES+=	sysutils
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	APCu - APC User Cache
 LICENSE=	php
 
-PHP_VERSIONS_ACCEPTED=	55 56
-
 CONFIGURE_ARGS+=	--enable-${MODNAME}
 
 PLIST_SRC+=		${.CURDIR}/PLIST.extras
@@ -21,6 +19,7 @@ INSTALLATION_DIRS=	${DOCDIR}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${DOCDIR}
+	cd ${WRKSRC} && ${MAKE} INSTALL_ROOT="${DESTDIR}" install-headers
 
 .include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/php-apcu/PLIST.extras b/www/php-apcu/PLIST.extras
index 8e478080ba2..3258f7f1f9c 100644
--- a/www/php-apcu/PLIST.extras
+++ b/www/php-apcu/PLIST.extras
@@ -1,2 +1,19 @@
-@comment $NetBSD: PLIST.extras,v 1.1 2015/02/01 08:11:20 taca Exp $
+@comment $NetBSD: PLIST.extras,v 1.2 2016/07/26 09:22:40 jdolecek Exp $
 share/doc/${PKGBASE}/INSTALL
+include/php/ext/apcu/apc.h
+include/php/ext/apcu/apc_api.h
+include/php/ext/apcu/apc_arginfo.h
+include/php/ext/apcu/apc_cache.h
+include/php/ext/apcu/apc_cache_api.h
+include/php/ext/apcu/apc_globals.h
+include/php/ext/apcu/apc_iterator.h
+include/php/ext/apcu/apc_lock.h
+include/php/ext/apcu/apc_lock_api.h
+include/php/ext/apcu/apc_pool.h
+include/php/ext/apcu/apc_pool_api.h
+include/php/ext/apcu/apc_serializer.h
+include/php/ext/apcu/apc_sma.h
+include/php/ext/apcu/apc_sma_api.h
+include/php/ext/apcu/apc_stack.h
+include/php/ext/apcu/php_apc.h
+@dirrm include/php/ext/apcu
diff --git a/www/php-apcu/distinfo b/www/php-apcu/distinfo
index 8b54842a3c8..5801dcd2627 100644
--- a/www/php-apcu/distinfo
+++ b/www/php-apcu/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 02:47:22 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/07/26 09:22:40 jdolecek Exp $
 
-SHA1 (php-apcu/apcu-4.0.7.tgz) = 84d68cbafea61df1ff864c7a3e8d2302a2879347
-RMD160 (php-apcu/apcu-4.0.7.tgz) = 9b5f01dbefff164cd519ced448b62620e6770df8
-SHA512 (php-apcu/apcu-4.0.7.tgz) = 50db51358c9268cc5fdd0d48fb444be9e9356f1690bc1ae021a9618c8819ce8873bf4502fe87a10467ffda2ef38267ccca2af55152b064400c69a8da92b7e98b
-Size (php-apcu/apcu-4.0.7.tgz) = 118670 bytes
-SHA1 (patch-.._package.xml) = 8a30b47ce2276448e98462bda3d8fc145637ea03
-SHA1 (patch-config.m4) = 4a5e49577068b0d5c610148f560e565e3dcfc50a
+SHA1 (php-apcu/apcu-5.1.5.tgz) = 1fe5f87808fd51f45b1fa2a7f67ae45b0c8336fb
+RMD160 (php-apcu/apcu-5.1.5.tgz) = b4b9c4ffe34ae5d1f27ae5033fb3ad06444cbf97
+SHA512 (php-apcu/apcu-5.1.5.tgz) = ffa3e666f354c8fd2ab163db9c8352066d27a1cd6aebe4d8f374052f14a90dbe752efc27c6e927cbf75fc48b6f673e639b07ceeffc2a68402a778cc6a8b18fbc
+Size (php-apcu/apcu-5.1.5.tgz) = 109196 bytes
+SHA1 (patch-.._package.xml) = 2012bc96eaa53679b457b7230fb10634aca2bb6a
+SHA1 (patch-config.m4) = 8bbec8aff40c4d19fa46166dae1507316bf6e3bb
diff --git a/www/php-apcu/patches/patch-.._package.xml b/www/php-apcu/patches/patch-.._package.xml
index 44fe06ae84a..bf771bcf5af 100644
--- a/www/php-apcu/patches/patch-.._package.xml
+++ b/www/php-apcu/patches/patch-.._package.xml
@@ -1,15 +1,15 @@
-$NetBSD: patch-.._package.xml,v 1.1 2015/02/01 08:11:20 taca Exp $
+$NetBSD: patch-.._package.xml,v 1.2 2016/07/26 09:22:40 jdolecek Exp $
 
 Update md5 sum.
 
---- ../package.xml.orig	2014-10-12 02:02:21.000000000 +0900
-+++ ../package.xml	2015-02-01 16:50:25.000000000 +0900
-@@ -105,7 +105,7 @@
-    <file md5sum="2a8437130a0d8b546a4ad0a4c46f6e6b" name="pgsql_s_lock.h" role="src" />
-    <file md5sum="f779685bd4d96e1d925ea93b73131d9c" name="pgsql_s_lock.c" role="src" />
-    <file md5sum="54bfc8892372c1cf55cfa069aaf81eb2" name="apc_serializer.h" role="src" />
--   <file md5sum="5be4ac2cf190c97d2933e008b57d1055" name="config.m4" role="src" />
-+   <file md5sum="5a19fef359933bfc9b208a4598f3ce53" name="config.m4" role="src" />
-    <file md5sum="8c723e3d9a87c81326117fc32e56edff" name="config.w32" role="src" />
+--- ../package.xml.orig	2016-06-07 12:41:02.000000000 +0000
++++ ../package.xml
+@@ -112,7 +112,7 @@
+    <file md5sum="9ef781739883eec8bb8743df9083152b" name="pgsql_s_lock.h" role="src" />
+    <file md5sum="c95208eaf18327335d822da86eaa5bcf" name="pgsql_s_lock.c" role="src" />
+    <file md5sum="610c03c9de0306986a66f3c6d2d97b9c" name="apc_serializer.h" role="src" />
+-   <file md5sum="6677eaef2137aa0d474d284e347f6e2c" name="config.m4" role="src" />
++   <file md5sum="87b5e0291a8619e0e87209a02c1c0ce6" name="config.m4" role="src" />
+    <file md5sum="e76c6931b54dc5fb3f55b20cd53aea04" name="config.w32" role="src" />
     <file md5sum="d6c836c279b1fbabf69ada700dd5cdfc" name="INSTALL" role="doc" />
-    <file md5sum="de1caba45c42bd445f33d52eb1e82339" name="LICENSE" role="doc" />
+    <file md5sum="52dd90569008fee5bcdbb22d945b1108" name="LICENSE" role="doc" />
diff --git a/www/php-apcu/patches/patch-config.m4 b/www/php-apcu/patches/patch-config.m4
index 6ed354b116e..3c8d9941d69 100644
--- a/www/php-apcu/patches/patch-config.m4
+++ b/www/php-apcu/patches/patch-config.m4
@@ -1,19 +1,19 @@
-$NetBSD: patch-config.m4,v 1.1 2015/02/01 08:11:20 taca Exp $
+$NetBSD: patch-config.m4,v 1.2 2016/07/26 09:22:40 jdolecek Exp $
 
-Fix bashism.
+Fix bashism
 
---- config.m4.orig	2014-10-11 17:02:21.000000000 +0000
+--- config.m4.orig	2016-06-07 12:41:02.000000000 +0000
 +++ config.m4
-@@ -140,7 +140,7 @@ if test "$PHP_APCU" != "no"; then
-     LIBS="$orig_LIBS"
-   fi
+@@ -149,7 +149,7 @@ if test "$PHP_APCU" != "no"; then
+ 		fi
+ 	fi
    
 -  if test "$PHP_APCU_RWLOCKS" == "no"; then
 +  if test "$PHP_APCU_RWLOCKS" = "no"; then
      orig_LIBS="$LIBS"
  	  LIBS="$LIBS -lpthread"
  	  AC_TRY_RUN(
-@@ -193,8 +193,8 @@ if test "$PHP_APCU" != "no"; then
+@@ -202,8 +202,8 @@ if test "$PHP_APCU" != "no"; then
  	  LIBS="$orig_LIBS"
    fi