aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/abraca/Makefile16
-rw-r--r--audio/abraca/distinfo5
-rw-r--r--audio/abraca/pkg-descr2
-rw-r--r--audio/cpp-xmms2/Makefile4
-rw-r--r--audio/cpp-xmms2/pkg-plist4
-rw-r--r--audio/gxmms2/Makefile12
-rw-r--r--audio/gxmms2/distinfo5
-rw-r--r--audio/p5-xmms2/Makefile4
-rw-r--r--audio/p5-xmms2/pkg-plist7
-rw-r--r--audio/py-xmms2/Makefile4
-rw-r--r--audio/ruby-xmms2/Makefile4
-rw-r--r--audio/xmms2/Makefile27
-rw-r--r--audio/xmms2/distinfo5
-rw-r--r--audio/xmms2/files/patch-src-plugins-airplay-wscript10
-rw-r--r--audio/xmms2/files/patch-wscript19
-rw-r--r--audio/xmms2/pkg-plist9
-rw-r--r--sysutils/conky/Makefile4
17 files changed, 79 insertions, 62 deletions
diff --git a/audio/abraca/Makefile b/audio/abraca/Makefile
index 75ec1e873ebf..630fd9bd94e9 100644
--- a/audio/abraca/Makefile
+++ b/audio/abraca/Makefile
@@ -6,25 +6,25 @@
#
PORTNAME= abraca
-PORTVERSION= 0.4
-PORTREVISION= 2
-DISTVERSIONSUFFIX=-pre2
+PORTVERSION= 0.5.0
CATEGORIES= audio
-MASTER_SITES= http://abraca.xmms.se/attachments/download/100/
+MASTER_SITES= http://abraca.xmms.se/attachments/download/128/
MAINTAINER= olivier@gid0.org
COMMENT= Abraca is a GTK2 client for the XMMS2 music player
-LIB_DEPENDS= xmmsclient.5:${PORTSDIR}/audio/xmms2
+BUILD_DEPENDS= ${LOCALBASE}/bin/valac:${PORTSDIR}/lang/vala
+LIB_DEPENDS= xmmsclient.6:${PORTSDIR}/audio/xmms2 \
+ gee.2:${PORTSDIR}/devel/libgee
-USE_GMAKE= yes
-ALL_TARGET= # defined
+USE_BZIP2= yes
+USE_SCONS= yes
USE_GNOME= gtk20
PLIST_FILES= bin/${PORTNAME}
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/build/src/${PORTNAME} ${PREFIX}/bin
.include <bsd.port.pre.mk>
diff --git a/audio/abraca/distinfo b/audio/abraca/distinfo
index 73f93187ec70..925d2ea98d19 100644
--- a/audio/abraca/distinfo
+++ b/audio/abraca/distinfo
@@ -1,3 +1,2 @@
-MD5 (abraca-0.4-pre2.tar.gz) = ccfaf2bb1d01f0ab9915896bdad859c1
-SHA256 (abraca-0.4-pre2.tar.gz) = b2af3a885d6398735c581e43edb45658ed0190e69f99b3f55e7dfa3d6f85ce4b
-SIZE (abraca-0.4-pre2.tar.gz) = 155504
+SHA256 (abraca-0.5.0.tar.bz2) = c4caf88e9c0c8d5d51ac5c0df4cc9022a0aa2574a4ff791dea11c7e212b766e2
+SIZE (abraca-0.5.0.tar.bz2) = 402497
diff --git a/audio/abraca/pkg-descr b/audio/abraca/pkg-descr
index 933177bed7fd..643ba02861ce 100644
--- a/audio/abraca/pkg-descr
+++ b/audio/abraca/pkg-descr
@@ -1,4 +1,4 @@
Abraca is a GTK2 client for the XMMS2 music player. It is designed with
collections in mind, which makes managing your music a breeze.
-WWW: http://nooms.de/projects/abraca
+WWW: http://abraca.xmms.se/wiki/abraca
diff --git a/audio/cpp-xmms2/Makefile b/audio/cpp-xmms2/Makefile
index af657493899e..19228a8c75f7 100644
--- a/audio/cpp-xmms2/Makefile
+++ b/audio/cpp-xmms2/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
PKGNAMEPREFIX= cpp-
@@ -13,7 +13,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= C++ Bindings for XMMS2
LIB_DEPENDS+= boost_signals.4:${PORTSDIR}/devel/boost-libs \
- xmmsclient.5:${PORTSDIR}/audio/xmms2
+ xmmsclient.6:${PORTSDIR}/audio/xmms2
MASTERDIR= ${.CURDIR}/../xmms2
USE_LDCONFIG= yes
diff --git a/audio/cpp-xmms2/pkg-plist b/audio/cpp-xmms2/pkg-plist
index 47a0bea6c216..ad85a487472e 100644
--- a/audio/cpp-xmms2/pkg-plist
+++ b/audio/cpp-xmms2/pkg-plist
@@ -2,7 +2,7 @@ lib/libxmmsclient++-glib.so
lib/libxmmsclient++-glib.so.1
lib/libxmmsclient++-glib.so.1.0.0
lib/libxmmsclient++.so
-lib/libxmmsclient++.so.3
-lib/libxmmsclient++.so.3.0.0
+lib/libxmmsclient++.so.4
+lib/libxmmsclient++.so.4.0.0
libdata/pkgconfig/xmms2-client-cpp-glib.pc
libdata/pkgconfig/xmms2-client-cpp.pc
diff --git a/audio/gxmms2/Makefile b/audio/gxmms2/Makefile
index 28c960ed516b..f888b8b27bfc 100644
--- a/audio/gxmms2/Makefile
+++ b/audio/gxmms2/Makefile
@@ -6,19 +6,15 @@
#
PORTNAME= gxmms2
-PORTVERSION= 0.7.0.20090608
-PORTREVISION= 2
-DISTVERSIONSUFFIX=.795a77a
+PORTVERSION= 0.7.1
CATEGORIES= audio
-#MASTER_SITES= http://wejp.k.vu/projects/xmms2/
-MASTER_SITES= ftp://ftp.lissyara.su/users/Guest/distfiles/
+DISTFILES= ${PORTNAME}_${PORTVERSION}.orig${EXTRACT_SUFX}
+MASTER_SITES= http://ftp.de.debian.org/debian/pool/main/g/gxmms2/
MAINTAINER= ports@FreeBSD.org
COMMENT= A GTK2 based XMMS2 client, written in C
-LIB_DEPENDS= xmmsclient.5:${PORTSDIR}/audio/xmms2
-
-BROKEN= does not fetch
+LIB_DEPENDS= xmmsclient.6:${PORTSDIR}/audio/xmms2
USE_GNOME= gtk20
USE_GMAKE= yes
diff --git a/audio/gxmms2/distinfo b/audio/gxmms2/distinfo
index 22b8fcf50366..99c62e45d1d4 100644
--- a/audio/gxmms2/distinfo
+++ b/audio/gxmms2/distinfo
@@ -1,3 +1,2 @@
-MD5 (gxmms2-0.7.0.20090608.795a77a.tar.gz) = e3c8154035c69d5cae7d67f85f86d101
-SHA256 (gxmms2-0.7.0.20090608.795a77a.tar.gz) = aeedb2ae3ae7ca40dd1c718a3c52d92b2d0c52565b7c22e73be8ff36d04be3db
-SIZE (gxmms2-0.7.0.20090608.795a77a.tar.gz) = 75735
+SHA256 (gxmms2_0.7.1.orig.tar.gz) = fa3fef28935d29665bd7d788db2dcd131e177c7d9ee71423c096a410bfc05a27
+SIZE (gxmms2_0.7.1.orig.tar.gz) = 76473
diff --git a/audio/p5-xmms2/Makefile b/audio/p5-xmms2/Makefile
index afebb2a39f7a..ea9a1df66a53 100644
--- a/audio/p5-xmms2/Makefile
+++ b/audio/p5-xmms2/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio perl5
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl Bindings for XMMS2
-LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2
+LIB_DEPENDS+= xmmsclient.6:${PORTSDIR}/audio/xmms2
MASTERDIR= ${.CURDIR}/../xmms2
diff --git a/audio/p5-xmms2/pkg-plist b/audio/p5-xmms2/pkg-plist
index 6ebe9ed20655..2508ae18d947 100644
--- a/audio/p5-xmms2/pkg-plist
+++ b/audio/p5-xmms2/pkg-plist
@@ -1,8 +1,9 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Collection.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Glib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Sync.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient/Collection.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient/Glib.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient/Sync.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/XMMSClient/XMMSClient.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/XMMSClient
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Audio
diff --git a/audio/py-xmms2/Makefile b/audio/py-xmms2/Makefile
index 7d1d15745e20..500aa20b6e38 100644
--- a/audio/py-xmms2/Makefile
+++ b/audio/py-xmms2/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Python Bindings for XMMS2
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex
-LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2
+LIB_DEPENDS+= xmmsclient.6:${PORTSDIR}/audio/xmms2
MASTERDIR= ${.CURDIR}/../xmms2
diff --git a/audio/ruby-xmms2/Makefile b/audio/ruby-xmms2/Makefile
index d81cbee7f5f9..60ae1d5666cf 100644
--- a/audio/ruby-xmms2/Makefile
+++ b/audio/ruby-xmms2/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio ruby
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
MAINTAINER= ruby@FreeBSD.org
COMMENT= Ruby Bindings for XMMS2
-LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2
+LIB_DEPENDS+= xmmsclient.6:${PORTSDIR}/audio/xmms2
MASTERDIR= ${.CURDIR}/../xmms2
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index 3ebf29b22557..d405a1a235c2 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME?= xmms2
-PORTVERSION= 0.6
-PORTREVISION= 8
-DISTVERSIONSUFFIX=DrMattDestruction
+PORTVERSION= 0.7
+DISTVERSIONSUFFIX=DrNo
CATEGORIES?= audio
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20DrMattDestruction
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT?= Rewrite of xmms as a client/server system (developer release)
@@ -37,6 +36,7 @@ OPTIONS= AIRPLAY "Support output via Airport Express" off \
FAAD "Support to playback AAC files" on \
FAM "Support to update Media Library on file change" off \
FLAC "Support to playback FLAC files" on \
+ GME "Support to playback video game music files" off \
GVFS "Support to playback files via GVFS" off \
ICES "Support to playback files to an icecast server" off \
JACK "Support to output via the Jack output server" off \
@@ -52,6 +52,7 @@ OPTIONS= AIRPLAY "Support output via Airport Express" off \
SAMBA "Support to playback files via SMB" off \
SID "Support to playback SID files" off \
SPEEX "Support to playback SPEEX files" off \
+ TREMOR "Support to playback OGG files" off \
VISUAL "Support for visualization plugins" off \
VOCODER "Phase Vocoder effect plugin" off \
VORBIS "Support to playback OGG files" on \
@@ -162,6 +163,14 @@ EXCLUDE+= --without-plugins="flac"
PLIST_SUB+= FLAC="@comment "
.endif
+.if !defined(WITHOUT_GME)
+LIB_DEPENDS+= gme.0:${PORTSDIR}/audio/libgme
+PLIST_SUB+= GME=""
+.else
+EXCLUDE+= --without-plugins="gme"
+PLIST_SUB+= GME="@comment "
+.endif
+
.if !defined(WITHOUT_GVFS)
USE_GNOME+= gvfs
PLIST_SUB+= GVFS=""
@@ -289,6 +298,14 @@ EXCLUDE+= --without-plugins="speex"
PLIST_SUB+= SPEEX="@comment "
.endif
+.if !defined(WITHOUT_TREMOR)
+LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor
+PLIST_SUB+= TREMOR=""
+.else
+EXCLUDE+= --without-plugins="tremor"
+PLIST_SUB+= TREMOR="@comment "
+.endif
+
# xmms2-ripper
.if !defined(WITHOUT_VISUAL) && !defined(WITHOUT_VORBIS)
LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis
@@ -344,7 +361,7 @@ PLIST_SUB+= XML="@comment "
do-configure:
cd ${WRKSRC} && ./waf configure --conf-prefix=${LOCALBASE} \
- --prefix=${PREFIX} --with-mandir=${PREFIX}/man ${EXCLUDE}
+ --prefix=${PREFIX} --mandir=${PREFIX}/man ${EXCLUDE}
do-build:
cd ${WRKSRC} && ./waf build
diff --git a/audio/xmms2/distinfo b/audio/xmms2/distinfo
index 1c713b14a195..80536b0417f8 100644
--- a/audio/xmms2/distinfo
+++ b/audio/xmms2/distinfo
@@ -1,3 +1,2 @@
-MD5 (xmms2-0.6DrMattDestruction.tar.bz2) = 954fb9c76b5db5e324a105e81b273200
-SHA256 (xmms2-0.6DrMattDestruction.tar.bz2) = 4fb4f469816d8a1a676f6660e370b0c73a07e3d7e59d07f57a43b67216291db8
-SIZE (xmms2-0.6DrMattDestruction.tar.bz2) = 1631304
+SHA256 (xmms2-0.7DrNo.tar.bz2) = 59c58d9380e6b002920a8dc75f0fd4629ab175b82f29b6637f7816fdc9832b2c
+SIZE (xmms2-0.7DrNo.tar.bz2) = 1519973
diff --git a/audio/xmms2/files/patch-src-plugins-airplay-wscript b/audio/xmms2/files/patch-src-plugins-airplay-wscript
index c7589b83ff23..9a06e08da61c 100644
--- a/audio/xmms2/files/patch-src-plugins-airplay-wscript
+++ b/audio/xmms2/files/patch-src-plugins-airplay-wscript
@@ -1,9 +1,13 @@
---- src/plugins/airplay/wscript~
-+++ src/plugins/airplay/wscript
-@@ -1,11 +1,6 @@
+--- src/plugins/airplay/wscript.orig 2010-02-19 18:43:54.000000000 +0100
++++ src/plugins/airplay/wscript 2010-03-17 15:14:34.459359323 +0100
+@@ -1,15 +1,6 @@
from waftools.plugin import plugin
-def plugin_configure(conf):
+- # MinGW doesn't ship sys/select.h
+- if not conf.check_cc(header_name='sys/select.h'):
+- return False
+-
- if not conf.check_cfg(package="openssl", args="--cflags --libs", uselib_store="openssl"):
- return False
- return True
diff --git a/audio/xmms2/files/patch-wscript b/audio/xmms2/files/patch-wscript
index c28784b2bb66..e953ae0ee506 100644
--- a/audio/xmms2/files/patch-wscript
+++ b/audio/xmms2/files/patch-wscript
@@ -1,24 +1,27 @@
---- wscript~
-+++ wscript
-@@ -297,7 +297,7 @@ def configure(conf):
+--- wscript.orig 2010-02-19 18:43:54.000000000 +0100
++++ wscript 2010-03-17 15:21:16.184861151 +0100
+@@ -303,7 +303,7 @@
conf.env['PKGCONFIGDIR'] = Options.options.pkgconfigdir
print(conf.env['PKGCONFIGDIR'])
else:
-- conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "lib", "pkgconfig")
+- conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["LIBDIR"], "pkgconfig")
+ conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "libdata", "pkgconfig")
if Options.options.config_prefix:
for dir in Options.options.config_prefix:
-@@ -476,12 +476,5 @@ def set_options(opt):
+@@ -480,15 +480,6 @@
opt.sub_options(o)
def shutdown():
-- if Options.commands['install'] and os.geteuid() == 0:
+- if Options.commands['install'] and (
+- Options.options.ldconfig or
+- (Options.options.ldconfig is None and os.geteuid() == 0)
+- ):
- ldconfig = '/sbin/ldconfig'
- if os.path.isfile(ldconfig):
- libprefix = Utils.subst_vars('${PREFIX}/lib', Build.bld.env)
- try: Utils.cmd_output(ldconfig + ' ' + libprefix)
- except: pass
--
+
if Options.options.run_tests:
- os.system(os.path.join(os.getenv('WAF_HOME'), "default/tests/test_xmmstypes"))
+ os.system(os.path.join(blddir, "default/tests/test_xmmstypes"))
diff --git a/audio/xmms2/pkg-plist b/audio/xmms2/pkg-plist
index ab36d7649723..148eeb6d8076 100644
--- a/audio/xmms2/pkg-plist
+++ b/audio/xmms2/pkg-plist
@@ -22,7 +22,6 @@ bin/xmms2d
%%INCLUDEDIR%%/xmms/xmms_plugin.h
%%INCLUDEDIR%%/xmms/xmms_sample.h
%%INCLUDEDIR%%/xmms/xmms_streamtype.h
-%%INCLUDEDIR%%/xmms/xmms_strfunc.h
%%INCLUDEDIR%%/xmms/xmms_util.h
%%INCLUDEDIR%%/xmms/xmms_xformplugin.h
%%INCLUDEDIR%%/xmmsc/xmmsc_compiler.h
@@ -70,15 +69,14 @@ lib/libxmmsclient-glib.so
lib/libxmmsclient-glib.so.1
lib/libxmmsclient-glib.so.1.0.0
lib/libxmmsclient.so
-lib/libxmmsclient.so.5
-lib/libxmmsclient.so.5.0.0
+lib/libxmmsclient.so.6
+lib/libxmmsclient.so.6.0.0
%%AIRPLAY%%%%LIBDIR%%/libxmms_airplay.so
%%AO%%%%LIBDIR%%/libxmms_ao.so
%%LIBDIR%%/libxmms_apefile.so
%%LIBDIR%%/libxmms_asf.so
%%LIBDIR%%/libxmms_asx.so
%%AVCODEC%%%%LIBDIR%%/libxmms_avcodec.so
-%%AVCODEC%%%%LIBDIR%%/libxmms_avformat.so
%%CDDA%%%%LIBDIR%%/libxmms_cdda.so
%%LIBDIR%%/libxmms_cue.so
%%CURL%%%%LIBDIR%%/libxmms_curl.so
@@ -89,7 +87,7 @@ lib/libxmmsclient.so.5.0.0
%%LIBDIR%%/libxmms_file.so
%%FLAC%%%%LIBDIR%%/libxmms_flac.so
%%LIBDIR%%/libxmms_flv.so
-%%LIBDIR%%/libxmms_gme.so
+%%GME%%%%LIBDIR%%/libxmms_gme.so
%%GVFS%%%%LIBDIR%%/libxmms_gvfs.so
%%LIBDIR%%/libxmms_html.so
%%ICES%%%%LIBDIR%%/libxmms_ices.so
@@ -117,6 +115,7 @@ lib/libxmmsclient.so.5.0.0
%%SAMBA%%%%LIBDIR%%/libxmms_samba.so
%%SID%%%%LIBDIR%%/libxmms_sid.so
%%SPEEX%%%%LIBDIR%%/libxmms_speex.so
+%%TREMOR%%%%LIBDIR%%/libxmms_tremor.so
%%LIBDIR%%/libxmms_tta.so
%%VOCODER%%%%LIBDIR%%/libxmms_vocoder.so
%%VORBIS%%%%LIBDIR%%/libxmms_vorbis.so
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index cede0bad3ea7..749961a7c315 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -7,7 +7,7 @@
PORTNAME= conky
PORTVERSION= 1.8.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= SF
@@ -154,7 +154,7 @@ CONFIGURE_ARGS+= --enable-weather-xoap
.endif
.if defined(WITH_XMMS2)
-LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2
+LIB_DEPENDS+= xmmsclient.6:${PORTSDIR}/audio/xmms2
CONFIGURE_ARGS+= --enable-xmms2
.else
CONFIGURE_ARGS+= --disable-xmms2