Index: audio/cpp-xmms2/Makefile =================================================================== RCS file: /home/csup/ports/audio/cpp-xmms2/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- audio/cpp-xmms2/Makefile 2 Aug 2009 08:01:57 -0000 1.12 +++ audio/cpp-xmms2/Makefile 4 Aug 2009 15:07:29 -0000 @@ -13,7 +13,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= C++ Bindings for XMMS2 LIB_DEPENDS+= boost_signals.4:${PORTSDIR}/devel/boost-libs \ - xmmsclient.4:${PORTSDIR}/audio/xmms2 + xmmsclient.5:${PORTSDIR}/audio/xmms2 MASTERDIR= ${.CURDIR}/../xmms2 USE_LDCONFIG= yes Index: audio/p5-xmms2/Makefile =================================================================== RCS file: /home/csup/ports/audio/p5-xmms2/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- audio/p5-xmms2/Makefile 2 Aug 2009 08:01:58 -0000 1.5 +++ audio/p5-xmms2/Makefile 4 Aug 2009 15:07:56 -0000 @@ -12,7 +12,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= ports@FreeBSD.org COMMENT= Perl Bindings for XMMS2 -LIB_DEPENDS+= xmmsclient.4:${PORTSDIR}/audio/xmms2 +LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2 MASTERDIR= ${.CURDIR}/../xmms2 Index: audio/py-xmms2/Makefile =================================================================== RCS file: /home/csup/ports/audio/py-xmms2/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- audio/py-xmms2/Makefile 2 Aug 2009 08:01:59 -0000 1.10 +++ audio/py-xmms2/Makefile 4 Aug 2009 15:07:36 -0000 @@ -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.4:${PORTSDIR}/audio/xmms2 +LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2 MASTERDIR= ${.CURDIR}/../xmms2 Index: audio/ruby-xmms2/Makefile =================================================================== RCS file: /home/csup/ports/audio/ruby-xmms2/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- audio/ruby-xmms2/Makefile 3 Aug 2009 22:06:30 -0000 1.9 +++ audio/ruby-xmms2/Makefile 4 Aug 2009 15:07:45 -0000 @@ -12,7 +12,7 @@ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} MAINTAINER= ruby@FreeBSD.org COMMENT= Ruby Bindings for XMMS2 -LIB_DEPENDS+= xmmsclient.4:${PORTSDIR}/audio/xmms2 +LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2 MASTERDIR= ${.CURDIR}/../xmms2 Index: audio/xmms2/Makefile =================================================================== RCS file: /home/csup/ports/audio/xmms2/Makefile,v retrieving revision 1.45 diff -u -p -r1.45 Makefile --- audio/xmms2/Makefile 2 Aug 2009 08:01:59 -0000 1.45 +++ audio/xmms2/Makefile 4 Aug 2009 14:48:10 -0000 @@ -6,21 +6,14 @@ # PORTNAME?= xmms2 -DISTVERSION= 0.5.d.0 -DISTVERSION= 0.5DrLecter +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 @@ -29,107 +22,104 @@ USE_GNOME= glib20 USE_SQLITE= 3 USE_LDCONFIG= yes -.endif -.if !defined(XMMS2_SLAVE) -MAN1= xmms2.1 xmms2-et.1 xmms2d.1 xmms2-launcher.1 +MAN1= nyxmms2.1 xmms2.1 xmms2-et.1 xmms2d.1 xmms2-launcher.1 MANCOMPRESSED= yes +PLIST_SUB+= INCLUDEDIR="include/${PORTNAME}" LIBDIR="lib/${PORTNAME}" -OPTIONS= FAAD "Support to playback AAC files" on \ - FLAC "Support to playback FLAC files" on \ - SPEEX "Support to playback SPEEX files" off \ - CDDA "Support to playback AudioCD" off \ - MODPLUG "Support to playback MOD files" off \ - MUSEPACK "Support to playback MPC files" off \ - SID "Support to playback SID files" off \ - AVCODEC "Support to playback files with avcodec" 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 \ - GVFS "Support to playback files via GVFS" off \ - MMS "Support to playback streams via MMS" off \ - 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 \ +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 \ MDNS_APPLE "Support to announce XMMS2d via mDNS (Apple)" on \ - ICES "Support to playback files to an icecast server" off \ - JACK "Support to output via the Jack output server" off \ - PULSE "Support to output via the PulseAudio" off \ - AO "Support to output via libao" off \ - KARAOKE "Karaoke plugin for voice removal from tracks" on \ - VOCODER "Phase Vocoder effect plugin" off #\ -# SDL "Support for visualization" on -.endif + 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 .if defined(XMMS2_SLAVE) -EXCLUDE+= --without-xmms2d=1 -.endif +EXCLUDE+= --without-xmms2d -.if defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "python" +.if ${XMMS2_SLAVE} == "python" EXCLUDE+= --with-optionals="python" -.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "ruby" +.elif ${XMMS2_SLAVE} == "ruby" EXCLUDE+= --with-optionals="ruby" -.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "perl" +.elif ${XMMS2_SLAVE} == "perl" EXCLUDE+= --with-optionals="perl" -.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "ruby-ecore" +.elif ${XMMS2_SLAVE} == "ruby-ecore" EXCLUDE+= --with-optionals="ruby" --with-optionals="xmmsclient-ecore" -.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "cpp" -EXCLUDE+= --with-optionals="xmmsclient++" --with-optionals="xmmsclient++-glib" -.elif !defined(XMMS2_SLAVE) -EXCLUDE+= --without-optionals="python" --without-optionals="ruby" --without-optionals="xmmsclient-ecore" --without-optionals="xmmsclient++" --without-optionals="xmmsclient++-glib" --without-optionals="perl" +.elif ${XMMS2_SLAVE} == "cpp" +EXCLUDE+= --with-optionals="xmmsclient++" \ + --with-optionals="xmmsclient++-glib" .endif -.if !defined(XMMS2_SLAVE) +.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(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(XMMS2_SLAVE) -.if !defined(WITHOUT_LASTFM) -.if defined(WITHOUT_CURL) -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl -.endif -PLIST_SUB+= LASTFM="" +.if !defined(WITHOUT_AIRPLAY) +USE_OPENSSL= yes +PLIST_SUB+= AIRPLAY="" .else -EXCLUDE+= --without-plugins="lastfm" --without-plugins="lastfmeta" -PLIST_SUB+= LASTFM="@comment " +EXCLUDE+= --without-plugins="airplay" +PLIST_SUB+= AIRPLAY="@comment " .endif -.if defined(WITH_SID) -LIB_DEPENDS+= sidplay2.[0-9]:${PORTSDIR}/audio/libsidplay2 -PLIST_SUB+= SID="" +.if !defined(WITHOUT_AO) +LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao +PLIST_SUB+= AO="" .else -EXCLUDE+= --without-plugins="sid" -PLIST_SUB+= SID="@comment " +EXCLUDE+= --without-plugins="ao" +PLIST_SUB+= AO="@comment " .endif -.if !defined(WITHOUT_FLAC) -LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac -PLIST_SUB+= FLAC="" +.if !defined(WITHOUT_APE) +LIB_DEPENDS+= mac.2:${PORTSDIR}/audio/mac +PLIST_SUB+= MAC="" .else -EXCLUDE+= --without-plugins="flac" -PLIST_SUB+= FLAC="@comment " +EXCLUDE+= --without-plugins="mac" +PLIST_SUB+= MAC="@comment " .endif -.if defined(WITH_SPEEX) -LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex -PLIST_SUB+= SPEEX="" +.if !defined(WITHOUT_AVCODEC) +LIB_DEPENDS+= avutil.1:${PORTSDIR}/multimedia/ffmpeg +PLIST_SUB+= AVCODEC="" .else -EXCLUDE+= --without-plugins="speex" -PLIST_SUB+= SPEEX="@comment " +EXCLUDE+= --without-plugins="avcodec" +PLIST_SUB+= AVCODEC="@comment " .endif -.if defined(WITH_CDDA) +.if !defined(WITHOUT_CDDA) LIB_DEPENDS+= cdio.8:${PORTSDIR}/sysutils/libcdio \ discid.2:${PORTSDIR}/audio/libdiscid PLIST_SUB+= CDDA="" @@ -138,6 +128,14 @@ EXCLUDE+= --without-plugins="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="" @@ -146,40 +144,40 @@ EXCLUDE+= --without-plugins="faad" --wit PLIST_SUB+= FAAD="@comment " .endif -.if defined(WITH_AVCODEC) -LIB_DEPENDS+= avutil.1:${PORTSDIR}/multimedia/ffmpeg -PLIST_SUB+= AVCODEC="" +.if !defined(WITHOUT_FAM) +USE_FAM= yes +WANT_FAM_SYSTEM=gamin +PLIST_SUB+= FAM="" .else -EXCLUDE+= --without-plugins="avcodec" -PLIST_SUB+= AVCODEC="@comment " +EXCLUDE+= --without-optionals="medialib-updater" +PLIST_SUB+= FAM="@comment " .endif -.if defined(WITH_APE) -LIB_DEPENDS+= mac.2:${PORTSDIR}/audio/mac -PLIST_SUB+= MAC="" +.if !defined(WITHOUT_FLAC) +LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac +PLIST_SUB+= FLAC="" .else -EXCLUDE+= --without-plugins="mac" -PLIST_SUB+= MAC="@comment " +EXCLUDE+= --without-plugins="flac" +PLIST_SUB+= FLAC="@comment " .endif -.if !defined(WITHOUT_SDL) && defined(UNDEFINED) -IGNORE= visualization has not been updated to the Transforms API -USE_SDL= sdl ttf -PLIST_SUB+= SDL="" -#EXTRA_PATCHES+= ${FILESDIR}/extraPatch-src::clients::sdl-vis::Program +.if !defined(WITHOUT_GVFS) +USE_GNOME+= gvfs +PLIST_SUB+= GVFS="" .else -PLIST_SUB+= SDL="@comment " +EXCLUDE+= --without-plugins="gvfs" +PLIST_SUB+= GVFS="@comment " .endif -.if defined(WITH_MUSEPACK) -LIB_DEPENDS+= mpcdec.5:${PORTSDIR}/audio/libmpcdec -PLIST_SUB+= MUSEPACK="" +.if !defined(WITHOUT_ICES) +LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2 +PLIST_SUB+= ICES="" .else -EXCLUDE+= --without-plugins="musepack" -PLIST_SUB+= MUSEPACK="@comment " +EXCLUDE+= --without-plugins="ices" +PLIST_SUB+= ICES="@comment " .endif -.if defined(WITH_JACK) +.if !defined(WITHOUT_JACK) LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack PLIST_SUB+= JACK="" .else @@ -187,142 +185,127 @@ EXCLUDE+= --without-plugins="jack" PLIST_SUB+= JACK="@comment " .endif -.if defined(WITH_PULSE) -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio -PLIST_SUB+= PULSE="" +.if !defined(WITHOUT_MAD) +LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad +PLIST_SUB+= MAD="" .else -EXCLUDE+= --without-plugins="pulse" -PLIST_SUB+= PULSE="@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 " +EXCLUDE+= --without-plugins="mad" +PLIST_SUB+= MAD="@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 " +.if !defined(WITHOUT_MDNS_APPLE) && !defined(WITHOUT_MDNS_AVAHI) +BROKEN= You may choose either MDNS_APPLE or MDNS_AVAHI, but not both .endif -.if defined(WITH_XML) -USE_GNOME= libxml2 -PLIST_SUB+= XML="" +.if !defined(WITHOUT_MDNS_APPLE) +EXCLUDE+= --without-optionals="avahi" +LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder +PLIST_SUB+= MDNS_APPLE="" .else -EXCLUDE+= --without-plugins="xml" --without-plugins="rss" --without-plugins="xspf" -PLIST_SUB+= XML="@comment " +EXCLUDE+= --without-optionals="dns_sd" +PLIST_SUB+= MDNS_APPLE="@comment " .endif -.if defined(WITH_SAMBA) -LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient -PLIST_SUB+= SAMBA="" +.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-plugins="samba" -PLIST_SUB+= SAMBA="@comment " +EXCLUDE+= --without-optionals="avahi" +PLIST_SUB+= MDNS_AVAHI="@comment " .endif -.if !defined(WITHOUT_DAAP) -PLIST_SUB+= DAAP="" +.if !defined(WITHOUT_MMS) +LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms +PLIST_SUB+= MMS="" .else -EXCLUDE+= --without-plugins="daap" -PLIST_SUB+= DAAP="@comment " +EXCLUDE+= --without-plugins="mms" +PLIST_SUB+= MMS="@comment " .endif -.if !defined(WITHOUT_GME) -PLIST_SUB+= GME="" +.if !defined(WITHOUT_MODPLUG) +LIB_DEPENDS+= modplug.0:${PORTSDIR}/audio/libmodplug +PLIST_SUB+= MODPLUG="" .else -EXCLUDE+= --without-plugins="gme" -PLIST_SUB+= GME="@comment " +EXCLUDE+= --without-plugins="modplug" +PLIST_SUB+= MODPLUG="@comment " .endif -.if defined(WITH_GVFS) -USE_GNOME+= gvfs -PLIST_SUB+= GVFS="" +.if !defined(WITHOUT_MPG123) +LIB_DEPENDS+= mpg123.11:${PORTSDIR}/audio/mpg123 +PLIST_SUB+= MPG123="" .else -EXCLUDE+= --without-plugins="gvfs" -PLIST_SUB+= GVFS="@comment " +EXCLUDE+= --without-plugins="mpg123" +PLIST_SUB+= MPG123="@comment " .endif -.if defined(WITH_MMS) -LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms -PLIST_SUB+= MMS="" +.if !defined(WITHOUT_MUSEPACK) +LIB_DEPENDS+= mpcdec.5:${PORTSDIR}/audio/libmpcdec +PLIST_SUB+= MUSEPACK="" .else -EXCLUDE+= --without-plugins="mms" -PLIST_SUB+= MMS="@comment " +EXCLUDE+= --without-plugins="musepack" +PLIST_SUB+= MUSEPACK="@comment " .endif -.if defined(WITH_FAM) -USE_FAM= yes -WANT_FAM_SYSTEM=gamin -PLIST_SUB+= FAM="" +.if !defined(WITHOUT_OFA) +LIB_DEPENDS+= ofa.0:${PORTSDIR}/audio/libofa +PLIST_SUB+= OFA="" .else -EXCLUDE+= --without-optionals="medialib-updater" -PLIST_SUB+= FAM="@comment " +EXCLUDE+= --without-plugins="ofa" +PLIST_SUB+= OFA="@comment " .endif -.if defined(WITH_ICES) -LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2 -PLIST_SUB+= ICES="" +.if !defined(WITHOUT_PULSE) +LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +PLIST_SUB+= PULSE="" .else -EXCLUDE+= --without-plugins="ices" -PLIST_SUB+= ICES="@comment " +EXCLUDE+= --without-plugins="pulse" +PLIST_SUB+= PULSE="@comment " .endif -# FIXME: requires pkg-config data of openssl -.if defined(WITH_AIRPLAY) -PLIST_SUB+= AIRPLAY="" +.if !defined(WITHOUT_SAMBA) +LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient +PLIST_SUB+= SAMBA="" .else -EXCLUDE+= --without-plugins="airplay" -PLIST_SUB+= AIRPLAY="@comment " +EXCLUDE+= --without-plugins="samba" +PLIST_SUB+= SAMBA="@comment " .endif -.if defined(WITH_AO) -LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao -PLIST_SUB+= AO="" +.if !defined(WITHOUT_SID) +LIB_DEPENDS+= sidplay2.[0-9]:${PORTSDIR}/audio/libsidplay2 +PLIST_SUB+= SID="" .else -EXCLUDE+= --without-plugins="ao" -PLIST_SUB+= AO="@comment " +EXCLUDE+= --without-plugins="sid" +PLIST_SUB+= SID="@comment " .endif -.if defined(WITH_MDNS_AVAHI) -.if !defined(WITHOUT_MDNS_APPLE) -BROKEN= You may choose either MDNS_APPLE or MDNS_AVAHI, but not both -.endif -EXCLUDE+= --without-optionals="dns_sd" -LIB_DEPENDS+= avahi-core:${PORTSDIR}/net/avahi-app -PLIST_SUB+= MDNS_AVAHI="" -MAN1+= xmms2-mdns-avahi.1 +.if !defined(WITHOUT_SPEEX) +LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex +PLIST_SUB+= SPEEX="" .else -EXCLUDE+= --without-optionals="avahi" -PLIST_SUB+= MDNS_AVAHI="@comment " +EXCLUDE+= --without-plugins="speex" +PLIST_SUB+= SPEEX="@comment " .endif -.if !defined (WITHOUT_MDNS_APPLE) -.if defined(WITH_MDNS_AVAHI) -BROKEN= You may choose either MDNS_APPLE or MDNS_AVAHI, but not both -.endif -EXCLUDE+= --without-optionals="avahi" -LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder -PLIST_SUB+= MDNS_APPLE="" +# xmms2-ripper +.if !defined(WITHOUT_VISUAL) && !defined(WITHOUT_VORBIS) +LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis .else -EXCLUDE+= --without-optionals="dns_sd" -PLIST_SUB+= MDNS_APPLE="@comment " +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_clients_vistest_wscript .endif -.if !defined(WITHOUT_KARAOKE) -PLIST_SUB+= KARAOKE="" +# 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-plugins="karaoke" -PLIST_SUB+= KARAOKE="@comment " +EXCLUDE+= --without-optionals="vistest" +PLIST_SUB+= VISUAL="@comment " .endif -.if defined(WITH_VOCODER) +.if !defined(WITHOUT_VOCODER) LIB_DEPENDS+= fftw3f.5:${PORTSDIR}/math/fftw3-float LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate PLIST_SUB+= VOCODER="" @@ -330,10 +313,37 @@ 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} + cd ${WRKSRC} && ./waf configure --conf-prefix=${LOCALBASE} \ + --prefix=${PREFIX} --with-mandir=${PREFIX}/man ${EXCLUDE} do-build: cd ${WRKSRC} && ./waf build Index: audio/xmms2/distinfo =================================================================== RCS file: /home/csup/ports/audio/xmms2/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- audio/xmms2/distinfo 30 Jun 2008 04:45:44 -0000 1.11 +++ audio/xmms2/distinfo 2 Aug 2009 11:39:13 -0000 @@ -1,3 +1,3 @@ -MD5 (xmms2-0.5DrLecter.tar.bz2) = 9033ef15be9069ef43aeb4b6360a4d36 -SHA256 (xmms2-0.5DrLecter.tar.bz2) = 95e4dc003599c88ec7caa16c95f472df2a8e4fc024843b610a27e405ffc5c659 -SIZE (xmms2-0.5DrLecter.tar.bz2) = 1543415 +MD5 (xmms2-0.6DrMattDestruction.tar.bz2) = 954fb9c76b5db5e324a105e81b273200 +SHA256 (xmms2-0.6DrMattDestruction.tar.bz2) = 4fb4f469816d8a1a676f6660e370b0c73a07e3d7e59d07f57a43b67216291db8 +SIZE (xmms2-0.6DrMattDestruction.tar.bz2) = 1631304 Index: audio/xmms2/pkg-plist =================================================================== RCS file: /home/csup/ports/audio/xmms2/pkg-plist,v retrieving revision 1.18 diff -u -p -r1.18 pkg-plist --- audio/xmms2/pkg-plist 30 Jun 2008 04:45:44 -0000 1.18 +++ audio/xmms2/pkg-plist 4 Aug 2009 13:12:50 -0000 @@ -1,118 +1,129 @@ +bin/nyxmms2 +%%VISUAL%%bin/vistest +%%VISUAL%%bin/vistest-fft bin/xmms2 bin/xmms2-et -bin/xmms2-launcher -%%FAM%%bin/xmms2-mlib-updater %%MDNS_AVAHI%%bin/xmms2-find-avahi +bin/xmms2-launcher +%%VISUAL%%bin/xmms2-libvisual %%MDNS_AVAHI%%bin/xmms2-mdns-avahi %%MDNS_APPLE%%bin/xmms2-mdns-dnssd +%%FAM%%bin/xmms2-mlib-updater +%%VISUAL%%%%VORBIS%%bin/xmms2-ripper bin/xmms2d -include/xmms2/xmms/xmms_bindata.h -include/xmms2/xmms/xmms_config.h -include/xmms2/xmms/xmms_error.h -include/xmms2/xmms/xmms_ipc.h -include/xmms2/xmms/xmms_log.h -include/xmms2/xmms/xmms_medialib.h -include/xmms2/xmms/xmms_object.h -include/xmms2/xmms/xmms_outputplugin.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_coll.h -include/xmms2/xmmsc/xmmsc_errorcodes.h -include/xmms2/xmmsc/xmmsc_idnumbers.h -include/xmms2/xmmsc/xmmsc_inline.h -include/xmms2/xmmsc/xmmsc_ipc_msg.h -include/xmms2/xmmsc/xmmsc_ipc_transport.h -include/xmms2/xmmsc/xmmsc_sockets.h -include/xmms2/xmmsc/xmmsc_stdbool.h -include/xmms2/xmmsc/xmmsc_stdint.h -include/xmms2/xmmsc/xmmsc_stringport.h -include/xmms2/xmmsc/xmmsc_strlist.h -include/xmms2/xmmsc/xmmsc_unistd.h -include/xmms2/xmmsc/xmmsc_util.h -include/xmms2/xmmsclient/xmmsclient++-glib.h -include/xmms2/xmmsclient/xmmsclient++.h -include/xmms2/xmmsclient/xmmsclient++/bindata.h -include/xmms2/xmmsclient/xmmsclient++/client.h -include/xmms2/xmmsclient/xmmsclient++/coll.h -include/xmms2/xmmsclient/xmmsclient++/collection.h -include/xmms2/xmmsclient/xmmsclient++/config.h -include/xmms2/xmmsclient/xmmsclient++/dict.h -include/xmms2/xmmsclient/xmmsclient++/exceptions.h -include/xmms2/xmmsclient/xmmsclient++/helpers.h -include/xmms2/xmmsclient/xmmsclient++/list.h -include/xmms2/xmmsclient/xmmsclient++/listener.h -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 -include/xmms2/xmmsclient/xmmsclient++/xform.h -include/xmms2/xmmsclient/xmmsclient-cf.h -include/xmms2/xmmsclient/xmmsclient-ecore.h -include/xmms2/xmmsclient/xmmsclient-glib.h -include/xmms2/xmmsclient/xmmsclient-qt.h -include/xmms2/xmmsclient/xmmsclient.h +%%INCLUDEDIR%%/xmms/xmms_bindata.h +%%INCLUDEDIR%%/xmms/xmms_config.h +%%INCLUDEDIR%%/xmms/xmms_error.h +%%INCLUDEDIR%%/xmms/xmms_ipc.h +%%INCLUDEDIR%%/xmms/xmms_log.h +%%INCLUDEDIR%%/xmms/xmms_medialib.h +%%INCLUDEDIR%%/xmms/xmms_object.h +%%INCLUDEDIR%%/xmms/xmms_outputplugin.h +%%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 +%%INCLUDEDIR%%/xmmsc/xmmsc_errorcodes.h +%%INCLUDEDIR%%/xmmsc/xmmsc_idnumbers.h +%%INCLUDEDIR%%/xmmsc/xmmsc_ipc_msg.h +%%INCLUDEDIR%%/xmmsc/xmmsc_ipc_transport.h +%%INCLUDEDIR%%/xmmsc/xmmsc_sockets.h +%%INCLUDEDIR%%/xmmsc/xmmsc_stdbool.h +%%INCLUDEDIR%%/xmmsc/xmmsc_stdint.h +%%INCLUDEDIR%%/xmmsc/xmmsc_stringport.h +%%INCLUDEDIR%%/xmmsc/xmmsc_strlist.h +%%INCLUDEDIR%%/xmmsc/xmmsc_unistd.h +%%INCLUDEDIR%%/xmmsc/xmmsc_util.h +%%INCLUDEDIR%%/xmmsc/xmmsc_visualization.h +%%INCLUDEDIR%%/xmmsc/xmmsv.h +%%INCLUDEDIR%%/xmmsc/xmmsv_coll.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++-glib.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/bindata.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/client.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/coll.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/collection.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/config.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/dict.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/exceptions.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/helpers.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/list.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/listener.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/mainloop.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/medialib.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/playback.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/playlist.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/result.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/signal.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/stats.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/typedefs.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient++/xform.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient-cf.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient-ecore.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient-glib.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient-qt.h +%%INCLUDEDIR%%/xmmsclient/xmmsclient.h lib/libxmmsclient-glib.so lib/libxmmsclient-glib.so.1 lib/libxmmsclient-glib.so.1.0.0 lib/libxmmsclient.so -lib/libxmmsclient.so.4 -lib/libxmmsclient.so.4.0.0 -%%AO%%lib/xmms2/libxmms_ao.so -lib/xmms2/libxmms_asf.so -lib/xmms2/libxmms_asx.so -%%AVCODEC%%lib/xmms2/libxmms_avcodec.so -%%AVCODEC%%lib/xmms2/libxmms_avformat.so -lib/xmms2/libxmms_cue.so -%%CURL%%lib/xmms2/libxmms_curl.so -%%DAAP%%lib/xmms2/libxmms_daap.so -lib/xmms2/libxmms_diskwrite.so -lib/xmms2/libxmms_equalizer.so -%%FAAD%%lib/xmms2/libxmms_faad.so -lib/xmms2/libxmms_file.so -%%FLAC%%lib/xmms2/libxmms_flac.so -%%SPEEX%%lib/xmms2/libxmms_speex.so -%%CDDA%%lib/xmms2/libxmms_cdda.so -%%GVFS%%lib/xmms2/libxmms_gvfs.so -%%ICES%%lib/xmms2/libxmms_ices.so -%%AIRPLAY%%lib/xmms2/libxmms_airplay.so -%%CURL%%lib/xmms2/libxmms_icymetaint.so -lib/xmms2/libxmms_id3v2.so -%%JACK%%lib/xmms2/libxmms_jack.so -%%PULSE%%lib/xmms2/libxmms_pulse.so -%%LASTFM%%lib/xmms2/libxmms_lastfm.so -%%LASTFM%%lib/xmms2/libxmms_lastfmeta.so -%%KARAOKE%%lib/xmms2/libxmms_karaoke.so -%%GME%%lib/xmms2/libxmms_gme.so -lib/xmms2/libxmms_m3u.so -%%MAC%%lib/xmms2/libxmms_mac.so -lib/xmms2/libxmms_mad.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_normalize.so -lib/xmms2/libxmms_null.so -lib/xmms2/libxmms_nulstripper.so -%%OFA%%lib/xmms2/libxmms_ofa.so -lib/xmms2/libxmms_oss.so -lib/xmms2/libxmms_pls.so -lib/xmms2/libxmms_replaygain.so -%%XML%%lib/xmms2/libxmms_rss.so -%%SAMBA%%lib/xmms2/libxmms_samba.so -%%SID%%lib/xmms2/libxmms_sid.so -%%VOCODER%%lib/xmms2/libxmms_vocoder.so -lib/xmms2/libxmms_vorbis.so -lib/xmms2/libxmms_wave.so -%%XML%%lib/xmms2/libxmms_xml.so -%%XML%%lib/xmms2/libxmms_xspf.so +lib/libxmmsclient.so.5 +lib/libxmmsclient.so.5.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_daap.so +%%LIBDIR%%/libxmms_diskwrite.so +%%LIBDIR%%/libxmms_equalizer.so +%%FAAD%%%%LIBDIR%%/libxmms_faad.so +%%LIBDIR%%/libxmms_file.so +%%FLAC%%%%LIBDIR%%/libxmms_flac.so +%%LIBDIR%%/libxmms_flv.so +%%LIBDIR%%/libxmms_gme.so +%%GVFS%%%%LIBDIR%%/libxmms_gvfs.so +%%LIBDIR%%/libxmms_html.so +%%ICES%%%%LIBDIR%%/libxmms_ices.so +%%CURL%%%%LIBDIR%%/libxmms_icymetaint.so +%%LIBDIR%%/libxmms_id3v2.so +%%JACK%%%%LIBDIR%%/libxmms_jack.so +%%LIBDIR%%/libxmms_karaoke.so +%%LIBDIR%%/libxmms_m3u.so +%%MAC%%%%LIBDIR%%/libxmms_mac.so +%%MAD%%%%LIBDIR%%/libxmms_mad.so +%%MMS%%%%LIBDIR%%/libxmms_mms.so +%%MODPLUG%%%%LIBDIR%%/libxmms_modplug.so +%%MPG123%%%%LIBDIR%%/libxmms_mpg123.so +%%MUSEPACK%%%%LIBDIR%%/libxmms_musepack.so +%%FAAD%%%%LIBDIR%%/libxmms_mp4.so +%%LIBDIR%%/libxmms_normalize.so +%%LIBDIR%%/libxmms_null.so +%%LIBDIR%%/libxmms_nulstripper.so +%%OFA%%%%LIBDIR%%/libxmms_ofa.so +%%LIBDIR%%/libxmms_oss.so +%%LIBDIR%%/libxmms_pls.so +%%PULSE%%%%LIBDIR%%/libxmms_pulse.so +%%LIBDIR%%/libxmms_replaygain.so +%%XML%%%%LIBDIR%%/libxmms_rss.so +%%SAMBA%%%%LIBDIR%%/libxmms_samba.so +%%SID%%%%LIBDIR%%/libxmms_sid.so +%%SPEEX%%%%LIBDIR%%/libxmms_speex.so +%%LIBDIR%%/libxmms_tta.so +%%VOCODER%%%%LIBDIR%%/libxmms_vocoder.so +%%VORBIS%%%%LIBDIR%%/libxmms_vorbis.so +%%LIBDIR%%/libxmms_wave.so +%%WAVPACK%%%%LIBDIR%%/libxmms_wavpack.so +%%XML%%%%LIBDIR%%/libxmms_xml.so +%%XML%%%%LIBDIR%%/libxmms_xspf.so libdata/pkgconfig/xmms2-client-glib.pc libdata/pkgconfig/xmms2-client.pc libdata/pkgconfig/xmms2-plugin.pc @@ -127,13 +138,13 @@ share/pixmaps/xmms2.svg %%DATADIR%%/scripts/startup.d/xmms2-et-launcher.sh %%MDNS_AVAHI%%%%DATADIR%%/scripts/startup.d/xmms2-mdns-launcher.sh %%MDNS_APPLE%%%%DATADIR%%/scripts/startup.d/xmms2-mdns-launcher.sh -%%FAM%%share/xmms2/scripts/startup.d/xmms2-mlib-updater.sh -@dirrm share/xmms2/scripts/startup.d -@dirrm share/xmms2/scripts -@dirrm share/xmms2 -@dirrm lib/xmms2 -@dirrm include/xmms2/xmmsclient/xmmsclient++ -@dirrm include/xmms2/xmmsclient -@dirrm include/xmms2/xmmsc -@dirrm include/xmms2/xmms -@dirrm include/xmms2 +%%FAM%%%%DATADIR%%/scripts/startup.d/xmms2-mlib-updater.sh +@dirrm %%INCLUDEDIR%%/xmms +@dirrm %%INCLUDEDIR%%/xmmsc +@dirrm %%INCLUDEDIR%%/xmmsclient/xmmsclient++ +@dirrm %%INCLUDEDIR%%/xmmsclient +@dirrm %%INCLUDEDIR%% +@dirrm %%LIBDIR%% +@dirrm %%DATADIR%%/scripts/startup.d +@dirrm %%DATADIR%%/scripts +@dirrm %%DATADIR%% Index: audio/xmms2/files/extra-patch-src_clients_vistest_wscript =================================================================== RCS file: audio/xmms2/files/extra-patch-src_clients_vistest_wscript diff -N audio/xmms2/files/extra-patch-src_clients_vistest_wscript --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ audio/xmms2/files/extra-patch-src_clients_vistest_wscript 4 Aug 2009 13:44:30 -0000 @@ -0,0 +1,25 @@ +--- 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 + Index: audio/xmms2/files/patch-src_include_xmms_wscript =================================================================== RCS file: audio/xmms2/files/patch-src_include_xmms_wscript diff -N audio/xmms2/files/patch-src_include_xmms_wscript --- audio/xmms2/files/patch-src_include_xmms_wscript 30 Jun 2008 04:45:45 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- wscript.orig Fri May 25 16:49:48 2007 -+++ wscript Fri May 25 16:50:17 2007 -@@ -284,7 +284,7 @@ - conf.env['PKGCONFIGDIR'] = Params.g_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 Params.g_options.config_prefix: - for dir in Params.g_options.config_prefix: Index: audio/xmms2/files/patch-src_plugins_airplay_wscript =================================================================== RCS file: audio/xmms2/files/patch-src_plugins_airplay_wscript diff -N audio/xmms2/files/patch-src_plugins_airplay_wscript --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ audio/xmms2/files/patch-src_plugins_airplay_wscript 2 Aug 2009 12:32:26 -0000 @@ -0,0 +1,15 @@ +--- 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"], Index: audio/xmms2/files/patch-wscript =================================================================== RCS file: audio/xmms2/files/patch-wscript diff -N audio/xmms2/files/patch-wscript --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ audio/xmms2/files/patch-wscript 4 Aug 2009 13:57:15 -0000 @@ -0,0 +1,20 @@ +--- 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: