Attachment #98500 for bug #137430

View | Details | Raw Unified | Return to bug 137430
Collapse All | Expand All

Lines 13-19 MAINTAINER= ports@FreeBSD.org Link Here

(-)audio/cpp-xmms2/Makefile (-1 / +1 lines)
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.4:${PORTSDIR}/audio/xmms2	16	xmmsclient.5:${PORTSDIR}/audio/xmms2
17		17
18	MASTERDIR= ${.CURDIR}/../xmms2	18	MASTERDIR= ${.CURDIR}/../xmms2
19	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes

Lines 12-18 PKGNAMEPREFIX= p5- Link Here

(-)audio/p5-xmms2/Makefile (-1 / +1 lines)
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.4:${PORTSDIR}/audio/xmms2	15	LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2
16		16
17	MASTERDIR= ${.CURDIR}/../xmms2	17	MASTERDIR= ${.CURDIR}/../xmms2
18		18

Lines 14-20 MAINTAINER= ports@FreeBSD.org Link Here

(-)audio/py-xmms2/Makefile (-1 / +1 lines)
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.4:${PORTSDIR}/audio/xmms2	17	LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2
18		18
19	MASTERDIR= ${.CURDIR}/../xmms2	19	MASTERDIR= ${.CURDIR}/../xmms2
20		20

Lines 12-18 PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} Link Here

(-)audio/ruby-xmms2/Makefile (-1 / +1 lines)
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.4:${PORTSDIR}/audio/xmms2	15	LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2
16		16
17	MASTERDIR= ${.CURDIR}/../xmms2	17	MASTERDIR= ${.CURDIR}/../xmms2
18		18




#

PORTNAME?=	xmms2
PORTVERSION=	0.6
DISTVERSIONSUFFIX=DrMattDestruction
CATEGORIES?=	audio
MASTER_SITES=	SF
DISTNAME=	${PORTNAME}-${DISTVERSION}
PORTREVISION?=	2

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

.if !defined(XMMS2_SLAVE)
LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
		vorbis.4:${PORTSDIR}/audio/libvorbis
.endif

USE_BZIP2=	yes
USE_PYTHON_BUILD=	yes


USE_SQLITE=	3

USE_LDCONFIG=	yes
.endif

MAN1=		nyxmms2.1 xmms2.1 xmms2-et.1 xmms2d.1 xmms2-launcher.1
MAN1=		xmms2.1 xmms2-et.1 xmms2d.1 xmms2-launcher.1
MANCOMPRESSED=	yes
PLIST_SUB+=	INCLUDEDIR="include/${PORTNAME}" LIBDIR="lib/${PORTNAME}"

OPTIONS=	AIRPLAY	"Support output via Airport Express" off \
		AO	"Support to output via libao" off \
		APE	"Support to playback Monkey's Audio files" off \
		AVCODEC	"Support to playback files with avcodec" off \
		CDDA	"Support to playback AudioCD" off \
		CURL	"Support to playback files via HTTP" on \
		FAAD	"Support to playback AAC files" on \
		FAM	"Support to update Media Library on file change" off \
		FLAC	"Support to playback FLAC files" on \
		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 \
		MAD	"Support to playback MP3 files" on \
		SAMBA "Support to playback files via SMB" off \
		DAAP "Support to playback files via DAAP" on \
		GME "Support to playback files via GME (SPC/NSF/GBS)" 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 \
		MDNS_AVAHI "Support to announce XMMS2d via mDNS (Avahi)" off \
		MMS	"Support to playback streams via MMS" off \
		MODPLUG	"Support to playback MOD files" off \
		MPG123	"Support to playback MP3 files" off \
		MUSEPACK "Support to playback MPC files" off \
		OFA	"Support to collect MusicDNS fingerprints" off \
		PULSE	"Support to output via the PulseAudio" off \
		SAMBA	"Support to playback files via SMB" off \
		SID	"Support to playback SID files" off \
		SPEEX	"Support to playback SPEEX files" off \
		VISUAL	"Support for visualization plugins" off \
		VOCODER	"Phase Vocoder effect plugin" off \
		VORBIS	"Support to playback OGG files" on \
		WAVPACK	"Support to playback WV files" off \
		XML	"Support for XML based playlists (XSPF, RSS)" off
.endif # !XMMS_SLAVE

.include <bsd.port.pre.mk>

.if defined(XMMS2_SLAVE)
EXCLUDE+=	--without-xmms2d
.endif

.if   ${XMMS2_SLAVE} == "python"
EXCLUDE+=	--with-optionals="python"
.elif ${XMMS2_SLAVE} == "ruby"
EXCLUDE+=	--with-optionals="ruby"
.elif ${XMMS2_SLAVE} == "perl"
EXCLUDE+=	--with-optionals="perl"
.elif ${XMMS2_SLAVE} == "ruby-ecore"
EXCLUDE+=	--with-optionals="ruby" --with-optionals="xmmsclient-ecore"
.elif ${XMMS2_SLAVE} == "cpp"
EXCLUDE+=	--with-optionals="xmmsclient++" \
		--with-optionals="xmmsclient++-glib"
EXCLUDE+=	--without-optionals="python" --without-optionals="ruby" --without-optionals="xmmsclient-ecore" --without-optionals="xmmsclient++" --without-optionals="xmmsclient++-glib" --without-optionals="perl"
.endif

.else # XMMS2_SLAVE
EXCLUDE+=	--without-optionals="python" \
		--without-optionals="ruby" \
		--without-optionals="xmmsclient-ecore" \
		--without-optionals="xmmsclient++" \
		--without-optionals="xmmsclient++-glib" \
		--without-optionals="perl"
.endif # XMMS2_SLAVE

.if !defined(XMMS2_SLAVE)
LIB_DEPENDS+=	curl.5:${PORTSDIR}/ftp/curl
PLIST_SUB+=	CURL=""
.else
EXCLUDE+=	--without-plugins="curl" --without-plugins="icymetaint"
PLIST_SUB+=	CURL="@comment "
.endif

.if !defined(WITHOUT_AIRPLAY)
USE_OPENSSL=	yes
PLIST_SUB+=	AIRPLAY=""
.endif
PLIST_SUB+=	LASTFM=""
.else
EXCLUDE+=	--without-plugins="airplay"
PLIST_SUB+=	AIRPLAY="@comment "
.endif

.if !defined(WITHOUT_AO)
LIB_DEPENDS+=	ao.3:${PORTSDIR}/audio/libao
PLIST_SUB+=	AO=""
.else
EXCLUDE+=	--without-plugins="ao"
PLIST_SUB+=	AO="@comment "
.endif

.if !defined(WITHOUT_APE)
LIB_DEPENDS+=	mac.2:${PORTSDIR}/audio/mac
PLIST_SUB+=	MAC=""
.else
EXCLUDE+=	--without-plugins="mac"
PLIST_SUB+=	MAC="@comment "
.endif

.if !defined(WITHOUT_AVCODEC)
LIB_DEPENDS+=	avutil.1:${PORTSDIR}/multimedia/ffmpeg
PLIST_SUB+=	AVCODEC=""
.else
EXCLUDE+=	--without-plugins="avcodec"
PLIST_SUB+=	AVCODEC="@comment "
.endif

.if !defined(WITHOUT_CDDA)
LIB_DEPENDS+=	cdio.8:${PORTSDIR}/sysutils/libcdio \
		discid.2:${PORTSDIR}/audio/libdiscid
PLIST_SUB+=	CDDA=""

PLIST_SUB+=	CDDA="@comment "
.endif

.if !defined(WITHOUT_CURL)
LIB_DEPENDS+=	curl.5:${PORTSDIR}/ftp/curl
PLIST_SUB+=	CURL=""
.else
EXCLUDE+=	--without-plugins="curl" --without-plugins="icymetaint"
PLIST_SUB+=	CURL="@comment "
.endif

.if !defined(WITHOUT_FAAD)
LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
PLIST_SUB+=	FAAD=""

PLIST_SUB+=	FAAD="@comment "
.endif

.if !defined(WITHOUT_FAM)
USE_FAM=	yes
WANT_FAM_SYSTEM=gamin
PLIST_SUB+=	FAM=""
.else
EXCLUDE+=	--without-optionals="medialib-updater"
PLIST_SUB+=	FAM="@comment "
.endif

.if !defined(WITHOUT_FLAC)
LIB_DEPENDS+=	FLAC.10:${PORTSDIR}/audio/flac
PLIST_SUB+=	FLAC=""
.else
EXCLUDE+=	--without-plugins="flac"
PLIST_SUB+=	FLAC="@comment "
.endif

.if !defined(WITHOUT_GVFS)
USE_GNOME+=	gvfs
PLIST_SUB+=	GVFS=""
PLIST_SUB+=	SDL=""
#EXTRA_PATCHES+=	${FILESDIR}/extraPatch-src::clients::sdl-vis::Program
.else
EXCLUDE+=	--without-plugins="gvfs"
PLIST_SUB+=	GVFS="@comment "
.endif

.if !defined(WITHOUT_ICES)
LIB_DEPENDS+=	shout.5:${PORTSDIR}/audio/libshout2
PLIST_SUB+=	ICES=""
.else
EXCLUDE+=	--without-plugins="ices"
PLIST_SUB+=	ICES="@comment "
.endif

.if !defined(WITHOUT_JACK)
LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
PLIST_SUB+=	JACK=""
.else

PLIST_SUB+=	JACK="@comment "
.endif

.if !defined(WITHOUT_MAD)
LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
PLIST_SUB+=	MAD=""
.else
EXCLUDE+=	--without-plugins="mad"
PLIST_SUB+=	MAD="@comment "
.endif

.if defined(WITH_MODPLUG)
LIB_DEPENDS+=	modplug.0:${PORTSDIR}/audio/libmodplug
PLIST_SUB+=	MODPLUG=""
.else
EXCLUDE+=	--without-plugins="modplug"
PLIST_SUB+=	MODPLUG="@comment "
.endif

.if !defined(WITHOUT_MDNS_APPLE) && !defined(WITHOUT_MDNS_AVAHI)
BROKEN=		You may choose either MDNS_APPLE or MDNS_AVAHI, but not both
PLIST_SUB+=	OFA=""
.else
EXCLUDE+=	--without-plugins="ofa"
PLIST_SUB+=	OFA="@comment "
.endif

.if !defined(WITHOUT_MDNS_APPLE)
EXCLUDE+=	--without-optionals="avahi"
LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
PLIST_SUB+=	MDNS_APPLE=""
.else
EXCLUDE+=	--without-optionals="dns_sd"
PLIST_SUB+=	MDNS_APPLE="@comment "
.endif

.if !defined(WITHOUT_MDNS_AVAHI)
EXCLUDE+=	--without-optionals="dns_sd"
LIB_DEPENDS+=	avahi-core:${PORTSDIR}/net/avahi-app
PLIST_SUB+=	MDNS_AVAHI=""
MAN1+=		xmms2-mdns-avahi.1
.else
EXCLUDE+=	--without-optionals="avahi"
PLIST_SUB+=	MDNS_AVAHI="@comment "
.endif

.if !defined(WITHOUT_MMS)
LIB_DEPENDS+=	mms.0:${PORTSDIR}/net/libmms
PLIST_SUB+=	MMS=""
.else
EXCLUDE+=	--without-plugins="mms"
PLIST_SUB+=	MMS="@comment "
.endif

.if !defined(WITHOUT_MODPLUG)
LIB_DEPENDS+=	modplug.0:${PORTSDIR}/audio/libmodplug
PLIST_SUB+=	MODPLUG=""
.else
EXCLUDE+=	--without-plugins="modplug"
PLIST_SUB+=	MODPLUG="@comment "
.endif

.if !defined(WITHOUT_MPG123)
LIB_DEPENDS+=	mpg123.11:${PORTSDIR}/audio/mpg123
PLIST_SUB+=	MPG123=""
.else
EXCLUDE+=	--without-plugins="mpg123"
PLIST_SUB+=	MPG123="@comment "
.endif

.if !defined(WITHOUT_MUSEPACK)
LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
PLIST_SUB+=	MUSEPACK=""
.else
EXCLUDE+=	--without-plugins="musepack"
PLIST_SUB+=	MUSEPACK="@comment "
.endif

.if !defined(WITHOUT_OFA)
LIB_DEPENDS+=	ofa.0:${PORTSDIR}/audio/libofa
PLIST_SUB+=	OFA=""
PLIST_SUB+=	FAM=""
.else
EXCLUDE+=	--without-plugins="ofa"
PLIST_SUB+=	OFA="@comment "
.endif

.if !defined(WITHOUT_PULSE)
LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
PLIST_SUB+=	PULSE=""
.else
EXCLUDE+=	--without-plugins="pulse"
PLIST_SUB+=	PULSE="@comment "
.endif

.if !defined(WITHOUT_SAMBA)
LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
PLIST_SUB+=	SAMBA=""
.else
EXCLUDE+=	--without-plugins="samba"
PLIST_SUB+=	SAMBA="@comment "
.endif

.if !defined(WITHOUT_SID)
LIB_DEPENDS+=	sidplay2.[0-9]:${PORTSDIR}/audio/libsidplay2
PLIST_SUB+=	SID=""
.else
EXCLUDE+=	--without-plugins="sid"
PLIST_SUB+=	SID="@comment "
.endif

.if !defined(WITHOUT_SPEEX)
LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
PLIST_SUB+=	SPEEX=""
.endif
EXCLUDE+=	--without-optionals="dns_sd"
LIB_DEPENDS+=	avahi-core:${PORTSDIR}/net/avahi-app
PLIST_SUB+=	MDNS_AVAHI=""
MAN1+=	xmms2-mdns-avahi.1
.else
EXCLUDE+=	--without-plugins="speex"
PLIST_SUB+=	SPEEX="@comment "
.endif

# xmms2-ripper
.if !defined(WITHOUT_VISUAL) && !defined(WITHOUT_VORBIS)
LIB_DEPENDS+=	vorbisenc.2:${PORTSDIR}/audio/libvorbis
.endif
EXCLUDE+=	--without-optionals="avahi"
LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
PLIST_SUB+=	MDNS_APPLE=""
.else
EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src_clients_vistest_wscript
PLIST_SUB+=	MDNS_APPLE="@comment "
.endif

# XXX: shm support requires semtimedop(2)
.if !defined(WITHOUT_VISUAL)
USE_SDL=	yes
LIB_DEPENDS+=	visual-0.4.0:${PORTSDIR}/graphics/libvisual04
PLIST_SUB+=	VISUAL=""
.else
EXCLUDE+=	--without-optionals="vistest"
PLIST_SUB+=	VISUAL="@comment "
.endif

.if !defined(WITHOUT_VOCODER)
LIB_DEPENDS+=	fftw3f.5:${PORTSDIR}/math/fftw3-float
LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
PLIST_SUB+=	VOCODER=""

EXCLUDE+=	--without-plugins="vocoder"
PLIST_SUB+=	VOCODER="@comment "
.endif

.if !defined(WITHOUT_VORBIS)
LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
PLIST_SUB+=	VORBIS=""
.else
EXCLUDE+=	--without-plugins="vorbis"
PLIST_SUB+=	VORBIS="@comment "
.endif

.if !defined(WITHOUT_WAVPACK)
LIB_DEPENDS+=	wavpack.1:${PORTSDIR}/audio/wavpack
PLIST_SUB+=	WAVPACK=""
.else
EXCLUDE+=	--without-plugins="wavpack"
PLIST_SUB+=	WAVPACK="@comment "
.endif

.if !defined(WITHOUT_XML)
USE_GNOME+=	libxml2
PLIST_SUB+=	XML=""
.else
EXCLUDE+=	--without-plugins="xml" --without-plugins="rss" \
		--without-plugins="xspf"
PLIST_SUB+=	XML="@comment "
.endif

.endif # !XMMS2_SLAVE

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

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

Lines 1-3 Link Here

(-)audio/xmms2/distinfo (-3 / +3 lines)
1	MD5 (xmms2-0.5DrLecter.tar.bz2) = 9033ef15be9069ef43aeb4b6360a4d36	1	MD5 (xmms2-0.6DrMattDestruction.tar.bz2) = 954fb9c76b5db5e324a105e81b273200
2	SHA256 (xmms2-0.5DrLecter.tar.bz2) = 95e4dc003599c88ec7caa16c95f472df2a8e4fc024843b610a27e405ffc5c659	2	SHA256 (xmms2-0.6DrMattDestruction.tar.bz2) = 4fb4f469816d8a1a676f6660e370b0c73a07e3d7e59d07f57a43b67216291db8
3	SIZE (xmms2-0.5DrLecter.tar.bz2) = 1543415	3	SIZE (xmms2-0.6DrMattDestruction.tar.bz2) = 1631304

Lines 1-118 Link Here

(-)audio/xmms2/pkg-plist (-115 / +126 lines)
		1	bin/nyxmms2
		2	%%VISUAL%%bin/vistest
		3	%%VISUAL%%bin/vistest-fft
1	bin/xmms2	4	bin/xmms2
2	bin/xmms2-et	5	bin/xmms2-et
3	bin/xmms2-launcher
4	%%FAM%%bin/xmms2-mlib-updater
5	%%MDNS_AVAHI%%bin/xmms2-find-avahi	6	%%MDNS_AVAHI%%bin/xmms2-find-avahi
		7	bin/xmms2-launcher
		8	%%VISUAL%%bin/xmms2-libvisual
6	%%MDNS_AVAHI%%bin/xmms2-mdns-avahi	9	%%MDNS_AVAHI%%bin/xmms2-mdns-avahi
7	%%MDNS_APPLE%%bin/xmms2-mdns-dnssd	10	%%MDNS_APPLE%%bin/xmms2-mdns-dnssd
		11	%%FAM%%bin/xmms2-mlib-updater
		12	%%VISUAL%%%%VORBIS%%bin/xmms2-ripper
8	bin/xmms2d	13	bin/xmms2d
9	include/xmms2/xmms/xmms_bindata.h	14	%%INCLUDEDIR%%/xmms/xmms_bindata.h
10	include/xmms2/xmms/xmms_config.h	15	%%INCLUDEDIR%%/xmms/xmms_config.h
11	include/xmms2/xmms/xmms_error.h	16	%%INCLUDEDIR%%/xmms/xmms_error.h
12	include/xmms2/xmms/xmms_ipc.h	17	%%INCLUDEDIR%%/xmms/xmms_ipc.h
13	include/xmms2/xmms/xmms_log.h	18	%%INCLUDEDIR%%/xmms/xmms_log.h
14	include/xmms2/xmms/xmms_medialib.h	19	%%INCLUDEDIR%%/xmms/xmms_medialib.h
15	include/xmms2/xmms/xmms_object.h	20	%%INCLUDEDIR%%/xmms/xmms_object.h
16	include/xmms2/xmms/xmms_outputplugin.h	21	%%INCLUDEDIR%%/xmms/xmms_outputplugin.h
17	include/xmms2/xmms/xmms_plugin.h	22	%%INCLUDEDIR%%/xmms/xmms_plugin.h
18	include/xmms2/xmms/xmms_sample.h	23	%%INCLUDEDIR%%/xmms/xmms_sample.h
19	include/xmms2/xmms/xmms_streamtype.h	24	%%INCLUDEDIR%%/xmms/xmms_streamtype.h
20	include/xmms2/xmms/xmms_strfunc.h	25	%%INCLUDEDIR%%/xmms/xmms_strfunc.h
21	include/xmms2/xmms/xmms_util.h	26	%%INCLUDEDIR%%/xmms/xmms_util.h
22	include/xmms2/xmms/xmms_xformplugin.h	27	%%INCLUDEDIR%%/xmms/xmms_xformplugin.h
23	include/xmms2/xmmsc/xmmsc_coll.h	28	%%INCLUDEDIR%%/xmmsc/xmmsc_compiler.h
24	include/xmms2/xmmsc/xmmsc_errorcodes.h	29	%%INCLUDEDIR%%/xmmsc/xmmsc_errorcodes.h
25	include/xmms2/xmmsc/xmmsc_idnumbers.h	30	%%INCLUDEDIR%%/xmmsc/xmmsc_idnumbers.h
26	include/xmms2/xmmsc/xmmsc_inline.h	31	%%INCLUDEDIR%%/xmmsc/xmmsc_ipc_msg.h
27	include/xmms2/xmmsc/xmmsc_ipc_msg.h	32	%%INCLUDEDIR%%/xmmsc/xmmsc_ipc_transport.h
28	include/xmms2/xmmsc/xmmsc_ipc_transport.h	33	%%INCLUDEDIR%%/xmmsc/xmmsc_sockets.h
29	include/xmms2/xmmsc/xmmsc_sockets.h	34	%%INCLUDEDIR%%/xmmsc/xmmsc_stdbool.h
30	include/xmms2/xmmsc/xmmsc_stdbool.h	35	%%INCLUDEDIR%%/xmmsc/xmmsc_stdint.h
31	include/xmms2/xmmsc/xmmsc_stdint.h	36	%%INCLUDEDIR%%/xmmsc/xmmsc_stringport.h
32	include/xmms2/xmmsc/xmmsc_stringport.h	37	%%INCLUDEDIR%%/xmmsc/xmmsc_strlist.h
33	include/xmms2/xmmsc/xmmsc_strlist.h	38	%%INCLUDEDIR%%/xmmsc/xmmsc_unistd.h
34	include/xmms2/xmmsc/xmmsc_unistd.h	39	%%INCLUDEDIR%%/xmmsc/xmmsc_util.h
35	include/xmms2/xmmsc/xmmsc_util.h	40	%%INCLUDEDIR%%/xmmsc/xmmsc_visualization.h
36	include/xmms2/xmmsclient/xmmsclient++-glib.h	41	%%INCLUDEDIR%%/xmmsc/xmmsv.h
37	include/xmms2/xmmsclient/xmmsclient++.h	42	%%INCLUDEDIR%%/xmmsc/xmmsv_coll.h
38	include/xmms2/xmmsclient/xmmsclient++/bindata.h	43	%%INCLUDEDIR%%/xmmsclient/xmmsclient++-glib.h
39	include/xmms2/xmmsclient/xmmsclient++/client.h	44	%%INCLUDEDIR%%/xmmsclient/xmmsclient++.h
40	include/xmms2/xmmsclient/xmmsclient++/coll.h	45	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/bindata.h
41	include/xmms2/xmmsclient/xmmsclient++/collection.h	46	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/client.h
42	include/xmms2/xmmsclient/xmmsclient++/config.h	47	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/coll.h
43	include/xmms2/xmmsclient/xmmsclient++/dict.h	48	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/collection.h
44	include/xmms2/xmmsclient/xmmsclient++/exceptions.h	49	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/config.h
45	include/xmms2/xmmsclient/xmmsclient++/helpers.h	50	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/dict.h
46	include/xmms2/xmmsclient/xmmsclient++/list.h	51	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/exceptions.h
47	include/xmms2/xmmsclient/xmmsclient++/listener.h	52	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/helpers.h
48	include/xmms2/xmmsclient/xmmsclient++/mainloop.h	53	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/list.h
49	include/xmms2/xmmsclient/xmmsclient++/medialib.h	54	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/listener.h
50	include/xmms2/xmmsclient/xmmsclient++/playback.h	55	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/mainloop.h
51	include/xmms2/xmmsclient/xmmsclient++/playlist.h	56	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/medialib.h
52	include/xmms2/xmmsclient/xmmsclient++/result.h	57	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/playback.h
53	include/xmms2/xmmsclient/xmmsclient++/signal.h	58	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/playlist.h
54	include/xmms2/xmmsclient/xmmsclient++/stats.h	59	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/result.h
55	include/xmms2/xmmsclient/xmmsclient++/typedefs.h	60	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/signal.h
56	include/xmms2/xmmsclient/xmmsclient++/xform.h	61	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/stats.h
57	include/xmms2/xmmsclient/xmmsclient-cf.h	62	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/typedefs.h
58	include/xmms2/xmmsclient/xmmsclient-ecore.h	63	%%INCLUDEDIR%%/xmmsclient/xmmsclient++/xform.h
59	include/xmms2/xmmsclient/xmmsclient-glib.h	64	%%INCLUDEDIR%%/xmmsclient/xmmsclient-cf.h
60	include/xmms2/xmmsclient/xmmsclient-qt.h	65	%%INCLUDEDIR%%/xmmsclient/xmmsclient-ecore.h
61	include/xmms2/xmmsclient/xmmsclient.h	66	%%INCLUDEDIR%%/xmmsclient/xmmsclient-glib.h
		67	%%INCLUDEDIR%%/xmmsclient/xmmsclient-qt.h
		68	%%INCLUDEDIR%%/xmmsclient/xmmsclient.h
62	lib/libxmmsclient-glib.so	69	lib/libxmmsclient-glib.so
63	lib/libxmmsclient-glib.so.1	70	lib/libxmmsclient-glib.so.1
64	lib/libxmmsclient-glib.so.1.0.0	71	lib/libxmmsclient-glib.so.1.0.0
65	lib/libxmmsclient.so	72	lib/libxmmsclient.so
66	lib/libxmmsclient.so.4	73	lib/libxmmsclient.so.5
67	lib/libxmmsclient.so.4.0.0	74	lib/libxmmsclient.so.5.0.0
68	%%AO%%lib/xmms2/libxmms_ao.so	75	%%AIRPLAY%%%%LIBDIR%%/libxmms_airplay.so
69	lib/xmms2/libxmms_asf.so	76	%%AO%%%%LIBDIR%%/libxmms_ao.so
70	lib/xmms2/libxmms_asx.so	77	%%LIBDIR%%/libxmms_apefile.so
71	%%AVCODEC%%lib/xmms2/libxmms_avcodec.so	78	%%LIBDIR%%/libxmms_asf.so
72	%%AVCODEC%%lib/xmms2/libxmms_avformat.so	79	%%LIBDIR%%/libxmms_asx.so
73	lib/xmms2/libxmms_cue.so	80	%%AVCODEC%%%%LIBDIR%%/libxmms_avcodec.so
74	%%CURL%%lib/xmms2/libxmms_curl.so	81	%%AVCODEC%%%%LIBDIR%%/libxmms_avformat.so
75	%%DAAP%%lib/xmms2/libxmms_daap.so	82	%%CDDA%%%%LIBDIR%%/libxmms_cdda.so
76	lib/xmms2/libxmms_diskwrite.so	83	%%LIBDIR%%/libxmms_cue.so
77	lib/xmms2/libxmms_equalizer.so	84	%%CURL%%%%LIBDIR%%/libxmms_curl.so
78	%%FAAD%%lib/xmms2/libxmms_faad.so	85	%%LIBDIR%%/libxmms_daap.so
79	lib/xmms2/libxmms_file.so	86	%%LIBDIR%%/libxmms_diskwrite.so
80	%%FLAC%%lib/xmms2/libxmms_flac.so	87	%%LIBDIR%%/libxmms_equalizer.so
81	%%SPEEX%%lib/xmms2/libxmms_speex.so	88	%%FAAD%%%%LIBDIR%%/libxmms_faad.so
82	%%CDDA%%lib/xmms2/libxmms_cdda.so	89	%%LIBDIR%%/libxmms_file.so
83	%%GVFS%%lib/xmms2/libxmms_gvfs.so	90	%%FLAC%%%%LIBDIR%%/libxmms_flac.so
84	%%ICES%%lib/xmms2/libxmms_ices.so	91	%%LIBDIR%%/libxmms_flv.so
85	%%AIRPLAY%%lib/xmms2/libxmms_airplay.so	92	%%LIBDIR%%/libxmms_gme.so
86	%%CURL%%lib/xmms2/libxmms_icymetaint.so	93	%%GVFS%%%%LIBDIR%%/libxmms_gvfs.so
87	lib/xmms2/libxmms_id3v2.so	94	%%LIBDIR%%/libxmms_html.so
88	%%JACK%%lib/xmms2/libxmms_jack.so	95	%%ICES%%%%LIBDIR%%/libxmms_ices.so
89	%%PULSE%%lib/xmms2/libxmms_pulse.so	96	%%CURL%%%%LIBDIR%%/libxmms_icymetaint.so
90	%%LASTFM%%lib/xmms2/libxmms_lastfm.so	97	%%LIBDIR%%/libxmms_id3v2.so
91	%%LASTFM%%lib/xmms2/libxmms_lastfmeta.so	98	%%JACK%%%%LIBDIR%%/libxmms_jack.so
92	%%KARAOKE%%lib/xmms2/libxmms_karaoke.so	99	%%LIBDIR%%/libxmms_karaoke.so
93	%%GME%%lib/xmms2/libxmms_gme.so	100	%%LIBDIR%%/libxmms_m3u.so
94	lib/xmms2/libxmms_m3u.so	101	%%MAC%%%%LIBDIR%%/libxmms_mac.so
95	%%MAC%%lib/xmms2/libxmms_mac.so	102	%%MAD%%%%LIBDIR%%/libxmms_mad.so
96	lib/xmms2/libxmms_mad.so	103	%%MMS%%%%LIBDIR%%/libxmms_mms.so
97	%%MMS%%lib/xmms2/libxmms_mms.so	104	%%MODPLUG%%%%LIBDIR%%/libxmms_modplug.so
98	%%MODPLUG%%lib/xmms2/libxmms_modplug.so	105	%%MPG123%%%%LIBDIR%%/libxmms_mpg123.so
99	%%FAAD%%lib/xmms2/libxmms_mp4.so	106	%%MUSEPACK%%%%LIBDIR%%/libxmms_musepack.so
100	%%MUSEPACK%%lib/xmms2/libxmms_musepack.so	107	%%FAAD%%%%LIBDIR%%/libxmms_mp4.so
101	lib/xmms2/libxmms_normalize.so	108	%%LIBDIR%%/libxmms_normalize.so
102	lib/xmms2/libxmms_null.so	109	%%LIBDIR%%/libxmms_null.so
103	lib/xmms2/libxmms_nulstripper.so	110	%%LIBDIR%%/libxmms_nulstripper.so
104	%%OFA%%lib/xmms2/libxmms_ofa.so	111	%%OFA%%%%LIBDIR%%/libxmms_ofa.so
105	lib/xmms2/libxmms_oss.so	112	%%LIBDIR%%/libxmms_oss.so
106	lib/xmms2/libxmms_pls.so	113	%%LIBDIR%%/libxmms_pls.so
107	lib/xmms2/libxmms_replaygain.so	114	%%PULSE%%%%LIBDIR%%/libxmms_pulse.so
108	%%XML%%lib/xmms2/libxmms_rss.so	115	%%LIBDIR%%/libxmms_replaygain.so
109	%%SAMBA%%lib/xmms2/libxmms_samba.so	116	%%XML%%%%LIBDIR%%/libxmms_rss.so
110	%%SID%%lib/xmms2/libxmms_sid.so	117	%%SAMBA%%%%LIBDIR%%/libxmms_samba.so
111	%%VOCODER%%lib/xmms2/libxmms_vocoder.so	118	%%SID%%%%LIBDIR%%/libxmms_sid.so
112	lib/xmms2/libxmms_vorbis.so	119	%%SPEEX%%%%LIBDIR%%/libxmms_speex.so
113	lib/xmms2/libxmms_wave.so	120	%%LIBDIR%%/libxmms_tta.so
114	%%XML%%lib/xmms2/libxmms_xml.so	121	%%VOCODER%%%%LIBDIR%%/libxmms_vocoder.so
115	%%XML%%lib/xmms2/libxmms_xspf.so	122	%%VORBIS%%%%LIBDIR%%/libxmms_vorbis.so
		123	%%LIBDIR%%/libxmms_wave.so
		124	%%WAVPACK%%%%LIBDIR%%/libxmms_wavpack.so
		125	%%XML%%%%LIBDIR%%/libxmms_xml.so
		126	%%XML%%%%LIBDIR%%/libxmms_xspf.so
116	libdata/pkgconfig/xmms2-client-glib.pc	127	libdata/pkgconfig/xmms2-client-glib.pc
117	libdata/pkgconfig/xmms2-client.pc	128	libdata/pkgconfig/xmms2-client.pc
118	libdata/pkgconfig/xmms2-plugin.pc	129	libdata/pkgconfig/xmms2-plugin.pc
Lines 127-139 share/pixmaps/xmms2.svg Link Here
127	%%DATADIR%%/scripts/startup.d/xmms2-et-launcher.sh	138	%%DATADIR%%/scripts/startup.d/xmms2-et-launcher.sh
128	%%MDNS_AVAHI%%%%DATADIR%%/scripts/startup.d/xmms2-mdns-launcher.sh	139	%%MDNS_AVAHI%%%%DATADIR%%/scripts/startup.d/xmms2-mdns-launcher.sh
129	%%MDNS_APPLE%%%%DATADIR%%/scripts/startup.d/xmms2-mdns-launcher.sh	140	%%MDNS_APPLE%%%%DATADIR%%/scripts/startup.d/xmms2-mdns-launcher.sh
130	%%FAM%%share/xmms2/scripts/startup.d/xmms2-mlib-updater.sh	141	%%FAM%%%%DATADIR%%/scripts/startup.d/xmms2-mlib-updater.sh
131	@dirrm share/xmms2/scripts/startup.d	142	@dirrm %%INCLUDEDIR%%/xmms
132	@dirrm share/xmms2/scripts	143	@dirrm %%INCLUDEDIR%%/xmmsc
133	@dirrm share/xmms2	144	@dirrm %%INCLUDEDIR%%/xmmsclient/xmmsclient++
134	@dirrm lib/xmms2	145	@dirrm %%INCLUDEDIR%%/xmmsclient
135	@dirrm include/xmms2/xmmsclient/xmmsclient++	146	@dirrm %%INCLUDEDIR%%
136	@dirrm include/xmms2/xmmsclient	147	@dirrm %%LIBDIR%%
137	@dirrm include/xmms2/xmmsc	148	@dirrm %%DATADIR%%/scripts/startup.d
138	@dirrm include/xmms2/xmms	149	@dirrm %%DATADIR%%/scripts
139	@dirrm include/xmms2	150	@dirrm %%DATADIR%%




--- src/clients/vistest/wscript~
+++ src/clients/vistest/wscript
@@ -15,14 +15,6 @@ def build(bld):
     obj.uselib_local = 'xmmsclient-glib xmmsclient'
     obj.uselib = 'glib2 math'
 
-    if bld.env['LIB_vorbisenc']:
-        obj = bld.new_task_gen('cc', 'program')
-        obj.target = 'xmms2-ripper'
-        obj.source = 'ripper.c'
-        obj.includes = '. ../../.. ../../include'
-        obj.uselib_local = 'xmmsclient'
-        obj.uselib = 'vorbisenc'
-
     if bld.env['LIB_visual'] and bld.env['LIB_sdl']:
         obj = bld.new_task_gen('cc', 'program')
         obj.target = 'xmms2-libvisual'
@@ -38,7 +30,6 @@ def configure(conf):
     conf.check_cc(lib="m", uselib_store="math")
     conf.check_cfg(package='libvisual-0.4', uselib_store='visual', args='--cflags --libs')
     conf.check_cfg(package='sdl', uselib_store='sdl', args='--cflags --libs')
-    conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc', args='--cflags --libs')
 
     return True
 

Removed Link Here

(-)audio/xmms2/files/patch-src_include_xmms_wscript (-11 lines)
1	--- wscript.orig Fri May 25 16:49:48 2007
2	+++ wscript Fri May 25 16:50:17 2007
3	@@ -284,7 +284,7 @@
4	conf.env['PKGCONFIGDIR'] = Params.g_options.pkgconfigdir
5	print conf.env['PKGCONFIGDIR']
6	else:
7	- conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "lib", "pkgconfig")
8	+ conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "libdata", "pkgconfig")
9
10	if Params.g_options.config_prefix:
11	for dir in Params.g_options.config_prefix:




--- src/plugins/airplay/wscript~
+++ src/plugins/airplay/wscript
@@ -1,11 +1,6 @@
 from waftools.plugin import plugin
 
-def plugin_configure(conf):
-	if not conf.check_cfg(package="openssl", args="--cflags --libs", uselib_store="openssl"):
-		return False
-	return True
-
-configure, build = plugin("airplay", configure=plugin_configure,
+configure, build = plugin("airplay",
                           source=["airplay.c", "raop_client.c",
                                   "net_utils.c", "rtspdefs.c",
                                   "rtspconnection.c", "rtspmessage.c"],




--- wscript~
+++ wscript
@@ -297,7 +297,7 @@ def configure(conf):
         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["PREFIX"], "libdata", "pkgconfig")
 
     if Options.options.config_prefix:
         for dir in Options.options.config_prefix:
@@ -480,7 +480,7 @@ def shutdown():
         ldconfig = '/sbin/ldconfig'
         if os.path.isfile(ldconfig):
             libprefix = Utils.subst_vars('${PREFIX}/lib', Build.bld.env)
-            try: Utils.cmd_output(ldconfig + ' ' + libprefix)
+            try: Utils.cmd_output(ldconfig + '-m' + ' ' + libprefix)
             except: pass
 
     if Options.options.run_tests:

Return to bug 137430

Lines 6-26 Link Here

(-)audio/xmms2/Makefile (-196 / +206 lines)
6	#	6	#
7		7
8	PORTNAME?= xmms2	8	PORTNAME?= xmms2
9	DISTVERSION= 0.5.d.0	9	PORTVERSION= 0.6
10	DISTVERSION= 0.5DrLecter	10	DISTVERSIONSUFFIX=DrMattDestruction
11	CATEGORIES?= audio	11	CATEGORIES?= audio
12	MASTER_SITES= SF	12	MASTER_SITES= SF
13	DISTNAME= ${PORTNAME}-${DISTVERSION}
14	PORTREVISION?= 2
15		13
16	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
17	COMMENT?= Rewrite of xmms as a client/server system (developer release)	15	COMMENT?= Rewrite of xmms as a client/server system (developer release)
18		16
19	.if !defined(XMMS2_SLAVE)
20	LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \
21	vorbis.4:${PORTSDIR}/audio/libvorbis
22	.endif
23
24	USE_BZIP2= yes	17	USE_BZIP2= yes
25	USE_PYTHON_BUILD= yes	18	USE_PYTHON_BUILD= yes
26		19
Lines 29-135 USE_GNOME= glib20 Link Here
29	USE_SQLITE= 3	22	USE_SQLITE= 3
30		23
31	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
32	.endif
33		25
34	.if !defined(XMMS2_SLAVE)	26	MAN1= nyxmms2.1 xmms2.1 xmms2-et.1 xmms2d.1 xmms2-launcher.1
35	MAN1= xmms2.1 xmms2-et.1 xmms2d.1 xmms2-launcher.1
36	MANCOMPRESSED= yes	27	MANCOMPRESSED= yes
		28	PLIST_SUB+= INCLUDEDIR="include/${PORTNAME}" LIBDIR="lib/${PORTNAME}"
37		29
38	OPTIONS= FAAD "Support to playback AAC files" on \	30	OPTIONS= AIRPLAY "Support output via Airport Express" off \
39	FLAC "Support to playback FLAC files" on \	31	AO "Support to output via libao" off \
40	SPEEX "Support to playback SPEEX files" off \	32	APE "Support to playback Monkey's Audio files" off \
41	CDDA "Support to playback AudioCD" off \	33	AVCODEC "Support to playback files with avcodec" off \
42	MODPLUG "Support to playback MOD files" off \	34	CDDA "Support to playback AudioCD" off \
43	MUSEPACK "Support to playback MPC files" off \	35	CURL "Support to playback files via HTTP" on \
44	SID "Support to playback SID files" off \	36	FAAD "Support to playback AAC files" on \
45	AVCODEC "Support to playback files with avcodec" off \	37	FAM "Support to update Media Library on file change" off \
46	APE "Support to playback Monkey's Audio files" off \	38	FLAC "Support to playback FLAC files" on \
47	CURL "Support to playback files via HTTP" on \	39	GVFS "Support to playback files via GVFS" off \
48	LASTFM "Support to playback audio via Last.fm radio" on \	40	ICES "Support to playback files to an icecast server" off \
49	GVFS "Support to playback files via GVFS" off \	41	JACK "Support to output via the Jack output server" off \
50	MMS "Support to playback streams via MMS" off \	42	MAD "Support to playback MP3 files" on \
51	SAMBA "Support to playback files via SMB" off \
52	DAAP "Support to playback files via DAAP" on \
53	GME "Support to playback files via GME (SPC/NSF/GBS)" on \
54	OFA "Support to collect MusicDNS fingerprints" off \
55	XML "Support for XML based playlists (XSPF, RSS)" off \
56	FAM "Support to update Media Library on file change" off \
57	MDNS_AVAHI "Support to announce XMMS2d via mDNS (Avahi)" off \
58	MDNS_APPLE "Support to announce XMMS2d via mDNS (Apple)" on \	43	MDNS_APPLE "Support to announce XMMS2d via mDNS (Apple)" on \
59	ICES "Support to playback files to an icecast server" off \	44	MDNS_AVAHI "Support to announce XMMS2d via mDNS (Avahi)" off \
60	JACK "Support to output via the Jack output server" off \	45	MMS "Support to playback streams via MMS" off \
61	PULSE "Support to output via the PulseAudio" off \	46	MODPLUG "Support to playback MOD files" off \
62	AO "Support to output via libao" off \	47	MPG123 "Support to playback MP3 files" off \
63	KARAOKE "Karaoke plugin for voice removal from tracks" on \	48	MUSEPACK "Support to playback MPC files" off \
64	VOCODER "Phase Vocoder effect plugin" off #\	49	OFA "Support to collect MusicDNS fingerprints" off \
65	# SDL "Support for visualization" on	50	PULSE "Support to output via the PulseAudio" off \
66	.endif	51	SAMBA "Support to playback files via SMB" off \
		52	SID "Support to playback SID files" off \
		53	SPEEX "Support to playback SPEEX files" off \
		54	VISUAL "Support for visualization plugins" off \
		55	VOCODER "Phase Vocoder effect plugin" off \
		56	VORBIS "Support to playback OGG files" on \
		57	WAVPACK "Support to playback WV files" off \
		58	XML "Support for XML based playlists (XSPF, RSS)" off
		59	.endif # !XMMS_SLAVE
67		60
68	.include <bsd.port.pre.mk>	61	.include <bsd.port.pre.mk>
69		62
70	.if defined(XMMS2_SLAVE)	63	.if defined(XMMS2_SLAVE)
71	EXCLUDE+= --without-xmms2d=1	64	EXCLUDE+= --without-xmms2d
72	.endif
73		65
74	.if defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "python"	66	.if ${XMMS2_SLAVE} == "python"
75	EXCLUDE+= --with-optionals="python"	67	EXCLUDE+= --with-optionals="python"
76	.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "ruby"	68	.elif ${XMMS2_SLAVE} == "ruby"
77	EXCLUDE+= --with-optionals="ruby"	69	EXCLUDE+= --with-optionals="ruby"
78	.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "perl"	70	.elif ${XMMS2_SLAVE} == "perl"
79	EXCLUDE+= --with-optionals="perl"	71	EXCLUDE+= --with-optionals="perl"
80	.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "ruby-ecore"	72	.elif ${XMMS2_SLAVE} == "ruby-ecore"
81	EXCLUDE+= --with-optionals="ruby" --with-optionals="xmmsclient-ecore"	73	EXCLUDE+= --with-optionals="ruby" --with-optionals="xmmsclient-ecore"
82	.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "cpp"	74	.elif ${XMMS2_SLAVE} == "cpp"
83	EXCLUDE+= --with-optionals="xmmsclient++" --with-optionals="xmmsclient++-glib"	75	EXCLUDE+= --with-optionals="xmmsclient++" \
84	.elif !defined(XMMS2_SLAVE)	76	--with-optionals="xmmsclient++-glib"
85	EXCLUDE+= --without-optionals="python" --without-optionals="ruby" --without-optionals="xmmsclient-ecore" --without-optionals="xmmsclient++" --without-optionals="xmmsclient++-glib" --without-optionals="perl"
86	.endif	77	.endif
87		78
88	.if !defined(XMMS2_SLAVE)	79	.else # XMMS2_SLAVE
		80	EXCLUDE+= --without-optionals="python" \
		81	--without-optionals="ruby" \
		82	--without-optionals="xmmsclient-ecore" \
		83	--without-optionals="xmmsclient++" \
		84	--without-optionals="xmmsclient++-glib" \
		85	--without-optionals="perl"
		86	.endif # XMMS2_SLAVE
89		87
90	.if !defined(WITHOUT_CURL)	88	.if !defined(XMMS2_SLAVE)
91	LIB_DEPENDS+= curl.5:${PORTSDIR}/ftp/curl
92	PLIST_SUB+= CURL=""
93	.else
94	EXCLUDE+= --without-plugins="curl" --without-plugins="icymetaint"
95	PLIST_SUB+= CURL="@comment "
96	.endif
97		89
98	.if !defined(WITHOUT_LASTFM)	90	.if !defined(WITHOUT_AIRPLAY)
99	.if defined(WITHOUT_CURL)	91	USE_OPENSSL= yes
100	LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl	92	PLIST_SUB+= AIRPLAY=""
101	.endif
102	PLIST_SUB+= LASTFM=""
103	.else	93	.else
104	EXCLUDE+= --without-plugins="lastfm" --without-plugins="lastfmeta"	94	EXCLUDE+= --without-plugins="airplay"
105	PLIST_SUB+= LASTFM="@comment "	95	PLIST_SUB+= AIRPLAY="@comment "
106	.endif	96	.endif
107		97
108	.if defined(WITH_SID)	98	.if !defined(WITHOUT_AO)
109	LIB_DEPENDS+= sidplay2.[0-9]:${PORTSDIR}/audio/libsidplay2	99	LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao
110	PLIST_SUB+= SID=""	100	PLIST_SUB+= AO=""
111	.else	101	.else
112	EXCLUDE+= --without-plugins="sid"	102	EXCLUDE+= --without-plugins="ao"
113	PLIST_SUB+= SID="@comment "	103	PLIST_SUB+= AO="@comment "
114	.endif	104	.endif
115		105
116	.if !defined(WITHOUT_FLAC)	106	.if !defined(WITHOUT_APE)
117	LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac	107	LIB_DEPENDS+= mac.2:${PORTSDIR}/audio/mac
118	PLIST_SUB+= FLAC=""	108	PLIST_SUB+= MAC=""
119	.else	109	.else
120	EXCLUDE+= --without-plugins="flac"	110	EXCLUDE+= --without-plugins="mac"
121	PLIST_SUB+= FLAC="@comment "	111	PLIST_SUB+= MAC="@comment "
122	.endif	112	.endif
123		113
124	.if defined(WITH_SPEEX)	114	.if !defined(WITHOUT_AVCODEC)
125	LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex	115	LIB_DEPENDS+= avutil.1:${PORTSDIR}/multimedia/ffmpeg
126	PLIST_SUB+= SPEEX=""	116	PLIST_SUB+= AVCODEC=""
127	.else	117	.else
128	EXCLUDE+= --without-plugins="speex"	118	EXCLUDE+= --without-plugins="avcodec"
129	PLIST_SUB+= SPEEX="@comment "	119	PLIST_SUB+= AVCODEC="@comment "
130	.endif	120	.endif
131		121
132	.if defined(WITH_CDDA)	122	.if !defined(WITHOUT_CDDA)
133	LIB_DEPENDS+= cdio.8:${PORTSDIR}/sysutils/libcdio \	123	LIB_DEPENDS+= cdio.8:${PORTSDIR}/sysutils/libcdio \
134	discid.2:${PORTSDIR}/audio/libdiscid	124	discid.2:${PORTSDIR}/audio/libdiscid
135	PLIST_SUB+= CDDA=""	125	PLIST_SUB+= CDDA=""
Lines 138-143 EXCLUDE+= --without-plugins="cdda" Link Here
138	PLIST_SUB+= CDDA="@comment "	128	PLIST_SUB+= CDDA="@comment "
139	.endif	129	.endif
140		130
		131	.if !defined(WITHOUT_CURL)
		132	LIB_DEPENDS+= curl.5:${PORTSDIR}/ftp/curl
		133	PLIST_SUB+= CURL=""
		134	.else
		135	EXCLUDE+= --without-plugins="curl" --without-plugins="icymetaint"
		136	PLIST_SUB+= CURL="@comment "
		137	.endif
		138
141	.if !defined(WITHOUT_FAAD)	139	.if !defined(WITHOUT_FAAD)
142	LIB_DEPENDS+= faad.2:${PORTSDIR}/audio/faad	140	LIB_DEPENDS+= faad.2:${PORTSDIR}/audio/faad
143	PLIST_SUB+= FAAD=""	141	PLIST_SUB+= FAAD=""
Lines 146-185 EXCLUDE+= --without-plugins="faad" --wit Link Here
146	PLIST_SUB+= FAAD="@comment "	144	PLIST_SUB+= FAAD="@comment "
147	.endif	145	.endif
148		146
149	.if defined(WITH_AVCODEC)	147	.if !defined(WITHOUT_FAM)
150	LIB_DEPENDS+= avutil.1:${PORTSDIR}/multimedia/ffmpeg	148	USE_FAM= yes
151	PLIST_SUB+= AVCODEC=""	149	WANT_FAM_SYSTEM=gamin
		150	PLIST_SUB+= FAM=""
152	.else	151	.else
153	EXCLUDE+= --without-plugins="avcodec"	152	EXCLUDE+= --without-optionals="medialib-updater"
154	PLIST_SUB+= AVCODEC="@comment "	153	PLIST_SUB+= FAM="@comment "
155	.endif	154	.endif
156		155
157	.if defined(WITH_APE)	156	.if !defined(WITHOUT_FLAC)
158	LIB_DEPENDS+= mac.2:${PORTSDIR}/audio/mac	157	LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac
159	PLIST_SUB+= MAC=""	158	PLIST_SUB+= FLAC=""
160	.else	159	.else
161	EXCLUDE+= --without-plugins="mac"	160	EXCLUDE+= --without-plugins="flac"
162	PLIST_SUB+= MAC="@comment "	161	PLIST_SUB+= FLAC="@comment "
163	.endif	162	.endif
164		163
165	.if !defined(WITHOUT_SDL) && defined(UNDEFINED)	164	.if !defined(WITHOUT_GVFS)
166	IGNORE= visualization has not been updated to the Transforms API	165	USE_GNOME+= gvfs
167	USE_SDL= sdl ttf	166	PLIST_SUB+= GVFS=""
168	PLIST_SUB+= SDL=""
169	#EXTRA_PATCHES+= ${FILESDIR}/extraPatch-src::clients::sdl-vis::Program
170	.else	167	.else
171	PLIST_SUB+= SDL="@comment "	168	EXCLUDE+= --without-plugins="gvfs"
		169	PLIST_SUB+= GVFS="@comment "
172	.endif	170	.endif
173		171
174	.if defined(WITH_MUSEPACK)	172	.if !defined(WITHOUT_ICES)
175	LIB_DEPENDS+= mpcdec.5:${PORTSDIR}/audio/libmpcdec	173	LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2
176	PLIST_SUB+= MUSEPACK=""	174	PLIST_SUB+= ICES=""
177	.else	175	.else
178	EXCLUDE+= --without-plugins="musepack"	176	EXCLUDE+= --without-plugins="ices"
179	PLIST_SUB+= MUSEPACK="@comment "	177	PLIST_SUB+= ICES="@comment "
180	.endif	178	.endif
181		179
182	.if defined(WITH_JACK)	180	.if !defined(WITHOUT_JACK)
183	LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack	181	LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack
184	PLIST_SUB+= JACK=""	182	PLIST_SUB+= JACK=""
185	.else	183	.else
Lines 187-328 EXCLUDE+= --without-plugins="jack" Link Here
187	PLIST_SUB+= JACK="@comment "	185	PLIST_SUB+= JACK="@comment "
188	.endif	186	.endif
189		187
190	.if defined(WITH_PULSE)	188	.if !defined(WITHOUT_MAD)
191	LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio	189	LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad
192	PLIST_SUB+= PULSE=""	190	PLIST_SUB+= MAD=""
193	.else	191	.else
194	EXCLUDE+= --without-plugins="pulse"	192	EXCLUDE+= --without-plugins="mad"
195	PLIST_SUB+= PULSE="@comment "	193	PLIST_SUB+= MAD="@comment "
196	.endif
197
198	.if defined(WITH_MODPLUG)
199	LIB_DEPENDS+= modplug.0:${PORTSDIR}/audio/libmodplug
200	PLIST_SUB+= MODPLUG=""
201	.else
202	EXCLUDE+= --without-plugins="modplug"
203	PLIST_SUB+= MODPLUG="@comment "
204	.endif	194	.endif
205		195
206	.if defined(WITH_OFA)	196	.if !defined(WITHOUT_MDNS_APPLE) && !defined(WITHOUT_MDNS_AVAHI)
207	LIB_DEPENDS+= ofa.0:${PORTSDIR}/audio/libofa	197	BROKEN= You may choose either MDNS_APPLE or MDNS_AVAHI, but not both
208	PLIST_SUB+= OFA=""
209	.else
210	EXCLUDE+= --without-plugins="ofa"
211	PLIST_SUB+= OFA="@comment "
212	.endif	198	.endif
213		199
214	.if defined(WITH_XML)	200	.if !defined(WITHOUT_MDNS_APPLE)
215	USE_GNOME= libxml2	201	EXCLUDE+= --without-optionals="avahi"
216	PLIST_SUB+= XML=""	202	LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder
		203	PLIST_SUB+= MDNS_APPLE=""
217	.else	204	.else
218	EXCLUDE+= --without-plugins="xml" --without-plugins="rss" --without-plugins="xspf"	205	EXCLUDE+= --without-optionals="dns_sd"
219	PLIST_SUB+= XML="@comment "	206	PLIST_SUB+= MDNS_APPLE="@comment "
220	.endif	207	.endif
221		208
222	.if defined(WITH_SAMBA)	209	.if !defined(WITHOUT_MDNS_AVAHI)
223	LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient	210	EXCLUDE+= --without-optionals="dns_sd"
224	PLIST_SUB+= SAMBA=""	211	LIB_DEPENDS+= avahi-core:${PORTSDIR}/net/avahi-app
		212	PLIST_SUB+= MDNS_AVAHI=""
		213	MAN1+= xmms2-mdns-avahi.1
225	.else	214	.else
226	EXCLUDE+= --without-plugins="samba"	215	EXCLUDE+= --without-optionals="avahi"
227	PLIST_SUB+= SAMBA="@comment "	216	PLIST_SUB+= MDNS_AVAHI="@comment "
228	.endif	217	.endif
229		218
230	.if !defined(WITHOUT_DAAP)	219	.if !defined(WITHOUT_MMS)
231	PLIST_SUB+= DAAP=""	220	LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms
		221	PLIST_SUB+= MMS=""
232	.else	222	.else
233	EXCLUDE+= --without-plugins="daap"	223	EXCLUDE+= --without-plugins="mms"
234	PLIST_SUB+= DAAP="@comment "	224	PLIST_SUB+= MMS="@comment "
235	.endif	225	.endif
236		226
237	.if !defined(WITHOUT_GME)	227	.if !defined(WITHOUT_MODPLUG)
238	PLIST_SUB+= GME=""	228	LIB_DEPENDS+= modplug.0:${PORTSDIR}/audio/libmodplug
		229	PLIST_SUB+= MODPLUG=""
239	.else	230	.else
240	EXCLUDE+= --without-plugins="gme"	231	EXCLUDE+= --without-plugins="modplug"
241	PLIST_SUB+= GME="@comment "	232	PLIST_SUB+= MODPLUG="@comment "
242	.endif	233	.endif
243		234
244	.if defined(WITH_GVFS)	235	.if !defined(WITHOUT_MPG123)
245	USE_GNOME+= gvfs	236	LIB_DEPENDS+= mpg123.11:${PORTSDIR}/audio/mpg123
246	PLIST_SUB+= GVFS=""	237	PLIST_SUB+= MPG123=""
247	.else	238	.else
248	EXCLUDE+= --without-plugins="gvfs"	239	EXCLUDE+= --without-plugins="mpg123"
249	PLIST_SUB+= GVFS="@comment "	240	PLIST_SUB+= MPG123="@comment "
250	.endif	241	.endif
251		242
252	.if defined(WITH_MMS)	243	.if !defined(WITHOUT_MUSEPACK)
253	LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms	244	LIB_DEPENDS+= mpcdec.5:${PORTSDIR}/audio/libmpcdec
254	PLIST_SUB+= MMS=""	245	PLIST_SUB+= MUSEPACK=""
255	.else	246	.else
256	EXCLUDE+= --without-plugins="mms"	247	EXCLUDE+= --without-plugins="musepack"
257	PLIST_SUB+= MMS="@comment "	248	PLIST_SUB+= MUSEPACK="@comment "
258	.endif	249	.endif
259		250
260	.if defined(WITH_FAM)	251	.if !defined(WITHOUT_OFA)
261	USE_FAM= yes	252	LIB_DEPENDS+= ofa.0:${PORTSDIR}/audio/libofa
262	WANT_FAM_SYSTEM=gamin	253	PLIST_SUB+= OFA=""
263	PLIST_SUB+= FAM=""
264	.else	254	.else
265	EXCLUDE+= --without-optionals="medialib-updater"	255	EXCLUDE+= --without-plugins="ofa"
266	PLIST_SUB+= FAM="@comment "	256	PLIST_SUB+= OFA="@comment "
267	.endif	257	.endif
268		258
269	.if defined(WITH_ICES)	259	.if !defined(WITHOUT_PULSE)
270	LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2	260	LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
271	PLIST_SUB+= ICES=""	261	PLIST_SUB+= PULSE=""
272	.else	262	.else
273	EXCLUDE+= --without-plugins="ices"	263	EXCLUDE+= --without-plugins="pulse"
274	PLIST_SUB+= ICES="@comment "	264	PLIST_SUB+= PULSE="@comment "
275	.endif	265	.endif
276		266
277	# FIXME: requires pkg-config data of openssl	267	.if !defined(WITHOUT_SAMBA)
278	.if defined(WITH_AIRPLAY)	268	LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient
279	PLIST_SUB+= AIRPLAY=""	269	PLIST_SUB+= SAMBA=""
280	.else	270	.else
281	EXCLUDE+= --without-plugins="airplay"	271	EXCLUDE+= --without-plugins="samba"
282	PLIST_SUB+= AIRPLAY="@comment "	272	PLIST_SUB+= SAMBA="@comment "
283	.endif	273	.endif
284		274
285	.if defined(WITH_AO)	275	.if !defined(WITHOUT_SID)
286	LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao	276	LIB_DEPENDS+= sidplay2.[0-9]:${PORTSDIR}/audio/libsidplay2
287	PLIST_SUB+= AO=""	277	PLIST_SUB+= SID=""
288	.else	278	.else
289	EXCLUDE+= --without-plugins="ao"	279	EXCLUDE+= --without-plugins="sid"
290	PLIST_SUB+= AO="@comment "	280	PLIST_SUB+= SID="@comment "
291	.endif	281	.endif
292		282
293	.if defined(WITH_MDNS_AVAHI)	283	.if !defined(WITHOUT_SPEEX)
294	.if !defined(WITHOUT_MDNS_APPLE)	284	LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex
295	BROKEN= You may choose either MDNS_APPLE or MDNS_AVAHI, but not both	285	PLIST_SUB+= SPEEX=""
296	.endif
297	EXCLUDE+= --without-optionals="dns_sd"
298	LIB_DEPENDS+= avahi-core:${PORTSDIR}/net/avahi-app
299	PLIST_SUB+= MDNS_AVAHI=""
300	MAN1+= xmms2-mdns-avahi.1
301	.else	286	.else
302	EXCLUDE+= --without-optionals="avahi"	287	EXCLUDE+= --without-plugins="speex"
303	PLIST_SUB+= MDNS_AVAHI="@comment "	288	PLIST_SUB+= SPEEX="@comment "
304	.endif	289	.endif
305		290
306	.if !defined (WITHOUT_MDNS_APPLE)	291	# xmms2-ripper
307	.if defined(WITH_MDNS_AVAHI)	292	.if !defined(WITHOUT_VISUAL) && !defined(WITHOUT_VORBIS)
308	BROKEN= You may choose either MDNS_APPLE or MDNS_AVAHI, but not both	293	LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis
309	.endif
310	EXCLUDE+= --without-optionals="avahi"
311	LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder
312	PLIST_SUB+= MDNS_APPLE=""
313	.else	294	.else
314	EXCLUDE+= --without-optionals="dns_sd"	295	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_clients_vistest_wscript
315	PLIST_SUB+= MDNS_APPLE="@comment "
316	.endif	296	.endif
317		297
318	.if !defined(WITHOUT_KARAOKE)	298	# XXX: shm support requires semtimedop(2)
319	PLIST_SUB+= KARAOKE=""	299	.if !defined(WITHOUT_VISUAL)
		300	USE_SDL= yes
		301	LIB_DEPENDS+= visual-0.4.0:${PORTSDIR}/graphics/libvisual04
		302	PLIST_SUB+= VISUAL=""
320	.else	303	.else
321	EXCLUDE+= --without-plugins="karaoke"	304	EXCLUDE+= --without-optionals="vistest"
322	PLIST_SUB+= KARAOKE="@comment "	305	PLIST_SUB+= VISUAL="@comment "
323	.endif	306	.endif
324		307
325	.if defined(WITH_VOCODER)	308	.if !defined(WITHOUT_VOCODER)
326	LIB_DEPENDS+= fftw3f.5:${PORTSDIR}/math/fftw3-float	309	LIB_DEPENDS+= fftw3f.5:${PORTSDIR}/math/fftw3-float
327	LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate	310	LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate
328	PLIST_SUB+= VOCODER=""	311	PLIST_SUB+= VOCODER=""
Lines 330-339 PLIST_SUB+= VOCODER="" Link Here
330	EXCLUDE+= --without-plugins="vocoder"	313	EXCLUDE+= --without-plugins="vocoder"
331	PLIST_SUB+= VOCODER="@comment "	314	PLIST_SUB+= VOCODER="@comment "
332	.endif	315	.endif
		316
		317	.if !defined(WITHOUT_VORBIS)
		318	LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis
		319	PLIST_SUB+= VORBIS=""
		320	.else
		321	EXCLUDE+= --without-plugins="vorbis"
		322	PLIST_SUB+= VORBIS="@comment "
		323	.endif
		324
		325	.if !defined(WITHOUT_WAVPACK)
		326	LIB_DEPENDS+= wavpack.1:${PORTSDIR}/audio/wavpack
		327	PLIST_SUB+= WAVPACK=""
		328	.else
		329	EXCLUDE+= --without-plugins="wavpack"
		330	PLIST_SUB+= WAVPACK="@comment "
		331	.endif
		332
		333	.if !defined(WITHOUT_XML)
		334	USE_GNOME+= libxml2
		335	PLIST_SUB+= XML=""
		336	.else
		337	EXCLUDE+= --without-plugins="xml" --without-plugins="rss" \
		338	--without-plugins="xspf"
		339	PLIST_SUB+= XML="@comment "
333	.endif	340	.endif
334		341
		342	.endif # !XMMS2_SLAVE
		343
335	do-configure:	344	do-configure:
336	cd ${WRKSRC} && ./waf configure --conf-prefix=${LOCALBASE} --prefix=${PREFIX} --with-mandir=${PREFIX}/man ${EXCLUDE}	345	cd ${WRKSRC} && ./waf configure --conf-prefix=${LOCALBASE} \
		346	--prefix=${PREFIX} --with-mandir=${PREFIX}/man ${EXCLUDE}
337		347
338	do-build:	348	do-build:
339	cd ${WRKSRC} && ./waf build	349	cd ${WRKSRC} && ./waf build

Added Link Here

(-)audio/xmms2/files/extra-patch-src_clients_vistest_wscript (+25 lines)
1	--- src/clients/vistest/wscript~
2	+++ src/clients/vistest/wscript
3	@@ -15,14 +15,6 @@ def build(bld):
4	obj.uselib_local = 'xmmsclient-glib xmmsclient'
5	obj.uselib = 'glib2 math'
6
7	- if bld.env['LIB_vorbisenc']:
8	- obj = bld.new_task_gen('cc', 'program')
9	- obj.target = 'xmms2-ripper'
10	- obj.source = 'ripper.c'
11	- obj.includes = '. ../../.. ../../include'
12	- obj.uselib_local = 'xmmsclient'
13	- obj.uselib = 'vorbisenc'
14	-
15	if bld.env['LIB_visual'] and bld.env['LIB_sdl']:
16	obj = bld.new_task_gen('cc', 'program')
17	obj.target = 'xmms2-libvisual'
18	@@ -38,7 +30,6 @@ def configure(conf):
19	conf.check_cc(lib="m", uselib_store="math")
20	conf.check_cfg(package='libvisual-0.4', uselib_store='visual', args='--cflags --libs')
21	conf.check_cfg(package='sdl', uselib_store='sdl', args='--cflags --libs')
22	- conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc', args='--cflags --libs')
23
24	return True
25

Added Link Here

(-)audio/xmms2/files/patch-src_plugins_airplay_wscript (+15 lines)
1	--- src/plugins/airplay/wscript~
2	+++ src/plugins/airplay/wscript
3	@@ -1,11 +1,6 @@
4	from waftools.plugin import plugin
5
6	-def plugin_configure(conf):
7	- if not conf.check_cfg(package="openssl", args="--cflags --libs", uselib_store="openssl"):
8	- return False
9	- return True
10	-
11	-configure, build = plugin("airplay", configure=plugin_configure,
12	+configure, build = plugin("airplay",
13	source=["airplay.c", "raop_client.c",
14	"net_utils.c", "rtspdefs.c",
15	"rtspconnection.c", "rtspmessage.c"],

Added Link Here

(-)audio/xmms2/files/patch-wscript (+20 lines)
1	--- wscript~
2	+++ wscript
3	@@ -297,7 +297,7 @@ def configure(conf):
4	conf.env['PKGCONFIGDIR'] = Options.options.pkgconfigdir
5	print(conf.env['PKGCONFIGDIR'])
6	else:
7	- conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "lib", "pkgconfig")
8	+ conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "libdata", "pkgconfig")
9
10	if Options.options.config_prefix:
11	for dir in Options.options.config_prefix:
12	@@ -480,7 +480,7 @@ def shutdown():
13	ldconfig = '/sbin/ldconfig'
14	if os.path.isfile(ldconfig):
15	libprefix = Utils.subst_vars('${PREFIX}/lib', Build.bld.env)
16	- try: Utils.cmd_output(ldconfig + ' ' + libprefix)
17	+ try: Utils.cmd_output(ldconfig + '-m' + ' ' + libprefix)
18	except: pass
19
20	if Options.options.run_tests: