update audacious to 2.4.0

4 files changed, 52 insertions, 55 deletions

diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 479c1b9fdfd0..80c989c4aec2 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	audacious
-PORTVERSION=	2.3
-PORTREVISION=	3
+PORTVERSION=	2.4.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.atheme.org/
 MASTER_SITE_SUBDIR=oliver
@@ -22,8 +21,8 @@ USE_XORG=	x11 sm
 USE_GNOME=	gtk20 libglade2
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+#CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+#		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		audacious2.1 audtool2.1
 
@@ -75,9 +74,10 @@ PLIST_SUB+=	NLS="@comment "
 post-patch:
 	@${REINPLACE_CMD} 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} 's|CPPFLAGS +=|CPPFLAGS =|g' \
-		${WRKSRC}/src/libid3tag/Makefile \
-		${WRKSRC}/src/libaudgui/Makefile
+	@${REINPLACE_CMD} 's|CPPFLAGS +=\(.*\)|CPPFLAGS =\1 -I${LOCALBASE}/include|g' \
+		${WRKSRC}/src/libaudgui/Makefile \
+		${WRKSRC}/src/libaudtag/Makefile \
+		${WRKSRC}/src/libaudcore/Makefile
 	@${REINPLACE_CMD} 's|FMT_FIXED32,|FMT_FIXED32|g; \
 		s|OUTPUT_PLUGIN_INIT_FOUND_DEVICES,|OUTPUT_PLUGIN_INIT_FOUND_DEVICES|g' \
 		${WRKSRC}/src/audacious/plugin.h
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index 7b156aaa517c..c86ee6e6dfb0 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-2.3.tgz) = b65753880c6762cdad6423df48590304
-SHA256 (audacious-2.3.tgz) = b19b3a75d4bac535231a77b6f993519b599a9619ac46c4d5627fd2bc8337416f
-SIZE (audacious-2.3.tgz) = 1564114
+MD5 (audacious-2.4.0.tgz) = 113d99a09d4faead7adc07a86eab5c80
+SHA256 (audacious-2.4.0.tgz) = f2a2d45b9cb8fc24c1c55aef72a3a397a9a35776c18a94532b1bd3238577d5d8
+SIZE (audacious-2.4.0.tgz) = 1346549
diff --git a/multimedia/audacious/files/patch-src-audacious-Makefile b/multimedia/audacious/files/patch-src-audacious-Makefile
index d05e3d1e733d..da2d0fb2702d 100644
--- a/multimedia/audacious/files/patch-src-audacious-Makefile
+++ b/multimedia/audacious/files/patch-src-audacious-Makefile
@@ -1,6 +1,6 @@
---- src/audacious/Makefile.orig	2010-04-06 22:01:24.000000000 +0200
-+++ src/audacious/Makefile	2010-04-17 13:02:28.000000000 +0200
-@@ -108,14 +108,15 @@
+--- src/audacious/Makefile.orig	2010-08-26 01:04:25.000000000 +0200
++++ src/audacious/Makefile	2010-09-09 11:07:04.000000000 +0200
+@@ -91,15 +91,16 @@
  include ../../buildsys.mk
  
  ifeq ($(USE_DBUS),yes)
@@ -13,26 +13,27 @@
  
  pre-depend: ${DBUS_BINDINGS}
  
- CPPFLAGS += -DHAVE_CONFIG_H		\
+ CPPFLAGS += -std=gnu99 \
+             -DHAVE_CONFIG_H \
 +		-I.. -I../..			\
  		${MOWGLI_CFLAGS}		\
  		${GLIB_CFLAGS}			\
  		${GTHREAD_CFLAGS}		\
-@@ -133,7 +134,7 @@
- 		-I.				\
- 		-I../libaudcore
+@@ -116,7 +117,7 @@
+ 		-I.. -I../..			\
+ 		-I./intl
  
 -LIBS += ${LDADD}						\
-+LIBS += 						\
++LIBS += 					\
+         -lm \
  		-L../libaudcore -laudcore	\
- 		${LIBINTL}						\
- 		../libguess/libguess.a			\
-@@ -144,7 +145,8 @@
- 		${DBUS_LIBS}					\
+ 		-L../libaudgui -laudgui \
+@@ -130,7 +131,8 @@
  		${MOWGLI_LIBS}					\
  		${LIBMCS_LIBS}					\
--		${REGEX_LIBS}
-+		${REGEX_LIBS}					\
+ 		${REGEX_LIBS}					\
+-		${LIBGUESS_LIBS}
++		${LIBGUESS_LIBS}				\
 +		${LDADD}
  
  LDFLAGS += ${PROG_IMPLIB_LDFLAGS} ${AUDLDFLAGS}
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 4305ec2c39ab..a1606e301757 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -1,32 +1,35 @@
+man/man1/audacious.1
+man/man1/audtool.1
 bin/audacious
 bin/audacious2
 %%WITH_DBUS%%bin/audtool
 %%WITH_DBUS%%bin/audtool2
 %%WITH_DBUS%%include/audacious/audctrl.h
 include/audacious/audconfig.h
-include/audacious/auddrct.h
 include/audacious/configdb.h
 include/audacious/dbus.h
 include/audacious/dbus-service.h
-include/audacious/equalizer_preset.h
-include/audacious/eventqueue.h
-include/audacious/flow.h
-include/audacious/hook.h
 include/audacious/i18n.h
-include/audacious/id3tag.h
-include/audacious/input.h
 include/audacious/interface.h
-include/audacious/main.h
-include/audacious/output.h
-include/audacious/playback.h
-include/audacious/playlist_container.h
 include/audacious/plugin.h
 include/audacious/preferences.h
-include/audacious/rcfile.h
-include/audacious/ui_fileinfopopup.h
-include/audacious/ui_plugin_menu.h
-include/audacious/ui_preferences.h
-include/audacious/util.h
+include/audacious/audtag.h
+include/audacious/api.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/configdb-api.h
+include/audacious/debug.h
+include/audacious/drct.h
+include/audacious/drct-api.h
+include/audacious/misc.h
+include/audacious/misc-api.h
+include/audacious/playlist.h
+include/audacious/playlist-api.h
+include/audacious/plugins.h
+include/audacious/plugins-api.h
+include/audacious/types.h
 include/libaudcore/audio.h
 include/libaudcore/audstrings.h
 include/libaudcore/index.h
@@ -39,10 +42,11 @@ include/libaudcore/md5.h
 include/libaudcore/vfs.h
 include/libaudcore/vfs_buffer.h
 include/libaudcore/vfs_buffered_file.h
+include/libaudcore/eventqueue.h
+include/libaudcore/hook.h
+include/libaudcore/vfs_async.h
 include/libaudgui/libaudgui.h
 include/libaudgui/libaudgui-gtk.h
-include/libaudtag/audtag.h
-include/libaudtag/util.h
 %%WITH_DBUS%%lib/libaudclient.so
 %%WITH_DBUS%%lib/libaudclient.so.2
 %%WITH_DBUS%%lib/libaudclient.so.2.0.0
@@ -52,16 +56,12 @@ lib/libaudcore.so.1.0.0
 lib/libaudgui.so
 lib/libaudgui.so.1
 lib/libaudgui.so.1.0.0
-lib/libaudid3tag.so
-lib/libaudid3tag.so.2
-lib/libaudid3tag.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
 share/applications/audacious2.desktop
-share/applications/audacious2-gtkui.desktop
 %%DATADIR%%/images/about-logo.png
 %%DATADIR%%/images/audacious_eq.xpm
 %%DATADIR%%/images/audacious_playlist.xpm
@@ -73,16 +73,13 @@ share/applications/audacious2-gtkui.desktop
 %%DATADIR%%/images/menu_playlist.png
 %%DATADIR%%/images/menu_plugin.png
 %%DATADIR%%/images/menu_queue_toggle.png
-%%DATADIR%%/images/menu_randomize_playlist.png
 %%DATADIR%%/images/playback.png
 %%DATADIR%%/images/playlist.png
 %%DATADIR%%/images/plugins.png
 %%DATADIR%%/images/replay_gain.png
-%%DATADIR%%/ui/carbon-menubar.ui
-%%DATADIR%%/ui/equalizer.ui
-%%DATADIR%%/ui/mainwin.ui
-%%DATADIR%%/ui/player.ui
-%%DATADIR%%/ui/playlist.ui
+share/icons/hicolor/48x48/apps/audacious.png
+share/icons/hicolor/scalable/apps/audacious.svg
+%%NLS%%share/locale/ast/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/be/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/br/LC_MESSAGES/audacious.mo
@@ -120,13 +117,12 @@ share/applications/audacious2-gtkui.desktop
 %%NLS%%share/locale/uk/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo
-share/pixmaps/audacious2.png
+share/pixmaps/audacious.png
+share/pixmaps/audacious.svg
 @dirrmtry %%DATADIR%%/images
-@dirrm %%DATADIR%%/ui
 @dirrmtry %%DATADIR%%
 @dirrm include/audacious
 @dirrm include/libaudcore
 @dirrm include/libaudgui
-@dirrm include/libaudtag
 @dirrmtry lib/audacious
 @dirrmtry share/applications