Attachment #104613 for bug #144821




#

PORTNAME=	abraca
PORTVERSION=	0.5.0
PORTREVISION=	2
DISTVERSIONSUFFIX=-pre2
CATEGORIES=	audio
MASTER_SITES=	http://abraca.xmms.se/attachments/download/128/

MAINTAINER=	olivier@gid0.org
COMMENT=	Abraca is a GTK2 client for the XMMS2 music player

BUILD_DEPENDS=	${LOCALBASE}/bin/valac:${PORTSDIR}/lang/vala
LIB_DEPENDS=	xmmsclient.6:${PORTSDIR}/audio/xmms2 \
		gee.2:${PORTSDIR}/devel/libgee

USE_BZIP2=	yes
USE_SCONS=	yes
USE_GNOME=	gtk20

PLIST_FILES=	bin/${PORTNAME}

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/build/src/${PORTNAME} ${PREFIX}/bin

.include <bsd.port.pre.mk>


Lines 1-3 Link Here

(-)ports/audio/abraca/distinfo (-3 / +2 lines)
1	MD5 (abraca-0.4-pre2.tar.gz) = ccfaf2bb1d01f0ab9915896bdad859c1	1	SHA256 (abraca-0.5.0.tar.bz2) = c4caf88e9c0c8d5d51ac5c0df4cc9022a0aa2574a4ff791dea11c7e212b766e2
2	SHA256 (abraca-0.4-pre2.tar.gz) = b2af3a885d6398735c581e43edb45658ed0190e69f99b3f55e7dfa3d6f85ce4b	2	SIZE (abraca-0.5.0.tar.bz2) = 402497
3	SIZE (abraca-0.4-pre2.tar.gz) = 155504




--- src/components/collections/collections_view.vala.orig	2010-04-03 04:19:53.000000000 +0200
+++ src/components/collections/collections_view.vala	2010-11-12 20:11:48.471315596 +0100
@@ -441,16 +441,11 @@
 				Gtk.TreePath path = model.get_path(iter);
 
 				if (path.get_depth() == 2) {
-					unowned GLib.List<Gtk.CellRenderer> renderers;
-					Gtk.CellRendererText renderer;
-					GLib.List<unowned Gtk.TreeViewColumn> cols;
-					Gtk.TreeViewColumn col;
+					var cols = get_columns();
+					var col = cols.data;
 
-					cols = get_columns();
-					col = cols.data;
-
-					renderers = col.get_cells();
-					renderer = (Gtk.CellRendererText) renderers.data;
+					var renderers = col.get_cells();
+					var renderer = (Gtk.CellRendererText) renderers.data;
 
 					renderer.editable = true;
 					set_cursor_on_cell(path, col, renderer, true);

Lines 1-4 Link Here

(-)ports/audio/abraca/pkg-descr (-1 / +1 lines)
1	Abraca is a GTK2 client for the XMMS2 music player. It is designed with	1	Abraca is a GTK2 client for the XMMS2 music player. It is designed with
2	collections in mind, which makes managing your music a breeze.	2	collections in mind, which makes managing your music a breeze.
3		3
4	WWW: http://nooms.de/projects/abraca	4	WWW: http://abraca.xmms.se/wiki/abraca

Lines 5-11 Link Here

(-)ports/audio/cpp-xmms2/Makefile (-2 / +2 lines)
5	# $FreeBSD: ports/audio/cpp-xmms2/Makefile,v 1.13 2009/08/19 11:56:15 miwi Exp $	5	# $FreeBSD: ports/audio/cpp-xmms2/Makefile,v 1.13 2009/08/19 11:56:15 miwi Exp $
6	#	6	#
7		7
8	PORTREVISION= 5	8	PORTREVISION= 6
9	CATEGORIES= audio	9	CATEGORIES= audio
10	PKGNAMEPREFIX= cpp-	10	PKGNAMEPREFIX= cpp-
11		11
Lines 13-19 Link Here
13	COMMENT= C++ Bindings for XMMS2	13	COMMENT= C++ Bindings for XMMS2
14		14
15	LIB_DEPENDS+= boost_signals.4:${PORTSDIR}/devel/boost-libs \	15	LIB_DEPENDS+= boost_signals.4:${PORTSDIR}/devel/boost-libs \
16	xmmsclient.5:${PORTSDIR}/audio/xmms2	16	xmmsclient.6:${PORTSDIR}/audio/xmms2
17		17
18	MASTERDIR= ${.CURDIR}/../xmms2	18	MASTERDIR= ${.CURDIR}/../xmms2
19	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes

Lines 2-8 Link Here

(-)ports/audio/cpp-xmms2/pkg-plist (-2 / +2 lines)
2	lib/libxmmsclient++-glib.so.1	2	lib/libxmmsclient++-glib.so.1
3	lib/libxmmsclient++-glib.so.1.0.0	3	lib/libxmmsclient++-glib.so.1.0.0
4	lib/libxmmsclient++.so	4	lib/libxmmsclient++.so
5	lib/libxmmsclient++.so.3	5	lib/libxmmsclient++.so.4
6	lib/libxmmsclient++.so.3.0.0	6	lib/libxmmsclient++.so.4.0.0
7	libdata/pkgconfig/xmms2-client-cpp-glib.pc	7	libdata/pkgconfig/xmms2-client-cpp-glib.pc
8	libdata/pkgconfig/xmms2-client-cpp.pc	8	libdata/pkgconfig/xmms2-client-cpp.pc




#

PORTNAME=	gxmms2
PORTVERSION=	0.7.1
PORTREVISION=	2
DISTVERSIONSUFFIX=.795a77a
CATEGORIES=	audio
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.6:${PORTSDIR}/audio/xmms2

BROKEN=		does not fetch

USE_GNOME=	gtk20
USE_GMAKE=	yes

Lines 1-3 Link Here

(-)ports/audio/gxmms2/distinfo (-3 / +2 lines)
1	MD5 (gxmms2-0.7.0.20090608.795a77a.tar.gz) = e3c8154035c69d5cae7d67f85f86d101	1	SHA256 (gxmms2_0.7.1.orig.tar.gz) = fa3fef28935d29665bd7d788db2dcd131e177c7d9ee71423c096a410bfc05a27
2	SHA256 (gxmms2-0.7.0.20090608.795a77a.tar.gz) = aeedb2ae3ae7ca40dd1c718a3c52d92b2d0c52565b7c22e73be8ff36d04be3db	2	SIZE (gxmms2_0.7.1.orig.tar.gz) = 76473
3	SIZE (gxmms2-0.7.0.20090608.795a77a.tar.gz) = 75735




# $FreeBSD: ports/audio/p5-xmms2/Makefile,v 1.6 2009/08/19 11:56:15 miwi Exp $
#

PORTREVISION=	1
CATEGORIES=	audio perl5
PKGNAMEPREFIX=	p5-

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Perl Bindings for XMMS2

LIB_DEPENDS+=	xmmsclient.6:${PORTSDIR}/audio/xmms2

MASTERDIR=	${.CURDIR}/../xmms2





%%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

Lines 5-11 Link Here

(-)ports/audio/py-xmms2/Makefile (-2 / +2 lines)
5	# $FreeBSD: ports/audio/py-xmms2/Makefile,v 1.11 2009/08/19 11:56:15 miwi Exp $	5	# $FreeBSD: ports/audio/py-xmms2/Makefile,v 1.11 2009/08/19 11:56:15 miwi Exp $
6	#	6	#
7		7
8	PORTREVISION= 4	8	PORTREVISION= 5
9		9
10	CATEGORIES= audio python	10	CATEGORIES= audio python
11	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	11	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 14-20 Link Here
14	COMMENT= Python Bindings for XMMS2	14	COMMENT= Python Bindings for XMMS2
15		15
16	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex	16	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex
17	LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2	17	LIB_DEPENDS+= xmmsclient.6:${PORTSDIR}/audio/xmms2
18		18
19	MASTERDIR= ${.CURDIR}/../xmms2	19	MASTERDIR= ${.CURDIR}/../xmms2
20		20




# $FreeBSD: ports/audio/ruby-xmms2/Makefile,v 1.10 2009/08/19 11:56:16 miwi Exp $
#

PORTREVISION=	4
CATEGORIES=	audio ruby
PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}

MAINTAINER=	ruby@FreeBSD.org
COMMENT=	Ruby Bindings for XMMS2

LIB_DEPENDS+=	xmmsclient.6:${PORTSDIR}/audio/xmms2

MASTERDIR=	${.CURDIR}/../xmms2





#

PORTNAME?=	xmms2
PORTVERSION=	0.7
DISTVERSIONSUFFIX=DrNo
DISTVERSIONSUFFIX=DrMattDestruction
CATEGORIES?=	audio
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}

MAINTAINER=	ports@FreeBSD.org
COMMENT?=	Rewrite of xmms as a client/server system (developer release)

		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 \

		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 \

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=""

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


do-configure:
	cd ${WRKSRC} && ./waf configure --conf-prefix=${LOCALBASE} \
		--prefix=${PREFIX} --mandir=${PREFIX}/man ${EXCLUDE}

do-build:
	cd ${WRKSRC} && ./waf build

Lines 1-3 Link Here

(-)ports/audio/xmms2/distinfo (-3 / +2 lines)
1	MD5 (xmms2-0.6DrMattDestruction.tar.bz2) = 954fb9c76b5db5e324a105e81b273200	1	SHA256 (xmms2-0.7DrNo.tar.bz2) = 59c58d9380e6b002920a8dc75f0fd4629ab175b82f29b6637f7816fdc9832b2c
2	SHA256 (xmms2-0.6DrMattDestruction.tar.bz2) = 4fb4f469816d8a1a676f6660e370b0c73a07e3d7e59d07f57a43b67216291db8	2	SIZE (xmms2-0.7DrNo.tar.bz2) = 1519973
3	SIZE (xmms2-0.6DrMattDestruction.tar.bz2) = 1631304

Lines 1-9 Link Here

(-)ports/audio/xmms2/files/patch-src-plugins-airplay-wscript (-3 / +7 lines)
1	--- src/plugins/airplay/wscript~	1	--- src/plugins/airplay/wscript.orig 2010-02-19 18:43:54.000000000 +0100
2	+++ src/plugins/airplay/wscript	2	+++ src/plugins/airplay/wscript 2010-03-17 15:14:34.459359323 +0100
3	@@ -1,11 +1,6 @@	3	@@ -1,15 +1,6 @@
4	from waftools.plugin import plugin	4	from waftools.plugin import plugin
5		5
6	-def plugin_configure(conf):	6	-def plugin_configure(conf):
		7	- # MinGW doesn't ship sys/select.h
		8	- if not conf.check_cc(header_name='sys/select.h'):
		9	- return False
		10	-
7	- if not conf.check_cfg(package="openssl", args="--cflags --libs", uselib_store="openssl"):	11	- if not conf.check_cfg(package="openssl", args="--cflags --libs", uselib_store="openssl"):
8	- return False	12	- return False
9	- return True	13	- return True




--- 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["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:
@@ -480,15 +480,6 @@
         opt.sub_options(o)
 
 def shutdown():
-    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(blddir, "default/tests/test_xmmstypes"))




%%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

lib/libxmmsclient-glib.so.1
lib/libxmmsclient-glib.so.1.0.0
lib/libxmmsclient.so
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

%%LIBDIR%%/libxmms_file.so
%%FLAC%%%%LIBDIR%%/libxmms_flac.so
%%LIBDIR%%/libxmms_flv.so
%%GME%%%%LIBDIR%%/libxmms_gme.so
%%GVFS%%%%LIBDIR%%/libxmms_gvfs.so
%%LIBDIR%%/libxmms_html.so
%%ICES%%%%LIBDIR%%/libxmms_ices.so

%%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

Lines 7-13 Link Here

(-)ports/sysutils/conky/Makefile (-2 / +2 lines)
7		7
8	PORTNAME= conky	8	PORTNAME= conky
9	PORTVERSION= 1.8.1	9	PORTVERSION= 1.8.1
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= sysutils	11	CATEGORIES= sysutils
12	MASTER_SITES= SF	12	MASTER_SITES= SF
13		13
Lines 153-159 Link Here
153	.endif	153	.endif
154		154
155	.if defined(WITH_XMMS2)	155	.if defined(WITH_XMMS2)
156	LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2	156	LIB_DEPENDS+= xmmsclient.6:${PORTSDIR}/audio/xmms2
157	CONFIGURE_ARGS+= --enable-xmms2	157	CONFIGURE_ARGS+= --enable-xmms2
158	.else	158	.else
159	CONFIGURE_ARGS+= --disable-xmms2	159	CONFIGURE_ARGS+= --disable-xmms2

Return to bug 144821

Lines 6-30 Link Here

(-)ports/audio/abraca/Makefile (-8 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= abraca	8	PORTNAME= abraca
9	PORTVERSION= 0.4	9	PORTVERSION= 0.5.0
10	PORTREVISION= 2
11	DISTVERSIONSUFFIX=-pre2
12	CATEGORIES= audio	10	CATEGORIES= audio
13	MASTER_SITES= http://abraca.xmms.se/attachments/download/100/	11	MASTER_SITES= http://abraca.xmms.se/attachments/download/128/
14		12
15	MAINTAINER= olivier@gid0.org	13	MAINTAINER= olivier@gid0.org
16	COMMENT= Abraca is a GTK2 client for the XMMS2 music player	14	COMMENT= Abraca is a GTK2 client for the XMMS2 music player
17		15
18	LIB_DEPENDS= xmmsclient.5:${PORTSDIR}/audio/xmms2	16	BUILD_DEPENDS= ${LOCALBASE}/bin/valac:${PORTSDIR}/lang/vala
		17	LIB_DEPENDS= xmmsclient.6:${PORTSDIR}/audio/xmms2 \
		18	gee.2:${PORTSDIR}/devel/libgee
19		19
20	USE_GMAKE= yes	20	USE_BZIP2= yes
21	ALL_TARGET= # defined	21	USE_SCONS= yes
22	USE_GNOME= gtk20	22	USE_GNOME= gtk20
23		23
24	PLIST_FILES= bin/${PORTNAME}	24	PLIST_FILES= bin/${PORTNAME}
25		25
26	do-install:	26	do-install:
27	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin	27	${INSTALL_PROGRAM} ${WRKSRC}/build/src/${PORTNAME} ${PREFIX}/bin
28		28
29	.include <bsd.port.pre.mk>	29	.include <bsd.port.pre.mk>
30		30

Line 0 Link Here

(-)ports/audio/abraca/files/patch-src-components-collections-collections_view.vala (+23 lines)
	1	--- src/components/collections/collections_view.vala.orig 2010-04-03 04:19:53.000000000 +0200
	2	+++ src/components/collections/collections_view.vala 2010-11-12 20:11:48.471315596 +0100
	3	@@ -441,16 +441,11 @@
	4	Gtk.TreePath path = model.get_path(iter);
	5
	6	if (path.get_depth() == 2) {
	7	- unowned GLib.List<Gtk.CellRenderer> renderers;
	8	- Gtk.CellRendererText renderer;
	9	- GLib.List<unowned Gtk.TreeViewColumn> cols;
	10	- Gtk.TreeViewColumn col;
	11	+ var cols = get_columns();
	12	+ var col = cols.data;
	13
	14	- cols = get_columns();
	15	- col = cols.data;
	16	-
	17	- renderers = col.get_cells();
	18	- renderer = (Gtk.CellRendererText) renderers.data;
	19	+ var renderers = col.get_cells();
	20	+ var renderer = (Gtk.CellRendererText) renderers.data;
	21
	22	renderer.editable = true;
	23	set_cursor_on_cell(path, col, renderer, true);

Lines 6-24 Link Here

(-)ports/audio/gxmms2/Makefile (-8 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= gxmms2	8	PORTNAME= gxmms2
9	PORTVERSION= 0.7.0.20090608	9	PORTVERSION= 0.7.1
10	PORTREVISION= 2
11	DISTVERSIONSUFFIX=.795a77a
12	CATEGORIES= audio	10	CATEGORIES= audio
13	#MASTER_SITES= http://wejp.k.vu/projects/xmms2/	11	DISTFILES= ${PORTNAME}_${PORTVERSION}.orig${EXTRACT_SUFX}
14	MASTER_SITES= ftp://ftp.lissyara.su/users/Guest/distfiles/	12	MASTER_SITES= http://ftp.de.debian.org/debian/pool/main/g/gxmms2/
15		13
16	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
17	COMMENT= A GTK2 based XMMS2 client, written in C	15	COMMENT= A GTK2 based XMMS2 client, written in C
18		16
19	LIB_DEPENDS= xmmsclient.5:${PORTSDIR}/audio/xmms2	17	LIB_DEPENDS= xmmsclient.6:${PORTSDIR}/audio/xmms2
20
21	BROKEN= does not fetch
22		18
23	USE_GNOME= gtk20	19	USE_GNOME= gtk20
24	USE_GMAKE= yes	20	USE_GMAKE= yes

Lines 5-18 Link Here

(-)ports/audio/p5-xmms2/Makefile (-2 / +2 lines)
5	# $FreeBSD: ports/audio/p5-xmms2/Makefile,v 1.6 2009/08/19 11:56:15 miwi Exp $	5	# $FreeBSD: ports/audio/p5-xmms2/Makefile,v 1.6 2009/08/19 11:56:15 miwi Exp $
6	#	6	#
7		7
8	PORTREVISION= 0	8	PORTREVISION= 1
9	CATEGORIES= audio perl5	9	CATEGORIES= audio perl5
10	PKGNAMEPREFIX= p5-	10	PKGNAMEPREFIX= p5-
11		11
12	MAINTAINER= ports@FreeBSD.org	12	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Perl Bindings for XMMS2	13	COMMENT= Perl Bindings for XMMS2
14		14
15	LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2	15	LIB_DEPENDS+= xmmsclient.6:${PORTSDIR}/audio/xmms2
16		16
17	MASTERDIR= ${.CURDIR}/../xmms2	17	MASTERDIR= ${.CURDIR}/../xmms2
18		18

Lines 1-8 Link Here

(-)ports/audio/p5-xmms2/pkg-plist (-3 / +4 lines)
1	%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Collection.pm
2	%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Glib.pm
3	%%SITE_PERL%%/%%PERL_ARCH%%/Audio/Sync.pm
4	%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient.pm	1	%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient.pm
		2	%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient/Collection.pm
		3	%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient/Glib.pm
		4	%%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient/Sync.pm
5	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/XMMSClient/XMMSClient.so	5	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/XMMSClient/XMMSClient.so
6	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/XMMSClient	6	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/XMMSClient
7	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio	7	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio
		8	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Audio/XMMSClient
8	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Audio	9	@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Audio

Lines 5-18 Link Here

(-)ports/audio/ruby-xmms2/Makefile (-2 / +2 lines)
5	# $FreeBSD: ports/audio/ruby-xmms2/Makefile,v 1.10 2009/08/19 11:56:16 miwi Exp $	5	# $FreeBSD: ports/audio/ruby-xmms2/Makefile,v 1.10 2009/08/19 11:56:16 miwi Exp $
6	#	6	#
7		7
8	PORTREVISION= 3	8	PORTREVISION= 4
9	CATEGORIES= audio ruby	9	CATEGORIES= audio ruby
10	PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}	10	PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
11		11
12	MAINTAINER= ruby@FreeBSD.org	12	MAINTAINER= ruby@FreeBSD.org
13	COMMENT= Ruby Bindings for XMMS2	13	COMMENT= Ruby Bindings for XMMS2
14		14
15	LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2	15	LIB_DEPENDS+= xmmsclient.6:${PORTSDIR}/audio/xmms2
16		16
17	MASTERDIR= ${.CURDIR}/../xmms2	17	MASTERDIR= ${.CURDIR}/../xmms2
18		18

Lines 6-16 Link Here

(-)ports/audio/xmms2/Makefile (-5 / +22 lines)
6	#	6	#
7		7
8	PORTNAME?= xmms2	8	PORTNAME?= xmms2
9	PORTVERSION= 0.6	9	PORTVERSION= 0.7
10	PORTREVISION= 7	10	DISTVERSIONSUFFIX=DrNo
11	DISTVERSIONSUFFIX=DrMattDestruction
12	CATEGORIES?= audio	11	CATEGORIES?= audio
13	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20DrMattDestruction	12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
14		13
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
16	COMMENT?= Rewrite of xmms as a client/server system (developer release)	15	COMMENT?= Rewrite of xmms as a client/server system (developer release)
Lines 37-42 Link Here
37	FAAD "Support to playback AAC files" on \	36	FAAD "Support to playback AAC files" on \
38	FAM "Support to update Media Library on file change" off \	37	FAM "Support to update Media Library on file change" off \
39	FLAC "Support to playback FLAC files" on \	38	FLAC "Support to playback FLAC files" on \
		39	GME "Support to playback video game music files" off \
40	GVFS "Support to playback files via GVFS" off \	40	GVFS "Support to playback files via GVFS" off \
41	ICES "Support to playback files to an icecast server" off \	41	ICES "Support to playback files to an icecast server" off \
42	JACK "Support to output via the Jack output server" off \	42	JACK "Support to output via the Jack output server" off \
Lines 52-57 Link Here
52	SAMBA "Support to playback files via SMB" off \	52	SAMBA "Support to playback files via SMB" off \
53	SID "Support to playback SID files" off \	53	SID "Support to playback SID files" off \
54	SPEEX "Support to playback SPEEX files" off \	54	SPEEX "Support to playback SPEEX files" off \
		55	TREMOR "Support to playback OGG files" off \
55	VISUAL "Support for visualization plugins" off \	56	VISUAL "Support for visualization plugins" off \
56	VOCODER "Phase Vocoder effect plugin" off \	57	VOCODER "Phase Vocoder effect plugin" off \
57	VORBIS "Support to playback OGG files" on \	58	VORBIS "Support to playback OGG files" on \
Lines 162-167 Link Here
162	PLIST_SUB+= FLAC="@comment "	163	PLIST_SUB+= FLAC="@comment "
163	.endif	164	.endif
164		165
		166	.if !defined(WITHOUT_GME)
		167	LIB_DEPENDS+= gme.0:${PORTSDIR}/audio/libgme
		168	PLIST_SUB+= GME=""
		169	.else
		170	EXCLUDE+= --without-plugins="gme"
		171	PLIST_SUB+= GME="@comment "
		172	.endif
		173
165	.if !defined(WITHOUT_GVFS)	174	.if !defined(WITHOUT_GVFS)
166	USE_GNOME+= gvfs	175	USE_GNOME+= gvfs
167	PLIST_SUB+= GVFS=""	176	PLIST_SUB+= GVFS=""
Lines 289-294 Link Here
289	PLIST_SUB+= SPEEX="@comment "	298	PLIST_SUB+= SPEEX="@comment "
290	.endif	299	.endif
291		300
		301	.if !defined(WITHOUT_TREMOR)
		302	LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor
		303	PLIST_SUB+= TREMOR=""
		304	.else
		305	EXCLUDE+= --without-plugins="tremor"
		306	PLIST_SUB+= TREMOR="@comment "
		307	.endif
		308
292	# xmms2-ripper	309	# xmms2-ripper
293	.if !defined(WITHOUT_VISUAL) && !defined(WITHOUT_VORBIS)	310	.if !defined(WITHOUT_VISUAL) && !defined(WITHOUT_VORBIS)
294	LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis	311	LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis
Lines 344-350 Link Here
344		361
345	do-configure:	362	do-configure:
346	cd ${WRKSRC} && ./waf configure --conf-prefix=${LOCALBASE} \	363	cd ${WRKSRC} && ./waf configure --conf-prefix=${LOCALBASE} \
347	--prefix=${PREFIX} --with-mandir=${PREFIX}/man ${EXCLUDE}	364	--prefix=${PREFIX} --mandir=${PREFIX}/man ${EXCLUDE}
348		365
349	do-build:	366	do-build:
350	cd ${WRKSRC} && ./waf build	367	cd ${WRKSRC} && ./waf build

Lines 1-24 Link Here

(-)ports/audio/xmms2/files/patch-wscript (-8 / +11 lines)
1	--- wscript~	1	--- wscript.orig 2010-02-19 18:43:54.000000000 +0100
2	+++ wscript	2	+++ wscript 2010-03-17 15:21:16.184861151 +0100
3	@@ -297,7 +297,7 @@ def configure(conf):	3	@@ -303,7 +303,7 @@
4	conf.env['PKGCONFIGDIR'] = Options.options.pkgconfigdir	4	conf.env['PKGCONFIGDIR'] = Options.options.pkgconfigdir
5	print(conf.env['PKGCONFIGDIR'])	5	print(conf.env['PKGCONFIGDIR'])
6	else:	6	else:
7	- conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "lib", "pkgconfig")	7	- conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["LIBDIR"], "pkgconfig")
8	+ conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "libdata", "pkgconfig")	8	+ conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "libdata", "pkgconfig")
9		9
10	if Options.options.config_prefix:	10	if Options.options.config_prefix:
11	for dir in Options.options.config_prefix:	11	for dir in Options.options.config_prefix:
12	@@ -476,12 +476,5 @@ def set_options(opt):	12	@@ -480,15 +480,6 @@
13	opt.sub_options(o)	13	opt.sub_options(o)
14		14
15	def shutdown():	15	def shutdown():
16	- if Options.commands['install'] and os.geteuid() == 0:	16	- if Options.commands['install'] and (
		17	- Options.options.ldconfig or
		18	- (Options.options.ldconfig is None and os.geteuid() == 0)
		19	- ):
17	- ldconfig = '/sbin/ldconfig'	20	- ldconfig = '/sbin/ldconfig'
18	- if os.path.isfile(ldconfig):	21	- if os.path.isfile(ldconfig):
19	- libprefix = Utils.subst_vars('${PREFIX}/lib', Build.bld.env)	22	- libprefix = Utils.subst_vars('${PREFIX}/lib', Build.bld.env)
20	- try: Utils.cmd_output(ldconfig + ' ' + libprefix)	23	- try: Utils.cmd_output(ldconfig + ' ' + libprefix)
21	- except: pass	24	- except: pass
22	-	25
23	if Options.options.run_tests:	26	if Options.options.run_tests:
24	os.system(os.path.join(os.getenv('WAF_HOME'), "default/tests/test_xmmstypes"))	27	os.system(os.path.join(blddir, "default/tests/test_xmmstypes"))

Lines 22-28 Link Here

(-)ports/audio/xmms2/pkg-plist (-5 / +4 lines)
22	%%INCLUDEDIR%%/xmms/xmms_plugin.h	22	%%INCLUDEDIR%%/xmms/xmms_plugin.h
23	%%INCLUDEDIR%%/xmms/xmms_sample.h	23	%%INCLUDEDIR%%/xmms/xmms_sample.h
24	%%INCLUDEDIR%%/xmms/xmms_streamtype.h	24	%%INCLUDEDIR%%/xmms/xmms_streamtype.h
25	%%INCLUDEDIR%%/xmms/xmms_strfunc.h
26	%%INCLUDEDIR%%/xmms/xmms_util.h	25	%%INCLUDEDIR%%/xmms/xmms_util.h
27	%%INCLUDEDIR%%/xmms/xmms_xformplugin.h	26	%%INCLUDEDIR%%/xmms/xmms_xformplugin.h
28	%%INCLUDEDIR%%/xmmsc/xmmsc_compiler.h	27	%%INCLUDEDIR%%/xmmsc/xmmsc_compiler.h
Lines 70-84 Link Here
70	lib/libxmmsclient-glib.so.1	69	lib/libxmmsclient-glib.so.1
71	lib/libxmmsclient-glib.so.1.0.0	70	lib/libxmmsclient-glib.so.1.0.0
72	lib/libxmmsclient.so	71	lib/libxmmsclient.so
73	lib/libxmmsclient.so.5	72	lib/libxmmsclient.so.6
74	lib/libxmmsclient.so.5.0.0	73	lib/libxmmsclient.so.6.0.0
75	%%AIRPLAY%%%%LIBDIR%%/libxmms_airplay.so	74	%%AIRPLAY%%%%LIBDIR%%/libxmms_airplay.so
76	%%AO%%%%LIBDIR%%/libxmms_ao.so	75	%%AO%%%%LIBDIR%%/libxmms_ao.so
77	%%LIBDIR%%/libxmms_apefile.so	76	%%LIBDIR%%/libxmms_apefile.so
78	%%LIBDIR%%/libxmms_asf.so	77	%%LIBDIR%%/libxmms_asf.so
79	%%LIBDIR%%/libxmms_asx.so	78	%%LIBDIR%%/libxmms_asx.so
80	%%AVCODEC%%%%LIBDIR%%/libxmms_avcodec.so	79	%%AVCODEC%%%%LIBDIR%%/libxmms_avcodec.so
81	%%AVCODEC%%%%LIBDIR%%/libxmms_avformat.so
82	%%CDDA%%%%LIBDIR%%/libxmms_cdda.so	80	%%CDDA%%%%LIBDIR%%/libxmms_cdda.so
83	%%LIBDIR%%/libxmms_cue.so	81	%%LIBDIR%%/libxmms_cue.so
84	%%CURL%%%%LIBDIR%%/libxmms_curl.so	82	%%CURL%%%%LIBDIR%%/libxmms_curl.so
Lines 89-95 Link Here
89	%%LIBDIR%%/libxmms_file.so	87	%%LIBDIR%%/libxmms_file.so
90	%%FLAC%%%%LIBDIR%%/libxmms_flac.so	88	%%FLAC%%%%LIBDIR%%/libxmms_flac.so
91	%%LIBDIR%%/libxmms_flv.so	89	%%LIBDIR%%/libxmms_flv.so
92	%%LIBDIR%%/libxmms_gme.so	90	%%GME%%%%LIBDIR%%/libxmms_gme.so
93	%%GVFS%%%%LIBDIR%%/libxmms_gvfs.so	91	%%GVFS%%%%LIBDIR%%/libxmms_gvfs.so
94	%%LIBDIR%%/libxmms_html.so	92	%%LIBDIR%%/libxmms_html.so
95	%%ICES%%%%LIBDIR%%/libxmms_ices.so	93	%%ICES%%%%LIBDIR%%/libxmms_ices.so
Lines 117-122 Link Here
117	%%SAMBA%%%%LIBDIR%%/libxmms_samba.so	115	%%SAMBA%%%%LIBDIR%%/libxmms_samba.so
118	%%SID%%%%LIBDIR%%/libxmms_sid.so	116	%%SID%%%%LIBDIR%%/libxmms_sid.so
119	%%SPEEX%%%%LIBDIR%%/libxmms_speex.so	117	%%SPEEX%%%%LIBDIR%%/libxmms_speex.so
		118	%%TREMOR%%%%LIBDIR%%/libxmms_tremor.so
120	%%LIBDIR%%/libxmms_tta.so	119	%%LIBDIR%%/libxmms_tta.so
121	%%VOCODER%%%%LIBDIR%%/libxmms_vocoder.so	120	%%VOCODER%%%%LIBDIR%%/libxmms_vocoder.so
122	%%VORBIS%%%%LIBDIR%%/libxmms_vorbis.so	121	%%VORBIS%%%%LIBDIR%%/libxmms_vorbis.so