Date: Wed, 2 Mar 2016 00:12:11 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409904 - in head/mail/mailman: . files Message-ID: <201603020012.u220CBfe079180@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Wed Mar 2 00:12:11 2016 New Revision: 409904 URL: https://svnweb.freebsd.org/changeset/ports/409904 Log: Make sure pkg-install works with postfix-base, too. Prior to this fix, pkg-install used hardcoded ${PKG_PREFIX}/sbin/postconf, but postfix-base installs it into /usr/sbin/postconf. Instead, do a path search for postconf in ${PKG_PREFIX}/sbin:$PATH and cache the result in a variable. Modified: head/mail/mailman/Makefile head/mail/mailman/files/pkg-install.in Modified: head/mail/mailman/Makefile ============================================================================== --- head/mail/mailman/Makefile Tue Mar 1 21:45:32 2016 (r409903) +++ head/mail/mailman/Makefile Wed Mar 2 00:12:11 2016 (r409904) @@ -3,7 +3,7 @@ PORTNAME= mailman DISTVERSION= 2.1.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= GNU \ SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \ Modified: head/mail/mailman/files/pkg-install.in ============================================================================== --- head/mail/mailman/files/pkg-install.in Tue Mar 1 21:45:32 2016 (r409903) +++ head/mail/mailman/files/pkg-install.in Wed Mar 2 00:12:11 2016 (r409904) @@ -109,13 +109,14 @@ POST-INSTALL) echo "---> Running assorted other checks" if egrep -q "^[ \t]*MTA.*=.*Postfix" "%%MAILMANDIR%%/Mailman/mm_cfg.py" ; then # run Postfix-specific checks - if [ "x`${PKG_PREFIX}/sbin/postconf -h myhostname`" != "xlocalhost" ] \ - && ! egrep -q "^[ \t]*SMTPHOST.*=.*`${PKG_PREFIX}/sbin/postconf -h myhostname`" \ + POSTCONF=$(PATH="${PKG_PREFIX}/sbin:/usr/sbin:/sbin:$PATH" which postconf) + if [ "x`${POSTCONF} -h myhostname`" != "xlocalhost" ] \ + && ! egrep -q "^[ \t]*SMTPHOST.*=.*`${POSTCONF} -h myhostname`" \ "%%MAILMANDIR%%/Mailman/mm_cfg.py" then echo "" echo "Your Postfix hostname is non-default." - echo -n "You must add \"SMTPHOST = '`${PKG_PREFIX}/sbin/postconf -h myhostname`'" + echo -n "You must add \"SMTPHOST = '`${POSTCONF} -h myhostname`'" echo "\" to the bottom of mm_cfg.py (without quotes)." echo "" fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603020012.u220CBfe079180>