3 files changed, 38 insertions, 9 deletions

diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index d5bee3bf3fae..24031f0eab3a 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	aqualung
-DISTVERSION=	0.9beta9
-PORTREVISION=	4
+DISTVERSION=	0.9beta10
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jsa@wickedmachine.net
 COMMENT=	Music player with rich features
 
 LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
@@ -19,7 +18,7 @@ LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
 		sndfile.1:${PORTSDIR}/audio/libsndfile \
 		FLAC.10:${PORTSDIR}/audio/flac \
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
-		oggz.3:${PORTSDIR}/audio/liboggz \
+		oggz.4:${PORTSDIR}/audio/liboggz \
 		speex.1:${PORTSDIR}/audio/speex \
 		mad.2:${PORTSDIR}/audio/libmad \
 		modplug.0:${PORTSDIR}/audio/libmodplug \
@@ -33,7 +32,8 @@ LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
 		strfunc.9:${PORTSDIR}/devel/libstrfunc \
 		wavpack.1:${PORTSDIR}/audio/wavpack \
 		xslt.2:${PORTSDIR}/textproc/libxslt \
-		cddb.4:${PORTSDIR}/audio/libcddb
+		cddb.4:${PORTSDIR}/audio/libcddb \
+		strfunc.9:${PORTSDIR}/devel/libstrfunc
 
 USE_GETTEXT=	yes
 USE_GNOME=	pkgconfig gtk20 libxml2
@@ -47,7 +47,7 @@ CONFIGURE_ARGS+=	--with-systray=no
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib -lstrfunc
-PORTDOCS=	README
+PORTDOCS=	*
 MAN1=		${PORTNAME}.1
 
 post-patch:
diff --git a/audio/aqualung/distinfo b/audio/aqualung/distinfo
index 547b7eb17475..0f0e38660b24 100644
--- a/audio/aqualung/distinfo
+++ b/audio/aqualung/distinfo
@@ -1,3 +1,3 @@
-MD5 (aqualung-0.9beta9.tar.gz) = 5573e4a120063291fe43ec46498c3e60
-SHA256 (aqualung-0.9beta9.tar.gz) = 0a8f09f383927c14338a07cd05c8a9216f7a7e72ba062626802547831c76d6f1
-SIZE (aqualung-0.9beta9.tar.gz) = 1039751
+MD5 (aqualung-0.9beta10.tar.gz) = 29ce07b74527e6e44f0c4c778ac85f40
+SHA256 (aqualung-0.9beta10.tar.gz) = 464568ff1b87c7a3dc6ef7d153a18e56ca8e0bfd5a173f942a00f4e59e097d67
+SIZE (aqualung-0.9beta10.tar.gz) = 1400075
diff --git a/audio/aqualung/pkg-plist b/audio/aqualung/pkg-plist
index 7293e12b276b..36cef60647fa 100644
--- a/audio/aqualung/pkg-plist
+++ b/audio/aqualung/pkg-plist
@@ -31,6 +31,7 @@ bin/aqualung
 %%DATADIR%%/skin/dark/next.png
 %%DATADIR%%/skin/dark/pause.png
 %%DATADIR%%/skin/dark/play.png
+%%DATADIR%%/skin/dark/play_pause.png
 %%DATADIR%%/skin/dark/prev.png
 %%DATADIR%%/skin/dark/rc
 %%DATADIR%%/skin/dark/repeat.png
@@ -48,6 +49,7 @@ bin/aqualung
 %%DATADIR%%/skin/default/next.png
 %%DATADIR%%/skin/default/pause.png
 %%DATADIR%%/skin/default/play.png
+%%DATADIR%%/skin/default/play_pause.png
 %%DATADIR%%/skin/default/prev.png
 %%DATADIR%%/skin/default/rc
 %%DATADIR%%/skin/default/repeat.png
@@ -63,6 +65,7 @@ bin/aqualung
 %%DATADIR%%/skin/metal/next.png
 %%DATADIR%%/skin/metal/pause.png
 %%DATADIR%%/skin/metal/play.png
+%%DATADIR%%/skin/metal/play_pause.png
 %%DATADIR%%/skin/metal/prev.png
 %%DATADIR%%/skin/metal/rc
 %%DATADIR%%/skin/metal/repeat.png
@@ -73,6 +76,7 @@ bin/aqualung
 %%DATADIR%%/skin/no_skin/next.png
 %%DATADIR%%/skin/no_skin/pause.png
 %%DATADIR%%/skin/no_skin/play.png
+%%DATADIR%%/skin/no_skin/play_pause.png
 %%DATADIR%%/skin/no_skin/prev.png
 %%DATADIR%%/skin/no_skin/rc
 %%DATADIR%%/skin/no_skin/repeat.png
@@ -88,6 +92,7 @@ bin/aqualung
 %%DATADIR%%/skin/ocean/pause.png
 %%DATADIR%%/skin/ocean/pl.png
 %%DATADIR%%/skin/ocean/play.png
+%%DATADIR%%/skin/ocean/play_pause.png
 %%DATADIR%%/skin/ocean/prev.png
 %%DATADIR%%/skin/ocean/rc
 %%DATADIR%%/skin/ocean/repeat.png
@@ -97,6 +102,7 @@ bin/aqualung
 %%DATADIR%%/skin/plain/next.png
 %%DATADIR%%/skin/plain/pause.png
 %%DATADIR%%/skin/plain/play.png
+%%DATADIR%%/skin/plain/play_pause.png
 %%DATADIR%%/skin/plain/prev.png
 %%DATADIR%%/skin/plain/rc
 %%DATADIR%%/skin/plain/repeat.png
@@ -107,6 +113,7 @@ bin/aqualung
 %%DATADIR%%/skin/woody/pause.png
 %%DATADIR%%/skin/woody/pine.png
 %%DATADIR%%/skin/woody/play.png
+%%DATADIR%%/skin/woody/play_pause.png
 %%DATADIR%%/skin/woody/prev.png
 %%DATADIR%%/skin/woody/rc
 %%DATADIR%%/skin/woody/repeat.png
@@ -122,10 +129,32 @@ bin/aqualung
 %%DATADIR%%/skin/woody/wood5.png
 %%DATADIR%%/skin/woody/wood6.png
 %%DATADIR%%/tab-close.png
+%%PORTDOCS%%%%DOCSDIR%%/split.sh
+%%PORTDOCS%%%%DOCSDIR%%/aqualung-doc.css
+%%PORTDOCS%%%%DOCSDIR%%/aqualung-doc.dtd
+%%PORTDOCS%%%%DOCSDIR%%/aqualung-doc.xml
+%%PORTDOCS%%%%DOCSDIR%%/aqualung-latex.xsl
+%%PORTDOCS%%%%DOCSDIR%%/aqualung-man.xsl
+%%PORTDOCS%%%%DOCSDIR%%/aqualung-xhtml-multipage.xsl
+%%PORTDOCS%%%%DOCSDIR%%/aqualung-xhtml-view.xsl
+%%PORTDOCS%%%%DOCSDIR%%/aqualung-xhtml.xsl
+%%PORTDOCS%%%%DOCSDIR%%/external.eps
+%%PORTDOCS%%%%DOCSDIR%%/timer.eps
+%%PORTDOCS%%%%DOCSDIR%%/external.png
+%%PORTDOCS%%%%DOCSDIR%%/jack.png
+%%PORTDOCS%%%%DOCSDIR%%/main.png
+%%PORTDOCS%%%%DOCSDIR%%/playlist.png
+%%PORTDOCS%%%%DOCSDIR%%/settings.png
+%%PORTDOCS%%%%DOCSDIR%%/store.png
+%%PORTDOCS%%%%DOCSDIR%%/systray.png
+%%PORTDOCS%%%%DOCSDIR%%/timer.png
 share/locale/de/LC_MESSAGES/aqualung.mo
 share/locale/hu/LC_MESSAGES/aqualung.mo
 share/locale/it/LC_MESSAGES/aqualung.mo
+share/locale/ru/LC_MESSAGES/aqualung.mo
+share/locale/sv/LC_MESSAGES/aqualung.mo
 share/locale/uk/LC_MESSAGES/aqualung.mo
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @dirrm %%DATADIR%%/skin/dark
 @dirrm %%DATADIR%%/skin/default
 @dirrm %%DATADIR%%/skin/metal