4 files changed, 14 insertions, 90 deletions

diff --git a/audio/linux-esound/Makefile b/audio/linux-esound/Makefile
index cff621254388..6b971c25f940 100644
--- a/audio/linux-esound/Makefile
+++ b/audio/linux-esound/Makefile
@@ -8,14 +8,8 @@
 PORTNAME=	esound
 CATEGORIES=	audio linux
 PORTVERSION=	0.2.35
-PORTREVISION=	0
-MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR=	3/i386/os/Fedora/RPMS 3/SRPMS
-
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES+=	esound-${PORTVERSION}-2.src.rpm
-ALWAYS_KEEP_DISTFILES=  yes
-.endif
+PORTREVISION=	1
+DISTNAME=	${PORTNAME}-${PORTVERSION}-2
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of esound
@@ -24,7 +18,11 @@ NOT_FOR_ARCHS=	amd64
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
 
-RPM_SET=	esound-${PORTVERSION}-2.${MACHINE_ARCH}.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+BRANDELF_DIRS=	usr/bin
+PLIST=		pkg-plist.${LINUX_RPM_ARCH}
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
 
diff --git a/audio/linux-esound/distinfo.alpha b/audio/linux-esound/distinfo.alpha
deleted file mode 100644
index a3bda61a9bfd..000000000000
--- a/audio/linux-esound/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/esound-0.2.22-1.alpha.rpm) = 94411e58472dbb01383a8c7784b9b4bd
-SIZE (rpm/esound-0.2.22-1.alpha.rpm) = 129522
diff --git a/audio/linux-esound/distinfo.i386 b/audio/linux-esound/distinfo.i386
index c2a1983f7355..35b5ebdcccc4 100644
--- a/audio/linux-esound/distinfo.i386
+++ b/audio/linux-esound/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/esound-0.2.35-2.i386.rpm) = a38d50fbb3a481f899ce38d403cd4f35
-SHA256 (rpm/esound-0.2.35-2.i386.rpm) = fd7c65b81cf6cc8b6d9313fe9e4325a10a65a4515fba6c0a93371acc71b1d3c0
-SIZE (rpm/esound-0.2.35-2.i386.rpm) = 123657
-MD5 (rpm/esound-0.2.35-2.src.rpm) = 96ea0ca1a379603b08ef83cd9d6858b7
-SHA256 (rpm/esound-0.2.35-2.src.rpm) = 8847dbdb22db93693542bb0d9951d58fe0faa86f7d3b560eab437ff341e56a22
-SIZE (rpm/esound-0.2.35-2.src.rpm) = 394701
+MD5 (rpm/i386/fedora/3/esound-0.2.35-2.i386.rpm) = a38d50fbb3a481f899ce38d403cd4f35
+SHA256 (rpm/i386/fedora/3/esound-0.2.35-2.i386.rpm) = fd7c65b81cf6cc8b6d9313fe9e4325a10a65a4515fba6c0a93371acc71b1d3c0
+SIZE (rpm/i386/fedora/3/esound-0.2.35-2.i386.rpm) = 123657
+MD5 (rpm/i386/fedora/3/esound-0.2.35-2.src.rpm) = 96ea0ca1a379603b08ef83cd9d6858b7
+SHA256 (rpm/i386/fedora/3/esound-0.2.35-2.src.rpm) = 8847dbdb22db93693542bb0d9951d58fe0faa86f7d3b560eab437ff341e56a22
+SIZE (rpm/i386/fedora/3/esound-0.2.35-2.src.rpm) = 394701
diff --git a/audio/linux-esound/pkg-plist.alpha b/audio/linux-esound/pkg-plist.alpha
deleted file mode 100644
index 2fd653643fb5..000000000000
--- a/audio/linux-esound/pkg-plist.alpha
+++ /dev/null
@@ -1,72 +0,0 @@
-etc/esd.conf
-usr/bin/esd
-usr/bin/esdcat
-usr/bin/esdctl
-usr/bin/esddsp
-usr/bin/esdfilt
-usr/bin/esdloop
-usr/bin/esdmon
-usr/bin/esdplay
-usr/bin/esdrec
-usr/bin/esdsample
-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/libesddsp.so
-usr/lib/libesddsp.so.0
-@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