svn commit: r451218 - in head/www: asterisk-stat atutor b2evolution bacula-web bblog chems claroline cmsmadesimple dotproject efront elgg entrans eventum freeway gallery2 gallery3 gregarius habari ...

Baptiste Daroussin bapt at FreeBSD.org
Wed Oct 4 11:29:23 UTC 2017


Author: bapt
Date: Wed Oct  4 11:29:14 2017
New Revision: 451218
URL: https://svnweb.freebsd.org/changeset/ports/451218

Log:
  Convert to USES=php
  While here convert some ports to optiosn helpers

Modified:
  head/www/asterisk-stat/Makefile
  head/www/atutor/Makefile
  head/www/b2evolution/Makefile
  head/www/bacula-web/Makefile
  head/www/bblog/Makefile
  head/www/chems/Makefile
  head/www/claroline/Makefile
  head/www/cmsmadesimple/Makefile
  head/www/dotproject/Makefile
  head/www/efront/Makefile
  head/www/elgg/Makefile
  head/www/entrans/Makefile
  head/www/eventum/Makefile
  head/www/freeway/Makefile
  head/www/gallery2/Makefile
  head/www/gallery3/Makefile
  head/www/gregarius/Makefile
  head/www/habari/Makefile
  head/www/hastymail/Makefile
  head/www/hastymail2-devel/Makefile
  head/www/hastymail2/Makefile
  head/www/horde-ansel/Makefile
  head/www/horde-base/Makefile
  head/www/horde-passwd/Makefile
  head/www/horde-trean/Makefile
  head/www/horde-wicked/Makefile
  head/www/hotcrp/Makefile
  head/www/ilias/Makefile
  head/www/jinzora/Makefile
  head/www/kplaylist/Makefile
  head/www/lilurl/Makefile
  head/www/limesurvey/Makefile
  head/www/lionwiki/Makefile
  head/www/magento/Makefile
  head/www/mahara/Makefile
  head/www/mediawiki123/Makefile
  head/www/moodle30/Makefile
  head/www/moodle31/Makefile
  head/www/moodle32/Makefile
  head/www/moodle33/Makefile
  head/www/mysar/Makefile
  head/www/nibbleblog/Makefile
  head/www/opencart/Makefile
  head/www/openxmldir/Makefile
  head/www/orangehrm/Makefile
  head/www/oscommerce/Makefile
  head/www/pear-Horde_Feed/Makefile
  head/www/pear-Horde_Service_Facebook/Makefile
  head/www/pear-twig/Makefile
  head/www/phpmp/Makefile
  head/www/phprecipebook/Makefile
  head/www/phproxy/Makefile
  head/www/pivotx/Makefile
  head/www/plexwatchweb/Makefile
  head/www/pydio/Makefile
  head/www/redaxo/Makefile
  head/www/repos-style/Makefile
  head/www/revive-adserver/Makefile
  head/www/rnews/Makefile
  head/www/sams2/Makefile
  head/www/serendipity/Makefile
  head/www/sit/Makefile
  head/www/sitebar/Makefile
  head/www/smarty3/Makefile
  head/www/sxweb/Makefile
  head/www/templatelite/Makefile
  head/www/testlink/Makefile
  head/www/thundercache/Makefile
  head/www/thundersnarf/Makefile
  head/www/tivoka/Makefile
  head/www/usermanager/Makefile
  head/www/webtrees/Makefile
  head/www/xaraya/Makefile
  head/www/xoops/Makefile
  head/www/yanopaste/Makefile
  head/www/yii/Makefile
  head/www/zend-framework/Makefile
  head/www/zend-framework1/Makefile
  head/www/zikula/Makefile

Modified: head/www/asterisk-stat/Makefile
==============================================================================
--- head/www/asterisk-stat/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/asterisk-stat/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -14,8 +14,8 @@ COMMENT=	ASTERISK call detail records analyzer
 LIB_DEPENDS=	libgd.so:graphics/gd
 
 NO_BUILD=	yes
+USES=		php:web
 USE_PHP=	session gd pcre
-WANT_PHP_WEB=	yes
 ASTERISKDIR?=	${WWWDIR}
 SITE_SUBDIR=	asterisk-stat-v2
 WRKSRC=		${WRKDIR}/${SITE_SUBDIR}

Modified: head/www/atutor/Makefile
==============================================================================
--- head/www/atutor/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/atutor/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -12,7 +12,7 @@ COMMENT=	Open Source Web-based Learning Content Manage
 
 LICENSE=	GPLv2
 
-USES=		cpe
+USES=		cpe php
 
 USE_PHP=	session mbstring zlib mysql
 WRKSRC=		${WRKDIR}/ATutor

Modified: head/www/b2evolution/Makefile
==============================================================================
--- head/www/b2evolution/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/b2evolution/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -11,12 +11,11 @@ MASTER_SITES=	SF/evocms/${PORTNAME}/b2evo%20${PORTVERS
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Multilingual, multiuser, multi-blog engine
 
-USES=		cpe dos2unix zip
+USES=		cpe dos2unix php:web zip
 
 B2EVO_DATE?=	stable-2011-03-23
 USE_PHP=	mysql pcre session xml
 NO_BUILD=	YES
-WANT_PHP_WEB=	YES
 
 TMPDIR?=	${PORTNAME}
 WRKSRC=		${WRKDIR}/${TMPDIR}

Modified: head/www/bacula-web/Makefile
==============================================================================
--- head/www/bacula-web/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/bacula-web/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -12,9 +12,8 @@ COMMENT=	Bacula-web provides a summarized output of Ba
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
-USES=		tar:tgz
+USES=		php:web tar:tgz
 USE_PHP=	gd gettext session
-WANT_PHP_WEB=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes

Modified: head/www/bblog/Makefile
==============================================================================
--- head/www/bblog/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/bblog/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTN
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Elegant personal publishing system with Smarty
 
+USES=		php:web
 USE_PHP=	mysql pcre session
 NO_BUILD=	yes
-WANT_PHP_WEB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME:tl}
 WWWDOCROOT?=	www

Modified: head/www/chems/Makefile
==============================================================================
--- head/www/chems/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/chems/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -11,7 +11,7 @@ MAINTAINER=	ports at FreeBSD.org
 COMMENT=	The geekest content helper management system
 
 NO_BUILD=	yes
-USES=		zip
+USES=		zip php
 USE_PHP=	xml iconv gd
 PLIST_SUB=	WWWOWN="${WWWOWN}"
 SUB_FILES=	pkg-message

Modified: head/www/claroline/Makefile
==============================================================================
--- head/www/claroline/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/claroline/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -12,7 +12,7 @@ COMMENT=	Open Source eLearning and eWorking platform
 
 LICENSE=	GPLv2
 
-USES=		cpe
+USES=		cpe php
 
 NO_BUILD=	yes
 USE_PHP=	mysql

Modified: head/www/cmsmadesimple/Makefile
==============================================================================
--- head/www/cmsmadesimple/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/cmsmadesimple/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -12,6 +12,7 @@ COMMENT=	Simple Open Source CMS
 
 LICENSE=	GPLv2
 
+USES=		php
 USE_PHP=	mysql tokenizer gd
 
 NO_BUILD=	yes

Modified: head/www/dotproject/Makefile
==============================================================================
--- head/www/dotproject/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/dotproject/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -11,12 +11,11 @@ COMMENT=	Open Source Project Management tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cpe shebangfix
+USES=		cpe shebangfix php:web
 SHEBANG_FILES=	misc/cvs2cl/cvs2cl.pl
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 USE_PHP=	gd mysql session zlib
-WANT_PHP_WEB=	yes
 USE_APACHE_RUN=	22+
 
 SUB_FILES=	pkg-message

Modified: head/www/efront/Makefile
==============================================================================
--- head/www/efront/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/efront/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}_build18016_commun
 MAINTAINER=	wen at FreeBSD.org
 COMMENT=	Elearning and Human Capital Development platform
 
-USES=		cpe shebangfix zip
+USES=		cpe shebangfix zip php
 SHEBANG_FILES=	www/phplivedocx/samples/mail-merge/supported-file-formats/generate-documents.php \
 		www/phplivedocx/samples/mail-merge/supported-file-formats/show-supported-file-formats.php \
 		www/phplivedocx/samples/mail-merge/template-info/list-template-info.php \

Modified: head/www/elgg/Makefile
==============================================================================
--- head/www/elgg/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/elgg/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -13,7 +13,7 @@ COMMENT=	Blogging and social networking platform
 LICENSE=	GPLv2
 
 USE_PHP=	mysql gd json soap dom xml
-USES=		cpe gettext zip
+USES=		cpe gettext zip php
 
 NO_BUILD=	yes
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"

Modified: head/www/entrans/Makefile
==============================================================================
--- head/www/entrans/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/entrans/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -12,10 +12,10 @@ COMMENT=	Entrans is an online, collaborative translati
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		php:web
 USE_PHP=	mysql
 NO_BUILD=	yes
 NO_ARCH=	yes
-WANT_PHP_WEB=	yes
 ENTRANS?=	www/entrans
 PLIST_SUB+=	ENTRANS=${ENTRANS}
 PLIST=		${WRKDIR}/pkg-plist

Modified: head/www/eventum/Makefile
==============================================================================
--- head/www/eventum/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/eventum/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -10,11 +10,10 @@ MASTER_SITES=	MYSQL/eventum
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Eventum issue tracking system
 
-USES=		cpe
+USES=		cpe php:web
 CPE_VENDOR=	mysql
 NO_BUILD=	yes
 USE_PHP=	pcre session mysql gd gettext
-WANT_PHP_WEB=	yes
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
 pre-install:

Modified: head/www/freeway/Makefile
==============================================================================
--- head/www/freeway/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/freeway/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION:S,.,_,g}
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Advanced Open Source eCommerce Platform
 
-USES=		shebangfix
+USES=		shebangfix php
 SHEBANG_FILES=	admin/htmlarea/plugins/SpellChecker/spell-check-logic.cgi
 USE_PHP=	mysql
 WRKSRC=		${WRKDIR}/${PORTNAME}

Modified: head/www/gallery2/Makefile
==============================================================================
--- head/www/gallery2/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/gallery2/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -22,8 +22,8 @@ OPTIONS_DEFAULT=IMAGEMAGICK JHEAD MYSQL
 
 NO_ARCH=	yes
 NO_BUILD=	yes
+USES=		php:web
 USE_PHP=	pcre session
-WANT_PHP_WEB=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 SUB_FILES=	pkg-message

Modified: head/www/gallery3/Makefile
==============================================================================
--- head/www/gallery3/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/gallery3/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -11,11 +11,10 @@ DISTNAME=	gallery-${PORTVERSION}
 MAINTAINER=	appleboy.tw at gmail.com
 COMMENT=	Web based photo album organizer written in PHP
 
-USES=		zip
+USES=		zip php:web
 
 USE_PHP=	ctype filter iconv json mysql mbstring pcre \
 		simplexml session spl tokenizer xml
-WANT_PHP_WEB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes

Modified: head/www/gregarius/Makefile
==============================================================================
--- head/www/gregarius/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/gregarius/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -12,6 +12,7 @@ COMMENT=	Web-based RSS/RDF/ATOM news aggregator
 
 LICENSE=	GPLv2
 
+USES=		php
 USE_PHP=	gettext iconv mbstring session xml zlib
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}

Modified: head/www/habari/Makefile
==============================================================================
--- head/www/habari/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/habari/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -10,9 +10,8 @@ MASTER_SITES=	http://habariproject.org/dist/ \
 MAINTAINER=	ayu at commun.jp
 COMMENT=	Next-generation free software blogging platform
 
-USES=		zip
+USES=		zip php:web
 USE_PHP=	ctype filter hash json mbstring pcre pdo session simplexml tokenizer zlib
-WANT_PHP_WEB=	yes
 NO_BUILD=	yes
 
 OPTIONS_MULTI=	DB

Modified: head/www/hastymail/Makefile
==============================================================================
--- head/www/hastymail/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/hastymail/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
-WANT_PHP_WEB=	yes
+USES=		php:web
 USE_PHP=	session imap pcre
 
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"

Modified: head/www/hastymail2-devel/Makefile
==============================================================================
--- head/www/hastymail2-devel/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/hastymail2-devel/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
-WANT_PHP_WEB=	yes
+USES=		php:web
 USE_PHP=	session imap pcre
 
 WRKSRC=		${WRKDIR}/${PORTNAME}

Modified: head/www/hastymail2/Makefile
==============================================================================
--- head/www/hastymail2/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/hastymail2/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -20,7 +20,7 @@ SUB_FILES=	pkg-message
 
 CONFLICTS_INSTALL=	hastymail2-devel-[0-9]*
 
-WANT_PHP_WEB=	yes
+USES=		php:web
 USE_PHP=	ctype pcre session xml
 
 WIKEDVERSION=	1_1

Modified: head/www/horde-ansel/Makefile
==============================================================================
--- head/www/horde-ansel/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/horde-ansel/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -11,7 +11,7 @@ COMMENT=	Horde Photo Management and Web Gallery
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=	horde cpe
+USES=	horde cpe php
 USE_PHP=	gettext hash
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \

Modified: head/www/horde-base/Makefile
==============================================================================
--- head/www/horde-base/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/horde-base/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -1,3 +1,4 @@
+USE_MYSQL=	serve2
 # $FreeBSD$
 
 PORTNAME=	horde
@@ -18,7 +19,7 @@ ICONV_DESC=	Depend on PHP iconv extension
 TWITTER_DESC=	Support connections to Twitter
 WEATHER_DESC=	Support weather forecast display
 
-USES=	horde cpe
+USES=	horde cpe php
 USE_PHP=	filter gettext hash
 
 USE_HORDE_BUILD=	Horde_Role

Modified: head/www/horde-passwd/Makefile
==============================================================================
--- head/www/horde-passwd/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/horde-passwd/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -11,7 +11,7 @@ COMMENT=	Horde password changing application
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=	horde cpe
+USES=	horde cpe php
 USE_PHP=	gettext
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \

Modified: head/www/horde-trean/Makefile
==============================================================================
--- head/www/horde-trean/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/horde-trean/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -11,7 +11,7 @@ COMMENT=	Horde Bookmark Manager
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=	horde cpe
+USES=	horde cpe php
 USE_PHP=	gettext json
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \

Modified: head/www/horde-wicked/Makefile
==============================================================================
--- head/www/horde-wicked/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/horde-wicked/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS+=	${PEARDIR}/Text/Wiki.php:www/pear-Text_Wiki
 
-USES=	horde cpe
+USES=	horde cpe php
 USE_PHP=	gettext
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \

Modified: head/www/hotcrp/Makefile
==============================================================================
--- head/www/hotcrp/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/hotcrp/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -12,8 +12,8 @@ COMMENT=	Web based conference management software
 RUN_DEPENDS=	pdftohtml:graphics/poppler-utils \
 		zip:archivers/zip
 
+USES=		php mysql:server
 USE_PHP=	mysqli gd session ctype
-USE_MYSQL=	server
 
 NO_BUILD=	yes
 SUB_FILES=	pkg-message

Modified: head/www/ilias/Makefile
==============================================================================
--- head/www/ilias/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/ilias/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -24,7 +24,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	ILIAS-eLearning
 GH_PROJECT=	ILIAS
 
-USES=		cpe jpeg
+USES=		cpe jpeg php
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/plist
 SUB_FILES=	pkg-message

Modified: head/www/jinzora/Makefile
==============================================================================
--- head/www/jinzora/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/jinzora/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -10,6 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/Jinzora%20${PORTVERSION}
 MAINTAINER=	kevlo at FreeBSD.org
 COMMENT=	Web based media streaming and management system
 
+USES=		php
 USE_PHP=	mysql session iconv gd pdf
 
 NO_BUILD=	yes

Modified: head/www/kplaylist/Makefile
==============================================================================
--- head/www/kplaylist/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/kplaylist/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -15,6 +15,7 @@ RUN_DEPENDS=	lame:audio/lame \
 		oggenc:audio/vorbis-tools \
 		zip:archivers/zip
 
+USES=		php
 USE_PHP=	curl mysql session iconv
 
 WRKSRC=		${WRKDIR}

Modified: head/www/lilurl/Makefile
==============================================================================
--- head/www/lilurl/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/lilurl/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -10,10 +10,10 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-$
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Simple PHP/MySQL script for generating lil? URLs
 
+USES=		php:web
 USE_PHP=	mysql pcre
 NO_BUILD=	yes
 NO_ARCH=	yes
-WANT_PHP_WEB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 LILURL_DIR?=	www/lilurl

Modified: head/www/limesurvey/Makefile
==============================================================================
--- head/www/limesurvey/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/limesurvey/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -13,7 +13,7 @@ COMMENT=	PHP-based survey building and runing system
 
 LICENSE=	GPLv2
 
-USES=		cpe
+USES=		cpe php:web
 
 # http://docs.limesurvey.org/Installation&structure=English+Instructions+for+LimeSurvey
 OPTIONS_DEFINE=		PGSQL GD LDAP ZIP
@@ -47,7 +47,6 @@ USE_PHP+=	zip
 .endif
 USE_PHP+=	ctype dom iconv json mbstring pcre \
 		simplexml session xmlwriter
-WANT_PHP_WEB=yes
 
 WWWDOCROOT?=		www
 PHPSURVEYORURL?=	${PORTNAME}

Modified: head/www/lionwiki/Makefile
==============================================================================
--- head/www/lionwiki/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/lionwiki/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -9,6 +9,7 @@ MASTER_SITES=	http://lionwiki.0o.cz/download/${PORTVER
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Minimalis wiki, extensible, templatable and file based
 
+USES=		php
 USE_PHP=	session ctype
 
 NO_BUILD=	yes

Modified: head/www/magento/Makefile
==============================================================================
--- head/www/magento/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/magento/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.magentocommerce.com/downloads
 MAINTAINER=	wen at FreeBSD.org
 COMMENT=	Feature-rich eCommerce platform
 
-USES=		cpe
+USES=		cpe php
 CPE_VENDDOR=	magentocommerce
 USE_PHP=	pdo_mysql hash gd iconv curl dom soap simplexml mcrypt mysql \
 		ctype zlib json

Modified: head/www/mahara/Makefile
==============================================================================
--- head/www/mahara/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/mahara/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -12,7 +12,7 @@ COMMENT=	Open source ePortfolio system
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
-USES=		cpe tar:bzip2
+USES=		cpe php tar:bzip2
 USE_PHP=	dom gd session json curl xml xmlrpc openssl simplexml \
 		mcrypt zip
 

Modified: head/www/mediawiki123/Makefile
==============================================================================
--- head/www/mediawiki123/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/mediawiki123/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 CONFLICTS=	mediawiki12[789]-[0-9]*
 
-USES=		python:run shebangfix
+USES=		php:web python:run shebangfix
 SHEBANG_FILES=	maintenance/dev/*.sh \
 		maintenance/hiphop/run-server \
 		maintenance/language/zhtable/Makefile.py
@@ -23,7 +23,6 @@ hhvm_OLD_CMD=	/usr/bin/hhvm
 hhvm_CMD=	${LOCALBASE}/bin/hhvm # not installed by anything yet
 USE_PHP=	ctype dom hash iconv json mbstring pcre readline \
 		session xml xmlreader zlib
-WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki
 
 NO_BUILD=	yes
@@ -42,40 +41,16 @@ SOCKETS_DESC=	Use sockets
 
 MYSQL_VARS=	IGNORE_WITH_PHP+=70
 
-.include <bsd.port.options.mk>
+MYSQL_USES=	mysql
+MYSQL_USE=	php=mysql
+PGSQL_USE=	php=pgsql
+SQLITE_USE=	php=sqlite3
+LDAP_USE=	php=ldap
 
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	client
-USE_PHP+=	mysql
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PHP+=	pgsql
-.endif
-
-.if ${PORT_OPTIONS:MSQLITE}
-USE_PHP+=	sqlite3
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_PHP+=	ldap
-.endif
-
-.if ${PORT_OPTIONS:MMEMCACHED}
-RUN_DEPENDS=	memcached:databases/memcached
-.endif
-
-.if ${PORT_OPTIONS:MIMAGICK}
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
-.endif
-
-.if ${PORT_OPTIONS:MXCACHE}
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
-.endif
-
-.if ${PORT_OPTIONS:MSOCKETS}
-USE_PHP+=	sockets
-.endif
+MEMCACHED_RUN_DEPENDS=	memcached:databases/memcached
+IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
+XCACHE_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
+SOCKETS_USE=	php=sockets
 
 pre-install:
 	@${FIND} -s -d ${WRKSRC} -not -type d | ${SED} "s?${WRKSRC}?${MEDIAWIKIDIR}?g" >>${PLIST}

Modified: head/www/moodle30/Makefile
==============================================================================
--- head/www/moodle30/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/moodle30/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -17,7 +17,7 @@ CONFLICTS=	moodle31-3.1.[0-9]* moodle32-3.2.[0-9]* moo
 DEPRECATED=		Deprecated by upstream, please use www/moodle33 instead
 EXPIRATION_DATE=	2017-10-11
 
-USES=		cpe tar:tgz
+USES=		cpe php tar:tgz
 USE_PHP=	ctype curl dom gd hash iconv intl json mbstring opcache \
 		openssl pcre session simplexml soap spl tokenizer xml xmlrpc \
 		zip zlib
@@ -29,7 +29,8 @@ OPTIONS_DEFINE=		LDAP MIMETEX
 OPTIONS_DEFAULT=	MYSQL
 MIMETEX_DESC=		mimeTeX filter functionality support
 
-MYSQL_USE=	mysql=client php=mysqli
+MYSQL_USES=	mysql:client
+MYSQL_USE=	php=mysqli
 PGSQL_USE=	php=pgsql
 MSSQL_USE=	php=mssql
 LDAP_USE=	php=ldap

Modified: head/www/moodle31/Makefile
==============================================================================
--- head/www/moodle31/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/moodle31/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -14,7 +14,7 @@ LICENSE=	GPLv3
 
 CONFLICTS=	moodle30-3.0.[0-9]* moodle32-3.2.[0-9]* moodle33-3.3.[0-9]*
 
-USES=		cpe tar:tgz
+USES=		cpe php tar:tgz
 USE_PHP=	ctype curl dom gd hash iconv intl json mbstring opcache \
 		openssl pcre session simplexml soap spl tokenizer xml \
 		xmlreader xmlrpc zip zlib
@@ -26,7 +26,8 @@ OPTIONS_DEFINE=		LDAP MIMETEX
 OPTIONS_DEFAULT=	MYSQL
 MIMETEX_DESC=		mimeTeX filter functionality support
 
-MYSQL_USE=	mysql=client php=mysqli
+MYSQL_USES=	mysql:client
+MYSQL_USE=	php=mysqli
 PGSQL_USE=	php=pgsql
 MSSQL_USE=	php=mssql
 LDAP_USE=	php=ldap

Modified: head/www/moodle32/Makefile
==============================================================================
--- head/www/moodle32/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/moodle32/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -1,4 +1,4 @@
-# Created by: Javier Martin Rueda <jmrueda at diatel.upm.es>
+:# Created by: Javier Martin Rueda <jmrueda at diatel.upm.es2
 # $FreeBSD$
 
 PORTNAME=	moodle
@@ -14,7 +14,7 @@ LICENSE=	GPLv3
 
 CONFLICTS=	moodle30-3.0.[0-9]* moodle31-3.1.[0-9]* moodle33-3.3.[0-9]*
 
-USES=		cpe tar:tgz
+USES=		cpe php tar:tgz
 USE_PHP=	ctype curl dom gd hash iconv intl json mbstring opcache \
 		openssl pcre session simplexml soap spl tokenizer xml \
 		xmlreader xmlrpc zip zlib
@@ -26,7 +26,8 @@ OPTIONS_DEFINE=		LDAP MIMETEX
 OPTIONS_DEFAULT=	MYSQL
 MIMETEX_DESC=		mimeTeX filter functionality support
 
-MYSQL_USE=	mysql=client php=mysqli
+MYSQL_USES=	mysql:client
+MYSQL_USE=	php=mysqli
 PGSQL_USE=	php=pgsql
 MSSQL_USE=	php=mssql
 LDAP_USE=	php=ldap

Modified: head/www/moodle33/Makefile
==============================================================================
--- head/www/moodle33/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/moodle33/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -14,7 +14,7 @@ LICENSE=	GPLv3
 
 CONFLICTS=	moodle30-3.0.[0-9]* moodle31-3.1.[0-9]* moodle32-3.2.[0-9]*
 
-USES=		cpe tar:tgz
+USES=		cpe php tar:tgz
 USE_PHP=	ctype curl dom fileinfo gd hash iconv intl json mbstring \
 		opcache openssl pcre session simplexml soap spl tokenizer \
 		xml xmlreader xmlrpc zip zlib
@@ -26,7 +26,8 @@ OPTIONS_DEFINE=		LDAP MIMETEX
 OPTIONS_DEFAULT=	MYSQL
 MIMETEX_DESC=		mimeTeX filter functionality support
 
-MYSQL_USE=	mysql=client php=mysqli
+MYSQL_USES=	mysql
+MYSQL_USE=	php=mysqli
 PGSQL_USE=	php=pgsql
 MSSQL_USE=	php=mssql
 LDAP_USE=	php=ldap

Modified: head/www/mysar/Makefile
==============================================================================
--- head/www/mysar/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/mysar/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -20,6 +20,7 @@ WRKROOT=	${WRKDIR}/${PORTNAME:tl}
 WRKSRC=		${WRKROOT}/bin/mysar-binary-importer
 GNU_CONFIGURE=	yes
 USE_MYSQL=	yes
+USES=		php
 USE_PHP=	mysql pcre
 USE_CSTD=	gnu89
 

Modified: head/www/nibbleblog/Makefile
==============================================================================
--- head/www/nibbleblog/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/nibbleblog/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -13,7 +13,7 @@ COMMENT=	Lightweight blog system for general use
 
 RUN_DEPENDS=	pear:devel/pear
 
-USES=		cpe zip
+USES=		cpe php zip
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_PHP=	session filter xml simplexml gd

Modified: head/www/opencart/Makefile
==============================================================================
--- head/www/opencart/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/opencart/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -13,6 +13,7 @@ LICENSE=	GPLv3
 USE_GITHUB=	yes
 GH_ACCOUNT=	opencart
 
+USES=		php
 USE_PHP=	filter mysqli curl mbstring gd zlib mcrypt session zip hash
 WRKSRC_SUBDIR=	upload
 

Modified: head/www/openxmldir/Makefile
==============================================================================
--- head/www/openxmldir/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/openxmldir/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -13,8 +13,8 @@ COMMENT=	PHP based XML menuing system for Cisco 79xx I
 
 LICENSE=	GPLv2
 
+USES=		php:web
 NO_BUILD=	yes
-WANT_PHP_WEB=	yes
 USE_PHP=	mysql xml
 PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 

Modified: head/www/orangehrm/Makefile
==============================================================================
--- head/www/orangehrm/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/orangehrm/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -13,7 +13,7 @@ COMMENT=	Open Source Human Resource Management
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license/LICENSE.TXT
 
-USES=		cpe zip
+USES=		cpe php zip
 USE_PHP=	pdo_mysql ctype xml simplexml
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/plist

Modified: head/www/oscommerce/Makefile
==============================================================================
--- head/www/oscommerce/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/oscommerce/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -10,9 +10,8 @@ MASTER_SITES=	http://www.oscommerce.com/files/
 MAINTAINER=	wen at FreeBSD.org
 COMMENT=	Full-featured open source e-commerce system
 
-USES=		cpe zip
+USES=		cpe php:web zip
 USE_PHP=	mysql session pcre gd curl openssl
-WANT_PHP_WEB=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 SUB_FILES=	pkg-message

Modified: head/www/pear-Horde_Feed/Makefile
==============================================================================
--- head/www/pear-Horde_Feed/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/pear-Horde_Feed/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -8,7 +8,7 @@ CATEGORIES=	www pear
 MAINTAINER=	horde at FreeBSD.org
 COMMENT=	Horde Feed libraries
 
-USES=	horde
+USES=	horde php
 USE_PHP=	dom
 USE_HORDE_RUN=	Horde_Exception \
 		Horde_Http \

Modified: head/www/pear-Horde_Service_Facebook/Makefile
==============================================================================
--- head/www/pear-Horde_Service_Facebook/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/pear-Horde_Service_Facebook/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -8,7 +8,7 @@ CATEGORIES=	www pear
 MAINTAINER=	horde at FreeBSD.org
 COMMENT=	Horde Facebook client
 
-USES=	horde
+USES=	horde php
 USE_PHP=	json simplexml
 USE_HORDE_RUN=	Horde_Exception \
 		Horde_Http \

Modified: head/www/pear-twig/Makefile
==============================================================================
--- head/www/pear-twig/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/pear-twig/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -16,11 +16,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PEARDIR}/.channels/pear.twig-project.org.reg:devel/pear-channel-twig
 RUN_DEPENDS=	${PEARDIR}/.channels/pear.twig-project.org.reg:devel/pear-channel-twig
 
-USES=		pear
+USES=		pear php:cli
 PEAR_CHANNEL=	twig
 NO_ARCH=	yes
 
 USE_PHP=	ctype hash
-WANT_PHP_CLI=	yes
 
 .include <bsd.port.mk>

Modified: head/www/phpmp/Makefile
==============================================================================
--- head/www/phpmp/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/phpmp/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -13,6 +13,7 @@ COMMENT=	Web interface for music player daemon
 LICENSE=	GPLv2
 
 NO_BUILD=	yes
+USES=		php
 USE_PHP=	pcre sockets
 
 PHPMP?=		${WWWDIR_REL}

Modified: head/www/phprecipebook/Makefile
==============================================================================
--- head/www/phprecipebook/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/phprecipebook/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -15,9 +15,8 @@ LICENSE_FILE=	${WRKSRC}/docs/LICENSE.TXT
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
-USES=		tar:tgz
+USES=		php:web tar:tgz
 USE_PHP=	xml
-WANT_PHP_WEB=	yes
 SUB_FILES=	pkg-message
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 

Modified: head/www/phproxy/Makefile
==============================================================================
--- head/www/phproxy/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/phproxy/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -12,8 +12,7 @@ MAINTAINER=	ports at FreeBSD.org
 COMMENT=	PHP based web proxy
 
 NO_BUILD=	YES
-WANT_PHP_WEB=	YES
-USES=		zip:infozip
+USES=		php:web zip:infozip
 USE_PHP=	ctype pcre
 EXTRACT_AFTER_ARGS+=	-d ${WRKSRC}
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
@@ -27,7 +26,6 @@ do-install:
 .for i in ${DOCFILES}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/${i}
 .endfor
-
 	@${RM} ${WRKSRC}/*.txt
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/)

Modified: head/www/pivotx/Makefile
==============================================================================
--- head/www/pivotx/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/pivotx/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -23,11 +23,10 @@ OPTIONS_DEFINE=	MYSQL PHPDOM DOCS EXAMPLES
 MYSQL_DESC=	Use MySQL instead of flat files
 PHPDOM_DESC=	Use PHP:DOM instead of SimpleXML
 
-.include <bsd.port.options.mk>
-
-WANT_PHP_WEB=	yes
+USES+=		cpe php:web tar:tgz
 USE_PHP=	session gettext xml tokenizer gd pcre
-USES+=		cpe tar:tgz
+
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPHPDOM}
 USE_PHP+=	dom

Modified: head/www/plexwatchweb/Makefile
==============================================================================
--- head/www/plexwatchweb/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/plexwatchweb/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -12,6 +12,7 @@ COMMENT=	Web front-end for plexWatch
 
 RUN_DEPENDS=	plexWatch>=0.1.6:multimedia/plexwatch
 
+USES=		php
 USE_PHP=	curl json session simplexml sqlite3
 
 USERS=		${WWWOWN}

Modified: head/www/pydio/Makefile
==============================================================================
--- head/www/pydio/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/pydio/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -15,10 +15,9 @@ PORTSCOUT=	limitw:1,even
 
 NO_BUILD=	yes
 NO_ARCH=	yes
-USES=		cpe dos2unix
+USES=		cpe dos2unix php:web
 USE_PHP=	dom mcrypt gd
 DOS2UNIX_REGEX=	.*\.php
-WANT_PHP_WEB=	yes
 SUB_FILES=	pkg-deinstall pkg-message
 SUB_LIST+=	GOWDIR=${WWWDIR:H}
 

Modified: head/www/redaxo/Makefile
==============================================================================
--- head/www/redaxo/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/redaxo/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -15,6 +15,7 @@ LICENSE=	GPLv2
 NO_BUILD=	yes
 
 SUB_FILES+=	pkg-message pkg-deinstall
+
 USE_PHP=	mysql session xml zlib
 USES=		cpe zip:infozip
 
@@ -26,9 +27,10 @@ GD_DESC=	Enable Image Manager extension (requires gd)
 
 OPTIONS_DEFAULT=	APACHE MYSQLS GD
 
-MYSQLS_USE=	MYSQL=server
+MYSQLS_USES=	mysql:server
 
-APACHE_VARS=	WANT_PHP_MOD=yes
+APACHE_USES=	php:mod
+APACHE_USES_OFF=	php
 
 GD_USE=	PHP=gd
 

Modified: head/www/repos-style/Makefile
==============================================================================
--- head/www/repos-style/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/repos-style/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -13,12 +13,11 @@ COMMENT=	Stylesheet for the Subversion index web page
 
 RUN_DEPENDS=	subversion>=0:devel/subversion
 
-USES=		dos2unix zip
+USES=		dos2unix php:web zip
 DOS2UNIX_GLOB=	*.xsl *.php
 NO_BUILD=	YES
 
 USE_PHP=	xml
-WANT_PHP_WEB=	yes
 
 WRKSRC=		${WRKDIR}/repos-web
 

Modified: head/www/revive-adserver/Makefile
==============================================================================
--- head/www/revive-adserver/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/revive-adserver/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -22,6 +22,7 @@ PLIST_SUB+=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_PHP_DEPENDS)
+USES+=		php
 USE_PHP=	xml pcre zlib mysql pgsql ftp
 IGNORE_WITH_PHP=	70 71
 .endif

Modified: head/www/rnews/Makefile
==============================================================================
--- head/www/rnews/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/rnews/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -1,3 +1,4 @@
+
 # Created by: Vincent Tantardini <vinc at FreeBSD-fr.org>
 # $FreeBSD$
 
@@ -18,9 +19,10 @@ OPTIONS_DEFINE=	GD MYSQLSERVER DOCS
 OPTIONS_DEFAULT=	GD
 MYSQLSERVER_DESC=	Use MySQL-Server on localhost
 
-.include <bsd.port.options.mk>
-
+USES=		php
 USE_PHP=	mysql mbstring pcre xml iconv
+
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGD}
 USE_PHP+=	gd

Modified: head/www/sams2/Makefile
==============================================================================
--- head/www/sams2/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/sams2/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -14,7 +14,7 @@ LICENSE=	BSD4CLAUSE
 LIB_DEPENDS=	libpcre.so:devel/pcre
 RUN_DEPENDS=	${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER}
 
-USES=		autoreconf gmake libtool tar:bzip2
+USES=		autoreconf gmake libtool php tar:bzip2
 USE_LDCONFIG=	yes
 USE_PHP=	gd mysql zlib
 USE_MYSQL=	yes

Modified: head/www/serendipity/Makefile
==============================================================================
--- head/www/serendipity/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/serendipity/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -18,29 +18,16 @@ SERENDIPITY?=	www/${PORTNAME}
 PLIST_SUB+=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 USE_PHP=	session pcre gd openssl mbstring iconv zlib xml
 SUB_FILES=	pkg-message
-USES=		cpe tar:bzip2
+USES=		cpe php tar:bzip2
 CPE_VENDOR=	s9y
 
 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE MAGICK
 OPTIONS_DEFAULT=	MYSQL MAGICK
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_PHP+=	mysql
-. endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PHP+=	pgsql
-.endif
-
-.if ${PORT_OPTIONS:MSQLITE}
-USE_PHP+=	sqlite3
-.endif
-
-.if ${PORT_OPTIONS:MMAGICK}
-RUN_DEPENDS+=	convert:graphics/ImageMagick
-.endif
+MYSQL_USE=	PHP=mysql
+PGSQL_USE=	PHP=pgsql
+SQLITE_USE=	PHP=sqlite3
+MAGICK_RUN_DEPENDS+=	convert:graphics/ImageMagick
 
 do-install:
 	@-${MKDIR} ${STAGEDIR}${PREFIX}/${SERENDIPITY}

Modified: head/www/sit/Makefile
==============================================================================
--- head/www/sit/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/sit/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -13,8 +13,8 @@ COMMENT=	PHP incident tracking system / Helpdesk
 
 LICENSE=	GPLv2
 
+USES=		php:web
 USE_PHP=	pcre mysql session zlib mbstring
-WANT_PHP_WEB=	yes
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/sit-${PORTVERSION}

Modified: head/www/sitebar/Makefile
==============================================================================
--- head/www/sitebar/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/sitebar/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -10,9 +10,8 @@ DISTNAME=	SiteBar-${PORTVERSION}
 MAINTAINER=	gunter at six-two.net
 COMMENT=	The Bookmark Server for Personal and Team Use
 
-USES=		tar:bzip2
+USES=		php:web tar:bzip2
 USE_PHP=	mysql pcre
-WANT_PHP_WEB=	yes
 NO_BUILD=	yes
 DATADIR=	${PREFIX}/www/${PORTNAME}
 

Modified: head/www/smarty3/Makefile
==============================================================================
--- head/www/smarty3/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/smarty3/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -14,8 +14,8 @@ COMMENT=	PHP compiling template engine
 LICENSE=	LGPL3
 
 NO_BUILD=	yes
+USES=		php:web
 USE_PHP=	pcre
-WANT_PHP_WEB=	yes
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message

Modified: head/www/sxweb/Makefile
==============================================================================
--- head/www/sxweb/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/sxweb/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -11,12 +11,10 @@ COMMENT=	SXDrive Web app
 
 RUN_DEPENDS=	sxinit:net-mgmt/sx
 
-USES=		cpe
+USES=		cpe php:web
 USE_PHP=	ctype curl dom gd hash iconv json mbstring mysql mysqli \
 		pcre pdo pdo_mysql posix session simplexml sockets spl \
 		xml xmlreader xmlwriter
-
-WANT_PHP_WEB=	yes
 
 NO_BUILD=	yes
 SXWEB_USERNAME?=	${WWWOWN}

Modified: head/www/templatelite/Makefile
==============================================================================
--- head/www/templatelite/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/templatelite/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -15,8 +15,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 NO_BUILD=	yes
 NO_ARCH=	yes
+USES=		php:web
 USE_PHP=	pcre
-WANT_PHP_WEB=	yes
 WRKSRC=		${WRKDIR}/template_lite
 SUB_FILES=	pkg-message
 

Modified: head/www/testlink/Makefile
==============================================================================
--- head/www/testlink/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/testlink/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -12,10 +12,9 @@ COMMENT=	Web based test management and test execution 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cpe
+USES=		cpe php:web
 CPE_VENDOR=	teamst
 USE_PHP=	gd iconv mbstring session xml
-WANT_PHP_WEB=	yes
 NO_BUILD=	yes
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 REINPLACE_ARGS=	-i ''

Modified: head/www/thundercache/Makefile
==============================================================================
--- head/www/thundercache/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/thundercache/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -28,7 +28,7 @@ APACHE_DESC=	Install apache for reporting viewing
 PHP_DESC=	Install PHP for reporting generating
 PGSQL_DESC=	Install PostgreSQL (report data storing)
 
-USES=		shebangfix tar:bzip2 ssl
+USES=		php shebangfix tar:bzip2 ssl
 SHEBANG_FILES=	sbin/thunderlog.php
 USE_GCC=	any
 

Modified: head/www/thundersnarf/Makefile
==============================================================================
--- head/www/thundersnarf/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/thundersnarf/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -19,6 +19,8 @@ PGSQL_DESC=	Install PostgreSQL (report data storing)
 
 USES=		tar:bzip2
 
+PHP_USES=	php
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}

Modified: head/www/tivoka/Makefile
==============================================================================
--- head/www/tivoka/Makefile	Wed Oct  4 11:23:34 2017	(r451217)
+++ head/www/tivoka/Makefile	Wed Oct  4 11:29:14 2017	(r451218)
@@ -13,6 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 OPTIONS_DEFINE=	EXAMPLES
 
+USES=		php
 USE_PHP=	json filter
 NO_BUILD=	yes

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-ports-all mailing list