aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/azrael/Makefile2
-rw-r--r--audio/cpp-xmms2/Makefile16
-rw-r--r--audio/cpp-xmms2/pkg-plist6
-rw-r--r--audio/esperanza/Makefile9
-rw-r--r--audio/esperanza/distinfo6
-rw-r--r--audio/euphoria/Makefile2
-rw-r--r--audio/gx2osd/Makefile23
-rw-r--r--audio/gx2osd/distinfo6
-rw-r--r--audio/gx2osd/pkg-plist1
-rw-r--r--audio/gxmms2/Makefile2
-rw-r--r--audio/java-xmms2/Makefile19
-rw-r--r--audio/nyello/Makefile2
-rw-r--r--audio/py-xmms2/Makefile9
-rw-r--r--audio/py-xmms2/pkg-plist10
-rw-r--r--audio/ruby-xmms2-ecore/Makefile19
-rw-r--r--audio/ruby-xmms2/Makefile12
-rw-r--r--audio/ruby-xmms2/pkg-plist6
-rw-r--r--audio/shellac/Makefile1
-rw-r--r--audio/snett/Makefile1
-rw-r--r--audio/xmms2-scrobbler/Makefile13
-rw-r--r--audio/xmms2-scrobbler/distinfo6
-rw-r--r--audio/xmms2/Makefile111
-rw-r--r--audio/xmms2/distinfo6
-rw-r--r--audio/xmms2/files/patch-src_clients_sdl-vis_Program10
-rw-r--r--audio/xmms2/files/patch-src_include_xmms_wscript11
-rw-r--r--audio/xmms2/files/patch-src_plugins_faad_Plugin17
-rw-r--r--audio/xmms2/files/patch-src_plugins_faad_mp4ff_mp4ff_int_types.h11
-rw-r--r--audio/xmms2/files/patch-src_plugins_sid_Plugin9
-rw-r--r--audio/xmms2/files/patch-src_xmms_Program17
-rw-r--r--audio/xmms2/files/slaveport-src_include_wscript11
-rw-r--r--audio/xmms2/files/slaveport-wscript11
-rw-r--r--audio/xmms2/pkg-plist26
32 files changed, 194 insertions, 217 deletions
diff --git a/audio/azrael/Makefile b/audio/azrael/Makefile
index 8f3fa9199a73..a1550174e82d 100644
--- a/audio/azrael/Makefile
+++ b/audio/azrael/Makefile
@@ -25,4 +25,6 @@ USE_GNOME= gtk20
PLIST_FILES=bin/azrael
+BROKEN= Not updated to the DrJekyll clientlib API
+
.include <bsd.port.mk>
diff --git a/audio/cpp-xmms2/Makefile b/audio/cpp-xmms2/Makefile
index b45000075b25..e2109b21ff9d 100644
--- a/audio/cpp-xmms2/Makefile
+++ b/audio/cpp-xmms2/Makefile
@@ -11,25 +11,15 @@ PKGNAMEPREFIX= cpp-
MAINTAINER= alexbl@FreeBSD.org
COMMENT= C++ Bindings for XMMS2
-LIB_DEPENDS= boost_signals.3:${PORTSDIR}/devel/boost
-BUILD_DEPENDS= ${LOCALBASE}/lib/libxmmsclient.so:${PORTSDIR}/audio/xmms2
-RUN_DEPENDS= ${LOCALBASE}/lib/libxmmsclient.so:${PORTSDIR}/audio/xmms2
+LIB_DEPENDS+= boost_signals.3:${PORTSDIR}/devel/boost \
+ xmmsclient.2:${PORTSDIR}/audio/xmms2
MASTERDIR= ${.CURDIR}/../xmms2
USE_LDCONFIG= yes
+USE_GNOME= glib20
PLIST= ${.CURDIR}/pkg-plist
-SCONS_TARGET= src/clients/lib/xmmsclient++/libxmmsclient++.so \
- src/clients/lib/xmmsclient++-glib//libxmmsclient++-glib.so
XMMS2_SLAVE= cpp
-do-install:
- @cd ${WRKSRC} && ${INSTALL_PROGRAM} \
- src/clients/lib/xmmsclient++/libxmmsclient++.so \
- ${TARGETDIR}/lib/libxmmsclient++.so
- @cd ${WRKSRC} && ${INSTALL_PROGRAM} \
- src/clients/lib/xmmsclient++-glib/libxmmsclient++-glib.so \
- ${TARGETDIR}/lib/libxmmsclient++-glib.so
-
.include "${MASTERDIR}/Makefile"
diff --git a/audio/cpp-xmms2/pkg-plist b/audio/cpp-xmms2/pkg-plist
index 2aca0dcbce66..c62d23acf1c7 100644
--- a/audio/cpp-xmms2/pkg-plist
+++ b/audio/cpp-xmms2/pkg-plist
@@ -1,2 +1,8 @@
lib/libxmmsclient++.so
+lib/libxmmsclient++.so.1
+lib/libxmmsclient++.so.1.0.0
lib/libxmmsclient++-glib.so
+lib/libxmmsclient++-glib.so.1
+lib/libxmmsclient++-glib.so.1.0.0
+libdata/pkgconfig/xmms2-client-cpp-glib.pc
+libdata/pkgconfig/xmms2-client-cpp.pc
diff --git a/audio/esperanza/Makefile b/audio/esperanza/Makefile
index c91a0e4834e7..e60cf35b4491 100644
--- a/audio/esperanza/Makefile
+++ b/audio/esperanza/Makefile
@@ -6,16 +6,15 @@
#
PORTNAME= esperanza
-PORTVERSION= 0.2.2
-PORTREVISION= 1
+PORTVERSION= 0.3
CATEGORIES= audio
-MASTER_SITES= http://xmms2.xmms.se/~tru/esperanza/0.2/
+MASTER_SITES= http://xmms2.xmms.se/~tru/esperanza/0.3/
MAINTAINER= alexbl@FreeBSD.org
COMMENT= Advanced QT4 XMMS2 client
-BUILD_DEPENDS= ${LOCALBASE}/lib/libxmmsclient++.so:${PORTSDIR}/audio/cpp-xmms2
-RUN_DEPENDS= ${LOCALBASE}/lib/libxmmsclient++.so:${PORTSDIR}/audio/cpp-xmms2
+BUILD_DEPENDS= ${LOCALBASE}/lib/libxmmsclient++.so.1:${PORTSDIR}/audio/cpp-xmms2
+RUN_DEPENDS= ${LOCALBASE}/lib/libxmmsclient++.so.1:${PORTSDIR}/audio/cpp-xmms2
USE_QT_VER= 4
QT_COMPONENTS= gui moc qmake rcc uic xml network imageformats
diff --git a/audio/esperanza/distinfo b/audio/esperanza/distinfo
index 02015d2db4f4..867ee285617b 100644
--- a/audio/esperanza/distinfo
+++ b/audio/esperanza/distinfo
@@ -1,3 +1,3 @@
-MD5 (esperanza-0.2.2.tar.gz) = 4d4c7567fb0081e99f097925b5eaeca8
-SHA256 (esperanza-0.2.2.tar.gz) = 247e31ca03bbb6147ff789516e843be5d48269f2f555d1a8756ddea855af7541
-SIZE (esperanza-0.2.2.tar.gz) = 151126
+MD5 (esperanza-0.3.tar.gz) = 4a6c23d2e4f73af2d2143e1e0f5ea766
+SHA256 (esperanza-0.3.tar.gz) = c365c22c0154f15a83951e287068faf0b862ae017a7b402ed34e0ca85cde3ae6
+SIZE (esperanza-0.3.tar.gz) = 211618
diff --git a/audio/euphoria/Makefile b/audio/euphoria/Makefile
index 36c7d761bdf3..aed413ecb6f0 100644
--- a/audio/euphoria/Makefile
+++ b/audio/euphoria/Makefile
@@ -29,6 +29,8 @@ USE_BZIP2= yes
USE_RUBY= yes
RUBY_SHEBANG_FILES= ${WRKSRC}/bin/euphoria
+BROKEN= Not updated to the DrJekyll clientlib API
+
.include <bsd.port.pre.mk>
.if ${ARCH} == "ia64"
BROKEN= edje is broken on ia64
diff --git a/audio/gx2osd/Makefile b/audio/gx2osd/Makefile
index ccd7e9d3e877..90c2b63d0e7f 100644
--- a/audio/gx2osd/Makefile
+++ b/audio/gx2osd/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= gx2osd
-PORTVERSION= 0.1
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= audio
MASTER_SITES= http://eclipser.no-ip.org/
@@ -14,33 +13,27 @@ MAINTAINER= alexbl@FreeBSD.org
COMMENT= An OSD client for XMMS2
LIB_DEPENDS= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
+ glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
xerces-c.27:${PORTSDIR}/textproc/xerces-c2
-BUILD_DEPENDS= ${LOCALBASE}/lib/libxmmsclient++.so:${PORTSDIR}/audio/cpp-xmms2
-RUN_DEPENDS= ${LOCALBASE}/lib/libxmmsclient++.so:${PORTSDIR}/audio/cpp-xmms2
+BUILD_DEPENDS= ${LOCALBASE}/lib/libxmmsclient++.so.1:${PORTSDIR}/audio/cpp-xmms2
+RUN_DEPENDS= ${LOCALBASE}/lib/libxmmsclient++.so.1:${PORTSDIR}/audio/cpp-xmms2
USE_BZIP2= yes
USE_PYTHON_BUILD= yes
-CFLAGS+= -I${LOCALBASE}/include
-LINKFLAGS+= ${LDFLAGS} -L${LOCALBASE}/lib
-
-MAKE_ENV+= LINKFAGS="${LINKFLAGS}" WAF_HOME=.
+MAKE_ENV+= WAF_HOME=.
MAN1= gx2osd.1
.include <bsd.port.pre.mk>
-pre-patch:
- @${REINPLACE_CMD} -e 's|share/man/man1|man/man1|g' ${WRKSRC}/wscript
-
do-configure:
- -@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf --prefix ${PREFIX} configure
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf --prefix ${PREFIX} configure
+ @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf --conf-prefix=${LOCALBASE} --with-mandir=${LOCALBASE}/man --prefix=${PREFIX} configure
do-build:
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf --prefix ${PREFIX} build
+ @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf build
do-install:
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf --prefix ${PREFIX} ${INSTALL_TARGET}
+ @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf ${INSTALL_TARGET}
.include <bsd.port.post.mk>
diff --git a/audio/gx2osd/distinfo b/audio/gx2osd/distinfo
index 914a33eae0e8..7a8666deb558 100644
--- a/audio/gx2osd/distinfo
+++ b/audio/gx2osd/distinfo
@@ -1,3 +1,3 @@
-MD5 (gx2osd-0.1.tar.bz2) = dbfe4fdf6aa8b788d1346b149c094884
-SHA256 (gx2osd-0.1.tar.bz2) = 702b99f7eb3f6c614932085aa01be543ad463d01ba710d848bd38a919b200985
-SIZE (gx2osd-0.1.tar.bz2) = 117143
+MD5 (gx2osd-0.2.tar.bz2) = f7d2b53b8b1ee8becdee7ae4dcd632b5
+SHA256 (gx2osd-0.2.tar.bz2) = 674195b762d1a16f843062dffea88b1b6dcbee979ef6f593535b800815141c5e
+SIZE (gx2osd-0.2.tar.bz2) = 132995
diff --git a/audio/gx2osd/pkg-plist b/audio/gx2osd/pkg-plist
index 3eea19677f11..da67f97038b6 100644
--- a/audio/gx2osd/pkg-plist
+++ b/audio/gx2osd/pkg-plist
@@ -1,4 +1,5 @@
bin/gx2osd
+%%DATADIR%%/gx2osd.glade
%%DATADIR%%/skins/skin.xsd
%%DATADIR%%/skins/default/default.xml
%%DATADIR%%/skins/default/noimage.png
diff --git a/audio/gxmms2/Makefile b/audio/gxmms2/Makefile
index f1a8ed48a294..773043854411 100644
--- a/audio/gxmms2/Makefile
+++ b/audio/gxmms2/Makefile
@@ -25,6 +25,8 @@ PLIST_FILES= bin/gxmms2 \
%%DATADIR%%/gxmms2_mini.xpm
PLIST_DIRS= %%DATADIR%%
+BROKEN= Not updated to DrJekyll clientlib API
+
.include <bsd.port.pre.mk>
do-install:
diff --git a/audio/java-xmms2/Makefile b/audio/java-xmms2/Makefile
index 3368d1cb1138..2fafe0cf3ef9 100644
--- a/audio/java-xmms2/Makefile
+++ b/audio/java-xmms2/Makefile
@@ -27,24 +27,7 @@ PLIST= ${.CURDIR}/pkg-plist
SCONS_BUILDENV= JAVA_HOME=${JAVA_HOME}
SCONS_TARGET= src/clients/lib/java
+BROKEN= Requires Java 1.6 and are no longer included with xmms2
XMMS2_SLAVE= java
-# Crazy workaround for a bug introduced sometime after DrDoolittle that
-# causes the java bindings to not be built completely on the first
-# run of scons.
-
-do-build:
- @cd ${WRKSRC} && \
- ${SETENV} ${SCONS_BUILDENV} ${SCONS_BIN} ${SCONS_ENV} ${SCONS_ARGS} \
- ${SCONS_TARGET}
- @cd ${WRKSRC} && \
- ${SETENV} ${SCONS_BUILDENV} ${SCONS_BIN} ${SCONS_ENV} ${SCONS_ARGS} \
- ${SCONS_TARGET}
-
-do-install:
- @cd ${WRKSRC} && ${INSTALL_DATA} src/clients/lib/java/xmms2java.jar \
- ${JAVAJARDIR}/xmms2java.jar
- @cd ${WRKSRC} && ${INSTALL_DATA} src/clients/lib/java/libxmms2java.so \
- ${PREFIX}/lib/libxmms2java.so
-
.include "${MASTERDIR}/Makefile"
diff --git a/audio/nyello/Makefile b/audio/nyello/Makefile
index 97db7d49a947..7ede08c35a3e 100644
--- a/audio/nyello/Makefile
+++ b/audio/nyello/Makefile
@@ -25,4 +25,6 @@ CONFIGURE_ENV= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
WRKSRC= ${WRKDIR}/${DISTNAME}
PLIST_FILES= bin/nyello
+BROKEN= Not updated to the DrJekyll clientlib API
+
.include <bsd.port.mk>
diff --git a/audio/py-xmms2/Makefile b/audio/py-xmms2/Makefile
index 6709fb00ffef..dc7a0d6ad286 100644
--- a/audio/py-xmms2/Makefile
+++ b/audio/py-xmms2/Makefile
@@ -11,9 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= alexbl@FreeBSD.org
COMMENT= Python Bindings for XMMS2
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex \
- ${LOCALBASE}/lib/libxmmsclient.so:${PORTSDIR}/audio/xmms2
-RUN_DEPENDS= ${LOCALBASE}/lib/libxmmsclient.so:${PORTSDIR}/audio/xmms2
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex
+LIB_DEPENDS+= xmmsclient.2:${PORTSDIR}/audio/xmms2
MASTERDIR= ${.CURDIR}/../xmms2
@@ -21,10 +20,6 @@ USE_PYTHON= yes
PLIST= ${.CURDIR}/pkg-plist
-SCONS_TARGET= src/clients/lib/python/xmmsclient.so
XMMS2_SLAVE= python
-do-install:
- @cd ${WRKSRC} && ${INSTALL_PROGRAM} ${SCONS_TARGET} ${DESTDIR}/${PYTHONPREFIX_SITELIBDIR}/xmmsclient.so
-
.include "${MASTERDIR}/Makefile"
diff --git a/audio/py-xmms2/pkg-plist b/audio/py-xmms2/pkg-plist
index 2cf38cc8a00f..f7a7a5440769 100644
--- a/audio/py-xmms2/pkg-plist
+++ b/audio/py-xmms2/pkg-plist
@@ -1 +1,9 @@
-%%PYTHON_SITELIBDIR%%/xmmsclient.so
+%%PYTHON_SITELIBDIR%%/xmmsclient/__init__.py
+%%PYTHON_SITELIBDIR%%/xmmsclient/sync.py
+%%PYTHON_SITELIBDIR%%/xmmsclient/propdict.py
+%%PYTHON_SITELIBDIR%%/xmmsclient/consts.py
+%%PYTHON_SITELIBDIR%%/xmmsclient/collections.py
+%%PYTHON_SITELIBDIR%%/xmmsclient/glib.py
+%%PYTHON_SITELIBDIR%%/xmmsclient/qt3.py
+%%PYTHON_SITELIBDIR%%/xmmsclient/xmmsapi.so
+@dirrm %%PYTHON_SITELIBDIR%%/xmmsclient
diff --git a/audio/ruby-xmms2-ecore/Makefile b/audio/ruby-xmms2-ecore/Makefile
index cdcf58a38a2f..14231af03652 100644
--- a/audio/ruby-xmms2-ecore/Makefile
+++ b/audio/ruby-xmms2-ecore/Makefile
@@ -12,8 +12,8 @@ PKGNAMESUFFIX= -ecore
MAINTAINER= alexbl@FreeBSD.org
COMMENT= Ruby ecore mainloop bindings for XMMS2
-BUILD_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/xmmsclient.so:${PORTSDIR}/audio/ruby-xmms2
-RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/xmmsclient.so:${PORTSDIR}/audio/ruby-xmms2
+BUILD_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/xmmsclient_ext.so:${PORTSDIR}/audio/ruby-xmms2
+RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/xmmsclient_ext.so:${PORTSDIR}/audio/ruby-xmms2
LIB_DEPENDS+= ecore.1:${PORTSDIR}/x11/ecore
MASTERDIR= ${.CURDIR}/../xmms2
@@ -24,19 +24,8 @@ USE_LDCONFIG= yes
PLIST= ${.CURDIR}/pkg-plist
-SCONS_TARGET= src/clients/lib/xmmsclient-ecore/libxmmsclient-ecore.so \
- src/clients/lib/ruby/xmmsclient_ecore.so
-XMMS2_SLAVE= ruby-ecore
+BROKEN= Fails to configure (can not find ecore-config)
-do-install:
- @cd ${WRKSRC} && ${INSTALL_PROGRAM} \
- src/clients/lib/ruby/xmmsclient_ecore.so \
- ${RUBY_SITEARCHLIBDIR}/xmmsclient_ecore.so
- @cd ${WRKSRC} && ${INSTALL_PROGRAM} \
- src/clients/lib/xmmsclient-ecore/libxmmsclient-ecore.so \
- ${PREFIX}/lib/libxmmsclient-ecore.so
- @cd ${WRKSRC} && ${INSTALL_PROGRAM} \
- src/clients/lib/xmmsclient-ecore/libxmmsclient-ecore.a \
- ${PREFIX}/lib/libxmmsclient-ecore.a
+XMMS2_SLAVE= ruby-ecore
.include "${MASTERDIR}/Makefile"
diff --git a/audio/ruby-xmms2/Makefile b/audio/ruby-xmms2/Makefile
index 9d566239948b..261f5591423e 100644
--- a/audio/ruby-xmms2/Makefile
+++ b/audio/ruby-xmms2/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
MAINTAINER= alexbl@FreeBSD.org
COMMENT= Ruby Bindings for XMMS2
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libxmmsclient.so:${PORTSDIR}/audio/xmms2
-RUN_DEPENDS+= ${LOCALBASE}/lib/libxmmsclient.so:${PORTSDIR}/audio/xmms2
+LIB_DEPENDS+= xmmsclient.2:${PORTSDIR}/audio/xmms2
MASTERDIR= ${.CURDIR}/../xmms2
@@ -21,15 +20,6 @@ USE_GNOME= glib20
PLIST= ${.CURDIR}/pkg-plist
-SCONS_TARGET= src/clients/lib/ruby/xmmsclient.so \
- src/clients/lib/ruby/xmmsclient_glib.so
XMMS2_SLAVE= ruby
-do-install:
- @cd ${WRKSRC} && ${INSTALL_PROGRAM} src/clients/lib/ruby/xmmsclient.so \
- ${RUBY_SITEARCHLIBDIR}/xmmsclient.so
- @cd ${WRKSRC} && ${INSTALL_PROGRAM} \
- src/clients/lib/ruby/xmmsclient_glib.so \
- ${RUBY_SITEARCHLIBDIR}/xmmsclient_glib.so
-
.include "${MASTERDIR}/Makefile"
diff --git a/audio/ruby-xmms2/pkg-plist b/audio/ruby-xmms2/pkg-plist
index d46cc9bfe0a3..a855bd0b63ef 100644
--- a/audio/ruby-xmms2/pkg-plist
+++ b/audio/ruby-xmms2/pkg-plist
@@ -1,2 +1,6 @@
-%%RUBY_SITEARCHLIBDIR%%/xmmsclient.so
+%%RUBY_SITELIBDIR%%/xmmsclient.rb
+%%RUBY_SITELIBDIR%%/xmmsclient/async.rb
+%%RUBY_SITELIBDIR%%/xmmsclient/sync.rb
+%%RUBY_SITEARCHLIBDIR%%/xmmsclient_ext.so
%%RUBY_SITEARCHLIBDIR%%/xmmsclient_glib.so
+@dirrm %%RUBY_SITELIBDIR%%/xmmsclient
diff --git a/audio/shellac/Makefile b/audio/shellac/Makefile
index 222dd9ae2232..a8af92bb4695 100644
--- a/audio/shellac/Makefile
+++ b/audio/shellac/Makefile
@@ -20,6 +20,7 @@ USE_PYTHON= yes
USE_PYDISTUTILS= yes
USE_GNOME= pygtk2
+BROKEN= Not updated to the DrJekyl clientlib API
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
diff --git a/audio/snett/Makefile b/audio/snett/Makefile
index 5c7e77898cc0..817d24f335ea 100644
--- a/audio/snett/Makefile
+++ b/audio/snett/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_RUBY= yes
NO_BUILD= yes
+BROKEN= Not updated to the DrJekyll clientlib API
do-install:
@cd ${WRKSRC} && ${LOCALBASE}/bin/rake PREFIX=${PREFIX}/ ${INSTALL_TARGET}
diff --git a/audio/xmms2-scrobbler/Makefile b/audio/xmms2-scrobbler/Makefile
index 286c653ca32f..e85182ce0e1f 100644
--- a/audio/xmms2-scrobbler/Makefile
+++ b/audio/xmms2-scrobbler/Makefile
@@ -5,23 +5,26 @@
# $FreeBSD$
PORTNAME= xmms2-scrobbler
-PORTVERSION= 0.1.2
+PORTVERSION= 0.1.3
CATEGORIES= audio ruby
-MASTER_SITES= ftp://ftp.code-monkey.de/pub/xmms2-scrobbler/
+MASTER_SITES= http://exodus.xmms.se/~tilman/
MAINTAINER= alexbl@FreeBSD.org
COMMENT= A last.fm submission client for XMMS2
-BUILD_DEPENDS= ${RUBY_SITEARCHLIBDIR}/xmmsclient.so:${PORTSDIR}/audio/ruby-xmms2 \
+BUILD_DEPENDS= ${RUBY_SITEARCHLIBDIR}/xmmsclient_ext.so:${PORTSDIR}/audio/ruby-xmms2 \
${RUBY_SITELIBDIR}/event-loop.rb:${PORTSDIR}/devel/ruby-event-loop \
${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
-RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/xmmsclient.so:${PORTSDIR}/audio/ruby-xmms2 \
+RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/xmmsclient_ext.so:${PORTSDIR}/audio/ruby-xmms2 \
${RUBY_SITELIBDIR}/event-loop.rb:${PORTSDIR}/devel/ruby-event-loop
USE_RUBY= yes
NO_BUILD= yes
-PLIST_FILES= bin/xmms2-scrobbler
+PLIST_FILES= bin/xmms2-scrobbler \
+ %%DATADIR%%/filters/britney.rb \
+ %%DATADIR%%/filters/musicbrainz.rb
+PLIST_DIRS= %%DATADIR%%/filters %%DATADIR%%
SUB_FILES= pkg-message
diff --git a/audio/xmms2-scrobbler/distinfo b/audio/xmms2-scrobbler/distinfo
index c70db2a18948..beb66c7ae96d 100644
--- a/audio/xmms2-scrobbler/distinfo
+++ b/audio/xmms2-scrobbler/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmms2-scrobbler-0.1.2.tar.gz) = e0df8fe4fba93a3f42de3d90308d21d2
-SHA256 (xmms2-scrobbler-0.1.2.tar.gz) = fb2d9fc595886b3bff01efefbbc8c2cc8aff2d1d9cb8096ac5250b4a8582e513
-SIZE (xmms2-scrobbler-0.1.2.tar.gz) = 6061
+MD5 (xmms2-scrobbler-0.1.3.tar.gz) = 4d7fde80a5a6c963cf46864f2747d773
+SHA256 (xmms2-scrobbler-0.1.3.tar.gz) = 2c2306eedab88f3b8ee4b8ab07b84405349d35e0ce4a57e300f491f70049cf26
+SIZE (xmms2-scrobbler-0.1.3.tar.gz) = 6466
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index 552af278c6a3..c8e16dde6637 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -6,9 +6,8 @@
#
PORTNAME?= xmms2
-PORTVERSION= 0.2.d.8
-PORTREVISION= 1
-DISTVERSION= 0.2DrHouse
+PORTVERSION= 0.2.d.9
+DISTVERSION= 0.2DrJekyll
CATEGORIES?= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -23,8 +22,7 @@ LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \
.endif
USE_BZIP2= yes
-USE_SCONS= yes
-SCONS_ARGS= INSTALLDIR=${DESTDIR} SHAREDIR=${DATADIR} EXCLUDE="${EXCLUDE}"
+USE_PYTHON_BUILD= yes
.if !defined(XMMS2_SLAVE)
USE_GNOME= glib20
@@ -34,7 +32,7 @@ USE_LDCONFIG= yes
.endif
.if !defined(XMMS2_SLAVE)
-MAN1= xmms2.1 xmms2-et.1 xmms2d.1 xmms2-launcher.1 xmms2-mdns-avahi.1
+MAN1= xmms2.1 xmms2-et.1 xmms2d.1 xmms2-launcher.1
MANCOMPRESSED= yes
OPTIONS= FAAD "Support to playback AAC files" on \
@@ -42,7 +40,7 @@ OPTIONS= FAAD "Support to playback AAC files" on \
MODPLUG "Support to playback MOD files" off \
MUSEPACK "Support to playback MPC files" off \
SID "Support to playback SID files" off \
- WMA "Support to playback WMA files" off \
+ AVCODEC "Support to playback files with avcodec/avformat" 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 \
@@ -50,6 +48,8 @@ OPTIONS= FAAD "Support to playback AAC files" on \
MMS "Support to playback streams via MMS" off \
SAMBA "Support to playback files via SMB" off \
DAAP "Support to playback files via DAAP" on \
+ OFA "Support to collect MusicDNS fingerprints" off \
+ XML "Support for XML based playlists (XSPF, RSS)" off \
FAM "Support to update Media Library on file change" off \
MDNS_AVAHI "Support to announce XMMS2d via mDNS (Avahi)" off \
MDNS_APPLE "Support to announce XMMS2d via mDNS (Apple)" on \
@@ -62,26 +62,33 @@ OPTIONS= FAAD "Support to playback AAC files" on \
.include <bsd.port.pre.mk>
+.if defined(XMMS2_SLAVE)
+EXCLUDE+= --without-xmms2d=1
+EXTRA_PATCHES= ${PATCHDIR}/slaveport-wscript ${PATCHDIR}/slaveport-src_include_wscript
+.endif
+
.if defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "python"
-EXCLUDE+= ruby java xmmsclient-ecore xmmsclient++ xmmsclient++-glib
+EXCLUDE+= --with-optionals="python"
.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "ruby"
-EXCLUDE+= python java xmmsclient-ecore xmmsclient++ xmmsclient++-glib
+EXCLUDE+= --with-optionals="ruby"
+.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "perl"
+EXCLUDE+= --with-optionals="perl"
.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "ruby-ecore"
-EXCLUDE+= python java xmmsclient++ xmmsclient++-glib
-.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "java"
-EXCLUDE+= ruby python xmmsclient-ecore xmmsclient++ xmmsclient++-glib
+EXCLUDE+= --with-optionals="ruby" --with-optionals="xmmsclient-ecore"
.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "cpp"
-EXCLUDE+= ruby python java xmmsclient-ecore
+EXCLUDE+= --with-optionals="xmmsclient++" --with-optionals="xmmsclient++-glib"
.elif !defined(XMMS2_SLAVE)
-EXCLUDE+= python ruby java xmmsclient-ecore xmmsclient++ xmmsclient++-glib
+EXCLUDE+= --without-optionals="python" --without-optionals="ruby" --without-optionals="xmmsclient-ecore" --without-optionals="xmmsclient++" --without-optionals="xmmsclient++-glib" --without-optionals="perl"
.endif
.if !defined(XMMS2_SLAVE)
+
+EXCLUDE+= --without-plugins="cdda"
.if !defined(WITHOUT_CURL)
LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl
PLIST_SUB+= CURL=""
.else
-EXCLUDE+= curl
+EXCLUDE+= --without-plugins="curl" --without-plugins="icymetaint"
PLIST_SUB+= CURL="@comment "
.endif
@@ -91,7 +98,7 @@ LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl
.endif
PLIST_SUB+= LASTFM=""
.else
-EXCLUDE+= lastfm lastfmeta
+EXCLUDE+= --without-plugins="lastfm" --without-plugins="lastfmeta"
PLIST_SUB+= LASTFM="@comment "
.endif
@@ -99,7 +106,7 @@ PLIST_SUB+= LASTFM="@comment "
LIB_DEPENDS+= sidplay2.[0-9]:${PORTSDIR}/audio/libsidplay2
PLIST_SUB+= SID=""
.else
-EXCLUDE+= sid
+EXCLUDE+= --without-plugins="sid"
PLIST_SUB+= SID="@comment "
.endif
@@ -107,7 +114,7 @@ PLIST_SUB+= SID="@comment "
LIB_DEPENDS+= FLAC.7:${PORTSDIR}/audio/flac
PLIST_SUB+= FLAC=""
.else
-EXCLUDE+= flac
+EXCLUDE+= --without-plugins="flac"
PLIST_SUB+= FLAC="@comment "
.endif
@@ -115,15 +122,15 @@ PLIST_SUB+= FLAC="@comment "
LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad
PLIST_SUB+= FAAD=""
.else
-EXCLUDE+= faad
+EXCLUDE+= --without-plugins="faad" --without-plugins="mp4"
PLIST_SUB+= FAAD="@comment "
.endif
-.if defined(WITH_WMA)
+.if defined(WITH_AVCODEC)
LIB_DEPENDS+= avutil.1:${PORTSDIR}/multimedia/ffmpeg
PLIST_SUB+= WMA=""
.else
-EXCLUDE+= wma
+EXCLUDE+= --without-plugins="avcodec" --without-plugins="avformat"
PLIST_SUB+= WMA="@comment "
.endif
@@ -131,7 +138,7 @@ PLIST_SUB+= WMA="@comment "
LIB_DEPENDS+= mac.2:${PORTSDIR}/audio/mac
PLIST_SUB+= MAC=""
.else
-EXCLUDE+= mac
+EXCLUDE+= --without-plugins="mac"
PLIST_SUB+= MAC="@comment "
.endif
@@ -141,7 +148,6 @@ 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
@@ -149,16 +155,15 @@ PLIST_SUB+= SDL="@comment "
LIB_DEPENDS+= mpcdec.5:${PORTSDIR}/audio/libmpcdec
PLIST_SUB+= MUSEPACK=""
.else
-EXCLUDE+= musepack
+EXCLUDE+= --without-plugins="musepack"
PLIST_SUB+= MUSEPACK="@comment "
.endif
.if defined(WITH_JACK)
-IGNORE= the Jack plugin has not been updated to the Transforms API
LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack
PLIST_SUB+= JACK=""
.else
-EXCLUDE+= jack
+EXCLUDE+= --without-plugins="jack"
PLIST_SUB+= JACK="@comment "
.endif
@@ -166,22 +171,38 @@ PLIST_SUB+= JACK="@comment "
LIB_DEPENDS+= modplug.0:${PORTSDIR}/audio/libmodplug
PLIST_SUB+= MODPLUG=""
.else
-EXCLUDE+= modplug
+EXCLUDE+= --without-plugins="modplug"
PLIST_SUB+= MODPLUG="@comment "
.endif
+.if defined(WITH_OFA)
+LIB_DEPENDS+= ofa.0:${PORTSDIR}/audio/libofa
+PLIST_SUB+= OFA=""
+.else
+EXCLUDE+= --without-plugins="ofa"
+PLIST_SUB+= OFA="@comment "
+.endif
+
+.if defined(WITH_XML)
+USE_GNOME= xml2
+PLIST_SUB+= XML=""
+.else
+EXCLUDE+= --without-plugins="xml" --without-plugins="rss" --without-plugins="xspf"
+PLIST_SUB+= XML="@comment "
+.endif
+
.if defined(WITH_SAMBA)
LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient
PLIST_SUB+= SAMBA=""
.else
-EXCLUDE+= samba
+EXCLUDE+= --without-plugins="samba"
PLIST_SUB+= SAMBA="@comment "
.endif
.if !defined(WITHOUT_DAAP)
PLIST_SUB+= DAAP=""
.else
-EXCLUDE+= daap
+EXCLUDE+= --without-plugins="daap"
PLIST_SUB+= DAAP="@comment "
.endif
@@ -189,7 +210,7 @@ PLIST_SUB+= DAAP="@comment "
USE_GNOME+= gnomevfs2
PLIST_SUB+= GNOMEVFS=""
.else
-EXCLUDE+= gnomevfs
+EXCLUDE+= --without-plugins="gnomevfs"
PLIST_SUB+= GNOMEVFS="@comment "
.endif
@@ -197,7 +218,7 @@ PLIST_SUB+= GNOMEVFS="@comment "
LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms
PLIST_SUB+= MMS=""
.else
-EXCLUDE+= mms
+EXCLUDE+= --without-plugins="mms"
PLIST_SUB+= MMS="@comment "
.endif
@@ -206,7 +227,7 @@ USE_FAM= yes
WANT_FAM_SYSTEM=gamin
PLIST_SUB+= FAM=""
.else
-EXCLUDE+= medialib-updater
+EXCLUDE+= --without-optionals="medialib-updater"
PLIST_SUB+= FAM="@comment "
.endif
@@ -214,7 +235,7 @@ PLIST_SUB+= FAM="@comment "
LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2
PLIST_SUB+= ICES=""
.else
-EXCLUDE+= ices
+EXCLUDE+= --without-plugins="ices"
PLIST_SUB+= ICES="@comment "
.endif
@@ -222,7 +243,7 @@ PLIST_SUB+= ICES="@comment "
LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao
PLIST_SUB+= AO=""
.else
-EXCLUDE+= ao
+EXCLUDE+= --without-plugins="ao"
PLIST_SUB+= AO="@comment "
.endif
@@ -230,11 +251,12 @@ PLIST_SUB+= AO="@comment "
.if !defined(WITHOUT_MDNS_APPLE)
BROKEN= You may choose either MDNS_APPLE or MDNS_AVAHI, but not both
.endif
-EXCLUDE+= dnssd dns_sd
+EXCLUDE+= --without-optionals="dnssd"
LIB_DEPENDS+= avahi-core:${PORTSDIR}/net/avahi
PLIST_SUB+= MDNS_AVAHI=""
+MAN1+= xmms2-mdns-avahi.1
.else
-EXCLUDE+= avahi
+EXCLUDE+= --without-optionals="avahi"
PLIST_SUB+= MDNS_AVAHI="@comment "
.endif
@@ -242,22 +264,31 @@ PLIST_SUB+= MDNS_AVAHI="@comment "
.if defined(WITH_MDNS_AVAHI)
BROKEN= You may choose either MDNS_APPLE or MDNS_AVAHI, but not both
.endif
-EXCLUDE+= avahi
+EXCLUDE+= --without-optionals="avahi"
LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder
PLIST_SUB+= MDNS_APPLE=""
.else
-EXCLUDE+= dnssd dns_sd
+EXCLUDE+= --without-optionals="dnssd"
PLIST_SUB+= MDNS_APPLE="@comment "
.endif
-.endif
.if defined(WITH_VOCODER)
LIB_DEPENDS+= fftw3f.4:${PORTSDIR}/math/fftw3-float
LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate
PLIST_SUB+= VOCODER=""
.else
-EXCLUDE+= vocoder
+EXCLUDE+= --without-plugins="vocoder"
PLIST_SUB+= VOCODER="@comment "
.endif
+.endif
+
+do-configure:
+ cd ${WRKSRC} && ./waf configure --conf-prefix=${LOCALBASE} --prefix=${PREFIX} --with-mandir=${PREFIX}/man ${EXCLUDE}
+
+do-build:
+ cd ${WRKSRC} && ./waf build
+
+do-install:
+ cd ${WRKSRC} && ./waf install
.include <bsd.port.post.mk>
diff --git a/audio/xmms2/distinfo b/audio/xmms2/distinfo
index 5233ad3ff1de..d30090122fb7 100644
--- a/audio/xmms2/distinfo
+++ b/audio/xmms2/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmms2-0.2DrHouse.tar.bz2) = 8f7293b21bd6cb28e7705559a9deab10
-SHA256 (xmms2-0.2DrHouse.tar.bz2) = b87191f137c8a53e85ef502fadc648958848d5229f0b4b6b899e4d1655363c26
-SIZE (xmms2-0.2DrHouse.tar.bz2) = 1059473
+MD5 (xmms2-0.2DrJekyll.tar.bz2) = 768de76a98b6a9766cec157ff0a12543
+SHA256 (xmms2-0.2DrJekyll.tar.bz2) = 7d46baaeaac50d3f4e6db2d492de4ba8fa4fbaed6d42816df5b57d9116a50ff4
+SIZE (xmms2-0.2DrJekyll.tar.bz2) = 1207014
diff --git a/audio/xmms2/files/patch-src_clients_sdl-vis_Program b/audio/xmms2/files/patch-src_clients_sdl-vis_Program
deleted file mode 100644
index 2c4b3b177a2d..000000000000
--- a/audio/xmms2/files/patch-src_clients_sdl-vis_Program
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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_include_xmms_wscript b/audio/xmms2/files/patch-src_include_xmms_wscript
new file mode 100644
index 000000000000..3588ba5ca8ae
--- /dev/null
+++ b/audio/xmms2/files/patch-src_include_xmms_wscript
@@ -0,0 +1,11 @@
+--- src/include/xmms/wscript.orig Fri May 25 16:49:48 2007
++++ src/include/xmms/wscript Fri May 25 16:50:17 2007
+@@ -45,7 +45,7 @@
+
+ conf.env['XMMS_DEFS'] = defs
+ conf.env['PLUGINDIR'] = defs['PKGLIBDIR']
+- conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "lib", "pkgconfig")
++ conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "libdata", "pkgconfig")
+
+ for i in defs:
+ conf.add_define(i, defs[i])
diff --git a/audio/xmms2/files/patch-src_plugins_faad_Plugin b/audio/xmms2/files/patch-src_plugins_faad_Plugin
deleted file mode 100644
index 8c20d2479bec..000000000000
--- a/audio/xmms2/files/patch-src_plugins_faad_Plugin
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/plugins/faad/Plugin.orig Tue Sep 26 20:35:50 2006
-+++ src/plugins/faad/Plugin Tue Sep 26 20:36:04 2006
-@@ -2,13 +2,7 @@
- source=['faad.c', 'mp4ff/drms.c', 'mp4ff/mp4atom.c', 'mp4ff/mp4ff.c', 'mp4ff/mp4meta.c', 'mp4ff/mp4sample.c', 'mp4ff/mp4tagupdate.c', 'mp4ff/mp4util.c']
-
- def config(env):
-- 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(CPPDEFINES=['USE_TAGGING'])
-
- # to use iTunes DRM change this to true
diff --git a/audio/xmms2/files/patch-src_plugins_faad_mp4ff_mp4ff_int_types.h b/audio/xmms2/files/patch-src_plugins_faad_mp4ff_mp4ff_int_types.h
deleted file mode 100644
index 309a124bfd6b..000000000000
--- a/audio/xmms2/files/patch-src_plugins_faad_mp4ff_mp4ff_int_types.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/faad/mp4ff/mp4ff_int_types.h.orig Fri Jul 7 03:00:50 2006
-+++ src/plugins/faad/mp4ff/mp4ff_int_types.h Fri Jul 7 03:01:16 2006
-@@ -15,7 +15,7 @@
-
- #else
-
--#include <stdint.h>
-+#include <inttypes.h>
-
- #endif
-
diff --git a/audio/xmms2/files/patch-src_plugins_sid_Plugin b/audio/xmms2/files/patch-src_plugins_sid_Plugin
deleted file mode 100644
index db9c4004e45a..000000000000
--- a/audio/xmms2/files/patch-src_plugins_sid_Plugin
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/plugins/sid/Plugin.orig Thu Jul 6 22:25:16 2006
-+++ src/plugins/sid/Plugin Thu Jul 6 22:27:29 2006
-@@ -6,4 +6,5 @@
- builder_path = env.run("pkg-config libsidplay2 --variable=builders").strip()
- if builder_path:
- env.Append(LIBPATH=["-L%s" % builder_path])
-- env.checklib("resid-builder", "resid_version_string")
-+ env.Append(LINKFLAGS=['-rpath=%s' % builder_path])
-+ env.Append(LIBS=["resid-builder"])
diff --git a/audio/xmms2/files/patch-src_xmms_Program b/audio/xmms2/files/patch-src_xmms_Program
deleted file mode 100644
index ce954718f6ff..000000000000
--- a/audio/xmms2/files/patch-src_xmms_Program
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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()
-- env.pkgconfig("glib-2.0 >= 2.6.0", fail=True)
-- env.pkgconfig("gmodule-2.0", fail=True)
-- env.pkgconfig("gthread-2.0", fail=True)
-- env.pkgconfig("sqlite3", fail=True)
-+ env.pkgconfig("glib-2.0 >= 2.6.0")
-+ 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"])
diff --git a/audio/xmms2/files/slaveport-src_include_wscript b/audio/xmms2/files/slaveport-src_include_wscript
new file mode 100644
index 000000000000..f26fc665ff3f
--- /dev/null
+++ b/audio/xmms2/files/slaveport-src_include_wscript
@@ -0,0 +1,11 @@
+--- src/include/wscript.orig Fri May 25 16:27:44 2007
++++ src/include/wscript Fri May 25 16:27:51 2007
+@@ -5,8 +5,6 @@
+ paths = ['xmms', 'xmmsc', 'xmmsclient', 'xmmsclient/xmmsclient++']
+ for p in paths:
+ bld.add_subdirs(p)
+- f = [os.path.join(p, a) for a in os.listdir(os.path.join('src','include',p)) if a.endswith('.h')]
+- Common.install_files('PREFIX', os.path.join('include', 'xmms2', p), " ".join(f))
+
+ def configure(conf):
+ conf.sub_config("xmms")
diff --git a/audio/xmms2/files/slaveport-wscript b/audio/xmms2/files/slaveport-wscript
new file mode 100644
index 000000000000..38ee21ff7e29
--- /dev/null
+++ b/audio/xmms2/files/slaveport-wscript
@@ -0,0 +1,11 @@
+--- wscript.orig Fri May 25 16:27:23 2007
++++ wscript Fri May 25 16:27:28 2007
+@@ -41,8 +41,6 @@
+ src/lib/xmmssocket
+ src/lib/xmmsipc
+ src/lib/xmmsutils
+- src/clients/lib/xmmsclient
+- src/clients/lib/xmmsclient-glib
+ src/include
+ src/includepriv
+ """.split()
diff --git a/audio/xmms2/pkg-plist b/audio/xmms2/pkg-plist
index 73060e12259a..8f957d28234d 100644
--- a/audio/xmms2/pkg-plist
+++ b/audio/xmms2/pkg-plist
@@ -8,7 +8,6 @@ bin/xmms2-launcher
bin/xmms2d
include/xmms2/xmms/xmms_bindata.h
include/xmms2/xmms/xmms_config.h
-include/xmms2/xmms/xmms_defs.h
include/xmms2/xmms/xmms_effect.h
include/xmms2/xmms/xmms_effectplugin.h
include/xmms2/xmms/xmms_error.h
@@ -17,13 +16,13 @@ include/xmms2/xmms/xmms_log.h
include/xmms2/xmms/xmms_medialib.h
include/xmms2/xmms/xmms_object.h
include/xmms2/xmms/xmms_outputplugin.h
-include/xmms2/xmms/xmms_plsplugins.h
include/xmms2/xmms/xmms_plugin.h
include/xmms2/xmms/xmms_sample.h
include/xmms2/xmms/xmms_streamtype.h
include/xmms2/xmms/xmms_strfunc.h
+include/xmms2/xmms/xmms_util.h
include/xmms2/xmms/xmms_xformplugin.h
-include/xmms2/xmmsc/xmmsc_asyncns.h
+include/xmms2/xmmsc/xmmsc_coll.h
include/xmms2/xmmsc/xmmsc_errorcodes.h
include/xmms2/xmmsc/xmmsc_idnumbers.h
include/xmms2/xmmsc/xmmsc_inline.h
@@ -39,6 +38,8 @@ include/xmms2/xmmsc/xmmsc_util.h
include/xmms2/xmmsclient/xmmsclient++/bindata.h
include/xmms2/xmmsclient/xmmsclient++/client.h
include/xmms2/xmmsclient/xmmsclient++/config.h
+include/xmms2/xmmsclient/xmmsclient++/coll.h
+include/xmms2/xmmsclient/xmmsclient++/collection.h
include/xmms2/xmmsclient/xmmsclient++/dict.h
include/xmms2/xmmsclient/xmmsclient++/exceptions.h
include/xmms2/xmmsclient/xmmsclient++/helpers.h
@@ -48,6 +49,7 @@ include/xmms2/xmmsclient/xmmsclient++/mainloop.h
include/xmms2/xmmsclient/xmmsclient++/medialib.h
include/xmms2/xmmsclient/xmmsclient++/playback.h
include/xmms2/xmmsclient/xmmsclient++/playlist.h
+include/xmms2/xmmsclient/xmmsclient++/result.h
include/xmms2/xmmsclient/xmmsclient++/signal.h
include/xmms2/xmmsclient/xmmsclient++/stats.h
include/xmms2/xmmsclient/xmmsclient++/typedefs.h
@@ -59,12 +61,16 @@ 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
-lib/libxmmsclient.a
+lib/libxmmsclient-glib.so.1
+lib/libxmmsclient-glib.so.1.0.0
lib/libxmmsclient.so
+lib/libxmmsclient.so.2
+lib/libxmmsclient.so.2.0.0
%%AO%%lib/xmms2/libxmms_ao.so
-%%CURL%%lib/xmms2/libxmms_curl_http.so
+lib/xmms2/libxmms_asx.so
+lib/xmms2/libxmms_cue.so
+%%CURL%%lib/xmms2/libxmms_curl.so
lib/xmms2/libxmms_diskwrite.so
lib/xmms2/libxmms_equalizer.so
%%DAAP%%lib/xmms2/libxmms_daap.so
@@ -78,24 +84,24 @@ lib/xmms2/libxmms_file.so
lib/xmms2/libxmms_icymetaint.so
lib/xmms2/libxmms_id3v2.so
%%JACK%%lib/xmms2/libxmms_jack.so
+lib/xmms2/libxmms_m3u.so
lib/xmms2/libxmms_mad.so
%%MAC%%lib/xmms2/libxmms_mac.so
%%MMS%%lib/xmms2/libxmms_mms.so
%%MODPLUG%%lib/xmms2/libxmms_modplug.so
+%%FAAD%%lib/xmms2/libxmms_mp4.so
%%MUSEPACK%%lib/xmms2/libxmms_musepack.so
lib/xmms2/libxmms_null.so
lib/xmms2/libxmms_nulstripper.so
lib/xmms2/libxmms_oss.so
+lib/xmms2/libxmms_pls.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_vorbis.so
lib/xmms2/libxmms_wave.so
%%WMA%%lib/xmms2/libxmms_wma.so
-libdata/pkgconfig/xmms2-client-cpp.pc
-libdata/pkgconfig/xmms2-client-cpp-glib.pc
-libdata/pkgconfig/xmms2-client-ecore.pc
libdata/pkgconfig/xmms2-client-glib.pc
libdata/pkgconfig/xmms2-client.pc
libdata/pkgconfig/xmms2-plugin.pc