10 files changed, 31 insertions, 4 deletions

diff --git a/audio/linux-alsa-lib/Makefile b/audio/linux-alsa-lib/Makefile
index 800b6414793f..2968147ce766 100644
--- a/audio/linux-alsa-lib/Makefile
+++ b/audio/linux-alsa-lib/Makefile
@@ -7,12 +7,15 @@
 
 PORTNAME=	alsa-lib
 DISTVERSION=	1.0.10-3
+PORTREVISION=	1
 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]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
diff --git a/audio/linux-arts/Makefile b/audio/linux-arts/Makefile
index 8835f0917b60..a2f0ff815b1c 100644
--- a/audio/linux-arts/Makefile
+++ b/audio/linux-arts/Makefile
@@ -7,11 +7,14 @@
 
 PORTNAME=		arts
 DISTVERSION=		1.5.3-0.1.fc4
+PORTREVISION=		1
 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]*
+
 ONLY_FOR_ARCHS=		i386 amd64
 USE_LINUX_RPM=		yes
 LINUX_DIST_VER=		4
diff --git a/audio/linux-esound/Makefile b/audio/linux-esound/Makefile
index 9e9ab0cb8c8f..511a2a143e9e 100644
--- a/audio/linux-esound/Makefile
+++ b/audio/linux-esound/Makefile
@@ -6,13 +6,16 @@
 #
 
 PORTNAME=	esound
-CATEGORIES=	audio linux
 PORTVERSION=	0.2.36
+PORTREVISION=	1
+CATEGORIES=	audio linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-0.fc4.1
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of esound
 
+CONFLICTS=	linux-f8-esound-[0-9]*
+
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	libaudiofile
 LINUX_DIST_VER=	4
diff --git a/audio/linux-freealut/Makefile b/audio/linux-freealut/Makefile
index 93d47290414b..5285867a2e5b 100644
--- a/audio/linux-freealut/Makefile
+++ b/audio/linux-freealut/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freealut
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	audio linux
 MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.fc${LINUX_DIST_VER}
@@ -14,6 +15,8 @@ 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]*
+
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	openal
 LINUX_DIST_VER=	4
diff --git a/audio/linux-libaudiofile/Makefile b/audio/linux-libaudiofile/Makefile
index afcbcbf7e445..eb0daef4e309 100644
--- a/audio/linux-libaudiofile/Makefile
+++ b/audio/linux-libaudiofile/Makefile
@@ -7,13 +7,15 @@
 
 PORTNAME=	libaudiofile
 PORTVERSION=	0.2.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio linux
 DISTNAME=	audiofile-${PORTVERSION}-2
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of audiofile
 
+CONFLICTS=	linux-f8-libaudiofile-[0-9]*
+
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
 USE_LDCONFIG=	yes
diff --git a/audio/linux-libogg/Makefile b/audio/linux-libogg/Makefile
index 9f33fefbaa61..4c1596c16b2f 100644
--- a/audio/linux-libogg/Makefile
+++ b/audio/linux-libogg/Makefile
@@ -7,12 +7,14 @@
 
 PORTNAME=	libogg
 DISTVERSION=	1.1.2-2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio linux
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ogg bitstream library (Linux version)
 
+CONFLICTS=	linux-f8-libogg-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
diff --git a/audio/linux-libvorbis/Makefile b/audio/linux-libvorbis/Makefile
index e21ca9b52cf8..e45d2f6cf9a0 100644
--- a/audio/linux-libvorbis/Makefile
+++ b/audio/linux-libvorbis/Makefile
@@ -7,11 +7,14 @@
 
 PORTNAME=	libvorbis
 DISTVERSION=	1.1.0-2
+PORTREVISION=	1
 CATEGORIES=	audio linux
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Audio compression codec library (Linux version)
 
+CONFLICTS=	linux-f8-libvorbis-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	libogg
diff --git a/audio/linux-mikmod/Makefile b/audio/linux-mikmod/Makefile
index 230e13109c71..eaf17343d15d 100644
--- a/audio/linux-mikmod/Makefile
+++ b/audio/linux-mikmod/Makefile
@@ -7,12 +7,15 @@
 
 PORTNAME=	mikmod
 DISTVERSION=	3.1.6
+PORTREVISION=	1
 CATEGORIES=	audio linux
 DISTNAME=	${PORTNAME}-${PORTVERSION}-34
 
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	MikMod Sound Library (Linux version)
 
+CONFLICTS=	linux-f8-mikmod-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
diff --git a/audio/linux-openal/Makefile b/audio/linux-openal/Makefile
index 850736b2b4da..5c493f68c0a8 100644
--- a/audio/linux-openal/Makefile
+++ b/audio/linux-openal/Makefile
@@ -6,14 +6,16 @@
 #
 
 PORTNAME=	openal
-PORTREVISION=	1
 DISTVERSION=	0.0.9-0.6.20060204cvs.fc4
+PORTREVISION=	2
 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]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	alsalib arts esound libaudiofile libvorbis sdl12
diff --git a/audio/linux-sdl_mixer/Makefile b/audio/linux-sdl_mixer/Makefile
index 8a21370a5e18..0999570e80c5 100644
--- a/audio/linux-sdl_mixer/Makefile
+++ b/audio/linux-sdl_mixer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdl_mixer
 DISTVERSION=	1.2.6
+PORTREVISION=	1
 CATEGORIES=	audio linux
 MASTER_SITE_SUBDIR=	../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
 DISTNAME=	SDL_mixer-${PORTVERSION}-3.fc${LINUX_DIST_VER}
@@ -14,6 +15,8 @@ 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]*
+
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	sdl12