Here are new Linux Fedora 10 infrastructure ports.

Those ports are intended to be used with 8-CURRENT at least
with SVN r192206.

If you want to switch to linux-f10 ports, please define at /etc/make.conf:
  OVERRIDE_LINUX_BASE_PORT=f10
  OVERRIDE_LINUX_NONBASE_PORTS=f10

An upgrading procedure is shown at /usr/ports/UPDATING, entries 20090401
and 20070327.

For the first time all tested linux ports work as expected(!):
. acroread8;
. google-earth;
. skype;
. seamonkey.

Many thanks for kernel folks who really did the main work
(and I wrote only some lines of ports).

There is a good chance that those ports may become a default
for 8.0-RELEASE. Please, test and report back to emulation@ ML.

20 files changed, 222 insertions, 193 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 040338e9ecaf..d1e5c68c0cb4 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -391,6 +391,15 @@
     SUBDIR += linux-alsa-lib
     SUBDIR += linux-arts
     SUBDIR += linux-esound
+    SUBDIR += linux-f10-alsa-lib
+    SUBDIR += linux-f10-arts
+    SUBDIR += linux-f10-esound
+    SUBDIR += linux-f10-freealut
+    SUBDIR += linux-f10-libaudiofile
+    SUBDIR += linux-f10-libogg
+    SUBDIR += linux-f10-libvorbis
+    SUBDIR += linux-f10-openal
+    SUBDIR += linux-f10-sdl_mixer
     SUBDIR += linux-f8-alsa-lib
     SUBDIR += linux-f8-arts
     SUBDIR += linux-f8-esound
diff --git a/audio/linux-f10-alsa-lib/Makefile b/audio/linux-f10-alsa-lib/Makefile
index fba5ff03cef0..1a3bf16257cd 100644
--- a/audio/linux-f10-alsa-lib/Makefile
+++ b/audio/linux-f10-alsa-lib/Makefile
@@ -1,23 +1,25 @@
-# New ports collection makefile for:	audio/linux-f8-alsa-lib
-# Date created:				2008-04-03
+# New ports collection makefile for:	audio/linux-f10-alsa-lib
+# Date created:				2009-05-03
 # Whom:					bsam
 #
 # $FreeBSD$
 #
 
 PORTNAME=	alsa-lib
-PORTVERSION=	1.0.15
+PORTVERSION=	1.0.19
 CATEGORIES=	audio linux
-PKGNAMEPREFIX=	linux-f8-
+PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	The Advanced Linux Sound Architecture libraries (Linux Fedora 8)
+COMMENT=	The Advanced Linux Sound Architecture libraries (Linux Fedora 10)
+
+CONFLICTS=	linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
-LINUX_DIST_VER=	8
-RPMVERSION=	1.fc8
+LINUX_DIST_VER=	10
+RPMVERSION=	2.fc10
 BRANDELF_FILES=	usr/bin/aserver
 USE_LDCONFIG=	yes
 
diff --git a/audio/linux-f10-alsa-lib/distinfo.i386 b/audio/linux-f10-alsa-lib/distinfo.i386
index db0a02de9009..48818f43a81a 100644
--- a/audio/linux-f10-alsa-lib/distinfo.i386
+++ b/audio/linux-f10-alsa-lib/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/8/alsa-lib-1.0.15-1.fc8.i386.rpm) = 0fd6410da033214c24b0730f56b60ad6
-SHA256 (rpm/i386/fedora/8/alsa-lib-1.0.15-1.fc8.i386.rpm) = cea0a7664ec405bd37ed20e1dad28046bf016478fd74f3427d65447db32ad479
-SIZE (rpm/i386/fedora/8/alsa-lib-1.0.15-1.fc8.i386.rpm) = 417654
-MD5 (rpm/i386/fedora/8/alsa-lib-1.0.15-1.fc8.src.rpm) = ea4ba36f0a87b06239582e088a008737
-SHA256 (rpm/i386/fedora/8/alsa-lib-1.0.15-1.fc8.src.rpm) = 53f85b02352c1d542a9b26ba19907367865d69826a918f0bc1b476bd9a02e98f
-SIZE (rpm/i386/fedora/8/alsa-lib-1.0.15-1.fc8.src.rpm) = 807353
+MD5 (rpm/i386/fedora/10/alsa-lib-1.0.19-2.fc10.i386.rpm) = 24e6f8586ad12666338588cad653e125
+SHA256 (rpm/i386/fedora/10/alsa-lib-1.0.19-2.fc10.i386.rpm) = 35fdfd63df29d3c145441af0bd6d843bd964a6e664f071fd9f0d3c7b3903d586
+SIZE (rpm/i386/fedora/10/alsa-lib-1.0.19-2.fc10.i386.rpm) = 420839
+MD5 (rpm/i386/fedora/10/alsa-lib-1.0.19-2.fc10.src.rpm) = 78a96a612537ab809dfe45cf49c5a334
+SHA256 (rpm/i386/fedora/10/alsa-lib-1.0.19-2.fc10.src.rpm) = 1ed500f0f3ff2c7fdf0b7cee2d7e4baa6da65414a7bdf7f28a02de7cd6dbea8c
+SIZE (rpm/i386/fedora/10/alsa-lib-1.0.19-2.fc10.src.rpm) = 808626
diff --git a/audio/linux-f10-alsa-lib/pkg-plist b/audio/linux-f10-alsa-lib/pkg-plist
index 5af553c132d1..aa606367b3a9 100644
--- a/audio/linux-f10-alsa-lib/pkg-plist
+++ b/audio/linux-f10-alsa-lib/pkg-plist
@@ -1,76 +1,5 @@
 @comment file listing
-etc/alsa/alsa.conf
-etc/alsa/cards/AACI.conf
-etc/alsa/cards/ATIIXP-MODEM.conf
-etc/alsa/cards/ATIIXP-SPDMA.conf
-etc/alsa/cards/ATIIXP.conf
-etc/alsa/cards/AU8810.conf
-etc/alsa/cards/AU8820.conf
-etc/alsa/cards/AU8830.conf
-etc/alsa/cards/Audigy.conf
-etc/alsa/cards/Audigy2.conf
-etc/alsa/cards/Aureon51.conf
-etc/alsa/cards/Aureon71.conf
-etc/alsa/cards/CA0106.conf
-etc/alsa/cards/CMI8338-SWIEC.conf
-etc/alsa/cards/CMI8338.conf
-etc/alsa/cards/CMI8738-MC6.conf
-etc/alsa/cards/CMI8738-MC8.conf
-etc/alsa/cards/CMI8788.conf
-etc/alsa/cards/CS46xx.conf
-etc/alsa/cards/EMU10K1.conf
-etc/alsa/cards/EMU10K1X.conf
-etc/alsa/cards/ENS1370.conf
-etc/alsa/cards/ENS1371.conf
-etc/alsa/cards/ES1968.conf
-etc/alsa/cards/FM801.conf
-etc/alsa/cards/GUS.conf
-etc/alsa/cards/HDA-Intel.conf
-etc/alsa/cards/ICE1712.conf
-etc/alsa/cards/ICE1724.conf
-etc/alsa/cards/ICH-MODEM.conf
-etc/alsa/cards/ICH.conf
-etc/alsa/cards/ICH4.conf
-etc/alsa/cards/Maestro3.conf
-etc/alsa/cards/NFORCE.conf
-etc/alsa/cards/PC-Speaker.conf
-etc/alsa/cards/PMac.conf
-etc/alsa/cards/PMacToonie.conf
-etc/alsa/cards/PS3.conf
-etc/alsa/cards/RME9636.conf
-etc/alsa/cards/RME9652.conf
-etc/alsa/cards/SI7018.conf
-etc/alsa/cards/SI7018/sndoc-mixer.alisp
-etc/alsa/cards/SI7018/sndop-mixer.alisp
-etc/alsa/cards/TRID4DWAVENX.conf
-etc/alsa/cards/USB-Audio.conf
-etc/alsa/cards/VIA686A.conf
-etc/alsa/cards/VIA8233.conf
-etc/alsa/cards/VIA8233A.conf
-etc/alsa/cards/VIA8237.conf
-etc/alsa/cards/VX222.conf
-etc/alsa/cards/VXPocket.conf
-etc/alsa/cards/VXPocket440.conf
-etc/alsa/cards/YMF744.conf
-etc/alsa/cards/aliases.alisp
-etc/alsa/cards/aliases.conf
-etc/alsa/pcm/center_lfe.conf
-etc/alsa/pcm/default.conf
-etc/alsa/pcm/dmix.conf
-etc/alsa/pcm/dpl.conf
-etc/alsa/pcm/dsnoop.conf
-etc/alsa/pcm/front.conf
-etc/alsa/pcm/iec958.conf
-etc/alsa/pcm/modem.conf
-etc/alsa/pcm/rear.conf
-etc/alsa/pcm/side.conf
-etc/alsa/pcm/surround40.conf
-etc/alsa/pcm/surround41.conf
-etc/alsa/pcm/surround50.conf
-etc/alsa/pcm/surround51.conf
-etc/alsa/pcm/surround71.conf
-etc/alsa/smixer.conf
-etc/alsa/sndo-mixer.alisp
+etc/asound.conf
 lib/libasound.so.2
 lib/libasound.so.2.0.0
 usr/bin/aserver
@@ -80,15 +9,88 @@ usr/lib/alsa-lib/smixer/smixer-hda.la
 usr/lib/alsa-lib/smixer/smixer-hda.so
 usr/lib/alsa-lib/smixer/smixer-sbase.la
 usr/lib/alsa-lib/smixer/smixer-sbase.so
-usr/share/doc/alsa-lib-1.0.15/COPYING
-usr/share/doc/alsa-lib-1.0.15/ChangeLog
-usr/share/doc/alsa-lib-1.0.15/TODO
-usr/share/doc/alsa-lib-1.0.15/asoundrc.txt
+usr/share/alsa/alsa.conf
+usr/share/alsa/cards/AACI.conf
+usr/share/alsa/cards/ATIIXP-MODEM.conf
+usr/share/alsa/cards/ATIIXP-SPDMA.conf
+usr/share/alsa/cards/ATIIXP.conf
+usr/share/alsa/cards/AU8810.conf
+usr/share/alsa/cards/AU8820.conf
+usr/share/alsa/cards/AU8830.conf
+usr/share/alsa/cards/Audigy.conf
+usr/share/alsa/cards/Audigy2.conf
+usr/share/alsa/cards/Aureon51.conf
+usr/share/alsa/cards/Aureon71.conf
+usr/share/alsa/cards/CA0106.conf
+usr/share/alsa/cards/CMI8338-SWIEC.conf
+usr/share/alsa/cards/CMI8338.conf
+usr/share/alsa/cards/CMI8738-MC6.conf
+usr/share/alsa/cards/CMI8738-MC8.conf
+usr/share/alsa/cards/CMI8788.conf
+usr/share/alsa/cards/CS46xx.conf
+usr/share/alsa/cards/EMU10K1.conf
+usr/share/alsa/cards/EMU10K1X.conf
+usr/share/alsa/cards/ENS1370.conf
+usr/share/alsa/cards/ENS1371.conf
+usr/share/alsa/cards/ES1968.conf
+usr/share/alsa/cards/FM801.conf
+usr/share/alsa/cards/GUS.conf
+usr/share/alsa/cards/HDA-Intel.conf
+usr/share/alsa/cards/ICE1712.conf
+usr/share/alsa/cards/ICE1724.conf
+usr/share/alsa/cards/ICH-MODEM.conf
+usr/share/alsa/cards/ICH.conf
+usr/share/alsa/cards/ICH4.conf
+usr/share/alsa/cards/Maestro3.conf
+usr/share/alsa/cards/NFORCE.conf
+usr/share/alsa/cards/PC-Speaker.conf
+usr/share/alsa/cards/PMac.conf
+usr/share/alsa/cards/PMacToonie.conf
+usr/share/alsa/cards/PS3.conf
+usr/share/alsa/cards/RME9636.conf
+usr/share/alsa/cards/RME9652.conf
+usr/share/alsa/cards/SI7018.conf
+usr/share/alsa/cards/SI7018/sndoc-mixer.alisp
+usr/share/alsa/cards/SI7018/sndop-mixer.alisp
+usr/share/alsa/cards/TRID4DWAVENX.conf
+usr/share/alsa/cards/USB-Audio.conf
+usr/share/alsa/cards/VIA686A.conf
+usr/share/alsa/cards/VIA8233.conf
+usr/share/alsa/cards/VIA8233A.conf
+usr/share/alsa/cards/VIA8237.conf
+usr/share/alsa/cards/VX222.conf
+usr/share/alsa/cards/VXPocket.conf
+usr/share/alsa/cards/VXPocket440.conf
+usr/share/alsa/cards/YMF744.conf
+usr/share/alsa/cards/aliases.alisp
+usr/share/alsa/cards/aliases.conf
+usr/share/alsa/pcm/center_lfe.conf
+usr/share/alsa/pcm/default.conf
+usr/share/alsa/pcm/dmix.conf
+usr/share/alsa/pcm/dpl.conf
+usr/share/alsa/pcm/dsnoop.conf
+usr/share/alsa/pcm/front.conf
+usr/share/alsa/pcm/hdmi.conf
+usr/share/alsa/pcm/iec958.conf
+usr/share/alsa/pcm/modem.conf
+usr/share/alsa/pcm/rear.conf
+usr/share/alsa/pcm/side.conf
+usr/share/alsa/pcm/surround40.conf
+usr/share/alsa/pcm/surround41.conf
+usr/share/alsa/pcm/surround50.conf
+usr/share/alsa/pcm/surround51.conf
+usr/share/alsa/pcm/surround71.conf
+usr/share/alsa/smixer.conf
+usr/share/alsa/sndo-mixer.alisp
+usr/share/doc/alsa-lib-1.0.19/COPYING
+usr/share/doc/alsa-lib-1.0.19/ChangeLog
+usr/share/doc/alsa-lib-1.0.19/TODO
+usr/share/doc/alsa-lib-1.0.19/asoundrc.txt
 @comment non-empty directory listing in revers order
-@dirrm usr/share/doc/alsa-lib-1.0.15
+@dirrm usr/share/doc/alsa-lib-1.0.19
+@dirrm usr/share/alsa/pcm
+@dirrm usr/share/alsa/cards/SI7018
+@dirrm usr/share/alsa/cards
+@dirrm usr/share/alsa
 @dirrm usr/lib/alsa-lib/smixer
 @dirrm usr/lib/alsa-lib
-@dirrm etc/alsa/pcm
-@dirrm etc/alsa/cards/SI7018
-@dirrm etc/alsa/cards
-@dirrm etc/alsa
diff --git a/audio/linux-f10-arts/Makefile b/audio/linux-f10-arts/Makefile
index e1d8cd10b37b..f1b8fd6cca84 100644
--- a/audio/linux-f10-arts/Makefile
+++ b/audio/linux-f10-arts/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for:	audio/linux-f8-arts
-# Date created:				2008-04-03
+# New ports collection makefile for:	audio/linux-f10-arts
+# Date created:				2009-05-03
 # Whom:					bsam
 #
 # $FreeBSD$
@@ -8,16 +8,18 @@
 PORTNAME=		arts
 PORTVERSION=		1.5.10
 CATEGORIES=		audio kde linux
-PKGNAMEPREFIX=		linux-f8-
+PKGNAMEPREFIX=		linux-f10-
 DISTNAME=		${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=		emulation@FreeBSD.org
-COMMENT=		Audio system for the KDE integrated X11 desktop (Linux Fedora 8)
+COMMENT=		Audio system for the KDE integrated X11 desktop (Linux Fedora 10)
+
+CONFLICTS=		linux-arts-[0-9]* linux-f8-arts-[0-9]*
 
 ONLY_FOR_ARCHS=		i386 amd64
 USE_LINUX_RPM=		yes
-LINUX_DIST_VER=		8
-RPMVERSION=		1.fc8.1
+LINUX_DIST_VER=		10
+RPMVERSION=		1.fc10
 BRANDELF_DIRS=		usr/bin
 USE_LDCONFIG=		yes
 DESCR=			${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/audio/linux-f10-arts/distinfo.i386 b/audio/linux-f10-arts/distinfo.i386
index 3e4d79e337bf..d17d7db6e489 100644
--- a/audio/linux-f10-arts/distinfo.i386
+++ b/audio/linux-f10-arts/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/8/arts-1.5.10-1.fc8.1.i386.rpm) = 829830996c25472c6d043cebdb9c0f48
-SHA256 (rpm/i386/fedora/8/arts-1.5.10-1.fc8.1.i386.rpm) = 85d377481b314b06e2e1e772ef7eef33572767502a0a32ffa973d330b74f6ed1
-SIZE (rpm/i386/fedora/8/arts-1.5.10-1.fc8.1.i386.rpm) = 1208874
-MD5 (rpm/i386/fedora/8/arts-1.5.10-1.fc8.1.src.rpm) = b9f9a367c363842c6cce2a974b7c88c8
-SHA256 (rpm/i386/fedora/8/arts-1.5.10-1.fc8.1.src.rpm) = 430849a77803ffc1cec43117fc312835b5c975a335dbca6fd441beb57ceb1eb0
-SIZE (rpm/i386/fedora/8/arts-1.5.10-1.fc8.1.src.rpm) = 992572
+MD5 (rpm/i386/fedora/10/arts-1.5.10-1.fc10.i386.rpm) = f193bb2790139f6852b2a660a06590ee
+SHA256 (rpm/i386/fedora/10/arts-1.5.10-1.fc10.i386.rpm) = b9aa1790dc69d19b415c994de594078ff06b4524379c4d09a8ac9906e4518840
+SIZE (rpm/i386/fedora/10/arts-1.5.10-1.fc10.i386.rpm) = 1181344
+MD5 (rpm/i386/fedora/10/arts-1.5.10-1.fc10.src.rpm) = f015b72046736686f3d1f7bcdf879aa7
+SHA256 (rpm/i386/fedora/10/arts-1.5.10-1.fc10.src.rpm) = 204f6ad4e375a57115d8b15a1b609a9c752fdfedb6ca586f18569bf1ec401493
+SIZE (rpm/i386/fedora/10/arts-1.5.10-1.fc10.src.rpm) = 992344
diff --git a/audio/linux-f10-esound/Makefile b/audio/linux-f10-esound/Makefile
index 75e0234b1e02..d14625d1d2b6 100644
--- a/audio/linux-f10-esound/Makefile
+++ b/audio/linux-f10-esound/Makefile
@@ -1,29 +1,31 @@
-# New ports collection makefile for:	audio/linux-f8-esound
-# Date created:				2008-04-03
+# New ports collection makefile for:	audio/linux-f10-esound
+# Date created:				2009-05-03
 # Whom:					bsam
 #
 # $FreeBSD$
 #
 
 PORTNAME=	esound
-PORTVERSION=	0.2.38
+PORTVERSION=	0.2.41
 CATEGORIES=	audio linux
-PKGNAMEPREFIX=	linux-f8-
+PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
-COMMENT=	RPM of esound (Linux Fedora 8)
+COMMENT=	RPM of esound (Linux Fedora 10)
+
+CONFLICTS=	linux-esound-[0-9]* linux-f8-esound-[0-9]*
 
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	libaudiofile
 LINUX_NAME=	${PORTNAME}-libs
-LINUX_DIST_VER=	8
-RPMVERSION=	6.fc8
+LINUX_DIST_VER=	10
+RPMVERSION=	1.fc10
 USE_LDCONFIG=	yes
 SRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
 
-PLIST_FILES=	etc/esd.conf usr/lib/libesd.so.0 usr/lib/libesd.so.0.2.38 \
-		usr/lib/libesddsp.so.0 usr/lib/libesddsp.so.0.2.38
+PLIST_FILES=	etc/esd.conf usr/lib/libesd.so.0 usr/lib/libesd.so.0.2.39 \
+		usr/lib/libesddsp.so.0 usr/lib/libesddsp.so.0.2.39
 DOCSDIR=	${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING.LIB ChangeLog NEWS README TIPS TODO esound.sgml
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/audio/linux-f10-esound/distinfo.i386 b/audio/linux-f10-esound/distinfo.i386
index 36e369d5007e..bb47a2184dc8 100644
--- a/audio/linux-f10-esound/distinfo.i386
+++ b/audio/linux-f10-esound/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/8/esound-libs-0.2.38-6.fc8.i386.rpm) = e80aad552a50e5ce6a76da90e5b5fd8f
-SHA256 (rpm/i386/fedora/8/esound-libs-0.2.38-6.fc8.i386.rpm) = e4cddc393e020bc539986dfb00739a7fe76e318a235eebf70ea608351897be26
-SIZE (rpm/i386/fedora/8/esound-libs-0.2.38-6.fc8.i386.rpm) = 75064
-MD5 (rpm/i386/fedora/8/esound-0.2.38-6.fc8.src.rpm) = 1e3bcbf0accc5a9e007181eacc40ce52
-SHA256 (rpm/i386/fedora/8/esound-0.2.38-6.fc8.src.rpm) = 382d46ed3aa282f092788da177569fc0977528720daa07aca100551134eea252
-SIZE (rpm/i386/fedora/8/esound-0.2.38-6.fc8.src.rpm) = 530950
+MD5 (rpm/i386/fedora/10/esound-libs-0.2.41-1.fc10.i386.rpm) = 7392200de0259cc2265ae6025f5c3490
+SHA256 (rpm/i386/fedora/10/esound-libs-0.2.41-1.fc10.i386.rpm) = dff6c1b8039d73ab4a6a229857bc44fd8369045e92dc968f0e9e78eaf681b3c5
+SIZE (rpm/i386/fedora/10/esound-libs-0.2.41-1.fc10.i386.rpm) = 79414
+MD5 (rpm/i386/fedora/10/esound-0.2.41-1.fc10.src.rpm) = f8f0bea3cfed4a5e66e8055b25752a96
+SHA256 (rpm/i386/fedora/10/esound-0.2.41-1.fc10.src.rpm) = 23db7226f67c76c8984c7f87ed29381d314c4275e938ef152d960fbdda509eef
+SIZE (rpm/i386/fedora/10/esound-0.2.41-1.fc10.src.rpm) = 410229
diff --git a/audio/linux-f10-freealut/Makefile b/audio/linux-f10-freealut/Makefile
index 2f34db720696..a654132935cd 100644
--- a/audio/linux-f10-freealut/Makefile
+++ b/audio/linux-f10-freealut/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for:	audio/linux-f8-freealut
-# Date created:				2008-04-03
+# New ports collection makefile for:	audio/linux-f10-freealut
+# Date created:				2009-05-03
 # Whom:					bsam
 #
 # $FreeBSD$
@@ -8,16 +8,18 @@
 PORTNAME=	freealut
 PORTVERSION=	1.1.0
 CATEGORIES=	audio linux
-PKGNAMEPREFIX=	linux-f8-
+PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	A free implementation of OpenAL's ALUT standard (Linux Fedora 8)
+COMMENT=	A free implementation of OpenAL's ALUT standard (Linux Fedora 10)
+
+CONFLICTS=	linux-freealut-[0-9]* linux-f8-freealut-[0-9]*
 
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	openal
-LINUX_DIST_VER=	8
-RPMVERSION=	5.fc8
+LINUX_DIST_VER=	10
+RPMVERSION=	6.fc9
 USE_LDCONFIG=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/audio/linux-f10-freealut/distinfo.i386 b/audio/linux-f10-freealut/distinfo.i386
index bcc088e88b78..b7d746e83c2e 100644
--- a/audio/linux-f10-freealut/distinfo.i386
+++ b/audio/linux-f10-freealut/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/8/freealut-1.1.0-5.fc8.i386.rpm) = 2ed8e10047cee7d7bb413be2a5bd6054
-SHA256 (rpm/i386/fedora/8/freealut-1.1.0-5.fc8.i386.rpm) = bdd412c4e1b5dc2c98d4981a33876929e43aeeeb334d42ce700d0d10aed6c512
-SIZE (rpm/i386/fedora/8/freealut-1.1.0-5.fc8.i386.rpm) = 41578
-MD5 (rpm/i386/fedora/8/freealut-1.1.0-5.fc8.src.rpm) = ec73a68fcdf5dafb362149424868cf24
-SHA256 (rpm/i386/fedora/8/freealut-1.1.0-5.fc8.src.rpm) = 509ac6548eb71a0db8bf9b504187aaecefcda868edfe1d56051a08d86df05388
-SIZE (rpm/i386/fedora/8/freealut-1.1.0-5.fc8.src.rpm) = 465764
+MD5 (rpm/i386/fedora/10/freealut-1.1.0-6.fc9.i386.rpm) = a8eee64c52c346da55b877f8bfb07431
+SHA256 (rpm/i386/fedora/10/freealut-1.1.0-6.fc9.i386.rpm) = 98d2f6b77422692a98996e3e6459a8dcd0a86ea95734c1c2f76fc41acf906a4e
+SIZE (rpm/i386/fedora/10/freealut-1.1.0-6.fc9.i386.rpm) = 41661
+MD5 (rpm/i386/fedora/10/freealut-1.1.0-6.fc9.src.rpm) = 1257174caff56df4ad844ed31587eef5
+SHA256 (rpm/i386/fedora/10/freealut-1.1.0-6.fc9.src.rpm) = 568cba6b336e4110e8abd49ba4e5a494b1968b36255903554478c9f0bf144dc7
+SIZE (rpm/i386/fedora/10/freealut-1.1.0-6.fc9.src.rpm) = 465932
diff --git a/audio/linux-f10-libaudiofile/Makefile b/audio/linux-f10-libaudiofile/Makefile
index ec3405afa6fe..61b88c1d7bdc 100644
--- a/audio/linux-f10-libaudiofile/Makefile
+++ b/audio/linux-f10-libaudiofile/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for:	audio/linux-f8-libaudiofile
-# Date created:				2008-04-03
+# New ports collection makefile for:	audio/linux-f10-libaudiofile
+# Date created:				2009-05-03
 # Whom:					bsam
 #
 # $FreeBSD$
@@ -8,16 +8,18 @@
 PORTNAME=	lib${LINUX_NAME}
 PORTVERSION=	0.2.6
 CATEGORIES=	audio linux
-PKGNAMEPREFIX=	linux-f8-
+PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
-COMMENT=	An implementation of the Audio File Library from SGI (Linux Fedora 8)
+COMMENT=	An implementation of the Audio File Library from SGI (Linux Fedora 10)
+
+CONTFLICTS=	linux-libaudiofile-[0-9]* linux-f8-libaudiofile-[0-9]*
 
 USE_LINUX_RPM=	yes
 LINUX_NAME=	audiofile
-LINUX_DIST_VER=	8
-RPMVERSION=	7.fc8
+LINUX_DIST_VER=	10
+RPMVERSION=	9.fc10
 BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
 PLIST=		pkg-plist.${LINUX_RPM_ARCH}
diff --git a/audio/linux-f10-libaudiofile/distinfo.i386 b/audio/linux-f10-libaudiofile/distinfo.i386
index 256e7c72833b..942d3a5759d3 100644
--- a/audio/linux-f10-libaudiofile/distinfo.i386
+++ b/audio/linux-f10-libaudiofile/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/8/audiofile-0.2.6-7.fc8.i386.rpm) = cac74bde19f64db48a4d4ed3ecd8516e
-SHA256 (rpm/i386/fedora/8/audiofile-0.2.6-7.fc8.i386.rpm) = 28b0a9998b1f097fde57f177383cfec3347f4d299b38c14a5eb5c87707493c68
-SIZE (rpm/i386/fedora/8/audiofile-0.2.6-7.fc8.i386.rpm) = 109995
-MD5 (rpm/i386/fedora/8/audiofile-0.2.6-7.fc8.src.rpm) = 2f214f8e90f34b55bdbc00657bee645b
-SHA256 (rpm/i386/fedora/8/audiofile-0.2.6-7.fc8.src.rpm) = 935ae4d929767191888e92d895b0f159d80aaafb5b002c01b7feda97e8dea7eb
-SIZE (rpm/i386/fedora/8/audiofile-0.2.6-7.fc8.src.rpm) = 290076
+MD5 (rpm/i386/fedora/10/audiofile-0.2.6-9.fc10.i386.rpm) = 548a964239b99954cab2fc3e2bf06b2d
+SHA256 (rpm/i386/fedora/10/audiofile-0.2.6-9.fc10.i386.rpm) = 5c89d3a12cc15e3357961389a46ded0650e194e86c8f78e01383e4b23967d868
+SIZE (rpm/i386/fedora/10/audiofile-0.2.6-9.fc10.i386.rpm) = 105138
+MD5 (rpm/i386/fedora/10/audiofile-0.2.6-9.fc10.src.rpm) = bac7472f519ed534684bfe6e1f58db9f
+SHA256 (rpm/i386/fedora/10/audiofile-0.2.6-9.fc10.src.rpm) = 840ce0902c2e4064fa57bfc8db2868ff1b519560fb4b7cb10e7fc48db845a332
+SIZE (rpm/i386/fedora/10/audiofile-0.2.6-9.fc10.src.rpm) = 290369
diff --git a/audio/linux-f10-libogg/Makefile b/audio/linux-f10-libogg/Makefile
index e8f42ea170f8..60a849ff48a7 100644
--- a/audio/linux-f10-libogg/Makefile
+++ b/audio/linux-f10-libogg/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for:	audio/linux-f8-libogg
-# Date created:				2008-04-03
+# New ports collection makefile for:	audio/linux-f10-libogg
+# Date created:				2009-05-03
 # Whom:					bsam
 #
 # $FreeBSD$
@@ -8,16 +8,18 @@
 PORTNAME=	libogg
 PORTVERSION=	1.1.3
 CATEGORIES=	audio linux
-PKGNAMEPREFIX=	linux-f8-
+PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Ogg bitstream library (Linux Fedora 8)
+COMMENT=	Ogg bitstream library (Linux Fedora 10)
+
+CONFLICTS=	linux-libogg-[0-9]* linux-f8-libogg-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
-LINUX_DIST_VER=	8
-RPMVERSION=	5.fc8
+LINUX_DIST_VER=	10
+RPMVERSION=	9.fc9
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	usr/lib/libogg.so.0 usr/lib/libogg.so.0.5.3
diff --git a/audio/linux-f10-libogg/distinfo.i386 b/audio/linux-f10-libogg/distinfo.i386
index 80870ed2f317..2e22b6f32ef7 100644
--- a/audio/linux-f10-libogg/distinfo.i386
+++ b/audio/linux-f10-libogg/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/8/libogg-1.1.3-5.fc8.i386.rpm) = bdbce072e2359672b684416af81a57d8
-SHA256 (rpm/i386/fedora/8/libogg-1.1.3-5.fc8.i386.rpm) = d7fb0839a6ffe6426523cdc43c5f35a176aee0c76df9c350d3253f2224efcd5d
-SIZE (rpm/i386/fedora/8/libogg-1.1.3-5.fc8.i386.rpm) = 19464
-MD5 (rpm/i386/fedora/8/libogg-1.1.3-5.fc8.src.rpm) = c5f5828d8e7f59c026a2511f33895373
-SHA256 (rpm/i386/fedora/8/libogg-1.1.3-5.fc8.src.rpm) = 0ef0dd9535aa88ab1bef7b47dc5bca7b59bd26d7c11ac351c36c79c9736b9407
-SIZE (rpm/i386/fedora/8/libogg-1.1.3-5.fc8.src.rpm) = 409838
+MD5 (rpm/i386/fedora/10/libogg-1.1.3-9.fc9.i386.rpm) = 327f09f87368523e6efc778ae215e38a
+SHA256 (rpm/i386/fedora/10/libogg-1.1.3-9.fc9.i386.rpm) = aac8646e18cb56515cc428d5582663769ad72a79d71b3d97a9cad9b671e7473d
+SIZE (rpm/i386/fedora/10/libogg-1.1.3-9.fc9.i386.rpm) = 19983
+MD5 (rpm/i386/fedora/10/libogg-1.1.3-9.fc9.src.rpm) = 23ba7bc95b7e51fbc6d61535794f5479
+SHA256 (rpm/i386/fedora/10/libogg-1.1.3-9.fc9.src.rpm) = f5b00f7ec59afd33a6696a277be92d3f0ae3eee8889b109c53b74b7c5b19cdd6
+SIZE (rpm/i386/fedora/10/libogg-1.1.3-9.fc9.src.rpm) = 410625
diff --git a/audio/linux-f10-libvorbis/Makefile b/audio/linux-f10-libvorbis/Makefile
index aca7ea357170..95dc17a1441f 100644
--- a/audio/linux-f10-libvorbis/Makefile
+++ b/audio/linux-f10-libvorbis/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for:	audio/linux-f8-libvorbis
-# Date created:				2008-04-03
+# New ports collection makefile for:	audio/linux-f10-libvorbis
+# Date created:				2009-05-03
 # Whom:					bsam
 #
 # $FreeBSD$
@@ -8,17 +8,19 @@
 PORTNAME=	libvorbis
 PORTVERSION=	1.2.0
 CATEGORIES=	audio linux
-PKGNAMEPREFIX=	linux-f8-
+PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Audio compression codec library (Linux Fedora 8)
+COMMENT=	Audio compression codec library (Linux Fedora 10)
+
+CONFLICTS=	linux-libvorbis-[0-9]* linux-f8-libvorbis-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	libogg
-LINUX_DIST_VER=	8
-RPMVERSION=	1.fc8
+LINUX_DIST_VER=	10
+RPMVERSION=	5.fc10
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	usr/lib/libvorbis.so.0 usr/lib/libvorbis.so.0.4.0 \
diff --git a/audio/linux-f10-libvorbis/distinfo.i386 b/audio/linux-f10-libvorbis/distinfo.i386
index 8abc8524af0e..5dddd72f9cda 100644
--- a/audio/linux-f10-libvorbis/distinfo.i386
+++ b/audio/linux-f10-libvorbis/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/8/libvorbis-1.2.0-1.fc8.i386.rpm) = b6f5c4c180815096cd4408a902329ea7
-SHA256 (rpm/i386/fedora/8/libvorbis-1.2.0-1.fc8.i386.rpm) = 8ee79ae2910b27d4721e2b3a684dd2b6f9a0322494b4e0a0f1426d02249ea794
-SIZE (rpm/i386/fedora/8/libvorbis-1.2.0-1.fc8.i386.rpm) = 196314
-MD5 (rpm/i386/fedora/8/libvorbis-1.2.0-1.fc8.src.rpm) = 06600500793d7fe90bdace7448bf879a
-SHA256 (rpm/i386/fedora/8/libvorbis-1.2.0-1.fc8.src.rpm) = 6520cf1081c24a76230f54dc2adf0b51859b3cf5b62b2051ce1ea665231ab6fa
-SIZE (rpm/i386/fedora/8/libvorbis-1.2.0-1.fc8.src.rpm) = 1218504
+MD5 (rpm/i386/fedora/10/libvorbis-1.2.0-5.fc10.i386.rpm) = d8bc2534ea88c4dff0c93419d168e7e6
+SHA256 (rpm/i386/fedora/10/libvorbis-1.2.0-5.fc10.i386.rpm) = ee268a85fb3da256e469ecd0528fdf98e5caa47669d08f911bad95b8ab71d79f
+SIZE (rpm/i386/fedora/10/libvorbis-1.2.0-5.fc10.i386.rpm) = 197156
+MD5 (rpm/i386/fedora/10/libvorbis-1.2.0-5.fc10.src.rpm) = e54486598e246eea71385987345038d0
+SHA256 (rpm/i386/fedora/10/libvorbis-1.2.0-5.fc10.src.rpm) = 0c2e42495d282cae6e9a50007fb948a5dda76db527719a17056e73b69c0e13ad
+SIZE (rpm/i386/fedora/10/libvorbis-1.2.0-5.fc10.src.rpm) = 1223634
diff --git a/audio/linux-f10-openal/Makefile b/audio/linux-f10-openal/Makefile
index 42f2687f0262..f104f09c3a70 100644
--- a/audio/linux-f10-openal/Makefile
+++ b/audio/linux-f10-openal/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for:	audio/linux-f8-openal
-# Date created:				2008-04-03
+# New ports collection makefile for:	audio/linux-f10-openal
+# Date created:				2009-05-03
 # Whom:					bsam
 #
 # $FreeBSD$
@@ -8,17 +8,19 @@
 PORTNAME=	openal
 PORTVERSION=	0.0.9
 CATEGORIES=	audio linux
-PKGNAMEPREFIX=	linux-f8-
+PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	A 3D positional spatialized sound library (Linux Fedora 8)
+COMMENT=	A 3D positional spatialized sound library (Linux Fedora 10)
+
+CONFLICTS=	linux-openal-[0-9]* linux-f8-openal-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	alsalib arts esound libaudiofile libvorbis sdl12
-LINUX_DIST_VER=	8
-RPMVERSION=	0.13.20060204cvs.fc8
+LINUX_DIST_VER=	10
+RPMVERSION=	0.15.20060204cvs.fc9
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	etc/openalrc usr/lib/libopenal.so.0 usr/lib/libopenal.so.0.0.0
diff --git a/audio/linux-f10-openal/distinfo.i386 b/audio/linux-f10-openal/distinfo.i386
index 3d6afb8743a9..efc2fff5211f 100644
--- a/audio/linux-f10-openal/distinfo.i386
+++ b/audio/linux-f10-openal/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/8/openal-0.0.9-0.13.20060204cvs.fc8.i386.rpm) = bf79f0d22f8dec34dca197b42a69bf86
-SHA256 (rpm/i386/fedora/8/openal-0.0.9-0.13.20060204cvs.fc8.i386.rpm) = 9d6128b8e953bdc266b0ac7d3c5a35514b657120ad00b18ec3e003ec44fbeaf1
-SIZE (rpm/i386/fedora/8/openal-0.0.9-0.13.20060204cvs.fc8.i386.rpm) = 151812
-MD5 (rpm/i386/fedora/8/openal-0.0.9-0.13.20060204cvs.fc8.src.rpm) = 7d1c69ed910831c3f19fab35a26e9996
-SHA256 (rpm/i386/fedora/8/openal-0.0.9-0.13.20060204cvs.fc8.src.rpm) = 4cbbbb16985fa87f1e3613c84da2c3a439d4dced771caacb56ad6503d3db9020
-SIZE (rpm/i386/fedora/8/openal-0.0.9-0.13.20060204cvs.fc8.src.rpm) = 1368776
+MD5 (rpm/i386/fedora/10/openal-0.0.9-0.15.20060204cvs.fc9.i386.rpm) = 326e4e8ce297043af0992d7b7d775165
+SHA256 (rpm/i386/fedora/10/openal-0.0.9-0.15.20060204cvs.fc9.i386.rpm) = 028ecd7caa6dc811a78d39e790608814431030961f8e93524712ba877925a009
+SIZE (rpm/i386/fedora/10/openal-0.0.9-0.15.20060204cvs.fc9.i386.rpm) = 150777
+MD5 (rpm/i386/fedora/10/openal-0.0.9-0.15.20060204cvs.fc9.src.rpm) = 97894e43891331813ce3552a5b8bd08b
+SHA256 (rpm/i386/fedora/10/openal-0.0.9-0.15.20060204cvs.fc9.src.rpm) = 012dc49966e5ee56296596fac8f20500779257710062d3f8cd270e21b0efdf9c
+SIZE (rpm/i386/fedora/10/openal-0.0.9-0.15.20060204cvs.fc9.src.rpm) = 1369567
diff --git a/audio/linux-f10-sdl_mixer/Makefile b/audio/linux-f10-sdl_mixer/Makefile
index 4019dc86798c..65fd0ff0b87e 100644
--- a/audio/linux-f10-sdl_mixer/Makefile
+++ b/audio/linux-f10-sdl_mixer/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for:	audio/linux-f8-sdl_mixer
-# Date created:				2008-04-03
+# New ports collection makefile for:	audio/linux-f10-sdl_mixer
+# Date created:				2009-05-03
 # Whom:					bsam
 #
 # $FreeBSD$
@@ -8,18 +8,20 @@
 PORTNAME=	sdl_mixer
 PORTVERSION=	1.2.8
 CATEGORIES=	audio linux
-PKGNAMEPREFIX=	linux-f8-
+PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	A sample multi-channel audio mixer library (Linux Fedora 8)
+COMMENT=	A sample multi-channel audio mixer library (Linux Fedora 10)
+
+CONFLICTS=	linux-sdl_mixer-[0-9]* linux-f8-sdl_mixer-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	sdl12
 LINUX_NAME=	SDL_mixer
-LINUX_DIST_VER=	8
-RPMVERSION=	6.fc8
+LINUX_DIST_VER=	10
+RPMVERSION=	9.fc10
 BRANDELF_FILES=	usr/bin/playmus usr/bin/playwave
 USE_LDCONFIG=	yes
 
diff --git a/audio/linux-f10-sdl_mixer/distinfo.i386 b/audio/linux-f10-sdl_mixer/distinfo.i386
index 57555a6b2ba5..0bac8b7c5618 100644
--- a/audio/linux-f10-sdl_mixer/distinfo.i386
+++ b/audio/linux-f10-sdl_mixer/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/8/SDL_mixer-1.2.8-6.fc8.i386.rpm) = 067eaa2c815d1081f54c0610068c701c
-SHA256 (rpm/i386/fedora/8/SDL_mixer-1.2.8-6.fc8.i386.rpm) = f23ec051c7693e0610dbe8d9d1359a0a5e8562be651d5691a1ce995b3f20456f
-SIZE (rpm/i386/fedora/8/SDL_mixer-1.2.8-6.fc8.i386.rpm) = 97639
-MD5 (rpm/i386/fedora/8/SDL_mixer-1.2.8-6.fc8.src.rpm) = c14635db490922260e67bf063edb22d7
-SHA256 (rpm/i386/fedora/8/SDL_mixer-1.2.8-6.fc8.src.rpm) = 81a7af527e622dbad29bbcb6d9d9a7fb9d8d42ec27a8f19e6bc8a4ace9e13107
-SIZE (rpm/i386/fedora/8/SDL_mixer-1.2.8-6.fc8.src.rpm) = 2107691
+MD5 (rpm/i386/fedora/10/SDL_mixer-1.2.8-9.fc10.i386.rpm) = 17b70084014d81685d27145ab874d85f
+SHA256 (rpm/i386/fedora/10/SDL_mixer-1.2.8-9.fc10.i386.rpm) = 93d971cc55f7cc65b754825b9b5443dd545de25bed94944c47ed16852b91cfeb
+SIZE (rpm/i386/fedora/10/SDL_mixer-1.2.8-9.fc10.i386.rpm) = 99727
+MD5 (rpm/i386/fedora/10/SDL_mixer-1.2.8-9.fc10.src.rpm) = 725f0acca213ed8c67caa7cd9e2fc9bd
+SHA256 (rpm/i386/fedora/10/SDL_mixer-1.2.8-9.fc10.src.rpm) = 41d764090e764a13645ad27ffb149315ddad49340af5b77244719196d88b135e
+SIZE (rpm/i386/fedora/10/SDL_mixer-1.2.8-9.fc10.src.rpm) = 2108084