- update to 0.2DrHouse

 - Complete changes for DrHouse available at:
    http://wiki.xmms2.xmms.se/index.php/Release:DrHouse

6 files changed, 45 insertions, 35 deletions

diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index 4c2364bfe0a7..ff2f3e5dad12 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME?=	xmms2
-PORTVERSION=	0.2.d.7
+PORTVERSION=	0.2.d.8
+DISTVERSION=	0.2DrHouse
 CATEGORIES?=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTVERSION=	0.2DrGonzo
 DISTNAME=	${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	alexbl@FreeBSD.org
@@ -33,8 +33,7 @@ USE_LDCONFIG=	yes
 .endif
 
 .if !defined(XMMS2_SLAVE)
-MAN1=		xmms2.1 xmms2-et.1
-MAN8=		xmms2d.8 xmms2-launcher.8 xmms2-mdns-avahi.8
+MAN1=		xmms2.1 xmms2-et.1 xmms2d.1 xmms2-launcher.1 xmms2-mdns-avahi.1
 MANCOMPRESSED=	yes
 
 OPTIONS=	FAAD "Support to playback AAC files" on \
@@ -45,6 +44,7 @@ OPTIONS=	FAAD "Support to playback AAC files" on \
 		WMA "Support to playback WMA files" off \
 		APE "Support to playback Monkey's Audio files" off \
 		CURL "Support to playback files via HTTP" on \
+		LASTFM "Support to playback audio via Last.fm radio" on \
 		GNOMEVFS "Support to playback files via GnomeVFS" off \
 		MMS "Support to playback streams via MMS" off \
 		SAMBA "Support to playback files via SMB" off \
@@ -53,7 +53,9 @@ OPTIONS=	FAAD "Support to playback AAC files" on \
 		MDNS_AVAHI "Support to announce XMMS2d via mDNS (Avahi)" off \
 		MDNS_APPLE "Support to announce XMMS2d via mDNS (Apple)" on \
 		ICES "Support to playback files to an icecast server" off \
-		JACK "Support to output via the Jack output server" off #\
+		JACK "Support to output via the Jack output server" off \
+		AO "Support to output via libao" off \
+		VOCODER "Phase Vocoder effect plugin" off #\
 #		SDL "Support for visualization" on
 .endif
 
@@ -82,6 +84,16 @@ EXCLUDE+=	curl
 PLIST_SUB+=	CURL="@comment "
 .endif
 
+.if !defined(WITHOUT_LASTFM)
+.if defined(WITHOUT_CURL)
+LIB_DEPENDS+=	curl.3:${PORTSDIR}/ftp/curl
+.endif
+PLIST_SUB+=	LASTFM=""
+.else
+EXCLUDE+=	lastfm lastfmeta
+PLIST_SUB+=	LASTMFM="@comment "
+.endif
+
 .if defined(WITH_SID)
 LIB_DEPENDS+=	sidplay2.[0-9]:${PORTSDIR}/audio/libsidplay2
 PLIST_SUB+=	SID=""
@@ -208,6 +220,14 @@ EXCLUDE+=	ices
 PLIST_SUB+=	ICES="@comment "
 .endif
 
+.if defined(WITH_AO)
+LIB_DEPENDS+=	ao.3:${PORTSDIR}/audio/libao
+PLIST_SUB+=	AO=""
+.else
+EXCLUDE+=	ao
+PLIST_SUB+=	AO="@comment "
+.endif
+
 .if defined(WITH_MDNS_AVAHI)
 LIB_DEPENDS+=	avahi-core:${PORTSDIR}/net/avahi
 PLIST_SUB+=	MDNS_AVAHI=""
@@ -225,6 +245,14 @@ PLIST_SUB+=	MDNS_APPLE="@comment "
 .endif
 .endif
 
+.if defined(WITH_VOCODER)
+LIB_DEPENDS+=	fftw3f.4:${PORTSDIR}/math/fftw3-float
+PLIST_SUB+=	VOCODER=""
+.else
+EXCLUDE+=	vocoder
+PLIST_SUB+=	VOCODER="@comment "
+.endif
+
 .if defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} != "java"
 .if ${OSVERSION} < 500000
 IGNORE=	broken on FreeBSD 4.x
diff --git a/audio/xmms2/distinfo b/audio/xmms2/distinfo
index a5ae45465600..5233ad3ff1de 100644
--- a/audio/xmms2/distinfo
+++ b/audio/xmms2/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmms2-0.2DrGonzo.tar.bz2) = 0845dc7ce04d1825c28566b5c36f23b3
-SHA256 (xmms2-0.2DrGonzo.tar.bz2) = 59a069e2a9b00ef81870a616b0b4ae076ccf63598ec79ba2b1820df2b60f870b
-SIZE (xmms2-0.2DrGonzo.tar.bz2) = 1045538
+MD5 (xmms2-0.2DrHouse.tar.bz2) = 8f7293b21bd6cb28e7705559a9deab10
+SHA256 (xmms2-0.2DrHouse.tar.bz2) = b87191f137c8a53e85ef502fadc648958848d5229f0b4b6b899e4d1655363c26
+SIZE (xmms2-0.2DrHouse.tar.bz2) = 1059473
diff --git a/audio/xmms2/files/patch-SConstruct b/audio/xmms2/files/patch-SConstruct
deleted file mode 100644
index 6904c8357ce6..000000000000
--- a/audio/xmms2/files/patch-SConstruct
+++ /dev/null
@@ -1,13 +0,0 @@
---- SConstruct.orig	Tue Sep 26 21:07:58 2006
-+++ SConstruct	Tue Sep 26 21:08:16 2006
-@@ -182,8 +182,8 @@
- base_env.add_manpage(1, 'doc/xmms2.1')
- base_env.add_manpage(8, 'doc/xmms2d.8')
- base_env.add_manpage(1, 'doc/xmms2-et.1')
--base_env.add_manpage(1, 'doc/xmms2-launcher.8')
--base_env.add_manpage(1, 'doc/xmms2-mdns-avahi.8')
-+base_env.add_manpage(8, 'doc/xmms2-launcher.8')
-+base_env.add_manpage(8, 'doc/xmms2-mdns-avahi.8')
- 
- #### Generate pc files.
- 
diff --git a/audio/xmms2/files/patch-src_clients_lib_java_misc.c b/audio/xmms2/files/patch-src_clients_lib_java_misc.c
deleted file mode 100644
index 7c2856a033b6..000000000000
--- a/audio/xmms2/files/patch-src_clients_lib_java_misc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/clients/lib/java/misc.c.orig	Sat Oct  7 14:41:07 2006
-+++ src/clients/lib/java/misc.c	Sat Oct  7 14:41:16 2006
-@@ -15,6 +15,7 @@
-  */
- 
- #include <stdio.h>
-+#include <sys/syslimits.h>
- #include <xmmsclient/xmmsclient.h>
- #include <xmms/xmms_defs.h>
- #include <jni.h>
diff --git a/audio/xmms2/files/patch-src_xmms_Program b/audio/xmms2/files/patch-src_xmms_Program
index 51b657b348aa..ce954718f6ff 100644
--- a/audio/xmms2/files/patch-src_xmms_Program
+++ b/audio/xmms2/files/patch-src_xmms_Program
@@ -1,6 +1,6 @@
---- src/xmms/Program.orig	Tue Sep 26 20:51:07 2006
-+++ src/xmms/Program	Tue Sep 26 20:51:39 2006
-@@ -26,10 +26,10 @@
+--- src/xmms/Program.orig	Sat Dec  2 15:01:08 2006
++++ src/xmms/Program	Sat Dec  2 19:53:19 2006
+@@ -27,10 +27,10 @@
  
  def config(env):
  	pluginenv = env.Copy()
@@ -12,6 +12,6 @@
 +	env.pkgconfig("gmodule-2.0")
 +	env.pkgconfig("gthread-2.0")
 +	env.pkgconfig("sqlite3")
+ 	env.Prepend(LIBPATH=["src/lib/xmmsutils"])
  	env.Prepend(LIBPATH=["src/lib/xmmsipc"])
  	env.Prepend(LIBPATH=["src/lib/xmmssocket"])
- 	env.Append(LIBS=['xmmsipc'])
diff --git a/audio/xmms2/pkg-plist b/audio/xmms2/pkg-plist
index 0f91a73078dc..5f10e60691bc 100644
--- a/audio/xmms2/pkg-plist
+++ b/audio/xmms2/pkg-plist
@@ -33,6 +33,7 @@ include/xmms2/xmmsc/xmmsc_sockets.h
 include/xmms2/xmmsc/xmmsc_stdbool.h
 include/xmms2/xmmsc/xmmsc_stdint.h
 include/xmms2/xmmsc/xmmsc_stringport.h
+include/xmms2/xmmsc/xmmsc_strlist.h
 include/xmms2/xmmsc/xmmsc_unistd.h
 include/xmms2/xmmsc/xmmsc_util.h
 include/xmms2/xmmsclient/xmmsclient++/bindata.h
@@ -62,6 +63,7 @@ lib/libxmmsclient-glib.a
 lib/libxmmsclient-glib.so
 lib/libxmmsclient.a
 lib/libxmmsclient.so
+%%AO%%lib/xmms2/libxmms_ao.so
 %%CURL%%lib/xmms2/libxmms_curl_http.so
 lib/xmms2/libxmms_diskwrite.so
 lib/xmms2/libxmms_equalizer.so
@@ -71,6 +73,8 @@ lib/xmms2/libxmms_equalizer.so
 lib/xmms2/libxmms_file.so
 %%GNOMEVFS%%lib/xmms2/libxmms_gnomevfs.so
 %%ICES%%lib/xmms2/libxmms_ices.so
+%%LASTFM%%lib/xmms2/libxmms_lastfm.so
+%%LASTFM%%lib/xmms2/libxmms_lastfmeta.so
 lib/xmms2/libxmms_icymetaint.so
 lib/xmms2/libxmms_id3v2.so
 %%JACK%%lib/xmms2/libxmms_jack.so
@@ -85,6 +89,7 @@ lib/xmms2/libxmms_oss.so
 lib/xmms2/libxmms_replaygain.so
 %%SAMBA%%lib/xmms2/libxmms_samba.so
 %%SID%%lib/xmms2/libxmms_sid.so
+%%VOCODER%%lib/xmms2/libxmms_vocoder.so
 lib/xmms2/libxmms_vorbisfile.so
 lib/xmms2/libxmms_wave.so
 %%WMA%%lib/xmms2/libxmms_wma.so