Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -8996,3 +8996,4 @@
 www/pligg||2017-01-22|Has expired: Abandonware
 x11-drivers/xf86-video-fbdev||2017-01-22|Linux only driver
 net/librsync1|net/librsync2|2017-01-24|Port renamed to librsync2
+devel/php70-APCu|devel/pecl-APCu|2017-01-26|Use devel/pecl-APCu for PHP 7.0+ users
Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -3824,6 +3824,7 @@
     SUBDIR += pear-pdepend-staticReflection
     SUBDIR += pear-phing
     SUBDIR += pecl-APCu
+    SUBDIR += pecl-APCu4
     SUBDIR += pecl-dio
     SUBDIR += pecl-eio
     SUBDIR += pecl-ev
@@ -3901,7 +3902,6 @@
     SUBDIR += php56-sysvsem
     SUBDIR += php56-sysvshm
     SUBDIR += php56-tokenizer
-    SUBDIR += php70-APCu
     SUBDIR += php70-gettext
     SUBDIR += php70-intl
     SUBDIR += php70-json
Index: devel/pecl-APCu/Makefile
===================================================================
--- devel/pecl-APCu/Makefile
+++ devel/pecl-APCu/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	APCu
-PORTVERSION=	4.0.10
-PORTREVISION=	1
+PORTVERSION=	5.1.8
 CATEGORIES=	devel
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
@@ -15,11 +14,10 @@
 
 LICENSE=	PHP301
 
-CONFLICTS=	pecl-APC-[0-9]*
+CONFLICTS_INSTALL=	pecl-APC-
 
-CFLAGS+=	-I${LOCALBASE}/include
-IGNORE_WITH_PHP=	70
-USES=		php:ext tar:tgz
+IGNORE_WITH_PHP=56
+USES=		localbase php:ext tar:tgz
 PHP_MODNAME=	${PORTNAME:tl}
 
 .include <bsd.port.mk>
Index: devel/pecl-APCu/distinfo
===================================================================
--- devel/pecl-APCu/distinfo
+++ devel/pecl-APCu/distinfo
@@ -1,2 +1,3 @@
-SHA256 (PECL/apcu-4.0.10.tgz) = 8dee6680924107d2aaf827f9cb8ef0e8e09c47bb38712a3439eddabe3ce41b40
-SIZE (PECL/apcu-4.0.10.tgz) = 119264
+TIMESTAMP = 1485283897
+SHA256 (PECL/apcu-5.1.8.tgz) = 01dfbf0245d8cc0f51ba16467a60b5fad08e30b28df7846e0dd213da1143ecce
+SIZE (PECL/apcu-5.1.8.tgz) = 111260
Index: devel/pecl-APCu4/Makefile
===================================================================
--- devel/pecl-APCu4/Makefile
+++ devel/pecl-APCu4/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	APCu
-PORTVERSION=	4.0.10
-PORTREVISION=	1
+PORTVERSION=	4.0.11
 CATEGORIES=	devel
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
+PKGNAMESUFFIX=	4
 DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 DIST_SUBDIR=	PECL
 
@@ -15,11 +15,10 @@
 
 LICENSE=	PHP301
 
-CONFLICTS=	pecl-APC-[0-9]*
+CONFLICTS_INSTALL=	pecl-APC-
 
-CFLAGS+=	-I${LOCALBASE}/include
-IGNORE_WITH_PHP=	70
-USES=		php:ext tar:tgz
+IGNORE_WITH_PHP=70 71
+USES=		localbase php:ext tar:tgz
 PHP_MODNAME=	${PORTNAME:tl}
 
 .include <bsd.port.mk>
Index: devel/pecl-APCu4/distinfo
===================================================================
--- devel/pecl-APCu4/distinfo
+++ devel/pecl-APCu4/distinfo
@@ -1,2 +1,3 @@
-SHA256 (PECL/apcu-4.0.10.tgz) = 8dee6680924107d2aaf827f9cb8ef0e8e09c47bb38712a3439eddabe3ce41b40
-SIZE (PECL/apcu-4.0.10.tgz) = 119264
+TIMESTAMP = 1480160370
+SHA256 (PECL/apcu-4.0.11.tgz) = 454f302ec13a6047ca4c39e081217ce5a61bbea815aec9c1091fb849e70b4d00
+SIZE (PECL/apcu-4.0.11.tgz) = 119535
Index: devel/php70-APCu/Makefile
===================================================================
--- devel/php70-APCu/Makefile
+++ devel/php70-APCu/Makefile
@@ -1,23 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	APCu
-PORTVERSION=	5.1.8
-CATEGORIES=	devel
-MASTER_SITES=	http://pecl.php.net/get/
-PKGNAMEPREFIX=	php70-
-DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
-DIST_SUBDIR=	PECL
-
-MAINTAINER=	daniel@blodan.se
-COMMENT=	APC User Caching
-
-LICENSE=	PHP301
-
-CONFLICTS_INSTALL=	pecl-APC-[0-9]*
-
-IGNORE_WITH_PHP=	56
-PHP_VER=	70
-USES=		localbase php:ext tar:tgz
-PHP_MODNAME=	${PORTNAME:tl}
-
-.include <bsd.port.mk>
Index: devel/php70-APCu/distinfo
===================================================================
--- devel/php70-APCu/distinfo
+++ devel/php70-APCu/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1484667198
-SHA256 (PECL/apcu-5.1.8.tgz) = 01dfbf0245d8cc0f51ba16467a60b5fad08e30b28df7846e0dd213da1143ecce
-SIZE (PECL/apcu-5.1.8.tgz) = 111260
Index: devel/php70-APCu/pkg-descr
===================================================================
--- devel/php70-APCu/pkg-descr
+++ devel/php70-APCu/pkg-descr
@@ -1,3 +0,0 @@
-APCu - APC User Cache
-
-WWW: https://pecl.php.net/package/apcu