. add linux-f10 ports to the rank of CONFLICTS for linux-fc4 ports;

. bump PORTREVISIONs.

49 files changed, 101 insertions, 96 deletions

diff --git a/accessibility/linux-atk/Makefile b/accessibility/linux-atk/Makefile
index c4f1cbc7c81c..b809db70e19d 100644
--- a/accessibility/linux-atk/Makefile
+++ b/accessibility/linux-atk/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	atk
 PORTVERSION=	1.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	accessibility linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Accessibility Toolkit, Linux/i386 binary
 
-CONFLICTS=	linux-f8-atk-[0-9]*
+CONFLICTS=	linux-f8-atk-[0-9]* linux-f10-atk-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
diff --git a/archivers/linux-ucl/Makefile b/archivers/linux-ucl/Makefile
index 97a30675626f..c6d46d5ba4ba 100644
--- a/archivers/linux-ucl/Makefile
+++ b/archivers/linux-ucl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		ucl
 PORTVERSION=		1.03
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		archivers linux
 MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
 DISTNAME=		${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -15,7 +15,7 @@ DISTNAME=		${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=		emulation@FreeBSD.org
 COMMENT=		RPM of UCL, a lossless data compression library
 
-CONFLICTS=		linux-f8-ucl-[0-9]*
+CONFLICTS=		linux-f8-ucl-[0-9]* linux-f10-ucl-[0-9]*
 
 USE_LINUX_RPM=		yes
 RPMVERSION=		3
diff --git a/archivers/linux-upx/Makefile b/archivers/linux-upx/Makefile
index 80c4b4d3e1bd..aea1d286694e 100644
--- a/archivers/linux-upx/Makefile
+++ b/archivers/linux-upx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		upx
 PORTVERSION=		1.25
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		archivers linux
 MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
 DISTNAME=		${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -15,7 +15,7 @@ DISTNAME=		${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=		emulation@FreeBSD.org
 COMMENT=		RPM of UPX, a high-performance executable packer
 
-CONFLICTS=		linux-f8-upx-[0-9]*
+CONFLICTS=		linux-f8-upx-[0-9]* linux-f10-upx-[0-9]*
 
 USE_LINUX_RPM=		yes
 USE_LINUX_APPS=		ucl
diff --git a/audio/linux-alsa-lib/Makefile b/audio/linux-alsa-lib/Makefile
index 2968147ce766..5abd11a084c2 100644
--- a/audio/linux-alsa-lib/Makefile
+++ b/audio/linux-alsa-lib/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	alsa-lib
 DISTVERSION=	1.0.10-3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio linux
 DISTNAME=	${PORTNAME}-${DISTVERSION}.FC4
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Advanced Linux Sound Architecture libraries
 
-CONFLICTS=	linux-f8-alsa-lib-[0-9]*
+CONFLICTS=	linux-f8-alsa-lib-[0-9]* linux-f10-alsa-lib-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
diff --git a/audio/linux-arts/Makefile b/audio/linux-arts/Makefile
index a2f0ff815b1c..5e95b051bc25 100644
--- a/audio/linux-arts/Makefile
+++ b/audio/linux-arts/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=		arts
 DISTVERSION=		1.5.3-0.1.fc4
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		audio kde linux
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Audio system for the KDE integrated X11 desktop (Linux version)
 
-CONFLICTS=		linux-f8-arts-[0-9]*
+CONFLICTS=		linux-f8-arts-[0-9]* linux-f10-arts-[0-9]*
 
 ONLY_FOR_ARCHS=		i386 amd64
 USE_LINUX_RPM=		yes
diff --git a/audio/linux-esound/Makefile b/audio/linux-esound/Makefile
index 511a2a143e9e..e3d01c36669f 100644
--- a/audio/linux-esound/Makefile
+++ b/audio/linux-esound/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	esound
 PORTVERSION=	0.2.36
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-0.fc4.1
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of esound
 
-CONFLICTS=	linux-f8-esound-[0-9]*
+CONFLICTS=	linux-f8-esound-[0-9]* linux-f10-esound-[0-9]*
 
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	libaudiofile
diff --git a/audio/linux-freealut/Makefile b/audio/linux-freealut/Makefile
index 5285867a2e5b..4b23af0b5961 100644
--- a/audio/linux-freealut/Makefile
+++ b/audio/linux-freealut/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freealut
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio linux
 MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.fc${LINUX_DIST_VER}
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-1.fc${LINUX_DIST_VER}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free implementation of OpenAL's ALUT standard (Linux version)
 
-CONFLICTS=	linux-f8-freealut-[0-9]*
+CONFLICTS=	linux-f8-freealut-[0-9]* linux-f10-freealut-[0-9]*
 
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	openal
diff --git a/audio/linux-libaudiofile/Makefile b/audio/linux-libaudiofile/Makefile
index eb0daef4e309..94848e12cab8 100644
--- a/audio/linux-libaudiofile/Makefile
+++ b/audio/linux-libaudiofile/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	libaudiofile
 PORTVERSION=	0.2.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio linux
 DISTNAME=	audiofile-${PORTVERSION}-2
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of audiofile
 
-CONFLICTS=	linux-f8-libaudiofile-[0-9]*
+CONFLICTS=	linux-f8-libaudiofile-[0-9]* linux-f10-libaudiofile-[0-9]*
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
diff --git a/audio/linux-libogg/Makefile b/audio/linux-libogg/Makefile
index 4c1596c16b2f..eb155823f372 100644
--- a/audio/linux-libogg/Makefile
+++ b/audio/linux-libogg/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	libogg
 DISTVERSION=	1.1.2-2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio linux
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ogg bitstream library (Linux version)
 
-CONFLICTS=	linux-f8-libogg-[0-9]*
+CONFLICTS=	linux-f8-libogg-[0-9]* linux-f10-libogg-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
diff --git a/audio/linux-libvorbis/Makefile b/audio/linux-libvorbis/Makefile
index e45d2f6cf9a0..10207d5435d6 100644
--- a/audio/linux-libvorbis/Makefile
+++ b/audio/linux-libvorbis/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	libvorbis
 DISTVERSION=	1.1.0-2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio linux
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Audio compression codec library (Linux version)
 
-CONFLICTS=	linux-f8-libvorbis-[0-9]*
+CONFLICTS=	linux-f8-libvorbis-[0-9]* linux-f10-libvorbis-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
diff --git a/audio/linux-mikmod/Makefile b/audio/linux-mikmod/Makefile
index eaf17343d15d..b038c997c699 100644
--- a/audio/linux-mikmod/Makefile
+++ b/audio/linux-mikmod/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	mikmod
 DISTVERSION=	3.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-34
 
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	MikMod Sound Library (Linux version)
 
-CONFLICTS=	linux-f8-mikmod-[0-9]*
+CONFLICTS=	linux-f8-mikmod-[0-9]* linux-f10-mikmod-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
diff --git a/audio/linux-openal/Makefile b/audio/linux-openal/Makefile
index 5c493f68c0a8..20c812158e1e 100644
--- a/audio/linux-openal/Makefile
+++ b/audio/linux-openal/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	openal
 DISTVERSION=	0.0.9-0.6.20060204cvs.fc4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio linux
 MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A 3D positional spatialized sound library (Linux version)
 
-CONFLICTS=	linux-f8-openal-[0-9]*
+CONFLICTS=	linux-f8-openal-[0-9]* linux-f10-openal-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
diff --git a/audio/linux-sdl_mixer/Makefile b/audio/linux-sdl_mixer/Makefile
index 0999570e80c5..26b1896ccc89 100644
--- a/audio/linux-sdl_mixer/Makefile
+++ b/audio/linux-sdl_mixer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl_mixer
 DISTVERSION=	1.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio linux
 MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
 DISTNAME=	SDL_mixer-${PORTVERSION}-3.fc${LINUX_DIST_VER}
@@ -15,7 +15,7 @@ DISTNAME=	SDL_mixer-${PORTVERSION}-3.fc${LINUX_DIST_VER}
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	A sample multi-channel audio mixer library (Linux version)
 
-CONFLICTS=	linux-f8-sdl_mixer-[0-9]*
+CONFLICTS=	linux-f8-sdl_mixer-[0-9]* linux-f10-sdl_mixer-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
diff --git a/devel/linux-allegro/Makefile b/devel/linux-allegro/Makefile
index 988cbbafd5d5..da715a839afe 100644
--- a/devel/linux-allegro/Makefile
+++ b/devel/linux-allegro/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	allegro
 PORTVERSION=	4.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel linux
 MASTER_SITES=	http://membres.lycos.fr/ebotcazou/allegro/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Cross-platform game programming library (linux version)
 
-CONFLICTS=	linux-f8-allegro-[0-9]*
+CONFLICTS=	linux-f8-allegro-[0-9]* linux-f10-allegro-[0-9]*
 
 USE_LINUX_RPM=		yes
 USE_LINUX_APPS=		xorglibs
diff --git a/devel/linux-libglade/Makefile b/devel/linux-libglade/Makefile
index 0c71cd9a8d64..15f19ae6a956 100644
--- a/devel/linux-libglade/Makefile
+++ b/devel/linux-libglade/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	libglade
 PORTVERSION=	0.17
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-16
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libglade
 
-CONFLICTS=	linux-f8-libglade-[0-9]*
+CONFLICTS=	linux-f8-libglade-[0-9]* linux-f10-libglade-[0-9]*
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
diff --git a/devel/linux-libglade2/Makefile b/devel/linux-libglade2/Makefile
index a50b9e15296a..203389bc38e5 100644
--- a/devel/linux-libglade2/Makefile
+++ b/devel/linux-libglade2/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	libglade2
 PORTVERSION=	2.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-2
 
 MAINTAINER=	tut@nhamon.com.ua
 COMMENT=	RPM of libglade2
 
-CONFLICTS=	linux-f8-libglade2-[0-9]*
+CONFLICTS=	linux-f8-libglade2-[0-9]* linux-f10-libglade2-[0-9]*
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
diff --git a/devel/linux-libsigc++20/Makefile b/devel/linux-libsigc++20/Makefile
index 30d40810362d..1b1f0212d1d2 100644
--- a/devel/linux-libsigc++20/Makefile
+++ b/devel/linux-libsigc++20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		libsigc
 PORTVERSION=		2.0.17
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		devel linux
 MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
 DISTNAME=		${PORTNAME}++20-${PORTVERSION}-${RPMVERSION}
@@ -15,7 +15,7 @@ DISTNAME=		${PORTNAME}++20-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=		freebsd-emulation@FreeBSD.org
 COMMENT=		Callback Framework for C++ (linux version)
 
-CONFLICTS=		linux-f8-libsigc++20-[0-9]*
+CONFLICTS=		linux-f8-libsigc++20-[0-9]* linux-f10-libsigc++20-[0-9]*
 
 ONLY_FOR_ARCHS=		i386 amd64
 USE_LINUX_RPM=		yes
diff --git a/devel/linux-sdl12/Makefile b/devel/linux-sdl12/Makefile
index 0681c31bffdb..f47830ec2bdd 100644
--- a/devel/linux-sdl12/Makefile
+++ b/devel/linux-sdl12/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	sdl
 PORTVERSION=	1.2.10
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel linux
 MASTER_SITES=	http://www.libsdl.org/release/ \
@@ -18,7 +18,7 @@ DISTNAME=	${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Cross-platform multi-media development API (linux version)
 
-CONFLICTS=	linux-f8-sdl12-[0-9]*
+CONFLICTS=	linux-f8-sdl12-[0-9]* linux-f10-sdl12-[0-9]*
 
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	xorglibs
diff --git a/ftp/linux-curl/Makefile b/ftp/linux-curl/Makefile
index 63f5068428a0..88b5527c361e 100644
--- a/ftp/linux-curl/Makefile
+++ b/ftp/linux-curl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	curl
 PORTVERSION=	7.13.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp linux
 PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-5.fc4
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-5.fc4
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Curl linux version
 
-CONFLICTS=	linux-f8-curl-[0-9]*
+CONFLICTS=	linux-f8-curl-[0-9]* linux-f10-curl-[0-9]*
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
diff --git a/graphics/linux-cairo/Makefile b/graphics/linux-cairo/Makefile
index e4656dbcc46e..451c17129291 100644
--- a/graphics/linux-cairo/Makefile
+++ b/graphics/linux-cairo/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	cairo
 PORTVERSION=	1.0.2
 DISTVERSIONSUFFIX=	-2.gst.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics linux
 MASTER_SITES=	http://gstreamer.freedesktop.org/pkg/%SUBDIR%/ CENKES/myports
 MASTER_SITE_SUBDIR=	${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/RPMS.deps
@@ -17,7 +17,7 @@ MASTER_SITE_SRC_SUBDIR=	${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/SRPMS.
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Linux cairo binary
 
-CONFLICTS=	linux-f8-cairo-[0-9]*
+CONFLICTS=	linux-f8-cairo-[0-9]* linux-f10-cairo-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 LINUX_DIST_VER=	4
diff --git a/graphics/linux-gdk-pixbuf/Makefile b/graphics/linux-gdk-pixbuf/Makefile
index 7f6c8e79a33e..e8a8e85baf9e 100644
--- a/graphics/linux-gdk-pixbuf/Makefile
+++ b/graphics/linux-gdk-pixbuf/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	gdk-pixbuf
 PORTVERSION=	0.22.0.18.fc4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics linux
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+)\./\1-/}
 
 MAINTAINER=	sethk@meowfishies.com
 COMMENT=	Linux version of the graphic library for GTK+
 
-CONFLICTS=	linux-f8-gdk-pixbuf-[0-9]*
+CONFLICTS=	linux-f8-gdk-pixbuf-[0-9]* linux-f10-gdk-pixbuf-[0-9]*
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
diff --git a/graphics/linux-imlib/Makefile b/graphics/linux-imlib/Makefile
index 18387be76a5f..264cf3b5f41d 100644
--- a/graphics/linux-imlib/Makefile
+++ b/graphics/linux-imlib/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	imlib
 PORTVERSION=	1.9.13
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-24
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of imlib
 
-CONFLICTS=	linux-f8-imlib-[0-9]*
+CONFLICTS=	linux-f8-imlib-[0-9]* linux-f10-imlib-[0-9]*
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
diff --git a/graphics/linux-jpeg/Makefile b/graphics/linux-jpeg/Makefile
index b0a20482428d..b0b14237c79e 100644
--- a/graphics/linux-jpeg/Makefile
+++ b/graphics/linux-jpeg/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	jpeg
 PORTVERSION=	6b.34
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics linux
 DISTNAME=	libjpeg-6b-34
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of the JPEG lib
 
-CONFLICTS=	linux-f8-jpeg-[0-9]*
+CONFLICTS=	linux-f8-jpeg-[0-9]* linux-f10-jpeg-[0-9]*
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
diff --git a/graphics/linux-libGLU/Makefile b/graphics/linux-libGLU/Makefile
index ca950b16f568..06a00bacad37 100644
--- a/graphics/linux-libGLU/Makefile
+++ b/graphics/linux-libGLU/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libGLU
 PORTVERSION=	6.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics linux
 DISTNAME=	xorg-x11-Mesa-libGLU-${PORTVERSION}-${RPMVERSION}
 SRC_DISTFILES=	xorg-x11-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
@@ -15,7 +15,8 @@ SRC_DISTFILES=	xorg-x11-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL utility library (Linux version)
 
-CONFLICTS=	linux_dri-[0-9]* linux-f8-libGLU-[0-9]*
+CONFLICTS=	linux_dri-[0-9]* linux-f8-libGLU-[0-9]* linux-dri-[0-9]* \
+		linux-f8-dri-[0-9]* linux-f10-dri-[0-9]*
 
 RPMVERSION=	37.FC4.49.2.1
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/graphics/linux-libmng/Makefile b/graphics/linux-libmng/Makefile
index 6e7e97ca820b..25d58cc57347 100644
--- a/graphics/linux-libmng/Makefile
+++ b/graphics/linux-libmng/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=		libmng
 PORTVERSION=		1.0.9
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		graphics linux
 DISTNAME=		${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=		michael@ranner.eu
 COMMENT=		RPM of libmng
 
-CONFLICTS=		linux-f8-libmng-[0-9]*
+CONFLICTS=		linux-f8-libmng-[0-9]* linux-f10-libmng-[0-9]*
 
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	jpeg
diff --git a/graphics/linux-png/Makefile b/graphics/linux-png/Makefile
index 1b18f7dd1a79..1f09b1b5e5bd 100644
--- a/graphics/linux-png/Makefile
+++ b/graphics/linux-png/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	png
 PORTVERSION=	1.2.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics linux
 DISTNAME=	libpng-${PORTVERSION}-2
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of the PNG lib
 
-CONFLICTS=	linux-f8-png-[0-9]*
+CONFLICTS=	linux-f8-png-[0-9]* linux-f10-png-[0-9]*
 
 # no alpha rpm is available
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/graphics/linux-png10/Makefile b/graphics/linux-png10/Makefile
index 17ece16f0588..672ed103f9af 100644
--- a/graphics/linux-png10/Makefile
+++ b/graphics/linux-png10/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	png
 PORTVERSION=	1.0.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics linux
 DISTNAME=	libpng10-${PORTVERSION}-2
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of the PNG lib (old 1.0 version)
 
-CONFLICTS=	linux-f8-png10-[0-9]*
+CONFLICTS=	linux-f8-png10-[0-9]* linux-f10-png10-[0-9]*
 LATEST_LINK=	linux-png10
 
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/graphics/linux-sdl_image/Makefile b/graphics/linux-sdl_image/Makefile
index 6aa0688b28fb..ca7e0dbe85f8 100644
--- a/graphics/linux-sdl_image/Makefile
+++ b/graphics/linux-sdl_image/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	sdl_image
 PORTVERSION=	1.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics linux
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_image/release/
 DISTNAME=	SDL_image-${PORTVERSION}-1
@@ -16,7 +16,7 @@ DISTNAME=	SDL_image-${PORTVERSION}-1
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A simple library to load images as SDL interfaces (linux version)
 
-CONFLICTS=	linux-f8-sdl_image-[0-9]*
+CONFLICTS=	linux-f8-sdl_image-[0-9]* linux-f10-sdl_image-[0-9]*
 
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	sdl12
diff --git a/graphics/linux-tiff/Makefile b/graphics/linux-tiff/Makefile
index 9e791da3a55f..d493448ff57d 100644
--- a/graphics/linux-tiff/Makefile
+++ b/graphics/linux-tiff/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	tiff
 PORTVERSION=	3.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics linux
 DISTNAME=	libtiff-${PORTVERSION}-6.fc4.2
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	TIFF library, Linux/i386 binary
 
-CONFLICTS=	linux-f8-tiff-[0-9]*
+CONFLICTS=	linux-f8-tiff-[0-9]* linux-f10-tiff-[0-9]*
 
 ONLY_FOR_ARCHS=	amd64 i386
 USE_LINUX_RPM=	yes
diff --git a/graphics/linux-ungif/Makefile b/graphics/linux-ungif/Makefile
index 35743e62486c..356268b5a4c6 100644
--- a/graphics/linux-ungif/Makefile
+++ b/graphics/linux-ungif/Makefile
@@ -6,14 +6,14 @@
 
 PORTNAME=	ungif
 PORTVERSION=	4.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics linux
 DISTNAME=	libungif-${PORTVERSION}-3.fc4.2
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	RPM of the ungif lib
 
-CONFLICTS=	linux-f8-ungif-[0-9]*
+CONFLICTS=	linux-f8-ungif-[0-9]* linux-f10-ungif-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/graphics/linux_dri-devel/Makefile b/graphics/linux_dri-devel/Makefile
index 4708dc365e43..1b9013954b13 100644
--- a/graphics/linux_dri-devel/Makefile
+++ b/graphics/linux_dri-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	linux_dri-devel
 PORTVERSION=	6.5.20060624
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 MASTER_SITES=	http://people.freebsd.org/~anholt/dri/files/
 DISTFILES=	Mesa-linux-bin-20060624.tar.bz2 \
@@ -16,7 +17,8 @@ DISTFILES=	Mesa-linux-bin-20060624.tar.bz2 \
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Binary Linux DRI libraries for 3D hardware acceleration of linux apps
 
-CONFLICTS=	linux_dri-6.5 linux-libGLU-[0-9]*
+CONFLICTS=	linux_dri-6.5 linux-libGLU-[0-9]* linux-f8-dri-[0-9]* \
+		linux-f8-libGLU-[0-9]* linux-f10-dri-[0-9]* linux-dri-[0-9]*
 
 WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
diff --git a/graphics/linux_dri/Makefile b/graphics/linux_dri/Makefile
index 45c525f7b219..fd060a8dfc21 100644
--- a/graphics/linux_dri/Makefile
+++ b/graphics/linux_dri/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	linux_dri
 PORTVERSION=	7.0
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 MASTER_SITES=	http://people.freebsd.org/~anholt/dri/files/
 DISTFILES=	Mesa-linux-bin-${PORTVERSION}.tar.bz2 \
@@ -16,7 +17,8 @@ DISTFILES=	Mesa-linux-bin-${PORTVERSION}.tar.bz2 \
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Binary Linux DRI libraries for 3D hardware acceleration of linux apps
 
-CONFLICTS=	linux_dri-6.5.2006* linux-libGLU-[0-9]*
+CONFLICTS=	linux_dri-6.5.2006* linux-libGLU-[0-9]* linux-f8-dri-[0-9]* \
+		linux-f8-libGLU-[0-9]* linux-f10-dri-[0-9]* linux-dri-[0-9]*
 
 WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
diff --git a/lang/linux-libg2c/Makefile b/lang/linux-libg2c/Makefile
index 2b64d81899f8..81bff14f4b35 100644
--- a/lang/linux-libg2c/Makefile
+++ b/lang/linux-libg2c/Makefile
@@ -6,14 +6,14 @@
 
 PORTNAME=	libg2c
 PORTVERSION=	3.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang linux
 DISTNAME=	compat-libf2c-32-${PORTVERSION}-47.fc4
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Fortran 77 compatibility runtime
 
-CONFLICTS=	linux-f8-libg2c-[0-9]*
+CONFLICTS=	linux-f8-libg2c-[0-9]* linux-f10-libg2c-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
diff --git a/multimedia/linux-libtheora/Makefile b/multimedia/linux-libtheora/Makefile
index 3d95509067a8..d172c15c17f9 100644
--- a/multimedia/linux-libtheora/Makefile
+++ b/multimedia/linux-libtheora/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	libtheora
 DISTVERSION=	1.0alpha4-2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia linux
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Video codec
 
-CONFLICTS=	linux-f8-libtheora-[0-9]*
+CONFLICTS=	linux-f8-libtheora-[0-9]* linux-f10-libtheora-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
diff --git a/security/linux-openssl/Makefile b/security/linux-openssl/Makefile
index 68250bedf0dc..04685b862bda 100644
--- a/security/linux-openssl/Makefile
+++ b/security/linux-openssl/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	openssl
 PORTVERSION=	0.9.7f
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-7.10
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	SSL and crypto library (Linux Version)
 
-CONFLICTS=	linux-f8-openssl-[0-9]*
+CONFLICTS=	linux-f8-openssl-[0-9]* linux-f10-openssl-[0-9]*
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
diff --git a/textproc/linux-aspell/Makefile b/textproc/linux-aspell/Makefile
index 82c3daa1da8a..e7057629fb0a 100644
--- a/textproc/linux-aspell/Makefile
+++ b/textproc/linux-aspell/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aspell
 PORTVERSION=	0.50.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc linux
 MASTER_SITES=	ftp://ftp.pbone.net/mirror/ftp.ximian.com/pub/ximian-evolution/redhat-80-i386/ \
 		ftp://ftp.pbone.net/mirror/ftp.ximian.com/pub/ximian-evolution/redhat-80-i386/source/ \
@@ -21,7 +21,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Spelling checker with better logic than ispell (linux version)
 
-CONFLICTS=	linux-f8-aspell-[0-9]*
+CONFLICTS=	linux-f8-aspell-[0-9]* linux-f10-aspell-[0-9]*
 
 USE_LINUX_RPM=	yes
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/textproc/linux-expat/Makefile b/textproc/linux-expat/Makefile
index 2aa2e4617ab6..47faef0dbeeb 100644
--- a/textproc/linux-expat/Makefile
+++ b/textproc/linux-expat/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	expat
 PORTVERSION=	1.95.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-6
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Linux/i386 binary port of Expat XML-parsing library
 
-CONFLICTS=	linux-f8-expat-[0-9]*
+CONFLICTS=	linux-f8-expat-[0-9]* linux-f10-expat-[0-9]*
 
 BRANDELF_DIRS=	usr/bin
 
diff --git a/textproc/linux-libxml/Makefile b/textproc/linux-libxml/Makefile
index 17b3f338f3bd..e02e889261bc 100644
--- a/textproc/linux-libxml/Makefile
+++ b/textproc/linux-libxml/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	libxml
 PORTVERSION=	1.8.17
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-13
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libxml
 
-CONFLICTS=	linux-f8-libxml-[0-9]*
+CONFLICTS=	linux-f8-libxml-[0-9]* linux-f10-libxml-[0-9]*
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
diff --git a/textproc/linux-libxml2/Makefile b/textproc/linux-libxml2/Makefile
index 5640acf4e903..e769e1853e2c 100644
--- a/textproc/linux-libxml2/Makefile
+++ b/textproc/linux-libxml2/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	libxml2
 PORTVERSION=	2.6.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	tut@nhamon.com.ua
 COMMENT=	RPM of libxml2
 
-CONFLICTS=	linux-f8-libxml2-[0-9]*
+CONFLICTS=	linux-f8-libxml2-[0-9]* linux-f10-libxml2-[0-9]*
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
diff --git a/textproc/linux-scim-gtk/Makefile b/textproc/linux-scim-gtk/Makefile
index e0e54a104d0d..7b38466f5d51 100644
--- a/textproc/linux-scim-gtk/Makefile
+++ b/textproc/linux-scim-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-gtk
 PORTVERSION=	# defined below
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc linux
 MASTER_SITE_SUBDIR=	# defined below
 PKGNAMESUFFIX=	-fc${LINUX_DIST_VER}
@@ -16,7 +16,7 @@ DISTNAME=	# defined below
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Smart Common Input Method platform, gtk module, Linux binary
 
-CONFLICTS=	linux-f8-scim-gtk-[0-9]*
+CONFLICTS=	linux-f8-scim-gtk-[0-9]* linux-f10-scim-gtk-[0-9]*
 
 MASTER_SITE_SRC_SUBDIR=	# defined below
 SRC_DISTFILES=	scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX}
diff --git a/textproc/linux-scim-libs/Makefile b/textproc/linux-scim-libs/Makefile
index 156b8ce9dfef..1fb7b3042c45 100644
--- a/textproc/linux-scim-libs/Makefile
+++ b/textproc/linux-scim-libs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-libs
 PORTVERSION=	# defined below
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc linux
 MASTER_SITE_SUBDIR=	# defined below
 PKGNAMESUFFIX=	-fc${LINUX_DIST_VER}
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Smart Common Input Method platform, library part, Linux binary
 
-CONFLICTS=	linux-f8-scim-libs-[0-9]*
+CONFLICTS=	linux-f8-scim-libs-[0-9]* linux-f10-scim-libs-[0-9]*
 
 MASTER_SITE_SRC_SUBDIR=	# defined below
 SRC_DISTFILES=	scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX}
diff --git a/x11-fonts/linux-fontconfig/Makefile b/x11-fonts/linux-fontconfig/Makefile
index 7caa46f288c5..b5e6159848e5 100644
--- a/x11-fonts/linux-fontconfig/Makefile
+++ b/x11-fonts/linux-fontconfig/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	fontconfig
 PORTVERSION=	2.2.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-fonts linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-13
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Linux/i386 binary of Fontconfig
 
-CONFLICTS=	linux-f8-fontconfig-[0-9]*
+CONFLICTS=	linux-f8-fontconfig-[0-9]* linux-f10-fontconfig-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
diff --git a/x11-themes/linux-hicolor-icon-theme/Makefile b/x11-themes/linux-hicolor-icon-theme/Makefile
index 4e472a9d48ba..2332ae184d45 100644
--- a/x11-themes/linux-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-hicolor-icon-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hicolor-icon-theme
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes linux
 MASTER_SITES=	# empty
 PKGNAMEPREFIX=	linux-
@@ -18,7 +18,7 @@ COMMENT=	A high-color icon theme shell from the FreeDesktop project
 
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-CONFLICTS=	linux-f8-hicolor-icon-theme-[0-9]*
+CONFLICTS=	linux-f8-hicolor-icon-theme-[0-9]* linux-f10-hicolor-icon-theme-[0-9]*
 
 NO_BUILD=	yes
 USE_LINUX=	yes
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
diff --git a/x11/linux-xorg-libs/Makefile b/x11/linux-xorg-libs/Makefile
index dba37be30ee1..f9f71aae341b 100644
--- a/x11/linux-xorg-libs/Makefile
+++ b/x11/linux-xorg-libs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		xorg-libs
 PORTVERSION=		6.8.2
-PORTREVISION=		6
+PORTREVISION=		7
 CATEGORIES=		x11 linux
 DISTFILES=		xorg-x11-libs-${PORTVERSION}-37.FC4.49.2.1.${LINUX_RPM_ARCH}.rpm \
 			xorg-x11-deprecated-libs-6.8.2-31.${LINUX_RPM_ARCH}.rpm
@@ -15,7 +15,7 @@ DISTFILES=		xorg-x11-libs-${PORTVERSION}-37.FC4.49.2.1.${LINUX_RPM_ARCH}.rpm \
 MAINTAINER=		freebsd-emulation@FreeBSD.org
 COMMENT=		Xorg libraries, linux binaries
 
-CONFLICTS=		linux-XFree86-libs-[0-9]* linux-f8-xorg-libs-[0-9]*
+CONFLICTS=		linux-XFree86-libs-[0-9]* linux-f8-xorg-libs-[0-9]* linux-f10-xorg-libs-[0-9]*
 
 USE_LINUX_RPM=		yes
 USE_LINUX_APPS=		fontconfig