Date: Fri, 7 Oct 2011 00:20:07 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r226080 - user/dougb/portmaster Message-ID: <201110070020.p970K7On083862@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Fri Oct 7 00:20:07 2011 New Revision: 226080 URL: http://svn.freebsd.org/changeset/base/226080 Log: Until I can revamp the way dependencies are tracked, include all 3 forms of CONFLICTS to make sure we catch alternates. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Thu Oct 6 21:55:05 2011 (r226079) +++ user/dougb/portmaster/portmaster Fri Oct 7 00:20:07 2011 (r226080) @@ -2451,8 +2451,11 @@ dependency_check () { conflicts='' if pm_cd $d_port; then - grep -ql ^CONFLICTS Makefile && + if grep -ql ^CONFLICTS Makefile ; then conflicts=`pm_make_b -V CONFLICTS` + conflicts="$conflicts `pm_make_b -V CONFLICTS_BUILD`" + conflicts="$conflicts `pm_make_b -V CONFLICTS_INSTALL`" + fi else fail "Cannot cd to $d_port" fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110070020.p970K7On083862>