Index: mail/Makefile =================================================================== --- mail/Makefile +++ mail/Makefile @@ -477,6 +477,7 @@ SUBDIR += postfix-postfwd SUBDIR += postfix-sasl SUBDIR += postfixadmin + SUBDIR += postfixadmin-lite SUBDIR += postgrey SUBDIR += postsrsd SUBDIR += prepflog Index: mail/postfixadmin-lite/Makefile =================================================================== --- /dev/null +++ mail/postfixadmin-lite/Makefile @@ -0,0 +1,5 @@ +_PFA_LITE= yes + +MASTERDIR= ${.CURDIR}/../postfixadmin + +.include "${MASTERDIR}/Makefile" Index: mail/postfixadmin/Makefile =================================================================== --- mail/postfixadmin/Makefile +++ mail/postfixadmin/Makefile @@ -2,8 +2,13 @@ PORTNAME= postfixadmin DISTVERSIONPREFIX= postfixadmin- -DISTVERSION= 3.4.dev.20210902 +DISTVERSION= 3.4.dev.20211018 CATEGORIES= mail www +.if defined(_PFA_LITE) +PKGNAMESUFFIX= -lite${PHP_PKGNAMESUFFIX} +.else +PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} +.endif MAINTAINER= ports.maintainer@evilphi.com COMMENT= PHP web-based management tool for Postfix virtual domains and users @@ -11,11 +16,11 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/GPL-LICENSE.TXT -USES= cpe php shebangfix +USES= cpe php:flavors shebangfix CPE_VENDOR= postfix_admin_project CPE_PRODUCT= postfix_admin USE_GITHUB= yes -GH_TAGNAME= cd73f275 +GH_TAGNAME= d3bc1551 USE_PHP= mbstring openssl pcre session spl NO_ARCH= yes @@ -25,28 +30,33 @@ PLIST_SUB= WWWGRP=${WWWGRP} \ WWWOWN=${WWWOWN} -OPTIONS_DEFINE= DOCS IMAP VACATION -OPTIONS_DEFAULT= IMAP MYSQL PGSQL SQLITE VACATION +OPTIONS_DEFINE= ADDONS DOCS IMAP +.if defined(_PFA_LITE) +OPTIONS_DEFAULT= SQLITE +.else +OPTIONS_DEFAULT= ADDONS IMAP SQLITE +.endif OPTIONS_MULTI= DATABASE OPTIONS_MULTI_DATABASE= MYSQL PGSQL SQLITE OPTIONS_SUB= yes +ADDONS_DESC= Include add-ons and related Perl dependencies 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 -VACATION_RUN_DEPENDS= p5-DBI>=1.634:databases/p5-DBI \ +ADDONS_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 \ p5-Email-Valid>=0.12:mail/p5-Email-Valid \ + p5-LockFile-Simple>=0.208:devel/p5-LockFile-Simple \ p5-Log-Log4perl>=0.26:devel/p5-Log-Log4perl \ 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 +ADDONS_USES= gettext perl5 +IMAP_USE= PHP=imap +MYSQL_USE= PHP=pdo_mysql +PGSQL_USE= PHP=pdo_pgsql +SQLITE_USE= PHP=pdo_sqlite do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} @@ -56,18 +66,18 @@ (cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/${i}) .endfor ${MKDIR} ${STAGEDIR}${DATADIR} - (cd ${WRKSRC}/ADDITIONS && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ADDITIONS) .for i in GPL-LICENSE.TXT LICENSE.TXT password_expiration.sql postfixadmin.my.cnf ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DATADIR} .endfor +do-install-ADDONS-on: + (cd ${WRKSRC}/ADDITIONS && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ADDITIONS) + (cd ${WRKSRC}/VIRTUAL_VACATION && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/VIRTUAL_VACATION) + do-install-DOCS-on: (cd ${WRKSRC}/DOCUMENTS && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .for i in CHANGELOG.TXT INSTALL.TXT README.md ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -do-install-VACATION-on: - (cd ${WRKSRC}/VIRTUAL_VACATION && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/VIRTUAL_VACATION) - .include Index: mail/postfixadmin/distinfo =================================================================== --- mail/postfixadmin/distinfo +++ mail/postfixadmin/distinfo @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1634948330 +SHA256 (postfixadmin-postfixadmin-postfixadmin-3.4.dev.20211018-d3bc1551_GH0.tar.gz) = 333be903e4558802ab2c5bf0e45d0bd2c56b14d9a90d1d639948a07146002e62 +SIZE (postfixadmin-postfixadmin-postfixadmin-3.4.dev.20211018-d3bc1551_GH0.tar.gz) = 4931789 Index: mail/postfixadmin/pkg-plist =================================================================== --- mail/postfixadmin/pkg-plist +++ mail/postfixadmin/pkg-plist @@ -33,82 +33,82 @@ %%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 -%%DATADIR%%/ADDITIONS/convert-passwd-to-postfixadmin.pl -%%DATADIR%%/ADDITIONS/cyrus/Changelog -%%DATADIR%%/ADDITIONS/cyrus/README-ES.txt -%%DATADIR%%/ADDITIONS/cyrus/README.txt -%%DATADIR%%/ADDITIONS/cyrus/cyrus-mailbox-postcreation.pl -%%DATADIR%%/ADDITIONS/cyrus/cyrus-mailbox-postdelete.pl -%%DATADIR%%/ADDITIONS/cyrus/cyrus-mailbox-postedit.pl -%%DATADIR%%/ADDITIONS/cyrus/cyrus.conf -%%DATADIR%%/ADDITIONS/delete-mailq-by-domain.pl -%%DATADIR%%/ADDITIONS/fetchmail.pl -%%DATADIR%%/ADDITIONS/import_users_from_csv.py -%%DATADIR%%/ADDITIONS/mailbox_remover.pl -%%DATADIR%%/ADDITIONS/mkeveryone.pl -%%DATADIR%%/ADDITIONS/pfa_maildir_cleanup.pl -%%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 -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/README.md -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/common.php -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/config.php.sample -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/README.Debian -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/changelog -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/conffiles -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/control -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/copyright -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/docs -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/files -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/postfixadmin-squirrelmail.dirs -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/postinst -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/rules -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/functions.inc.php -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/index.php -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/build.sh -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/cs_CZ/LC_MESSAGES/postfixadmin.mo -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/cs_CZ/LC_MESSAGES/postfixadmin.po -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/da_DK/LC_MESSAGES/postfixadmin.mo -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/da_DK/LC_MESSAGES/postfixadmin.po -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/de_DE/LC_MESSAGES/postfixadmin.mo -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/de_DE/LC_MESSAGES/postfixadmin.po -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/hu_HU/LC_MESSAGES/postfixadmin.mo -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/hu_HU/LC_MESSAGES/postfixadmin.po -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/it_IT/LC_MESSAGES/postfixadmin.po -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/nl_NL/LC_MESSAGES/postfixadmin.mo -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/nl_NL/LC_MESSAGES/postfixadmin.po -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/pl_PL/LC_MESSAGES/postfixadmin.mo -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/pl_PL/LC_MESSAGES/postfixadmin.po -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/pt_BR/LC_MESSAGES/postfixadmin.mo -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/pt_BR/LC_MESSAGES/postfixadmin.po -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/po/postfixadmin.po -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/postfixadmin_changepass.php -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/postfixadmin_forward.php -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/postfixadmin_vacation.php -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/setup.php -%%DATADIR%%/ADDITIONS/squirrelmail-plugin/version -%%DATADIR%%/ADDITIONS/virtualmaildel.php +%%ADDONS%%%%DATADIR%%/ADDITIONS/README.md +%%ADDONS%%%%DATADIR%%/ADDITIONS/change_password.tgz +%%ADDONS%%%%DATADIR%%/ADDITIONS/cleanupdirs.pl +%%ADDONS%%%%DATADIR%%/ADDITIONS/convert-passwd-to-postfixadmin.pl +%%ADDONS%%%%DATADIR%%/ADDITIONS/cyrus/Changelog +%%ADDONS%%%%DATADIR%%/ADDITIONS/cyrus/README-ES.txt +%%ADDONS%%%%DATADIR%%/ADDITIONS/cyrus/README.txt +%%ADDONS%%%%DATADIR%%/ADDITIONS/cyrus/cyrus-mailbox-postcreation.pl +%%ADDONS%%%%DATADIR%%/ADDITIONS/cyrus/cyrus-mailbox-postdelete.pl +%%ADDONS%%%%DATADIR%%/ADDITIONS/cyrus/cyrus-mailbox-postedit.pl +%%ADDONS%%%%DATADIR%%/ADDITIONS/cyrus/cyrus.conf +%%ADDONS%%%%DATADIR%%/ADDITIONS/delete-mailq-by-domain.pl +%%ADDONS%%%%DATADIR%%/ADDITIONS/fetchmail.pl +%%ADDONS%%%%DATADIR%%/ADDITIONS/import_users_from_csv.py +%%ADDONS%%%%DATADIR%%/ADDITIONS/mailbox_remover.pl +%%ADDONS%%%%DATADIR%%/ADDITIONS/mkeveryone.pl +%%ADDONS%%%%DATADIR%%/ADDITIONS/pfa_maildir_cleanup.pl +%%ADDONS%%%%DATADIR%%/ADDITIONS/postfixadmin-domain-postdeletion.sh +%%ADDONS%%%%DATADIR%%/ADDITIONS/postfixadmin-mailbox-postcreation.sh +%%ADDONS%%%%DATADIR%%/ADDITIONS/postfixadmin-mailbox-postdeletion.sh +%%ADDONS%%%%DATADIR%%/ADDITIONS/postfixadmin-mailbox-postpassword.sh +%%ADDONS%%%%DATADIR%%/ADDITIONS/quota_usage.pl +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/INSTALL +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/LICENSE.txt +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/README.md +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/common.php +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/config.php.sample +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/README.Debian +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/changelog +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/conffiles +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/control +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/copyright +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/docs +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/files +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/postfixadmin-squirrelmail.dirs +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/postinst +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/debian/rules +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/functions.inc.php +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/index.php +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/build.sh +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/cs_CZ/LC_MESSAGES/postfixadmin.mo +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/cs_CZ/LC_MESSAGES/postfixadmin.po +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/da_DK/LC_MESSAGES/postfixadmin.mo +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/da_DK/LC_MESSAGES/postfixadmin.po +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/de_DE/LC_MESSAGES/postfixadmin.mo +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/de_DE/LC_MESSAGES/postfixadmin.po +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/hu_HU/LC_MESSAGES/postfixadmin.mo +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/hu_HU/LC_MESSAGES/postfixadmin.po +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/it_IT/LC_MESSAGES/postfixadmin.po +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/nl_NL/LC_MESSAGES/postfixadmin.mo +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/nl_NL/LC_MESSAGES/postfixadmin.po +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/pl_PL/LC_MESSAGES/postfixadmin.mo +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/pl_PL/LC_MESSAGES/postfixadmin.po +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/pt_BR/LC_MESSAGES/postfixadmin.mo +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/locale/pt_BR/LC_MESSAGES/postfixadmin.po +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/po/postfixadmin.po +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/postfixadmin_changepass.php +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/postfixadmin_forward.php +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/postfixadmin_vacation.php +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/setup.php +%%ADDONS%%%%DATADIR%%/ADDITIONS/squirrelmail-plugin/version +%%ADDONS%%%%DATADIR%%/ADDITIONS/virtualmaildel.php %%DATADIR%%/GPL-LICENSE.TXT %%DATADIR%%/LICENSE.TXT -%%VACATION%%%%DATADIR%%/VIRTUAL_VACATION/Contributions.txt -%%VACATION%%%%DATADIR%%/VIRTUAL_VACATION/FILTER_README -%%VACATION%%%%DATADIR%%/VIRTUAL_VACATION/INSTALL.md -%%VACATION%%%%DATADIR%%/VIRTUAL_VACATION/tests/asterisk-email.txt -%%VACATION%%%%DATADIR%%/VIRTUAL_VACATION/tests/facebook.txt -%%VACATION%%%%DATADIR%%/VIRTUAL_VACATION/tests/mail-myself.txt -%%VACATION%%%%DATADIR%%/VIRTUAL_VACATION/tests/mailing-list.txt -%%VACATION%%%%DATADIR%%/VIRTUAL_VACATION/tests/spam.txt -%%VACATION%%%%DATADIR%%/VIRTUAL_VACATION/tests/teodor-smtp-envelope-headers.txt -%%VACATION%%%%DATADIR%%/VIRTUAL_VACATION/tests/test-email.txt -%%VACATION%%%%DATADIR%%/VIRTUAL_VACATION/tests/test.sh -%%VACATION%%%%DATADIR%%/VIRTUAL_VACATION/vacation.pl +%%ADDONS%%%%DATADIR%%/VIRTUAL_VACATION/Contributions.txt +%%ADDONS%%%%DATADIR%%/VIRTUAL_VACATION/FILTER_README +%%ADDONS%%%%DATADIR%%/VIRTUAL_VACATION/INSTALL.md +%%ADDONS%%%%DATADIR%%/VIRTUAL_VACATION/tests/asterisk-email.txt +%%ADDONS%%%%DATADIR%%/VIRTUAL_VACATION/tests/facebook.txt +%%ADDONS%%%%DATADIR%%/VIRTUAL_VACATION/tests/mail-myself.txt +%%ADDONS%%%%DATADIR%%/VIRTUAL_VACATION/tests/mailing-list.txt +%%ADDONS%%%%DATADIR%%/VIRTUAL_VACATION/tests/spam.txt +%%ADDONS%%%%DATADIR%%/VIRTUAL_VACATION/tests/teodor-smtp-envelope-headers.txt +%%ADDONS%%%%DATADIR%%/VIRTUAL_VACATION/tests/test-email.txt +%%ADDONS%%%%DATADIR%%/VIRTUAL_VACATION/tests/test.sh +%%ADDONS%%%%DATADIR%%/VIRTUAL_VACATION/vacation.pl %%DATADIR%%/password_expiration.sql %%DATADIR%%/postfixadmin.my.cnf %%WWWDIR%%/common.php