6 files changed, 18 insertions, 0 deletions

diff --git a/textproc/linux-f8-aspell/Makefile b/textproc/linux-f8-aspell/Makefile
index e3364af841e2..47277f091331 100644
--- a/textproc/linux-f8-aspell/Makefile
+++ b/textproc/linux-f8-aspell/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	aspell
 PORTVERSION=	0.60.5
+PORTREVISION=	1
 CATEGORIES=	textproc linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Spelling checker with better logic than ispell (Linux Fedora 8)
 
+CONFLICTS=	linux-aspell-[0-9]* linux-f10-aspell-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	8
diff --git a/textproc/linux-f8-expat/Makefile b/textproc/linux-f8-expat/Makefile
index d14588dad4eb..d583b62ca314 100644
--- a/textproc/linux-f8-expat/Makefile
+++ b/textproc/linux-f8-expat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	expat
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Linux/i386 binary port of Expat XML-parsing library (Linux Fedora 8)
 
+CONFLICTS=	linux-expat-[0-9]* linux-f10-expat-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	8
diff --git a/textproc/linux-f8-libxml/Makefile b/textproc/linux-f8-libxml/Makefile
index 54665f45675a..e6b01e1ed941 100644
--- a/textproc/linux-f8-libxml/Makefile
+++ b/textproc/linux-f8-libxml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libxml
 PORTVERSION=	1.8.17
+PORTREVISION=	1
 CATEGORIES=	textproc linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Old libXML library for Gnome-1 application compatibility (Linux Fedora 8)
 
+CONFLICTS=	linux-libxml-[0-9]* linux-f10-libxml-[0-9]*
+
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	8
 RPMVERSION=	18.fc8
diff --git a/textproc/linux-f8-libxml2/Makefile b/textproc/linux-f8-libxml2/Makefile
index 9ec61e39e1d7..841418c58765 100644
--- a/textproc/linux-f8-libxml2/Makefile
+++ b/textproc/linux-f8-libxml2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libxml2
 PORTVERSION=	2.7.2
+PORTREVISION=	1
 CATEGORIES=	textproc linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Library providing XML and HTML support (Linux Fedora 8)
 
+CONFLICTS=	linux-libxml2-[0-9]* linux-f10-libxml2-[0-9]*
+
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	8
 RPMVERSION=	2.fc8
diff --git a/textproc/linux-f8-scim-gtk/Makefile b/textproc/linux-f8-scim-gtk/Makefile
index 11a154a9c3eb..9d4d31be6d1f 100644
--- a/textproc/linux-f8-scim-gtk/Makefile
+++ b/textproc/linux-f8-scim-gtk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-gtk
 PORTVERSION=	1.4.7
+PORTREVISION=	1
 CATEGORIES=	textproc linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Smart Common Input Method platform, gtk module, (Linux Fedora 8)
 
+CONFLICTS=	linux-scim-gtk-[0-9]* linux-f10-scim-gtk-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	gtk2 scimlibs
diff --git a/textproc/linux-f8-scim-libs/Makefile b/textproc/linux-f8-scim-libs/Makefile
index 5bc2397693e5..e7354c5c4ea4 100644
--- a/textproc/linux-f8-scim-libs/Makefile
+++ b/textproc/linux-f8-scim-libs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-libs
 PORTVERSION=	1.4.7
+PORTREVISION=	1
 CATEGORIES=	textproc linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Smart Common Input Method libraries (Linux Fedora 8)
 
+CONFLICTS=	linux-scim-libs-[0-9]* linux-f10-scim-libs-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	gtk2