Index: head/devel/arcanist/Makefile
===================================================================
--- head/devel/arcanist/Makefile	(revision 437828)
+++ head/devel/arcanist/Makefile	(revision 437829)
@@ -1,36 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	arcanist
 PORTVERSION=	20161003
+PORTREVISION=	1
 CATEGORIES=	devel
-PKGNAMEPREFIX=	php5-
+PKGNAMEPREFIX=	php-
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Command line interface for Phabricator
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS=	arc-*
 
 PHP_DESTDIR=	lib/php/arcanist
-RUN_DEPENDS=	php5-libphutil>0:devel/libphutil
+RUN_DEPENDS=	php-libphutil>0:devel/libphutil
 USES=		php
 USE_PHP=	curl dom json simplexml
 USE_GITHUB=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 GH_ACCOUNT=	phacility
 GH_TAGNAME=	483e985
 
 OPTIONS_DEFINE=	ENCODINGS
 OPTIONS_DEFAULT=ENCODINGS
 ENCODINGS_DESC=	Support for encodings other than utf-8
 ENCODINGS_USE=	PHP=mbstring
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
 	cd ${WRKSRC} ; ${PAX} -rw * ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
 	${LN} -sf ../${PHP_DESTDIR}/scripts/arcanist.php ${STAGEDIR}${PREFIX}/bin/arc
 
 .include <bsd.port.mk>
Index: head/devel/libphutil/Makefile
===================================================================
--- head/devel/libphutil/Makefile	(revision 437828)
+++ head/devel/libphutil/Makefile	(revision 437829)
@@ -1,27 +1,28 @@
 # $FreeBSD$
 
 PORTNAME=	libphutil
 PORTVERSION=	20161003
+PORTREVISION=	1
 CATEGORIES=	devel
-PKGNAMEPREFIX=	php5-
+PKGNAMEPREFIX=	php-
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Collection of PHP utility classes
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PHP_DESTDIR=	lib/php/libphutil
 USES=		php
 USE_PHP=	xml
 USE_GITHUB=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 GH_ACCOUNT=	phacility
 GH_TAGNAME=	4b12a4f
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
 	cd ${WRKSRC} ; ${PAX} -rw * ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
 
 .include <bsd.port.mk>
Index: head/devel/phabricator/Makefile
===================================================================
--- head/devel/phabricator/Makefile	(revision 437828)
+++ head/devel/phabricator/Makefile	(revision 437829)
@@ -1,59 +1,59 @@
 # $FreeBSD$
 
 PORTNAME=	phabricator
 PORTVERSION=	20161003
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
-PKGNAMEPREFIX=	php5-
+PKGNAMEPREFIX=	php-
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Open source, software engineering platform
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	php5-libphutil>0:devel/libphutil \
-		php5-arcanist>0:devel/arcanist \
+RUN_DEPENDS=	php-libphutil>0:devel/libphutil \
+		php-arcanist>0:devel/arcanist \
 		git:devel/git
 
 OPTIONS_DEFINE=	GD OPCACHE
 OPTIONS_DEFAULT=OPCACHE
 OPCACHE_DESC?=	Use OPcache to improve performance
 
 USES=		php shebangfix
 SHEBANG_FILES=	externals/httpful/build \
 		externals/restful/build-phar \
 		scripts/install/install_rhel-derivs.sh \
 		scripts/install/install_ubuntu.sh
 USE_PHP=	ctype curl fileinfo filter hash iconv mbstring mysqli openssl \
 		pcntl posix
 
 GD_USE=		PHP=gd
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MOPCACHE}
 USE_PHP+=	opcache
 .	if ${PHP_VER} >= 70
 RUN_DEPENDS+=	 ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu
 .	else
 RUN_DEPENDS+=	 ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu4
 .	endif
 .endif
 
 USE_GITHUB=	yes
 NO_BUILD=	yes
 USE_RC_SUBR=	phd
 SUB_FILES=	pkg-message
 GH_ACCOUNT=	phacility
 GH_TAGNAME=	55a56c0
 
 PHP_DESTDIR=	lib/php/phabricator
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/conf/local
 	@${INSTALL_DATA} ${FILESDIR}/local.json.sample \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/conf/local
 	cd ${WRKSRC} ; ${PAX} -rw * ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
 
 .include <bsd.port.post.mk>