From 6818da9c7c60d2b66e387859ed4e25c4f0c8fb44 Mon Sep 17 00:00:00 2001
From: miwi <miwi@FreeBSD.org>
Date: Wed, 29 Dec 2010 07:14:56 +0000
Subject: - Fix Conflict handling. At the moment the build conflicts are
 recorded in   the packages which is not necessary.

Reported by:	makc@ via cvs-ports@, #bsdports
Submitted by:	beat@
---
 Mk/bsd.port.mk | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'Mk')

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 62b8100..2f8f030 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -2502,9 +2502,6 @@ PKG_ARGS+=		-o ${PKGORIGIN}
 .if defined(CONFLICTS) && !defined(DISABLE_CONFLICTS)
 PKG_ARGS+=		-C "${CONFLICTS}"
 .endif
-.if defined(CONFLICTS_BUILD) && !defined(DISABLE_CONFLICTS)
-PKG_ARGS+=		-C "${CONFLICTS_BUILD}"
-.endif
 .if defined(CONFLICTS_INSTALL) && !defined(DISABLE_CONFLICTS)
 PKG_ARGS+=		-C "${CONFLICTS_INSTALL}"
 .endif
-- 
cgit v1.1