Tue Jul 26 09:22:40 2016 UTC ()
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


(jdolecek)
diff -r0 -r1.1 pkgsrc/www/php-apcu/MESSAGE
diff -r1.2 -r1.3 pkgsrc/www/php-apcu/Makefile
diff -r1.2 -r1.3 pkgsrc/www/php-apcu/distinfo
diff -r1.1 -r1.2 pkgsrc/www/php-apcu/PLIST.extras
diff -r1.1 -r1.2 pkgsrc/www/php-apcu/patches/patch-.._package.xml
diff -r1.1 -r1.2 pkgsrc/www/php-apcu/patches/patch-config.m4
File Added: pkgsrc/www/php-apcu/MESSAGE
===========================================================================
$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.
===========================================================================
cvs diff -r1.2 -r1.3 pkgsrc/www/php-apcu/Makefile (expand / switch to unified diff)

--- pkgsrc/www/php-apcu/Makefile 2015/12/19 14:27:15 1.2
+++ pkgsrc/www/php-apcu/Makefile 2016/07/26 09:22:40 1.3
@@ -1,26 +1,25 @@ @@ -1,26 +1,25 @@
1# $NetBSD: Makefile,v 1.2 2015/12/19 14:27:15 taca Exp $ 1# $NetBSD: Makefile,v 1.3 2016/07/26 09:22:40 jdolecek Exp $
2 2
3MODNAME= apcu 3MODNAME= apcu
4PECL_VERSION= 4.0.7 4PECL_VERSION= 5.1.5
5CATEGORIES+= sysutils 5CATEGORIES+= sysutils
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= APCu - APC User Cache 8COMMENT= APCu - APC User Cache
9LICENSE= php 9LICENSE= php
10 10
11PHP_VERSIONS_ACCEPTED= 55 56 
12 
13CONFIGURE_ARGS+= --enable-${MODNAME} 11CONFIGURE_ARGS+= --enable-${MODNAME}
14 12
15PLIST_SRC+= ${.CURDIR}/PLIST.extras 13PLIST_SRC+= ${.CURDIR}/PLIST.extras
16PLIST_SUBST+= PKGBASE=${PKGBASE:Q} 14PLIST_SUBST+= PKGBASE=${PKGBASE:Q}
17 15
18DOCDIR= ${PREFIX}/share/doc/${PKGBASE} 16DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
19 17
20INSTALLATION_DIRS= ${DOCDIR} 18INSTALLATION_DIRS= ${DOCDIR}
21 19
22post-install: 20post-install:
23 ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${DOCDIR} 21 ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${DOCDIR}
 22 cd ${WRKSRC} && ${MAKE} INSTALL_ROOT="${DESTDIR}" install-headers
24 23
25.include "../../lang/php/ext.mk" 24.include "../../lang/php/ext.mk"
26.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/www/php-apcu/distinfo (expand / switch to unified diff)

--- pkgsrc/www/php-apcu/distinfo 2015/11/04 02:47:22 1.2
+++ pkgsrc/www/php-apcu/distinfo 2016/07/26 09:22:40 1.3
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.2 2015/11/04 02:47:22 agc Exp $ 1$NetBSD: distinfo,v 1.3 2016/07/26 09:22:40 jdolecek Exp $
2 2
3SHA1 (php-apcu/apcu-4.0.7.tgz) = 84d68cbafea61df1ff864c7a3e8d2302a2879347 3SHA1 (php-apcu/apcu-5.1.5.tgz) = 1fe5f87808fd51f45b1fa2a7f67ae45b0c8336fb
4RMD160 (php-apcu/apcu-4.0.7.tgz) = 9b5f01dbefff164cd519ced448b62620e6770df8 4RMD160 (php-apcu/apcu-5.1.5.tgz) = b4b9c4ffe34ae5d1f27ae5033fb3ad06444cbf97
5SHA512 (php-apcu/apcu-4.0.7.tgz) = 50db51358c9268cc5fdd0d48fb444be9e9356f1690bc1ae021a9618c8819ce8873bf4502fe87a10467ffda2ef38267ccca2af55152b064400c69a8da92b7e98b 5SHA512 (php-apcu/apcu-5.1.5.tgz) = ffa3e666f354c8fd2ab163db9c8352066d27a1cd6aebe4d8f374052f14a90dbe752efc27c6e927cbf75fc48b6f673e639b07ceeffc2a68402a778cc6a8b18fbc
6Size (php-apcu/apcu-4.0.7.tgz) = 118670 bytes 6Size (php-apcu/apcu-5.1.5.tgz) = 109196 bytes
7SHA1 (patch-.._package.xml) = 8a30b47ce2276448e98462bda3d8fc145637ea03 7SHA1 (patch-.._package.xml) = 2012bc96eaa53679b457b7230fb10634aca2bb6a
8SHA1 (patch-config.m4) = 4a5e49577068b0d5c610148f560e565e3dcfc50a 8SHA1 (patch-config.m4) = 8bbec8aff40c4d19fa46166dae1507316bf6e3bb
cvs diff -r1.1 -r1.2 pkgsrc/www/php-apcu/PLIST.extras (expand / switch to unified diff)

--- pkgsrc/www/php-apcu/PLIST.extras 2015/02/01 08:11:20 1.1
+++ pkgsrc/www/php-apcu/PLIST.extras 2016/07/26 09:22:40 1.2
@@ -1,2 +1,19 @@ @@ -1,2 +1,19 @@
1@comment $NetBSD: PLIST.extras,v 1.1 2015/02/01 08:11:20 taca Exp $ 1@comment $NetBSD: PLIST.extras,v 1.2 2016/07/26 09:22:40 jdolecek Exp $
2share/doc/${PKGBASE}/INSTALL 2share/doc/${PKGBASE}/INSTALL
 3include/php/ext/apcu/apc.h
 4include/php/ext/apcu/apc_api.h
 5include/php/ext/apcu/apc_arginfo.h
 6include/php/ext/apcu/apc_cache.h
 7include/php/ext/apcu/apc_cache_api.h
 8include/php/ext/apcu/apc_globals.h
 9include/php/ext/apcu/apc_iterator.h
 10include/php/ext/apcu/apc_lock.h
 11include/php/ext/apcu/apc_lock_api.h
 12include/php/ext/apcu/apc_pool.h
 13include/php/ext/apcu/apc_pool_api.h
 14include/php/ext/apcu/apc_serializer.h
 15include/php/ext/apcu/apc_sma.h
 16include/php/ext/apcu/apc_sma_api.h
 17include/php/ext/apcu/apc_stack.h
 18include/php/ext/apcu/php_apc.h
 19@dirrm include/php/ext/apcu
cvs diff -r1.1 -r1.2 pkgsrc/www/php-apcu/patches/Attic/patch-.._package.xml (expand / switch to unified diff)

--- pkgsrc/www/php-apcu/patches/Attic/patch-.._package.xml 2015/02/01 08:11:20 1.1
+++ pkgsrc/www/php-apcu/patches/Attic/patch-.._package.xml 2016/07/26 09:22:40 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-.._package.xml,v 1.1 2015/02/01 08:11:20 taca Exp $ 1$NetBSD: patch-.._package.xml,v 1.2 2016/07/26 09:22:40 jdolecek Exp $
2 2
3Update md5 sum. 3Update md5 sum.
4 4
5--- ../package.xml.orig 2014-10-12 02:02:21.000000000 +0900 5--- ../package.xml.orig 2016-06-07 12:41:02.000000000 +0000
6+++ ../package.xml 2015-02-01 16:50:25.000000000 +0900 6+++ ../package.xml
7@@ -105,7 +105,7 @@ 7@@ -112,7 +112,7 @@
8 <file md5sum="2a8437130a0d8b546a4ad0a4c46f6e6b" name="pgsql_s_lock.h" role="src" /> 8 <file md5sum="9ef781739883eec8bb8743df9083152b" name="pgsql_s_lock.h" role="src" />
9 <file md5sum="f779685bd4d96e1d925ea93b73131d9c" name="pgsql_s_lock.c" role="src" /> 9 <file md5sum="c95208eaf18327335d822da86eaa5bcf" name="pgsql_s_lock.c" role="src" />
10 <file md5sum="54bfc8892372c1cf55cfa069aaf81eb2" name="apc_serializer.h" role="src" /> 10 <file md5sum="610c03c9de0306986a66f3c6d2d97b9c" name="apc_serializer.h" role="src" />
11- <file md5sum="5be4ac2cf190c97d2933e008b57d1055" name="config.m4" role="src" /> 11- <file md5sum="6677eaef2137aa0d474d284e347f6e2c" name="config.m4" role="src" />
12+ <file md5sum="5a19fef359933bfc9b208a4598f3ce53" name="config.m4" role="src" /> 12+ <file md5sum="87b5e0291a8619e0e87209a02c1c0ce6" name="config.m4" role="src" />
13 <file md5sum="8c723e3d9a87c81326117fc32e56edff" name="config.w32" role="src" /> 13 <file md5sum="e76c6931b54dc5fb3f55b20cd53aea04" name="config.w32" role="src" />
14 <file md5sum="d6c836c279b1fbabf69ada700dd5cdfc" name="INSTALL" role="doc" /> 14 <file md5sum="d6c836c279b1fbabf69ada700dd5cdfc" name="INSTALL" role="doc" />
15 <file md5sum="de1caba45c42bd445f33d52eb1e82339" name="LICENSE" role="doc" /> 15 <file md5sum="52dd90569008fee5bcdbb22d945b1108" name="LICENSE" role="doc" />
cvs diff -r1.1 -r1.2 pkgsrc/www/php-apcu/patches/patch-config.m4 (expand / switch to unified diff)

--- pkgsrc/www/php-apcu/patches/patch-config.m4 2015/02/01 08:11:20 1.1
+++ pkgsrc/www/php-apcu/patches/patch-config.m4 2016/07/26 09:22:40 1.2
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-config.m4,v 1.1 2015/02/01 08:11:20 taca Exp $ 1$NetBSD: patch-config.m4,v 1.2 2016/07/26 09:22:40 jdolecek Exp $
2 2
3Fix bashism. 3Fix bashism
4 4
5--- config.m4.orig 2014-10-11 17:02:21.000000000 +0000 5--- config.m4.orig 2016-06-07 12:41:02.000000000 +0000
6+++ config.m4 6+++ config.m4
7@@ -140,7 +140,7 @@ if test "$PHP_APCU" != "no"; then 7@@ -149,7 +149,7 @@ if test "$PHP_APCU" != "no"; then
8 LIBS="$orig_LIBS" 8 fi
9 fi 9 fi
10  10
11- if test "$PHP_APCU_RWLOCKS" == "no"; then 11- if test "$PHP_APCU_RWLOCKS" == "no"; then
12+ if test "$PHP_APCU_RWLOCKS" = "no"; then 12+ if test "$PHP_APCU_RWLOCKS" = "no"; then
13 orig_LIBS="$LIBS" 13 orig_LIBS="$LIBS"
14 LIBS="$LIBS -lpthread" 14 LIBS="$LIBS -lpthread"
15 AC_TRY_RUN( 15 AC_TRY_RUN(
16@@ -193,8 +193,8 @@ if test "$PHP_APCU" != "no"; then 16@@ -202,8 +202,8 @@ if test "$PHP_APCU" != "no"; then
17 LIBS="$orig_LIBS" 17 LIBS="$orig_LIBS"
18 fi 18 fi
19  19
20- if test "$PHP_APCU_RWLOCKS" == "no"; then 20- if test "$PHP_APCU_RWLOCKS" == "no"; then
21- if test "$PHP_APCU_MUTEX" == "no"; then 21- if test "$PHP_APCU_MUTEX" == "no"; then
22+ if test "$PHP_APCU_RWLOCKS" = "no"; then 22+ if test "$PHP_APCU_RWLOCKS" = "no"; then
23+ if test "$PHP_APCU_MUTEX" = "no"; then 23+ if test "$PHP_APCU_MUTEX" = "no"; then
24 if test "$PHP_APCU_SPINLOCK" != "no"; then 24 if test "$PHP_APCU_SPINLOCK" != "no"; then
25 AC_DEFINE(APC_SPIN_LOCK, 1, [ ]) 25 AC_DEFINE(APC_SPIN_LOCK, 1, [ ])
26 AC_MSG_WARN([APCu spin locking enabled]) 26 AC_MSG_WARN([APCu spin locking enabled])