From owner-svn-ports-all@freebsd.org Tue Sep 18 04:03:28 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A78AE1090348; Tue, 18 Sep 2018 04:03:28 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4E6577BED8; Tue, 18 Sep 2018 04:03:28 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 43B4F1ACF7; Tue, 18 Sep 2018 04:03:28 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8I43S5t034883; Tue, 18 Sep 2018 04:03:28 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8I43RjL034878; Tue, 18 Sep 2018 04:03:27 GMT (envelope-from ler@FreeBSD.org) Message-Id: <201809180403.w8I43RjL034878@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Tue, 18 Sep 2018 04:03:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479972 - in head/mail/postfixadmin: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ler X-SVN-Commit-Paths: in head/mail/postfixadmin: . files X-SVN-Commit-Revision: 479972 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Sep 2018 04:03:28 -0000 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@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 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