From 551be3c7231225ed9c26479af2b8914fb2ef0ea8 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Thu, 30 Nov 2017 15:50:30 +0000 Subject: Convert Python ports to FLAVORS. Ports using USE_PYTHON=distutils are now flavored. They will automatically get flavors (py27, py34, py35, py36) depending on what versions they support. There is also a USE_PYTHON=flavors for ports that do not use distutils but need FLAVORS to be set. A USE_PYTHON=noflavors can be set if using distutils but flavors are not wanted. A new USE_PYTHON=optsuffix that will add PYTHON_PKGNAMESUFFIX has been added to cope with Python ports that did not have the Python PKGNAMEPREFIX but are flavored. USES=python now also exports a PY_FLAVOR variable that contains the current python flavor. It can be used in dependency lines when the port itself is not python flavored. For example, deskutils/calibre. By default, all the flavors are generated. To only generate flavors for the versions in PYTHON2_DEFAULT and PYTHON3_DEFAULT, define BUILD_DEFAULT_PYTHON_FLAVORS in your make.conf. In all the ports with Python dependencies, the *_DEPENDS entries MUST end with the flavor so that the framework knows which to build/use. This is done by appending '@${PY_FLAVOR}' after the origin (or @${FLAVOR} if in a Python module with Python flavors, as the content will be the same). For example: RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} PR: 223071 Reviewed by: portmgr, python Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D12464 --- sysutils/Makefile | 3 -- sysutils/ansible/Makefile | 14 ++++----- sysutils/ansible1/Makefile | 8 ++--- sysutils/azure-agent/Makefile | 2 +- sysutils/backupchecker/Makefile | 2 +- sysutils/bamf/Makefile | 4 +-- sysutils/battray/Makefile | 2 +- sysutils/bsdploy/Makefile | 18 +++++------ sysutils/catfish/Makefile | 8 ++--- sysutils/createrepo/Makefile | 15 ++++----- sysutils/deltarpm/Makefile | 1 + sysutils/docker-compose/Makefile | 37 +++++++++++----------- sysutils/duplicity/Makefile | 12 ++++---- sysutils/dvdvideo/Makefile | 4 +-- sysutils/farbot/Makefile | 2 +- sysutils/feather/Makefile | 2 +- sysutils/fusefs-gitfs/Makefile | 16 +++++----- sysutils/fusefs-wikipediafs/Makefile | 4 +-- sysutils/hachoir-urwid/Makefile | 2 +- sysutils/iocage/Makefile | 20 ++++++------ sysutils/jadm/Makefile | 16 +++++----- sysutils/lfm/Makefile | 2 +- sysutils/mog/Makefile | 6 ++-- sysutils/ohmu/Makefile | 6 ++-- sysutils/py-bcfg2/Makefile | 14 ++++----- sysutils/py-cdmi/Makefile | 6 ++-- sysutils/py-consul/Makefile | 9 +++--- sysutils/py-croniter/Makefile | 2 +- sysutils/py-crontab/Makefile | 4 +-- sysutils/py-diffoscope/Makefile | 8 ++--- sysutils/py-dlipower/Makefile | 6 ++-- sysutils/py-docker/Makefile | 14 ++++----- sysutils/py-execnet/Makefile | 6 ++-- sysutils/py-ezjailremote/Makefile | 4 +-- sysutils/py-filelike/Makefile | 3 +- sysutils/py-freenas.cli/Makefile | 22 +++++++------- sysutils/py-glances/Makefile | 2 +- sysutils/py-gmailfs-fuse/Makefile | 2 +- sysutils/py-google-compute-engine/Makefile | 6 ++-- sysutils/py-halite/Makefile | 4 +-- sysutils/py-honcho/Makefile | 6 ++-- sysutils/py-nomad/Makefile | 5 +-- sysutils/py-pkginfo/Makefile | 2 +- sysutils/py-ploy/Makefile | 6 ++-- sysutils/py-ploy_ansible/Makefile | 12 ++++---- sysutils/py-ploy_ec2/Makefile | 8 ++--- sysutils/py-ploy_ezjail/Makefile | 6 ++-- sysutils/py-ploy_fabric/Makefile | 4 +-- sysutils/py-plumbum/Makefile | 2 +- sysutils/py-psutil/Makefile | 4 +-- sysutils/py-ptyprocess/Makefile | 2 +- sysutils/py-salt/Makefile | 49 ++++++++++++++++-------------- sysutils/py-shutilwhich/Makefile | 2 +- sysutils/py-stdiff/Makefile | 3 +- sysutils/py-superlance/Makefile | 2 +- sysutils/py-supervisor/Makefile | 4 +-- sysutils/py-tmuxp/Makefile | 6 ++-- sysutils/py-zdaemon/Makefile | 2 +- sysutils/py3-execnet/Makefile | 11 ------- sysutils/py3-pkginfo/Makefile | 8 ----- sysutils/py3-ptyprocess/Makefile | 8 ----- sysutils/qzeitgeist/Makefile | 2 +- sysutils/rdiff-backup-devel/Makefile | 2 +- sysutils/sample/Makefile | 2 +- sysutils/solaar/Makefile | 4 +-- sysutils/tentakel/Makefile | 2 +- sysutils/xen-guest-tools/Makefile | 2 +- sysutils/yum/Makefile | 11 ++++--- sysutils/zeitgeist/Makefile | 6 ++-- 69 files changed, 242 insertions(+), 259 deletions(-) delete mode 100644 sysutils/py3-execnet/Makefile delete mode 100644 sysutils/py3-pkginfo/Makefile delete mode 100644 sysutils/py3-ptyprocess/Makefile (limited to 'sysutils') diff --git a/sysutils/Makefile b/sysutils/Makefile index 69f0eac97139..05c2b2d07e39 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -931,9 +931,6 @@ SUBDIR += py-uptime SUBDIR += py-zdaemon SUBDIR += py-zfs - SUBDIR += py3-execnet - SUBDIR += py3-pkginfo - SUBDIR += py3-ptyprocess SUBDIR += pydf SUBDIR += qchroot SUBDIR += qjail diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index e97b01e8825e..4f9cca8ddd97 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -13,12 +13,12 @@ COMMENT= Radically simple IT automation LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath \ - ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} CONFLICTS?= ansible1-* ansible23-* @@ -26,7 +26,7 @@ EXTRA_PATCHES?= # NO_ARCH= yes USES?= cpe python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix CPE_VENDOR= ansibleworks SUB_FILES= pkg-message diff --git a/sysutils/ansible1/Makefile b/sysutils/ansible1/Makefile index a8770820ec13..08b15b6b077a 100644 --- a/sysutils/ansible1/Makefile +++ b/sysutils/ansible1/Makefile @@ -10,10 +10,10 @@ CONFLICTS= ansible-* ansible23-* MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} USES= cpe python:2 shebangfix diff --git a/sysutils/azure-agent/Makefile b/sysutils/azure-agent/Makefile index 680a0fc18e42..043b13620036 100644 --- a/sysutils/azure-agent/Makefile +++ b/sysutils/azure-agent/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= python:lang/python \ bash:shells/bash \ base64:converters/base64 \ dmidecode:sysutils/dmidecode \ - ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1 \ + ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${FLAVOR} \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss NO_BUILD= yes diff --git a/sysutils/backupchecker/Makefile b/sysutils/backupchecker/Makefile index 95be94900b76..0ab7835d89d5 100644 --- a/sysutils/backupchecker/Makefile +++ b/sysutils/backupchecker/Makefile @@ -14,7 +14,7 @@ USE_GITHUB= yes NO_ARCH= yes USES= python:3.3+ -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix PORTDOCS= README.md diff --git a/sysutils/bamf/Makefile b/sysutils/bamf/Makefile index bc4f40f8e266..908a95c7c53b 100644 --- a/sysutils/bamf/Makefile +++ b/sysutils/bamf/Makefile @@ -14,8 +14,8 @@ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING.LGPL BUILD_DEPENDS= vapigen:lang/vala \ - ${PYTHON_PKGNAMEPREFIX}libxml2>=2.8.0:textproc/py-libxml2 \ - ${PYTHON_PKGNAMEPREFIX}libxslt>=1.1.28:textproc/py-libxslt + ${PYTHON_PKGNAMEPREFIX}libxml2>=2.8.0:textproc/py-libxml2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libxslt>=1.1.28:textproc/py-libxslt@${PY_FLAVOR} LIB_DEPENDS= libgtop-2.0.so:devel/libgtop \ libdbus-glib-1.so:devel/dbus-glib \ libstartup-notification-1.so:x11/startup-notification diff --git a/sysutils/battray/Makefile b/sysutils/battray/Makefile index 59063d48c345..0f193960e2b0 100644 --- a/sysutils/battray/Makefile +++ b/sysutils/battray/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT USES= python:3.3+ USE_GNOME= py3gobject3 -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix USE_GITHUB= yes GH_ACCOUNT= Carpetsmoker diff --git a/sysutils/bsdploy/Makefile b/sysutils/bsdploy/Makefile index 9c6c577ee1de..841b181e182d 100644 --- a/sysutils/bsdploy/Makefile +++ b/sysutils/bsdploy/Makefile @@ -9,20 +9,20 @@ MASTER_SITES= CHEESESHOP MAINTAINER= koobs@FreeBSD.org COMMENT= Container Management for FreeBSD Jails -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \ - ${PYTHON_PKGNAMEPREFIX}pyliblzma>0:archivers/py-pyliblzma \ - ${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy \ - ${PYTHON_PKGNAMEPREFIX}ploy_ansible>=1.3.0:sysutils/py-ploy_ansible \ - ${PYTHON_PKGNAMEPREFIX}ploy_ezjail>=1.2.0:sysutils/py-ploy_ezjail \ - ${PYTHON_PKGNAMEPREFIX}ploy_fabric>=1.1.0:sysutils/py-ploy_fabric +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyliblzma>0:archivers/py-pyliblzma@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ploy_ansible>=1.3.0:sysutils/py-ploy_ansible@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ploy_ezjail>=1.2.0:sysutils/py-ploy_ezjail@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ploy_fabric>=1.1.0:sysutils/py-ploy_fabric@${FLAVOR} OPTIONS_DEFINE= EC2 OPTIONS_DEFAULT= EC2 EC2_DESC= Support Amazon Web Services EC2 hosts -EC2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy_ec2>0:sysutils/py-ploy_ec2 +EC2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy_ec2>0:sysutils/py-ploy_ec2@${FLAVOR} USES= python:-2.7 zip USE_PYTHON= autoplist distutils diff --git a/sysutils/catfish/Makefile b/sysutils/catfish/Makefile index a744b54ff7e7..879e0199dbcf 100644 --- a/sysutils/catfish/Makefile +++ b/sysutils/catfish/Makefile @@ -12,13 +12,13 @@ COMMENT= GTK search utility LICENSE= GPLv3 RUN_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra \ - ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect \ - ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3 \ + ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${FLAVOR} \ gksu:sysutils/gksu BUILD_DEPENDS= ${RUN_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils USE_GNOME= gtk30 intltool diff --git a/sysutils/createrepo/Makefile b/sysutils/createrepo/Makefile index 5206107fe022..335ea0a092b9 100644 --- a/sysutils/createrepo/Makefile +++ b/sysutils/createrepo/Makefile @@ -11,13 +11,14 @@ COMMENT= Utility to create and manage RPM metadata repositories LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser \ - ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \ - ${PYTHON_SITELIBDIR}/urlgrabber/__init__.py:www/py-urlgrabber \ - ${PYTHON_SITELIBDIR}/yum/__init__.py:sysutils/yum \ - ${PYTHON_SITELIBDIR}/deltarpm.py:sysutils/deltarpm - -USES= gmake python shebangfix +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/urlgrabber/__init__.py:www/py-urlgrabber@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/yum/__init__.py:sysutils/yum@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/deltarpm.py:sysutils/deltarpm@${FLAVOR} + +USES= gmake python:2.7 shebangfix +USE_PYTHON= flavors SHEBANG_FILES= *.py */*.py Makefile BUILD_DEPENDS+= ginstall:sysutils/coreutils diff --git a/sysutils/deltarpm/Makefile b/sysutils/deltarpm/Makefile index 38e7e0b658c5..d50ecbced7ba 100644 --- a/sysutils/deltarpm/Makefile +++ b/sysutils/deltarpm/Makefile @@ -14,6 +14,7 @@ LICENSE= BSD3CLAUSE LIB_DEPENDS= librpm.so:archivers/rpm4 USES= gmake python shebangfix tar:bz2 +USE_PYTHON= flavors optsuffix SHEBANG_FILES= drpmsync ALL_TARGET= all diff --git a/sysutils/docker-compose/Makefile b/sysutils/docker-compose/Makefile index 3f55b681269c..923b98ed3661 100644 --- a/sysutils/docker-compose/Makefile +++ b/sysutils/docker-compose/Makefile @@ -11,34 +11,35 @@ COMMENT= Define and run multi-container applications with Docker LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-property \ - ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama \ - ${PYTHON_PKGNAMEPREFIX}docker>=2.2.1:sysutils/py-docker \ - ${PYTHON_PKGNAMEPREFIX}dockerpty>=0.4.1:devel/py-dockerpty \ - ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt \ - ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.16:net/py-ipaddress \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}texttable>=0.9.0:textproc/py-texttable \ - ${PYTHON_PKGNAMEPREFIX}websocket-client>=0.32.0:www/py-websocket-client - -USES= python -USE_PYTHON= distutils autoplist +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-property@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docker>=2.2.1:sysutils/py-docker@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dockerpty>=0.4.1:devel/py-dockerpty@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.16:net/py-ipaddress@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}texttable>=0.9.0:textproc/py-texttable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}websocket-client>=0.32.0:www/py-websocket-client@${FLAVOR} + +USES= python:-3.3 +USE_PYTHON= distutils autoplist concurrent optsuffix .include .if ${PYTHON_SUFFIX} < 35 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname@${FLAVOR} .endif .if ${PYTHON_SUFFIX} < 34 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} .endif .if ${PYTHON_SUFFIX} < 32 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.16:net/py-ipaddress@${FLAVOR} .endif .include diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile index 43645a0d8d5e..35473da912a3 100644 --- a/sysutils/duplicity/Makefile +++ b/sysutils/duplicity/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= librsync.so:net/librsync2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fasteners>=0:devel/py-fasteners +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fasteners>=0:devel/py-fasteners@${FLAVOR} USES= python:2 USE_PYTHON= autoplist distutils @@ -41,15 +41,15 @@ PEXPECT_DESC= pexpect and use ssh binaries FTP_RUN_DEPENDS= ncftp>=3.2.2:ftp/ncftp3 FTPS_RUN_DEPENDS= lftp>=3.7.15:ftp/lftp -GDOCS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata -GIO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject>0:devel/py-gobject \ +GDOCS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata@${FLAVOR} +GIO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject>0:devel/py-gobject@${FLAVOR} \ dbus>0:devel/dbus GNUPG_RUN_DEPENDS= gnupg1>=1.4.7:security/gnupg1 GNUPG2_RUN_DEPENDS= gpg2:security/gnupg NLS_USES= gettext -PARAMIKO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:security/py-paramiko -PEXPECT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect -S3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.6b:devel/py-boto +PARAMIKO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:security/py-paramiko@${FLAVOR} +PEXPECT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${FLAVOR} +S3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.6b:devel/py-boto@${FLAVOR} post-patch: .for f in cfbackend _cf_cloudfiles _cf_pyrax diff --git a/sysutils/dvdvideo/Makefile b/sysutils/dvdvideo/Makefile index ce1eb11772e9..b2ffd1d702c0 100644 --- a/sysutils/dvdvideo/Makefile +++ b/sysutils/dvdvideo/Makefile @@ -15,8 +15,8 @@ COMMENT= Video DVD backup tool LICENSE= GPLv3 NO_ARCH= yes -USES= python:3 tar:tgz -USE_PYTHON= autoplist distutils +USES= python:3.4+ tar:tgz +USE_PYTHON= autoplist distutils optsuffix OPTIONS_DEFINE= DVDCSS .if !defined(PACKAGE_BUILDING) diff --git a/sysutils/farbot/Makefile b/sysutils/farbot/Makefile index 8766416b9c65..cc1921b1152d 100644 --- a/sysutils/farbot/Makefile +++ b/sysutils/farbot/Makefile @@ -19,7 +19,7 @@ GH_ACCOUNT= threerings GH_PROJECT= farbot GH_TAGNAME= c824009 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist PYDISTUTILS_PKGNAME= farb PYDISTUTILS_PKGVERSION= 0.1 diff --git a/sysutils/feather/Makefile b/sysutils/feather/Makefile index aaf14a0cab8b..9df32621dc39 100644 --- a/sysutils/feather/Makefile +++ b/sysutils/feather/Makefile @@ -9,7 +9,7 @@ CATEGORIES= sysutils python MAINTAINER= ports@FreeBSD.org COMMENT= Python script for managing tarsnap backups -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \ tarsnap>=0:sysutils/tarsnap USES= python:2,run diff --git a/sysutils/fusefs-gitfs/Makefile b/sysutils/fusefs-gitfs/Makefile index c62cdf813433..aa7570fcab1b 100644 --- a/sysutils/fusefs-gitfs/Makefile +++ b/sysutils/fusefs-gitfs/Makefile @@ -10,19 +10,19 @@ COMMENT= Version controlled file system LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomiclong>0:devel/py-atomiclong \ - ${PYTHON_PKGNAMEPREFIX}fusepy>=2.0.2:devel/py-fusepy \ - ${PYTHON_PKGNAMEPREFIX}pygit2>=0.24.1:devel/py-pygit2 \ - ${PYTHON_PKGNAMEPREFIX}raven>=5.27.0:devel/py-raven \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.1:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomiclong>0:devel/py-atomiclong@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fusepy>=2.0.2:devel/py-fusepy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygit2>=0.24.1:devel/py-pygit2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}raven>=5.27.0:devel/py-raven@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.1:devel/py-pytest@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= PressLabs NO_ARCH= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix post-patch: @${REINPLACE_CMD} -e 's/==/>=/' ${WRKSRC}/*requirements.txt @@ -34,7 +34,7 @@ do-test: .include .if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${FLAVOR} .else post-patch: patch-py3k-mock patch-py3k-mock: diff --git a/sysutils/fusefs-wikipediafs/Makefile b/sysutils/fusefs-wikipediafs/Makefile index c7a20e1c0a86..a572f1dd69c1 100644 --- a/sysutils/fusefs-wikipediafs/Makefile +++ b/sysutils/fusefs-wikipediafs/Makefile @@ -13,9 +13,9 @@ COMMENT= Mount mediawikis LICENSE= GPLv2 -RUN_DEPENDS= py*-fusefs>=0.2:devel/py-fusefs +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fusefs>=0.2:devel/py-fusefs@${FLAVOR} -USES= fuse python +USES= fuse python:2.7 USE_PYTHON= autoplist distutils PORTDOCS= AUTHORS ChangeLog HACKING NEWS README TODO NO_ARCH= yes diff --git a/sysutils/hachoir-urwid/Makefile b/sysutils/hachoir-urwid/Makefile index 8a032cfec9f2..33ed3b0dd0b5 100644 --- a/sysutils/hachoir-urwid/Makefile +++ b/sysutils/hachoir-urwid/Makefile @@ -10,7 +10,7 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= Binary file explorer RUN_DEPENDS= ${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:devel/hachoir-parser \ - ${PYTHON_SITELIBDIR}/urwid/__init__.py:devel/py-urwid + ${PYTHON_SITELIBDIR}/urwid/__init__.py:devel/py-urwid@${FLAVOR} USES= python:2.7 USE_PYTHON= distutils diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile index 695e470d2abb..63ff88a6cf94 100644 --- a/sysutils/iocage/Makefile +++ b/sysutils/iocage/Makefile @@ -11,17 +11,17 @@ COMMENT= FreeBSD jail manager written in Python3 LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py3-pytest-runner -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py3-click \ - ${PYTHON_PKGNAMEPREFIX}tqdm>=4.10.0:misc/py3-tqdm \ - ${PYTHON_PKGNAMEPREFIX}coloredlogs>0:devel/py3-coloredlogs \ - ${PYTHON_PKGNAMEPREFIX}verboselogs>0:devel/py3-verboselogs \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tqdm>=4.10.0:misc/py-tqdm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}coloredlogs>0:devel/py-coloredlogs@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}verboselogs>0:devel/py-verboselogs@${PY_FLAVOR} \ ca_root_nss>0:security/ca_root_nss \ - ${PYTHON_PKGNAMEPREFIX}texttable>=0.8.7:textproc/py3-texttable \ - ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py3-pytest-runner \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py3-requests \ - ${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py3-libzfs \ - ${PYTHON_PKGNAMEPREFIX}pygit2>=0.24.1:devel/py3-pygit2 + ${PYTHON_PKGNAMEPREFIX}texttable>=0.8.7:textproc/py-texttable@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py-libzfs@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygit2>=0.24.1:devel/py-pygit2@${PY_FLAVOR} USE_GITHUB= yes diff --git a/sysutils/jadm/Makefile b/sysutils/jadm/Makefile index f86ea295b044..9045e24c8dd5 100644 --- a/sysutils/jadm/Makefile +++ b/sysutils/jadm/Makefile @@ -12,14 +12,14 @@ COMMENT= FreeBSD jail framework with zfs, vnet and jail.conf support LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate \ - ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.6:net/py-ipaddress -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate \ - ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.6:net/py-ipaddress +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:net/py-netifaces@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate@${FLAVOR} \ + ${PY_IPADDRESS} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:net/py-netifaces@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate@${FLAVOR} \ + ${PY_IPADDRESS} USES= python USE_PYTHON= distutils autoplist diff --git a/sysutils/lfm/Makefile b/sysutils/lfm/Makefile index f424857b9d53..b700c3659577 100644 --- a/sysutils/lfm/Makefile +++ b/sysutils/lfm/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING NO_ARCH= yes -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix USES= python:3.4+ PLIST_FILES= man/man1/lfm.1.gz diff --git a/sysutils/mog/Makefile b/sysutils/mog/Makefile index 8e11539abd07..e17ebe093a36 100644 --- a/sysutils/mog/Makefile +++ b/sysutils/mog/Makefile @@ -11,13 +11,13 @@ COMMENT= Different take on the UNIX tool cat LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments \ - mdv:devel/py-mdv +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${FLAVOR} \ + mdv:devel/py-mdv@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python USE_GITHUB= yes -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix NO_ARCH= yes GH_ACCOUNT= witchard diff --git a/sysutils/ohmu/Makefile b/sysutils/ohmu/Makefile index 0edfff75b41f..31e7092509a3 100644 --- a/sysutils/ohmu/Makefile +++ b/sysutils/ohmu/Makefile @@ -11,14 +11,14 @@ COMMENT= Tool to view space usage in your terminal LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scandir>=1.3:sysutils/py-scandir \ - ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scandir>=1.3:sysutils/py-scandir@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= paul-nechifor USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix NO_ARCH= yes pre-configure: diff --git a/sysutils/py-bcfg2/Makefile b/sysutils/py-bcfg2/Makefile index 1cd5dd262765..faee92ecce71 100644 --- a/sysutils/py-bcfg2/Makefile +++ b/sysutils/py-bcfg2/Makefile @@ -12,24 +12,24 @@ COMMENT= Configuration management system written in Python LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}daemon>=0:devel/py-daemon \ - ${PYTHON_PKGNAMEPREFIX}gamin>=0:devel/py-gamin \ - ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}daemon>=0:devel/py-daemon@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gamin>=0:devel/py-gamin@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} OPTIONS_DEFINE= CHEETAH GENSHI CHEETAH_DESC= Support Cheetah Templates GENSHI_DESC= Support Genshi Templates -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_RC_SUBR= bcfg2 SUB_LIST= PYTHON_CMD=${PYTHON_CMD} PORTDOCS= COPYRIGHT README -CHEETAH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=0:devel/py-cheetah -GENSHI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0:textproc/py-genshi +CHEETAH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=0:devel/py-cheetah@${FLAVOR} +GENSHI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0:textproc/py-genshi@${FLAVOR} post-patch: @${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py diff --git a/sysutils/py-cdmi/Makefile b/sysutils/py-cdmi/Makefile index 18b2762aeccd..f486470ceb99 100644 --- a/sysutils/py-cdmi/Makefile +++ b/sysutils/py-cdmi/Makefile @@ -12,14 +12,14 @@ COMMENT= CDMI on OpenStack Swift implementation LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}swift>0:databases/py-swift \ - ${PYTHON_PKGNAMEPREFIX}webob>0:www/py-webob +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}swift>0:databases/py-swift@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>0:www/py-webob@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= osaddon GH_TAGNAME= f0e3ad9 -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include diff --git a/sysutils/py-consul/Makefile b/sysutils/py-consul/Makefile index a2d95e640b7e..e792204e7aa0 100644 --- a/sysutils/py-consul/Makefile +++ b/sysutils/py-consul/Makefile @@ -4,16 +4,17 @@ PORTNAME= py-consul PORTVERSION= 0.7.2 DISTVERSIONPREFIX= v CATEGORIES= sysutils +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= jhixson@gmail.com COMMENT= Python client for consul LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py3-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py3-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} USES= python:3.3+ diff --git a/sysutils/py-croniter/Makefile b/sysutils/py-croniter/Makefile index b58786cf70da..96e3f4735463 100644 --- a/sysutils/py-croniter/Makefile +++ b/sysutils/py-croniter/Makefile @@ -12,7 +12,7 @@ COMMENT= Iteration support for datetime objects with cron like format LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist diff --git a/sysutils/py-crontab/Makefile b/sysutils/py-crontab/Makefile index 0424db4124f7..8fb20c13c1c0 100644 --- a/sysutils/py-crontab/Makefile +++ b/sysutils/py-crontab/Makefile @@ -13,8 +13,8 @@ COMMENT= Read and write crontab files using a direct API LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}croniter>0:sysutils/py-croniter +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}croniter>0:sysutils/py-croniter@${FLAVOR} USES= python USE_PYTHON= autoplist distutils diff --git a/sysutils/py-diffoscope/Makefile b/sysutils/py-diffoscope/Makefile index 20383a92ca57..8c33516f43ff 100644 --- a/sysutils/py-diffoscope/Makefile +++ b/sysutils/py-diffoscope/Makefile @@ -13,15 +13,15 @@ COMMENT= In-depth comparison of files, archives, and directories LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libarchive-c>=0:archivers/py3-libarchive-c \ - ${PYTHON_PKGNAMEPREFIX}python-magic>=0:devel/py3-python-magic \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libarchive-c>=0:archivers/py-libarchive-c@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-magic>=0:devel/py-python-magic@${FLAVOR} \ gdiff:textproc/diffutils -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \ zipinfo:archivers/unzip \ isoinfo:sysutils/cdrkit \ rpm2cpio:archivers/rpm2cpio -USES= python:3.4+ +USES= python:3.5+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/sysutils/py-dlipower/Makefile b/sysutils/py-dlipower/Makefile index cf82197317ce..37beda186494 100644 --- a/sysutils/py-dlipower/Makefile +++ b/sysutils/py-dlipower/Makefile @@ -13,9 +13,9 @@ COMMENT= CLI interface to Digital Logger's (DLI) Power Strips LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR} USES= python shebangfix SHEBANG_FILES= scripts/fence_dli diff --git a/sysutils/py-docker/Makefile b/sysutils/py-docker/Makefile index 781d022c22fc..1f22dfc8d4d0 100644 --- a/sysutils/py-docker/Makefile +++ b/sysutils/py-docker/Makefile @@ -12,11 +12,11 @@ COMMENT= Python library for the Docker Engine API LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client \ - ${PYTHON_PKGNAMEPREFIX}docker-pycreds>0:security/py-docker-pycreds +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docker-pycreds>0:security/py-docker-pycreds@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -24,11 +24,11 @@ USE_PYTHON= autoplist distutils .include .if ${PYTHON_SUFFIX} < 35 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname@${FLAVOR} .endif .if ${PYTHON_SUFFIX} < 33 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddress>0:net/py-ipaddress +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddress>0:net/py-ipaddress@${FLAVOR} .endif .include diff --git a/sysutils/py-execnet/Makefile b/sysutils/py-execnet/Makefile index 16125cde0df0..c33a95e394d2 100644 --- a/sysutils/py-execnet/Makefile +++ b/sysutils/py-execnet/Makefile @@ -13,11 +13,11 @@ COMMENT= Distributed Python deployment and communication LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.4:devel/py-apipkg +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.4:devel/py-apipkg@${FLAVOR} NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include diff --git a/sysutils/py-ezjailremote/Makefile b/sysutils/py-ezjailremote/Makefile index c73eb872bffe..37af97b322bc 100644 --- a/sysutils/py-ezjailremote/Makefile +++ b/sysutils/py-ezjailremote/Makefile @@ -13,13 +13,13 @@ COMMENT= Remote control and convenience wrapper for ezjail LICENSE= BSD2CLAUSE RUN_DEPENDS= ezjail-admin:sysutils/ezjail \ - ${PYTHON_PKGNAMEPREFIX}fabric>0:devel/py-fabric + ${PYTHON_PKGNAMEPREFIX}fabric>0:devel/py-fabric@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= tomster GH_PROJECT= ezjail-remote -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include diff --git a/sysutils/py-filelike/Makefile b/sysutils/py-filelike/Makefile index fe71d8fb1305..98f8a502c084 100644 --- a/sysutils/py-filelike/Makefile +++ b/sysutils/py-filelike/Makefile @@ -6,11 +6,12 @@ PORTVERSION= 0.4.1 PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= dikshie@sfc.wide.ad.jp COMMENT= Python module for building and manipulating file-like object USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent .include diff --git a/sysutils/py-freenas.cli/Makefile b/sysutils/py-freenas.cli/Makefile index 960777b3e30d..5f06aa96ced6 100644 --- a/sysutils/py-freenas.cli/Makefile +++ b/sysutils/py-freenas.cli/Makefile @@ -10,18 +10,18 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wg@FreeBSD.org COMMENT= FreeNAS Command Line Interface -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}columnize>0:devel/py-columnize \ - ${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu \ - ${PYTHON_PKGNAMEPREFIX}natural>0:devel/py-natural \ - ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \ - ${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor \ - ${PYTHON_PKGNAMEPREFIX}texttable>0:textproc/py-texttable \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils \ - ${PYTHON_PKGNAMEPREFIX}freenas.dispatcher>0:devel/py-freenas.dispatcher +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}columnize>0:devel/py-columnize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}natural>0:devel/py-natural@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}texttable>0:textproc/py-texttable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}freenas.dispatcher>0:devel/py-freenas.dispatcher@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include diff --git a/sysutils/py-glances/Makefile b/sysutils/py-glances/Makefile index 1e6a62b2aab9..25d314614f5d 100644 --- a/sysutils/py-glances/Makefile +++ b/sysutils/py-glances/Makefile @@ -13,7 +13,7 @@ COMMENT= CLI curses based monitoring tool for GNU/Linux and BSD OS LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=2.1.1:sysutils/py-psutil +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=2.1.1:sysutils/py-psutil@${FLAVOR} OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes diff --git a/sysutils/py-gmailfs-fuse/Makefile b/sysutils/py-gmailfs-fuse/Makefile index a9fc54c528c9..e2945b4938a7 100644 --- a/sysutils/py-gmailfs-fuse/Makefile +++ b/sysutils/py-gmailfs-fuse/Makefile @@ -11,7 +11,7 @@ COMMENT= Use an IMAP server (like gmail) as normal storage LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fusefs>=0.2:devel/py-fusefs +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fusefs>=0.2:devel/py-fusefs@${FLAVOR} USES= fuse python:2.7 USE_PYTHON= autoplist distutils diff --git a/sysutils/py-google-compute-engine/Makefile b/sysutils/py-google-compute-engine/Makefile index c7c0d8581dd8..a640e431bcd7 100644 --- a/sysutils/py-google-compute-engine/Makefile +++ b/sysutils/py-google-compute-engine/Makefile @@ -12,9 +12,9 @@ COMMENT= Guest Environment for Google Compute Engine LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \ - ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${FLAVOR} \ sudo:security/sudo USES= python diff --git a/sysutils/py-halite/Makefile b/sysutils/py-halite/Makefile index fef9a851069e..e27a68511dc4 100644 --- a/sysutils/py-halite/Makefile +++ b/sysutils/py-halite/Makefile @@ -13,8 +13,8 @@ COMMENT= SaltStack Web UI LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}salt>=0.17.0:sysutils/py-salt \ - ${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}salt>=0.17.0:sysutils/py-salt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist diff --git a/sysutils/py-honcho/Makefile b/sysutils/py-honcho/Makefile index b9c66d4017d7..6a51f69fd7df 100644 --- a/sysutils/py-honcho/Makefile +++ b/sysutils/py-honcho/Makefile @@ -13,9 +13,9 @@ COMMENT= Managing Procfile-based applications tool LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= nickstenning diff --git a/sysutils/py-nomad/Makefile b/sysutils/py-nomad/Makefile index 4dd11ab64e31..f807a8379605 100644 --- a/sysutils/py-nomad/Makefile +++ b/sysutils/py-nomad/Makefile @@ -3,14 +3,15 @@ PORTNAME= py-nomad PORTVERSION= 0.5.0 CATEGORIES= sysutils +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= jhixson@gmail.com COMMENT= Python client for nomad LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py3-requests -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py3-requests +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} USES= python:3.3+ diff --git a/sysutils/py-pkginfo/Makefile b/sysutils/py-pkginfo/Makefile index 5ad143adeccd..659d2fd9e67d 100644 --- a/sysutils/py-pkginfo/Makefile +++ b/sysutils/py-pkginfo/Makefile @@ -12,7 +12,7 @@ COMMENT= Query metadatdata from sdists / bdists / installed packages LICENSE= MIT NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include diff --git a/sysutils/py-ploy/Makefile b/sysutils/py-ploy/Makefile index 85aa76f51622..f8092809bb34 100644 --- a/sysutils/py-ploy/Makefile +++ b/sysutils/py-ploy/Makefile @@ -14,9 +14,9 @@ COMMENT= Manage servers through a central configuration LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy \ - ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} USES= python USE_PYTHON= autoplist distutils diff --git a/sysutils/py-ploy_ansible/Makefile b/sysutils/py-ploy_ansible/Makefile index 1229e9c0804d..297e67e25e63 100644 --- a/sysutils/py-ploy_ansible/Makefile +++ b/sysutils/py-ploy_ansible/Makefile @@ -13,13 +13,13 @@ COMMENT= Plugin to integrate Ansible with ploy LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \ - ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy \ - ${PYTHON_PKGNAMEPREFIX}execnet>0:sysutils/py-execnet \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}execnet>0:sysutils/py-execnet@${FLAVOR} \ ansible1<2.0:sysutils/ansible1 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils diff --git a/sysutils/py-ploy_ec2/Makefile b/sysutils/py-ploy_ec2/Makefile index e452b15a8945..81370ca9ae08 100644 --- a/sysutils/py-ploy_ec2/Makefile +++ b/sysutils/py-ploy_ec2/Makefile @@ -13,10 +13,10 @@ COMMENT= Plugin for ploy to provision Amazon EC2 instances LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \ - ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy \ - ${PYTHON_PKGNAMEPREFIX}boto>=2.0:devel/py-boto \ - ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}boto>=2.0:devel/py-boto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils diff --git a/sysutils/py-ploy_ezjail/Makefile b/sysutils/py-ploy_ezjail/Makefile index 9c4931f1a0e7..3019f97810c6 100644 --- a/sysutils/py-ploy_ezjail/Makefile +++ b/sysutils/py-ploy_ezjail/Makefile @@ -13,9 +13,9 @@ COMMENT= Plugin for ploy to provision FreeBSD jails using ezjail LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \ - ${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy \ - ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${FLAVOR} USES= python USE_PYTHON= autoplist distutils diff --git a/sysutils/py-ploy_fabric/Makefile b/sysutils/py-ploy_fabric/Makefile index ca642865e288..dd65f7e7111d 100644 --- a/sysutils/py-ploy_fabric/Makefile +++ b/sysutils/py-ploy_fabric/Makefile @@ -13,8 +13,8 @@ COMMENT= Ploy plugin for integration with Fabric LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy \ - ${PYTHON_PKGNAMEPREFIX}fabric>=1.4.0,1:devel/py-fabric +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fabric>=1.4.0,1:devel/py-fabric@${FLAVOR} USES= python:-2.7 zip USE_PYTHON= autoplist distutils diff --git a/sysutils/py-plumbum/Makefile b/sysutils/py-plumbum/Makefile index 2350337ef6ed..349fffed5ec3 100644 --- a/sysutils/py-plumbum/Makefile +++ b/sysutils/py-plumbum/Makefile @@ -12,7 +12,7 @@ COMMENT= Shell combinators and more for python LICENSE= MIT -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_GITHUB= yes diff --git a/sysutils/py-psutil/Makefile b/sysutils/py-psutil/Makefile index 9a546d21d30b..9fb0aa394a1a 100644 --- a/sysutils/py-psutil/Makefile +++ b/sysutils/py-psutil/Makefile @@ -13,8 +13,8 @@ COMMENT= Process utilities module for Python LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2 +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${FLAVOR} USE_PYTHON= autoplist concurrent distutils USES= python diff --git a/sysutils/py-ptyprocess/Makefile b/sysutils/py-ptyprocess/Makefile index 5ac66bb37721..a5cc898f1bd4 100644 --- a/sysutils/py-ptyprocess/Makefile +++ b/sysutils/py-ptyprocess/Makefile @@ -11,7 +11,7 @@ COMMENT= Run a subprocess in a pseudo terminal LICENSE= ISCL -USES?= python +USES= python USE_PYTHON= distutils autoplist .include diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index 4d9f591ceb5e..3b573a0827bc 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -13,19 +13,24 @@ COMMENT= Distributed remote execution and configuration management system LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3\ - ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto \ - ${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore \ - ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar \ - ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:www/py-tornado \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml - -USES= cpe python:2.7+ +py34_BROKEN= fails to package +py35_BROKEN= fails to package +py36_BROKEN= fails to package + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:www/py-tornado@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} + +USES= cpe python + CPE_VENDOR= saltstack CPE_PRODUCT= salt USE_PYTHON= autoplist distutils @@ -63,26 +68,26 @@ RAET_DESC= Install dependencies required for RAET transport TCP_DESC= Install dependencies required for TCP transport ZEROMQ_DESC= Install dependencies required for ZeroMQ transport -RAET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libnacl>=1.0.0:security/py-libnacl \ - ${PYTHON_PKGNAMEPREFIX}ioflo>=1.1.7:devel/py-ioflo \ - ${PYTHON_PKGNAMEPREFIX}raet>=0.6.0:net/py-raet +RAET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libnacl>=1.0.0:security/py-libnacl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ioflo>=1.1.7:devel/py-ioflo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}raet>=0.6.0:net/py-raet@${FLAVOR} -TCP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto +TCP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR} -ZEROMQ_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq -ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto +ZEROMQ_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${FLAVOR} +ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR} .include # Python 2.7-3.3 require enum34, unnecessary for Python 3.4+ .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} .endif # Python 3+ comes with futures built-in .if ${PYTHON_REL} < 3200 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>=2.0:devel/py-futures +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>=2.0:devel/py-futures@${FLAVOR} .endif post-patch: diff --git a/sysutils/py-shutilwhich/Makefile b/sysutils/py-shutilwhich/Makefile index 50efaa436b98..901865e946a5 100644 --- a/sysutils/py-shutilwhich/Makefile +++ b/sysutils/py-shutilwhich/Makefile @@ -11,7 +11,7 @@ COMMENT= shutil.which for those not using Python 3.3 LICENSE= PSFL -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python:-3.3 USE_GITHUB= yes diff --git a/sysutils/py-stdiff/Makefile b/sysutils/py-stdiff/Makefile index 2a4a5a598144..d788ab14849f 100644 --- a/sysutils/py-stdiff/Makefile +++ b/sysutils/py-stdiff/Makefile @@ -4,11 +4,12 @@ PORTNAME= stdiff PORTVERSION= 0.2.1 CATEGORIES= sysutils python MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= araujo@FreeBSD.org COMMENT= Spot The Difference is a file integrity checker -USES= python +USES= python:2.7 USE_PYTHON= distutils OPTIONS_DEFINE= DOCS diff --git a/sysutils/py-superlance/Makefile b/sysutils/py-superlance/Makefile index d38fec79bfa1..30ef0ec9c4cd 100644 --- a/sysutils/py-superlance/Makefile +++ b/sysutils/py-superlance/Makefile @@ -13,7 +13,7 @@ COMMENT= Superlance plugins for supervisord LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor@${FLAVOR} NO_ARCH= yes diff --git a/sysutils/py-supervisor/Makefile b/sysutils/py-supervisor/Makefile index 8af46080249d..a32fe1bfa7f0 100644 --- a/sysutils/py-supervisor/Makefile +++ b/sysutils/py-supervisor/Makefile @@ -11,8 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= hizel@vyborg.ru COMMENT= System for controlling process state under UNIX -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meld3>=0.6.5:www/py-meld3 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0.5.0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meld3>=0.6.5:www/py-meld3@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0.5.0:devel/py-mock@${FLAVOR} PORTDOCS= *.txt *.rst diff --git a/sysutils/py-tmuxp/Makefile b/sysutils/py-tmuxp/Makefile index a21758220958..d8e2b7263e88 100644 --- a/sysutils/py-tmuxp/Makefile +++ b/sysutils/py-tmuxp/Makefile @@ -13,9 +13,9 @@ COMMENT= Session manager for tmux LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argcomplete>=0:devel/py-argcomplete \ - ${PYTHON_PKGNAMEPREFIX}kaptan>=0.5.7:devel/py-kaptan \ - ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3:devel/py-colorama \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argcomplete>=0:devel/py-argcomplete@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}kaptan>=0.5.7:devel/py-kaptan@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3:devel/py-colorama@${FLAVOR} \ tmux:sysutils/tmux NO_ARCH= yes diff --git a/sysutils/py-zdaemon/Makefile b/sysutils/py-zdaemon/Makefile index 5671c8a65d30..5d61965152aa 100644 --- a/sysutils/py-zdaemon/Makefile +++ b/sysutils/py-zdaemon/Makefile @@ -13,7 +13,7 @@ COMMENT= Daemon Process Control Library and Tools for Unix-bases Systems LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>0:devel/py-zconfig +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>0:devel/py-zconfig@${FLAVOR} NO_ARCH= yes USES= python zip diff --git a/sysutils/py3-execnet/Makefile b/sysutils/py3-execnet/Makefile deleted file mode 100644 index 3e8308b55b92..000000000000 --- a/sysutils/py3-execnet/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-execnet - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py3-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.4:devel/py3-apipkg - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/py3-pkginfo/Makefile b/sysutils/py3-pkginfo/Makefile deleted file mode 100644 index b61d7e097b66..000000000000 --- a/sysutils/py3-pkginfo/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: rs.os -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pkginfo - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/py3-ptyprocess/Makefile b/sysutils/py3-ptyprocess/Makefile deleted file mode 100644 index 62c834fff6dc..000000000000 --- a/sysutils/py3-ptyprocess/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-ptyprocess - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/qzeitgeist/Makefile b/sysutils/qzeitgeist/Makefile index 1a9cb51488b9..c72b6f6fc1af 100644 --- a/sysutils/qzeitgeist/Makefile +++ b/sysutils/qzeitgeist/Makefile @@ -20,7 +20,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= rapper:textproc/raptor2 \ ${PYTHON_SITELIBDIR}/rdflib/__init__.py:textproc/py-rdflib -USES= cmake kde:4 python:build tar:bzip2 +USES= cmake kde:4 python:2.7,build tar:bzip2 USE_KDE= automoc4 USE_QT4= corelib dbus declarative qtestlib \ moc_build qmake_build rcc_build uic_build diff --git a/sysutils/rdiff-backup-devel/Makefile b/sysutils/rdiff-backup-devel/Makefile index 41e88e0c09e8..624d5c1e1e98 100644 --- a/sysutils/rdiff-backup-devel/Makefile +++ b/sysutils/rdiff-backup-devel/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= librsync.so:net/librsync2 CONFLICTS= rdiff-backup-[0-9]* -USES= python +USES= python:2.7 USE_PYTHON= distutils MAN1S= rdiff-backup.1 rdiff-backup-statistics.1 diff --git a/sysutils/sample/Makefile b/sysutils/sample/Makefile index d40f0ae08154..ac781fe2303e 100644 --- a/sysutils/sample/Makefile +++ b/sysutils/sample/Makefile @@ -13,7 +13,6 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${LOCALBASE}/lib/libbfd.a:devel/libbfd \ ${LOCALBASE}/lib/libiberty.a:devel/gnulibiberty \ ${LOCALBASE}/lib/libxo.a:devel/libxo \ - ${LOCALBASE}/bin/cython:lang/cython \ ${LOCALBASE}/bin/python:lang/python BROKEN_i386= does not build: don't know how to make sample_support_i386.c @@ -25,6 +24,7 @@ GH_ACCOUNT= freenas GH_TAGNAME= 45e2b86 USES= python:build kmod +USE_PYTHON= cython MAKE_ENV= SYSDIR=${SRC_BASE}/sys diff --git a/sysutils/solaar/Makefile b/sysutils/solaar/Makefile index b390522356d6..f051c4f31691 100644 --- a/sysutils/solaar/Makefile +++ b/sysutils/solaar/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${LOCALBASE}/lib/libhidapi.so:comms/hidapi USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix USE_GITHUB= yes GH_ACCOUNT= pwr @@ -29,7 +29,7 @@ GH_TAGNAME= 53ec751 NO_ARCH= yes OPTIONS_DEFINE= GUI -GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py${PYTHON_MAJOR_VER:S/2//}-gobject3 +GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${FLAVOR} post-patch: @${CP} ${FILESDIR}/hidapi.py ${WRKSRC}/lib/hidapi/udev.py diff --git a/sysutils/tentakel/Makefile b/sysutils/tentakel/Makefile index 23a677be9939..b8b46b778813 100644 --- a/sysutils/tentakel/Makefile +++ b/sysutils/tentakel/Makefile @@ -13,7 +13,7 @@ COMMENT= Program for executing commands on many hosts in parallel WRKSRC= ${WRKDIR}/${DISTNAME}/py -USES= python +USES= python:2.7 USE_PYTHON= distutils OPTIONS_DEFINE= DOCS diff --git a/sysutils/xen-guest-tools/Makefile b/sysutils/xen-guest-tools/Makefile index 24679aa9bf4d..95f591f71ae0 100644 --- a/sysutils/xen-guest-tools/Makefile +++ b/sysutils/xen-guest-tools/Makefile @@ -19,7 +19,7 @@ ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= not yet ported to anything other than amd64 or i386 CONFLICTS= xen-tools-[0-9]* -USES= gmake python:2.7:configure perl5 gettext-runtime:build gettext-tools:build pkgconfig +USES= gmake python:2.7,configure perl5 gettext-runtime:build gettext-tools:build pkgconfig USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} PYTHON_PATH=${PYTHON_CMD} diff --git a/sysutils/yum/Makefile b/sysutils/yum/Makefile index fad3ec5c0adc..93485b96f632 100644 --- a/sysutils/yum/Makefile +++ b/sysutils/yum/Makefile @@ -17,15 +17,16 @@ BUILD_DEPENDS= bash:shells/bash \ intltool-update:textproc/intltool RUN_DEPENDS= bash:shells/bash \ ${PYTHON_SITELIBDIR}/rpm/__init__.py:archivers/rpm4 \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser \ - ${PYTHON_PKGNAMEPREFIX}iniparse>0:devel/py-iniparse \ - ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iniparse>0:devel/py-iniparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber@${FLAVOR} ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 ONLY_FOR_ARCHS_REASON= linux is not available for ${ARCH} -USES= cpe gettext gmake python shebangfix +USES= cpe gettext gmake python:2.7 shebangfix +USE_PYTHON= flavors SHEBANG_FILES= etc/yum-updatesd.init CPE_VENDOR= baseurl diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile index 9d8072d7adb4..fcc803ebdd9a 100644 --- a/sysutils/zeitgeist/Makefile +++ b/sysutils/zeitgeist/Makefile @@ -16,9 +16,9 @@ LICENSE_COMB= multi BUILD_DEPENDS= valac:lang/vala \ dee-tool:devel/dee \ rapper:textproc/raptor2 \ - ${PYTHON_PKGNAMEPREFIX}rdflib>=4.1.1:textproc/py-rdflib -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg \ - ${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus + ${PYTHON_PKGNAMEPREFIX}rdflib>=4.1.1:textproc/py-rdflib@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus@${PY_FLAVOR} USE_GNOME= intlhack glib20 introspection:build GNU_CONFIGURE= yes -- cgit v1.2.3