update to 1.5.0 [1]

fix the /usr/local/include/audacious/dbus.h make error

Submitted by:	Roland Smith <rsmith@xs4all.nl> [1]

9 files changed, 93 insertions, 83 deletions

diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 12ccaeec28a8..b095ed619c4a 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	audacious-plugins
-PORTVERSION=	1.4.5
-PORTREVISION=	2
+PORTVERSION=	1.5.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.atheme.org/
 EXTRACT_SUFX=	.tgz
@@ -29,7 +28,7 @@ WANT_GNOME=	yes
 WANT_EFL=	yes
 WANT_SDL=	yes
 
-PORTDOCS=	AUTHORS ChangeLog NEWS
+PORTDOCS=	AUTHORS
 
 # no ports for:
 #		PULSE		"Enable PulseAudio output plugin"	off \
diff --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo
index fd29611853d3..50d9ec884890 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-plugins-1.4.5.tgz) = ecb7802c1800ed2b10b44e7e9fea46aa
-SHA256 (audacious-plugins-1.4.5.tgz) = 5ffe377f6df0b701c8a7de7bb63c1ba1951b0a1b0f95a8841765b39204e64d07
-SIZE (audacious-plugins-1.4.5.tgz) = 3176785
+MD5 (audacious-plugins-1.5.0.tgz) = 42c82ffffd57aca612141bc106b9f51e
+SHA256 (audacious-plugins-1.5.0.tgz) = 566bc8cb73967f85fc08cb9d6de90fd4e066fa7fa137614b3c71a93eadaf6552
+SIZE (audacious-plugins-1.5.0.tgz) = 2961507
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index 51f369e5acd3..f2d5537a62eb 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -21,6 +21,7 @@ lib/audacious/Input/alac.so
 %%AUDIOCDPLUGIN%%lib/audacious/Input/cdaudio-ng.so
 lib/audacious/Input/console.so
 lib/audacious/Input/cuesheet.so
+lib/audacious/Input/demac.so
 %%FLACPLUGIN%%lib/audacious/Input/flacng.so
 %%MP3PLUGIN%%lib/audacious/Input/madplug.so
 lib/audacious/Input/metronom.so
@@ -34,7 +35,6 @@ lib/audacious/Input/tonegen.so
 %%TTAPLUGIN%%lib/audacious/Input/tta.so
 %%VORBISPLUGIN%%lib/audacious/Input/vorbis.so
 lib/audacious/Input/vtx.so
-lib/audacious/Input/wav.so
 %%WAVPACKPLUGIN%%lib/audacious/Input/wavpack.so
 %%WMAPLUGIN%%lib/audacious/Input/wma.so
 %%OSSPLUGIN%%lib/audacious/Output/OSS.so
@@ -50,44 +50,45 @@ lib/audacious/Visualization/blur_scope.so
 %%ROCKLIGHTPLUGIN%%lib/audacious/Visualization/rocklight.so
 %%ROOTPLUGIN%%lib/audacious/Visualization/rootvis.so
 lib/audacious/Visualization/spectrum.so
-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
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/aerdan_-_cloudscape.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/aerdan_-_cloudscape2.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/aerdan_-_dancing_snow.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/aerdan_-_portal_to_hell.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/aerdan_-_telestatic.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nazca_-_smoke_on_the_water.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_3d_wave.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_aquamarine_dream.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_beatscope.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_branchscope.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_bumblebees.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_cubism.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_flying_into_pastels.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_interlaced.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_kaliedoscope.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_phosphor_flame.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_psuedo_starfield.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_purple_flower.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_quakingscope.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_quasar.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_retroscope.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_rush.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_scopefun.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_simple_yet_pretty.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_smoke.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_swarm.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_technicolour_nightmare.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_transform_fun.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_trapped.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_tunnel_vision.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_value_replace_fun.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_worms.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/ticpu_-_colored_beat-o-scope.pnv
 %%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/aerdan_-_bloody_vortex.pnv
 %%NLS%%share/locale/ca/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/cy/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/de/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/et/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/audacious-plugins.mo
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index dc7c61dbbb35..dbe4106e0641 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	audacious
-PORTVERSION=	1.4.6
+PORTVERSION=	1.5.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.atheme.org/
 MASTER_SITE_SUBDIR=oliver
@@ -79,12 +79,6 @@ CONFIGURE_ARGS+=--with-xml-prefix=/
 post-patch:
 	@${REINPLACE_CMD} 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile
-# otherwise LIBDIR gets overwritten in tinderbox with /usr/lib from bsd.own.mk
-	@${REINPLACE_CMD} 's|LIBDIR|_LIBDIR|g' \
-		${WRKSRC}/buildsys.mk.in \
-		${WRKSRC}/configure \
-		${WRKSRC}/m4/buildsys.m4 \
-		${WRKSRC}/src/libid3tag/Makefile
 	@${REINPLACE_CMD} 's|+= $${LIB_CPPFLAGS} -I..|= -I.. $${LIB_CPPFLAGS}|' \
 		${WRKSRC}/src/libid3tag/Makefile
 .if defined(WITH_EXECINFO) || exists(${LOCALBASE}/lib/libexecinfo.so)
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index 0aa69bf3dc31..c49333b48f4c 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-1.4.6.tgz) = 51c828b34300b592c363e6f441312898
-SHA256 (audacious-1.4.6.tgz) = 5d88d509beb7d5ca7fcf226cf89a3d9ff4efff2095810631106398926f0f67b2
-SIZE (audacious-1.4.6.tgz) = 1836978
+MD5 (audacious-1.5.0.tgz) = ea631b69eb54e97d60bf3c52ae6c7e62
+SHA256 (audacious-1.5.0.tgz) = 25a4e72ca44c2228b41246df662ae6a96b7ebcd561affacdc0dd83ebdee02322
+SIZE (audacious-1.5.0.tgz) = 1946403
diff --git a/multimedia/audacious/files/patch-buildsys.mk.in b/multimedia/audacious/files/patch-buildsys.mk.in
new file mode 100644
index 000000000000..9d5b0bf829e9
--- /dev/null
+++ b/multimedia/audacious/files/patch-buildsys.mk.in
@@ -0,0 +1,11 @@
+--- buildsys.mk.in.orig	2008-03-16 15:37:56.000000000 +0100
++++ buildsys.mk.in	2008-03-16 15:38:43.000000000 +0100
+@@ -100,7 +100,7 @@
+ 		${DEPEND_STATUS}; \
+ 		rm -f .deps; \
+ 		if ${MAKE} ${MFLAGS} ${DEPS}; then \
+-			cat ${DEPS} >.deps; \
++			sed 's|/[^ ]*/include/audacious/dbus.h||g' ${DEPS} >.deps; \
+ 			rm -f ${DEPS}; \
+ 			${DEPEND_OK}; \
+ 		else \
diff --git a/multimedia/audacious/files/patch-configure b/multimedia/audacious/files/patch-configure
new file mode 100644
index 000000000000..23fc02db10e4
--- /dev/null
+++ b/multimedia/audacious/files/patch-configure
@@ -0,0 +1,12 @@
+--- configure.orig	2008-03-16 15:32:34.000000000 +0100
++++ configure	2008-03-16 15:32:45.000000000 +0100
+@@ -2049,9 +2049,6 @@
+ 
+ 
+ 
+-if test -d "/usr/X11R6/include"; then
+-	CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
+-fi
+ 
+ PACKAGE=audacious
+ 
diff --git a/multimedia/audacious/files/patch-src-audacious-Makefile b/multimedia/audacious/files/patch-src-audacious-Makefile
index 18c265547949..800983172f90 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	2007-11-19 03:02:02.000000000 +0100
-+++ src/audacious/Makefile	2007-11-26 19:04:28.000000000 +0100
-@@ -157,15 +157,8 @@
+--- src/audacious/Makefile.orig	2008-03-13 23:19:27.000000000 +0100
++++ src/audacious/Makefile	2008-03-15 19:27:56.000000000 +0100
+@@ -146,15 +146,8 @@
  
  include ../../buildsys.mk
  
@@ -17,23 +17,26 @@
 +	    -DHAVE_CONFIG_H		\
  	    ${MOWGLI_CFLAGS}		\
  	    ${GTK_CFLAGS}		\
- 	    ${LIBGLADE_CFLAGS}		\
-@@ -176,10 +169,11 @@
- 	    ${REGEX_CFLAGS}		\
- 	    ${LIBMCS_CFLAGS}		\
+ 	    ${BEEP_DEFINES}		\
+@@ -167,21 +160,29 @@
  	    -D_AUDACIOUS_CORE		\
+ 	    -I../libSAD			\
+ 	    -I../libeggsmclient		\
 -	    -I.. -I../..		\
  	    -I./intl
  
 -LIBS += ${LDADD}		\
-+
-+
-+LIBS = ${LDADD}		\
++LIBS  = ${LDADD}		\
  	${LIBINTL}		\
  	${samplerate_LIBS}	\
  	../libguess/libguess.a	\
-@@ -190,6 +184,14 @@
- 	${LIBGLADE_LIBS}	\
+ 	../libSAD/libSAD.a	\
+ 	../libeggsmclient/libeggsmclient.a ${SM_LIBS} \
+ 	${GTK_LIBS}		\
++	${GLIB_LIBS}		\
+ 	${DBUS_LIBS}		\
+ 	${MOWGLI_LIBS}		\
+ 	${LIBMCS_LIBS}		\
  	${REGEX_LIBS}
  
 +ifdef USE_DBUS
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 13d33e5758d6..1bf0ccbfefc3 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -33,13 +33,15 @@ include/audacious/util.h
 include/audacious/vfs.h
 include/audacious/vfs_buffer.h
 include/audacious/vfs_buffered_file.h
-include/audacious/xconvert.h
-lib/audacious/libaudid3tag.so.1.0.0
-lib/audacious/libaudid3tag.so.1
-lib/audacious/libaudid3tag.so 
+include/libSAD/libSAD.h
+include/libSAD/common.h
+include/libSAD/dither.h
 %%WITH_DBUS%%lib/libaudclient.so
 %%WITH_DBUS%%lib/libaudclient.so.1
 %%WITH_DBUS%%lib/libaudclient.so.1.0.0
+lib/libaudid3tag.so
+lib/libaudid3tag.so.1
+lib/libaudid3tag.so.1.0.0
 libdata/pkgconfig/audacious.pc
 libdata/pkgconfig/audclient.pc
 share/applications/audacious.desktop
@@ -257,8 +259,6 @@ share/applications/audacious.desktop
 %%DATADIR%%/Skins/TinyPlayer/titlebar.png
 %%DATADIR%%/Skins/TinyPlayer/viscolor.txt
 %%DATADIR%%/Skins/TinyPlayer/volume.png
-%%DATADIR%%/glade/fileinfo.glade
-%%DATADIR%%/glade/prefswin.glade
 %%DATADIR%%/images/about-logo.png
 %%DATADIR%%/images/audacious_eq.xpm
 %%DATADIR%%/images/audacious_playlist.xpm
@@ -266,25 +266,15 @@ share/applications/audacious.desktop
 %%DATADIR%%/images/audacious_player.xpm
 %%DATADIR%%/images/audio.png
 %%DATADIR%%/images/connectivity.png
-%%DATADIR%%/images/eq.png
-%%DATADIR%%/images/info.png
-%%DATADIR%%/images/menu_invert_playlist.png
+%%DATADIR%%/images/menu_playlist.png
+%%DATADIR%%/images/menu_plugin.png
 %%DATADIR%%/images/menu_queue_toggle.png
 %%DATADIR%%/images/menu_randomize_playlist.png
-%%DATADIR%%/images/menu_remove_dups.png
-%%DATADIR%%/images/menu_remove_unavail.png
-%%DATADIR%%/images/menu_select_all.png
-%%DATADIR%%/images/menu_select_invert.png
-%%DATADIR%%/images/menu_select_none.png
-%%DATADIR%%/images/menu_sort_artist.png
-%%DATADIR%%/images/menu_sort_filename.png
-%%DATADIR%%/images/menu_sort_pathfile.png
-%%DATADIR%%/images/menu_sort_title.png
 %%DATADIR%%/images/mouse.png
-%%DATADIR%%/images/pl.png
-%%DATADIR%%/images/play.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
@@ -349,10 +339,10 @@ share/pixmaps/audacious.png
 @dirrm %%DATADIR%%/Skins/Refugee
 @dirrm %%DATADIR%%/Skins/TinyPlayer
 @dirrm %%DATADIR%%/Skins
-@dirrm %%DATADIR%%/glade
 @dirrmtry %%DATADIR%%/images
 @dirrm %%DATADIR%%/ui
 @dirrmtry %%DATADIR%%
 @dirrm include/audacious
+@dirrm include/libSAD
 @dirrmtry lib/audacious
 @dirrmtry share/applications