diff options
36 files changed, 64 insertions, 111 deletions
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile index e9a608ca9495..fa2bfc7c801d 100644 --- a/audio/abcde/Makefile +++ b/audio/abcde/Makefile @@ -21,15 +21,13 @@ RUN_DEPENDS= cd-discid:${PORTSDIR}/audio/cd-discid \ NO_BUILD= yes -USE_PYTHON_RUN= yes - OPTIONS_DEFINE= CDDA2WAV DAGRAB EJECT FLAC MPP NORMALIZE REPLAYGAIN SPEEX EJECT_DESC?= Enable auto-eject support NORMALIZE_DESC?= Enable normalize support REPLAYGAIN_DESC?= Enable (vorbis|mp3)gain support -USES= shebangfix +USES= python:run shebangfix SHEBANG_FILES= ${PORTNAME} cddb-tool .include <bsd.port.options.mk> diff --git a/audio/beets/Makefile b/audio/beets/Makefile index 58448d0e729c..0e85af89e1d8 100644 --- a/audio/beets/Makefile +++ b/audio/beets/Makefile @@ -17,9 +17,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=1.22:${PORTSDIR}/audio/py-mutagen \ ${PYTHON_PKGNAMEPREFIX}enum34>=0:${PORTSDIR}/devel/py-enum34 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 -USE_PYTHON= yes -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +USES= python +USE_PYTHON= distutils autoplist PLIST_FILES= man/man1/beet.1.gz man/man5/beetsconfig.5.gz diff --git a/audio/cymbaline/Makefile b/audio/cymbaline/Makefile index 1f078162d272..7ba8a5fca3b4 100644 --- a/audio/cymbaline/Makefile +++ b/audio/cymbaline/Makefile @@ -13,9 +13,8 @@ COMMENT= Console frontend for py-mad RUN_DEPENDS= ${PYTHON_SITELIBDIR}/aomodule.so:${PORTSDIR}/audio/py-ao \ ${PYTHON_SITELIBDIR}/madmodule.so:${PORTSDIR}/audio/py-mad -USE_PYTHON= yes -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +USES= python +USE_PYTHON= distutils autoplist PLIST_FILES= bin/cymbaline diff --git a/audio/idjc/Makefile b/audio/idjc/Makefile index c942c4148981..21885a6799e5 100644 --- a/audio/idjc/Makefile +++ b/audio/idjc/Makefile @@ -30,12 +30,11 @@ RUN_DEPENDS= oggenc:${PORTSDIR}/audio/vorbis-tools \ OPTIONS_DEFINE= DOCS USES= compiler:nestedfct desktop-file-utils gettext gmake \ - libtool pathfix pkgconfig + libtool pathfix pkgconfig python:2.7 LDFLAGS= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes -USE_PYTHON= 2.7 -USE_PYTHON_PREFIX= yes +USE_PYTHON= pythonprefix USE_GNOME= glib20 pygtk2 PLIST_SUB+= PORTVERSION="${PORTVERSION}" diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile index 295d4e60aa5b..1bd019625f47 100644 --- a/audio/jack-rack/Makefile +++ b/audio/jack-rack/Makefile @@ -16,8 +16,7 @@ LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack \ RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa USE_GNOME= libgnomeui libxml2 -USES= gettext shebangfix pkgconfig tar:bzip2 -USE_PYTHON= yes +USES= gettext shebangfix pkgconfig python tar:bzip2 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lm diff --git a/audio/jack_mixer/Makefile b/audio/jack_mixer/Makefile index a382acfa2ee0..cf5abfa9a0f0 100644 --- a/audio/jack_mixer/Makefile +++ b/audio/jack_mixer/Makefile @@ -17,8 +17,7 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/fpconst.py:${PORTSDIR}/math/py-fpconst \ ${LOCALBASE}/include/pygtk-2.0/pygtk/pygtk.h:${PORTSDIR}/x11-toolkits/py-gtk2 RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= pkgconfig libtool -USE_PYTHON= yes +USES= libtool pkgconfig python USE_GNOME= gconf2 GCONF_SCHEMAS= jack_mixer.schemas INSTALLS_ICONS= yes diff --git a/audio/jokosher/Makefile b/audio/jokosher/Makefile index 17a13aa0c24c..c869ac0978ed 100644 --- a/audio/jokosher/Makefile +++ b/audio/jokosher/Makefile @@ -13,9 +13,8 @@ LICENSE= GPLv2 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg -USES= desktop-file-utils shared-mime-info -USE_PYTHON= 2 -USE_PYDISTUTILS=yes +USES= desktop-file-utils python:2 shared-mime-info +USE_PYTHON= distutils USE_GNOME= gnomehier USE_GSTREAMER= gnonlin good python INSTALLS_ICONS= yes diff --git a/audio/last-cmus/Makefile b/audio/last-cmus/Makefile index 28c2ecd27ab1..4f492bbfd12f 100644 --- a/audio/last-cmus/Makefile +++ b/audio/last-cmus/Makefile @@ -13,7 +13,7 @@ EXTRACT_SUFX= # none MAINTAINER= dhn@FreeBSD.org COMMENT= Cmus plugin for submitting songs into last.fm -USE_PYTHON= yes +USES= python SUB_FILES= pkg-message NO_BUILD= yes PLIST_FILES= bin/${DISTNAME} diff --git a/audio/lv2core/Makefile b/audio/lv2core/Makefile index 08fe31cf8896..c521afea7f61 100644 --- a/audio/lv2core/Makefile +++ b/audio/lv2core/Makefile @@ -12,8 +12,7 @@ COMMENT= LV2 Core Package LICENSE= BSD LICENSE_FILE= ${WRKSRC}/COPYING -USES= pkgconfig tar:bzip2 -USE_PYTHON_BUILD= yes +USES= pkgconfig python:build tar:bzip2 .include <bsd.port.pre.mk> diff --git a/audio/mma/Makefile b/audio/mma/Makefile index ed7fd2ef2c9c..e7c211f29c56 100644 --- a/audio/mma/Makefile +++ b/audio/mma/Makefile @@ -26,8 +26,7 @@ SHEBANG_FILES= mma.py SUB_FILES= mma_g.py SUB_LIST= PYTHON_CMD=${PYTHON_CMD} -USES= shebangfix -USE_PYTHON= yes +USES= python shebangfix WRKDOC= ${WRKDIR}/${PORTNAME}-pdf-${DISTVERSION:S,a,,} WRKSRC= ${WRKDIR}/${PORTNAME}-bin-${DISTVERSION} diff --git a/audio/mps/Makefile b/audio/mps/Makefile index eeb246fc0392..fec638690525 100644 --- a/audio/mps/Makefile +++ b/audio/mps/Makefile @@ -14,17 +14,15 @@ COMMENT= Terminal based MP3 search, playback and download LICENSE= GPLv3 OPTIONS_DEFAULT= MPLAYER -OPTIONS_RADIO= PLAYER +OPTIONS_RADIO= PLAYER OPTIONS_RADIO_PLAYER= MPLAYER MPV MPV_DESC= Mpv media player support # This port installs the following files in shared dirs # PLIST_FILES= bin/mps -PYDISTUTILS_AUTOPLIST= yes - -USE_PYDISTUTILS= yes -USE_PYTHON= yes +USES= python +USE_PYTHON= distutils autoplist .include <bsd.port.options.mk> diff --git a/audio/patchage/Makefile b/audio/patchage/Makefile index 8bce845ef7bf..8d0a506e9210 100644 --- a/audio/patchage/Makefile +++ b/audio/patchage/Makefile @@ -22,8 +22,7 @@ LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack \ libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \ libflowcanvas.so:${PORTSDIR}/x11-toolkits/flowcanvas -USES= pkgconfig tar:bzip2 -USE_PYTHON_BUILD=yes +USES= pkgconfig python:build tar:bzip2 INSTALLS_ICONS= yes CFLAGS+= -I${LOCALBASE}/include diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile index ae580efde8b7..1d40a165054d 100644 --- a/audio/py-ao/Makefile +++ b/audio/py-ao/Makefile @@ -17,10 +17,8 @@ LICENSE= GPLv2 LIB_DEPENDS= libao.so:${PORTSDIR}/audio/libao -USE_PYTHON= 2 -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes -PYDISTUTILS_PKGNAME= pyao +USES= python:2 +USE_PYTHON= distutils autoplist do-configure: @cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} config_unix.py \ diff --git a/audio/py-apetag/Makefile b/audio/py-apetag/Makefile index f39c4620828f..ea5e459e1687 100644 --- a/audio/py-apetag/Makefile +++ b/audio/py-apetag/Makefile @@ -12,9 +12,7 @@ DISTNAME= py-ApeTag-${PORTVERSION} MAINTAINER= miwi@FreeBSD.org COMMENT= Library for APE Tag written in Python -USE_PYTHON= yes -USE_PYDISTUTILS= yes -PYDISTUTILS_PKGNAME= py-ApeTag -PYDISTUTILS_AUTOPLIST= yes +USES= python +USE_PYTHON= distutils autoplist .include <bsd.port.mk> diff --git a/audio/py-cddb/Makefile b/audio/py-cddb/Makefile index 531ed1ee2b7c..b38d81db1d89 100644 --- a/audio/py-cddb/Makefile +++ b/audio/py-cddb/Makefile @@ -11,9 +11,7 @@ DISTNAME= CDDB-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Python module to fetch information on audio CDs from CDDB -USE_PYTHON= 2 -USE_PYDISTUTILS= yes -USE_PYTHON_PREFIX= yes -PYDISTUTILS_AUTOPLIST= yes +USES= python:2 +USE_PYTHON= distutils autoplist pythonprefix .include <bsd.port.mk> diff --git a/audio/py-discogs-client/Makefile b/audio/py-discogs-client/Makefile index 354c201dc844..aeb47427e043 100644 --- a/audio/py-discogs-client/Makefile +++ b/audio/py-discogs-client/Makefile @@ -15,8 +15,7 @@ LICENSE= BSD RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests1>=1.0.0:${PORTSDIR}/www/py-requests1 -USE_PYTHON= yes -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +USES= python +USE_PYTHON= distutils autoplist .include <bsd.port.mk> diff --git a/audio/py-eyed3-06/Makefile b/audio/py-eyed3-06/Makefile index 4465f82579a9..41eee645f7b8 100644 --- a/audio/py-eyed3-06/Makefile +++ b/audio/py-eyed3-06/Makefile @@ -15,11 +15,9 @@ COMMENT= Python module for processing ID3 tags LICENSE= GPLv2 -USE_PYTHON= 2 -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes -USES= gmake -GNU_CONFIGURE= yes +USES= gmake python:2 +USE_PYTHON= distutils autoplist +GNU_CONFIGURE= yes CONFLICTS= py*-eyed3-0.7.[0-9]* diff --git a/audio/py-fastaudio/Makefile b/audio/py-fastaudio/Makefile index ab9afb74ad99..0d0bd7eeeab6 100644 --- a/audio/py-fastaudio/Makefile +++ b/audio/py-fastaudio/Makefile @@ -23,9 +23,8 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/fastaudio.so PLIST_DIRS= EXAMPLESDIR= ${LOCALBASE}/share/examples/py-${PORTNAME} -USES= zip:infozip -USE_PYTHON= yes -USE_PYDISTUTILS=yes +USES= python zip:infozip +USE_PYTHON= distutils FASTA_SRCFILE= fastaudio.tar.gz PORTA_SRCFILE= portaudio_v18_1.zip diff --git a/audio/py-id3/Makefile b/audio/py-id3/Makefile index 8a2a55d3a953..04839a54daf8 100644 --- a/audio/py-id3/Makefile +++ b/audio/py-id3/Makefile @@ -12,10 +12,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Python module for retrieving and setting ID3 tags on MP3 files WRKSRC= ${WRKDIR}/id3-py-${PORTVERSION} -USE_PYTHON= 2 -USE_PYDISTUTILS= yes -USE_PYTHON_PREFIX= yes -PYDISTUTILS_AUTOPLIST= yes -PYDISTUTILS_PKGNAME= ID3 +USES= python:2 +USE_PYTHON= distutils autoplist pythonprefix .include <bsd.port.mk> diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile index 5499c701a0e5..261c16a1e0f0 100644 --- a/audio/py-karaoke/Makefile +++ b/audio/py-karaoke/Makefile @@ -21,15 +21,13 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \ dejavu>0:${PORTSDIR}/x11-fonts/dejavu \ ${PYNUMPY} -USES= desktop-file-utils iconv zip +USES= desktop-file-utils iconv python:2 zip USE_SDL= sdl USE_XORG= x11 xau xcb xdmcp USE_WX= 3.0+ WX_COMPS= python:lib -USE_PYTHON= 2 -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +USE_PYTHON= distutils autoplist DATADIR= ${PREFIX}/share/py${PORTNAME} diff --git a/audio/py-mad/Makefile b/audio/py-mad/Makefile index 9fca88575438..d2782e8d61fd 100644 --- a/audio/py-mad/Makefile +++ b/audio/py-mad/Makefile @@ -17,11 +17,8 @@ LICENSE= LGPL20 LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/mad -USE_PYTHON= 2 -USE_PYDISTUTILS= yes -USE_PYTHON_PREFIX= yes -PYDISTUTILS_AUTOPLIST= yes -PYDISTUTILS_PKGNAME= pymad +USES= python:2 +USE_PYTHON= distutils autoplist pythonprefix do-configure: @cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} config_unix.py \ diff --git a/audio/py-mpd/Makefile b/audio/py-mpd/Makefile index f4466394b6ee..ad20bf85e508 100644 --- a/audio/py-mpd/Makefile +++ b/audio/py-mpd/Makefile @@ -13,9 +13,7 @@ DISTNAME= python-${PORTNAME}-${PORTVERSION} MAINTAINER= nivit@FreeBSD.org COMMENT= Python MPD client library -USE_PYTHON= yes -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes - +USES= python +USE_PYTHON= distutils autoplist .include <bsd.port.mk> diff --git a/audio/py-musicbrainzngs/Makefile b/audio/py-musicbrainzngs/Makefile index 49e43f405d35..04a7f237cc57 100644 --- a/audio/py-musicbrainzngs/Makefile +++ b/audio/py-musicbrainzngs/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE ISCL LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING -USE_PYTHON= yes -USE_PYDISTUTILS= yes +USES= python +USE_PYTHON= distutils .include <bsd.port.mk> diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile index b8e678c51edb..1e2641aa85dc 100644 --- a/audio/py-mutagen/Makefile +++ b/audio/py-mutagen/Makefile @@ -13,8 +13,8 @@ COMMENT= Python-based audio metadata tag reader and writer LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USE_PYTHON= yes -USE_PYDISTUTILS= yes +USES= python +USE_PYTHON= distutils .include <bsd.port.pre.mk> diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile index 9d75582c6098..49b625738f4e 100644 --- a/audio/py-ogg/Makefile +++ b/audio/py-ogg/Makefile @@ -16,9 +16,8 @@ LICENSE= LGPL20 LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg -USE_PYTHON= 2 -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +USES= python:2 +USE_PYTHON= distutils autoplist do-configure: @cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} config_unix.py --prefix ${LOCALBASE} diff --git a/audio/py-openal/Makefile b/audio/py-openal/Makefile index 1aa86942ded0..ceddad6d611f 100644 --- a/audio/py-openal/Makefile +++ b/audio/py-openal/Makefile @@ -15,12 +15,10 @@ COMMENT= PyOpenAL is a binding of OpenAL for Python OPTIONS_DEFINE= DOCS EXAMPLES DIST_SUBDIR= python -USES= openal:al,alut -USE_PYTHON= yes -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +USES= openal:al,alut python +USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/PyOpenAL-${PORTVERSION} -EXAMPLESDIR= ${PREFIX}/share/examples/py-openal +EXAMPLESDIR= ${PREFIX}/share/examples/${PYTHON_PKGNAMEPREFIX}openal PORTEXAMPLES= * post-patch: diff --git a/audio/py-pyacoustid/Makefile b/audio/py-pyacoustid/Makefile index 085f901aedbb..fb09149b23a3 100644 --- a/audio/py-pyacoustid/Makefile +++ b/audio/py-pyacoustid/Makefile @@ -15,8 +15,7 @@ LICENSE= MIT LIB_DEPENDS= libchromaprint.so:${PORTSDIR}/audio/chromaprint -USE_PYTHON= yes -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +USES= python +USE_PYTHON= distutils autoplist .include <bsd.port.mk> diff --git a/audio/py-pyaudio/Makefile b/audio/py-pyaudio/Makefile index 822df3b3b134..51598dbbbc66 100644 --- a/audio/py-pyaudio/Makefile +++ b/audio/py-pyaudio/Makefile @@ -12,9 +12,8 @@ COMMENT= Portaudio toolkit bindings for Python LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio2 -USE_PYTHON= yes -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +USES= python +USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/PyAudio-${PORTVERSION} diff --git a/audio/py-shout/Makefile b/audio/py-shout/Makefile index 8664e8e8eb3d..56f85e48bd08 100644 --- a/audio/py-shout/Makefile +++ b/audio/py-shout/Makefile @@ -18,10 +18,8 @@ LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} -USES= pkgconfig -USE_PYTHON= 2 -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +USES= pkgconfig python:2 +USE_PYTHON= distutils autoplist PORTEXAMPLES= example.py diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile index 1fbd63207b20..68eb4e640a42 100644 --- a/audio/py-vorbis/Makefile +++ b/audio/py-vorbis/Makefile @@ -16,9 +16,8 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/_ogg.so:${PORTSDIR}/audio/py-ogg RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/_ogg.so:${PORTSDIR}/audio/py-ogg LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis -USE_PYTHON= 2 -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +USES= python:2 +USE_PYTHON= distutils autoplist post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ diff --git a/audio/raul/Makefile b/audio/raul/Makefile index 6958e7013dcc..d36ac182d757 100644 --- a/audio/raul/Makefile +++ b/audio/raul/Makefile @@ -15,9 +15,8 @@ LICENSE_COMB= dual LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs -USES= pkgconfig tar:bzip2 +USES= pkgconfig python:build tar:bzip2 USE_GNOME= glib20 -USE_PYTHON_BUILD=yes USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 3b9d896d3707..3eadb68d7b05 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -99,7 +99,7 @@ CONFIGURE_ARGS+= --disable-libnotify .endif .if exists(${LOCALBASE}/libdata/pkgconfig/gst-python-0.10.pc) -USE_PYTHON= yes +USES+= python USE_GSTREAMER+= python CONFIGURE_ARGS+=--enable-python PLIST_SUB+= PYTHON="" diff --git a/audio/slv2/Makefile b/audio/slv2/Makefile index 782df2ac27c4..4b94f3fceeb6 100644 --- a/audio/slv2/Makefile +++ b/audio/slv2/Makefile @@ -16,8 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/lv2.h:${PORTSDIR}/audio/lv2core LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack \ librdf.so:${PORTSDIR}/textproc/redland -USES= pkgconfig tar:bzip2 -USE_PYTHON_BUILD= yes +USES= pkgconfig python:build tar:bzip2 USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile index 431c8e876fad..c8f453fc9684 100644 --- a/audio/solfege/Makefile +++ b/audio/solfege/Makefile @@ -16,9 +16,8 @@ LICENSE= GPLv3 BUILD_DEPENDS= docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \ txt2man:${PORTSDIR}/textproc/txt2man -USES= display gettext gmake makeinfo pathfix pkgconfig +USES= display gettext gmake makeinfo pathfix pkgconfig python USE_GNOME= pygtk2 -USE_PYTHON= yes GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_path_XML2PO="" CONFIGURE_ARGS= --disable-oss-sound \ diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile index 43f910ba51a5..444af2226a1c 100644 --- a/audio/sonata/Makefile +++ b/audio/sonata/Makefile @@ -14,11 +14,9 @@ LICENSE= GPLv3 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:${PORTSDIR}/audio/py-mpd -USES= gettext pkgconfig +USES= gettext pkgconfig python USE_GNOME= pygtk2 -USE_PYTHON= yes -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +USE_PYTHON= distutils autoplist OPTIONS_DEFINE= DOCS MANPAGES MMKEYS MPD PYGNOMEEXTRAS TAGLIB ZSI OPTIONS_DEFAULT= MPD diff --git a/audio/sonice/Makefile b/audio/sonice/Makefile index 90ef598e3ecc..9c8e88e3811a 100644 --- a/audio/sonice/Makefile +++ b/audio/sonice/Makefile @@ -15,9 +15,8 @@ RUN_DEPENDS= oggenc:${PORTSDIR}/audio/vorbis-tools \ vorbisgain:${PORTSDIR}/audio/vorbisgain \ ${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml -USE_PYTHON= 2 -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +USES= python:2 +USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/sonice post-patch: |