svn commit: r466792 - in head/deskutils: moregroupware myitcrm tine20

[Bernard Spil]

Author: brnrd
Date: Sun Apr  8 11:28:27 2018
New Revision: 466792
URL: https://svnweb.freebsd.org/changeset/ports/466792

Log:
  deskutils: Convert to USES=php
  
   - While here convert some USE_APACHE
  
  Approved by:    infrastructure modernization blanket

Modified:
  head/deskutils/moregroupware/Makefile
  head/deskutils/myitcrm/Makefile
  head/deskutils/tine20/Makefile

Modified: head/deskutils/moregroupware/Makefile
==============================================================================
--- head/deskutils/moregroupware/Makefile	Sun Apr  8 10:54:05 2018	(r466791)
+++ head/deskutils/moregroupware/Makefile	Sun Apr  8 11:28:27 2018	(r466792)
@@ -18,10 +18,8 @@ USE_PHP=	curl \
 		session \
 		xml
 
-USES=	gettext
+USES=	gettext php:mod
 
-WANT_PHP_MOD=	yes
-
 OPTIONS_DEFINE=	ADDONS NLS
 OPTIONS_SINGLE=	DB
 OPTIONS_SINGLE_DB=	PGSQL MYSQL
@@ -32,7 +30,7 @@ OPTIONS_SUB=	yes
 NLS_USES=		gettext
 PGSQL_USES=	pgsql
 WANT_PGSQL=	server
-MYSQL_USE=	MYSQL=server
+MYSQL_USES=	mysql:server
 
 ADDONS_DISTFILES=	${PORTNAME}-addons-${PORTVERSION}${EXTRACT_SUFX}
 NO_BUILD=	yes

Modified: head/deskutils/myitcrm/Makefile
==============================================================================
--- head/deskutils/myitcrm/Makefile	Sun Apr  8 10:54:05 2018	(r466791)
+++ head/deskutils/myitcrm/Makefile	Sun Apr  8 11:28:27 2018	(r466792)
@@ -30,16 +30,16 @@ OPTIONS_DEFAULT=	APACHE
 PHPMOD_DESC=	Use PHP module for Apache
 NGINX_DESC=	Use Nginx
 
-APACHE_USE=	APACHE_RUN=22+
+APACHE_USES=		apache:run,2.2+
 LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
 NGINX_RUN_DEPENDS=	nginx:www/nginx
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPHPMOD}
-WANT_PHP_MOD=	yes
+USES+=	php:mod
 .else
-WANT_PHP_CGI=	yes
+USES+=	php:cgi
 .endif
 
 # Set files to ignore.

Modified: head/deskutils/tine20/Makefile
==============================================================================
--- head/deskutils/tine20/Makefile	Sun Apr  8 10:54:05 2018	(r466791)
+++ head/deskutils/tine20/Makefile	Sun Apr  8 11:28:27 2018	(r466792)
@@ -13,7 +13,7 @@ COMMENT=	Professional Open Source Groupware and CRM
 
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		tar:bzip2 gettext
+USES=		gettext mysql php:web tar:bzip2
 NO_BUILD=	yes
 EXTRACT_AFTER_ARGS=	--no-same-owner --no-same-permissions -C ${WRKSRC}
 
@@ -23,10 +23,8 @@ SUB_LIST=	DISTNAME=${DISTNAME}
 OPTIONS_DEFINE=	LDAP MEMCACHE
 MEMCACHE_DESC=	Enable pecl-memcache support
 
-USE_MYSQL=	yes
 USE_PHP=	ctype dom gd iconv json mcrypt pdo_mysql simplexml \
 		spl xml zip
-WANT_PHP_WEB=	yes
 
 LDAP_USE=	php=ldap
 MEMCACHE_USE=	php=memcache