svn commit: r226080 - user/dougb/portmaster

[Doug Barton]

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