svn commit: r479972 - in head/mail/postfixadmin: . files
Larry Rosenman
ler at FreeBSD.org
Tue Sep 18 04:03:28 UTC 2018
Author: ler
Date: Tue Sep 18 04:03:27 2018
New Revision: 479972
URL: https://svnweb.freebsd.org/changeset/ports/479972
Log:
mail/postfixadmin: Add missing dependency, Fix packaging failure with DOCS option
Fix the following bugs:
- missing PHP extension dependency introduced with the previous commit
- missing README.md file when port is built with DOCS unset
While here: move the last of the documentation files into DOCSDIR
PR: 231424
Submitted by: ports.maintainer at evilphi.com
Modified:
head/mail/postfixadmin/Makefile
head/mail/postfixadmin/files/pkg-message.in
head/mail/postfixadmin/pkg-plist
Modified: head/mail/postfixadmin/Makefile
==============================================================================
--- head/mail/postfixadmin/Makefile Tue Sep 18 03:27:39 2018 (r479971)
+++ head/mail/postfixadmin/Makefile Tue Sep 18 04:03:27 2018 (r479972)
@@ -3,6 +3,7 @@
PORTNAME= postfixadmin
PORTVERSION= 3.2
+PORTREVISION= 1
CATEGORIES= mail www
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -36,7 +37,7 @@ OPTIONS_DEFAULT= PGSQL
USE_PERL5= run
-USE_PHP= mbstring pcre phar session spl xmlrpc
+USE_PHP= mbstring openssl pcre phar session spl xmlrpc
MYSQL_USE= php=mysqli
PGSQL_USE= php=pgsql
@@ -50,13 +51,16 @@ do-install:
@cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/${i}
.endfor
@${MKDIR} ${STAGEDIR}${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/*.TXT ${STAGEDIR}${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/GPL-LICENSE.TXT ${STAGEDIR}${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/LICENSE.TXT ${STAGEDIR}${DATADIR}
.for i in ADDITIONS VIRTUAL_VACATION
@cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${i}
.endfor
do-install-DOCS-on:
- ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DATADIR}
@cd ${WRKSRC}/DOCUMENTS && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+.for i in CHANGELOG.TXT INSTALL.TXT README.md
+ ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
+.endfor
.include <bsd.port.mk>
Modified: head/mail/postfixadmin/files/pkg-message.in
==============================================================================
--- head/mail/postfixadmin/files/pkg-message.in Tue Sep 18 03:27:39 2018 (r479971)
+++ head/mail/postfixadmin/files/pkg-message.in Tue Sep 18 04:03:27 2018 (r479972)
@@ -1,14 +1,14 @@
-If you are upgrading, you may need to update your current installation's
-database. You can do so by browsing to [URL]/setup.php where [URL] is the
+If you are upgrading, you may need to update your existing database.
+You can do so by browsing to [URL]/setup.php where [URL] is the
postfixadmin root.
-To avoid checksum errors when removing or upgrading postfixadmin, do not
-edit config.inc.php. Instead, put your configuration settings in
-config.local.php in the postfixadmin webroot. That file will be included
-automatically by config.inc.php.
+To avoid checksum errors when uninstalling or upgrading postfixadmin,
+do not edit config.inc.php. Instead, put your configuration settings
+in config.local.php in the postfixadmin webroot. That file will be
+included automatically by config.inc.php.
-For detailed information, please see the complete installation steps in
-%%DATADIR%%/INSTALL.TXT.
+For detailed information, please see the complete installation steps
+in %%DOCSDIR%%/INSTALL.TXT.
-See %%DATADIR%%/CHANGELOG.TXT for any upgrade-related details, including
-configuration changes.
+For upgrade-related details, including configuration changes, see
+%%DOCSDIR%%/CHANGELOG.TXT.
Modified: head/mail/postfixadmin/pkg-plist
==============================================================================
--- head/mail/postfixadmin/pkg-plist Tue Sep 18 03:27:39 2018 (r479971)
+++ head/mail/postfixadmin/pkg-plist Tue Sep 18 04:03:27 2018 (r479972)
@@ -1,11 +1,14 @@
%%PORTDOCS%%%%DOCSDIR%%/BACKUP_MX.txt
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.TXT
%%PORTDOCS%%%%DOCSDIR%%/DOVECOT.txt
%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
%%PORTDOCS%%%%DOCSDIR%%/HORDE.txt
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.TXT
%%PORTDOCS%%%%DOCSDIR%%/LANGUAGE.txt
%%PORTDOCS%%%%DOCSDIR%%/POSTFIXADMIN.txt
%%PORTDOCS%%%%DOCSDIR%%/POSTFIX_CONF.txt
%%PORTDOCS%%%%DOCSDIR%%/Postfix-Dovecot-Postgresql-Example.md
+%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTDOCS%%%%DOCSDIR%%/SECURITY.txt
%%PORTDOCS%%%%DOCSDIR%%/SUPERADMIN.txt
%%PORTDOCS%%%%DOCSDIR%%/UPGRADE.txt
@@ -81,11 +84,8 @@
%%DATADIR%%/ADDITIONS/squirrelmail-plugin/setup.php
%%DATADIR%%/ADDITIONS/squirrelmail-plugin/version
%%DATADIR%%/ADDITIONS/virtualmaildel.php
-%%DATADIR%%/CHANGELOG.TXT
%%DATADIR%%/GPL-LICENSE.TXT
-%%DATADIR%%/INSTALL.TXT
%%DATADIR%%/LICENSE.TXT
-%%DATADIR%%/README.md
%%DATADIR%%/VIRTUAL_VACATION/Contributions.txt
%%DATADIR%%/VIRTUAL_VACATION/FILTER_README
%%DATADIR%%/VIRTUAL_VACATION/INSTALL.md
More information about the svn-ports-head
mailing list