Finish repocopies of new linux-f8 infrastructure ports:

. add CONFLICTS to 47 original ports;
. bump PORTREVISIONs for all of them;
. pet portlint for 2-3 ports (misplaced PORTREVISION).

11 files changed, 31 insertions, 4 deletions

diff --git a/graphics/linux-cairo/Makefile b/graphics/linux-cairo/Makefile
index 580fc64bf92..e4656dbcc46 100644
--- a/graphics/linux-cairo/Makefile
+++ b/graphics/linux-cairo/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	cairo
 PORTVERSION=	1.0.2
 DISTVERSIONSUFFIX=	-2.gst.1.4
+PORTREVISION=	1
 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
@@ -16,6 +17,8 @@ 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]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
diff --git a/graphics/linux-gdk-pixbuf/Makefile b/graphics/linux-gdk-pixbuf/Makefile
index 28ad286f678..7f6c8e79a33 100644
--- a/graphics/linux-gdk-pixbuf/Makefile
+++ b/graphics/linux-gdk-pixbuf/Makefile
@@ -7,12 +7,15 @@
 
 PORTNAME=	gdk-pixbuf
 PORTVERSION=	0.22.0.18.fc4.2
+PORTREVISION=	1
 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]*
+
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/graphics/linux-imlib/Makefile b/graphics/linux-imlib/Makefile
index 70552b4b75c..18387be76a5 100644
--- a/graphics/linux-imlib/Makefile
+++ b/graphics/linux-imlib/Makefile
@@ -7,13 +7,15 @@
 
 PORTNAME=	imlib
 PORTVERSION=	1.9.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-24
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of imlib
 
+CONFLICTS=	linux-f8-imlib-[0-9]*
+
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
diff --git a/graphics/linux-jpeg/Makefile b/graphics/linux-jpeg/Makefile
index abd359ef7b1..b0a20482428 100644
--- a/graphics/linux-jpeg/Makefile
+++ b/graphics/linux-jpeg/Makefile
@@ -7,12 +7,15 @@
 
 PORTNAME=	jpeg
 PORTVERSION=	6b.34
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 DISTNAME=	libjpeg-6b-34
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of the JPEG lib
 
+CONFLICTS=	linux-f8-jpeg-[0-9]*
+
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
diff --git a/graphics/linux-libGLU/Makefile b/graphics/linux-libGLU/Makefile
index e3e972565ee..ca950b16f56 100644
--- a/graphics/linux-libGLU/Makefile
+++ b/graphics/linux-libGLU/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libGLU
 PORTVERSION=	6.8.2
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 DISTNAME=	xorg-x11-Mesa-libGLU-${PORTVERSION}-${RPMVERSION}
 SRC_DISTFILES=	xorg-x11-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
@@ -14,7 +15,7 @@ SRC_DISTFILES=	xorg-x11-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL utility library (Linux version)
 
-CONFLICTS=	linux_dri-[0-9]*
+CONFLICTS=	linux_dri-[0-9]* linux-f8-libGLU-[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 1ed7a820da6..6e7e97ca820 100644
--- a/graphics/linux-libmng/Makefile
+++ b/graphics/linux-libmng/Makefile
@@ -7,12 +7,15 @@
 
 PORTNAME=		libmng
 PORTVERSION=		1.0.9
+PORTREVISION=		1
 CATEGORIES=		graphics linux
 DISTNAME=		${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=		michael@ranner.eu
 COMMENT=		RPM of libmng
 
+CONFLICTS=		linux-f8-libmng-[0-9]*
+
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	jpeg
 LINUX_DIST_VER=	4
diff --git a/graphics/linux-png/Makefile b/graphics/linux-png/Makefile
index 10c3d3261f2..1b18f7dd1a7 100644
--- a/graphics/linux-png/Makefile
+++ b/graphics/linux-png/Makefile
@@ -7,13 +7,15 @@
 
 PORTNAME=	png
 PORTVERSION=	1.2.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics linux
 DISTNAME=	libpng-${PORTVERSION}-2
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of the PNG lib
 
+CONFLICTS=	linux-f8-png-[0-9]*
+
 # no alpha rpm is available
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
diff --git a/graphics/linux-png10/Makefile b/graphics/linux-png10/Makefile
index d23671783b5..17ece16f058 100644
--- a/graphics/linux-png10/Makefile
+++ b/graphics/linux-png10/Makefile
@@ -7,12 +7,14 @@
 
 PORTNAME=	png
 PORTVERSION=	1.0.18
+PORTREVISION=	1
 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]*
 LATEST_LINK=	linux-png10
 
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/graphics/linux-sdl_image/Makefile b/graphics/linux-sdl_image/Makefile
index a80e82a4136..6aa0688b28f 100644
--- a/graphics/linux-sdl_image/Makefile
+++ b/graphics/linux-sdl_image/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	sdl_image
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_image/release/
 DISTNAME=	SDL_image-${PORTVERSION}-1
@@ -15,6 +16,8 @@ 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]*
+
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	sdl12
 INSTALL_SHLIB=	yes
diff --git a/graphics/linux-tiff/Makefile b/graphics/linux-tiff/Makefile
index 7c52ea33277..9e791da3a55 100644
--- a/graphics/linux-tiff/Makefile
+++ b/graphics/linux-tiff/Makefile
@@ -7,12 +7,15 @@
 
 PORTNAME=	tiff
 PORTVERSION=	3.7.1
+PORTREVISION=	1
 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]*
+
 ONLY_FOR_ARCHS=	amd64 i386
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	jpeg
diff --git a/graphics/linux-ungif/Makefile b/graphics/linux-ungif/Makefile
index 33f945001b8..35743e62486 100644
--- a/graphics/linux-ungif/Makefile
+++ b/graphics/linux-ungif/Makefile
@@ -6,13 +6,15 @@
 
 PORTNAME=	ungif
 PORTVERSION=	4.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 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]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_LINUX_RPM=	yes