diff options
| author | miwi <miwi@FreeBSD.org> | 2010-12-29 07:14:56 +0000 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2010-12-29 07:14:56 +0000 |
| commit | 6818da9c7c60d2b66e387859ed4e25c4f0c8fb44 (patch) | |
| tree | cc9bdbb2be7a311ef69b22d340dacba288e5c869 /Mk | |
| parent | 51cca55ea61f816f6d7750e3ca667997fc336c99 (diff) | |
| download | FreeBSD-ports-6818da9c7c60d2b66e387859ed4e25c4f0c8fb44.zip FreeBSD-ports-6818da9c7c60d2b66e387859ed4e25c4f0c8fb44.tar.gz | |
- 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@
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 3 |
1 files changed, 0 insertions, 3 deletions
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 |
