4 files changed, 13 insertions, 61 deletions
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index e37de413756..b850de0c47f 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2005/06/08 13:20:04 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2005/07/27 17:16:32 drochner Exp $
 
-DISTNAME=		esound-0.2.35
-PKGREVISION=		1
+DISTNAME=		esound-0.2.36
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/esound/0.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -38,10 +37,5 @@ SUBST_SED.oss=		-e 's,-lossaudio,${LIBOSSAUDIO},g'
 SUBST_MESSAGE.oss=	"Fixing oss."
 .endif
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/esound
-	cd ${WRKSRC}/docs/html && \
-		${PAX} -rw -pp -pm . ${PREFIX}/share/doc/html/esound
-
 .include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/esound/PLIST.common b/audio/esound/PLIST.common
index 4fb6571824b..f68a259b082 100644
--- a/audio/esound/PLIST.common
+++ b/audio/esound/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.5 2004/09/22 08:09:15 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.6 2005/07/27 17:16:32 drochner Exp $
 bin/esd
 bin/esd-config
 bin/esdcat
@@ -24,47 +24,5 @@ man/man1/esdplay.1
 man/man1/esdrec.1
 man/man1/esdsample.1
 share/aclocal/esd.m4
-share/doc/html/esound/a346.html
-share/doc/html/esound/c19.html
-share/doc/html/esound/c250.html
-share/doc/html/esound/c271.html
-share/doc/html/esound/c285.html
-share/doc/html/esound/c290.html
-share/doc/html/esound/c32.html
-share/doc/html/esound/c76.html
-share/doc/html/esound/index.html
-share/doc/html/esound/r311.html
-share/doc/html/esound/r313.html
-share/doc/html/esound/stylesheet-images/caution.gif
-share/doc/html/esound/stylesheet-images/home.gif
-share/doc/html/esound/stylesheet-images/important.gif
-share/doc/html/esound/stylesheet-images/next.gif
-share/doc/html/esound/stylesheet-images/note.gif
-share/doc/html/esound/stylesheet-images/prev.gif
-share/doc/html/esound/stylesheet-images/tip.gif
-share/doc/html/esound/stylesheet-images/toc-blank.gif
-share/doc/html/esound/stylesheet-images/toc-minus.gif
-share/doc/html/esound/stylesheet-images/toc-plus.gif
-share/doc/html/esound/stylesheet-images/up.gif
-share/doc/html/esound/stylesheet-images/warning.gif
-share/doc/html/esound/x119.html
-share/doc/html/esound/x179.html
-share/doc/html/esound/x211.html
-share/doc/html/esound/x241.html
-share/doc/html/esound/x259.html
-share/doc/html/esound/x26.html
-share/doc/html/esound/x265.html
-share/doc/html/esound/x268.html
-share/doc/html/esound/x277.html
-share/doc/html/esound/x281.html
-share/doc/html/esound/x296.html
-share/doc/html/esound/x299.html
-share/doc/html/esound/x302.html
-share/doc/html/esound/x305.html
-share/doc/html/esound/x308.html
-share/doc/html/esound/x47.html
-share/doc/html/esound/x66.html
 share/examples/esound/esd.conf
 @dirrm share/examples/esound
-@dirrm share/doc/html/esound/stylesheet-images
-@dirrm share/doc/html/esound
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
index 5a8317738c0..363c5795ae9 100644
--- a/audio/esound/distinfo
+++ b/audio/esound/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2005/02/23 20:39:44 agc Exp $
+$NetBSD: distinfo,v 1.22 2005/07/27 17:16:32 drochner Exp $
 
-SHA1 (esound-0.2.35.tar.bz2) = b3164f17d84fe57f1457bc0d0a50615f67c87de8
-RMD160 (esound-0.2.35.tar.bz2) = 17890d400b505a35a3d4cff1df6582889c54c486
-Size (esound-0.2.35.tar.bz2) = 384641 bytes
-SHA1 (patch-aa) = bf90e118cb5106b6328fa455bc9403fce11cb2ed
+SHA1 (esound-0.2.36.tar.bz2) = 66f451ff5a6b9cae8d49b196a536cf49f3f1755c
+RMD160 (esound-0.2.36.tar.bz2) = 1a6d4a1f31311e6265324fb1a392f9b0491cf1f9
+Size (esound-0.2.36.tar.bz2) = 369952 bytes
+SHA1 (patch-aa) = d734a1004026287071e571ceb3fd346b809a6a30
 SHA1 (patch-ab) = 50d4c829fe5d53f28a4a38b1962097b8a47b97c7
 SHA1 (patch-ac) = 8ab2eebc32792102a6d74b57f75a4381a218186e
diff --git a/audio/esound/patches/patch-aa b/audio/esound/patches/patch-aa
index c2d8f2ae096..bcdbb1bea38 100644
--- a/audio/esound/patches/patch-aa
+++ b/audio/esound/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.7 2003/09/07 10:46:07 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2005/07/27 17:16:33 drochner Exp $
 
---- Makefile.in.orig	Wed Sep  3 18:26:10 2003
+--- Makefile.in.orig	2005-06-07 03:04:14.000000000 +0200
 +++ Makefile.in
-@@ -176,7 +176,7 @@ esd_LDADD = $(WRAP_LIB) $(LDADD)
+@@ -425,7 +425,7 @@ LDADD = libesd.la $(AUDIOFILE_LIBS)
+ esd_LDADD = $(WRAP_LIB) $(LDADD)
  m4datadir = $(datadir)/aclocal
  m4data_DATA = esd.m4
- 
 -esdconfdir = $(sysconfdir)
 +esdconfdir = $(datadir)/examples/@PACKAGE@
  esdconf_DATA = esd.conf
- 
  pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = esound.pc