update to 1.5.1

6 files changed, 42 insertions, 47 deletions

diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 1801dd08ef37..019fd7f7bad1 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	audacious
-PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTVERSION=	1.5.1
+PORTREVISION=	0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.atheme.org/
 MASTER_SITE_SUBDIR=oliver
@@ -33,7 +33,7 @@ LIB_DEPENDS=	mcs.1:${PORTSDIR}/devel/libmcs \
 PORTDOCS=	README AUTHORS NEWS
 
 OPTIONS=	CHARSET	"Build with automatic charset detection" off \
-		DBUS	"Build with dbus support" on \
+		DBUS	"Build with dbus support" off \
 		GNOME	"Build with gconf support" off \
 		NLS	"Native Language Support" on \
 		XML	"Build with xml support" on \
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index c49333b48f4c..ab099059885f 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-1.5.0.tgz) = ea631b69eb54e97d60bf3c52ae6c7e62
-SHA256 (audacious-1.5.0.tgz) = 25a4e72ca44c2228b41246df662ae6a96b7ebcd561affacdc0dd83ebdee02322
-SIZE (audacious-1.5.0.tgz) = 1946403
+MD5 (audacious-1.5.1.tgz) = 3c206a6d06d49d8a68f0edd9933d2219
+SHA256 (audacious-1.5.1.tgz) = ac5970c09ed25ac56dac15e035328592cace5321c7895229e682cac92201f1d7
+SIZE (audacious-1.5.1.tgz) = 1937747
diff --git a/multimedia/audacious/files/patch-configure b/multimedia/audacious/files/patch-configure
index 23fc02db10e4..30469fec5792 100644
--- a/multimedia/audacious/files/patch-configure
+++ b/multimedia/audacious/files/patch-configure
@@ -1,11 +1,11 @@
 --- configure.orig	2008-03-16 15:32:34.000000000 +0100
 +++ configure	2008-03-16 15:32:45.000000000 +0100
 @@ -2049,9 +2049,6 @@
- 
+ fi 
  
  
 -if test -d "/usr/X11R6/include"; then
--	CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
+-    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 800983172f90..6113334b4767 100644
--- a/multimedia/audacious/files/patch-src-audacious-Makefile
+++ b/multimedia/audacious/files/patch-src-audacious-Makefile
@@ -1,10 +1,10 @@
---- 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 @@
+--- src/audacious/Makefile.orig	2008-05-24 00:00:34.000000000 +0200
++++ src/audacious/Makefile	2008-05-28 19:12:10.000000000 +0200
+@@ -150,15 +150,8 @@
  
  include ../../buildsys.mk
  
--ifdef USE_DBUS
+-ifeq ($(USE_DBUS),yes)
 -CPPFLAGS += -I../libaudclient
 -DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
 -LIBS += -L../libaudclient -laudclient
@@ -13,33 +13,28 @@
 -pre-depend: ${DBUS_BINDINGS}
 -
 -CPPFLAGS += -DHAVE_CONFIG_H		\
-+CPPFLAGS =  -I.. -I../..		\
-+	    -DHAVE_CONFIG_H		\
- 	    ${MOWGLI_CFLAGS}		\
- 	    ${GTK_CFLAGS}		\
- 	    ${BEEP_DEFINES}		\
-@@ -167,21 +160,29 @@
- 	    -D_AUDACIOUS_CORE		\
- 	    -I../libSAD			\
- 	    -I../libeggsmclient		\
--	    -I.. -I../..		\
- 	    -I./intl
++CPPFLAGS = -I.. -I../..			\
++		-DHAVE_CONFIG_H			\
+ 		${MOWGLI_CFLAGS}		\
+ 		${GLIB_CFLAGS}			\
+ 		${GTHREAD_CFLAGS}		\
+@@ -173,10 +166,9 @@
+ 		-D_AUDACIOUS_CORE		\
+ 		-I../libSAD				\
+ 		${EGGSM_CFLAGS}			\
+-		-I.. -I../..			\
+ 		-I./intl
  
--LIBS += ${LDADD}		\
-+LIBS  = ${LDADD}		\
- 	${LIBINTL}		\
- 	${samplerate_LIBS}	\
- 	../libguess/libguess.a	\
- 	../libSAD/libSAD.a	\
- 	../libeggsmclient/libeggsmclient.a ${SM_LIBS} \
- 	${GTK_LIBS}		\
-+	${GLIB_LIBS}		\
- 	${DBUS_LIBS}		\
- 	${MOWGLI_LIBS}		\
- 	${LIBMCS_LIBS}		\
- 	${REGEX_LIBS}
+-LIBS += ${LDADD}						\
++LIBS = ${LDADD}						\
+ 		${LIBINTL}						\
+ 		${SAMPLERATE_LIBS}				\
+ 		../libguess/libguess.a			\
+@@ -190,6 +182,14 @@
+ 		${LIBMCS_LIBS}					\
+ 		${REGEX_LIBS}
  
-+ifdef USE_DBUS
++ifeq ($(USE_DBUS),yes)
 +CPPFLAGS += -I../libaudclient
 +DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
 +LIBS += -L../libaudclient -laudclient
diff --git a/multimedia/audacious/files/patch-src-audtool-Makefile b/multimedia/audacious/files/patch-src-audtool-Makefile
index 92bb359fd866..22467f5d25b7 100644
--- a/multimedia/audacious/files/patch-src-audtool-Makefile
+++ b/multimedia/audacious/files/patch-src-audtool-Makefile
@@ -1,13 +1,13 @@
---- src/audtool/Makefile.orig	2007-11-26 17:58:26.000000000 +0100
-+++ src/audtool/Makefile	2007-11-26 17:57:34.000000000 +0100
+--- src/audtool/Makefile.orig	2008-05-24 00:00:34.000000000 +0200
++++ src/audtool/Makefile	2008-05-28 19:15:01.000000000 +0200
 @@ -18,8 +18,8 @@
- 	  ${BEEP_DEFINES}	\
- 	  ${ARCH_DEFINES}	\
- 	  ${MOWGLI_CFLAGS}
--LIBS += ${DBUS_LIBS}			\
+ 		  ${ARCH_DEFINES}		\
+ 		  ${MOWGLI_CFLAGS}
+ 
+-LIBS += ${DBUS_LIBS}				\
 -	-L../libaudclient -laudclient	\
 +LIBS += -L../libaudclient -laudclient	\
 +	${DBUS_LIBS}			\
- 	${GTK_LIBS}			\
- 	${MOWGLI_LIBS}			\
- 	${LIBGLADE_LIBS}
+ 	${GTK_LIBS}						\
+ 	${MOWGLI_LIBS}					\
+ 	${LIBMCS_LIBS}
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 1bf0ccbfefc3..d1016f9f0dd9 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -1,6 +1,7 @@
 bin/audacious
 %%WITH_DBUS%%bin/audtool
 %%WITH_DBUS%%include/audacious/audctrl.h
+include/audacious/audconfig.h
 include/audacious/auddrct.h
 include/audacious/configdb.h
 include/audacious/custom_uri.h
@@ -9,7 +10,6 @@ include/audacious/dbus-service.h
 include/audacious/discovery.h
 include/audacious/eventqueue.h
 include/audacious/flow.h
-include/audacious/formatter.h
 include/audacious/hook.h
 include/audacious/i18n.h
 include/audacious/id3tag.h