7 files changed, 269 insertions, 0 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 0d0e8b3167ec..312602e070c9 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -588,6 +588,7 @@
     SUBDIR += xmms-wma
     SUBDIR += xmms-xf86audio
     SUBDIR += xmms-xymms
+    SUBDIR += xmms2
     SUBDIR += xmmsctrl
     SUBDIR += xmp
     SUBDIR += xmpeg3
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
new file mode 100644
index 000000000000..492f964876df
--- /dev/null
+++ b/audio/xmms2/Makefile
@@ -0,0 +1,150 @@
+# New ports collection makefile for:    xmms2
+# Date created:				20 May 2005
+# Whom:				  	Alexander Botero-Lowry <alex@foxybanana.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xmms2
+DISTVERSION=	0.2DrAlban
+CATEGORIES=	audio
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${DISTVERSION}
+
+MAINTAINER=	alex@foxybanana.com
+COMMENT=	Rewrite of xmms as a client/server system (developer release)
+
+BUILD_DEPENDS=	scons:${PORTSDIR}/devel/scons
+LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3 \
+		mad.2:${PORTSDIR}/audio/libmad \
+		vorbis.3:${PORTSDIR}/audio/libvorbis
+
+WRKSRC=		${WRKDIR}/${DISTNAME}
+
+USE_PYTHON=	yes
+USE_BZIP2=	yes
+USE_GNOME=	glib20
+INSTALLS_SHLIB=	yes
+
+MAN1=		xmms2.1
+MAN8=		xmms2d.8
+MANCOMPRESSED=	yes
+
+DATADIR=	share/xmms2
+
+.if defined(WITH_CURL)
+LIB_DEPENDS+=	curl.3:${PORTSDIR}/ftp/curl
+PLIST_SUB+=	CURL=""
+.else
+EXCLUDE+=	curl
+PLIST_SUB+=	CURL="@comment "
+.endif
+
+.if defined(WITH_SID)
+LIB_DEPENDS+=	resid.0:${PORTSDIR}/audio/resid \
+		sidplay.2:${PORTSDIR}/audio/libsidplay2
+PLIST_SUB+=	SID=""
+.else
+EXCLUDE+=	sid
+PLIST_SUB+=	SID="@comment "
+.endif
+
+.if defined(WITH_PYTHON_BINDINGS)
+BUILD_DEPENDS+=	pyrex:${PORTSDIR}/devel/pyrex
+PLIST_SUB+=	PYTHON=""
+.else
+EXCLUDE+=	python
+PLIST_SUB+=	PYTHON="@comment "
+.endif
+
+.if defined(WITH_RUBY_BINDINGS)
+USE_RUBY=	yes
+PLIST_SUB+=	RUBY=""
+.else
+EXCLUDE+=	ruby
+PLIST_SUB+=	RUBY="@comment "
+.endif
+
+.if defined(WITH_ECORE)
+BUILD_DEPENDS+=	ecore.1:${PORTSDIR}/x11/ecore
+PLIST_SUB+=	ECORE=""
+.else
+EXCLUDE+=	xmmsclient-ecore
+PLIST_SUB+=	ECORE="@comment "
+.endif
+
+.if defined(WITH_FLAC)
+BUILD_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
+PLIST_SUB+=	FLAC=""
+.else
+EXCLUDE+=	flac
+PLIST_SUB+=	FLAC="@comment "
+.endif
+
+.if defined(WITH_FAAD)
+BUILD_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
+PLIST_SUB+=	FAAD=""
+#EXTRA_PATCHES+=	${FILESDIR}/extraPatch-src::clients::faad::Plugin
+.else
+EXCLUDE+=	faad
+PLIST_SUB+=	FAAD="@comment "
+.endif
+
+.if defined(WITH_SDL)
+USE_SDL=	sdl ttf
+PLIST_SUB+=	SDL=""
+#EXTRA_PATCHES+=	${FILESDIR}/extraPatch-src::clients::sdl-vis::Program
+.else
+EXCLUDE+=	sdl-vis
+PLIST_SUB+=	SDL="@comment "
+.endif
+
+.if defined(WITH_MUSEPACK)
+BUILD_DEPENDS+=	mpcdec.3:${PORTSDIR}/audio/libmpcdec
+PLIST_SUB+=	MUSEPACK=""
+.else
+EXCLUDE+=	musepack
+PLIST_SUB+=	MUSEPACK="@comment "
+.endif
+
+.if defined(WITH_JACK)
+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+PLIST_SUB+=	JACK=""
+.else
+EXCLUDE+=	jack
+PLIST_SUB+=	JACK="@comment "
+.endif
+
+.if defined(WITH_MODPLUG)
+LIB_DEPENDS+=	modplug.0:${PORTSDIR}/audio/libmodplug
+PLIST_SUB+=	MODPLUG=""
+.else
+EXCLUDE+=	modplug
+PLIST_SUB+=	MODPLUG="@comment "
+.endif
+
+.if defined(WITH_SAMBA)
+LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+PLIST_SUB+=	SAMBA=""
+.else
+EXCLUDE+=	samba
+PLIST_SUB+=	SAMBA="@comment "
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+BROKEN=	"Doesn't build on FreeBSD < 5.x"
+.endif
+
+do-build:
+	cd ${WRKSRC} && \
+		scons CC=${CC} LINKFLAGS="${LDFLAGS}" CCFLAGS="${CFLAGS}" \
+		LIBPATH=${LOCALBASE}/lib CPPPATH=${LOCALBASE}/include \
+		PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig EXCLUDE="${EXCLUDE}"
+
+do-install:
+	@cd ${WRKSRC} && scons install
+
+.include <bsd.port.post.mk>
diff --git a/audio/xmms2/distinfo b/audio/xmms2/distinfo
new file mode 100644
index 000000000000..7a09111fbf59
--- /dev/null
+++ b/audio/xmms2/distinfo
@@ -0,0 +1,3 @@
+MD5 (xmms2-0.2DrAlban.tar.bz2) = 172368d5d03d3f309641f82aef7490f5
+SHA256 (xmms2-0.2DrAlban.tar.bz2) = 91067bd9c4d378e2afcd8506c40c9a3af168cd916241fbf7039fb5efb1788ad4
+SIZE (xmms2-0.2DrAlban.tar.bz2) = 687706
diff --git a/audio/xmms2/files/patch-src_clients_sdl-vis_Program b/audio/xmms2/files/patch-src_clients_sdl-vis_Program
new file mode 100644
index 000000000000..2c4b3b177a2d
--- /dev/null
+++ b/audio/xmms2/files/patch-src_clients_sdl-vis_Program
@@ -0,0 +1,10 @@
+--- src/clients/sdl-vis/Program.orig	Sun Dec 18 08:35:27 2005
++++ src/clients/sdl-vis/Program	Sun Dec 18 14:36:51 2005
+@@ -7,5 +7,5 @@
+ 	env.Prepend(LIBPATH="src/clients/lib/xmmsclient-glib")
+ 	env.Append(LIBS=["xmmsclient-glib"])
+ 	env.pkgconfig("glib-2.0")
+-	env.configcmd("sdl-config --libs --cflags")
+-	env.checklib("SDL_ttf", "TTF_Init")
++	env.configcmd("sdl11-config --libs --cflags")
++	env.Append(LIBS=["SDL_ttf"])
diff --git a/audio/xmms2/files/patch-src_plugins_faad_Plugin b/audio/xmms2/files/patch-src_plugins_faad_Plugin
new file mode 100644
index 000000000000..661d70f817af
--- /dev/null
+++ b/audio/xmms2/files/patch-src_plugins_faad_Plugin
@@ -0,0 +1,16 @@
+--- src/plugins/faad/Plugin.orig	Tue Dec 20 01:09:13 2005
++++ src/plugins/faad/Plugin	Tue Dec 20 01:09:48 2005
+@@ -12,12 +12,7 @@
+ 	This function should return True if this module
+ 	is to be built otherwise False
+ 	"""
+-	try:
+-		env.checklib("faad", "faacDecInit2")
+-	except ConfigError:
+-		env.checklib("faad", "NeAACDecInit2")
+-	except ConfigError:
+-		raise ConfigError("Could not find libfaad")
++	env.Append (LIBS=["faad"])
+ 
+ 	env.Append (CCFLAGS = '-DUSE_TAGGING')
+ 
diff --git a/audio/xmms2/pkg-descr b/audio/xmms2/pkg-descr
new file mode 100644
index 000000000000..c5eb9e4173f3
--- /dev/null
+++ b/audio/xmms2/pkg-descr
@@ -0,0 +1,6 @@
+XMMS2 is a redesign of the XMMS music player. It features a client-server
+model, allowing multiple (even simultaneous!) user interfaces, both textual
+and graphical. All common audio formats are supported using plugins. On top
+of this, there is a flexible media library to organize your music.
+
+WWW:	http://xmms2.xmms.org
diff --git a/audio/xmms2/pkg-plist b/audio/xmms2/pkg-plist
new file mode 100644
index 000000000000..85c7af290a06
--- /dev/null
+++ b/audio/xmms2/pkg-plist
@@ -0,0 +1,83 @@
+bin/xmms2
+bin/xmms2d
+bin/xmms2-launcher
+bin/xmms2-et
+include/xmms2/xmms/xmms_config.h
+include/xmms2/xmms/xmms_decoder.h
+include/xmms2/xmms/xmms_decoderplugin.h
+include/xmms2/xmms/xmms_effectplugin.h
+include/xmms2/xmms/xmms_outputplugin.h
+include/xmms2/xmms/xmms_defs.h
+include/xmms2/xmms/xmms_effect.h
+include/xmms2/xmms/xmms_error.h
+include/xmms2/xmms/xmms_ipc.h
+include/xmms2/xmms/xmms_log.h
+include/xmms2/xmms/xmms_medialib.h
+include/xmms2/xmms/xmms_object.h
+include/xmms2/xmms/xmms_output.h
+include/xmms2/xmms/xmms_plsplugins.h
+include/xmms2/xmms/xmms_plugin.h
+include/xmms2/xmms/xmms_sample.h
+include/xmms2/xmms/xmms_transport.h
+include/xmms2/xmms/xmms_transportplugin.h
+include/xmms2/xmmsc/xmmsc_sockets.h
+include/xmms2/xmmsc/xmmsc_asyncns.h
+include/xmms2/xmmsc/xmmsc_inline.h
+include/xmms2/xmmsc/xmmsc_stdbool.h
+include/xmms2/xmmsc/xmmsc_stdint.h
+include/xmms2/xmmsc/xmmsc_stringport.h
+include/xmms2/xmmsc/xmmsc_unistd.h
+include/xmms2/xmmsc/xmmsc_errorcodes.h
+include/xmms2/xmmsc/xmmsc_idnumbers.h
+include/xmms2/xmmsc/xmmsc_ipc_msg.h
+include/xmms2/xmmsc/xmmsc_ipc_transport.h
+include/xmms2/xmmsc/xmmsc_util.h
+include/xmms2/xmmsclient/xmmsclient-cf.h
+include/xmms2/xmmsclient/xmmsclient-ecore.h
+include/xmms2/xmmsclient/xmmsclient-glib.h
+include/xmms2/xmmsclient/xmmsclient-qt.h
+include/xmms2/xmmsclient/xmmsclient.h
+lib/libxmmsclient-glib.a
+lib/libxmmsclient-glib.so
+%%ECORE%%lib/libxmmsclient-ecore.a
+%%ECORE%%lib/libxmmsclient-ecore.so
+lib/libxmmsclient.a
+lib/libxmmsclient.so
+%%CURL%%lib/xmms2/libxmms_curl_http.so
+lib/xmms2/libxmms_diskwrite.so
+lib/xmms2/libxmms_eq.so
+%%SID%%lib/xmms2/libxmms_sid.so
+%%MUSEPACK%%lib/xmms2/libxmms_musepack.so
+%%JACK%%lib/xmms2/libxmms_jack.so
+%%FAAD%%lib/xmms2/libxmms_faad.so
+%%FLAC%%lib/xmms2/libxmms_flac.so
+%%MODPLUG%%lib/xmms2/libxmms_modplug.so
+%%SAMBA%%lib/xmms2/libxmms_samba.so
+lib/xmms2/libxmms_null.so
+%%RUBY%%%%RUBY_SITELIBDIR%%/xmmsclient_glib.so
+%%RUBY%%%%RUBY_SITELIBDIR%%/xmmsclient.so
+%%PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/xmmsclient.so
+lib/xmms2/libxmms_file.so
+lib/xmms2/libxmms_html.so
+lib/xmms2/libxmms_m3u.so
+lib/xmms2/libxmms_mad.so
+lib/xmms2/libxmms_oss.so
+lib/xmms2/libxmms_vorbisfile.so
+lib/xmms2/libxmms_pls.so
+lib/xmms2/libxmms_replaygain.so
+lib/xmms2/libxmms_wave.so
+%%ECORE%%libdata/pkgconfig/xmms2-client-ecore.pc
+libdata/pkgconfig/xmms2-client-glib.pc
+libdata/pkgconfig/xmms2-client-ecore.pc
+libdata/pkgconfig/xmms2-client.pc
+libdata/pkgconfig/xmms2-plugin.pc
+%%DATADIR%%/dismantled-the_swarm_clip.ogg
+%%DATADIR%%/scripts/startup.d/xmms2-et-launcher.sh
+@dirrm include/xmms2/xmms
+@dirrm include/xmms2/xmmsc
+@dirrm include/xmms2/xmmsclient
+@dirrm include/xmms2
+@dirrm lib/xmms2
+@dirrm %%DATADIR%%/scripts/startup.d
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%