update audacious to 3.5

audclient got removed upstream so this breaks some ports

audio/audacious-dumb/Makefile

@@ -16,6 +16,8 @@ RUN_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
 BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious \
 		${LOCALBASE}/lib/libdumb.a:${PORTSDIR}/audio/dumb
 
+BROKEN=		Does not work with audacious 3.5 or later
+
 USES=		gmake pkgconfig
 USE_LDCONFIG=	yes
 

audio/wmauda/Makefile

@@ -17,6 +17,8 @@ BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
 RUN_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
 LIB_DEPENDS=	libmowgli.so:${PORTSDIR}/devel/libmowgli
 
+BROKEN=		Does not work with audacious 3.5 or later
+
 USES=		gmake pkgconfig
 USE_GNOME=	gnomeprefix gtk20
 

multimedia/audacious-plugins/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	audacious-plugins
-PORTVERSION=	3.4.3
+PORTVERSION=	3.5
-PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
@@ -20,7 +19,7 @@ USE_LDCONFIG=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--disable-mpris2
-WANT_GNOME=	yes
+USE_GNOME=	glib20
 WANT_EFL=	yes
 WANT_SDL=	yes
 
@@ -28,7 +27,7 @@ PORTDOCS=	AUTHORS
 
 OPTIONS_DEFINE=	DBUS OSS4 SDLOUT ALSA CUE MP3 STATUSICON AOSD AOSDXCOMP \
 		ADPLUG VORBIS FLAC WAVPACK AAC SNDFILE MODPLUG JACK \
-		CDAUDIO SCROBBLER MMS GIO NLS RESAMPLE AMIDI GLSPECTRUM \
+		CDAUDIO SCROBBLER MMS NLS RESAMPLE AMIDI GLSPECTRUM \
 		NOTIFY BS2B FFAUDIO PULSE NEON SPEEDPITCH LIRC MP3FILEWRITER \
 		SID
 OPTIONS_DEFAULT=DBUS CUE MP3 STATUSICON AOSD AOSDXCOMP AAC CDAUDIO \
@@ -42,7 +41,6 @@ BS2B_DESC=	BS2B effect
 CDAUDIO_DESC=	CD audio input
 FFAUDIO_DESC=	FFAudio decoder
 GLSPECTRUM_DESC=OpenGL Spectrum Analyzer
-GIO_DESC=	GIO support
 OSS4_DESC=	Open Sound System 4
 PULSE_DESC=	PulseAudio support
 RESAMPLE_DESC=	Resample effect
@@ -308,21 +306,11 @@ PLIST_SUB+=	ALSAPLUGIN="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAMIDI}
-.if ${PORT_OPTIONS:MALSA}
-CONFIGURE_ARGS+=--enable-amidiplug --enable-amidiplug-alsa
-PLIST_SUB+=	AMIDIFPLUGIN="@comment "
-PLIST_SUB+=	AMIDIAPLUGIN=""
-.else
 LIB_DEPENDS+=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
-CONFIGURE_ARGS+=--enable-amidiplug --enable-amidiplug-flsyn
+CONFIGURE_ARGS+=--enable-amidiplug
-PLIST_SUB+=	AMIDIFPLUGIN=""
-PLIST_SUB+=	AMIDIAPLUGIN="@comment "
-.endif
 PLIST_SUB+=	AMIDIPLUGIN=""
 .else
 CONFIGURE_ARGS+=--disable-amidiplug
-PLIST_SUB+=	AMIDIFPLUGIN="@comment "
-PLIST_SUB+=	AMIDIAPLUGIN="@comment "
 PLIST_SUB+=	AMIDIPLUGIN="@comment "
 .endif
 
@@ -335,15 +323,6 @@ CONFIGURE_ARGS+=--disable-bs2b
 PLIST_SUB+=	BS2BPLUGIN="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MGIO}
-USE_GNOME+=	glib20
-CONFIGURE_ARGS+=--enable-gio
-PLIST_SUB+=	GIOPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-gio
-PLIST_SUB+=	GIOPLUGIN="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls

multimedia/audacious-plugins/distinfo

@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-3.4.3.tar.bz2) = bee67a8f8e84d855d4008367a61e662f1e6d15db5accda587c4025ed12462803
+SHA256 (audacious-plugins-3.5.tar.bz2) = 11bc39e5e386b218db62122411de15363cd5795f2e86ea7989d10d640f2dd4d2
-SIZE (audacious-plugins-3.4.3.tar.bz2) = 1812774
+SIZE (audacious-plugins-3.5.tar.bz2) = 1710000

multimedia/audacious-plugins/pkg-plist

@@ -1,4 +1,5 @@
 lib/audacious/Container/asx.so
+lib/audacious/Container/asx3.so
 lib/audacious/Container/audpl.so
 %%CUEPLUGIN%%lib/audacious/Container/cue.so
 lib/audacious/Container/m3u.so
@@ -19,6 +20,7 @@ lib/audacious/General/alarm.so
 lib/audacious/General/albumart.so
 %%AOSDPLUGIN%%lib/audacious/General/aosd.so
 %%CDAUDIOPLUGIN%%lib/audacious/General/cd-menu-items.so
+lib/audacious/General/delete-files.so
 %%DBUS%%lib/audacious/General/gnomeshortcuts.so
 lib/audacious/General/gtkui.so
 lib/audacious/General/hotkey.so
@@ -29,11 +31,10 @@ lib/audacious/General/search-tool.so
 lib/audacious/General/skins.so
 lib/audacious/General/song_change.so
 %%STATUSICONPLUGIN%%lib/audacious/General/statusicon.so
+%%AACPLUGIN%%lib/audacious/Input/aac-raw.so
 %%AACPLUGIN%%lib/audacious/Input/aac.so
 %%ADPLUGPLUGIN%%lib/audacious/Input/adplug.so
 %%AMIDIPLUGIN%%lib/audacious/Input/amidi-plug.so
-%%AMIDIAPLUGIN%%lib/audacious/Input/amidi-plug/ap-alsa.so
-%%AMIDIFPLUGIN%%lib/audacious/Input/amidi-plug/ap-fluidsynth.so
 %%CDAUDIOPLUGIN%%lib/audacious/Input/cdaudio-ng.so
 lib/audacious/Input/console.so
 %%FFAUDIOPLUGIN%%lib/audacious/Input/ffaudio.so
@@ -55,10 +56,9 @@ lib/audacious/Output/filewriter.so
 %%OSS4PLUGIN%%lib/audacious/Output/oss4.so
 %%PULSE%%lib/audacious/Output/pulse_audio.so
 %%SDL%%lib/audacious/Output/sdlout.so
-%%GIOPLUGIN%%lib/audacious/Transport/gio.so
+lib/audacious/Transport/gio.so
 %%MMSPLUGIN%%lib/audacious/Transport/mms.so
 %%NEONPLUGIN%%lib/audacious/Transport/neon.so
-lib/audacious/Transport/unix-io.so
 lib/audacious/Visualization/blur_scope.so
 lib/audacious/Visualization/cairo-spectrum.so
 %%GLSPECTRUM%%lib/audacious/Visualization/gl-spectrum.so
@@ -181,10 +181,6 @@ 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/ui/equalizer.ui
-share/audacious/ui/mainwin.ui
-share/audacious/ui/playlist.ui
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%NLS%%share/locale/be/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/audacious-plugins.mo
@@ -199,6 +195,7 @@ share/audacious/ui/playlist.ui
 %%NLS%%share/locale/es_MX/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/et/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/fa_IR/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/audacious-plugins.mo
@@ -217,6 +214,7 @@ share/audacious/ui/playlist.ui
 %%NLS%%share/locale/ru/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/si/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/sr_RS/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/ta/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/audacious-plugins.mo
@@ -237,8 +235,6 @@ share/audacious/ui/playlist.ui
 %%NLS%%@dirrmtry share/locale/es_AR
 %%NLS%%@dirrmtry share/locale/cmn/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/cmn
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm share/audacious/ui
 @dirrm share/audacious/Skins/TinyPlayer
 @dirrm share/audacious/Skins/Refugee
 @dirrm share/audacious/Skins/Osmosis
@@ -251,7 +247,6 @@ share/audacious/ui/playlist.ui
 @dirrm lib/audacious/Visualization
 @dirrm lib/audacious/Transport
 @dirrm lib/audacious/Output
-%%AMIDIPLUGIN%%@dirrm lib/audacious/Input/amidi-plug
 @dirrm lib/audacious/Input
 @dirrm lib/audacious/General
 @dirrm lib/audacious/Effect

multimedia/audacious/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	audacious
-PORTVERSION=	3.4.3
+PORTVERSION=	3.5
-PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
@@ -25,9 +24,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--disable-chardet --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
-OPTIONS_DEFINE=	DBUS GNOME ICONV NLS EXECINFO SSE2 CHARSET
+OPTIONS_DEFINE=	DBUS ICONV NLS EXECINFO SSE2
-OPTIONS_DEFAULT=DBUS ICONV NLS EXECINFO SSE2 CHARSET
+OPTIONS_DEFAULT=DBUS ICONV NLS EXECINFO SSE2
-CHARSET_DESC=	Build with automatic charset detection
 EXECINFO_DESC=	Build with libexecinfo support
 SSE2_DESC=	Build with SSE2 instruction set
 
@@ -46,11 +44,6 @@ PLIST_SUB+=	WITH_DBUS="@comment "
 LIB_DEPENDS+=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 .endif
 
-.if  ${PORT_OPTIONS:MGNOME}
-USE_GNOME+=	gconf2
-CONFIGURE_ARGS+=--enable-gconf
-.endif
-
 .if  ${PORT_OPTIONS:MICONV} || exists(${LOCALBASE}/lib/libiconv.so)
 USES+=		iconv
 .endif
@@ -68,13 +61,6 @@ PLIST_SUB+=	NLS="@comment "
 CONFIGURE_ARGS+=--disable-sse2
 .endif
 
-.if  ${PORT_OPTIONS:MCHARSET}
-LIB_DEPENDS+=	libguess.so:${PORTSDIR}/textproc/libguess
-CONFIGURE_ARGS+=--enable-chardet
-.else
-CONFIGURE_ARGS+=--disable-chardet
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile
@@ -87,12 +73,11 @@ post-patch:
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/audacious
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudcore.so.1.0.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudcore.so.2.0.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudgui.so.1.0.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudgui.so.2.0.0
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudtag.so.1.0.0
 .if ${PORT_OPTIONS:MDBUS}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/audtool
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudclient.so.2.0.0
 .endif
 
 .include <bsd.port.mk>

multimedia/audacious/distinfo

@@ -1,2 +1,2 @@
-SHA256 (audacious-3.4.3.tar.bz2) = 183454f4df1482e569d16d1452b3e14010daeab2fbf9dfdd82cf741a72e39f12
+SHA256 (audacious-3.5.tar.bz2) = 4180a1a922b42ef2b1fe47c708a226e03e7400b35e04ece4b2e73c01c5d42514
-SIZE (audacious-3.4.3.tar.bz2) = 485267
+SIZE (audacious-3.5.tar.bz2) = 443556

multimedia/audacious/files/patch-extra.mk.in

@@ -1,7 +1,7 @@
---- extra.mk.in.orig	2012-10-28 10:46:45.000000000 +0100
+--- extra.mk.in.orig	2014-06-19 16:24:45.729557751 +0200
-+++ extra.mk.in	2012-10-28 10:47:04.000000000 +0100
++++ extra.mk.in	2014-06-19 16:24:25.930403218 +0200
-@@ -31,3 +31,4 @@
+@@ -12,3 +12,4 @@
+ GTK_LIBS ?= @GTK_LIBS@
+ LIBGUESS_CFLAGS ?= @LIBGUESS_CFLAGS@
  LIBGUESS_LIBS ?= @LIBGUESS_LIBS@
- REGEX_CFLAGS ?= @REGEX_CFLAGS@
- REGEX_LIBS ?= @REGEX_LIBS@
 +LIBINTL ?= @LIBINTL@

multimedia/audacious/files/patch-src-audacious-output.c

@@ -1,10 +0,0 @@
---- src/audacious/output.c.orig	2012-10-28 10:48:02.000000000 +0100
-+++ src/audacious/output.c	2012-10-28 10:48:15.000000000 +0100
-@@ -24,6 +24,7 @@
- #include <unistd.h>
- 
- #include <libaudcore/hook.h>
-+#include <libaudcore/audio.h>
- 
- #include "debug.h"
- #include "effect.h"

multimedia/audacious/files/patch-src-audacious-util.c

@@ -1,14 +1,33 @@
---- src/audacious/util.c.orig	2011-11-08 17:37:12.000000000 +0100
+--- src/audacious/util.c.orig	2014-04-23 04:36:33.000000000 +0200
-+++ src/audacious/util.c	2011-11-23 20:49:18.000000000 +0100
++++ src/audacious/util.c	2014-06-19 23:47:29.000000000 +0200
-@@ -142,9 +142,9 @@
+@@ -35,6 +35,9 @@
+ 
+ #include <libaudcore/audstrings.h>
+ 
++#include <sys/types.h>
++#include <sys/sysctl.h>
++
+ #include "debug.h"
+ #include "i18n.h"
+ #include "misc.h"
+@@ -212,7 +215,19 @@
              return NULL;
-         }
+     }
  #else
--        if ((len = readlink ("/proc/self/exe", buf, size)) < 0)
+-    return NULL;
-+        if ((len = readlink ("/proc/curproc/file", buf, size)) < 0)
++    char path[PATH_MAX + 1];
-         {
++    size_t len = PATH_MAX + 1;
--            fprintf (stderr, "Cannot access /proc/self/exe: %s.\n", strerror (errno));
++    int mib[4];
-+            fprintf (stderr, "Cannot access /proc/curproc/file: %s.\n", strerror (errno));
++
-             g_free (buf);
++    mib[0] = CTL_KERN;
-             return NULL;
++    mib[1] = KERN_PROC;
-         }
++    mib[2] = KERN_PROC_PATHNAME;
++    mib[3] = -1;
++
++    if (sysctl(mib, 4, &path, &len, NULL, 0) != 0)
++        return NULL;
++
++    return str_get (path);
+ #endif
+ }
+ 

multimedia/audacious/files/patch-src_audtool_Makefile

@@ -1,9 +1,8 @@
---- src/audtool/Makefile.orig        2012-05-07 10:04:29.639672532 +0300
+--- src/audtool/Makefile.orig	2014-06-19 16:33:05.570367015 +0200
-+++ src/audtool/Makefile        2012-05-07 10:04:45.691668909 +0300
++++ src/audtool/Makefile	2014-06-19 16:33:24.317364894 +0200
-@@ -20,4 +20,5 @@ CPPFLAGS := -I.. -I../.. \
+@@ -15,4 +15,4 @@
- LIBS := -L../libaudclient -laudclient \
+ include ../../extra.mk
-         ${LIBS} \
+ 
-         ${DBUS_LIBS} \
+ CPPFLAGS := -I../.. -I../dbus ${CPPFLAGS} ${GLIB_CFLAGS} ${GIO_CFLAGS}
--        ${GTK_LIBS}
+-LIBS := ../dbus/aud-dbus.a ${LIBS} ${GLIB_LIBS} ${GIO_LIBS}
-+        ${GTK_LIBS} \
++LIBS := ../dbus/aud-dbus.a ${LIBS} ${GLIB_LIBS} ${GIO_LIBS} ${LIBINTL}
-+        ${LIBINTL}

multimedia/audacious/pkg-plist

@@ -5,14 +5,13 @@ include/audacious/api-alias-end.h
 include/audacious/api-define-begin.h
 include/audacious/api-define-end.h
 include/audacious/api.h
-%%WITH_DBUS%%include/audacious/audctrl.h
 include/audacious/audtag.h
-include/audacious/dbus-service.h
-include/audacious/dbus.h
 include/audacious/debug.h
 include/audacious/drct-api.h
 include/audacious/drct.h
 include/audacious/i18n.h
+include/audacious/input-api.h
+include/audacious/input.h
 include/audacious/misc-api.h
 include/audacious/misc.h
 include/audacious/playlist-api.h
@@ -27,26 +26,26 @@ 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
-%%WITH_DBUS%%lib/libaudclient.so
+include/libaudgui/menu.h
-%%WITH_DBUS%%lib/libaudclient.so.2
-%%WITH_DBUS%%lib/libaudclient.so.2.0.0
 lib/libaudcore.so
-lib/libaudcore.so.1
+lib/libaudcore.so.2
-lib/libaudcore.so.1.0.0
+lib/libaudcore.so.2.0.0
 lib/libaudgui.so
-lib/libaudgui.so.1
+lib/libaudgui.so.2
-lib/libaudgui.so.1.0.0
+lib/libaudgui.so.2.0.0
 lib/libaudtag.so
 lib/libaudtag.so.1
 lib/libaudtag.so.1.0.0
 libdata/pkgconfig/audacious.pc
-libdata/pkgconfig/audclient.pc
 man/man1/audacious.1.gz
 man/man1/audtool.1.gz
 share/applications/audacious.desktop
@@ -54,13 +53,10 @@ share/applications/audacious.desktop
 %%DATADIR%%/COPYING
 %%DATADIR%%/images/about-logo.png
 %%DATADIR%%/images/album.png
-%%DATADIR%%/images/audacious.png
+%%DATADIR%%/images/appearance.png
 %%DATADIR%%/images/audio.png
 %%DATADIR%%/images/connectivity.png
 %%DATADIR%%/images/info.png
-%%DATADIR%%/images/menu_playlist.png
-%%DATADIR%%/images/menu_plugin.png
-%%DATADIR%%/images/menu_queue_toggle.png
 %%DATADIR%%/images/playlist.png
 %%DATADIR%%/images/plugins.png
 share/icons/hicolor/48x48/apps/audacious.png
@@ -85,6 +81,7 @@ share/icons/hicolor/scalable/apps/audacious.svg
 %%NLS%%share/locale/fi/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/he/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/id_ID/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/it/LC_MESSAGES/audacious.mo
@@ -106,12 +103,16 @@ share/icons/hicolor/scalable/apps/audacious.svg
 %%NLS%%share/locale/sq/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/sr@latin/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/sr_RS/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/ta/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo
+%%NLS%%@dirrmtry share/locale/sr_RS/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sr_RS
 %%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/sr@latin
 %%NLS%%@dirrmtry share/locale/si/LC_MESSAGES

net-im/pidgin-audacious-remote/Makefile

@@ -17,6 +17,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		libtool pkgconfig tar:bzip2
 
+BROKEN=		Does not work with audacious 3.5 or later
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static