13 files changed, 36 insertions, 3 deletions

diff --git a/graphics/linux-f10-libGLU/Makefile b/graphics/linux-f10-libGLU/Makefile
index 85a0bc02d641..dc82caec3a9f 100644
--- a/graphics/linux-f10-libGLU/Makefile
+++ b/graphics/linux-f10-libGLU/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libGLU
 PORTVERSION=	7.0.2
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,7 +15,7 @@ DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Mesa libGLU runtime library (Linux Fedora 8)
 
-CONFLICTS=	linux_dri-[0-9]* linux_dri-devel-* linux-libGLU-*
+CONFLICTS=	linux_dri-[0-9]* linux_dri-devel-* linux-libGLU-* linux-dri-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
diff --git a/graphics/linux-f8-cairo/Makefile b/graphics/linux-f8-cairo/Makefile
index f86b18119808..f6e446a8676e 100644
--- a/graphics/linux-f8-cairo/Makefile
+++ b/graphics/linux-f8-cairo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cairo
 PORTVERSION=	1.4.14
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Vector graphics library Cairo (Linux Fedora 8)
 
+CONFLICTS=	linux-cairo-[0-9]* linux-f10-cairo-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	fontconfig png xorglibs
diff --git a/graphics/linux-f8-dri/Makefile b/graphics/linux-f8-dri/Makefile
index 8d4d15925710..13a28e9d3103 100644
--- a/graphics/linux-f8-dri/Makefile
+++ b/graphics/linux-f8-dri/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dri
 PORTVERSION=	7.0.2
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 PKGNAMEPREFIX=	linux-f8-
 DISTFILES=	Glide3-20050815-6.fc8.${LINUX_RPM_ARCH}.rpm \
@@ -27,7 +28,7 @@ ALWAYS_KEEP_DISTFILES=  YES
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Mesa libGL runtime libraries and DRI drivers (Linux Fedora 8)
 
-CONFLICTS=	linux_dri-[0-9]* linux_dri-devel-[0-9]*
+CONFLICTS=	linux_dri-[0-9]* linux_dri-devel-[0-9]* linux-dri-[0-9]* linux-f10-dri-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
diff --git a/graphics/linux-f8-gdk-pixbuf/Makefile b/graphics/linux-f8-gdk-pixbuf/Makefile
index 6aafda7bec3e..a2814afd69df 100644
--- a/graphics/linux-f8-gdk-pixbuf/Makefile
+++ b/graphics/linux-f8-gdk-pixbuf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gdk-pixbuf
 PORTVERSION=	0.22.0
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Image loading library for GTK+ (Linux Fedora 8)
 
+CONFLICTS=	linux-gdk-pixbuf-[0-9]* linux-f10-gdk-pixbuf-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	8
diff --git a/graphics/linux-f8-imlib/Makefile b/graphics/linux-f8-imlib/Makefile
index a9f1b627bc49..dde4f8397efa 100644
--- a/graphics/linux-f8-imlib/Makefile
+++ b/graphics/linux-f8-imlib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imlib
 PORTVERSION=	1.9.15
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of imlib (Linux Fedora 8)
 
+CONFLICTS=	linux-imlib-[0-9]* linux-f10-imlib-[0-9]*
+
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	8
 RPMVERSION=	6.fc8
diff --git a/graphics/linux-f8-jpeg/Makefile b/graphics/linux-f8-jpeg/Makefile
index b68fc51b6b6a..04729f68092d 100644
--- a/graphics/linux-f8-jpeg/Makefile
+++ b/graphics/linux-f8-jpeg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jpeg
 PORTVERSION=	6b
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of the JPEG lib (Linux Fedora 8)
 
+CONFLICTS=	linux-jpeg-[0-9]* linux-f10-jpeg-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_NAME=	lib${PORTNAME}
diff --git a/graphics/linux-f8-libGLU/Makefile b/graphics/linux-f8-libGLU/Makefile
index 85a0bc02d641..dc82caec3a9f 100644
--- a/graphics/linux-f8-libGLU/Makefile
+++ b/graphics/linux-f8-libGLU/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libGLU
 PORTVERSION=	7.0.2
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,7 +15,7 @@ DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Mesa libGLU runtime library (Linux Fedora 8)
 
-CONFLICTS=	linux_dri-[0-9]* linux_dri-devel-* linux-libGLU-*
+CONFLICTS=	linux_dri-[0-9]* linux_dri-devel-* linux-libGLU-* linux-dri-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
diff --git a/graphics/linux-f8-libmng/Makefile b/graphics/linux-f8-libmng/Makefile
index 88c1b0d09e2d..2c26f3fbeea3 100644
--- a/graphics/linux-f8-libmng/Makefile
+++ b/graphics/linux-f8-libmng/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		libmng
 PORTVERSION=		1.0.9
+PORTREVISION=		1
 CATEGORIES=		graphics linux
 PKGNAMEPREFIX=		linux-f8-
 DISTNAME=		${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=		${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=		emulation@FreeBSD.org
 COMMENT=		RPM of libmng (Linux Fedora 8)
 
+CONFLICTS=	linux-libmng-[0-9]* linux-f10-libmng-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	jpeg
diff --git a/graphics/linux-f8-png/Makefile b/graphics/linux-f8-png/Makefile
index fc1e07c180fe..c86c3fa47124 100644
--- a/graphics/linux-f8-png/Makefile
+++ b/graphics/linux-f8-png/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	png
 PORTVERSION=	1.2.22
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of the PNG lib (Linux Fedora 8)
 
+CONFLICTS=	linux-png-[0-9]* linux-f10-png-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_NAME=	libpng
diff --git a/graphics/linux-f8-png10/Makefile b/graphics/linux-f8-png10/Makefile
index e48aeaa568b8..392c86597699 100644
--- a/graphics/linux-f8-png10/Makefile
+++ b/graphics/linux-f8-png10/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	png10
 PORTVERSION=	1.0.30
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of the PNG lib (old 1.0 version, Linux Fedora 8)
 
+CONFLICTS=	linux-png10-[0-9]* linux-f10-png10-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_NAME=	lib${PORTNAME}
diff --git a/graphics/linux-f8-sdl_image/Makefile b/graphics/linux-f8-sdl_image/Makefile
index a7318678eb48..402c534d3de6 100644
--- a/graphics/linux-f8-sdl_image/Makefile
+++ b/graphics/linux-f8-sdl_image/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdl_image
 PORTVERSION=	1.2.6
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	A simple library to load images as SDL interfaces (Linux Fedora 8)
 
+CONFLICTS=	linux-sdl_image-[0-9]* linux-f10-sdl_image-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	sdl12
diff --git a/graphics/linux-f8-tiff/Makefile b/graphics/linux-f8-tiff/Makefile
index 1b1fdb50c0df..6a1e3d2e6fe4 100644
--- a/graphics/linux-f8-tiff/Makefile
+++ b/graphics/linux-f8-tiff/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tiff
 PORTVERSION=	3.8.2
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	The TIFF library, Linux/i386 binary (Linux Fedora 8)
 
+CONFLICTS=	linux-tiff-[0-9]* linux-f10-tiff-[0-9]*
+
 ONLY_FOR_ARCHS=	amd64 i386
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	jpeg
diff --git a/graphics/linux-f8-ungif/Makefile b/graphics/linux-f8-ungif/Makefile
index fed19f3d1c38..f1a8f209fdb4 100644
--- a/graphics/linux-f8-ungif/Makefile
+++ b/graphics/linux-f8-ungif/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ungif
 PORTVERSION=	4.1.3
+PORTREVISION=	1
 CATEGORIES=	graphics 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 gif and ungif libs (Linux Fedora 8)
 
+CONFLICTS=	linux-ungif-[0-9]* linux-f10-ungif-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_NAME=	giflib