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

. bump PORTREVISIONs.

13 files changed, 29 insertions, 24 deletions

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