3 files changed, 8 insertions, 27 deletions
diff --git a/audio/mpg123-esound/DESCR b/audio/mpg123-esound/DESCR
index dbff9b1adc8..a0a4d362758 100644
--- a/audio/mpg123-esound/DESCR
+++ b/audio/mpg123-esound/DESCR
@@ -1,6 +1,2 @@
-mpg123-esound reads one or more files (or standard input if ``-'' is
-specified) or URLs and plays them to the Enlightened Sound Daemon (by
-default) or outputs them to a specified file or to stdout.
-
-File(s) and/or URL contents are assumed to be MPEG-1.0/2.0 audio
-layer 1, 2, or 3 bit streams.
+Module for the mpg123 audio player to play back audio via the
+Enlightened Sound Daemon.
diff --git a/audio/mpg123-esound/Makefile b/audio/mpg123-esound/Makefile
index 63f33895d47..208aab7b708 100644
--- a/audio/mpg123-esound/Makefile
+++ b/audio/mpg123-esound/Makefile
@@ -1,27 +1,13 @@
-# $NetBSD: Makefile,v 1.20 2008/08/11 15:21:04 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2010/03/14 14:58:26 martin Exp $
 
-PKGNAME=	mpg123-esound-${MPG123_VERSION}
-PKGREVISION=	7
-COMMENT=	Command-line player for mpeg layer 1, 2 and 3 audio with EsounD
+MPG123_MODULE=	esd
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+.include "${.CURDIR}/../../audio/mpg123/Makefile.common"
 
-TARGET_SUFFIX=	-esd
-
-PKG_OPTIONS_VAR=PKG_OPTIONS.mpg123-esound
-.include "../../audio/mpg123/Makefile.common"
 
 USE_TOOLS+=	pkg-config
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mpg123 \
-		${DESTDIR}${PREFIX}/bin/mpg123-esound
-	${INSTALL_MAN} ${WRKSRC}/mpg123.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/mpg123-esound.1
-
 .include "../../audio/esound/buildlink3.mk"
+.include "../../audio/mpg123/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123-esound/PLIST b/audio/mpg123-esound/PLIST
index 2e9c7d74080..9d0fd5f1b9c 100644
--- a/audio/mpg123-esound/PLIST
+++ b/audio/mpg123-esound/PLIST
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2002/11/28 12:15:49 markd Exp $
-bin/mpg123-esound
-man/man1/mpg123-esound.1
+@comment $NetBSD: PLIST,v 1.3 2010/03/14 14:58:26 martin Exp $
+lib/mpg123/output_esd.la