diff -ru /usr/ports/audio/aqualung/Makefile aqualung/Makefile --- /usr/ports/audio/aqualung/Makefile 2010-02-06 15:30:45.000000000 -0500 +++ aqualung/Makefile 2010-02-08 00:41:09.000000000 -0500 @@ -6,17 +6,15 @@ # PORTNAME= aqualung -DISTVERSION= 0.9beta10 -PORTREVISION= 6 +DISTVERSION= 0.9beta11 CATEGORIES= audio -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.9beta10 \ +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.9beta11 \ http://wickedmachine.net/mirror/ MAINTAINER= jsa@wickedmachine.net COMMENT= Music player with rich features -LIB_DEPENDS= jack.0:${PORTSDIR}/audio/jack \ - samplerate.1:${PORTSDIR}/audio/libsamplerate \ +LIB_DEPENDS= samplerate.1:${PORTSDIR}/audio/libsamplerate \ sndfile.1:${PORTSDIR}/audio/libsndfile \ FLAC.10:${PORTSDIR}/audio/flac \ vorbis.4:${PORTSDIR}/audio/libvorbis \ @@ -41,17 +39,30 @@ USE_GNOME= pkgconfig gtk20 libxml2 USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --program-transform-name="" --with-alsa=no --with-ifp=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= * MAN1= ${PORTNAME}.1 +OPTIONS= JACK "Enable JACK low-latency audio server support" Off \ + PULSE "Enable PulseAudio sound server support" Off + +.if !defined(WITH_JACK) +CONFIGURE_ARGS+= --with-jack=no +.else +LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack +CONFIGURE_ARGS+= --with-jack=yes +.endif + +.if !defined(WITH_PULSE) +CONFIGURE_ARGS+= --with-pulse=no +.else +LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +CONFIGURE_ARGS+= --with-pulse=yes +.endif + post-patch: @${REINPLACE_CMD} -e '/^docdir/s!=.*!= ${DOCSDIR}!'\ ${WRKSRC}/doc/Makefile.in diff -ru /usr/ports/audio/aqualung/distinfo aqualung/distinfo --- /usr/ports/audio/aqualung/distinfo 2009-03-14 08:56:01.000000000 -0400 +++ aqualung/distinfo 2010-02-07 21:18:59.000000000 -0500 @@ -1,3 +1,3 @@ -MD5 (aqualung-0.9beta10.tar.gz) = 29ce07b74527e6e44f0c4c778ac85f40 -SHA256 (aqualung-0.9beta10.tar.gz) = 464568ff1b87c7a3dc6ef7d153a18e56ca8e0bfd5a173f942a00f4e59e097d67 -SIZE (aqualung-0.9beta10.tar.gz) = 1400075 +MD5 (aqualung-0.9beta11.tar.gz) = cfc470e0738e6edf9532af5f92aac959 +SHA256 (aqualung-0.9beta11.tar.gz) = 315eae4539c1039978d38bd7bc8ef965f3e9dc518c7eb6f4e9da52a9bf332ddd +SIZE (aqualung-0.9beta11.tar.gz) = 1584700 diff -ru /usr/ports/audio/aqualung/pkg-plist aqualung/pkg-plist --- /usr/ports/audio/aqualung/pkg-plist 2009-03-14 08:56:01.000000000 -0400 +++ aqualung/pkg-plist 2010-02-08 00:43:00.000000000 -0500 @@ -129,32 +129,35 @@ %%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 +%%DOCSDIR%%/README +%%DOCSDIR%%/split.sh +%%DOCSDIR%%/aqualung-doc.css +%%DOCSDIR%%/aqualung-doc.dtd +%%DOCSDIR%%/aqualung-doc.xml +%%DOCSDIR%%/aqualung-latex.xsl +%%DOCSDIR%%/aqualung-man.xsl +%%DOCSDIR%%/aqualung-xhtml-multipage.xsl +%%DOCSDIR%%/aqualung-xhtml-view.xsl +%%DOCSDIR%%/aqualung-xhtml.xsl +%%DOCSDIR%%/external.eps +%%DOCSDIR%%/timer.eps +%%DOCSDIR%%/external.png +%%DOCSDIR%%/jack.png +%%DOCSDIR%%/main.png +%%DOCSDIR%%/playlist.png +%%DOCSDIR%%/settings.png +%%DOCSDIR%%/store.png +%%DOCSDIR%%/systray.png +%%DOCSDIR%%/timer.png share/locale/de/LC_MESSAGES/aqualung.mo +share/locale/fr/LC_MESSAGES/aqualung.mo share/locale/hu/LC_MESSAGES/aqualung.mo share/locale/it/LC_MESSAGES/aqualung.mo +share/locale/ja/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 %%DOCSDIR%% @dirrm %%DATADIR%%/skin/dark @dirrm %%DATADIR%%/skin/default @dirrm %%DATADIR%%/skin/metal