5 files changed, 122 insertions, 37 deletions

diff --git a/audio/linux-f10-esound/Makefile b/audio/linux-f10-esound/Makefile
index 29698d8a781d..7bcb5c47290f 100644
--- a/audio/linux-f10-esound/Makefile
+++ b/audio/linux-f10-esound/Makefile
@@ -7,16 +7,7 @@
 
 PORTNAME=	esound
 CATEGORIES=	audio linux
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION=	0.2.14
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION=	0.2.17
-.endif
-.if (${MACHINE_ARCH} == "i386")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/i386/RedHat/RPMS/
-.elif (${MACHINE_ARCH} == "alpha")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/alpha/RedHat/RPMS/
-.endif
+PORTVERSION=	0.2.22
 
 MAINTAINER=	taoka@FreeBSD.org
 
diff --git a/audio/linux-f10-esound/distinfo.alpha b/audio/linux-f10-esound/distinfo.alpha
index 3707a963ea1d..84d7d6cb932e 100644
--- a/audio/linux-f10-esound/distinfo.alpha
+++ b/audio/linux-f10-esound/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/esound-0.2.17-1.alpha.rpm) = 09cbbd8d7bc2633f99fecd75843b33e9
+MD5 (rpm/esound-0.2.22-1.alpha.rpm) = 94411e58472dbb01383a8c7784b9b4bd
diff --git a/audio/linux-f10-esound/distinfo.i386 b/audio/linux-f10-esound/distinfo.i386
index 56cfba6ba039..2f638f0a1ec0 100644
--- a/audio/linux-f10-esound/distinfo.i386
+++ b/audio/linux-f10-esound/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/esound-0.2.14-1.i386.rpm) = 2bfd09ee99fc1f01a98a33f811d09689
+MD5 (rpm/esound-0.2.22-1.i386.rpm) = c8395daab28f33d7a59ed18e484fbcc9
diff --git a/audio/linux-f10-esound/pkg-plist.alpha b/audio/linux-f10-esound/pkg-plist.alpha
index 6f19dfd6e603..2fd653643fb5 100644
--- a/audio/linux-f10-esound/pkg-plist.alpha
+++ b/audio/linux-f10-esound/pkg-plist.alpha
@@ -9,18 +9,64 @@ usr/bin/esdmon
 usr/bin/esdplay
 usr/bin/esdrec
 usr/bin/esdsample
-usr/doc/esound-0.2.17
-usr/doc/esound-0.2.17/AUTHORS
-usr/doc/esound-0.2.17/COPYING
-usr/doc/esound-0.2.17/ChangeLog
-usr/doc/esound-0.2.17/INSTALL
-usr/doc/esound-0.2.17/NEWS
-usr/doc/esound-0.2.17/README
-usr/doc/esound-0.2.17/TIPS
-usr/doc/esound-0.2.17/TODO
-usr/doc/esound-0.2.17/esound.sgml
+usr/lib/libesd.so.0.2.22
+usr/lib/libesddsp.so.0.2.22
+usr/share/doc/esound-0.2.22/AUTHORS
+usr/share/doc/esound-0.2.22/COPYING
+usr/share/doc/esound-0.2.22/ChangeLog
+usr/share/doc/esound-0.2.22/INSTALL
+usr/share/doc/esound-0.2.22/NEWS
+usr/share/doc/esound-0.2.22/README
+usr/share/doc/esound-0.2.22/TIPS
+usr/share/doc/esound-0.2.22/TODO
+usr/share/doc/esound-0.2.22/esound.ps
+usr/share/doc/esound-0.2.22/esound.sgml
+usr/share/doc/esound-0.2.22/html/anything-else.html
+usr/share/doc/esound-0.2.22/html/authentication.html
+usr/share/doc/esound-0.2.22/html/book1.html
+usr/share/doc/esound-0.2.22/html/compiling.html
+usr/share/doc/esound-0.2.22/html/deficiencies.html
+usr/share/doc/esound-0.2.22/html/design-docs.html
+usr/share/doc/esound-0.2.22/html/docbook.css
+usr/share/doc/esound-0.2.22/html/downloading-compiling-installing.html
+usr/share/doc/esound-0.2.22/html/environment-variables.html
+usr/share/doc/esound-0.2.22/html/esdcat-esdmon-esdrec.html
+usr/share/doc/esound-0.2.22/html/esdctl.html
+usr/share/doc/esound-0.2.22/html/esdsample-esdloop.html
+usr/share/doc/esound-0.2.22/html/esound-api.html
+usr/share/doc/esound-0.2.22/html/feature-additions.html
+usr/share/doc/esound-0.2.22/html/index.html
+usr/share/doc/esound-0.2.22/html/installing.html
+usr/share/doc/esound-0.2.22/html/introduction.html
+usr/share/doc/esound-0.2.22/html/ln17.html
+usr/share/doc/esound-0.2.22/html/miscellaneous.html
+usr/share/doc/esound-0.2.22/html/mpg123.html
+usr/share/doc/esound-0.2.22/html/organization.html
+usr/share/doc/esound-0.2.22/html/planned-development.html
+usr/share/doc/esound-0.2.22/html/player-type.html
+usr/share/doc/esound-0.2.22/html/r312.html
+usr/share/doc/esound-0.2.22/html/refentry-esd.html
+usr/share/doc/esound-0.2.22/html/remaining-details.html
+usr/share/doc/esound-0.2.22/html/running-esound.html
+usr/share/doc/esound-0.2.22/html/signal-path.html
+usr/share/doc/esound-0.2.22/html/stylesheet-images/caution.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/home.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/important.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/next.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/note.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/prev.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/tip.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/toc-blank.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/toc-minus.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/toc-plus.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/up.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/warning.gif
+usr/share/doc/esound-0.2.22/html/supported-programs.html
+usr/share/doc/esound-0.2.22/html/x27.html
+usr/share/doc/esound-0.2.22/html/xmp.html
 usr/lib/libesd.so.0
-usr/lib/libesd.so.0.2.17
+usr/lib/libesddsp.so
 usr/lib/libesddsp.so.0
-usr/lib/libesddsp.so.0.2.17
-@dirrm /usr/doc/esound-0.2.14
+@dirrm usr/share/doc/esound-0.2.22/html/stylesheet-images
+@dirrm usr/share/doc/esound-0.2.22/html
+@dirrm usr/share/doc/esound-0.2.22
diff --git a/audio/linux-f10-esound/pkg-plist.i386 b/audio/linux-f10-esound/pkg-plist.i386
index fcd117d381ee..2fd653643fb5 100644
--- a/audio/linux-f10-esound/pkg-plist.i386
+++ b/audio/linux-f10-esound/pkg-plist.i386
@@ -1,3 +1,4 @@
+etc/esd.conf
 usr/bin/esd
 usr/bin/esdcat
 usr/bin/esdctl
@@ -8,17 +9,64 @@ usr/bin/esdmon
 usr/bin/esdplay
 usr/bin/esdrec
 usr/bin/esdsample
-usr/doc/esound-0.2.14/AUTHORS
-usr/doc/esound-0.2.14/COPYING
-usr/doc/esound-0.2.14/ChangeLog
-usr/doc/esound-0.2.14/INSTALL
-usr/doc/esound-0.2.14/NEWS
-usr/doc/esound-0.2.14/README
-usr/doc/esound-0.2.14/TIPS
-usr/doc/esound-0.2.14/TODO
-usr/doc/esound-0.2.14/esound.sgml
+usr/lib/libesd.so.0.2.22
+usr/lib/libesddsp.so.0.2.22
+usr/share/doc/esound-0.2.22/AUTHORS
+usr/share/doc/esound-0.2.22/COPYING
+usr/share/doc/esound-0.2.22/ChangeLog
+usr/share/doc/esound-0.2.22/INSTALL
+usr/share/doc/esound-0.2.22/NEWS
+usr/share/doc/esound-0.2.22/README
+usr/share/doc/esound-0.2.22/TIPS
+usr/share/doc/esound-0.2.22/TODO
+usr/share/doc/esound-0.2.22/esound.ps
+usr/share/doc/esound-0.2.22/esound.sgml
+usr/share/doc/esound-0.2.22/html/anything-else.html
+usr/share/doc/esound-0.2.22/html/authentication.html
+usr/share/doc/esound-0.2.22/html/book1.html
+usr/share/doc/esound-0.2.22/html/compiling.html
+usr/share/doc/esound-0.2.22/html/deficiencies.html
+usr/share/doc/esound-0.2.22/html/design-docs.html
+usr/share/doc/esound-0.2.22/html/docbook.css
+usr/share/doc/esound-0.2.22/html/downloading-compiling-installing.html
+usr/share/doc/esound-0.2.22/html/environment-variables.html
+usr/share/doc/esound-0.2.22/html/esdcat-esdmon-esdrec.html
+usr/share/doc/esound-0.2.22/html/esdctl.html
+usr/share/doc/esound-0.2.22/html/esdsample-esdloop.html
+usr/share/doc/esound-0.2.22/html/esound-api.html
+usr/share/doc/esound-0.2.22/html/feature-additions.html
+usr/share/doc/esound-0.2.22/html/index.html
+usr/share/doc/esound-0.2.22/html/installing.html
+usr/share/doc/esound-0.2.22/html/introduction.html
+usr/share/doc/esound-0.2.22/html/ln17.html
+usr/share/doc/esound-0.2.22/html/miscellaneous.html
+usr/share/doc/esound-0.2.22/html/mpg123.html
+usr/share/doc/esound-0.2.22/html/organization.html
+usr/share/doc/esound-0.2.22/html/planned-development.html
+usr/share/doc/esound-0.2.22/html/player-type.html
+usr/share/doc/esound-0.2.22/html/r312.html
+usr/share/doc/esound-0.2.22/html/refentry-esd.html
+usr/share/doc/esound-0.2.22/html/remaining-details.html
+usr/share/doc/esound-0.2.22/html/running-esound.html
+usr/share/doc/esound-0.2.22/html/signal-path.html
+usr/share/doc/esound-0.2.22/html/stylesheet-images/caution.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/home.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/important.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/next.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/note.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/prev.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/tip.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/toc-blank.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/toc-minus.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/toc-plus.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/up.gif
+usr/share/doc/esound-0.2.22/html/stylesheet-images/warning.gif
+usr/share/doc/esound-0.2.22/html/supported-programs.html
+usr/share/doc/esound-0.2.22/html/x27.html
+usr/share/doc/esound-0.2.22/html/xmp.html
 usr/lib/libesd.so.0
-usr/lib/libesd.so.0.2.14
+usr/lib/libesddsp.so
 usr/lib/libesddsp.so.0
-usr/lib/libesddsp.so.0.2.14
-@dirrm /usr/doc/esound-0.2.14
+@dirrm usr/share/doc/esound-0.2.22/html/stylesheet-images
+@dirrm usr/share/doc/esound-0.2.22/html
+@dirrm usr/share/doc/esound-0.2.22