- 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@
This commit is contained in:
Martin Wilke 2010-12-29 07:14:56 +00:00
parent 99281dcdc9
commit d86445d661
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=267114

View file

@ -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