- Update to 0.9beta9

PR:		ports/118632 (based on)
Submitted by:	anray

3 files changed, 38 insertions, 16 deletions

diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index e84e723aad99..9b0dfc7cd25e 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	aqualung
-DISTVERSION=	0.9beta7
-PORTREVISION=	5
+DISTVERSION=	0.9beta9
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -31,25 +30,35 @@ LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
 		mp3lame.0:${PORTSDIR}/audio/lame \
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
 		strfunc.9:${PORTSDIR}/devel/libstrfunc \
+		wavpack.1:${PORTSDIR}/audio/wavpack \
+		xslt.2:${PORTSDIR}/textproc/libxslt \
 		cddb.4:${PORTSDIR}/audio/libcddb
 
 USE_GETTEXT=	yes
 USE_GNOME=	pkgconfig gtk20 libxml2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-transform-name="" --with-alsa=no --with-ifp=no --with-systray=no \
+CONFIGURE_ARGS=	--program-transform-name="" --with-alsa=no --with-ifp=no\
 		--with-cdda=no
+.ifndef WITH_TRAYICON
+CONFIGURE_ARGS+=	--with-systray=no
+.endif
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib -lstrfunc
-PORTDOCS=	README manual.lyx manual.pdf
+PORTDOCS=	README
 MAN1=		${PORTNAME}.1
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^docdir/s!=.*!= ${DOCSDIR}!' ${WRKSRC}/doc/Makefile.in
-#	@${REINPLACE_CMD} -e 's/libcdio_paranoia/libcdda_paranoia/g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/^docdir/s!=.*!= ${DOCSDIR}!'\
+		${WRKSRC}/doc/Makefile.in
+#	@${REINPLACE_CMD} -e 's/libcdio_paranoia/libcdda_paranoia/g'\
+#		${WRKSRC}/configure
+	@${ECHO_CMD} "#include <sys/stat.h>" >> ${WRKSRC}/src/common.h
+	@${ECHO_CMD} "#include <sys/types.h>" >> ${WRKSRC}/src/common.h
 .ifdef NOPORTDOCS
-	@${REINPLACE_CMD} -e '/^install-data-am/s!install-docDATA!!' ${WRKSRC}/doc/Makefile.in
+	@${REINPLACE_CMD} -e '/^install-data-am/s!install-docDATA!!'\
+		${WRKSRC}/doc/Makefile.in
 .endif
 
 .include <bsd.port.mk>
diff --git a/audio/aqualung/distinfo b/audio/aqualung/distinfo
index 748e7160f4e3..547b7eb17475 100644
--- a/audio/aqualung/distinfo
+++ b/audio/aqualung/distinfo
@@ -1,3 +1,3 @@
-MD5 (aqualung-0.9beta7.tar.gz) = f5de05de722c713b78968854a47c54b2
-SHA256 (aqualung-0.9beta7.tar.gz) = 826da77ddb6426428db56b43b2e1c7a6df13372be2879c641fce0edf9f85060c
-SIZE (aqualung-0.9beta7.tar.gz) = 1064151
+MD5 (aqualung-0.9beta9.tar.gz) = 5573e4a120063291fe43ec46498c3e60
+SHA256 (aqualung-0.9beta9.tar.gz) = 0a8f09f383927c14338a07cd05c8a9216f7a7e72ba062626802547831c76d6f1
+SIZE (aqualung-0.9beta9.tar.gz) = 1039751
diff --git a/audio/aqualung/pkg-plist b/audio/aqualung/pkg-plist
index a853f1285cee..7293e12b276b 100644
--- a/audio/aqualung/pkg-plist
+++ b/audio/aqualung/pkg-plist
@@ -1,7 +1,4 @@
 bin/aqualung
-share/locale/hu/LC_MESSAGES/aqualung.mo
-share/locale/de/LC_MESSAGES/aqualung.mo
-share/locale/uk/LC_MESSAGES/aqualung.mo
 %%DATADIR%%/appearance.png
 %%DATADIR%%/cdda.png
 %%DATADIR%%/cddb.png
@@ -13,12 +10,15 @@ share/locale/uk/LC_MESSAGES/aqualung.mo
 %%DATADIR%%/icon_32.png
 %%DATADIR%%/icon_48.png
 %%DATADIR%%/icon_64.png
+%%DATADIR%%/inet.png
 %%DATADIR%%/logo.png
 %%DATADIR%%/metadata.png
 %%DATADIR%%/ms-artist.png
-%%DATADIR%%/ms-cdda.png
 %%DATADIR%%/ms-cdda-disk.png
 %%DATADIR%%/ms-cdda-nodisk.png
+%%DATADIR%%/ms-cdda.png
+%%DATADIR%%/ms-feed.png
+%%DATADIR%%/ms-podcast.png
 %%DATADIR%%/ms-record.png
 %%DATADIR%%/ms-store.png
 %%DATADIR%%/ms-track.png
@@ -60,8 +60,6 @@ share/locale/uk/LC_MESSAGES/aqualung.mo
 %%DATADIR%%/skin/metal/bg4.png
 %%DATADIR%%/skin/metal/bg5.png
 %%DATADIR%%/skin/metal/bg6.png
-%%DATADIR%%/skin/metal/bg7.png
-%%DATADIR%%/skin/metal/bg8.png
 %%DATADIR%%/skin/metal/next.png
 %%DATADIR%%/skin/metal/pause.png
 %%DATADIR%%/skin/metal/play.png
@@ -72,6 +70,15 @@ share/locale/uk/LC_MESSAGES/aqualung.mo
 %%DATADIR%%/skin/metal/scale_bg.png
 %%DATADIR%%/skin/metal/shuffle.png
 %%DATADIR%%/skin/metal/stop.png
+%%DATADIR%%/skin/no_skin/next.png
+%%DATADIR%%/skin/no_skin/pause.png
+%%DATADIR%%/skin/no_skin/play.png
+%%DATADIR%%/skin/no_skin/prev.png
+%%DATADIR%%/skin/no_skin/rc
+%%DATADIR%%/skin/no_skin/repeat.png
+%%DATADIR%%/skin/no_skin/repeat_all.png
+%%DATADIR%%/skin/no_skin/shuffle.png
+%%DATADIR%%/skin/no_skin/stop.png
 %%DATADIR%%/skin/ocean/bg.png
 %%DATADIR%%/skin/ocean/bg2.png
 %%DATADIR%%/skin/ocean/bg3.png
@@ -114,9 +121,15 @@ share/locale/uk/LC_MESSAGES/aqualung.mo
 %%DATADIR%%/skin/woody/wood4.png
 %%DATADIR%%/skin/woody/wood5.png
 %%DATADIR%%/skin/woody/wood6.png
+%%DATADIR%%/tab-close.png
+share/locale/de/LC_MESSAGES/aqualung.mo
+share/locale/hu/LC_MESSAGES/aqualung.mo
+share/locale/it/LC_MESSAGES/aqualung.mo
+share/locale/uk/LC_MESSAGES/aqualung.mo
 @dirrm %%DATADIR%%/skin/dark
 @dirrm %%DATADIR%%/skin/default
 @dirrm %%DATADIR%%/skin/metal
+@dirrm %%DATADIR%%/skin/no_skin
 @dirrm %%DATADIR%%/skin/ocean
 @dirrm %%DATADIR%%/skin/plain
 @dirrm %%DATADIR%%/skin/woody