svn commit: r328665 - in head/audio: abraca cpp-xmms2 gxmms2 p5-xmms2 py-xmms2 xmms2
Guido Falsi
madpilot at FreeBSD.org
Sun Sep 29 10:41:26 UTC 2013
Author: madpilot
Date: Sun Sep 29 10:41:24 2013
New Revision: 328665
URL: http://svnweb.freebsd.org/changeset/ports/328665
Log:
Convert xmms2 ports to staging.
While here, convert to new LIB_DEPENDS format.
Modified:
head/audio/abraca/Makefile
head/audio/abraca/pkg-plist (contents, props changed)
head/audio/cpp-xmms2/Makefile
head/audio/gxmms2/Makefile
head/audio/p5-xmms2/Makefile
head/audio/py-xmms2/Makefile
head/audio/xmms2/Makefile
head/audio/xmms2/pkg-plist (contents, props changed)
Modified: head/audio/abraca/Makefile
==============================================================================
--- head/audio/abraca/Makefile Sun Sep 29 10:25:56 2013 (r328664)
+++ head/audio/abraca/Makefile Sun Sep 29 10:41:24 2013 (r328665)
@@ -10,18 +10,14 @@ MAINTAINER= madpilot at FreeBSD.org
COMMENT= GTK2 client for the XMMS2 music player
BUILD_DEPENDS= ${LOCALBASE}/bin/valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS= xmmsclient:${PORTSDIR}/audio/xmms2 \
- gee:${PORTSDIR}/devel/libgee06
+LIB_DEPENDS= libxmmsclient.so:${PORTSDIR}/audio/xmms2 \
+ libgee.so:${PORTSDIR}/devel/libgee06
-NO_STAGE= yes
USES= pkgconfig
USE_SCONS= yes
USE_GNOME= gtk30
-SCONS_ARGS= MANDIR=${MANPREFIX}/man
-
-MAN1= abraca.1
-MANCOMPRESSED= yes
+SCONS_ARGS= MANDIR=${MANPREFIX}/man DESTDIR=${STAGEDIR}
OPTIONS_DEFINE= NLS
OPTIONS_DEFAULT= NLS
Modified: head/audio/abraca/pkg-plist
==============================================================================
--- head/audio/abraca/pkg-plist Sun Sep 29 10:25:56 2013 (r328664)
+++ head/audio/abraca/pkg-plist Sun Sep 29 10:41:24 2013 (r328665)
@@ -1,4 +1,5 @@
bin/abraca
+man/man1/abraca.1.gz
share/applications/abraca.desktop
share/icons/abraca.svg
%%NLS%%share/locale/de/LC_MESSAGES/abraca.mo
Modified: head/audio/cpp-xmms2/Makefile
==============================================================================
--- head/audio/cpp-xmms2/Makefile Sun Sep 29 10:25:56 2013 (r328664)
+++ head/audio/cpp-xmms2/Makefile Sun Sep 29 10:41:24 2013 (r328665)
@@ -8,11 +8,10 @@ PKGNAMEPREFIX= cpp-
MAINTAINER= madpilot at FreeBSD.org
COMMENT= C++ Bindings for XMMS2
-LIB_DEPENDS+= boost_signals:${PORTSDIR}/devel/boost-libs \
- xmmsclient.6:${PORTSDIR}/audio/xmms2
+LIB_DEPENDS+= libboost_signals.so:${PORTSDIR}/devel/boost-libs \
+ libxmmsclient.so:${PORTSDIR}/audio/xmms2
MASTERDIR= ${.CURDIR}/../xmms2
-NO_STAGE= yes
USE_LDCONFIG= yes
USE_GNOME= glib20
Modified: head/audio/gxmms2/Makefile
==============================================================================
--- head/audio/gxmms2/Makefile Sun Sep 29 10:25:56 2013 (r328664)
+++ head/audio/gxmms2/Makefile Sun Sep 29 10:41:24 2013 (r328665)
@@ -19,7 +19,6 @@ LIB_DEPENDS= libxmmsclient.so:${PORTSDIR
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GNOME= gtk20
-NO_STAGE= yes
USES= gmake pkgconfig
ALL_TARGET= ${PORTNAME}
@@ -28,8 +27,8 @@ PLIST_FILES= bin/gxmms2 \
PLIST_DIRS= %%DATADIR%%
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
- ${MKDIR} ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/gxmms2src/gxmms2_mini.xpm ${DATADIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+ ${MKDIR} ${STAGEDIR}${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/gxmms2src/gxmms2_mini.xpm ${STAGEDIR}${DATADIR}
.include <bsd.port.mk>
Modified: head/audio/p5-xmms2/Makefile
==============================================================================
--- head/audio/p5-xmms2/Makefile Sun Sep 29 10:25:56 2013 (r328664)
+++ head/audio/p5-xmms2/Makefile Sun Sep 29 10:41:24 2013 (r328665)
@@ -8,12 +8,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= madpilot at FreeBSD.org
COMMENT= Perl Bindings for XMMS2
-LIB_DEPENDS+= xmmsclient.6:${PORTSDIR}/audio/xmms2
+LIB_DEPENDS+= libxmmsclient.so:${PORTSDIR}/audio/xmms2
MASTERDIR= ${.CURDIR}/../xmms2
USES= perl5
-NO_STAGE= yes
PLIST= ${.CURDIR}/pkg-plist
Modified: head/audio/py-xmms2/Makefile
==============================================================================
--- head/audio/py-xmms2/Makefile Sun Sep 29 10:25:56 2013 (r328664)
+++ head/audio/py-xmms2/Makefile Sun Sep 29 10:41:24 2013 (r328665)
@@ -10,12 +10,11 @@ MAINTAINER= madpilot at FreeBSD.org
COMMENT= Python Bindings for XMMS2
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex
-LIB_DEPENDS+= xmmsclient.6:${PORTSDIR}/audio/xmms2
+LIB_DEPENDS+= libxmmsclient.so:${PORTSDIR}/audio/xmms2
MASTERDIR= ${.CURDIR}/../xmms2
USE_PYTHON= yes
-NO_STAGE= yes
PLIST= ${.CURDIR}/pkg-plist
Modified: head/audio/xmms2/Makefile
==============================================================================
--- head/audio/xmms2/Makefile Sun Sep 29 10:25:56 2013 (r328664)
+++ head/audio/xmms2/Makefile Sun Sep 29 10:41:24 2013 (r328665)
@@ -12,7 +12,6 @@ MAINTAINER?= madpilot at FreeBSD.org
COMMENT?= Rewrite of xmms as a client/server system (developer release)
USE_BZIP2= yes
-NO_STAGE= yes
USE_PYTHON_BUILD= yes
USES+= pkgconfig
@@ -22,8 +21,6 @@ USE_SQLITE= 3
USE_LDCONFIG= yes
-MAN1= xmms2.1 xmms2d.1 xmms2-launcher.1
-MANCOMPRESSED= yes
PLIST_SUB+= INCLUDEDIR="include/${PORTNAME}" LIBDIR="lib/${PORTNAME}"
CPPFLAGS+= -I${LOCALBASE}/include
@@ -95,7 +92,7 @@ PLIST_SUB+= AIRPLAY="@comment "
.endif
.if ${PORT_OPTIONS:MAO}
-LIB_DEPENDS+= ao:${PORTSDIR}/audio/libao
+LIB_DEPENDS+= libao.so:${PORTSDIR}/audio/libao
PLIST_SUB+= AO=""
.else
EXCLUDE+= --without-plugins="ao"
@@ -103,7 +100,7 @@ PLIST_SUB+= AO="@comment "
.endif
.if ${PORT_OPTIONS:MAPE}
-LIB_DEPENDS+= mac:${PORTSDIR}/audio/mac
+LIB_DEPENDS+= libmac.so:${PORTSDIR}/audio/mac
PLIST_SUB+= MAC=""
.else
EXCLUDE+= --without-plugins="mac"
@@ -111,7 +108,7 @@ PLIST_SUB+= MAC="@comment "
.endif
.if ${PORT_OPTIONS:MAVCODEC}
-LIB_DEPENDS+= avutil:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+= libavutil.so:${PORTSDIR}/multimedia/ffmpeg
PLIST_SUB+= AVCODEC=""
.else
EXCLUDE+= --without-plugins="avcodec"
@@ -119,8 +116,8 @@ PLIST_SUB+= AVCODEC="@comment "
.endif
.if ${PORT_OPTIONS:MCDDA}
-LIB_DEPENDS+= cdio:${PORTSDIR}/sysutils/libcdio \
- discid:${PORTSDIR}/audio/libdiscid
+LIB_DEPENDS+= libcdio.so:${PORTSDIR}/sysutils/libcdio \
+ libdiscid.so:${PORTSDIR}/audio/libdiscid
PLIST_SUB+= CDDA=""
.else
EXCLUDE+= --without-plugins="cdda"
@@ -128,7 +125,7 @@ PLIST_SUB+= CDDA="@comment "
.endif
.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl
PLIST_SUB+= CURL=""
.else
EXCLUDE+= --without-plugins="curl" --without-plugins="icymetaint"
@@ -136,7 +133,7 @@ PLIST_SUB+= CURL="@comment "
.endif
.if ${PORT_OPTIONS:MFAAD}
-LIB_DEPENDS+= faad:${PORTSDIR}/audio/faad
+LIB_DEPENDS+= libfaad.so:${PORTSDIR}/audio/faad
PLIST_SUB+= FAAD=""
.else
EXCLUDE+= --without-plugins="faad" --without-plugins="mp4"
@@ -153,7 +150,7 @@ PLIST_SUB+= FAM="@comment "
.endif
.if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac
+LIB_DEPENDS+= libFLAC.so:${PORTSDIR}/audio/flac
PLIST_SUB+= FLAC=""
.else
EXCLUDE+= --without-plugins="flac"
@@ -161,7 +158,7 @@ PLIST_SUB+= FLAC="@comment "
.endif
.if ${PORT_OPTIONS:MGME}
-LIB_DEPENDS+= gme:${PORTSDIR}/audio/libgme
+LIB_DEPENDS+= libgme.so:${PORTSDIR}/audio/libgme
PLIST_SUB+= GME=""
.else
EXCLUDE+= --without-plugins="gme"
@@ -177,7 +174,7 @@ PLIST_SUB+= GVFS="@comment "
.endif
.if ${PORT_OPTIONS:MICES}
-LIB_DEPENDS+= shout:${PORTSDIR}/audio/libshout2
+LIB_DEPENDS+= libshout.so:${PORTSDIR}/audio/libshout2
PLIST_SUB+= ICES=""
.else
EXCLUDE+= --without-plugins="ices"
@@ -185,7 +182,7 @@ PLIST_SUB+= ICES="@comment "
.endif
.if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack
+LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack
PLIST_SUB+= JACK=""
.else
EXCLUDE+= --without-plugins="jack"
@@ -193,7 +190,7 @@ PLIST_SUB+= JACK="@comment "
.endif
.if ${PORT_OPTIONS:MMAD}
-LIB_DEPENDS+= mad:${PORTSDIR}/audio/libmad
+LIB_DEPENDS+= libmad.so:${PORTSDIR}/audio/libmad
PLIST_SUB+= MAD=""
.else
EXCLUDE+= --without-plugins="mad"
@@ -206,7 +203,7 @@ EXCLUDE+= --without-optionals="mdns"
.if ${PORT_OPTIONS:MMDNS_APPLE}
EXCLUDE+= --with-mdns-backend="dns_sd"
-LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder
+LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder
PLIST_SUB+= MDNS_APPLE=""
.else
PLIST_SUB+= MDNS_APPLE="@comment "
@@ -214,7 +211,7 @@ PLIST_SUB+= MDNS_APPLE="@comment "
.if ${PORT_OPTIONS:MMDNS_AVAHI}
EXCLUDE+= --with-mdns-backend="avahi"
-LIB_DEPENDS+= avahi-core:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+= libavahi-core.so:${PORTSDIR}/net/avahi-app
PLIST_SUB+= MDNS_AVAHI=""
MAN1+= xmms2-mdns-avahi.1
.else
@@ -222,7 +219,7 @@ PLIST_SUB+= MDNS_AVAHI="@comment "
.endif
.if ${PORT_OPTIONS:MMMS}
-LIB_DEPENDS+= mms:${PORTSDIR}/net/libmms
+LIB_DEPENDS+= libmms.so:${PORTSDIR}/net/libmms
PLIST_SUB+= MMS=""
.else
EXCLUDE+= --without-plugins="mms"
@@ -230,7 +227,7 @@ PLIST_SUB+= MMS="@comment "
.endif
.if ${PORT_OPTIONS:MMODPLUG}
-LIB_DEPENDS+= modplug:${PORTSDIR}/audio/libmodplug
+LIB_DEPENDS+= libmodplug.so:${PORTSDIR}/audio/libmodplug
PLIST_SUB+= MODPLUG=""
.else
EXCLUDE+= --without-plugins="modplug"
@@ -238,7 +235,7 @@ PLIST_SUB+= MODPLUG="@comment "
.endif
.if ${PORT_OPTIONS:MMPG123}
-LIB_DEPENDS+= mpg123:${PORTSDIR}/audio/mpg123
+LIB_DEPENDS+= libmpg123.so:${PORTSDIR}/audio/mpg123
PLIST_SUB+= MPG123=""
.else
EXCLUDE+= --without-plugins="mpg123"
@@ -246,7 +243,7 @@ PLIST_SUB+= MPG123="@comment "
.endif
.if ${PORT_OPTIONS:MMUSEPACK}
-LIB_DEPENDS+= mpcdec:${PORTSDIR}/audio/musepack
+LIB_DEPENDS+= libmpcdec.so:${PORTSDIR}/audio/musepack
PLIST_SUB+= MUSEPACK=""
.else
EXCLUDE+= --without-plugins="musepack"
@@ -254,7 +251,7 @@ PLIST_SUB+= MUSEPACK="@comment "
.endif
.if ${PORT_OPTIONS:MOFA}
-LIB_DEPENDS+= ofa:${PORTSDIR}/audio/libofa
+LIB_DEPENDS+= libofa.so:${PORTSDIR}/audio/libofa
PLIST_SUB+= OFA=""
.else
EXCLUDE+= --without-plugins="ofa"
@@ -262,7 +259,7 @@ PLIST_SUB+= OFA="@comment "
.endif
.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio
PLIST_SUB+= PULSE=""
.else
EXCLUDE+= --without-plugins="pulse"
@@ -270,7 +267,7 @@ PLIST_SUB+= PULSE="@comment "
.endif
.if ${PORT_OPTIONS:MSAMBA}
-LIB_DEPENDS+= smbclient:${PORTSDIR}/net/samba-libsmbclient
+LIB_DEPENDS+= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
PLIST_SUB+= SAMBA=""
.else
EXCLUDE+= --without-plugins="samba"
@@ -278,7 +275,7 @@ PLIST_SUB+= SAMBA="@comment "
.endif
.if ${PORT_OPTIONS:MSID}
-LIB_DEPENDS+= sidplay2:${PORTSDIR}/audio/libsidplay2
+LIB_DEPENDS+= libsidplay2.so:${PORTSDIR}/audio/libsidplay2
PLIST_SUB+= SID=""
.else
EXCLUDE+= --without-plugins="sid"
@@ -286,7 +283,7 @@ PLIST_SUB+= SID="@comment "
.endif
.if ${PORT_OPTIONS:MSNDFILE}
-LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS+= libsndfile.so:${PORTSDIR}/audio/libsndfile
PLIST_SUB+= SNDFILE=""
.else
EXCLUDE+= --without-plugins="sndfile"
@@ -294,7 +291,7 @@ PLIST_SUB+= SNDFILE="@comment "
.endif
.if ${PORT_OPTIONS:MSPEEX}
-LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex
+LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex
PLIST_SUB+= SPEEX=""
.else
EXCLUDE+= --without-plugins="speex"
@@ -302,7 +299,7 @@ PLIST_SUB+= SPEEX="@comment "
.endif
.if ${PORT_OPTIONS:MTREMOR}
-LIB_DEPENDS+= vorbisidec:${PORTSDIR}/audio/libtremor
+LIB_DEPENDS+= libvorbisidec.so:${PORTSDIR}/audio/libtremor
PLIST_SUB+= TREMOR=""
.else
EXCLUDE+= --without-plugins="tremor"
@@ -311,7 +308,7 @@ PLIST_SUB+= TREMOR="@comment "
# xmms2-ripper
.if ${PORT_OPTIONS:MVISUAL} && ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+= vorbisenc:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+= libvorbisenc.so:${PORTSDIR}/audio/libvorbis
.else
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-clients-vistest-wscript
.endif
@@ -319,7 +316,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-
# XXX: shm support requires semtimedop(2)
.if ${PORT_OPTIONS:MVISUAL}
USE_SDL= yes
-LIB_DEPENDS+= visual-0.4.0:${PORTSDIR}/graphics/libvisual04
+LIB_DEPENDS+= libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04
.else
EXCLUDE+= --without-optionals="vistest"
.endif
@@ -331,8 +328,8 @@ PLIST_SUB+= VISUAL="@comment "
.endif
.if ${PORT_OPTIONS:MVOCODER}
-LIB_DEPENDS+= fftw3f:${PORTSDIR}/math/fftw3-float
-LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS+= libfftw3f.so:${PORTSDIR}/math/fftw3-float \
+ libsamplerate.so:${PORTSDIR}/audio/libsamplerate
PLIST_SUB+= VOCODER=""
.else
EXCLUDE+= --without-plugins="vocoder"
@@ -340,7 +337,7 @@ PLIST_SUB+= VOCODER="@comment "
.endif
.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis
PLIST_SUB+= VORBIS=""
.else
EXCLUDE+= --without-plugins="vorbis"
@@ -348,7 +345,7 @@ PLIST_SUB+= VORBIS="@comment "
.endif
.if ${PORT_OPTIONS:MWAVPACK}
-LIB_DEPENDS+= wavpack:${PORTSDIR}/audio/wavpack
+LIB_DEPENDS+= libwavpack.so:${PORTSDIR}/audio/wavpack
PLIST_SUB+= WAVPACK=""
.else
EXCLUDE+= --without-plugins="wavpack"
@@ -386,10 +383,10 @@ do-build:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf ${_MAKE_JOBS} build
do-install:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf install --without-ldconfig
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf install --destdir=${STAGEDIR} --without-ldconfig
.if !defined(XMMS2_SLAVE)
- if [ ! -d ${DATADIR}/scripts/startup.d ]; then \
- ${MKDIR} ${DATADIR}/scripts/startup.d;\
+ if [ ! -d ${STAGEDIR}${DATADIR}/scripts/startup.d ]; then \
+ ${MKDIR} ${STAGEDIR}${DATADIR}/scripts/startup.d; \
fi
.endif
Modified: head/audio/xmms2/pkg-plist
==============================================================================
--- head/audio/xmms2/pkg-plist Sun Sep 29 10:25:56 2013 (r328664)
+++ head/audio/xmms2/pkg-plist Sun Sep 29 10:41:24 2013 (r328665)
@@ -134,6 +134,9 @@ lib/libxmmsclient.so.6.0.0
libdata/pkgconfig/xmms2-client-glib.pc
libdata/pkgconfig/xmms2-client.pc
libdata/pkgconfig/xmms2-plugin.pc
+man/man1/xmms2-launcher.1.gz
+man/man1/xmms2.1.gz
+man/man1/xmms2d.1.gz
share/pixmaps/xmms2-128.png
share/pixmaps/xmms2-16.png
share/pixmaps/xmms2-32.png
More information about the svn-ports-all
mailing list