. add CONFLICTS to linux-f8 infrastructure ports;

. bump PORTREVISIONs.

11 files changed, 33 insertions, 0 deletions

diff --git a/audio/linux-f10-mikmod/Makefile b/audio/linux-f10-mikmod/Makefile
index c2264a2706b8..690403fa1331 100644
--- a/audio/linux-f10-mikmod/Makefile
+++ b/audio/linux-f10-mikmod/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mikmod
 PORTVERSION=	3.2.2
+PORTREVISION=	1
 CATEGORIES=	audio linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	MikMod Sound Library (Linux Fedora 8)
 
+CONFLICTS=	linux-mikmod-[0-9]* linux-f10-mikmod-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	8
diff --git a/audio/linux-f8-alsa-lib/Makefile b/audio/linux-f8-alsa-lib/Makefile
index fba5ff03cef0..7c9d7620c6cd 100644
--- a/audio/linux-f8-alsa-lib/Makefile
+++ b/audio/linux-f8-alsa-lib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	alsa-lib
 PORTVERSION=	1.0.15
+PORTREVISION=	1
 CATEGORIES=	audio linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	The Advanced Linux Sound Architecture libraries (Linux Fedora 8)
 
+CONFLICTS=	linux-alsa-lib-[0-9]* linux-f10-alsa-lib-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	8
diff --git a/audio/linux-f8-arts/Makefile b/audio/linux-f8-arts/Makefile
index e1d8cd10b37b..994e7dace4eb 100644
--- a/audio/linux-f8-arts/Makefile
+++ b/audio/linux-f8-arts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		arts
 PORTVERSION=		1.5.10
+PORTREVISION=		1
 CATEGORIES=		audio kde linux
 PKGNAMEPREFIX=		linux-f8-
 DISTNAME=		${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=		${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=		emulation@FreeBSD.org
 COMMENT=		Audio system for the KDE integrated X11 desktop (Linux Fedora 8)
 
+CONFLICTS=		linux-arts-[0-9]* linux-f10-arts-[0-9]*
+
 ONLY_FOR_ARCHS=		i386 amd64
 USE_LINUX_RPM=		yes
 LINUX_DIST_VER=		8
diff --git a/audio/linux-f8-esound/Makefile b/audio/linux-f8-esound/Makefile
index 75e0234b1e02..330f8957d0b0 100644
--- a/audio/linux-f8-esound/Makefile
+++ b/audio/linux-f8-esound/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	esound
 PORTVERSION=	0.2.38
+PORTREVISION=	1
 CATEGORIES=	audio 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 esound (Linux Fedora 8)
 
+CONFLICTS=	linux-esound-[0-9]* linux-f10-esound-[0-9]*
+
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	libaudiofile
 LINUX_NAME=	${PORTNAME}-libs
diff --git a/audio/linux-f8-freealut/Makefile b/audio/linux-f8-freealut/Makefile
index 2f34db720696..6ad4b2a6c164 100644
--- a/audio/linux-f8-freealut/Makefile
+++ b/audio/linux-f8-freealut/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freealut
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	audio linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	A free implementation of OpenAL's ALUT standard (Linux Fedora 8)
 
+CONFLICTS=	linux-freealut-[0-9]* linux-f10-freealut-[0-9]*
+
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	openal
 LINUX_DIST_VER=	8
diff --git a/audio/linux-f8-libaudiofile/Makefile b/audio/linux-f8-libaudiofile/Makefile
index ec3405afa6fe..db9134f2ec0d 100644
--- a/audio/linux-f8-libaudiofile/Makefile
+++ b/audio/linux-f8-libaudiofile/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lib${LINUX_NAME}
 PORTVERSION=	0.2.6
+PORTREVISION=	1
 CATEGORIES=	audio linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	An implementation of the Audio File Library from SGI (Linux Fedora 8)
 
+CONFLICTS=	linux-libaudiofile-[0-9]* linux-f10-libaudiofile-[0-9]*
+
 USE_LINUX_RPM=	yes
 LINUX_NAME=	audiofile
 LINUX_DIST_VER=	8
diff --git a/audio/linux-f8-libogg/Makefile b/audio/linux-f8-libogg/Makefile
index e8f42ea170f8..a7f623a6dd75 100644
--- a/audio/linux-f8-libogg/Makefile
+++ b/audio/linux-f8-libogg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libogg
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	audio linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Ogg bitstream library (Linux Fedora 8)
 
+CONFLICTS=	linux-libogg-[0-9]* linux-f10-libogg-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	8
diff --git a/audio/linux-f8-libvorbis/Makefile b/audio/linux-f8-libvorbis/Makefile
index aca7ea357170..eade27848e90 100644
--- a/audio/linux-f8-libvorbis/Makefile
+++ b/audio/linux-f8-libvorbis/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libvorbis
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	audio linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Audio compression codec library (Linux Fedora 8)
 
+CONFLICTS=	linux-libvorbis-[0-9]* linux-f10-libvorbis-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	libogg
diff --git a/audio/linux-f8-mikmod/Makefile b/audio/linux-f8-mikmod/Makefile
index c2264a2706b8..690403fa1331 100644
--- a/audio/linux-f8-mikmod/Makefile
+++ b/audio/linux-f8-mikmod/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mikmod
 PORTVERSION=	3.2.2
+PORTREVISION=	1
 CATEGORIES=	audio linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	MikMod Sound Library (Linux Fedora 8)
 
+CONFLICTS=	linux-mikmod-[0-9]* linux-f10-mikmod-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	8
diff --git a/audio/linux-f8-openal/Makefile b/audio/linux-f8-openal/Makefile
index 42f2687f0262..51422830e085 100644
--- a/audio/linux-f8-openal/Makefile
+++ b/audio/linux-f8-openal/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openal
 PORTVERSION=	0.0.9
+PORTREVISION=	1
 CATEGORIES=	audio linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	A 3D positional spatialized sound library (Linux Fedora 8)
 
+CONFLICTS=	linux-openal-[0-9]* linux-f10-openal-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	alsalib arts esound libaudiofile libvorbis sdl12
diff --git a/audio/linux-f8-sdl_mixer/Makefile b/audio/linux-f8-sdl_mixer/Makefile
index 4019dc86798c..bced6cd9e832 100644
--- a/audio/linux-f8-sdl_mixer/Makefile
+++ b/audio/linux-f8-sdl_mixer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdl_mixer
 PORTVERSION=	1.2.8
+PORTREVISION=	1
 CATEGORIES=	audio linux
 PKGNAMEPREFIX=	linux-f8-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	A sample multi-channel audio mixer library (Linux Fedora 8)
 
+CONFLICTS=	linux-sdl_mixer-[0-9]* linux-f10-sdl_mixer-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	sdl12