6 files changed, 37 insertions, 72 deletions

diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index 6785ad6798d4..466ae85d5cea 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -2,59 +2,50 @@
 # $FreeBSD$
 
 PORTNAME=	aqualung
-DISTVERSION=	0.9beta11
-PORTREVISION=	22
+DISTVERSION=	1.0-rc1
 CATEGORIES=	audio
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \
- 		http://wickedmachine.net/mirror/
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Music player with rich features
 
-LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libFLAC.so:${PORTSDIR}/audio/flac \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		liboggz.so:${PORTSDIR}/audio/liboggz \
-		libspeex.so:${PORTSDIR}/audio/speex \
+LICENSE=	GPLv2 # (or later)
+
+LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
+		libmp3lame.so:${PORTSDIR}/audio/lame \
+		libcddb.so:${PORTSDIR}/audio/libcddb \
 		libmad.so:${PORTSDIR}/audio/libmad \
 		libmodplug.so:${PORTSDIR}/audio/libmodplug \
-		libmpcdec.so:${PORTSDIR}/audio/musepack \
+		liboggz.so:${PORTSDIR}/audio/liboggz \
+		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libmac.so:${PORTSDIR}/audio/mac \
-		libtag.so:${PORTSDIR}/audio/taglib \
-		liblrdf.so:${PORTSDIR}/textproc/liblrdf \
-		libcdio.so:${PORTSDIR}/sysutils/libcdio \
-		libmp3lame.so:${PORTSDIR}/audio/lame \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
+		libmpcdec.so:${PORTSDIR}/audio/musepack \
+		libspeex.so:${PORTSDIR}/audio/speex \
 		libwavpack.so:${PORTSDIR}/audio/wavpack \
-		libxslt.so:${PORTSDIR}/textproc/libxslt \
-		libcddb.so:${PORTSDIR}/audio/libcddb \
-		libstrfunc.so:${PORTSDIR}/devel/libstrfunc
+		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
+		libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia \
+		liblrdf.so:${PORTSDIR}/textproc/liblrdf
 
-USES=		gmake pkgconfig gettext compiler:nestedfct
-USE_GNOME=	gtk20 libxml2
+USES=		gettext lua:51 pkgconfig
+USE_GNOME=	gtk20 libxml2 libxslt
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-transform-name="" --with-alsa=no --with-ifp=no \
-		--with-cdda=no
+CONFIGURE_ARGS=	--with-alsa=no --with-ifp=no
+
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lstrfunc
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	JACK PULSEAUDIO DOCS
+DESKTOP_ENTRIES="Aqualung" "" "${DATADIR}/general.png" "aqualung" \
+		"Audio;AudioVideo;GTK;" ""
+
+OPTIONS_DEFINE=		DOCS JACK PULSEAUDIO
 
-JACK_CONFIGURE_OFF=	--with-jack=no
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 JACK_CONFIGURE_ON=	--with-jack=yes
-
-PULSEAUDIO_CONFIGURE_OFF=	--with-pulse=no
-PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
+JACK_CONFIGURE_OFF=	--with-jack=no
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ON=	--with-pulse=yes
-
-post-patch:
-	@${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
+PULSEAUDIO_CONFIGURE_OFF=	--with-pulse=no
 
 .include <bsd.port.mk>
diff --git a/audio/aqualung/distinfo b/audio/aqualung/distinfo
index 01d65d0a6551..43a9d375ef8a 100644
--- a/audio/aqualung/distinfo
+++ b/audio/aqualung/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aqualung-0.9beta11.tar.gz) = 315eae4539c1039978d38bd7bc8ef965f3e9dc518c7eb6f4e9da52a9bf332ddd
-SIZE (aqualung-0.9beta11.tar.gz) = 1584700
+SHA256 (aqualung-1.0-rc1.tar.gz) = 4b6c7e8a38af9f03fb042f8133cce834f87d7f5489caf2a85e9d2d1e428ae24b
+SIZE (aqualung-1.0-rc1.tar.gz) = 1939271
diff --git a/audio/aqualung/files/patch-configure b/audio/aqualung/files/patch-configure
deleted file mode 100644
index cc6d586f7c6a..000000000000
--- a/audio/aqualung/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	2010-02-01 00:30:18.000000000 +0800
-+++ configure	2012-08-19 21:26:55.000000000 +0800
-@@ -10920,6 +10920,7 @@
- 			{ $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
- 		        lrdf_LIBS=`pkg-config --libs lrdf`
-+		        lrdf_CFLAGS=`pkg-config --cflags lrdf`
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LADSPA 1
-@@ -11801,7 +11802,7 @@
- 
- CFLAGS="$CFLAGS $BUILD_CFLAGS -Wall $PLATFORM_CFLAGS $AQUALUNG_SKINDIR $AQUALUNG_LOCALEDIR $AQUALUNG_DATADIR -D_GNU_SOURCE"
- CXXFLAGS="$CFLAGS"
--CPPFLAGS="$gtk_CFLAGS $glib_CFLAGS $xml_CFLAGS $alsa_CFLAGS $jack_CFLAGS $cdda_CFLAGS $pulse_CFLAGS"
-+CPPFLAGS="$gtk_CFLAGS $glib_CFLAGS $xml_CFLAGS $alsa_CFLAGS $jack_CFLAGS $cdda_CFLAGS $pulse_CFLAGS $lrdf_CFLAGS"
- LIBS="decoder/libdecoder.a encoder/libencoder.a $gtk_LIBS $glib_LIBS $xml_LIBS $jack_LIBS $lrdf_LIBS $src_LIBS $alsa_LIBS $sndio_LIBS $oss_LIBS $sndfile_LIBS $flac_LIBS $ogg_LIBS $wavpack_LIBS $speex_LIBS $mad_LIBS $mod_LIBS $mpc_LIBS $mac_LIBS $lavc_LIBS $vorbisenc_LIBS $lame_LIBS $cdda_LIBS $cddb_LIBS $ifp_LIBS $PLATFORM_LIBS $z_LIBS $bz2_LIBS $lua_LIBS $pulse_LIBS"
- 
- 
diff --git a/audio/aqualung/files/patch-src__playlist.c b/audio/aqualung/files/patch-src__playlist.c
deleted file mode 100644
index 0f512e772868..000000000000
--- a/audio/aqualung/files/patch-src__playlist.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/playlist.c.orig	Mon Feb  5 00:46:43 2007
-+++ ./src/playlist.c	Mon Feb  5 00:47:06 2007
-@@ -51,6 +51,8 @@
- #include "playlist.h"
- #include "ifp_device.h"
- 
-+#include <strfunc.h>
-+
- extern options_t options;
- 
- extern void assign_audio_fc_filters(GtkFileChooser *fc);
diff --git a/audio/aqualung/pkg-descr b/audio/aqualung/pkg-descr
index 1649d894fd47..9091f16e6232 100644
--- a/audio/aqualung/pkg-descr
+++ b/audio/aqualung/pkg-descr
@@ -1,4 +1,4 @@
 Aqualung is a music player. It plays audio files from your filesystem
 and has the feature of inserting no gaps between adjacent tracks.
 
-WWW: http://aqualung.sourceforge.net/
+WWW: http://aqualung.factorial.hu/
diff --git a/audio/aqualung/pkg-plist b/audio/aqualung/pkg-plist
index 5157a9b0bdb7..84c024378712 100644
--- a/audio/aqualung/pkg-plist
+++ b/audio/aqualung/pkg-plist
@@ -131,7 +131,6 @@ man/man1/aqualung.1.gz
 %%DATADIR%%/skin/woody/wood6.png
 %%DATADIR%%/tab-close.png
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/split.sh
 %%PORTDOCS%%%%DOCSDIR%%/aqualung-doc.css
 %%PORTDOCS%%%%DOCSDIR%%/aqualung-doc.dtd
 %%PORTDOCS%%%%DOCSDIR%%/aqualung-doc.xml
@@ -141,20 +140,25 @@ man/man1/aqualung.1.gz
 %%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%%/split.sh
 %%PORTDOCS%%%%DOCSDIR%%/store.png
 %%PORTDOCS%%%%DOCSDIR%%/systray.png
+%%PORTDOCS%%%%DOCSDIR%%/timer.eps
 %%PORTDOCS%%%%DOCSDIR%%/timer.png
 share/locale/de/LC_MESSAGES/aqualung.mo
+share/locale/es/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/nl/LC_MESSAGES/aqualung.mo
+share/locale/pl/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
+share/locale/zh/LC_MESSAGES/aqualung.mo