Index: head/CHANGES =================================================================== --- head/CHANGES +++ head/CHANGES @@ -13,6 +13,36 @@ 20171130: AUTHOR: mat@FreeBSD.org + 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 the port is + using distutils but flavors are not wanted. + + A new USE_PYTHON=optsuffix that will adds 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 it will only generate flavors for the versions in PYTHON2_DEFAULT + and PYTHON3_DEFAULT. Define BUILD_ALL_PYTHON_FLAVORS in your make.conf to + generate all possible flavors. A port can set USE_PYTHON=allflavors to have + all the flavors and not simply the default ones. + + 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} + +20171130: +AUTHOR: mat@FreeBSD.org + To help with flavored ports, helpers are available. In these, replace <*> with the flavor name. Index: head/MOVED =================================================================== --- head/MOVED +++ head/MOVED @@ -7656,7 +7656,6 @@ graphics/sng||2015-07-21|Has expired: Broken for more than 6 months japanese/netype||2015-07-21|Has expired: Broken for more than 6 months databases/p5-DBD-Pg32|databases/p5-DBD-Pg|2015-07-22|Has expired: Use databases/p5-DBD-Pg instead, compatibility probles are fixed -textproc/py-asciinema|textproc/asciinema|2015-07-23|Has expired: use textproc/asciinema instead devel/libiomp5-devel|devel/llvm-devel|2015-07-24|Merged with devel/llvm-devel devel/p5-Test-Tester|devel/p5-Test-Simple|2015-07-25|Has expired: Part of p5-Test-Simple (use that instead), and included in perl 5.22 devel/p5-Test-use-ok|devel/p5-Test-Simple|2015-07-25|Has expired: Part of devel/p5-Test-Simple (use that instead), and included in perl 5.22 @@ -9099,7 +9098,6 @@ devel/avr-gcc-devel||2017-03-13|Has expired: There's no longer a point to have both, a -devel and a regular port of GCC for the AVR net/py-pysimplesoap|net/py-soap2py|2017-03-13|Rename to match upstream naming games/trigger-data|games/trigger-rally|2017-03-15|Merged into games/trigger-rally -devel/py-setuptools|devel/py27-setuptools|2017-03-16|Renamed to better match other python ports devel/py-setuptools27|devel/py27-setuptools|2017-03-16|Renamed to better match other python ports devel/py-setuptools33|devel/py33-setuptools|2017-03-16|Renamed to better match other python ports devel/py-setuptools34|devel/py34-setuptools|2017-03-16|Renamed to better match other python ports @@ -9657,3 +9655,149 @@ devel/buildbot-www|devel/py-buildbot-www|2017-11-29|Rename to comply with PyPI scheme. emulators/ppsspp-devel|emulators/ppsspp|2017-11-29|Out of date: use emulators/ppsspp for now audio/shairport|audio/shairport-sync|2017-11-29|Has expired: Officially unmaintained upstream. Use audio/shairport-sync instead +accessibility/py3-speech-dispatcher|accessibility/py-speech-dispatcher@py36|2017-11-30|Moved to a flavored, generic, version +accessibility/py3-atspi|accessibility/py-atspi@py36|2017-11-30|Moved to a flavored, generic, version +archivers/py3-libarchive-c|archivers/py-libarchive-c@py36|2017-11-30|Moved to a flavored, generic, version +audio/py3-mutagen|audio/py-mutagen@py36|2017-11-30|Moved to a flavored, generic, version +audio/py3-pylast|audio/py-pylast@py36|2017-11-30|Moved to a flavored, generic, version +databases/py3-apsw|databases/py-apsw@py36|2017-11-30|Moved to a flavored, generic, version +databases/py3-bsddb3|databases/py-bsddb3@py36|2017-11-30|Moved to a flavored, generic, version +databases/py3-mysqlclient|databases/py-mysqlclient@py36|2017-11-30|Moved to a flavored, generic, version +databases/py3-psycopg2|databases/py-psycopg2@py36|2017-11-30|Moved to a flavored, generic, version +databases/py34-gdbm|databases/py-gdbm@py34|2017-11-30|Moved to a flavored, generic, version +databases/py34-sqlite3|databases/py-sqlite3@py34|2017-11-30|Moved to a flavored, generic, version +databases/py35-gdbm|databases/py-gdbm@py35|2017-11-30|Moved to a flavored, generic, version +databases/py35-sqlite3|databases/py-sqlite3@py35|2017-11-30|Moved to a flavored, generic, version +databases/py36-gdbm|databases/py-gdbm@py36|2017-11-30|Moved to a flavored, generic, version +databases/py36-sqlite3|databases/py-sqlite3@py36|2017-11-30|Moved to a flavored, generic, version +devel/py27-setuptools|devel/py-setuptools@py27|2017-11-30|Moved to a flavored, generic, version +devel/py3-threema-msgapi|devel/py-threema-msgapi@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-Jinja2|devel/py-Jinja2@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-apipkg|devel/py-apipkg@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-asttokens|devel/py-asttokens@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-babel|devel/py-babel@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-cffi|devel/py-cffi@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-click-log|devel/py-click-log@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-click-threading|devel/py-click-threading@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-click|devel/py-click@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-colorama|devel/py-colorama@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-coloredlogs|devel/py-coloredlogs@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-dateutil|devel/py-dateutil@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-dbus|devel/py-dbus@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-defusedxml|devel/py-defusedxml@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-docopt|devel/py-docopt@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-flake8-builtins|devel/py-flake8-builtins@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-flake8-docstrings|devel/py-flake8-docstrings@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-flake8-import-order|devel/py-flake8-import-order@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-flake8-polyfill|devel/py-flake8-polyfill@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-flake8-quotes|devel/py-flake8-quotes@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-flake8|devel/py-flake8@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-freezegun|devel/py-freezegun@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-gobject3|devel/py-gobject3@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-hgtools|devel/py-hgtools@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-icalendar|devel/py-icalendar@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-jedi|devel/py-jedi@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-jsonschema|devel/py-jsonschema@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-libpeas|devel/py-libpeas@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-libzfs|devel/py-libzfs@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-llfuse|devel/py-llfuse@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-lxml|devel/py-lxml@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-mccabe|devel/py-mccabe@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-mock|devel/py-mock@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-nose|devel/py-nose@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pbr|devel/py-pbr@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pip|devel/py-pip@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pluggy|devel/py-pluggy@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-ply|devel/py-ply@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pretend|devel/py-pretend@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-prompt_toolkit|devel/py-prompt_toolkit@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-protobuf|devel/py-protobuf@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-py|devel/py-py@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pyasn1|devel/py-pyasn1@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pycodestyle|devel/py-pycodestyle@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pycparser|devel/py-pycparser@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pydocstyle|devel/py-pydocstyle@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pyflakes|devel/py-pyflakes@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pygit2|devel/py-pygit2@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pyicu|devel/py-pyicu@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pylru-cache|devel/py-pylru-cache@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pytest-capturelog|devel/py-pytest-capturelog@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pytest-runner|devel/py-pytest-runner@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pytest-timeout|devel/py-pytest-timeout@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pytest-xdist|devel/py-pytest-xdist@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pytest|devel/py-pytest@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-python-magic|devel/py-python-magic@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-pytz|devel/py-pytz@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-rubymarshal|devel/py-rubymarshal@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-scripttest|devel/py-scripttest@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-setproctitle|devel/py-setproctitle@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-setuptools_scm|devel/py-setuptools_scm@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-simplejson|devel/py-simplejson@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-six|devel/py-six@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-tabulate|devel/py-tabulate@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-toposort|devel/py-toposort@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-tox|devel/py-tox@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-tzlocal|devel/py-tzlocal@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-urwid|devel/py-urwid@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-vcversioner|devel/py-vcversioner@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-verboselogs|devel/py-verboselogs@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-virtualenv|devel/py-virtualenv@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-voluptuous|devel/py-voluptuous@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-wcwidth|devel/py-wcwidth@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-xdg|devel/py-xdg@py36|2017-11-30|Moved to a flavored, generic, version +devel/py3-yaml|devel/py-yaml@py36|2017-11-30|Moved to a flavored, generic, version +devel/py34-setuptools|devel/py-setuptools@py34|2017-11-30|Moved to a flavored, generic, version +devel/py35-setuptools|devel/py-setuptools@py35|2017-11-30|Moved to a flavored, generic, version +devel/py36-setuptools|devel/py-setuptools@py36|2017-11-30|Moved to a flavored, generic, version +dns/py3-dnspython|dns/py-dnspython@py36|2017-11-30|Moved to a flavored, generic, version +dns/py3-idna|dns/py-idna@py36|2017-11-30|Moved to a flavored, generic, version +graphics/py3-cairo|graphics/py-cairo@py36|2017-11-30|Moved to a flavored, generic, version +graphics/py3-imagesize|graphics/py-imagesize@py36|2017-11-30|Moved to a flavored, generic, version +graphics/py3-pillow|graphics/py-pillow@py36|2017-11-30|Moved to a flavored, generic, version +graphics/py3-pygraphviz|graphics/py-pygraphviz@py36|2017-11-30|Moved to a flavored, generic, version +lang/cython3|lang/cython@py36|2017-11-30|Moved to a flavored, generic, version +misc/py3-pexpect|misc/py-pexpect@py36|2017-11-30|Moved to a flavored, generic, version +misc/py3-tqdm|misc/py-tqdm@py36|2017-11-30|Moved to a flavored, generic, version +multimedia/py3-gstreamer1|multimedia/py-gstreamer1@py36|2017-11-30|Moved to a flavored, generic, version +net-mgmt/py3-dnsdiag|net-mgmt/py-dnsdiag@py36|2017-11-30|Moved to a flavored, generic, version +net/py3-netifaces|net/py-netifaces@py36|2017-11-30|Moved to a flavored, generic, version +net/py3-pysocks|net/py-pysocks@py36|2017-11-30|Moved to a flavored, generic, version +net/py3-urllib3|net/py-urllib3@py36|2017-11-30|Moved to a flavored, generic, version +print/py3-fonttools|print/py-fonttools@py36|2017-11-30|Moved to a flavored, generic, version +print/py3-pycups|print/py-pycups@py36|2017-11-30|Moved to a flavored, generic, version +security/py3-certifi|security/py-certifi@py36|2017-11-30|Moved to a flavored, generic, version +security/py3-cryptography|security/py-cryptography@py36|2017-11-30|Moved to a flavored, generic, version +security/py3-ecdsa|security/py-ecdsa@py36|2017-11-30|Moved to a flavored, generic, version +security/py3-libnacl|security/py-libnacl@py36|2017-11-30|Moved to a flavored, generic, version +security/py3-openssl|security/py-openssl@py36|2017-11-30|Moved to a flavored, generic, version +security/py3-pbkdf2|security/py-pbkdf2@py36|2017-11-30|Moved to a flavored, generic, version +security/py3-pyaes|security/py-pyaes@py36|2017-11-30|Moved to a flavored, generic, version +security/py3-pycrypto|security/py-pycrypto@py36|2017-11-30|Moved to a flavored, generic, version +sysutils/py3-execnet|sysutils/py-execnet@py36|2017-11-30|Moved to a flavored, generic, version +sysutils/py3-pkginfo|sysutils/py-pkginfo@py36|2017-11-30|Moved to a flavored, generic, version +sysutils/py3-ptyprocess|sysutils/py-ptyprocess@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-asciinema|textproc/py-asciinema@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-pager|textproc/py-pager@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-MarkupSafe|textproc/py-MarkupSafe@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-alabaster|textproc/py-alabaster@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-chardet|textproc/py-chardet@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-docutils|textproc/py-docutils@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-feedparser|textproc/py-feedparser@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-humanfriendly|textproc/py-humanfriendly@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-hunspell|textproc/py-hunspell@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-libxml2|textproc/py-libxml2@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-numpydoc|textproc/py-numpydoc@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-pyPEG2|textproc/py-pyPEG2@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-pygments|textproc/py-pygments@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-pystemmer|textproc/py-pystemmer@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-qrcode|textproc/py-qrcode@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-snowballstemmer|textproc/py-snowballstemmer@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-sphinx|textproc/py-sphinx@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-sphinx_rtd_theme|textproc/py-sphinx_rtd_theme@py36|2017-11-30|Moved to a flavored, generic, version +textproc/py3-texttable|textproc/py-texttable@py36|2017-11-30|Moved to a flavored, generic, version +www/py3-cssutils|www/py-cssutils@py36|2017-11-30|Moved to a flavored, generic, version +www/py3-httplib2|www/py-httplib2@py36|2017-11-30|Moved to a flavored, generic, version +www/py3-requests|www/py-requests@py36|2017-11-30|Moved to a flavored, generic, version +x11-toolkits/py34-tkinter|x11-toolkits/py-tkinter@py34|2017-11-30|Moved to a flavored, generic, version +x11-toolkits/py35-tkinter|x11-toolkits/py-tkinter@py35|2017-11-30|Moved to a flavored, generic, version +x11-toolkits/py36-tkinter|x11-toolkits/py-tkinter@py36|2017-11-30|Moved to a flavored, generic, version Index: head/Mk/Uses/gnome.mk =================================================================== --- head/Mk/Uses/gnome.mk +++ head/Mk/Uses/gnome.mk @@ -388,14 +388,15 @@ pygobject_RUN_DEPENDS= pygobject-codegen-2.0:devel/py-gobject pygobject_USE_GNOME_IMPL= glib20 +# Have to keep two components because the _DETECT file is not the same. py3gobject3_DETECT= ${LOCALBASE}/share/py3gobject3/.keep -py3gobject3_BUILD_DEPENDS= py3?-gobject3>=0:devel/py3-gobject3 -py3gobject3_RUN_DEPENDS= py3?-gobject3>=0:devel/py3-gobject3 +py3gobject3_BUILD_DEPENDS= py3?-gobject3>=0:devel/py-gobject3@${PY_FLAVOR} +py3gobject3_RUN_DEPENDS= py3?-gobject3>=0:devel/py-gobject3@${PY_FLAVOR} py3gobject3_USE_GNOME_IMPL= glib20 pygobject3_DETECT= ${LOCALBASE}/share/pygobject3/.keep -pygobject3_BUILD_DEPENDS= py2?-gobject3>=0:devel/py-gobject3 -pygobject3_RUN_DEPENDS= py2?-gobject3>=0:devel/py-gobject3 +pygobject3_BUILD_DEPENDS= py2?-gobject3>=0:devel/py-gobject3@${PY_FLAVOR} +pygobject3_RUN_DEPENDS= py2?-gobject3>=0:devel/py-gobject3@${PY_FLAVOR} pygobject3_USE_GNOME_IMPL= glib20 pygtk2_DETECT= ${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc Index: head/Mk/Uses/pyqt.mk =================================================================== --- head/Mk/Uses/pyqt.mk +++ head/Mk/Uses/pyqt.mk @@ -241,8 +241,8 @@ _USE_PYQT_ALL+= ${_USE_PYQT${_PYQT_VERSION}_ONLY} .for comp in ${_USE_PYQT_ALL:O:u} _USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}_build py-${comp}_run -py-${comp}_BUILD_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT} -py-${comp}_RUN_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT} +py-${comp}_BUILD_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR} +py-${comp}_RUN_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR} py-${comp}_build_BUILD_DEPENDS?= ${py-${comp}_BUILD_DEPENDS} py-${comp}_run_RUN_DEPENDS?= ${py-${comp}_RUN_DEPENDS} .endfor Index: head/Mk/Uses/python.mk =================================================================== --- head/Mk/Uses/python.mk +++ head/Mk/Uses/python.mk @@ -71,8 +71,24 @@ # prefix-less original name, e.g. # bin/foo-2.7 --> bin/foo. # +# cython - Depend on lang/cython at build-time. +# +# cython_run - Depend on lang/cython at run-time. +# +# flavors - Force creation of flavors for Python 2 and 3 default +# versions, where applicable. +# +# noflavors - Disable automatic creation of flavors if they would +# otherwise be created and they are not wanted. +# +# allflavors - Generate flavors for all possible versions and not +# simply the default ones. +# +# optsuffix - Set PKGNAMESUFFIX to PYTHON_PKGNAMESUFFIX if not the +# default python version. +# # distutils - Use distutils as do-configure, do-build and -# do-install targets. +# do-install targets. implies flavors. # # autoplist - Automatically generates the packaging list for a # port that uses distutils when defined. @@ -235,9 +251,19 @@ # Make each individual feature available as _PYTHON_FEATURE_ .for var in ${USE_PYTHON} -_PYTHON_FEATURE_${var:tu}= yes +_PYTHON_FEATURE_${var:C/=.*$//:tu}= ${var:C/.*=//:S/,/ /g} .endfor +# distutils automatically generates flavors depending on the supported +# versions. +.if defined(_PYTHON_FEATURE_DISTUTILS) +_PYTHON_FEATURE_FLAVORS= yes +.endif + +.if defined(_PYTHON_FEATURE_NOFLAVORS) +.undef _PYTHON_FEATURE_FLAVORS +.endif + # Make sure that no dependency or some other environment variable # pollutes the build/run dependency detection .undef _PYTHON_BUILD_DEP @@ -307,6 +333,7 @@ PYTHON3_DEFAULT_VERSION?= python${PYTHON3_DEFAULT} .endif +# Keep this before the FLAVOR selection to get the meta port dependency. .if ${_PYTHON_ARGS} == "2" _PYTHON_ARGS= ${PYTHON2_DEFAULT_VERSION:S/^python//} _WANTS_META_PORT= 2 @@ -372,6 +399,60 @@ .endif .endif # defined(_PYTHON_VERSION_NONSUPPORTED) +# Automatically generates FLAVORS if empty +.if empty(FLAVORS) && defined(_PYTHON_FEATURE_FLAVORS) +. undef _VALID_PYTHON_VERSIONS +. for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS} +__VER= ${ver} +. if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \ + ${__VER} < ${_PYTHON_VERSION_MINIMUM})) && \ + !(!empty(_PYTHON_VERSION_MAXIMUM) && ( \ + ${__VER} > ${_PYTHON_VERSION_MAXIMUM})) +. if empty(_VALID_PYTHON_VERSIONS:M${ver}) +_VALID_PYTHON_VERSIONS+= ${ver} +. endif +. endif +. endfor +# Get all possible flavors depending on version requirements +. if defined(_VALID_PYTHON_VERSIONS) +_ALL_PYTHON_FLAVORS= ${_VALID_PYTHON_VERSIONS:S/.//:S/^/py/} +. else +_ALL_PYTHON_FLAVORS= ${_PYTHON_VERSIONS:S/.//:S/^/py/} +. endif +# Decide how many flavors we want. By default, only generate the default +# versions. +. if defined(BUILD_ALL_PYTHON_FLAVORS) || defined(_PYTHON_FEATURE_ALLFLAVORS) +FLAVORS= ${_ALL_PYTHON_FLAVORS} +. else +. for _v in ${PYTHON3_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON_DEFAULT} +_f= py${_v:S/.//} +. if ${_ALL_PYTHON_FLAVORS:M${_f}} && !${FLAVORS:M${_f}} +FLAVORS:= ${_f} ${FLAVORS} +. endif +. endfor +. endif +. if !empty(FLAVORS) && empty(FLAVOR) +FLAVOR= ${FLAVORS:[1]} +. endif +.endif + +.if ${FLAVOR:Mpy[23]*} +_PYTHON_VERSION= ${FLAVOR:S/py//:C/(.)/\1./} +.endif + +.if !empty(FLAVOR) && ${_PYTHON_VERSION} != ${PYTHON_DEFAULT} +.if defined(_PYTHON_FEATURE_OPTSUFFIX) +PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} +.endif +.endif + +# To avoid having dependencies with @ and empty flavor: +.if empty(FLAVOR) +PY_FLAVOR= ${PYTHON_VERSION:S/^python/py/:S/.//} +.else +PY_FLAVOR= ${FLAVOR} +.endif + # Pass PYTHON_VERSION down the dependency chain. This ensures that # port A -> B -> C all will use the same python version and do not # try to find a different one, if the passed version fits into @@ -460,6 +541,14 @@ # - it uses USE_PYTHON=distutils # +.if defined(_PYTHON_FEATURE_CYTHON) +BUILD_DEPENDS+= cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR} +.endif + +.if defined(_PYTHON_FEATURE_CYTHON_RUN) +RUN_DEPENDS+= cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR} +.endif + .if defined(_PYTHON_FEATURE_CONCURRENT) _USES_POST+= uniquefiles:dirs .if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} @@ -483,8 +572,8 @@ _CURRENTPORT:= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} .if defined(_PYTHON_FEATURE_DISTUTILS) && \ ${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} .endif # distutils support @@ -565,9 +654,32 @@ CMAKE_ARGS+= -DPython_ADDITIONAL_VERSIONS=${PYTHON_VER} # Python 3rd-party modules -PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game -PYNUMERIC= ${PYTHON_SITELIBDIR}/Numeric/Numeric.py:math/py-numeric -PYNUMPY= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy +PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR} +PYNUMERIC= ${PYTHON_SITELIBDIR}/Numeric/Numeric.py:math/py-numeric@${PY_FLAVOR} +PYNUMPY= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy@${PY_FLAVOR} + +# Common Python modules that can be needed but only for some versions of Python. +.if ${PYTHON_REL} < 3400 +PY_ENUM34= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${PY_FLAVOR} +PY_ENUM_COMPAT= ${PYTHON_PKGNAMEPREFIX}enum-compat>0:devel/py-enum-compat@${PY_FLAVOR} +PY_PATHLIB= ${PYTHON_PKGNAMEPREFIX}pathlib>0:devel/py-pathlib@${PY_FLAVOR} +.else +PY_ENUM34= +PY_ENUM_COMPAT= +PY_PATHLIB= +.endif + +.if ${PYTHON_REL} < 3300 +PY_IPADDRESS= ${PYTHON_PKGNAMEPREFIX}ipaddress>0:net/py-ipaddress@${PY_FLAVOR} +.else +PY_IPADDRESS= +.endif + +.if ${PYTHON_REL} < 3200 +PY_FUTURES= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${PY_FLAVOR} +.else +PY_FUTURES= +.endif # dependencies .if defined(_PYTHON_BUILD_DEP) Index: head/UPDATING =================================================================== --- head/UPDATING +++ head/UPDATING @@ -5,6 +5,20 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20171130: + AFFECTS: */py* + AUTHOR: mat@FreeBSD.org + + Ports using Python via USES=python are now flavored. All the py3-* ports + have been removed and folded into their py-* master ports. + + People using Poudriere and binary packages do not have to do anything. + + For other people, to build the Python 3.6 version of, for example, + databases/py-gdbm, you need to run: + + # make FLAVOR=py36 install + 20171126: AFFECTS: users of security/p5-openxpki AUTHOR: dbaio@FreeBSD.org Index: head/accessibility/Makefile =================================================================== --- head/accessibility/Makefile +++ head/accessibility/Makefile @@ -23,8 +23,7 @@ SUBDIR += orca SUBDIR += py-atspi SUBDIR += py-papi - SUBDIR += py3-atspi - SUBDIR += py3-speech-dispatcher + SUBDIR += py-speech-dispatcher SUBDIR += qt4-accessible SUBDIR += redshift SUBDIR += rubygem-atk Index: head/accessibility/accerciser/Makefile =================================================================== --- head/accessibility/accerciser/Makefile +++ head/accessibility/accerciser/Makefile @@ -19,7 +19,7 @@ at-spi2-core>=2.1.5:accessibility/at-spi2-core NO_ARCH= yes -USES= gettext gmake pkgconfig python:3 shebangfix tar:xz +USES= gettext gmake pkgconfig python:3.4+ shebangfix tar:xz USE_GNOME= gtk30 intlhack py3gobject3 INSTALLS_ICONS= yes GNU_CONFIGURE= yes Index: head/accessibility/caribou/Makefile =================================================================== --- head/accessibility/caribou/Makefile +++ head/accessibility/caribou/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libclutter-glx-1.0.so:graphics/clutter \ libgee-0.8.so:devel/libgee \ libxklavier.so:x11/libxklavier -RUN_DEPENDS= py2?-atspi>=2.1.91:accessibility/py-atspi +RUN_DEPENDS= py2?-atspi>=2.1.91:accessibility/py-atspi@${PY_FLAVOR} USES= gettext gmake gnome libtool pathfix pkgconfig python:2 \ shebangfix tar:xz Index: head/accessibility/orca/Makefile =================================================================== --- head/accessibility/orca/Makefile +++ head/accessibility/orca/Makefile @@ -10,16 +10,16 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Scriptable screen reader -BUILD_DEPENDS= py3?-dbus>=0:devel/py3-dbus \ - py3?-xdg>=0:devel/py3-xdg \ - py3?-cairo>=0:graphics/py3-cairo \ +BUILD_DEPENDS= py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} \ + py3?-xdg>=0:devel/py-xdg@${PY_FLAVOR} \ + py3?-cairo>=0:graphics/py-cairo@${PY_FLAVOR} \ itstool:textproc/itstool LIB_DEPENDS= libatspi.so:accessibility/at-spi2-core -RUN_DEPENDS= py3?-dbus>=0:devel/py3-dbus \ - py3?-speech-dispatcher>=0:accessibility/py3-speech-dispatcher \ - py3?-atspi>=0:accessibility/py3-atspi \ - py3?-xdg>=0:devel/py3-xdg \ - py3?-cairo>=0:graphics/py3-cairo +RUN_DEPENDS= py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} \ + py3?-speech-dispatcher>=0:accessibility/py-speech-dispatcher@${PY_FLAVOR} \ + py3?-atspi>=0:accessibility/py-atspi@${PY_FLAVOR} \ + py3?-xdg>=0:devel/py-xdg@${PY_FLAVOR} \ + py3?-cairo>=0:graphics/py-cairo@${PY_FLAVOR} # conflict with py*-json-py because orca uses the json from python itself # and py*-json-py shadows this. @@ -27,7 +27,7 @@ PORTSCOUT= limitw:1,even NO_ARCH= yes -USES= gettext gmake gnome pathfix pkgconfig python:3 tar:xz +USES= gettext gmake gnome pathfix pkgconfig python:3.4+ tar:xz USE_GNOME= gtk30 py3gobject3 intlhack INSTALLS_ICONS= yes GNU_CONFIGURE= yes Index: head/accessibility/py-atspi/Makefile =================================================================== --- head/accessibility/py-atspi/Makefile +++ head/accessibility/py-atspi/Makefile @@ -19,8 +19,16 @@ CONFLICTS= at-spi-1.[0-9]* PORTSCOUT= limitw:1,even -USES= gettext gmake gnome localbase pathfix pkgconfig python:2 tar:xz +USES= gettext gmake gnome localbase pathfix pkgconfig python tar:xz +USE_PYTHON= flavors +.if ${FLAVOR:Upy27:Mpy2*} USE_GNOME= intlhack pygobject3 +.else +USE_GNOME= intlhack py3gobject3 +.endif +py34_PLIST= ${.CURDIR}/pkg-plist-py3 +py35_PLIST= ${.CURDIR}/pkg-plist-py3 +py36_PLIST= ${.CURDIR}/pkg-plist-py3 GNU_CONFIGURE= yes .include Index: head/accessibility/py-atspi/pkg-plist-py3 =================================================================== --- head/accessibility/py-atspi/pkg-plist-py3 +++ head/accessibility/py-atspi/pkg-plist-py3 @@ -0,0 +1,72 @@ +%%PYTHON_SITELIBDIR%%/pyatspi/Accessibility.py +%%PYTHON_SITELIBDIR%%/pyatspi/__init__.py +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/Accessibility.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/Accessibility.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/atspienum.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/atspienum.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pyatspi/action.py +%%PYTHON_SITELIBDIR%%/pyatspi/appevent.py +%%PYTHON_SITELIBDIR%%/pyatspi/application.py +%%PYTHON_SITELIBDIR%%/pyatspi/atspienum.py +%%PYTHON_SITELIBDIR%%/pyatspi/collection.py +%%PYTHON_SITELIBDIR%%/pyatspi/component.py +%%PYTHON_SITELIBDIR%%/pyatspi/constants.py +%%PYTHON_SITELIBDIR%%/pyatspi/deviceevent.py +%%PYTHON_SITELIBDIR%%/pyatspi/document.py +%%PYTHON_SITELIBDIR%%/pyatspi/editabletext.py +%%PYTHON_SITELIBDIR%%/pyatspi/hypertext.py +%%PYTHON_SITELIBDIR%%/pyatspi/image.py +%%PYTHON_SITELIBDIR%%/pyatspi/interface.py +%%PYTHON_SITELIBDIR%%/pyatspi/registry.py +%%PYTHON_SITELIBDIR%%/pyatspi/role.py +%%PYTHON_SITELIBDIR%%/pyatspi/selection.py +%%PYTHON_SITELIBDIR%%/pyatspi/state.py +%%PYTHON_SITELIBDIR%%/pyatspi/table.py +%%PYTHON_SITELIBDIR%%/pyatspi/tablecell.py +%%PYTHON_SITELIBDIR%%/pyatspi/text.py +%%PYTHON_SITELIBDIR%%/pyatspi/utils.py +%%PYTHON_SITELIBDIR%%/pyatspi/value.py Index: head/accessibility/py-speech-dispatcher/Makefile =================================================================== --- head/accessibility/py-speech-dispatcher/Makefile +++ head/accessibility/py-speech-dispatcher/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +PORTREVISION= 0 +CATEGORIES= accessibility audio python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +COMMENT= Python bindings for Speech Dispatcher + +SPEECH_SLAVE= yes + +MASTERDIR= ${.CURDIR:H}/speech-dispatcher + +BUILD_WRKSRC= ${WRKSRC}/src/api/python +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +PLIST= ${.CURDIR}/pkg-plist + +.include "${MASTERDIR}/Makefile" Index: head/accessibility/py-speech-dispatcher/pkg-plist =================================================================== --- head/accessibility/py-speech-dispatcher/pkg-plist +++ head/accessibility/py-speech-dispatcher/pkg-plist @@ -0,0 +1,24 @@ +bin/spd-conf +%%PYTHON_SITELIBDIR%%/speechd/__init__.py +%%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/speechd/_test.py +%%PYTHON_SITELIBDIR%%/speechd/client.py +%%PYTHON_SITELIBDIR%%/speechd/paths.py +%%PYTHON_SITELIBDIR%%/speechd_config/__init__.py +%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/speechd_config/config.py +%%PYTHON_SITELIBDIR%%/speechd_config/paths.py +share/sounds/speech-dispatcher/test.wav +%%DATADIR%%/conf/desktop/speechd.desktop Index: head/accessibility/py3-atspi/Makefile =================================================================== --- head/accessibility/py3-atspi/Makefile +++ head/accessibility/py3-atspi/Makefile @@ -1,27 +0,0 @@ -# Created by: Maxim Sobolev -# $FreeBSD$ - -PORTNAME= atspi -PORTVERSION= 2.24.0 -CATEGORIES= accessibility x11-toolkits python -MASTER_SITES= GNOME/sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= pyatspi-${PORTVERSION} -DIST_SUBDIR= gnome3 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Python3 API for the D-BUS based SPI framework - -LICENSE= LGPL20 - -RUN_DEPENDS= ${LOCALBASE}/libexec/at-spi2-registryd:accessibility/at-spi2-core - -CONFLICTS= at-spi-1.[0-9]* -PORTSCOUT= limitw:1,even - -NO_ARCH= yes -USES= gettext gmake gnome localbase pathfix pkgconfig python:3 tar:xz -USE_GNOME= intlhack py3gobject3 -GNU_CONFIGURE= yes - -.include Index: head/accessibility/py3-atspi/distinfo =================================================================== --- head/accessibility/py3-atspi/distinfo +++ head/accessibility/py3-atspi/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1491080637 -SHA256 (gnome3/pyatspi-2.24.0.tar.xz) = e7ef47a5d387fdc64a01722ef2bcced54c4d6b225fbe34867189e1f88ff0a692 -SIZE (gnome3/pyatspi-2.24.0.tar.xz) = 298228 Index: head/accessibility/py3-atspi/pkg-descr =================================================================== --- head/accessibility/py3-atspi/pkg-descr +++ head/accessibility/py3-atspi/pkg-descr @@ -1,8 +0,0 @@ -This is the Gnome Accessibility Project's Assistive Technology -Service Provider Interface. It allows accessibility applications -and assistive technologies to announce their respective existence -to each other. - -This port is the Python API to interface with the D-BUS based SPI framework. - -WWW: http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus Index: head/accessibility/py3-atspi/pkg-plist =================================================================== --- head/accessibility/py3-atspi/pkg-plist +++ head/accessibility/py3-atspi/pkg-plist @@ -1,72 +0,0 @@ -%%PYTHON_SITELIBDIR%%/pyatspi/Accessibility.py -%%PYTHON_SITELIBDIR%%/pyatspi/__init__.py -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/Accessibility.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/Accessibility.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/atspienum.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/atspienum.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/action.py -%%PYTHON_SITELIBDIR%%/pyatspi/appevent.py -%%PYTHON_SITELIBDIR%%/pyatspi/application.py -%%PYTHON_SITELIBDIR%%/pyatspi/atspienum.py -%%PYTHON_SITELIBDIR%%/pyatspi/collection.py -%%PYTHON_SITELIBDIR%%/pyatspi/component.py -%%PYTHON_SITELIBDIR%%/pyatspi/constants.py -%%PYTHON_SITELIBDIR%%/pyatspi/deviceevent.py -%%PYTHON_SITELIBDIR%%/pyatspi/document.py -%%PYTHON_SITELIBDIR%%/pyatspi/editabletext.py -%%PYTHON_SITELIBDIR%%/pyatspi/hypertext.py -%%PYTHON_SITELIBDIR%%/pyatspi/image.py -%%PYTHON_SITELIBDIR%%/pyatspi/interface.py -%%PYTHON_SITELIBDIR%%/pyatspi/registry.py -%%PYTHON_SITELIBDIR%%/pyatspi/role.py -%%PYTHON_SITELIBDIR%%/pyatspi/selection.py -%%PYTHON_SITELIBDIR%%/pyatspi/state.py -%%PYTHON_SITELIBDIR%%/pyatspi/table.py -%%PYTHON_SITELIBDIR%%/pyatspi/tablecell.py -%%PYTHON_SITELIBDIR%%/pyatspi/text.py -%%PYTHON_SITELIBDIR%%/pyatspi/utils.py -%%PYTHON_SITELIBDIR%%/pyatspi/value.py Index: head/accessibility/py3-speech-dispatcher/Makefile =================================================================== --- head/accessibility/py3-speech-dispatcher/Makefile +++ head/accessibility/py3-speech-dispatcher/Makefile @@ -1,18 +0,0 @@ -# $FreeBSD$ - -PORTREVISION= 0 -CATEGORIES= accessibility audio python -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -COMMENT= Python bindings for Speech Dispatcher - -SPEECH_SLAVE= yes - -MASTERDIR= ${.CURDIR:H}/speech-dispatcher - -BUILD_WRKSRC= ${WRKSRC}/src/api/python -INSTALL_WRKSRC= ${BUILD_WRKSRC} - -PLIST= ${.CURDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" Index: head/accessibility/py3-speech-dispatcher/pkg-plist =================================================================== --- head/accessibility/py3-speech-dispatcher/pkg-plist +++ head/accessibility/py3-speech-dispatcher/pkg-plist @@ -1,24 +0,0 @@ -bin/spd-conf -%%PYTHON_SITELIBDIR%%/speechd/__init__.py -%%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/speechd/_test.py -%%PYTHON_SITELIBDIR%%/speechd/client.py -%%PYTHON_SITELIBDIR%%/speechd/paths.py -%%PYTHON_SITELIBDIR%%/speechd_config/__init__.py -%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/speechd_config/config.py -%%PYTHON_SITELIBDIR%%/speechd_config/paths.py -share/sounds/speech-dispatcher/test.wav -%%DATADIR%%/conf/desktop/speechd.desktop Index: head/accessibility/redshift/Makefile =================================================================== --- head/accessibility/redshift/Makefile +++ head/accessibility/redshift/Makefile @@ -42,10 +42,10 @@ VIDMODE_USE= XORG=xxf86vm VIDMODE_CONFIGURE_ENABLE= vidmode -GUI_USES= python +GUI_USES= python:2.7 GUI_CONFIGURE_ENABLE= gui -GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2 \ - ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg +GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} GNOME_CONFIGURE_ENABLE= gnome-clock GNOME_USE= GNOME=glib20,gconf2 Index: head/accessibility/speech-dispatcher/Makefile =================================================================== --- head/accessibility/speech-dispatcher/Makefile +++ head/accessibility/speech-dispatcher/Makefile @@ -92,8 +92,9 @@ NO_ARCH= yes USES+= python:3.3+ +USE_PYTHON= flavors LIB_DEPENDS+= libspeechd.so:accessibility/speech-dispatcher -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py3-xdg +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${FLAVOR} .endif Index: head/archivers/Makefile =================================================================== --- head/archivers/Makefile +++ head/archivers/Makefile @@ -189,7 +189,6 @@ SUBDIR += py-rjsmin SUBDIR += py-warctools SUBDIR += py-xopen - SUBDIR += py3-libarchive-c SUBDIR += qpress SUBDIR += quazip SUBDIR += quazip-qt5 Index: head/archivers/py-attic/Makefile =================================================================== --- head/archivers/py-attic/Makefile +++ head/archivers/py-attic/Makefile @@ -14,8 +14,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:devel/py-msgpack-python -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:devel/py-msgpack-python +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:devel/py-msgpack-python@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:devel/py-msgpack-python@${FLAVOR} USES= python:3.3+ ssl USE_PYTHON= autoplist distutils @@ -23,13 +23,6 @@ STRIP_FILES= hashindex.so platform_freebsd.so chunker.so crypto.so PYDISTUTILS_BUILDPATH=${BUILD_WRKSRC}/build/lib.${OPSYS:tl}-${UNAMER}-${ARCH}-${PYTHON_VER} -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - regression-test: build ${SETENV} PYTHONPATH="${PYDISTUTILS_BUILDPATH}:${PYTHONPATH}" \ ${PYTHON_CMD} -m attic.testsuite.run @@ -37,4 +30,4 @@ post-install: ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/attic/,} -.include +.include Index: head/archivers/py-borgbackup/Makefile =================================================================== --- head/archivers/py-borgbackup/Makefile +++ head/archivers/py-borgbackup/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm@${FLAVOR} LIB_DEPENDS= liblz4.so:archivers/liblz4 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.6:devel/py-msgpack-python +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.6:devel/py-msgpack-python@${FLAVOR} OPTIONS_DEFINE= FUSE FUSE_DESC= Support to mount locally borg backup files @@ -26,15 +26,8 @@ USES= python:3.4+ ssl USE_PYTHON= autoplist distutils -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - post-install: @${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/borg/ -name "*.so" \ -exec ${STRIP_CMD} {} \; -.include +.include Index: head/archivers/py-czipfile/Makefile =================================================================== --- head/archivers/py-czipfile/Makefile +++ head/archivers/py-czipfile/Makefile @@ -12,7 +12,7 @@ LICENSE= PSFL -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/archivers/py-libarchive-c/Makefile =================================================================== --- head/archivers/py-libarchive-c/Makefile +++ head/archivers/py-libarchive-c/Makefile @@ -11,9 +11,9 @@ LICENSE= LGPL20+ -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} -USES?= python +USES= python USE_GITHUB= yes USE_PYTHON= autoplist distutils Index: head/archivers/py-librtfcomp/Makefile =================================================================== --- head/archivers/py-librtfcomp/Makefile +++ head/archivers/py-librtfcomp/Makefile @@ -14,13 +14,14 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENCE -BUILD_DEPENDS= pyrexc:devel/pyrex +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR} LIB_DEPENDS= librtfcomp.so:archivers/librtfcomp CONFIGURE_ARGS= --enable-python-bindings GNU_CONFIGURE= yes USE_LDCONFIG= yes USES= libtool python:2 +USE_PYTHON= flavors BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${WRKSRC}/python Index: head/archivers/py-lz4/Makefile =================================================================== --- head/archivers/py-lz4/Makefile +++ head/archivers/py-lz4/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} LIB_DEPENDS= liblz4.so:archivers/liblz4 USE_PYTHON= distutils py3kplist Index: head/archivers/py-python-lzo/Makefile =================================================================== --- head/archivers/py-python-lzo/Makefile +++ head/archivers/py-python-lzo/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= liblzo2.so:archivers/lzo2 -USES= python:2 +USES= python USE_PYTHON= autoplist distutils CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/lzo Index: head/archivers/py3-libarchive-c/Makefile =================================================================== --- head/archivers/py3-libarchive-c/Makefile +++ head/archivers/py3-libarchive-c/Makefile @@ -1,8 +0,0 @@ -# Created by: Kubilay Kocak -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-libarchive-c - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/astro/py-RO/Makefile =================================================================== --- head/astro/py-RO/Makefile +++ head/astro/py-RO/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} OPTIONS_DEFINE= MATPLOTLIB PYFITS PYGAME @@ -25,8 +25,8 @@ USES= python USE_PYTHON= autoplist distutils -MATPLOTLIB_RUN_DEPENDS= ${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib -PYFITS_RUN_DEPENDS= ${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits -PYGAME_RUN_DEPENDS= ${PKGNAMEPREFIX}game>=1.8.1:devel/py-game +MATPLOTLIB_RUN_DEPENDS= ${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${FLAVOR} +PYFITS_RUN_DEPENDS= ${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits@${FLAVOR} +PYGAME_RUN_DEPENDS= ${PKGNAMEPREFIX}game>=1.8.1:devel/py-game@${FLAVOR} .include Index: head/astro/py-aipy/Makefile =================================================================== --- head/astro/py-aipy/Makefile +++ head/astro/py-aipy/Makefile @@ -11,12 +11,12 @@ COMMENT= Astronomical Interferometry in PYthon BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem \ - ${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits \ - ${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib + ${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem@${FLAVOR} \ + ${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits@${FLAVOR} \ + ${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/astro/py-astLib/Makefile =================================================================== --- head/astro/py-astLib/Makefile +++ head/astro/py-astLib/Makefile @@ -14,15 +14,15 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYNUMPY} \ - ${PKGNAMEPREFIX}scipy>=0.7.0:science/py-scipy \ - ${PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits \ - ${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib + ${PKGNAMEPREFIX}scipy>=0.7.0:science/py-scipy@${FLAVOR} \ + ${PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits@${FLAVOR} \ + ${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} PORTSCOUT= skipv:0.15,0.17,0.17.1 # incorrect versioning upstream -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils post-install: Index: head/astro/py-horoscopegenerator/Makefile =================================================================== --- head/astro/py-horoscopegenerator/Makefile +++ head/astro/py-horoscopegenerator/Makefile @@ -16,6 +16,6 @@ USES= python USE_PYTHON= distutils autoplist -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nltk>0:textproc/py-nltk +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nltk>0:textproc/py-nltk@${FLAVOR} .include Index: head/astro/py-pyfits/Makefile =================================================================== --- head/astro/py-pyfits/Makefile +++ head/astro/py-pyfits/Makefile @@ -14,10 +14,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}d2to1>=0:devel/py-d2to1 \ - ${PYTHON_PKGNAMEPREFIX}stsci.distutils>=0:devel/py-stsci.distutils + ${PYTHON_PKGNAMEPREFIX}d2to1>=0:devel/py-d2to1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stsci.distutils>=0:devel/py-stsci.distutils@${FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}d2to1>=0:devel/py-d2to1 + ${PYTHON_PKGNAMEPREFIX}d2to1>=0:devel/py-d2to1@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/astro/pyephem/Makefile =================================================================== --- head/astro/pyephem/Makefile +++ head/astro/pyephem/Makefile @@ -6,6 +6,8 @@ PORTEPOCH= 1 CATEGORIES= astro math hamradio MASTER_SITES= CHEESESHOP +# XXX rename the directory too. +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wen@FreeBSD.org COMMENT= Scientific-grade astronomical computations for Python Index: head/audio/Makefile =================================================================== --- head/audio/Makefile +++ head/audio/Makefile @@ -685,8 +685,6 @@ SUBDIR += py-tagpy SUBDIR += py-vorbis SUBDIR += py-xmms2 - SUBDIR += py3-mutagen - SUBDIR += py3-pylast SUBDIR += pytone SUBDIR += qjackctl SUBDIR += qmidiarp Index: head/audio/abcde/Makefile =================================================================== --- head/audio/abcde/Makefile +++ head/audio/abcde/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= cd-discid:audio/cd-discid \ cdparanoia:audio/cdparanoia \ lame:audio/lame \ - ${PYTHON_PKGNAMEPREFIX}eyed3>=0.7:audio/py-eyed3 \ + ${PYTHON_PKGNAMEPREFIX}eyed3>=0.7:audio/py-eyed3@${PY_FLAVOR} \ oggenc:audio/vorbis-tools \ bash:shells/bash Index: head/audio/beets/Makefile =================================================================== --- head/audio/beets/Makefile +++ head/audio/beets/Makefile @@ -13,18 +13,18 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=1.33:audio/py-mutagen \ - ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode \ - ${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs \ - ${PYTHON_PKGNAMEPREFIX}munkres>=0:math/py-munkres \ - ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}enum34>=1.0.4:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}jellyfish>=0:devel/py-jellyfish \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=1.33:audio/py-mutagen@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}munkres>=0:math/py-munkres@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} \ + ${PY_ENUM34} \ + ${PYTHON_PKGNAMEPREFIX}jellyfish>=0:devel/py-jellyfish@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix PLIST_FILES= man/man1/beet.1.gz man/man5/beetsconfig.5.gz @@ -57,34 +57,34 @@ WEB_DESC= Web plugin for querying, browsing and playing music WEB_CORS_DESC= Cross-origin resource sharing for the Web plugin -ACOUSTICBRAINZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests +ACOUSTICBRAINZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} BADFILES_RUN_DEPENDS= flac:audio/flac \ mp3val:audio/mp3val -BEATPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.6.1:www/py-requests-oauthlib -BPD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>=0:multimedia/py-gstreamer1 \ - ${PYTHON_PKGNAMEPREFIX}gobject>=0:devel/py-gobject -CHROMA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyacoustid>=0:audio/py-pyacoustid -DISCOGS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discogs-client>=2.1.0:audio/py-discogs-client -EMBYUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests -FETCHART_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests +BEATPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.6.1:www/py-requests-oauthlib@${FLAVOR} +BPD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>=0:multimedia/py-gstreamer1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gobject>=0:devel/py-gobject@${FLAVOR} +CHROMA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyacoustid>=0:audio/py-pyacoustid@${FLAVOR} +DISCOGS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discogs-client>=2.1.0:audio/py-discogs-client@${FLAVOR} +EMBYUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} +FETCHART_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} FFMPEG_RUN_DEPENDS= ffmpeg>=2:multimedia/ffmpeg IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick IPFS_RUN_DEPENDS= ipfs-go:sysutils/ipfs-go -LASTFM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylast>=0:audio/py-pylast -LASTIMPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests -LYRICS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests -LYRICS_GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup -METASYNC_DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus -MPDSTATS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd2>=0:audio/py-mpd2 -PLEXUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests +LASTFM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylast>=0:audio/py-pylast@${FLAVOR} +LASTIMPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} +LYRICS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} +LYRICS_GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${FLAVOR} +METASYNC_DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${FLAVOR} +MPDSTATS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd2>=0:audio/py-mpd2@${FLAVOR} +PLEXUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} REPLAYGAIN_RUN_DEPENDS= mp3gain>=0:audio/mp3gain REPLAYGAIN_RUN_DEPENDS+= aacgain>=0:audio/aacgain -SPOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests -THUMBNAILS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg -THUMBNAILS_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib>=0:devel/py-pathlib -WEB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask -WEB_CORS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask-Cors>=0:www/py-flask-cors +SPOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} +THUMBNAILS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${FLAVOR} +THUMBNAILS_RUN_DEPENDS+= ${PY_PATHLIB} +WEB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${FLAVOR} +WEB_CORS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask-Cors>=0:www/py-flask-cors@${FLAVOR} post-install: ${INSTALL} ${WRKSRC}/man/beet.1 ${STAGEDIR}${PREFIX}/man/man1/ Index: head/audio/carla/Makefile =================================================================== --- head/audio/carla/Makefile +++ head/audio/carla/Makefile @@ -13,10 +13,10 @@ LIB_DEPENDS= liblo.so:audio/liblo \ libsndfile.so:audio/libsndfile -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyliblo>0:audio/py-pyliblo +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyliblo>0:audio/py-pyliblo@${PY_FLAVOR} USES= compiler:c++11-lib desktop-file-utils gmake localbase \ - pkgconfig pyqt:5 python:3 shared-mime-info tar:bz2 + pkgconfig pyqt:5 python:3.4+ shared-mime-info tar:bz2 USE_GITHUB= yes GH_ACCOUNT= falkTX USE_PYQT= core_run gui_run svg_run widgets_run sip_build xml_build Index: head/audio/exaile-devel/Makefile =================================================================== --- head/audio/exaile-devel/Makefile +++ head/audio/exaile-devel/Makefile @@ -11,10 +11,10 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen \ - ${PYTHON_PKGNAMEPREFIX}gstreamer1>0:multimedia/py-gstreamer1 \ - ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}bsddb3>0:databases/py-bsddb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gstreamer1>0:multimedia/py-gstreamer1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bsddb3>0:databases/py-bsddb3@${PY_FLAVOR} USE_GITHUB= yes GH_TAGNAME= 9ba2cc8 @@ -29,7 +29,7 @@ NLS_USES= gettext NLS_BUILD_DEPENDS= help2man:misc/help2man NLS_INSTALL_TARGET_OFF= install_no_locale -CDDB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cddb>0:audio/py-cddb +CDDB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cddb>0:audio/py-cddb@${PY_FLAVOR} HAL_LIB_DEPENDS= libhal.so:sysutils/hal MAKE_ENV= EPREFIX=${PREFIX} \ Index: head/audio/exaile/Makefile =================================================================== --- head/audio/exaile/Makefile +++ head/audio/exaile/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=1.11:audio/py-mutagen +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=1.11:audio/py-mutagen@${PY_FLAVOR} MAKE_ENV+= PYTHON2_CMD=${PYTHON_CMD} XDGCONFDIR=${PREFIX}/etc/xdg USES= desktop-file-utils gmake python:2 @@ -24,14 +24,14 @@ OPTIONS_SUB= yes BAD_DESC= Install bad GStreamer plugins BAD_USE= GSTREAMER=bad -CDDB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cddb>=1.4:audio/py-cddb -DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.1:devel/py-dbus +CDDB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cddb>=1.4:audio/py-cddb@${PY_FLAVOR} +DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.1:devel/py-dbus@${PY_FLAVOR} HAL_LIB_DEPENDS= libhal.so:sysutils/hal -NOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify +NOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify@${PY_FLAVOR} NLS_USES= gettext NLS_INSTALL_TARGET_OFF= install_no_locale SEXY_DESC= UI enchancements -SEXY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sexy>=0.1.9:x11-toolkits/py-sexy +SEXY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sexy>=0.1.9:x11-toolkits/py-sexy@${PY_FLAVOR} post-patch: @${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/Makefile Index: head/audio/gnome-music/Makefile =================================================================== --- head/audio/gnome-music/Makefile +++ head/audio/gnome-music/Makefile @@ -17,7 +17,7 @@ PORTSCOUT= limitw:1,even -USES= gettext gmake gnome libtool pathfix pkgconfig python:3 tar:xz +USES= gettext gmake gnome libtool pathfix pkgconfig python:3.4+ tar:xz USE_LDCONFIG= yes USE_GNOME= gnomedesktop3 gtk30 intltool introspection:build GNU_CONFIGURE= yes Index: head/audio/idjc/Makefile =================================================================== --- head/audio/idjc/Makefile +++ head/audio/idjc/Makefile @@ -25,8 +25,8 @@ libsamplerate.so:audio/libsamplerate \ libshout-idjc.so:audio/shout-idjc RUN_DEPENDS= oggenc:audio/vorbis-tools \ - ${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen \ - ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus + ${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${PY_FLAVOR} OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= YES Index: head/audio/jokosher/Makefile =================================================================== --- head/audio/jokosher/Makefile +++ head/audio/jokosher/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} USES= desktop-file-utils python:2 shared-mime-info USE_PYTHON= distutils @@ -23,7 +23,7 @@ OPTIONS_DEFINE= DBUS FLAC GCONF GNOME JACK LADSPA LAME MP3 PIDGIN PULSEAUDIO VORBIS OPTIONS_DEFAULT= DBUS FLAC GCONF LADSPA VORBIS -DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus +DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} FLAC_USE= GSTREAMER=flac GCONF_USE= GSTREAMER=gconf JACK_USE= GSTREAMER=jack Index: head/audio/libgpod/Makefile =================================================================== --- head/audio/libgpod/Makefile +++ head/audio/libgpod/Makefile @@ -39,10 +39,10 @@ MONO_CONFIGURE_WITH= mono PYTHON_BUILD_DEPENDS= swig2.0:devel/swig20 \ - ${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen -PYTHON_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen + ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen PYTHON_USE= GNOME=pygobject -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig2.0" PYTHON_CONFIGURE_WITH= python Index: head/audio/lollypop/Makefile =================================================================== --- head/audio/lollypop/Makefile +++ head/audio/lollypop/Makefile @@ -13,14 +13,14 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.8:databases/py-sqlite3 \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.8:databases/py-sqlite3@${PY_FLAVOR} \ itstool:textproc/itstool \ - ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1:devel/py3-dbus \ - ${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:multimedia/py3-gstreamer1 + ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:multimedia/py-gstreamer1@${PY_FLAVOR} LIB_DEPENDS= libnotify.so:devel/libnotify \ libtotem-plparser.so:multimedia/totem-pl-parser -USES= shebangfix python:3 pkgconfig gettext gmake sqlite tar:xz +USES= shebangfix python:3.4+ pkgconfig gettext gmake sqlite tar:xz GNU_CONFIGURE= yes USE_GNOME= glib20 gtk30 py3gobject3 introspection:build intltool intlhack USE_GSTREAMER1= yes mpg123 ogg flac opus libav faad good speex @@ -36,11 +36,4 @@ SUB_FILES= pkg-message -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include +.include Index: head/audio/mbox/Makefile =================================================================== --- head/audio/mbox/Makefile +++ head/audio/mbox/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ogg>0:audio/py-ogg \ - ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ogg>0:audio/py-ogg@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis@${FLAVOR} \ lame:audio/lame \ oggenc:audio/vorbis-tools \ mplayer:multimedia/mplayer Index: head/audio/mpdbrowser/Makefile =================================================================== --- head/audio/mpdbrowser/Makefile +++ head/audio/mpdbrowser/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:audio/py-mpd +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:audio/py-mpd@${FLAVOR} USES= gettext iconv python:2 tar:tgz USE_GNOME= intltool pygtk2 Index: head/audio/mps/Makefile =================================================================== --- head/audio/mps/Makefile +++ head/audio/mps/Makefile @@ -22,7 +22,7 @@ # This port installs the following files in shared dirs # PLIST_FILES= bin/mps USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer MPV_RUN_DEPENDS= mpv:multimedia/mpv Index: head/audio/picard/Makefile =================================================================== --- head/audio/picard/Makefile +++ head/audio/picard/Makefile @@ -14,8 +14,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discid>=0:audio/py-discid \ - ${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discid>=0:audio/py-discid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen@${FLAVOR} USES= gettext pyqt:4 python:2 desktop-file-utils USE_PYQT= core_run gui_run network_run xml_run Index: head/audio/pithos/Makefile =================================================================== --- head/audio/pithos/Makefile +++ head/audio/pithos/Makefile @@ -13,15 +13,15 @@ USE_GITHUB= yes -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py3-xdg \ - ${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py3-dbus \ - ${PYTHON_SITELIBDIR}/gi/overrides/Gst.py:multimedia/py3-gstreamer1 \ - ${PYTHON_PKGNAMEPREFIX}pylast>0:audio/py3-pylast \ +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/gi/overrides/Gst.py:multimedia/py-gstreamer1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pylast>0:audio/py-pylast@${FLAVOR} \ git:devel/git USE_GNOME= gtk30 py3gobject3 -USES= python:3 -USE_PYTHON= distutils autoplist +USES= python:3.4+ +USE_PYTHON= distutils autoplist optsuffix USE_GSTREAMER= core good bad soup post-install: Index: head/audio/puddletag/Makefile =================================================================== --- head/audio/puddletag/Makefile +++ head/audio/puddletag/Makefile @@ -13,10 +13,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= chromaprint>=0.4:audio/chromaprint \ - ${PYTHON_PKGNAMEPREFIX}musicbrainz2>=0:audio/py-musicbrainz2 \ - ${PYTHON_PKGNAMEPREFIX}mutagen>=1.14:audio/py-mutagen \ - ${PYTHON_PKGNAMEPREFIX}configobj>=4.5.0:devel/py-configobj \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:devel/py-pyparsing + ${PYTHON_PKGNAMEPREFIX}musicbrainz2>=0:audio/py-musicbrainz2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mutagen>=1.14:audio/py-mutagen@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configobj>=4.5.0:devel/py-configobj@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:devel/py-pyparsing@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= keithgg Index: head/audio/py-aubio/Makefile =================================================================== --- head/audio/py-aubio/Makefile +++ head/audio/py-aubio/Makefile @@ -11,7 +11,7 @@ BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} TEST_DEPENDS= sox:audio/sox \ - ${PYTHON_PKGNAMEPREFIX}nose2>=0.6.5:devel/py-nose2 + ${PYTHON_PKGNAMEPREFIX}nose2>=0.6.5:devel/py-nose2@${FLAVOR} USES+= python USE_PYTHON= autoplist distutils Index: head/audio/py-discogs-client/Makefile =================================================================== --- head/audio/py-discogs-client/Makefile +++ head/audio/py-discogs-client/Makefile @@ -12,9 +12,9 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}oauthlib>=0:security/py-oauthlib \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauthlib>=0:security/py-oauthlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/audio/py-gmusicapi/Makefile =================================================================== --- head/audio/py-gmusicapi/Makefile +++ head/audio/py-gmusicapi/Makefile @@ -12,21 +12,21 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.2:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}future>=0.0:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}mutagen>=1.18:audio/py-mutagen \ - ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.2:security/py-oauth2client \ - ${PYTHON_PKGNAMEPREFIX}gpsoauth>=0.0:security/py-gpsoauth \ - ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}validictory>=0.9.3:devel/py-validictory \ - ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient \ - ${PYTHON_PKGNAMEPREFIX}MechanicalSoup>0:www/py-MechanicalSoup \ - ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.2:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.0:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mutagen>=1.18:audio/py-mutagen@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.2:security/py-oauth2client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gpsoauth>=0.0:security/py-gpsoauth@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}validictory>=0.9.3:devel/py-validictory@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MechanicalSoup>0:www/py-MechanicalSoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/audio/py-gmusicproxy/Makefile =================================================================== --- head/audio/py-gmusicproxy/Makefile +++ head/audio/py-gmusicproxy/Makefile @@ -13,14 +13,14 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs \ - ${PYTHON_PKGNAMEPREFIX}gmusicapi>=10.1.0:audio/py-gmusicapi \ - ${PYTHON_PKGNAMEPREFIX}netifaces>=-0.10.4:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg \ - ${PYTHON_PKGNAMEPREFIX}eyed3>=0.7.8:audio/py-eyed3 \ - ${PYTHON_PKGNAMEPREFIX}daemon>=2.0.5:devel/py-daemon +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gmusicapi>=10.1.0:audio/py-gmusicapi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>=-0.10.4:net/py-netifaces@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eyed3>=0.7.8:audio/py-eyed3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}daemon>=2.0.5:devel/py-daemon@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_GITHUB= yes Index: head/audio/py-karaoke/Makefile =================================================================== --- head/audio/py-karaoke/Makefile +++ head/audio/py-karaoke/Makefile @@ -39,7 +39,7 @@ OPTIONS_DEFINE= MUTAGEN MUTAGEN_DESC= Mutagen support -MUTAGEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen +MUTAGEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${FLAVOR} BIN_SCRIPTS= cdg2mpg pycdg pykar pykaraoke pykaraoke_mini pympg DATA_FONTS= DejaVuSans.ttf DejaVuSansCondensed.ttf \ Index: head/audio/py-mutagen/Makefile =================================================================== --- head/audio/py-mutagen/Makefile +++ head/audio/py-mutagen/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING NO_ARCH= yes -USES?= python shebangfix +USES= python shebangfix USE_PYTHON= autoplist concurrent distutils SHEBANG_FILES= tools/* Index: head/audio/py-openal/Makefile =================================================================== --- head/audio/py-openal/Makefile +++ head/audio/py-openal/Makefile @@ -18,7 +18,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES -USES= openal:al,alut python +USES= openal:al,alut python:2.7 USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/PyOpenAL-${PORTVERSION} EXAMPLESDIR= ${PREFIX}/share/examples/${PYTHON_PKGNAMEPREFIX}openal Index: head/audio/py-py-jack/Makefile =================================================================== --- head/audio/py-py-jack/Makefile +++ head/audio/py-py-jack/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libjack.so:audio/jack -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${FLAVOR} USES= python:-2.7 localbase USE_PYTHON= distutils autoplist Index: head/audio/py-pylast/Makefile =================================================================== --- head/audio/py-pylast/Makefile +++ head/audio/py-pylast/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/audio/py-pyliblo/Makefile =================================================================== --- head/audio/py-pyliblo/Makefile +++ head/audio/py-pyliblo/Makefile @@ -14,12 +14,11 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= cython${PYTHON_VER:M3.*:S/^3/-3/}:lang/cython${PYTHON_MAJOR_VER:M3} LIB_DEPENDS= liblo.so:audio/liblo USES= localbase:ldflags python USES= python -USE_PYTHON= distutils # autoplist fails to add the manpage files +USE_PYTHON= distutils cython MAKE_ENV+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} post-patch: Index: head/audio/py-pysndfile/Makefile =================================================================== --- head/audio/py-pysndfile/Makefile +++ head/audio/py-pysndfile/Makefile @@ -11,13 +11,12 @@ LICENSE= LGPL3 -BUILD_DEPENDS= cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy +BUILD_DEPENDS= ${PYNUMPY} LIB_DEPENDS= libsndfile.so:audio/libsndfile -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy +RUN_DEPENDS= ${PYNUMPY} USES= python localbase -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist cython post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pysndfile/_pysndfile.so Index: head/audio/py-soundcloud/Makefile =================================================================== --- head/audio/py-soundcloud/Makefile +++ head/audio/py-soundcloud/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/audio/py-soundscrape/Makefile =================================================================== --- head/audio/py-soundscrape/Makefile +++ head/audio/py-soundscrape/Makefile @@ -13,16 +13,16 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=1.31.0:audio/py-mutagen \ - ${PYTHON_PKGNAMEPREFIX}soundcloud>=0.4.1:audio/py-soundcloud \ - ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args \ - ${PYTHON_PKGNAMEPREFIX}clint>=0.3.2:devel/py-clint \ - ${PYTHON_PKGNAMEPREFIX}demjson>=2.2.2:devel/py-demjson \ - ${PYTHON_PKGNAMEPREFIX}fudge>=1.0.3:devel/py-fudge \ - ${PYTHON_PKGNAMEPREFIX}nose>=1.3.7:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=3.3.1:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}wheel>=0.24.0:devel/py-wheel \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.9.0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=1.31.0:audio/py-mutagen@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}soundcloud>=0.4.1:audio/py-soundcloud@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}clint>=0.3.2:devel/py-clint@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}demjson>=2.2.2:devel/py-demjson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fudge>=1.0.3:devel/py-fudge@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=1.3.7:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=3.3.1:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0.24.0:devel/py-wheel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.9.0:www/py-requests@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: head/audio/py-speechrecognition/Makefile =================================================================== --- head/audio/py-speechrecognition/Makefile +++ head/audio/py-speechrecognition/Makefile @@ -16,7 +16,7 @@ GH_PROJECT= speech_recognition RUN_DEPENDS= flac:audio/flac \ - ${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio + ${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio@${FLAVOR} NO_ARCH= yes USES= python @@ -28,7 +28,7 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>=0.3:devel/py-monotonic +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>=0.3:devel/py-monotonic@${FLAVOR} .endif .include Index: head/audio/py-speex/Makefile =================================================================== --- head/audio/py-speex/Makefile +++ head/audio/py-speex/Makefile @@ -13,10 +13,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Python bindings for the Speex compressor/decompressor audio codec -BUILD_DEPENDS= pyrex>=0.9.6.2:devel/pyrex +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>=0.9.6.2:devel/pyrex@${FLAVOR} LIB_DEPENDS= libspeex.so:audio/speex -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils post-patch: Index: head/audio/py-vorbis/Makefile =================================================================== --- head/audio/py-vorbis/Makefile +++ head/audio/py-vorbis/Makefile @@ -15,8 +15,8 @@ LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg@${FLAVOR} +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg@${FLAVOR} LIB_DEPENDS= libvorbis.so:audio/libvorbis USES= python:2 Index: head/audio/py-xmms2/Makefile =================================================================== --- head/audio/py-xmms2/Makefile +++ head/audio/py-xmms2/Makefile @@ -9,12 +9,13 @@ MAINTAINER= madpilot@FreeBSD.org COMMENT= Python Bindings for XMMS2 -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/__init__.py:devel/pyrex +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR} LIB_DEPENDS+= libxmmsclient.so:audio/xmms2 MASTERDIR= ${.CURDIR}/../xmms2 -USES= python +USES= python:2.7 +USE_PYTHON= flavors PLIST= ${.CURDIR}/pkg-plist Index: head/audio/py3-mutagen/Makefile =================================================================== --- head/audio/py3-mutagen/Makefile +++ head/audio/py3-mutagen/Makefile @@ -1,9 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-mutagen - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/audio/py3-pylast/Makefile =================================================================== --- head/audio/py3-pylast/Makefile +++ head/audio/py3-pylast/Makefile @@ -1,20 +0,0 @@ -# Created by: Kris Moore -# $FreeBSD$ - -PORTNAME= pylast -PORTVERSION= 0.5.11 -PORTREVISION= 1 -CATEGORIES= audio python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= kmoore@FreeBSD.org -COMMENT= Python3 interface to Last.fm - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/COPYING - -USES= python:3 -USE_PYTHON= distutils autoplist - -.include Index: head/audio/py3-pylast/distinfo =================================================================== --- head/audio/py3-pylast/distinfo +++ head/audio/py3-pylast/distinfo @@ -1,2 +0,0 @@ -SHA256 (pylast-0.5.11.tar.gz) = bf35820be35447d55564d36072d40b09ac8a7fd41a6f1a7a9d408f4d0eaefac4 -SIZE (pylast-0.5.11.tar.gz) = 26146 Index: head/audio/py3-pylast/pkg-descr =================================================================== --- head/audio/py3-pylast/pkg-descr +++ head/audio/py3-pylast/pkg-descr @@ -1,3 +0,0 @@ -A Python interface to Last.fm (and other API compatible social networks) - -WWW: http://code.google.com/p/pylast/ Index: head/audio/pytone/Makefile =================================================================== --- head/audio/pytone/Makefile +++ head/audio/pytone/Makefile @@ -15,8 +15,8 @@ LICENSE= GPLv2 LIB_DEPENDS= libao.so:audio/libao -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${FLAVOR} USES= ncurses python:2 @@ -31,11 +31,11 @@ OPTIONS_DEFINE= MAD MPG123 MPG321 VORBIS OPTIONS_DEFAULT= MAD VORBIS -MAD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mad>0:audio/py-mad +MAD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mad>0:audio/py-mad@${FLAVOR} MPG123_RUN_DEPENDS= mpg123:audio/mpg123 MPG321_DESC= MP3 decoding support via mpg321 MPG321_RUN_DEPENDS= mpg321:audio/mpg321 -VORBIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis +VORBIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis@${FLAVOR} post-patch: .for i in pytone pytonectl Index: head/audio/rhythmbox/Makefile =================================================================== --- head/audio/rhythmbox/Makefile +++ head/audio/rhythmbox/Makefile @@ -69,10 +69,10 @@ libhal.so:sysutils/hal PYTHON_CONFIGURE_ENABLE= python PYTHON_USES= python:3.3+ -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} # context plugin # webkit is for the context plugin, which is broken because -# it needs textproc/py3-mako +# it needs textproc/py-mako@${PY_FLAVOR} #WEBKIT_DESC= HTML view support #WEBKIT_CONFIGURE_WITH= webkit #WEBKIT_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3 Index: head/audio/sonata/Makefile =================================================================== --- head/audio/sonata/Makefile +++ head/audio/sonata/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:audio/py-mpd +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:audio/py-mpd@${FLAVOR} -USES= gettext pkgconfig python +USES= gettext pkgconfig python:2.7 USE_GNOME= pygtk2 USE_PYTHON= distutils autoplist @@ -30,10 +30,11 @@ MANPAGES_MAKE_ENV_OFF= NO_INSTALL_MANPAGES=yes DOCS_MAKE_ENV= NOPORTDOCS=${NOPORTDOCS} MPD_RUN_DEPENDS+= musicpd:audio/musicpd -MMKEYS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus -PYGNOMEEXTRAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gnome-extras>=2.25.3_4:x11-toolkits/py-gnome-extras -TAGLIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tagpy>=0.94.5:audio/py-tagpy -ZSI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zsi>=2.0,1:net/py-zsi +MMKEYS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus@${FLAVOR} +PYGNOMEEXTRAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gnome-extras>=2.25.3_4:x11-toolkits/py-gnome-extras@${FLAVOR} +PYGNOMEEXTRAS_IGNORE= Dependency py-gnome-extras gone. +TAGLIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tagpy>=0.94.5:audio/py-tagpy@${FLAVOR} +ZSI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zsi>=2.0,1:net/py-zsi@${FLAVOR} post-patch: @${REINPLACE_CMD} -e 's,%%DOCSDIR%%,${DOCSDIR},' \ Index: head/audio/soundconverter/Makefile =================================================================== --- head/audio/soundconverter/Makefile +++ head/audio/soundconverter/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer>=0.10:multimedia/py-gstreamer +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer>=0.10:multimedia/py-gstreamer@${PY_FLAVOR} NO_ARCH= yes USES= desktop-file-utils gmake python:2 shebangfix tar:xz Index: head/benchmarks/py-naarad/Makefile =================================================================== --- head/benchmarks/py-naarad/Makefile +++ head/benchmarks/py-naarad/Makefile @@ -12,9 +12,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=2013.8,1:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}luminol>0:math/py-luminol \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=2013.8,1:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}luminol>0:math/py-luminol@${FLAVOR} \ bash:shells/bash \ gawk:lang/gawk Index: head/benchmarks/py-zopkio/Makefile =================================================================== --- head/benchmarks/py-zopkio/Makefile +++ head/benchmarks/py-zopkio/Makefile @@ -12,10 +12,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= naarad:benchmarks/py-naarad \ - ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}kazoo>=1.1:devel/py-kazoo \ - ${PYTHON_PKGNAMEPREFIX}paramiko>=1.10.1:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}junit-xml>0:textproc/py-junit-xml \ + ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}kazoo>=1.1:devel/py-kazoo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}paramiko>=1.10.1:security/py-paramiko@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}junit-xml>0:textproc/py-junit-xml@${FLAVOR} \ USES= python USE_PYTHON= autoplist concurrent distutils Index: head/biology/libsbml/Makefile =================================================================== --- head/biology/libsbml/Makefile +++ head/biology/libsbml/Makefile @@ -27,7 +27,7 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHON_BUILD_DEPENDS= swig2.0:devel/swig20 -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CMAKE_ON= -DWITH_PYTHON:BOOL=ON \ -DPYTHON_INCLUDE_DIR:STRING="${PYTHON_INCLUDEDIR}" \ -DPYTHON_LIBRARY:STRING="${PYTHONBASE}/lib/lib${PYTHON_VERSION}.so" \ Index: head/biology/py-biom-format/Makefile =================================================================== --- head/biology/py-biom-format/Makefile +++ head/biology/py-biom-format/Makefile @@ -13,10 +13,10 @@ BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}h5py>=2.6.0:science/py-h5py \ - ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.16.1:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}h5py>=2.6.0:science/py-h5py@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0.16.1:science/py-scipy@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= biocore @@ -27,7 +27,7 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyqi>=0.2.0:devel/py-pyqi +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyqi>=0.2.0:devel/py-pyqi@${FLAVOR} .endif post-install: Index: head/biology/py-biopython/Makefile =================================================================== --- head/biology/py-biopython/Makefile +++ head/biology/py-biopython/Makefile @@ -20,6 +20,6 @@ OPTIONS_DEFAULT= REPORTLAB REPORTLAB_DESC= PDF support in Bio.Graphics module -REPORTLAB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab1>0:print/py-reportlab1 +REPORTLAB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab1>0:print/py-reportlab1@${FLAVOR} .include Index: head/biology/py-bx-python/Makefile =================================================================== --- head/biology/py-bx-python/Makefile +++ head/biology/py-bx-python/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}python-lzo>0:archivers/py-python-lzo + ${PYTHON_PKGNAMEPREFIX}python-lzo>0:archivers/py-python-lzo@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USE_GITHUB= yes Index: head/biology/py-cutadapt/Makefile =================================================================== --- head/biology/py-cutadapt/Makefile +++ head/biology/py-cutadapt/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xopen>0:archivers/py-xopen +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xopen>0:archivers/py-xopen@${FLAVOR} USES= python USE_PYTHON= distutils Index: head/biology/py-pysam/Makefile =================================================================== --- head/biology/py-pysam/Makefile +++ head/biology/py-pysam/Makefile @@ -12,11 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= cython:lang/cython -RUN_DEPENDS= cython:lang/cython - USES= gmake python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython cython_run post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pysam/*.so Index: head/biology/pycogent/Makefile =================================================================== --- head/biology/pycogent/Makefile +++ head/biology/pycogent/Makefile @@ -11,13 +11,12 @@ LICENSE= GPLv2 BUILD_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/bin/cython:lang/cython \ - ${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10 + ${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python:-2.7 USE_GITHUB= yes -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist cython .include Index: head/biology/pyfasta/Makefile =================================================================== --- head/biology/pyfasta/Makefile +++ head/biology/pyfasta/Makefile @@ -6,6 +6,7 @@ PORTREVISION= 1 CATEGORIES= biology python MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wen@FreeBSD.org COMMENT= Fast, memory-efficient, pythonic access to fasta sequence files Index: head/biology/python-nexus/Makefile =================================================================== --- head/biology/python-nexus/Makefile +++ head/biology/python-nexus/Makefile @@ -5,6 +5,7 @@ PORTVERSION= 1.53 CATEGORIES= biology python MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wen@FreeBSD.org COMMENT= Generic nexus file format reader for python Index: head/cad/brickutils/Makefile =================================================================== --- head/cad/brickutils/Makefile +++ head/cad/brickutils/Makefile @@ -20,7 +20,7 @@ LICENSE= GPLv3 RUN_DEPENDS= ${LOCALBASE}/share/ldraw/models/car.dat:cad/ldraw \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} WRKSRC= ${WRKDIR}/BrickUtils-${PORTVERSION} Index: head/cad/linuxcnc-devel/Makefile =================================================================== --- head/cad/linuxcnc-devel/Makefile +++ head/cad/linuxcnc-devel/Makefile @@ -46,7 +46,7 @@ CXXFLAGS="-I${LOCALBASE}/include" CXX="${CXX}" CC="${CC}" \ --with-locale-dir="${PREFIX}/share/locale" --with-python=${PYTHON_CMD} MAKE_ENV= BUILD_VERBOSE=1 -USES= autoreconf gettext gmake ncurses pkgconfig python readline shebangfix tk +USES= autoreconf gettext gmake ncurses pkgconfig python:2.7 readline shebangfix tk USE_GL= gl glu USE_GNOME= cairo gdkpixbuf2 libgnomeprintui pygtksourceview USE_XORG= ice sm x11 xext xft xinerama xmu xrender xscrnsaver xt Index: head/cad/py-gdspy/Makefile =================================================================== --- head/cad/py-gdspy/Makefile +++ head/cad/py-gdspy/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/cad/py-lcapy/Makefile =================================================================== --- head/cad/py-lcapy/Makefile +++ head/cad/py-lcapy/Makefile @@ -10,11 +10,11 @@ LICENSE= LGPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy \ - ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_GITHUB= yes GH_ACCOUNT= mph- Index: head/cad/py-pycam/Makefile =================================================================== --- head/cad/py-pycam/Makefile +++ head/cad/py-pycam/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2 \ - ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL \ - ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext@${FLAVOR} USES= python:-2.7 USE_PYTHON= distutils autoplist Index: head/cad/python-gdsii/Makefile =================================================================== --- head/cad/python-gdsii/Makefile +++ head/cad/python-gdsii/Makefile @@ -11,7 +11,7 @@ LICENSE= LGPL3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/cad/pythoncad/Makefile =================================================================== --- head/cad/pythoncad/Makefile +++ head/cad/pythoncad/Makefile @@ -14,9 +14,9 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2@${FLAVOR} -USES= python shebangfix +USES= python:2.7 shebangfix USE_PYTHON= distutils PYDISTUTILS_PKGNAME= PythonCAD PYDISTUTILS_PKGVERSION= DS1-R${PORTVERSION} Index: head/comms/chirp/Makefile =================================================================== --- head/comms/chirp/Makefile +++ head/comms/chirp/Makefile @@ -15,11 +15,11 @@ BUILD_DEPENDS= ${CHIRP_DEPENDS} RUN_DEPENDS= ${CHIRP_DEPENDS} -CHIRP_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2 \ - ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial \ - ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2 +CHIRP_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2@${FLAVOR} -USES= desktop-file-utils gettext python +USES= desktop-file-utils gettext python:2.7 USE_PYTHON= distutils autoplist .include Index: head/comms/congruity/Makefile =================================================================== --- head/comms/congruity/Makefile +++ head/comms/congruity/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libconcord>=0:comms/py-libconcord +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libconcord>=0:comms/py-libconcord@${PY_FLAVOR} MAKE_ARGS= MANDIR=${PREFIX}/man USES= desktop-file-utils gmake tar:bzip2 python:2.7+ Index: head/comms/gnuradio/Makefile =================================================================== --- head/comms/gnuradio/Makefile +++ head/comms/gnuradio/Makefile @@ -14,14 +14,14 @@ BUILD_DEPENDS= sdl-config:devel/sdl12 \ swig2.0:devel/swig20 \ - cheetah:devel/py-cheetah \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ + cheetah:devel/py-cheetah@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ xdg-open:devel/xdg-utils \ guile:lang/guile \ aconnect:audio/alsa-utils \ git:devel/git \ ${PYNUMPY} \ - ${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem + ${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem@${PY_FLAVOR} LIB_DEPENDS= libcppunit.so:devel/cppunit \ libcodec2.so:audio/codec2 \ libfftw3.so:math/fftw3 \ @@ -80,7 +80,7 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ - sphinx-apidoc:textproc/py-sphinx \ + sphinx-apidoc:textproc/py-sphinx@${PY_FLAVOR} \ dot:graphics/graphviz \ xmlto:textproc/xmlto \ freefont-ttf>0:x11-fonts/freefont-ttf Index: head/comms/owfs/Makefile =================================================================== --- head/comms/owfs/Makefile +++ head/comms/owfs/Makefile @@ -57,7 +57,7 @@ OWPHP_CONFIGURE_ENABLE= owphp OWPYTHON_CONFIGURE_ENABLE= owpython -OWPYTHON_USES= python +OWPYTHON_USES= python:2.7 # Additional CONFIGURE_ARGS is done below OWTCL_CONFIGURE_ENABLE= owtcl Index: head/comms/py-bulksms/Makefile =================================================================== --- head/comms/py-bulksms/Makefile +++ head/comms/py-bulksms/Makefile @@ -10,7 +10,7 @@ MAINTAINER= craig001@lerwick.hopto.org COMMENT= Python client for the BulkSMS.co.uk HTTP API -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= BulkSMS PYDISTUTILS_PKGVERSION= 1.0 Index: head/comms/py-hidapi/Makefile =================================================================== --- head/comms/py-hidapi/Makefile +++ head/comms/py-hidapi/Makefile @@ -13,11 +13,10 @@ LICENSE= GPLv3 -BUILD_DEPENDS= cython:lang/cython LIB_DEPENDS= libhidapi.so:comms/hidapi USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython post-patch: @${REINPLACE_CMD} -e 's|usb-1.0|usb|g' ${WRKSRC}/setup.py Index: head/comms/py-libconcord/Makefile =================================================================== --- head/comms/py-libconcord/Makefile +++ head/comms/py-libconcord/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libconcord.so:comms/libconcord USE_LDCONFIG= yes -USES= python:2.7+ tar:bzip2 +USES= python:2.7 tar:bzip2 WRKSRC_SUBDIR= libconcord/bindings/python USE_PYTHON= distutils Index: head/comms/py-libimobiledevice/Makefile =================================================================== --- head/comms/py-libimobiledevice/Makefile +++ head/comms/py-libimobiledevice/Makefile @@ -8,13 +8,13 @@ COMMENT= Python bindings for libimobiledevice LIB_DEPENDS= libimobiledevice.so:${MASTER_PORT} -BUILD_DEPENDS= cython:lang/cython \ - ${PYTHON_SITELIBDIR}/plist.so:devel/py-libplist -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/plist.so:devel/py-libplist +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libplist>0:devel/py-libplist@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libplist>0:devel/py-libplist@${FLAVOR} PORTSCOUT= ignore:1 -USES= python +USES= python:2.7 +USE_PYTHON= flavors cython CONFIGURE_ENV= PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`" SLAVE_PORT= yes MASTERDIR= ${.CURDIR:H:H}/comms/libimobiledevice Index: head/comms/py-qt5-serialport/Makefile =================================================================== --- head/comms/py-qt5-serialport/Makefile +++ head/comms/py-qt5-serialport/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run +USE_PYTHON= flavors USE_QT5= core gui serialport qmake_build OPTIONS_DEFINE= API DEBUG Index: head/comms/quisk/Makefile =================================================================== --- head/comms/quisk/Makefile +++ head/comms/quisk/Makefile @@ -17,7 +17,7 @@ libasound.so:audio/alsa-lib \ libpulse.so:audio/pulseaudio -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_WX= 3.0+ WX_COMPS= python Index: head/comms/uhd/Makefile =================================================================== --- head/comms/uhd/Makefile +++ head/comms/uhd/Makefile @@ -13,10 +13,10 @@ LIB_DEPENDS= libboost_python.so:devel/boost-python-libs BUILD_DEPENDS= ${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs \ - cheetah-analyze:devel/py-cheetah \ - rst2html:textproc/py-docutils \ + cheetah-analyze:devel/py-cheetah@${PY_FLAVOR} \ + rst2html:textproc/py-docutils@${PY_FLAVOR} \ orcc:devel/orc \ - ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako + ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= EttusResearch Index: head/comms/wsjt/Makefile =================================================================== --- head/comms/wsjt/Makefile +++ head/comms/wsjt/Makefile @@ -21,9 +21,9 @@ libsamplerate.so:audio/libsamplerate \ libportaudio.so:audio/portaudio -WSJT_DEPENDS= ${PYTHON_LIBDIR}/lib-dynload/_tkinter.so:x11-toolkits/py-tkinter \ - ${PYTHON_SITELIBDIR}/scipy:science/py-scipy \ - ${PYTHON_SITELIBDIR}/PIL:graphics/py-pillow \ +WSJT_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYNUMPY} USE_GCC= yes @@ -102,10 +102,5 @@ calledby.txt wsjt7a.txt ${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR} .endfor - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif .include Index: head/comms/wspr/Makefile =================================================================== --- head/comms/wspr/Makefile +++ head/comms/wspr/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv3 BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYTHON_LIBDIR}/tkinter:x11-toolkits/py-tkinter \ - ${PYTHON_SITELIBDIR}/PIL:graphics/py-pillow \ - ${PYTHON_SITELIBDIR}/scipy:science/py-scipy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} LIB_DEPENDS= libhamlib.so:comms/hamlib \ libfftw3f.so:math/fftw3-float \ libsamplerate.so:audio/libsamplerate \ @@ -61,11 +61,6 @@ scp ${DISTDIR}/${DISTNAME}.tar.bz2 \ freefall.freebsd.org:public_distfiles/ .endif -.endif - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif .include Index: head/converters/py-bencode.py/Makefile =================================================================== --- head/converters/py-bencode.py/Makefile +++ head/converters/py-bencode.py/Makefile @@ -15,8 +15,8 @@ LICENSE_TEXT= See http://directory.fsf.org/wiki/License:BitTorrentOSL1.1 LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} NO_ARCH= yes USES= python Index: head/converters/py-rencode/Makefile =================================================================== --- head/converters/py-rencode/Makefile +++ head/converters/py-rencode/Makefile @@ -11,9 +11,7 @@ LICENSE= GPLv3 -BUILD_DEPENDS= cython:lang/cython - -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython USES= python post-install: Index: head/converters/py-zfec/Makefile =================================================================== --- head/converters/py-zfec/Makefile +++ head/converters/py-zfec/Makefile @@ -18,7 +18,7 @@ unsort:devel/py-pyutil RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} Index: head/converters/zbase32/Makefile =================================================================== --- head/converters/zbase32/Makefile +++ head/converters/zbase32/Makefile @@ -11,10 +11,10 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Base32 Encoder/Decoder -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_darcs>=1.2.11:devel/py-setuptools_darcs +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_darcs>=1.2.11:devel/py-setuptools_darcs@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/databases/Makefile =================================================================== --- head/databases/Makefile +++ head/databases/Makefile @@ -854,16 +854,6 @@ SUBDIR += py-whisper SUBDIR += py-xapian SUBDIR += py-zodbpickle - SUBDIR += py3-apsw - SUBDIR += py3-bsddb3 - SUBDIR += py3-mysqlclient - SUBDIR += py3-psycopg2 - SUBDIR += py34-gdbm - SUBDIR += py34-sqlite3 - SUBDIR += py35-gdbm - SUBDIR += py35-sqlite3 - SUBDIR += py36-gdbm - SUBDIR += py36-sqlite3 SUBDIR += pydbx SUBDIR += pymongo SUBDIR += pypy-gdbm Index: head/databases/buzhug/Makefile =================================================================== --- head/databases/buzhug/Makefile +++ head/databases/buzhug/Makefile @@ -10,6 +10,6 @@ COMMENT= Pure-Python database engine USES= python zip -USE_PYTHON= distutils +USE_PYTHON= distutils autoplist concurrent optsuffix .include Index: head/databases/buzhug/pkg-plist =================================================================== --- head/databases/buzhug/pkg-plist +++ head/databases/buzhug/pkg-plist @@ -1,21 +0,0 @@ -%%PYTHON_SITELIBDIR%%/buzhug/__init__.py -%%PYTHON_SITELIBDIR%%/buzhug/__init__.pyc -%%PYTHON_SITELIBDIR%%/buzhug/__init__.pyo -%%PYTHON_SITELIBDIR%%/buzhug/buzhug.py -%%PYTHON_SITELIBDIR%%/buzhug/buzhug.pyc -%%PYTHON_SITELIBDIR%%/buzhug/buzhug.pyo -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_algos.py -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_algos.pyc -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_algos.pyo -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_files.py -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_files.pyc -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_files.pyo -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_info.py -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_info.pyc -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_info.pyo -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_test.py -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_test.pyc -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_test.pyo -%%PYTHON_SITELIBDIR%%/buzhug/conversion_float.py -%%PYTHON_SITELIBDIR%%/buzhug/conversion_float.pyc -%%PYTHON_SITELIBDIR%%/buzhug/conversion_float.pyo Index: head/databases/emma/Makefile =================================================================== --- head/databases/emma/Makefile +++ head/databases/emma/Makefile @@ -10,9 +10,9 @@ MAINTAINER= jun-g@daemonfreaks.com COMMENT= Extendable MySQL managing assistant -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${FLAVOR} -USES= python +USES= python:2.7 USE_GNOME= pygtk2 USE_PYTHON= distutils Index: head/databases/gadfly/Makefile =================================================================== --- head/databases/gadfly/Makefile +++ head/databases/gadfly/Makefile @@ -10,7 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= SQL database written in Python -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/kjbuckets.so:devel/py-kjbuckets +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/kjbuckets.so:devel/py-kjbuckets@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: head/databases/grass7/Makefile =================================================================== --- head/databases/grass7/Makefile +++ head/databases/grass7/Makefile @@ -25,7 +25,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/GPL.TXT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2:math/py-numpy +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libgdal.so:graphics/gdal \ libpng.so:graphics/png \ libproj.so:graphics/proj \ @@ -113,7 +113,7 @@ PGSQL_CONFIGURE_ON= --with-postgres SQLITE_USES= sqlite SQLITE_CONFIGURE_ON= --with-sqlite -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} .include Index: head/databases/metakit/Makefile =================================================================== --- head/databases/metakit/Makefile +++ head/databases/metakit/Makefile @@ -26,7 +26,7 @@ OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CONFIGURE_ON= --with-python=${LOCALBASE} PYTHON_CATEGORIES= python Index: head/databases/monetdb/Makefile =================================================================== --- head/databases/monetdb/Makefile +++ head/databases/monetdb/Makefile @@ -177,7 +177,7 @@ .endif .if ${PORT_OPTIONS:MPYTHON2} -USES+= python:2 +USES+= python:2.7 PLIST_SUB+= PYTHON_VER=${PYTHON_VER} CONFIGURE_ARGS+= --with-python2=${PYTHON_CMD} \ --without-python3 @@ -186,7 +186,7 @@ .endif .if ${PORT_OPTIONS:MPYTHON3} -USES+= python:3 +USES+= python:3.4+ USE_PYTHON= py3kplist PLIST_SUB+= PYTHON_VER=${PYTHON_VER} CONFIGURE_ARGS+= --with-python3=${PYTHON_CMD} \ Index: head/databases/mtools-mongodb/Makefile =================================================================== --- head/databases/mtools-mongodb/Makefile +++ head/databases/mtools-mongodb/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib + ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} USE_PYTHON= autoplist distutils USES= python:2 Index: head/databases/mydbf2mysql/Makefile =================================================================== --- head/databases/mydbf2mysql/Makefile +++ head/databases/mydbf2mysql/Makefile @@ -11,10 +11,10 @@ MAINTAINER= andrey.polyakov@unix.net COMMENT= Flexible tool for DBF import into MySQL -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb -RUN_DEPENDS+= ydbf>=0.0.1:devel/py-ydbf +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} +RUN_DEPENDS+= ydbf>=0.0.1:devel/py-ydbf@${FLAVOR} -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/${PORTNAME}/${PORTNAME}/dist/${DISTNAME}/ Index: head/databases/openark-kit/Makefile =================================================================== --- head/databases/openark-kit/Makefile +++ head/databases/openark-kit/Makefile @@ -11,10 +11,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/databases/pg_activity/Makefile =================================================================== --- head/databases/pg_activity/Makefile +++ head/databases/pg_activity/Makefile @@ -11,8 +11,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${FLAVOR} OPTIONS_DEFINE= DOCS @@ -20,7 +20,7 @@ GH_ACCOUNT= julmon USES= python:2.6+ -USE_PYTHON= autoplist distutils noegginfo +USE_PYTHON= autoplist distutils noegginfo concurrent optsuffix PYDISTUTILS_INSTALLARGS= --with-man post-patch: Index: head/databases/pgbarman/Makefile =================================================================== --- head/databases/pgbarman/Makefile +++ head/databases/pgbarman/Makefile @@ -15,10 +15,10 @@ LICENSE= GPLv3 RUN_DEPENDS= rsync:net/rsync \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}argh>=0.21.2:devel/py-argh \ - ${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete + ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}argh>=0.21.2:devel/py-argh@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete@${FLAVOR} NO_ARCH= yes @@ -27,7 +27,7 @@ USES= pgsql python WANT_PGSQL= client -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix PORTDOCS= tutorial.pdf Index: head/databases/pgloader/Makefile =================================================================== --- head/databases/pgloader/Makefile +++ head/databases/pgloader/Makefile @@ -11,10 +11,10 @@ COMMENT= Import CSV data and Large Object to PostgreSQL NO_BUILD= yes -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= *.py -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psycopg2/__init__.py:databases/py-psycopg2 +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psycopg2/__init__.py:databases/py-psycopg2@${PY_FLAVOR} OPTIONS_DEFINE= DOCS EXAMPLES Index: head/databases/pgworksheet/Makefile =================================================================== --- head/databases/pgworksheet/Makefile +++ head/databases/pgworksheet/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyPgSQL/libpq/__init__.py:databases/py-pyPgSQL +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyPgSQL/libpq/__init__.py:databases/py-pyPgSQL@${FLAVOR} USES= pgsql python:2 tar:bzip2 USE_GNOME= pygtk2 Index: head/databases/powa-web/Makefile =================================================================== --- head/databases/powa-web/Makefile +++ head/databases/powa-web/Makefile @@ -12,9 +12,9 @@ LICENSE= PostgreSQL -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}tornado>=2.0:www/py-tornado +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>=2.0:www/py-tornado@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/databases/py-Elixir/Makefile =================================================================== --- head/databases/py-Elixir/Makefile +++ head/databases/py-Elixir/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.4.0:databases/py-sqlalchemy10 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.4.0:databases/py-sqlalchemy10@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/databases/py-Pyrseas/Makefile =================================================================== --- head/databases/py-Pyrseas/Makefile +++ head/databases/py-Pyrseas/Makefile @@ -12,9 +12,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5:databases/py-psycopg2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/databases/py-agate-sql/Makefile =================================================================== --- head/databases/py-agate-sql/Makefile +++ head/databases/py-agate-sql/Makefile @@ -11,8 +11,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.8:databases/py-sqlalchemy10 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.8:databases/py-sqlalchemy10@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/databases/py-alembic/Makefile =================================================================== --- head/databases/py-alembic/Makefile +++ head/databases/py-alembic/Makefile @@ -11,8 +11,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/databases/py-apsw/Makefile =================================================================== --- head/databases/py-apsw/Makefile +++ head/databases/py-apsw/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_PYTHON= autoplist concurrent distutils -USES?= localbase python sqlite:3 +USES= localbase python sqlite:3 GH_ACCOUNT= rogerbinns USE_GITHUB= yes Index: head/databases/py-bsddb/Makefile =================================================================== --- head/databases/py-bsddb/Makefile +++ head/databases/py-bsddb/Makefile @@ -17,7 +17,7 @@ PORTSCOUT= ignore:1 USE_PYTHON= distutils autoplist -USES= bdb python tar:xz +USES= bdb python:2.7 tar:xz DIST_SUBDIR= python DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo @@ -27,12 +27,6 @@ MAKE_ENV= BSDDB_VERSION=${BDB_LIB_NAME} -.include - -.if ${PYTHON_REL} >= 3000 -IGNORE= bsddb package was removed from core standard library since 3.0, use databases/py-bsddb3 instead -.endif - post-extract: @${CP} ${FILESDIR}/setup.py ${WRKSRC} @@ -41,4 +35,4 @@ 's,^\(#include.*\)\(db\.h.*\)$$,\1${BDB_INCLUDE_DIR}/\2,' \ ${WRKSRC}/bsddb.h -.include +.include Index: head/databases/py-bsddb3/Makefile =================================================================== --- head/databases/py-bsddb3/Makefile +++ head/databases/py-bsddb3/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -USES?= bdb python +USES= bdb python USE_PYTHON= distutils autoplist PYDISTUTILS_CONFIGUREARGS=--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE} Index: head/databases/py-carbon/Makefile =================================================================== --- head/databases/py-carbon/Makefile +++ head/databases/py-carbon/Makefile @@ -12,10 +12,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:net/py-txamqp \ - ${PYTHON_PKGNAMEPREFIX}whisper>=0.9.10:databases/py-whisper \ - ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:net/py-txamqp@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}whisper>=0.9.10:databases/py-whisper@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18@${FLAVOR} NO_ARCH= yes USE_PYTHON= distutils Index: head/databases/py-couchdb/Makefile =================================================================== --- head/databases/py-couchdb/Makefile +++ head/databases/py-couchdb/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${FLAVOR} USES= python -USE_PYTHON= distutils pythonprefix +USE_PYTHON= distutils autoplist concurrent pythonprefix .include Index: head/databases/py-couchdb/pkg-plist =================================================================== --- head/databases/py-couchdb/pkg-plist +++ head/databases/py-couchdb/pkg-plist @@ -1,95 +0,0 @@ -bin/couchdb-dump -bin/couchdb-load -bin/couchdb-load-design-doc -bin/couchdb-replicate -bin/couchpy -%%PYTHON_SITELIBDIR%%/couchdb/__init__.py -%%PYTHON_SITELIBDIR%%/couchdb/__init__.pyc -%%PYTHON_SITELIBDIR%%/couchdb/__init__.pyo -%%PYTHON_SITELIBDIR%%/couchdb/__main__.py -%%PYTHON_SITELIBDIR%%/couchdb/__main__.pyc -%%PYTHON_SITELIBDIR%%/couchdb/__main__.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/client.py -%%PYTHON_SITELIBDIR%%/couchdb/client.pyc -%%PYTHON_SITELIBDIR%%/couchdb/client.pyo -%%PYTHON_SITELIBDIR%%/couchdb/design.py -%%PYTHON_SITELIBDIR%%/couchdb/design.pyc -%%PYTHON_SITELIBDIR%%/couchdb/design.pyo -%%PYTHON_SITELIBDIR%%/couchdb/http.py -%%PYTHON_SITELIBDIR%%/couchdb/http.pyc -%%PYTHON_SITELIBDIR%%/couchdb/http.pyo -%%PYTHON_SITELIBDIR%%/couchdb/json.py -%%PYTHON_SITELIBDIR%%/couchdb/json.pyc -%%PYTHON_SITELIBDIR%%/couchdb/json.pyo -%%PYTHON_SITELIBDIR%%/couchdb/loader.py -%%PYTHON_SITELIBDIR%%/couchdb/loader.pyc -%%PYTHON_SITELIBDIR%%/couchdb/loader.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/mapping.py -%%PYTHON_SITELIBDIR%%/couchdb/mapping.pyc -%%PYTHON_SITELIBDIR%%/couchdb/mapping.pyo -%%PYTHON_SITELIBDIR%%/couchdb/multipart.py -%%PYTHON_SITELIBDIR%%/couchdb/multipart.pyc -%%PYTHON_SITELIBDIR%%/couchdb/multipart.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/__init__.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/__init__.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/__init__.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/__main__.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/__main__.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/__main__.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/tests/client.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/client.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/client.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/couch_tests.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/couch_tests.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/couch_tests.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/couchhttp.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/couchhttp.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/couchhttp.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/tests/design.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/design.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/design.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/loader.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/loader.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/loader.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/tests/mapping.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/mapping.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/mapping.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/multipart.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/multipart.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/multipart.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/package.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/package.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/package.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/testutil.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/testutil.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/testutil.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/tools.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/tools.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/tools.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/util.py -%%PYTHON_SITELIBDIR%%/couchdb/util.pyc -%%PYTHON_SITELIBDIR%%/couchdb/util.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/util2.py -%%PYTHON_SITELIBDIR%%/couchdb/util2.pyc -%%PYTHON_SITELIBDIR%%/couchdb/util2.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/util3.py -%%PYTHON_SITELIBDIR%%/couchdb/util3.pyc -%%PYTHON_SITELIBDIR%%/couchdb/util3.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/tests/view.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/view.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/view.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tools/__init__.py -%%PYTHON_SITELIBDIR%%/couchdb/tools/__init__.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tools/__init__.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tools/dump.py -%%PYTHON_SITELIBDIR%%/couchdb/tools/dump.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tools/dump.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tools/load.py -%%PYTHON_SITELIBDIR%%/couchdb/tools/load.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tools/load.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tools/replicate.py -%%PYTHON_SITELIBDIR%%/couchdb/tools/replicate.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tools/replicate.pyo -%%PYTHON_SITELIBDIR%%/couchdb/view.py -%%PYTHON_SITELIBDIR%%/couchdb/view.pyc -%%PYTHON_SITELIBDIR%%/couchdb/view.pyo Index: head/databases/py-cql/Makefile =================================================================== --- head/databases/py-cql/Makefile +++ head/databases/py-cql/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/thrift/Thrift.py:devel/py-thrift +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/thrift/Thrift.py:devel/py-thrift@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= cql Index: head/databases/py-django-transaction-hooks/Makefile =================================================================== --- head/databases/py-django-transaction-hooks/Makefile +++ head/databases/py-django-transaction-hooks/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6.1:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6.1:www/py-django18@${FLAVOR} NO_ARCH= yes Index: head/databases/py-fakeredis/Makefile =================================================================== --- head/databases/py-fakeredis/Makefile +++ head/databases/py-fakeredis/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/databases/py-flask-sqlalchemy/Makefile =================================================================== --- head/databases/py-flask-sqlalchemy/Makefile +++ head/databases/py-flask-sqlalchemy/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.8:databases/py-sqlalchemy10 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.8:databases/py-sqlalchemy10@${FLAVOR} NO_ARCH= yes USES= python Index: head/databases/py-forgetsql/Makefile =================================================================== --- head/databases/py-forgetsql/Makefile +++ head/databases/py-forgetsql/Makefile @@ -23,8 +23,8 @@ OPTIONS_DEFINE= DOCS MYSQL PGSQL -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} .include Index: head/databases/py-gdbm/Makefile =================================================================== --- head/databases/py-gdbm/Makefile +++ head/databases/py-gdbm/Makefile @@ -19,7 +19,7 @@ PORTSCOUT= ignore:1 USES= python tar:xz -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist allflavors PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHONPREFIX_LIBDIR}/lib-dynload Index: head/databases/py-geoalchemy/Makefile =================================================================== --- head/databases/py-geoalchemy/Makefile +++ head/databases/py-geoalchemy/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>=0.6.1:databases/py-sqlalchemy11 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>=0.6.1:databases/py-sqlalchemy11@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils Index: head/databases/py-geoalchemy2/Makefile =================================================================== --- head/databases/py-geoalchemy2/Makefile +++ head/databases/py-geoalchemy2/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>=0.8:databases/py-sqlalchemy11 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>=0.8:databases/py-sqlalchemy11@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/databases/py-htsql-mysql/Makefile =================================================================== --- head/databases/py-htsql-mysql/Makefile +++ head/databases/py-htsql-mysql/Makefile @@ -14,8 +14,8 @@ LICENSE= AGPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}htsql>2.3:databases/py-htsql \ - ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}htsql>2.3:databases/py-htsql@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: head/databases/py-htsql-pgsql/Makefile =================================================================== --- head/databases/py-htsql-pgsql/Makefile +++ head/databases/py-htsql-pgsql/Makefile @@ -14,8 +14,8 @@ LICENSE= AGPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}htsql>2.3:databases/py-htsql \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}htsql>2.3:databases/py-htsql@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: head/databases/py-htsql/Makefile =================================================================== --- head/databases/py-htsql/Makefile +++ head/databases/py-htsql/Makefile @@ -17,7 +17,7 @@ USES= python:2 USE_PYTHON= distutils autoplist -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} .include Index: head/databases/py-kyotocabinet/Makefile =================================================================== --- head/databases/py-kyotocabinet/Makefile +++ head/databases/py-kyotocabinet/Makefile @@ -18,6 +18,6 @@ LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet USE_PYTHON= autoplist distutils -USES= python:3 +USES= python:3.4+ .include Index: head/databases/py-lmdb/Makefile =================================================================== --- head/databases/py-lmdb/Makefile +++ head/databases/py-lmdb/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0.8:devel/py-cffi +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0.8:devel/py-cffi@${FLAVOR} LIB_DEPENDS= liblmdb.so:databases/lmdb USES= localbase python Index: head/databases/py-motor/Makefile =================================================================== --- head/databases/py-motor/Makefile +++ head/databases/py-motor/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=3.3:databases/pymongo +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=3.3:databases/pymongo@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/databases/py-mycli/Makefile =================================================================== --- head/databases/py-mycli/Makefile +++ head/databases/py-mycli/Makefile @@ -13,14 +13,14 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cli-helpers>=0.2.3:devel/py-cli-helpers \ - ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.5:devel/py-configobj \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=1.0.0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.10:devel/py-prompt_toolkit \ - ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}pymysql>=0.6.7:databases/py-pymysql \ - ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.2:databases/py-sqlparse +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cli-helpers>=0.2.3:devel/py-cli-helpers@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.5:devel/py-configobj@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=1.0.0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.10:devel/py-prompt_toolkit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pymysql>=0.6.7:databases/py-pymysql@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.2:databases/py-sqlparse@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/databases/py-mysql2pgsql/Makefile =================================================================== --- head/databases/py-mysql2pgsql/Makefile +++ head/databases/py-mysql2pgsql/Makefile @@ -12,11 +12,11 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.4.2:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.4.2:databases/py-psycopg2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: head/databases/py-mysqlclient/Makefile =================================================================== --- head/databases/py-mysqlclient/Makefile +++ head/databases/py-mysqlclient/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= iconv mysql python ssl +USES= iconv mysql python ssl USE_PYTHON= distutils autoplist USE_GITHUB= yes GH_ACCOUNT= pymysql Index: head/databases/py-oursql/Makefile =================================================================== --- head/databases/py-oursql/Makefile +++ head/databases/py-oursql/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE -USES= mysql python +USES= mysql python:2.7 USE_PYTHON= autoplist distutils post-install: Index: head/databases/py-peewee/Makefile =================================================================== --- head/databases/py-peewee/Makefile +++ head/databases/py-peewee/Makefile @@ -20,8 +20,8 @@ USES= python USE_PYTHON= autoplist distutils -SQLITE_BUILD_DEPENDS= ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3 -MYSQL_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb -PGSQL_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:databases/py-psycopg2 +SQLITE_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} +MYSQL_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${FLAVOR} +PGSQL_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:databases/py-psycopg2@${FLAVOR} .include Index: head/databases/py-pg_pqueue/Makefile =================================================================== --- head/databases/py-pg_pqueue/Makefile +++ head/databases/py-pg_pqueue/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist OPTIONS_DEFINE= DOCS Index: head/databases/py-pgcli/Makefile =================================================================== --- head/databases/py-pgcli/Makefile +++ head/databases/py-pgcli/Makefile @@ -13,16 +13,16 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cli-helpers>=0.2.3:devel/py-cli-helpers \ - ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj \ - ${PYTHON_PKGNAMEPREFIX}humanize>=0.5.1:devel/py-humanize \ - ${PYTHON_PKGNAMEPREFIX}pgspecial>=1.8.0:databases/py-pgspecial \ - ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.10:devel/py-prompt_toolkit \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.4:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.9:devel/py-setproctitle \ - ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.2:databases/py-sqlparse +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cli-helpers>=0.2.3:devel/py-cli-helpers@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}humanize>=0.5.1:devel/py-humanize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pgspecial>=1.8.0:databases/py-pgspecial@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.10:devel/py-prompt_toolkit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.4:databases/py-psycopg2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.9:devel/py-setproctitle@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.2:databases/py-sqlparse@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/databases/py-pgspecial/Makefile =================================================================== --- head/databases/py-pgspecial/Makefile +++ head/databases/py-pgspecial/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1.19:databases/py-sqlparse +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1.19:databases/py-sqlparse@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/databases/py-pgxnclient/Makefile =================================================================== --- head/databases/py-pgxnclient/Makefile +++ head/databases/py-pgxnclient/Makefile @@ -11,6 +11,6 @@ COMMENT= Command line tool to interact with the PostgreSQL Extension Network USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix .include Index: head/databases/py-pickledb/Makefile =================================================================== --- head/databases/py-pickledb/Makefile +++ head/databases/py-pickledb/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/databases/py-pickleshare/Makefile =================================================================== --- head/databases/py-pickleshare/Makefile +++ head/databases/py-pickleshare/Makefile @@ -20,7 +20,7 @@ .include .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${FLAVOR} .endif .include Index: head/databases/py-psycopg2/Makefile =================================================================== --- head/databases/py-psycopg2/Makefile +++ head/databases/py-psycopg2/Makefile @@ -17,7 +17,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES USE_PYTHON= autoplist concurrent distutils -USES?= pgsql python +USES= pgsql python PORTDOCS= AUTHORS INSTALL NEWS PKG-INFO README.rst PORTEXAMPLES= * Index: head/databases/py-psycopg2cffi/Makefile =================================================================== --- head/databases/py-psycopg2cffi/Makefile +++ head/databases/py-psycopg2cffi/Makefile @@ -12,8 +12,8 @@ LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHONPREFIX_SITELIBDIR}/_cffi_backend.so:devel/py-cffi -RUN_DEPENDS= ${PYTHONPREFIX_SITELIBDIR}/_cffi_backend.so:devel/py-cffi +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR} USES= pgsql python USE_PYTHON= autoplist distutils Index: head/databases/py-pyhs/Makefile =================================================================== --- head/databases/py-pyhs/Makefile +++ head/databases/py-pyhs/Makefile @@ -12,7 +12,7 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= HandlerSocket client for Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/databases/py-pymssql/Makefile =================================================================== --- head/databases/py-pymssql/Makefile +++ head/databases/py-pymssql/Makefile @@ -12,12 +12,11 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}setuptools-git>0:devel/py-setuptools-git +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>0:devel/py-setuptools-git@${FLAVOR} LIB_DEPENDS= libsybdb.so:databases/freetds USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython post-extract: @${RM} ${WRKSRC}/_mssql.c Index: head/databases/py-pytc/Makefile =================================================================== --- head/databases/py-pytc/Makefile +++ head/databases/py-pytc/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/databases/py-python-rrdtool/Makefile =================================================================== --- head/databases/py-python-rrdtool/Makefile +++ head/databases/py-python-rrdtool/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= librrd.so:databases/rrdtool -USES= groff pkgconfig python +USES= groff pkgconfig python:2.7 USE_GNOME= cairo glib20 libxml2 pango USE_PYTHON= distutils autoplist Index: head/databases/py-python-swiftclient/Makefile =================================================================== --- head/databases/py-python-swiftclient/Makefile +++ head/databases/py-python-swiftclient/Makefile @@ -12,14 +12,14 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>=3.0:devel/py-futures \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>=1.1:www/py-requests +RUN_DEPENDS+= ${PY_FUTURES} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=1.1:www/py-requests@${FLAVOR} -USES= python:2 +USES= python USE_PYTHON= distutils autoplist post-install: Index: head/databases/py-qt4-sql/Makefile =================================================================== --- head/databases/py-qt4-sql/Makefile +++ head/databases/py-qt4-sql/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run +USE_PYTHON= flavors USE_QT4= corelib gui sql \ moc_build qmake_build Index: head/databases/py-qt5-sql/Makefile =================================================================== --- head/databases/py-qt5-sql/Makefile +++ head/databases/py-qt5-sql/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run +USE_PYTHON= flavors USE_QT5= core gui sql widgets buildtools_build qmake_build OPTIONS_DEFINE= API DEBUG Index: head/databases/py-queries/Makefile =================================================================== --- head/databases/py-queries/Makefile +++ head/databases/py-queries/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:databases/py-psycopg2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:databases/py-psycopg2@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/databases/py-rb/Makefile =================================================================== --- head/databases/py-rb/Makefile +++ head/databases/py-rb/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=2.6:databases/py-redis +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=2.6:databases/py-redis@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/databases/py-redis/Makefile =================================================================== --- head/databases/py-redis/Makefile +++ head/databases/py-redis/Makefile @@ -18,7 +18,7 @@ HIREDIS_DESC= High performance response parser (via hiredis) -HIREDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hiredis>0:databases/py-hiredis +HIREDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hiredis>0:databases/py-hiredis@${FLAVOR} USES= python USE_PYTHON= distutils autoplist concurrent Index: head/databases/py-riak/Makefile =================================================================== --- head/databases/py-riak/Makefile +++ head/databases/py-riak/Makefile @@ -13,8 +13,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}riak_pb>=2.0.0:devel/py-riak_pb \ - ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}riak_pb>=2.0.0:devel/py-riak_pb@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: head/databases/py-sqlalchemy-migrate/Makefile =================================================================== --- head/databases/py-sqlalchemy-migrate/Makefile +++ head/databases/py-sqlalchemy-migrate/Makefile @@ -13,13 +13,13 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.8:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}Tempita>=0.4:textproc/py-Tempita \ - ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}sqlparse>0:databases/py-sqlparse \ - ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.8:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Tempita>=0.4:textproc/py-Tempita@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlparse>0:databases/py-sqlparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${FLAVOR} USES= python USE_PYTHON= distutils concurrent autoplist Index: head/databases/py-sqlalchemy10/Makefile =================================================================== --- head/databases/py-sqlalchemy10/Makefile +++ head/databases/py-sqlalchemy10/Makefile @@ -14,8 +14,8 @@ LICENSE= MIT -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python USE_PYTHON= distutils autoplist @@ -34,10 +34,10 @@ MSSQL_DESC= MS SQL Server backend SYBASE_DESC= Sybase backend -MSSQL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pymssql.py:databases/py-pymssql -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:databases/py-psycopg2 -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -SYBASE_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Sybase.py:databases/py-sybase +MSSQL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pymssql.py:databases/py-pymssql@${FLAVOR} +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:databases/py-psycopg2@${FLAVOR} +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} +SYBASE_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Sybase.py:databases/py-sybase@${FLAVOR} PORTDOCS= * PORTEXAMPLES= * @@ -45,11 +45,11 @@ .include .if ${PYTHON_REL} < 3000 -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} #.else # At the moment databases/py-pymysql does not build with Python3 # See https://github.com/petehunt/PyMySQL#python-3-0-support -#MYSQL_RUN_DEPENDS+= pymysql>=0.5:databases/py-pymysql +#MYSQL_RUN_DEPENDS+= pymysql>=0.5:databases/py-pymysql@${FLAVOR} .endif pre-build: Index: head/databases/py-sqlalchemy11/Makefile =================================================================== --- head/databases/py-sqlalchemy11/Makefile +++ head/databases/py-sqlalchemy11/Makefile @@ -14,9 +14,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${FLAVOR} CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy0 ${PYTHON_PKGNAMEPREFIX}sqlalchemy10 @@ -31,11 +31,11 @@ PORTDOCS= * PORTEXAMPLES= * -MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mssql>=0:databases/py-pymssql -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymysql>=0:databases/py-pymysql -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.0:databases/py-psycopg2 -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 -SYBASE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sybase>=0:databases/py-sybase +MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mssql>=0:databases/py-pymssql@${FLAVOR} +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymysql>=0:databases/py-pymysql@${FLAVOR} +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.0:databases/py-psycopg2@${FLAVOR} +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} +SYBASE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sybase>=0:databases/py-sybase@${FLAVOR} post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/sqlalchemy/*.so Index: head/databases/py-sqlite3/Makefile =================================================================== --- head/databases/py-sqlite3/Makefile +++ head/databases/py-sqlite3/Makefile @@ -21,7 +21,7 @@ PORTSCOUT= ignore:1 USES= python tar:xz -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils allflavors DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo WRKSRC= ${WRKDIR}/Python-${PORTVERSION}/Modules Index: head/databases/py-sqlite3dbm/Makefile =================================================================== --- head/databases/py-sqlite3dbm/Makefile +++ head/databases/py-sqlite3dbm/Makefile @@ -11,10 +11,10 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Sqlite-backed dictionary -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/databases/py-sqlobject/Makefile =================================================================== --- head/databases/py-sqlobject/Makefile +++ head/databases/py-sqlobject/Makefile @@ -13,7 +13,7 @@ LICENSE= LGPL21 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.2:www/py-formencode +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.2:www/py-formencode@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes @@ -26,11 +26,11 @@ PORTDOCS= * -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2 -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 -MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymssql>=0:databases/py-pymssql -SYBASE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sybase>=0.37:databases/py-sybase +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${FLAVOR} +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${FLAVOR} +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} +MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymssql>=0:databases/py-pymssql@${FLAVOR} +SYBASE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sybase>=0.37:databases/py-sybase@${FLAVOR} post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} Index: head/databases/py-swift/Makefile =================================================================== --- head/databases/py-swift/Makefile +++ head/databases/py-swift/Makefile @@ -13,22 +13,22 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}PasteDeploy>0:www/py-pastedeploy \ - ${PYTHON_PKGNAMEPREFIX}dnspython>=1.10.0:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.8:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=0:databases/py-python-swiftclient \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}webob>=0.9.8:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}xattr>=0:devel/py-xattr \ +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}PasteDeploy>0:www/py-pastedeploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dnspython>=1.10.0:dns/py-dnspython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.8:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=0:databases/py-python-swiftclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=0.9.8:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xattr>=0:devel/py-xattr@${FLAVOR} \ memcached>=0:databases/memcached \ rsync>=3.0:net/rsync -USES= python:2 +USES= python:2.7 USE_PYTHON= distutils autoplist USE_RC_SUBR= swift USERS= swift Index: head/databases/py-sybase/Makefile =================================================================== --- head/databases/py-sybase/Makefile +++ head/databases/py-sybase/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libct.so:databases/freetds -USES= python +USES= python:2.7 USE_PYTHON= distutils OPTIONS_DEFINE= DOCS THREADS EXAMPLES Index: head/databases/py-unqlite/Makefile =================================================================== --- head/databases/py-unqlite/Makefile +++ head/databases/py-unqlite/Makefile @@ -11,9 +11,7 @@ LICENSE= MIT -BUILD_DEPENDS= cython>0:lang/cython - USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist cython .include Index: head/databases/py-xapian/Makefile =================================================================== --- head/databases/py-xapian/Makefile +++ head/databases/py-xapian/Makefile @@ -17,7 +17,7 @@ BROKEN_aarch64= fails to build: Fatal Python error: swig_pythreadstate set in XapianSWIG_Python_Thread_Allow ctor -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4.8:textproc/py-sphinx \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4.8:textproc/py-sphinx@${FLAVOR} \ xapian-core>=${PORTVERSION}:databases/xapian-core LIB_DEPENDS= libxapian.so:databases/xapian-core @@ -34,6 +34,7 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= libtool python tar:xz +USE_PYTHON= flavors PORTDOCS= * Index: head/databases/py3-apsw/Makefile =================================================================== --- head/databases/py3-apsw/Makefile +++ head/databases/py3-apsw/Makefile @@ -1,9 +0,0 @@ -# $FreeBSD$ - -USES= localbase python:3.3+ sqlite:3 - -PORTSCOUT= ignore:1 - -MASTERDIR= ${.CURDIR}/../py-apsw - -.include "${MASTERDIR}/Makefile" Index: head/databases/py3-bsddb3/Makefile =================================================================== --- head/databases/py3-bsddb3/Makefile +++ head/databases/py3-bsddb3/Makefile @@ -1,8 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-bsddb3 - -USES= bdb python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: head/databases/py3-mysqlclient/Makefile =================================================================== --- head/databases/py3-mysqlclient/Makefile +++ head/databases/py3-mysqlclient/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-mysqlclient - -USES= python:3.3+ mysql - -.include "${MASTERDIR}/Makefile" Index: head/databases/py3-psycopg2/Makefile =================================================================== --- head/databases/py3-psycopg2/Makefile +++ head/databases/py3-psycopg2/Makefile @@ -1,9 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-psycopg2 - -PORTSCOUT= ignore:1 - -USES= pgsql python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/databases/py34-gdbm/Makefile =================================================================== --- head/databases/py34-gdbm/Makefile +++ head/databases/py34-gdbm/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-gdbm - -PYTHON_VERSION= python3.4 - -.include "${MASTERDIR}/Makefile" Index: head/databases/py34-sqlite3/Makefile =================================================================== --- head/databases/py34-sqlite3/Makefile +++ head/databases/py34-sqlite3/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-sqlite3 - -PYTHON_VERSION= python3.4 - -.include "${MASTERDIR}/Makefile" Index: head/databases/py35-gdbm/Makefile =================================================================== --- head/databases/py35-gdbm/Makefile +++ head/databases/py35-gdbm/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-gdbm - -PYTHON_VERSION= python3.5 - -.include "${MASTERDIR}/Makefile" Index: head/databases/py35-sqlite3/Makefile =================================================================== --- head/databases/py35-sqlite3/Makefile +++ head/databases/py35-sqlite3/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-sqlite3 - -PYTHON_VERSION= python3.5 - -.include "${MASTERDIR}/Makefile" Index: head/databases/py36-gdbm/Makefile =================================================================== --- head/databases/py36-gdbm/Makefile +++ head/databases/py36-gdbm/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-gdbm - -PYTHON_VERSION= python3.6 - -.include "${MASTERDIR}/Makefile" Index: head/databases/py36-sqlite3/Makefile =================================================================== --- head/databases/py36-sqlite3/Makefile +++ head/databases/py36-sqlite3/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-sqlite3 - -PYTHON_VERSION= python3.6 - -.include "${MASTERDIR}/Makefile" Index: head/databases/pydbx/Makefile =================================================================== --- head/databases/pydbx/Makefile +++ head/databases/pydbx/Makefile @@ -11,7 +11,7 @@ MAINTAINER= david@acz.org COMMENT= Simple SQL database abstraction layer for Python -USES= python -USE_PYTHON= distutils +USES= python:2.7 +USE_PYTHON= distutils autoplist .include Index: head/databases/pydbx/pkg-plist =================================================================== --- head/databases/pydbx/pkg-plist +++ head/databases/pydbx/pkg-plist @@ -1,9 +0,0 @@ -%%PYTHON_SITELIBDIR%%/dbx/__init__.py -%%PYTHON_SITELIBDIR%%/dbx/__init__.pyc -%%PYTHON_SITELIBDIR%%/dbx/__init__.pyo -%%PYTHON_SITELIBDIR%%/dbx/mysql.py -%%PYTHON_SITELIBDIR%%/dbx/mysql.pyc -%%PYTHON_SITELIBDIR%%/dbx/mysql.pyo -%%PYTHON_SITELIBDIR%%/dbx/sqlite.py -%%PYTHON_SITELIBDIR%%/dbx/sqlite.pyc -%%PYTHON_SITELIBDIR%%/dbx/sqlite.pyo Index: head/databases/pyspatialite/Makefile =================================================================== --- head/databases/pyspatialite/Makefile +++ head/databases/pyspatialite/Makefile @@ -22,7 +22,7 @@ OPTIONS_DEFINE= DOCS -USES= iconv python +USES= iconv python:2.7 USE_PYTHON= autoplist concurrent distutils .include Index: head/databases/rrdtool/Makefile =================================================================== --- head/databases/rrdtool/Makefile +++ head/databases/rrdtool/Makefile @@ -52,6 +52,7 @@ PERL_USES= perl5 PYTHON_CONFIGURE_ENABLE=python PYTHON_USES= python +PYTHON_USE= python=flavors,optsuffix RUBY_CONFIGURE_ENABLE= ruby RUBY_USE= RUBY=yes Index: head/databases/rrdtool12/Makefile =================================================================== --- head/databases/rrdtool12/Makefile +++ head/databases/rrdtool12/Makefile @@ -29,7 +29,7 @@ .include .if ${PORT_OPTIONS:MPYTHON} -USES+= python +USES+= python:2.7 PLIST_SUB+= WITH_PYTHON="" CONFIGURE_ARGS+= --enable-python .else Index: head/databases/zodb3/Makefile =================================================================== --- head/databases/zodb3/Makefile +++ head/databases/zodb3/Makefile @@ -14,12 +14,12 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig \ - ${PYTHON_PKGNAMEPREFIX}zdaemon>=0:sysutils/py-zdaemon \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zclockfile>=1.0.0:devel/py-zclockfile \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=1.0.0:devel/py-zope.event +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zdaemon>=0:sysutils/py-zdaemon@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zclockfile>=1.0.0:devel/py-zclockfile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=1.0.0:devel/py-zope.event@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: head/deskutils/calibre/Makefile =================================================================== --- head/deskutils/calibre/Makefile +++ head/deskutils/calibre/Makefile @@ -19,32 +19,32 @@ libpodofo.so:graphics/podofo \ libmtp.so:multimedia/libmtp \ libfreetype.so:print/freetype2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1,1:www/py-cssutils \ - ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex \ - ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1,1:www/py-cssutils@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} RUN_DEPENDS= xdg-open:devel/xdg-utils \ - ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1,1:www/py-cssutils \ - ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32 \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect \ - ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex \ - ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet \ - ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser \ + ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1,1:www/py-cssutils@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \ pdftohtml:graphics/poppler-utils USES= desktop-file-utils gettext-runtime gnome localbase:ldflags pkgconfig \ Index: head/deskutils/conduit/Makefile =================================================================== --- head/deskutils/conduit/Makefile +++ head/deskutils/conduit/Makefile @@ -11,15 +11,15 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Synchronization application for GNOME -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject \ - ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} LIB_DEPENDS= libdbus-1.so:devel/dbus -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject \ - ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus \ +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \ xdg-open:devel/xdg-utils GNU_CONFIGURE= yes Index: head/deskutils/conkyemail/Makefile =================================================================== --- head/deskutils/conkyemail/Makefile +++ head/deskutils/conkyemail/Makefile @@ -13,7 +13,7 @@ RUN_DEPENDS= conky:sysutils/conky -USES= python +USES= python:2.7 USE_PYTHON= distutils NO_BUILD= yes NO_ARCH= yes Index: head/deskutils/conkyforecast/Makefile =================================================================== --- head/deskutils/conkyforecast/Makefile +++ head/deskutils/conkyforecast/Makefile @@ -18,7 +18,7 @@ pidof:sysutils/pidof USES= gettext python fonts -USE_PYTHON= distutils +USE_PYTHON= distutils concurrent optsuffix SUB_FILES= pkg-message WRKSRC= ${WRKDIR}/src Index: head/deskutils/dosage/Makefile =================================================================== --- head/deskutils/dosage/Makefile +++ head/deskutils/dosage/Makefile @@ -11,10 +11,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix post-patch: @${REINPLACE_CMD} 's|share/man/man1|man/man1|' ${WRKSRC}/setup.py Index: head/deskutils/everygui/Makefile =================================================================== --- head/deskutils/everygui/Makefile +++ head/deskutils/everygui/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= dos2unix python shebangfix +USES= dos2unix python:2.7 shebangfix SHEBANG_FILES= src/*.py DOS2UNIX_GLOB= *.py USE_PYTHON= distutils autoplist Index: head/deskutils/gbirthday/Makefile =================================================================== --- head/deskutils/gbirthday/Makefile +++ head/deskutils/gbirthday/Makefile @@ -18,11 +18,11 @@ OPTIONS_DEFINE= MYSQL NLS NOTIFY THUNDERBIRD OPTIONS_SUB= yes THUNDERBIRD_DESC= Thunderbird/Sunbird support -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${PY_FLAVOR} NLS_USES= gettext NLS_USE= GNOME=intltool -NOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>0:devel/py-notify -THUNDERBIRD_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +NOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>0:devel/py-notify@${PY_FLAVOR} +THUNDERBIRD_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} NO_ARCH= yes USES= python:2.7,run Index: head/deskutils/gcalcli/Makefile =================================================================== --- head/deskutils/gcalcli/Makefile +++ head/deskutils/gcalcli/Makefile @@ -12,11 +12,11 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}gdata>=0:devel/py-gdata \ - ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=0:www/py-google-api-python-client \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}python-gflags>=0:devel/py-python-gflags +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gdata>=0:devel/py-gdata@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=0:www/py-google-api-python-client@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-gflags>=0:devel/py-python-gflags@${PY_FLAVOR} USES= python:-2.7 shebangfix USE_GITHUB= yes @@ -31,9 +31,9 @@ SIMPLEJSON_DESC= Use simplejson for url shortening FUZZYDATES_DESC= Use parsedatetime for fuzzy date parsing -ICS_VCAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject -SIMPLEJSON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson -FUZZYDATES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}parsedatetime>=0:devel/py-parsedatetime +ICS_VCAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject@${PY_FLAVOR} +SIMPLEJSON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR} +FUZZYDATES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}parsedatetime>=0:devel/py-parsedatetime@${PY_FLAVOR} NO_BUILD= yes NO_ARCH= yes Index: head/deskutils/gnome-sound-recorder/Makefile =================================================================== --- head/deskutils/gnome-sound-recorder/Makefile +++ head/deskutils/gnome-sound-recorder/Makefile @@ -14,7 +14,7 @@ PORTSCOUT= limitw:1,even -USES= gettext gmake gnome libtool pathfix pkgconfig python:3 tar:xz +USES= gettext gmake gnome libtool pathfix pkgconfig python:3.4+ tar:xz USE_GNOME= gnomedesktop3 gtk30 intlhack introspection:build USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: head/deskutils/gourmet/Makefile =================================================================== --- head/deskutils/gourmet/Makefile +++ head/deskutils/gourmet/Makefile @@ -12,16 +12,16 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra \ - ${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}poppler>=0:graphics/py-poppler \ - ${PYTHON_PKGNAMEPREFIX}rtf>=0:print/py-rtf \ - ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab \ - ${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}poppler>=0:graphics/py-poppler@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rtf>=0:print/py-rtf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32@${FLAVOR} OPTIONS_DEFINE= IPYTHON IPYTHON_DESC= Interactive shell support Index: head/deskutils/griffith/Makefile =================================================================== --- head/deskutils/griffith/Makefile +++ head/deskutils/griffith/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.5:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}reportlab1>=1.19:print/py-reportlab1 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.5:databases/py-sqlalchemy10@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}reportlab1>=1.19:print/py-reportlab1@${PY_FLAVOR} USES= gmake gettext python:2 shebangfix tar:xz SHEBANG_FILES= griffith @@ -28,10 +28,10 @@ OPTIONS_DEFAULT= LXML CHARDET_DESC= chardet support -CHARDET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet +CHARDET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} LXML_DESC= lxml support -LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml +LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} post-patch: .for file in Makefile Index: head/deskutils/gtg/Makefile =================================================================== --- head/deskutils/gtg/Makefile +++ head/deskutils/gtg/Makefile @@ -10,9 +10,9 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg \ - ${PYTHON_PKGNAMEPREFIX}liblarch>=2.1:devel/py-liblarch \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}liblarch>=2.1:devel/py-liblarch@${FLAVOR} \ xset:x11/xset USE_GNOME= pygobject pygtk2 @@ -24,7 +24,7 @@ OPTIONS_DEFINE= CHEETAH CHEETAH_DESC= Needed for export plugin to work OPTIONS_EXCLUDE= NLS DOCS -CHEETAH_RUN_DEPENDS= ${LOCALBASE}/bin/cheetah:devel/py-cheetah +CHEETAH_RUN_DEPENDS= ${LOCALBASE}/bin/cheetah:devel/py-cheetah@${FLAVOR} .include Index: head/deskutils/py-bugwarrior/Makefile =================================================================== --- head/deskutils/py-bugwarrior/Makefile +++ head/deskutils/py-bugwarrior/Makefile @@ -13,36 +13,36 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twiggy>0:devel/py-twiggy \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}taskw>=0.8:deskutils/py-taskw \ - ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.2:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl \ - ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.3:devel/py-dogpile.cache \ - ${PYTHON_PKGNAMEPREFIX}lockfile>=0.9.1:devel/py-lockfile \ - ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twiggy>0:devel/py-twiggy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}taskw>=0.8:deskutils/py-taskw@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.2:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.3:devel/py-dogpile.cache@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lockfile>=0.9.1:devel/py-lockfile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} OPTIONS_DEFINE= BUGZILLA JIRA PHABRICATOR OPTIONS_DEFAULT= BUGZILLA PHABRICATOR BUGZILLA_DESC= Enable Bugzilla support -BUGZILLA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-bugzilla>0:devel/py-python-bugzilla +BUGZILLA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-bugzilla>0:devel/py-python-bugzilla@${FLAVOR} JIRA_DESC= Enabla Atlassian Jira support -JIRA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jira>0:devel/py-jira +JIRA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jira>0:devel/py-jira@${FLAVOR} PHABRICATOR_DESC= Enable Phabricator support -PHABRICATOR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}phabricator>0:devel/py-phabricator +PHABRICATOR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}phabricator>0:devel/py-phabricator@${FLAVOR} TRAC_DESC= Enable Trac support -TRAC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}offtrac>0:devel/py-offtrac +TRAC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}offtrac>0:devel/py-offtrac@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist concurrent distutils Index: head/deskutils/py-khal/Makefile =================================================================== --- head/deskutils/py-khal/Makefile +++ head/deskutils/py-khal/Makefile @@ -13,17 +13,17 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}icalendar>=3.8.2:devel/py-icalendar \ - ${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:devel/py-urwid \ - ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2014.10,1:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.3:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj \ - ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal \ - ${PYTHON_PKGNAMEPREFIX}vdirsyncer<0.13:deskutils/py-vdirsyncer \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}pkginfo>0:sysutils/py-pkginfo +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}icalendar>=3.8.2:devel/py-icalendar@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:devel/py-urwid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2014.10,1:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.3:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vdirsyncer<0.13:deskutils/py-vdirsyncer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pkginfo>0:sysutils/py-pkginfo@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/deskutils/py-pycarddav/Makefile =================================================================== --- head/deskutils/py-pycarddav/Makefile +++ head/deskutils/py-pycarddav/Makefile @@ -13,14 +13,14 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:devel/py-urwid \ - ${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.0:deskutils/py-vobject \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:devel/py-urwid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.0:deskutils/py-vobject@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/deskutils/py-pystash/Makefile =================================================================== --- head/deskutils/py-pystash/Makefile +++ head/deskutils/py-pystash/Makefile @@ -11,10 +11,10 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= Save your code snippets in the cloud from the command line -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args \ - ${PYTHON_PKGNAMEPREFIX}clint>=0.3.7:devel/py-clint \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}xerox>=0.3.1:devel/py-xerox +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}clint>=0.3.7:devel/py-clint@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xerox>=0.3.1:devel/py-xerox@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/deskutils/py-taskw/Makefile =================================================================== --- head/deskutils/py-taskw/Makefile +++ head/deskutils/py-taskw/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.4:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.4:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/deskutils/py-vdirsyncer/Makefile =================================================================== --- head/deskutils/py-vdirsyncer/Makefile +++ head/deskutils/py-vdirsyncer/Makefile @@ -12,15 +12,15 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.10.1:devel/py-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites \ - ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}click-log>=0.1.3:devel/py-click-log \ - ${PYTHON_PKGNAMEPREFIX}click-threading>=0.1.2:devel/py-click-threading \ - ${PYTHON_PKGNAMEPREFIX}icalendar>=3.6:devel/py-icalendar \ - ${PYTHON_PKGNAMEPREFIX}lxml>=3.1:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.4.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.4.0:www/py-requests-toolbelt +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.10.1:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click-log>=0.1.3:devel/py-click-log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click-threading>=0.1.2:devel/py-click-threading@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}icalendar>=3.6:devel/py-icalendar@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=3.1:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.4.1:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.4.0:www/py-requests-toolbelt@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/deskutils/py-vobject/Makefile =================================================================== --- head/deskutils/py-vobject/Makefile +++ head/deskutils/py-vobject/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE-2.0.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python Index: head/deskutils/pybookreader/Makefile =================================================================== --- head/deskutils/pybookreader/Makefile +++ head/deskutils/pybookreader/Makefile @@ -11,9 +11,9 @@ MAINTAINER= ufo@februality.com COMMENT= Program for reading e-books -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= PyBookReader USE_GNOME= pygtk2 Index: head/deskutils/pypanel/Makefile =================================================================== --- head/deskutils/pypanel/Makefile +++ head/deskutils/pypanel/Makefile @@ -16,10 +16,10 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libImlib2.so:graphics/imlib2 -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Xlib/X.py:x11-toolkits/py-xlib +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Xlib/X.py:x11-toolkits/py-xlib@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils USE_XORG= xft Index: head/deskutils/rednotebook/Makefile =================================================================== --- head/deskutils/rednotebook/Makefile +++ head/deskutils/rednotebook/Makefile @@ -12,10 +12,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk@${FLAVOR} \ ${LOCALBASE}/bin/xdg-open:devel/xdg-utils \ - ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet + ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${FLAVOR} USES= desktop-file-utils gettext python:2 Index: head/deskutils/syncthing-gtk/Makefile =================================================================== --- head/deskutils/syncthing-gtk/Makefile +++ head/deskutils/syncthing-gtk/Makefile @@ -10,8 +10,8 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= syncthing Index: head/deskutils/taskcoach/Makefile =================================================================== --- head/deskutils/taskcoach/Makefile +++ head/deskutils/taskcoach/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} NO_ARCH= yes -USES= python shebangfix +USES= python:2.7 shebangfix USE_PYTHON= distutils PYDISTUTILS_EGGINFO=${DISTNAME}-py${PYTHON_VER}.egg-info USE_WX= 3.0+ Index: head/deskutils/tel/Makefile =================================================================== --- head/deskutils/tel/Makefile +++ head/deskutils/tel/Makefile @@ -14,7 +14,7 @@ NO_ARCH= yes -USES= gettext python shebangfix tar:bzip2 +USES= gettext python:2.7 shebangfix tar:bzip2 SHEBANG_FILES= src/tel.py USE_PYTHON= distutils Index: head/deskutils/virt-manager/Makefile =================================================================== --- head/deskutils/virt-manager/Makefile +++ head/deskutils/virt-manager/Makefile @@ -12,13 +12,13 @@ LICENSE= LGPL3 LIB_DEPENDS= libvirt.so:devel/libvirt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:textproc/py-libxml2 \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:devel/py-dbus@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:textproc/py-libxml2@${FLAVOR} \ vte3>=0:x11-toolkits/vte3 \ - ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr \ - ${PYTHON_PKGNAMEPREFIX}urlgrabber>=0:www/py-urlgrabber \ - ${PYTHON_PKGNAMEPREFIX}libvirt>=0:devel/py-libvirt \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ + ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urlgrabber>=0:www/py-urlgrabber@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libvirt>=0:devel/py-libvirt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ gtk-vnc>=0.4.4:net/gtk-vnc \ libvirt-glib>=0.1.9:devel/libvirt-glib \ libosinfo>=0:devel/libosinfo \ Index: head/deskutils/vnc2flv/Makefile =================================================================== --- head/deskutils/vnc2flv/Makefile +++ head/deskutils/vnc2flv/Makefile @@ -10,7 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Captures a VNC desktop session and saves as a flv -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist OPTIONS_DEFINE= X11 Index: head/deskutils/wammu/Makefile =================================================================== --- head/deskutils/wammu/Makefile +++ head/deskutils/wammu/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libGammu.so:comms/gammu -USES= gettext pkgconfig python tar:bz2 +USES= gettext pkgconfig python:2.7 tar:bz2 USE_PYTHON= distutils autoplist USE_WX= 3.0+ WX_COMPS= python:lib Index: head/deskutils/zim/Makefile =================================================================== --- head/deskutils/zim/Makefile +++ head/deskutils/zim/Makefile @@ -12,10 +12,10 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${FLAVOR} \ xdg-open:devel/xdg-utils \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} NO_ARCH= yes USES= desktop-file-utils gettext python:-2.7 shared-mime-info Index: head/devel/Makefile =================================================================== --- head/devel/Makefile +++ head/devel/Makefile @@ -4861,6 +4861,7 @@ SUBDIR += py-semantic_version SUBDIR += py-serpent SUBDIR += py-setproctitle + SUBDIR += py-setuptools SUBDIR += py-setuptools-git SUBDIR += py-setuptools-pkg SUBDIR += py-setuptools_darcs @@ -4919,6 +4920,7 @@ SUBDIR += py-testoob SUBDIR += py-testpath SUBDIR += py-testtools + SUBDIR += py-threema-msgapi SUBDIR += py-thrift SUBDIR += py-thriftpy SUBDIR += py-timelib @@ -5084,85 +5086,6 @@ SUBDIR += py-zope.testing SUBDIR += py-zope.traversing SUBDIR += py-zope.viewlet - SUBDIR += py27-setuptools - SUBDIR += py3-Jinja2 - SUBDIR += py3-apipkg - SUBDIR += py3-asttokens - SUBDIR += py3-babel - SUBDIR += py3-cffi - SUBDIR += py3-click - SUBDIR += py3-click-log - SUBDIR += py3-click-threading - SUBDIR += py3-colorama - SUBDIR += py3-coloredlogs - SUBDIR += py3-dateutil - SUBDIR += py3-dbus - SUBDIR += py3-defusedxml - SUBDIR += py3-docopt - SUBDIR += py3-flake8 - SUBDIR += py3-flake8-builtins - SUBDIR += py3-flake8-docstrings - SUBDIR += py3-flake8-import-order - SUBDIR += py3-flake8-polyfill - SUBDIR += py3-flake8-quotes - SUBDIR += py3-freezegun - SUBDIR += py3-gobject3 - SUBDIR += py3-hgtools - SUBDIR += py3-icalendar - SUBDIR += py3-jedi - SUBDIR += py3-jsonschema - SUBDIR += py3-libpeas - SUBDIR += py3-libzfs - SUBDIR += py3-llfuse - SUBDIR += py3-lxml - SUBDIR += py3-mccabe - SUBDIR += py3-mock - SUBDIR += py3-nose - SUBDIR += py3-pbr - SUBDIR += py3-pip - SUBDIR += py3-pluggy - SUBDIR += py3-ply - SUBDIR += py3-pretend - SUBDIR += py3-prompt_toolkit - SUBDIR += py3-protobuf - SUBDIR += py3-py - SUBDIR += py3-pyasn1 - SUBDIR += py3-pycodestyle - SUBDIR += py3-pycparser - SUBDIR += py3-pydocstyle - SUBDIR += py3-pyflakes - SUBDIR += py3-pygit2 - SUBDIR += py3-pyicu - SUBDIR += py3-pylru-cache - SUBDIR += py3-pytest - SUBDIR += py3-pytest-capturelog - SUBDIR += py3-pytest-runner - SUBDIR += py3-pytest-timeout - SUBDIR += py3-pytest-xdist - SUBDIR += py3-python-magic - SUBDIR += py3-pytz - SUBDIR += py3-rubymarshal - SUBDIR += py3-scripttest - SUBDIR += py3-setproctitle - SUBDIR += py3-setuptools_scm - SUBDIR += py3-simplejson - SUBDIR += py3-six - SUBDIR += py3-tabulate - SUBDIR += py3-threema-msgapi - SUBDIR += py3-toposort - SUBDIR += py3-tox - SUBDIR += py3-tzlocal - SUBDIR += py3-urwid - SUBDIR += py3-vcversioner - SUBDIR += py3-verboselogs - SUBDIR += py3-virtualenv - SUBDIR += py3-voluptuous - SUBDIR += py3-wcwidth - SUBDIR += py3-xdg - SUBDIR += py3-yaml - SUBDIR += py34-setuptools - SUBDIR += py35-setuptools - SUBDIR += py36-setuptools SUBDIR += py_static_check SUBDIR += pybind11 SUBDIR += pybugz Index: head/devel/ahven/Makefile =================================================================== --- head/devel/ahven/Makefile +++ head/devel/ahven/Makefile @@ -23,7 +23,7 @@ TRACE_DESC= Build with GNAT-specific symbolic tracing functionality DOCS_USES= python:build -DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-adadomain>0:textproc/py-sphinxcontrib-adadomain TRACE_EXTRA_PATCHES= ${FILESDIR}/extra-src_ahven-framework.adb Index: head/devel/android-tools-adb/Makefile =================================================================== --- head/devel/android-tools-adb/Makefile +++ head/devel/android-tools-adb/Makefile @@ -65,7 +65,7 @@ TEST_PYTHON_DESC= ${TEST_DESC:S/tests/python &/} TEST_PYTHON_GH_PROJECT= platform_development:development -TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} TEST_PYTHON_USES= python:2.7,build post-patch: Index: head/devel/antlr/Makefile =================================================================== --- head/devel/antlr/Makefile +++ head/devel/antlr/Makefile @@ -34,7 +34,7 @@ OPTIONS_DEFINE= PYTHON DOCS OPTIONS_SUB= yes -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_PORTDOCS= python-runtime.html post-extract: Index: head/devel/arpc/Makefile =================================================================== --- head/devel/arpc/Makefile +++ head/devel/arpc/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyPEG2>=2.15.2:textproc/py3-pyPEG2 \ - ${PYTHON_PKGNAMEPREFIX}toposort>=1.5:devel/py3-toposort +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyPEG2>=2.15.2:textproc/py-pyPEG2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}toposort>=1.5:devel/py-toposort@${PY_FLAVOR} LIB_DEPENDS= libargdata.so:devel/argdata -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyPEG2>=2.15.2:textproc/py3-pyPEG2 \ - ${PYTHON_PKGNAMEPREFIX}toposort>=1.5:devel/py3-toposort +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyPEG2>=2.15.2:textproc/py-pyPEG2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}toposort>=1.5:devel/py-toposort@${PY_FLAVOR} -USES= cmake localbase:ldflags python:3 tar:xz +USES= cmake localbase:ldflags python:3.4+ tar:xz USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= NuxiNL Index: head/devel/awscli/Makefile =================================================================== --- head/devel/awscli/Makefile +++ head/devel/awscli/Makefile @@ -5,6 +5,7 @@ PORTVERSION= 1.12.1 CATEGORIES= devel MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= bhughes@FreeBSD.org COMMENT= Universal Command Line Interface for Amazon Web Services @@ -12,15 +13,15 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.8.1:devel/py-botocore \ - ${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:devel/py-colorama \ - ${PYTHON_PKGNAMEPREFIX}s3transfer>=0.1.9:net/py-s3transfer \ - ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils \ - ${PYTHON_PKGNAMEPREFIX}rsa>=3.1.2:security/py-rsa \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.8.1:devel/py-botocore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:devel/py-colorama@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}s3transfer>=0.1.9:net/py-s3transfer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rsa>=3.1.2:security/py-rsa@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent NO_ARCH= yes .include Index: head/devel/b2/Makefile =================================================================== --- head/devel/b2/Makefile +++ head/devel/b2/Makefile @@ -12,15 +12,15 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=0.8.0:devel/py-arrow \ - ${PYTHON_PKGNAMEPREFIX}logfury>=0.1.2:devel/py-logfury \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}tqdm>=4.5.0:misc/py-tqdm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=0.8.0:devel/py-arrow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}logfury>=0.1.2:devel/py-logfury@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tqdm>=4.5.0:misc/py-tqdm@${FLAVOR} USES= python:2.7+ -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix USE_GITHUB= yes GH_ACCOUNT= Backblaze Index: head/devel/bbfreeze/Makefile =================================================================== --- head/devel/bbfreeze/Makefile +++ head/devel/bbfreeze/Makefile @@ -12,7 +12,7 @@ LICENSE= ZLIB -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}altgraph>=0.9:math/py-altgraph \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}altgraph>=0.9:math/py-altgraph@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bbfreeze-loader>=1.1.0:devel/bbfreeze-loader USES= python:2 zip Index: head/devel/bicyclerepair/Makefile =================================================================== --- head/devel/bicyclerepair/Makefile +++ head/devel/bicyclerepair/Makefile @@ -10,7 +10,7 @@ MAINTAINER= mwm@mired.org COMMENT= Python refactoring tool -USES= python +USES= python:2.7 USE_PYTHON= distutils OPTIONS_DEFINE= DOCS Index: head/devel/bpython/Makefile =================================================================== --- head/devel/bpython/Makefile +++ head/devel/bpython/Makefile @@ -14,12 +14,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}curtsies>=0.1.18:devel/py-curtsies \ - ${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet \ - ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}curtsies>=0.1.18:devel/py-curtsies@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${FLAVOR} OPTIONS_DEFINE= EXAMPLES NLS OPTIONS_SUB= yes Index: head/devel/bzr-builder/Makefile =================================================================== --- head/devel/bzr-builder/Makefile +++ head/devel/bzr-builder/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/bzr-colo/Makefile =================================================================== --- head/devel/bzr-colo/Makefile +++ head/devel/bzr-colo/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/bzr-explorer/Makefile =================================================================== --- head/devel/bzr-explorer/Makefile +++ head/devel/bzr-explorer/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2 BUILD_DEPENDS= bzr:devel/bzr -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bzrlib/plugins/qbzr/__init__.py:devel/qbzr \ +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bzrlib/plugins/qbzr/__init__.py:devel/qbzr@${FLAVOR} \ bzr:devel/bzr -USES= gettext python +USES= gettext python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/bzr-externals/Makefile =================================================================== --- head/devel/bzr-externals/Makefile +++ head/devel/bzr-externals/Makefile @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/externals -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/bzr-fastimport/Makefile =================================================================== --- head/devel/bzr-fastimport/Makefile +++ head/devel/bzr-fastimport/Makefile @@ -14,9 +14,9 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr \ - ${PYTHON_SITELIBDIR}/fastimport/__init__.py:devel/py-fastimport + ${PYTHON_SITELIBDIR}/fastimport/__init__.py:devel/py-fastimport@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/bzr-git/Makefile =================================================================== --- head/devel/bzr-git/Makefile +++ head/devel/bzr-git/Makefile @@ -15,10 +15,10 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr \ - ${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.0:devel/dulwich \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 + ${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.0:devel/dulwich@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/bzr-gtk/Makefile =================================================================== --- head/devel/bzr-gtk/Makefile +++ head/devel/bzr-gtk/Makefile @@ -15,10 +15,10 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr \ - ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo + ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${FLAVOR} -USES= desktop-file-utils python +USES= desktop-file-utils python:2.7 USE_PYTHON= distutils autoplist USE_GNOME= pygtk2 INSTALLS_ICONS= yes Index: head/devel/bzr-loom/Makefile =================================================================== --- head/devel/bzr-loom/Makefile +++ head/devel/bzr-loom/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/bzr-pipeline/Makefile =================================================================== --- head/devel/bzr-pipeline/Makefile +++ head/devel/bzr-pipeline/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/${PORTNAME} Index: head/devel/bzr-rewrite/Makefile =================================================================== --- head/devel/bzr-rewrite/Makefile +++ head/devel/bzr-rewrite/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/bzr-scmproj/Makefile =================================================================== --- head/devel/bzr-scmproj/Makefile +++ head/devel/bzr-scmproj/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/bzr-stats/Makefile =================================================================== --- head/devel/bzr-stats/Makefile +++ head/devel/bzr-stats/Makefile @@ -16,7 +16,7 @@ LICENSE= GPLv2 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/bzr-svn/Makefile =================================================================== --- head/devel/bzr-svn/Makefile +++ head/devel/bzr-svn/Makefile @@ -14,10 +14,10 @@ LICENSE= GPLv2 BUILD_DEPENDS+= bzr:devel/bzr -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/subvertpy/__init__.py:devel/py-subvertpy \ +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/subvertpy/__init__.py:devel/py-subvertpy@${FLAVOR} \ bzr:devel/bzr -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/bzr-upload/Makefile =================================================================== --- head/devel/bzr-upload/Makefile +++ head/devel/bzr-upload/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/bzr/Makefile =================================================================== --- head/devel/bzr/Makefile +++ head/devel/bzr/Makefile @@ -10,18 +10,15 @@ MAINTAINER= fullermd@over-yonder.net COMMENT= Distributed version control system by Canonical -# Often not needed, but it's cheap insurance -BUILD_DEPENDS= cython:lang/cython - OPTIONS_DEFINE= SFTP CA_BUNDLE SFTP_DESC= Paramiko for SFTP support CA_BUNDLE_DESC= Include CA bundle for SSL cert validation OPTIONS_DEFAULT= SFTP CA_BUNDLE -SFTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko +SFTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko@${FLAVOR} CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -USE_PYTHON= distutils +USE_PYTHON= distutils cython PYDISTUTILS_PKGNAME= bzr USES= gettext python:2 MAKE_ENV= BZR_LOG=/dev/null Index: head/devel/bzrtools/Makefile =================================================================== --- head/devel/bzrtools/Makefile +++ head/devel/bzrtools/Makefile @@ -19,7 +19,7 @@ RSYNC_DESC= rsync for rspush WRKSRC= ${WRKDIR}/bzrtools -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= BzrTools Index: head/devel/codeville/Makefile =================================================================== --- head/devel/codeville/Makefile +++ head/devel/codeville/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE NO_ARCH= yes -USES= python tar:xz +USES= python:2.7 tar:xz USE_PYTHON= distutils autoplist PORTDOCS= LICENSE.txt Index: head/devel/cppcheck/Makefile =================================================================== --- head/devel/cppcheck/Makefile +++ head/devel/cppcheck/Makefile @@ -47,7 +47,7 @@ HTMLREPORT_DESC= Install cppcheck-htmlreport HTMLREPORT_USES= python:2,${PYUSE:C/ /,/W} -HTMLREPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments +HTMLREPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} HTMLREPORT_PLIST_FILES= bin/cppcheck-htmlreport HTMLREPORT_VARS= PYUSE+=run Index: head/devel/cram/Makefile =================================================================== --- head/devel/cram/Makefile +++ head/devel/cram/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}check-manifest>=0:devel/py-check-manifest \ - ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}pep8>=0:devel/pep8 \ - ${PYTHON_PKGNAMEPREFIX}pyflakes>=0:devel/py-pyflakes +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}check-manifest>=0:devel/py-check-manifest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pep8>=0:devel/pep8@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyflakes>=0:devel/py-pyflakes@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/cvs2svn/Makefile =================================================================== --- head/devel/cvs2svn/Makefile +++ head/devel/cvs2svn/Makefile @@ -14,8 +14,8 @@ MAINTAINER= ohauer@FreeBSD.org COMMENT= CVS to Subversion Repository Converter -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} \ cvs:devel/cvs # 2.4.0 -> svn r5392 @@ -37,7 +37,7 @@ GIT_DESC= Build with git support BAZAAR_DESC= Build with Bazaar support -SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion +SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${FLAVOR} GIT_RUN_DEPENDS= ${LOCALBASE}/bin/git:devel/git BAZAAR_RUN_DEPENDS= ${LOCALBASE}/bin/bzr:devel/bzr Index: head/devel/cx_Freeze/Makefile =================================================================== --- head/devel/cx_Freeze/Makefile +++ head/devel/cx_Freeze/Makefile @@ -10,7 +10,7 @@ COMMENT= The cx_Freeze is a set of utilities for freezing Python scripts USE_GCC= yes -USES= python +USES= python:2.7 USE_PYTHON= distutils .include Index: head/devel/dissy/Makefile =================================================================== --- head/devel/dissy/Makefile +++ head/devel/dissy/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2 \ - ${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk@${FLAVOR} LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 USES= python:2 Index: head/devel/ditrack/Makefile =================================================================== --- head/devel/ditrack/Makefile +++ head/devel/ditrack/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= svn:devel/subversion -USES= python shebangfix tar:tgz +USES= python:2.7 shebangfix tar:tgz SHEBANG_FILES= upgrade-0.7-db.py USE_PYTHON= distutils PYDISTUTILS_PKGNAME= DITrack Index: head/devel/drpython/Makefile =================================================================== --- head/devel/drpython/Makefile +++ head/devel/drpython/Makefile @@ -17,13 +17,13 @@ # fails to build in presence if installed self CONFLICTS_BUILD= ${PORTNAME}${PYTHON_PKGNAMESUFFIX}-[0-9]* -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} RUN_DEPENDS= xdg-open:devel/xdg-utils NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME} -USES= compiler:c++11-lib python zip +USES= compiler:c++11-lib python:2.7 zip USE_PYTHON= autoplist distutils USE_WX= 3.0+ WX_COMPS= python:lib Index: head/devel/eblob/Makefile =================================================================== --- head/devel/eblob/Makefile +++ head/devel/eblob/Makefile @@ -34,7 +34,7 @@ .if ${PORT_OPTIONS:MPYTHON} LIB_DEPENDS+= libboost_python.so:devel/boost-python-libs -USES+= python +USES+= python:2.7 CMAKE_ARGS+= -DWITH_PYTHON=ON PLIST_SUB+= PYTHON="" PYTHON_VER=${PYTHON_VER} .else Index: head/devel/epydoc/Makefile =================================================================== --- head/devel/epydoc/Makefile +++ head/devel/epydoc/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= python +USES= python:2.7 USE_PYTHON= distutils OPTIONS_DEFINE= DOCS UTF8 Index: head/devel/eric6/Makefile =================================================================== --- head/devel/eric6/Makefile +++ head/devel/eric6/Makefile @@ -5,15 +5,15 @@ CATEGORIES= devel python DISTNAME= ${PORTNAME}-${PORTVERSION} -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtGui.so:x11-toolkits/py-qt${PYQTVER}-gui \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/Qsci.so:devel/py-qt${PYQTVER}-qscintilla2 +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtGui.so:x11-toolkits/py-qt${PYQTVER}-gui@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/Qsci.so:devel/py-qt${PYQTVER}-qscintilla2@${PY_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtNetwork.so:net/py-qt${PYQTVER}-network \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtSvg.so:graphics/py-qt${PYQTVER}-svg \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtSql.so:databases/py-qt${PYQTVER}-sql \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtWebKit.so:www/py-qt${PYQTVER}-webkit \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtHelp.so:devel/py-qt${PYQTVER}-help \ - ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3 + ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtNetwork.so:net/py-qt${PYQTVER}-network@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtSvg.so:graphics/py-qt${PYQTVER}-svg@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtSql.so:databases/py-qt${PYQTVER}-sql@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtWebKit.so:www/py-qt${PYQTVER}-webkit@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtHelp.so:devel/py-qt${PYQTVER}-help@${PY_FLAVOR} \ + ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR} USES= desktop-file-utils INSTALL_CMD= install.py -c -f eric6config.freebsd -i ${STAGEDIR} --pyqt=${PYQTVER} @@ -28,7 +28,7 @@ PYQT4_VARS= PYQTVER=4 PYQT5_DESC= Python bindings for Qt5 PYQT5_VARS= PYQTVER=5 -PYQT5_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt5/QtWebKitWidgets.so:www/py-qt5-webkitwidgets +PYQT5_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt5/QtWebKitWidgets.so:www/py-qt5-webkitwidgets@${PY_FLAVOR} EXTRA_PATCHES= MASTERPORT= Index: head/devel/eric6/Makefile.inc =================================================================== --- head/devel/eric6/Makefile.inc +++ head/devel/eric6/Makefile.inc @@ -22,7 +22,7 @@ INSTALL_CMD?= install-i18n.py -p ${STAGEDIR} MAKE_ENV+= "HOME=${WRKDIR}" -USES+= python +USES+= python:2.7 NO_BUILD= yes PLIST_FILES?= %%DATADIR%%/i18n/${PORTNAME}_${I18N_LANG}.qm EXTRA_PATCHES?= ${.CURDIR}/../../devel/eric6/files/extra-patch-install-i18n.py Index: head/devel/euca2ools/Makefile =================================================================== --- head/devel/euca2ools/Makefile +++ head/devel/euca2ools/Makefile @@ -13,11 +13,11 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}requestbuilder>=0.4:www/py-requestbuilder \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requestbuilder>=0.4:www/py-requestbuilder@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} USES= python:2.7 USE_GITHUB= yes Index: head/devel/fb-adb/Makefile =================================================================== --- head/devel/fb-adb/Makefile +++ head/devel/fb-adb/Makefile @@ -28,7 +28,7 @@ USE_GITHUB= yes GH_ACCOUNT= facebook -USES= autoreconf gmake ncurses perl5 python:3,build +USES= autoreconf gmake ncurses perl5 python:3.4+,build USE_PERL5= build # pod2man BASH_CMD?= bash # can be zsh GNU_CONFIGURE= yes Index: head/devel/fnorb/Makefile =================================================================== --- head/devel/fnorb/Makefile +++ head/devel/fnorb/Makefile @@ -10,9 +10,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= CORBA 2.0 ORB written in Python -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} -USES= python shebangfix +USES= python:2.7 shebangfix USE_PYTHON= distutils noegginfo SHEBANG_FILES= tests/interop/*.py tests/datatransfer/*.py NO_ARCH= yes Index: head/devel/gazpacho/Makefile =================================================================== --- head/devel/gazpacho/Makefile +++ head/devel/gazpacho/Makefile @@ -13,10 +13,10 @@ LICENSE= LGPL21+ # source mentions LGPL20+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kiwi-gtk>=0:x11-toolkits/py-kiwi-gtk +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kiwi-gtk>=0:x11-toolkits/py-kiwi-gtk@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= desktop-file-utils gettext python +USES= desktop-file-utils gettext python:2.7 USE_GNOME= pygtk2 USE_PYTHON= distutils NO_BUILD= yes Index: head/devel/git-cola/Makefile =================================================================== --- head/devel/git-cola/Makefile +++ head/devel/git-cola/Makefile @@ -11,8 +11,8 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network \ - ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \ +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui@${PY_FLAVOR} \ USE_GITHUB= yes Index: head/devel/git-cvs/Makefile =================================================================== --- head/devel/git-cvs/Makefile +++ head/devel/git-cvs/Makefile @@ -9,9 +9,9 @@ MAINTAINER= mp39590@gmail.com COMMENT= Tool to incrementally import changesets from CVS into Git -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rcsparse>0:devel/py-rcsparse \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rcsparse>0:devel/py-rcsparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} LICENSE_FILE= ${WRKSRC}/LICENSE Index: head/devel/git-review/Makefile =================================================================== --- head/devel/git-review/Makefile +++ head/devel/git-review/Makefile @@ -11,12 +11,12 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} RUN_DEPENDS= git:devel/git \ - ${PYTHON_PKGNAMEPREFIX}requests>2.4:www/py-requests + ${PYTHON_PKGNAMEPREFIX}requests>2.4:www/py-requests@${FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix NO_ARCH= yes PORTDOCS= README.rst HACKING.rst AUTHORS Index: head/devel/gitinspector/Makefile =================================================================== --- head/devel/gitinspector/Makefile +++ head/devel/gitinspector/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= git:devel/git NO_ARCH= yes -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix USES= python GH_ACCOUNT= ejwa Index: head/devel/glade/Makefile =================================================================== --- head/devel/glade/Makefile +++ head/devel/glade/Makefile @@ -39,7 +39,7 @@ OPTIONS_DEFINE= PYTHON OPTIONS_DEFAULT=PYTHON PYTHON_CONFIGURE_ENABLE= python -PYTHON_USES= python:3 +PYTHON_USES= python:3.4+ PYTHON_USE= GNOME=py3gobject3 .include Index: head/devel/gnatpython/Makefile =================================================================== --- head/devel/gnatpython/Makefile +++ head/devel/gnatpython/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING3 SNAPSHOT= 20140224 -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= distutils autoplist .include Index: head/devel/gnome-builder/Makefile =================================================================== --- head/devel/gnome-builder/Makefile +++ head/devel/gnome-builder/Makefile @@ -25,10 +25,11 @@ PORTSCOUT= limitw:1,even PORTDOCS= * -USES= cpe gettext gmake libtool pathfix pkgconfig tar:xz +USES= cpe gettext gmake libtool pathfix python:3.4+ pkgconfig tar:xz USE_GNOME= glib20 gtk30 gtksourceview3 gtk-update-icon-cache py3gobject3 GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--disable-debug +CONFIGURE_ARGS+=--disable-debug \ + ac_cv_path_PYTHON3_CONFIG=${PYTHON_CMD}-config USE_LDCONFIG= yes INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include Index: head/devel/hgview/Makefile =================================================================== --- head/devel/hgview/Makefile +++ head/devel/hgview/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2 RUN_DEPENDS= hg:devel/mercurial \ - ${PYTHON_PKGNAMEPREFIX}mx-base>0:lang/py-mx-base \ - ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils + ${PYTHON_PKGNAMEPREFIX}mx-base>0:lang/py-mx-base@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} BUILD_DEPENDS= hg:devel/mercurial \ - pyrcc4:textproc/py-qt4-xml \ + pyrcc4:textproc/py-qt4-xml@${FLAVOR} \ xmlto:textproc/xmlto \ asciidoc:textproc/asciidoc Index: head/devel/ipython/Makefile =================================================================== --- head/devel/ipython/Makefile +++ head/devel/ipython/Makefile @@ -14,14 +14,14 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.rst -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=2:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}pickleshare>=0:databases/py-pickleshare \ - ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.4:devel/py-prompt_toolkit \ - ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}simplegeneric>0.8:devel/py-simplegeneric \ - ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=2:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pickleshare>=0:databases/py-pickleshare@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.4:devel/py-prompt_toolkit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplegeneric>0.8:devel/py-simplegeneric@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -34,10 +34,10 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size>=0:devel/py-backports.shutil_get_terminal_size +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size>=0:devel/py-backports.shutil_get_terminal_size@${FLAVOR} .endif .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${FLAVOR} .endif post-install: Index: head/devel/libftdi/Makefile =================================================================== --- head/devel/libftdi/Makefile +++ head/devel/libftdi/Makefile @@ -30,7 +30,7 @@ PYTHON_DESC= Python bindings PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 PYTHON_CMAKE_BOOL= PYTHON_BINDINGS -PYTHON_USES= python +PYTHON_USES= python:2.7 BINARY_ALIAS= swig=swig3.0 Index: head/devel/libpeas/Makefile =================================================================== --- head/devel/libpeas/Makefile +++ head/devel/libpeas/Makefile @@ -36,18 +36,23 @@ CONFIGURE_ARGS+=--disable-glade-catalog PLIST= ${.CURDIR}/pkg-plist -.if ${LIBPEAS_SLAVE} == python2 -USES+= python:-2.7 +.if ${LIBPEAS_SLAVE} == python +USES+= python +USE_PYTHON= flavors +.if ${FLAVOR:Upy27:Mpy2*} USE_GNOME+= pygobject3 +CONFIGURE_ARGS+= --disable-python3 +BUILD_WRKSRC= ${WRKSRC}/loaders/python +INSTALL_WRKSRC= ${WRKSRC}/loaders/python .else -CONFIGURE_ARGS+= --disable-python2 -.endif - -.if ${LIBPEAS_SLAVE} == python3 -USES+= python:3.3+ USE_GNOME+= py3gobject3 +CONFIGURE_ARGS+= --disable-python2 \ + ac_cv_path_PYTHON3_CONFIG=${LOCALBASE}/bin/python${PYTHON_VER}-config +BUILD_WRKSRC= ${WRKSRC}/loaders/python3 +INSTALL_WRKSRC= ${WRKSRC}/loaders/python3 +.endif .else -CONFIGURE_ARGS+= --disable-python3 +CONFIGURE_ARGS+= --disable-python2 --disable-python3 .endif # lua needs lua 5.1 and devel/lua-lgi. The latter is build for lua 5.2 however.. Index: head/devel/libsigrokdecode/Makefile =================================================================== --- head/devel/libsigrokdecode/Makefile +++ head/devel/libsigrokdecode/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv3 GNU_CONFIGURE= yes -USES= libtool pathfix pkgconfig python:3 +USES= libtool pathfix pkgconfig python:3.4+ USE_GNOME= glib20 MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes Index: head/devel/meson/Makefile =================================================================== --- head/devel/meson/Makefile +++ head/devel/meson/Makefile @@ -15,6 +15,6 @@ RUN_DEPENDS= ninja:devel/ninja USES= python:3.4+ -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils noflavors .include Index: head/devel/nuitka/Makefile =================================================================== --- head/devel/nuitka/Makefile +++ head/devel/nuitka/Makefile @@ -14,6 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= python tar:bzip2 -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils optsuffix .include Index: head/devel/osc/Makefile =================================================================== --- head/devel/osc/Makefile +++ head/devel/osc/Makefile @@ -11,9 +11,9 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto \ - ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber@${FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= openSUSE @@ -21,7 +21,7 @@ CPE_VENDOR= suse CPE_PRODUCT= opensuse_osc -USES= cpe python +USES= cpe python:2.7 USE_PYTHON= autoplist distutils PLIST_FILES= bin/osc NO_ARCH= yes Index: head/devel/phpbt/Makefile =================================================================== --- head/devel/phpbt/Makefile +++ head/devel/phpbt/Makefile @@ -32,7 +32,7 @@ OPTIONS_SUB= yes GNATS_DESC= Install script to convert entries from GNATS -GNATS_USES= python:run shebangfix +GNATS_USES= python:2.7,run shebangfix post-extract-GNATS-off: @${RM} ${WRKSRC}/contrib/gnats-to-phpbt.py Index: head/devel/phpsh/Makefile =================================================================== --- head/devel/phpsh/Makefile +++ head/devel/phpsh/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= distutils autoplist USE_PHP= pcre posix tokenizer NO_ARCH= yes Index: head/devel/py-Acquisition/Makefile =================================================================== --- head/devel/py-Acquisition/Makefile +++ head/devel/py-Acquisition/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils post-install: Index: head/devel/py-AddOns/Makefile =================================================================== --- head/devel/py-AddOns/Makefile +++ head/devel/py-AddOns/Makefile @@ -12,10 +12,10 @@ MAINTAINER= wenheping@gmail.com COMMENT= Dynamically extend other objects with AddOns -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-Automat/Makefile =================================================================== --- head/devel/py-Automat/Makefile +++ head/devel/py-Automat/Makefile @@ -13,10 +13,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm \ - ${PYTHON_PKGNAMEPREFIX}m2r>0:textproc/py-m2r -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=16.1.0:devel/py-attrs \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}m2r>0:textproc/py-m2r@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=16.1.0:devel/py-attrs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-Breve/Makefile =================================================================== --- head/devel/py-Breve/Makefile +++ head/devel/py-Breve/Makefile @@ -12,7 +12,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= Python s-expression style template engine -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-BytecodeAssembler/Makefile =================================================================== --- head/devel/py-BytecodeAssembler/Makefile +++ head/devel/py-BytecodeAssembler/Makefile @@ -10,11 +10,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Generate Python code objects by "assembling" bytecode -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools \ - ${PYTHON_PKGNAMEPREFIX}SymbolType>0:devel/py-SymbolType +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}SymbolType>0:devel/py-SymbolType@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-DateTime/Makefile =================================================================== --- head/devel/py-DateTime/Makefile +++ head/devel/py-DateTime/Makefile @@ -14,10 +14,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} -USES= python:2 zip +USES= python zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-DocumentTemplate/Makefile =================================================================== --- head/devel/py-DocumentTemplate/Makefile +++ head/devel/py-DocumentTemplate/Makefile @@ -13,15 +13,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \ - ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:devel/py-zope.sequencesort \ - ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:devel/py-zope.sequencesort@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-Jinja2/Makefile =================================================================== --- head/devel/py-Jinja2/Makefile +++ head/devel/py-Jinja2/Makefile @@ -14,14 +14,17 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe@${FLAVOR} NO_ARCH= yes USES= python .if empty(PKGNAMESUFFIX) USE_PYTHON= autoplist distutils .endif +.if ${PKGNAMESUFFIX} == -doc +USE_PYTHON= flavors +.endif EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} @@ -29,7 +32,7 @@ OPTIONS_DEFAULT?= BABEL BABEL_DESC= Enable Babel extension -BABEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel +BABEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${FLAVOR} PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} PY2TO3_ARGS= --fix=all --no-diffs --nobackups --verbose --write @@ -37,13 +40,13 @@ .include .if ${PKGNAMESUFFIX} == "-doc" -BUILD_DEPENDS+= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx +BUILD_DEPENDS+= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} PORTDOCS= * PORT_OPTIONS:= ${PORT_OPTIONS:NEXAMPLES} do-build: - (cd ${WRKSRC}/docs && ${MAKE} html) + (cd ${WRKSRC}/docs && ${MAKE} SPHINXBUILD=sphinx-build-${PYTHON_VER} html) do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} Index: head/devel/py-Missing/Makefile =================================================================== --- head/devel/py-Missing/Makefile +++ head/devel/py-Missing/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-MultiMapping/Makefile =================================================================== --- head/devel/py-MultiMapping/Makefile +++ head/devel/py-MultiMapping/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-PEAK-Rules/Makefile =================================================================== --- head/devel/py-PEAK-Rules/Makefile +++ head/devel/py-PEAK-Rules/Makefile @@ -12,12 +12,12 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Generic functions and business rules support systems -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Extremes>=1.1.1:devel/py-extremes \ - ${PYTHON_PKGNAMEPREFIX}AddOns>=0.6:devel/py-AddOns \ - ${PYTHON_PKGNAMEPREFIX}BytecodeAssembler>0:devel/py-BytecodeAssembler +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Extremes>=1.1.1:devel/py-extremes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}AddOns>=0.6:devel/py-AddOns@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}BytecodeAssembler>0:devel/py-BytecodeAssembler@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-Persistence/Makefile =================================================================== --- head/devel/py-Persistence/Makefile +++ head/devel/py-Persistence/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-Products.ATContentTypes/Makefile =================================================================== --- head/devel/py-Products.ATContentTypes/Makefile +++ head/devel/py-Products.ATContentTypes/Makefile @@ -12,34 +12,34 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget \ - ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \ - ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \ - ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes \ - ${PYTHON_PKGNAMEPREFIX}Products.ATReferenceBrowserWidget>=0:devel/py-Products.ATReferenceBrowserWidget \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry \ - ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms \ - ${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ATReferenceBrowserWidget>=0:devel/py-Products.ATReferenceBrowserWidget@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils -USES= python zope +USES= python:2.7 zope .include Index: head/devel/py-Products.ATReferenceBrowserWidget/Makefile =================================================================== --- head/devel/py-Products.ATReferenceBrowserWidget/Makefile +++ head/devel/py-Products.ATReferenceBrowserWidget/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget \ - ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-Products.Archetypes/Makefile =================================================================== --- head/devel/py-Products.Archetypes/Makefile +++ head/devel/py-Products.Archetypes/Makefile @@ -12,45 +12,45 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \ - ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime \ - ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \ - ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:devel/py-Products.CMFCalendar \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool \ - ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.Marshall>=0:devel/py-Products.Marshall \ - ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=2.0.3:devel/py-Products.MimetypesRegistry \ - ${PYTHON_PKGNAMEPREFIX}Products.PlacelessTranslationService>=0:devel/py-Products.PlacelessTranslationService \ - ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms \ - ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \ - ${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation \ - ${PYTHON_PKGNAMEPREFIX}plone.folder>=0:www/py-plone.folder \ - ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid \ - ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:devel/py-Products.ZSQLMethods +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:devel/py-Products.CMFCalendar@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.Marshall>=0:devel/py-Products.Marshall@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=2.0.3:devel/py-Products.MimetypesRegistry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PlacelessTranslationService>=0:devel/py-Products.PlacelessTranslationService@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.folder>=0:www/py-plone.folder@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:devel/py-Products.ZSQLMethods@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils -USES= python zope +USES= python:2.7 zope .include Index: head/devel/py-Products.BTreeFolder2/Makefile =================================================================== --- head/devel/py-Products.BTreeFolder2/Makefile +++ head/devel/py-Products.BTreeFolder2/Makefile @@ -13,17 +13,17 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-Products.CMFActionIcons/Makefile =================================================================== --- head/devel/py-Products.CMFActionIcons/Makefile +++ head/devel/py-Products.CMFActionIcons/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-Products.CMFCalendar/Makefile =================================================================== --- head/devel/py-Products.CMFCalendar/Makefile +++ head/devel/py-Products.CMFCalendar/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}zope.app.form>0:devel/py-zope.app.form +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.form>0:devel/py-zope.app.form@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: head/devel/py-Products.CMFCore/Makefile =================================================================== --- head/devel/py-Products.CMFCore/Makefile +++ head/devel/py-Products.CMFCore/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:devel/py-Products.ZSQLMethods \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publication>0:devel/py-zope.app.publication +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:devel/py-Products.ZSQLMethods@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publication>0:devel/py-zope.app.publication@${FLAVOR} NO_ARCH= yes #USES= zope # cyclic dependency Index: head/devel/py-Products.CMFDefault/Makefile =================================================================== --- head/devel/py-Products.CMFDefault/Makefile +++ head/devel/py-Products.CMFDefault/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=1.0.2:devel/py-five.formlib \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=1.0.2:devel/py-five.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-Products.CMFDiffTool/Makefile =================================================================== --- head/devel/py-Products.CMFDiffTool/Makefile +++ head/devel/py-Products.CMFDiffTool/Makefile @@ -12,10 +12,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: head/devel/py-Products.CMFDynamicViewFTI/Makefile =================================================================== --- head/devel/py-Products.CMFDynamicViewFTI/Makefile +++ head/devel/py-Products.CMFDynamicViewFTI/Makefile @@ -12,15 +12,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:devel/py-zope.browsermenu \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:devel/py-zope.browsermenu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-Products.CMFEditions/Makefile =================================================================== --- head/devel/py-Products.CMFEditions/Makefile +++ head/devel/py-Products.CMFEditions/Makefile @@ -12,22 +12,22 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.copy>0:devel/py-zope.copy \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4.0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.ZopeVersionControl>=0:devel/py-Products.ZopeVersionControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.copy>0:devel/py-zope.copy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4.0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ZopeVersionControl>=0:devel/py-Products.ZopeVersionControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} NO_ARCH= yes -USES= python zope +USES= python:2.7 zope USE_PYTHON= autoplist distutils .include Index: head/devel/py-Products.CMFFormController/Makefile =================================================================== --- head/devel/py-Products.CMFFormController/Makefile +++ head/devel/py-Products.CMFFormController/Makefile @@ -12,13 +12,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext \ - ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: head/devel/py-Products.CMFPlacefulWorkflow/Makefile =================================================================== --- head/devel/py-Products.CMFPlacefulWorkflow/Makefile +++ head/devel/py-Products.CMFPlacefulWorkflow/Makefile @@ -12,14 +12,14 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-Products.CMFQuickInstallerTool/Makefile =================================================================== --- head/devel/py-Products.CMFQuickInstallerTool/Makefile +++ head/devel/py-Products.CMFQuickInstallerTool/Makefile @@ -12,14 +12,14 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: head/devel/py-Products.CMFTestCase/Makefile =================================================================== --- head/devel/py-Products.CMFTestCase/Makefile +++ head/devel/py-Products.CMFTestCase/Makefile @@ -13,18 +13,18 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:devel/py-Products.CMFCalendar \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:devel/py-Products.CMFCalendar@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python:2 zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-Products.CMFUid/Makefile =================================================================== --- head/devel/py-Products.CMFUid/Makefile +++ head/devel/py-Products.CMFUid/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-Products.DCWorkflow/Makefile =================================================================== --- head/devel/py-Products.DCWorkflow/Makefile +++ head/devel/py-Products.DCWorkflow/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-Products.ExtendedPathIndex/Makefile =================================================================== --- head/devel/py-Products.ExtendedPathIndex/Makefile +++ head/devel/py-Products.ExtendedPathIndex/Makefile @@ -13,11 +13,11 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction \ - zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3@${FLAVOR} -USES= python zope zip +USES= python:2.7 zope zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-Products.ExternalMethod/Makefile =================================================================== --- head/devel/py-Products.ExternalMethod/Makefile +++ head/devel/py-Products.ExternalMethod/Makefile @@ -13,14 +13,14 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: head/devel/py-Products.GenericSetup/Makefile =================================================================== --- head/devel/py-Products.GenericSetup/Makefile +++ head/devel/py-Products.GenericSetup/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: head/devel/py-Products.LDAPMultiPlugins/Makefile =================================================================== --- head/devel/py-Products.LDAPMultiPlugins/Makefile +++ head/devel/py-Products.LDAPMultiPlugins/Makefile @@ -14,9 +14,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:net/py-ldap \ - ${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:devel/py-Products.LDAPUserFolder \ - ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=1.4.0:security/py-Products.PluggableAuthService +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:net/py-ldap@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:devel/py-Products.LDAPUserFolder@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=1.4.0:security/py-Products.PluggableAuthService@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: head/devel/py-Products.LDAPUserFolder/Makefile =================================================================== --- head/devel/py-Products.LDAPUserFolder/Makefile +++ head/devel/py-Products.LDAPUserFolder/Makefile @@ -13,8 +13,8 @@ LICENSE= ZPL21 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>=0.4.2:devel/py-setuptools-git -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:net/py-ldap +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>=0.4.2:devel/py-setuptools-git@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:net/py-ldap@${FLAVOR} OPTIONS_DEFINE= POSIXGROUP_PATCH POSIXGROUP_PATCH_DESC= Use posixGroup for group membership Index: head/devel/py-Products.MIMETools/Makefile =================================================================== --- head/devel/py-Products.MIMETools/Makefile +++ head/devel/py-Products.MIMETools/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-Products.Marshall/Makefile =================================================================== --- head/devel/py-Products.Marshall/Makefile +++ head/devel/py-Products.Marshall/Makefile @@ -12,16 +12,16 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid \ - ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \ - ${PYTHON_PKGNAMEPREFIX}zope.deprecation>0:devel/py-zope.deprecation \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deprecation>0:devel/py-zope.deprecation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} USES= python:2 zip USE_PYTHON= autoplist distutils Index: head/devel/py-Products.MimetypesRegistry/Makefile =================================================================== --- head/devel/py-Products.MimetypesRegistry/Makefile +++ head/devel/py-Products.MimetypesRegistry/Makefile @@ -12,13 +12,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python:2 zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: head/devel/py-Products.OFSP/Makefile =================================================================== --- head/devel/py-Products.OFSP/Makefile +++ head/devel/py-Products.OFSP/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-Products.PasswordResetTool/Makefile =================================================================== --- head/devel/py-Products.PasswordResetTool/Makefile +++ head/devel/py-Products.PasswordResetTool/Makefile @@ -12,17 +12,17 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} NO_ARCH= yes -USES= python zip zope +USES= python:2.7 zip zope USE_PYTHON= autoplist distutils .include Index: head/devel/py-Products.PlacelessTranslationService/Makefile =================================================================== --- head/devel/py-Products.PlacelessTranslationService/Makefile +++ head/devel/py-Products.PlacelessTranslationService/Makefile @@ -13,20 +13,20 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-gettext>0:textproc/py-python-gettext \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \ - ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-gettext>0:textproc/py-python-gettext@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python shebangfix zip +USES= python:2.7 shebangfix zip USE_PYTHON= autoplist distutils SHEBANG_FILES= Products/PlacelessTranslationService/bin/convertToLocales.py Index: head/devel/py-Products.PloneTestCase/Makefile =================================================================== --- head/devel/py-Products.PloneTestCase/Makefile +++ head/devel/py-Products.PloneTestCase/Makefile @@ -12,17 +12,17 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}Products.ATContentTypes>=0:devel/py-Products.ATContentTypes \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ATContentTypes>=0:devel/py-Products.ATContentTypes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} USE_PYTHON= autoplist distutils -USES= python:2 zope zip +USES= python:2.7 zope zip .include Index: head/devel/py-Products.PluginRegistry/Makefile =================================================================== --- head/devel/py-Products.PluginRegistry/Makefile +++ head/devel/py-Products.PluginRegistry/Makefile @@ -14,7 +14,7 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: head/devel/py-Products.PortalTransforms/Makefile =================================================================== --- head/devel/py-Products.PortalTransforms/Makefile +++ head/devel/py-Products.PortalTransforms/Makefile @@ -12,14 +12,14 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:www/py-plone.intelligenttext \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}markdown>=1.7:textproc/py-markdown +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:www/py-plone.intelligenttext@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>=1.7:textproc/py-markdown@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: head/devel/py-Products.PythonScripts/Makefile =================================================================== --- head/devel/py-Products.PythonScripts/Makefile +++ head/devel/py-Products.PythonScripts/Makefile @@ -13,14 +13,14 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate \ - ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \ - ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-Products.ResourceRegistries/Makefile =================================================================== --- head/devel/py-Products.ResourceRegistries/Makefile +++ head/devel/py-Products.ResourceRegistries/Makefile @@ -12,15 +12,15 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}plone.app.registry>0:www/py-plone.app.registry +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.registry>0:www/py-plone.app.registry@${FLAVOR} USES= python:2.7 zip zope USE_PYTHON= autoplist distutils Index: head/devel/py-Products.StandardCacheManagers/Makefile =================================================================== --- head/devel/py-Products.StandardCacheManagers/Makefile +++ head/devel/py-Products.StandardCacheManagers/Makefile @@ -13,12 +13,12 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-Products.ZCTextIndex/Makefile =================================================================== --- head/devel/py-Products.ZCTextIndex/Makefile +++ head/devel/py-Products.ZCTextIndex/Makefile @@ -12,15 +12,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \ - ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-Products.ZCatalog/Makefile =================================================================== --- head/devel/py-Products.ZCatalog/Makefile +++ head/devel/py-Products.ZCatalog/Makefile @@ -12,22 +12,22 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing \ - ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \ - ${PYTHON_PKGNAMEPREFIX}Products.ZCTextIndex>=0:devel/py-Products.ZCTextIndex \ - ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record \ - ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \ - ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ZCTextIndex>=0:devel/py-Products.ZCTextIndex@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} USES= python:2.7 zip USE_PYTHON= distutils autoplist Index: head/devel/py-Products.ZSQLMethods/Makefile =================================================================== --- head/devel/py-Products.ZSQLMethods/Makefile +++ head/devel/py-Products.ZSQLMethods/Makefile @@ -13,17 +13,17 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing \ - ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \ - ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-Products.ZopeVersionControl/Makefile =================================================================== --- head/devel/py-Products.ZopeVersionControl/Makefile +++ head/devel/py-Products.ZopeVersionControl/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-Products.statusmessages/Makefile =================================================================== --- head/devel/py-Products.statusmessages/Makefile +++ head/devel/py-Products.statusmessages/Makefile @@ -13,11 +13,11 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-Products.validation/Makefile =================================================================== --- head/devel/py-Products.validation/Makefile +++ head/devel/py-Products.validation/Makefile @@ -12,14 +12,14 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: head/devel/py-RPyC/Makefile =================================================================== --- head/devel/py-RPyC/Makefile +++ head/devel/py-RPyC/Makefile @@ -16,10 +16,10 @@ OPTIONS_DEFINE= PLUMBUM OPTIONS_DEFAULT=PLUMBUM -PLUMBUM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plumbum>0:sysutils/py-plumbum +PLUMBUM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plumbum>0:sysutils/py-plumbum@${FLAVOR} PLUMBUM_DESC= Required for features like rpyc_classic.py and zero deploy -USES= python:-3.3 +USES= python USE_PYTHON= distutils autoplist .include Index: head/devel/py-Record/Makefile =================================================================== --- head/devel/py-Record/Makefile +++ head/devel/py-Record/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-SymbolType/Makefile =================================================================== --- head/devel/py-SymbolType/Makefile +++ head/devel/py-SymbolType/Makefile @@ -12,7 +12,7 @@ MAINTAINER= wenheping@gmail.com COMMENT= Simple Symbol Type for Python -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-ToscaWidgets/Makefile =================================================================== --- head/devel/py-ToscaWidgets/Makefile +++ head/devel/py-ToscaWidgets/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-XStatic-Angular-Bootstrap/Makefile =================================================================== --- head/devel/py-XStatic-Angular-Bootstrap/Makefile +++ head/devel/py-XStatic-Angular-Bootstrap/Makefile @@ -11,11 +11,11 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Bootstrap widgets for Angular (angular-bootstrap) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm \ - ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic \ - ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${FLAVOR} NO_ARCH= yes Index: head/devel/py-XStatic-Angular-FileUpload/Makefile =================================================================== --- head/devel/py-XStatic-Angular-FileUpload/Makefile +++ head/devel/py-XStatic-Angular-FileUpload/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= File Upload module for the AngularJS (angular-file-upload) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-Angular-Gettext/Makefile =================================================================== --- head/devel/py-XStatic-Angular-Gettext/Makefile +++ head/devel/py-XStatic-Angular-Gettext/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Gettext support for Angular.js (angular-gettext) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-Angular-Schema-Form/Makefile =================================================================== --- head/devel/py-XStatic-Angular-Schema-Form/Makefile +++ head/devel/py-XStatic-Angular-Schema-Form/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Forms from a JSON schema (angular-schema-form) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-Angular-lrdragndrop/Makefile =================================================================== --- head/devel/py-XStatic-Angular-lrdragndrop/Makefile +++ head/devel/py-XStatic-Angular-lrdragndrop/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= HTML5 Drag and Drop AngularJS module (angular-dragndrop) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-Angular/Makefile =================================================================== --- head/devel/py-XStatic-Angular/Makefile +++ head/devel/py-XStatic-Angular/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= JavaScript MVW Framework (angular) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-Bootstrap-Datepicker/Makefile =================================================================== --- head/devel/py-XStatic-Bootstrap-Datepicker/Makefile +++ head/devel/py-XStatic-Bootstrap-Datepicker/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Datepicker for Bootstrap (bootstrap-datepicker) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-Bootstrap-SCSS/Makefile =================================================================== --- head/devel/py-XStatic-Bootstrap-SCSS/Makefile +++ head/devel/py-XStatic-Bootstrap-SCSS/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Bootstrap SCSS stylesheets (bootstrap-scss) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-D3/Makefile =================================================================== --- head/devel/py-XStatic-D3/Makefile +++ head/devel/py-XStatic-D3/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Data-Driven Documents framework (d3) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-Font-Awesome/Makefile =================================================================== --- head/devel/py-XStatic-Font-Awesome/Makefile +++ head/devel/py-XStatic-Font-Awesome/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Iconic font and CSS framework (font-awesome) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-Hogan/Makefile =================================================================== --- head/devel/py-XStatic-Hogan/Makefile +++ head/devel/py-XStatic-Hogan/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= JavaScript templating framework (hogan.js) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-JQuery-Migrate/Makefile =================================================================== --- head/devel/py-XStatic-JQuery-Migrate/Makefile +++ head/devel/py-XStatic-JQuery-Migrate/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= JQuery migration kit (jquery-migrate) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-JQuery.TableSorter/Makefile =================================================================== --- head/devel/py-XStatic-JQuery.TableSorter/Makefile +++ head/devel/py-XStatic-JQuery.TableSorter/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= JQuery plugin for creating sortable tables (jquery-tablesort) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-JQuery.quicksearch/Makefile =================================================================== --- head/devel/py-XStatic-JQuery.quicksearch/Makefile +++ head/devel/py-XStatic-JQuery.quicksearch/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= JQuery plugin for searching through tables (jquery-quicksearch) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-JSEncrypt/Makefile =================================================================== --- head/devel/py-XStatic-JSEncrypt/Makefile +++ head/devel/py-XStatic-JSEncrypt/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Javascript library to perform OpenSSL RSA (jsencrypt) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-Jasmine/Makefile =================================================================== --- head/devel/py-XStatic-Jasmine/Makefile +++ head/devel/py-XStatic-Jasmine/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= DOM-less simple JavaScript testing framework (jasmine) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-Rickshaw/Makefile =================================================================== --- head/devel/py-XStatic-Rickshaw/Makefile +++ head/devel/py-XStatic-Rickshaw/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Rickshaw 1.5.0 (xstatic packaging standard) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-Spin/Makefile =================================================================== --- head/devel/py-XStatic-Spin/Makefile +++ head/devel/py-XStatic-Spin/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Spinner component (spin) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-bootswatch/Makefile =================================================================== --- head/devel/py-XStatic-bootswatch/Makefile +++ head/devel/py-XStatic-bootswatch/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Collection of themes for Bootstrap (bootswatch) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-jQuery/Makefile =================================================================== --- head/devel/py-XStatic-jQuery/Makefile +++ head/devel/py-XStatic-jQuery/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= JavaScript library for DOM operations (jquery) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-jquery-ui/Makefile =================================================================== --- head/devel/py-XStatic-jquery-ui/Makefile +++ head/devel/py-XStatic-jquery-ui/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= JQuery library for building user interfaces (jquery-ui) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-mdi/Makefile =================================================================== --- head/devel/py-XStatic-mdi/Makefile +++ head/devel/py-XStatic-mdi/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Material Design Webfont (mdi) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-objectpath/Makefile =================================================================== --- head/devel/py-XStatic-objectpath/Makefile +++ head/devel/py-XStatic-objectpath/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Parser for js object paths (objectpath) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-roboto-fontface/Makefile =================================================================== --- head/devel/py-XStatic-roboto-fontface/Makefile +++ head/devel/py-XStatic-roboto-fontface/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Simple package providing the Roboto fontface (roboto-fontface) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-smart-table/Makefile =================================================================== --- head/devel/py-XStatic-smart-table/Makefile +++ head/devel/py-XStatic-smart-table/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Table module for angular js (angular-smart-table) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-term.js/Makefile =================================================================== --- head/devel/py-XStatic-term.js/Makefile +++ head/devel/py-XStatic-term.js/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Terminal written in javascript (term.js) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-XStatic-tv4/Makefile =================================================================== --- head/devel/py-XStatic-tv4/Makefile +++ head/devel/py-XStatic-tv4/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= JSON Schema validator for JavaScript (tv4) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-adb/Makefile =================================================================== --- head/devel/py-adb/Makefile +++ head/devel/py-adb/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libusb115>=1.0.16:devel/py-libusb115 \ - ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.21.1:security/py-m2crypto +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libusb115>=1.0.16:devel/py-libusb115@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.21.1:security/py-m2crypto@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= google Index: head/devel/py-akismet/Makefile =================================================================== --- head/devel/py-akismet/Makefile +++ head/devel/py-akismet/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils PYDISTUTILS_PKGNAME= akismet Index: head/devel/py-aniso8601/Makefile =================================================================== --- head/devel/py-aniso8601/Makefile +++ head/devel/py-aniso8601/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: head/devel/py-anonfunc/Makefile =================================================================== --- head/devel/py-anonfunc/Makefile +++ head/devel/py-anonfunc/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-patch: Index: head/devel/py-apipkg/Makefile =================================================================== --- head/devel/py-apipkg/Makefile +++ head/devel/py-apipkg/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include Index: head/devel/py-apptools/Makefile =================================================================== --- head/devel/py-apptools/Makefile +++ head/devel/py-apptools/Makefile @@ -15,8 +15,8 @@ # See ${WRKSRC}/image_LICENSE.txt for information that other # files *LICENSE* are not used -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits \ - ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.:devel/py-configobj +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.:devel/py-configobj@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: head/devel/py-apscheduler/Makefile =================================================================== --- head/devel/py-apscheduler/Makefile +++ head/devel/py-apscheduler/Makefile @@ -13,12 +13,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.2:devel/py-tzlocal -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>=0.7:devel/py-pytest-capturelog +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.2:devel/py-tzlocal@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>=0.7:devel/py-pytest-capturelog@${FLAVOR} NO_ARCH= yes USES= python:2.7+ @@ -28,12 +28,12 @@ .include .if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures \ - ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs@${FLAVOR} +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} .else -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio \ - ${PYTHON_PKGNAMEPREFIX}pytest-tornado>0:devel/py-pytest-tornado +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-tornado>0:devel/py-pytest-tornado@${FLAVOR} .endif post-patch: Index: head/devel/py-archetypes.querywidget/Makefile =================================================================== --- head/devel/py-archetypes.querywidget/Makefile +++ head/devel/py-archetypes.querywidget/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.querystring>=1.0.3:www/py-plone.app.querystring \ - ${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:www/py-plone.app.jquerytools +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.querystring>=1.0.3:www/py-plone.app.querystring@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:www/py-plone.app.jquerytools@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-archetypes.referencebrowserwidget/Makefile =================================================================== --- head/devel/py-archetypes.referencebrowserwidget/Makefile +++ head/devel/py-archetypes.referencebrowserwidget/Makefile @@ -12,11 +12,11 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \ - ${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=1.1:www/py-plone.app.jquerytools +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=1.1:www/py-plone.app.jquerytools@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: head/devel/py-archetypes.schemaextender/Makefile =================================================================== --- head/devel/py-archetypes.schemaextender/Makefile +++ head/devel/py-archetypes.schemaextender/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-arrow/Makefile =================================================================== --- head/devel/py-arrow/Makefile +++ head/devel/py-arrow/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-aspects/Makefile =================================================================== --- head/devel/py-aspects/Makefile +++ head/devel/py-aspects/Makefile @@ -14,7 +14,7 @@ LICENSE= LGPL21 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist SUB_FILES= pkg-message Index: head/devel/py-astroid/Makefile =================================================================== --- head/devel/py-astroid/Makefile +++ head/devel/py-astroid/Makefile @@ -12,9 +12,9 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.LESSER -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy-object-proxy>=0:devel/py-lazy-object-proxy \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}wrapt>=0:devel/py-wrapt +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy-object-proxy>=0:devel/py-lazy-object-proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wrapt>=0:devel/py-wrapt@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils @@ -23,12 +23,12 @@ .include .if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=0:devel/py-backports.functools_lru_cache +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=0:devel/py-backports.functools_lru_cache@${FLAVOR} .endif .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>=1.1.3:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>=1.1.3:devel/py-enum34@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch@${FLAVOR} .endif .include Index: head/devel/py-asttokens/Makefile =================================================================== --- head/devel/py-asttokens/Makefile +++ head/devel/py-asttokens/Makefile @@ -13,17 +13,17 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes .include .if ${PYTHON_REL} < 3000 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}astroid>0:devel/py-astroid +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}astroid>0:devel/py-astroid@${FLAVOR} # not supported on 3.x due to missing test depends do-test: Index: head/devel/py-atomiclong/Makefile =================================================================== --- head/devel/py-atomiclong/Makefile +++ head/devel/py-atomiclong/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-atpublic/Makefile =================================================================== --- head/devel/py-atpublic/Makefile +++ head/devel/py-atpublic/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -USES= python:3 +USES= python:3.3+ USE_PYTHON= autoplist distutils MAKE_ENV= ATPUBLIC_BUILD_EXTENSION=1 Index: head/devel/py-automaton/Makefile =================================================================== --- head/devel/py-automaton/Makefile +++ head/devel/py-automaton/Makefile @@ -12,10 +12,10 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} NO_ARCH= yes Index: head/devel/py-babel/Makefile =================================================================== --- head/devel/py-babel/Makefile +++ head/devel/py-babel/Makefile @@ -1,18 +1,19 @@ -# Created by: Dryice Liu +# Created by: Muhammad Moinur Rahman # $FreeBSD$ PORTNAME= Babel -PORTVERSION= 2.3.4 +PORTVERSION= 2.5.1 CATEGORIES= devel python -MASTER_SITES= https://pypi.io/packages/source/B/${PORTNAME}/ +MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= gaod@hychen.org +MAINTAINER= bofh@FreeBSD.org COMMENT= Collection of tools for internationalizing Python applications LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils @@ -22,7 +23,7 @@ OPTIONS_DEFINE= DOCS -post-install-DOCS-on: +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for docfile in ${PORTDOCS} ${CP} -r ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} Index: head/devel/py-babel/distinfo =================================================================== --- head/devel/py-babel/distinfo +++ head/devel/py-babel/distinfo @@ -1,2 +1,3 @@ -SHA256 (Babel-2.3.4.tar.gz) = c535c4403802f6eb38173cd4863e419e2274921a01a8aad8a5b497c131c62875 -SIZE (Babel-2.3.4.tar.gz) = 6866920 +TIMESTAMP = 1505757363 +SHA256 (Babel-2.5.1.tar.gz) = 6007daf714d0cd5524bbe436e2d42b3c20e68da66289559341e48d2cd6d25811 +SIZE (Babel-2.5.1.tar.gz) = 6612869 Index: head/devel/py-backports.functools_lru_cache/Makefile =================================================================== --- head/devel/py-backports.functools_lru_cache/Makefile +++ head/devel/py-backports.functools_lru_cache/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils Index: head/devel/py-backports.tempfile/Makefile =================================================================== --- head/devel/py-backports.tempfile/Makefile +++ head/devel/py-backports.tempfile/Makefile @@ -12,7 +12,7 @@ LICENSE= PSFL -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: head/devel/py-backports.weakref/Makefile =================================================================== --- head/devel/py-backports.weakref/Makefile +++ head/devel/py-backports.weakref/Makefile @@ -12,7 +12,7 @@ LICENSE= PSFL -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: head/devel/py-bandit/Makefile =================================================================== --- head/devel/py-bandit/Makefile +++ head/devel/py-bandit/Makefile @@ -13,10 +13,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.5.0:devel/py-stevedore +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.5.0:devel/py-stevedore@${FLAVOR} MAKE_ENV+= PBR_VERSION=${PORTVERSION} Index: head/devel/py-bcdoc/Makefile =================================================================== --- head/devel/py-bcdoc/Makefile +++ head/devel/py-bcdoc/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils \ - ${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-binplist/Makefile =================================================================== --- head/devel/py-binplist/Makefile +++ head/devel/py-binplist/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-biplist/Makefile =================================================================== --- head/devel/py-biplist/Makefile +++ head/devel/py-biplist/Makefile @@ -12,9 +12,9 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} TEST_DEPENDS:= ${RUN_DEPENDS} USES= python Index: head/devel/py-bison/Makefile =================================================================== --- head/devel/py-bison/Makefile +++ head/devel/py-bison/Makefile @@ -15,11 +15,11 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= pyrex>=0.9.6.2:devel/pyrex +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>=0.9.6.2:devel/pyrex@${FLAVOR} OPTIONS_DEFINE= DOCS EXAMPLES -USES= bison:both python +USES= bison:both python:2.7 USE_PYTHON= distutils autoplist DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} Index: head/devel/py-blinker/Makefile =================================================================== --- head/devel/py-blinker/Makefile +++ head/devel/py-blinker/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-bluelet/Makefile =================================================================== --- head/devel/py-bluelet/Makefile +++ head/devel/py-bluelet/Makefile @@ -13,10 +13,6 @@ LICENSE= MIT USES= python -USE_PYTHON= distutils - -PLIST_FILES= %%PYTHON_SITELIBDIR%%/bluelet.py \ - %%PYTHON_SITELIBDIR%%/bluelet.pyc \ - %%PYTHON_SITELIBDIR%%/bluelet.pyo +USE_PYTHON= distutils autoplist .include Index: head/devel/py-botocore/Makefile =================================================================== --- head/devel/py-botocore/Makefile +++ head/devel/py-botocore/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1:devel/py-jmespath \ - ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1:devel/py-jmespath@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-bsd/Makefile =================================================================== --- head/devel/py-bsd/Makefile +++ head/devel/py-bsd/Makefile @@ -10,12 +10,11 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= cython>0:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython USE_GITHUB= yes GH_ACCOUNT= freenas @@ -25,7 +24,7 @@ .include .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} .endif .include Index: head/devel/py-buildbot-console-view/Makefile =================================================================== --- head/devel/py-buildbot-console-view/Makefile +++ head/devel/py-buildbot-console-view/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-buildbot-grid-view/Makefile =================================================================== --- head/devel/py-buildbot-grid-view/Makefile +++ head/devel/py-buildbot-grid-view/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-buildbot-waterfall-view/Makefile =================================================================== --- head/devel/py-buildbot-waterfall-view/Makefile +++ head/devel/py-buildbot-waterfall-view/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-buildbot-worker/Makefile =================================================================== --- head/devel/py-buildbot-worker/Makefile +++ head/devel/py-buildbot-worker/Makefile @@ -14,10 +14,10 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted -TEST_DEPENDS= trial:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted@${FLAVOR} +TEST_DEPENDS= trial:devel/py-twisted@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-buildbot-www/Makefile =================================================================== --- head/devel/py-buildbot-www/Makefile +++ head/devel/py-buildbot-www/Makefile @@ -13,13 +13,13 @@ LICENSE= GPLv2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot>=${PORTVERSION}:devel/py-buildbot \ - ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg \ - ${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-console-view>=${PORTVERSION}:devel/py-buildbot-console-view \ - ${PYTHON_PKGNAMEPREFIX}buildbot-grid-view>=${PORTVERSION}:devel/py-buildbot-grid-view \ - ${PYTHON_PKGNAMEPREFIX}buildbot-waterfall-view>=${PORTVERSION}:devel/py-buildbot-waterfall-view \ - ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot>=${PORTVERSION}:devel/py-buildbot@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-console-view>=${PORTVERSION}:devel/py-buildbot-console-view@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}buildbot-grid-view>=${PORTVERSION}:devel/py-buildbot-grid-view@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}buildbot-waterfall-view>=${PORTVERSION}:devel/py-buildbot-waterfall-view@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-buildbot/Makefile =================================================================== --- head/devel/py-buildbot/Makefile +++ head/devel/py-buildbot/Makefile @@ -14,22 +14,22 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}lz4>=0:archivers/py-lz4 \ - ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.4.0:www/py-pyjwt \ - ${PYTHON_PKGNAMEPREFIX}ramlfications>0:devel/py-ramlfications \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:databases/py-sqlalchemy-migrate \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \ - ${PYTHON_PKGNAMEPREFIX}buildbot-worker>=${PORTVERSION}:devel/py-buildbot-worker \ - ${PYTHON_PKGNAMEPREFIX}buildbot-www>=${PORTVERSION}:devel/py-buildbot-www \ - ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lz4>=0:archivers/py-lz4@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.4.0:www/py-pyjwt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ramlfications>0:devel/py-ramlfications@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:databases/py-sqlalchemy-migrate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}buildbot-worker>=${PORTVERSION}:devel/py-buildbot-worker@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}buildbot-www>=${PORTVERSION}:devel/py-buildbot-www@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${FLAVOR} USES= python USE_RC_SUBR= buildbot Index: head/devel/py-canonicaljson/Makefile =================================================================== --- head/devel/py-canonicaljson/Makefile +++ head/devel/py-canonicaljson/Makefile @@ -14,9 +14,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}frozendict>=0.4:devel/py-frozendict \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=3.6.5:devel/py-simplejson -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}frozendict>=0.4:devel/py-frozendict@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=3.6.5:devel/py-simplejson@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_GITHUB= yes Index: head/devel/py-castellan/Makefile =================================================================== --- head/devel/py-castellan/Makefile +++ head/devel/py-castellan/Makefile @@ -11,15 +11,15 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Generic Key Manager interface for OpenStack -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=1.0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.policy>=0.5.0:devel/py-oslo.policy \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=1.0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.policy>=0.5.0:devel/py-oslo.policy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} NO_ARCH= yes Index: head/devel/py-cclib/Makefile =================================================================== --- head/devel/py-cclib/Makefile +++ head/devel/py-cclib/Makefile @@ -5,6 +5,7 @@ PORTVERSION= 1.5.1 DISTVERSIONPREFIX= v CATEGORIES= devel python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= robak@FreeBSD.org COMMENT= Parsers And Algorithms For Computational Chemistry Index: head/devel/py-cdg/Makefile =================================================================== --- head/devel/py-cdg/Makefile +++ head/devel/py-cdg/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-celery/Makefile =================================================================== --- head/devel/py-celery/Makefile +++ head/devel/py-celery/Makefile @@ -13,10 +13,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}billiard>=3.3.0.21:devel/py-billiard \ - ${PYTHON_PKGNAMEPREFIX}pytz>=1.5:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}kombu>=3.0.36:net/py-kombu \ - ${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}billiard>=3.3.0.21:devel/py-billiard@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=1.5:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}kombu>=3.0.36:net/py-kombu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-cffi/Makefile =================================================================== --- head/devel/py-cffi/Makefile +++ head/devel/py-cffi/Makefile @@ -14,11 +14,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libffi.so:devel/libffi -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} # Actually 2.6-2.7,3.2-3.5 -USES?= localbase python compiler +USES= localbase python compiler USE_PYTHON= autoplist distutils .include Index: head/devel/py-check-manifest/Makefile =================================================================== --- head/devel/py-check-manifest/Makefile +++ head/devel/py-check-manifest/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.rst -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} OPTIONS_DEFINE= DOCS Index: head/devel/py-cheetah/Makefile =================================================================== --- head/devel/py-cheetah/Makefile +++ head/devel/py-cheetah/Makefile @@ -12,7 +12,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= HTML template engine for Python -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown@${FLAVOR} USES= python:2.7 USE_PYTHON= distutils autoplist Index: head/devel/py-ciphon/Makefile =================================================================== --- head/devel/py-ciphon/Makefile +++ head/devel/py-ciphon/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE -USES= python +USES= python:2.7 USE_PYTHON= distutils post-install: Index: head/devel/py-circuits/Makefile =================================================================== --- head/devel/py-circuits/Makefile +++ head/devel/py-circuits/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-cjson/Makefile =================================================================== --- head/devel/py-cjson/Makefile +++ head/devel/py-cjson/Makefile @@ -13,7 +13,7 @@ LICENSE= LGPL20 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-install: Index: head/devel/py-cld/Makefile =================================================================== --- head/devel/py-cld/Makefile +++ head/devel/py-cld/Makefile @@ -17,6 +17,7 @@ LIB_DEPENDS= libcld2.so:devel/cld2 USES= python +USE_PYTHON= flavors PLIST_FILES= %%PYTHON_SITELIBDIR%%/chromium_compact_language_detector-2.0-py%%PYTHON_VER%%.egg-info \ %%PYTHON_SITELIBDIR%%/cld2.so \ Index: head/devel/py-cli-helpers/Makefile =================================================================== --- head/devel/py-cli-helpers/Makefile +++ head/devel/py-cli-helpers/Makefile @@ -14,9 +14,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}tabulate>=0.8.0:devel/py-tabulate \ - ${PYTHON_PKGNAMEPREFIX}terminaltables>=3.0.0:textproc/py-terminaltables +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tabulate>=0.8.0:devel/py-tabulate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}terminaltables>=3.0.0:textproc/py-terminaltables@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils @@ -25,7 +25,7 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.csv>=1.0.0:devel/py-backports.csv +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.csv>=1.0.0:devel/py-backports.csv@${FLAVOR} .endif .include Index: head/devel/py-cliapp/Makefile =================================================================== --- head/devel/py-cliapp/Makefile +++ head/devel/py-cliapp/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 LICENSE_FILES= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} USES= python:2 NO_ARCH= yes Index: head/devel/py-click-log/Makefile =================================================================== --- head/devel/py-click-log/Makefile +++ head/devel/py-click-log/Makefile @@ -12,11 +12,11 @@ LICENSE= MIT -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-click-plugins/Makefile =================================================================== --- head/devel/py-click-plugins/Makefile +++ head/devel/py-click-plugins/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-click-threading/Makefile =================================================================== --- head/devel/py-click-threading/Makefile +++ head/devel/py-click-threading/Makefile @@ -12,21 +12,16 @@ LICENSE= MIT -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \ + ${PY_FUTURES} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ ${RUN_DEPENDS} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 3200 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>=0:devel/py-futures -.endif - do-test: @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v -.include +.include Index: head/devel/py-click/Makefile =================================================================== --- head/devel/py-click/Makefile +++ head/devel/py-click/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -USES?= python +USES= python USE_PYTHON= distutils autoplist NO_ARCH= yes Index: head/devel/py-cliff/Makefile =================================================================== --- head/devel/py-cliff/Makefile +++ head/devel/py-cliff/Makefile @@ -12,14 +12,14 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cmd2>=0.6.7:devel/py-cmd2 \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \ - ${PYTHON_PKGNAMEPREFIX}unicodecsv>=0.8.0:devel/py-unicodecsv \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.7:devel/py-pyparsing +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cmd2>=0.6.7:devel/py-cmd2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unicodecsv>=0.8.0:devel/py-unicodecsv@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.7:devel/py-pyparsing@${FLAVOR} NO_ARCH= yes Index: head/devel/py-clint/Makefile =================================================================== --- head/devel/py-clint/Makefile +++ head/devel/py-clint/Makefile @@ -13,7 +13,7 @@ LICENSE= ISCL -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-clonedigger/Makefile =================================================================== --- head/devel/py-clonedigger/Makefile +++ head/devel/py-clonedigger/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-cloudpickle/Makefile =================================================================== --- head/devel/py-cloudpickle/Makefile +++ head/devel/py-cloudpickle/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-cmdtest/Makefile =================================================================== --- head/devel/py-cmdtest/Makefile +++ head/devel/py-cmdtest/Makefile @@ -12,12 +12,12 @@ LICENSE= GPLv3 LICENSE_FILES= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown \ - ${PYTHON_PKGNAMEPREFIX}cliapp>0:devel/py-cliapp \ - ${PYTHON_PKGNAMEPREFIX}ttystatus>0:devel/py-ttystatus -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown \ - ${PYTHON_PKGNAMEPREFIX}cliapp>0:devel/py-cliapp \ - ${PYTHON_PKGNAMEPREFIX}ttystatus>0:devel/py-ttystatus +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cliapp>0:devel/py-cliapp@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ttystatus>0:devel/py-ttystatus@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cliapp>0:devel/py-cliapp@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ttystatus>0:devel/py-ttystatus@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: head/devel/py-codecov/Makefile =================================================================== --- head/devel/py-codecov/Makefile +++ head/devel/py-codecov/Makefile @@ -13,11 +13,11 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.7.9:www/py-requests -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ddt>0:devel/py-ddt \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.7.9:www/py-requests@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ddt>0:devel/py-ddt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-collective.z3cform.datetimewidget/Makefile =================================================================== --- head/devel/py-collective.z3cform.datetimewidget/Makefile +++ head/devel/py-collective.z3cform.datetimewidget/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form \ - ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${FLAVOR} NO_ARCH= yes USES= python:2.7 zip Index: head/devel/py-colorama/Makefile =================================================================== --- head/devel/py-colorama/Makefile +++ head/devel/py-colorama/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= distutils autoplist .include Index: head/devel/py-coloredlogs/Makefile =================================================================== --- head/devel/py-coloredlogs/Makefile +++ head/devel/py-coloredlogs/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}humanfriendly>=2.1:textproc/py-humanfriendly +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}humanfriendly>=2.1:textproc/py-humanfriendly@${FLAVOR} NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include Index: head/devel/py-columnize/Makefile =================================================================== --- head/devel/py-columnize/Makefile +++ head/devel/py-columnize/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -MY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose +MY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${FLAVOR} BUILD_DEPENDS= ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} @@ -24,7 +24,7 @@ .if ${PYTHON_MAJOR_VER} == "3" EXTRA_PATCHES= ${FILESDIR}/extra-patch-____pkginfo____.py .else -MY_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size=1.0:devel/py-backports.shutil_get_terminal_size +MY_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size=1.0:devel/py-backports.shutil_get_terminal_size@${FLAVOR} .endif .include Index: head/devel/py-configargparse/Makefile =================================================================== --- head/devel/py-configargparse/Makefile +++ head/devel/py-configargparse/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-configobj/Makefile =================================================================== --- head/devel/py-configobj/Makefile +++ head/devel/py-configobj/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-construct/Makefile =================================================================== --- head/devel/py-construct/Makefile +++ head/devel/py-construct/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-construct28/Makefile =================================================================== --- head/devel/py-construct28/Makefile +++ head/devel/py-construct28/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-cov-core/Makefile =================================================================== --- head/devel/py-cov-core/Makefile +++ head/devel/py-cov-core/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=3.6:devel/py-coverage +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=3.6:devel/py-coverage@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-cuisine/Makefile =================================================================== --- head/devel/py-cuisine/Makefile +++ head/devel/py-cuisine/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fabric>=1.7,1:devel/py-fabric +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fabric>=1.7,1:devel/py-fabric@${FLAVOR} USES= python:2.7 USE_PYTHON= distutils autoplist Index: head/devel/py-cursive/Makefile =================================================================== --- head/devel/py-cursive/Makefile +++ head/devel/py-cursive/Makefile @@ -10,15 +10,15 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Cursive implements OpenStack-specific validation of digital signatures -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${FLAVOR} NO_ARCH= yes Index: head/devel/py-curtsies/Makefile =================================================================== --- head/devel/py-curtsies/Makefile +++ head/devel/py-curtsies/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blessings>=1.5:devel/py-blessings \ - ${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.4:devel/py-wcwidth +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blessings>=1.5:devel/py-blessings@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.4:devel/py-wcwidth@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-cxx/Makefile =================================================================== --- head/devel/py-cxx/Makefile +++ head/devel/py-cxx/Makefile @@ -11,7 +11,7 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= Make it easier to extend Python with C++ -USES= python +USES= python:2.7 USE_PYTHON= distutils pythonprefix PYDISTUTILS_PKGNAME= CXX PYDISTUTILS_PKGVERSION= 5.3 Index: head/devel/py-cycler/Makefile =================================================================== --- head/devel/py-cycler/Makefile +++ head/devel/py-cycler/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD2CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-d2to1/Makefile =================================================================== --- head/devel/py-d2to1/Makefile +++ head/devel/py-d2to1/Makefile @@ -11,8 +11,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python USE_GITHUB= yes Index: head/devel/py-daemon-runner/Makefile =================================================================== --- head/devel/py-daemon-runner/Makefile +++ head/devel/py-daemon-runner/Makefile @@ -10,7 +10,7 @@ MAINTAINER= dvl@FreeBSD.org COMMENT= Simple command line runner on top of python-daemon -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}daemon>0:devel/py-daemon +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}daemon>0:devel/py-daemon@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-daemon/Makefile =================================================================== --- head/devel/py-daemon/Makefile +++ head/devel/py-daemon/Makefile @@ -13,8 +13,8 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils \ - ${PYTHON_PKGNAMEPREFIX}lockfile>=0.10:devel/py-lockfile +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lockfile>=0.10:devel/py-lockfile@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-darcsver/Makefile =================================================================== --- head/devel/py-darcsver/Makefile +++ head/devel/py-darcsver/Makefile @@ -11,7 +11,7 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Generate a version number from darcs history -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-patch: Index: head/devel/py-dateutil/Makefile =================================================================== --- head/devel/py-dateutil/Makefile +++ head/devel/py-dateutil/Makefile @@ -12,9 +12,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${FLAVOR} -USES?= python +USES= python USE_GITHUB= yes USE_PYTHON= autoplist distutils Index: head/devel/py-dateutils/Makefile =================================================================== --- head/devel/py-dateutils/Makefile +++ head/devel/py-dateutils/Makefile @@ -12,11 +12,11 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse \ - ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-dbus/Makefile =================================================================== --- head/devel/py-dbus/Makefile +++ head/devel/py-dbus/Makefile @@ -11,6 +11,10 @@ SLAVE_PORT= python2 MASTERDIR= ${.CURDIR}/../../devel/pydbus-common +.if ${FLAVOR:U:Mpy3*} +PLIST= ${.CURDIR}/pkg-plist-py3 +.else PLIST= ${.CURDIR}/pkg-plist +.endif .include "${MASTERDIR}/Makefile" Index: head/devel/py-dbus/pkg-plist-py3 =================================================================== --- head/devel/py-dbus/pkg-plist-py3 +++ head/devel/py-dbus/pkg-plist-py3 @@ -0,0 +1,56 @@ +%%PYTHON_SITELIBDIR%%/_dbus_bindings.so +%%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.so +%%PYTHON_SITELIBDIR%%/dbus/__init__.py +%%PYTHON_SITELIBDIR%%/dbus/__init__.pyc +%%PYTHON_SITELIBDIR%%/dbus/__init__.pyo +%%PYTHON_SITELIBDIR%%/dbus/_compat.py +%%PYTHON_SITELIBDIR%%/dbus/_compat.pyc +%%PYTHON_SITELIBDIR%%/dbus/_compat.pyo +%%PYTHON_SITELIBDIR%%/dbus/_dbus.py +%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyc +%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyo +%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.py +%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.pyc +%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.pyo +%%PYTHON_SITELIBDIR%%/dbus/_version.py +%%PYTHON_SITELIBDIR%%/dbus/_version.pyc +%%PYTHON_SITELIBDIR%%/dbus/_version.pyo +%%PYTHON_SITELIBDIR%%/dbus/bus.py +%%PYTHON_SITELIBDIR%%/dbus/bus.pyc +%%PYTHON_SITELIBDIR%%/dbus/bus.pyo +%%PYTHON_SITELIBDIR%%/dbus/connection.py +%%PYTHON_SITELIBDIR%%/dbus/connection.pyc +%%PYTHON_SITELIBDIR%%/dbus/connection.pyo +%%PYTHON_SITELIBDIR%%/dbus/decorators.py +%%PYTHON_SITELIBDIR%%/dbus/decorators.pyc +%%PYTHON_SITELIBDIR%%/dbus/decorators.pyo +%%PYTHON_SITELIBDIR%%/dbus/exceptions.py +%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyc +%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyo +%%PYTHON_SITELIBDIR%%/dbus/gi_service.py +%%PYTHON_SITELIBDIR%%/dbus/gi_service.pyc +%%PYTHON_SITELIBDIR%%/dbus/gi_service.pyo +%%PYTHON_SITELIBDIR%%/dbus/glib.py +%%PYTHON_SITELIBDIR%%/dbus/glib.pyc +%%PYTHON_SITELIBDIR%%/dbus/glib.pyo +%%PYTHON_SITELIBDIR%%/dbus/lowlevel.py +%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyc +%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyo +%%PYTHON_SITELIBDIR%%/dbus/proxies.py +%%PYTHON_SITELIBDIR%%/dbus/proxies.pyc +%%PYTHON_SITELIBDIR%%/dbus/proxies.pyo +%%PYTHON_SITELIBDIR%%/dbus/server.py +%%PYTHON_SITELIBDIR%%/dbus/server.pyc +%%PYTHON_SITELIBDIR%%/dbus/server.pyo +%%PYTHON_SITELIBDIR%%/dbus/service.py +%%PYTHON_SITELIBDIR%%/dbus/service.pyc +%%PYTHON_SITELIBDIR%%/dbus/service.pyo +%%PYTHON_SITELIBDIR%%/dbus/types.py +%%PYTHON_SITELIBDIR%%/dbus/types.pyc +%%PYTHON_SITELIBDIR%%/dbus/types.pyo +%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.py +%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.pyc +%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.pyo +%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.py +%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.pyc +%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.pyo Index: head/devel/py-ddt/Makefile =================================================================== --- head/devel/py-ddt/Makefile +++ head/devel/py-ddt/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-debtcollector/Makefile =================================================================== --- head/devel/py-debtcollector/Makefile +++ head/devel/py-debtcollector/Makefile @@ -12,10 +12,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt \ - ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs@${FLAVOR} NO_ARCH= yes Index: head/devel/py-defusedxml/Makefile =================================================================== --- head/devel/py-defusedxml/Makefile +++ head/devel/py-defusedxml/Makefile @@ -12,7 +12,7 @@ LICENSE= PSFL -USES?= python +USES= python USE_PYTHON= distutils autoplist PORTDOCS= * Index: head/devel/py-delfick_error/Makefile =================================================================== --- head/devel/py-delfick_error/Makefile +++ head/devel/py-delfick_error/Makefile @@ -10,19 +10,19 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}total-ordering>0:devel/py-total-ordering -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:devel/py-noseofyeti \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}total-ordering>0:devel/py-total-ordering@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:devel/py-noseofyeti@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \ - ${PYTHON_PKGNAMEPREFIX}cloud_sptheme>0:textproc/py-cloud_sptheme + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cloud_sptheme>0:textproc/py-cloud_sptheme@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_GITHUB= yes GH_ACCOUNT= delfick GH_TAGNAME= 6761e6c Index: head/devel/py-deliciousapi/Makefile =================================================================== --- head/devel/py-deliciousapi/Makefile +++ head/devel/py-deliciousapi/Makefile @@ -12,13 +12,13 @@ MAINTAINER= sbz@FreeBSD.org COMMENT= Unofficial Python API for retrieving data from Delicious.com -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32 \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=1.7:devel/py-simplejson +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=1.7:devel/py-simplejson@${FLAVOR} LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-dialog/Makefile =================================================================== --- head/devel/py-dialog/Makefile +++ head/devel/py-dialog/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= cdialog:devel/cdialog -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= pythondialog Index: head/devel/py-diazo/Makefile =================================================================== --- head/devel/py-diazo/Makefile +++ head/devel/py-diazo/Makefile @@ -12,12 +12,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect \ - ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:devel/py-repoze.xmliter \ - ${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:devel/py-repoze.xmliter@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: head/devel/py-django-rq-dashboard/Makefile =================================================================== --- head/devel/py-django-rq-dashboard/Makefile +++ head/devel/py-django-rq-dashboard/Makefile @@ -8,14 +8,14 @@ MAINTAINER= swills@FreeBSD.org COMMENT= Monitor your RQ queues, jobs and workers from the Django admin -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-rq>0:devel/py-django-rq +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-rq>0:devel/py-django-rq@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= brutasse NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-django-rq/Makefile =================================================================== --- head/devel/py-django-rq/Makefile +++ head/devel/py-django-rq/Makefile @@ -14,8 +14,8 @@ LICENSE= MIT TEST_DEPENDS= redis-server:databases/redis -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}rq>=0.5.5:devel/py-rq +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rq>=0.5.5:devel/py-rq@${FLAVOR} NO_ARCH= yes Index: head/devel/py-django-tastypie-mongoengine/Makefile =================================================================== --- head/devel/py-django-tastypie-mongoengine/Makefile +++ head/devel/py-django-tastypie-mongoengine/Makefile @@ -14,9 +14,9 @@ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}django-tastypie>=0.9.12:www/py-django-tastypie \ - ${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:devel/py-mongoengine \ - ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 +RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}django-tastypie>=0.9.12:www/py-django-tastypie@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:devel/py-mongoengine@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= wlanslovenija Index: head/devel/py-docker-py/Makefile =================================================================== --- head/devel/py-docker-py/Makefile +++ head/devel/py-docker-py/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-dockerpty/Makefile =================================================================== --- head/devel/py-dockerpty/Makefile +++ head/devel/py-dockerpty/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docker>0:sysutils/py-docker +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docker>0:sysutils/py-docker@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-docopt/Makefile =================================================================== --- head/devel/py-docopt/Makefile +++ head/devel/py-docopt/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE-MIT NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= distutils autoplist concurrent OPTIONS_DEFINE= DOCS EXAMPLES Index: head/devel/py-dogpile.cache/Makefile =================================================================== --- head/devel/py-dogpile.cache/Makefile +++ head/devel/py-dogpile.cache/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-doit/Makefile =================================================================== --- head/devel/py-doit/Makefile +++ head/devel/py-doit/Makefile @@ -13,10 +13,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python:3.3+ USE_PYTHON= distutils autoplist @@ -26,11 +26,4 @@ do-test: @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include +.include Index: head/devel/py-easyprocess/Makefile =================================================================== --- head/devel/py-easyprocess/Makefile +++ head/devel/py-easyprocess/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver \ - ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} NO_ARCH= YES USE_PYTHON= autoplist distutils Index: head/devel/py-efilter/Makefile =================================================================== --- head/devel/py-efilter/Makefile +++ head/devel/py-efilter/Makefile @@ -14,10 +14,10 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2011:devel/py-pytz +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2011:devel/py-pytz@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-efl/Makefile =================================================================== --- head/devel/py-efl/Makefile +++ head/devel/py-efl/Makefile @@ -14,20 +14,12 @@ LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus@${FLAVOR} LIB_DEPENDS= libefl.so:devel/efl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus@${FLAVOR} DIST_SUBDIR= enlightenment USES= pkgconfig python tar:xz USE_PYTHON= autoplist distutils -.include - -.if ${PYTHON_REL} < 3000 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus -.else -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py3-dbus -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py3-dbus -.endif - -.include +.include Index: head/devel/py-entrypoints/Makefile =================================================================== --- head/devel/py-entrypoints/Makefile +++ head/devel/py-entrypoints/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -21,7 +21,7 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>=3.5:devel/py-configparser +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>=3.5:devel/py-configparser@${FLAVOR} .endif do-test: Index: head/devel/py-envisage/Makefile =================================================================== --- head/devel/py-envisage/Makefile +++ head/devel/py-envisage/Makefile @@ -14,7 +14,7 @@ LICENSE_COMB= multi # See image_LICENSE.txt files for per file license information -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: head/devel/py-epsilon/Makefile =================================================================== --- head/devel/py-epsilon/Makefile +++ head/devel/py-epsilon/Makefile @@ -15,8 +15,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} CONFLICTS_INSTALL= brlcad-[0-9]* # bin/benchmark Index: head/devel/py-extras/Makefile =================================================================== --- head/devel/py-extras/Makefile +++ head/devel/py-extras/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}testtools>0:devel/py-testtools +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}testtools>0:devel/py-testtools@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-ezpyinline/Makefile =================================================================== --- head/devel/py-ezpyinline/Makefile +++ head/devel/py-ezpyinline/Makefile @@ -7,11 +7,12 @@ CATEGORIES= devel python MASTER_SITES= CHEESESHOP DIST_SUBDIR= python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= lwhsu@FreeBSD.org COMMENT= Easy embedded Inline C for Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-fabric/Makefile =================================================================== --- head/devel/py-fabric/Makefile +++ head/devel/py-fabric/Makefile @@ -15,10 +15,10 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.10:security/py-paramiko -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=0.6:devel/py-Jinja2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.10:security/py-paramiko@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=0.6:devel/py-Jinja2@${FLAVOR} USES= python:2.7 USE_PYTHON= distutils autoplist Index: head/devel/py-fasteners/Makefile =================================================================== --- head/devel/py-fasteners/Makefile +++ head/devel/py-fasteners/Makefile @@ -10,8 +10,8 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Python package that provides useful locks -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.1:devel/py-monotonic +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}monotonic>=0.1:devel/py-monotonic@${FLAVOR} NO_ARCH= yes Index: head/devel/py-filemagic/Makefile =================================================================== --- head/devel/py-filemagic/Makefile +++ head/devel/py-filemagic/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} OPTIONS_DEFINE= TESTS Index: head/devel/py-five.customerize/Makefile =================================================================== --- head/devel/py-five.customerize/Makefile +++ head/devel/py-five.customerize/Makefile @@ -13,21 +13,21 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} USE_PYTHON= distutils autoplist USES= python:2 zope zip Index: head/devel/py-five.formlib/Makefile =================================================================== --- head/devel/py-five.formlib/Makefile +++ head/devel/py-five.formlib/Makefile @@ -13,21 +13,21 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-five.globalrequest/Makefile =================================================================== --- head/devel/py-five.globalrequest/Makefile +++ head/devel/py-five.globalrequest/Makefile @@ -13,7 +13,7 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:devel/py-zope.globalrequest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:devel/py-zope.globalrequest@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-five.localsitemanager/Makefile =================================================================== --- head/devel/py-five.localsitemanager/Makefile +++ head/devel/py-five.localsitemanager/Makefile @@ -13,17 +13,17 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-flake8-builtins/Makefile =================================================================== --- head/devel/py-flake8-builtins/Makefile +++ head/devel/py-flake8-builtins/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-flake8-docstrings/Makefile =================================================================== --- head/devel/py-flake8-docstrings/Makefile +++ head/devel/py-flake8-docstrings/Makefile @@ -13,11 +13,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8 \ - ${PYTHON_PKGNAMEPREFIX}flake8-polyfill>=0:devel/py-flake8-polyfill \ - ${PYTHON_PKGNAMEPREFIX}pydocstyle>=0:devel/py-pydocstyle +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}flake8-polyfill>=0:devel/py-flake8-polyfill@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pydocstyle>=0:devel/py-pydocstyle@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-flake8-import-order/Makefile =================================================================== --- head/devel/py-flake8-import-order/Makefile +++ head/devel/py-flake8-import-order/Makefile @@ -14,10 +14,10 @@ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pycodestyle>=0:devel/py-pycodestyle \ - ${PYTHON_PKGNAMEPREFIX}asttokens>=0:devel/py-asttokens +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycodestyle>=0:devel/py-pycodestyle@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}asttokens>=0:devel/py-asttokens@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-flake8-polyfill/Makefile =================================================================== --- head/devel/py-flake8-polyfill/Makefile +++ head/devel/py-flake8-polyfill/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-flake8-quotes/Makefile =================================================================== --- head/devel/py-flake8-quotes/Makefile +++ head/devel/py-flake8-quotes/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-flake8/Makefile =================================================================== --- head/devel/py-flake8/Makefile +++ head/devel/py-flake8/Makefile @@ -12,12 +12,12 @@ LICENSE= MIT -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}mccabe>=0.5.0:devel/py-mccabe \ - ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.0.0:devel/py-pycodestyle \ - ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.8.1:devel/py-pyflakes +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mccabe>=0.5.0:devel/py-mccabe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.0.0:devel/py-pycodestyle@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.8.1:devel/py-pyflakes@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: head/devel/py-flask-babel/Makefile =================================================================== --- head/devel/py-flask-babel/Makefile +++ head/devel/py-flask-babel/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.3:devel/py-babel +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=2.3:devel/py-babel@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils Index: head/devel/py-flufl.i18n/Makefile =================================================================== --- head/devel/py-flufl.i18n/Makefile +++ head/devel/py-flufl.i18n/Makefile @@ -11,9 +11,9 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic@${FLAVOR} -USES= python:3 +USES= python:3.5+ USE_PYTHON= autoplist distutils .include Index: head/devel/py-flufl.lock/Makefile =================================================================== --- head/devel/py-flufl.lock/Makefile +++ head/devel/py-flufl.lock/Makefile @@ -11,9 +11,9 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic@${FLAVOR} -USES= python:3 +USES= python:3.4+ USE_PYTHON= autoplist distutils .include Index: head/devel/py-foolscap/Makefile =================================================================== --- head/devel/py-foolscap/Makefile +++ head/devel/py-foolscap/Makefile @@ -14,8 +14,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-fortran/Makefile =================================================================== --- head/devel/py-fortran/Makefile +++ head/devel/py-fortran/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYNUMERIC} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-freenas.dispatcher/Makefile =================================================================== --- head/devel/py-freenas.dispatcher/Makefile +++ head/devel/py-freenas.dispatcher/Makefile @@ -9,15 +9,15 @@ MAINTAINER= wg@FreeBSD.org COMMENT= FreeNAS dispatcher client -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ws4py>0:www/py-ws4py \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent \ - ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ws4py>0:www/py-ws4py@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-freenas.utils/Makefile =================================================================== --- head/devel/py-freenas.utils/Makefile +++ head/devel/py-freenas.utils/Makefile @@ -11,8 +11,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-freezegun/Makefile =================================================================== --- head/devel/py-freezegun/Makefile +++ head/devel/py-freezegun/Makefile @@ -14,13 +14,13 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-fsm/Makefile =================================================================== --- head/devel/py-fsm/Makefile +++ head/devel/py-fsm/Makefile @@ -15,9 +15,9 @@ GH_PROJECT= python-fsm GH_TAGNAME= bf888123 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.0:graphics/py-pygraphviz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.0:graphics/py-pygraphviz@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-fusefs/Makefile =================================================================== --- head/devel/py-fusefs/Makefile +++ head/devel/py-fusefs/Makefile @@ -19,7 +19,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES -USES= fuse pkgconfig python iconv +USES= fuse pkgconfig python:2.7 iconv USE_PYTHON= distutils autoplist PORTDOCS= AUTHORS Changelog FAQ INSTALL README.1st README.historic \ Index: head/devel/py-futurist/Makefile =================================================================== --- head/devel/py-futurist/Makefile +++ head/devel/py-futurist/Makefile @@ -12,12 +12,12 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>=3.0:devel/py-futures \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic \ - ${PYTHON_PKGNAMEPREFIX}contextlib2>=0.4.0:devel/py-contextlib2 \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PY_FUTURES} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}contextlib2>=0.4.0:devel/py-contextlib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} NO_ARCH= yes Index: head/devel/py-fuzzywuzzy/Makefile =================================================================== --- head/devel/py-fuzzywuzzy/Makefile +++ head/devel/py-fuzzywuzzy/Makefile @@ -14,7 +14,7 @@ LICENSE= GPL LICENSE_FILE= LICENSE.txt -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}python-Levenshtein>0:devel/py-python-Levenshtein +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-Levenshtein>0:devel/py-python-Levenshtein@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-game_sdl2/Makefile =================================================================== --- head/devel/py-game_sdl2/Makefile +++ head/devel/py-game_sdl2/Makefile @@ -14,7 +14,6 @@ LICENSE= LGPL21+ ZLIB LICENSE_COMB= multi -BUILD_DEPENDS= cython:lang/cython LIB_DEPENDS= libpng.so:graphics/png # Upstream tends to reroll distfiles before moving under /release/ @@ -22,9 +21,11 @@ USES= jpeg python USE_SDL= image2 mixer2 ttf2 -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython EXCLUDE= gen gen3 PKG-INFO '*.egg-info' EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} + +BINARY_ALIAS= cython=cython-${PYTHON_VER} post-install: ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name \*.so \ Index: head/devel/py-gamin/Makefile =================================================================== --- head/devel/py-gamin/Makefile +++ head/devel/py-gamin/Makefile @@ -16,7 +16,8 @@ GAMIN_SLAVE= yes -USES= fam:gamin python +USES= fam:gamin python:2.7 +USE_PYTHON= flavors CONFIGURE_ARGS= --with-python=${PYTHON_CMD} \ --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc Index: head/devel/py-gdata/Makefile =================================================================== --- head/devel/py-gdata/Makefile +++ head/devel/py-gdata/Makefile @@ -24,9 +24,9 @@ EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} -M2CRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.20:security/py-m2crypto -PYCRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto -GMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gmpy>0:math/py-gmpy +M2CRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.20:security/py-m2crypto@${FLAVOR} +PYCRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} +GMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gmpy>0:math/py-gmpy@${FLAVOR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ Index: head/devel/py-gdbgui/Makefile =================================================================== --- head/devel/py-gdbgui/Makefile +++ head/devel/py-gdbgui/Makefile @@ -11,17 +11,17 @@ LICENSE= CC-BY-NC-3.0 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.12.2:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}Flask-SocketIO>=2.9.0:www/py-flask-socketio \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0.21.0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}pygdbmi>=0.7.3.3:devel/py-pygdbmi \ - ${PYTHON_PKGNAMEPREFIX}pypugjs>=4.2.0:devel/py-pypugjs \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}gevent>=1.2.2:devel/py-gevent +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.12.2:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-SocketIO>=2.9.0:www/py-flask-socketio@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0.21.0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygdbmi>=0.7.3.3:devel/py-pygdbmi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pypugjs>=4.2.0:devel/py-pypugjs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gevent>=1.2.2:devel/py-gevent@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= cs01 -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-gearman/Makefile =================================================================== --- head/devel/py-gearman/Makefile +++ head/devel/py-gearman/Makefile @@ -11,7 +11,7 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Gearman Library for Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-geojson/Makefile =================================================================== --- head/devel/py-geojson/Makefile +++ head/devel/py-geojson/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.0:devel/py-nose -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>1.9:devel/py-simplejson +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.0:devel/py-nose@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>1.9:devel/py-simplejson@${FLAVOR} PORTDOCS= LICENSE.rst CHANGELOG.rst README.rst Index: head/devel/py-geotypes/Makefile =================================================================== --- head/devel/py-geotypes/Makefile +++ head/devel/py-geotypes/Makefile @@ -12,7 +12,7 @@ LICENSE= LGPL21 -USES= python +USES= python:2.7 USE_PYTHON= distutils PYTHON_PKGNAMEPREFIX= yes PYDISTUTILS_EGGINFO= GeoTypes-0.7.0-py${PYTHON_VER}.egg-info Index: head/devel/py-gevent/Makefile =================================================================== --- head/devel/py-gevent/Makefile +++ head/devel/py-gevent/Makefile @@ -15,9 +15,9 @@ LIB_DEPENDS= libcares.so:dns/c-ares \ libev.so:devel/libev -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.10:devel/py-greenlet -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.10:devel/py-greenlet \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.10:devel/py-greenlet@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.10:devel/py-greenlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} DO_MAKE_TEST= ${SETENV} PYTHONPATH=../ ${PYTHON_CMD} MAKE_ENV= CARES_EMBED=0 LIBEV_EMBED=0 Index: head/devel/py-git-up/Makefile =================================================================== --- head/devel/py-git-up/Makefile +++ head/devel/py-git-up/Makefile @@ -11,11 +11,11 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.0.0:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama \ - ${PYTHON_PKGNAMEPREFIX}GitPython>=2.1.1:devel/py-gitpython \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.0.0:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}GitPython>=2.1.1:devel/py-gitpython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${FLAVOR} NO_ARCH= yes USES= dos2unix python zip Index: head/devel/py-gitdb/Makefile =================================================================== --- head/devel/py-gitdb/Makefile +++ head/devel/py-gitdb/Makefile @@ -14,9 +14,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}smmap>=0.8.5:devel/py-smmap +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}smmap>=0.8.5:devel/py-smmap@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils post-install: Index: head/devel/py-gitdb2/Makefile =================================================================== --- head/devel/py-gitdb2/Makefile +++ head/devel/py-gitdb2/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}smmap2>=2.0.0:devel/py-smmap2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}smmap2>=2.0.0:devel/py-smmap2@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-gitless/Makefile =================================================================== --- head/devel/py-gitless/Makefile +++ head/devel/py-gitless/Makefile @@ -14,9 +14,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clint>=0.3.6:devel/py-clint \ - ${PYTHON_PKGNAMEPREFIX}pygit2>=0.23.0:devel/py-pygit2 \ - ${PYTHON_PKGNAMEPREFIX}sh>=1.11:devel/py-sh \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clint>=0.3.6:devel/py-clint@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygit2>=0.23.0:devel/py-pygit2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sh>=1.11:devel/py-sh@${FLAVOR} \ git:devel/git USES= python Index: head/devel/py-gitpython/Makefile =================================================================== --- head/devel/py-gitpython/Makefile +++ head/devel/py-gitpython/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ddt>=1.1.1:devel/py-ddt \ - ${PYTHON_PKGNAMEPREFIX}gitdb2>=2.0.0:devel/py-gitdb2 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ddt>=1.1.1:devel/py-ddt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gitdb2>=2.0.0:devel/py-gitdb2@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-glance-store/Makefile =================================================================== --- head/devel/py-glance-store/Makefile +++ head/devel/py-glance-store/Makefile @@ -12,20 +12,20 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= OpenStack Image Service Store Library -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PY_ENUM34} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} NO_ARCH= yes Index: head/devel/py-glob2/Makefile =================================================================== --- head/devel/py-glob2/Makefile +++ head/devel/py-glob2/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: head/devel/py-gobject/Makefile =================================================================== --- head/devel/py-gobject/Makefile +++ head/devel/py-gobject/Makefile @@ -24,6 +24,7 @@ USES= gmake libtool pathfix pkgconfig python:2 tar:xz shebangfix USE_GNOME= glib20 introspection:build,run +USE_PYTHON= flavors GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-docs --disable-introspection --with-ffi Index: head/devel/py-gobject3/Makefile =================================================================== --- head/devel/py-gobject3/Makefile +++ head/devel/py-gobject3/Makefile @@ -6,9 +6,12 @@ COMMENT= Python 2 bindings for GObject -SLAVE_PORT= python2 +SLAVE_PORT= python MASTERDIR= ${.CURDIR}/../../devel/pygobject3-common PLIST= ${.CURDIR}/pkg-plist +py34_PLIST= ${.CURDIR}/pkg-plist-py3 +py35_PLIST= ${.CURDIR}/pkg-plist-py3 +py36_PLIST= ${.CURDIR}/pkg-plist-py3 .include "${MASTERDIR}/Makefile" Index: head/devel/py-gobject3/pkg-plist-py3 =================================================================== --- head/devel/py-gobject3/pkg-plist-py3 +++ head/devel/py-gobject3/pkg-plist-py3 @@ -0,0 +1,78 @@ +%%PYTHON_SITELIBDIR%%/gi/__init__.py +%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/_constants.py +%%PYTHON_SITELIBDIR%%/gi/_error.py +%%PYTHON_SITELIBDIR%%/gi/_gi.so +%%PYTHON_SITELIBDIR%%/gi/_gi_cairo.so +%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.py +%%PYTHON_SITELIBDIR%%/gi/_gobject/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/_gobject/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/_option.py +%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.py +%%PYTHON_SITELIBDIR%%/gi/_signalhelper.py +%%PYTHON_SITELIBDIR%%/gi/docstring.py +%%PYTHON_SITELIBDIR%%/gi/importer.py +%%PYTHON_SITELIBDIR%%/gi/module.py +%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.py +%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.py +%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.py +%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.py +%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.py +%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.py +%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.py +%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.py +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.py +%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.py +%%PYTHON_SITELIBDIR%%/gi/repository/__init__.py +%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/types.py +%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VER%%-%%OPSYS%%-%%UNAME_R%%-%%UNAME_M%%.egg-info +%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py +%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.py +%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py Index: head/devel/py-google-apputils/Makefile =================================================================== --- head/devel/py-google-apputils/Makefile +++ head/devel/py-google-apputils/Makefile @@ -14,9 +14,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-gflags>2:devel/py-python-gflags \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}dateutil>2:devel/py-dateutil +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-gflags>2:devel/py-python-gflags@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>2:devel/py-dateutil@${FLAVOR} NO_ARCH= yes USES= python:2 Index: head/devel/py-googleapis-common-protos/Makefile =================================================================== --- head/devel/py-googleapis-common-protos/Makefile +++ head/devel/py-googleapis-common-protos/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-grab/Makefile =================================================================== --- head/devel/py-grab/Makefile +++ head/devel/py-grab/Makefile @@ -11,13 +11,13 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl \ - ${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib \ - ${PYTHON_PKGNAMEPREFIX}selection>0:devel/py-selection \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent \ - ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}selection>0:devel/py-selection@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-grpcio-tools/Makefile =================================================================== --- head/devel/py-grpcio-tools/Makefile +++ head/devel/py-grpcio-tools/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grpcio>1:devel/py-grpcio +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grpcio>1:devel/py-grpcio@${FLAVOR} LIB_DEPENDS= libcares.so:dns/c-ares USES= localbase:ldflags python Index: head/devel/py-grpcio/Makefile =================================================================== --- head/devel/py-grpcio/Makefile +++ head/devel/py-grpcio/Makefile @@ -13,8 +13,10 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>1:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}protobuf>=3:devel/py-protobuf +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>1:devel/py-six@${FLAVOR} \ + ${PY_ENUM34} \ + ${PY_FUTURES} \ + ${PYTHON_PKGNAMEPREFIX}protobuf>=3:devel/py-protobuf@${FLAVOR} LIB_DEPENDS= libcares.so:dns/c-ares BROKEN_powerpc64= fails to compile: cpu-ppc64le.c: 'AT_HWCAP2' undeclared @@ -24,15 +26,8 @@ CFLAGS+= -Ithird_party/boringssl/include LDFLAGS+= -lcares -.include - -.if ${PYTHON_VERSION} == "2.7" -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>1:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}futures>=3:devel/py-futures -.endif - post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/grpc/_cython/cygrpc.so ${REINPLACE_CMD} -e 's|${PYTHONPREFIX_SITELIBDIR}/\(.*\)/grpcio/grpc/_cython/cygrpc.so|${PYTHONPREFIX_SITELIBDIR}/grpc/_cython/cygrpc.so|g' ${_PYTHONPKGLIST} -.include +.include Index: head/devel/py-gtfslib/Makefile =================================================================== --- head/devel/py-gtfslib/Makefile +++ head/devel/py-gtfslib/Makefile @@ -12,12 +12,12 @@ LICENSE= GPLv3+ -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>=0.6.1:databases/py-sqlalchemy11 \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}docopt>=0.6:devel/py-docopt \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.18:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}pyqtree>=0.24:devel/py-pyqtree \ - ${PYTHON_PKGNAMEPREFIX}pyshp>=1.2.12:devel/py-pyshp +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>=0.6.1:databases/py-sqlalchemy11@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docopt>=0.6:devel/py-docopt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.18:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyqtree>=0.24:devel/py-pyqtree@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyshp>=1.2.12:devel/py-pyshp@${FLAVOR} NO_ARCH= yes Index: head/devel/py-hash_ring/Makefile =================================================================== --- head/devel/py-hash_ring/Makefile +++ head/devel/py-hash_ring/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Implementation of consistent hashing in Python -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-hgsubversion/Makefile =================================================================== --- head/devel/py-hgsubversion/Makefile +++ head/devel/py-hgsubversion/Makefile @@ -22,9 +22,9 @@ .include .if ${PORT_OPTIONS:MSUBVERTPY} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subvertpy>=0:devel/py-subvertpy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subvertpy>=0:devel/py-subvertpy@${FLAVOR} .else -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${FLAVOR} .endif .include Index: head/devel/py-hgtools/Makefile =================================================================== --- head/devel/py-hgtools/Makefile +++ head/devel/py-hgtools/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= python zip +USES= python zip USE_PYTHON= distutils autoplist NO_ARCH= yes Index: head/devel/py-http-prompt/Makefile =================================================================== --- head/devel/py-http-prompt/Makefile +++ head/devel/py-http-prompt/Makefile @@ -12,12 +12,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}parsimonious>=0.6.2:textproc/py-parsimonious \ - ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=0.60:devel/py-prompt_toolkit \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}httpie>=0.9.2:www/py-httpie +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}parsimonious>=0.6.2:textproc/py-parsimonious@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=0.60:devel/py-prompt_toolkit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httpie>=0.9.2:www/py-httpie@${FLAVOR} NO_ARCH= yes SUB_FILES= pkg-message Index: head/devel/py-hypothesis/Makefile =================================================================== --- head/devel/py-hypothesis/Makefile +++ head/devel/py-hypothesis/Makefile @@ -12,7 +12,7 @@ LICENSE= MPL20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-icalendar/Makefile =================================================================== --- head/devel/py-icalendar/Makefile +++ head/devel/py-icalendar/Makefile @@ -13,10 +13,10 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: head/devel/py-interface/Makefile =================================================================== --- head/devel/py-interface/Makefile +++ head/devel/py-interface/Makefile @@ -14,12 +14,14 @@ LICENSE= LGPL20 USES= python -USE_PYTHON= distutils +USE_PYTHON= distutils autoplist PYDISTUTILS_PKGNAME= py_${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/py_${PORTNAME} # EXAMPLESDIR= ${PREFIX}/share/examples/py_${PORTNAME} OPTIONS_DEFINE= DOCS + +PORTDOCS= README post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} Index: head/devel/py-interface/pkg-plist =================================================================== --- head/devel/py-interface/pkg-plist +++ head/devel/py-interface/pkg-plist @@ -1,28 +0,0 @@ -%%PYTHON_SITELIBDIR%%/py_interface/__init__.py -%%PYTHON_SITELIBDIR%%/py_interface/__init__.pyc -%%PYTHON_SITELIBDIR%%/py_interface/__init__.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/py_interface/erl_async_conn.py -%%PYTHON_SITELIBDIR%%/py_interface/erl_async_conn.pyc -%%PYTHON_SITELIBDIR%%/py_interface/erl_async_conn.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/py_interface/erl_common.py -%%PYTHON_SITELIBDIR%%/py_interface/erl_common.pyc -%%PYTHON_SITELIBDIR%%/py_interface/erl_common.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/py_interface/erl_epmd.py -%%PYTHON_SITELIBDIR%%/py_interface/erl_epmd.pyc -%%PYTHON_SITELIBDIR%%/py_interface/erl_epmd.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/py_interface/erl_eventhandler.py -%%PYTHON_SITELIBDIR%%/py_interface/erl_eventhandler.pyc -%%PYTHON_SITELIBDIR%%/py_interface/erl_eventhandler.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/py_interface/erl_node.py -%%PYTHON_SITELIBDIR%%/py_interface/erl_node.pyc -%%PYTHON_SITELIBDIR%%/py_interface/erl_node.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/py_interface/erl_node_conn.py -%%PYTHON_SITELIBDIR%%/py_interface/erl_node_conn.pyc -%%PYTHON_SITELIBDIR%%/py_interface/erl_node_conn.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/py_interface/erl_opts.py -%%PYTHON_SITELIBDIR%%/py_interface/erl_opts.pyc -%%PYTHON_SITELIBDIR%%/py_interface/erl_opts.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/py_interface/erl_term.py -%%PYTHON_SITELIBDIR%%/py_interface/erl_term.pyc -%%PYTHON_SITELIBDIR%%/py_interface/erl_term.%%PYTHON_PYOEXTENSION%% -%%PORTDOCS%%%%DOCSDIR%%/README Index: head/devel/py-intervaltree/Makefile =================================================================== --- head/devel/py-intervaltree/Makefile +++ head/devel/py-intervaltree/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=0:devel/py-sortedcontainers +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=0:devel/py-sortedcontainers@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-invoke/Makefile =================================================================== --- head/devel/py-invoke/Makefile +++ head/devel/py-invoke/Makefile @@ -16,10 +16,10 @@ USES= python USE_PYTHON= autoplist distutils -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}semantic_version>0:devel/py-semantic_version -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}twine>0:devel/py-twine -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}semantic_version>0:devel/py-semantic_version@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}twine>0:devel/py-twine@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} NO_ARCH= YES Index: head/devel/py-ipdb/Makefile =================================================================== --- head/devel/py-ipdb/Makefile +++ head/devel/py-ipdb/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0.10:devel/ipython +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0.10:devel/ipython@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist Index: head/devel/py-ipykernel/Makefile =================================================================== --- head/devel/py-ipykernel/Makefile +++ head/devel/py-ipykernel/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython \ - ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client \ - ${PYTHON_PKGNAMEPREFIX}tornado>=4.0:www/py-tornado \ - ${PYTHON_PKGNAMEPREFIX}traitlets>=4.1.0:devel/py-traitlets +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>=4.0:www/py-tornado@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitlets>=4.1.0:devel/py-traitlets@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-ipyparallel/Makefile =================================================================== --- head/devel/py-ipyparallel/Makefile +++ head/devel/py-ipyparallel/Makefile @@ -12,16 +12,16 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}futures>=0:devel/py-futures \ - ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel \ - ${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython \ - ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils \ - ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client \ - ${PYTHON_PKGNAMEPREFIX}notebook>=0:www/py-notebook \ - ${PYTHON_PKGNAMEPREFIX}pyzmq>=13:net/py-pyzmq \ - ${PYTHON_PKGNAMEPREFIX}tornado>=4.0:www/py-tornado +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${FLAVOR} \ + ${PY_FUTURES} \ + ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}notebook>=0:www/py-notebook@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyzmq>=13:net/py-pyzmq@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>=4.0:www/py-tornado@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-ipywidgets/Makefile =================================================================== --- head/devel/py-ipywidgets/Makefile +++ head/devel/py-ipywidgets/Makefile @@ -9,10 +9,10 @@ MAINTAINER= swills@FreeBSD.org COMMENT= Interactive HTML widgets for Jupyter notebooks and the IPython kernel -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython \ - ${PYTHON_PKGNAMEPREFIX}ipykernel>=4.2.2:devel/py-ipykernel \ - ${PYTHON_PKGNAMEPREFIX}widgetsnbextension>=1.2:devel/py-widgetsnbextension \ - ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipykernel>=4.2.2:devel/py-ipykernel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}widgetsnbextension>=1.2:devel/py-widgetsnbextension@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-iso8601/Makefile =================================================================== --- head/devel/py-iso8601/Makefile +++ head/devel/py-iso8601/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-isodate/Makefile =================================================================== --- head/devel/py-isodate/Makefile +++ head/devel/py-isodate/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-isort/Makefile =================================================================== --- head/devel/py-isort/Makefile +++ head/devel/py-isort/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-jaraco.classes/Makefile =================================================================== --- head/devel/py-jaraco.classes/Makefile +++ head/devel/py-jaraco.classes/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six@${FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-jaraco.functools/Makefile =================================================================== --- head/devel/py-jaraco.functools/Makefile +++ head/devel/py-jaraco.functools/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -20,7 +20,7 @@ .include .if ${PYTHON_VER} == "2.7" -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32 +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${FLAVOR} .endif .include Index: head/devel/py-jaraco.itertools/Makefile =================================================================== --- head/devel/py-jaraco.itertools/Makefile +++ head/devel/py-jaraco.itertools/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools \ - ${PYTHON_PKGNAMEPREFIX}inflect>0:devel/py-inflect -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}inflect>0:devel/py-inflect@${FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-jaraco.logging/Makefile =================================================================== --- head/devel/py-jaraco.logging/Makefile +++ head/devel/py-jaraco.logging/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}tempora>0:devel/py-tempora -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tempora>0:devel/py-tempora@${FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-jaraco.timing/Makefile =================================================================== --- head/devel/py-jaraco.timing/Makefile +++ head/devel/py-jaraco.timing/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools \ - ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-jaraco.util/Makefile =================================================================== --- head/devel/py-jaraco.util/Makefile +++ head/devel/py-jaraco.util/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools \ - ${PYTHON_PKGNAMEPREFIX}jaraco.timing>0:devel/py-jaraco.timing -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jaraco.timing>0:devel/py-jaraco.timing@${FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools@${FLAVOR} USES= python zip USE_PYTHON= autoplist distutils Index: head/devel/py-jdcal/Makefile =================================================================== --- head/devel/py-jdcal/Makefile +++ head/devel/py-jdcal/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-jedi/Makefile =================================================================== --- head/devel/py-jedi/Makefile +++ head/devel/py-jedi/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist distutils .include Index: head/devel/py-jenkins-job-builder/Makefile =================================================================== --- head/devel/py-jenkins-job-builder/Makefile +++ head/devel/py-jenkins-job-builder/Makefile @@ -13,12 +13,12 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PKGNAMEPREFIX}pbr>0:devel/py-pbr -RUN_DEPENDS= ${PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PKGNAMEPREFIX}pbr>0:devel/py-pbr \ - ${PKGNAMEPREFIX}six>0:devel/py-six \ - ${PKGNAMEPREFIX}stevedore>0:devel/py-stevedore \ - ${PKGNAMEPREFIX}python-jenkins>0:devel/py-python-jenkins +BUILD_DEPENDS= ${PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} \ + ${PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PKGNAMEPREFIX}stevedore>0:devel/py-stevedore@${FLAVOR} \ + ${PKGNAMEPREFIX}python-jenkins>0:devel/py-python-jenkins@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-jira/Makefile =================================================================== --- head/devel/py-jira/Makefile +++ head/devel/py-jira/Makefile @@ -13,16 +13,16 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner \ - ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.3:www/py-requests-oauthlib \ - ${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.4:security/py-tlslite \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.3:www/py-requests-oauthlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.4:security/py-tlslite@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr@${FLAVOR} TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} OPTIONS_DEFINE= MAGIC PARALLEL SHELL TESTS OPTIONS_DEFAULT= MAGIC PARALLEL SHELL @@ -32,15 +32,15 @@ SHELL_DESC= Enable interactive shell TESTS_DESC= Install test suite dependencies -MAGIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filemagic>=1.6:devel/py-filemagic -PARALLEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grequests>0:www/py-grequests -SHELL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0.13:devel/ipython +MAGIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filemagic>=1.6:devel/py-filemagic@${FLAVOR} +PARALLEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grequests>0:www/py-grequests@${FLAVOR} +SHELL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0.13:devel/ipython@${FLAVOR} TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-jsbeautifier/Makefile =================================================================== --- head/devel/py-jsbeautifier/Makefile +++ head/devel/py-jsbeautifier/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}editorconfig>=0.12.0:editors/py-editorconfig +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}editorconfig>=0.12.0:editors/py-editorconfig@${FLAVOR} USES?= python USE_PYTHON= distutils autoplist Index: head/devel/py-json-sempai/Makefile =================================================================== --- head/devel/py-json-sempai/Makefile +++ head/devel/py-json-sempai/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist PORTDOCS= README.rst Index: head/devel/py-jsonlib/Makefile =================================================================== --- head/devel/py-jsonlib/Makefile +++ head/devel/py-jsonlib/Makefile @@ -11,7 +11,7 @@ MAINTAINER= wen@FreeBSD.org COMMENT= JSON Serializer/Deserializer for Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-jsonlib2/Makefile =================================================================== --- head/devel/py-jsonlib2/Makefile +++ head/devel/py-jsonlib2/Makefile @@ -11,7 +11,7 @@ MAINTAINER= wen@FreeBSD.org COMMENT= JSON Serializer/Deserializer for Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-jsonpatch/Makefile =================================================================== --- head/devel/py-jsonpatch/Makefile +++ head/devel/py-jsonpatch/Makefile @@ -9,7 +9,7 @@ MAINTAINER= harm@weites.com COMMENT= Apply JSON-Patches (RFC 6902) -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${FLAVOR} LICENSE= BSD3CLAUSE Index: head/devel/py-jsonref/Makefile =================================================================== --- head/devel/py-jsonref/Makefile +++ head/devel/py-jsonref/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.0:www/py-requests@${FLAVOR} USES?= python USE_PYTHON= autoplist distutils Index: head/devel/py-jsonrpclib-pelix/Makefile =================================================================== --- head/devel/py-jsonrpclib-pelix/Makefile +++ head/devel/py-jsonrpclib-pelix/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -USES= python:3 +USES= python:3.4+ USE_PYTHON= distutils autoplist .include Index: head/devel/py-jsonrpclib/Makefile =================================================================== --- head/devel/py-jsonrpclib/Makefile +++ head/devel/py-jsonrpclib/Makefile @@ -21,7 +21,7 @@ .include .if ${PORT_OPTIONS:MCJSON} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cjson>0:devel/py-cjson +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cjson>0:devel/py-cjson@${FLAVOR} .endif .include Index: head/devel/py-jsonschema/Makefile =================================================================== --- head/devel/py-jsonschema/Makefile +++ head/devel/py-jsonschema/Makefile @@ -1,26 +1,27 @@ -# Created by: William Grzybowski +# Created by: Muhammad Moinur Rahman # $FreeBSD$ PORTNAME= jsonschema -PORTVERSION= 2.5.1 +PORTVERSION= 2.6.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= wg@FreeBSD.org +MAINTAINER= bofh@FreeBSD.org COMMENT= JSON Schema validation for Python LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner@${FLAVOR} USES= python USE_PYTHON= autoplist distutils +NO_ARCH= yes .include .if ${PYTHON_VER} == "2.7" -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${FLAVOR} .endif .include Index: head/devel/py-jsonschema/distinfo =================================================================== --- head/devel/py-jsonschema/distinfo +++ head/devel/py-jsonschema/distinfo @@ -1,2 +1,3 @@ -SHA256 (jsonschema-2.5.1.tar.gz) = 36673ac378feed3daa5956276a829699056523d7961027911f064b52255ead41 -SIZE (jsonschema-2.5.1.tar.gz) = 50855 +TIMESTAMP = 1488112296 +SHA256 (jsonschema-2.6.0.tar.gz) = 6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02 +SIZE (jsonschema-2.6.0.tar.gz) = 53252 Index: head/devel/py-jupyter_client/Makefile =================================================================== --- head/devel/py-jupyter_client/Makefile +++ head/devel/py-jupyter_client/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core \ - ${PYTHON_PKGNAMEPREFIX}pyzmq>=13:net/py-pyzmq \ - ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyzmq>=13:net/py-pyzmq@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-jupyter_console/Makefile =================================================================== --- head/devel/py-jupyter_console/Makefile +++ head/devel/py-jupyter_console/Makefile @@ -12,11 +12,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client \ - ${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython \ - ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel \ - ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.4:devel/py-prompt_toolkit \ - ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.4:devel/py-prompt_toolkit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-jupyter_core/Makefile =================================================================== --- head/devel/py-jupyter_core/Makefile +++ head/devel/py-jupyter_core/Makefile @@ -12,11 +12,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython \ - ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath + ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-kaptan/Makefile =================================================================== --- head/devel/py-kaptan/Makefile +++ head/devel/py-kaptan/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-kayako/Makefile =================================================================== --- head/devel/py-kayako/Makefile +++ head/devel/py-kayako/Makefile @@ -9,7 +9,7 @@ MAINTAINER= rm@FreeBSD.org COMMENT= Python API Wrapper for Kayako -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} NO_ARCH= yes USES= python:2 Index: head/devel/py-kazoo/Makefile =================================================================== --- head/devel/py-kazoo/Makefile +++ head/devel/py-kazoo/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:devel/py-gevent +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:devel/py-gevent@${FLAVOR} USES= gmake python USE_PYTHON= distutils autoplist Index: head/devel/py-keystoneauth1/Makefile =================================================================== --- head/devel/py-keystoneauth1/Makefile +++ head/devel/py-keystoneauth1/Makefile @@ -12,12 +12,12 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}positional>=1.0.1:devel/py-positional \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}positional>=1.0.1:devel/py-positional@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${FLAVOR} NO_ARCH= yes Index: head/devel/py-keystonemiddleware/Makefile =================================================================== --- head/devel/py-keystonemiddleware/Makefile +++ head/devel/py-keystonemiddleware/Makefile @@ -10,20 +10,20 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Middleware for OpenStack Identity -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient \ - ${PYTHON_PKGNAMEPREFIX}pycadf>=0:devel/py-pycadf \ - ${PYTHON_PKGNAMEPREFIX}positional>=1.1.1:devel/py-positional \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.17.0:devel/py-keystoneauth1 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycadf>=0:devel/py-pycadf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}positional>=1.1.1:devel/py-positional@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.17.0:devel/py-keystoneauth1@${FLAVOR} NO_ARCH= yes Index: head/devel/py-kid/Makefile =================================================================== --- head/devel/py-kid/Makefile +++ head/devel/py-kid/Makefile @@ -12,7 +12,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= Simple template language for XML based written in Python -USES= python shebangfix +USES= python:2.7 shebangfix USE_PYTHON= distutils autoplist SHEBANG_FILES= misc/upgrade-0.6.py Index: head/devel/py-kjbuckets/Makefile =================================================================== --- head/devel/py-kjbuckets/Makefile +++ head/devel/py-kjbuckets/Makefile @@ -18,7 +18,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/${DISTNAME}/kjbuckets Index: head/devel/py-lazr.config/Makefile =================================================================== --- head/devel/py-lazr.config/Makefile +++ head/devel/py-lazr.config/Makefile @@ -13,8 +13,8 @@ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}lazr.delegates>=2.0.3:devel/py-lazr.delegates +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lazr.delegates>=2.0.3:devel/py-lazr.delegates@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-lazr.delegates/Makefile =================================================================== --- head/devel/py-lazr.delegates/Makefile +++ head/devel/py-lazr.delegates/Makefile @@ -13,8 +13,8 @@ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}nose>=1.3.7:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=1.3.7:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-libpeas/Makefile =================================================================== --- head/devel/py-libpeas/Makefile +++ head/devel/py-libpeas/Makefile @@ -1,22 +1,16 @@ # Created by: Koop Mast # $FreeBSD$ -PORTNAME= libpeas PORTREVISION= 0 -CATEGORIES= devel gnome -MASTER_SITES= GNOME -DIST_SUBDIR= gnome3 PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -COMMENT= libpeas Python 2 support +COMMENT= libpeas Python support -LIB_DEPENDS+= libpeas-1.0.so:devel/libpeas +LIBPEAS_SLAVE= python -LIBPEAS_SLAVE= python2 - -BUILD_WRKSRC= ${WRKSRC}/loaders/python -INSTALL_WRKSRC= ${WRKSRC}/loaders/python - MASTERDIR= ${.CURDIR}/../../devel/libpeas/ +py34_PLIST= ${.CURDIR}/pkg-plist-py3 +py35_PLIST= ${.CURDIR}/pkg-plist-py3 +py36_PLIST= ${.CURDIR}/pkg-plist-py3 .include "${MASTERDIR}/Makefile" Index: head/devel/py-libpeas/pkg-plist-py3 =================================================================== --- head/devel/py-libpeas/pkg-plist-py3 +++ head/devel/py-libpeas/pkg-plist-py3 @@ -0,0 +1 @@ +lib/libpeas-1.0/loaders/libpython3loader.so Index: head/devel/py-libplist/Makefile =================================================================== --- head/devel/py-libplist/Makefile +++ head/devel/py-libplist/Makefile @@ -8,11 +8,11 @@ COMMENT= Python bindings for libplist LIB_DEPENDS= libplist.so:${MASTER_PORT} -BUILD_DEPENDS= cython:lang/cython PORTSCOUT= ignore:1 -USES= python +USES= python:2.7 +USE_PYTHON= flavors cython CONFIGURE_ENV= PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`" SLAVE_PORT= yes MASTERDIR= ${.CURDIR:H:H}/devel/libplist Index: head/devel/py-libtaxii/Makefile =================================================================== --- head/devel/py-libtaxii/Makefile +++ head/devel/py-libtaxii/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4.1:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4.1:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils Index: head/devel/py-libzfs/Makefile =================================================================== --- head/devel/py-libzfs/Makefile +++ head/devel/py-libzfs/Makefile @@ -18,21 +18,15 @@ GH_PROJECT= py-libzfs GH_TAGNAME= 3e31c3f -USES?= python -USE_PYTHON= autoplist distutils +USES= python +USE_PYTHON= autoplist distutils cython MAKE_ENV= FREEBSD_SRC=${SRC_BASE} .include -.if ${PYTHON_REL} >= 3306 -BUILD_DEPENDS= cython3>0:lang/cython3 -.else -BUILD_DEPENDS= cython>0:lang/cython -.endif - .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} .endif .if !exists(${SRC_BASE}/sys/Makefile) Index: head/devel/py-linecache2/Makefile =================================================================== --- head/devel/py-linecache2/Makefile +++ head/devel/py-linecache2/Makefile @@ -12,8 +12,8 @@ LICENSE= PSFL -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-llfuse/Makefile =================================================================== --- head/devel/py-llfuse/Makefile +++ head/devel/py-llfuse/Makefile @@ -14,7 +14,7 @@ BROKEN_powerpc64= Does not build: error: conversion to mode_t from int may alter its value -USES?= compiler:c++11-lang fuse pkgconfig python tar:bz2 +USES= compiler:c++11-lang fuse pkgconfig python tar:bz2 USE_PYTHON= autoplist distutils post-install: Index: head/devel/py-llvmlite/Makefile =================================================================== --- head/devel/py-llvmlite/Makefile +++ head/devel/py-llvmlite/Makefile @@ -27,7 +27,7 @@ # Python 2.7 requires enum34, unnecessary for Python 3.4+ .if ${PYTHON_REL} < 3400 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} .endif BUILD_DEPENDS+= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} Index: head/devel/py-lockfile/Makefile =================================================================== --- head/devel/py-lockfile/Makefile +++ head/devel/py-lockfile/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-log4py/Makefile =================================================================== --- head/devel/py-log4py/Makefile +++ head/devel/py-log4py/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -USES= python +USES= python:2.7 USE_PYTHON= distutils OPTIONS_DEFINE= DOCS Index: head/devel/py-logan/Makefile =================================================================== --- head/devel/py-logan/Makefile +++ head/devel/py-logan/Makefile @@ -11,10 +11,10 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-logfury/Makefile =================================================================== --- head/devel/py-logfury/Makefile +++ head/devel/py-logfury/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}funcsigs>=1.0.2:devel/py-funcsigs +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}funcsigs>=1.0.2:devel/py-funcsigs@${FLAVOR} USES= python:2.7+ USE_PYTHON= autoplist distutils Index: head/devel/py-logilab-common/Makefile =================================================================== --- head/devel/py-logilab-common/Makefile +++ head/devel/py-logilab-common/Makefile @@ -13,8 +13,8 @@ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LESSER -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-louie/Makefile =================================================================== --- head/devel/py-louie/Makefile +++ head/devel/py-louie/Makefile @@ -12,9 +12,9 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.8.3:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.8.3:devel/py-nose@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: head/devel/py-lxml/Makefile =================================================================== --- head/devel/py-lxml/Makefile +++ head/devel/py-lxml/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libxslt.so:textproc/libxslt -USES+= python uniquefiles:dirs +USES= python uniquefiles:dirs USE_PYTHON= autoplist concurrent distutils LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib Index: head/devel/py-manuel/Makefile =================================================================== --- head/devel/py-manuel/Makefile +++ head/devel/py-manuel/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.rst -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-mccabe/Makefile =================================================================== --- head/devel/py-mccabe/Makefile +++ head/devel/py-mccabe/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-mdv/Makefile =================================================================== --- head/devel/py-mdv/Makefile +++ head/devel/py-mdv/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt \ - ${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python Index: head/devel/py-meliae/Makefile =================================================================== --- head/devel/py-meliae/Makefile +++ head/devel/py-meliae/Makefile @@ -13,10 +13,8 @@ LICENSE= GPLv3 -BUILD_DEPENDS= cython>0:lang/cython - USES= python:2 -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist cython regression-test: extract (cd ${WRKSRC}; ${MAKE} check) Index: head/devel/py-memory_profiler/Makefile =================================================================== --- head/devel/py-memory_profiler/Makefile +++ head/devel/py-memory_profiler/Makefile @@ -16,7 +16,7 @@ OPTIONS_DEFAULT= PSUTIL PSUTIL_DESC= Use psutil for better performance -PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>1.0.0:sysutils/py-psutil +PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>1.0.0:sysutils/py-psutil@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-microversion-parse/Makefile =================================================================== --- head/devel/py-microversion-parse/Makefile +++ head/devel/py-microversion-parse/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} NO_ARCH= yes Index: head/devel/py-minimongo/Makefile =================================================================== --- head/devel/py-minimongo/Makefile +++ head/devel/py-minimongo/Makefile @@ -12,7 +12,7 @@ MAINTAINER= mail@derzinn.de COMMENT= Minimal database Model management for MongoDB -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=1.9:databases/pymongo +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=1.9:databases/pymongo@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-mock/Makefile =================================================================== --- head/devel/py-mock/Makefile +++ head/devel/py-mock/Makefile @@ -13,19 +13,19 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -TESTS_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox +TESTS_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${FLAVOR} NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include .if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}funcsigs>=0:devel/py-funcsigs +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}funcsigs>=0:devel/py-funcsigs@${FLAVOR} .endif do-test: Index: head/devel/py-mongoengine/Makefile =================================================================== --- head/devel/py-mongoengine/Makefile +++ head/devel/py-mongoengine/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}rednose>0:devel/py-rednose -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=2.7:databases/pymongo +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rednose>0:devel/py-rednose@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=2.7:databases/pymongo@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-mwlib.ext/Makefile =================================================================== --- head/devel/py-mwlib.ext/Makefile +++ head/devel/py-mwlib.ext/Makefile @@ -11,7 +11,7 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Provide Dependencies for mwlib -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-mwlib.rl/Makefile =================================================================== --- head/devel/py-mwlib.rl/Makefile +++ head/devel/py-mwlib.rl/Makefile @@ -14,13 +14,13 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/texvc:print/texvc \ ${LOCALBASE}/bin/fribidi:converters/fribidi \ - ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent \ - ${PYTHON_PKGNAMEPREFIX}mwlib>=0.12.14:devel/py-mwlib \ - ${PYTHON_PKGNAMEPREFIX}mwlib.ext>=0.12.3:devel/py-mwlib.ext \ - ${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments + ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mwlib>=0.12.14:devel/py-mwlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mwlib.ext>=0.12.3:devel/py-mwlib.ext@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-mwlib/Makefile =================================================================== --- head/devel/py-mwlib/Makefile +++ head/devel/py-mwlib/Makefile @@ -13,25 +13,25 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.2:devel/py-apipkg \ - ${PYTHON_PKGNAMEPREFIX}bottle>=0.10:www/py-bottle \ - ${PYTHON_PKGNAMEPREFIX}flup>=1.0:www/py-flup \ - ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent \ - ${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}odfpy>=0.9:devel/py-odfpy \ - ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile \ - ${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib \ - ${PYTHON_PKGNAMEPREFIX}pdf>=1.12:print/py-pdf \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}py>=1.4.0:devel/py-py \ - ${PYTHON_PKGNAMEPREFIX}qserve>=0:devel/py-qserve \ - ${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman \ - ${PYTHON_PKGNAMEPREFIX}simplejson>2.0.8:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}sqlite3dbm>=0:databases/py-sqlite3dbm \ - ${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib \ - ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.2:devel/py-apipkg@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bottle>=0.10:www/py-bottle@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}flup>=1.0:www/py-flup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}odfpy>=0.9:devel/py-odfpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pdf>=1.12:print/py-pdf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}py>=1.4.0:devel/py-py@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qserve>=0:devel/py-qserve@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>2.0.8:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3dbm>=0:databases/py-sqlite3dbm@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob@${FLAVOR} USES= python:2 shebangfix zip SHEBANG_FILES= mwlib/EasyTimeline.pl mwlib/writer/*.py \ Index: head/devel/py-mx-experimental/Makefile =================================================================== --- head/devel/py-mx-experimental/Makefile +++ head/devel/py-mx-experimental/Makefile @@ -13,9 +13,9 @@ COMMENT= The eGenix mx Extensions - EXPERIMENTAL Package BUILD_DEPENDS= ${LOCALBASE}/include/gmp.h:math/gmp -#RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:lang/py-mx-base +#RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:lang/py-mx-base@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= egenix-mx-experimental Index: head/devel/py-mypy/Makefile =================================================================== --- head/devel/py-mypy/Makefile +++ head/devel/py-mypy/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT PSFL LICENSE_COMB= multi -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}typed-ast>=1.1.0:devel/py-typed-ast +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}typed-ast>=1.1.0:devel/py-typed-ast@${FLAVOR} NO_ARCH= yes USES= python:3.3+ shebangfix @@ -23,7 +23,7 @@ .include .if ${PYTHON_VER} < 3.5 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=3.5.3:devel/py-typing +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=3.5.3:devel/py-typing@${FLAVOR} .endif .include Index: head/devel/py-nagioscheck/Makefile =================================================================== --- head/devel/py-nagioscheck/Makefile +++ head/devel/py-nagioscheck/Makefile @@ -10,7 +10,7 @@ MAINTAINER= python@FreeBSD.org COMMENT= Class library for writing Nagios plugins -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-natsort/Makefile =================================================================== --- head/devel/py-natsort/Makefile +++ head/devel/py-natsort/Makefile @@ -12,13 +12,13 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fastnumbers>0:devel/py-fastnumbers \ - ${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}hypothesis>=3.8.0:devel/py-hypothesis \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pathlib>0:devel/py-pathlib \ - ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fastnumbers>0:devel/py-fastnumbers@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hypothesis>=3.8.0:devel/py-hypothesis@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pathlib>0:devel/py-pathlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-nbconvert/Makefile =================================================================== --- head/devel/py-nbconvert/Makefile +++ head/devel/py-nbconvert/Makefile @@ -12,17 +12,17 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}bleach>=0:www/py-bleach \ - ${PYTHON_PKGNAMEPREFIX}entrypoints>=0.2.2:devel/py-entrypoints \ - ${PYTHON_PKGNAMEPREFIX}jupyter_client>=4.2:devel/py-jupyter_client \ - ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core \ - ${PYTHON_PKGNAMEPREFIX}mistune>=0:textproc/py-mistune \ - ${PYTHON_PKGNAMEPREFIX}nbformat>=0:devel/py-nbformat \ - ${PYTHON_PKGNAMEPREFIX}pandocfilters>=1.4.1:textproc/py-pandocfilters \ - ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath \ - ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bleach>=0:www/py-bleach@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}entrypoints>=0.2.2:devel/py-entrypoints@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_client>=4.2:devel/py-jupyter_client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mistune>=0:textproc/py-mistune@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nbformat>=0:devel/py-nbformat@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pandocfilters>=1.4.1:textproc/py-pandocfilters@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-nbformat/Makefile =================================================================== --- head/devel/py-nbformat/Makefile +++ head/devel/py-nbformat/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.4:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}traitlets>=4.1:devel/py-traitlets -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.4:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitlets>=4.1:devel/py-traitlets@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-ncurses/Makefile =================================================================== --- head/devel/py-ncurses/Makefile +++ head/devel/py-ncurses/Makefile @@ -15,7 +15,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYRIGHT -USES= ncurses python +USES= ncurses python:2.7 USE_PYTHON= distutils autoplist post-patch: Index: head/devel/py-nose-cov/Makefile =================================================================== --- head/devel/py-nose-cov/Makefile +++ head/devel/py-nose-cov/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-nose/Makefile =================================================================== --- head/devel/py-nose/Makefile +++ head/devel/py-nose/Makefile @@ -13,7 +13,7 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/lgpl.txt -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include Index: head/devel/py-nose2/Makefile =================================================================== --- head/devel/py-nose2/Makefile +++ head/devel/py-nose2/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/license.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cov-core>=1.12:devel/py-cov-core \ - ${PYTHON_PKGNAMEPREFIX}six>=1.7:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cov-core>=1.12:devel/py-cov-core@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.7:devel/py-six@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils Index: head/devel/py-noseofyeti/Makefile =================================================================== --- head/devel/py-noseofyeti/Makefile +++ head/devel/py-noseofyeti/Makefile @@ -8,21 +8,21 @@ MAINTAINER= truckman@FreeBSD.org COMMENT= Nose plugin providing BDD dsl for Python -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge \ - ${PYTHON_PKGNAMEPREFIX}should_dsl>0:devel/py-should_dsl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}should_dsl>0:devel/py-should_dsl@${FLAVOR} OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \ - ${PYTHON_PKGNAMEPREFIX}pinocchio>0:devel/py-pinocchio \ - ${PYTHON_PKGNAMEPREFIX}should_dsl>0:devel/py-should_dsl + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pinocchio>0:devel/py-pinocchio@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}should_dsl>0:devel/py-should_dsl@${FLAVOR} NO_ARCH= yes -USES= python shebangfix +USES= python:2.7 shebangfix USE_GITHUB= yes GH_ACCOUNT= delfick GH_PROJECT= nose-of-yeti Index: head/devel/py-notifier/Makefile =================================================================== --- head/devel/py-notifier/Makefile +++ head/devel/py-notifier/Makefile @@ -14,7 +14,7 @@ LICENSE= LGPL20 -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= examples/*.py USE_PYTHON= distutils PYDISTUTILS_PKGNAME= pynotifier Index: head/devel/py-notify/Makefile =================================================================== --- head/devel/py-notify/Makefile +++ head/devel/py-notify/Makefile @@ -17,6 +17,7 @@ USES= gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2 USE_GNOME= pygtk2 +USE_PYTHON= flavors INSTALL_TARGET= install-strip GNU_CONFIGURE= yes Index: head/devel/py-numba/Makefile =================================================================== --- head/devel/py-numba/Makefile +++ head/devel/py-numba/Makefile @@ -14,8 +14,8 @@ LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>1.7,1:math/py-numpy -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}llvmlite>=0.12:devel/py-llvmlite +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>1.7,1:math/py-numpy@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}llvmlite>=0.12:devel/py-llvmlite@${FLAVOR} # Uses Python 2.7, 3.4+ USES= python fortran @@ -25,9 +25,9 @@ # Requried for Python 2.7 .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch \ - ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs@${FLAVOR} .endif .include Index: head/devel/py-omnijson/Makefile =================================================================== --- head/devel/py-omnijson/Makefile +++ head/devel/py-omnijson/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= kennethreitz Index: head/devel/py-openstacksdk/Makefile =================================================================== --- head/devel/py-openstacksdk/Makefile +++ head/devel/py-openstacksdk/Makefile @@ -12,11 +12,11 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.14.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}os-client-config>=1.22.0:devel/py-os-client-config +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.14.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}os-client-config>=1.22.0:devel/py-os-client-config@${FLAVOR} USES= python USE_PYTHON= distutils autoplist noegginfo Index: head/devel/py-option_merge/Makefile =================================================================== --- head/devel/py-option_merge/Makefile +++ head/devel/py-option_merge/Makefile @@ -8,14 +8,14 @@ MAINTAINER= truckman@FreeBSD.org COMMENT= Code to deeply merge multiple python dictionaries -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}delfick_error>=1.6:devel/py-delfick_error \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:devel/py-noseofyeti \ - ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}delfick_error>=1.6:devel/py-delfick_error@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:devel/py-noseofyeti@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_GITHUB= yes GH_ACCOUNT= delfick GH_TAGNAME= 2940589 Index: head/devel/py-orbit/Makefile =================================================================== --- head/devel/py-orbit/Makefile +++ head/devel/py-orbit/Makefile @@ -16,8 +16,9 @@ CONFLICTS= py*-omniorb-[0-9]* -USES= gmake libtool pathfix pkgconfig python tar:bzip2 +USES= gmake libtool pathfix pkgconfig python:2.7 tar:bzip2 USE_GNOME= orbit2 +USE_PYTHON= flavors GNU_CONFIGURE= yes INSTALL_TARGET= install-strip Index: head/devel/py-ordered-set/Makefile =================================================================== --- head/devel/py-ordered-set/Makefile +++ head/devel/py-ordered-set/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-os-brick/Makefile =================================================================== --- head/devel/py-os-brick/Makefile +++ head/devel/py-os-brick/Makefile @@ -12,21 +12,21 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}os-win>=1.3.0:devel/py-os-win \ - ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service \ - ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}os-win>=1.3.0:devel/py-os-win@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} NO_ARCH= yes Index: head/devel/py-os-client-config/Makefile =================================================================== --- head/devel/py-os-client-config/Makefile +++ head/devel/py-os-client-config/Makefile @@ -12,11 +12,11 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.1.0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.1.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}requestsexceptions>=1.1.1:devel/py-requestsexceptions +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.1.0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.1.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requestsexceptions>=1.1.1:devel/py-requestsexceptions@${FLAVOR} USES= python USE_PYTHON= distutils autoplist noegginfo Index: head/devel/py-os-vif/Makefile =================================================================== --- head/devel/py-os-vif/Makefile +++ head/devel/py-os-vif/Makefile @@ -13,16 +13,16 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects \ - ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${FLAVOR} NO_ARCH= yes Index: head/devel/py-os-win/Makefile =================================================================== --- head/devel/py-os-win/Makefile +++ head/devel/py-os-win/Makefile @@ -12,14 +12,14 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} NO_ARCH= yes Index: head/devel/py-osc-lib/Makefile =================================================================== --- head/devel/py-osc-lib/Makefile +++ head/devel/py-osc-lib/Makefile @@ -12,16 +12,16 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}os-client-config>=1.22.0:devel/py-os-client-config \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}os-client-config>=1.22.0:devel/py-os-client-config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-oslo.cache/Makefile =================================================================== --- head/devel/py-oslo.cache/Makefile +++ head/devel/py-oslo.cache/Makefile @@ -12,13 +12,13 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.2:devel/py-dogpile.cache +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.2:devel/py-dogpile.cache@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.concurrency/Makefile =================================================================== --- head/devel/py-oslo.concurrency/Makefile +++ head/devel/py-oslo.concurrency/Makefile @@ -12,15 +12,15 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PY_ENUM34} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.config/Makefile =================================================================== --- head/devel/py-oslo.config/Makefile +++ head/devel/py-oslo.config/Makefile @@ -12,13 +12,13 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}rfc3986>=0.3.1:www/py-rfc3986 \ - ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rfc3986>=0.3.1:www/py-rfc3986@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.context/Makefile =================================================================== --- head/devel/py-oslo.context/Makefile +++ head/devel/py-oslo.context/Makefile @@ -12,9 +12,9 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}positional>=1.1.1:devel/py-positional \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}positional>=1.1.1:devel/py-positional@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.db/Makefile =================================================================== --- head/devel/py-oslo.db/Makefile +++ head/devel/py-oslo.db/Makefile @@ -12,17 +12,17 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}alembic>=0.8.4:databases/py-alembic \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}alembic>=0.8.4:databases/py-alembic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.i18n/Makefile =================================================================== --- head/devel/py-oslo.i18n/Makefile +++ head/devel/py-oslo.i18n/Makefile @@ -11,9 +11,9 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +BUILD_DEPENDS= ${PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.log/Makefile =================================================================== --- head/devel/py-oslo.log/Makefile +++ head/devel/py-oslo.log/Makefile @@ -12,16 +12,16 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.2:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.2:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.messaging/Makefile =================================================================== --- head/devel/py-oslo.messaging/Makefile +++ head/devel/py-oslo.messaging/Makefile @@ -12,32 +12,32 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>=3.0:devel/py-futures \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \ - ${PYTHON_PKGNAMEPREFIX}pika-pool>=0.1.3:devel/py-pika-pool \ - ${PYTHON_PKGNAMEPREFIX}pika>=0.10.0:devel/py-pika \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic \ - ${PYTHON_PKGNAMEPREFIX}kombu>=3.0.25:net/py-kombu \ - ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet \ - ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}cachetools>=1.1.0:devel/py-cachetools \ - ${PYTHON_PKGNAMEPREFIX}amqp>=0:net/py-amqp \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PY_FUTURES} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pika-pool>=0.1.3:devel/py-pika-pool@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pika>=0.10.0:devel/py-pika@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}kombu>=3.0.25:net/py-kombu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cachetools>=1.1.0:devel/py-cachetools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}amqp>=0:net/py-amqp@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.middleware/Makefile =================================================================== --- head/devel/py-oslo.middleware/Makefile +++ head/devel/py-oslo.middleware/Makefile @@ -12,17 +12,17 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.0:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}statsd>=3.2.1:devel/py-statsd +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.0:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}statsd>=3.2.1:devel/py-statsd@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.policy/Makefile =================================================================== --- head/devel/py-oslo.policy/Makefile +++ head/devel/py-oslo.policy/Makefile @@ -12,14 +12,14 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.privsep/Makefile =================================================================== --- head/devel/py-oslo.privsep/Makefile +++ head/devel/py-oslo.privsep/Makefile @@ -12,16 +12,16 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PY_ENUM34} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.reports/Makefile =================================================================== --- head/devel/py-oslo.reports/Makefile +++ head/devel/py-oslo.reports/Makefile @@ -12,13 +12,13 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}psutil121>=0:sysutils/py-psutil121 \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil121>=0:sysutils/py-psutil121@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.rootwrap/Makefile =================================================================== --- head/devel/py-oslo.rootwrap/Makefile +++ head/devel/py-oslo.rootwrap/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.serialization/Makefile =================================================================== --- head/devel/py-oslo.serialization/Makefile +++ head/devel/py-oslo.serialization/Makefile @@ -12,11 +12,11 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.service/Makefile =================================================================== --- head/devel/py-oslo.service/Makefile +++ head/devel/py-oslo.service/Makefile @@ -12,20 +12,20 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic \ - ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \ - ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.utils/Makefile =================================================================== --- head/devel/py-oslo.utils/Makefile +++ head/devel/py-oslo.utils/Makefile @@ -11,17 +11,17 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs \ - ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.3:devel/py-monotonic \ - ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}monotonic>=0.3:devel/py-monotonic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.versionedobjects/Makefile =================================================================== --- head/devel/py-oslo.versionedobjects/Makefile +++ head/devel/py-oslo.versionedobjects/Makefile @@ -12,19 +12,19 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.14.0:devel/py-oslo.messaging \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.18.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.14.0:devel/py-oslo.messaging@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.18.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} NO_ARCH= yes Index: head/devel/py-oslo.vmware/Makefile =================================================================== --- head/devel/py-oslo.vmware/Makefile +++ head/devel/py-oslo.vmware/Makefile @@ -12,19 +12,19 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.15.1:net/py-urllib3 \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}suds-jurko>=0.6:net/py-suds-jurko +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.15.1:net/py-urllib3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}suds-jurko>=0.6:net/py-suds-jurko@${FLAVOR} NO_ARCH= yes Index: head/devel/py-osprofiler/Makefile =================================================================== --- head/devel/py-osprofiler/Makefile +++ head/devel/py-osprofiler/Makefile @@ -10,15 +10,15 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= OpenStack Profiler Library -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging \ - ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.13:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.13:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${FLAVOR} NO_ARCH= yes Index: head/devel/py-palm/Makefile =================================================================== --- head/devel/py-palm/Makefile +++ head/devel/py-palm/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD2CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simpleparse>0:devel/py-simpleparse +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simpleparse>0:devel/py-simpleparse@${FLAVOR} USES= python:2 USE_PYTHON= autoplist distutils Index: head/devel/py-pathlib/Makefile =================================================================== --- head/devel/py-pathlib/Makefile +++ head/devel/py-pathlib/Makefile @@ -17,7 +17,7 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${FLAVOR} .include Index: head/devel/py-pathlib2/Makefile =================================================================== --- head/devel/py-pathlib2/Makefile +++ head/devel/py-pathlib2/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.rst -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils autoplist @@ -22,7 +22,7 @@ .include .if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}scandir>=0:sysutils/py-scandir +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}scandir>=0:sysutils/py-scandir@${FLAVOR} .endif do-test: Index: head/devel/py-pathtools/Makefile =================================================================== --- head/devel/py-pathtools/Makefile +++ head/devel/py-pathtools/Makefile @@ -20,11 +20,11 @@ .include .if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx +BUILD_DEPENDS+= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} post-build: - @(cd ${WRKSRC}/docs ; ${MAKE} html) + @(cd ${WRKSRC}/docs ; ${MAKE} SPHINXBUILD=sphinx-build-${PYTHON_VER} html) post-install: @(cd ${WRKSRC}/docs/build/html ; ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ Index: head/devel/py-pbr/Makefile =================================================================== --- head/devel/py-pbr/Makefile +++ head/devel/py-pbr/Makefile @@ -13,11 +13,11 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR} NO_ARCH= yes -USES?= python shebangfix +USES= python shebangfix USE_PYTHON= autoplist concurrent distutils SHEBANG_FILES= pbr/tests/testpackage/setup.py Index: head/devel/py-pefile/Makefile =================================================================== --- head/devel/py-pefile/Makefile +++ head/devel/py-pefile/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-pex/Makefile =================================================================== --- head/devel/py-pex/Makefile +++ head/devel/py-pex/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>=0.24.0:devel/py-wheel +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>=0.24.0:devel/py-wheel@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-phabricator/Makefile =================================================================== --- head/devel/py-phabricator/Makefile +++ head/devel/py-phabricator/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-pid/Makefile =================================================================== --- head/devel/py-pid/Makefile +++ head/devel/py-pid/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} NO_ARCH= yes Index: head/devel/py-pika-pool/Makefile =================================================================== --- head/devel/py-pika-pool/Makefile +++ head/devel/py-pika-pool/Makefile @@ -10,7 +10,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Pika connection pooling -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pika>=0.9.0:devel/py-pika +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pika>=0.9.0:devel/py-pika@${FLAVOR} NO_ARCH= yes Index: head/devel/py-pinocchio/Makefile =================================================================== --- head/devel/py-pinocchio/Makefile +++ head/devel/py-pinocchio/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-pip/Makefile =================================================================== --- head/devel/py-pip/Makefile +++ head/devel/py-pip/Makefile @@ -13,27 +13,27 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt # Tests also need bzr, git, otherwise they fail -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog \ - ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist \ - ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.10:devel/py-virtualenv \ - ${PYTHON_PKGNAMEPREFIX}scripttest>=1.3:devel/py-scripttest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend \ - ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.10:devel/py-virtualenv@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scripttest>=1.3:devel/py-scripttest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${FLAVOR} \ git>0:devel/git \ bzr>0:devel/bzr OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS?= sphinx-build:textproc/py-sphinx +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} DOCS_PORTDOCS= * DOCS_VARS= PYDISTUTILS_BUILD_TARGET=build_sphinx \ PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env" NO_ARCH= yes -USES?= python shebangfix +USES= python shebangfix USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-plan/Makefile =================================================================== --- head/devel/py-plan/Makefile +++ head/devel/py-plan/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=2.1:devel/py-click +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=2.1:devel/py-click@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-pluggy/Makefile =================================================================== --- head/devel/py-pluggy/Makefile +++ head/devel/py-pluggy/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-ply/Makefile =================================================================== --- head/devel/py-ply/Makefile +++ head/devel/py-ply/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE -USES?= python +USES= python USES+= shebangfix USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: head/devel/py-positional/Makefile =================================================================== --- head/devel/py-positional/Makefile +++ head/devel/py-positional/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} NO_ARCH= yes Index: head/devel/py-pqueue/Makefile =================================================================== --- head/devel/py-pqueue/Makefile +++ head/devel/py-pqueue/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/PQueue Index: head/devel/py-pretend/Makefile =================================================================== --- head/devel/py-pretend/Makefile +++ head/devel/py-pretend/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils USE_GITHUB= yes Index: head/devel/py-prioritized_methods/Makefile =================================================================== --- head/devel/py-prioritized_methods/Makefile +++ head/devel/py-prioritized_methods/Makefile @@ -11,10 +11,10 @@ MAINTAINER= wenheping@gmail.com COMMENT= Extension to PEAK-Rules to prioritize methods -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0.5:devel/py-PEAK-Rules +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0.5:devel/py-PEAK-Rules@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-prompt_toolkit/Makefile =================================================================== --- head/devel/py-prompt_toolkit/Makefile +++ head/devel/py-prompt_toolkit/Makefile @@ -13,13 +13,13 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils -USES?= python +USES= python -SLAVEDIRS= devel/py3-prompt_toolkit +SLAVEDIRS= devel/py-prompt_toolkit .include Index: head/devel/py-protobuf/Makefile =================================================================== --- head/devel/py-protobuf/Makefile +++ head/devel/py-protobuf/Makefile @@ -13,15 +13,15 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/../LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR} \ protoc:devel/protobuf -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR} DO_MAKE_TEST= ${PYTHON_CMD} ${PYDISTUTILS_SETUP} NO_ARCH= yes TEST_TARGET= test USE_PYTHON= autoplist distutils -USES?= python +USES= python WRKSRC_SUBDIR= python GH_ACCOUNT= google Index: head/devel/py-protocols-devel/Makefile =================================================================== --- head/devel/py-protocols-devel/Makefile +++ head/devel/py-protocols-devel/Makefile @@ -12,9 +12,9 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Protocol Definition, Declaration, and Adaptation for Python -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist BROKEN= checksum mismatch Index: head/devel/py-protocols/Makefile =================================================================== --- head/devel/py-protocols/Makefile +++ head/devel/py-protocols/Makefile @@ -12,7 +12,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= Python module extending the PEP 246 adapt() function -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-patch: Index: head/devel/py-ptrace/Makefile =================================================================== --- head/devel/py-ptrace/Makefile +++ head/devel/py-ptrace/Makefile @@ -14,9 +14,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}distorm>0:devel/py-distorm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}distorm>0:devel/py-distorm@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} Index: head/devel/py-pudb/Makefile =================================================================== --- head/devel/py-pudb/Makefile +++ head/devel/py-pudb/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}urwid>=1.1.1:devel/py-urwid +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urwid>=1.1.1:devel/py-urwid@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-py/Makefile =================================================================== --- head/devel/py-py/Makefile +++ head/devel/py-py/Makefile @@ -13,10 +13,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} NO_ARCH= yes -USES+= python +USES= python USE_PYTHON= autoplist distutils do-test: Index: head/devel/py-pyasn1-modules/Makefile =================================================================== --- head/devel/py-pyasn1-modules/Makefile +++ head/devel/py-pyasn1-modules/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:devel/py-pyasn1 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:devel/py-pyasn1@${FLAVOR} OPTIONS_DEFINE= DOCS Index: head/devel/py-pyasn1/Makefile =================================================================== --- head/devel/py-pyasn1/Makefile +++ head/devel/py-pyasn1/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist distutils do-test: Index: head/devel/py-pycadf/Makefile =================================================================== --- head/devel/py-pycadf/Makefile +++ head/devel/py-pycadf/Makefile @@ -10,12 +10,12 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= CADF Library -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} NO_ARCH= yes Index: head/devel/py-pycallgraph/Makefile =================================================================== --- head/devel/py-pycallgraph/Makefile +++ head/devel/py-pycallgraph/Makefile @@ -17,10 +17,10 @@ RUN_DEPENDS+= dot:graphics/graphviz USES= python shebangfix -USE_PYTHON= distutils +USE_PYTHON= distutils autoplist concurrent SHEBANG_FILES= examples/*.py -EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/${PYTHON_PKGNAMEPREFIX}${PORTNAME} OPTIONS_DEFINE= EXAMPLES Index: head/devel/py-pycallgraph/pkg-plist =================================================================== --- head/devel/py-pycallgraph/pkg-plist +++ head/devel/py-pycallgraph/pkg-plist @@ -1,8 +1,4 @@ -bin/pycallgraph man/man1/pycallgraph.1.gz -%%PYTHON_SITELIBDIR%%/pycallgraph.py -%%PYTHON_SITELIBDIR%%/pycallgraph.pyc -%%PYTHON_SITELIBDIR%%/pycallgraph.pyo %%PORTEXAMPLES%%%%EXAMPLESDIR%%/all.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colours.py Index: head/devel/py-pycmd/Makefile =================================================================== --- head/devel/py-pycmd/Makefile +++ head/devel/py-pycmd/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.4.9:devel/py-py -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.4.9:devel/py-py@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-pycodestyle/Makefile =================================================================== --- head/devel/py-pycodestyle/Makefile +++ head/devel/py-pycodestyle/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT # mentioned as "Expat" -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: head/devel/py-pycparser/Makefile =================================================================== --- head/devel/py-pycparser/Makefile +++ head/devel/py-pycparser/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist distutils .include Index: head/devel/py-pydenticon/Makefile =================================================================== --- head/devel/py-pydenticon/Makefile +++ head/devel/py-pydenticon/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-pydocstyle/Makefile =================================================================== --- head/devel/py-pydocstyle/Makefile +++ head/devel/py-pydocstyle/Makefile @@ -14,10 +14,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE-MIT -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py-snowballstemmer \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py-snowballstemmer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} -USES?= python zip +USES= python zip USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: head/devel/py-pydrive/Makefile =================================================================== --- head/devel/py-pydrive/Makefile +++ head/devel/py-pydrive/Makefile @@ -13,8 +13,8 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.5.2:www/py-google-api-python-client \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.5.2:www/py-google-api-python-client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-pyechonest/Makefile =================================================================== --- head/devel/py-pyechonest/Makefile +++ head/devel/py-pyechonest/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -USES= python +USES= python:2.7 USE_PYTHON= distutils .include Index: head/devel/py-pyface/Makefile =================================================================== --- head/devel/py-pyface/Makefile +++ head/devel/py-pyface/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE_LGPL3= ${WRKSRC}/image_LICENSE_OOo.txt #See file ${WRKSRC}/image_LICENSE.txt for files with non BSD3CLAUSE licenses -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: head/devel/py-pyflakes/Makefile =================================================================== --- head/devel/py-pyflakes/Makefile +++ head/devel/py-pyflakes/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: head/devel/py-pygdbmi/Makefile =================================================================== --- head/devel/py-pygdbmi/Makefile +++ head/devel/py-pygdbmi/Makefile @@ -14,7 +14,7 @@ USE_GITHUB= yes GH_ACCOUNT= cs01 -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-pygit2/Makefile =================================================================== --- head/devel/py-pygit2/Makefile +++ head/devel/py-pygit2/Makefile @@ -13,12 +13,12 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR} LIB_DEPENDS= libgit2.so:devel/libgit2 -RUN_DEPENDS?= ${BUILD_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${BUILD_DEPENDS} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils MAKE_ENV= LIBGIT2=${LOCALBASE} PYDISTUTILS_TEST_TARGET?= test Index: head/devel/py-pyicu/Makefile =================================================================== --- head/devel/py-pyicu/Makefile +++ head/devel/py-pyicu/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libicudata.so:devel/icu -USES?= python +USES= python USE_CXXSTD= c++11 USE_PYTHON= distutils autoplist Index: head/devel/py-pyinotify/Makefile =================================================================== --- head/devel/py-pyinotify/Makefile +++ head/devel/py-pyinotify/Makefile @@ -14,6 +14,6 @@ LIB_DEPENDS= libinotify.so:devel/libinotify USES= python -USE_PYTHON= distutils +USE_PYTHON= distutils py3kplist .include Index: head/devel/py-pyinstaller/Makefile =================================================================== --- head/devel/py-pyinstaller/Makefile +++ head/devel/py-pyinstaller/Makefile @@ -22,7 +22,7 @@ OPTIONS_DEFINE= DOCS EXTRACT_AFTER_ARGS= --exclude doc/source --no-same-owner --no-same-permissions -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME} Index: head/devel/py-pykde4/Makefile =================================================================== --- head/devel/py-pykde4/Makefile +++ head/devel/py-pykde4/Makefile @@ -17,6 +17,7 @@ USE_PYQT= declarative designer gui network opengl phonon script sip \ sql svg webkit xml \ dbussupport_run +USE_PYTHON= flavors USE_QT4= corelib dbus designer_build gui network xml \ qmake_build moc_build uic_build rcc_build Index: head/devel/py-pyke/Makefile =================================================================== --- head/devel/py-pyke/Makefile +++ head/devel/py-pyke/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=2.3:devel/py-ply +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=2.3:devel/py-ply@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils OPTIONS_DEFINE= DOCS Index: head/devel/py-pylru-cache/Makefile =================================================================== --- head/devel/py-pylru-cache/Makefile +++ head/devel/py-pylru-cache/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE GPLv3 LICENSE_COMB= dual -USES?= python +USES= python USE_PYTHON= distutils autoplist .include Index: head/devel/py-pymarc/Makefile =================================================================== --- head/devel/py-pymarc/Makefile +++ head/devel/py-pymarc/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-pyopencl/Makefile =================================================================== --- head/devel/py-pyopencl/Makefile +++ head/devel/py-pyopencl/Makefile @@ -14,18 +14,18 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/CL/cl.h:devel/opencl \ - ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi \ - ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy + ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${FLAVOR} LIB_DEPENDS= libboost_python.so:devel/boost-python-libs \ libOpenCL.so:devel/ocl-icd -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs \ - ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi \ - ${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}mako>=0.3.6:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}pytest>=2:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytools>=2017.2:devel/py-pytools \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mako>=0.3.6:textproc/py-mako@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=2:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytools>=2017.2:devel/py-pytools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} CONFIGURE_ARGS= BOOST_INC_DIR="${LOCALBASE}/include" \ BOOST_LIB_DIR="${LOCALBASE}/lib" \ Index: head/devel/py-pyqi/Makefile =================================================================== --- head/devel/py-pyqi/Makefile +++ head/devel/py-pyqi/Makefile @@ -14,6 +14,6 @@ NO_ARCH= yes USE_PYTHON= autoplist distutils -USES= pgsql python +USES= pgsql python:2.7 .include Index: head/devel/py-pyral/Makefile =================================================================== --- head/devel/py-pyral/Makefile +++ head/devel/py-pyral/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.12.5:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.12.5:www/py-requests@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-pyrfc3339/Makefile =================================================================== --- head/devel/py-pyrfc3339/Makefile +++ head/devel/py-pyrfc3339/Makefile @@ -14,8 +14,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-pyro/Makefile =================================================================== --- head/devel/py-pyro/Makefile +++ head/devel/py-pyro/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}serpent>=1.23:devel/py-serpent +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}serpent>=1.23:devel/py-serpent@${FLAVOR} NO_ARCH= yes USES= dos2unix python:2.7+ @@ -26,7 +26,7 @@ .include .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}selectors34>0:devel/py-selectors34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}selectors34>0:devel/py-selectors34@${FLAVOR} .endif post-install: Index: head/devel/py-pystorm/Makefile =================================================================== --- head/devel/py-pystorm/Makefile +++ head/devel/py-pystorm/Makefile @@ -13,12 +13,12 @@ LICENSE= APACHE20 -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python@${FLAVOR} NO_ARCH= yes Index: head/devel/py-pyte/Makefile =================================================================== --- head/devel/py-pyte/Makefile +++ head/devel/py-pyte/Makefile @@ -11,8 +11,8 @@ LICENSE= LGPL3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-pytest-asyncio/Makefile =================================================================== --- head/devel/py-pytest-asyncio/Makefile +++ head/devel/py-pytest-asyncio/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.6:devel/py3-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.6:devel/py-pytest@${FLAVOR} NO_ARCH= yes USES= python:3.5+ Index: head/devel/py-pytest-cache/Makefile =================================================================== --- head/devel/py-pytest-cache/Makefile +++ head/devel/py-pytest-cache/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.2:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}execnet>=1.2:sysutils/py-execnet -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.2:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}execnet>=1.2:sysutils/py-execnet@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-pytest-capturelog/Makefile =================================================================== --- head/devel/py-pytest-capturelog/Makefile +++ head/devel/py-pytest-capturelog/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}py>=1.1.1:devel/py-py +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.1.1:devel/py-py@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils .include Index: head/devel/py-pytest-cov/Makefile =================================================================== --- head/devel/py-pytest-cov/Makefile +++ head/devel/py-pytest-cov/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=3.7.1:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=3.7.1:devel/py-coverage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.0:devel/py-pytest@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-pytest-django/Makefile =================================================================== --- head/devel/py-pytest-django/Makefile +++ head/devel/py-pytest-django/Makefile @@ -10,14 +10,14 @@ MAINTAINER= tj@FreeBSD.org COMMENT= Django plugin for py.test -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}django-configurations>=0:www/py-django-configurations \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist \ - ${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox \ - ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel \ - ${PYTHON_PKGNAMEPREFIX}twine>=0:devel/py-twine \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm \ - ${PYTHON_PKGNAMEPREFIX}south>=0:databases/py-south +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-configurations>=0:www/py-django-configurations@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twine>=0:devel/py-twine@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}south>=0:databases/py-south@${FLAVOR} BUILD_DEPENDS= ${RUN_DEPENDS} USES= python Index: head/devel/py-pytest-localserver/Makefile =================================================================== --- head/devel/py-pytest-localserver/Makefile +++ head/devel/py-pytest-localserver/Makefile @@ -13,10 +13,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.10:www/py-werkzeug -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.10:www/py-werkzeug@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-pytest-mock/Makefile =================================================================== --- head/devel/py-pytest-mock/Makefile +++ head/devel/py-pytest-mock/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py${SLAVE_SUFFIX}-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} NO_ARCH= yes USES+= python Index: head/devel/py-pytest-runner/Makefile =================================================================== --- head/devel/py-pytest-runner/Makefile +++ head/devel/py-pytest-runner/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-pytest-timeout/Makefile =================================================================== --- head/devel/py-pytest-timeout/Makefile +++ head/devel/py-pytest-timeout/Makefile @@ -13,12 +13,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${FLAVOR} NO_ARCH= yes -USES?= python:2.7+ +USES= python:2.7+ USE_PYTHON= autoplist distutils TEST_ENV+= PYTHONPATH=${TEST_WRKSRC} Index: head/devel/py-pytest-tornado/Makefile =================================================================== --- head/devel/py-pytest-tornado/Makefile +++ head/devel/py-pytest-tornado/Makefile @@ -11,8 +11,8 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-pytest-xdist/Makefile =================================================================== --- head/devel/py-pytest-xdist/Makefile +++ head/devel/py-pytest-xdist/Makefile @@ -13,14 +13,14 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py-execnet \ - ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}py>=1.4.22:devel/py-py -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py-execnet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}py>=1.4.22:devel/py-py@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: head/devel/py-pytest/Makefile =================================================================== --- head/devel/py-pytest/Makefile +++ head/devel/py-pytest/Makefile @@ -12,17 +12,17 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py${SLAVE_SUFFIX}-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.4.33:devel/py${SLAVE_SUFFIX}-py -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:devel/py-pytest-xdist \ - ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.4.33:devel/py-py@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:devel/py-pytest-xdist@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted@${FLAVOR} NO_ARCH= yes -USES+= python +USES= python USE_PYTHON= autoplist concurrent distutils do-test: Index: head/devel/py-python-bugzilla/Makefile =================================================================== --- head/devel/py-python-bugzilla/Makefile +++ head/devel/py-python-bugzilla/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-python-dtrace/Makefile =================================================================== --- head/devel/py-python-dtrace/Makefile +++ head/devel/py-python-dtrace/Makefile @@ -11,10 +11,7 @@ LICENSE= MIT -BUILD_DEPENDS= cython:lang/cython -RUN_DEPENDS= cython:lang/cython - USES= python zip -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython cython_run .include Index: head/devel/py-python-gist/Makefile =================================================================== --- head/devel/py-python-gist/Makefile +++ head/devel/py-python-gist/Makefile @@ -12,12 +12,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt \ - ${PYTHON_PKGNAMEPREFIX}python-gnupg>0:security/py-python-gnupg \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-gnupg>0:security/py-python-gnupg@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${FLAVOR} USES= python USE_GITHUB= yes Index: head/devel/py-python-jenkins/Makefile =================================================================== --- head/devel/py-python-jenkins/Makefile +++ head/devel/py-python-jenkins/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:devel/py-pbr \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}multi_key_dict>0:devel/py-multi_key_dict +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:devel/py-pbr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}multi_key_dict>0:devel/py-multi_key_dict@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-python-magic/Makefile =================================================================== --- head/devel/py-python-magic/Makefile +++ head/devel/py-python-magic/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= python +USES= python USE_GITHUB= yes USE_PYTHON= autoplist distutils Index: head/devel/py-pytools/Makefile =================================================================== --- head/devel/py-pytools/Makefile +++ head/devel/py-pytools/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs \ - ${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}numpy>=1.6.0,1:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.6.0,1:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-pytz/Makefile =================================================================== --- head/devel/py-pytz/Makefile +++ head/devel/py-pytz/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -USES?= python zip +USES= python zip USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-pyutil/Makefile =================================================================== --- head/devel/py-pyutil/Makefile +++ head/devel/py-pyutil/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.1:devel/py-simplejson \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.1:devel/py-simplejson@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zbase32>=1.1.0:converters/zbase32 USES= python:2 Index: head/devel/py-pyvalid/Makefile =================================================================== --- head/devel/py-pyvalid/Makefile +++ head/devel/py-pyvalid/Makefile @@ -11,9 +11,9 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-pyvisa-py/Makefile =================================================================== --- head/devel/py-pyvisa-py/Makefile +++ head/devel/py-pyvisa-py/Makefile @@ -23,9 +23,9 @@ OPTIONS_GROUP_DRIVERS= SERIAL USB SERIAL_DESC= Access to devices via RS-232 -SERIAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial +SERIAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${FLAVOR} USB_DESC= Access to devices via USB -USB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb +USB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb@${FLAVOR} .include Index: head/devel/py-pyvisa/Makefile =================================================================== --- head/devel/py-pyvisa/Makefile +++ head/devel/py-pyvisa/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyvisa-py>0:devel/py-pyvisa-py +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyvisa-py>0:devel/py-pyvisa-py@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= hgrecco @@ -23,7 +23,7 @@ .include .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} .endif .include Index: head/devel/py-pyxb/Makefile =================================================================== --- head/devel/py-pyxb/Makefile +++ head/devel/py-pyxb/Makefile @@ -14,7 +14,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2 +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-pyxml2obj/Makefile =================================================================== --- head/devel/py-pyxml2obj/Makefile +++ head/devel/py-pyxml2obj/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-qpid/Makefile =================================================================== --- head/devel/py-qpid/Makefile +++ head/devel/py-qpid/Makefile @@ -14,7 +14,7 @@ LICENSE= APACHE20 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-qserve/Makefile =================================================================== --- head/devel/py-qserve/Makefile +++ head/devel/py-qserve/Makefile @@ -11,7 +11,7 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Job queue server -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-qt4-assistant/Makefile =================================================================== --- head/devel/py-qt4-assistant/Makefile +++ head/devel/py-qt4-assistant/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run +USE_PYTHON= flavors USE_QT4= assistantclient corelib gui network \ moc_build qmake_build Index: head/devel/py-qt4-core/Makefile =================================================================== --- head/devel/py-qt4-core/Makefile +++ head/devel/py-qt4-core/Makefile @@ -13,7 +13,7 @@ PYQT_DIST= yes USES= python pyqt:4 -USE_PYTHON= py3kplist +USE_PYTHON= py3kplist flavors USE_PYQT= sip USE_QT4= corelib qmake_build moc_build Index: head/devel/py-qt4-dbus/Makefile =================================================================== --- head/devel/py-qt4-dbus/Makefile +++ head/devel/py-qt4-dbus/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run +USE_PYTHON= flavors USE_QT4= corelib dbus moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: head/devel/py-qt4-dbussupport/Makefile =================================================================== --- head/devel/py-qt4-dbussupport/Makefile +++ head/devel/py-qt4-dbussupport/Makefile @@ -7,14 +7,16 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt event loop support for dbus-python -BUILD_DEPENDS= ${PYDBUS} -RUN_DEPENDS= ${PYDBUS} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${FLAVOR} + CONFIGURE_ARGS= --enable QtCore PYQT_DIST= yes USES= pkgconfig python pyqt:4 USE_PYQT= sip_build +USE_PYTHON= flavors USE_QT4= corelib qmake_build moc_build OPTIONS_DEFINE= DEBUG @@ -25,12 +27,4 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/dbus/mainloop/qt.so -.include - -.if ${PYTHON_MAJOR_VER} == 2 -PYDBUS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus -.elif ${PYTHON_MAJOR_VER} == 3 -PYDBUS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py3-dbus -.endif - -.include +.include Index: head/devel/py-qt4-declarative/Makefile =================================================================== --- head/devel/py-qt4-declarative/Makefile +++ head/devel/py-qt4-declarative/Makefile @@ -11,6 +11,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run network_run +USE_PYTHON= flavors USE_QT4= corelib declarative gui network script sql svg xmlpatterns \ qmake_build moc_build Index: head/devel/py-qt4-designer/Makefile =================================================================== --- head/devel/py-qt4-designer/Makefile +++ head/devel/py-qt4-designer/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run +USE_PYTHON= flavors USE_QT4= corelib designer gui moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: head/devel/py-qt4-designerplugin/Makefile =================================================================== --- head/devel/py-qt4-designerplugin/Makefile +++ head/devel/py-qt4-designerplugin/Makefile @@ -17,6 +17,7 @@ USES= python pyqt:4 USE_PYQT= sip_build +USE_PYTHON= flavors USE_QT4= corelib designer gui script xml moc_build qmake_build OPTIONS_DEFINE= DEBUG Index: head/devel/py-qt4-help/Makefile =================================================================== --- head/devel/py-qt4-help/Makefile +++ head/devel/py-qt4-help/Makefile @@ -11,6 +11,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run +USE_PYTHON= flavors USE_QT4= corelib gui help network sql moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: head/devel/py-qt4-qscintilla2/Makefile =================================================================== --- head/devel/py-qt4-qscintilla2/Makefile +++ head/devel/py-qt4-qscintilla2/Makefile @@ -22,6 +22,7 @@ USES= python pyqt:4 USE_PYQT= sip core gui +USE_PYTHON= flavors USE_QT4= corelib gui moc_build qmake_build OPTIONS_DEFINE= DEBUG @@ -29,7 +30,8 @@ QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ARGS= --pyqt PyQt4 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4 -v ${SIPDIR} \ - --apidir ${QSCIDIR} --qmake ${QMAKE} --pyqt-sipdir ${SIPDIR} + --apidir ${QSCIDIR} --qmake ${QMAKE} --pyqt-sipdir ${SIPDIR} \ + --sip ${LOCALBASE}/bin/sip-${PYTHON_VER} WRKSRC= ${WRKDIR}/${DISTNAME}/Python ALL_TARGET= #empty Index: head/devel/py-qt4-script/Makefile =================================================================== --- head/devel/py-qt4-script/Makefile +++ head/devel/py-qt4-script/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run +USE_PYTHON= flavors USE_QT4= corelib script moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: head/devel/py-qt4-scripttools/Makefile =================================================================== --- head/devel/py-qt4-scripttools/Makefile +++ head/devel/py-qt4-scripttools/Makefile @@ -12,6 +12,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run script_run +USE_PYTHON= flavors USE_QT4= corelib gui script scripttools moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: head/devel/py-qt4-test/Makefile =================================================================== --- head/devel/py-qt4-test/Makefile +++ head/devel/py-qt4-test/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run +USE_PYTHON= flavors USE_QT4= corelib gui qtestlib moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: head/devel/py-qt4/Makefile =================================================================== --- head/devel/py-qt4/Makefile +++ head/devel/py-qt4/Makefile @@ -10,6 +10,7 @@ COMMENT= Python bindings for the Qt 4 toolkit (meta port) USES= metaport python pyqt:4 +USE_PYTHON= flavors OPTIONS_DEFINE= assistant core dbus dbussupport declarative \ demo designer designerplugin doc gui help \ Index: head/devel/py-qt5-core/Makefile =================================================================== --- head/devel/py-qt5-core/Makefile +++ head/devel/py-qt5-core/Makefile @@ -10,7 +10,7 @@ PYQT_DIST= yes USES= python pyqt:5 -USE_PYTHON= py3kplist +USE_PYTHON= py3kplist flavors USE_PYQT= sip_build USE_QT5= core qmake_build Index: head/devel/py-qt5-dbus/Makefile =================================================================== --- head/devel/py-qt5-dbus/Makefile +++ head/devel/py-qt5-dbus/Makefile @@ -11,6 +11,7 @@ USES= python pyqt:5 USE_PYQT= sip_build core_run +USE_PYTHON= flavors USE_QT5= core dbus qmake_build OPTIONS_DEFINE= API DEBUG Index: head/devel/py-qt5-dbussupport/Makefile =================================================================== --- head/devel/py-qt5-dbussupport/Makefile +++ head/devel/py-qt5-dbussupport/Makefile @@ -6,14 +6,15 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt event loop support for dbus-python -BUILD_DEPENDS= ${PYDBUS} -RUN_DEPENDS= ${PYDBUS} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${FLAVOR} CONFIGURE_ARGS= --enable QtCore PYQT_DIST= yes USES= pkgconfig python pyqt:5 USE_PYQT= sip_build +USE_PYTHON= flavors USE_QT5= core buildtools_build qmake_build OPTIONS_DEFINE= DEBUG @@ -24,12 +25,4 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/dbus/mainloop/pyqt5.so -.include - -.if ${PYTHON_MAJOR_VER} == 2 -PYDBUS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus -.elif ${PYTHON_MAJOR_VER} == 3 -PYDBUS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py3-dbus -.endif - -.include +.include Index: head/devel/py-qt5-designer/Makefile =================================================================== --- head/devel/py-qt5-designer/Makefile +++ head/devel/py-qt5-designer/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= yes USE_PYQT= sip_build core_run widgets_run +USE_PYTHON= flavors USE_QT5= core gui designer widgets xml \ buildtools_build qmake_build Index: head/devel/py-qt5-designerplugin/Makefile =================================================================== --- head/devel/py-qt5-designerplugin/Makefile +++ head/devel/py-qt5-designerplugin/Makefile @@ -17,6 +17,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build +USE_PYTHON= flavors USE_QT5= core designer gui xml widgets \ buildtools_build qmake_build Index: head/devel/py-qt5-help/Makefile =================================================================== --- head/devel/py-qt5-help/Makefile +++ head/devel/py-qt5-help/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run +USE_PYTHON= flavors USE_QT5= core gui widgets help network sql buildtools_build qmake_build xml OPTIONS_DEFINE= API DEBUG Index: head/devel/py-qt5-qscintilla2/Makefile =================================================================== --- head/devel/py-qt5-qscintilla2/Makefile +++ head/devel/py-qt5-qscintilla2/Makefile @@ -22,6 +22,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip core gui printsupport widgets +USE_PYTHON= flavors USE_QT5= core gui printsupport widgets buildtools_build qmake_build OPTIONS_DEFINE= DEBUG Index: head/devel/py-qt5-test/Makefile =================================================================== --- head/devel/py-qt5-test/Makefile +++ head/devel/py-qt5-test/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run +USE_PYTHON= flavors USE_QT5= core gui testlib widgets \ buildtools_build qmake_build Index: head/devel/py-qt5/Makefile =================================================================== --- head/devel/py-qt5/Makefile +++ head/devel/py-qt5/Makefile @@ -9,6 +9,7 @@ COMMENT= Python bindings for the Qt 5 toolkit (meta port) USES= metaport python pyqt:5 +USE_PYTHON= flavors OPTIONS_DEFINE= core dbus dbussupport demo designer \ designerplugin doc gui multimedia multimediawidgets \ Index: head/devel/py-qtconsole/Makefile =================================================================== --- head/devel/py-qtconsole/Makefile +++ head/devel/py-qtconsole/Makefile @@ -9,11 +9,11 @@ MAINTAINER= swills@FreeBSD.org COMMENT= Qt-based console for Jupyter with support for rich media output -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets \ - ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core \ - ${PYTHON_PKGNAMEPREFIX}jupyter_client>=4.1:devel/py-jupyter_client \ - ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}ipykernel>=4.1:devel/py-ipykernel +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_client>=4.1:devel/py-jupyter_client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipykernel>=4.1:devel/py-ipykernel@${FLAVOR} USES= pyqt:4 python USE_PYQT= core gui svg Index: head/devel/py-ramlfications/Makefile =================================================================== --- head/devel/py-ramlfications/Makefile +++ head/devel/py-ramlfications/Makefile @@ -13,11 +13,11 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=16.0.0:devel/py-attrs \ - ${PYTHON_PKGNAMEPREFIX}jsonref>=0.1:devel/py-jsonref \ - ${PYTHON_PKGNAMEPREFIX}markdown2>=2.3.2:textproc/py-markdown2 \ - ${PYTHON_PKGNAMEPREFIX}xmltodict>=0.10.1:devel/py-xmltodict \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=16.0.0:devel/py-attrs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonref>=0.1:devel/py-jsonref@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown2>=2.3.2:textproc/py-markdown2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xmltodict>=0.10.1:devel/py-xmltodict@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} USES?= python USE_PYTHON= autoplist distutils Index: head/devel/py-rauth/Makefile =================================================================== --- head/devel/py-rauth/Makefile +++ head/devel/py-rauth/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.2.1:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.2.1:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto@${FLAVOR} USES= python USE_GITHUB= yes Index: head/devel/py-raven/Makefile =================================================================== --- head/devel/py-raven/Makefile +++ head/devel/py-raven/Makefile @@ -21,7 +21,7 @@ .include .if ${PYTHON_REL} < 3200 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${FLAVOR} .endif .include Index: head/devel/py-rebulk/Makefile =================================================================== --- head/devel/py-rebulk/Makefile +++ head/devel/py-rebulk/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-rednose/Makefile =================================================================== --- head/devel/py-rednose/Makefile +++ head/devel/py-rednose/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama \ - ${PYTHON_PKGNAMEPREFIX}termstyle>0:devel/py-termstyle +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}termstyle>0:devel/py-termstyle@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-repoze.tm2/Makefile =================================================================== --- head/devel/py-repoze.tm2/Makefile +++ head/devel/py-repoze.tm2/Makefile @@ -11,7 +11,7 @@ MAINTAINER= python@FreeBSD.org COMMENT= Zope-like transaction manager via WSGI middleware -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-repoze.what-pylons/Makefile =================================================================== --- head/devel/py-repoze.what-pylons/Makefile +++ head/devel/py-repoze.what-pylons/Makefile @@ -11,12 +11,12 @@ MAINTAINER= wen@FreeBSD.org COMMENT= The repoze.what v1 plugin for Pylons/TG2 integration -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylons>=0.9.7:www/py-pylons \ - ${PYTHON_PKGNAMEPREFIX}repoze.what>=0:devel/py-repoze.what \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylons>=0.9.7:www/py-pylons@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}repoze.what>=0:devel/py-repoze.what@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-repoze.what/Makefile =================================================================== --- head/devel/py-repoze.what/Makefile +++ head/devel/py-repoze.what/Makefile @@ -11,11 +11,11 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Authorization for WSGI applications -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:www/py-paste \ - ${PYTHON_PKGNAMEPREFIX}repoze.who-testutil>=0:devel/py-repoze.who-testutil +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:www/py-paste@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}repoze.who-testutil>=0:devel/py-repoze.who-testutil@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-repoze.who-friendlyform/Makefile =================================================================== --- head/devel/py-repoze.who-friendlyform/Makefile +++ head/devel/py-repoze.who-friendlyform/Makefile @@ -10,14 +10,14 @@ MAINTAINER= ychsiao@ychsiao.org COMMENT= Collection of developer-friendly for repoze.who-powered -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who -RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who@${FLAVOR} +RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-repoze.who-testutil/Makefile =================================================================== --- head/devel/py-repoze.who-testutil/Makefile +++ head/devel/py-repoze.who-testutil/Makefile @@ -14,11 +14,11 @@ LICENSE= BSD4CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who \ - ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.3:www/py-pastedeploy +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.3:www/py-pastedeploy@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: head/devel/py-repoze.who/Makefile =================================================================== --- head/devel/py-repoze.who/Makefile +++ head/devel/py-repoze.who/Makefile @@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python Index: head/devel/py-repoze.xmliter/Makefile =================================================================== --- head/devel/py-repoze.xmliter/Makefile +++ head/devel/py-repoze.xmliter/Makefile @@ -14,8 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.1:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.1:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR} USES= python zip USE_PYTHON= autoplist distutils Index: head/devel/py-requestsexceptions/Makefile =================================================================== --- head/devel/py-requestsexceptions/Makefile +++ head/devel/py-requestsexceptions/Makefile @@ -10,7 +10,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Library to find the correct path to exceptions in the requests library -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} NO_ARCH= yes Index: head/devel/py-resourcepackage/Makefile =================================================================== --- head/devel/py-resourcepackage/Makefile +++ head/devel/py-resourcepackage/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Automated resource-as-package embedding mechanism -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-responses/Makefile =================================================================== --- head/devel/py-responses/Makefile +++ head/devel/py-responses/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.0.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}cookies>0:www/py-cookies +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.0.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cookies>0:www/py-cookies@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-retrying/Makefile =================================================================== --- head/devel/py-retrying/Makefile +++ head/devel/py-retrying/Makefile @@ -10,7 +10,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= General-purpose retrying library, written in Python -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six@${FLAVOR} NO_ARCH= yes Index: head/devel/py-riak_pb/Makefile =================================================================== --- head/devel/py-riak_pb/Makefile +++ head/devel/py-riak_pb/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>=2.4.1:devel/py-protobuf +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>=2.4.1:devel/py-protobuf@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: head/devel/py-robotframework-databaselibrary/Makefile =================================================================== --- head/devel/py-robotframework-databaselibrary/Makefile +++ head/devel/py-robotframework-databaselibrary/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= franz-see Index: head/devel/py-robotframework-pabot/Makefile =================================================================== --- head/devel/py-robotframework-pabot/Makefile +++ head/devel/py-robotframework-pabot/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework \ - ${PYTHON_PKGNAMEPREFIX}robotremoteserver>=1.0.1:devel/py-robotremoteserver +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}robotremoteserver>=1.0.1:devel/py-robotremoteserver@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-robotframework-ride/Makefile =================================================================== --- head/devel/py-robotframework-ride/Makefile +++ head/devel/py-robotframework-ride/Makefile @@ -12,9 +12,9 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework \ - ${PYTHON_PKGNAMEPREFIX}robotframework-selenium2library>=1.1.0:devel/py-robotframework-selenium2library \ - ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}robotframework-selenium2library>=1.1.0:devel/py-robotframework-selenium2library@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${FLAVOR} NO_ARCH= yes USES= python:-2.7 Index: head/devel/py-robotframework-selenium2library/Makefile =================================================================== --- head/devel/py-robotframework-selenium2library/Makefile +++ head/devel/py-robotframework-selenium2library/Makefile @@ -13,8 +13,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework \ - ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${FLAVOR} USES= python:2 USE_PYTHON= autoplist distutils Index: head/devel/py-robotremoteserver/Makefile =================================================================== --- head/devel/py-robotremoteserver/Makefile +++ head/devel/py-robotremoteserver/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-rply/Makefile =================================================================== --- head/devel/py-rply/Makefile +++ head/devel/py-rply/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-rq/Makefile =================================================================== --- head/devel/py-rq/Makefile +++ head/devel/py-rq/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=2.7:databases/py-redis \ - ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=2.7:databases/py-redis@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-ruamel.ordereddict/Makefile =================================================================== --- head/devel/py-ruamel.ordereddict/Makefile +++ head/devel/py-ruamel.ordereddict/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-rubymarshal/Makefile =================================================================== --- head/devel/py-rubymarshal/Makefile +++ head/devel/py-rubymarshal/Makefile @@ -14,7 +14,7 @@ LICENSE= WTFPL LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-ruledispatch/Makefile =================================================================== --- head/devel/py-ruledispatch/Makefile +++ head/devel/py-ruledispatch/Makefile @@ -16,10 +16,10 @@ LICENSE= PSFL ZPL21 LICENSE_COMB= dual -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Extremes>=1.1:devel/py-extremes \ - ${PYTHON_PKGNAMEPREFIX}PyProtocols>=1.0.a0.r2302:devel/py-protocols-devel +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Extremes>=1.1:devel/py-extremes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PyProtocols>=1.0.a0.r2302:devel/py-protocols-devel@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist # to have a platform/release indipendent directory (necessary for strip cmd) Index: head/devel/py-rwt/Makefile =================================================================== --- head/devel/py-rwt/Makefile +++ head/devel/py-rwt/Makefile @@ -12,11 +12,11 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${FLAVOR} NO_ARCH= yes -USE_PYTHON= concurrent distutils +USE_PYTHON= concurrent distutils autoplist USES= python .include Index: head/devel/py-rwt/pkg-plist =================================================================== --- head/devel/py-rwt/pkg-plist +++ head/devel/py-rwt/pkg-plist @@ -1,28 +0,0 @@ -bin/rwt -%%PYTHON_SITELIBDIR%%/rwt/__init__.py -%%PYTHON_SITELIBDIR%%/rwt/__init__.pyc -%%PYTHON_SITELIBDIR%%/rwt/__init__.pyo -%%PYTHON_SITELIBDIR%%/rwt/__main__.py -%%PYTHON_SITELIBDIR%%/rwt/__main__.pyc -%%PYTHON_SITELIBDIR%%/rwt/__main__.pyo -%%PYTHON_SITELIBDIR%%/rwt/commands.py -%%PYTHON_SITELIBDIR%%/rwt/commands.pyc -%%PYTHON_SITELIBDIR%%/rwt/commands.pyo -%%PYTHON_SITELIBDIR%%/rwt/deps.py -%%PYTHON_SITELIBDIR%%/rwt/deps.pyc -%%PYTHON_SITELIBDIR%%/rwt/deps.pyo -%%PYTHON_SITELIBDIR%%/rwt/launch.py -%%PYTHON_SITELIBDIR%%/rwt/launch.pyc -%%PYTHON_SITELIBDIR%%/rwt/launch.pyo -%%PYTHON_SITELIBDIR%%/rwt/scripts.py -%%PYTHON_SITELIBDIR%%/rwt/scripts.pyc -%%PYTHON_SITELIBDIR%%/rwt/scripts.pyo -%%PYTHON_SITELIBDIR%%/rwt/tests/test_deps.py -%%PYTHON_SITELIBDIR%%/rwt/tests/test_deps.pyc -%%PYTHON_SITELIBDIR%%/rwt/tests/test_deps.pyo -%%PYTHON_SITELIBDIR%%/rwt/tests/test_launch.py -%%PYTHON_SITELIBDIR%%/rwt/tests/test_launch.pyc -%%PYTHON_SITELIBDIR%%/rwt/tests/test_launch.pyo -%%PYTHON_SITELIBDIR%%/rwt/tests/test_scripts.py -%%PYTHON_SITELIBDIR%%/rwt/tests/test_scripts.pyc -%%PYTHON_SITELIBDIR%%/rwt/tests/test_scripts.pyo Index: head/devel/py-sanetime/Makefile =================================================================== --- head/devel/py-sanetime/Makefile +++ head/devel/py-sanetime/Makefile @@ -14,9 +14,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2010:devel/py-pytz -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2010:devel/py-pytz@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${FLAVOR} USES= python:2.7 USE_PYTHON= distutils autoplist Index: head/devel/py-scripttest/Makefile =================================================================== --- head/devel/py-scripttest/Makefile +++ head/devel/py-scripttest/Makefile @@ -11,9 +11,9 @@ LICENSE= MIT -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils USE_GITHUB= yes Index: head/devel/py-selection/Makefile =================================================================== --- head/devel/py-selection/Makefile +++ head/devel/py-selection/Makefile @@ -11,9 +11,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-selectors34/Makefile =================================================================== --- head/devel/py-selectors34/Makefile +++ head/devel/py-selectors34/Makefile @@ -11,7 +11,7 @@ LICENSE= PSFL -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python:2.7-3.3 Index: head/devel/py-semantic_version/Makefile =================================================================== --- head/devel/py-semantic_version/Makefile +++ head/devel/py-semantic_version/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= rbarrois Index: head/devel/py-setproctitle/Makefile =================================================================== --- head/devel/py-setproctitle/Makefile +++ head/devel/py-setproctitle/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT -USES?= python +USES= python USE_PYTHON= autoplist distutils PORTDOCS= HISTORY.rst README.rst Index: head/devel/py-setuptools-pkg/Makefile =================================================================== --- head/devel/py-setuptools-pkg/Makefile +++ head/devel/py-setuptools-pkg/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=18.2:devel/${PYTHON_PKGNAMEPREFIX}setuptools -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=18.2:devel/py-setuptools@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${FLAVOR} NO_ARCH= yes Index: head/devel/py-setuptools/Makefile =================================================================== --- head/devel/py-setuptools/Makefile +++ head/devel/py-setuptools/Makefile @@ -0,0 +1,46 @@ +# $FreeBSD$ + +PORTNAME= setuptools +PORTVERSION= 36.5.0 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DIST_SUBDIR= python + +MAINTAINER= python@FreeBSD.org +COMMENT= Python packages installer + +LICENSE= PSFL + +NO_ARCH= yes +USES= python zip +USE_PYTHON= autoplist concurrent distutils allflavors + +PYDISTUTILS_SETUP= ${PYSETUP} + +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}distribute-[0-9]* +MAKE_ENV+= SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 + +PLIST_FILES= "@sample %%PYTHON_SITELIBDIR%%/easy-install.pth.dist %%PYTHON_SITELIBDIR%%/easy-install.pth" + +.include + +.if ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION} +SUB_FILES+= pkg-message +SUB_LIST+= PYTHON_VER=${PYTHON_VER} +.endif + +# These create dependency loops in redports/poudriere, because setuptools +# is currently an explicit BUILD & RUN dependency in Uses/python.mk. +#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} +#.if ${PYTHON_REL} < 3300 +#TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} +#.endif + +post-install: + ${INSTALL_DATA} ${FILESDIR}/easy-install.pth.dist ${STAGEDIR}${PYTHON_SITELIBDIR}/ + +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test + +.include Index: head/devel/py-setuptools/distinfo =================================================================== --- head/devel/py-setuptools/distinfo +++ head/devel/py-setuptools/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1507100095 +SHA256 (python/setuptools-36.5.0.zip) = ce2007c1cea3359870b80657d634253a0765b0c7dc5a988d77ba803fc86f2c64 +SIZE (python/setuptools-36.5.0.zip) = 721505 Index: head/devel/py-setuptools/files/easy-install.pth.dist =================================================================== --- head/devel/py-setuptools/files/easy-install.pth.dist +++ head/devel/py-setuptools/files/easy-install.pth.dist @@ -0,0 +1,2 @@ +import sys; sys.__plen = len(sys.path) +import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new) Index: head/devel/py-setuptools/files/pkg-message.in =================================================================== --- head/devel/py-setuptools/files/pkg-message.in +++ head/devel/py-setuptools/files/pkg-message.in @@ -0,0 +1,7 @@ + +******************************************************************* + + Only %%PREFIX%%/bin/easy_install-%%PYTHON_VER%% script has been installed + since Python %%PYTHON_VER%% is not the default Python version. + +******************************************************************* Index: head/devel/py-setuptools/pkg-descr =================================================================== --- head/devel/py-setuptools/pkg-descr +++ head/devel/py-setuptools/pkg-descr @@ -0,0 +1,10 @@ +Setuptools is a fully-featured, actively-maintained, and stable library +designed to facilitate packaging Python projects, where packaging includes: + - Python package and module definitions + - Distribution package metadata + - Test hooks + - Project installation + - Platform-specific details + - Python 3 support + +WWW: https://pypi.python.org/pypi/setuptools Index: head/devel/py-setuptools_darcs/Makefile =================================================================== --- head/devel/py-setuptools_darcs/Makefile +++ head/devel/py-setuptools_darcs/Makefile @@ -13,7 +13,7 @@ BUILD_DEPENDS= darcsver:devel/py-darcsver -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-setuptools_scm/Makefile =================================================================== --- head/devel/py-setuptools_scm/Makefile +++ head/devel/py-setuptools_scm/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-simplejson/Makefile =================================================================== --- head/devel/py-simplejson/Makefile +++ head/devel/py-simplejson/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils post-install: Index: head/devel/py-simpy/Makefile =================================================================== --- head/devel/py-simpy/Makefile +++ head/devel/py-simpy/Makefile @@ -21,7 +21,7 @@ PORTDOCS= * -TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Index: head/devel/py-singledispatch/Makefile =================================================================== --- head/devel/py-singledispatch/Makefile +++ head/devel/py-singledispatch/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python:-3.3 USE_PYTHON= distutils concurrent autoplist Index: head/devel/py-sip/Makefile =================================================================== --- head/devel/py-sip/Makefile +++ head/devel/py-sip/Makefile @@ -13,7 +13,7 @@ COMMENT= Python to C and C++ bindings generator USES= python pyqt:sip -USE_PYTHON= concurrent py3kplist +USE_PYTHON= concurrent py3kplist flavors USE_PYQT= # CONFIGURE_ARGS= -b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \ @@ -29,6 +29,8 @@ do-configure: cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} + ${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|' \ + ${WRKSRC}/sipconfig.py post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} && cd ${WRKSRC}/doc/html && \ Index: head/devel/py-six/Makefile =================================================================== --- head/devel/py-six/Makefile +++ head/devel/py-six/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: head/devel/py-smmap2/Makefile =================================================================== --- head/devel/py-smmap2/Makefile +++ head/devel/py-smmap2/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-sortedcontainers/Makefile =================================================================== --- head/devel/py-sortedcontainers/Makefile +++ head/devel/py-sortedcontainers/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-spyder/Makefile =================================================================== --- head/devel/py-spyder/Makefile +++ head/devel/py-spyder/Makefile @@ -13,10 +13,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \ - ${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg \ - ${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:www/py-qt4-webkit \ - ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:www/py-qt4-webkit@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network@${FLAVOR} USES= desktop-file-utils python USE_PYTHON= autoplist distutils @@ -48,22 +48,22 @@ SPHINX_DESC= Rich text help on the Object Inspector SYMPY_DESC= Symbolic mathematics in the IPython Console -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0.6:textproc/py-sphinx +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0.6:textproc/py-sphinx@${FLAVOR} IPYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=1.0:devel/ipython \ - ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.11:net/py-pyzmq -JEDI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jedi>=0.8.1:devel/py-jedi -MATPLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.0:math/py-matplotlib + ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.11:net/py-pyzmq@${FLAVOR} +JEDI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jedi>=0.8.1:devel/py-jedi@${FLAVOR} +MATPLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.0:math/py-matplotlib@${FLAVOR} NUMPY_RUN_DEPENDS= ${PYNUMPY} -PANDAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=0.13.1:math/py-pandas +PANDAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=0.13.1:math/py-pandas@${FLAVOR} PEP8_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pep8>=0.6:devel/pep8 -PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0.3:sysutils/py-psutil -PYFLAKES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes -PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments -PYLINT_RUN_DEPENDS= pylint${PYTHON_PKGNAMESUFFIX}>=0.25:devel/pylint -ROPE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rope>=0.9.2:devel/py-rope -SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy +PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0.3:sysutils/py-psutil@${FLAVOR} +PYFLAKES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes@${FLAVOR} +PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR} +PYLINT_RUN_DEPENDS= pylint${PYTHON_PKGNAMESUFFIX}>=0.25:devel/pylint@${FLAVOR} +ROPE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rope>=0.9.2:devel/py-rope@${FLAVOR} +SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} SPHINX_RUN_DEPENDS= ${DOCS_BUILD_DEPENDS} -SYMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>=0.7.3:math/py-sympy +SYMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>=0.7.3:math/py-sympy@${FLAVOR} post-patch: @${REINPLACE_CMD} -e "s|'linux'|'${OPSYS:tl}'|" \ Index: head/devel/py-sqlcc/Makefile =================================================================== --- head/devel/py-sqlcc/Makefile +++ head/devel/py-sqlcc/Makefile @@ -12,9 +12,9 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pythk>=0:devel/pythk +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pythk>=0:devel/pythk@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils .include Index: head/devel/py-stackexchange/Makefile =================================================================== --- head/devel/py-stackexchange/Makefile +++ head/devel/py-stackexchange/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-stevedore/Makefile =================================================================== --- head/devel/py-stevedore/Makefile +++ head/devel/py-stevedore/Makefile @@ -12,9 +12,9 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr # <2.0 -RUN_DEPENDS= ${PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr \ - ${PKGNAMEPREFIX}six>=1.9.0:devel/py-six +BUILD_DEPENDS= ${PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} # <2.0 +RUN_DEPENDS= ${PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} \ + ${PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-streamparse/Makefile =================================================================== --- head/devel/py-streamparse/Makefile +++ head/devel/py-streamparse/Makefile @@ -13,18 +13,18 @@ LICENSE= APACHE20 -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable \ - ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml \ - ${PYTHON_PKGNAMEPREFIX}fabric3>0:devel/py-fabric3 \ - ${PYTHON_PKGNAMEPREFIX}pystorm>=3.1.0:devel/py-pystorm \ - ${PYTHON_PKGNAMEPREFIX}thriftpy>=0.3.2:devel/py-thriftpy +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fabric3>0:devel/py-fabric3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pystorm>=3.1.0:devel/py-pystorm@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}thriftpy>=0.3.2:devel/py-thriftpy@${FLAVOR} NO_ARCH= YES Index: head/devel/py-structlog/Makefile =================================================================== --- head/devel/py-structlog/Makefile +++ head/devel/py-structlog/Makefile @@ -15,8 +15,8 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.apache2 LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.mit -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3:devel/py-colorama \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3:devel/py-colorama@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-stsci.distutils/Makefile =================================================================== --- head/devel/py-stsci.distutils/Makefile +++ head/devel/py-stsci.distutils/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}d2to1>0:devel/py-d2to1 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}d2to1>0:devel/py-d2to1@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-subversion/Makefile =================================================================== --- head/devel/py-subversion/Makefile +++ head/devel/py-subversion/Makefile @@ -14,6 +14,7 @@ PKGDIR= ${.CURDIR} USES+= python +USE_PYTHON= flavors py3kplist SVN_BUILD_BINDINGS= yes SVN_BUILD_ADDONS= yes Index: head/devel/py-subvertpy/Makefile =================================================================== --- head/devel/py-subvertpy/Makefile +++ head/devel/py-subvertpy/Makefile @@ -14,7 +14,7 @@ BUILD_DEPENDS+= svn:devel/subversion -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist MAKE_ENV= HOME=/dev/null INSTALL_TARGET= install-strip Index: head/devel/py-sure/Makefile =================================================================== --- head/devel/py-sure/Makefile +++ head/devel/py-sure/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python:2.7 USE_PYTHON= autoplist distutils Index: head/devel/py-tables/Makefile =================================================================== --- head/devel/py-tables/Makefile +++ head/devel/py-tables/Makefile @@ -14,21 +14,20 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/bin/cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:math/py-numexpr + ${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:math/py-numexpr@${FLAVOR} LIB_DEPENDS= libhdf5.so:science/hdf5 \ liblzo2.so:archivers/lzo2 \ libucl.so:archivers/ucl RUN_DEPENDS:= ${BUILD_DEPENDS} USES= fortran python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils cython PORTEXAMPLES= * OPTIONS_DEFINE= PYREX EXAMPLES PYREX_DESC= Use code generated by Pyrex to build -PYREX_BUILD_DEPENDS= pyrex>0:devel/pyrex +PYREX_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR} post-patch: @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/setup.py Index: head/devel/py-tabulate/Makefile =================================================================== --- head/devel/py-tabulate/Makefile +++ head/devel/py-tabulate/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-tarantool-queue/Makefile =================================================================== --- head/devel/py-tarantool-queue/Makefile +++ head/devel/py-tarantool-queue/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tarantool>=0:databases/py-tarantool \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0:devel/py-msgpack-python +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tarantool>=0:databases/py-tarantool@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0:devel/py-msgpack-python@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-taskflow/Makefile =================================================================== --- head/devel/py-taskflow/Makefile +++ head/devel/py-taskflow/Makefile @@ -12,28 +12,28 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>=3.0:devel/py-futures \ - ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}networkx>=1.10:math/py-networkx \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist \ - ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}contextlib2>=0.4.0:devel/py-contextlib2 \ - ${PYTHON_PKGNAMEPREFIX}cachetools>=1.1.0:devel/py-cachetools \ - ${PYTHON_PKGNAMEPREFIX}automaton>=0.5.0:devel/py-automaton \ - ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PY_FUTURES} \ + ${PY_ENUM34} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}networkx>=1.10:math/py-networkx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}contextlib2>=0.4.0:devel/py-contextlib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cachetools>=1.1.0:devel/py-cachetools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}automaton>=0.5.0:devel/py-automaton@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-tempora/Makefile =================================================================== --- head/devel/py-tempora/Makefile +++ head/devel/py-tempora/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-tempstorage/Makefile =================================================================== --- head/devel/py-tempstorage/Makefile +++ head/devel/py-tempstorage/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=3.9.0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=3.9.0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-tenacity/Makefile =================================================================== --- head/devel/py-tenacity/Makefile +++ head/devel/py-tenacity/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: head/devel/py-terminable_thread/Makefile =================================================================== --- head/devel/py-terminable_thread/Makefile +++ head/devel/py-terminable_thread/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-testgears/Makefile =================================================================== --- head/devel/py-testgears/Makefile +++ head/devel/py-testgears/Makefile @@ -12,7 +12,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= Python module to run tests written as simple functions -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-testinfra/Makefile =================================================================== --- head/devel/py-testinfra/Makefile +++ head/devel/py-testinfra/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}six>1.4:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>1.4:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-testoob/Makefile =================================================================== --- head/devel/py-testoob/Makefile +++ head/devel/py-testoob/Makefile @@ -22,6 +22,6 @@ USES= python tar:bzip2 USE_PYTHON= autoplist distutils -TWISTED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +TWISTED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} .include Index: head/devel/py-testpath/Makefile =================================================================== --- head/devel/py-testpath/Makefile +++ head/devel/py-testpath/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= jupyter @@ -23,7 +23,7 @@ .include .if ${PYTHON_REL} < 3400 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib>=0:devel/py-pathlib +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib>=0:devel/py-pathlib@${FLAVOR} .endif post-extract: Index: head/devel/py-testtools/Makefile =================================================================== --- head/devel/py-testtools/Makefile +++ head/devel/py-testtools/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}extras>=0.0.3:devel/py-extras +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}extras>=0.0.3:devel/py-extras@${FLAVOR} USES= python USE_PYTHON= distutils autoplist concurrent Index: head/devel/py-threema-msgapi/Makefile =================================================================== --- head/devel/py-threema-msgapi/Makefile +++ head/devel/py-threema-msgapi/Makefile @@ -0,0 +1,27 @@ +# Created by: philip@FreeBSD.org +# $FreeBSD$ + +PORTNAME= threema-msgapi +PORTVERSION= 2.1.8 +DISTVERSIONPREFIX= v +CATEGORIES= devel python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= philip@FreeBSD.org +COMMENT= Threema Gateway Message SDK for Python + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= python:3.2+ +USE_PYTHON= distutils autoplist +USE_GITHUB= yes +GH_ACCOUNT= lgrahl +GH_PROJECT= threema-msgapi-sdk-python + +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pylru-cache>0:devel/py-pylru-cache@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libnacl>0:security/py-libnacl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${FLAVOR} + +.include Index: head/devel/py-threema-msgapi/distinfo =================================================================== --- head/devel/py-threema-msgapi/distinfo +++ head/devel/py-threema-msgapi/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1481010859 +SHA256 (lgrahl-threema-msgapi-sdk-python-v2.1.8_GH0.tar.gz) = 3ba7cde76d015d23ab026a09c00ee7bd819eed0313fbccd8b9717a1ecb8d4660 +SIZE (lgrahl-threema-msgapi-sdk-python-v2.1.8_GH0.tar.gz) = 24503 Index: head/devel/py-threema-msgapi/pkg-descr =================================================================== --- head/devel/py-threema-msgapi/pkg-descr +++ head/devel/py-threema-msgapi/pkg-descr @@ -0,0 +1,3 @@ +Threema Gateway Message SDK for Python https://gateway.threema.ch/. + +WWW: https://github.com/lgrahl/threema-msgapi-sdk-python/ Index: head/devel/py-tinyarray/Makefile =================================================================== --- head/devel/py-tinyarray/Makefile +++ head/devel/py-tinyarray/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-tinyrpc/Makefile =================================================================== --- head/devel/py-tinyrpc/Makefile +++ head/devel/py-tinyrpc/Makefile @@ -25,9 +25,9 @@ OPTIONS_DEFAULT=HTTP -HTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests -WSGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent \ - ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug -ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq +HTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} +WSGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${FLAVOR} +ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${FLAVOR} .include Index: head/devel/py-tooz/Makefile =================================================================== --- head/devel/py-tooz/Makefile +++ head/devel/py-tooz/Makefile @@ -12,18 +12,18 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>=3.0:devel/py-futures \ - ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}voluptuous>=0.8.9:devel/py-voluptuous \ - ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.15.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist \ - ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PY_FUTURES} \ + ${PY_ENUM34} \ + ${PYTHON_PKGNAMEPREFIX}voluptuous>=0.8.9:devel/py-voluptuous@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.15.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners@${FLAVOR} NO_ARCH= yes Index: head/devel/py-toposort/Makefile =================================================================== --- head/devel/py-toposort/Makefile +++ head/devel/py-toposort/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-tox/Makefile =================================================================== --- head/devel/py-tox/Makefile +++ head/devel/py-tox/Makefile @@ -13,14 +13,14 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.11.2:devel/py-virtualenv \ - ${PYTHON_PKGNAMEPREFIX}py>=1.4.17:devel/py-py \ - ${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox \ - ${PYTHON_PKGNAMEPREFIX}pytest>=2.3.5:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.11.2:devel/py-virtualenv@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}py>=1.4.17:devel/py-py@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=2.3.5:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: head/devel/py-traceback2/Makefile =================================================================== --- head/devel/py-traceback2/Makefile +++ head/devel/py-traceback2/Makefile @@ -11,10 +11,10 @@ MAINTAINER= feld@FreeBSD.org COMMENT= New features in traceback backported to Python 2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} LICENSE= PSFL Index: head/devel/py-traitlets/Makefile =================================================================== --- head/devel/py-traitlets/Makefile +++ head/devel/py-traitlets/Makefile @@ -13,10 +13,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -25,11 +25,11 @@ .include .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34@${FLAVOR} .endif .if ${PYTHON_VER} == 2.7 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} .endif do-test: Index: head/devel/py-transaction/Makefile =================================================================== --- head/devel/py-transaction/Makefile +++ head/devel/py-transaction/Makefile @@ -12,7 +12,7 @@ LICENSE= ZPL21 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python Index: head/devel/py-trollius/Makefile =================================================================== --- head/devel/py-trollius/Makefile +++ head/devel/py-trollius/Makefile @@ -20,9 +20,9 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${FLAVOR} .if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} .endif .endif Index: head/devel/py-tw.forms/Makefile =================================================================== --- head/devel/py-tw.forms/Makefile +++ head/devel/py-tw.forms/Makefile @@ -11,12 +11,12 @@ MAINTAINER= ychsiao@ychsiao.org COMMENT= Web Widgets for building and validating forms -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:devel/py-ToscaWidgets \ - ${PYTHON_PKGNAMEPREFIX}formencode>=0:www/py-formencode -RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:devel/py-ToscaWidgets \ - ${PYTHON_PKGNAMEPREFIX}formencode>=0:www/py-formencode +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:devel/py-ToscaWidgets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}formencode>=0:www/py-formencode@${FLAVOR} +RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:devel/py-ToscaWidgets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}formencode>=0:www/py-formencode@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-twext/Makefile =================================================================== --- head/devel/py-twext/Makefile +++ head/devel/py-twext/Makefile @@ -10,16 +10,16 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=15.4.0:devel/py-twisted +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=15.4.0:devel/py-twisted@${FLAVOR} RUN_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}cffi>=0.6:devel/py-cffi \ - ${PYTHON_PKGNAMEPREFIX}twisted>=15.4:devel/py-twisted + ${PYTHON_PKGNAMEPREFIX}cffi>=0.6:devel/py-cffi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=15.4:devel/py-twisted@${FLAVOR} DAL_RUN_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}sqlparse01>=0.1.19:databases/py-sqlparse01 \ + ${PYTHON_PKGNAMEPREFIX}sqlparse01>=0.1.19:databases/py-sqlparse01@${FLAVOR} \ POSTGRES_RUN_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.2:databases/py-pg8000 + ${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.2:databases/py-pg8000@${FLAVOR} OPTIONS_DEFINE= DAL POSTGRES DAL_DESC= Enables use of the Database Abstraction Layer. Index: head/devel/py-twilio/Makefile =================================================================== --- head/devel/py-twilio/Makefile +++ head/devel/py-twilio/Makefile @@ -11,9 +11,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-twine/Makefile =================================================================== --- head/devel/py-twine/Makefile +++ head/devel/py-twine/Makefile @@ -12,11 +12,11 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clint>=0:devel/py-clint \ - ${PYTHON_PKGNAMEPREFIX}pkginfo>=0:sysutils/py-pkginfo \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0:www/py-requests-toolbelt \ - ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/${PYTHON_PKGNAMEPREFIX}setuptools +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clint>=0:devel/py-clint@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pkginfo>=0:sysutils/py-pkginfo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0:www/py-requests-toolbelt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-twisted/Makefile =================================================================== --- head/devel/py-twisted/Makefile +++ head/devel/py-twisted/Makefile @@ -14,11 +14,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}constantly>=15.1:devel/py-constantly \ - ${PYTHON_PKGNAMEPREFIX}hyperlink>=17.1.1:www/py-hyperlink \ - ${PYTHON_PKGNAMEPREFIX}incremental>=16.10.1:devel/py-incremental \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Automat>=0.3.0:devel/py-Automat +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}constantly>=15.1:devel/py-constantly@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hyperlink>=17.1.1:www/py-hyperlink@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}incremental>=16.10.1:devel/py-incremental@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Automat>=0.3.0:devel/py-Automat@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python tar:bzip2 Index: head/devel/py-txaio/Makefile =================================================================== --- head/devel/py-txaio/Makefile +++ head/devel/py-txaio/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -23,9 +23,9 @@ .include .if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}trollius>=2.0:devel/py-trollius +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}trollius>=2.0:devel/py-trollius@${FLAVOR} .elif ${PYTHON_REL} >= 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>=3.4.3:devel/py-asyncio +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>=3.4.3:devel/py-asyncio@${FLAVOR} .endif do-test: Index: head/devel/py-tzlocal/Makefile =================================================================== --- head/devel/py-tzlocal/Makefile +++ head/devel/py-tzlocal/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} -USES?= python +USES= python USE_PYTHON= distutils autoplist NO_ARCH= yes Index: head/devel/py-ua_parser/Makefile =================================================================== --- head/devel/py-ua_parser/Makefile +++ head/devel/py-ua_parser/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${FLAVOR} RUN_DEPENDS= ${LOCALBASE}/share/ua_parser/regexes.yaml:devel/ua_parser-core \ - ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml + ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-unittest2/Makefile =================================================================== --- head/devel/py-unittest2/Makefile +++ head/devel/py-unittest2/Makefile @@ -11,12 +11,12 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}linecache2>0:devel/py-linecache2 \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}traceback2>0:devel/py-traceback2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}linecache2>0:devel/py-linecache2 \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}traceback2>0:devel/py-traceback2 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}linecache2>0:devel/py-linecache2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traceback2>0:devel/py-traceback2@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}linecache2>0:devel/py-linecache2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traceback2>0:devel/py-traceback2@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-unpaddedbase64/Makefile =================================================================== --- head/devel/py-unpaddedbase64/Makefile +++ head/devel/py-unpaddedbase64/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_GITHUB= yes Index: head/devel/py-update_checker/Makefile =================================================================== --- head/devel/py-update_checker/Makefile +++ head/devel/py-update_checker/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-urwid/Makefile =================================================================== --- head/devel/py-urwid/Makefile +++ head/devel/py-urwid/Makefile @@ -16,7 +16,7 @@ OPTIONS_DEFINE= EXAMPLES -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils PORTEXAMPLES= * Index: head/devel/py-urwidtrees/Makefile =================================================================== --- head/devel/py-urwidtrees/Makefile +++ head/devel/py-urwidtrees/Makefile @@ -11,8 +11,8 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE.md -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:devel/py-urwid -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:devel/py-urwid +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:devel/py-urwid@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:devel/py-urwid@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= pazz Index: head/devel/py-user_agents/Makefile =================================================================== --- head/devel/py-user_agents/Makefile +++ head/devel/py-user_agents/Makefile @@ -11,7 +11,7 @@ MAINTAINER= demon@FreeBSD.org COMMENT= Python library to identify devices using User-Agent string -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ua_parser/__init__.py:devel/py-ua_parser +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ua_parser/__init__.py:devel/py-ua_parser@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-utils/Makefile =================================================================== --- head/devel/py-utils/Makefile +++ head/devel/py-utils/Makefile @@ -11,7 +11,7 @@ MAINTAINER= daniel@netwalk.org COMMENT= General utility modules that simplify common programming in Python -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} Index: head/devel/py-vcrpy/Makefile =================================================================== --- head/devel/py-vcrpy/Makefile +++ head/devel/py-vcrpy/Makefile @@ -14,11 +14,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-localserver>0:devel/py-pytest-localserver +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-localserver>0:devel/py-pytest-localserver@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -32,8 +32,8 @@ .include .if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${FLAVOR} .endif post-patch: Index: head/devel/py-vcversioner/Makefile =================================================================== --- head/devel/py-vcversioner/Makefile +++ head/devel/py-vcversioner/Makefile @@ -1,17 +1,20 @@ +# Created by: Muhammad Moinur Rahman # $FreeBSD$ PORTNAME= vcversioner -PORTVERSION= 2.14.0.0 +PORTVERSION= 2.16.0.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= wg@FreeBSD.org +MAINTAINER= bofh@FreeBSD.org COMMENT= Use version control tags to discover version numbers LICENSE= ISCL USES= python USE_PYTHON= distutils autoplist +NO_ARCH= yes .include Index: head/devel/py-vcversioner/distinfo =================================================================== --- head/devel/py-vcversioner/distinfo +++ head/devel/py-vcversioner/distinfo @@ -1,2 +1,3 @@ -SHA256 (vcversioner-2.14.0.0.tar.gz) = acd43686e92e6c8bbeb4f2eef54408567a7adea9692fa72d591eec5357c03b86 -SIZE (vcversioner-2.14.0.0.tar.gz) = 9015 +TIMESTAMP = 1465721148 +SHA256 (vcversioner-2.16.0.0.tar.gz) = dae60c17a479781f44a4010701833f1829140b1eeccd258762a74974aa06e19b +SIZE (vcversioner-2.16.0.0.tar.gz) = 9024 Index: head/devel/py-verboselogs/Makefile =================================================================== --- head/devel/py-verboselogs/Makefile +++ head/devel/py-verboselogs/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include Index: head/devel/py-virtualenv/Makefile =================================================================== --- head/devel/py-virtualenv/Makefile +++ head/devel/py-virtualenv/Makefile @@ -10,14 +10,14 @@ LICENSE= MIT -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR} -USES?= python +USES= python USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils Index: head/devel/py-virtualenvwrapper/Makefile =================================================================== --- head/devel/py-virtualenvwrapper/Makefile +++ head/devel/py-virtualenvwrapper/Makefile @@ -13,17 +13,17 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr -RUN_DEPENDS= ${PKGNAMEPREFIX}stevedore>0:devel/py-stevedore \ - ${PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv \ - ${PKGNAMEPREFIX}virtualenv-clone>0:devel/py-virtualenv-clone +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>0:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}virtualenv-clone>0:devel/py-virtualenv-clone@${FLAVOR} OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \ - ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-bitbucket>=1.0:textproc/py-sphinxcontrib-bitbucket +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-bitbucket>=1.0:textproc/py-sphinxcontrib-bitbucket@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist concurrent distutils DOCS_VARS= DOCSDIR=${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} \ Index: head/devel/py-voluptuous/Makefile =================================================================== --- head/devel/py-voluptuous/Makefile +++ head/devel/py-voluptuous/Makefile @@ -14,7 +14,7 @@ USE_GITHUB= yes GH_ACCOUNT= alecthomas -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/py-warlock/Makefile =================================================================== --- head/devel/py-warlock/Makefile +++ head/devel/py-warlock/Makefile @@ -10,9 +10,9 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Python object model built on JSON schema and JSON patch -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=0.7:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}jsonpatch>=0.10:devel/py-jsonpatch \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=0.7:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonpatch>=0.10:devel/py-jsonpatch@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-watchdog/Makefile =================================================================== --- head/devel/py-watchdog/Makefile +++ head/devel/py-watchdog/Makefile @@ -12,12 +12,12 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PKGNAMEPREFIX}argh>=0.26.1:devel/py-argh \ - ${PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools \ - ${PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml +RUN_DEPENDS= ${PKGNAMEPREFIX}argh>=0.26.1:devel/py-argh@${FLAVOR} \ + ${PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${FLAVOR} \ + ${PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} -DOCS_BUILD_DEPENDS= ${PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools \ - ${PKGNAMEPREFIX}sphinx>=1.4.4:textproc/py-sphinx +DOCS_BUILD_DEPENDS= ${PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${FLAVOR} \ + ${PKGNAMEPREFIX}sphinx>=1.4.4:textproc/py-sphinx@${FLAVOR} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} GH_ACCOUNT= gorakhargosh @@ -32,7 +32,7 @@ NO_ARCH= yes post-build-DOCS-on: - (cd ${WRKSRC}/docs ; ${MAKE_CMD} html) + (cd ${WRKSRC}/docs ; ${MAKE_CMD} SPHINXBUILD=sphinx-build-${PYTHON_VER} html) post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Index: head/devel/py-wcwidth/Makefile =================================================================== --- head/devel/py-wcwidth/Makefile +++ head/devel/py-wcwidth/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include Index: head/devel/py-weblib/Makefile =================================================================== --- head/devel/py-weblib/Makefile +++ head/devel/py-weblib/Makefile @@ -11,10 +11,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytils>0:russian/py-pytils \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytils>0:russian/py-pytils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-wheel/Makefile =================================================================== --- head/devel/py-wheel/Makefile +++ head/devel/py-wheel/Makefile @@ -19,10 +19,10 @@ PIP_RUN_DEPENDS= pip:devel/py-pip SIGNATURE_DESC= Enable digital signature of wheels -SIGNATURE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dirspec>=13.05:devel/py-dirspec \ - ${PYTHON_PKGNAMEPREFIX}ed25519ll>=0.6_1:security/py-ed25519ll \ - ${PYTHON_PKGNAMEPREFIX}keyring>=1.3:security/py-keyring \ - ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg +SIGNATURE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dirspec>=13.05:devel/py-dirspec@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ed25519ll>=0.6_1:security/py-ed25519ll@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keyring>=1.3:security/py-keyring@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-widgetsnbextension/Makefile =================================================================== --- head/devel/py-widgetsnbextension/Makefile +++ head/devel/py-widgetsnbextension/Makefile @@ -10,7 +10,7 @@ COMMENT= IPython HTML widgets for Jupyter BUILD_DEPENDS= npm>=0:www/npm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notebook>=0:www/py-notebook +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notebook>=0:www/py-notebook@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-wsme/Makefile =================================================================== --- head/devel/py-wsme/Makefile +++ head/devel/py-wsme/Makefile @@ -11,12 +11,12 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Simplify the writing of REST APIs -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}simplegeneric>=0:devel/py-simplegeneric \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.12:net/py-netaddr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplegeneric>=0:devel/py-simplegeneric@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.12:net/py-netaddr@${FLAVOR} NO_ARCH= yes Index: head/devel/py-xattr/Makefile =================================================================== --- head/devel/py-xattr/Makefile +++ head/devel/py-xattr/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-xcaplib/Makefile =================================================================== --- head/devel/py-xcaplib/Makefile +++ head/devel/py-xcaplib/Makefile @@ -13,9 +13,9 @@ LICENSE= LGPL20+ -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}application>=1.1.5:devel/py-application \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.2:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}application>=1.1.5:devel/py-application@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.2:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-xdg/Makefile =================================================================== --- head/devel/py-xdg/Makefile +++ head/devel/py-xdg/Makefile @@ -16,7 +16,7 @@ LICENSE= LGPL20 NO_ARCH= yes -USES= python:2 +USES= python USE_PYTHON= autoplist distutils post-patch: Index: head/devel/py-xmltodict/Makefile =================================================================== --- head/devel/py-xmltodict/Makefile +++ head/devel/py-xmltodict/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-xxhash/Makefile =================================================================== --- head/devel/py-xxhash/Makefile +++ head/devel/py-xxhash/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>1:devel/py-nose +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>1:devel/py-nose@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist Index: head/devel/py-yaml/Makefile =================================================================== --- head/devel/py-yaml/Makefile +++ head/devel/py-yaml/Makefile @@ -18,7 +18,7 @@ OPTIONS_DEFINE= LIBYAML EXAMPLES LIBYAML_DESC= Use textproc/libyaml for faster parsing -USES?= python +USES= python USE_PYTHON= distutils autoplist EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} Index: head/devel/py-yandex-money-sdk/Makefile =================================================================== --- head/devel/py-yandex-money-sdk/Makefile +++ head/devel/py-yandex-money-sdk/Makefile @@ -11,9 +11,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.4.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.4.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-ydbf/Makefile =================================================================== --- head/devel/py-ydbf/Makefile +++ head/devel/py-ydbf/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-yum-metadata-parser/Makefile =================================================================== --- head/devel/py-yum-metadata-parser/Makefile +++ head/devel/py-yum-metadata-parser/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libsqlite3.so:databases/sqlite3 -USES= pkgconfig python +USES= pkgconfig python:2.7 USE_GNOME= glib20 USE_PYTHON= distutils autoplist Index: head/devel/py-yunomi/Makefile =================================================================== --- head/devel/py-yunomi/Makefile +++ head/devel/py-yunomi/Makefile @@ -16,7 +16,7 @@ PORTDOCS= README.rst \ HISTORY.rst -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist OPTIONS_DEFINE= DOCS Index: head/devel/py-z3c.autoinclude/Makefile =================================================================== --- head/devel/py-z3c.autoinclude/Makefile +++ head/devel/py-z3c.autoinclude/Makefile @@ -12,11 +12,11 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zc.buildout>=0:devel/py-zc.buildout +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zc.buildout>=0:devel/py-zc.buildout@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-z3c.batching/Makefile =================================================================== --- head/devel/py-z3c.batching/Makefile +++ head/devel/py-z3c.batching/Makefile @@ -13,8 +13,8 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-z3c.caching/Makefile =================================================================== --- head/devel/py-z3c.caching/Makefile +++ head/devel/py-z3c.caching/Makefile @@ -13,14 +13,14 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-z3c.form/Makefile =================================================================== --- head/devel/py-z3c.form/Makefile +++ head/devel/py-z3c.form/Makefile @@ -13,27 +13,27 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.browserresource>0:devel/py-zope.browserresource \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6.0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.site>0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserresource>0:devel/py-zope.browserresource@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6.0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-z3c.formwidget.query/Makefile =================================================================== --- head/devel/py-z3c.formwidget.query/Makefile +++ head/devel/py-z3c.formwidget.query/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-z3c.zcmlhook/Makefile =================================================================== --- head/devel/py-z3c.zcmlhook/Makefile +++ head/devel/py-z3c.zcmlhook/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zExceptions/Makefile =================================================================== --- head/devel/py-zExceptions/Makefile +++ head/devel/py-zExceptions/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-zLOG/Makefile =================================================================== --- head/devel/py-zLOG/Makefile +++ head/devel/py-zLOG/Makefile @@ -13,7 +13,7 @@ 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:2 Index: head/devel/py-zkpython/Makefile =================================================================== --- head/devel/py-zkpython/Makefile +++ head/devel/py-zkpython/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libzookeeper_mt.so:devel/libzookeeper -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-zope.annotation/Makefile =================================================================== --- head/devel/py-zope.annotation/Makefile +++ head/devel/py-zope.annotation/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.http/Makefile =================================================================== --- head/devel/py-zope.app.http/Makefile +++ head/devel/py-zope.app.http/Makefile @@ -13,12 +13,12 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.applicationcontrol/Makefile =================================================================== --- head/devel/py-zope.app.applicationcontrol/Makefile +++ head/devel/py-zope.app.applicationcontrol/Makefile @@ -13,16 +13,16 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:devel/py-zope.applicationcontrol \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:devel/py-zope.traversing +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:devel/py-zope.applicationcontrol@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.appsetup/Makefile =================================================================== --- head/devel/py-zope.app.appsetup/Makefile +++ head/devel/py-zope.app.appsetup/Makefile @@ -13,21 +13,21 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=3.6.0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=3.6.0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.basicskin/Makefile =================================================================== --- head/devel/py-zope.app.basicskin/Makefile +++ head/devel/py-zope.app.basicskin/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zope.app.broken/Makefile =================================================================== --- head/devel/py-zope.app.broken/Makefile +++ head/devel/py-zope.app.broken/Makefile @@ -13,15 +13,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.broken>=0:devel/py-zope.broken \ - ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.broken>=0:devel/py-zope.broken@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.cache/Makefile =================================================================== --- head/devel/py-zope.app.cache/Makefile +++ head/devel/py-zope.app.cache/Makefile @@ -13,20 +13,20 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \ - ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.component/Makefile =================================================================== --- head/devel/py-zope.app.component/Makefile +++ head/devel/py-zope.app.component/Makefile @@ -13,22 +13,22 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container \ - ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12.0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12.0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.container/Makefile =================================================================== --- head/devel/py-zope.app.container/Makefile +++ head/devel/py-zope.app.container/Makefile @@ -13,26 +13,26 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove \ - ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:devel/py-zope.dublincore \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:devel/py-zope.dublincore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.content/Makefile =================================================================== --- head/devel/py-zope.app.content/Makefile +++ head/devel/py-zope.app.content/Makefile @@ -13,12 +13,12 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.debug/Makefile =================================================================== --- head/devel/py-zope.app.debug/Makefile +++ head/devel/py-zope.app.debug/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:devel/py-zope.app.appsetup \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:devel/py-zope.app.appsetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.dependable/Makefile =================================================================== --- head/devel/py-zope.app.dependable/Makefile +++ head/devel/py-zope.app.dependable/Makefile @@ -13,15 +13,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.error/Makefile =================================================================== --- head/devel/py-zope.app.error/Makefile +++ head/devel/py-zope.app.error/Makefile @@ -13,12 +13,12 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.exception/Makefile =================================================================== --- head/devel/py-zope.app.exception/Makefile +++ head/devel/py-zope.app.exception/Makefile @@ -13,15 +13,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.file/Makefile =================================================================== --- head/devel/py-zope.app.file/Makefile +++ head/devel/py-zope.app.file/Makefile @@ -12,20 +12,20 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publication>0:devel/py-zope.app.publication \ - ${PYTHON_PKGNAMEPREFIX}zope.contenttype>0:devel/py-zope.contenttype \ - ${PYTHON_PKGNAMEPREFIX}zope.datetime>0:devel/py-zope.datetime \ - ${PYTHON_PKGNAMEPREFIX}zope.dublincore>0:devel/py-zope.dublincore \ - ${PYTHON_PKGNAMEPREFIX}zope.event>0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>0:devel/py-zope.filerepresentation \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.site>0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.size>0:devel/py-zope.size \ - zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publication>0:devel/py-zope.app.publication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contenttype>0:devel/py-zope.contenttype@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.datetime>0:devel/py-zope.datetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dublincore>0:devel/py-zope.dublincore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>0:devel/py-zope.filerepresentation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.size>0:devel/py-zope.size@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: head/devel/py-zope.app.folder/Makefile =================================================================== --- head/devel/py-zope.app.folder/Makefile +++ head/devel/py-zope.app.folder/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:devel/py-zope.app.content +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:devel/py-zope.app.content@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.form/Makefile =================================================================== --- head/devel/py-zope.app.form/Makefile +++ head/devel/py-zope.app.form/Makefile @@ -13,23 +13,23 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=3.5.1:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=3.5.1:security/py-zope.security@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.generations/Makefile =================================================================== --- head/devel/py-zope.app.generations/Makefile +++ head/devel/py-zope.app.generations/Makefile @@ -13,15 +13,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \ - ${PYTHON_PKGNAMEPREFIX}zope.app.renderer>=0:devel/py-zope.app.renderer \ - ${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:devel/py-zope.applicationcontrol \ - ${PYTHON_PKGNAMEPREFIX}zope.generations>=0:devel/py-zope.generations \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.renderer>=0:devel/py-zope.app.renderer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:devel/py-zope.applicationcontrol@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.generations>=0:devel/py-zope.generations@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.pagetemplate/Makefile =================================================================== --- head/devel/py-zope.app.pagetemplate/Makefile +++ head/devel/py-zope.app.pagetemplate/Makefile @@ -13,20 +13,20 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.12.0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5.0:devel/py-zope.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \ - ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.12.0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5.0:devel/py-zope.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.publication/Makefile =================================================================== --- head/devel/py-zope.app.publication/Makefile +++ head/devel/py-zope.app.publication/Makefile @@ -13,17 +13,17 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12.4:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:devel/py-transaction +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12.4:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:devel/py-transaction@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.publisher/Makefile =================================================================== --- head/devel/py-zope.app.publisher/Makefile +++ head/devel/py-zope.app.publisher/Makefile @@ -13,21 +13,21 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu \ - ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:devel/py-zope.ptresource \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:devel/py-zope.ptresource@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.renderer/Makefile =================================================================== --- head/devel/py-zope.app.renderer/Makefile +++ head/devel/py-zope.app.renderer/Makefile @@ -13,15 +13,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.5:textproc/py-docutils \ - ${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.5:textproc/py-docutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zope.app.rotterdam/Makefile =================================================================== --- head/devel/py-zope.app.rotterdam/Makefile +++ head/devel/py-zope.app.rotterdam/Makefile @@ -13,20 +13,20 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:devel/py-zope.app.basicskin \ - ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \ - ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:devel/py-zope.app.basicskin@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.schema/Makefile =================================================================== --- head/devel/py-zope.app.schema/Makefile +++ head/devel/py-zope.app.schema/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zope.app.testing/Makefile =================================================================== --- head/devel/py-zope.app.testing/Makefile +++ head/devel/py-zope.app.testing/Makefile @@ -13,26 +13,26 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.11.0:devel/py-zope.app.appsetup \ - ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \ - ${PYTHON_PKGNAMEPREFIX}zope.app.debug>=0:devel/py-zope.app.debug \ - ${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:devel/py-zope.app.dependable \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.password>=0:security/py-zope.password \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \ - ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:devel/py-zope.testbrowser \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.11.0:devel/py-zope.app.appsetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.debug>=0:devel/py-zope.app.debug@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:devel/py-zope.app.dependable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.password>=0:security/py-zope.password@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:devel/py-zope.testbrowser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.zcmlfiles/Makefile =================================================================== --- head/devel/py-zope.app.zcmlfiles/Makefile +++ head/devel/py-zope.app.zcmlfiles/Makefile @@ -13,44 +13,44 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \ - ${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove \ - ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.app.applicationcontrol>=0:devel/py-zope.app.applicationcontrol \ - ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:devel/py-zope.app.appsetup \ - ${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:devel/py-zope.app.basicskin \ - ${PYTHON_PKGNAMEPREFIX}zope.app.broken>=0:devel/py-zope.app.broken \ - ${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component \ - ${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container \ - ${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:devel/py-zope.app.content \ - ${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:devel/py-zope.app.dependable \ - ${PYTHON_PKGNAMEPREFIX}zope.app.error>=0:devel/py-zope.app.error \ - ${PYTHON_PKGNAMEPREFIX}zope.app.exception>=0:devel/py-zope.app.exception \ - ${PYTHON_PKGNAMEPREFIX}zope.app.folder>=0:devel/py-zope.app.folder \ - ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \ - ${PYTHON_PKGNAMEPREFIX}zope.app.generations>=0:devel/py-zope.app.generations \ - ${PYTHON_PKGNAMEPREFIX}zope.app.http>=0:devel/py-zope.app.http \ - ${PYTHON_PKGNAMEPREFIX}zope.app.i18n>=0:textproc/py-zope.app.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.app.locales>=3.6.0:textproc/py-zope.app.locales \ - ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.app.principalannotation>=0:security/py-zope.app.principalannotation \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.app.rotterdam>=0:devel/py-zope.app.rotterdam \ - ${PYTHON_PKGNAMEPREFIX}zope.app.schema>=0:devel/py-zope.app.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:security/py-zope.app.security \ - ${PYTHON_PKGNAMEPREFIX}zope.app.wsgi>=0:www/py-zope.app.wsgi \ - ${PYTHON_PKGNAMEPREFIX}zope.app.zopeappgenerations>=0:devel/py-zope.app.zopeappgenerations +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.applicationcontrol>=0:devel/py-zope.app.applicationcontrol@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:devel/py-zope.app.appsetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:devel/py-zope.app.basicskin@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.broken>=0:devel/py-zope.app.broken@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:devel/py-zope.app.content@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:devel/py-zope.app.dependable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.error>=0:devel/py-zope.app.error@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.exception>=0:devel/py-zope.app.exception@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.folder>=0:devel/py-zope.app.folder@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.generations>=0:devel/py-zope.app.generations@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.http>=0:devel/py-zope.app.http@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.i18n>=0:textproc/py-zope.app.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.locales>=3.6.0:textproc/py-zope.app.locales@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.principalannotation>=0:security/py-zope.app.principalannotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.rotterdam>=0:devel/py-zope.app.rotterdam@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.schema>=0:devel/py-zope.app.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:security/py-zope.app.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.wsgi>=0:www/py-zope.app.wsgi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.zopeappgenerations>=0:devel/py-zope.app.zopeappgenerations@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.app.zopeappgenerations/Makefile =================================================================== --- head/devel/py-zope.app.zopeappgenerations/Makefile +++ head/devel/py-zope.app.zopeappgenerations/Makefile @@ -13,14 +13,14 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=0:security/py-zope.app.authentication \ - ${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component \ - ${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove \ - ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore \ - ${PYTHON_PKGNAMEPREFIX}zope.generations>=0:devel/py-zope.generations +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=0:security/py-zope.app.authentication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.generations>=0:devel/py-zope.generations@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.applicationcontrol/Makefile =================================================================== --- head/devel/py-zope.applicationcontrol/Makefile +++ head/devel/py-zope.applicationcontrol/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.broken/Makefile =================================================================== --- head/devel/py-zope.broken/Makefile +++ head/devel/py-zope.broken/Makefile @@ -13,7 +13,7 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist Index: head/devel/py-zope.browser/Makefile =================================================================== --- head/devel/py-zope.browser/Makefile +++ head/devel/py-zope.browser/Makefile @@ -12,7 +12,7 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-zope.browsermenu/Makefile =================================================================== --- head/devel/py-zope.browsermenu/Makefile +++ head/devel/py-zope.browsermenu/Makefile @@ -13,18 +13,18 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5:devel/py-zope.pagetemplate +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5:devel/py-zope.pagetemplate@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.browserpage/Makefile =================================================================== --- head/devel/py-zope.browserpage/Makefile +++ head/devel/py-zope.browserpage/Makefile @@ -12,19 +12,19 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=3.8:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=3.8:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-zope.browserresource/Makefile =================================================================== --- head/devel/py-zope.browserresource/Makefile +++ head/devel/py-zope.browserresource/Makefile @@ -14,15 +14,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>3.7:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>3.7:devel/py-zope.traversing@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist Index: head/devel/py-zope.component/Makefile =================================================================== --- head/devel/py-zope.component/Makefile +++ head/devel/py-zope.component/Makefile @@ -14,8 +14,8 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.0:devel/py-zope.interface@${FLAVOR} NO_ARCH= yes USES= python Index: head/devel/py-zope.componentvocabulary/Makefile =================================================================== --- head/devel/py-zope.componentvocabulary/Makefile +++ head/devel/py-zope.componentvocabulary/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.configuration/Makefile =================================================================== --- head/devel/py-zope.configuration/Makefile +++ head/devel/py-zope.configuration/Makefile @@ -14,9 +14,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zope.container/Makefile =================================================================== --- head/devel/py-zope.container/Makefile +++ head/devel/py-zope.container/Makefile @@ -13,24 +13,24 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=3.5.4:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=3.5.2:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation \ - ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.broken>=0:devel/py-zope.broken \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=3.5.4:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=3.5.2:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.broken>=0:devel/py-zope.broken@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.contentprovider/Makefile =================================================================== --- head/devel/py-zope.contentprovider/Makefile +++ head/devel/py-zope.contentprovider/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1dev:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1dev:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zope.copy/Makefile =================================================================== --- head/devel/py-zope.copy/Makefile +++ head/devel/py-zope.copy/Makefile @@ -13,7 +13,7 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zope.copypastemove/Makefile =================================================================== --- head/devel/py-zope.copypastemove/Makefile +++ head/devel/py-zope.copypastemove/Makefile @@ -13,17 +13,17 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.copy>=0:devel/py-zope.copy \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.copy>=0:devel/py-zope.copy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.deferredimport/Makefile =================================================================== --- head/devel/py-zope.deferredimport/Makefile +++ head/devel/py-zope.deferredimport/Makefile @@ -13,7 +13,7 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zope.dublincore/Makefile =================================================================== --- head/devel/py-zope.dublincore/Makefile +++ head/devel/py-zope.dublincore/Makefile @@ -13,15 +13,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.error/Makefile =================================================================== --- head/devel/py-zope.error/Makefile +++ head/devel/py-zope.error/Makefile @@ -13,12 +13,12 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.exceptions/Makefile =================================================================== --- head/devel/py-zope.exceptions/Makefile +++ head/devel/py-zope.exceptions/Makefile @@ -14,7 +14,7 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zope.filerepresentation/Makefile =================================================================== --- head/devel/py-zope.filerepresentation/Makefile +++ head/devel/py-zope.filerepresentation/Makefile @@ -13,8 +13,8 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zope.formlib/Makefile =================================================================== --- head/devel/py-zope.formlib/Makefile +++ head/devel/py-zope.formlib/Makefile @@ -13,23 +13,23 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/devel/py-zope.generations/Makefile =================================================================== --- head/devel/py-zope.generations/Makefile +++ head/devel/py-zope.generations/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zope.globalrequest/Makefile =================================================================== --- head/devel/py-zope.globalrequest/Makefile +++ head/devel/py-zope.globalrequest/Makefile @@ -12,9 +12,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/devel/py-zope.i18n/Makefile =================================================================== --- head/devel/py-zope.i18n/Makefile +++ head/devel/py-zope.i18n/Makefile @@ -12,12 +12,12 @@ MAINTAINER= zope@FreeBSD.org COMMENT= Zope Internationalization Support -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} USES= gettext python USE_PYTHON= autoplist distutils Index: head/devel/py-zope.lifecycleevent/Makefile =================================================================== --- head/devel/py-zope.lifecycleevent/Makefile +++ head/devel/py-zope.lifecycleevent/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zope.location/Makefile =================================================================== --- head/devel/py-zope.location/Makefile +++ head/devel/py-zope.location/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>3.3:net/py-zope.proxy \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>3.3:net/py-zope.proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6:devel/py-zope.schema@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zope.minmax/Makefile =================================================================== --- head/devel/py-zope.minmax/Makefile +++ head/devel/py-zope.minmax/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.pagetemplate/Makefile =================================================================== --- head/devel/py-zope.pagetemplate/Makefile +++ head/devel/py-zope.pagetemplate/Makefile @@ -13,16 +13,16 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \ - ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.processlifetime/Makefile =================================================================== --- head/devel/py-zope.processlifetime/Makefile +++ head/devel/py-zope.processlifetime/Makefile @@ -13,7 +13,7 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zope.ptresource/Makefile =================================================================== --- head/devel/py-zope.ptresource/Makefile +++ head/devel/py-zope.ptresource/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.publisher/Makefile =================================================================== --- head/devel/py-zope.publisher/Makefile +++ head/devel/py-zope.publisher/Makefile @@ -13,19 +13,19 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=3.5:devel/py-zope.contenttype \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=3.5:devel/py-zope.contenttype@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} -USES= python:2 zip +USES= python zip USE_PYTHON= autoplist distutils .include Index: head/devel/py-zope.ramcache/Makefile =================================================================== --- head/devel/py-zope.ramcache/Makefile +++ head/devel/py-zope.ramcache/Makefile @@ -13,12 +13,12 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.schema/Makefile =================================================================== --- head/devel/py-zope.schema/Makefile +++ head/devel/py-zope.schema/Makefile @@ -13,8 +13,8 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zope.site/Makefile =================================================================== --- head/devel/py-zope.site/Makefile +++ head/devel/py-zope.site/Makefile @@ -13,16 +13,16 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:devel/py-zope.location +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:devel/py-zope.location@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.size/Makefile =================================================================== --- head/devel/py-zope.size/Makefile +++ head/devel/py-zope.size/Makefile @@ -13,8 +13,8 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zope.tales/Makefile =================================================================== --- head/devel/py-zope.tales/Makefile +++ head/devel/py-zope.tales/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} -USES= python:2 +USES= python USE_PYTHON= distutils autoplist .include Index: head/devel/py-zope.testbrowser/Makefile =================================================================== --- head/devel/py-zope.testbrowser/Makefile +++ head/devel/py-zope.testbrowser/Makefile @@ -12,11 +12,11 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mechanize>=0.2.0:www/py-mechanize \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mechanize>=0.2.0:www/py-mechanize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist Index: head/devel/py-zope.testing/Makefile =================================================================== --- head/devel/py-zope.testing/Makefile +++ head/devel/py-zope.testing/Makefile @@ -14,8 +14,8 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/devel/py-zope.traversing/Makefile =================================================================== --- head/devel/py-zope.traversing/Makefile +++ head/devel/py-zope.traversing/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:net/py-zope.proxy \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:devel/py-zope.location +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:net/py-zope.proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:devel/py-zope.location@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist Index: head/devel/py-zope.viewlet/Makefile =================================================================== --- head/devel/py-zope.viewlet/Makefile +++ head/devel/py-zope.viewlet/Makefile @@ -13,19 +13,19 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/py27-setuptools/Makefile =================================================================== --- head/devel/py27-setuptools/Makefile +++ head/devel/py27-setuptools/Makefile @@ -1,47 +0,0 @@ -# $FreeBSD$ - -PORTNAME= setuptools -PORTVERSION= 36.5.0 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DIST_SUBDIR= python - -MAINTAINER= python@FreeBSD.org -COMMENT= Python packages installer - -LICENSE= PSFL - -NO_ARCH= yes -USES?= python:2.7 -USES+= zip -USE_PYTHON= autoplist concurrent distutils - -PYDISTUTILS_SETUP= ${PYSETUP} - -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}distribute-[0-9]* -MAKE_ENV+= SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 - -PLIST_FILES= "@sample %%PYTHON_SITELIBDIR%%/easy-install.pth.dist %%PYTHON_SITELIBDIR%%/easy-install.pth" - -.include - -.if ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION} -SUB_FILES+= pkg-message -SUB_LIST+= PYTHON_VER=${PYTHON_VER} -.endif - -# These create dependency loops in redports/poudriere, because setuptools -# is currently an explicit BUILD & RUN dependency in Uses/python.mk. -#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest -#.if ${PYTHON_REL} < 3300 -#TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock -#.endif - -post-install: - ${INSTALL_DATA} ${FILESDIR}/easy-install.pth.dist ${STAGEDIR}${PYTHON_SITELIBDIR}/ - -do-test: - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - -.include Index: head/devel/py27-setuptools/distinfo =================================================================== --- head/devel/py27-setuptools/distinfo +++ head/devel/py27-setuptools/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1507100095 -SHA256 (python/setuptools-36.5.0.zip) = ce2007c1cea3359870b80657d634253a0765b0c7dc5a988d77ba803fc86f2c64 -SIZE (python/setuptools-36.5.0.zip) = 721505 Index: head/devel/py27-setuptools/files/easy-install.pth.dist =================================================================== --- head/devel/py27-setuptools/files/easy-install.pth.dist +++ head/devel/py27-setuptools/files/easy-install.pth.dist @@ -1,2 +0,0 @@ -import sys; sys.__plen = len(sys.path) -import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new) Index: head/devel/py27-setuptools/files/pkg-message.in =================================================================== --- head/devel/py27-setuptools/files/pkg-message.in +++ head/devel/py27-setuptools/files/pkg-message.in @@ -1,7 +0,0 @@ - -******************************************************************* - - Only %%PREFIX%%/bin/easy_install-%%PYTHON_VER%% script has been installed - since Python %%PYTHON_VER%% is not the default Python version. - -******************************************************************* Index: head/devel/py27-setuptools/pkg-descr =================================================================== --- head/devel/py27-setuptools/pkg-descr +++ head/devel/py27-setuptools/pkg-descr @@ -1,10 +0,0 @@ -Setuptools is a fully-featured, actively-maintained, and stable library -designed to facilitate packaging Python projects, where packaging includes: - - Python package and module definitions - - Distribution package metadata - - Test hooks - - Project installation - - Platform-specific details - - Python 3 support - -WWW: https://pypi.python.org/pypi/setuptools Index: head/devel/py3-Jinja2/Makefile =================================================================== --- head/devel/py3-Jinja2/Makefile +++ head/devel/py3-Jinja2/Makefile @@ -1,47 +0,0 @@ -# Created by: Muhammad Moinur Rahman -# $FreeBSD$ - -PORTNAME= Jinja2 -PORTVERSION= 2.9.6 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX?= - -MAINTAINER= bofh@FreeBSD.org -COMMENT= Fast and easy to use stand-alone template engine - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:textproc/py3-MarkupSafe -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:textproc/py3-MarkupSafe - -NO_ARCH= yes -USES= python:3.5+ -USE_PYTHON= autoplist concurrent distutils - -OPTIONS_DEFINE= BABEL EXAMPLES -OPTIONS_DEFAULT= BABEL -BABEL_DESC= Enable Babel extension - -BABEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py3-babel - -PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} -PY2TO3_ARGS= --fix=all --no-diffs --nobackups --verbose --write - -PORTEXAMPLES= * - -post-build-EXAMPLES-on: - ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples - ${PYTHON_CMD} -m compileall ${WRKSRC}/examples ; \ - ${PYTHON_CMD} -O -m compileall ${WRKSRC}/examples - -do-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) - -check regression-test test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - -.include Index: head/devel/py3-Jinja2/distinfo =================================================================== --- head/devel/py3-Jinja2/distinfo +++ head/devel/py3-Jinja2/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1496757802 -SHA256 (Jinja2-2.9.6.tar.gz) = ddaa01a212cd6d641401cb01b605f4a4d9f37bfc93043d7f760ec70fb99ff9ff -SIZE (Jinja2-2.9.6.tar.gz) = 437659 Index: head/devel/py3-Jinja2/pkg-descr =================================================================== --- head/devel/py3-Jinja2/pkg-descr +++ head/devel/py3-Jinja2/pkg-descr @@ -1,6 +0,0 @@ -Jinja is a sandboxed template engine written in pure Python licensed -under the BSD license. It provides a Django-like non-XML syntax and -compiles templates into executable python code. It's basically a -combination of Django templates and python code. - -WWW: http://jinja.pocoo.org/ Index: head/devel/py3-apipkg/Makefile =================================================================== --- head/devel/py3-apipkg/Makefile +++ head/devel/py3-apipkg/Makefile @@ -1,8 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-apipkg - -USES= python:3.1+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-asttokens/Makefile =================================================================== --- head/devel/py3-asttokens/Makefile +++ head/devel/py3-asttokens/Makefile @@ -1,10 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-asttokens - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py3-six - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-babel/Makefile =================================================================== --- head/devel/py3-babel/Makefile +++ head/devel/py3-babel/Makefile @@ -1,32 +0,0 @@ -# Created by: Muhammad Moinur Rahman -# $FreeBSD$ - -PORTNAME= Babel -PORTVERSION= 2.5.1 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= bofh@FreeBSD.org -COMMENT= Collection of tools for internationalizing Python applications - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py3-pytz - -USES= python:3.3+ -USE_PYTHON= autoplist concurrent distutils -NO_ARCH= yes - -PORTDOCS= docs/* - -OPTIONS_DEFINE= DOCS - -do-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for docfile in ${PORTDOCS} - ${CP} -r ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} -.endfor - -.include Index: head/devel/py3-babel/distinfo =================================================================== --- head/devel/py3-babel/distinfo +++ head/devel/py3-babel/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1505757363 -SHA256 (Babel-2.5.1.tar.gz) = 6007daf714d0cd5524bbe436e2d42b3c20e68da66289559341e48d2cd6d25811 -SIZE (Babel-2.5.1.tar.gz) = 6612869 Index: head/devel/py3-babel/pkg-descr =================================================================== --- head/devel/py3-babel/pkg-descr +++ head/devel/py3-babel/pkg-descr @@ -1,9 +0,0 @@ -Babel is composed of two major parts: - - * tools to build and work with gettext message catalogs - - * a Python interface to the CLDR (Common Locale Data Repository), - providing access to various locale display names, localized - number and date formatting, etc. - -WWW: http://babel.pocoo.org/ Index: head/devel/py3-babel/pkg-plist =================================================================== --- head/devel/py3-babel/pkg-plist +++ head/devel/py3-babel/pkg-plist @@ -1,43 +0,0 @@ -%%PORTDOCS%%%%DOCSDIR%%/Makefile -%%PORTDOCS%%%%DOCSDIR%%/_static/logo.pdf -%%PORTDOCS%%%%DOCSDIR%%/_static/logo.png -%%PORTDOCS%%%%DOCSDIR%%/_static/logo_small.png -%%PORTDOCS%%%%DOCSDIR%%/_templates/sidebar-about.html -%%PORTDOCS%%%%DOCSDIR%%/_templates/sidebar-links.html -%%PORTDOCS%%%%DOCSDIR%%/_templates/sidebar-logo.html -%%PORTDOCS%%%%DOCSDIR%%/_themes/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/_themes/README -%%PORTDOCS%%%%DOCSDIR%%/_themes/babel/layout.html -%%PORTDOCS%%%%DOCSDIR%%/_themes/babel/relations.html -%%PORTDOCS%%%%DOCSDIR%%/_themes/babel/static/babel.css_t -%%PORTDOCS%%%%DOCSDIR%%/_themes/babel/static/small_babel.css -%%PORTDOCS%%%%DOCSDIR%%/_themes/babel/theme.conf -%%PORTDOCS%%%%DOCSDIR%%/api/core.rst -%%PORTDOCS%%%%DOCSDIR%%/api/dates.rst -%%PORTDOCS%%%%DOCSDIR%%/api/index.rst -%%PORTDOCS%%%%DOCSDIR%%/api/languages.rst -%%PORTDOCS%%%%DOCSDIR%%/api/lists.rst -%%PORTDOCS%%%%DOCSDIR%%/api/messages/catalog.rst -%%PORTDOCS%%%%DOCSDIR%%/api/messages/extract.rst -%%PORTDOCS%%%%DOCSDIR%%/api/messages/index.rst -%%PORTDOCS%%%%DOCSDIR%%/api/messages/mofile.rst -%%PORTDOCS%%%%DOCSDIR%%/api/messages/pofile.rst -%%PORTDOCS%%%%DOCSDIR%%/api/numbers.rst -%%PORTDOCS%%%%DOCSDIR%%/api/plural.rst -%%PORTDOCS%%%%DOCSDIR%%/api/support.rst -%%PORTDOCS%%%%DOCSDIR%%/api/units.rst -%%PORTDOCS%%%%DOCSDIR%%/changelog.rst -%%PORTDOCS%%%%DOCSDIR%%/cmdline.rst -%%PORTDOCS%%%%DOCSDIR%%/conf.py -%%PORTDOCS%%%%DOCSDIR%%/dates.rst -%%PORTDOCS%%%%DOCSDIR%%/dev.rst -%%PORTDOCS%%%%DOCSDIR%%/index.rst -%%PORTDOCS%%%%DOCSDIR%%/installation.rst -%%PORTDOCS%%%%DOCSDIR%%/intro.rst -%%PORTDOCS%%%%DOCSDIR%%/license.rst -%%PORTDOCS%%%%DOCSDIR%%/locale.rst -%%PORTDOCS%%%%DOCSDIR%%/make.bat -%%PORTDOCS%%%%DOCSDIR%%/messages.rst -%%PORTDOCS%%%%DOCSDIR%%/numbers.rst -%%PORTDOCS%%%%DOCSDIR%%/setup.rst -%%PORTDOCS%%%%DOCSDIR%%/support.rst Index: head/devel/py3-cffi/Makefile =================================================================== --- head/devel/py3-cffi/Makefile +++ head/devel/py3-cffi/Makefile @@ -1,9 +0,0 @@ -# $FreeBSD$ -# -MASTERDIR= ${.CURDIR}/../py-cffi - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py3-pycparser - -USES= localbase python:3.3+ compiler - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-click-log/Makefile =================================================================== --- head/devel/py3-click-log/Makefile +++ head/devel/py3-click-log/Makefile @@ -1,12 +0,0 @@ -# Created by: rs.os -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-click-log - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py3-click -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py3-click \ - ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-click-threading/Makefile =================================================================== --- head/devel/py3-click-threading/Makefile +++ head/devel/py3-click-threading/Makefile @@ -1,12 +0,0 @@ -# Created by: rs.os -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-click-threading - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py3-click -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest \ - ${RUN_DEPENDS} - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-click/Makefile =================================================================== --- head/devel/py3-click/Makefile +++ head/devel/py3-click/Makefile @@ -1,8 +0,0 @@ -# Created by: Philip Paeps -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-click - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-colorama/Makefile =================================================================== --- head/devel/py3-colorama/Makefile +++ head/devel/py3-colorama/Makefile @@ -1,8 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-colorama - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-coloredlogs/Makefile =================================================================== --- head/devel/py3-coloredlogs/Makefile +++ head/devel/py3-coloredlogs/Makefile @@ -1,11 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-coloredlogs - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}humanfriendly>=2.1:textproc/py3-humanfriendly - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-dateutil/Makefile =================================================================== --- head/devel/py3-dateutil/Makefile +++ head/devel/py3-dateutil/Makefile @@ -1,10 +0,0 @@ -# Created by: rs.os -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-dateutil - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py3-six - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-dbus/Makefile =================================================================== --- head/devel/py3-dbus/Makefile +++ head/devel/py3-dbus/Makefile @@ -1,16 +0,0 @@ -# Created by: Joe Marcus Clarke -# $FreeBSD$ - -PORTREVISION= 1 - -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= - -COMMENT= Python3 bindings for the D-BUS messaging system - -SLAVE_PORT= python3 - -MASTERDIR= ${.CURDIR}/../../devel/pydbus-common -PLIST= ${.CURDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-dbus/distinfo =================================================================== --- head/devel/py3-dbus/distinfo +++ head/devel/py3-dbus/distinfo @@ -1,2 +0,0 @@ -SHA256 (dbus-python-1.1.1.tar.gz) = 8917ca4fb8f4d693aee18d200cbad166b2c938dfb88c03bb4ab3d90a7c915e88 -SIZE (dbus-python-1.1.1.tar.gz) = 596476 Index: head/devel/py3-dbus/pkg-descr =================================================================== --- head/devel/py3-dbus/pkg-descr +++ head/devel/py3-dbus/pkg-descr @@ -1,3 +0,0 @@ -Python bindings for the D-BUS interprocess messaging system. - -WWW: http://dbus.freedesktop.org/doc/dbus-python/ Index: head/devel/py3-dbus/pkg-plist =================================================================== --- head/devel/py3-dbus/pkg-plist +++ head/devel/py3-dbus/pkg-plist @@ -1,56 +0,0 @@ -%%PYTHON_SITELIBDIR%%/_dbus_bindings.so -%%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.so -%%PYTHON_SITELIBDIR%%/dbus/__init__.py -%%PYTHON_SITELIBDIR%%/dbus/__init__.pyc -%%PYTHON_SITELIBDIR%%/dbus/__init__.pyo -%%PYTHON_SITELIBDIR%%/dbus/_compat.py -%%PYTHON_SITELIBDIR%%/dbus/_compat.pyc -%%PYTHON_SITELIBDIR%%/dbus/_compat.pyo -%%PYTHON_SITELIBDIR%%/dbus/_dbus.py -%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyc -%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyo -%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.py -%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.pyc -%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.pyo -%%PYTHON_SITELIBDIR%%/dbus/_version.py -%%PYTHON_SITELIBDIR%%/dbus/_version.pyc -%%PYTHON_SITELIBDIR%%/dbus/_version.pyo -%%PYTHON_SITELIBDIR%%/dbus/bus.py -%%PYTHON_SITELIBDIR%%/dbus/bus.pyc -%%PYTHON_SITELIBDIR%%/dbus/bus.pyo -%%PYTHON_SITELIBDIR%%/dbus/connection.py -%%PYTHON_SITELIBDIR%%/dbus/connection.pyc -%%PYTHON_SITELIBDIR%%/dbus/connection.pyo -%%PYTHON_SITELIBDIR%%/dbus/decorators.py -%%PYTHON_SITELIBDIR%%/dbus/decorators.pyc -%%PYTHON_SITELIBDIR%%/dbus/decorators.pyo -%%PYTHON_SITELIBDIR%%/dbus/exceptions.py -%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyc -%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyo -%%PYTHON_SITELIBDIR%%/dbus/gi_service.py -%%PYTHON_SITELIBDIR%%/dbus/gi_service.pyc -%%PYTHON_SITELIBDIR%%/dbus/gi_service.pyo -%%PYTHON_SITELIBDIR%%/dbus/glib.py -%%PYTHON_SITELIBDIR%%/dbus/glib.pyc -%%PYTHON_SITELIBDIR%%/dbus/glib.pyo -%%PYTHON_SITELIBDIR%%/dbus/lowlevel.py -%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyc -%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyo -%%PYTHON_SITELIBDIR%%/dbus/proxies.py -%%PYTHON_SITELIBDIR%%/dbus/proxies.pyc -%%PYTHON_SITELIBDIR%%/dbus/proxies.pyo -%%PYTHON_SITELIBDIR%%/dbus/server.py -%%PYTHON_SITELIBDIR%%/dbus/server.pyc -%%PYTHON_SITELIBDIR%%/dbus/server.pyo -%%PYTHON_SITELIBDIR%%/dbus/service.py -%%PYTHON_SITELIBDIR%%/dbus/service.pyc -%%PYTHON_SITELIBDIR%%/dbus/service.pyo -%%PYTHON_SITELIBDIR%%/dbus/types.py -%%PYTHON_SITELIBDIR%%/dbus/types.pyc -%%PYTHON_SITELIBDIR%%/dbus/types.pyo -%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.py -%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.pyc -%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.pyo -%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.py -%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.pyc -%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.pyo Index: head/devel/py3-defusedxml/Makefile =================================================================== --- head/devel/py3-defusedxml/Makefile +++ head/devel/py3-defusedxml/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-defusedxml - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-docopt/Makefile =================================================================== --- head/devel/py3-docopt/Makefile +++ head/devel/py3-docopt/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-docopt - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-flake8-builtins/Makefile =================================================================== --- head/devel/py3-flake8-builtins/Makefile +++ head/devel/py3-flake8-builtins/Makefile @@ -1,10 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-flake8-builtins - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py3-flake8 - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-flake8-docstrings/Makefile =================================================================== --- head/devel/py3-flake8-docstrings/Makefile +++ head/devel/py3-flake8-docstrings/Makefile @@ -1,12 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-flake8-docstrings - -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py3-flake8 \ - ${PYTHON_PKGNAMEPREFIX}flake8-polyfill>=0:devel/py3-flake8-polyfill \ - ${PYTHON_PKGNAMEPREFIX}pydocstyle>=0:devel/py3-pydocstyle - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-flake8-import-order/Makefile =================================================================== --- head/devel/py3-flake8-import-order/Makefile +++ head/devel/py3-flake8-import-order/Makefile @@ -1,11 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-flake8-import-order - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycodestyle>=0:devel/py3-pycodestyle \ - ${PYTHON_PKGNAMEPREFIX}asttokens>=0:devel/py3-asttokens - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-flake8-polyfill/Makefile =================================================================== --- head/devel/py3-flake8-polyfill/Makefile +++ head/devel/py3-flake8-polyfill/Makefile @@ -1,10 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-flake8-polyfill - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py3-flake8 - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-flake8-quotes/Makefile =================================================================== --- head/devel/py3-flake8-quotes/Makefile +++ head/devel/py3-flake8-quotes/Makefile @@ -1,10 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-flake8-quotes - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py3-flake8 - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-flake8/Makefile =================================================================== --- head/devel/py3-flake8/Makefile +++ head/devel/py3-flake8/Makefile @@ -1,13 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-flake8 - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py3-pytest-runner -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mccabe>=0.5.0:devel/py3-mccabe \ - ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.0.0:devel/py3-pycodestyle \ - ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.8.1:devel/py3-pyflakes - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-freezegun/Makefile =================================================================== --- head/devel/py3-freezegun/Makefile +++ head/devel/py3-freezegun/Makefile @@ -1,14 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-freezegun - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py3-six \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py3-dateutil -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py3-nose \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py${PYTHON_SUFFIX}-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py3-mock - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-gobject3/Makefile =================================================================== --- head/devel/py3-gobject3/Makefile +++ head/devel/py3-gobject3/Makefile @@ -1,14 +0,0 @@ -# Created by: Joe Marcus Clarke -# $FreeBSD$ - -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= 3 - -COMMENT= Python 3 bindings for GObject - -SLAVE_PORT= python3 - -MASTERDIR= ${.CURDIR}/../../devel/pygobject3-common -PLIST= ${.CURDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-gobject3/pkg-plist =================================================================== --- head/devel/py3-gobject3/pkg-plist +++ head/devel/py3-gobject3/pkg-plist @@ -1,78 +0,0 @@ -%%PYTHON_SITELIBDIR%%/gi/__init__.py -%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/_constants.py -%%PYTHON_SITELIBDIR%%/gi/_error.py -%%PYTHON_SITELIBDIR%%/gi/_gi.so -%%PYTHON_SITELIBDIR%%/gi/_gi_cairo.so -%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.py -%%PYTHON_SITELIBDIR%%/gi/_gobject/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/_gobject/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/_option.py -%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.py -%%PYTHON_SITELIBDIR%%/gi/_signalhelper.py -%%PYTHON_SITELIBDIR%%/gi/docstring.py -%%PYTHON_SITELIBDIR%%/gi/importer.py -%%PYTHON_SITELIBDIR%%/gi/module.py -%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.py -%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.py -%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.py -%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.py -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.py -%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.py -%%PYTHON_SITELIBDIR%%/gi/repository/__init__.py -%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/types.py -%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VER%%-%%OPSYS%%-%%UNAME_R%%-%%UNAME_M%%.egg-info -%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py -%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.py -%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py Index: head/devel/py3-hgtools/Makefile =================================================================== --- head/devel/py3-hgtools/Makefile +++ head/devel/py3-hgtools/Makefile @@ -1,8 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-hgtools - -USES= python:3 zip - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-icalendar/Makefile =================================================================== --- head/devel/py3-icalendar/Makefile +++ head/devel/py3-icalendar/Makefile @@ -1,11 +0,0 @@ -# Created by: rs.os -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-icalendar - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py3-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py3-pytz - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-jedi/Makefile =================================================================== --- head/devel/py3-jedi/Makefile +++ head/devel/py3-jedi/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-jedi - -USES= python:3.1+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-jsonschema/Makefile =================================================================== --- head/devel/py3-jsonschema/Makefile +++ head/devel/py3-jsonschema/Makefile @@ -1,21 +0,0 @@ -# Created by: Muhammad Moinur Rahman -# $FreeBSD$ - -PORTNAME= jsonschema -PORTVERSION= 2.6.0 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= bofh@FreeBSD.org -COMMENT= JSON Schema validation for Python - -LICENSE= MIT - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py3-vcversioner - -USES= python:3 -USE_PYTHON= autoplist distutils -NO_ARCH= yes - -.include Index: head/devel/py3-jsonschema/distinfo =================================================================== --- head/devel/py3-jsonschema/distinfo +++ head/devel/py3-jsonschema/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1488112296 -SHA256 (jsonschema-2.6.0.tar.gz) = 6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02 -SIZE (jsonschema-2.6.0.tar.gz) = 53252 Index: head/devel/py3-jsonschema/pkg-descr =================================================================== --- head/devel/py3-jsonschema/pkg-descr +++ head/devel/py3-jsonschema/pkg-descr @@ -1,8 +0,0 @@ -jsonschema is an implementation of JSON Schema for Python - - - Full support for Draft 3 and Draft 4 of the schema. - - Lazy validation that can iteratively report all validation errors. - - Small and extensible - - Programmatic querying of which properties or items failed validation. - -WWW: https://github.com/Julian/jsonschema Index: head/devel/py3-libpeas/Makefile =================================================================== --- head/devel/py3-libpeas/Makefile +++ head/devel/py3-libpeas/Makefile @@ -1,22 +0,0 @@ -# Created by: Koop Mast -# $FreeBSD$ - -PORTNAME= libpeas -PORTREVISION= 0 -CATEGORIES= devel gnome -MASTER_SITES= GNOME -DIST_SUBDIR= gnome3 -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -COMMENT= libpeas Python 3 support - -LIB_DEPENDS+= libpeas-1.0.so:devel/libpeas - -LIBPEAS_SLAVE= python3 - -BUILD_WRKSRC= ${WRKSRC}/loaders/python3 -INSTALL_WRKSRC= ${WRKSRC}/loaders/python3 - -MASTERDIR= ${.CURDIR}/../../devel/libpeas/ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-libpeas/pkg-plist =================================================================== --- head/devel/py3-libpeas/pkg-plist +++ head/devel/py3-libpeas/pkg-plist @@ -1 +0,0 @@ -lib/libpeas-1.0/loaders/libpython3loader.so Index: head/devel/py3-libzfs/Makefile =================================================================== --- head/devel/py3-libzfs/Makefile +++ head/devel/py3-libzfs/Makefile @@ -1,6 +0,0 @@ - -MASTERDIR= ${.CURDIR}/../py-libzfs - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-llfuse/Makefile =================================================================== --- head/devel/py3-llfuse/Makefile +++ head/devel/py3-llfuse/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-llfuse - -USES= compiler:c++11-lang fuse pkgconfig python:3.2+ tar:bz2 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-lxml/Makefile =================================================================== --- head/devel/py3-lxml/Makefile +++ head/devel/py3-lxml/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-lxml - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-mccabe/Makefile =================================================================== --- head/devel/py3-mccabe/Makefile +++ head/devel/py3-mccabe/Makefile @@ -1,10 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-mccabe - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py3-pytest-runner - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-mock/Makefile =================================================================== --- head/devel/py3-mock/Makefile +++ head/devel/py3-mock/Makefile @@ -1,12 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-mock - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py3-pbr \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py3-six -TESTS_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py3-tox - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-nose/Makefile =================================================================== --- head/devel/py3-nose/Makefile +++ head/devel/py3-nose/Makefile @@ -1,8 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-nose - -USES= python:3.1+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pbr/Makefile =================================================================== --- head/devel/py3-pbr/Makefile +++ head/devel/py3-pbr/Makefile @@ -1,10 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pbr - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py3-pip - -USES= python:3.3+ shebangfix - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pip/Makefile =================================================================== --- head/devel/py3-pip/Makefile +++ head/devel/py3-pip/Makefile @@ -1,24 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pip - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py3-pytest-capturelog \ - ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py3-pytest-timeout \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py3-pytest-xdist \ - ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.10:devel/py3-virtualenv \ - ${PYTHON_PKGNAMEPREFIX}scripttest>=1.3:devel/py3-scripttest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py3-mock \ - ${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py3-pretend \ - ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py3-freezegun \ - git>0:devel/git \ - bzr>0:devel/bzr - -DOCS_BUILD_DEPENDS= sphinx-build:textproc/py3-sphinx - -PORTSCOUT= ignore:1 - -USES= python:3.3+ shebangfix - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pluggy/Makefile =================================================================== --- head/devel/py3-pluggy/Makefile +++ head/devel/py3-pluggy/Makefile @@ -1,10 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pluggy - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-ply/Makefile =================================================================== --- head/devel/py3-ply/Makefile +++ head/devel/py3-ply/Makefile @@ -1,8 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-ply - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pretend/Makefile =================================================================== --- head/devel/py3-pretend/Makefile +++ head/devel/py3-pretend/Makefile @@ -1,10 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pretend - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-prompt_toolkit/Makefile =================================================================== --- head/devel/py3-prompt_toolkit/Makefile +++ head/devel/py3-prompt_toolkit/Makefile @@ -1,12 +0,0 @@ -# $FreeBSD$ - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py3-six \ - ${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py3-wcwidth - -USES= python:3.3+ - -PORTSCOUT= ignore:1 - -MASTERDIR= ${.CURDIR}/../py-prompt_toolkit - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-protobuf/Makefile =================================================================== --- head/devel/py3-protobuf/Makefile +++ head/devel/py3-protobuf/Makefile @@ -1,9 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-protobuf - -PORTSCOUT= ignore:1 - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-py/Makefile =================================================================== --- head/devel/py3-py/Makefile +++ head/devel/py3-py/Makefile @@ -1,9 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-py - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pyasn1/Makefile =================================================================== --- head/devel/py3-pyasn1/Makefile +++ head/devel/py3-pyasn1/Makefile @@ -1,8 +0,0 @@ -# Created by: Martin Jackson -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pyasn1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pycodestyle/Makefile =================================================================== --- head/devel/py3-pycodestyle/Makefile +++ head/devel/py3-pycodestyle/Makefile @@ -1,8 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pycodestyle - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pycparser/Makefile =================================================================== --- head/devel/py3-pycparser/Makefile +++ head/devel/py3-pycparser/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pycparser - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pydocstyle/Makefile =================================================================== --- head/devel/py3-pydocstyle/Makefile +++ head/devel/py3-pydocstyle/Makefile @@ -1,11 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pydocstyle - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py3-snowballstemmer \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py3-six - -USES= python:3 zip - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pyflakes/Makefile =================================================================== --- head/devel/py3-pyflakes/Makefile +++ head/devel/py3-pyflakes/Makefile @@ -1,8 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pyflakes - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pygit2/Makefile =================================================================== --- head/devel/py3-pygit2/Makefile +++ head/devel/py3-pygit2/Makefile @@ -1,10 +0,0 @@ - -MASTERDIR= ${.CURDIR}/../py-pygit2 - -USES= python:3.3+ - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py3-cffi -RUN_DEPENDS= ${BUILD_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py3-six - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pyicu/Makefile =================================================================== --- head/devel/py3-pyicu/Makefile +++ head/devel/py3-pyicu/Makefile @@ -1,8 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pyicu - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pylru-cache/Makefile =================================================================== --- head/devel/py3-pylru-cache/Makefile +++ head/devel/py3-pylru-cache/Makefile @@ -1,8 +0,0 @@ -# Created by: Philip Paeps -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pylru-cache - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pytest-capturelog/Makefile =================================================================== --- head/devel/py3-pytest-capturelog/Makefile +++ head/devel/py3-pytest-capturelog/Makefile @@ -1,10 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pytest-capturelog - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.1.1:devel/py3-py - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pytest-runner/Makefile =================================================================== --- head/devel/py3-pytest-runner/Makefile +++ head/devel/py3-pytest-runner/Makefile @@ -1,10 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pytest-runner - -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py3-setuptools_scm - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pytest-timeout/Makefile =================================================================== --- head/devel/py3-pytest-timeout/Makefile +++ head/devel/py3-pytest-timeout/Makefile @@ -1,10 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pytest-timeout - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.4:devel/py3-pytest - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pytest-xdist/Makefile =================================================================== --- head/devel/py3-pytest-xdist/Makefile +++ head/devel/py3-pytest-xdist/Makefile @@ -1,15 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pytest-xdist - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py3-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py3-execnet \ - ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py3-pytest \ - ${PYTHON_PKGNAMEPREFIX}py>=1.4.22:devel/py3-py -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py3-pytest \ - ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py3-pexpect - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pytest/Makefile =================================================================== --- head/devel/py3-pytest/Makefile +++ head/devel/py3-pytest/Makefile @@ -1,11 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pytest - -USES= python:3.3+ - -PORTSCOUT= ignore:1 - -SLAVE_SUFFIX= ${PYTHON_MAJOR_VER} - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-python-magic/Makefile =================================================================== --- head/devel/py3-python-magic/Makefile +++ head/devel/py3-python-magic/Makefile @@ -1,8 +0,0 @@ -# Created by: Kubilay Kocak -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-python-magic - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-pytz/Makefile =================================================================== --- head/devel/py3-pytz/Makefile +++ head/devel/py3-pytz/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pytz - -USES= python:3.3+ zip - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-rubymarshal/Makefile =================================================================== --- head/devel/py3-rubymarshal/Makefile +++ head/devel/py3-rubymarshal/Makefile @@ -1,8 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-rubymarshal - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-scripttest/Makefile =================================================================== --- head/devel/py3-scripttest/Makefile +++ head/devel/py3-scripttest/Makefile @@ -1,10 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-scripttest - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-setproctitle/Makefile =================================================================== --- head/devel/py3-setproctitle/Makefile +++ head/devel/py3-setproctitle/Makefile @@ -1,8 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-setproctitle - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-setuptools_scm/Makefile =================================================================== --- head/devel/py3-setuptools_scm/Makefile +++ head/devel/py3-setuptools_scm/Makefile @@ -1,8 +0,0 @@ -# Created by: rs.os -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-setuptools_scm - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-simplejson/Makefile =================================================================== --- head/devel/py3-simplejson/Makefile +++ head/devel/py3-simplejson/Makefile @@ -1,11 +0,0 @@ -# $FreeBSD$ - -PORTREVISION= 1 - -MASTERDIR= ${.CURDIR}/../py-simplejson - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-six/Makefile =================================================================== --- head/devel/py3-six/Makefile +++ head/devel/py3-six/Makefile @@ -1,12 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-six - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-tabulate/Makefile =================================================================== --- head/devel/py3-tabulate/Makefile +++ head/devel/py3-tabulate/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-tabulate - -USES= python:3.1+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-threema-msgapi/Makefile =================================================================== --- head/devel/py3-threema-msgapi/Makefile +++ head/devel/py3-threema-msgapi/Makefile @@ -1,27 +0,0 @@ -# Created by: philip@FreeBSD.org -# $FreeBSD$ - -PORTNAME= threema-msgapi -PORTVERSION= 2.1.8 -DISTVERSIONPREFIX= v -CATEGORIES= devel python -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= philip@FreeBSD.org -COMMENT= Threema Gateway Message SDK for Python - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE - -USES= python:3.2+ -USE_PYTHON= distutils autoplist -USE_GITHUB= yes -GH_ACCOUNT= lgrahl -GH_PROJECT= threema-msgapi-sdk-python - -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py3-click \ - ${PYTHON_PKGNAMEPREFIX}pylru-cache>0:devel/py3-pylru-cache \ - ${PYTHON_PKGNAMEPREFIX}libnacl>0:security/py3-libnacl \ - ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp - -.include Index: head/devel/py3-threema-msgapi/distinfo =================================================================== --- head/devel/py3-threema-msgapi/distinfo +++ head/devel/py3-threema-msgapi/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1481010859 -SHA256 (lgrahl-threema-msgapi-sdk-python-v2.1.8_GH0.tar.gz) = 3ba7cde76d015d23ab026a09c00ee7bd819eed0313fbccd8b9717a1ecb8d4660 -SIZE (lgrahl-threema-msgapi-sdk-python-v2.1.8_GH0.tar.gz) = 24503 Index: head/devel/py3-threema-msgapi/pkg-descr =================================================================== --- head/devel/py3-threema-msgapi/pkg-descr +++ head/devel/py3-threema-msgapi/pkg-descr @@ -1,3 +0,0 @@ -Threema Gateway Message SDK for Python https://gateway.threema.ch/. - -WWW: https://github.com/lgrahl/threema-msgapi-sdk-python/ Index: head/devel/py3-toposort/Makefile =================================================================== --- head/devel/py3-toposort/Makefile +++ head/devel/py3-toposort/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-toposort - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-tox/Makefile =================================================================== --- head/devel/py3-tox/Makefile +++ head/devel/py3-tox/Makefile @@ -1,15 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-tox - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.11.2:devel/py3-virtualenv \ - ${PYTHON_PKGNAMEPREFIX}py>=1.4.17:devel/py3-py \ - ${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py3-pluggy -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py3-tox \ - ${PYTHON_PKGNAMEPREFIX}pytest>=2.3.5:devel/py3-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py3-pytest-timeout - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-tzlocal/Makefile =================================================================== --- head/devel/py3-tzlocal/Makefile +++ head/devel/py3-tzlocal/Makefile @@ -1,10 +0,0 @@ -# Created by: rs.os -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-tzlocal - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py3-pytz - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-urwid/Makefile =================================================================== --- head/devel/py3-urwid/Makefile +++ head/devel/py3-urwid/Makefile @@ -1,10 +0,0 @@ -# Created by: rs.os -# $FreeBSD$ - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -MASTERDIR= ${.CURDIR}/../py-urwid - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-vcversioner/Makefile =================================================================== --- head/devel/py3-vcversioner/Makefile +++ head/devel/py3-vcversioner/Makefile @@ -1,20 +0,0 @@ -# Created by: Muhammad Moinur Rahman -# $FreeBSD$ - -PORTNAME= vcversioner -PORTVERSION= 2.16.0.0 -PORTREVISION= 1 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= bofh@FreeBSD.org -COMMENT= Use version control tags to discover version numbers - -LICENSE= ISCL - -USES= python:3.3+ -USE_PYTHON= distutils autoplist -NO_ARCH= yes - -.include Index: head/devel/py3-vcversioner/distinfo =================================================================== --- head/devel/py3-vcversioner/distinfo +++ head/devel/py3-vcversioner/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1465721148 -SHA256 (vcversioner-2.16.0.0.tar.gz) = dae60c17a479781f44a4010701833f1829140b1eeccd258762a74974aa06e19b -SIZE (vcversioner-2.16.0.0.tar.gz) = 9024 Index: head/devel/py3-vcversioner/pkg-descr =================================================================== --- head/devel/py3-vcversioner/pkg-descr +++ head/devel/py3-vcversioner/pkg-descr @@ -1,5 +0,0 @@ -You can write a setup.py with no version information specified, and -vcversioner will find a recent, properly-formatted VCS tag and extract a -version from it. - -WWW: https://github.com/habnabit/vcversioner Index: head/devel/py3-verboselogs/Makefile =================================================================== --- head/devel/py3-verboselogs/Makefile +++ head/devel/py3-verboselogs/Makefile @@ -1,9 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-verboselogs - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-virtualenv/Makefile =================================================================== --- head/devel/py3-virtualenv/Makefile +++ head/devel/py3-virtualenv/Makefile @@ -1,13 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-virtualenv - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py3-mock - -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py3-sphinx - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-voluptuous/Makefile =================================================================== --- head/devel/py3-voluptuous/Makefile +++ head/devel/py3-voluptuous/Makefile @@ -1,8 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-voluptuous - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-wcwidth/Makefile =================================================================== --- head/devel/py3-wcwidth/Makefile +++ head/devel/py3-wcwidth/Makefile @@ -1,8 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-wcwidth - -USES= python:3.4+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py3-xdg/Makefile =================================================================== --- head/devel/py3-xdg/Makefile +++ head/devel/py3-xdg/Makefile @@ -1,26 +0,0 @@ -# Created by: michael johnson -# $FreeBSD$ -# $MCom: ports/trunk/devel/py3-xdg/Makefile 19571 2014-04-25 18:12:46Z kwm $ - -PORTNAME= xdg -PORTVERSION= 0.25 -PORTREVISION= 1 -CATEGORIES= devel python -MASTER_SITES= http://people.freedesktop.org/~takluyver/ -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= py${PORTNAME}-${PORTVERSION} - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Python 3 library to access freedesktop.org standards - -LICENSE= LGPL20 - -USES= python:3 -USE_PYTHON= distutils autoplist - -post-patch: - @${REINPLACE_CMD} -e \ - 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/xdg/BaseDirectory.py - -.include Index: head/devel/py3-xdg/distinfo =================================================================== --- head/devel/py3-xdg/distinfo +++ head/devel/py3-xdg/distinfo @@ -1,2 +0,0 @@ -SHA256 (pyxdg-0.25.tar.gz) = 81e883e0b9517d624e8b0499eb267b82a815c0b7146d5269f364988ae031279d -SIZE (pyxdg-0.25.tar.gz) = 48935 Index: head/devel/py3-xdg/files/patch-xdg_BaseDirectory.py =================================================================== --- head/devel/py3-xdg/files/patch-xdg_BaseDirectory.py +++ head/devel/py3-xdg/files/patch-xdg_BaseDirectory.py @@ -1,18 +0,0 @@ ---- xdg/BaseDirectory.py.orig 2012-12-06 22:07:26.000000000 +0100 -+++ xdg/BaseDirectory.py 2014-03-04 17:22:23.000000000 +0100 -@@ -32,13 +32,13 @@ - os.path.join(_home, '.local', 'share') - - xdg_data_dirs = [xdg_data_home] + \ -- (os.environ.get('XDG_DATA_DIRS') or '/usr/local/share:/usr/share').split(':') -+ (os.environ.get('XDG_DATA_DIRS') or '%%LOCALBASE%%/share').split(':') - - xdg_config_home = os.environ.get('XDG_CONFIG_HOME') or \ - os.path.join(_home, '.config') - - xdg_config_dirs = [xdg_config_home] + \ -- (os.environ.get('XDG_CONFIG_DIRS') or '/etc/xdg').split(':') -+ (os.environ.get('XDG_CONFIG_DIRS') or '%%LOCALBASE%%/etc/xdg').split(':') - - xdg_cache_home = os.environ.get('XDG_CACHE_HOME') or \ - os.path.join(_home, '.cache') Index: head/devel/py3-xdg/pkg-descr =================================================================== --- head/devel/py3-xdg/pkg-descr +++ head/devel/py3-xdg/pkg-descr @@ -1,11 +0,0 @@ -A python library to access freedesktop.org standards. - -Currently supported are: - o Base Directory Specification - o Menu Specification - o Desktop Entry Specification - o Icon Theme Specification - o Recent File Spec - o Shared-MIME-Database Specification - -WWW: http://freedesktop.org/Software/pyxdg Index: head/devel/py3-yaml/Makefile =================================================================== --- head/devel/py3-yaml/Makefile +++ head/devel/py3-yaml/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-yaml - -USES= python:3.1+ - -.include "${MASTERDIR}/Makefile" Index: head/devel/py34-setuptools/Makefile =================================================================== --- head/devel/py34-setuptools/Makefile +++ head/devel/py34-setuptools/Makefile @@ -1,10 +0,0 @@ -# Created by: Sunpoet Po-Chuan Hsieh -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py27-setuptools - -PORTSCOUT= ignore:1 - -USES= python:3.4 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py35-setuptools/Makefile =================================================================== --- head/devel/py35-setuptools/Makefile +++ head/devel/py35-setuptools/Makefile @@ -1,10 +0,0 @@ -# Created by: Sunpoet Po-Chuan Hsieh -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py27-setuptools - -PORTSCOUT= ignore:1 - -USES= python:3.5 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py36-setuptools/Makefile =================================================================== --- head/devel/py36-setuptools/Makefile +++ head/devel/py36-setuptools/Makefile @@ -1,10 +0,0 @@ -# Created by: Sunpoet Po-Chuan Hsieh -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py27-setuptools - -PORTSCOUT= ignore:1 - -USES= python:3.6 - -.include "${MASTERDIR}/Makefile" Index: head/devel/py_static_check/Makefile =================================================================== --- head/devel/py_static_check/Makefile +++ head/devel/py_static_check/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/devel/pycanberra/Makefile =================================================================== --- head/devel/pycanberra/Makefile +++ head/devel/pycanberra/Makefile @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix USE_GITHUB= yes GH_ACCOUNT= totdb Index: head/devel/pychecker/Makefile =================================================================== --- head/devel/pychecker/Makefile +++ head/devel/pychecker/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/devel/pydbus-common/Makefile =================================================================== --- head/devel/pydbus-common/Makefile +++ head/devel/pydbus-common/Makefile @@ -68,12 +68,8 @@ LIB_DEPENDS+= libdbus-glib-1.so:devel/dbus-glib RUN_DEPENDS+= pydbus-common>=0:devel/pydbus-common USE_LDCONFIG= yes -.if ${SLAVE_PORT} == python2 -USES+= python:2 -.endif -.if ${SLAVE_PORT} == python3 -USES+= python:3 -.endif +USES+= python +USE_PYTHON= flavors post-install: @${RM} -r ${STAGEDIR}${PREFIX}/include/dbus-1.0 \ Index: head/devel/pygobject3-common/Makefile =================================================================== --- head/devel/pygobject3-common/Makefile +++ head/devel/pygobject3-common/Makefile @@ -55,16 +55,16 @@ LIB_DEPENDS+= libffi.so:devel/libffi RUN_DEPENDS+= pygobject3-common>=0:devel/pygobject3-common -.if ${SLAVE_PORT} == python2 -USES+= python:2 -BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo -RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo +.if ${SLAVE_PORT} == python +USES+= python +USE_PYTHON= flavors +.if ${FLAVOR:Upy27:Mpy2*} +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo@${PY_FLAVOR} +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo@${PY_FLAVOR} +.else +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py-cairo@${PY_FLAVOR} +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py-cairo@${PY_FLAVOR} .endif - -.if ${SLAVE_PORT} == python3 -USES+= python:3 -BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py3-cairo -RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py3-cairo .endif post-install: Index: head/devel/pylint/Makefile =================================================================== --- head/devel/pylint/Makefile +++ head/devel/pylint/Makefile @@ -13,13 +13,17 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astroid>=1.5.1:devel/py-astroid \ - ${PYTHON_PKGNAMEPREFIX}editdistance>=0:devel/py-editdistance \ - ${PYTHON_PKGNAMEPREFIX}isort>=4.2.5:devel/py-isort \ - ${PYTHON_PKGNAMEPREFIX}mccabe>=0:devel/py-mccabe \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +py34_BROKEN= Fails to package +py35_BROKEN= Fails to package +py36_BROKEN= Fails to package +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astroid>=1.5.1:devel/py-astroid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}editdistance>=0:devel/py-editdistance@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}isort>=4.2.5:devel/py-isort@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mccabe>=0:devel/py-mccabe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} + NO_ARCH= yes USE_PYTHON= concurrent distutils USES= python shebangfix @@ -29,12 +33,12 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=0:devel/py-backports.functools_lru_cache \ - ${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=0:devel/py-backports.functools_lru_cache@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser@${FLAVOR} .endif .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch@${FLAVOR} .endif .include Index: head/devel/pymacs/Makefile =================================================================== --- head/devel/pymacs/Makefile +++ head/devel/pymacs/Makefile @@ -15,7 +15,7 @@ USE_GITHUB= yes GH_ACCOUNT= pinard -USES= python +USES= python:2.7 USE_EMACS= yes USE_PYTHON= distutils Index: head/devel/pyobfuscate/Makefile =================================================================== --- head/devel/pyobfuscate/Makefile +++ head/devel/pyobfuscate/Makefile @@ -16,7 +16,7 @@ GH_TAGNAME= 47cc6e49bf65649c9fc53fbf4ae7d6e23b565550 USES= python shebangfix -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix NO_ARCH= yes SHEBANG_FILES= *.py pyobfuscate pyobfuscate-install Index: head/devel/pypersrc/Makefile =================================================================== --- head/devel/pypersrc/Makefile +++ head/devel/pypersrc/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE_GPL2.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw@${PY_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} WRKSRC= ${WRKDIR}/${PORTNAME} Index: head/devel/pyrex/Makefile =================================================================== --- head/devel/pyrex/Makefile +++ head/devel/pyrex/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.9.9 CATEGORIES= devel lang python MASTER_SITES= http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/ -PKGNAMEPREFIX= ${PYTHONPKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Pyrex-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org Index: head/devel/pyside/Makefile =================================================================== --- head/devel/pyside/Makefile +++ head/devel/pyside/Makefile @@ -30,6 +30,7 @@ PYTHON_VERSION=${PYTHON_VERSION} USES= cmake python:2 tar:bzip2 +USE_PYTHON= flavors USE_LDCONFIG= yes .include Index: head/devel/pysvn/Makefile =================================================================== --- head/devel/pysvn/Makefile +++ head/devel/pysvn/Makefile @@ -18,16 +18,15 @@ # Python3 ready USES= python -USE_PYTHON= distutils noegginfo +USE_PYTHON= distutils noegginfo concurrent optsuffix PYDISTUTILS_CONFIGURE_TARGET= configure PYDISTUTILS_CONFIGUREARGS= --apr-inc-dir=${LOCALBASE}/include/apr-1 \ --svn-inc-dir=${LOCALBASE}/include/subversion-1 \ --pycxx-dir=${WRKSRC}/../Import/pycxx-6.2.8 \ --pycxx-src-dir=${WRKSRC}/../Import/pycxx-6.2.8/Src -PLIST_SUB= PYTHONVER=${PYTHON_VERSION:S/./_/:S/python//} PLIST_FILES= %%PYTHON_SITELIBDIR%%/${PORTNAME}/__init__.py \ - %%PYTHON_SITELIBDIR%%/${PORTNAME}/_pysvn_%%PYTHONVER%%.so + %%PYTHON_SITELIBDIR%%/${PORTNAME}/_pysvn_${PYTHON_VERSION:S/./_/:S/python//}.so WRKSRC_SUBDIR= Source Index: head/devel/qbzr/Makefile =================================================================== --- head/devel/qbzr/Makefile +++ head/devel/qbzr/Makefile @@ -14,13 +14,13 @@ LICENSE= GPLv2 BUILD_DEPENDS= bzr:devel/bzr \ - ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant + ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${FLAVOR} RUN_DEPENDS= bzr:devel/bzr WRKSRC= ${WRKDIR}/${PORTNAME} -USES= gettext pyqt:4 python +USES= gettext pyqt:4 python:2.7 USE_PYQT= core USE_PYTHON= distutils autoplist USE_QT4= # empty Index: head/devel/qct/Makefile =================================================================== --- head/devel/qct/Makefile +++ head/devel/qct/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= pyqt:4 python +USES= pyqt:4 python:2.7 USE_PYQT= gui USE_PYTHON= distutils WRKSRC= ${WRKDIR}/qct Index: head/devel/rbtools/Makefile =================================================================== --- head/devel/rbtools/Makefile +++ head/devel/rbtools/Makefile @@ -11,14 +11,14 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${FLAVOR} ORIGNAME= RBTools NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist concurrent distutils .include Index: head/devel/renpy/Makefile =================================================================== --- head/devel/renpy/Makefile +++ head/devel/renpy/Makefile @@ -16,13 +16,12 @@ LICENSE_FILE_DejaVu= ${WRKSRC}/renpy/common/DejaVuSans.txt LICENSE_PERMS_DejaVu= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}game_sdl2>0:devel/py-game_sdl2 -BUILD_DEPENDS+= cython:lang/cython +BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}game_sdl2>0:devel/py-game_sdl2@${FLAVOR} LIB_DEPENDS= libfribidi.so:converters/fribidi \ libpng.so:graphics/png \ libavcodec.so:multimedia/ffmpeg \ libfreetype.so:print/freetype2 -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}game_sdl2>=${PORTVERSION}:devel/py-game_sdl2 +RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}game_sdl2>=${PORTVERSION}:devel/py-game_sdl2@${FLAVOR} CONFLICTS_INSTALL?= ${PORTNAME}6-* @@ -31,7 +30,7 @@ USES= python:2.7 shebangfix tar:bz2 USE_GL= glew -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython USE_SDL?= sdl2 EXCLUDE= gen 'module/*.py[co]' 'renpy/*.py[co]' EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} @@ -70,7 +69,7 @@ EXAMPLES_VARS+= PORTDATA+="oldtutorial" .endif TKINTER_DESC= Install Tkinter to allow choosing Projects Directory -TKINTER_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +TKINTER_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} . for lic in FREETYPE LIBJPEG LIBPNG MSVCR90 DIST_VARS+= LICENSE+=${lic} Index: head/devel/runsnakerun/Makefile =================================================================== --- head/devel/runsnakerun/Makefile +++ head/devel/runsnakerun/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}SquareMap>0:x11-toolkits/py-SquareMap \ - ${PYTHON_PKGNAMEPREFIX}meliae>0:devel/py-meliae +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}SquareMap>0:x11-toolkits/py-SquareMap@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}meliae>0:devel/py-meliae@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: head/devel/tailor/Makefile =================================================================== --- head/devel/tailor/Makefile +++ head/devel/tailor/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/rsync:net/rsync -USES= python +USES= python:2.7 USE_PYTHON= distutils NO_ARCH= yes Index: head/devel/tortoisehg/Makefile =================================================================== --- head/devel/tortoisehg/Makefile +++ head/devel/tortoisehg/Makefile @@ -13,8 +13,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING.txt RUN_DEPENDS= hg:devel/mercurial \ - ${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse \ - pygmentize:textproc/py-pygments + ${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse@${FLAVOR} \ + pygmentize:textproc/py-pygments@${FLAVOR} OPTIONS_DEFINE= NAUTILUS NLS NAUTILUS_DESC= Install TortoiseHG Nautilus extension Index: head/devel/trac-bitten/Makefile =================================================================== --- head/devel/trac-bitten/Makefile +++ head/devel/trac-bitten/Makefile @@ -34,7 +34,7 @@ NO_BUILD= yes NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} TOUCH=${TOUCH} CHOWN=${CHOWN} \ RM=${RM:Q} USERS=${USERS} Index: head/devel/viewvc/Makefile =================================================================== --- head/devel/viewvc/Makefile +++ head/devel/viewvc/Makefile @@ -33,8 +33,8 @@ MODPYTHON33_RUN_DEPENDS=${APACHE_PKGNAMEPREFIX}mod_python33>=3.3:www/mod_python33 MODPYTHON35_RUN_DEPENDS=${APACHE_PKGNAMEPREFIX}mod_python35>=3.5:www/mod_python35 MODWSGI_RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_wsgi4>=4.4.13:www/mod_wsgi4 -SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb +SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR} +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${PY_FLAVOR} .include @@ -46,7 +46,7 @@ ECHO=${ECHO} EGREP=${EGREP} TOUCH=${TOUCH} \ CHOWN=${CHOWN} RM=${RM:Q} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} pre-everything:: .if ${PORT_OPTIONS:MAPMOD} && !${PORT_OPTIONS:MAPACHE} Index: head/dns/Makefile =================================================================== --- head/dns/Makefile +++ head/dns/Makefile @@ -187,8 +187,6 @@ SUBDIR += py-pydnstable SUBDIR += py-pywdns SUBDIR += py-tldextract - SUBDIR += py3-dnspython - SUBDIR += py3-idna SUBDIR += radns SUBDIR += rbldnsd SUBDIR += rbllookup Index: head/dns/bundy/Makefile =================================================================== --- head/dns/bundy/Makefile +++ head/dns/bundy/Makefile @@ -19,12 +19,12 @@ BUILD_DEPENDS= ${LOCALBASE}/include/log4cplus/logger.h:devel/log4cplus \ sqlite3>=3.3.9:databases/sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/${PYTHON_PKGNAMEPREFIX}sqlite3 + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} LIB_DEPENDS= libbotan-1.10.so:security/botan110 \ liblog4cplus.so:devel/log4cplus \ libgmp.so:math/gmp \ libsqlite3.so:databases/sqlite3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/${PYTHON_PKGNAMEPREFIX}sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} BROKEN_powerpc64= fails to configure: checking for botan/botan.h... no @@ -32,7 +32,7 @@ GH_ACCOUNT= bundy-dns GH_TAGNAME= e640032 -USES= compiler:c++11-lang pathfix pkgconfig libtool python:3 autoreconf ssl +USES= compiler:c++11-lang pathfix pkgconfig libtool python:3.4+ autoreconf ssl USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: head/dns/dnsrecon/Makefile =================================================================== --- head/dns/dnsrecon/Makefile +++ head/dns/dnsrecon/Makefile @@ -11,9 +11,9 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= darkoperator Index: head/dns/dnsviz/Makefile =================================================================== --- head/dns/dnsviz/Makefile +++ head/dns/dnsviz/Makefile @@ -10,12 +10,12 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.1:graphics/py-pygraphviz \ - ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.24.0:security/py-m2crypto \ - ${PYTHON_PKGNAMEPREFIX}dnspython>=1.11.0:dns/py-dnspython +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.1:graphics/py-pygraphviz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.24.0:security/py-m2crypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dnspython>=1.11.0:dns/py-dnspython@${FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix USE_GITHUB= yes PYDISTUTILS_INSTALLNOSINGLE= yes Index: head/dns/ldns/Makefile =================================================================== --- head/dns/ldns/Makefile +++ head/dns/ldns/Makefile @@ -59,13 +59,14 @@ .if defined(BUILD_PYLDNS) USES+= python +USE_PYTHON= flavors PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} ALL_TARGET= pyldns INSTALL_TARGET= install-pyldns CONFIGURE_ARGS+=--with-pyldns LIB_DEPENDS+= libldns.so:dns/ldns -BUILD_DEPENDS+= ${LOCALBASE}/bin/swig:devel/swig13 +BUILD_DEPENDS+= swig2.0:devel/swig20 CFLAGS+= -I${OPENSSLINC} post-patch: Index: head/dns/maradns/Makefile =================================================================== --- head/dns/maradns/Makefile +++ head/dns/maradns/Makefile @@ -31,7 +31,7 @@ CONV_DESC= Install bind2csv2 tool (needs python) IPV6_CONFIGURE_ON= --ipv6 -CONV_USES= python:run +CONV_USES= python:2.7,run PORTDOCS= * PORTEXAMPLES= * Index: head/dns/py-dns-lexicon/Makefile =================================================================== --- head/dns/py-dns-lexicon/Makefile +++ head/dns/py-dns-lexicon/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.16:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}tldextract>=1.7.5:dns/py-tldextract \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.16:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tldextract>=1.7.5:dns/py-tldextract@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.11:www/py-requests@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/dns/py-dnschain/Makefile =================================================================== --- head/dns/py-dnschain/Makefile +++ head/dns/py-dnschain/Makefile @@ -12,7 +12,7 @@ LICENSE= MPL20 -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes Index: head/dns/py-dnspython/Makefile =================================================================== --- head/dns/py-dnspython/Makefile +++ head/dns/py-dnspython/Makefile @@ -14,12 +14,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE NO_ARCH= yes -USES?= python:2.7+ +USES= python:2.7+ USE_PYTHON= autoplist distutils OPTIONS_DEFINE= EXAMPLES PYCRYPTO PYCRYPTO_DESC= Enable pycrypto (part of dnssec needs it) -PYCRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto +PYCRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} PORTEXAMPLES= ddns.py e164.py mx.py name.py reverse.py reverse_name.py \ xfr.py zonediff.py Index: head/dns/py-easyzone/Makefile =================================================================== --- head/dns/py-easyzone/Makefile +++ head/dns/py-easyzone/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python Index: head/dns/py-idna/Makefile =================================================================== --- head/dns/py-idna/Makefile +++ head/dns/py-idna/Makefile @@ -10,7 +10,7 @@ MAINTAINER= koobs@FreeBSD.org COMMENT= Internationalized Domain Names in Applications (IDNA) -USES?= python # Actually, 2.6-2.7,3.3-3.6 +USES= python # Actually, 2.6-2.7,3.3-3.6 USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: head/dns/py-namebench/Makefile =================================================================== --- head/dns/py-namebench/Makefile +++ head/dns/py-namebench/Makefile @@ -15,18 +15,18 @@ LICENSE= APACHE20 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.5.5:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}graphy>=1.0:graphics/py-graphy \ - ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=0.6.0:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.6:devel/py-simplejson +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.5.5:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}graphy>=1.0:graphics/py-graphy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0.6.0:www/py-httplib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.6:devel/py-simplejson@${FLAVOR} USES= python tar:tgz .include .if ! ${PORT_OPTIONS:MX11} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>=2.7.1:x11-toolkits/py-tkinter +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>=2.7.1:x11-toolkits/py-tkinter@${FLAVOR} .endif MAKE_ENV+= NO_THIRD_PARTY=yes Index: head/dns/py-py3dns/Makefile =================================================================== --- head/dns/py-py3dns/Makefile +++ head/dns/py-py3dns/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils Index: head/dns/py-pydnstable/Makefile =================================================================== --- head/dns/py-pydnstable/Makefile +++ head/dns/py-pydnstable/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libdnstable.so:dns/dnstable USE_PYTHON= autoplist distutils -USES= pkgconfig python +USES= pkgconfig python:2.7 post-install: ${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/dnstable.so Index: head/dns/py-pywdns/Makefile =================================================================== --- head/dns/py-pywdns/Makefile +++ head/dns/py-pywdns/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libwdns.so:dns/wdns -USES= pkgconfig python +USES= pkgconfig python:2.7 USE_PYTHON= autoplist distutils post-patch: Index: head/dns/py-tldextract/Makefile =================================================================== --- head/dns/py-tldextract/Makefile +++ head/dns/py-tldextract/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/dns/py3-dnspython/Makefile =================================================================== --- head/dns/py3-dnspython/Makefile +++ head/dns/py3-dnspython/Makefile @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-dnspython - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/dns/py3-idna/Makefile =================================================================== --- head/dns/py3-idna/Makefile +++ head/dns/py3-idna/Makefile @@ -1,8 +0,0 @@ -# Created by: Kubilay Kocak -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-idna - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/dns/sshfp/Makefile =================================================================== --- head/dns/sshfp/Makefile +++ head/dns/sshfp/Makefile @@ -11,11 +11,12 @@ LICENSE= GPLv2 -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}ipcalc>=0.6:net-mgmt/py-ipcalc \ - ${PYTHON_SITELIBDIR}/ldns.py:dns/py-ldns +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipcalc>=0.6:net-mgmt/py-ipcalc@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/ldns.py:dns/py-ldns@${FLAVOR} USES= python shebangfix +USE_PYTHON= flavors concurrent optsuffix NO_ARCH= yes NO_BUILD= yes USE_GITHUB= yes Index: head/editors/fileobj/Makefile =================================================================== --- head/editors/fileobj/Makefile +++ head/editors/fileobj/Makefile @@ -16,7 +16,7 @@ USE_GITHUB= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix PLIST_FILES= man/man1/fileobj.1.gz Index: head/editors/gedit-plugins/Makefile =================================================================== --- head/editors/gedit-plugins/Makefile +++ head/editors/gedit-plugins/Makefile @@ -21,7 +21,7 @@ PORTSCOUT= limitw:1,even USES= gettext gmake gnome libtool pathfix pkgconfig \ - python:3 tar:xz + python:3.4+ tar:xz USE_GNOME= gtk30 gtksourceview3 intlhack USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -33,10 +33,10 @@ org.gnome.gedit.plugins.wordcompletion.gschema.xml USES+= python -BUILD_DEPENDS+= py3?-dbus>=0:devel/py3-dbus +BUILD_DEPENDS+= py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} LIB_DEPENDS+= libgucharmap_2_90.so:deskutils/gucharmap -RUN_DEPENDS+= py3?-dbus>=0:devel/py3-dbus \ - ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas +RUN_DEPENDS+= py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} USE_GNOME+= vte3 CONFIGURE_ARGS+=--enable-python GLIB_SCHEMAS+= org.gnome.gedit.plugins.terminal.gschema.xml Index: head/editors/gedit/Makefile =================================================================== --- head/editors/gedit/Makefile +++ head/editors/gedit/Makefile @@ -23,7 +23,7 @@ libsoup-2.4.so:devel/libsoup RUN_DEPENDS= iso-codes>=0:misc/iso-codes \ gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \ - ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas + ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} PORTSCOUT= limitw:1,even Index: head/editors/gwrite/Makefile =================================================================== --- head/editors/gwrite/Makefile +++ head/editors/gwrite/Makefile @@ -14,16 +14,16 @@ LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.15:devel/py-python-distutils-extra \ - ${PYTHON_PKGNAMEPREFIX}jswebkit>=0:www/py-jswebkit \ - ${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:www/py-webkitgtk +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.15:devel/py-python-distutils-extra@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jswebkit>=0:www/py-jswebkit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:www/py-webkitgtk@${FLAVOR} RUN_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme \ wvHtml:textproc/wv \ - ${PYTHON_PKGNAMEPREFIX}jswebkit>=0:www/py-jswebkit \ - ${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:www/py-webkitgtk + ${PYTHON_PKGNAMEPREFIX}jswebkit>=0:www/py-jswebkit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:www/py-webkitgtk@${FLAVOR} NO_ARCH= yes -USES= desktop-file-utils gettext-tools python +USES= desktop-file-utils gettext-tools python:2.7 USE_GNOME= intltool pygtk2 USE_PYTHON= distutils WRKSRC= ${WRKDIR}/gwrite-${PORTVERSION} Index: head/editors/leo/Makefile =================================================================== --- head/editors/leo/Makefile +++ head/editors/leo/Makefile @@ -15,8 +15,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \ silvercity>0:textproc/silvercity USES= pyqt:4 python:2 shebangfix zip @@ -32,7 +32,7 @@ OPTIONS_DEFINE= PYENCHANT PYENCHANT_DESC= Spell checking support via PyEnchant -PYENCHANT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant +PYENCHANT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant@${FLAVOR} post-patch: @${LN} -sf leo/dist/leo-install.py ${WRKSRC}/leo-install.py Index: head/editors/py-room/Makefile =================================================================== --- head/editors/py-room/Makefile +++ head/editors/py-room/Makefile @@ -12,9 +12,9 @@ MAINTAINER= arundel@FreeBSD.org COMMENT= PyRoom is a clone of WriteRoom and features "distraction-free writing" -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${FLAVOR} -USES= gettext python +USES= gettext python:2.7 USE_PYTHON= distutils USE_GNOME= pygtk2 PYDISTUTILS_PKGNAME= PyRoom Index: head/editors/texworks/Makefile =================================================================== --- head/editors/texworks/Makefile +++ head/editors/texworks/Makefile @@ -47,7 +47,7 @@ OPTIONS_DEFINE= DOCS LUA PYTHON LUA_USES= lua:51 LUA_PLIST_FILES=lib/texworks/libTWLuaPlugin.so -PYTHON_USES= python:3 +PYTHON_USES= python:3.4+ PYTHON_PLIST_FILES=lib/texworks/libTWPythonPlugin.so post-extract: Index: head/emulators/dynagen/Makefile =================================================================== --- head/emulators/dynagen/Makefile +++ head/emulators/dynagen/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.4.0:devel/py-configobj \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.4.0:devel/py-configobj@${FLAVOR} \ dynamips:emulators/dynamips-community PLIST_FILES= bin/dynagen "@sample etc/dynagen.ini.sample" @@ -21,7 +21,7 @@ PORTEXAMPLES= * PORTDATA= * -USES= dos2unix python shebangfix +USES= dos2unix python:2.7 shebangfix SHEBANG_FILES= *.py dynagen USE_PYTHON= distutils autoplist Index: head/emulators/dynagui/Makefile =================================================================== --- head/emulators/dynagui/Makefile +++ head/emulators/dynagui/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= dynagen:emulators/dynagen -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= dynagui.py USE_PYTHON= distutils IMGDIR= ${STAGEDIR}${PREFIX}/share/${PORTNAME}/img Index: head/emulators/gns3/Makefile =================================================================== --- head/emulators/gns3/Makefile +++ head/emulators/gns3/Makefile @@ -14,16 +14,16 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \ - ${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg \ - ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network \ +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network@${FLAVOR} \ dynamips:emulators/dynamips-community \ dynagen:emulators/dynagen \ xdotool:x11/xdotool WRKSRC= ${WRKDIR}/${PORTNAME}-legacy-GNS3-${PORTVERSION} -USES= cpe python +USES= cpe python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= GNS3 NO_ARCH= yes Index: head/emulators/loemu/Makefile =================================================================== --- head/emulators/loemu/Makefile +++ head/emulators/loemu/Makefile @@ -16,7 +16,7 @@ ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \ ${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt -USES= gettext python shebangfix +USES= gettext python:2.7 shebangfix USE_PYTHON= distutils NO_BUILD= yes SHEBANG_FILES= setup.py Index: head/emulators/py-gns3-converter/Makefile =================================================================== --- head/emulators/py-gns3-converter/Makefile +++ head/emulators/py-gns3-converter/Makefile @@ -10,7 +10,7 @@ LICENSE= GPLv3 -USES= python:3 -USE_PYTHON= distutils autoplist +USES= python:3.4+ +USE_PYTHON= distutils autoplist optsuffix .include Index: head/emulators/py-nova/Makefile =================================================================== --- head/emulators/py-nova/Makefile +++ head/emulators/py-nova/Makefile @@ -13,65 +13,65 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto \ - ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet \ - ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \ - ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \ - ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}python-neutronclient>=5.1.0:net/py-python-neutronclient \ - ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}websockify>=0.8.0:devel/py-websockify \ - ${PYTHON_PKGNAMEPREFIX}oslo.cache>=1.5.0:devel/py-oslo.cache \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.reports>=0.6.0:devel/py-oslo.reports \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db \ - ${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.0.0:devel/py-oslo.rootwrap \ - ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging \ - ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy \ - ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service \ - ${PYTHON_PKGNAMEPREFIX}rfc3986>=0.2.2:www/py-rfc3986 \ - ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware \ - ${PYTHON_PKGNAMEPREFIX}psutil121>=0:sysutils/py-psutil121 \ - ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects \ - ${PYTHON_PKGNAMEPREFIX}os-brick>=1.6.1:devel/py-os-brick \ - ${PYTHON_PKGNAMEPREFIX}os-vif>=1.1.0:devel/py-os-vif \ - ${PYTHON_PKGNAMEPREFIX}os-win>=0.2.3:devel/py-os-win \ - ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan \ - ${PYTHON_PKGNAMEPREFIX}microversion-parse>=0.1.2:devel/py-microversion-parse \ - ${PYTHON_PKGNAMEPREFIX}wsgi_intercept>=0.6.1:devel/py-wsgi_intercept \ - ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse \ - ${PYTHON_PKGNAMEPREFIX}libvirt>=0:devel/py-libvirt \ +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0:security/py-paramiko@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-neutronclient>=5.1.0:net/py-python-neutronclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}websockify>=0.8.0:devel/py-websockify@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.cache>=1.5.0:devel/py-oslo.cache@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.reports>=0.6.0:devel/py-oslo.reports@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.0.0:devel/py-oslo.rootwrap@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rfc3986>=0.2.2:www/py-rfc3986@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil121>=0:sysutils/py-psutil121@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}os-brick>=1.6.1:devel/py-os-brick@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}os-vif>=1.1.0:devel/py-os-vif@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}os-win>=0.2.3:devel/py-os-win@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}microversion-parse>=0.1.2:devel/py-microversion-parse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wsgi_intercept>=0.6.1:devel/py-wsgi_intercept@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libvirt>=0:devel/py-libvirt@${FLAVOR} \ e2fsprogs>=0:sysutils/e2fsprogs \ arping>=0:net/arping Index: head/emulators/swine/Makefile =================================================================== --- head/emulators/swine/Makefile +++ head/emulators/swine/Makefile @@ -23,7 +23,7 @@ GH_ACCOUNT= dswd GH_PROJECT= Swine -USES= gmake python +USES= gmake python:2.7 NO_BUILD= yes USE_QT4= linguist_build ONLY_FOR_ARCHS= i386 amd64 Index: head/emulators/virtualbox-ose/Makefile =================================================================== --- head/emulators/virtualbox-ose/Makefile +++ head/emulators/virtualbox-ose/Makefile @@ -149,7 +149,7 @@ .if ${PORT_OPTIONS:MPYTHON} USES+= python -USE_PYTHON= distutils noegginfo +USE_PYTHON= distutils noegginfo noflavors PYDISTUTILS_PKGNAME= vboxapi PYDISTUTILS_PKGVERSION= 1.0 .else Index: head/finance/bitcoin-armory/Makefile =================================================================== --- head/finance/bitcoin-armory/Makefile +++ head/finance/bitcoin-armory/Makefile @@ -14,10 +14,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/swig3.0:devel/swig30 \ - ${LOCALBASE}/bin/pyrcc4:textproc/py-qt4-xml \ + ${LOCALBASE}/bin/pyrcc4:textproc/py-qt4-xml@${PY_FLAVOR} \ ${LOCALBASE}/bin/rsync:net/rsync -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.0:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}psutil>1.2.1:sysutils/py-psutil \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.0:devel/py-twisted@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil>1.2.1:sysutils/py-psutil@${PY_FLAVOR} \ ${LOCALBASE}/bin/bitcoind:net-p2p/bitcoin-daemon USE_GITHUB= yes Index: head/finance/electrum/Makefile =================================================================== --- head/finance/electrum/Makefile +++ head/finance/electrum/Makefile @@ -14,33 +14,26 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py3-dnspython \ - ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py3-ecdsa \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py3-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}jsonrpclib-pelix>0:devel/py-jsonrpclib-pelix \ - ${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py3-pbkdf2 \ - ${PYTHON_PKGNAMEPREFIX}protobuf>=2.6.0:devel/py3-protobuf \ - ${PYTHON_PKGNAMEPREFIX}pyaes>0:security/py3-pyaes \ - ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py3-pysocks \ - ${PYTHON_PKGNAMEPREFIX}qrcode>=5.1:textproc/py3-qrcode \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py3-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonrpclib-pelix>0:devel/py-jsonrpclib-pelix@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}protobuf>=2.6.0:devel/py-protobuf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyaes>0:security/py-pyaes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qrcode>=5.1:textproc/py-qrcode@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${FLAVOR} CONFLICTS_INSTALL= electrum2-* -USES= desktop-file-utils pyqt:5 python:3 +USES= desktop-file-utils pyqt:5 python:3.4+ USE_PYQT= gui_run sip widgets -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix PYDISTUTILS_PKGNAME= Electrum NO_ARCH= yes -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/setup.py -.include +.include Index: head/finance/electrum2/Makefile =================================================================== --- head/finance/electrum2/Makefile +++ head/finance/electrum2/Makefile @@ -16,15 +16,15 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa \ - ${PYTHON_PKGNAMEPREFIX}jsonrpclib>0:devel/py-jsonrpclib \ - ${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2 \ - ${PYTHON_PKGNAMEPREFIX}protobuf>=2.6.0:devel/py-protobuf \ - ${PYTHON_PKGNAMEPREFIX}pyaes>0:security/py-pyaes \ - ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}qrcode>=5.1:textproc/py-qrcode +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonrpclib>0:devel/py-jsonrpclib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}protobuf>=2.6.0:devel/py-protobuf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyaes>0:security/py-pyaes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qrcode>=5.1:textproc/py-qrcode@${FLAVOR} CONFLICTS_INSTALL= electrum-3.* Index: head/finance/gnucash/Makefile =================================================================== --- head/finance/gnucash/Makefile +++ head/finance/gnucash/Makefile @@ -53,7 +53,7 @@ DATABASE_CONFIGURE_ON= --with-dbi-dbd-dir=${LOCALBASE}/lib/dbd LOCALE_TAX_CONFIGURE_ON=--enable-locale-specific-tax PYTHON_CONFIGURE_ON= --enable-python -PYTHON_USES= python +PYTHON_USES= python:2.7 GTKMM_USE= GNOME=gtkmm24 GTKMM_CONFIGURE_ON= --enable-gtkmm GTKMM_CONFIGURE_OFF= --disable-gtkmm Index: head/finance/py-python-obelisk/Makefile =================================================================== --- head/finance/py-python-obelisk/Makefile +++ head/finance/py-python-obelisk/Makefile @@ -14,9 +14,9 @@ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa \ - ${PYTHON_PKGNAMEPREFIX}pyzmq>=14.5.0:net/py-pyzmq +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyzmq>=14.5.0:net/py-pyzmq@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/finance/py-stripe/Makefile =================================================================== --- head/finance/py-stripe/Makefile +++ head/finance/py-stripe/Makefile @@ -14,10 +14,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.8.8:www/py-requests -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19:ftp/py-pycurl \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.8.8:www/py-requests@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19:ftp/py-pycurl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/finance/py-vatnumber/Makefile =================================================================== --- head/finance/py-vatnumber/Makefile +++ head/finance/py-vatnumber/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stdnum>=1.1:devel/py-stdnum +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stdnum>=1.1:devel/py-stdnum@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/finance/sabernetdcs-client/Makefile =================================================================== --- head/finance/sabernetdcs-client/Makefile +++ head/finance/sabernetdcs-client/Makefile @@ -15,11 +15,11 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyro>=0:devel/py-pyro +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyro>=0:devel/py-pyro@${FLAVOR} USE_GNOME= pygtk2 USE_PYTHON= distutils -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 DOCSDIR= ${PREFIX}/share/doc/sndcs DATADIR= ${PREFIX}/share/sndcs SUB_FILES= pkg-message Index: head/finance/tryton28/Makefile =================================================================== --- head/finance/tryton28/Makefile +++ head/finance/tryton28/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2012:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2012:devel/py-pytz@${FLAVOR} CONFLICTS= tryton-2.[46].* Index: head/finance/trytond28/Makefile =================================================================== --- head/finance/trytond28/Makefile +++ head/finance/trytond28/Makefile @@ -14,13 +14,13 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/mx/__init__.py:lang/py-mx-base \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}Genshi>0.5.1:textproc/py-genshi \ - ${PYTHON_PKGNAMEPREFIX}relatorio>=0.6.0:print/py-relatorio \ - ${PYTHON_PKGNAMEPREFIX}polib>=0.7.0:devel/py-polib \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/mx/__init__.py:lang/py-mx-base@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Genshi>0.5.1:textproc/py-genshi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}relatorio>=0.6.0:print/py-relatorio@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}polib>=0.7.0:devel/py-polib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} CONFLICTS= trytond-2.[46].* @@ -42,7 +42,7 @@ PIDDIR?= /var/run LOGDIR?= /var/log -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils post-patch: @@ -52,19 +52,19 @@ .include .if ${PORT_OPTIONS:MWEBDAV} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav@${FLAVOR} .endif .if ${PORT_OPTIONS:MPYOPENSSL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} .endif .if ${PORT_OPTIONS:MPYDOT} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${FLAVOR} .endif .if ${PORT_OPTIONS:MPYTZ} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} .endif post-install: Index: head/finance/trytond28_account/Makefile =================================================================== --- head/finance/trytond28_account/Makefile +++ head/finance/trytond28_account/Makefile @@ -15,11 +15,11 @@ RUN_DEPENDS= trytond28>=2.8.2:finance/trytond28 \ trytond28_company>=2.8.0:finance/trytond28_company \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil + ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} CONFLICTS= trytond_account-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_account_asset/Makefile =================================================================== --- head/finance/trytond28_account_asset/Makefile +++ head/finance/trytond28_account_asset/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_account-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_account_be/Makefile =================================================================== --- head/finance/trytond28_account_be/Makefile +++ head/finance/trytond28_account_be/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_account-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_account_invoice/Makefile =================================================================== --- head/finance/trytond28_account_invoice/Makefile +++ head/finance/trytond28_account_invoice/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_account_invoice-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_account_invoice_history/Makefile =================================================================== --- head/finance/trytond28_account_invoice_history/Makefile +++ head/finance/trytond28_account_invoice_history/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_account_invoice_history-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_account_invoice_line_standalone/Makefile =================================================================== --- head/finance/trytond28_account_invoice_line_standalone/Makefile +++ head/finance/trytond28_account_invoice_line_standalone/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_account_invoice_line_standalone-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_account_product/Makefile =================================================================== --- head/finance/trytond28_account_product/Makefile +++ head/finance/trytond28_account_product/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_account_product-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_account_statement/Makefile =================================================================== --- head/finance/trytond28_account_statement/Makefile +++ head/finance/trytond28_account_statement/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_account_statement-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_account_stock_anglo_saxon/Makefile =================================================================== --- head/finance/trytond28_account_stock_anglo_saxon/Makefile +++ head/finance/trytond28_account_stock_anglo_saxon/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_account_stock_anglo_saxon-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_account_stock_continental/Makefile =================================================================== --- head/finance/trytond28_account_stock_continental/Makefile +++ head/finance/trytond28_account_stock_continental/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_account_stock_continental-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_analytic_account/Makefile =================================================================== --- head/finance/trytond28_analytic_account/Makefile +++ head/finance/trytond28_analytic_account/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_analytic_account-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_analytic_invoice/Makefile =================================================================== --- head/finance/trytond28_analytic_invoice/Makefile +++ head/finance/trytond28_analytic_invoice/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_analytic_invoice-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_analytic_purchase/Makefile =================================================================== --- head/finance/trytond28_analytic_purchase/Makefile +++ head/finance/trytond28_analytic_purchase/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_analytic_purchase-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_analytic_sale/Makefile =================================================================== --- head/finance/trytond28_analytic_sale/Makefile +++ head/finance/trytond28_analytic_sale/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_analytic_sale-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_calendar/Makefile =================================================================== --- head/finance/trytond28_calendar/Makefile +++ head/finance/trytond28_calendar/Makefile @@ -14,14 +14,14 @@ LICENSE= GPLv3 RUN_DEPENDS= trytond28>=2.8.2:finance/trytond28 \ - ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject \ - ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil + ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} CONFLICTS= trytond_calendar-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_calendar_classification/Makefile =================================================================== --- head/finance/trytond28_calendar_classification/Makefile +++ head/finance/trytond28_calendar_classification/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_calendar_classification-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_calendar_scheduling/Makefile =================================================================== --- head/finance/trytond28_calendar_scheduling/Makefile +++ head/finance/trytond28_calendar_scheduling/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_calendar_scheduling-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_calendar_todo/Makefile =================================================================== --- head/finance/trytond28_calendar_todo/Makefile +++ head/finance/trytond28_calendar_todo/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_calendar_todo-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_carrier/Makefile =================================================================== --- head/finance/trytond28_carrier/Makefile +++ head/finance/trytond28_carrier/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_carrier-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_carrier_percentage/Makefile =================================================================== --- head/finance/trytond28_carrier_percentage/Makefile +++ head/finance/trytond28_carrier_percentage/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_carrier_percentage-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_carrier_weight/Makefile =================================================================== --- head/finance/trytond28_carrier_weight/Makefile +++ head/finance/trytond28_carrier_weight/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_carrier_weight-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_company/Makefile =================================================================== --- head/finance/trytond28_company/Makefile +++ head/finance/trytond28_company/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_company-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_company_work_time/Makefile =================================================================== --- head/finance/trytond28_company_work_time/Makefile +++ head/finance/trytond28_company_work_time/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_company_work_time-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_country/Makefile =================================================================== --- head/finance/trytond28_country/Makefile +++ head/finance/trytond28_country/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_country-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_currency/Makefile =================================================================== --- head/finance/trytond28_currency/Makefile +++ head/finance/trytond28_currency/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_currency-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_dashboard/Makefile =================================================================== --- head/finance/trytond28_dashboard/Makefile +++ head/finance/trytond28_dashboard/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_dashboard-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_ldap_authentication/Makefile =================================================================== --- head/finance/trytond28_ldap_authentication/Makefile +++ head/finance/trytond28_ldap_authentication/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_ldap_authentication-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_ldap_connection/Makefile =================================================================== --- head/finance/trytond28_ldap_connection/Makefile +++ head/finance/trytond28_ldap_connection/Makefile @@ -15,11 +15,11 @@ LICENSE= GPLv3 RUN_DEPENDS= trytond28>=2.8.2:finance/trytond28 \ - ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.10:net/py-ldap + ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.10:net/py-ldap@${FLAVOR} CONFLICTS= trytond_ldap_connection-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_party/Makefile =================================================================== --- head/finance/trytond28_party/Makefile +++ head/finance/trytond28_party/Makefile @@ -15,11 +15,11 @@ RUN_DEPENDS= trytond28>=2.8.2:finance/trytond28 \ trytond28_country>=2.8.0:finance/trytond28_country \ - ${PYTHON_PKGNAMEPREFIX}vatnumber>=1.0.0:finance/py-vatnumber + ${PYTHON_PKGNAMEPREFIX}vatnumber>=1.0.0:finance/py-vatnumber@${FLAVOR} CONFLICTS= trytond_party-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_party_siret/Makefile =================================================================== --- head/finance/trytond28_party_siret/Makefile +++ head/finance/trytond28_party_siret/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_party_siret-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_party_vcarddav/Makefile =================================================================== --- head/finance/trytond28_party_vcarddav/Makefile +++ head/finance/trytond28_party_vcarddav/Makefile @@ -15,12 +15,12 @@ LICENSE= GPLv3 RUN_DEPENDS= trytond28_party>=2.8.0:finance/trytond28_party \ - ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject \ - ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav + ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav@${FLAVOR} CONFLICTS= trytond_party_vcarddav-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_product/Makefile =================================================================== --- head/finance/trytond28_product/Makefile +++ head/finance/trytond28_product/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_product-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_product_attribute/Makefile =================================================================== --- head/finance/trytond28_product_attribute/Makefile +++ head/finance/trytond28_product_attribute/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_product_attribute-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_product_cost_fifo/Makefile =================================================================== --- head/finance/trytond28_product_cost_fifo/Makefile +++ head/finance/trytond28_product_cost_fifo/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_product_cost_fifo-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_product_cost_history/Makefile =================================================================== --- head/finance/trytond28_product_cost_history/Makefile +++ head/finance/trytond28_product_cost_history/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_product_cost_history-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_product_measurements/Makefile =================================================================== --- head/finance/trytond28_product_measurements/Makefile +++ head/finance/trytond28_product_measurements/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_product_measurements-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_product_price_list/Makefile =================================================================== --- head/finance/trytond28_product_price_list/Makefile +++ head/finance/trytond28_product_price_list/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_product_price_list-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_production/Makefile =================================================================== --- head/finance/trytond28_production/Makefile +++ head/finance/trytond28_production/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_production-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_project/Makefile =================================================================== --- head/finance/trytond28_project/Makefile +++ head/finance/trytond28_project/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_project-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_project_invoice/Makefile =================================================================== --- head/finance/trytond28_project_invoice/Makefile +++ head/finance/trytond28_project_invoice/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_project_invoice-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_project_plan/Makefile =================================================================== --- head/finance/trytond28_project_plan/Makefile +++ head/finance/trytond28_project_plan/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_project_plan-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_project_revenue/Makefile =================================================================== --- head/finance/trytond28_project_revenue/Makefile +++ head/finance/trytond28_project_revenue/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_project_revenue-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_purchase/Makefile =================================================================== --- head/finance/trytond28_purchase/Makefile +++ head/finance/trytond28_purchase/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_purchase-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_purchase_invoice_line_standalone/Makefile =================================================================== --- head/finance/trytond28_purchase_invoice_line_standalone/Makefile +++ head/finance/trytond28_purchase_invoice_line_standalone/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_purchase_invoice_line_standalone-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_purchase_shipment_cost/Makefile =================================================================== --- head/finance/trytond28_purchase_shipment_cost/Makefile +++ head/finance/trytond28_purchase_shipment_cost/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_purchase_shipment_cost-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_sale/Makefile =================================================================== --- head/finance/trytond28_sale/Makefile +++ head/finance/trytond28_sale/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_sale-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_sale_opportunity/Makefile =================================================================== --- head/finance/trytond28_sale_opportunity/Makefile +++ head/finance/trytond28_sale_opportunity/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_sale_opportunity-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_sale_price_list/Makefile =================================================================== --- head/finance/trytond28_sale_price_list/Makefile +++ head/finance/trytond28_sale_price_list/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_sale_price_list-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_sale_shipment_cost/Makefile =================================================================== --- head/finance/trytond28_sale_shipment_cost/Makefile +++ head/finance/trytond28_sale_shipment_cost/Makefile @@ -21,7 +21,7 @@ CONFLICTS= trytond_sale_shipment_cost-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_sale_supply/Makefile =================================================================== --- head/finance/trytond28_sale_supply/Makefile +++ head/finance/trytond28_sale_supply/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_sale_supply-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_sale_supply_drop_shipment/Makefile =================================================================== --- head/finance/trytond28_sale_supply_drop_shipment/Makefile +++ head/finance/trytond28_sale_supply_drop_shipment/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_sale_supply_drop_shipment-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_stock/Makefile =================================================================== --- head/finance/trytond28_stock/Makefile +++ head/finance/trytond28_stock/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_stock-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_stock_forecast/Makefile =================================================================== --- head/finance/trytond28_stock_forecast/Makefile +++ head/finance/trytond28_stock_forecast/Makefile @@ -13,12 +13,12 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \ trytond28_stock>=2.8.2:finance/trytond28_stock CONFLICTS= trytond_stock_forecast-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_stock_inventory_location/Makefile =================================================================== --- head/finance/trytond28_stock_inventory_location/Makefile +++ head/finance/trytond28_stock_inventory_location/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_stock_inventory_location-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_stock_location_sequence/Makefile =================================================================== --- head/finance/trytond28_stock_location_sequence/Makefile +++ head/finance/trytond28_stock_location_sequence/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_stock_location_sequence-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_stock_lot/Makefile =================================================================== --- head/finance/trytond28_stock_lot/Makefile +++ head/finance/trytond28_stock_lot/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_stock_lot-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_stock_product_location/Makefile =================================================================== --- head/finance/trytond28_stock_product_location/Makefile +++ head/finance/trytond28_stock_product_location/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_stock_product_location-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_stock_split/Makefile =================================================================== --- head/finance/trytond28_stock_split/Makefile +++ head/finance/trytond28_stock_split/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_stock_split-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_stock_supply/Makefile =================================================================== --- head/finance/trytond28_stock_supply/Makefile +++ head/finance/trytond28_stock_supply/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_stock_supply-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_stock_supply_day/Makefile =================================================================== --- head/finance/trytond28_stock_supply_day/Makefile +++ head/finance/trytond28_stock_supply_day/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_stock_supply_day-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_stock_supply_forecast/Makefile =================================================================== --- head/finance/trytond28_stock_supply_forecast/Makefile +++ head/finance/trytond28_stock_supply_forecast/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_stock_supply_forecast-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_stock_supply_production/Makefile =================================================================== --- head/finance/trytond28_stock_supply_production/Makefile +++ head/finance/trytond28_stock_supply_production/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_stock_supply_production-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/finance/trytond28_timesheet/Makefile =================================================================== --- head/finance/trytond28_timesheet/Makefile +++ head/finance/trytond28_timesheet/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_timesheet-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/french/aster/Makefile =================================================================== --- head/french/aster/Makefile +++ head/french/aster/Makefile @@ -46,7 +46,7 @@ libmed.so:french/med # libAsterInterface.so:science/mfront # libAsterInterface.so:science/tfel -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gnuplot>0:math/py-gnuplot\ +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gnuplot>0:math/py-gnuplot@${PY_FLAVOR} \ ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \ astk-serveur>0:cad/astk-serveur Index: head/french/trytond28_account_fr/Makefile =================================================================== --- head/french/trytond28_account_fr/Makefile +++ head/french/trytond28_account_fr/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_account_fr-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/ftp/py-ftputil/Makefile =================================================================== --- head/ftp/py-ftputil/Makefile +++ head/ftp/py-ftputil/Makefile @@ -11,7 +11,7 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= High-level FTP client library -USES= python +USES= python:2.7 USE_PYTHON= distutils DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} Index: head/ftp/py-pyftpdlib/Makefile =================================================================== --- head/ftp/py-pyftpdlib/Makefile +++ head/ftp/py-pyftpdlib/Makefile @@ -22,8 +22,8 @@ SENDFILE_DESC= Enable sendfile(2) support OPENSSL_DESC= Enable FTP over SSL/TLS (RFC4217) -SENDFILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysendfile>0:net/py-pysendfile -OPENSSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl +SENDFILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysendfile>0:net/py-pysendfile@${FLAVOR} +OPENSSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} PORTEXAMPLES= * Index: head/games/anki/Makefile =================================================================== --- head/games/anki/Makefile +++ head/games/anki/Makefile @@ -16,12 +16,12 @@ RUN_DEPENDS= lame:audio/lame \ mplayer:multimedia/mplayer \ - ${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32 \ - ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash + ${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash@${PY_FLAVOR} USES= desktop-file-utils pyqt:4 python:2 shared-mime-info shebangfix tar:tgz SHEBANG_FILES= tools/build_ui.sh tools/tests.sh Index: head/games/balazar/Makefile =================================================================== --- head/games/balazar/Makefile +++ head/games/balazar/Makefile @@ -15,17 +15,17 @@ LIB_DEPENDS= libcal3d.so:graphics/cal3d \ libfreetype.so:print/freetype2 -RUN_DEPENDS= soya_editor:graphics/py-soya3d \ - ${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal \ - ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis \ - ${PYTHON_PKGNAMEPREFIX}tofu>0:net/py-tofu \ - ${PYTHON_PKGNAMEPREFIX}cerealizer>0:security/py-cerealizer \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= soya_editor:graphics/py-soya3d@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tofu>0:net/py-tofu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cerealizer>0:security/py-cerealizer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} BROKEN= fails to package: pkg-static: py27-twisted-17.5.0_1 conflicts with py27-twistedCore-15.2.1 (installs files into the same place) NO_ARCH= yes -USES= gettext python tar:bzip2 +USES= gettext python:2.7 tar:bzip2 USE_GL= glew USE_SDL= mixer sdl USE_PYTHON= autoplist distutils Index: head/games/balazarbrothers/Makefile =================================================================== --- head/games/balazarbrothers/Makefile +++ head/games/balazarbrothers/Makefile @@ -18,15 +18,15 @@ LIB_DEPENDS= libcal3d.so:graphics/cal3d \ libfreetype.so:print/freetype2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis \ - ${PYTHON_PKGNAMEPREFIX}soya3d>0:graphics/py-soya3d \ - ${PYTHON_PKGNAMEPREFIX}tofu>0:net/py-tofu \ - ${PYTHON_PKGNAMEPREFIX}cerealizer>0:security/py-cerealizer \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}soya3d>0:graphics/py-soya3d@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tofu>0:net/py-tofu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cerealizer>0:security/py-cerealizer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} NO_ARCH= yes -USES= gettext python tar:bzip2 +USES= gettext python:2.7 tar:bzip2 USE_GL= glew USE_PYTHON= autoplist distutils @@ -40,7 +40,7 @@ OPTIONS_DEFINE= OPENAL OPTIONS_DEFAULT= OPENAL -OPENAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal +OPENAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal@${FLAVOR} post-patch: @${REINPLACE_CMD} -e \ Index: head/games/bouncy/Makefile =================================================================== --- head/games/bouncy/Makefile +++ head/games/bouncy/Makefile @@ -19,7 +19,7 @@ LICENSE_FILE= ${WRKSRC}/GPL.txt RUN_DEPENDS= ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL + ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} WRKSRC= ${WRKDIR}/${PORTNAME}-post-${DISTVERSION} Index: head/games/brainworkshop/Makefile =================================================================== --- head/games/brainworkshop/Makefile +++ head/games/brainworkshop/Makefile @@ -12,7 +12,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyglet/__init__.py:graphics/py-pyglet -USES= dos2unix python:run zip +USES= dos2unix python:2.7,run zip NO_BUILD= yes DOS2UNIX_FILES= brainworkshop.pyw Index: head/games/childsplay/Makefile =================================================================== --- head/games/childsplay/Makefile +++ head/games/childsplay/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv3 # only LICENSE_FILE= ${WRKSRC}/gpl-3.0.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR} NO_BUILD= yes Index: head/games/craft/Makefile =================================================================== --- head/games/craft/Makefile +++ head/games/craft/Makefile @@ -26,7 +26,7 @@ USE_XORG= x11 xi xrandr USE_GL= gl glu -SERVER_USES= python +SERVER_USES= python:2.7 SERVER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.2:www/py-requests \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 SERVER_CMAKE_ON= -DSERVER:BOOL=ON Index: head/games/endgame-singularity/Makefile =================================================================== --- head/games/endgame-singularity/Makefile +++ head/games/endgame-singularity/Makefile @@ -19,7 +19,7 @@ USE_GITHUB= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils USE_SDL= image mixer PORTDOCS= AUTHORS Changelog README.txt TODO Index: head/games/funnyboat/Makefile =================================================================== --- head/games/funnyboat/Makefile +++ head/games/funnyboat/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} -USES= python:run zip +USES= python:2.7,run zip NO_BUILD= yes NO_ARCH= yes Index: head/games/gcompris/Makefile =================================================================== --- head/games/gcompris/Makefile +++ head/games/gcompris/Makefile @@ -13,12 +13,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= texi2html:textproc/texi2html \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libao.so:audio/libao \ libassetml.so:devel/libassetml \ libdbus-glib-1.so:devel/dbus-glib -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ gnucap:cad/gnucap USES= display:configure gettext gmake libtool localbase pathfix \ Index: head/games/glchess/Makefile =================================================================== --- head/games/glchess/Makefile +++ head/games/glchess/Makefile @@ -10,9 +10,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= 3D OpenGL based chess game -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext@${FLAVOR} -USES= desktop-file-utils python shared-mime-info +USES= desktop-file-utils python:2.7 shared-mime-info USE_GNOME= gconf2 USE_PYTHON= distutils GCONF_SCHEMAS= glchess.schemas Index: head/games/hypatia_engine/Makefile =================================================================== --- head/games/hypatia_engine/Makefile +++ head/games/hypatia_engine/Makefile @@ -12,11 +12,11 @@ LICENSE= MIT RUN_DEPENDS= ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}pyganim>0:graphics/py-pyganim \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 + ${PYTHON_PKGNAMEPREFIX}pyganim>0:graphics/py-pyganim@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PY_ENUM34} -USES= python:2 +USES= python USE_PYTHON= autoplist concurrent distutils .include Index: head/games/jools/Makefile =================================================================== --- head/games/jools/Makefile +++ head/games/jools/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYGAME} -USES= python +USES= python:2.7 USE_PYTHON= distutils PORTDOCS= POINTS manual.html manual.pdf manual.tex Index: head/games/kye/Makefile =================================================================== --- head/games/kye/Makefile +++ head/games/kye/Makefile @@ -23,7 +23,7 @@ RESTRICTED_FILES= kye-data_nuke_levels.20121101.tar.gz USE_GNOME= pygtk2 librsvg2 -USES= python +USES= python:2.7 USE_PYTHON= distutils PORTDOCS= NEWS README Index: head/games/magicor/Makefile =================================================================== --- head/games/magicor/Makefile +++ head/games/magicor/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= *.py NO_BUILD= yes NO_ARCH= yes Index: head/games/nelly/Makefile =================================================================== --- head/games/nelly/Makefile +++ head/games/nelly/Makefile @@ -17,7 +17,7 @@ COMMENT= Nelly's Rooftop Garden, physics-based puzzle game RUN_DEPENDS= ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL + ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} USES= python:2 Index: head/games/outerspace/Makefile =================================================================== --- head/games/outerspace/Makefile +++ head/games/outerspace/Makefile @@ -12,7 +12,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game -USES= python +USES= python:2.7 NO_BUILD= yes NO_ARCH= yes Index: head/games/plutocracy/Makefile =================================================================== --- head/games/plutocracy/Makefile +++ head/games/plutocracy/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libpng.so:graphics/png -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_SDL= sdl pango USE_GL= gl glu USE_PYTHON= distutils Index: head/games/poker-engine/Makefile =================================================================== --- head/games/poker-engine/Makefile +++ head/games/poker-engine/Makefile @@ -14,15 +14,16 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/bin/rsync:net/rsync \ - ${PYTHON_SITELIBDIR}/pokereval.py:games/py-poker-eval \ - ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \ - ${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt + ${PYTHON_SITELIBDIR}/pokereval.py:games/py-poker-eval@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt@${FLAVOR} RUN_DEPENDS= ${LOCALBASE}/bin/rsync:net/rsync \ - ${PYTHON_SITELIBDIR}/pokereval.py:games/py-poker-eval \ - ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \ - ${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt + ${PYTHON_SITELIBDIR}/pokereval.py:games/py-poker-eval@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt@${FLAVOR} USES= gettext gmake pathfix pkgconfig python:2 +USE_PYTHON= flavors GNU_CONFIGURE= yes test: Index: head/games/ptkei/Makefile =================================================================== --- head/games/ptkei/Makefile +++ head/games/ptkei/Makefile @@ -13,7 +13,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \ ${PYTHON_SITELIBDIR}/Pmw/__init__.py:x11-toolkits/py-Pmw -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= empire.py scripts/*.py do-build: Index: head/games/py-fife/Makefile =================================================================== --- head/games/py-fife/Makefile +++ head/games/py-fife/Makefile @@ -61,6 +61,7 @@ PYTHON_CMAKE_BOOL= build-python PYTHON_USES= python:2 +PYTHON_USE= python=flavors PYTHON_BUILD_DEPENDS= ${LOCALBASE}/bin/swig3.0:devel/swig30 LIBRARY_CMAKE_BOOL= build-library Index: head/games/py-mnemosyne/Makefile =================================================================== --- head/games/py-mnemosyne/Makefile +++ head/games/py-mnemosyne/Makefile @@ -15,12 +15,12 @@ LICENSE= LGPL3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.2.0:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2:www/py-cherrypy \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.2.0:math/py-matplotlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2:www/py-cherrypy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob@${FLAVOR} -USES= fortran pyqt:4 python +USES= fortran pyqt:4 python:2.7 USE_PYQT= gui_run network_run sql_run webkit_run USE_PYTHON= distutils autoplist NO_ARCH= yes Index: head/games/py-poker-eval/Makefile =================================================================== --- head/games/py-poker-eval/Makefile +++ head/games/py-poker-eval/Makefile @@ -18,6 +18,7 @@ LIB_DEPENDS= libpoker-eval.so:games/poker-eval USES= autoreconf libtool pathfix pkgconfig python:2 +USE_PYTHON= flavors GNU_CONFIGURE= yes CONFIGURE_ARGS= PYTHON="" Index: head/games/py-sgflib/Makefile =================================================================== --- head/games/py-sgflib/Makefile +++ head/games/py-sgflib/Makefile @@ -17,6 +17,7 @@ LICENSE_FILE= ${WRKSRC}/lgpl.txt USES= python shebangfix +USE_PYTHON= flavors NO_BUILD= yes NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} Index: head/games/py-sgfsummary/Makefile =================================================================== --- head/games/py-sgfsummary/Makefile +++ head/games/py-sgfsummary/Makefile @@ -12,9 +12,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= SGF Summarizer -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sgflib.py:games/py-sgflib +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sgflib.py:games/py-sgflib@${FLAVOR} USES= python shebangfix tar:tgz +USE_PYTHON= flavors SHEBANG_FILES= sgfsummary.py WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} NO_BUILD= yes Index: head/games/pydance/Makefile =================================================================== --- head/games/pydance/Makefile +++ head/games/pydance/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYGAME} RUN_DEPENDS= ${PYGAME} -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= pydance.py utils/findbpm.py USE_PYTHON= distutils noegginfo SUB_FILES= pkg-message Index: head/games/pyfa/Makefile =================================================================== --- head/games/pyfa/Makefile +++ head/games/pyfa/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= pyfa-org @@ -34,9 +34,9 @@ OPTIONS_DEFINE= DPSGRAPHING DPSGRAPHING_DESC= DPS graphing (requires NumPy and matplotlib) -DPSGRAPHING_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.0:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools +DPSGRAPHING_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.0:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} do-build: @${PYTHON_CMD} -m compileall ${WRKSRC} Index: head/games/pysolfc/Makefile =================================================================== --- head/games/pysolfc/Makefile +++ head/games/pysolfc/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow -USES= python shebangfix tar:bzip2 +USES= python:2.7 shebangfix tar:bzip2 USE_PYTHON= autoplist distutils NO_ARCH= yes SHEBANG_FILES= data/themes/clearlooks/create_imgs.py Index: head/games/pyspacewar/Makefile =================================================================== --- head/games/pyspacewar/Makefile +++ head/games/pyspacewar/Makefile @@ -18,7 +18,7 @@ GH_ACCOUNT= mgedmin GH_TAGNAME= f872564 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist PORTDOCS= *.rst Index: head/games/pysycache/Makefile =================================================================== --- head/games/pysycache/Makefile +++ head/games/pysycache/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game -USES= python shebangfix zip +USES= python:2.7 shebangfix zip NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} SUB_FILES= pkg-message Index: head/games/pythonchess/Makefile =================================================================== --- head/games/pythonchess/Makefile +++ head/games/pythonchess/Makefile @@ -17,7 +17,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/gpl.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} WRKSRC= ${WRKDIR}/${PORTNAME:S/p/P/:S/c/C/} Index: head/games/pythonsudoku/Makefile =================================================================== --- head/games/pythonsudoku/Makefile +++ head/games/pythonsudoku/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS+= libcups.so:print/cups RUN_DEPENDS= ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1 + ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1@${FLAVOR} USES= python:2 tar:bzip2 USE_GNOME= pygtk2 Index: head/games/retroarch/Makefile =================================================================== --- head/games/retroarch/Makefile +++ head/games/retroarch/Makefile @@ -44,7 +44,7 @@ OPENAL_CONFIGURE_ENABLE=al NETPLAY_CONFIGURE_ENABLE= netplay PYTHON_CONFIGURE_ENABLE=python -PYTHON_USES= python:3 +PYTHON_USES= python:3.4+ V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l V4L_BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat V4L_CONFIGURE_ENABLE= v4l2 @@ -78,6 +78,10 @@ add_include_dirs ${LOCALBASE}/include;\ add_library_dirs ${LOCALBASE}/lib| ; \ /^check_lib OSS_LIB/d' \ + ${WRKSRC}/qb/config.libs.sh + +post-patch-PYTHON-on: + @${REINPLACE_CMD} -e '/check_pkgconf PYTHON/s/python3/python-${PYTHON_VER}/' \ ${WRKSRC}/qb/config.libs.sh post-install: Index: head/games/slune/Makefile =================================================================== --- head/games/slune/Makefile +++ head/games/slune/Makefile @@ -14,12 +14,12 @@ LICENSE= GPLv2 LIB_DEPENDS= libcal3d.so:graphics/cal3d -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal \ - ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis \ - ${PYTHON_PKGNAMEPREFIX}soya3d>0:graphics/py-soya3d \ - ${PYTHON_PKGNAMEPREFIX}py2play>0:net-p2p/py-py2play +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}soya3d>0:graphics/py-soya3d@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}py2play>0:net-p2p/py-py2play@${FLAVOR} -USES= dos2unix gettext python tar:bzip2 +USES= dos2unix gettext python:2.7 tar:bzip2 DOS2UNIX_GLOB= *.po *.mo USE_GL= glew USE_SDL= sdl mixer Index: head/games/unknown-horizons/Makefile =================================================================== --- head/games/unknown-horizons/Makefile +++ head/games/unknown-horizons/Makefile @@ -13,10 +13,10 @@ BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \ ${LOCALBASE}/bin/xsltproc:textproc/libxslt -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/fife/__init__.py:games/py-fife \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/fife/__init__.py:games/py-fife@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} ONLY_FOR_ARCHS= i386 amd64 Index: head/games/wxlauncher/Makefile =================================================================== --- head/games/wxlauncher/Makefile +++ head/games/wxlauncher/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/GPLv2.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= scp-fs2open Index: head/games/zephulor/Makefile =================================================================== --- head/games/zephulor/Makefile +++ head/games/zephulor/Makefile @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.txt RUN_DEPENDS= ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter + ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} WRKSRC= ${WRKDIR}/zephulor-source Index: head/german/trytond28_account_de_skr03/Makefile =================================================================== --- head/german/trytond28_account_de_skr03/Makefile +++ head/german/trytond28_account_de_skr03/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_account_de_skr03-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/graphics/Makefile =================================================================== --- head/graphics/Makefile +++ head/graphics/Makefile @@ -913,10 +913,6 @@ SUBDIR += py-traitsui SUBDIR += py-wand SUBDIR += py-webcolors - SUBDIR += py3-cairo - SUBDIR += py3-imagesize - SUBDIR += py3-pillow - SUBDIR += py3-pygraphviz SUBDIR += pygts SUBDIR += pymorph SUBDIR += pysvg Index: head/graphics/boxer/Makefile =================================================================== --- head/graphics/boxer/Makefile +++ head/graphics/boxer/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= box:graphics/box -USES= python +USES= python:2.7 USE_GNOME= pygtk2 USE_PYTHON= distutils autoplist USE_LDCONFIG= yes Index: head/graphics/caffe/Makefile =================================================================== --- head/graphics/caffe/Makefile +++ head/graphics/caffe/Makefile @@ -14,7 +14,6 @@ CONFLICTS_INSTALL= caffe2-* BUILD_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/bin/cython:lang/cython \ ${LOCALBASE}/include/cblas.h:math/cblas \ bash:shells/bash LIB_DEPENDS= libsnappy.so:archivers/snappy \ @@ -30,15 +29,16 @@ libopenblas.so:math/openblas \ libhdf5.so:science/hdf5 RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf \ - ${PYTHON_PKGNAMEPREFIX}scikit-image>=0.12:graphics/py-scikit-image \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets + ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scikit-image>=0.12:graphics/py-scikit-image@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets@${FLAVOR} USE_LDCONFIG= yes -USES= gmake python fortran compiler:c++11-lib pkgconfig +USES= gmake python:2.7 fortran compiler:c++11-lib pkgconfig +USE_PYTHON= flavors cython CXXFLAGS+= -DGTEST_USE_OWN_TR1_TUPLE=1 LDFLAGS+= -DGTEST_USE_OWN_TR1_TUPLE=1 Index: head/graphics/cegui/Makefile =================================================================== --- head/graphics/cegui/Makefile +++ head/graphics/cegui/Makefile @@ -45,7 +45,7 @@ LUA_CMAKE_ON= -DCEGUI_BUILD_LUA_MODULE=ON -DCEGUI_BUILD_LUA_GENERATOR=ON LUA_CMAKE_OFF= -DCEGUI_BUILD_LUA_MODULE=OFF -DCEGUI_BUILD_LUA_GENERATOR=OFF # this option is not currently used as it doesn't compile (see also CMAKE_ARGS below) -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_LIB_DEPENDS= libboost_python.so:devel/boost-python-libs PYTHON_CMAKE_ON= -DCEGUI_BUILD_PYTHON_MODULES=ON PYTHON_CMAKE_OFF= -DCEGUI_BUILD_PYTHON_MODULES=OFF Index: head/graphics/curator/Makefile =================================================================== --- head/graphics/curator/Makefile +++ head/graphics/curator/Makefile @@ -11,7 +11,7 @@ COMMENT= Static Image Gallery Generator for web or CD-ROM galleries USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix PLIST_FILES= man/man1/curator.1.gz Index: head/graphics/driconf/Makefile =================================================================== --- head/graphics/driconf/Makefile +++ head/graphics/driconf/Makefile @@ -16,7 +16,7 @@ USE_GL= glut USE_PYTHON= distutils NO_BUILD= yes -USES= gettext python +USES= gettext python:2.7 PYDISTUTILS_EGGINFODIR= ${STAGEDIR}${PREFIX}/lib/driconf pre-patch: Index: head/graphics/entangle/Makefile =================================================================== --- head/graphics/entangle/Makefile +++ head/graphics/entangle/Makefile @@ -20,9 +20,9 @@ libraw_r.so:graphics/libraw \ libpeas-1.0.so:devel/libpeas RUN_DEPENDS:= ${BUILD_DEPENDS:Nitstool*} \ - ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas + ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} -USES= gettext-tools gmake libtool pkgconfig python:3 +USES= gettext-tools gmake libtool pkgconfig python:3.4+ GNU_CONFIGURE= yes USE_GNOME= cairo gtk30 intltool introspection USE_GSTREAMER1= core Index: head/graphics/eog-plugins/Makefile =================================================================== --- head/graphics/eog-plugins/Makefile +++ head/graphics/eog-plugins/Makefile @@ -42,8 +42,8 @@ CHAMPLAIN_USE= GL=egl XORG=x11,xcomposite,xdamage,xext,xfixes,xi,xrandr PYTHON_CONFIGURE_ENABLE=python -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas -PYTHON_USES= python:3 +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} +PYTHON_USES= python:3.4+ PYTHON_VARS= GLIB_SCHEMAS+="org.gnome.eog.plugins.export-to-folder.gschema.xml \ org.gnome.eog.plugins.fullscreenbg.gschema.xml \ org.gnome.eog.plugins.pythonconsole.gschema.xml" Index: head/graphics/facedetect/Makefile =================================================================== --- head/graphics/facedetect/Makefile +++ head/graphics/facedetect/Makefile @@ -14,7 +14,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv -USES= python:run shebangfix +USES= python:2.7,run shebangfix USE_GITHUB= yes NO_BUILD= yes NO_ARCH= yes Index: head/graphics/geos/Makefile =================================================================== --- head/graphics/geos/Makefile +++ head/graphics/geos/Makefile @@ -27,7 +27,7 @@ PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 PYTHON_CONFIGURE_ENABLE=python -PYTHON_USES= python +PYTHON_USES= python:2.7 RUBY_BUILD_DEPENDS= swig3.0:devel/swig30 RUBY_CONFIGURE_ENABLE= ruby RUBY_CONFIGURE_ENV= RUBY="${RUBY}" Index: head/graphics/gnofract4d/Makefile =================================================================== --- head/graphics/gnofract4d/Makefile +++ head/graphics/gnofract4d/Makefile @@ -21,7 +21,7 @@ GH_ACCOUNT= edyoung USES= desktop-file-utils display:build jpeg localbase pathfix \ - pkgconfig python shared-mime-info shebangfix + pkgconfig python:2.7 shared-mime-info shebangfix SHEBANG_FILES= fractutils/get.py USE_GNOME= intlhack libxslt:build pygtk2 USE_PYTHON= distutils autoplist Index: head/graphics/graphene/Makefile =================================================================== --- head/graphics/graphene/Makefile +++ head/graphics/graphene/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -USES= gnome meson pkgconfig python:3 shebangfix tar:xz +USES= gnome meson pkgconfig python:3.4+ shebangfix tar:xz USE_GNOME= glib20 py3gobject3 OPTIONS_SUB= yes Index: head/graphics/gsculpt/Makefile =================================================================== --- head/graphics/gsculpt/Makefile +++ head/graphics/gsculpt/Makefile @@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_python.so:devel/boost-python-libs -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL \ - ${PYTHON_PKGNAMEPREFIX}gtkglext>0:x11-toolkits/py-gtkglext +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gtkglext>0:x11-toolkits/py-gtkglext@${PY_FLAVOR} BROKEN_powerpc= fails to compile BROKEN_sparc64= fails to compile Index: head/graphics/hugin/Makefile =================================================================== --- head/graphics/hugin/Makefile +++ head/graphics/hugin/Makefile @@ -48,7 +48,7 @@ AUTOPANOSIFTC_RUN_DEPENDS= autopano:graphics/autopano-sift-c PYTHON_DESC= Python Scripting Interface -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_BUILD_DEPENDS= swig2.0:devel/swig20 PYTHON_CMAKE_ON= -DBUILD_HSI=ON PYTHON_CMAKE_OFF= -DBUILD_HSI=OFF Index: head/graphics/imgtops/Makefile =================================================================== --- head/graphics/imgtops/Makefile +++ head/graphics/imgtops/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} -USES= ghostscript:run python +USES= ghostscript:run python:2.7 USE_PYTHON= distutils post-install: Index: head/graphics/lensfun/Makefile =================================================================== --- head/graphics/lensfun/Makefile +++ head/graphics/lensfun/Makefile @@ -28,8 +28,8 @@ SIMD_CMAKE_OFF= -DBUILD_FOR_SSE:BOOL=OFF -DBUILD_FOR_SSE2:BOOL=OFF -PYHELPERS_CMAKE_ON= -DSTAGEDIR:STRING=${STAGEDIR} +PYHELPERS_CMAKE_ON= -DSTAGEDIR:STRING=${STAGEDIR} -DPYTHON:STRING=${PYTHON_CMD} PYHELPERS_CMAKE_OFF= -DINSTALL_HELPER_SCRIPTS:BOOL=OFF -DPYTHON:STRING=IGNORE -PYHELPERS_USES= python:3 +PYHELPERS_USES= python:3.4+ .include Index: head/graphics/mapnik/Makefile =================================================================== --- head/graphics/mapnik/Makefile +++ head/graphics/mapnik/Makefile @@ -73,7 +73,7 @@ PROJ_MAKE_ARGS_OFF= PROJ=False CAIRO_LIB_DEPENDS= libcairo.so:graphics/cairo -CAIRO_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:graphics/py-cairo +CAIRO_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:graphics/py-cairo@${PY_FLAVOR} CAIRO_MAKE_ARGS_OFF= CAIRO=False .include Index: head/graphics/mirage/Makefile =================================================================== --- head/graphics/mirage/Makefile +++ head/graphics/mirage/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv3 -USES= desktop-file-utils gettext python tar:bzip2 +USES= desktop-file-utils gettext python:2.7 tar:bzip2 USE_GNOME= gtk20 pygtk2 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= Mirage Index: head/graphics/opencolorio/Makefile =================================================================== --- head/graphics/opencolorio/Makefile +++ head/graphics/opencolorio/Makefile @@ -63,7 +63,7 @@ -DPYTHON:STRING=${PYTHON_CMD} PLIST= ${PKGDIR}/pkg-plist-pyglue .else # master port -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} LIB_DEPENDS= libtinyxml.so:textproc/tinyxml \ libyaml-cpp03.so:devel/yaml-cpp03 USES+= python:2,build Index: head/graphics/opencv/Makefile =================================================================== --- head/graphics/opencv/Makefile +++ head/graphics/opencv/Makefile @@ -142,6 +142,7 @@ BUILD_DEPENDS+= ${PYNUMPY} RUN_DEPENDS+= ${PYNUMPY} USES+= fortran python:2.7 +USE_PYTHON= flavors CMAKE_ARGS+= -DBUILD_opencv_python:BOOL=On . for module in apps java stitching superres videostab CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off Index: head/graphics/piglit/Makefile =================================================================== --- head/graphics/piglit/Makefile +++ head/graphics/piglit/Makefile @@ -13,16 +13,16 @@ BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl \ ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six + ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} LIB_DEPENDS= libcaca.so:graphics/libcaca \ libdrm.so:graphics/libdrm \ libOpenCL.so:devel/ocl-icd \ libpng.so:graphics/png \ libwaffle-1.so:graphics/waffle RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six + ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= dumbbell Index: head/graphics/py-PyOpenGL-accelerate/Makefile =================================================================== --- head/graphics/py-PyOpenGL-accelerate/Makefile +++ head/graphics/py-PyOpenGL-accelerate/Makefile @@ -13,11 +13,10 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= cython:lang/cython \ - ${PYNUMPY} +BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython USES= python .include Index: head/graphics/py-PyOpenGL/Makefile =================================================================== --- head/graphics/py-PyOpenGL/Makefile +++ head/graphics/py-PyOpenGL/Makefile @@ -13,7 +13,7 @@ COMMENT= OpenGL (and related library) interface for Python BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} OPTIONS_DEFINE= TKINTER @@ -24,8 +24,8 @@ USE_GL= glut USE_PYTHON= distutils autoplist -TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter -TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} +TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} post-patch: @${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \ Index: head/graphics/py-PyX/Makefile =================================================================== --- head/graphics/py-PyX/Makefile +++ head/graphics/py-PyX/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 -USES= python:3 +USES= python:3.4+ USE_TEX= latex:build USE_PYTHON= autoplist distutils Index: head/graphics/py-actdiag/Makefile =================================================================== --- head/graphics/py-actdiag/Makefile +++ head/graphics/py-actdiag/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \ - ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag \ - ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib +RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${FLAVOR} \ + ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${FLAVOR} \ + ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${FLAVOR} USES= python:-3.4 USE_PYTHON= autoplist distutils Index: head/graphics/py-blockdiag/Makefile =================================================================== --- head/graphics/py-blockdiag/Makefile +++ head/graphics/py-blockdiag/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \ - ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib \ - ${PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors +RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${FLAVOR} \ + ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${FLAVOR} \ + ${PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors@${FLAVOR} USES= python:-3.4 USE_PYTHON= autoplist distutils @@ -33,7 +33,7 @@ OPTIONS_DEFAULT= PDF IPAFONT_RUN_DEPENDS= ${LOCALBASE}/share/font-ipa/ipag.otf:japanese/font-ipa -PDF_RUN_DEPENDS= ${PKGNAMEPREFIX}reportlab>0:print/py-reportlab +PDF_RUN_DEPENDS= ${PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${FLAVOR} post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/src/blockdiag/utils/bootstrap.py Index: head/graphics/py-blockdiagcontrib-cisco/Makefile =================================================================== --- head/graphics/py-blockdiagcontrib-cisco/Makefile +++ head/graphics/py-blockdiagcontrib-cisco/Makefile @@ -9,7 +9,7 @@ MAINTAINER= kuriyama@FreeBSD.org COMMENT= Networking shapes for blockdiag designed by Cisco -RUN_DEPENDS= ${PKGNAMEPREFIX}blockdiag>=0.8.0:graphics/py-blockdiag +RUN_DEPENDS= ${PKGNAMEPREFIX}blockdiag>=0.8.0:graphics/py-blockdiag@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: head/graphics/py-cairo/Makefile =================================================================== --- head/graphics/py-cairo/Makefile +++ head/graphics/py-cairo/Makefile @@ -18,9 +18,12 @@ PORTSCOUT= limitw:1,even -USES= gnome pkgconfig python:2 +USES= gnome pkgconfig python USE_PYTHON= distutils USE_GNOME= cairo +py34_PLIST= ${.CURDIR}/pkg-plist-py3 +py35_PLIST= ${.CURDIR}/pkg-plist-py3 +py36_PLIST= ${.CURDIR}/pkg-plist-py3 PLIST_SUB= PORTVER=${PORTVERSION} Index: head/graphics/py-cairo/pkg-plist-py3 =================================================================== --- head/graphics/py-cairo/pkg-plist-py3 +++ head/graphics/py-cairo/pkg-plist-py3 @@ -0,0 +1,10 @@ +include/pycairo/py3cairo.h +%%PYTHON_SITELIBDIR%%/cairo/__init__.py +%%PYTHON_SITELIBDIR%%/cairo/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/cairo/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/cairo/_cairo.so +%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/PKG-INFO +%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt +%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt +%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/top_level.txt +libdata/pkgconfig/py3cairo.pc Index: head/graphics/py-cairocffi/Makefile =================================================================== --- head/graphics/py-cairocffi/Makefile +++ head/graphics/py-cairocffi/Makefile @@ -13,10 +13,14 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi +py34_BROKEN= does not package +py35_BROKEN= does not package +py36_BROKEN= does not package + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR} BUILD_DEPENDS= ${RUN_DEPENDS} -USES= python:2+ +USES= python USE_PYTHON= autoplist distutils cffi USE_GNOME= cairo Index: head/graphics/py-django-easy-thumbnails/Makefile =================================================================== --- head/graphics/py-django-easy-thumbnails/Makefile +++ head/graphics/py-django-easy-thumbnails/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/graphics/py-djvulibre/Makefile =================================================================== --- head/graphics/py-djvulibre/Makefile +++ head/graphics/py-djvulibre/Makefile @@ -12,11 +12,10 @@ LICENSE= GPLv2 -BUILD_DEPENDS= cython:lang/cython LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre USES= python:2 pkgconfig -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython post-patch: @${REINPLACE_CMD} -e "s|'python'|'${PYTHON_CMD}'|g" ${WRKSRC}/setup.py Index: head/graphics/py-editobj/Makefile =================================================================== --- head/graphics/py-editobj/Makefile +++ head/graphics/py-editobj/Makefile @@ -13,7 +13,7 @@ COMMENT= Create and display a Tkinter dialog box for editing any Python object DIST_SUBDIR= python -USES+= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= EditObj WRKSRC= ${WRKDIR}/EditObj-${PORTVERSION} Index: head/graphics/py-exiv2/Makefile =================================================================== --- head/graphics/py-exiv2/Makefile +++ head/graphics/py-exiv2/Makefile @@ -16,6 +16,7 @@ libboost_python.so:devel/boost-python-libs USES= python:2 scons tar:bzip2 +USE_PYTHON= flavors USE_LDCONFIG= yes CXXFLAGS+= -I${LOCALBASE}/include MAKE_ARGS+= prefix=${PREFIX} use_env=1 Index: head/graphics/py-gd/Makefile =================================================================== --- head/graphics/py-gd/Makefile +++ head/graphics/py-gd/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libgd.so:graphics/gd -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist pythonprefix PYSETUP= setup.py Index: head/graphics/py-gdal/Makefile =================================================================== --- head/graphics/py-gdal/Makefile +++ head/graphics/py-gdal/Makefile @@ -27,8 +27,8 @@ SHEBANG_FILES= scripts/*.py -NUMPY_BUILD_DEPENDS= ${PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy -NUMPY_RUN_DEPENDS= ${PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy +NUMPY_BUILD_DEPENDS= ${PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy@${FLAVOR} +NUMPY_RUN_DEPENDS= ${PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy@${FLAVOR} NUMPY_USES= fortran post-install: Index: head/graphics/py-gizeh/Makefile =================================================================== --- head/graphics/py-gizeh/Makefile +++ head/graphics/py-gizeh/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairocffi>0:graphics/py-cairocffi \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairocffi>0:graphics/py-cairocffi@${FLAVOR} \ ${PYNUMPY} USES= python Index: head/graphics/py-glewpy/Makefile =================================================================== --- head/graphics/py-glewpy/Makefile +++ head/graphics/py-glewpy/Makefile @@ -16,9 +16,9 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Advanced OpenGL extensions to Python -BUILD_DEPENDS= pyrex>=0.9.6.2:devel/pyrex +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>=0.9.6.2:devel/pyrex@${FLAVOR} -USES= python +USES= python:2.7 USE_GL= glew USE_PYTHON= distutils Index: head/graphics/py-goocanvas/Makefile =================================================================== --- head/graphics/py-goocanvas/Makefile +++ head/graphics/py-goocanvas/Makefile @@ -18,9 +18,10 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/goocanvasmodule.so \ libdata/pkgconfig/pygoocanvas.pc USE_GNOME= pygtk2 +USE_PYTHON= flavors GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-docs -USES= gmake libtool pathfix pkgconfig python tar:bzip2 +USES= gmake libtool pathfix pkgconfig python:2.7 tar:bzip2 INSTALL_TARGET= install-strip post-patch: Index: head/graphics/py-graphviz/Makefile =================================================================== --- head/graphics/py-graphviz/Makefile +++ head/graphics/py-graphviz/Makefile @@ -14,8 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= dot:graphics/graphviz -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov \ - ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${FLAVOR} NO_ARCH= yes USES= python zip Index: head/graphics/py-graphy/Makefile =================================================================== --- head/graphics/py-graphy/Makefile +++ head/graphics/py-graphy/Makefile @@ -15,6 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= python:run tar:bzip2 +USE_PYTHON= flavors PORTDOCS= README PORTEXAMPLES= * Index: head/graphics/py-imagesize/Makefile =================================================================== --- head/graphics/py-imagesize/Makefile +++ head/graphics/py-imagesize/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist distutils .include Index: head/graphics/py-imgurpython/Makefile =================================================================== --- head/graphics/py-imgurpython/Makefile +++ head/graphics/py-imgurpython/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.7:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.7:www/py-requests@${FLAVOR} NO_ARCH= yes USES= python Index: head/graphics/py-leather/Makefile =================================================================== --- head/graphics/py-leather/Makefile +++ head/graphics/py-leather/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: head/graphics/py-mayavi/Makefile =================================================================== --- head/graphics/py-mayavi/Makefile +++ head/graphics/py-mayavi/Makefile @@ -26,10 +26,10 @@ py27-sphinx>=1.3.1_2:textproc/py-sphinx RUN_DEPENDS= vtk6>=6.1.0_8:math/vtk6 \ ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}envisage>=4.4.0:devel/py-envisage \ - ${PYTHON_PKGNAMEPREFIX}pyface>=4.5.2:devel/py-pyface \ - ${PYTHON_PKGNAMEPREFIX}scimath>=4.1.2:science/py-scimath \ - ${PYTHON_PKGNAMEPREFIX}traitsui>=4.5.1:graphics/py-traitsui + ${PYTHON_PKGNAMEPREFIX}envisage>=4.4.0:devel/py-envisage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyface>=4.5.2:devel/py-pyface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scimath>=4.1.2:science/py-scimath@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitsui>=4.5.1:graphics/py-traitsui@${FLAVOR} USES= python:-2.7 shebangfix tar:bzip2 USE_PYTHON= autoplist distutils Index: head/graphics/py-mcomix/Makefile =================================================================== --- head/graphics/py-mcomix/Makefile +++ head/graphics/py-mcomix/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python tar:bzip2 Index: head/graphics/py-nwdiag/Makefile =================================================================== --- head/graphics/py-nwdiag/Makefile +++ head/graphics/py-nwdiag/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \ - ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib \ - ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag +RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${FLAVOR} \ + ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${FLAVOR} \ + ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${FLAVOR} USES= python:-3.4 USE_PYTHON= autoplist distutils Index: head/graphics/py-openexr/Makefile =================================================================== --- head/graphics/py-openexr/Makefile +++ head/graphics/py-openexr/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-extract: Index: head/graphics/py-paint/Makefile =================================================================== --- head/graphics/py-paint/Makefile +++ head/graphics/py-paint/Makefile @@ -20,7 +20,7 @@ OPTIONS_DEFINE= EXAMPLES -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_GNOME= libartlgpl2 NO_WRKSUBDIR= yes Index: head/graphics/py-pillow/Makefile =================================================================== --- head/graphics/py-pillow/Makefile +++ head/graphics/py-pillow/Makefile @@ -45,15 +45,15 @@ TIFF_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-tiff TKINTER_USES= tk -TKINTER_BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter -TKINTER_RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} +TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} TKINTER_VARS= PYDISTUTILS_BUILDARGS+="--include-dirs=${TCL_INCLUDEDIR}:${TK_INCLUDEDIR}" WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_VARS= PYDISTUTILS_BUILDARGS+=--enable-webp --enable-webpmux WEBP_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-webp --disable-webpmux -USES?= cpe python +USES= cpe python USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils Index: head/graphics/py-plotly/Makefile =================================================================== --- head/graphics/py-plotly/Makefile +++ head/graphics/py-plotly/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} NO_ARCH= yes USES= python Index: head/graphics/py-poppler/Makefile =================================================================== --- head/graphics/py-poppler/Makefile +++ head/graphics/py-poppler/Makefile @@ -17,7 +17,8 @@ LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib GNU_CONFIGURE= yes -USES= gmake libtool pkgconfig python +USES= gmake libtool pkgconfig python:2.7 USE_GNOME= atk pygtk2 +USE_PYTHON= flavors .include Index: head/graphics/py-pycha/Makefile =================================================================== --- head/graphics/py-pycha/Makefile +++ head/graphics/py-pycha/Makefile @@ -18,6 +18,6 @@ OPTIONS_DEFINE= CAIRO OPTIONS_DEFAULT= CAIRO -CAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo +CAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${FLAVOR} .include Index: head/graphics/py-pycollada/Makefile =================================================================== --- head/graphics/py-pycollada/Makefile +++ head/graphics/py-pycollada/Makefile @@ -11,8 +11,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil@${FLAVOR} NO_ARCH= yes USES= python @@ -21,6 +21,6 @@ OPTIONS_DEFINE= LXML LXML_DESC= Uses lxml for XML loading, construction, and saving. -LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml +LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} .include Index: head/graphics/py-pydot/Makefile =================================================================== --- head/graphics/py-pydot/Makefile +++ head/graphics/py-pydot/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= dot:graphics/graphviz \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.4:devel/py-pyparsing + ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.4:devel/py-pyparsing@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: head/graphics/py-pyembree/Makefile =================================================================== --- head/graphics/py-pyembree/Makefile +++ head/graphics/py-pyembree/Makefile @@ -14,13 +14,12 @@ BROKEN= fails to configure -BUILD_DEPENDS= cython:lang/cython \ - ${PYNUMPY} +BUILD_DEPENDS= ${PYNUMPY} LIB_DEPENDS= libembree.so:graphics/embree RUN_DEPENDS= ${PYNUMPY} USES= localbase python:2 -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython USE_GITHUB= yes GH_ACCOUNT= scopatz Index: head/graphics/py-pygal/Makefile =================================================================== --- head/graphics/py-pygal/Makefile +++ head/graphics/py-pygal/Makefile @@ -12,7 +12,7 @@ LICENSE= LGPL3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml@${FLAVOR} NO_ARCH= yes USES= python Index: head/graphics/py-pyganim/Makefile =================================================================== --- head/graphics/py-pyganim/Makefile +++ head/graphics/py-pyganim/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python zip Index: head/graphics/py-pygooglechart/Makefile =================================================================== --- head/graphics/py-pygooglechart/Makefile +++ head/graphics/py-pygooglechart/Makefile @@ -12,7 +12,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= Complete Python wrapper for the Google Chart API -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist PORTEXAMPLES= * Index: head/graphics/py-pygraphviz/Makefile =================================================================== --- head/graphics/py-pygraphviz/Makefile +++ head/graphics/py-pygraphviz/Makefile @@ -14,9 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcgraph.so:graphics/graphviz -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}nose>=0.10.1:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.10.1:devel/py-nose@${FLAVOR} -USES?= pkgconfig python +USES= pkgconfig python USE_PYTHON= autoplist concurrent distutils PYDISTUTILS_BUILD_TARGET= build build_ext Index: head/graphics/py-qt4-svg/Makefile =================================================================== --- head/graphics/py-qt4-svg/Makefile +++ head/graphics/py-qt4-svg/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run +USE_PYTHON= flavors USE_QT4= corelib gui svg moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: head/graphics/py-qt5-svg/Makefile =================================================================== --- head/graphics/py-qt5-svg/Makefile +++ head/graphics/py-qt5-svg/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run gui_run widgets_run +USE_PYTHON= flavors USE_QT5= core gui svg widgets qmake_build OPTIONS_DEFINE= API DEBUG Index: head/graphics/py-rabbyt/Makefile =================================================================== --- head/graphics/py-rabbyt/Makefile +++ head/graphics/py-rabbyt/Makefile @@ -13,7 +13,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Fast sprite library for Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_GL= gl glu Index: head/graphics/py-sane/Makefile =================================================================== --- head/graphics/py-sane/Makefile +++ head/graphics/py-sane/Makefile @@ -14,10 +14,10 @@ COMMENT= Python bindings for Sane LIB_DEPENDS= libsane.so:graphics/sane-backends -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} DIST_SUBDIR= python -USES= python +USES= python:2.7 USE_PYTHON= distutils WRKSRC= ${WRKDIR}/${DISTNAME}/Sane Index: head/graphics/py-scikit-image/Makefile =================================================================== --- head/graphics/py-scikit-image/Makefile +++ head/graphics/py-scikit-image/Makefile @@ -13,23 +13,21 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/bin/cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc + ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/bin/cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets + ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets@${FLAVOR} -USES= cpe python +USES= cpe python:2.7 USE_GITHUB= yes -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython cython_run PYDISTUTILS_BUILD_TARGET= build build_ext PYDISTUTILS_BUILDARGS+= saveopts Index: head/graphics/py-seqdiag/Makefile =================================================================== --- head/graphics/py-seqdiag/Makefile +++ head/graphics/py-seqdiag/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \ - ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib \ - ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag +RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${FLAVOR} \ + ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${FLAVOR} \ + ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${FLAVOR} USES= python:-3.4 USE_PYTHON= autoplist distutils Index: head/graphics/py-sk1/Makefile =================================================================== --- head/graphics/py-sk1/Makefile +++ head/graphics/py-sk1/Makefile @@ -13,11 +13,11 @@ LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libMagickCore-6.so:graphics/ImageMagick -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}pycups>0:print/py-pycups \ - ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycups>0:print/py-pycups@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${FLAVOR} USES= desktop-file-utils python:2 USE_GITHUB= yes Index: head/graphics/py-sorl-thumbnail/Makefile =================================================================== --- head/graphics/py-sorl-thumbnail/Makefile +++ head/graphics/py-sorl-thumbnail/Makefile @@ -13,12 +13,12 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} USES= python USE_PYTHON= autoplist distutils -DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}@${FLAVOR} OPTIONS_DEFINE= DJANGO PDF WORD DJANGO_DESC= Enable Django @@ -30,7 +30,7 @@ .include .if ${PORT_OPTIONS:MDJANGO} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} .endif .if ${PORT_OPTIONS:MPDF} Index: head/graphics/py-soya3d/Makefile =================================================================== --- head/graphics/py-soya3d/Makefile +++ head/graphics/py-soya3d/Makefile @@ -14,15 +14,15 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Very high level 3D engine for Python -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} LIB_DEPENDS= libode.so:devel/ode \ libcal3d.so:graphics/cal3d \ libfreetype.so:print/freetype2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/editobj/editor.py:graphics/py-editobj \ - ${PYTHON_SITELIBDIR}/tofu/client.py:net/py-tofu \ - ${PYTHON_SITELIBDIR}/cerealizer/__init__.py:security/py-cerealizer +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/editobj/editor.py:graphics/py-editobj@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/tofu/client.py:net/py-tofu@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/cerealizer/__init__.py:security/py-cerealizer@${FLAVOR} -USES= gmake openal:al,alut python tar:bzip2 +USES= gmake openal:al,alut python:2.7 tar:bzip2 USE_GL= glew glu USE_PYTHON= autoplist distutils USE_SDL= sdl Index: head/graphics/py-stltools/Makefile =================================================================== --- head/graphics/py-stltools/Makefile +++ head/graphics/py-stltools/Makefile @@ -24,7 +24,7 @@ OPTIONS_DEFINE= PYCAIRO DOCS EXAMPLES PYCAIRO_DESC= Use (py)Cairo to enable stl2pdf to function. -PYCAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>1.8:graphics/py-cairo +PYCAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>1.8:graphics/py-cairo@${FLAVOR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Index: head/graphics/py-toyplot/Makefile =================================================================== --- head/graphics/py-toyplot/Makefile +++ head/graphics/py-toyplot/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.8:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}colormath>=2.1.1:math/py-colormath \ - ${PYTHON_PKGNAMEPREFIX}multipledispatch>=0.4.7:devel/py-multipledispatch \ - ${PYTHON_PKGNAMEPREFIX}png>=0.0.17:graphics/py-png \ - ${PYTHON_PKGNAMEPREFIX}reportlab>=3.2.0:print/py-reportlab +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.8:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}colormath>=2.1.1:math/py-colormath@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}multipledispatch>=0.4.7:devel/py-multipledispatch@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}png>=0.0.17:graphics/py-png@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}reportlab>=3.2.0:print/py-reportlab@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/graphics/py-traitsui/Makefile =================================================================== --- head/graphics/py-traitsui/Makefile +++ head/graphics/py-traitsui/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE_EPL= ${WRKSRC}/image_LICENSE_Eclipse.txt # See ${WRKSRC}/image_LICENSE.txt for per file license information -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apptools>=4.3.0:devel/py-apptools +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apptools>=4.3.0:devel/py-apptools@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: head/graphics/py3-cairo/Makefile =================================================================== --- head/graphics/py3-cairo/Makefile +++ head/graphics/py3-cairo/Makefile @@ -1,30 +0,0 @@ -# Created by: Michael Johnson -# $FreeBSD$ - -PORTNAME= cairo -PORTVERSION= 1.14.1 -CATEGORIES= graphics python -MASTER_SITES= https://github.com/pygobject/pycairo/releases/download/v${PORTVERSION}/ -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= py${PORTNAME}-${PORTVERSION} - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Python 3 bindings for Cairo - -LICENSE= LGPL21 MPL11 -LICENSE_COMB= multi -LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING-LGPL-2.1 -LICENSE_FILE_MPL11= ${WRKSRC}/COPYING-MPL-1.1 - -PORTSCOUT= limitw:1,even - -USES= gnome pkgconfig python:3 -USE_PYTHON= distutils -USE_GNOME= cairo - -PLIST_SUB= PORTVER=${PORTVERSION} - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cairo/_cairo.so - -.include Index: head/graphics/py3-cairo/distinfo =================================================================== --- head/graphics/py3-cairo/distinfo +++ head/graphics/py3-cairo/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1506344417 -SHA256 (pycairo-1.14.1.tar.gz) = 0d13a0a6eeaf0c357db04392943eb9b25767445608d31dde1307f003f68c5754 -SIZE (pycairo-1.14.1.tar.gz) = 154394 Index: head/graphics/py3-cairo/pkg-descr =================================================================== --- head/graphics/py3-cairo/pkg-descr +++ head/graphics/py3-cairo/pkg-descr @@ -1,3 +0,0 @@ -Python 3 bindings for Cairo. - -WWW: https://github.com/pygobject/pycairo Index: head/graphics/py3-cairo/pkg-plist =================================================================== --- head/graphics/py3-cairo/pkg-plist +++ head/graphics/py3-cairo/pkg-plist @@ -1,10 +0,0 @@ -include/pycairo/py3cairo.h -%%PYTHON_SITELIBDIR%%/cairo/__init__.py -%%PYTHON_SITELIBDIR%%/cairo/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/cairo/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/cairo/_cairo.so -%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/PKG-INFO -%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt -%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt -%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/top_level.txt -libdata/pkgconfig/py3cairo.pc Index: head/graphics/py3-imagesize/Makefile =================================================================== --- head/graphics/py3-imagesize/Makefile +++ head/graphics/py3-imagesize/Makefile @@ -1,8 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-imagesize - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: head/graphics/py3-pillow/Makefile =================================================================== --- head/graphics/py3-pillow/Makefile +++ head/graphics/py3-pillow/Makefile @@ -1,11 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pillow - -TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/${PYTHON_PKGNAMEPREFIX}tkinter -TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/${PYTHON_PKGNAMEPREFIX}tkinter - -USES= cpe python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: head/graphics/py3-pygraphviz/Makefile =================================================================== --- head/graphics/py3-pygraphviz/Makefile +++ head/graphics/py3-pygraphviz/Makefile @@ -1,12 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pygraphviz - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.10.1:devel/py3-nose - -PORTSCOUT= ignore:1 - -USES= pkgconfig python:3.4+ - -.include "${MASTERDIR}/Makefile" Index: head/graphics/qgis/Makefile =================================================================== --- head/graphics/qgis/Makefile +++ head/graphics/qgis/Makefile @@ -89,48 +89,48 @@ POSTGIS_CMAKE_ON= -DWITH_POSTGRESQL:BOOL=TRUE POSTGIS_CMAKE_OFF= -DWITH_POSTGRESQL:BOOL=FALSE -PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32 \ - ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr \ - ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj \ +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32 \ - ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}gdal>=2.0.1:graphics/py-gdal \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2,1:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr \ - ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gdal>=2.0.1:graphics/py-gdal@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2,1:math/py-numpy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:databases/py-psycopg2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml + ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} PYTHON_CMAKE_ON= -DWITH_BINDINGS:BOOL=TRUE PYTHON_CMAKE_OFF= -DWITH_BINDINGS:BOOL=FALSE Index: head/graphics/sk1libs/Makefile =================================================================== --- head/graphics/sk1libs/Makefile +++ head/graphics/sk1libs/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= liblcms.so:graphics/lcms \ libfreetype.so:print/freetype2 -USES= jpeg python +USES= jpeg python:2.7 USE_PYTHON= distutils PYDISTUTILS_BUILD_TARGET=build_ext PYDISTUTILS_BUILDARGS= -L${LOCALBASE}/lib \ Index: head/graphics/tilecache/Makefile =================================================================== --- head/graphics/tilecache/Makefile +++ head/graphics/tilecache/Makefile @@ -10,13 +10,13 @@ MAINTAINER= joris.dedieu@gmail.com COMMENT= Python-based WMS-C/TMS server -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup \ - ${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste@${FLAVOR} LICENSE= BSD3CLAUSE MIT LICENSE_COMB= multi -USES= python shebangfix +USES= python:2.7 shebangfix USE_PYTHON= distutils autoplist SHEBANG_FILES= tilecache.cgi tilecache.fcgi Index: head/graphics/uniconvertor/Makefile =================================================================== --- head/graphics/uniconvertor/Makefile +++ head/graphics/uniconvertor/Makefile @@ -15,9 +15,9 @@ LICENSE_FILE_GPLv2+ = ${WRKSRC}/src/GNU_GPL_v2 LICENSE_FILE_LGPL20+ = ${WRKSRC}/src/GNU_LGPL_v2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sk1libs/__init__.py:graphics/sk1libs +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sk1libs/__init__.py:graphics/sk1libs@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils post-install: Index: head/graphics/uniconvw/Makefile =================================================================== --- head/graphics/uniconvw/Makefile +++ head/graphics/uniconvw/Makefile @@ -18,9 +18,9 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sk1libs/__init__.py:graphics/sk1libs \ ${PYTHON_SITELIBDIR}/uniconvertor/__init__.py:graphics/uniconvertor \ - ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2 + ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2@${FLAVOR} -USES= desktop-file-utils python +USES= desktop-file-utils python:2.7 USE_PYTHON= distutils NO_ARCH= yes Index: head/graphics/variety/Makefile =================================================================== --- head/graphics/variety/Makefile +++ head/graphics/variety/Makefile @@ -14,19 +14,19 @@ LICENSE= GPLv3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.38:devel/py-python-distutils-extra \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.38:devel/py-python-distutils-extra@${FLAVOR} \ intltool-update:textproc/intltool -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}cairo>=1.10.0:graphics/py-cairo \ - ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj \ - ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.5.1:ftp/py-pycurl \ - ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1_1:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}exiv2>=0.3.2_3:graphics/py-exiv2 \ - ${PYTHON_PKGNAMEPREFIX}gobject3>=3.14.0:devel/py-gobject3 \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}pillow>=2.6.0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1_1:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cairo>=1.10.0:graphics/py-cairo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.5.1:ftp/py-pycurl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1_1:devel/py-dbus@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}exiv2>=0.3.2_3:graphics/py-exiv2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gobject3>=3.14.0:devel/py-gobject3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9:www/py-httplib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=2.6.0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1_1:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR} \ ImageMagick>=6.9.0.4,1:graphics/ImageMagick \ bash>=4.3.33:shells/bash \ ca_root_nss>=3.17.4:security/ca_root_nss \ Index: head/graphics/vips/Makefile =================================================================== --- head/graphics/vips/Makefile +++ head/graphics/vips/Makefile @@ -53,7 +53,7 @@ OPTIONS_SUB= yes DOCS_CONFIGURE_ENABLE= docs -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CONFIGURE_WITH= python PYTHON_CONFIGURE_ENABLE= pyvips8 PYTHON_USE= GNOME=pygobject3 Index: head/irc/bitlbee/Makefile =================================================================== --- head/irc/bitlbee/Makefile +++ head/irc/bitlbee/Makefile @@ -83,7 +83,7 @@ libgpg-error.so:security/libgpg-error SKYPE_CONFIGURE_ON= --skype=1 SKYPE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Skype4Py>0:net-im/py-skype4py -SKYPE_USES= python +SKYPE_USES= python:2.7 TWITTER_CONFIGURE_OFF= --twitter=0 YAHOO_CONFIGURE_OFF= --yahoo=0 Index: head/irc/py-fishcrypt/Makefile =================================================================== --- head/irc/py-fishcrypt/Makefile +++ head/irc/py-fishcrypt/Makefile @@ -11,8 +11,8 @@ MAINTAINER= nemysis@FreeBSD.org COMMENT= FiSH/Mircryption-compatible encryption for XChat/HexChat -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= fladd @@ -20,6 +20,7 @@ GH_TAGNAME= 43554b1a USES= dos2unix python:run shebangfix +USE_PYTHON= flavors SHEBANG_FILES= fishcrypt.py NO_BUILD= yes Index: head/irc/py-irc/Makefile =================================================================== --- head/irc/py-irc/Makefile +++ head/irc/py-irc/Makefile @@ -13,12 +13,12 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools \ - ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}jaraco.util>0:devel/py-jaraco.util \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jaraco.util>0:devel/py-jaraco.util@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} USES= python shebangfix USE_PYTHON= distutils autoplist Index: head/irc/py-limnoria/Makefile =================================================================== --- head/irc/py-limnoria/Makefile +++ head/irc/py-limnoria/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${FLAVOR} OPTIONS_DEFINE= ECDSA PROXY OPTIONS_DEFAULT= ECDSA ENCODING RSS TIME @@ -34,17 +34,17 @@ SQLALCHEMY_DESC= SQLAlchemy database support -ECDSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa -PROXY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks +ECDSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} +PROXY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${FLAVOR} -ENCODING_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet -GPG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-gnupg>=0:security/py-python-gnupg -RSS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser -TIME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz +ENCODING_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${FLAVOR} +GPG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-gnupg>=0:security/py-python-gnupg@${FLAVOR} +RSS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${FLAVOR} +TIME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} +SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: head/irc/py-supybot/Makefile =================================================================== --- head/irc/py-supybot/Makefile +++ head/irc/py-supybot/Makefile @@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= distutils PYDISTUTILS_PKGVERSION= 0.83.1+darcs PYDISTUTILS_EGGINFO= supybot-${PORTVERSION}-py${PYTHON_VER}.egg-info Index: head/irc/znc/Makefile =================================================================== --- head/irc/znc/Makefile +++ head/irc/znc/Makefile @@ -54,7 +54,7 @@ PYTHON_BUILD_DEPENDS= swig30>=3.0.0:devel/swig30 PYTHON_CONFIGURE_ON= --enable-python=python-${PYTHON_VER} --enable-swig PYTHON_USE= perl5=build -PYTHON_USES= perl5 python:3 +PYTHON_USES= perl5 python:3.4+ TCL_CONFIGURE_ENABLE= tcl TCL_CONFIGURE_ON= --with-tcl=${TCL_LIBDIR} TCL_USES= tcl Index: head/japanese/ibus-anthy/Makefile =================================================================== --- head/japanese/ibus-anthy/Makefile +++ head/japanese/ibus-anthy/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:devel/py-notify GNU_CONFIGURE= yes -USES= libtool gettext gmake pkgconfig python +USES= libtool gettext gmake pkgconfig python:2.7 USE_GNOME= intltool pygtk2 LOCALBASE_REPLACE_FILES= \ Index: head/japanese/kana-no-quiz/Makefile =================================================================== --- head/japanese/kana-no-quiz/Makefile +++ head/japanese/kana-no-quiz/Makefile @@ -19,7 +19,7 @@ NO_ARCH= yes -USES= gettext python tar:bzip2 +USES= gettext python:2.7 tar:bzip2 USE_GNOME= pygtk2:run USE_PYTHON= distutils autoplist Index: head/japanese/py-mecab/Makefile =================================================================== --- head/japanese/py-mecab/Makefile +++ head/japanese/py-mecab/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= swig:devel/swig13 LIB_DEPENDS= libmecab.so:japanese/mecab -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_EGGINFO= ${PORTNAME}_python-${PORTVERSION}.post2-py${PYTHON_VER}.egg-info Index: head/japanese/py-tegaki-gtk/Makefile =================================================================== --- head/japanese/py-tegaki-gtk/Makefile +++ head/japanese/py-tegaki-gtk/Makefile @@ -15,9 +15,9 @@ LICENSE= GPLv2 LIB_DEPENDS= libzinnia.so:japanese/zinnia -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/tegaki/engine.py:japanese/py-tegaki +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/tegaki/engine.py:japanese/py-tegaki@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= ${PORTNAME}_pygtk Index: head/japanese/py-tegaki/Makefile =================================================================== --- head/japanese/py-tegaki/Makefile +++ head/japanese/py-tegaki/Makefile @@ -14,9 +14,9 @@ LICENSE= GPLv2 LIB_DEPENDS= libzinnia.so:japanese/zinnia -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/zinnia.py:japanese/py-zinnia +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/zinnia.py:japanese/py-zinnia@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= ${PORTNAME}_python Index: head/japanese/py-zinnia/Makefile =================================================================== --- head/japanese/py-zinnia/Makefile +++ head/japanese/py-zinnia/Makefile @@ -16,7 +16,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= ${PORTNAME}_python PYDISTUTILS_PKGVERSION= 0.0.0 Index: head/japanese/tegaki-recognize/Makefile =================================================================== --- head/japanese/tegaki-recognize/Makefile +++ head/japanese/tegaki-recognize/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libzinnia.so:japanese/zinnia -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/tegakigtk/recognizer.py:japanese/py-tegaki-gtk +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/tegakigtk/recognizer.py:japanese/py-tegaki-gtk@${FLAVOR} OPTIONS_DEFINE= DOCS Index: head/japanese/tomoe/Makefile =================================================================== --- head/japanese/tomoe/Makefile +++ head/japanese/tomoe/Makefile @@ -36,7 +36,7 @@ MYSQL_CONFIGURE_WITH= mysql PYTHON_DESC= Enable Python module PYTHON_USE= GNOME=pygtk2 -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CONFIGURE_OFF= --with-python=no RUBY_DESC= Enable Ruby module RUBY_BROKEN= Does not build Index: head/lang/Makefile =================================================================== --- head/lang/Makefile +++ head/lang/Makefile @@ -47,7 +47,6 @@ SUBDIR += cparser SUBDIR += csharp-mode.el SUBDIR += cython - SUBDIR += cython3 SUBDIR += diveintopython SUBDIR += dlang-tools SUBDIR += dlv Index: head/lang/cdent/Makefile =================================================================== --- head/lang/cdent/Makefile +++ head/lang/cdent/Makefile @@ -10,9 +10,9 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= Portable Module Programming Language -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/lang/cython/Makefile =================================================================== --- head/lang/cython/Makefile +++ head/lang/cython/Makefile @@ -6,6 +6,7 @@ CATEGORIES= lang python MASTER_SITES= http://www.cython.org/release/ \ CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Cython-${PORTVERSION} MAINTAINER= vmagerya@gmail.com @@ -14,8 +15,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES?= python -USE_PYTHON+= autoplist distutils + +USES= python +USE_PYTHON= autoplist distutils concurrent allflavors post-install: ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Cython \ Index: head/lang/cython3/Makefile =================================================================== --- head/lang/cython3/Makefile +++ head/lang/cython3/Makefile @@ -1,9 +0,0 @@ -MASTERDIR= ${.CURDIR}/../cython - -PKGNAMESUFFIX= 3 - -USES= python:3.3+ -USE_PYTHON= concurrent -UNIQUE_SUFFIX= ${PKGNAMESUFFIX} - -.include "${MASTERDIR}/Makefile" Index: head/lang/micropython/Makefile =================================================================== --- head/lang/micropython/Makefile +++ head/lang/micropython/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libffi.so:devel/libffi -USES= gmake pkgconfig python:3,build readline shebangfix +USES= gmake pkgconfig python:3.4+,build readline shebangfix USE_GITHUB= yes Index: head/lang/py-clojure/Makefile =================================================================== --- head/lang/py-clojure/Makefile +++ head/lang/py-clojure/Makefile @@ -13,7 +13,7 @@ LICENSE= EPL -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: head/lang/py-hy/Makefile =================================================================== --- head/lang/py-hy/Makefile +++ head/lang/py-hy/Makefile @@ -13,15 +13,15 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>0:devel/py-args \ - ${PYTHON_PKGNAMEPREFIX}astor>0:devel/py-astor \ - ${PYTHON_PKGNAMEPREFIX}clint>0:devel/py-clint \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}rply>0:devel/py-rply \ - ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox \ - ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \ - ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>0:devel/py-args@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}astor>0:devel/py-astor@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}clint>0:devel/py-clint@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rply>0:devel/py-rply@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/lang/py-qt5-qml/Makefile =================================================================== --- head/lang/py-qt5-qml/Makefile +++ head/lang/py-qt5-qml/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run network_run +USE_PYTHON= flavors USE_QT5= core gui network qml buildtools_build qmake_build OPTIONS_DEFINE= API DEBUG Index: head/lang/pypy/Makefile =================================================================== --- head/lang/pypy/Makefile +++ head/lang/pypy/Makefile @@ -94,7 +94,7 @@ .endif PYPY_VARS= PYTHON_CMD=${LOCALBASE}/bin/pypy PYPY_MINMEM_VARS= PYTHON_CMD="${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300" -PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser@${PY_FLAVOR} PYTHON_USES= python:2,build DESCR= ${.CURDIR}/pkg-descr Index: head/lang/python-tools/Makefile =================================================================== --- head/lang/python-tools/Makefile +++ head/lang/python-tools/Makefile @@ -39,10 +39,6 @@ SCRIPT_FILES+= logmerge .endif -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} -UNIQUE_DEFAULT_LINKS= yes -.endif - do-install: .for fname in ${SCRIPT_FILES} ${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/${fname}.py \ Index: head/lang/python34/files/pkg-message.in =================================================================== --- head/lang/python34/files/pkg-message.in +++ head/lang/python34/files/pkg-message.in @@ -3,8 +3,8 @@ Note that some standard Python modules are provided as separate ports as they require additional dependencies. They are available as: -py%%PYTHON_SUFFIX%%-gdbm databases/py%%PYTHON_SUFFIX%%-gdbm -py%%PYTHON_SUFFIX%%-sqlite3 databases/py%%PYTHON_SUFFIX%%-sqlite3 -py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py%%PYTHON_SUFFIX%%-tkinter +py%%PYTHON_SUFFIX%%-gdbm databases/py-gdbm@py%%PYTHON_SUFFIX%% +py%%PYTHON_SUFFIX%%-sqlite3 databases/py-sqlite3@py%%PYTHON_SUFFIX%% +py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py-tkinter@py%%PYTHON_SUFFIX%% =========================================================================== Index: head/lang/python35/files/pkg-message.in =================================================================== --- head/lang/python35/files/pkg-message.in +++ head/lang/python35/files/pkg-message.in @@ -3,8 +3,8 @@ Note that some standard Python modules are provided as separate ports as they require additional dependencies. They are available as: -py%%PYTHON_SUFFIX%%-gdbm databases/py%%PYTHON_SUFFIX%%-gdbm -py%%PYTHON_SUFFIX%%-sqlite3 databases/py%%PYTHON_SUFFIX%%-sqlite3 -py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py%%PYTHON_SUFFIX%%-tkinter +py%%PYTHON_SUFFIX%%-gdbm databases/py-gdbm@py%%PYTHON_SUFFIX%% +py%%PYTHON_SUFFIX%%-sqlite3 databases/py-sqlite3@py%%PYTHON_SUFFIX%% +py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py-tkinter@py%%PYTHON_SUFFIX%% =========================================================================== Index: head/lang/python36/files/pkg-message.in =================================================================== --- head/lang/python36/files/pkg-message.in +++ head/lang/python36/files/pkg-message.in @@ -3,8 +3,8 @@ Note that some standard Python modules are provided as separate ports as they require additional dependencies. They are available as: -py%%PYTHON_SUFFIX%%-gdbm databases/py%%PYTHON_SUFFIX%%-gdbm -py%%PYTHON_SUFFIX%%-sqlite3 databases/py%%PYTHON_SUFFIX%%-sqlite3 -py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py%%PYTHON_SUFFIX%%-tkinter +py%%PYTHON_SUFFIX%%-gdbm databases/py-gdbm@py%%PYTHON_SUFFIX%% +py%%PYTHON_SUFFIX%%-sqlite3 databases/py-sqlite3@py%%PYTHON_SUFFIX%% +py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py-tkinter@py%%PYTHON_SUFFIX%% =========================================================================== Index: head/lang/tinypy/Makefile =================================================================== --- head/lang/tinypy/Makefile +++ head/lang/tinypy/Makefile @@ -15,7 +15,7 @@ GH_ACCOUNT= philhassey -USES= python:build +USES= python:2.7,build USE_PYTHON= distutils noegginfo USE_GITHUB= yes Index: head/mail/courier-pythonfilter/Makefile =================================================================== --- head/mail/courier-pythonfilter/Makefile +++ head/mail/courier-pythonfilter/Makefile @@ -11,8 +11,8 @@ BUILD_DEPENDS= courier-config:mail/courier -USES= python -USE_PYTHON= distutils +USES= python:2.7 +USE_PYTHON= distutils concurrent optsuffix NO_ARCH= yes MAILOWN= courier @@ -60,7 +60,7 @@ PYDISTUTILS_INSTALLARGS:=${PYDISTUTILS_INSTALLARGS} --install-scripts=${PYSCRIPTSDIR} -CLAMAV_CLAMD_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyclamd.py:security/py-pyclamd +CLAMAV_CLAMD_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyclamd.py:security/py-pyclamd@${FLAVOR} post-extract: ${MV} ${WRKSRC}/pythonfilter.conf ${WRKSRC}/pythonfilter.conf.sample Index: head/mail/isbg/Makefile =================================================================== --- head/mail/isbg/Makefile +++ head/mail/isbg/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD2CLAUSE RUN_DEPENDS= spamassassin:mail/spamassassin \ - ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt + ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt@${FLAVOR} USE_GITHUB= yes NO_ARCH= yes NO_BUILD= yes USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix .include Index: head/mail/mailman/Makefile =================================================================== --- head/mail/mailman/Makefile +++ head/mail/mailman/Makefile @@ -141,8 +141,8 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Mailman-Cgi-private.py .endif -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} pre-everything:: @${ECHO} "" Index: head/mail/mailpile/Makefile =================================================================== --- head/mail/mailpile/Makefile +++ head/mail/mailpile/Makefile @@ -12,17 +12,17 @@ LICENSE= AGPLv3+ LICENSE_FILE= ${WRKSRC}/AGPLv3.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}pgpdump>=0:security/py-pgpdump \ - ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns \ - ${PYTHON_PKGNAMEPREFIX}spambayes>=0:mail/py-spambayes +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pgpdump>=0:security/py-pgpdump@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}spambayes>=0:mail/py-spambayes@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= mailpile GH_PROJECT= Mailpile -USES= gettext python shebangfix +USES= gettext python:2.7 shebangfix python_OLD_CMD= /usr/bin/python2 SHEBANG_FILES= mailpile/contrib/gui/gui-o-matic.py \ mailpile/contrib/gui/gui-test.sh \ Index: head/mail/mailutils/Makefile =================================================================== --- head/mail/mailutils/Makefile +++ head/mail/mailutils/Makefile @@ -62,7 +62,7 @@ PAM_CONFIGURE_ENABLE= pam PYTHON_BUILD_DEPENDS= python-config:lang/python -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CONFIGURE_ENABLE=python BDB_USES= bdb:48 Index: head/mail/muttils/Makefile =================================================================== --- head/mail/muttils/Makefile +++ head/mail/muttils/Makefile @@ -15,7 +15,7 @@ CHANGESET= 8bb26094df06 WRKSRC= ${WRKDIR}/blacktrash-${PORTNAME}-${CHANGESET} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist PORTEXAMPLES= * Index: head/mail/offlineimap/Makefile =================================================================== --- head/mail/offlineimap/Makefile +++ head/mail/offlineimap/Makefile @@ -17,8 +17,8 @@ ## later versions have sqlite3 backend, which is recommended for local storages ## with large amount of emails ## (add additional variable to use in {BUILD|RUN}_DEPENDS per porter's hb 5.8.2) -OIMAP_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 +OIMAP_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} BUILD_DEPENDS= ${OIMAP_DEPENDS} RUN_DEPENDS= ${OIMAP_DEPENDS} Index: head/mail/postfix-policyd-spf-python/Makefile =================================================================== --- head/mail/postfix-policyd-spf-python/Makefile +++ head/mail/postfix-policyd-spf-python/Makefile @@ -15,9 +15,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr \ - ${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf \ - ${PYTHON_PKGNAMEPREFIX}authres>0:mail/py-authres +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}authres>0:mail/py-authres@${FLAVOR} USES= python:2.7+ USE_PYTHON= autoplist distutils Index: head/mail/py-Products.MailHost/Makefile =================================================================== --- head/mail/py-Products.MailHost/Makefile +++ head/mail/py-Products.MailHost/Makefile @@ -13,17 +13,17 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>0:devel/py-DocumentTemplate \ - ${PYTHON_PKGNAMEPREFIX}Persistence>0:devel/py-Persistence \ - ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>0:devel/py-zope.deferredimport \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.sendmail>0:mail/py-zope.sendmail +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>0:devel/py-DocumentTemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>0:devel/py-Persistence@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>0:devel/py-zope.deferredimport@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.sendmail>0:mail/py-zope.sendmail@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: head/mail/py-afew/Makefile =================================================================== --- head/mail/py-afew/Makefile +++ head/mail/py-afew/Makefile @@ -11,9 +11,9 @@ LICENSE= ISCL -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet \ - ${PYTHON_PKGNAMEPREFIX}notmuch>=0:mail/py-notmuch \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}notmuch>=0:mail/py-notmuch@${FLAVOR} \ notmuch:mail/notmuch USES= python @@ -22,13 +22,13 @@ OPTIONS_DEFINE= MANPAGES OPTIONS_DEFAULT= MANPAGES -MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx +MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${FLAVOR} MANPAGES_PLIST_FILES= man/man1/afew.1.gz NO_ARCH= yes post-build-MANPAGES-on: - ${MAKE} -C ${WRKSRC}/docs man + ${MAKE} -C ${WRKSRC}/docs SPHINXBUILD=sphinx-build-${PYTHON_VER} man post-install-MANPAGES-on: ${INSTALL_MAN} ${WRKSRC}/docs/build/man/afew.1 ${STAGEDIR}${PREFIX}/man/man1/ Index: head/mail/py-apolicy/Makefile =================================================================== --- head/mail/py-apolicy/Makefile +++ head/mail/py-apolicy/Makefile @@ -15,9 +15,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipy>=0:net-mgmt/py-ipy \ - ${PYTHON_PKGNAMEPREFIX}pyspf>=0:mail/py-pyspf \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipy>=0:net-mgmt/py-ipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyspf>=0:mail/py-pyspf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} USES= python:2.7 USE_PYTHON= autoplist distutils Index: head/mail/py-dkimpy/Makefile =================================================================== --- head/mail/py-dkimpy/Makefile +++ head/mail/py-dkimpy/Makefile @@ -12,7 +12,7 @@ LICENSE= ZLIB -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns@${FLAVOR} NO_ARCH= yes Index: head/mail/py-flufl.bounce/Makefile =================================================================== --- head/mail/py-flufl.bounce/Makefile +++ head/mail/py-flufl.bounce/Makefile @@ -11,17 +11,10 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} USES= python:3.4+ USE_PYTHON= autoplist distutils -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include +.include Index: head/mail/py-fuglu/Makefile =================================================================== --- head/mail/py-fuglu/Makefile +++ head/mail/py-fuglu/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 RUN_DEPENDS= postfix:mail/postfix \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} -USES= python:2.4+ +USES= python:2.7 USE_PYTHON= autoplist distutils USE_RC_SUBR= fuglu @@ -36,13 +36,13 @@ SPF_DESC= Use SPF (in FuGlu) SQL_DESC= Use SQL -BEAUTIFULSOUP_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bs4/__init__.py:www/py-beautifulsoup +BEAUTIFULSOUP_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bs4/__init__.py:www/py-beautifulsoup@${FLAVOR} CLAMAV_RUN_DEPENDS= clamd:security/clamav -DKIM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dkimpy>0:mail/py-dkimpy -MAGIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic +DKIM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dkimpy>0:mail/py-dkimpy@${FLAVOR} +MAGIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic@${FLAVOR} SPAMASSASSIN_RUN_DEPENDS= spamassassin>=0:mail/spamassassin -SPF_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf -SQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0:databases/py-sqlalchemy10 +SPF_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf@${FLAVOR} +SQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0:databases/py-sqlalchemy10@${FLAVOR} post-extract: @${REINPLACE_CMD} -e "s|'/etc|'etc|g" ${WRKSRC}/setup.py Index: head/mail/py-libgmail/Makefile =================================================================== --- head/mail/py-libgmail/Makefile +++ head/mail/py-libgmail/Makefile @@ -13,7 +13,7 @@ BUILD_DEPENDS= py*-mechanize>=0:www/py-mechanize RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: head/mail/py-ppolicy/Makefile =================================================================== --- head/mail/py-ppolicy/Makefile +++ head/mail/py-ppolicy/Makefile @@ -11,10 +11,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= PPolicy is tool for extending Postfix checking capabilities -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes NO_BUILD= yes @@ -27,9 +27,9 @@ OPTIONS_DEFINE= GEOIP LDAP MYSQL DOCS OPTIONS_DEFAULT= GEOIP LDAP -GEOIP_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/GeoIP.so:net/py-GeoIP -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb -LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap +GEOIP_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/GeoIP.so:net/py-GeoIP@${FLAVOR} +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${FLAVOR} +LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${FLAVOR} post-install: ${INSTALL_DATA} ${WRKSRC}/ppolicy.conf ${STAGEDIR}${PREFIX}/etc Index: head/mail/py-premailer/Makefile =================================================================== --- head/mail/py-premailer/Makefile +++ head/mail/py-premailer/Makefile @@ -12,12 +12,12 @@ LICENSE= PSFL LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect \ - ${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} NO_ARCH= yes USES= python Index: head/mail/py-pyspf/Makefile =================================================================== --- head/mail/py-pyspf/Makefile +++ head/mail/py-pyspf/Makefile @@ -14,8 +14,8 @@ LICENSE= PSFL -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}authres>=0:mail/py-authres -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}authres>=0:mail/py-authres@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils @@ -28,9 +28,9 @@ .include .if ${PYTHON_REL} >= 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}py3dns>=0:dns/py-py3dns +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}py3dns>=0:dns/py-py3dns@${FLAVOR} .else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns@${FLAVOR} .endif # Make the tests run as a module Index: head/mail/py-spambayes/Makefile =================================================================== --- head/mail/py-spambayes/Makefile +++ head/mail/py-spambayes/Makefile @@ -12,9 +12,9 @@ LICENSE= PSFL -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb \ - ${PYTHON_PKGNAMEPREFIX}dns>=2.0:dns/py-dns \ - ${PYTHON_PKGNAMEPREFIX}lockfile>=0.2:devel/py-lockfile +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dns>=2.0:dns/py-dns@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lockfile>=0.2:devel/py-lockfile@${FLAVOR} USES= python:-2.7 USE_PYTHON= distutils autoplist Index: head/mail/py-zope.sendmail/Makefile =================================================================== --- head/mail/py-zope.sendmail/Makefile +++ head/mail/py-zope.sendmail/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: head/mail/pyzor/Makefile =================================================================== --- head/mail/pyzor/Makefile +++ head/mail/pyzor/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>=0:databases/py-gdbm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>=0:databases/py-gdbm@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: head/mail/rss2email2/Makefile =================================================================== --- head/mail/rss2email2/Makefile +++ head/mail/rss2email2/Makefile @@ -14,8 +14,8 @@ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:textproc/py-feedparser \ - ${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:textproc/py-html2text +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:textproc/py-feedparser@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:textproc/py-html2text@${PY_FLAVOR} USES= python:2 shebangfix SHEBANG_FILES= rss2email.py Index: head/mail/rss2email3/Makefile =================================================================== --- head/mail/rss2email3/Makefile +++ head/mail/rss2email3/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:textproc/py-feedparser \ - ${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:textproc/py-html2text +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:textproc/py-feedparser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:textproc/py-html2text@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= wking @@ -26,18 +26,9 @@ PORTDOCS= AUTHORS CHANGELOG README OPTIONS_DEFINE= DOCS -.include - post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ ${INSTALL_MAN} ${WRKSRC}/r2e.1 ${STAGEDIR}${MANPREFIX}/man/man1 -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include +.include Index: head/mail/spamdb-curses/Makefile =================================================================== --- head/mail/spamdb-curses/Makefile +++ head/mail/spamdb-curses/Makefile @@ -13,7 +13,7 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/spamdb:mail/spamd -USES= python +USES= python:2.7 USE_PYTHON= distutils .include Index: head/mail/svnmailer/Makefile =================================================================== --- head/mail/svnmailer/Makefile +++ head/mail/svnmailer/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Tool to post subversion repository commit information -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python:2 tar:bzip2 Index: head/mail/tmda/Makefile =================================================================== --- head/mail/tmda/Makefile +++ head/mail/tmda/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= python shebangfix tar:tgz +USES= python:2.7 shebangfix tar:tgz SHEBANG_FILES= bin/tmda-* contrib/collectaddys contrib/def2html \ contrib/printcdb contrib/printdbm contrib/smtp-check-sender \ contrib/tofmipd.init Index: head/math/cadabra2/Makefile =================================================================== --- head/math/cadabra2/Makefile +++ head/math/cadabra2/Makefile @@ -19,8 +19,8 @@ libjsoncpp.so:devel/jsoncpp \ libgmp.so:math/gmp \ libuuid.so:misc/e2fsprogs-libuuid -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sympy/__init__.py:math/py-sympy \ - ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sympy/__init__.py:math/py-sympy@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} OPTIONS_DEFINE= GUI OPTIONS_DEFAULT=GUI Index: head/math/ceres-solver/Makefile =================================================================== --- head/math/ceres-solver/Makefile +++ head/math/ceres-solver/Makefile @@ -42,7 +42,7 @@ CUSTOM_BLAS_CMAKE_BOOL= CUSTOM_BLAS DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx -DOCS_USES= python:build +DOCS_USES= python:2.7,build DOCS_CMAKE_BOOL= BUILD_DOCUMENTATION EXAMPLES_CMAKE_BOOL= BUILD_EXAMPLES Index: head/math/convertall/Makefile =================================================================== --- head/math/convertall/Makefile +++ head/math/convertall/Makefile @@ -39,11 +39,4 @@ -d ${DATADIR} -f ${DATADIR_REL}) (cd ${STAGEDIR}${DOCSDIR} && ${RM} INSTALL LICENSE) -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include +.include Index: head/math/fityk/Makefile =================================================================== --- head/math/fityk/Makefile +++ head/math/fityk/Makefile @@ -46,7 +46,7 @@ OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CONFIGURE_ENABLE= python post-patch: Index: head/math/gracetmpl/Makefile =================================================================== --- head/math/gracetmpl/Makefile +++ head/math/gracetmpl/Makefile @@ -10,13 +10,14 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Provide an easy way to use existing grace-files as a template -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray@${FLAVOR} +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray@${FLAVOR} LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake python tar:bzip2 +USES= gmake python:2.7 tar:bzip2 +USE_PYTHON= flavors MAKE_ARGS= PREFIX="${PREFIX}" \ BIN_PREFIX="${PREFIX}/bin" \ LIB_PREFIX="${PREFIX}/lib" \ Index: head/math/lybniz/Makefile =================================================================== --- head/math/lybniz/Makefile +++ head/math/lybniz/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -USES= python +USES= python:2.7 USE_PYTHON= distutils USE_GNOME= pygtk2 Index: head/math/nlopt/Makefile =================================================================== --- head/math/nlopt/Makefile +++ head/math/nlopt/Makefile @@ -17,8 +17,8 @@ LIB_DEPENDS= libgmp.so:math/gmp \ libguile-2.0.so:lang/guile2 BUILD_DEPENDS= swig3.0:devel/swig30 \ - ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1,1:math/py-numpy -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1,1:math/py-numpy + ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1,1:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1,1:math/py-numpy@${PY_FLAVOR} GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared Index: head/math/plplot/Makefile =================================================================== --- head/math/plplot/Makefile +++ head/math/plplot/Makefile @@ -58,7 +58,7 @@ LUA_CMAKE_BOOL= ENABLE_lua LUA_CMAKE_ON= -DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}" -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_BUILD_DEPENDS= swig:devel/swig13 \ ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} Index: head/math/py-PyWavelets/Makefile =================================================================== --- head/math/py-PyWavelets/Makefile +++ head/math/py-PyWavelets/Makefile @@ -13,17 +13,15 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYNUMPY} \ - cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow + ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow + ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${FLAVOR} USE_GITHUB= yes GH_PROJECT= pywt -USES= cpe python -USE_PYTHON= autoplist distutils +USES= cpe python:2.7 +USE_PYTHON= autoplist distutils cython cython_run PYDISTUTILS_BUILD_TARGET= build build_ext PYDISTUTILS_BUILDARGS+= saveopts Index: head/math/py-apgl/Makefile =================================================================== --- head/math/py-apgl/Makefile +++ head/math/py-apgl/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv3 BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}scipy>0.7.0:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}scipy>0.7.0:science/py-scipy@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python Index: head/math/py-basemap/Makefile =================================================================== --- head/math/py-basemap/Makefile +++ head/math/py-basemap/Makefile @@ -14,10 +14,10 @@ LICENSE_COMB= multi BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} LIB_DEPENDS= libgeos.so:graphics/geos -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist DATADIR= ${PREFIX}/share/py-${PORTNAME}-data Index: head/math/py-bitmath/Makefile =================================================================== --- head/math/py-bitmath/Makefile +++ head/math/py-bitmath/Makefile @@ -18,6 +18,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-4 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}progressbar231>0:misc/py-progressbar231 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}progressbar231>0:misc/py-progressbar231@${FLAVOR} .include Index: head/math/py-bottleneck/Makefile =================================================================== --- head/math/py-bottleneck/Makefile +++ head/math/py-bottleneck/Makefile @@ -13,13 +13,12 @@ LICENSE= BSD2CLAUSE -BUILD_DEPENDS= ${PYNUMPY} \ - cython:lang/cython +BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist cython OPTIONS_DEFINE= DOCS DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} Index: head/math/py-colormath/Makefile =================================================================== --- head/math/py-colormath/Makefile +++ head/math/py-colormath/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}networkx>=1.9.1:math/py-networkx +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}networkx>=1.9.1:math/py-networkx@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: head/math/py-fastcluster/Makefile =================================================================== --- head/math/py-fastcluster/Makefile +++ head/math/py-fastcluster/Makefile @@ -14,7 +14,7 @@ BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} PORTDOCS= CITATION.txt \ INSTALL.txt \ Index: head/math/py-fiat/Makefile =================================================================== --- head/math/py-fiat/Makefile +++ head/math/py-fiat/Makefile @@ -14,7 +14,7 @@ LICENSE= LGPL3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scientific>=0:math/py-scientific +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scientific>=0:math/py-scientific@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python:2 Index: head/math/py-gato/Makefile =================================================================== --- head/math/py-gato/Makefile +++ head/math/py-gato/Makefile @@ -14,7 +14,7 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LGPL.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} NO_ARCH= yes PORTEXAMPLES= * Index: head/math/py-gnuplot/Makefile =================================================================== --- head/math/py-gnuplot/Makefile +++ head/math/py-gnuplot/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= gnuplot:math/gnuplot \ ${PYNUMPY} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: head/math/py-graphillion/Makefile ================================