Index: head/www/bareos-webui/Makefile
===================================================================
--- head/www/bareos-webui/Makefile	(revision 429815)
+++ head/www/bareos-webui/Makefile	(revision 429816)
@@ -1,74 +1,63 @@
 # Created by: Alonso Cardenas <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	bareos-webui
+PORTVERSION=	16.2.4
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	16.2.4
-PORTREVISION=	0
 CATEGORIES=	www sysutils
 
 MAINTAINER=	acm@FreeBSD.org
-COMMENT=	A PHP-Frontend to manage Bareos over the web
+COMMENT=	PHP-Frontend to manage Bareos over the web
 
-LICENSE=	AGPLv3 # or later
+LICENSE=	AGPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bareos
 GH_PROJECT=	bareos-webui
 
-USES=		tar:tgz
+USES=		php
 USE_PHP=	openssl
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 BAREOSWEB_HOME?=${WWWDIR}
 BAREOSWEBUIDIR=	${BAREOSWEB_HOME:S|${PREFIX}/||}
 SUB_FILES=	pkg-message
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} BAREOSWEBUIDIR=${BAREOSWEBUIDIR}
 SUB_LIST=	BAREOSWEBUIDIR=${BAREOSWEBUIDIR}
 
 OPTIONS_DEFINE=		MYSQL PGSQL ZENDFRAMEWORK
 OPTIONS_DEFAULT=	PGSQL
 ZENDFRAMEWORK_DESC=	Install zend framework
 
-.include <bsd.port.options.mk>
+MYSQL_USE=		PHP=pdo_mysql
+PGSQL_USE=		PHP=pdo_pgsql
+ZENDFRAMEWORK_RUN_DEPENDS=	${LOCALBASE}/share/ZendFramework/bin/classmap_generator.php:www/zend-framework
 
-.if ${PORT_OPTIONS:MMYSQL}
-USE_PHP+=	pdo_mysql
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PHP+=	pdo_pgsql
-.endif
-
-.if ${PORT_OPTIONS:MZENDFRAMEWORK}
-RUN_DEPENDS=	${LOCALBASE}/share/ZendFramework/bin/classmap_generator.php:www/zend-framework
-.endif
-
 post-extract:
 	${RM} ${WRKSRC}/config/autoload/.gitignore
 	${RM} ${WRKSRC}/data/cache/.gitignore
 	${RM} ${WRKSRC}/vendor/.gitignore
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/|${LOCALBASE}/etc/|g' ${WRKSRC}/config/autoload/global.php
 
 do-install:
 	@${ECHO} "Installing in ${BAREOSWEB_HOME}"
-	${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/console
-	${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile
-	${MKDIR} ${STAGEDIR}${BAREOSWEB_HOME}
+	@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/console
+	@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile
+	@${MKDIR} ${STAGEDIR}${BAREOSWEB_HOME}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "config data module public vendor" \
 		${STAGEDIR}${BAREOSWEB_HOME}
 	${INSTALL_DATA} ${WRKSRC}/*.php ${STAGEDIR}${BAREOSWEB_HOME}
 	${INSTALL_DATA} ${WRKSRC}/composer* ${STAGEDIR}${BAREOSWEB_HOME}
 	${INSTALL_DATA} ${WRKSRC}/phpunit.xml ${STAGEDIR}${BAREOSWEB_HOME}
 	${INSTALL_DATA} ${WRKSRC}/install/directors.ini ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/install/configuration.ini ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/install/bareos/bareos-dir.d/console/admin.conf.example ${STAGEDIR}${ETCDIR}/bareos-dir.d/console/admin.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/install/bareos/bareos-dir.d/profile/webui-admin.conf ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-admin.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/install/apache/bareos-webui.conf ${STAGEDIR}${ETCDIR}/apache-bareos-webui.conf
 	${INSTALL_DATA} ${WRKSRC}/install/nginx/bareos-webui.conf ${STAGEDIR}${ETCDIR}/nginx-bareos-webui.conf
 
 .include <bsd.port.mk>