update to 1.5.0 [1]

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

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

6 files changed, 53 insertions, 43 deletions

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