sysutils/froxlor: minor fixes

- Add WANT_PHP_CLI, since froxlor cron jobs rely on the cli sapi
- Add WANT_PHP_MOD due to separation of Apache PHP5 module
- Use WWWGRP/WWWOWN in pkg-plist
- Add option for depending on dns/bind99
- Remove superfluous NEED_ROOT
- Bump PORTREVISION

PR:		191102
Submitted by:	maintainer

2 files changed, 20 insertions, 8 deletions

diff --git a/sysutils/froxlor/Makefile b/sysutils/froxlor/Makefile
index 8bbbb3db7de4..fd1add8fb228 100644
--- a/sysutils/froxlor/Makefile
+++ b/sysutils/froxlor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	froxlor
 PORTVERSION=	0.9.32
+PORTREVISION=	1
 CATEGORIES=	sysutils www
 MASTER_SITES=	http://files.froxlor.org/releases/
 
@@ -13,25 +14,28 @@ LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}
 
-NEED_ROOT=	YES
-
 NO_BUILD=	YES
 
 SUB_FILES+=	pkg-message pkg-deinstall
+SUB_LIST+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+PLIST_SUB+=	${SUB_LIST}
 
 USE_PHP=	xml bcmath posix filter session ftp mysql mysqli
 
+WANT_PHP_CLI=	YES
+
 USES=		shebangfix
 
 SHEBANG_FILES=	froxlor/install/tsmarty2c.php
 
-OPTIONS_DEFINE=	POWERDNS LIBNSS LOGROTATE MYSQLS DKIM PCNTL NLS
+OPTIONS_DEFINE=	LIBNSS LOGROTATE MYSQLS DKIM PCNTL NLS
 
-OPTIONS_RADIO=	WEB SMTP IMAPPOP3 FTP
+OPTIONS_RADIO=	WEB SMTP IMAPPOP3 FTP DNS
 OPTIONS_RADIO_WEB=	APACHE LIGHTTPD NGINX
 OPTIONS_RADIO_SMTP=	POSTFIX EXIM
 OPTIONS_RADIO_IMAPPOP3=	DOVECOT COURIER
 OPTIONS_RADIO_FTP=	PROFTPD PUREFTPD
+OPTIONS_RADIO_DNS=	POWERDNS ISCDNS
 OPTIONS_MULTI=	WWWST
 OPTIONS_MULTI_WWWST=	WEBALIZER AWSTATS
 
@@ -39,6 +43,7 @@ WWWST_DESC=	Web access and traffic statistics dependency
 WEB_DESC=	Web server dependency
 SMTP_DESC=	SMTP server dependency
 IMAPPOP3_DESC=	IMAP/POP3 server dependency
+DNS_DESC=	DNS server dependency
 FTP_DESC=	FTP server dependency
 APACHE_DESC=	Apache (2.2) as HTTP/HTTPS server
 LIGHTTPD_DESC=	Lighttpd as HTTP/HTTPS server
@@ -53,6 +58,7 @@ COURIER_DESC=	Courier as IMAP/POP3 server
 PROFTPD_DESC=	ProFTPd as FTP server
 PUREFTPD_DESC=	Pure-FTPd as FTP server
 POWERDNS_DESC=	Powerdns as DNS server
+ISCDNS_DESC=	ISC BIND 9.9 from ports as DNS server
 PCNTL_DESC=	Use php-pcntl (speeds up statistics creation)
 LIBNSS_DESC=	Libnss-mysql for authentication
 WEBALIZER_DESC=	Webalizer (small, fast, static result pages)
@@ -79,6 +85,8 @@ PUREFTPD_RUN_DEPENDS=	pure-ftpd:${PORTSDIR}/ftp/pure-ftpd
 
 POWERDNS_RUN_DEPENDS=	powerdns:${PORTSDIR}/dns/powerdns
 
+ISCDNS_RUN_DEPENDS=	bind>=9.9.0.0:${PORTSDIR}/dns/bind99
+
 LIBNSS_RUN_DEPENDS=	${LOCALBASE}/lib/nss_mysql.so:${PORTSDIR}/net/libnss-mysql
 
 WEBALIZER_RUN_DEPENDS=	webalizer:${PORTSDIR}/www/webalizer
@@ -100,6 +108,12 @@ PCNTL_USE=	PHP=pcntl
 NLS_USES=	gettext:run
 NLS_USE=	PHP=gettext
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MAPACHE}
+WANT_PHP_MOD=	YES
+.endif
+
 do-install:
 	cd ${WRKDIR}/${PORTNAME} && \
 	${FIND} . ! -name .gitignore | \
diff --git a/sysutils/froxlor/pkg-plist b/sysutils/froxlor/pkg-plist
index c1a925dd41d8..1fa6f4797be6 100644
--- a/sysutils/froxlor/pkg-plist
+++ b/sysutils/froxlor/pkg-plist
@@ -1,5 +1,5 @@
-@owner www
-@group www
+@group %%WWWGRP%%
+@owner %%WWWOWN%%
 %%WWWDIR%%/COPYING
 %%WWWDIR%%/README.md
 %%WWWDIR%%/actions/admin/settings/000.version.php
@@ -1727,5 +1727,3 @@
 @dirrmtry %%WWWDIR%%/templates
 @dirrmtry %%WWWDIR%%/templates_c
 @dirrmtry %%WWWDIR%%
-@group
-@owner