6 files changed, 18 insertions, 0 deletions

diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile
index 9395d3cdf40e..3c6943979f45 100644
--- a/x11-toolkits/linux-f8-gtk/Makefile
+++ b/x11-toolkits/linux-f8-gtk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	1.2.10
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Gtk library (Linux Fedora 8)
 
+CONFLICTS=	linux-gtk-[0-9]* linux-f10-gtk-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	xorglibs
diff --git a/x11-toolkits/linux-f8-gtk2/Makefile b/x11-toolkits/linux-f8-gtk2/Makefile
index 27fc0c82df12..fdb3490c3af8 100644
--- a/x11-toolkits/linux-f8-gtk2/Makefile
+++ b/x11-toolkits/linux-f8-gtk2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	2.12.8
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits linux
 PKGNAMEPREFIX=	linux-f8-
 DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm \
@@ -20,6 +21,8 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm \
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	GTK+ library, version 2.X (Linux Fedora 8)
 
+CONFLICTS=	linux-gtk2-[0-9]* linux-f10-gtk2-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 # these libraries are required by gtk-query-immodules-2.0 or
diff --git a/x11-toolkits/linux-f8-openmotif/Makefile b/x11-toolkits/linux-f8-openmotif/Makefile
index 678feb74d5a4..b940ba545c8a 100644
--- a/x11-toolkits/linux-f8-openmotif/Makefile
+++ b/x11-toolkits/linux-f8-openmotif/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	openmotif
 PORTVERSION=	2.3.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits linux
 MASTER_SITES=	ftp://ftp.motifzone.com/%SUBDIR%/ \
 		ftp://ftp.ics.com/openmotif/%SUBDIR%/
@@ -17,6 +18,8 @@ DIST_SUBDIR=	rpm
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Motif toolkit Linux libraries
 
+CONFLICTS=	linux-openmotif-[0-9]* linux-f10-openmotif-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	xorglibs
diff --git a/x11-toolkits/linux-f8-pango/Makefile b/x11-toolkits/linux-f8-pango/Makefile
index 41725e1bc18d..eafa6e8b3251 100644
--- a/x11-toolkits/linux-f8-pango/Makefile
+++ b/x11-toolkits/linux-f8-pango/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pango
 PORTVERSION=	1.18.4
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	The pango library (Linux Fedora 8)
 
+CONFLICTS=	linux-pango-[0-9]* linux-f10-pango-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 # these libraries are required by pango-querymodules
diff --git a/x11-toolkits/linux-f8-qt33/Makefile b/x11-toolkits/linux-f8-qt33/Makefile
index 7cf9dd80b3f5..877c2cd34d1d 100644
--- a/x11-toolkits/linux-f8-qt33/Makefile
+++ b/x11-toolkits/linux-f8-qt33/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	${LINUX_NAME}33
 PORTVERSION=	3.3.8b
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of QT3 (Linux Fedora 8)
 
+CONFLICTS=	linux-qt33-[0-9]* linux-f10-qt33-[0-9]*
+
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	fontconfig libmng png
 LINUX_NAME=	qt
diff --git a/x11-toolkits/linux-f8-tk84/Makefile b/x11-toolkits/linux-f8-tk84/Makefile
index de81daeda88a..c209e955e7c5 100644
--- a/x11-toolkits/linux-f8-tk84/Makefile
+++ b/x11-toolkits/linux-f8-tk84/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.4.17
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits linux
 PKGNAMEPREFIX=	linux-f8-
 PKGNAMESUFFIX=	84
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	stast@bsdportal.ru
 COMMENT=	Graphical toolkit for TCL (Linux Fedora 8)
 
+CONFLICTS=	linux-f10-tk85-[0-9]*
+
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	xorglibs
 LINUX_DIST_VER=	8