diff options
31 files changed, 48 insertions, 67 deletions
diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile index b3c79e6bfb07..94ece25775e3 100644 --- a/irc/kvirc/Makefile +++ b/irc/kvirc/Makefile @@ -87,7 +87,7 @@ CMAKE_ARGS+= -DWANT_GSM=no #scripting support .if ${PORT_OPTIONS:MPYTHON} -USE_PYTHON= yes +USES+= python PLIST_SUB+= PYTHON="" .else CMAKE_ARGS+= -DWANT_PYTHON=no diff --git a/irc/py-fishcrypt/Makefile b/irc/py-fishcrypt/Makefile index d487b7cd5e95..e7b1081022c1 100644 --- a/irc/py-fishcrypt/Makefile +++ b/irc/py-fishcrypt/Makefile @@ -17,8 +17,7 @@ GH_PROJECT= py-fishcrypt GH_TAGNAME= ${GH_COMMIT} GH_COMMIT= c001c75 -USES= dos2unix -USE_PYTHON_RUN= yes +USES= dos2unix python:run NO_BUILD= yes SUB_FILES= pkg-message diff --git a/irc/py-gozerbot/Makefile b/irc/py-gozerbot/Makefile index 11c8d63c1498..e656dd7c51fb 100644 --- a/irc/py-gozerbot/Makefile +++ b/irc/py-gozerbot/Makefile @@ -12,9 +12,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sten@blinkenlights.nl COMMENT= Gozerbot - A modular Python IRC and Jabber bot -USE_PYTHON= yes -USE_PYDISTUTILS= yes -SUB_FILES= pkg-message +USES= python +USE_PYTHON= distutils +SUB_FILES= pkg-message OPTIONS_DEFINE= XMPP MYSQL DOCS XMPP_DESC= Jabber functions diff --git a/irc/py-irc/Makefile b/irc/py-irc/Makefile index da5711f4f040..49755921501f 100644 --- a/irc/py-irc/Makefile +++ b/irc/py-irc/Makefile @@ -17,10 +17,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:${PORTSDIR}/devel/py-hgtools \ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:${PORTSDIR}/devel/py-pytest-runner -USE_PYTHON= yes -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes -USES= zip +USES= python zip +USE_PYTHON= distutils autoplist PORTEXAMPLES= irccat.py irccat2.py servermap.py testbot.py \ dccreceive.py dccsend.py ssl-cat.py diff --git a/irc/py-supybot-plugins/Makefile b/irc/py-supybot-plugins/Makefile index cad131e03dd6..7e752bd62eb9 100644 --- a/irc/py-supybot-plugins/Makefile +++ b/irc/py-supybot-plugins/Makefile @@ -14,8 +14,7 @@ COMMENT= Official plugin pack for Supybot RUN_DEPENDS= supybot:${PORTSDIR}/irc/py-supybot -USE_PYTHON= yes -USES= tar:bzip2 +USES= python tar:bzip2 post-extract: # Delete, because it now included in irc/py-supybot diff --git a/irc/py-supybot/Makefile b/irc/py-supybot/Makefile index 35ddb167aecf..02649336d756 100644 --- a/irc/py-supybot/Makefile +++ b/irc/py-supybot/Makefile @@ -11,9 +11,8 @@ DISTNAME= Supybot-${PORTVERSION} MAINTAINER= dhn@FreeBSD.org COMMENT= Supybot - A Superb Python IRC bot -USES= tar:bzip2 -USE_PYTHON= yes -USE_PYDISTUTILS= yes +USES= python tar:bzip2 +USE_PYTHON= distutils PYDISTUTILS_PKGVERSION= 0.83.1+darcs PYDISTUTILS_EGGINFO= supybot-${PORTVERSION}-py${PYTHON_VER}.egg-info diff --git a/irc/qwebirc/Makefile b/irc/qwebirc/Makefile index 963677f2510c..e3843d04b07b 100644 --- a/irc/qwebirc/Makefile +++ b/irc/qwebirc/Makefile @@ -12,10 +12,9 @@ EXTRACT_SUFX= .gz MAINTAINER= tabmow@freenode.net COMMENT= Fast, easy to use, free, and open source web IRC client -USES= twisted:run,conch,mail,names,web,words +USES= python twisted:run,conch,mail,names,web,words WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes -USE_PYTHON= yes PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" do-install: diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile index 7a488e8339ea..00e5acac5f95 100644 --- a/irc/weechat-devel/Makefile +++ b/irc/weechat-devel/Makefile @@ -75,7 +75,7 @@ PLIST_SUB+= ASPELL="@comment " .endif .if ${PORT_OPTIONS:MPYTHON} -USE_PYTHON= 2 +USES+= python:2 CMAKE_ARGS+= -DBSD_PYTHON_CMD=${PYTHON_CMD} \ -DBSD_PYTHON_VER=${PYTHON_VERSION} PLIST_SUB+= PYTHON="" diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile index 395a48cf005c..7a97ec0b544b 100644 --- a/irc/xchat/Makefile +++ b/irc/xchat/Makefile @@ -70,7 +70,7 @@ PLIST_SUB+= PERL="@comment " .endif .if ${PORT_OPTIONS:MPYTHON} -USE_PYTHON= yes +USES+= python CONFIGURE_ARGS+=--enable-python PLIST_SUB+= PYTHON="" .else diff --git a/irc/znc/Makefile b/irc/znc/Makefile index 9c85fb2f6e32..5827bdaa1402 100644 --- a/irc/znc/Makefile +++ b/irc/znc/Makefile @@ -38,7 +38,7 @@ PERL_CONFIGURE_ON= --enable-swig PERL_USES= perl5 PYTHON_BUILD_DEPENDS= swig>=2.0.11:${PORTSDIR}/devel/swig20 PYTHON_CONFIGURE_ON= --enable-python=python-${PYTHON_VER} --enable-swig -PYTHON_USES= perl5 +PYTHON_USES= perl5 python:3 OPENSSL_CONFIGURE_OFF= --disable-openssl TCL_CONFIGURE_ENABLE= tcl @@ -59,7 +59,6 @@ CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR} .endif .if ${PORT_OPTIONS:MPYTHON} -USE_PYTHON= 3 USE_PERL5+= build .endif diff --git a/lang/cdent/Makefile b/lang/cdent/Makefile index 65930822597c..aa962722af0a 100644 --- a/lang/cdent/Makefile +++ b/lang/cdent/Makefile @@ -12,8 +12,7 @@ COMMENT= Portable Module Programming Language RUN_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/__init__.py:${PORTSDIR}/devel/py-yaml -USE_PYTHON= yes -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +USES= python +USE_PYTHON= distutils autoplist .include <bsd.port.mk> diff --git a/lang/clang-cheri/Makefile b/lang/clang-cheri/Makefile index 63a24ea6d45c..50ac3e67e829 100644 --- a/lang/clang-cheri/Makefile +++ b/lang/clang-cheri/Makefile @@ -10,9 +10,8 @@ MASTER_SITE_SUBDIR= brooks MAINTAINER= brooks@FreeBSD.org COMMENT= C, Objective-C, and C++ compiler with CHERI CPU support -USES= cmake:outsource compiler:c++11-lib ninja perl5 shebangfix \ - tar:bzip2 -USE_PYTHON= yes +USES= cmake:outsource compiler:c++11-lib ninja perl5 python \ + shebangfix tar:bzip2 BUILD_DEPENDS= swig1.3:${PORTSDIR}/devel/swig13 diff --git a/lang/clang32/Makefile b/lang/clang32/Makefile index 49ee5f77d021..54f990ab81d5 100644 --- a/lang/clang32/Makefile +++ b/lang/clang32/Makefile @@ -32,9 +32,8 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${LLVM_PREFIX} -USES= gmake perl5 +USES= gmake perl5 python:build USE_LDCONFIG= yes -USE_PYTHON_BUILD= yes MAKE_ARGS= CLANG_TBLGEN=${WRKSRC}/${RELTYPE}/bin/clang-tblgen \ LLVMIncDir=${LLVM_PREFIX}/include \ diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile index 26829de2311f..efbbe8d248ee 100644 --- a/lang/gjs/Makefile +++ b/lang/gjs/Makefile @@ -17,8 +17,8 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ CONFLICTS_BUILD=spidermonkey17-1.7.* -USES= gettext gmake libtool:keepla pathfix pkgconfig shebangfix tar:xz -USE_PYTHON_BUILD=2 +USES= gettext gmake libtool:keepla pathfix pkgconfig python:2,build \ + shebangfix tar:xz USE_GNOME= cairo glib20 gnomeprefix introspection:build intlhack USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/lang/io/Makefile.addons b/lang/io/Makefile.addons index a94777b54041..fe6ad01af40d 100644 --- a/lang/io/Makefile.addons +++ b/lang/io/Makefile.addons @@ -201,7 +201,7 @@ USE_PGSQL= yes # Python # .if ${PORT_OPTIONS:MPython} -USE_PYTHON= yes +USES+= python .endif # diff --git a/lang/kroc/Makefile b/lang/kroc/Makefile index 6b8dbbb41bd8..654558f3336c 100644 --- a/lang/kroc/Makefile +++ b/lang/kroc/Makefile @@ -22,12 +22,11 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash ONLY_FOR_ARCHS= i386 -USES= pathfix pkgconfig tar:bzip2 +USES= pathfix pkgconfig python tar:bzip2 PATHFIX_MAKEFILEIN= Makefile.am USE_LDCONFIG= yes USE_GL= yes USE_MYSQL= yes -USE_PYTHON= yes USE_SDL= sdl sound USE_GNOME= libxslt USE_AUTOTOOLS= autoconf:env automake:env diff --git a/lang/py-clojure/Makefile b/lang/py-clojure/Makefile index a83d977e5db2..a2b1a0e858cc 100644 --- a/lang/py-clojure/Makefile +++ b/lang/py-clojure/Makefile @@ -13,8 +13,7 @@ COMMENT= Implementation of Clojure in Python LICENSE= EPL -USE_PYTHON= yes -USE_PYDISTUTILS=yes -PYDISTUTILS_AUTOPLIST= yes +USES= python +USE_PYTHON= distutils autoplist .include <bsd.port.mk> diff --git a/lang/py-mx-base/Makefile b/lang/py-mx-base/Makefile index ecd692200a06..1cd22a4e93aa 100644 --- a/lang/py-mx-base/Makefile +++ b/lang/py-mx-base/Makefile @@ -11,8 +11,8 @@ DISTNAME= egenix-${PORTNAME}-${PORTVERSION} MAINTAINER= 5u623l20@gmail.com COMMENT= eGenix mx-Extension Series for Python -USE_PYTHON= 2 -USE_PYDISTUTILS= yes +USES= python:2 +USE_PYTHON= distutils PYDISTUTILS_PKGNAME= egenix-mx-base PLIST_FILES= %%PYTHON_SITELIBDIR%%/${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}-nspkg.pth diff --git a/lang/py-prolog/Makefile b/lang/py-prolog/Makefile index dc09011d4417..eb82d86fb1c7 100644 --- a/lang/py-prolog/Makefile +++ b/lang/py-prolog/Makefile @@ -15,9 +15,8 @@ COMMENT= Python extension embedding SWI-Prolog BUILD_DEPENDS= swipl:${PORTSDIR}/lang/swi-pl RUN_DEPENDS= swipl:${PORTSDIR}/lang/swi-pl -USE_PYTHON= yes -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +USES= python +USE_PYTHON= distutils autoplist .include <bsd.port.pre.mk> diff --git a/lang/pypy-devel/Makefile b/lang/pypy-devel/Makefile index 9d8f0535c88d..dcba01486760 100644 --- a/lang/pypy-devel/Makefile +++ b/lang/pypy-devel/Makefile @@ -69,7 +69,7 @@ PYTHON_CMD?= ${LOCALBASE}/bin/pypy .elif ${PORT_OPTIONS:MPYPY_MINMEM} PYTHON_CMD?= "${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300" .else -USE_PYTHON_BUILD= 2 +USES+= python:2,build .endif # List of PyPy instances diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile index dfd9d02b54a5..494f6c7cccc9 100644 --- a/lang/pypy/Makefile +++ b/lang/pypy/Makefile @@ -70,7 +70,7 @@ PYTHON_CMD?= ${LOCALBASE}/bin/pypy .elif ${PORT_OPTIONS:MPYPY_MINMEM} PYTHON_CMD?= "${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300" .else -USE_PYTHON_BUILD= 2 +USES+= python:2,build .endif # List of PyPy instances diff --git a/lang/pypy3-devel/Makefile b/lang/pypy3-devel/Makefile index 586d8b45947e..6fbcd1584b26 100644 --- a/lang/pypy3-devel/Makefile +++ b/lang/pypy3-devel/Makefile @@ -70,7 +70,7 @@ PYTHON_CMD?= ${LOCALBASE}/bin/pypy .elif ${PORT_OPTIONS:MPYPY_MINMEM} PYTHON_CMD?= "${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300" .else -USE_PYTHON_BUILD= 2 +USES+= python:2,build .endif # List of PyPy instances diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile index ecf1fadb032b..4de64b1434cb 100644 --- a/lang/python-doc-html/Makefile +++ b/lang/python-doc-html/Makefile @@ -16,8 +16,7 @@ COMMENT= Documentation for the Python programming language PORTSCOUT= ignore:1 NO_BUILD= yes -USES= tar:bzip2 -USE_PYTHON_BUILD= yes +USES= python:build tar:bzip2 DOCSDIR= ${PREFIX}/share/doc/${PYTHON_VERSION} PLIST= ${WRKDIR}/pkg-plist.${DOCFORMAT} diff --git a/lang/python/Makefile b/lang/python/Makefile index 30357ebf55fd..4f0bd347fa08 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -13,8 +13,8 @@ EXTRACT_ONLY= # empty MAINTAINER= python@FreeBSD.org COMMENT= The "meta-port" for the default version of Python interpreter -USE_PYTHON_RUN= yes -NO_BUILD= yes +USES= python:run +NO_BUILD= yes PYTHON_NO_DEPENDS= yes PLIST_FILES= bin/2to3 \ diff --git a/lang/python2/Makefile b/lang/python2/Makefile index 6b0e31e0d1b0..421647306d18 100644 --- a/lang/python2/Makefile +++ b/lang/python2/Makefile @@ -11,9 +11,9 @@ EXTRACT_ONLY= # empty MAINTAINER= python@FreeBSD.org COMMENT= The "meta-port" for version 2 of the Python interpreter -USE_PYTHON_RUN= yes -PYTHON_VERSION= ${PYTHON2_DEFAULT_VERSION} -NO_BUILD= yes +USES= python:run +PYTHON_VERSION= ${PYTHON2_DEFAULT_VERSION} +NO_BUILD= yes PYTHON_NO_DEPENDS= yes PLIST_FILES= bin/2to3-${PYTHON_MAJOR_VER} \ diff --git a/lang/python3/Makefile b/lang/python3/Makefile index f5e0b35f9685..e6f74b55720a 100644 --- a/lang/python3/Makefile +++ b/lang/python3/Makefile @@ -11,9 +11,9 @@ EXTRACT_ONLY= MAINTAINER= python@FreeBSD.org COMMENT= The "meta-port" for version 3 of the Python interpreter -USE_PYTHON_RUN= yes -PYTHON_VERSION= ${PYTHON3_DEFAULT_VERSION} -NO_BUILD= yes +USES= python:run +PYTHON_VERSION= ${PYTHON3_DEFAULT_VERSION} +NO_BUILD= yes PYTHON_NO_DEPENDS= yes PLIST_FILES= bin/2to3-${PYTHON_MAJOR_VER} \ diff --git a/lang/rust/Makefile b/lang/rust/Makefile index ad68dea2ec7f..73e8337af073 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -27,14 +27,12 @@ RUST_SOURCE= ${DISTNAME}${EXTRACT_SUFX} RUST_BOOT= rust-stage0-${RUST_BOOT_SIG}.tar.bz2 RUST_BOOT_SIG= 2014-06-21-db9af1d-freebsd-x86_64-ef2bd0fc0b0efa2bd6f5c1eaa60a2ec8df533254 -USES= gmake perl5 +USES= gmake perl5 python:2 HAS_CONFIGURE= yes CONFIGURE_ARGS= --disable-valgrind --disable-docs \ --enable-clang --mandir=${MANPREFIX}/man USE_LDCONFIG= yes USE_PERL5= build -USE_PYTHON= yes -USE_PYTHON_BUILD= 2 MAKE_ARGS= ARCH=x86_64 .if defined(BATCH) || defined(PACKAGE_BUILDING) diff --git a/lang/spidermonkey170/Makefile b/lang/spidermonkey170/Makefile index 1019605ef70d..800f551df08e 100644 --- a/lang/spidermonkey170/Makefile +++ b/lang/spidermonkey170/Makefile @@ -18,10 +18,9 @@ LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr CONFLICTS= njs-[0-9]* GNU_CONFIGURE= yes -USES= gmake pathfix perl5 +USES= gmake pathfix perl5 python:2,build USE_PERL5= build USE_LDCONFIG= yes -USE_PYTHON_BUILD= 2 WRKSRC= ${WRKDIR}/mozjs${PORTVERSION}/js/src diff --git a/lang/spidermonkey185/Makefile b/lang/spidermonkey185/Makefile index 1d9d9f259226..35d20f50222b 100644 --- a/lang/spidermonkey185/Makefile +++ b/lang/spidermonkey185/Makefile @@ -18,11 +18,10 @@ LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr CONFLICTS= njs-[0-9]* -USES= gmake pathfix perl5 pkgconfig +USES= gmake pathfix perl5 pkgconfig python:2,build GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_PERL5= build -USE_PYTHON_BUILD= 2 WRKSRC= ${WRKDIR}/js-${PORTVERSION}/js/src diff --git a/lang/spidermonkey24/Makefile b/lang/spidermonkey24/Makefile index 3fb481a53c2b..6f1093713b6d 100644 --- a/lang/spidermonkey24/Makefile +++ b/lang/spidermonkey24/Makefile @@ -18,10 +18,10 @@ LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr CONFLICTS= njs-[0-9]* GNU_CONFIGURE= yes -USES= compiler:c11 gmake pathfix perl5 readline tar:bzip2 +USES= compiler:c11 gmake pathfix perl5 python:2,build \ + readline tar:bzip2 USE_PERL5= build USE_LDCONFIG= yes -USE_PYTHON_BUILD= 2 WRKSRC= ${WRKDIR}/mozjs-${PORTVERSION}/js/src diff --git a/lang/tinypy/Makefile b/lang/tinypy/Makefile index bc44ed8d0e08..ae5a52e8b5e0 100644 --- a/lang/tinypy/Makefile +++ b/lang/tinypy/Makefile @@ -13,11 +13,10 @@ LICENSE= MIT PSFL LICENSE_COMB= multi LICENSE_FILE= LICENSE.txt -USE_PYTHON_BUILD= yes -USE_PYDISTUTILS= yes +USES= python:build +USE_PYTHON= distutils noegginfo PYDISTUTILS_BUILD_TARGET= linux -PYDISTUTILS_NOEGGINFO= yes PLIST_FILES= bin/tinypy |