sysutils/froxlor: security update 0.9.32_3 -> 0.9.33.2

- Update to 0.9.33.2
- Minor option and format fixes (support Dovecot 2, use default Apache version)
- Add security hint to pkg-message
- Add NO_ARCH
- Drop @dirrmtry as all pkg-plist files are under PREFIX

PR:		202262
Security:	CVE-2015-5959
Security:	9ee72858-4159-11e5-93ad-002590263bf5
Submitted by:	Marco Steinbach <coco@executive-computing.de> (maintainer)
Approved by:	feld (mentor)
MFH:		2015Q3

sysutils/froxlor/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	froxlor
-PORTVERSION=	0.9.32
-PORTREVISION=	3
+PORTVERSION=	0.9.33.2
 CATEGORIES=	sysutils www
 MASTER_SITES=	http://files.froxlor.org/releases/
 
@@ -14,17 +13,17 @@ LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}
 
-NO_BUILD=	YES
-
 SUB_FILES+=	pkg-message pkg-deinstall
 SUB_LIST+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 PLIST_SUB+=	${SUB_LIST}
 
 USE_PHP=	bcmath curl filter ftp json mysql mysqli pdo_mysql posix session xml
 
-WANT_PHP_CLI=	YES
+WANT_PHP_CLI=	yes
 
 USES=		shebangfix
+NO_ARCH=	yes
+NO_BUILD=	yes
 
 SHEBANG_FILES=	froxlor/install/tsmarty2c.php
 
@@ -33,7 +32,7 @@ OPTIONS_DEFINE=	LIBNSS LOGROTATE MYSQLS DKIM PCNTL NLS
 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_IMAPPOP3=	DOVECOT DOVECOT2 COURIER
 OPTIONS_RADIO_FTP=	PROFTPD PUREFTPD
 OPTIONS_RADIO_DNS=	POWERDNS ISCDNS
 OPTIONS_MULTI=	WWWST
@@ -45,7 +44,7 @@ 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
+APACHE_DESC=	Apache as HTTP/HTTPS server
 LIGHTTPD_DESC=	Lighttpd as HTTP/HTTPS server
 NGINX_DESC=	Nginx as HTTP/HTTPS server
 MYSQLC_DESC=	MySQL database client only
@@ -53,7 +52,8 @@ MYSQLS_DESC=	MySQL database server and client
 POSTFIX_DESC=	Postfix as SMTP server
 EXIM_DESC=	Exim as SMTP server
 DKIM_DESC=	OpenDKIM for DomainKeys Identified Mail
-DOVECOT_DESC=	Dovecot as IMAP/POP3 server
+DOVECOT_DESC=	Dovecot 1.x as IMAP/POP3 server
+DOVECOT2_DESC=	Dovecot 2.x as IMAP/POP3 server
 COURIER_DESC=	Courier as IMAP/POP3 server
 PROFTPD_DESC=	ProFTPd as FTP server
 PUREFTPD_DESC=	Pure-FTPd as FTP server
@@ -75,7 +75,9 @@ EXIM_RUN_DEPENDS=	exim:${PORTSDIR}/mail/exim
 
 DKIM_RUN_DEPENDS=	opendkim:${PORTSDIR}/mail/opendkim
 
-DOVECOT_RUN_DEPENDS=	dovecot:${PORTSDIR}/mail/dovecot
+DOVECOT_RUN_DEPENDS=	dovecot>1:${PORTSDIR}/mail/dovecot
+
+DOVECOT2_RUN_DEPENDS=	dovecot2>=2:${PORTSDIR}/mail/dovecot2
 
 COURIER_RUN_DEPENDS=	courier:${PORTSDIR}/mail/courier
 
@@ -99,7 +101,7 @@ LIGHTTPD_RUN_DEPENDS=	lighttpd:${PORTSDIR}/www/lighttpd
 
 NGINX_RUN_DEPENDS=	nginx:${PORTSDIR}/www/nginx
 
-APACHE_USE=	APACHE_RUN=22
+APACHE_USE=	yes
 
 MYSQLS_USE=	MYSQL=server
 
@@ -111,7 +113,7 @@ NLS_USE=	PHP=gettext
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAPACHE}
-WANT_PHP_MOD=	YES
+WANT_PHP_MOD=	yes
 .endif
 
 do-install:

sysutils/froxlor/distinfo

@@ -1,2 +1,2 @@
-SHA256 (froxlor-0.9.32.tar.gz) = f032440d33bddc03265656ed03126926ff618f82b71925c1c1684e46a219dfc9
-SIZE (froxlor-0.9.32.tar.gz) = 1406808
+SHA256 (froxlor-0.9.33.2.tar.gz) = 7693a0d7d17ff9183f6ddab4e68eda86d8215394ec8e1003c5ed076cd8d9a634
+SIZE (froxlor-0.9.33.2.tar.gz) = 1250837

sysutils/froxlor/files/pkg-message.in

@@ -1,5 +1,10 @@
 
 -------------------------------------------------------
+RELEASES PRIOR TO 0.99.3.2 MAY HAVE LEAKED SENSITIVE
+INFORMATION INTO %%WWWDIR%%/logs.
+
+Please visit froxlor's website for more information.
+
 You will want to check and eventually modify some of 
 the paths used by froxlor, as this port currently does
 not make any attempts to change the defaults as given