Fix CONFLICTS lines, as requested by eik then petef:

	I think it's a bug that linux_base thinks it conflicts with itself.

--petef

	The problem occurs if you do
	  make install; make install FORCE_PKG_REGISTER=yes
	which is somewhat supported, although [seldom] (never?) used.

--eik

Also record conflicts with cle_base.

10 files changed, 10 insertions, 10 deletions

diff --git a/emulators/linux_base-6/Makefile b/emulators/linux_base-6/Makefile
index d431215..c6924ff 100644
--- a/emulators/linux_base-6/Makefile
+++ b/emulators/linux_base-6/Makefile
@@ -29,7 +29,7 @@ FORBIDDEN=	"see <URL:http://rhn.redhat.com/errata/RHSA-2003-089.html> or\
 
 BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
-CONFLICTS=		linux_base-*
+CONFLICTS=cle_base-* linux_base-7* linux_base-8* linux_base-deb* linux_base-gen*
 ONLY_FOR_ARCHS=		alpha i386
 DIST_SUBDIR=		rpm
 PREFIX=			${LINUXBASE}
diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile
index 77750db..e77780a 100644
--- a/emulators/linux_base-8/Makefile
+++ b/emulators/linux_base-8/Makefile
@@ -53,8 +53,8 @@ COMMENT=	Base set of packages needed in Linux mode (only for i386)
 
 EXTRACT_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 
+CONFLICTS=cle_base-* linux_base-6* linux_base-7* linux_base-deb* linux_base-gen*
 RESTRICTED=		"binaries under GNU GPL without accompanying source"
-CONFLICTS=		linux_base-*
 ONLY_FOR_ARCHS=		i386
 DIST_SUBDIR=		rpm/${MACHINE_ARCH}/${PORTVERSION}
 PREFIX=			${LINUXBASE}
diff --git a/emulators/linux_base-debian/Makefile b/emulators/linux_base-debian/Makefile
index e3d85ff..20d55c7 100644
--- a/emulators/linux_base-debian/Makefile
+++ b/emulators/linux_base-debian/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Debian base set for the Linux mode
 
 BUILD_DEPENDS=	${DPKG_CMD}:${PORTSDIR}/archivers/dpkg
 
-CONFLICTS=	linux_base-*
+CONFLICTS=cle_base-* linux_base-6* linux_base-7* linux_base-8* linux_base-gento*
 DIST_SUBDIR=	debian-${PORTVERSION}-${DISTDATE}
 DISTDATE=	2002-07-18
 WRKSRC=		${WRKDIR}/var/cache/apt/archives
diff --git a/emulators/linux_base-gentoo-stage1/Makefile b/emulators/linux_base-gentoo-stage1/Makefile
index 9bfd748..4444340 100644
--- a/emulators/linux_base-gentoo-stage1/Makefile
+++ b/emulators/linux_base-gentoo-stage1/Makefile
@@ -44,7 +44,7 @@ ONLY_FOR_ARCHS=	alpha amd64 ia64 i386 sparc64
 PLIST=		${WRKDIR}/pkg-plist
 PREFIX=		${LINUXBASE}
 RESTRICTED=	"binaries licensed under GNU GPL without accompanying source"
-CONFLICTS=	linux_base-*
+CONFLICTS=cle_base-* linux_base-6* linux_base-7* linux_base-8* linux_base-debia*
 
 pre-install:
 	${ECHO_CMD} etc/resolv.conf > ${PLIST}
diff --git a/emulators/linux_base-rh-9/Makefile b/emulators/linux_base-rh-9/Makefile
index 77750db..e77780a 100644
--- a/emulators/linux_base-rh-9/Makefile
+++ b/emulators/linux_base-rh-9/Makefile
@@ -53,8 +53,8 @@ COMMENT=	Base set of packages needed in Linux mode (only for i386)
 
 EXTRACT_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 
+CONFLICTS=cle_base-* linux_base-6* linux_base-7* linux_base-deb* linux_base-gen*
 RESTRICTED=		"binaries under GNU GPL without accompanying source"
-CONFLICTS=		linux_base-*
 ONLY_FOR_ARCHS=		i386
 DIST_SUBDIR=		rpm/${MACHINE_ARCH}/${PORTVERSION}
 PREFIX=			${LINUXBASE}
diff --git a/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile
index 77750db..e77780a 100644
--- a/emulators/linux_base-suse-9.1/Makefile
+++ b/emulators/linux_base-suse-9.1/Makefile
@@ -53,8 +53,8 @@ COMMENT=	Base set of packages needed in Linux mode (only for i386)
 
 EXTRACT_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 
+CONFLICTS=cle_base-* linux_base-6* linux_base-7* linux_base-deb* linux_base-gen*
 RESTRICTED=		"binaries under GNU GPL without accompanying source"
-CONFLICTS=		linux_base-*
 ONLY_FOR_ARCHS=		i386
 DIST_SUBDIR=		rpm/${MACHINE_ARCH}/${PORTVERSION}
 PREFIX=			${LINUXBASE}
diff --git a/emulators/linux_base-suse-9.2/Makefile b/emulators/linux_base-suse-9.2/Makefile
index 77750db..e77780a 100644
--- a/emulators/linux_base-suse-9.2/Makefile
+++ b/emulators/linux_base-suse-9.2/Makefile
@@ -53,8 +53,8 @@ COMMENT=	Base set of packages needed in Linux mode (only for i386)
 
 EXTRACT_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 
+CONFLICTS=cle_base-* linux_base-6* linux_base-7* linux_base-deb* linux_base-gen*
 RESTRICTED=		"binaries under GNU GPL without accompanying source"
-CONFLICTS=		linux_base-*
 ONLY_FOR_ARCHS=		i386
 DIST_SUBDIR=		rpm/${MACHINE_ARCH}/${PORTVERSION}
 PREFIX=			${LINUXBASE}
diff --git a/emulators/linux_base-suse-9.3/Makefile b/emulators/linux_base-suse-9.3/Makefile
index 77750db..e77780a 100644
--- a/emulators/linux_base-suse-9.3/Makefile
+++ b/emulators/linux_base-suse-9.3/Makefile
@@ -53,8 +53,8 @@ COMMENT=	Base set of packages needed in Linux mode (only for i386)
 
 EXTRACT_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 
+CONFLICTS=cle_base-* linux_base-6* linux_base-7* linux_base-deb* linux_base-gen*
 RESTRICTED=		"binaries under GNU GPL without accompanying source"
-CONFLICTS=		linux_base-*
 ONLY_FOR_ARCHS=		i386
 DIST_SUBDIR=		rpm/${MACHINE_ARCH}/${PORTVERSION}
 PREFIX=			${LINUXBASE}
diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile
index 5356c6d..f56c361 100644
--- a/emulators/linux_base/Makefile
+++ b/emulators/linux_base/Makefile
@@ -48,7 +48,7 @@ COMMENT=	The base set of packages needed in Linux mode
 
 BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
-CONFLICTS=		linux_base-*
+CONFLICTS=cle_base-* linux_base-6* linux_base-8* linux_base-deb* linux_base-gen*
 ONLY_FOR_ARCHS=		alpha i386
 DIST_SUBDIR=		rpm
 PREFIX=			${LINUXBASE}
diff --git a/emulators/linux_dist-gentoo-stage1/Makefile b/emulators/linux_dist-gentoo-stage1/Makefile
index 9bfd748..4444340 100644
--- a/emulators/linux_dist-gentoo-stage1/Makefile
+++ b/emulators/linux_dist-gentoo-stage1/Makefile
@@ -44,7 +44,7 @@ ONLY_FOR_ARCHS=	alpha amd64 ia64 i386 sparc64
 PLIST=		${WRKDIR}/pkg-plist
 PREFIX=		${LINUXBASE}
 RESTRICTED=	"binaries licensed under GNU GPL without accompanying source"
-CONFLICTS=	linux_base-*
+CONFLICTS=cle_base-* linux_base-6* linux_base-7* linux_base-8* linux_base-debia*
 
 pre-install:
 	${ECHO_CMD} etc/resolv.conf > ${PLIST}