Changes 3.5.1:

This release contains updated translations and fixes for a few bugs.

9 files changed, 299 insertions, 449 deletions

diff --git a/audio/audacious-plugins/Makefile b/audio/audacious-plugins/Makefile
index ee1dba12f8e..804e609bce5 100644
--- a/audio/audacious-plugins/Makefile
+++ b/audio/audacious-plugins/Makefile
@@ -1,19 +1,26 @@
-# $NetBSD: Makefile,v 1.57 2014/06/09 14:18:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.58 2014/10/09 15:02:42 adam Exp $
 
-DISTNAME=		audacious-plugins-1.5.1
-PKGREVISION=		46
-CATEGORIES=		audio
-MASTER_SITES=		http://distfiles.atheme.org/
-EXTRACT_SUFX=		.tgz
+DISTNAME=	audacious-plugins-3.5.1
+CATEGORIES=	audio
+MASTER_SITES=	http://distfiles.audacious-media-player.org/
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		jfranz@bsdprojects.net
-HOMEPAGE=		http://audacious-media-player.org/
-COMMENT=		Plugins for Audacious media player
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://audacious-media-player.org/
+COMMENT=	Plugins for Audacious media player
+LICENSE=	2-clause-bsd
 
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake intltool pkg-config msgfmt
-USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake intltool pkg-config msgfmt
+GNU_CONFIGURE=		yes
+#CONFIGURE_ARGS+=	--disable-aac
+CONFIGURE_ARGS+=	--disable-amidiplug
+CONFIGURE_ARGS+=	--disable-evdevplug
+#CONFIGURE_ARGS+=	--disable-coreaudio
+CONFIGURE_ARGS+=	--disable-gnomeshortcuts
+CONFIGURE_ARGS+=	--disable-modplug
+CONFIGURE_ARGS+=	--disable-projectm
+CONFIGURE_ARGS+=	--with-ffmpeg=none
 
 .include "../../mk/compiler.mk"
 .if empty(PKGSRC_COMPILER:Mclang)
@@ -38,13 +45,6 @@ LDFLAGS+=		${LIBOSSAUDIO}
 # do not use pkgsrc' flac if it is installed
 CFLAGS+=	-I. -I../flacng -Ilibflacng
 
-CONFIGURE_ARGS+=	--disable-amidiplug
-CONFIGURE_ARGS+=	--disable-evdevplug
-CONFIGURE_ARGS+=	--disable-coreaudio
-CONFIGURE_ARGS+=	--disable-projectm
-CONFIGURE_ARGS+=	--disable-gnomeshortcuts
-CONFIGURE_ARGS+=	--disable-modplug
-
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
@@ -76,23 +76,23 @@ PLIST.oss=	yes
 .endif
 
 .include "../../audio/audacious/buildlink3.mk"
+.include "../../audio/faad2/buildlink3.mk"
+.include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libcddb/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libmpcdec/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/mpg123/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../audio/wavpack/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
-.include "../../devel/libbinio/buildlink3.mk"
-.include "../../devel/libmtp/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/libbinio/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
-.include "../../misc/libcdio/buildlink3.mk"
+.include "../../misc/libcdio-paranoia/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../net/libmms/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../www/neon/buildlink3.mk"
-.include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/audacious-plugins/PLIST b/audio/audacious-plugins/PLIST
index 9ab458d6243..5c305e4b770 100644
--- a/audio/audacious-plugins/PLIST
+++ b/audio/audacious-plugins/PLIST
@@ -1,103 +1,217 @@
-@comment $NetBSD: PLIST,v 1.9 2014/04/18 15:38:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2014/10/09 15:02:42 adam Exp $
+lib/audacious/Container/asx.so
+lib/audacious/Container/asx3.so
+lib/audacious/Container/audpl.so
 lib/audacious/Container/m3u.so
 lib/audacious/Container/pls.so
 lib/audacious/Container/xspf.so
-lib/audacious/Effect/audiocompress.so
+lib/audacious/Effect/compressor.so
+lib/audacious/Effect/crossfade.so
 lib/audacious/Effect/crystalizer.so
 lib/audacious/Effect/echo.so
 lib/audacious/Effect/ladspa.so
-lib/audacious/Effect/sndstretch.so
+lib/audacious/Effect/mixer.so
 lib/audacious/Effect/stereo.so
 lib/audacious/Effect/voice_removal.so
 lib/audacious/General/alarm.so
+lib/audacious/General/albumart.so
 lib/audacious/General/aosd.so
+lib/audacious/General/cd-menu-items.so
+lib/audacious/General/delete-files.so
+lib/audacious/General/gtkui.so
 lib/audacious/General/hotkey.so
-lib/audacious/General/mtp_up.so
+lib/audacious/General/lyricwiki.so
+lib/audacious/General/mpris2.so
 lib/audacious/General/scrobbler.so
+lib/audacious/General/search-tool.so
+lib/audacious/General/skins.so
 lib/audacious/General/song_change.so
 lib/audacious/General/statusicon.so
+lib/audacious/Input/aac-raw.so
 lib/audacious/Input/aac.so
 lib/audacious/Input/adplug.so
-lib/audacious/Input/alac.so
 lib/audacious/Input/cdaudio-ng.so
 lib/audacious/Input/console.so
-lib/audacious/Input/cuesheet.so
-lib/audacious/Input/demac.so
 lib/audacious/Input/flacng.so
 ${PLIST.midi}lib/audacious/Input/timidity.so
 lib/audacious/Input/madplug.so
 lib/audacious/Input/metronom.so
-lib/audacious/Input/musepack.so
-lib/audacious/Input/sexypsf.so
 ${PLIST.sid}lib/audacious/Input/sid.so
+lib/audacious/Input/psf2.so
 lib/audacious/Input/sndfile.so
 lib/audacious/Input/tonegen.so
-lib/audacious/Input/tta.so
 lib/audacious/Input/vorbis.so
 lib/audacious/Input/vtx.so
 lib/audacious/Input/wavpack.so
-lib/audacious/Input/wma.so
 ${PLIST.esd}lib/audacious/Output/ESD.so
-${PLIST.oss}lib/audacious/Output/OSS.so
 ${PLIST.oss4}lib/audacious/Output/OSS4.so
+lib/audacious/Input/xsf.so
 lib/audacious/Output/filewriter.so
 ${PLIST.jack}lib/audacious/Output/libjackout.so
 ${PLIST.pulse}lib/audacious/Output/pulse_audio.so
-lib/audacious/Output/null.so
-${PLIST.sun}lib/audacious/Output/sun.so
-lib/audacious/Transport/lastfm.so
+lib/audacious/Output/sdlout.so
+lib/audacious/Transport/gio.so
 lib/audacious/Transport/mms.so
 lib/audacious/Transport/neon.so
-lib/audacious/Transport/stdio.so
 lib/audacious/Visualization/blur_scope.so
-lib/audacious/Visualization/paranormal.so
-lib/audacious/Visualization/rocklight.so
-lib/audacious/Visualization/rootvis.so
-lib/audacious/Visualization/spectrum.so
-share/audacious/images/audioscrobbler.png
-share/audacious/images/audioscrobbler_badge.png
-share/audacious/paranormal/Presets/aerdan_-_bloody_vortex.pnv
-share/audacious/paranormal/Presets/aerdan_-_cloudscape.pnv
-share/audacious/paranormal/Presets/aerdan_-_cloudscape2.pnv
-share/audacious/paranormal/Presets/aerdan_-_dancing_snow.pnv
-share/audacious/paranormal/Presets/aerdan_-_portal_to_hell.pnv
-share/audacious/paranormal/Presets/aerdan_-_telestatic.pnv
-share/audacious/paranormal/Presets/nazca_-_smoke_on_the_water.pnv
-share/audacious/paranormal/Presets/nenolod_-_3d_wave.pnv
-share/audacious/paranormal/Presets/nenolod_-_aquamarine_dream.pnv
-share/audacious/paranormal/Presets/nenolod_-_beatscope.pnv
-share/audacious/paranormal/Presets/nenolod_-_branchscope.pnv
-share/audacious/paranormal/Presets/nenolod_-_bumblebees.pnv
-share/audacious/paranormal/Presets/nenolod_-_cubism.pnv
-share/audacious/paranormal/Presets/nenolod_-_flying_into_pastels.pnv
-share/audacious/paranormal/Presets/nenolod_-_interlaced.pnv
-share/audacious/paranormal/Presets/nenolod_-_kaliedoscope.pnv
-share/audacious/paranormal/Presets/nenolod_-_phosphor_flame.pnv
-share/audacious/paranormal/Presets/nenolod_-_psuedo_starfield.pnv
-share/audacious/paranormal/Presets/nenolod_-_purple_flower.pnv
-share/audacious/paranormal/Presets/nenolod_-_quakingscope.pnv
-share/audacious/paranormal/Presets/nenolod_-_quasar.pnv
-share/audacious/paranormal/Presets/nenolod_-_retroscope.pnv
-share/audacious/paranormal/Presets/nenolod_-_rush.pnv
-share/audacious/paranormal/Presets/nenolod_-_scopefun.pnv
-share/audacious/paranormal/Presets/nenolod_-_simple_yet_pretty.pnv
-share/audacious/paranormal/Presets/nenolod_-_smoke.pnv
-share/audacious/paranormal/Presets/nenolod_-_swarm.pnv
-share/audacious/paranormal/Presets/nenolod_-_technicolour_nightmare.pnv
-share/audacious/paranormal/Presets/nenolod_-_transform_fun.pnv
-share/audacious/paranormal/Presets/nenolod_-_trapped.pnv
-share/audacious/paranormal/Presets/nenolod_-_tunnel_vision.pnv
-share/audacious/paranormal/Presets/nenolod_-_value_replace_fun.pnv
-share/audacious/paranormal/Presets/nenolod_-_worms.pnv
-share/audacious/paranormal/Presets/ticpu_-_colored_beat-o-scope.pnv
+lib/audacious/Visualization/cairo-spectrum.so
+lib/audacious/Visualization/gl-spectrum.so
+share/audacious/Skins/Classic/balance.png
+share/audacious/Skins/Classic/cbuttons.png
+share/audacious/Skins/Classic/eq_ex.png
+share/audacious/Skins/Classic/eqmain.png
+share/audacious/Skins/Classic/main.png
+share/audacious/Skins/Classic/monoster.png
+share/audacious/Skins/Classic/nums_ex.png
+share/audacious/Skins/Classic/playpaus.png
+share/audacious/Skins/Classic/pledit.png
+share/audacious/Skins/Classic/pledit.txt
+share/audacious/Skins/Classic/posbar.png
+share/audacious/Skins/Classic/shufrep.png
+share/audacious/Skins/Classic/skin-classic.hints
+share/audacious/Skins/Classic/skin.hints
+share/audacious/Skins/Classic/text.png
+share/audacious/Skins/Classic/titlebar.png
+share/audacious/Skins/Classic/viscolor.txt
+share/audacious/Skins/Classic/volume.png
+share/audacious/Skins/Classic1.3/balance.png
+share/audacious/Skins/Classic1.3/cbuttons.png
+share/audacious/Skins/Classic1.3/eq_ex.png
+share/audacious/Skins/Classic1.3/eqmain.png
+share/audacious/Skins/Classic1.3/main.png
+share/audacious/Skins/Classic1.3/monoster.png
+share/audacious/Skins/Classic1.3/nums_ex.png
+share/audacious/Skins/Classic1.3/playpaus.png
+share/audacious/Skins/Classic1.3/pledit.png
+share/audacious/Skins/Classic1.3/pledit.txt
+share/audacious/Skins/Classic1.3/posbar.png
+share/audacious/Skins/Classic1.3/shufrep.png
+share/audacious/Skins/Classic1.3/skin-classic.hints
+share/audacious/Skins/Classic1.3/skin.hints
+share/audacious/Skins/Classic1.3/text.png
+share/audacious/Skins/Classic1.3/titlebar.png
+share/audacious/Skins/Classic1.3/viscolor.txt
+share/audacious/Skins/Classic1.3/volume.png
+share/audacious/Skins/Default/cbuttons.png
+share/audacious/Skins/Default/eq_ex.png
+share/audacious/Skins/Default/eqmain.png
+share/audacious/Skins/Default/main.png
+share/audacious/Skins/Default/monoster.png
+share/audacious/Skins/Default/nums_ex.png
+share/audacious/Skins/Default/playpaus.png
+share/audacious/Skins/Default/pledit.png
+share/audacious/Skins/Default/pledit.txt
+share/audacious/Skins/Default/posbar.png
+share/audacious/Skins/Default/shufrep.png
+share/audacious/Skins/Default/skin.hints
+share/audacious/Skins/Default/text.png
+share/audacious/Skins/Default/titlebar.png
+share/audacious/Skins/Default/viscolor.txt
+share/audacious/Skins/Default/volume.png
+share/audacious/Skins/Ivory/balance.png
+share/audacious/Skins/Ivory/cbuttons.png
+share/audacious/Skins/Ivory/eq_ex.png
+share/audacious/Skins/Ivory/eqmain.png
+share/audacious/Skins/Ivory/main.png
+share/audacious/Skins/Ivory/monoster.png
+share/audacious/Skins/Ivory/nums_ex.png
+share/audacious/Skins/Ivory/playpaus.png
+share/audacious/Skins/Ivory/pledit.png
+share/audacious/Skins/Ivory/pledit.txt
+share/audacious/Skins/Ivory/posbar.png
+share/audacious/Skins/Ivory/shufrep.png
+share/audacious/Skins/Ivory/skin.hints
+share/audacious/Skins/Ivory/text.png
+share/audacious/Skins/Ivory/titlebar.png
+share/audacious/Skins/Ivory/viscolor.txt
+share/audacious/Skins/Ivory/volume.png
+share/audacious/Skins/Osmosis/balance.png
+share/audacious/Skins/Osmosis/cbuttons.png
+share/audacious/Skins/Osmosis/eq_ex.png
+share/audacious/Skins/Osmosis/eqmain.png
+share/audacious/Skins/Osmosis/main.png
+share/audacious/Skins/Osmosis/monoster.png
+share/audacious/Skins/Osmosis/nums_ex.png
+share/audacious/Skins/Osmosis/playpaus.png
+share/audacious/Skins/Osmosis/pledit.png
+share/audacious/Skins/Osmosis/pledit.txt
+share/audacious/Skins/Osmosis/posbar.png
+share/audacious/Skins/Osmosis/shufrep.png
+share/audacious/Skins/Osmosis/skin.hints
+share/audacious/Skins/Osmosis/text.png
+share/audacious/Skins/Osmosis/titlebar.png
+share/audacious/Skins/Osmosis/viscolor.txt
+share/audacious/Skins/Osmosis/volume.png
+share/audacious/Skins/Refugee/cbuttons.png
+share/audacious/Skins/Refugee/eq_ex.png
+share/audacious/Skins/Refugee/eqmain.png
+share/audacious/Skins/Refugee/main.png
+share/audacious/Skins/Refugee/monoster.png
+share/audacious/Skins/Refugee/nums_ex.png
+share/audacious/Skins/Refugee/playpaus.png
+share/audacious/Skins/Refugee/pledit.png
+share/audacious/Skins/Refugee/pledit.txt
+share/audacious/Skins/Refugee/posbar.png
+share/audacious/Skins/Refugee/shufrep.png
+share/audacious/Skins/Refugee/skin.hints
+share/audacious/Skins/Refugee/text.png
+share/audacious/Skins/Refugee/titlebar.png
+share/audacious/Skins/Refugee/viscolor.txt
+share/audacious/Skins/Refugee/volume.png
+share/audacious/Skins/TinyPlayer/balance.png
+share/audacious/Skins/TinyPlayer/cbuttons.png
+share/audacious/Skins/TinyPlayer/eq_ex.png
+share/audacious/Skins/TinyPlayer/eqmain.png
+share/audacious/Skins/TinyPlayer/main.png
+share/audacious/Skins/TinyPlayer/monoster.png
+share/audacious/Skins/TinyPlayer/nums_ex.png
+share/audacious/Skins/TinyPlayer/playpaus.png
+share/audacious/Skins/TinyPlayer/pledit.png
+share/audacious/Skins/TinyPlayer/pledit.txt
+share/audacious/Skins/TinyPlayer/posbar.png
+share/audacious/Skins/TinyPlayer/shufrep.png
+share/audacious/Skins/TinyPlayer/skin.hints
+share/audacious/Skins/TinyPlayer/text.png
+share/audacious/Skins/TinyPlayer/titlebar.png
+share/audacious/Skins/TinyPlayer/viscolor.txt
+share/audacious/Skins/TinyPlayer/volume.png
+share/locale/be/LC_MESSAGES/audacious-plugins.mo
+share/locale/bg/LC_MESSAGES/audacious-plugins.mo
 share/locale/ca/LC_MESSAGES/audacious-plugins.mo
+share/locale/cmn/LC_MESSAGES/audacious-plugins.mo
 share/locale/cs/LC_MESSAGES/audacious-plugins.mo
-share/locale/cy/LC_MESSAGES/audacious-plugins.mo
+share/locale/da/LC_MESSAGES/audacious-plugins.mo
 share/locale/de/LC_MESSAGES/audacious-plugins.mo
+share/locale/el/LC_MESSAGES/audacious-plugins.mo
+share/locale/en_GB/LC_MESSAGES/audacious-plugins.mo
+share/locale/es/LC_MESSAGES/audacious-plugins.mo
+share/locale/es_AR/LC_MESSAGES/audacious-plugins.mo
+share/locale/es_MX/LC_MESSAGES/audacious-plugins.mo
 share/locale/et/LC_MESSAGES/audacious-plugins.mo
+share/locale/eu/LC_MESSAGES/audacious-plugins.mo
+share/locale/fa_IR/LC_MESSAGES/audacious-plugins.mo
+share/locale/fi/LC_MESSAGES/audacious-plugins.mo
 share/locale/fr/LC_MESSAGES/audacious-plugins.mo
+share/locale/gl/LC_MESSAGES/audacious-plugins.mo
+share/locale/hu/LC_MESSAGES/audacious-plugins.mo
+share/locale/id_ID/LC_MESSAGES/audacious-plugins.mo
+share/locale/it/LC_MESSAGES/audacious-plugins.mo
 share/locale/ja/LC_MESSAGES/audacious-plugins.mo
-share/locale/ro/LC_MESSAGES/audacious-plugins.mo
+share/locale/ko/LC_MESSAGES/audacious-plugins.mo
+share/locale/ky/LC_MESSAGES/audacious-plugins.mo
+share/locale/lt/LC_MESSAGES/audacious-plugins.mo
+share/locale/lv/LC_MESSAGES/audacious-plugins.mo
+share/locale/ml_IN/LC_MESSAGES/audacious-plugins.mo
+share/locale/pl/LC_MESSAGES/audacious-plugins.mo
+share/locale/pt_BR/LC_MESSAGES/audacious-plugins.mo
+share/locale/pt_PT/LC_MESSAGES/audacious-plugins.mo
 share/locale/ru/LC_MESSAGES/audacious-plugins.mo
+share/locale/si/LC_MESSAGES/audacious-plugins.mo
 share/locale/sk/LC_MESSAGES/audacious-plugins.mo
+share/locale/sr/LC_MESSAGES/audacious-plugins.mo
+share/locale/sr_RS/LC_MESSAGES/audacious-plugins.mo
+share/locale/ta/LC_MESSAGES/audacious-plugins.mo
 share/locale/tr/LC_MESSAGES/audacious-plugins.mo
+share/locale/uk/LC_MESSAGES/audacious-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/audacious-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/audacious-plugins.mo
diff --git a/audio/audacious-plugins/distinfo b/audio/audacious-plugins/distinfo
index 233d9adf141..57edb8933bd 100644
--- a/audio/audacious-plugins/distinfo
+++ b/audio/audacious-plugins/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2008/11/10 12:06:06 wiz Exp $
+$NetBSD: distinfo,v 1.3 2014/10/09 15:02:42 adam Exp $
 
-SHA1 (audacious-plugins-1.5.1.tgz) = 630c936027c66649795cac7327cf6ab3590d3e49
-RMD160 (audacious-plugins-1.5.1.tgz) = 4b9fc29ccf61d1a503f10f060cbdee8b148f28b8
-Size (audacious-plugins-1.5.1.tgz) = 2944448 bytes
-SHA1 (patch-aa) = 40620dde9c06925bf5cb9a0370eeaa55ec3b1f4f
+SHA1 (audacious-plugins-3.5.1.tar.bz2) = c066f79ca1f213c998b651250d02a84982556946
+RMD160 (audacious-plugins-3.5.1.tar.bz2) = b513103930905813ae047a6e021b07d7c422716b
+Size (audacious-plugins-3.5.1.tar.bz2) = 1714137 bytes
diff --git a/audio/audacious-plugins/patches/patch-aa b/audio/audacious-plugins/patches/patch-aa
deleted file mode 100644
index 4c99218a5a3..00000000000
--- a/audio/audacious-plugins/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/10/20 09:32:19 wiz Exp $
-
---- src/mtp_up/mtp.c.orig	2008-03-13 22:22:36.000000000 +0000
-+++ src/mtp_up/mtp.c
-@@ -199,7 +199,7 @@ gint upload_file(Tuple *from_tuple)

- #if DEBUG

-     g_print("Uploading track '%s'\n",filename);

- #endif

--    ret = LIBMTP_Send_Track_From_File(mtp_device, filename , gentrack, NULL , NULL, parent_id);

-+    ret = LIBMTP_Send_Track_From_File(mtp_device, filename , gentrack, NULL , NULL);

-     LIBMTP_destroy_track_t(gentrack);

-     if (ret == 0) 

-         g_print("Track upload finished!\n");

diff --git a/audio/audacious/Makefile b/audio/audacious/Makefile
index 2f204fd6565..91064440c81 100644
--- a/audio/audacious/Makefile
+++ b/audio/audacious/Makefile
@@ -1,53 +1,36 @@
-# $NetBSD: Makefile,v 1.37 2014/05/05 00:47:35 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.38 2014/10/09 15:02:42 adam Exp $
 
-DISTNAME=		audacious-1.5.1
-PKGREVISION=		23
-CATEGORIES=		audio
-MASTER_SITES=		http://distfiles.atheme.org/
-EXTRACT_SUFX=		.tbz2
+DISTNAME=	audacious-3.5.1
+CATEGORIES=	audio
+MASTER_SITES=	http://distfiles.audacious-media-player.org/
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		jfranz@bsdprojects.net
-HOMEPAGE=		http://audacious-media-player.org/
-COMMENT=		Media player based on BMP and XMMS
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://audacious-media-player.org/
+COMMENT=	Media player based on BMP and XMMS
+LICENSE=	2-clause-bsd
 
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake intltool msgfmt pkg-config
-USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
-
-CONFIGURE_ARGS+=	--enable-chardet --enable-nls
-
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
+GNU_CONFIGURE=		yes
+# requires libguess which is not available any more
+CONFIGURE_ARGS+=	--disable-chardet
 PKGCONFIG_OVERRIDE+=	audacious.pc.in
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.audacious
-PKG_SUPPORTED_OPTIONS=	inet6
-PKG_SUGGESTED_OPTIONS=	inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
+.include "../../mk/bsd.prefs.mk"
+# XXX does not solve linking problem completely
+.if ${OPSYS} == "Darwin"
+LDFLAGS+=	-flat_namespace -undefined suppress
 .endif
 
-# for backtrace
-.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
-LIBS+=  -lexecinfo
-.endif
-
-LIBS.SunOS+=		-lm -lX11 -lICE -lgmodule-2.0
-LDFLAGS.DragonFly=	-lm -lX11 -lICE -lgmodule-2.0
-
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libmcs/buildlink3.mk"
-.include "../../devel/libmowgli/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/audacious/PLIST b/audio/audacious/PLIST
index 04c1c1ff6eb..71761a45c72 100644
--- a/audio/audacious/PLIST
+++ b/audio/audacious/PLIST
@@ -1,318 +1,114 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:32:02 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/10/09 15:02:42 adam Exp $
 bin/audacious
 bin/audtool
-include/audacious/audconfig.h
-include/audacious/audctrl.h
-include/audacious/auddrct.h
-include/audacious/configdb.h
-include/audacious/custom_uri.h
-include/audacious/dbus-service.h
-include/audacious/dbus.h
-include/audacious/discovery.h
-include/audacious/eventqueue.h
-include/audacious/flow.h
-include/audacious/hook.h
+include/audacious/api-alias-begin.h
+include/audacious/api-alias-end.h
+include/audacious/api-define-begin.h
+include/audacious/api-define-end.h
+include/audacious/api.h
+include/audacious/audtag.h
+include/audacious/debug.h
+include/audacious/drct-api.h
+include/audacious/drct.h
 include/audacious/i18n.h
-include/audacious/id3tag.h
+include/audacious/input-api.h
 include/audacious/input.h
-include/audacious/main.h
-include/audacious/mime.h
-include/audacious/output.h
-include/audacious/playback.h
+include/audacious/misc-api.h
+include/audacious/misc.h
+include/audacious/playlist-api.h
 include/audacious/playlist.h
-include/audacious/playlist_container.h
 include/audacious/plugin.h
-include/audacious/rcfile.h
-include/audacious/strings.h
-include/audacious/tuple.h
-include/audacious/tuple_compiler.h
-include/audacious/tuple_formatter.h
-include/audacious/ui_fileinfopopup.h
-include/audacious/ui_plugin_menu.h
-include/audacious/ui_preferences.h
-include/audacious/util.h
-include/audacious/vfs.h
-include/audacious/vfs_buffer.h
-include/audacious/vfs_buffered_file.h
-include/libSAD/common.h
-include/libSAD/dither.h
-include/libSAD/libSAD.h
-lib/libaudclient.so
-lib/libaudclient.so.1
-lib/libaudclient.so.1.0.0
-lib/libaudid3tag.so
-lib/libaudid3tag.so.1
-lib/libaudid3tag.so.1.0.0
+include/audacious/plugins-api.h
+include/audacious/plugins.h
+include/audacious/preferences.h
+include/audacious/types.h
+include/libaudcore/audio.h
+include/libaudcore/audstrings.h
+include/libaudcore/core.h
+include/libaudcore/hook.h
+include/libaudcore/index.h
+include/libaudcore/inifile.h
+include/libaudcore/multihash.h
+include/libaudcore/tinylock.h
+include/libaudcore/tuple.h
+include/libaudcore/vfs.h
+include/libaudcore/vfs_async.h
+include/libaudgui/libaudgui-gtk.h
+include/libaudgui/libaudgui.h
+include/libaudgui/list.h
+include/libaudgui/menu.h
+lib/libaudcore.so
+lib/libaudcore.so.2
+lib/libaudcore.so.2.0.0
+lib/libaudgui.so
+lib/libaudgui.so.2
+lib/libaudgui.so.2.0.0
+lib/libaudtag.so
+lib/libaudtag.so.1
+lib/libaudtag.so.1.0.0
 lib/pkgconfig/audacious.pc
-lib/pkgconfig/audclient.pc
 man/man1/audacious.1
 man/man1/audtool.1
 share/applications/audacious.desktop
-share/audacious/Skins/Classic/balance.png
-share/audacious/Skins/Classic/cbuttons.png
-share/audacious/Skins/Classic/eq_ex.png
-share/audacious/Skins/Classic/eqmain.png
-share/audacious/Skins/Classic/main.png
-share/audacious/Skins/Classic/monoster.png
-share/audacious/Skins/Classic/nums_ex.png
-share/audacious/Skins/Classic/playpaus.png
-share/audacious/Skins/Classic/pledit.png
-share/audacious/Skins/Classic/pledit.txt
-share/audacious/Skins/Classic/posbar.png
-share/audacious/Skins/Classic/shufrep.png
-share/audacious/Skins/Classic/skin-classic.hints
-share/audacious/Skins/Classic/skin.hints
-share/audacious/Skins/Classic/text.png
-share/audacious/Skins/Classic/titlebar.png
-share/audacious/Skins/Classic/viscolor.txt
-share/audacious/Skins/Classic/volume.png
-share/audacious/Skins/Classic1.3/balance.png
-share/audacious/Skins/Classic1.3/cbuttons.png
-share/audacious/Skins/Classic1.3/eq_ex.png
-share/audacious/Skins/Classic1.3/eqmain.png
-share/audacious/Skins/Classic1.3/main.png
-share/audacious/Skins/Classic1.3/monoster.png
-share/audacious/Skins/Classic1.3/nums_ex.png
-share/audacious/Skins/Classic1.3/playpaus.png
-share/audacious/Skins/Classic1.3/pledit.png
-share/audacious/Skins/Classic1.3/pledit.txt
-share/audacious/Skins/Classic1.3/posbar.png
-share/audacious/Skins/Classic1.3/shufrep.png
-share/audacious/Skins/Classic1.3/skin-classic.hints
-share/audacious/Skins/Classic1.3/skin.hints
-share/audacious/Skins/Classic1.3/text.png
-share/audacious/Skins/Classic1.3/titlebar.png
-share/audacious/Skins/Classic1.3/viscolor.txt
-share/audacious/Skins/Classic1.3/volume.png
-share/audacious/Skins/Default/cbuttons.png
-share/audacious/Skins/Default/eq_ex.png
-share/audacious/Skins/Default/eqmain.png
-share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-down.png
-share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-insens.png
-share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-left.png
-share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-right.png
-share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-up.png
-share/audacious/Skins/Default/gtk-2.0/Buttons/button-insensitive.png
-share/audacious/Skins/Default/gtk-2.0/Buttons/button-normal.png
-share/audacious/Skins/Default/gtk-2.0/Buttons/button-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check1.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check2.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check3.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check4.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check5.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check6.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option1.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option2.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option3.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option4.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option5.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option6.png
-share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-end.png
-share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-start.png
-share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame.png
-share/audacious/Skins/Default/gtk-2.0/Handles/handle-h.png
-share/audacious/Skins/Default/gtk-2.0/Handles/handle-v.png
-share/audacious/Skins/Default/gtk-2.0/Lines/line-h.png
-share/audacious/Skins/Default/gtk-2.0/Lines/line-v.png
-share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-insens.png
-share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-prelight.png
-share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-pressed.png
-share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header.png
-share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menu.png
-share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item-active.png
-share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item.png
-share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar.png
-share/audacious/Skins/Default/gtk-2.0/Others/null.png
-share/audacious/Skins/Default/gtk-2.0/Others/ruler.png
-share/audacious/Skins/Default/gtk-2.0/Panel/panel-bg.png
-share/audacious/Skins/Default/gtk-2.0/ProgressBar/progressbar-horiz.png
-share/audacious/Skins/Default/gtk-2.0/ProgressBar/trough-progressbar-horiz.png
-share/audacious/Skins/Default/gtk-2.0/Range/slider-horiz-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Range/slider-horiz.png
-share/audacious/Skins/Default/gtk-2.0/Range/slider-vert-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Range/slider-vert.png
-share/audacious/Skins/Default/gtk-2.0/Range/trough-horizontal.png
-share/audacious/Skins/Default/gtk-2.0/Range/trough-vertical.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz-pre.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert-pre.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-horiz-pre.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-horiz.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-vert-pre.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-vert.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-down-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-down.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-left-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-left.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-right-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-right.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-up-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-up.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
-share/audacious/Skins/Default/gtk-2.0/Shadows/shadow-in.png
-share/audacious/Skins/Default/gtk-2.0/Shadows/shadow-out.png
-share/audacious/Skins/Default/gtk-2.0/Shadows/text-.png
-share/audacious/Skins/Default/gtk-2.0/Shadows/text-entry.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-down-disable.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-down-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-down.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-up-disable.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-up-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-up.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-bottom-left.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-bottom-right.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-left-bottom.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-left-top.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-right-bottom.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-right-top.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-current.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-left.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-right.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/notebook.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-bottom-active.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-bottom.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-left-active.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-left.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-right-active.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-right.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-top-active.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-top.png
-share/audacious/Skins/Default/gtk-2.0/Toolbar/toolbar.png
-share/audacious/Skins/Default/gtk-2.0/gtkrc
-share/audacious/Skins/Default/gtk-2.0/panel.rc
-share/audacious/Skins/Default/main.png
-share/audacious/Skins/Default/monoster.png
-share/audacious/Skins/Default/nums_ex.png
-share/audacious/Skins/Default/playpaus.png
-share/audacious/Skins/Default/pledit.png
-share/audacious/Skins/Default/pledit.txt
-share/audacious/Skins/Default/posbar.png
-share/audacious/Skins/Default/shufrep.png
-share/audacious/Skins/Default/skin.hints
-share/audacious/Skins/Default/text.png
-share/audacious/Skins/Default/titlebar.png
-share/audacious/Skins/Default/viscolor.txt
-share/audacious/Skins/Default/volume.png
-share/audacious/Skins/Ivory/balance.png
-share/audacious/Skins/Ivory/cbuttons.png
-share/audacious/Skins/Ivory/eq_ex.png
-share/audacious/Skins/Ivory/eqmain.png
-share/audacious/Skins/Ivory/main.png
-share/audacious/Skins/Ivory/monoster.png
-share/audacious/Skins/Ivory/nums_ex.png
-share/audacious/Skins/Ivory/playpaus.png
-share/audacious/Skins/Ivory/pledit.png
-share/audacious/Skins/Ivory/pledit.txt
-share/audacious/Skins/Ivory/posbar.png
-share/audacious/Skins/Ivory/shufrep.png
-share/audacious/Skins/Ivory/skin.hints
-share/audacious/Skins/Ivory/text.png
-share/audacious/Skins/Ivory/titlebar.png
-share/audacious/Skins/Ivory/viscolor.txt
-share/audacious/Skins/Ivory/volume.png
-share/audacious/Skins/Osmosis/balance.png
-share/audacious/Skins/Osmosis/cbuttons.png
-share/audacious/Skins/Osmosis/eq_ex.png
-share/audacious/Skins/Osmosis/eqmain.png
-share/audacious/Skins/Osmosis/main.png
-share/audacious/Skins/Osmosis/monoster.png
-share/audacious/Skins/Osmosis/nums_ex.png
-share/audacious/Skins/Osmosis/playpaus.png
-share/audacious/Skins/Osmosis/pledit.png
-share/audacious/Skins/Osmosis/pledit.txt
-share/audacious/Skins/Osmosis/posbar.png
-share/audacious/Skins/Osmosis/shufrep.png
-share/audacious/Skins/Osmosis/skin.hints
-share/audacious/Skins/Osmosis/text.png
-share/audacious/Skins/Osmosis/titlebar.png
-share/audacious/Skins/Osmosis/viscolor.txt
-share/audacious/Skins/Osmosis/volume.png
-share/audacious/Skins/Refugee/cbuttons.png
-share/audacious/Skins/Refugee/eq_ex.png
-share/audacious/Skins/Refugee/eqmain.png
-share/audacious/Skins/Refugee/main.png
-share/audacious/Skins/Refugee/monoster.png
-share/audacious/Skins/Refugee/nums_ex.png
-share/audacious/Skins/Refugee/playpaus.png
-share/audacious/Skins/Refugee/pledit.png
-share/audacious/Skins/Refugee/pledit.txt
-share/audacious/Skins/Refugee/posbar.png
-share/audacious/Skins/Refugee/shufrep.png
-share/audacious/Skins/Refugee/skin.hints
-share/audacious/Skins/Refugee/text.png
-share/audacious/Skins/Refugee/titlebar.png
-share/audacious/Skins/Refugee/viscolor.txt
-share/audacious/Skins/Refugee/volume.png
-share/audacious/Skins/TinyPlayer/balance.png
-share/audacious/Skins/TinyPlayer/cbuttons.png
-share/audacious/Skins/TinyPlayer/eq_ex.png
-share/audacious/Skins/TinyPlayer/eqmain.png
-share/audacious/Skins/TinyPlayer/main.png
-share/audacious/Skins/TinyPlayer/monoster.png
-share/audacious/Skins/TinyPlayer/nums_ex.png
-share/audacious/Skins/TinyPlayer/playpaus.png
-share/audacious/Skins/TinyPlayer/pledit.png
-share/audacious/Skins/TinyPlayer/pledit.txt
-share/audacious/Skins/TinyPlayer/posbar.png
-share/audacious/Skins/TinyPlayer/shufrep.png
-share/audacious/Skins/TinyPlayer/skin.hints
-share/audacious/Skins/TinyPlayer/text.png
-share/audacious/Skins/TinyPlayer/titlebar.png
-share/audacious/Skins/TinyPlayer/viscolor.txt
-share/audacious/Skins/TinyPlayer/volume.png
+share/audacious/AUTHORS
+share/audacious/COPYING
 share/audacious/images/about-logo.png
+share/audacious/images/album.png
 share/audacious/images/appearance.png
-share/audacious/images/audacious_eq.xpm
-share/audacious/images/audacious_player.xpm
-share/audacious/images/audacious_playlist.xpm
 share/audacious/images/audio.png
 share/audacious/images/connectivity.png
-share/audacious/images/menu_playlist.png
-share/audacious/images/menu_plugin.png
-share/audacious/images/menu_queue_toggle.png
-share/audacious/images/menu_randomize_playlist.png
-share/audacious/images/mouse.png
-share/audacious/images/playback.png
+share/audacious/images/info.png
 share/audacious/images/playlist.png
 share/audacious/images/plugins.png
-share/audacious/images/replay_gain.png
-share/audacious/ui/carbon-menubar.ui
-share/audacious/ui/equalizer.ui
-share/audacious/ui/mainwin.ui
-share/audacious/ui/playlist.ui
+share/icons/hicolor/48x48/apps/audacious.png
+share/icons/hicolor/scalable/apps/audacious.svg
+share/locale/ast/LC_MESSAGES/audacious.mo
+share/locale/be/LC_MESSAGES/audacious.mo
 share/locale/bg/LC_MESSAGES/audacious.mo
-share/locale/br/LC_MESSAGES/audacious.mo
 share/locale/ca/LC_MESSAGES/audacious.mo
+share/locale/cmn/LC_MESSAGES/audacious.mo
 share/locale/cs/LC_MESSAGES/audacious.mo
-share/locale/cy/LC_MESSAGES/audacious.mo
+share/locale/da/LC_MESSAGES/audacious.mo
 share/locale/de/LC_MESSAGES/audacious.mo
 share/locale/el/LC_MESSAGES/audacious.mo
+share/locale/en_GB/LC_MESSAGES/audacious.mo
+share/locale/eo/LC_MESSAGES/audacious.mo
 share/locale/es/LC_MESSAGES/audacious.mo
+share/locale/es_AR/LC_MESSAGES/audacious.mo
+share/locale/es_MX/LC_MESSAGES/audacious.mo
 share/locale/et/LC_MESSAGES/audacious.mo
+share/locale/eu/LC_MESSAGES/audacious.mo
+share/locale/fa_IR/LC_MESSAGES/audacious.mo
 share/locale/fi/LC_MESSAGES/audacious.mo
 share/locale/fr/LC_MESSAGES/audacious.mo
-share/locale/hi/LC_MESSAGES/audacious.mo
-share/locale/hr/LC_MESSAGES/audacious.mo
+share/locale/gl/LC_MESSAGES/audacious.mo
+share/locale/he/LC_MESSAGES/audacious.mo
 share/locale/hu/LC_MESSAGES/audacious.mo
+share/locale/id_ID/LC_MESSAGES/audacious.mo
 share/locale/it/LC_MESSAGES/audacious.mo
 share/locale/ja/LC_MESSAGES/audacious.mo
-share/locale/ka/LC_MESSAGES/audacious.mo
 share/locale/ko/LC_MESSAGES/audacious.mo
+share/locale/ky/LC_MESSAGES/audacious.mo
 share/locale/lt/LC_MESSAGES/audacious.mo
-share/locale/mk/LC_MESSAGES/audacious.mo
+share/locale/lv/LC_MESSAGES/audacious.mo
+share/locale/ml_IN/LC_MESSAGES/audacious.mo
+share/locale/ms/LC_MESSAGES/audacious.mo
 share/locale/nl/LC_MESSAGES/audacious.mo
 share/locale/pl/LC_MESSAGES/audacious.mo
 share/locale/pt_BR/LC_MESSAGES/audacious.mo
+share/locale/pt_PT/LC_MESSAGES/audacious.mo
 share/locale/ro/LC_MESSAGES/audacious.mo
 share/locale/ru/LC_MESSAGES/audacious.mo
+share/locale/si/LC_MESSAGES/audacious.mo
 share/locale/sk/LC_MESSAGES/audacious.mo
+share/locale/sq/LC_MESSAGES/audacious.mo
 share/locale/sr/LC_MESSAGES/audacious.mo
-share/locale/sr@Latn/LC_MESSAGES/audacious.mo
+share/locale/sr@latin/LC_MESSAGES/audacious.mo
+share/locale/sr_RS/LC_MESSAGES/audacious.mo
 share/locale/sv/LC_MESSAGES/audacious.mo
+share/locale/ta/LC_MESSAGES/audacious.mo
 share/locale/tr/LC_MESSAGES/audacious.mo
 share/locale/uk/LC_MESSAGES/audacious.mo
+share/locale/vi/LC_MESSAGES/audacious.mo
 share/locale/zh_CN/LC_MESSAGES/audacious.mo
 share/locale/zh_TW/LC_MESSAGES/audacious.mo
-share/pixmaps/audacious.png
diff --git a/audio/audacious/buildlink3.mk b/audio/audacious/buildlink3.mk
index b4dd7d0b7b3..1046d661202 100644
--- a/audio/audacious/buildlink3.mk
+++ b/audio/audacious/buildlink3.mk
@@ -1,25 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.28 2014/05/05 00:47:35 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2014/10/09 15:02:42 adam Exp $
 
 BUILDLINK_TREE+=	audacious
 
 .if !defined(AUDACIOUS_BUILDLINK3_MK)
 AUDACIOUS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.audacious+=	audacious>=1.5.0
-BUILDLINK_ABI_DEPENDS.audacious+=	audacious>=1.5.1nb23
+BUILDLINK_API_DEPENDS.audacious+=	audacious>=3.5.1
+BUILDLINK_ABI_DEPENDS.audacious+=	audacious>=3.5.1
 BUILDLINK_PKGSRCDIR.audacious?=	../../audio/audacious
 
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libmcs/buildlink3.mk"
-.include "../../devel/libmowgli/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .endif # AUDACIOUS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-audacious
diff --git a/audio/audacious/distinfo b/audio/audacious/distinfo
index 5e96e040a9c..fecf62f34dd 100644
--- a/audio/audacious/distinfo
+++ b/audio/audacious/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.5 2012/05/06 19:12:22 dholland Exp $
+$NetBSD: distinfo,v 1.6 2014/10/09 15:02:42 adam Exp $
 
-SHA1 (audacious-1.5.1.tbz2) = 571ed77333c4d85dab901770f6640501930a748c
-RMD160 (audacious-1.5.1.tbz2) = 1748b7075cef3fd0d41fb74c44109e294433d03b
-Size (audacious-1.5.1.tbz2) = 1374028 bytes
-SHA1 (patch-aa) = a95588e0f2c27f1f520cb687421f5d33e01e5155
-SHA1 (patch-src_audacious_i18n_h) = a0524ed265fb1298cf741f5c3af2f9893bde3bfe
-SHA1 (patch-src_audacious_ui__skinned__window_c) = 1aa195373ee7a2542a8d4e2b71b611a533c00483
+SHA1 (audacious-3.5.1.tar.bz2) = 6931871277f188eb2297842e76222be66dd7bbbe
+RMD160 (audacious-3.5.1.tar.bz2) = 8278c1a1173e38f61097f284cc0c8a4c8c26e97e
+Size (audacious-3.5.1.tar.bz2) = 446632 bytes
diff --git a/audio/audacious/patches/patch-aa b/audio/audacious/patches/patch-aa
deleted file mode 100644
index 1514d3c12b5..00000000000
--- a/audio/audacious/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2011/04/21 20:01:03 hans Exp $
-
---- configure.orig	2008-05-24 00:00:38.000000000 +0200
-+++ configure	2011-04-21 21:10:43.769673417 +0200
-@@ -2291,15 +2291,15 @@ echo "${ECHO_T}Mac OS X" >&6; }
- echo "${ECHO_T}Solaris" >&6; }
- 			LIB_CPPFLAGS='-DPIC'
- 			LIB_CFLAGS='-fPIC'
--			LIB_LDFLAGS='-shared -fPIC -Wl,-soname,${LIB}.${LIB_MAJOR}.${LIB_MINOR}'
-+			LIB_LDFLAGS='-shared -fPIC -Wl,-soname,${LIB}.${LIB_MAJOR}'
- 			LIB_PREFIX='lib'
- 			LIB_SUFFIX='.so'
- 			PLUGIN_CPPFLAGS='-DPIC'
- 			PLUGIN_CFLAGS='-fPIC'
- 			PLUGIN_LDFLAGS='-shared -fPIC'
- 			PLUGIN_SUFFIX='.so'
--			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
--			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
-+			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
-+			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
- 			CLEAN_LIB=''
- 			;;
- 		*-*-cygwin | *-*-mingw32)