5 files changed, 10 insertions, 10 deletions

diff --git a/x11-toolkits/linux-gtk/Makefile b/x11-toolkits/linux-gtk/Makefile
index 28770096b17c..dbf72f937a2d 100644
--- a/x11-toolkits/linux-gtk/Makefile
+++ b/x11-toolkits/linux-gtk/Makefile
@@ -9,14 +9,14 @@
 
 PORTNAME=	gtk
 PORTVERSION=	1.2.10
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits linux
 DISTNAME=	gtk+-${PORTVERSION}-39
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of the Gtk lib
 
-CONFLICTS=	linux-f8-gtk-[0-9]*
+CONFLICTS=	linux-f8-gtk-[0-9]* linux-f10-gtk-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/x11-toolkits/linux-gtk2/Makefile b/x11-toolkits/linux-gtk2/Makefile
index 4f0ee8f96e07..8f85352d71a7 100644
--- a/x11-toolkits/linux-gtk2/Makefile
+++ b/x11-toolkits/linux-gtk2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	2.6.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits linux
 DISTFILES=	${PORTNAME}-${PORTVERSION}-2.fc4.4.${LINUX_RPM_ARCH}.rpm \
 		${PORTNAME}-engines-2.6.3-2.${LINUX_RPM_ARCH}.rpm
@@ -15,7 +15,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}-2.fc4.4.${LINUX_RPM_ARCH}.rpm \
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	GTK+ library, version 2.X, Linux binary
 
-CONFLICTS=	linux-f8-gtk2-[0-9]*
+CONFLICTS=	linux-f8-gtk2-[0-9]* linux-f10-gtk2-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
diff --git a/x11-toolkits/linux-openmotif/Makefile b/x11-toolkits/linux-openmotif/Makefile
index a745feb859cf..682ab6e190c4 100644
--- a/x11-toolkits/linux-openmotif/Makefile
+++ b/x11-toolkits/linux-openmotif/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	openmotif
 PORTVERSION=	2.2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits linux
 MASTER_SITES=	ftp://ftp.motifzone.com/%SUBDIR%/ \
 		ftp://ftp.ics.com/pub/Products/Motif/%SUBDIR%/
@@ -21,7 +21,7 @@ COMMENT=	Motif toolkit Linux libraries
 
 BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm
 
-CONFLICTS=	linux-f8-openmotif-[0-9]*
+CONFLICTS=	linux-f8-openmotif-[0-9]* linux-f10-openmotif-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	yes
diff --git a/x11-toolkits/linux-pango/Makefile b/x11-toolkits/linux-pango/Makefile
index 997f74dd626b..6fc78c8d4b4e 100644
--- a/x11-toolkits/linux-pango/Makefile
+++ b/x11-toolkits/linux-pango/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	pango
 PORTVERSION=	1.10.2
 DISTVERSIONSUFFIX=	-1.gst.1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits linux
 MASTER_SITES=	http://gstreamer.freedesktop.org/pkg/%SUBDIR%/ CENKES/myports
 MASTER_SITE_SUBDIR=	${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/RPMS.gst010
@@ -17,7 +17,7 @@ MASTER_SITE_SRC_SUBDIR=	${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/SRPMS.
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Linux pango binary
 
-CONFLICTS=	linux-f8-pango-[0-9]*
+CONFLICTS=	linux-f8-pango-[0-9]* linux-f10-pango-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
diff --git a/x11-toolkits/linux-qt33/Makefile b/x11-toolkits/linux-qt33/Makefile
index b719131ffd4e..d52b997cfc8d 100644
--- a/x11-toolkits/linux-qt33/Makefile
+++ b/x11-toolkits/linux-qt33/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	qt33
 PORTVERSION=	3.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits linux
 DISTNAME=	qt-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	RPM of QT3
 
-CONFLICTS=	linux-f8-qt33-[0-9]*
+CONFLICTS=	linux-f8-qt33-[0-9]* linux-f10-qt33-[0-9]*
 
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	fontconfig libmng png