From owner-svn-ports-head@freebsd.org Wed Mar 2 00:12:13 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 55C1DABFFDB; Wed, 2 Mar 2016 00:12:13 +0000 (UTC) (envelope-from mandree@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 mx1.freebsd.org (Postfix) with ESMTPS id 08DA21363; Wed, 2 Mar 2016 00:12:12 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u220CBIU079182; Wed, 2 Mar 2016 00:12:11 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u220CBfe079180; Wed, 2 Mar 2016 00:12:11 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201603020012.u220CBfe079180@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Wed, 2 Mar 2016 00:12:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409904 - in head/mail/mailman: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Mar 2016 00:12:13 -0000 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