Index: head/databases/pear-DoctrineDBAL/Makefile
===================================================================
--- head/databases/pear-DoctrineDBAL/Makefile	(revision 466789)
+++ head/databases/pear-DoctrineDBAL/Makefile	(revision 466790)
@@ -1,38 +1,37 @@
 # Created by: William Grzybowski <wg@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	DoctrineDBAL
 PORTVERSION=	2.3.4
 CATEGORIES=	databases pear
 MASTER_SITES=	http://pear.doctrine-project.org/get/
 
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Database abstraction layer used to power the ORM package
 
 LICENSE=	LGPL21
 
 RUN_DEPENDS=	${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon@${PHP_FLAVOR} \
 	${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console@${PHP_FLAVOR}
 
 OPTIONS_DEFINE=	DBLIB MYSQL ODBC PGSQL SQLITE
 OPTIONS_DEFAULT=MYSQL
 
 DBLIB_DESC=	Install PHP DBO driver for DBLIB
 MYSQL_DESC=	Install PHP DBO driver for MySQL
 ODBC_DESC=	Install PHP DBO driver for ODBC
 PGSQL_DESC=	Install PHP DBO driver for PostgreSQL
 SQLITE_DESC=	Install PHP DBO driver for SQLite
 
-USES=		pear
+USES=		pear php:cli
 PEAR_CHANNEL=	doctrine
 
 USE_PHP=	pdo
-WANT_PHP_CLI=	yes
 
 DBLIB_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_dblib.so:databases/php${PHP_VER}-pdo_dblib
 MYSQL_USE=	PHP=pdo_mysql
 ODBC_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/pdo_odbc.so:databases/php${PHP_VER}-pdo_odbc
 PGSQL_USE=	PHP=pdo_pgsql
 SQLITE_USE=	PHP=pdo_sqlite
 
 .include <bsd.port.mk>
Index: head/databases/sqlbuddy/Makefile
===================================================================
--- head/databases/sqlbuddy/Makefile	(revision 466789)
+++ head/databases/sqlbuddy/Makefile	(revision 466790)
@@ -1,42 +1,42 @@
 # Created by: Chenguang LI
 # $FreeBSD$
 
 PORTNAME=	sqlbuddy
 PORTVERSION=	1.3.3
 PORTREVISION=	3
 CATEGORIES=	databases www
 
 MAINTAINER=	horus.li@gmail.com
 COMMENT=	Web based MySQL administration with a set of PHP scripts
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	deliciousbrains
 GH_TAGNAME=	b2cdc2b
 
 NO_BUILD=	yes
 
 USE_PHP=	ctype pcre session mysql
-WANT_PHP_WEB=	yes
+USES=		php:web
 
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_FILES=	pkg-message
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "NOTE:"
 	@${ECHO_MSG} "This port assumes you have already installed a mysql database, "
 	@${ECHO_MSG} "and you want to use SQL Buddy to manage the server."
 	@${ECHO_MSG} "If you are planning to install it/them on this machine later, "
 	@${ECHO_MSG} "you can find it/them at ${PORTSDIR}/databases."
 	@${ECHO_MSG} ""
 
 do-install:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Installing SQL Buddy under ${WWWDIR}/"
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	@cd ${WRKSRC} && ${CP} -R src/* ${STAGEDIR}${WWWDIR} && ${CP} LICENSE README.md ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>