From owner-svn-src-user@FreeBSD.ORG Fri Oct 7 00:20:07 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 674FF106566C; Fri, 7 Oct 2011 00:20:07 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 533968FC08; Fri, 7 Oct 2011 00:20:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p970K7x3083864; Fri, 7 Oct 2011 00:20:07 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p970K7On083862; Fri, 7 Oct 2011 00:20:07 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201110070020.p970K7On083862@svn.freebsd.org> From: Doug Barton Date: Fri, 7 Oct 2011 00:20:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226080 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 00:20:07 -0000 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