summaryrefslogtreecommitdiff
path: root/emulators/linux_base
diff options
context:
space:
mode:
authorTrevor Johnson <trevor@FreeBSD.org>2004-12-21 19:49:43 +0000
committerTrevor Johnson <trevor@FreeBSD.org>2004-12-21 19:49:43 +0000
commitce8d2856e5b64b575d19c842f5fce6cb6d7e9b0f (patch)
treeea632b0e3bffddd94bc86a53b9cf977f52552988 /emulators/linux_base
parentUpdate to 3.1.5. (diff)
Update CONFLICTS.
PR: 75283 Submitted by: linimon
Diffstat (limited to 'emulators/linux_base')
-rw-r--r--emulators/linux_base/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile
index 0b0f8e27e5c1..9ea16e649958 100644
--- a/emulators/linux_base/Makefile
+++ b/emulators/linux_base/Makefile
@@ -48,7 +48,8 @@ COMMENT= The base set of packages needed in Linux mode
BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
-CONFLICTS=cle_base-* linux_base-6* linux_base-8* linux_base-deb* linux_base-gen*
+CONFLICTS= linux_base-6* linux_base-8* linux_base-deb* linux_base-gen* \
+ linux_base-rh* linux_base-suse*
ONLY_FOR_ARCHS= alpha i386
DIST_SUBDIR= rpm
PREFIX= ${LINUXBASE}