mail/postfixadmin: Update to 3.4-dev

PR:	258154

4 files changed, 35 insertions, 26 deletions

diff --git a/mail/postfixadmin/Makefile b/mail/postfixadmin/Makefile
index a1480d121938..ccc8f975b042 100644
--- a/mail/postfixadmin/Makefile
+++ b/mail/postfixadmin/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	postfixadmin
 DISTVERSIONPREFIX=	postfixadmin-
-DISTVERSION=	3.3.10
+DISTVERSION=	3.4.dev.20210902
 CATEGORIES=	mail www
 
 MAINTAINER=	ports.maintainer@evilphi.com
@@ -11,10 +11,11 @@ COMMENT=	PHP web-based management tool for Postfix virtual domains and users
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GPL-LICENSE.TXT
 
-USES=		cpe shebangfix php
+USES=		cpe php shebangfix
 CPE_VENDOR=	postfix_admin_project
 CPE_PRODUCT=	postfix_admin
 USE_GITHUB=	yes
+GH_TAGNAME=	cd73f275
 USE_PHP=	mbstring openssl pcre session spl
 
 NO_ARCH=	yes
@@ -33,10 +34,10 @@ OPTIONS_SUB=		yes
 IMAP_DESC=	Support automated sub-folder creation for new mailboxes
 VACATION_DESC=	Install virtual vacation postfix script
 
-IMAP_USE=	php=imap
-MYSQL_USE=	php=pdo_mysql
-PGSQL_USE=	php=pdo_pgsql
-SQLITE_USE=	php=pdo_sqlite
+IMAP_USE=		PHP=imap
+MYSQL_USE=		PHP=pdo_mysql
+PGSQL_USE=		PHP=pdo_pgsql
+SQLITE_USE=		PHP=pdo_sqlite
 VACATION_RUN_DEPENDS=	p5-DBI>=1.634:databases/p5-DBI \
 			p5-Email-Sender>=1.300031:mail/p5-Email-Sender \
 			p5-Email-Simple>=1.998:mail/p5-Email-Simple \
@@ -45,7 +46,7 @@ VACATION_RUN_DEPENDS=	p5-DBI>=1.634:databases/p5-DBI \
 			p5-MIME-EncWords>=0.040:mail/p5-MIME-EncWords \
 			p5-Net-DNS>=1.32:dns/p5-Net-DNS \
 			p5-Try-Tiny>=0.30:lang/p5-Try-Tiny
-VACATION_USES=	perl5
+VACATION_USES=		perl5
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
@@ -56,7 +57,7 @@ do-install:
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/ADDITIONS && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ADDITIONS)
-.for i in GPL-LICENSE.TXT LICENSE.TXT check_mailpass_expiration.sh password_expiration.sql postfixadmin.my.cnf
+.for i in GPL-LICENSE.TXT LICENSE.TXT password_expiration.sql postfixadmin.my.cnf
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DATADIR}
 .endfor
 
diff --git a/mail/postfixadmin/distinfo b/mail/postfixadmin/distinfo
index 78c220f35f08..69eef4d4b1b5 100644
--- a/mail/postfixadmin/distinfo
+++ b/mail/postfixadmin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629722986
-SHA256 (postfixadmin-postfixadmin-postfixadmin-3.3.10_GH0.tar.gz) = b162cef0968225b33c251d5e7e872ca93ec790f275b874659f34b2ec69b9812c
-SIZE (postfixadmin-postfixadmin-postfixadmin-3.3.10_GH0.tar.gz) = 1868298
+TIMESTAMP = 1630642925
+SHA256 (postfixadmin-postfixadmin-postfixadmin-3.4.dev.20210902-cd73f275_GH0.tar.gz) = a537deb0fd0fef3000d8a2a1d7ede9883e6b5f2850085c4bf538b538186e6743
+SIZE (postfixadmin-postfixadmin-postfixadmin-3.4.dev.20210902-cd73f275_GH0.tar.gz) = 4927231
diff --git a/mail/postfixadmin/files/patch-config.inc.php b/mail/postfixadmin/files/patch-config.inc.php
index 610dff6bf1ba..9fade3e9ea4a 100644
--- a/mail/postfixadmin/files/patch-config.inc.php
+++ b/mail/postfixadmin/files/patch-config.inc.php
@@ -1,6 +1,6 @@
---- config.inc.php.orig	2021-08-09 08:41:35 UTC
+--- config.inc.php.orig	2021-08-09 14:34:09 UTC
 +++ config.inc.php
-@@ -210,10 +210,11 @@ $CONF['authlib_default_flavor'] = 'md5raw';
+@@ -212,10 +212,11 @@ $CONF['authlib_default_flavor'] = 'md5raw';
  // for dovecot 1.x
  // $CONF['dovecotpw'] = "/usr/sbin/dovecotpw";
  // for dovecot 2.x (dovecot 2.0.0 - 2.0.7 is not supported!)
diff --git a/mail/postfixadmin/pkg-plist b/mail/postfixadmin/pkg-plist
index d801ffd1c05a..d4b68759d0c2 100644
--- a/mail/postfixadmin/pkg-plist
+++ b/mail/postfixadmin/pkg-plist
@@ -6,26 +6,33 @@
 %%PORTDOCS%%%%DOCSDIR%%/HORDE.txt
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.TXT
 %%PORTDOCS%%%%DOCSDIR%%/LANGUAGE.txt
+%%PORTDOCS%%%%DOCSDIR%%/Migration.md
 %%PORTDOCS%%%%DOCSDIR%%/POSTFIXADMIN.txt
 %%PORTDOCS%%%%DOCSDIR%%/POSTFIX_CONF.txt
 %%PORTDOCS%%%%DOCSDIR%%/Password_Expiration.md
 %%PORTDOCS%%%%DOCSDIR%%/Postfix-Dovecot-Postgresql-Example.md
 %%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/README.password_expiration
 %%PORTDOCS%%%%DOCSDIR%%/SECURITY.txt
 %%PORTDOCS%%%%DOCSDIR%%/SUPERADMIN.txt
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE.txt
-%%PORTDOCS%%%%DOCSDIR%%/screenshots/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/screenshots/postfixadmin-admin-create-alias.jpg
-%%PORTDOCS%%%%DOCSDIR%%/screenshots/postfixadmin-admin-create-domain.jpg
-%%PORTDOCS%%%%DOCSDIR%%/screenshots/postfixadmin-admin-create-mailbox.jpg
-%%PORTDOCS%%%%DOCSDIR%%/screenshots/postfixadmin-admin-domain-list.jpg
-%%PORTDOCS%%%%DOCSDIR%%/screenshots/postfixadmin-admin-virtual-list.jpg
-%%PORTDOCS%%%%DOCSDIR%%/screenshots/postfixadmin-inital-welcome.jpg
-%%PORTDOCS%%%%DOCSDIR%%/screenshots/postfixadmin-mail-admin-login.jpg
-%%PORTDOCS%%%%DOCSDIR%%/screenshots/postfixadmin-user-change-forward.jpg
-%%PORTDOCS%%%%DOCSDIR%%/screenshots/postfixadmin-user-overview.jpg
-%%PORTDOCS%%%%DOCSDIR%%/screenshots/postfixadmin-user-vacation.jpg
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/README.md
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/admin-list.png
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/admin-login.png
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/admin-welcome.png
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/create-new-alias.png
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/domain-audit-log.png
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/domain-edit.png
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/domain-list.png
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/fetchmail-new-config.png
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/mailbox-adding.png
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/mailboxes-and-forwards-for-domain.png
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/setup-step1.png
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/setup-step2.png
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/users-edit-mail-forward.png
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/users-enable-vacation-autoresponse.png
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/users-forgotten-password.png
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/users-login.png
+%%PORTDOCS%%%%DOCSDIR%%/screenshots/users-welcome.png
 %%DATADIR%%/ADDITIONS/README.md
 %%DATADIR%%/ADDITIONS/change_password.tgz
 %%DATADIR%%/ADDITIONS/cleanupdirs.pl
@@ -46,6 +53,7 @@
 %%DATADIR%%/ADDITIONS/postfixadmin-domain-postdeletion.sh
 %%DATADIR%%/ADDITIONS/postfixadmin-mailbox-postcreation.sh
 %%DATADIR%%/ADDITIONS/postfixadmin-mailbox-postdeletion.sh
+%%DATADIR%%/ADDITIONS/postfixadmin-mailbox-postpassword.sh
 %%DATADIR%%/ADDITIONS/quota_usage.pl
 %%DATADIR%%/ADDITIONS/squirrelmail-plugin/INSTALL
 %%DATADIR%%/ADDITIONS/squirrelmail-plugin/LICENSE.txt
@@ -101,7 +109,6 @@
 %%VACATION%%%%DATADIR%%/VIRTUAL_VACATION/tests/test-email.txt
 %%VACATION%%%%DATADIR%%/VIRTUAL_VACATION/tests/test.sh
 %%VACATION%%%%DATADIR%%/VIRTUAL_VACATION/vacation.pl
-%%DATADIR%%/check_mailpass_expiration.sh
 %%DATADIR%%/password_expiration.sql
 %%DATADIR%%/postfixadmin.my.cnf
 %%WWWDIR%%/common.php
@@ -477,6 +484,7 @@
 %%WWWDIR%%/tests/DomainHandlerTest.php
 %%WWWDIR%%/tests/FetchmailHandlerTest.php
 %%WWWDIR%%/tests/GeneratePasswordTest.php
+%%WWWDIR%%/tests/GetSiteUrlTest.php
 %%WWWDIR%%/tests/ListAdminsTest.php
 %%WWWDIR%%/tests/ListDomainsForAdminTest.php
 %%WWWDIR%%/tests/ListDomainsTest.php