summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2017-11-30 15:50:30 +0000
committerMathieu Arnold <mat@FreeBSD.org>2017-11-30 15:50:30 +0000
commit551be3c7231225ed9c26479af2b8914fb2ef0ea8 (patch)
treed296c82a71504382f4faefa0bf8d7be384ea1105
parentemulators/ppsspp: update to 1.5.2 (diff)
Convert Python ports to FLAVORS.
Ports using USE_PYTHON=distutils are now flavored. They will automatically get flavors (py27, py34, py35, py36) depending on what versions they support. There is also a USE_PYTHON=flavors for ports that do not use distutils but need FLAVORS to be set. A USE_PYTHON=noflavors can be set if using distutils but flavors are not wanted. A new USE_PYTHON=optsuffix that will add PYTHON_PKGNAMESUFFIX has been added to cope with Python ports that did not have the Python PKGNAMEPREFIX but are flavored. USES=python now also exports a PY_FLAVOR variable that contains the current python flavor. It can be used in dependency lines when the port itself is not python flavored. For example, deskutils/calibre. By default, all the flavors are generated. To only generate flavors for the versions in PYTHON2_DEFAULT and PYTHON3_DEFAULT, define BUILD_DEFAULT_PYTHON_FLAVORS in your make.conf. In all the ports with Python dependencies, the *_DEPENDS entries MUST end with the flavor so that the framework knows which to build/use. This is done by appending '@${PY_FLAVOR}' after the origin (or @${FLAVOR} if in a Python module with Python flavors, as the content will be the same). For example: RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} PR: 223071 Reviewed by: portmgr, python Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D12464
Notes
Notes: svn path=/head/; revision=455210
-rw-r--r--CHANGES30
-rw-r--r--MOVED148
-rw-r--r--Mk/Uses/gnome.mk9
-rw-r--r--Mk/Uses/pyqt.mk4
-rw-r--r--Mk/Uses/python.mk126
-rw-r--r--UPDATING14
-rw-r--r--accessibility/Makefile3
-rw-r--r--accessibility/accerciser/Makefile2
-rw-r--r--accessibility/caribou/Makefile2
-rw-r--r--accessibility/orca/Makefile18
-rw-r--r--accessibility/py-atspi/Makefile10
-rw-r--r--accessibility/py-atspi/pkg-plist-py3 (renamed from accessibility/py3-atspi/pkg-plist)0
-rw-r--r--accessibility/py-speech-dispatcher/Makefile (renamed from accessibility/py3-speech-dispatcher/Makefile)0
-rw-r--r--accessibility/py-speech-dispatcher/pkg-plist (renamed from accessibility/py3-speech-dispatcher/pkg-plist)0
-rw-r--r--accessibility/py3-atspi/Makefile27
-rw-r--r--accessibility/py3-atspi/distinfo3
-rw-r--r--accessibility/py3-atspi/pkg-descr8
-rw-r--r--accessibility/redshift/Makefile6
-rw-r--r--accessibility/speech-dispatcher/Makefile3
-rw-r--r--archivers/Makefile1
-rw-r--r--archivers/py-attic/Makefile13
-rw-r--r--archivers/py-borgbackup/Makefile13
-rw-r--r--archivers/py-czipfile/Makefile2
-rw-r--r--archivers/py-libarchive-c/Makefile4
-rw-r--r--archivers/py-librtfcomp/Makefile3
-rw-r--r--archivers/py-lz4/Makefile2
-rw-r--r--archivers/py-python-lzo/Makefile2
-rw-r--r--archivers/py3-libarchive-c/Makefile8
-rw-r--r--astro/py-RO/Makefile8
-rw-r--r--astro/py-aipy/Makefile8
-rw-r--r--astro/py-astLib/Makefile10
-rw-r--r--astro/py-horoscopegenerator/Makefile2
-rw-r--r--astro/py-pyfits/Makefile6
-rw-r--r--astro/pyephem/Makefile2
-rw-r--r--audio/Makefile2
-rw-r--r--audio/abcde/Makefile2
-rw-r--r--audio/beets/Makefile62
-rw-r--r--audio/carla/Makefile4
-rw-r--r--audio/exaile-devel/Makefile10
-rw-r--r--audio/exaile/Makefile10
-rw-r--r--audio/gnome-music/Makefile2
-rw-r--r--audio/idjc/Makefile4
-rw-r--r--audio/jokosher/Makefile4
-rw-r--r--audio/libgpod/Makefile6
-rw-r--r--audio/lollypop/Makefile17
-rw-r--r--audio/mbox/Makefile4
-rw-r--r--audio/mpdbrowser/Makefile2
-rw-r--r--audio/mps/Makefile2
-rw-r--r--audio/picard/Makefile4
-rw-r--r--audio/pithos/Makefile12
-rw-r--r--audio/puddletag/Makefile8
-rw-r--r--audio/py-aubio/Makefile2
-rw-r--r--audio/py-discogs-client/Makefile6
-rw-r--r--audio/py-gmusicapi/Makefile30
-rw-r--r--audio/py-gmusicproxy/Makefile16
-rw-r--r--audio/py-karaoke/Makefile2
-rw-r--r--audio/py-mutagen/Makefile2
-rw-r--r--audio/py-openal/Makefile2
-rw-r--r--audio/py-py-jack/Makefile2
-rw-r--r--audio/py-pylast/Makefile2
-rw-r--r--audio/py-pyliblo/Makefile3
-rw-r--r--audio/py-pysndfile/Makefile7
-rw-r--r--audio/py-soundcloud/Makefile2
-rw-r--r--audio/py-soundscrape/Makefile20
-rw-r--r--audio/py-speechrecognition/Makefile4
-rw-r--r--audio/py-speex/Makefile4
-rw-r--r--audio/py-vorbis/Makefile4
-rw-r--r--audio/py-xmms2/Makefile5
-rw-r--r--audio/py3-mutagen/Makefile9
-rw-r--r--audio/py3-pylast/Makefile20
-rw-r--r--audio/py3-pylast/distinfo2
-rw-r--r--audio/py3-pylast/pkg-descr3
-rw-r--r--audio/pytone/Makefile8
-rw-r--r--audio/rhythmbox/Makefile4
-rw-r--r--audio/sonata/Makefile13
-rw-r--r--audio/soundconverter/Makefile2
-rw-r--r--benchmarks/py-naarad/Makefile6
-rw-r--r--benchmarks/py-zopkio/Makefile8
-rw-r--r--biology/libsbml/Makefile2
-rw-r--r--biology/py-biom-format/Makefile10
-rw-r--r--biology/py-biopython/Makefile2
-rw-r--r--biology/py-bx-python/Makefile2
-rw-r--r--biology/py-cutadapt/Makefile2
-rw-r--r--biology/py-pysam/Makefile5
-rw-r--r--biology/pycogent/Makefile7
-rw-r--r--biology/pyfasta/Makefile1
-rw-r--r--biology/python-nexus/Makefile1
-rw-r--r--cad/brickutils/Makefile2
-rw-r--r--cad/linuxcnc-devel/Makefile2
-rw-r--r--cad/py-gdspy/Makefile2
-rw-r--r--cad/py-lcapy/Makefile8
-rw-r--r--cad/py-pycam/Makefile6
-rw-r--r--cad/python-gdsii/Makefile2
-rw-r--r--cad/pythoncad/Makefile4
-rw-r--r--comms/chirp/Makefile8
-rw-r--r--comms/congruity/Makefile2
-rw-r--r--comms/gnuradio/Makefile8
-rw-r--r--comms/owfs/Makefile2
-rw-r--r--comms/py-bulksms/Makefile2
-rw-r--r--comms/py-hidapi/Makefile3
-rw-r--r--comms/py-libconcord/Makefile2
-rw-r--r--comms/py-libimobiledevice/Makefile8
-rw-r--r--comms/py-qt5-serialport/Makefile1
-rw-r--r--comms/quisk/Makefile2
-rw-r--r--comms/uhd/Makefile6
-rw-r--r--comms/wsjt/Makefile11
-rw-r--r--comms/wspr/Makefile11
-rw-r--r--converters/py-bencode.py/Makefile4
-rw-r--r--converters/py-rencode/Makefile4
-rw-r--r--converters/py-zfec/Makefile2
-rw-r--r--converters/zbase32/Makefile4
-rw-r--r--databases/Makefile10
-rw-r--r--databases/buzhug/Makefile2
-rw-r--r--databases/buzhug/pkg-plist21
-rw-r--r--databases/emma/Makefile4
-rw-r--r--databases/gadfly/Makefile2
-rw-r--r--databases/grass7/Makefile4
-rw-r--r--databases/metakit/Makefile2
-rw-r--r--databases/monetdb/Makefile4
-rw-r--r--databases/mtools-mongodb/Makefile4
-rw-r--r--databases/mydbf2mysql/Makefile6
-rw-r--r--databases/openark-kit/Makefile4
-rw-r--r--databases/pg_activity/Makefile6
-rw-r--r--databases/pgbarman/Makefile10
-rw-r--r--databases/pgloader/Makefile4
-rw-r--r--databases/pgworksheet/Makefile2
-rw-r--r--databases/powa-web/Makefile6
-rw-r--r--databases/py-Elixir/Makefile2
-rw-r--r--databases/py-Pyrseas/Makefile6
-rw-r--r--databases/py-agate-sql/Makefile4
-rw-r--r--databases/py-alembic/Makefile4
-rw-r--r--databases/py-apsw/Makefile2
-rw-r--r--databases/py-bsddb/Makefile10
-rw-r--r--databases/py-bsddb3/Makefile2
-rw-r--r--databases/py-carbon/Makefile8
-rw-r--r--databases/py-couchdb/Makefile4
-rw-r--r--databases/py-couchdb/pkg-plist95
-rw-r--r--databases/py-cql/Makefile4
-rw-r--r--databases/py-django-transaction-hooks/Makefile2
-rw-r--r--databases/py-fakeredis/Makefile2
-rw-r--r--databases/py-flask-sqlalchemy/Makefile4
-rw-r--r--databases/py-forgetsql/Makefile4
-rw-r--r--databases/py-gdbm/Makefile2
-rw-r--r--databases/py-geoalchemy/Makefile2
-rw-r--r--databases/py-geoalchemy2/Makefile2
-rw-r--r--databases/py-htsql-mysql/Makefile4
-rw-r--r--databases/py-htsql-pgsql/Makefile4
-rw-r--r--databases/py-htsql/Makefile4
-rw-r--r--databases/py-kyotocabinet/Makefile2
-rw-r--r--databases/py-lmdb/Makefile2
-rw-r--r--databases/py-motor/Makefile2
-rw-r--r--databases/py-mycli/Makefile16
-rw-r--r--databases/py-mysql2pgsql/Makefile10
-rw-r--r--databases/py-mysqlclient/Makefile2
-rw-r--r--databases/py-oursql/Makefile2
-rw-r--r--databases/py-peewee/Makefile6
-rw-r--r--databases/py-pg_pqueue/Makefile2
-rw-r--r--databases/py-pgcli/Makefile20
-rw-r--r--databases/py-pgspecial/Makefile4
-rw-r--r--databases/py-pgxnclient/Makefile2
-rw-r--r--databases/py-pickledb/Makefile2
-rw-r--r--databases/py-pickleshare/Makefile2
-rw-r--r--databases/py-psycopg2/Makefile2
-rw-r--r--databases/py-psycopg2cffi/Makefile4
-rw-r--r--databases/py-pyhs/Makefile2
-rw-r--r--databases/py-pymssql/Makefile5
-rw-r--r--databases/py-pytc/Makefile2
-rw-r--r--databases/py-python-rrdtool/Makefile2
-rw-r--r--databases/py-python-swiftclient/Makefile10
-rw-r--r--databases/py-qt4-sql/Makefile1
-rw-r--r--databases/py-qt5-sql/Makefile1
-rw-r--r--databases/py-queries/Makefile2
-rw-r--r--databases/py-rb/Makefile2
-rw-r--r--databases/py-redis/Makefile2
-rw-r--r--databases/py-riak/Makefile4
-rw-r--r--databases/py-sqlalchemy-migrate/Makefile14
-rw-r--r--databases/py-sqlalchemy10/Makefile16
-rw-r--r--databases/py-sqlalchemy11/Makefile16
-rw-r--r--databases/py-sqlite3/Makefile2
-rw-r--r--databases/py-sqlite3dbm/Makefile6
-rw-r--r--databases/py-sqlobject/Makefile12
-rw-r--r--databases/py-swift/Makefile22
-rw-r--r--databases/py-sybase/Makefile2
-rw-r--r--databases/py-unqlite/Makefile4
-rw-r--r--databases/py-xapian/Makefile3
-rw-r--r--databases/py3-apsw/Makefile9
-rw-r--r--databases/py3-bsddb3/Makefile8
-rw-r--r--databases/py3-mysqlclient/Makefile7
-rw-r--r--databases/py3-psycopg2/Makefile9
-rw-r--r--databases/py34-gdbm/Makefile7
-rw-r--r--databases/py34-sqlite3/Makefile7
-rw-r--r--databases/py35-gdbm/Makefile7
-rw-r--r--databases/py35-sqlite3/Makefile7
-rw-r--r--databases/py36-gdbm/Makefile7
-rw-r--r--databases/py36-sqlite3/Makefile7
-rw-r--r--databases/pydbx/Makefile4
-rw-r--r--databases/pydbx/pkg-plist9
-rw-r--r--databases/pyspatialite/Makefile2
-rw-r--r--databases/rrdtool/Makefile1
-rw-r--r--databases/rrdtool12/Makefile2
-rw-r--r--databases/zodb3/Makefile12
-rw-r--r--deskutils/calibre/Makefile50
-rw-r--r--deskutils/conduit/Makefile16
-rw-r--r--deskutils/conkyemail/Makefile2
-rw-r--r--deskutils/conkyforecast/Makefile2
-rw-r--r--deskutils/dosage/Makefile4
-rw-r--r--deskutils/everygui/Makefile2
-rw-r--r--deskutils/gbirthday/Makefile6
-rw-r--r--deskutils/gcalcli/Makefile16
-rw-r--r--deskutils/gnome-sound-recorder/Makefile2
-rw-r--r--deskutils/gourmet/Makefile20
-rw-r--r--deskutils/griffith/Makefile12
-rw-r--r--deskutils/gtg/Makefile8
-rw-r--r--deskutils/py-bugwarrior/Makefile38
-rw-r--r--deskutils/py-khal/Makefile22
-rw-r--r--deskutils/py-pycarddav/Makefile14
-rw-r--r--deskutils/py-pystash/Makefile8
-rw-r--r--deskutils/py-taskw/Makefile8
-rw-r--r--deskutils/py-vdirsyncer/Makefile18
-rw-r--r--deskutils/py-vobject/Makefile4
-rw-r--r--deskutils/pybookreader/Makefile4
-rw-r--r--deskutils/pypanel/Makefile4
-rw-r--r--deskutils/rednotebook/Makefile6
-rw-r--r--deskutils/syncthing-gtk/Makefile4
-rw-r--r--deskutils/taskcoach/Makefile4
-rw-r--r--deskutils/tel/Makefile2
-rw-r--r--deskutils/virt-manager/Makefile12
-rw-r--r--deskutils/vnc2flv/Makefile2
-rw-r--r--deskutils/wammu/Makefile2
-rw-r--r--deskutils/zim/Makefile6
-rw-r--r--devel/Makefile81
-rw-r--r--devel/ahven/Makefile2
-rw-r--r--devel/android-tools-adb/Makefile2
-rw-r--r--devel/antlr/Makefile2
-rw-r--r--devel/arpc/Makefile10
-rw-r--r--devel/awscli/Makefile15
-rw-r--r--devel/b2/Makefile14
-rw-r--r--devel/bbfreeze/Makefile2
-rw-r--r--devel/bicyclerepair/Makefile2
-rw-r--r--devel/bpython/Makefile12
-rw-r--r--devel/bzr-builder/Makefile2
-rw-r--r--devel/bzr-colo/Makefile2
-rw-r--r--devel/bzr-explorer/Makefile4
-rw-r--r--devel/bzr-externals/Makefile2
-rw-r--r--devel/bzr-fastimport/Makefile4
-rw-r--r--devel/bzr-git/Makefile6
-rw-r--r--devel/bzr-gtk/Makefile4
-rw-r--r--devel/bzr-loom/Makefile2
-rw-r--r--devel/bzr-pipeline/Makefile2
-rw-r--r--devel/bzr-rewrite/Makefile2
-rw-r--r--devel/bzr-scmproj/Makefile2
-rw-r--r--devel/bzr-stats/Makefile2
-rw-r--r--devel/bzr-svn/Makefile4
-rw-r--r--devel/bzr-upload/Makefile2
-rw-r--r--devel/bzr/Makefile7
-rw-r--r--devel/bzrtools/Makefile2
-rw-r--r--devel/codeville/Makefile2
-rw-r--r--devel/cppcheck/Makefile2
-rw-r--r--devel/cram/Makefile8
-rw-r--r--devel/cvs2svn/Makefile6
-rw-r--r--devel/cx_Freeze/Makefile2
-rw-r--r--devel/dissy/Makefile4
-rw-r--r--devel/ditrack/Makefile2
-rw-r--r--devel/drpython/Makefile4
-rw-r--r--devel/eblob/Makefile2
-rw-r--r--devel/epydoc/Makefile2
-rw-r--r--devel/eric6/Makefile18
-rw-r--r--devel/eric6/Makefile.inc2
-rw-r--r--devel/euca2ools/Makefile10
-rw-r--r--devel/fb-adb/Makefile2
-rw-r--r--devel/fnorb/Makefile4
-rw-r--r--devel/gazpacho/Makefile4
-rw-r--r--devel/git-cola/Makefile4
-rw-r--r--devel/git-cvs/Makefile6
-rw-r--r--devel/git-review/Makefile6
-rw-r--r--devel/gitinspector/Makefile2
-rw-r--r--devel/glade/Makefile2
-rw-r--r--devel/gnatpython/Makefile2
-rw-r--r--devel/gnome-builder/Makefile5
-rw-r--r--devel/hgview/Makefile6
-rw-r--r--devel/ipython/Makefile20
-rw-r--r--devel/libftdi/Makefile2
-rw-r--r--devel/libpeas/Makefile21
-rw-r--r--devel/libsigrokdecode/Makefile2
-rw-r--r--devel/meson/Makefile2
-rw-r--r--devel/nuitka/Makefile2
-rw-r--r--devel/osc/Makefile8
-rw-r--r--devel/phpbt/Makefile2
-rw-r--r--devel/phpsh/Makefile2
-rw-r--r--devel/py-Acquisition/Makefile6
-rw-r--r--devel/py-AddOns/Makefile4
-rw-r--r--devel/py-Automat/Makefile8
-rw-r--r--devel/py-Breve/Makefile2
-rw-r--r--devel/py-BytecodeAssembler/Makefile6
-rw-r--r--devel/py-DateTime/Makefile6
-rw-r--r--devel/py-DocumentTemplate/Makefile16
-rw-r--r--devel/py-Jinja2/Makefile13
-rw-r--r--devel/py-Missing/Makefile4
-rw-r--r--devel/py-MultiMapping/Makefile4
-rw-r--r--devel/py-PEAK-Rules/Makefile8
-rw-r--r--devel/py-Persistence/Makefile6
-rw-r--r--devel/py-Products.ATContentTypes/Makefile52
-rw-r--r--devel/py-Products.ATReferenceBrowserWidget/Makefile6
-rw-r--r--devel/py-Products.Archetypes/Makefile74
-rw-r--r--devel/py-Products.BTreeFolder2/Makefile18
-rw-r--r--devel/py-Products.CMFActionIcons/Makefile8
-rw-r--r--devel/py-Products.CMFCalendar/Makefile10
-rw-r--r--devel/py-Products.CMFCore/Makefile10
-rw-r--r--devel/py-Products.CMFDefault/Makefile10
-rw-r--r--devel/py-Products.CMFDiffTool/Makefile8
-rw-r--r--devel/py-Products.CMFDynamicViewFTI/Makefile16
-rw-r--r--devel/py-Products.CMFEditions/Makefile28
-rw-r--r--devel/py-Products.CMFFormController/Makefile14
-rw-r--r--devel/py-Products.CMFPlacefulWorkflow/Makefile12
-rw-r--r--devel/py-Products.CMFQuickInstallerTool/Makefile16
-rw-r--r--devel/py-Products.CMFTestCase/Makefile22
-rw-r--r--devel/py-Products.CMFUid/Makefile8
-rw-r--r--devel/py-Products.DCWorkflow/Makefile8
-rw-r--r--devel/py-Products.ExtendedPathIndex/Makefile8
-rw-r--r--devel/py-Products.ExternalMethod/Makefile12
-rw-r--r--devel/py-Products.GenericSetup/Makefile6
-rw-r--r--devel/py-Products.LDAPMultiPlugins/Makefile6
-rw-r--r--devel/py-Products.LDAPUserFolder/Makefile4
-rw-r--r--devel/py-Products.MIMETools/Makefile4
-rw-r--r--devel/py-Products.Marshall/Makefile20
-rw-r--r--devel/py-Products.MimetypesRegistry/Makefile12
-rw-r--r--devel/py-Products.OFSP/Makefile6
-rw-r--r--devel/py-Products.PasswordResetTool/Makefile18
-rw-r--r--devel/py-Products.PlacelessTranslationService/Makefile26
-rw-r--r--devel/py-Products.PloneTestCase/Makefile20
-rw-r--r--devel/py-Products.PluginRegistry/Makefile2
-rw-r--r--devel/py-Products.PortalTransforms/Makefile16
-rw-r--r--devel/py-Products.PythonScripts/Makefile14
-rw-r--r--devel/py-Products.ResourceRegistries/Makefile18
-rw-r--r--devel/py-Products.StandardCacheManagers/Makefile8
-rw-r--r--devel/py-Products.ZCTextIndex/Makefile16
-rw-r--r--devel/py-Products.ZCatalog/Makefile32
-rw-r--r--devel/py-Products.ZSQLMethods/Makefile20
-rw-r--r--devel/py-Products.ZopeVersionControl/Makefile12
-rw-r--r--devel/py-Products.statusmessages/Makefile8
-rw-r--r--devel/py-Products.validation/Makefile12
-rw-r--r--devel/py-RPyC/Makefile4
-rw-r--r--devel/py-Record/Makefile4
-rw-r--r--devel/py-SymbolType/Makefile2
-rw-r--r--devel/py-ToscaWidgets/Makefile4
-rw-r--r--devel/py-XStatic-Angular-Bootstrap/Makefile10
-rw-r--r--devel/py-XStatic-Angular-FileUpload/Makefile2
-rw-r--r--devel/py-XStatic-Angular-Gettext/Makefile2
-rw-r--r--devel/py-XStatic-Angular-Schema-Form/Makefile2
-rw-r--r--devel/py-XStatic-Angular-lrdragndrop/Makefile2
-rw-r--r--devel/py-XStatic-Angular/Makefile2
-rw-r--r--devel/py-XStatic-Bootstrap-Datepicker/Makefile2
-rw-r--r--devel/py-XStatic-Bootstrap-SCSS/Makefile2
-rw-r--r--devel/py-XStatic-D3/Makefile2
-rw-r--r--devel/py-XStatic-Font-Awesome/Makefile2
-rw-r--r--devel/py-XStatic-Hogan/Makefile2
-rw-r--r--devel/py-XStatic-JQuery-Migrate/Makefile2
-rw-r--r--devel/py-XStatic-JQuery.TableSorter/Makefile2
-rw-r--r--devel/py-XStatic-JQuery.quicksearch/Makefile2
-rw-r--r--devel/py-XStatic-JSEncrypt/Makefile2
-rw-r--r--devel/py-XStatic-Jasmine/Makefile2
-rw-r--r--devel/py-XStatic-Rickshaw/Makefile2
-rw-r--r--devel/py-XStatic-Spin/Makefile2
-rw-r--r--devel/py-XStatic-bootswatch/Makefile2
-rw-r--r--devel/py-XStatic-jQuery/Makefile2
-rw-r--r--devel/py-XStatic-jquery-ui/Makefile2
-rw-r--r--devel/py-XStatic-mdi/Makefile2
-rw-r--r--devel/py-XStatic-objectpath/Makefile2
-rw-r--r--devel/py-XStatic-roboto-fontface/Makefile2
-rw-r--r--devel/py-XStatic-smart-table/Makefile2
-rw-r--r--devel/py-XStatic-term.js/Makefile2
-rw-r--r--devel/py-XStatic-tv4/Makefile2
-rw-r--r--devel/py-adb/Makefile4
-rw-r--r--devel/py-akismet/Makefile2
-rw-r--r--devel/py-aniso8601/Makefile2
-rw-r--r--devel/py-anonfunc/Makefile2
-rw-r--r--devel/py-apipkg/Makefile2
-rw-r--r--devel/py-apptools/Makefile4
-rw-r--r--devel/py-apscheduler/Makefile22
-rw-r--r--devel/py-archetypes.querywidget/Makefile6
-rw-r--r--devel/py-archetypes.referencebrowserwidget/Makefile10
-rw-r--r--devel/py-archetypes.schemaextender/Makefile4
-rw-r--r--devel/py-arrow/Makefile2
-rw-r--r--devel/py-aspects/Makefile2
-rw-r--r--devel/py-astroid/Makefile12
-rw-r--r--devel/py-asttokens/Makefile8
-rw-r--r--devel/py-atomiclong/Makefile4
-rw-r--r--devel/py-atpublic/Makefile2
-rw-r--r--devel/py-automaton/Makefile8
-rw-r--r--devel/py-babel/Makefile13
-rw-r--r--devel/py-babel/distinfo5
-rw-r--r--devel/py-backports.functools_lru_cache/Makefile2
-rw-r--r--devel/py-backports.tempfile/Makefile2
-rw-r--r--devel/py-backports.weakref/Makefile2
-rw-r--r--devel/py-bandit/Makefile8
-rw-r--r--devel/py-bcdoc/Makefile4
-rw-r--r--devel/py-binplist/Makefile2
-rw-r--r--devel/py-biplist/Makefile6
-rw-r--r--devel/py-bison/Makefile4
-rw-r--r--devel/py-blinker/Makefile2
-rw-r--r--devel/py-bluelet/Makefile6
-rw-r--r--devel/py-botocore/Makefile6
-rw-r--r--devel/py-bsd/Makefile9
-rw-r--r--devel/py-buildbot-console-view/Makefile4
-rw-r--r--devel/py-buildbot-grid-view/Makefile4
-rw-r--r--devel/py-buildbot-waterfall-view/Makefile4
-rw-r--r--devel/py-buildbot-worker/Makefile8
-rw-r--r--devel/py-buildbot-www/Makefile14
-rw-r--r--devel/py-buildbot/Makefile32
-rw-r--r--devel/py-canonicaljson/Makefile6
-rw-r--r--devel/py-castellan/Makefile18
-rw-r--r--devel/py-cclib/Makefile1
-rw-r--r--devel/py-cdg/Makefile2
-rw-r--r--devel/py-celery/Makefile8
-rw-r--r--devel/py-cffi/Makefile6
-rw-r--r--devel/py-check-manifest/Makefile2
-rw-r--r--devel/py-cheetah/Makefile2
-rw-r--r--devel/py-ciphon/Makefile2
-rw-r--r--devel/py-circuits/Makefile2
-rw-r--r--devel/py-cjson/Makefile2
-rw-r--r--devel/py-cld/Makefile1
-rw-r--r--devel/py-cli-helpers/Makefile8
-rw-r--r--devel/py-cliapp/Makefile4
-rw-r--r--devel/py-click-log/Makefile8
-rw-r--r--devel/py-click-plugins/Makefile2
-rw-r--r--devel/py-click-threading/Makefile15
-rw-r--r--devel/py-click/Makefile2
-rw-r--r--devel/py-cliff/Makefile16
-rw-r--r--devel/py-clint/Makefile2
-rw-r--r--devel/py-clonedigger/Makefile2
-rw-r--r--devel/py-cloudpickle/Makefile2
-rw-r--r--devel/py-cmdtest/Makefile12
-rw-r--r--devel/py-codecov/Makefile10
-rw-r--r--devel/py-collective.z3cform.datetimewidget/Makefile6
-rw-r--r--devel/py-colorama/Makefile2
-rw-r--r--devel/py-coloredlogs/Makefile4
-rw-r--r--devel/py-columnize/Makefile4
-rw-r--r--devel/py-configargparse/Makefile2
-rw-r--r--devel/py-configobj/Makefile2
-rw-r--r--devel/py-construct/Makefile2
-rw-r--r--devel/py-construct28/Makefile2
-rw-r--r--devel/py-cov-core/Makefile2
-rw-r--r--devel/py-cuisine/Makefile2
-rw-r--r--devel/py-cursive/Makefile18
-rw-r--r--devel/py-curtsies/Makefile4
-rw-r--r--devel/py-cxx/Makefile2
-rw-r--r--devel/py-cycler/Makefile4
-rw-r--r--devel/py-d2to1/Makefile4
-rw-r--r--devel/py-daemon-runner/Makefile2
-rw-r--r--devel/py-daemon/Makefile4
-rw-r--r--devel/py-darcsver/Makefile2
-rw-r--r--devel/py-dateutil/Makefile4
-rw-r--r--devel/py-dateutils/Makefile8
-rw-r--r--devel/py-dbus/Makefile4
-rw-r--r--devel/py-dbus/pkg-plist-py3 (renamed from devel/py3-dbus/pkg-plist)0
-rw-r--r--devel/py-ddt/Makefile4
-rw-r--r--devel/py-debtcollector/Makefile8
-rw-r--r--devel/py-defusedxml/Makefile2
-rw-r--r--devel/py-delfick_error/Makefile16
-rw-r--r--devel/py-deliciousapi/Makefile6
-rw-r--r--devel/py-dialog/Makefile2
-rw-r--r--devel/py-diazo/Makefile12
-rw-r--r--devel/py-django-rq-dashboard/Makefile4
-rw-r--r--devel/py-django-rq/Makefile4
-rw-r--r--devel/py-django-tastypie-mongoengine/Makefile6
-rw-r--r--devel/py-docker-py/Makefile2
-rw-r--r--devel/py-dockerpty/Makefile2
-rw-r--r--devel/py-docopt/Makefile2
-rw-r--r--devel/py-dogpile.cache/Makefile2
-rw-r--r--devel/py-doit/Makefile17
-rw-r--r--devel/py-easyprocess/Makefile6
-rw-r--r--devel/py-efilter/Makefile8
-rw-r--r--devel/py-efl/Makefile14
-rw-r--r--devel/py-entrypoints/Makefile4
-rw-r--r--devel/py-envisage/Makefile2
-rw-r--r--devel/py-epsilon/Makefile4
-rw-r--r--devel/py-extras/Makefile2
-rw-r--r--devel/py-ezpyinline/Makefile3
-rw-r--r--devel/py-fabric/Makefile8
-rw-r--r--devel/py-fasteners/Makefile4
-rw-r--r--devel/py-filemagic/Makefile2
-rw-r--r--devel/py-five.customerize/Makefile30
-rw-r--r--devel/py-five.formlib/Makefile28
-rw-r--r--devel/py-five.globalrequest/Makefile2
-rw-r--r--devel/py-five.localsitemanager/Makefile20
-rw-r--r--devel/py-flake8-builtins/Makefile4
-rw-r--r--devel/py-flake8-docstrings/Makefile8
-rw-r--r--devel/py-flake8-import-order/Makefile6
-rw-r--r--devel/py-flake8-polyfill/Makefile4
-rw-r--r--devel/py-flake8-quotes/Makefile4
-rw-r--r--devel/py-flake8/Makefile10
-rw-r--r--devel/py-flask-babel/Makefile4
-rw-r--r--devel/py-flufl.i18n/Makefile4
-rw-r--r--devel/py-flufl.lock/Makefile4
-rw-r--r--devel/py-foolscap/Makefile4
-rw-r--r--devel/py-fortran/Makefile2
-rw-r--r--devel/py-freenas.dispatcher/Makefile16
-rw-r--r--devel/py-freenas.utils/Makefile4
-rw-r--r--devel/py-freezegun/Makefile12
-rw-r--r--devel/py-fsm/Makefile4
-rw-r--r--devel/py-fusefs/Makefile2
-rw-r--r--devel/py-futurist/Makefile12
-rw-r--r--devel/py-fuzzywuzzy/Makefile2
-rw-r--r--devel/py-game_sdl2/Makefile5
-rw-r--r--devel/py-gamin/Makefile3
-rw-r--r--devel/py-gdata/Makefile6
-rw-r--r--devel/py-gdbgui/Makefile16
-rw-r--r--devel/py-gearman/Makefile2
-rw-r--r--devel/py-geojson/Makefile4
-rw-r--r--devel/py-geotypes/Makefile2
-rw-r--r--devel/py-gevent/Makefile6
-rw-r--r--devel/py-git-up/Makefile10
-rw-r--r--devel/py-gitdb/Makefile4
-rw-r--r--devel/py-gitdb2/Makefile2
-rw-r--r--devel/py-gitless/Makefile6
-rw-r--r--devel/py-gitpython/Makefile8
-rw-r--r--devel/py-glance-store/Makefile28
-rw-r--r--devel/py-glob2/Makefile2
-rw-r--r--devel/py-gobject/Makefile1
-rw-r--r--devel/py-gobject3/Makefile5
-rw-r--r--devel/py-gobject3/pkg-plist-py3 (renamed from devel/py3-gobject3/pkg-plist)0
-rw-r--r--devel/py-google-apputils/Makefile6
-rw-r--r--devel/py-googleapis-common-protos/Makefile2
-rw-r--r--devel/py-grab/Makefile14
-rw-r--r--devel/py-grpcio-tools/Makefile2
-rw-r--r--devel/py-grpcio/Makefile15
-rw-r--r--devel/py-gtfslib/Makefile12
-rw-r--r--devel/py-hash_ring/Makefile2
-rw-r--r--devel/py-hgsubversion/Makefile4
-rw-r--r--devel/py-hgtools/Makefile2
-rw-r--r--devel/py-http-prompt/Makefile12
-rw-r--r--devel/py-hypothesis/Makefile2
-rw-r--r--devel/py-icalendar/Makefile6
-rw-r--r--devel/py-interface/Makefile4
-rw-r--r--devel/py-interface/pkg-plist28
-rw-r--r--devel/py-intervaltree/Makefile2
-rw-r--r--devel/py-invoke/Makefile8
-rw-r--r--devel/py-ipdb/Makefile2
-rw-r--r--devel/py-ipykernel/Makefile8
-rw-r--r--devel/py-ipyparallel/Makefile20
-rw-r--r--devel/py-ipywidgets/Makefile8
-rw-r--r--devel/py-iso8601/Makefile2
-rw-r--r--devel/py-isodate/Makefile2
-rw-r--r--devel/py-isort/Makefile4
-rw-r--r--devel/py-jaraco.classes/Makefile4
-rw-r--r--devel/py-jaraco.functools/Makefile4
-rw-r--r--devel/py-jaraco.itertools/Makefile8
-rw-r--r--devel/py-jaraco.logging/Makefile6
-rw-r--r--devel/py-jaraco.timing/Makefile6
-rw-r--r--devel/py-jaraco.util/Makefile8
-rw-r--r--devel/py-jdcal/Makefile2
-rw-r--r--devel/py-jedi/Makefile2
-rw-r--r--devel/py-jenkins-job-builder/Makefile12
-rw-r--r--devel/py-jira/Makefile28
-rw-r--r--devel/py-jsbeautifier/Makefile4
-rw-r--r--devel/py-json-sempai/Makefile2
-rw-r--r--devel/py-jsonlib/Makefile2
-rw-r--r--devel/py-jsonlib2/Makefile2
-rw-r--r--devel/py-jsonpatch/Makefile2
-rw-r--r--devel/py-jsonref/Makefile2
-rw-r--r--devel/py-jsonrpclib-pelix/Makefile2
-rw-r--r--devel/py-jsonrpclib/Makefile2
-rw-r--r--devel/py-jsonschema/Makefile11
-rw-r--r--devel/py-jsonschema/distinfo5
-rw-r--r--devel/py-jupyter_client/Makefile8
-rw-r--r--devel/py-jupyter_console/Makefile10
-rw-r--r--devel/py-jupyter_core/Makefile8
-rw-r--r--devel/py-kaptan/Makefile2
-rw-r--r--devel/py-kayako/Makefile2
-rw-r--r--devel/py-kazoo/Makefile4
-rw-r--r--devel/py-keystoneauth1/Makefile12
-rw-r--r--devel/py-keystonemiddleware/Makefile28
-rw-r--r--devel/py-kid/Makefile2
-rw-r--r--devel/py-kjbuckets/Makefile2
-rw-r--r--devel/py-lazr.config/Makefile4
-rw-r--r--devel/py-lazr.delegates/Makefile4
-rw-r--r--devel/py-libpeas/Makefile16
-rw-r--r--devel/py-libpeas/pkg-plist-py3 (renamed from devel/py3-libpeas/pkg-plist)0
-rw-r--r--devel/py-libplist/Makefile4
-rw-r--r--devel/py-libtaxii/Makefile6
-rw-r--r--devel/py-libzfs/Makefile12
-rw-r--r--devel/py-linecache2/Makefile4
-rw-r--r--devel/py-llfuse/Makefile2
-rw-r--r--devel/py-llvmlite/Makefile2
-rw-r--r--devel/py-lockfile/Makefile4
-rw-r--r--devel/py-log4py/Makefile2
-rw-r--r--devel/py-logan/Makefile8
-rw-r--r--devel/py-logfury/Makefile4
-rw-r--r--devel/py-logilab-common/Makefile4
-rw-r--r--devel/py-louie/Makefile4
-rw-r--r--devel/py-lxml/Makefile2
-rw-r--r--devel/py-manuel/Makefile2
-rw-r--r--devel/py-mccabe/Makefile4
-rw-r--r--devel/py-mdv/Makefile6
-rw-r--r--devel/py-meliae/Makefile4
-rw-r--r--devel/py-memory_profiler/Makefile2
-rw-r--r--devel/py-microversion-parse/Makefile2
-rw-r--r--devel/py-minimongo/Makefile2
-rw-r--r--devel/py-mock/Makefile10
-rw-r--r--devel/py-mongoengine/Makefile6
-rw-r--r--devel/py-mwlib.ext/Makefile2
-rw-r--r--devel/py-mwlib.rl/Makefile10
-rw-r--r--devel/py-mwlib/Makefile38
-rw-r--r--devel/py-mx-experimental/Makefile4
-rw-r--r--devel/py-mypy/Makefile4
-rw-r--r--devel/py-nagioscheck/Makefile2
-rw-r--r--devel/py-natsort/Makefile14
-rw-r--r--devel/py-nbconvert/Makefile22
-rw-r--r--devel/py-nbformat/Makefile14
-rw-r--r--devel/py-ncurses/Makefile2
-rw-r--r--devel/py-nose-cov/Makefile2
-rw-r--r--devel/py-nose/Makefile2
-rw-r--r--devel/py-nose2/Makefile4
-rw-r--r--devel/py-noseofyeti/Makefile20
-rw-r--r--devel/py-notifier/Makefile2
-rw-r--r--devel/py-notify/Makefile1
-rw-r--r--devel/py-numba/Makefile10
-rw-r--r--devel/py-omnijson/Makefile2
-rw-r--r--devel/py-openstacksdk/Makefile10
-rw-r--r--devel/py-option_merge/Makefile12
-rw-r--r--devel/py-orbit/Makefile3
-rw-r--r--devel/py-ordered-set/Makefile2
-rw-r--r--devel/py-os-brick/Makefile30
-rw-r--r--devel/py-os-client-config/Makefile10
-rw-r--r--devel/py-os-vif/Makefile20
-rw-r--r--devel/py-os-win/Makefile16
-rw-r--r--devel/py-osc-lib/Makefile20
-rw-r--r--devel/py-oslo.cache/Makefile14
-rw-r--r--devel/py-oslo.concurrency/Makefile18
-rw-r--r--devel/py-oslo.config/Makefile14
-rw-r--r--devel/py-oslo.context/Makefile6
-rw-r--r--devel/py-oslo.db/Makefile22
-rw-r--r--devel/py-oslo.i18n/Makefile6
-rw-r--r--devel/py-oslo.log/Makefile20
-rw-r--r--devel/py-oslo.messaging/Makefile52
-rw-r--r--devel/py-oslo.middleware/Makefile22
-rw-r--r--devel/py-oslo.policy/Makefile16
-rw-r--r--devel/py-oslo.privsep/Makefile20
-rw-r--r--devel/py-oslo.reports/Makefile14
-rw-r--r--devel/py-oslo.rootwrap/Makefile4
-rw-r--r--devel/py-oslo.serialization/Makefile10
-rw-r--r--devel/py-oslo.service/Makefile28
-rw-r--r--devel/py-oslo.utils/Makefile22
-rw-r--r--devel/py-oslo.versionedobjects/Makefile26
-rw-r--r--devel/py-oslo.vmware/Makefile26
-rw-r--r--devel/py-osprofiler/Makefile18
-rw-r--r--devel/py-palm/Makefile4
-rw-r--r--devel/py-pathlib/Makefile2
-rw-r--r--devel/py-pathlib2/Makefile4
-rw-r--r--devel/py-pathtools/Makefile4
-rw-r--r--devel/py-pbr/Makefile4
-rw-r--r--devel/py-pefile/Makefile4
-rw-r--r--devel/py-pex/Makefile2
-rw-r--r--devel/py-phabricator/Makefile4
-rw-r--r--devel/py-pid/Makefile2
-rw-r--r--devel/py-pika-pool/Makefile2
-rw-r--r--devel/py-pinocchio/Makefile2
-rw-r--r--devel/py-pip/Makefile22
-rw-r--r--devel/py-plan/Makefile2
-rw-r--r--devel/py-pluggy/Makefile4
-rw-r--r--devel/py-ply/Makefile2
-rw-r--r--devel/py-positional/Makefile2
-rw-r--r--devel/py-pqueue/Makefile2
-rw-r--r--devel/py-pretend/Makefile4
-rw-r--r--devel/py-prioritized_methods/Makefile4
-rw-r--r--devel/py-prompt_toolkit/Makefile8
-rw-r--r--devel/py-protobuf/Makefile6
-rw-r--r--devel/py-protocols-devel/Makefile4
-rw-r--r--devel/py-protocols/Makefile2
-rw-r--r--devel/py-ptrace/Makefile4
-rw-r--r--devel/py-pudb/Makefile4
-rw-r--r--devel/py-py/Makefile4
-rw-r--r--devel/py-pyasn1-modules/Makefile2
-rw-r--r--devel/py-pyasn1/Makefile2
-rw-r--r--devel/py-pycadf/Makefile12
-rw-r--r--devel/py-pycallgraph/Makefile4
-rw-r--r--devel/py-pycallgraph/pkg-plist4
-rw-r--r--devel/py-pycmd/Makefile4
-rw-r--r--devel/py-pycodestyle/Makefile2
-rw-r--r--devel/py-pycparser/Makefile2
-rw-r--r--devel/py-pydenticon/Makefile2
-rw-r--r--devel/py-pydocstyle/Makefile6
-rw-r--r--devel/py-pydrive/Makefile4
-rw-r--r--devel/py-pyechonest/Makefile2
-rw-r--r--devel/py-pyface/Makefile2
-rw-r--r--devel/py-pyflakes/Makefile2
-rw-r--r--devel/py-pygdbmi/Makefile2
-rw-r--r--devel/py-pygit2/Makefile8
-rw-r--r--devel/py-pyicu/Makefile2
-rw-r--r--devel/py-pyinotify/Makefile2
-rw-r--r--devel/py-pyinstaller/Makefile2
-rw-r--r--devel/py-pykde4/Makefile1
-rw-r--r--devel/py-pyke/Makefile4
-rw-r--r--devel/py-pylru-cache/Makefile2
-rw-r--r--devel/py-pymarc/Makefile2
-rw-r--r--devel/py-pyopencl/Makefile20
-rw-r--r--devel/py-pyqi/Makefile2
-rw-r--r--devel/py-pyral/Makefile4
-rw-r--r--devel/py-pyrfc3339/Makefile4
-rw-r--r--devel/py-pyro/Makefile4
-rw-r--r--devel/py-pystorm/Makefile8
-rw-r--r--devel/py-pyte/Makefile4
-rw-r--r--devel/py-pytest-asyncio/Makefile2
-rw-r--r--devel/py-pytest-cache/Makefile6
-rw-r--r--devel/py-pytest-capturelog/Makefile4
-rw-r--r--devel/py-pytest-cov/Makefile4
-rw-r--r--devel/py-pytest-django/Makefile16
-rw-r--r--devel/py-pytest-localserver/Makefile8
-rw-r--r--devel/py-pytest-mock/Makefile4
-rw-r--r--devel/py-pytest-runner/Makefile4
-rw-r--r--devel/py-pytest-timeout/Makefile6
-rw-r--r--devel/py-pytest-tornado/Makefile4
-rw-r--r--devel/py-pytest-xdist/Makefile16
-rw-r--r--devel/py-pytest/Makefile18
-rw-r--r--devel/py-python-bugzilla/Makefile2
-rw-r--r--devel/py-python-dtrace/Makefile5
-rw-r--r--devel/py-python-gist/Makefile12
-rw-r--r--devel/py-python-jenkins/Makefile8
-rw-r--r--devel/py-python-magic/Makefile2
-rw-r--r--devel/py-pytools/Makefile8
-rw-r--r--devel/py-pytz/Makefile2
-rw-r--r--devel/py-pyutil/Makefile2
-rw-r--r--devel/py-pyvalid/Makefile4
-rw-r--r--devel/py-pyvisa-py/Makefile4
-rw-r--r--devel/py-pyvisa/Makefile4
-rw-r--r--devel/py-pyxb/Makefile2
-rw-r--r--devel/py-pyxml2obj/Makefile2
-rw-r--r--devel/py-qpid/Makefile2
-rw-r--r--devel/py-qserve/Makefile2
-rw-r--r--devel/py-qt4-assistant/Makefile1
-rw-r--r--devel/py-qt4-core/Makefile2
-rw-r--r--devel/py-qt4-dbus/Makefile1
-rw-r--r--devel/py-qt4-dbussupport/Makefile16
-rw-r--r--devel/py-qt4-declarative/Makefile1
-rw-r--r--devel/py-qt4-designer/Makefile1
-rw-r--r--devel/py-qt4-designerplugin/Makefile1
-rw-r--r--devel/py-qt4-help/Makefile1
-rw-r--r--devel/py-qt4-qscintilla2/Makefile4
-rw-r--r--devel/py-qt4-script/Makefile1
-rw-r--r--devel/py-qt4-scripttools/Makefile1
-rw-r--r--devel/py-qt4-test/Makefile1
-rw-r--r--devel/py-qt4/Makefile1
-rw-r--r--devel/py-qt5-core/Makefile2
-rw-r--r--devel/py-qt5-dbus/Makefile1
-rw-r--r--devel/py-qt5-dbussupport/Makefile15
-rw-r--r--devel/py-qt5-designer/Makefile1
-rw-r--r--devel/py-qt5-designerplugin/Makefile1
-rw-r--r--devel/py-qt5-help/Makefile1
-rw-r--r--devel/py-qt5-qscintilla2/Makefile1
-rw-r--r--devel/py-qt5-test/Makefile1
-rw-r--r--devel/py-qt5/Makefile1
-rw-r--r--devel/py-qtconsole/Makefile10
-rw-r--r--devel/py-ramlfications/Makefile10
-rw-r--r--devel/py-rauth/Makefile8
-rw-r--r--devel/py-raven/Makefile2
-rw-r--r--devel/py-rebulk/Makefile4
-rw-r--r--devel/py-rednose/Makefile4
-rw-r--r--devel/py-repoze.tm2/Makefile2
-rw-r--r--devel/py-repoze.what-pylons/Makefile8
-rw-r--r--devel/py-repoze.what/Makefile6
-rw-r--r--devel/py-repoze.who-friendlyform/Makefile14
-rw-r--r--devel/py-repoze.who-testutil/Makefile6
-rw-r--r--devel/py-repoze.who/Makefile4
-rw-r--r--devel/py-repoze.xmliter/Makefile4
-rw-r--r--devel/py-requestsexceptions/Makefile2
-rw-r--r--devel/py-resourcepackage/Makefile2
-rw-r--r--devel/py-responses/Makefile4
-rw-r--r--devel/py-retrying/Makefile2
-rw-r--r--devel/py-riak_pb/Makefile2
-rw-r--r--devel/py-robotframework-databaselibrary/Makefile2
-rw-r--r--devel/py-robotframework-pabot/Makefile4
-rw-r--r--devel/py-robotframework-ride/Makefile6
-rw-r--r--devel/py-robotframework-selenium2library/Makefile4
-rw-r--r--devel/py-robotremoteserver/Makefile2
-rw-r--r--devel/py-rply/Makefile2
-rw-r--r--devel/py-rq/Makefile4
-rw-r--r--devel/py-ruamel.ordereddict/Makefile2
-rw-r--r--devel/py-rubymarshal/Makefile2
-rw-r--r--devel/py-ruledispatch/Makefile6
-rw-r--r--devel/py-rwt/Makefile6
-rw-r--r--devel/py-rwt/pkg-plist28
-rw-r--r--devel/py-sanetime/Makefile6
-rw-r--r--devel/py-scripttest/Makefile4
-rw-r--r--devel/py-selection/Makefile6
-rw-r--r--devel/py-selectors34/Makefile2
-rw-r--r--devel/py-semantic_version/Makefile2
-rw-r--r--devel/py-setproctitle/Makefile2
-rw-r--r--devel/py-setuptools-pkg/Makefile6
-rw-r--r--devel/py-setuptools/Makefile (renamed from devel/py27-setuptools/Makefile)9
-rw-r--r--devel/py-setuptools/distinfo (renamed from devel/py27-setuptools/distinfo)0
-rw-r--r--devel/py-setuptools/files/easy-install.pth.dist (renamed from devel/py27-setuptools/files/easy-install.pth.dist)0
-rw-r--r--devel/py-setuptools/files/pkg-message.in (renamed from devel/py27-setuptools/files/pkg-message.in)0
-rw-r--r--devel/py-setuptools/pkg-descr (renamed from devel/py27-setuptools/pkg-descr)0
-rw-r--r--devel/py-setuptools_darcs/Makefile2
-rw-r--r--devel/py-setuptools_scm/Makefile2
-rw-r--r--devel/py-simplejson/Makefile2
-rw-r--r--devel/py-simpy/Makefile2
-rw-r--r--devel/py-singledispatch/Makefile2
-rw-r--r--devel/py-sip/Makefile4
-rw-r--r--devel/py-six/Makefile4
-rw-r--r--devel/py-smmap2/Makefile2
-rw-r--r--devel/py-sortedcontainers/Makefile2
-rw-r--r--devel/py-spyder/Makefile32
-rw-r--r--devel/py-sqlcc/Makefile4
-rw-r--r--devel/py-stackexchange/Makefile2
-rw-r--r--devel/py-stevedore/Makefile6
-rw-r--r--devel/py-streamparse/Makefile20
-rw-r--r--devel/py-structlog/Makefile4
-rw-r--r--devel/py-stsci.distutils/Makefile2
-rw-r--r--devel/py-subversion/Makefile1
-rw-r--r--devel/py-subvertpy/Makefile2
-rw-r--r--devel/py-sure/Makefile6
-rw-r--r--devel/py-tables/Makefile7
-rw-r--r--devel/py-tabulate/Makefile2
-rw-r--r--devel/py-tarantool-queue/Makefile4
-rw-r--r--devel/py-taskflow/Makefile38
-rw-r--r--devel/py-tempora/Makefile6
-rw-r--r--devel/py-tempstorage/Makefile6
-rw-r--r--devel/py-tenacity/Makefile2
-rw-r--r--devel/py-terminable_thread/Makefile2
-rw-r--r--devel/py-testgears/Makefile2
-rw-r--r--devel/py-testinfra/Makefile6
-rw-r--r--devel/py-testoob/Makefile2
-rw-r--r--devel/py-testpath/Makefile4
-rw-r--r--devel/py-testtools/Makefile4
-rw-r--r--devel/py-threema-msgapi/Makefile (renamed from devel/py3-threema-msgapi/Makefile)8
-rw-r--r--devel/py-threema-msgapi/distinfo (renamed from devel/py3-threema-msgapi/distinfo)0
-rw-r--r--devel/py-threema-msgapi/pkg-descr (renamed from devel/py3-threema-msgapi/pkg-descr)0
-rw-r--r--devel/py-tinyarray/Makefile2
-rw-r--r--devel/py-tinyrpc/Makefile8
-rw-r--r--devel/py-tooz/Makefile24
-rw-r--r--devel/py-toposort/Makefile2
-rw-r--r--devel/py-tox/Makefile16
-rw-r--r--devel/py-traceback2/Makefile8
-rw-r--r--devel/py-traitlets/Makefile12
-rw-r--r--devel/py-transaction/Makefile2
-rw-r--r--devel/py-trollius/Makefile4
-rw-r--r--devel/py-tw.forms/Makefile10
-rw-r--r--devel/py-twext/Makefile10
-rw-r--r--devel/py-twilio/Makefile6
-rw-r--r--devel/py-twine/Makefile10
-rw-r--r--devel/py-twisted/Makefile10
-rw-r--r--devel/py-txaio/Makefile10
-rw-r--r--devel/py-tzlocal/Makefile4
-rw-r--r--devel/py-ua_parser/Makefile4
-rw-r--r--devel/py-unittest2/Makefile12
-rw-r--r--devel/py-unpaddedbase64/Makefile2
-rw-r--r--devel/py-update_checker/Makefile2
-rw-r--r--devel/py-urwid/Makefile2
-rw-r--r--devel/py-urwidtrees/Makefile4
-rw-r--r--devel/py-user_agents/Makefile2
-rw-r--r--devel/py-utils/Makefile2
-rw-r--r--devel/py-vcrpy/Makefile14
-rw-r--r--devel/py-vcversioner/Makefile7
-rw-r--r--devel/py-vcversioner/distinfo5
-rw-r--r--devel/py-verboselogs/Makefile2
-rw-r--r--devel/py-virtualenv/Makefile8
-rw-r--r--devel/py-virtualenvwrapper/Makefile14
-rw-r--r--devel/py-voluptuous/Makefile2
-rw-r--r--devel/py-warlock/Makefile6
-rw-r--r--devel/py-watchdog/Makefile12
-rw-r--r--devel/py-wcwidth/Makefile2
-rw-r--r--devel/py-weblib/Makefile8
-rw-r--r--devel/py-wheel/Makefile8
-rw-r--r--devel/py-widgetsnbextension/Makefile2
-rw-r--r--devel/py-wsme/Makefile12
-rw-r--r--devel/py-xattr/Makefile4
-rw-r--r--devel/py-xcaplib/Makefile6
-rw-r--r--devel/py-xdg/Makefile2
-rw-r--r--devel/py-xmltodict/Makefile2
-rw-r--r--devel/py-xxhash/Makefile2
-rw-r--r--devel/py-yaml/Makefile2
-rw-r--r--devel/py-yandex-money-sdk/Makefile6
-rw-r--r--devel/py-ydbf/Makefile2
-rw-r--r--devel/py-yum-metadata-parser/Makefile2
-rw-r--r--devel/py-yunomi/Makefile2
-rw-r--r--devel/py-z3c.autoinclude/Makefile10
-rw-r--r--devel/py-z3c.batching/Makefile4
-rw-r--r--devel/py-z3c.caching/Makefile14
-rw-r--r--devel/py-z3c.form/Makefile40
-rw-r--r--devel/py-z3c.formwidget.query/Makefile12
-rw-r--r--devel/py-z3c.zcmlhook/Makefile8
-rw-r--r--devel/py-zExceptions/Makefile8
-rw-r--r--devel/py-zLOG/Makefile2
-rw-r--r--devel/py-zkpython/Makefile2
-rw-r--r--devel/py-zope.annotation/Makefile12
-rw-r--r--devel/py-zope.app.applicationcontrol/Makefile18
-rw-r--r--devel/py-zope.app.appsetup/Makefile28
-rw-r--r--devel/py-zope.app.basicskin/Makefile6
-rw-r--r--devel/py-zope.app.broken/Makefile16
-rw-r--r--devel/py-zope.app.cache/Makefile26
-rw-r--r--devel/py-zope.app.component/Makefile30
-rw-r--r--devel/py-zope.app.container/Makefile38
-rw-r--r--devel/py-zope.app.content/Makefile10
-rw-r--r--devel/py-zope.app.debug/Makefile8
-rw-r--r--devel/py-zope.app.dependable/Makefile16
-rw-r--r--devel/py-zope.app.error/Makefile10
-rw-r--r--devel/py-zope.app.exception/Makefile16
-rw-r--r--devel/py-zope.app.file/Makefile28
-rw-r--r--devel/py-zope.app.folder/Makefile8
-rw-r--r--devel/py-zope.app.form/Makefile32
-rw-r--r--devel/py-zope.app.generations/Makefile16
-rw-r--r--devel/py-zope.app.http/Makefile10
-rw-r--r--devel/py-zope.app.pagetemplate/Makefile26
-rw-r--r--devel/py-zope.app.publication/Makefile20
-rw-r--r--devel/py-zope.app.publisher/Makefile28
-rw-r--r--devel/py-zope.app.renderer/Makefile18
-rw-r--r--devel/py-zope.app.rotterdam/Makefile26
-rw-r--r--devel/py-zope.app.schema/Makefile6
-rw-r--r--devel/py-zope.app.testing/Makefile38
-rw-r--r--devel/py-zope.app.zcmlfiles/Makefile74
-rw-r--r--devel/py-zope.app.zopeappgenerations/Makefile14
-rw-r--r--devel/py-zope.applicationcontrol/Makefile12
-rw-r--r--devel/py-zope.broken/Makefile2
-rw-r--r--devel/py-zope.browser/Makefile2
-rw-r--r--devel/py-zope.browsermenu/Makefile22
-rw-r--r--devel/py-zope.browserpage/Makefile22
-rw-r--r--devel/py-zope.browserresource/Makefile18
-rw-r--r--devel/py-zope.component/Makefile4
-rw-r--r--devel/py-zope.componentvocabulary/Makefile12
-rw-r--r--devel/py-zope.configuration/Makefile6
-rw-r--r--devel/py-zope.container/Makefile34
-rw-r--r--devel/py-zope.contentprovider/Makefile14
-rw-r--r--devel/py-zope.copy/Makefile2
-rw-r--r--devel/py-zope.copypastemove/Makefile20
-rw-r--r--devel/py-zope.deferredimport/Makefile2
-rw-r--r--devel/py-zope.dublincore/Makefile16
-rw-r--r--devel/py-zope.error/Makefile10
-rw-r--r--devel/py-zope.exceptions/Makefile2
-rw-r--r--devel/py-zope.filerepresentation/Makefile4
-rw-r--r--devel/py-zope.formlib/Makefile30
-rw-r--r--devel/py-zope.generations/Makefile8
-rw-r--r--devel/py-zope.globalrequest/Makefile6
-rw-r--r--devel/py-zope.i18n/Makefile12
-rw-r--r--devel/py-zope.lifecycleevent/Makefile6
-rw-r--r--devel/py-zope.location/Makefile8
-rw-r--r--devel/py-zope.minmax/Makefile6
-rw-r--r--devel/py-zope.pagetemplate/Makefile18
-rw-r--r--devel/py-zope.processlifetime/Makefile2
-rw-r--r--devel/py-zope.ptresource/Makefile12
-rw-r--r--devel/py-zope.publisher/Makefile24
-rw-r--r--devel/py-zope.ramcache/Makefile10
-rw-r--r--devel/py-zope.schema/Makefile4
-rw-r--r--devel/py-zope.site/Makefile18
-rw-r--r--devel/py-zope.size/Makefile4
-rw-r--r--devel/py-zope.tales/Makefile6
-rw-r--r--devel/py-zope.testbrowser/Makefile10
-rw-r--r--devel/py-zope.testing/Makefile4
-rw-r--r--devel/py-zope.traversing/Makefile14
-rw-r--r--devel/py-zope.viewlet/Makefile24
-rw-r--r--devel/py3-Jinja2/Makefile47
-rw-r--r--devel/py3-Jinja2/distinfo3
-rw-r--r--devel/py3-Jinja2/pkg-descr6
-rw-r--r--devel/py3-apipkg/Makefile8
-rw-r--r--devel/py3-asttokens/Makefile10
-rw-r--r--devel/py3-babel/Makefile32
-rw-r--r--devel/py3-babel/distinfo3
-rw-r--r--devel/py3-babel/pkg-descr9
-rw-r--r--devel/py3-babel/pkg-plist43
-rw-r--r--devel/py3-cffi/Makefile9
-rw-r--r--devel/py3-click-log/Makefile12
-rw-r--r--devel/py3-click-threading/Makefile12
-rw-r--r--devel/py3-click/Makefile8
-rw-r--r--devel/py3-colorama/Makefile8
-rw-r--r--devel/py3-coloredlogs/Makefile11
-rw-r--r--devel/py3-dateutil/Makefile10
-rw-r--r--devel/py3-dbus/Makefile16
-rw-r--r--devel/py3-dbus/distinfo2
-rw-r--r--devel/py3-dbus/pkg-descr3
-rw-r--r--devel/py3-defusedxml/Makefile7
-rw-r--r--devel/py3-docopt/Makefile7
-rw-r--r--devel/py3-flake8-builtins/Makefile10
-rw-r--r--devel/py3-flake8-docstrings/Makefile12
-rw-r--r--devel/py3-flake8-import-order/Makefile11
-rw-r--r--devel/py3-flake8-polyfill/Makefile10
-rw-r--r--devel/py3-flake8-quotes/Makefile10
-rw-r--r--devel/py3-flake8/Makefile13
-rw-r--r--devel/py3-freezegun/Makefile14
-rw-r--r--devel/py3-gobject3/Makefile14
-rw-r--r--devel/py3-hgtools/Makefile8
-rw-r--r--devel/py3-icalendar/Makefile11
-rw-r--r--devel/py3-jedi/Makefile7
-rw-r--r--devel/py3-jsonschema/Makefile21
-rw-r--r--devel/py3-jsonschema/distinfo3
-rw-r--r--devel/py3-jsonschema/pkg-descr8
-rw-r--r--devel/py3-libpeas/Makefile22
-rw-r--r--devel/py3-libzfs/Makefile6
-rw-r--r--devel/py3-llfuse/Makefile7
-rw-r--r--devel/py3-lxml/Makefile7
-rw-r--r--devel/py3-mccabe/Makefile10
-rw-r--r--devel/py3-mock/Makefile12
-rw-r--r--devel/py3-nose/Makefile8
-rw-r--r--devel/py3-pbr/Makefile10
-rw-r--r--devel/py3-pip/Makefile24
-rw-r--r--devel/py3-pluggy/Makefile10
-rw-r--r--devel/py3-ply/Makefile8
-rw-r--r--devel/py3-pretend/Makefile10
-rw-r--r--devel/py3-prompt_toolkit/Makefile12
-rw-r--r--devel/py3-protobuf/Makefile9
-rw-r--r--devel/py3-py/Makefile9
-rw-r--r--devel/py3-pyasn1/Makefile8
-rw-r--r--devel/py3-pycodestyle/Makefile8
-rw-r--r--devel/py3-pycparser/Makefile7
-rw-r--r--devel/py3-pydocstyle/Makefile11
-rw-r--r--devel/py3-pyflakes/Makefile8
-rw-r--r--devel/py3-pygit2/Makefile10
-rw-r--r--devel/py3-pyicu/Makefile8
-rw-r--r--devel/py3-pylru-cache/Makefile8
-rw-r--r--devel/py3-pytest-capturelog/Makefile10
-rw-r--r--devel/py3-pytest-runner/Makefile10
-rw-r--r--devel/py3-pytest-timeout/Makefile10
-rw-r--r--devel/py3-pytest-xdist/Makefile15
-rw-r--r--devel/py3-pytest/Makefile11
-rw-r--r--devel/py3-python-magic/Makefile8
-rw-r--r--devel/py3-pytz/Makefile7
-rw-r--r--devel/py3-rubymarshal/Makefile8
-rw-r--r--devel/py3-scripttest/Makefile10
-rw-r--r--devel/py3-setproctitle/Makefile8
-rw-r--r--devel/py3-setuptools_scm/Makefile8
-rw-r--r--devel/py3-simplejson/Makefile11
-rw-r--r--devel/py3-six/Makefile12
-rw-r--r--devel/py3-tabulate/Makefile7
-rw-r--r--devel/py3-toposort/Makefile7
-rw-r--r--devel/py3-tox/Makefile15
-rw-r--r--devel/py3-tzlocal/Makefile10
-rw-r--r--devel/py3-urwid/Makefile10
-rw-r--r--devel/py3-vcversioner/Makefile20
-rw-r--r--devel/py3-vcversioner/distinfo3
-rw-r--r--devel/py3-vcversioner/pkg-descr5
-rw-r--r--devel/py3-verboselogs/Makefile9
-rw-r--r--devel/py3-virtualenv/Makefile13
-rw-r--r--devel/py3-voluptuous/Makefile8
-rw-r--r--devel/py3-wcwidth/Makefile8
-rw-r--r--devel/py3-xdg/Makefile26
-rw-r--r--devel/py3-xdg/distinfo2
-rw-r--r--devel/py3-xdg/files/patch-xdg_BaseDirectory.py18
-rw-r--r--devel/py3-xdg/pkg-descr11
-rw-r--r--devel/py3-yaml/Makefile7
-rw-r--r--devel/py34-setuptools/Makefile10
-rw-r--r--devel/py35-setuptools/Makefile10
-rw-r--r--devel/py36-setuptools/Makefile10
-rw-r--r--devel/py_static_check/Makefile4
-rw-r--r--devel/pycanberra/Makefile2
-rw-r--r--devel/pychecker/Makefile2
-rw-r--r--devel/pydbus-common/Makefile8
-rw-r--r--devel/pygobject3-common/Makefile18
-rw-r--r--devel/pylint/Makefile22
-rw-r--r--devel/pymacs/Makefile2
-rw-r--r--devel/pyobfuscate/Makefile2
-rw-r--r--devel/pypersrc/Makefile2
-rw-r--r--devel/pyrex/Makefile2
-rw-r--r--devel/pyside/Makefile1
-rw-r--r--devel/pysvn/Makefile5
-rw-r--r--devel/qbzr/Makefile6
-rw-r--r--devel/qct/Makefile2
-rw-r--r--devel/rbtools/Makefile8
-rw-r--r--devel/renpy/Makefile9
-rw-r--r--devel/runsnakerun/Makefile4
-rw-r--r--devel/tailor/Makefile2
-rw-r--r--devel/tortoisehg/Makefile4
-rw-r--r--devel/trac-bitten/Makefile2
-rw-r--r--devel/viewvc/Makefile6
-rw-r--r--dns/Makefile2
-rw-r--r--dns/bundy/Makefile6
-rw-r--r--dns/dnsrecon/Makefile6
-rw-r--r--dns/dnsviz/Makefile8
-rw-r--r--dns/ldns/Makefile3
-rw-r--r--dns/maradns/Makefile2
-rw-r--r--dns/py-dns-lexicon/Makefile6
-rw-r--r--dns/py-dnschain/Makefile2
-rw-r--r--dns/py-dnspython/Makefile4
-rw-r--r--dns/py-easyzone/Makefile2
-rw-r--r--dns/py-idna/Makefile2
-rw-r--r--dns/py-namebench/Makefile12
-rw-r--r--dns/py-py3dns/Makefile2
-rw-r--r--dns/py-pydnstable/Makefile2
-rw-r--r--dns/py-pywdns/Makefile2
-rw-r--r--dns/py-tldextract/Makefile2
-rw-r--r--dns/py3-dnspython/Makefile7
-rw-r--r--dns/py3-idna/Makefile8
-rw-r--r--dns/sshfp/Makefile7
-rw-r--r--editors/fileobj/Makefile2
-rw-r--r--editors/gedit-plugins/Makefile8
-rw-r--r--editors/gedit/Makefile2
-rw-r--r--editors/gwrite/Makefile12
-rw-r--r--editors/leo/Makefile6
-rw-r--r--editors/py-room/Makefile4
-rw-r--r--editors/texworks/Makefile2
-rw-r--r--emulators/dynagen/Makefile4
-rw-r--r--emulators/dynagui/Makefile2
-rw-r--r--emulators/gns3/Makefile8
-rw-r--r--emulators/loemu/Makefile2
-rw-r--r--emulators/py-gns3-converter/Makefile4
-rw-r--r--emulators/py-nova/Makefile114
-rw-r--r--emulators/swine/Makefile2
-rw-r--r--emulators/virtualbox-ose/Makefile2
-rw-r--r--finance/bitcoin-armory/Makefile6
-rw-r--r--finance/electrum/Makefile33
-rw-r--r--finance/electrum2/Makefile18
-rw-r--r--finance/gnucash/Makefile2
-rw-r--r--finance/py-python-obelisk/Makefile6
-rw-r--r--finance/py-stripe/Makefile8
-rw-r--r--finance/py-vatnumber/Makefile2
-rw-r--r--finance/sabernetdcs-client/Makefile4
-rw-r--r--finance/tryton28/Makefile4
-rw-r--r--finance/trytond28/Makefile24
-rw-r--r--finance/trytond28_account/Makefile4
-rw-r--r--finance/trytond28_account_asset/Makefile2
-rw-r--r--finance/trytond28_account_be/Makefile2
-rw-r--r--finance/trytond28_account_invoice/Makefile2
-rw-r--r--finance/trytond28_account_invoice_history/Makefile2
-rw-r--r--finance/trytond28_account_invoice_line_standalone/Makefile2
-rw-r--r--finance/trytond28_account_product/Makefile2
-rw-r--r--finance/trytond28_account_statement/Makefile2
-rw-r--r--finance/trytond28_account_stock_anglo_saxon/Makefile2
-rw-r--r--finance/trytond28_account_stock_continental/Makefile2
-rw-r--r--finance/trytond28_analytic_account/Makefile2
-rw-r--r--finance/trytond28_analytic_invoice/Makefile2
-rw-r--r--finance/trytond28_analytic_purchase/Makefile2
-rw-r--r--finance/trytond28_analytic_sale/Makefile2
-rw-r--r--finance/trytond28_calendar/Makefile10
-rw-r--r--finance/trytond28_calendar_classification/Makefile2
-rw-r--r--finance/trytond28_calendar_scheduling/Makefile2
-rw-r--r--finance/trytond28_calendar_todo/Makefile2
-rw-r--r--finance/trytond28_carrier/Makefile2
-rw-r--r--finance/trytond28_carrier_percentage/Makefile2
-rw-r--r--finance/trytond28_carrier_weight/Makefile2
-rw-r--r--finance/trytond28_company/Makefile2
-rw-r--r--finance/trytond28_company_work_time/Makefile2
-rw-r--r--finance/trytond28_country/Makefile2
-rw-r--r--finance/trytond28_currency/Makefile2
-rw-r--r--finance/trytond28_dashboard/Makefile2
-rw-r--r--finance/trytond28_ldap_authentication/Makefile2
-rw-r--r--finance/trytond28_ldap_connection/Makefile4
-rw-r--r--finance/trytond28_party/Makefile4
-rw-r--r--finance/trytond28_party_siret/Makefile2
-rw-r--r--finance/trytond28_party_vcarddav/Makefile6
-rw-r--r--finance/trytond28_product/Makefile2
-rw-r--r--finance/trytond28_product_attribute/Makefile2
-rw-r--r--finance/trytond28_product_cost_fifo/Makefile2
-rw-r--r--finance/trytond28_product_cost_history/Makefile2
-rw-r--r--finance/trytond28_product_measurements/Makefile2
-rw-r--r--finance/trytond28_product_price_list/Makefile2
-rw-r--r--finance/trytond28_production/Makefile2
-rw-r--r--finance/trytond28_project/Makefile2
-rw-r--r--finance/trytond28_project_invoice/Makefile2
-rw-r--r--finance/trytond28_project_plan/Makefile2
-rw-r--r--finance/trytond28_project_revenue/Makefile2
-rw-r--r--finance/trytond28_purchase/Makefile2
-rw-r--r--finance/trytond28_purchase_invoice_line_standalone/Makefile2
-rw-r--r--finance/trytond28_purchase_shipment_cost/Makefile2
-rw-r--r--finance/trytond28_sale/Makefile2
-rw-r--r--finance/trytond28_sale_opportunity/Makefile2
-rw-r--r--finance/trytond28_sale_price_list/Makefile2
-rw-r--r--finance/trytond28_sale_shipment_cost/Makefile2
-rw-r--r--finance/trytond28_sale_supply/Makefile2
-rw-r--r--finance/trytond28_sale_supply_drop_shipment/Makefile2
-rw-r--r--finance/trytond28_stock/Makefile2
-rw-r--r--finance/trytond28_stock_forecast/Makefile4
-rw-r--r--finance/trytond28_stock_inventory_location/Makefile2
-rw-r--r--finance/trytond28_stock_location_sequence/Makefile2
-rw-r--r--finance/trytond28_stock_lot/Makefile2
-rw-r--r--finance/trytond28_stock_product_location/Makefile2
-rw-r--r--finance/trytond28_stock_split/Makefile2
-rw-r--r--finance/trytond28_stock_supply/Makefile2
-rw-r--r--finance/trytond28_stock_supply_day/Makefile2
-rw-r--r--finance/trytond28_stock_supply_forecast/Makefile2
-rw-r--r--finance/trytond28_stock_supply_production/Makefile2
-rw-r--r--finance/trytond28_timesheet/Makefile2
-rw-r--r--french/aster/Makefile2
-rw-r--r--french/trytond28_account_fr/Makefile2
-rw-r--r--ftp/py-ftputil/Makefile2
-rw-r--r--ftp/py-pyftpdlib/Makefile4
-rw-r--r--games/anki/Makefile12
-rw-r--r--games/balazar/Makefile14
-rw-r--r--games/balazarbrothers/Makefile14
-rw-r--r--games/bouncy/Makefile2
-rw-r--r--games/brainworkshop/Makefile2
-rw-r--r--games/childsplay/Makefile6
-rw-r--r--games/craft/Makefile2
-rw-r--r--games/endgame-singularity/Makefile2
-rw-r--r--games/funnyboat/Makefile2
-rw-r--r--games/gcompris/Makefile4
-rw-r--r--games/glchess/Makefile4
-rw-r--r--games/hypatia_engine/Makefile8
-rw-r--r--games/jools/Makefile2
-rw-r--r--games/kye/Makefile2
-rw-r--r--games/magicor/Makefile2
-rw-r--r--games/nelly/Makefile2
-rw-r--r--games/outerspace/Makefile2
-rw-r--r--games/plutocracy/Makefile2
-rw-r--r--games/poker-engine/Makefile13
-rw-r--r--games/ptkei/Makefile2
-rw-r--r--games/py-fife/Makefile1
-rw-r--r--games/py-mnemosyne/Makefile10
-rw-r--r--games/py-poker-eval/Makefile1
-rw-r--r--games/py-sgflib/Makefile1
-rw-r--r--games/py-sgfsummary/Makefile3
-rw-r--r--games/pydance/Makefile2
-rw-r--r--games/pyfa/Makefile12
-rw-r--r--games/pysolfc/Makefile2
-rw-r--r--games/pyspacewar/Makefile2
-rw-r--r--games/pysycache/Makefile2
-rw-r--r--games/pythonchess/Makefile2
-rw-r--r--games/pythonsudoku/Makefile4
-rw-r--r--games/retroarch/Makefile6
-rw-r--r--games/slune/Makefile10
-rw-r--r--games/unknown-horizons/Makefile8
-rw-r--r--games/wxlauncher/Makefile4
-rw-r--r--games/zephulor/Makefile2
-rw-r--r--german/trytond28_account_de_skr03/Makefile2
-rw-r--r--graphics/Makefile4
-rw-r--r--graphics/boxer/Makefile2
-rw-r--r--graphics/caffe/Makefile16
-rw-r--r--graphics/cegui/Makefile2
-rw-r--r--graphics/curator/Makefile2
-rw-r--r--graphics/driconf/Makefile2
-rw-r--r--graphics/entangle/Makefile4
-rw-r--r--graphics/eog-plugins/Makefile4
-rw-r--r--graphics/facedetect/Makefile2
-rw-r--r--graphics/geos/Makefile2
-rw-r--r--graphics/gnofract4d/Makefile2
-rw-r--r--graphics/graphene/Makefile2
-rw-r--r--graphics/gsculpt/Makefile4
-rw-r--r--graphics/hugin/Makefile2
-rw-r--r--graphics/imgtops/Makefile4
-rw-r--r--graphics/lensfun/Makefile4
-rw-r--r--graphics/mapnik/Makefile2
-rw-r--r--graphics/mirage/Makefile2
-rw-r--r--graphics/opencolorio/Makefile2
-rw-r--r--graphics/opencv/Makefile1
-rw-r--r--graphics/piglit/Makefile8
-rw-r--r--graphics/py-PyOpenGL-accelerate/Makefile5
-rw-r--r--graphics/py-PyOpenGL/Makefile6
-rw-r--r--graphics/py-PyX/Makefile2
-rw-r--r--graphics/py-actdiag/Makefile6
-rw-r--r--graphics/py-blockdiag/Makefile8
-rw-r--r--graphics/py-blockdiagcontrib-cisco/Makefile2
-rw-r--r--graphics/py-cairo/Makefile5
-rw-r--r--graphics/py-cairo/pkg-plist-py3 (renamed from graphics/py3-cairo/pkg-plist)0
-rw-r--r--graphics/py-cairocffi/Makefile8
-rw-r--r--graphics/py-django-easy-thumbnails/Makefile2
-rw-r--r--graphics/py-djvulibre/Makefile3
-rw-r--r--graphics/py-editobj/Makefile2
-rw-r--r--graphics/py-exiv2/Makefile1
-rw-r--r--graphics/py-gd/Makefile2
-rw-r--r--graphics/py-gdal/Makefile4
-rw-r--r--graphics/py-gizeh/Makefile2
-rw-r--r--graphics/py-glewpy/Makefile4
-rw-r--r--graphics/py-goocanvas/Makefile3
-rw-r--r--graphics/py-graphviz/Makefile4
-rw-r--r--graphics/py-graphy/Makefile1
-rw-r--r--graphics/py-imagesize/Makefile2
-rw-r--r--graphics/py-imgurpython/Makefile2
-rw-r--r--graphics/py-leather/Makefile2
-rw-r--r--graphics/py-mayavi/Makefile8
-rw-r--r--graphics/py-mcomix/Makefile2
-rw-r--r--graphics/py-nwdiag/Makefile6
-rw-r--r--graphics/py-openexr/Makefile2
-rw-r--r--graphics/py-paint/Makefile2
-rw-r--r--graphics/py-pillow/Makefile6
-rw-r--r--graphics/py-plotly/Makefile6
-rw-r--r--graphics/py-poppler/Makefile3
-rw-r--r--graphics/py-pycha/Makefile2
-rw-r--r--graphics/py-pycollada/Makefile6
-rw-r--r--graphics/py-pydot/Makefile2
-rw-r--r--graphics/py-pyembree/Makefile5
-rw-r--r--graphics/py-pygal/Makefile2
-rw-r--r--graphics/py-pyganim/Makefile2
-rw-r--r--graphics/py-pygooglechart/Makefile2
-rw-r--r--graphics/py-pygraphviz/Makefile4
-rw-r--r--graphics/py-qt4-svg/Makefile1
-rw-r--r--graphics/py-qt5-svg/Makefile1
-rw-r--r--graphics/py-rabbyt/Makefile2
-rw-r--r--graphics/py-sane/Makefile4
-rw-r--r--graphics/py-scikit-image/Makefile28
-rw-r--r--graphics/py-seqdiag/Makefile6
-rw-r--r--graphics/py-sk1/Makefile10
-rw-r--r--graphics/py-sorl-thumbnail/Makefile6
-rw-r--r--graphics/py-soya3d/Makefile10
-rw-r--r--graphics/py-stltools/Makefile2
-rw-r--r--graphics/py-toyplot/Makefile12
-rw-r--r--graphics/py-traitsui/Makefile2
-rw-r--r--graphics/py3-cairo/Makefile30
-rw-r--r--graphics/py3-cairo/distinfo3
-rw-r--r--graphics/py3-cairo/pkg-descr3
-rw-r--r--graphics/py3-imagesize/Makefile8
-rw-r--r--graphics/py3-pillow/Makefile11
-rw-r--r--graphics/py3-pygraphviz/Makefile12
-rw-r--r--graphics/qgis/Makefile80
-rw-r--r--graphics/sk1libs/Makefile2
-rw-r--r--graphics/tilecache/Makefile6
-rw-r--r--graphics/uniconvertor/Makefile4
-rw-r--r--graphics/uniconvw/Makefile4
-rw-r--r--graphics/variety/Makefile24
-rw-r--r--graphics/vips/Makefile2
-rw-r--r--irc/bitlbee/Makefile2
-rw-r--r--irc/py-fishcrypt/Makefile5
-rw-r--r--irc/py-irc/Makefile12
-rw-r--r--irc/py-limnoria/Makefile20
-rw-r--r--irc/py-supybot/Makefile2
-rw-r--r--irc/znc/Makefile2
-rw-r--r--japanese/ibus-anthy/Makefile2
-rw-r--r--japanese/kana-no-quiz/Makefile2
-rw-r--r--japanese/py-mecab/Makefile2
-rw-r--r--japanese/py-tegaki-gtk/Makefile4
-rw-r--r--japanese/py-tegaki/Makefile4
-rw-r--r--japanese/py-zinnia/Makefile2
-rw-r--r--japanese/tegaki-recognize/Makefile2
-rw-r--r--japanese/tomoe/Makefile2
-rw-r--r--lang/Makefile1
-rw-r--r--lang/cdent/Makefile4
-rw-r--r--lang/cython/Makefile6
-rw-r--r--lang/cython3/Makefile9
-rw-r--r--lang/micropython/Makefile2
-rw-r--r--lang/py-clojure/Makefile2
-rw-r--r--lang/py-hy/Makefile18
-rw-r--r--lang/py-qt5-qml/Makefile1
-rw-r--r--lang/pypy/Makefile2
-rw-r--r--lang/python-tools/Makefile4
-rw-r--r--lang/python34/files/pkg-message.in6
-rw-r--r--lang/python35/files/pkg-message.in6
-rw-r--r--lang/python36/files/pkg-message.in6
-rw-r--r--lang/tinypy/Makefile2
-rw-r--r--mail/courier-pythonfilter/Makefile6
-rw-r--r--mail/isbg/Makefile4
-rw-r--r--mail/mailman/Makefile4
-rw-r--r--mail/mailpile/Makefile12
-rw-r--r--mail/mailutils/Makefile2
-rw-r--r--mail/muttils/Makefile2
-rw-r--r--mail/offlineimap/Makefile4
-rw-r--r--mail/postfix-policyd-spf-python/Makefile6
-rw-r--r--mail/py-Products.MailHost/Makefile18
-rw-r--r--mail/py-afew/Makefile10
-rw-r--r--mail/py-apolicy/Makefile6
-rw-r--r--mail/py-dkimpy/Makefile2
-rw-r--r--mail/py-flufl.bounce/Makefile13
-rw-r--r--mail/py-fuglu/Makefile14
-rw-r--r--mail/py-libgmail/Makefile2
-rw-r--r--mail/py-ppolicy/Makefile12
-rw-r--r--mail/py-premailer/Makefile12
-rw-r--r--mail/py-pyspf/Makefile8
-rw-r--r--mail/py-spambayes/Makefile6
-rw-r--r--mail/py-zope.sendmail/Makefile14
-rw-r--r--mail/pyzor/Makefile2
-rw-r--r--mail/rss2email2/Makefile4
-rw-r--r--mail/rss2email3/Makefile15
-rw-r--r--mail/spamdb-curses/Makefile2
-rw-r--r--mail/svnmailer/Makefile2
-rw-r--r--mail/tmda/Makefile2
-rw-r--r--math/cadabra2/Makefile4
-rw-r--r--math/ceres-solver/Makefile2
-rw-r--r--math/convertall/Makefile9
-rw-r--r--math/fityk/Makefile2
-rw-r--r--math/gracetmpl/Makefile7
-rw-r--r--math/lybniz/Makefile2
-rw-r--r--math/nlopt/Makefile4
-rw-r--r--math/plplot/Makefile2
-rw-r--r--math/py-PyWavelets/Makefile10
-rw-r--r--math/py-apgl/Makefile2
-rw-r--r--math/py-basemap/Makefile4
-rw-r--r--math/py-bitmath/Makefile2
-rw-r--r--math/py-bottleneck/Makefile7
-rw-r--r--math/py-colormath/Makefile6
-rw-r--r--math/py-fastcluster/Makefile2
-rw-r--r--math/py-fiat/Makefile2
-rw-r--r--math/py-gato/Makefile2
-rw-r--r--math/py-gnuplot/Makefile2
-rw-r--r--math/py-graphillion/Makefile2
-rw-r--r--math/py-keras/Makefile6
-rw-r--r--math/py-luminol/Makefile4
-rw-r--r--math/py-mathdom/Makefile4
-rw-r--r--math/py-matplotlib/Makefile14
-rw-r--r--math/py-mpmath/Makefile2
-rw-r--r--math/py-munkres/Makefile6
-rw-r--r--math/py-networkx/Makefile20
-rw-r--r--math/py-numarray/Makefile2
-rw-r--r--math/py-numeric/Makefile2
-rw-r--r--math/py-numexpr/Makefile2
-rw-r--r--math/py-numpy/Makefile6
-rw-r--r--math/py-nzmath/Makefile2
-rw-r--r--math/py-pandas/Makefile71
-rw-r--r--math/py-patsy/Makefile2
-rw-r--r--math/py-plastex/Makefile2
-rw-r--r--math/py-probstat/Makefile2
-rw-r--r--math/py-pybloom/Makefile4
-rw-r--r--math/py-pymc/Makefile10
-rw-r--r--math/py-pysparse/Makefile6
-rw-r--r--math/py-scientific/Makefile2
-rw-r--r--math/py-statsmodels/Makefile15
-rw-r--r--math/py-sympy/Makefile4
-rw-r--r--math/py-theano/Makefile2
-rw-r--r--math/py-yt/Makefile15
-rw-r--r--math/qtiplot/Makefile4
-rw-r--r--math/rpcalc/Makefile9
-rw-r--r--math/rpy/Makefile2
-rw-r--r--math/rpy2/Makefile2
-rw-r--r--math/vtk5/Makefile2
-rw-r--r--math/vtk6/Makefile5
-rw-r--r--math/z3/Makefile4
-rw-r--r--misc/Makefile2
-rw-r--r--misc/fbless/Makefile2
-rw-r--r--misc/iso-codes/Makefile4
-rw-r--r--misc/metalink-editor/Makefile2
-rw-r--r--misc/py-YABT/Makefile2
-rw-r--r--misc/py-cinder/Makefile118
-rw-r--r--misc/py-crudini/Makefile2
-rw-r--r--misc/py-fuzzy/Makefile8
-rw-r--r--misc/py-glance/Makefile86
-rw-r--r--misc/py-osd/Makefile2
-rw-r--r--misc/py-pexpect/Makefile4
-rw-r--r--misc/py-pyprind/Makefile6
-rw-r--r--misc/py-qt4-demo/Makefile2
-rw-r--r--misc/py-qt4-doc/Makefile1
-rw-r--r--misc/py-qt5-demo/Makefile2
-rw-r--r--misc/py-qt5-doc/Makefile1
-rw-r--r--misc/py-socli/Makefile12
-rw-r--r--misc/py-spdx-lookup/Makefile2
-rw-r--r--misc/py-tqdm/Makefile2
-rw-r--r--misc/py3-pexpect/Makefile10
-rw-r--r--misc/py3-tqdm/Makefile7
-rw-r--r--misc/pylize/Makefile6
-rw-r--r--misc/wotsap/Makefile2
-rw-r--r--multimedia/Makefile1
-rw-r--r--multimedia/freevo/Makefile20
-rw-r--r--multimedia/freevo/files/freevo.in2
-rw-r--r--multimedia/gaupol/Makefile2
-rw-r--r--multimedia/gdvrecv/Makefile2
-rw-r--r--multimedia/gpodder/Makefile16
-rw-r--r--multimedia/gstreamer1-plugins-gnonlin/Makefile2
-rw-r--r--multimedia/kodi/Makefile2
-rw-r--r--multimedia/libkate/Makefile2
-rw-r--r--multimedia/livestreamer/Makefile8
-rw-r--r--multimedia/mimms/Makefile2
-rw-r--r--multimedia/miro/Makefile22
-rw-r--r--multimedia/mmpython/Makefile2
-rw-r--r--multimedia/mps-youtube/Makefile13
-rw-r--r--multimedia/openshot/Makefile10
-rw-r--r--multimedia/photofilmstrip/Makefile4
-rw-r--r--multimedia/pitivi/Makefile2
-rw-r--r--multimedia/plexpy/Makefile4
-rw-r--r--multimedia/py-cec/Makefile2
-rw-r--r--multimedia/py-gstreamer/Makefile5
-rw-r--r--multimedia/py-gstreamer1/Makefile12
-rw-r--r--multimedia/py-gstreamer1/pkg-plist-py3 (renamed from multimedia/py3-gstreamer1/pkg-plist)0
-rw-r--r--multimedia/py-guessit/Makefile6
-rw-r--r--multimedia/py-kaa-base/Makefile6
-rw-r--r--multimedia/py-kaa-imlib2/Makefile4
-rw-r--r--multimedia/py-kaa-metadata/Makefile4
-rw-r--r--multimedia/py-librtmp/Makefile6
-rw-r--r--multimedia/py-mlt/Makefile1
-rw-r--r--multimedia/py-moviepy/Makefile14
-rw-r--r--multimedia/py-openlp/Makefile24
-rw-r--r--multimedia/py-periscope/Makefile4
-rw-r--r--multimedia/py-pretty_midi/Makefile4
-rw-r--r--multimedia/py-qt4-multimedia/Makefile1
-rw-r--r--multimedia/py-qt4-phonon/Makefile1
-rw-r--r--multimedia/py-qt5-multimedia/Makefile1
-rw-r--r--multimedia/py-qt5-multimediawidgets/Makefile1
-rw-r--r--multimedia/py-soco/Makefile2
-rw-r--r--multimedia/py-subliminal/Makefile34
-rw-r--r--multimedia/py-tvnamer/Makefile6
-rw-r--r--multimedia/py3-gstreamer1/Makefile27
-rw-r--r--multimedia/py3-gstreamer1/distinfo3
-rw-r--r--multimedia/py3-gstreamer1/pkg-descr5
-rw-r--r--multimedia/quodlibet/Makefile16
-rw-r--r--multimedia/syncplay/Makefile2
-rw-r--r--multimedia/totem/Makefile2
-rw-r--r--multimedia/tovid/Makefile4
-rw-r--r--multimedia/vapoursynth/Makefile5
-rw-r--r--net-im/cjc/Makefile2
-rw-r--r--net-im/fugu/Makefile4
-rw-r--r--net-im/gajim/Makefile16
-rw-r--r--net-im/hotot/Makefile2
-rw-r--r--net-im/libpurple/Makefile2
-rw-r--r--net-im/papyon/Makefile25
-rw-r--r--net-im/pebrot/Makefile2
-rw-r--r--net-im/poezio/Makefile15
-rw-r--r--net-im/proxy65/Makefile6
-rw-r--r--net-im/py-fbmq/Makefile4
-rw-r--r--net-im/py-jabber/Makefile2
-rw-r--r--net-im/py-jabberbot/Makefile2
-rw-r--r--net-im/py-libturpial/Makefile6
-rw-r--r--net-im/py-matrix-synapse/Makefile64
-rw-r--r--net-im/py-nbxmpp/Makefile2
-rw-r--r--net-im/py-punjab/Makefile2
-rw-r--r--net-im/py-python-telegram-bot/Makefile8
-rw-r--r--net-im/py-pyxmpp/Makefile8
-rw-r--r--net-im/py-slackclient/Makefile8
-rw-r--r--net-im/py-telepot/Makefile2
-rw-r--r--net-im/py-unmessage/Makefile14
-rw-r--r--net-im/py-xmpppy-irc/Makefile7
-rw-r--r--net-im/py-xmpppy-yahoo/Makefile2
-rw-r--r--net-im/py-xmpppy/Makefile4
-rw-r--r--net-im/turpial/Makefile10
-rw-r--r--net-mgmt/2ping/Makefile2
-rw-r--r--net-mgmt/Makefile2
-rw-r--r--net-mgmt/crmsh/Makefile9
-rw-r--r--net-mgmt/flowd/Makefile2
-rw-r--r--net-mgmt/nagstamon/Makefile2
-rw-r--r--net-mgmt/net-snmp/Makefile4
-rw-r--r--net-mgmt/onionlauncher/Makefile4
-rw-r--r--net-mgmt/py-adal/Makefile8
-rw-r--r--net-mgmt/py-dnsdiag/Makefile (renamed from net-mgmt/py3-dnsdiag/Makefile)13
-rw-r--r--net-mgmt/py-dnsdiag/distinfo (renamed from net-mgmt/py3-dnsdiag/distinfo)0
-rw-r--r--net-mgmt/py-dnsdiag/pkg-descr (renamed from net-mgmt/py3-dnsdiag/pkg-descr)0
-rw-r--r--net-mgmt/py-ipcalc/Makefile2
-rw-r--r--net-mgmt/py-ipcalc/pkg-plist3
-rw-r--r--net-mgmt/py-msrest/Makefile10
-rw-r--r--net-mgmt/py-msrestazure/Makefile6
-rw-r--r--net-mgmt/py-pynsca/Makefile6
-rw-r--r--net-mgmt/py-pysmi/Makefile2
-rw-r--r--net-mgmt/py-pyzabbix/Makefile2
-rw-r--r--net-mgmt/py-snmp4-apps/Makefile2
-rw-r--r--net-mgmt/py-snmp4-mibs/Makefile2
-rw-r--r--net-mgmt/py-snmp4/Makefile4
-rw-r--r--net-mgmt/seafile-client/Makefile4
-rw-r--r--net-mgmt/seafile-server/Makefile4
-rw-r--r--net-mgmt/tornova/Makefile2
-rw-r--r--net-mgmt/wmi-client/Makefile2
-rw-r--r--net-p2p/bitmessage/Makefile14
-rw-r--r--net-p2p/couchpotato/Makefile6
-rw-r--r--net-p2p/deluge-cli/Makefile12
-rw-r--r--net-p2p/deluge/Makefile6
-rw-r--r--net-p2p/libtorrent-rasterbar-python/Makefile2
-rw-r--r--net-p2p/py-py2play/Makefile2
-rw-r--r--net-p2p/py-transmissionrpc/Makefile2
-rw-r--r--net-p2p/py-vertex/Makefile6
-rw-r--r--net-p2p/tribler/Makefile28
-rw-r--r--net/Makefile3
-rw-r--r--net/ceph-devel/Makefile2
-rw-r--r--net/ceph/Makefile8
-rw-r--r--net/cloud-init-azure/Makefile24
-rw-r--r--net/cloud-init/Makefile22
-rw-r--r--net/dpdk/Makefile2
-rw-r--r--net/dshell/Makefile10
-rw-r--r--net/freeradius3/Makefile2
-rw-r--r--net/googlecl/Makefile6
-rw-r--r--net/gupnp-igd/Makefile2
-rw-r--r--net/liferea/Makefile4
-rw-r--r--net/netatalk3/Makefile2
-rw-r--r--net/neubot/Makefile2
-rw-r--r--net/nsscache/Makefile4
-rw-r--r--net/pdb/Makefile4
-rw-r--r--net/py-GeoIP2/Makefile4
-rw-r--r--net/py-amqp/Makefile6
-rw-r--r--net/py-avahi/Makefile9
-rw-r--r--net/py-beanstalkc/Makefile8
-rw-r--r--net/py-cjdns/Makefile2
-rw-r--r--net/py-cloudflare-scrape/Makefile2
-rw-r--r--net/py-coherence/Makefile10
-rw-r--r--net/py-ec2-cli-tools/Makefile2
-rw-r--r--net/py-eventlet/Makefile8
-rw-r--r--net/py-gspread/Makefile2
-rw-r--r--net/py-gspreadsheet/Makefile4
-rw-r--r--net/py-httpstat/Makefile2
-rw-r--r--net/py-impacket/Makefile6
-rw-r--r--net/py-kombu/Makefile14
-rw-r--r--net/py-ldap/Makefile4
-rw-r--r--net/py-ldap3/Makefile2
-rw-r--r--net/py-ldaptor/Makefile6
-rw-r--r--net/py-libcloud/Makefile2
-rw-r--r--net/py-libdnet/Makefile3
-rw-r--r--net/py-magic-wormhole/Makefile22
-rw-r--r--net/py-matrix-synapse-ldap3/Makefile2
-rw-r--r--net/py-maxminddb/Makefile2
-rw-r--r--net/py-miniupnpc/Makefile4
-rw-r--r--net/py-msrplib/Makefile8
-rw-r--r--net/py-ndg_httpsclient/Makefile4
-rw-r--r--net/py-netaddr/Makefile2
-rw-r--r--net/py-netif/Makefile7
-rw-r--r--net/py-netifaces/Makefile11
-rw-r--r--net/py-netifaces/distinfo6
-rw-r--r--net/py-netlib/Makefile6
-rw-r--r--net/py-netstring/Makefile2
-rw-r--r--net/py-nnpy/Makefile2
-rw-r--r--net/py-oauth2/Makefile6
-rw-r--r--net/py-pcap/Makefile2
-rw-r--r--net/py-pcs/Makefile4
-rw-r--r--net/py-port-for/Makefile4
-rw-r--r--net/py-pyldap/Makefile2
-rw-r--r--net/py-pynsq/Makefile10
-rw-r--r--net/py-pypcap/Makefile4
-rw-r--r--net/py-pyshark/Makefile8
-rw-r--r--net/py-pysmb/Makefile2
-rw-r--r--net/py-pysocks/Makefile2
-rw-r--r--net/py-python-barbicanclient/Makefile16
-rw-r--r--net/py-python-ceilometerclient/Makefile20
-rw-r--r--net/py-python-cinderclient/Makefile18
-rw-r--r--net/py-python-designateclient/Makefile20
-rw-r--r--net/py-python-glanceclient/Makefile18
-rw-r--r--net/py-python-heatclient/Makefile30
-rw-r--r--net/py-python-keystoneclient/Makefile22
-rw-r--r--net/py-python-neutronclient/Makefile28
-rw-r--r--net/py-python-novaclient/Makefile22
-rw-r--r--net/py-python-openstackclient/Makefile26
-rw-r--r--net/py-python-twitter/Makefile4
-rw-r--r--net/py-pyvmomi/Makefile6
-rw-r--r--net/py-pyzmq/Makefile4
-rw-r--r--net/py-qt4-network/Makefile1
-rw-r--r--net/py-qt5-network/Makefile1
-rw-r--r--net/py-rabbitpy/Makefile4
-rw-r--r--net/py-rainbowstream/Makefile16
-rw-r--r--net/py-ripe.atlas.cousteau/Makefile8
-rw-r--r--net/py-ripe.atlas.sagan/Makefile6
-rw-r--r--net/py-ripe.atlas.tools/Makefile14
-rw-r--r--net/py-s3cmd/Makefile2
-rw-r--r--net/py-s3transfer/Makefile8
-rw-r--r--net/py-shodan/Makefile8
-rw-r--r--net/py-soappy/Makefile4
-rw-r--r--net/py-socketio-client/Makefile6
-rw-r--r--net/py-sshuttle/Makefile6
-rw-r--r--net/py-stomp.py/Makefile2
-rw-r--r--net/py-terminado/Makefile4
-rw-r--r--net/py-tofu/Makefile2
-rw-r--r--net/py-tweepy/Makefile16
-rw-r--r--net/py-twitter-tools/Makefile4
-rw-r--r--net/py-txamqp/Makefile4
-rw-r--r--net/py-upnp-inspector/Makefile4
-rw-r--r--net/py-urllib3/Makefile28
-rw-r--r--net/py-wmi-query/Makefile2
-rw-r--r--net/py-wolframalpha/Makefile6
-rw-r--r--net/py-xmlrpc/Makefile2
-rw-r--r--net/py-zope.proxy/Makefile2
-rw-r--r--net/py3-netifaces/Makefile21
-rw-r--r--net/py3-netifaces/distinfo3
-rw-r--r--net/py3-netifaces/pkg-descr7
-rw-r--r--net/py3-pysocks/Makefile10
-rw-r--r--net/py3-urllib3/Makefile18
-rw-r--r--net/pygopherd/Makefile2
-rw-r--r--net/pynids/Makefile2
-rw-r--r--net/pythondirector/Makefile4
-rw-r--r--net/reposado/Makefile2
-rw-r--r--net/s3ql/Makefile14
-rw-r--r--net/samba44/Makefile8
-rw-r--r--net/samba45/Makefile8
-rw-r--r--net/samba46/Makefile8
-rw-r--r--net/scapy/Makefile12
-rw-r--r--net/sippy_b2bua/Makefile4
-rw-r--r--net/splatd/Makefile12
-rw-r--r--net/tcpwatch/Makefile4
-rw-r--r--net/tiny-network-utilities/Makefile13
-rw-r--r--net/turses/Makefile12
-rw-r--r--news/hellanzb/Makefile4
-rw-r--r--news/py-pynzb/Makefile2
-rw-r--r--news/py-yenc/Makefile2
-rw-r--r--news/rawdog/Makefile4
-rw-r--r--news/sabnzbdplus/Makefile12
-rw-r--r--news/xpn/Makefile4
-rw-r--r--polish/ekg2/Makefile2
-rw-r--r--ports-mgmt/portell/Makefile2
-rw-r--r--ports-mgmt/py-pytoport/Makefile13
-rw-r--r--print/Makefile2
-rw-r--r--print/biblio-py/Makefile2
-rw-r--r--print/cloudprint/Makefile10
-rw-r--r--print/dot2tex/Makefile2
-rw-r--r--print/frescobaldi/Makefile8
-rw-r--r--print/pkipplib/Makefile2
-rw-r--r--print/pkpgcounter/Makefile4
-rw-r--r--print/py-fonttools/Makefile2
-rw-r--r--print/py-pollyreports/Makefile2
-rw-r--r--print/py-pycups/Makefile4
-rw-r--r--print/py-pyscript/Makefile2
-rw-r--r--print/py-qt5-printsupport/Makefile1
-rw-r--r--print/py-relatorio/Makefile10
-rw-r--r--print/py-reportlab/Makefile2
-rw-r--r--print/py-reportlab1/Makefile2
-rw-r--r--print/py-stapler/Makefile4
-rw-r--r--print/py-trml2pdf/Makefile7
-rw-r--r--print/py3-fonttools/Makefile10
-rw-r--r--print/py3-pycups/Makefile10
-rw-r--r--print/ttfquery/Makefile4
-rw-r--r--science/avogadro/Makefile4
-rw-r--r--science/brian/Makefile8
-rw-r--r--science/gnudatalanguage/Makefile2
-rw-r--r--science/gramps/Makefile10
-rw-r--r--science/gwyddion/Makefile2
-rw-r--r--science/paraview/Makefile2
-rw-r--r--science/psychopy/Makefile20
-rw-r--r--science/py-DendroPy/Makefile4
-rw-r--r--science/py-cdo/Makefile2
-rw-r--r--science/py-h5py/Makefile9
-rw-r--r--science/py-hcluster/Makefile4
-rw-r--r--science/py-mdp/Makefile4
-rw-r--r--science/py-mlpy/Makefile5
-rw-r--r--science/py-netCDF4/Makefile5
-rw-r--r--science/py-obspy/Makefile18
-rw-r--r--science/py-paida/Makefile2
-rw-r--r--science/py-pysal/Makefile6
-rw-r--r--science/py-pyteomics.biolccc/Makefile2
-rw-r--r--science/py-pyteomics/Makefile6
-rw-r--r--science/py-scikit-fuzzy/Makefile6
-rw-r--r--science/py-scikit-learn/Makefile2
-rw-r--r--science/py-scikit-sparse/Makefile7
-rw-r--r--science/py-scimath/Makefile6
-rw-r--r--science/py-scoria/Makefile2
-rw-r--r--science/py-tensorflow/Makefile28
-rw-r--r--science/pybrain/Makefile4
-rw-r--r--science/pycdf/Makefile2
-rw-r--r--science/sigrok-firmware-utils/Makefile2
-rw-r--r--science/tfel/Makefile3
-rw-r--r--science/veusz/Makefile2
-rw-r--r--security/Makefile8
-rw-r--r--security/arm/Makefile2
-rw-r--r--security/binwalk/Makefile2
-rw-r--r--security/blindelephant/Makefile2
-rw-r--r--security/broccoli/Makefile2
-rw-r--r--security/gpgme/Makefile6
-rw-r--r--security/kedpm/Makefile4
-rw-r--r--security/lasso/Makefile4
-rw-r--r--security/libpwquality/pkg-plist2
-rw-r--r--security/morphis/Makefile13
-rw-r--r--security/nyx/Makefile4
-rw-r--r--security/obfsproxy/Makefile10
-rw-r--r--security/pssh/Makefile2
-rw-r--r--security/pwman3/Makefile6
-rw-r--r--security/py-AccessControl/Makefile34
-rw-r--r--security/py-Products.PlonePAS/Makefile16
-rw-r--r--security/py-Products.PluggableAuthService/Makefile4
-rw-r--r--security/py-RestrictedPython/Makefile2
-rw-r--r--security/py-SecretStorage/Makefile6
-rw-r--r--security/py-YubiOTP/Makefile4
-rw-r--r--security/py-acme/Makefile18
-rw-r--r--security/py-artifacts/Makefile4
-rw-r--r--security/py-bcrypt/Makefile4
-rw-r--r--security/py-borg.localrole/Makefile22
-rw-r--r--security/py-btchip-python/Makefile8
-rw-r--r--security/py-certbot/Makefile26
-rw-r--r--security/py-certifi/Makefile2
-rw-r--r--security/py-cryptkit/Makefile2
-rw-r--r--security/py-cryptography/Makefile29
-rw-r--r--security/py-cybox/Makefile8
-rw-r--r--security/py-dfdatetime/Makefile2
-rw-r--r--security/py-dfvfs/Makefile14
-rw-r--r--security/py-dfwinreg/Makefile6
-rw-r--r--security/py-docker-pycreds/Makefile2
-rw-r--r--security/py-ecdsa/Makefile2
-rw-r--r--security/py-fail2ban/Makefile2
-rw-r--r--security/py-fchksum/Makefile2
-rw-r--r--security/py-first-server/Makefile15
-rw-r--r--security/py-flask-httpauth/Makefile2
-rw-r--r--security/py-gixy/Makefile12
-rw-r--r--security/py-gnupg/Makefile2
-rw-r--r--security/py-google-auth/Makefile10
-rw-r--r--security/py-gpsoauth/Makefile10
-rw-r--r--security/py-halberd/Makefile2
-rw-r--r--security/py-itsdangerous/Makefile2
-rw-r--r--security/py-keyczar/Makefile4
-rw-r--r--security/py-keyring/Makefile8
-rw-r--r--security/py-keyrings.alt/Makefile10
-rw-r--r--security/py-keystone/Makefile70
-rw-r--r--security/py-libnacl/Makefile2
-rw-r--r--security/py-m2crypto/Makefile2
-rw-r--r--security/py-maec/Makefile8
-rw-r--r--security/py-mcrypt/Makefile2
-rw-r--r--security/py-mhash/Makefile2
-rw-r--r--security/py-mixbox/Makefile8
-rw-r--r--security/py-mnemonic/Makefile2
-rw-r--r--security/py-oauth2client/Makefile10
-rw-r--r--security/py-oauthlib/Makefile18
-rw-r--r--security/py-openssl/Makefile6
-rw-r--r--security/py-paramiko/Makefile10
-rw-r--r--security/py-paramiko1/Makefile4
-rw-r--r--security/py-passlib/Makefile2
-rw-r--r--security/py-pbkdf2/Makefile2
-rw-r--r--security/py-plaso/Makefile45
-rw-r--r--security/py-plone.app.openid/Makefile20
-rw-r--r--security/py-plone.keyring/Makefile10
-rw-r--r--security/py-plone.openid/Makefile12
-rw-r--r--security/py-plone.protect/Makefile8
-rw-r--r--security/py-plone.session/Makefile10
-rw-r--r--security/py-potr/Makefile2
-rw-r--r--security/py-pow/Makefile2
-rw-r--r--security/py-pyaes/Makefile2
-rw-r--r--security/py-pyaff4/Makefile6
-rw-r--r--security/py-pyaxo/Makefile6
-rw-r--r--security/py-pycrypto/Makefile2
-rw-r--r--security/py-pycryptopp/Makefile6
-rw-r--r--security/py-pyelliptic/Makefile2
-rw-r--r--security/py-pymacaroons-pynacl/Makefile10
-rw-r--r--security/py-pynacl/Makefile10
-rw-r--r--security/py-pysaml2/Makefile26
-rw-r--r--security/py-python-registry/Makefile2
-rw-r--r--security/py-python-social-auth/Makefile12
-rw-r--r--security/py-rekall-core/Makefile36
-rw-r--r--security/py-rekall/Makefile2
-rw-r--r--security/py-rekall_gui/Makefile12
-rw-r--r--security/py-requests-kerberos/Makefile4
-rw-r--r--security/py-rsa/Makefile6
-rw-r--r--security/py-service_identity/Makefile10
-rw-r--r--security/py-signedjson/Makefile8
-rw-r--r--security/py-ssh/Makefile2
-rw-r--r--security/py-sslstrip/Makefile6
-rw-r--r--security/py-stem/Makefile8
-rw-r--r--security/py-stix/Makefile12
-rw-r--r--security/py-trezor/Makefile8
-rw-r--r--security/py-tuf/Makefile10
-rw-r--r--security/py-txtorcon/Makefile12
-rw-r--r--security/py-volatility/Makefile12
-rw-r--r--security/py-vulndb/Makefile2
-rw-r--r--security/py-yubioath-desktop/Makefile10
-rw-r--r--security/py-zope.app.authentication/Makefile40
-rw-r--r--security/py-zope.app.localpermission/Makefile14
-rw-r--r--security/py-zope.app.principalannotation/Makefile10
-rw-r--r--security/py-zope.app.security/Makefile26
-rw-r--r--security/py-zope.app.securitypolicy/Makefile32
-rw-r--r--security/py-zope.authentication/Makefile14
-rw-r--r--security/py-zope.login/Makefile10
-rw-r--r--security/py-zope.password/Makefile6
-rw-r--r--security/py-zope.pluggableauth/Makefile30
-rw-r--r--security/py-zope.principalannotation/Makefile16
-rw-r--r--security/py-zope.principalregistry/Makefile12
-rw-r--r--security/py-zope.security/Makefile20
-rw-r--r--security/py-zope.securitypolicy/Makefile24
-rw-r--r--security/py-zope.session/Makefile16
-rw-r--r--security/py3-certifi/Makefile10
-rw-r--r--security/py3-cryptography/Makefile14
-rw-r--r--security/py3-ecdsa/Makefile7
-rw-r--r--security/py3-libnacl/Makefile8
-rw-r--r--security/py3-openssl/Makefile11
-rw-r--r--security/py3-pbkdf2/Makefile7
-rw-r--r--security/py3-pyaes/Makefile7
-rw-r--r--security/py3-pycrypto/Makefile7
-rw-r--r--security/suricata/Makefile2
-rw-r--r--security/switzerland/Makefile2
-rw-r--r--security/umit/Makefile6
-rw-r--r--security/vinetto/Makefile4
-rw-r--r--security/w3af/Makefile77
-rw-r--r--security/wapiti/Makefile4
-rw-r--r--security/yubikey-piv-manager/Makefile4
-rw-r--r--security/zenmap/Makefile4
-rw-r--r--security/zeronet/Makefile8
-rw-r--r--shells/fish/Makefile2
-rw-r--r--shells/lshell/Makefile2
-rw-r--r--shells/xonsh/Makefile2
-rw-r--r--sysutils/Makefile3
-rw-r--r--sysutils/ansible/Makefile14
-rw-r--r--sysutils/ansible1/Makefile8
-rw-r--r--sysutils/azure-agent/Makefile2
-rw-r--r--sysutils/backupchecker/Makefile2
-rw-r--r--sysutils/bamf/Makefile4
-rw-r--r--sysutils/battray/Makefile2
-rw-r--r--sysutils/bsdploy/Makefile18
-rw-r--r--sysutils/catfish/Makefile8
-rw-r--r--sysutils/createrepo/Makefile15
-rw-r--r--sysutils/deltarpm/Makefile1
-rw-r--r--sysutils/docker-compose/Makefile37
-rw-r--r--sysutils/duplicity/Makefile12
-rw-r--r--sysutils/dvdvideo/Makefile4
-rw-r--r--sysutils/farbot/Makefile2
-rw-r--r--sysutils/feather/Makefile2
-rw-r--r--sysutils/fusefs-gitfs/Makefile16
-rw-r--r--sysutils/fusefs-wikipediafs/Makefile4
-rw-r--r--sysutils/hachoir-urwid/Makefile2
-rw-r--r--sysutils/iocage/Makefile20
-rw-r--r--sysutils/jadm/Makefile16
-rw-r--r--sysutils/lfm/Makefile2
-rw-r--r--sysutils/mog/Makefile6
-rw-r--r--sysutils/ohmu/Makefile6
-rw-r--r--sysutils/py-bcfg2/Makefile14
-rw-r--r--sysutils/py-cdmi/Makefile6
-rw-r--r--sysutils/py-consul/Makefile9
-rw-r--r--sysutils/py-croniter/Makefile2
-rw-r--r--sysutils/py-crontab/Makefile4
-rw-r--r--sysutils/py-diffoscope/Makefile8
-rw-r--r--sysutils/py-dlipower/Makefile6
-rw-r--r--sysutils/py-docker/Makefile14
-rw-r--r--sysutils/py-execnet/Makefile6
-rw-r--r--sysutils/py-ezjailremote/Makefile4
-rw-r--r--sysutils/py-filelike/Makefile3
-rw-r--r--sysutils/py-freenas.cli/Makefile22
-rw-r--r--sysutils/py-glances/Makefile2
-rw-r--r--sysutils/py-gmailfs-fuse/Makefile2
-rw-r--r--sysutils/py-google-compute-engine/Makefile6
-rw-r--r--sysutils/py-halite/Makefile4
-rw-r--r--sysutils/py-honcho/Makefile6
-rw-r--r--sysutils/py-nomad/Makefile5
-rw-r--r--sysutils/py-pkginfo/Makefile2
-rw-r--r--sysutils/py-ploy/Makefile6
-rw-r--r--sysutils/py-ploy_ansible/Makefile12
-rw-r--r--sysutils/py-ploy_ec2/Makefile8
-rw-r--r--sysutils/py-ploy_ezjail/Makefile6
-rw-r--r--sysutils/py-ploy_fabric/Makefile4
-rw-r--r--sysutils/py-plumbum/Makefile2
-rw-r--r--sysutils/py-psutil/Makefile4
-rw-r--r--sysutils/py-ptyprocess/Makefile2
-rw-r--r--sysutils/py-salt/Makefile49
-rw-r--r--sysutils/py-shutilwhich/Makefile2
-rw-r--r--sysutils/py-stdiff/Makefile3
-rw-r--r--sysutils/py-superlance/Makefile2
-rw-r--r--sysutils/py-supervisor/Makefile4
-rw-r--r--sysutils/py-tmuxp/Makefile6
-rw-r--r--sysutils/py-zdaemon/Makefile2
-rw-r--r--sysutils/py3-execnet/Makefile11
-rw-r--r--sysutils/py3-pkginfo/Makefile8
-rw-r--r--sysutils/py3-ptyprocess/Makefile8
-rw-r--r--sysutils/qzeitgeist/Makefile2
-rw-r--r--sysutils/rdiff-backup-devel/Makefile2
-rw-r--r--sysutils/sample/Makefile2
-rw-r--r--sysutils/solaar/Makefile4
-rw-r--r--sysutils/tentakel/Makefile2
-rw-r--r--sysutils/xen-guest-tools/Makefile2
-rw-r--r--sysutils/yum/Makefile11
-rw-r--r--sysutils/zeitgeist/Makefile6
-rw-r--r--textproc/Makefile21
-rw-r--r--textproc/archmage/Makefile2
-rw-r--r--textproc/cdiff/Makefile2
-rw-r--r--textproc/cmark/Makefile2
-rw-r--r--textproc/coccigrep/Makefile2
-rw-r--r--textproc/codespell/Makefile2
-rw-r--r--textproc/ibus-el/Makefile2
-rw-r--r--textproc/ibus-typing-booster/Makefile16
-rw-r--r--textproc/ibus/Makefile6
-rw-r--r--textproc/icdiff/Makefile2
-rw-r--r--textproc/loook/Makefile2
-rw-r--r--textproc/plover/Makefile8
-rw-r--r--textproc/pootle/Makefile30
-rw-r--r--textproc/py-agate-dbf/Makefile4
-rw-r--r--textproc/py-agate-excel/Makefile6
-rw-r--r--textproc/py-agate/Makefile14
-rw-r--r--textproc/py-alabaster/Makefile2
-rw-r--r--textproc/py-asciinema/Makefile (renamed from textproc/py3-asciinema/Makefile)2
-rw-r--r--textproc/py-asciinema/distinfo (renamed from textproc/py3-asciinema/distinfo)0
-rw-r--r--textproc/py-asciinema/pkg-descr (renamed from textproc/py3-asciinema/pkg-descr)0
-rw-r--r--textproc/py-autopep8/Makefile2
-rw-r--r--textproc/py-awesome-slugify/Makefile6
-rw-r--r--textproc/py-chardet/Makefile8
-rw-r--r--textproc/py-cloud_sptheme/Makefile8
-rw-r--r--textproc/py-creole/Makefile2
-rw-r--r--textproc/py-csvkit/Makefile10
-rw-r--r--textproc/py-docutils/Makefile6
-rw-r--r--textproc/py-elasticsearch-curator-py/Makefile6
-rw-r--r--textproc/py-elasticsearch-dsl-py/Makefile2
-rw-r--r--textproc/py-elasticsearch-py/Makefile2
-rw-r--r--textproc/py-elasticsearch2-dsl-py/Makefile2
-rw-r--r--textproc/py-elib.intl/Makefile2
-rw-r--r--textproc/py-enchant/Makefile2
-rw-r--r--textproc/py-errorhandler/Makefile2
-rw-r--r--textproc/py-feedparser/Makefile2
-rw-r--r--textproc/py-genshi/Makefile2
-rw-r--r--textproc/py-humanfriendly/Makefile4
-rw-r--r--textproc/py-hunspell/Makefile2
-rw-r--r--textproc/py-hyperestraier-python/Makefile2
-rw-r--r--textproc/py-hypua2jamo/Makefile2
-rw-r--r--textproc/py-libtre/Makefile2
-rw-r--r--textproc/py-libxml2/Makefile4
-rw-r--r--textproc/py-libxslt/Makefile5
-rw-r--r--textproc/py-ltxml/Makefile2
-rw-r--r--textproc/py-m2r/Makefile10
-rw-r--r--textproc/py-mako/Makefile12
-rw-r--r--textproc/py-markdown/Makefile10
-rw-r--r--textproc/py-mistune/Makefile2
-rw-r--r--textproc/py-nltk/Makefile6
-rw-r--r--textproc/py-numpydoc/Makefile8
-rw-r--r--textproc/py-openpyxl/Makefile4
-rw-r--r--textproc/py-pager/Makefile (renamed from textproc/py3-pager/Makefile)0
-rw-r--r--textproc/py-pager/distinfo (renamed from textproc/py3-pager/distinfo)0
-rw-r--r--textproc/py-pager/pkg-descr (renamed from textproc/py3-pager/pkg-descr)0
-rw-r--r--textproc/py-paragrep/Makefile2
-rw-r--r--textproc/py-parsel/Makefile10
-rw-r--r--textproc/py-parsimonious/Makefile2
-rw-r--r--textproc/py-pyPEG2/Makefile2
-rw-r--r--textproc/py-pyelasticsearch/Makefile10
-rw-r--r--textproc/py-pyes/Makefile4
-rw-r--r--textproc/py-pygments/Makefile2
-rw-r--r--textproc/py-pyhwp/Makefile12
-rw-r--r--textproc/py-pyscss/Makefile7
-rw-r--r--textproc/py-pysrt/Makefile2
-rw-r--r--textproc/py-pystemmer/Makefile2
-rw-r--r--textproc/py-python-augeas/Makefile6
-rw-r--r--textproc/py-python-docx/Makefile2
-rw-r--r--textproc/py-python-slugify/Makefile2
-rw-r--r--textproc/py-qrcode/Makefile18
-rw-r--r--textproc/py-qt4-xml/Makefile1
-rw-r--r--textproc/py-qt4-xmlpatterns/Makefile1
-rw-r--r--textproc/py-qt5-xml/Makefile1
-rw-r--r--textproc/py-qt5-xmlpatterns/Makefile1
-rw-r--r--textproc/py-rdflib/Makefile8
-rw-r--r--textproc/py-rst2html5/Makefile8
-rw-r--r--textproc/py-rstyoutube/Makefile2
-rw-r--r--textproc/py-rxp/Makefile2
-rw-r--r--textproc/py-scour/Makefile2
-rw-r--r--textproc/py-snowballstemmer/Makefile4
-rw-r--r--textproc/py-sphinx-hieroglyph/Makefile2
-rw-r--r--textproc/py-sphinx-intl/Makefile6
-rw-r--r--textproc/py-sphinx/Makefile29
-rw-r--r--textproc/py-sphinx_numfig/Makefile5
-rw-r--r--textproc/py-sphinx_rtd_theme/Makefile2
-rw-r--r--textproc/py-sphinx_wikipedia/Makefile3
-rw-r--r--textproc/py-sphinxcontrib-adadomain/Makefile2
-rw-r--r--textproc/py-sphinxcontrib-bitbucket/Makefile2
-rw-r--r--textproc/py-sphinxcontrib-fulltoc/Makefile4
-rw-r--r--textproc/py-sphinxcontrib-httpdomain/Makefile2
-rw-r--r--textproc/py-sphinxcontrib-programoutput/Makefile2
-rw-r--r--textproc/py-syck/Makefile2
-rw-r--r--textproc/py-texttable/Makefile6
-rw-r--r--textproc/py-toronado/Makefile6
-rw-r--r--textproc/py-trans/Makefile2
-rw-r--r--textproc/py-transifex-client/Makefile4
-rw-r--r--textproc/py-wicked/Makefile10
-rw-r--r--textproc/py-wstools/Makefile6
-rw-r--r--textproc/py-wtforms/Makefile8
-rw-r--r--textproc/py-xlutils/Makefile4
-rw-r--r--textproc/py-xlwriter/Makefile2
-rw-r--r--textproc/py-xlwt/Makefile2
-rw-r--r--textproc/py-zope.app.i18n/Makefile20
-rw-r--r--textproc/py-zope.app.locales/Makefile10
-rw-r--r--textproc/py-zope.tal/Makefile4
-rw-r--r--textproc/py3-MarkupSafe/Makefile22
-rw-r--r--textproc/py3-MarkupSafe/distinfo3
-rw-r--r--textproc/py3-MarkupSafe/pkg-descr4
-rw-r--r--textproc/py3-alabaster/Makefile8
-rw-r--r--textproc/py3-chardet/Makefile10
-rw-r--r--textproc/py3-docutils/Makefile12
-rw-r--r--textproc/py3-feedparser/Makefile8
-rw-r--r--textproc/py3-humanfriendly/Makefile9
-rw-r--r--textproc/py3-hunspell/Makefile7
-rw-r--r--textproc/py3-libxml2/Makefile34
-rw-r--r--textproc/py3-libxml2/pkg-descr3
-rw-r--r--textproc/py3-numpydoc/Makefile12
-rw-r--r--textproc/py3-pyPEG2/Makefile7
-rw-r--r--textproc/py3-pygments/Makefile8
-rw-r--r--textproc/py3-pystemmer/Makefile8
-rw-r--r--textproc/py3-qrcode/Makefile7
-rw-r--r--textproc/py3-snowballstemmer/Makefile10
-rw-r--r--textproc/py3-sphinx/Makefile23
-rw-r--r--textproc/py3-sphinx_rtd_theme/Makefile8
-rw-r--r--textproc/py3-texttable/Makefile7
-rw-r--r--textproc/sigil/Makefile4
-rw-r--r--textproc/silvercity/Makefile2
-rw-r--r--textproc/translate-toolkit/Makefile16
-rw-r--r--textproc/xml2rfc/Makefile6
-rw-r--r--textproc/xsv/Makefile4
-rw-r--r--textproc/yould/Makefile2
-rw-r--r--www/Makefile3
-rw-r--r--www/butterfly/Makefile9
-rw-r--r--www/calendarserver/Makefile30
-rw-r--r--www/chromium/Makefile6
-rw-r--r--www/ddgr/Makefile6
-rw-r--r--www/feedjack/Makefile6
-rw-r--r--www/geeknote/Makefile12
-rw-r--r--www/google-appengine/Makefile8
-rw-r--r--www/iridium/Makefile6
-rw-r--r--www/jtoolkit/Makefile2
-rw-r--r--www/linkchecker/Makefile12
-rw-r--r--www/mitmproxy/Makefile50
-rw-r--r--www/moinmoin/Makefile2
-rw-r--r--www/planet/Makefile2
-rw-r--r--www/plone/Makefile20
-rw-r--r--www/py-HTMLgen/Makefile1
-rw-r--r--www/py-MechanicalSoup/Makefile18
-rw-r--r--www/py-Products.CMFPlone/Makefile204
-rw-r--r--www/py-Products.PloneLDAP/Makefile6
-rw-r--r--www/py-Products.TinyMCE/Makefile16
-rw-r--r--www/py-WebError/Makefile8
-rw-r--r--www/py-WebTest/Makefile16
-rw-r--r--www/py-aiohttp-wsgi/Makefile2
-rw-r--r--www/py-aiohttp/Makefile17
-rw-r--r--www/py-autobahn/Makefile40
-rw-r--r--www/py-aws-requests-auth/Makefile4
-rw-r--r--www/py-beaker/Makefile2
-rw-r--r--www/py-bleach/Makefile6
-rw-r--r--www/py-blogofile/Makefile22
-rw-r--r--www/py-bokeh/Makefile14
-rw-r--r--www/py-boto3/Makefile10
-rw-r--r--www/py-bottle-cork/Makefile8
-rw-r--r--www/py-buku/Makefile21
-rw-r--r--www/py-cachecontrol/Makefile4
-rw-r--r--www/py-caldav/Makefile8
-rw-r--r--www/py-cherrypy/Makefile4
-rw-r--r--www/py-collective.easytemplate/Makefile10
-rw-r--r--www/py-collective.templateengines/Makefile2
-rw-r--r--www/py-cookies/Makefile2
-rw-r--r--www/py-cssutils/Makefile4
-rw-r--r--www/py-ddgr/Makefile4
-rw-r--r--www/py-django-allauth/Makefile2
-rw-r--r--www/py-django-annotations/Makefile12
-rw-r--r--www/py-django-annoying/Makefile2
-rw-r--r--www/py-django-appconf/Makefile2
-rw-r--r--www/py-django-appmedia/Makefile2
-rw-r--r--www/py-django-assets/Makefile4
-rw-r--r--www/py-django-auth-ldap/Makefile6
-rw-r--r--www/py-django-babel/Makefile4
-rw-r--r--www/py-django-bitfield/Makefile4
-rw-r--r--www/py-django-bootstrap-form/Makefile2
-rw-r--r--www/py-django-bulk-update/Makefile2
-rw-r--r--www/py-django-caching-app-plugins/Makefile4
-rw-r--r--www/py-django-classy-tags/Makefile2
-rw-r--r--www/py-django-cms/Makefile18
-rw-r--r--www/py-django-configurations/Makefile2
-rw-r--r--www/py-django-constance/Makefile8
-rw-r--r--www/py-django-contact-form/Makefile2
-rw-r--r--www/py-django-contrib-comments/Makefile2
-rw-r--r--www/py-django-cors-headers/Makefile2
-rw-r--r--www/py-django-crispy-forms/Makefile2
-rw-r--r--www/py-django-datetime-widget/Makefile2
-rw-r--r--www/py-django-debug-toolbar/Makefile4
-rw-r--r--www/py-django-devel/Makefile12
-rw-r--r--www/py-django-dpaste/Makefile10
-rw-r--r--www/py-django-evolution/Makefile4
-rw-r--r--www/py-django-extensions/Makefile4
-rw-r--r--www/py-django-filer/Makefile6
-rw-r--r--www/py-django-guardian/Makefile4
-rw-r--r--www/py-django-happenings/Makefile4
-rw-r--r--www/py-django-haystack/Makefile2
-rw-r--r--www/py-django-hijack/Makefile2
-rw-r--r--www/py-django-htmlmin/Makefile4
-rw-r--r--www/py-django-json-rpc/Makefile2
-rw-r--r--www/py-django-jsonfield/Makefile2
-rw-r--r--www/py-django-keyedcache/Makefile2
-rw-r--r--www/py-django-ldapdb/Makefile6
-rw-r--r--www/py-django-livesettings/Makefile4
-rw-r--r--www/py-django-markdownx/Makefile4
-rw-r--r--www/py-django-mezzanine/Makefile26
-rw-r--r--www/py-django-mptt/Makefile2
-rw-r--r--www/py-django-openid-auth/Makefile6
-rw-r--r--www/py-django-otp-yubikey/Makefile4
-rw-r--r--www/py-django-overextends/Makefile4
-rw-r--r--www/py-django-paging/Makefile2
-rw-r--r--www/py-django-photologue/Makefile10
-rw-r--r--www/py-django-picklefield/Makefile4
-rw-r--r--www/py-django-pipeline/Makefile2
-rw-r--r--www/py-django-post_office/Makefile4
-rw-r--r--www/py-django-profiles/Makefile8
-rw-r--r--www/py-django-profiles/pkg-plist14
-rw-r--r--www/py-django-pyscss/Makefile4
-rw-r--r--www/py-django-recaptcha/Makefile2
-rw-r--r--www/py-django-redis/Makefile12
-rw-r--r--www/py-django-registration-defaults/Makefile2
-rw-r--r--www/py-django-registration-redux/Makefile2
-rw-r--r--www/py-django-registration/Makefile2
-rw-r--r--www/py-django-reversion/Makefile4
-rw-r--r--www/py-django-sekizai/Makefile4
-rw-r--r--www/py-django-signals-ahoy/Makefile2
-rw-r--r--www/py-django-simple-captcha/Makefile6
-rw-r--r--www/py-django-simple-history/Makefile2
-rw-r--r--www/py-django-social-auth/Makefile4
-rw-r--r--www/py-django-sortedm2m/Makefile2
-rw-r--r--www/py-django-star-ratings/Makefile2
-rw-r--r--www/py-django-statici18n/Makefile6
-rw-r--r--www/py-django-subdomains/Makefile2
-rw-r--r--www/py-django-sudo/Makefile2
-rw-r--r--www/py-django-tables2/Makefile4
-rw-r--r--www/py-django-tagging/Makefile2
-rw-r--r--www/py-django-taggit/Makefile2
-rw-r--r--www/py-django-tastypie/Makefile6
-rw-r--r--www/py-django-templatetag-sugar/Makefile2
-rw-r--r--www/py-django-threaded-multihost/Makefile6
-rw-r--r--www/py-django-tinymce/Makefile2
-rw-r--r--www/py-django/Makefile7
-rw-r--r--www/py-django110/Makefile12
-rw-r--r--www/py-django111/Makefile12
-rw-r--r--www/py-django18/Makefile12
-rw-r--r--www/py-django_compressor/Makefile16
-rw-r--r--www/py-django_openstack_auth/Makefile14
-rw-r--r--www/py-django_polymorphic/Makefile2
-rw-r--r--www/py-djangotoolbox/Makefile2
-rw-r--r--www/py-dojango/Makefile2
-rw-r--r--www/py-evernote/Makefile4
-rw-r--r--www/py-falcon/Makefile9
-rw-r--r--www/py-fedex/Makefile2
-rw-r--r--www/py-feedgenerator/Makefile4
-rw-r--r--www/py-flask-admin/Makefile4
-rw-r--r--www/py-flask-api/Makefile2
-rw-r--r--www/py-flask-assets/Makefile4
-rw-r--r--www/py-flask-bootstrap/Makefile2
-rw-r--r--www/py-flask-cache/Makefile2
-rw-r--r--www/py-flask-compress/Makefile4
-rw-r--r--www/py-flask-cors/Makefile4
-rw-r--r--www/py-flask-flatpages/Makefile6
-rw-r--r--www/py-flask-login/Makefile2
-rw-r--r--www/py-flask-oauthlib/Makefile6
-rw-r--r--www/py-flask-principal/Makefile4
-rw-r--r--www/py-flask-restful/Makefile8
-rw-r--r--www/py-flask-restplus/Makefile18
-rw-r--r--www/py-flask-socketio/Makefile8
-rw-r--r--www/py-flask-sockets/Makefile6
-rw-r--r--www/py-flask-uploads/Makefile2
-rw-r--r--www/py-flask-wtf/Makefile8
-rw-r--r--www/py-flask/Makefile8
-rw-r--r--www/py-flexget/Makefile70
-rw-r--r--www/py-flup/Makefile2
-rw-r--r--www/py-formalchemy/Makefile14
-rw-r--r--www/py-frappe-bench/Makefile18
-rw-r--r--www/py-frozen-flask/Makefile2
-rw-r--r--www/py-funkload/Makefile4
-rw-r--r--www/py-gandi.cli/Makefile10
-rw-r--r--www/py-gevent-websocket/Makefile2
-rw-r--r--www/py-goobook/Makefile8
-rw-r--r--www/py-google-api-python-client/Makefile14
-rw-r--r--www/py-google-cloud-core/Makefile10
-rw-r--r--www/py-google-cloud-storage/Makefile8
-rw-r--r--www/py-google-resumable-media/Makefile2
-rw-r--r--www/py-google/Makefile2
-rw-r--r--www/py-graphite-api/Makefile18
-rw-r--r--www/py-graphite-web/Makefile10
-rw-r--r--www/py-grequests/Makefile6
-rw-r--r--www/py-gunicorn/Makefile14
-rw-r--r--www/py-h2/Makefile4
-rw-r--r--www/py-horizon/Makefile114
-rw-r--r--www/py-html/Makefile2
-rw-r--r--www/py-html5-parser/Makefile2
-rw-r--r--www/py-html5lib/Makefile2
-rw-r--r--www/py-httpie/Makefile4
-rw-r--r--www/py-httplib2/Makefile2
-rw-r--r--www/py-hyper/Makefile8
-rw-r--r--www/py-imdbpy/Makefile6
-rw-r--r--www/py-jsonfield/Makefile2
-rw-r--r--www/py-jswebkit/Makefile4
-rw-r--r--www/py-kallithea/Makefile44
-rw-r--r--www/py-libsass/Makefile2
-rw-r--r--www/py-multidict/Makefile4
-rw-r--r--www/py-nevow/Makefile2
-rw-r--r--www/py-notebook/Makefile20
-rw-r--r--www/py-octoprint/Makefile56
-rw-r--r--www/py-paste/Makefile2
-rw-r--r--www/py-pastedeploy/Makefile2
-rw-r--r--www/py-pastescript/Makefile14
-rw-r--r--www/py-pelican/Makefile22
-rw-r--r--www/py-planet/Makefile6
-rw-r--r--www/py-plone.alterego/Makefile2
-rw-r--r--www/py-plone.app.blob/Makefile10
-rw-r--r--www/py-plone.app.caching/Makefile42
-rw-r--r--www/py-plone.app.collection/Makefile38
-rw-r--r--www/py-plone.app.content/Makefile32
-rw-r--r--www/py-plone.app.contentlisting/Makefile4
-rw-r--r--www/py-plone.app.contentmenu/Makefile30
-rw-r--r--www/py-plone.app.contentrules/Makefile52
-rw-r--r--www/py-plone.app.controlpanel/Makefile52
-rw-r--r--www/py-plone.app.customerize/Makefile20
-rw-r--r--www/py-plone.app.dexterity/Makefile52
-rw-r--r--www/py-plone.app.discussion/Makefile34
-rw-r--r--www/py-plone.app.folder/Makefile8
-rw-r--r--www/py-plone.app.form/Makefile34
-rw-r--r--www/py-plone.app.i18n/Makefile2
-rw-r--r--www/py-plone.app.imaging/Makefile8
-rw-r--r--www/py-plone.app.iterate/Makefile38
-rw-r--r--www/py-plone.app.jquery/Makefile6
-rw-r--r--www/py-plone.app.jquerytools/Makefile6
-rw-r--r--www/py-plone.app.layout/Makefile40
-rw-r--r--www/py-plone.app.ldap/Makefile20
-rw-r--r--www/py-plone.app.linkintegrity/Makefile4
-rw-r--r--www/py-plone.app.portlets/Makefile66
-rw-r--r--www/py-plone.app.querystring/Makefile34
-rw-r--r--www/py-plone.app.redirector/Makefile4
-rw-r--r--www/py-plone.app.registry/Makefile24
-rw-r--r--www/py-plone.app.search/Makefile4
-rw-r--r--www/py-plone.app.testing/Makefile20
-rw-r--r--www/py-plone.app.textfield/Makefile8
-rw-r--r--www/py-plone.app.theming/Makefile26
-rw-r--r--www/py-plone.app.upgrade/Makefile60
-rw-r--r--www/py-plone.app.users/Makefile28
-rw-r--r--www/py-plone.app.uuid/Makefile10
-rw-r--r--www/py-plone.app.viewletmanager/Makefile20
-rw-r--r--www/py-plone.app.vocabularies/Makefile24
-rw-r--r--www/py-plone.app.workflow/Makefile36
-rw-r--r--www/py-plone.app.z3cform/Makefile20
-rw-r--r--www/py-plone.autoform/Makefile14
-rw-r--r--www/py-plone.behavior/Makefile10
-rw-r--r--www/py-plone.browserlayer/Makefile12
-rw-r--r--www/py-plone.cachepurging/Makefile22
-rw-r--r--www/py-plone.caching/Makefile18
-rw-r--r--www/py-plone.contentrules/Makefile22
-rw-r--r--www/py-plone.dexterity/Makefile56
-rw-r--r--www/py-plone.fieldsets/Makefile12
-rw-r--r--www/py-plone.folder/Makefile18
-rw-r--r--www/py-plone.formwidget.namedfile/Makefile6
-rw-r--r--www/py-plone.i18n/Makefile12
-rw-r--r--www/py-plone.indexer/Makefile8
-rw-r--r--www/py-plone.intelligenttext/Makefile2
-rw-r--r--www/py-plone.locking/Makefile20
-rw-r--r--www/py-plone.memoize/Makefile8
-rw-r--r--www/py-plone.namedfile/Makefile14
-rw-r--r--www/py-plone.outputfilters/Makefile8
-rw-r--r--www/py-plone.portlet.collection/Makefile10
-rw-r--r--www/py-plone.portlet.static/Makefile20
-rw-r--r--www/py-plone.portlets/Makefile20
-rw-r--r--www/py-plone.registry/Makefile12
-rw-r--r--www/py-plone.resource/Makefile20
-rw-r--r--www/py-plone.resourceeditor/Makefile10
-rw-r--r--www/py-plone.rfc822/Makefile8
-rw-r--r--www/py-plone.scale/Makefile8
-rw-r--r--www/py-plone.schemaeditor/Makefile20
-rw-r--r--www/py-plone.stringinterp/Makefile6
-rw-r--r--www/py-plone.subrequest/Makefile6
-rw-r--r--www/py-plone.supermodel/Makefile16
-rw-r--r--www/py-plone.synchronize/Makefile2
-rw-r--r--www/py-plone.testing/Makefile2
-rw-r--r--www/py-plone.theme/Makefile12
-rw-r--r--www/py-plone.transformchain/Makefile6
-rw-r--r--www/py-plone.uuid/Makefile10
-rw-r--r--www/py-plone.z3cform/Makefile12
-rw-r--r--www/py-plonetheme.classic/Makefile2
-rw-r--r--www/py-plonetheme.sunburst/Makefile2
-rw-r--r--www/py-poster/Makefile2
-rw-r--r--www/py-praw/Makefile10
-rw-r--r--www/py-puppetboard/Makefile10
-rw-r--r--www/py-puppetboard02/Makefile10
-rw-r--r--www/py-py-restclient/Makefile2
-rw-r--r--www/py-pySmartDL/Makefile2
-rw-r--r--www/py-pyjwt/Makefile8
-rw-r--r--www/py-pylons/Makefile34
-rw-r--r--www/py-pyocclient/Makefile2
-rw-r--r--www/py-pyquery/Makefile14
-rw-r--r--www/py-pyramid/Makefile18
-rw-r--r--www/py-pyramid_rpc/Makefile2
-rw-r--r--www/py-pysearch/Makefile2
-rw-r--r--www/py-python-digitalocean/Makefile2
-rw-r--r--www/py-pywebdav/Makefile2
-rw-r--r--www/py-pywikibot/Makefile14
-rw-r--r--www/py-qp/Makefile4
-rw-r--r--www/py-qt4-webkit/Makefile1
-rw-r--r--www/py-qt5-webkit/Makefile5
-rw-r--r--www/py-qt5-webkitwidgets/Makefile1
-rw-r--r--www/py-rackspace-monitoring/Makefile2
-rw-r--r--www/py-requestbuilder/Makefile4
-rw-r--r--www/py-requests-cache/Makefile6
-rw-r--r--www/py-requests-file/Makefile4
-rw-r--r--www/py-requests-futures/Makefile4
-rw-r--r--www/py-requests-mock/Makefile6
-rw-r--r--www/py-requests-oauthlib/Makefile6
-rw-r--r--www/py-requests-toolbelt/Makefile2
-rw-r--r--www/py-requests/Makefile18
-rw-r--r--www/py-restclient/Makefile2
-rw-r--r--www/py-rhodecode/Makefile44
-rw-r--r--www/py-rollbar/Makefile4
-rw-r--r--www/py-routes/Makefile4
-rw-r--r--www/py-scgi/Makefile2
-rw-r--r--www/py-scrapy/Makefile20
-rw-r--r--www/py-seafdav/Makefile1
-rw-r--r--www/py-seafobj/Makefile1
-rw-r--r--www/py-searx/Makefile22
-rw-r--r--www/py-selector/Makefile2
-rw-r--r--www/py-slimit/Makefile6
-rw-r--r--www/py-slimmer/Makefile2
-rw-r--r--www/py-slumber/Makefile6
-rw-r--r--www/py-sockjs-tornado/Makefile2
-rw-r--r--www/py-splinter/Makefile10
-rw-r--r--www/py-spyne/Makefile4
-rw-r--r--www/py-textile/Makefile4
-rw-r--r--www/py-tornado/Makefile6
-rw-r--r--www/py-trello/Makefile2
-rw-r--r--www/py-treq/Makefile18
-rw-r--r--www/py-turbogears2/Makefile8
-rw-r--r--www/py-tvdb_api/Makefile6
-rw-r--r--www/py-txrequests/Makefile4
-rw-r--r--www/py-urlgrabber/Makefile2
-rw-r--r--www/py-user_agent/Makefile2
-rw-r--r--www/py-w3lib/Makefile2
-rw-r--r--www/py-webhelpers/Makefile4
-rw-r--r--www/py-webkitgtk/Makefile1
-rw-r--r--www/py-webob/Makefile2
-rw-r--r--www/py-werkzeug/Makefile6
-rw-r--r--www/py-wikipedia/Makefile4
-rw-r--r--www/py-ws4py/Makefile6
-rw-r--r--www/py-wsgiauth/Makefile2
-rw-r--r--www/py-wsgidav/Makefile14
-rw-r--r--www/py-yarl/Makefile9
-rw-r--r--www/py-zope.app.wsgi/Makefile42
-rw-r--r--www/py3-cssutils/Makefile10
-rw-r--r--www/py3-httplib2/Makefile7
-rw-r--r--www/py3-requests/Makefile16
-rw-r--r--www/pycarddav/Makefile12
-rw-r--r--www/pyjamas/Makefile2
-rw-r--r--www/qutebrowser/Makefile20
-rw-r--r--www/radicale/Makefile4
-rw-r--r--www/roundup/Makefile8
-rw-r--r--www/rtv/Makefile14
-rw-r--r--www/seahub/Makefile42
-rw-r--r--www/trac-OhlohWidgetsMacro/Makefile4
-rw-r--r--www/trac-TracGoogleAnalytics/Makefile4
-rw-r--r--www/trac-advancedticketworkflow/Makefile2
-rw-r--r--www/trac-iniadmin/Makefile2
-rw-r--r--www/trac-ldapauthstore/Makefile2
-rw-r--r--www/trac-permredirect/Makefile2
-rw-r--r--www/trac-privatetickets/Makefile2
-rw-r--r--www/trac-ticketimport/Makefile2
-rw-r--r--www/trac-tocmacro/Makefile2
-rw-r--r--www/trac-tweakui/Makefile2
-rw-r--r--www/trac-wikigoodies/Makefile2
-rw-r--r--www/trac-wikinotification/Makefile2
-rw-r--r--www/trac-wikitemplates/Makefile2
-rw-r--r--www/trac/Makefile20
-rw-r--r--www/trytond28_google_maps/Makefile2
-rw-r--r--www/twill/Makefile2
-rw-r--r--www/uwsgi/Makefile2
-rw-r--r--www/uwsgitop/Makefile2
-rw-r--r--www/uzbl/Makefile4
-rw-r--r--www/wadcomblog/Makefile2
-rw-r--r--www/web2ldap/Makefile6
-rw-r--r--www/webpy/Makefile2
-rw-r--r--www/xist/Makefile8
-rw-r--r--www/you-get/Makefile4
-rw-r--r--www/zope213/Makefile132
-rw-r--r--x11-fm/sunflower/Makefile12
-rw-r--r--x11-fonts/font-manager/Makefile4
-rw-r--r--x11-toolkits/Makefile3
-rw-r--r--x11-toolkits/py-Pmw/Makefile4
-rw-r--r--x11-toolkits/py-SquareMap/Makefile2
-rw-r--r--x11-toolkits/py-gnome2/Makefile5
-rw-r--r--x11-toolkits/py-gtk2/Makefile5
-rw-r--r--x11-toolkits/py-gtkglext/Makefile7
-rw-r--r--x11-toolkits/py-gui/Makefile6
-rw-r--r--x11-toolkits/py-kivy/Makefile21
-rw-r--r--x11-toolkits/py-kiwi-gtk/Makefile2
-rw-r--r--x11-toolkits/py-qt4-gui/Makefile1
-rw-r--r--x11-toolkits/py-qt5-gui/Makefile1
-rw-r--r--x11-toolkits/py-qt5-quick/Makefile1
-rw-r--r--x11-toolkits/py-qt5-widgets/Makefile1
-rw-r--r--x11-toolkits/py-sexy/Makefile3
-rw-r--r--x11-toolkits/py-tkinter/Makefile2
-rw-r--r--x11-toolkits/py-tktreectrl/Makefile6
-rw-r--r--x11-toolkits/py-vte/Makefile3
-rw-r--r--x11-toolkits/py-wxPython28/Makefile8
-rw-r--r--x11-toolkits/py-wxPython30/Makefile6
-rw-r--r--x11-toolkits/py-xlib/Makefile6
-rw-r--r--x11-toolkits/py34-tkinter/Makefile7
-rw-r--r--x11-toolkits/py35-tkinter/Makefile7
-rw-r--r--x11-toolkits/py36-tkinter/Makefile7
-rw-r--r--x11-wm/compizconfig-python/Makefile3
-rw-r--r--x11-wm/obapps/Makefile4
-rw-r--r--x11-wm/obkey/Makefile2
-rw-r--r--x11-wm/obmenu/Makefile2
-rw-r--r--x11-wm/plwm/Makefile6
-rw-r--r--x11-wm/qtile/Makefile6
-rw-r--r--x11/arandr/Makefile6
-rw-r--r--x11/gnome-desktop/Makefile2
-rw-r--r--x11/gnome-shell/Makefile4
-rw-r--r--x11/guake/Makefile16
-rw-r--r--x11/ooxcb/Makefile2
-rw-r--r--x11/py-pyvirtualdisplay/Makefile10
-rw-r--r--x11/py-qt4-opengl/Makefile1
-rw-r--r--x11/py-qt5-opengl/Makefile1
-rw-r--r--x11/terminator/Makefile6
-rw-r--r--x11/workrave/Makefile2
-rw-r--r--x11/xpra/Makefile39
-rw-r--r--x11/xpyb/Makefile3
2437 files changed, 8603 insertions, 10454 deletions
diff --git a/CHANGES b/CHANGES
index 5a15d2c2c6ea..dba1494b8fac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,36 @@ All ports committers are allowed to commit to this file.
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.
diff --git a/MOVED b/MOVED
index 1fd32d52b12e..f54c144a1450 100644
--- a/MOVED
+++ b/MOVED
@@ -7656,7 +7656,6 @@ graphics/kuickshow-kde4||2015-07-21|Has expired: Broken for more than 6 months
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 @@ databases/py-sqlalchemy09|databases/py-sqlalchemy10|2017-03-12|Has expired: Upst
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-worker|devel/py-buildbot-worker|2017-11-29|Rename to comply with
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
diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
index 63e3dbd4e244..7bab1fdb636b 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -388,14 +388,15 @@ pygobject_BUILD_DEPENDS= pygobject-codegen-2.0:devel/py-gobject
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
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index e81b422b476d..8ff7cbcfa1cc 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -241,8 +241,8 @@ do-configure:
_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
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index 87af9c27acc9..6f81e2b23b14 100644
--- a/Mk/Uses/python.mk
+++ b/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 @@ _PYTHON_RELPORTDIR= lang/python
# Make each individual feature available as _PYTHON_FEATURE_<FEATURENAME>
.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}
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 @@ IGNORE= needs an unsupported version of Python
.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 @@ PYTHON_PYOEXTENSION= opt-1.pyc
# - 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 @@ UNIQUE_FIND_SUFFIX_FILES= \
_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 @@ CONFIGURE_ENV+= PYTHON="${PYTHON_CMD}"
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)
diff --git a/UPDATING b/UPDATING
index ef56bda7a11a..545d78b13ce1 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,20 @@ they are unavoidable.
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
diff --git a/accessibility/Makefile b/accessibility/Makefile
index a1a5bd348fdb..ba82967c6a84 100644
--- a/accessibility/Makefile
+++ b/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
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index 71b78d5ffce1..26c5c2a21574 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas \
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
diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile
index 665ece56ed7c..89a1cf226562 100644
--- a/accessibility/caribou/Makefile
+++ b/accessibility/caribou/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index d817d3a7a600..eadbc07578d5 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -10,16 +10,16 @@ DIST_SUBDIR= gnome3
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 @@ CONFLICTS= py*-json-py-[0-9]*
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
diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
index fa5f938f0403..bef8fe3ed2cc 100644
--- a/accessibility/py-atspi/Makefile
+++ b/accessibility/py-atspi/Makefile
@@ -19,8 +19,16 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/at-spi2-registryd:accessibility/at-spi2-core
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 <bsd.port.mk>
diff --git a/accessibility/py3-atspi/pkg-plist b/accessibility/py-atspi/pkg-plist-py3
index 71dfa77a8eec..71dfa77a8eec 100644
--- a/accessibility/py3-atspi/pkg-plist
+++ b/accessibility/py-atspi/pkg-plist-py3
diff --git a/accessibility/py3-speech-dispatcher/Makefile b/accessibility/py-speech-dispatcher/Makefile
index ea846a052a2f..ea846a052a2f 100644
--- a/accessibility/py3-speech-dispatcher/Makefile
+++ b/accessibility/py-speech-dispatcher/Makefile
diff --git a/accessibility/py3-speech-dispatcher/pkg-plist b/accessibility/py-speech-dispatcher/pkg-plist
index 303d9074311f..303d9074311f 100644
--- a/accessibility/py3-speech-dispatcher/pkg-plist
+++ b/accessibility/py-speech-dispatcher/pkg-plist
diff --git a/accessibility/py3-atspi/Makefile b/accessibility/py3-atspi/Makefile
deleted file mode 100644
index 0ec6a6f3220c..000000000000
--- a/accessibility/py3-atspi/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
-# $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 <bsd.port.mk>
diff --git a/accessibility/py3-atspi/distinfo b/accessibility/py3-atspi/distinfo
deleted file mode 100644
index 9d717a35f5af..000000000000
--- a/accessibility/py3-atspi/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1491080637
-SHA256 (gnome3/pyatspi-2.24.0.tar.xz) = e7ef47a5d387fdc64a01722ef2bcced54c4d6b225fbe34867189e1f88ff0a692
-SIZE (gnome3/pyatspi-2.24.0.tar.xz) = 298228
diff --git a/accessibility/py3-atspi/pkg-descr b/accessibility/py3-atspi/pkg-descr
deleted file mode 100644
index 151f94c993e2..000000000000
--- a/accessibility/py3-atspi/pkg-descr
+++ /dev/null
@@ -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
diff --git a/accessibility/redshift/Makefile b/accessibility/redshift/Makefile
index 7b35b3a5650f..79905e36b3d4 100644
--- a/accessibility/redshift/Makefile
+++ b/accessibility/redshift/Makefile
@@ -42,10 +42,10 @@ RANDR_CONFIGURE_ENABLE= randr
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
diff --git a/accessibility/speech-dispatcher/Makefile b/accessibility/speech-dispatcher/Makefile
index 47e84916fa30..44cd856160c2 100644
--- a/accessibility/speech-dispatcher/Makefile
+++ b/accessibility/speech-dispatcher/Makefile
@@ -92,8 +92,9 @@ PORTSCOUT= ignore:1
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
diff --git a/archivers/Makefile b/archivers/Makefile
index 5dd07aec5b8d..ec2f0c32216d 100644
--- a/archivers/Makefile
+++ b/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
diff --git a/archivers/py-attic/Makefile b/archivers/py-attic/Makefile
index eb1476e5ea10..8409d809c149 100644
--- a/archivers/py-attic/Makefile
+++ b/archivers/py-attic/Makefile
@@ -14,8 +14,8 @@ COMMENT= Deduplicating backup program
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 @@ USE_PYTHON= autoplist distutils
STRIP_FILES= hashindex.so platform_freebsd.so chunker.so crypto.so
PYDISTUTILS_BUILDPATH=${BUILD_WRKSRC}/build/lib.${OPSYS:tl}-${UNAMER}-${ARCH}-${PYTHON_VER}
-.include <bsd.port.pre.mk>
-
-.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 @@ regression-test: build
post-install:
${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/attic/,}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/py-borgbackup/Makefile b/archivers/py-borgbackup/Makefile
index bba9b34b8760..8db5e395d4ef 100644
--- a/archivers/py-borgbackup/Makefile
+++ b/archivers/py-borgbackup/Makefile
@@ -13,9 +13,9 @@ COMMENT= Deduplicating backup program
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 @@ FUSE_RUN_DEPENDS= ${PYTHONPREFIX_SITELIBDIR}/llfuse.so:devel/py-llfuse
USES= python:3.4+ ssl
USE_PYTHON= autoplist distutils
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/py-czipfile/Makefile b/archivers/py-czipfile/Makefile
index fc7020673f06..26d7e6f8fd1d 100644
--- a/archivers/py-czipfile/Makefile
+++ b/archivers/py-czipfile/Makefile
@@ -12,7 +12,7 @@ COMMENT= Fast C-based zipfile decryption for Python
LICENSE= PSFL
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/archivers/py-libarchive-c/Makefile b/archivers/py-libarchive-c/Makefile
index c4138a0ecd09..9e35747eb572 100644
--- a/archivers/py-libarchive-c/Makefile
+++ b/archivers/py-libarchive-c/Makefile
@@ -11,9 +11,9 @@ COMMENT= Python interface to libarchive
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
diff --git a/archivers/py-librtfcomp/Makefile b/archivers/py-librtfcomp/Makefile
index a92c95a4e03f..bc654193ad2a 100644
--- a/archivers/py-librtfcomp/Makefile
+++ b/archivers/py-librtfcomp/Makefile
@@ -14,13 +14,14 @@ COMMENT= Python bindings for library for handling compressed RTF documents
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
diff --git a/archivers/py-lz4/Makefile b/archivers/py-lz4/Makefile
index 3f8c93b8db1f..fe63a0786cf2 100644
--- a/archivers/py-lz4/Makefile
+++ b/archivers/py-lz4/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python binding for the LZ4 compression library
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
diff --git a/archivers/py-python-lzo/Makefile b/archivers/py-python-lzo/Makefile
index 04ca7aba8ffb..2620a4251201 100644
--- a/archivers/py-python-lzo/Makefile
+++ b/archivers/py-python-lzo/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= liblzo2.so:archivers/lzo2
-USES= python:2
+USES= python
USE_PYTHON= autoplist distutils
CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/lzo
diff --git a/archivers/py3-libarchive-c/Makefile b/archivers/py3-libarchive-c/Makefile
deleted file mode 100644
index 12df1c925687..000000000000
--- a/archivers/py3-libarchive-c/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Kubilay Kocak <koobs@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-libarchive-c
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/astro/py-RO/Makefile b/astro/py-RO/Makefile
index 4c82c8cbc41f..fb7ac2537909 100644
--- a/astro/py-RO/Makefile
+++ b/astro/py-RO/Makefile
@@ -12,7 +12,7 @@ COMMENT= Package of Python astronomical utilities
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 @@ PYGAME_DESC= Add Support for PyGame
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 <bsd.port.mk>
diff --git a/astro/py-aipy/Makefile b/astro/py-aipy/Makefile
index daae1f981390..40e6e22dec3a 100644
--- a/astro/py-aipy/Makefile
+++ b/astro/py-aipy/Makefile
@@ -11,12 +11,12 @@ MAINTAINER= wen@FreeBSD.org
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 <bsd.port.mk>
diff --git a/astro/py-astLib/Makefile b/astro/py-astLib/Makefile
index ff33bdd0602b..beaaed8dd727 100644
--- a/astro/py-astLib/Makefile
+++ b/astro/py-astLib/Makefile
@@ -14,15 +14,15 @@ LICENSE= LGPL21
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:
diff --git a/astro/py-horoscopegenerator/Makefile b/astro/py-horoscopegenerator/Makefile
index 3c53386e1043..55acd4ee023e 100644
--- a/astro/py-horoscopegenerator/Makefile
+++ b/astro/py-horoscopegenerator/Makefile
@@ -16,6 +16,6 @@ NO_ARCH= yes
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 <bsd.port.mk>
diff --git a/astro/py-pyfits/Makefile b/astro/py-pyfits/Makefile
index c8c966b5d7ce..26d266559510 100644
--- a/astro/py-pyfits/Makefile
+++ b/astro/py-pyfits/Makefile
@@ -14,10 +14,10 @@ LICENSE= BSD3CLAUSE
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
diff --git a/astro/pyephem/Makefile b/astro/pyephem/Makefile
index 9ce70f1ce819..0cb676e9fec9 100644
--- a/astro/pyephem/Makefile
+++ b/astro/pyephem/Makefile
@@ -6,6 +6,8 @@ PORTVERSION= 3.7.6.0
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
diff --git a/audio/Makefile b/audio/Makefile
index fb4ec891d8e8..7b3c6b67f7bc 100644
--- a/audio/Makefile
+++ b/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
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index b5b80f72473e..9f39bba8516f 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -16,7 +16,7 @@ LICENSE_COMB= dual
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
diff --git a/audio/beets/Makefile b/audio/beets/Makefile
index 575f1e2c3cf3..9c56f8bdb193 100644
--- a/audio/beets/Makefile
+++ b/audio/beets/Makefile
@@ -13,18 +13,18 @@ COMMENT= Media library management system for obsessive-compulsive music geeks
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 @@ THUMBNAILS_DESC= Thumbnails for freedesktop.org-compliant file managers
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/
diff --git a/audio/carla/Makefile b/audio/carla/Makefile
index e9956114a863..123261d8559f 100644
--- a/audio/carla/Makefile
+++ b/audio/carla/Makefile
@@ -13,10 +13,10 @@ LICENSE_FILE= ${WRKSRC}/doc/GPL.txt
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
diff --git a/audio/exaile-devel/Makefile b/audio/exaile-devel/Makefile
index 194e94d3b137..c1a27e70cd3b 100644
--- a/audio/exaile-devel/Makefile
+++ b/audio/exaile-devel/Makefile
@@ -11,10 +11,10 @@ COMMENT= Full featured python-based music player for GTK+
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 @@ OPTIONS_SUB= yes
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} \
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index b49dfb729ec1..5ed5d53655ef 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -12,7 +12,7 @@ COMMENT= Full featured python-based music player for GTK+
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_DEFAULT= BAD CDDB DBUS HAL NOTIFY SEXY
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
diff --git a/audio/gnome-music/Makefile b/audio/gnome-music/Makefile
index bfa2023527f6..8af2b69e087c 100644
--- a/audio/gnome-music/Makefile
+++ b/audio/gnome-music/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libgrilo-0.2.so:net/grilo2 \
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
diff --git a/audio/idjc/Makefile b/audio/idjc/Makefile
index 8407fcfb96e9..12109fd4ea1b 100644
--- a/audio/idjc/Makefile
+++ b/audio/idjc/Makefile
@@ -25,8 +25,8 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \
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
diff --git a/audio/jokosher/Makefile b/audio/jokosher/Makefile
index 74ec50bcec70..21b87c881531 100644
--- a/audio/jokosher/Makefile
+++ b/audio/jokosher/Makefile
@@ -12,7 +12,7 @@ COMMENT= Multi-track non-linear audio editing
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 @@ NO_ARCH= yes
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
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 9c51879d6240..28c0d74c3351 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -39,10 +39,10 @@ MONO_USE= GNOME=gtksharp20
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
diff --git a/audio/lollypop/Makefile b/audio/lollypop/Makefile
index cd4255cec761..6d1ac720fd9a 100644
--- a/audio/lollypop/Makefile
+++ b/audio/lollypop/Makefile
@@ -13,14 +13,14 @@ COMMENT= Play and organize your music collection
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 @@ PULSEAUDIO_USE= gstreamer1=pulse
SUB_FILES= pkg-message
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/mbox/Makefile b/audio/mbox/Makefile
index 137b8342a1fd..490c3fa6f0b0 100644
--- a/audio/mbox/Makefile
+++ b/audio/mbox/Makefile
@@ -12,8 +12,8 @@ COMMENT= Program intended to help with organizing your music files
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
diff --git a/audio/mpdbrowser/Makefile b/audio/mpdbrowser/Makefile
index 31c963540bef..64e68c75c1d9 100644
--- a/audio/mpdbrowser/Makefile
+++ b/audio/mpdbrowser/Makefile
@@ -14,7 +14,7 @@ COMMENT= GTK+ client for the Music Player Daemon (MPD)
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
diff --git a/audio/mps/Makefile b/audio/mps/Makefile
index 2452bb770cae..cd7b133d4a3c 100644
--- a/audio/mps/Makefile
+++ b/audio/mps/Makefile
@@ -22,7 +22,7 @@ MPV_DESC= Mpv media player support
# 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
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index 01b8e99fd399..aa12a25274b3 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -14,8 +14,8 @@ COMMENT= Next generation MusicBrainz Tagger
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
diff --git a/audio/pithos/Makefile b/audio/pithos/Makefile
index e26d74d1336a..36122de1e1b5 100644
--- a/audio/pithos/Makefile
+++ b/audio/pithos/Makefile
@@ -13,15 +13,15 @@ LICENSE= GPLv3
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:
diff --git a/audio/puddletag/Makefile b/audio/puddletag/Makefile
index 2109a0b0a719..01bc336aa543 100644
--- a/audio/puddletag/Makefile
+++ b/audio/puddletag/Makefile
@@ -13,10 +13,10 @@ LICENSE= GPLv3
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
diff --git a/audio/py-aubio/Makefile b/audio/py-aubio/Makefile
index 4e3d12b168b7..c81c1e625e93 100644
--- a/audio/py-aubio/Makefile
+++ b/audio/py-aubio/Makefile
@@ -11,7 +11,7 @@ LIB_DEPENDS= libaubio.so:audio/aubio
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
diff --git a/audio/py-discogs-client/Makefile b/audio/py-discogs-client/Makefile
index 70acc2fa88db..5461288aa1ef 100644
--- a/audio/py-discogs-client/Makefile
+++ b/audio/py-discogs-client/Makefile
@@ -12,9 +12,9 @@ COMMENT= Python interface to Discogs website
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
diff --git a/audio/py-gmusicapi/Makefile b/audio/py-gmusicapi/Makefile
index b459f0273859..d5518affe0ec 100644
--- a/audio/py-gmusicapi/Makefile
+++ b/audio/py-gmusicapi/Makefile
@@ -12,21 +12,21 @@ COMMENT= Unofficial Python API for Google Play Music
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
diff --git a/audio/py-gmusicproxy/Makefile b/audio/py-gmusicproxy/Makefile
index d8c222320cc0..063908f9389a 100644
--- a/audio/py-gmusicproxy/Makefile
+++ b/audio/py-gmusicproxy/Makefile
@@ -13,14 +13,14 @@ COMMENT= Proxy for streaming Google Play Music using any media-player
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
-
-USES= python
+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:2.7
USE_PYTHON= distutils autoplist
USE_GITHUB= yes
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 33de373f5f1e..1728e4acf80a 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -39,7 +39,7 @@ PLIST_FILES= ${BIN_SCRIPTS:S,^,bin/,} \
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 \
diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile
index acb384268bcf..2450aac4fd93 100644
--- a/audio/py-mutagen/Makefile
+++ b/audio/py-mutagen/Makefile
@@ -14,7 +14,7 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
NO_ARCH= yes
-USES?= python shebangfix
+USES= python shebangfix
USE_PYTHON= autoplist concurrent distutils
SHEBANG_FILES= tools/*
diff --git a/audio/py-openal/Makefile b/audio/py-openal/Makefile
index 6d14978495b4..1b786f1e17d5 100644
--- a/audio/py-openal/Makefile
+++ b/audio/py-openal/Makefile
@@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
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
diff --git a/audio/py-py-jack/Makefile b/audio/py-py-jack/Makefile
index 171fdf9e389f..3c3e21bf7457 100644
--- a/audio/py-py-jack/Makefile
+++ b/audio/py-py-jack/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python bindings for the Jack Audio Server
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
diff --git a/audio/py-pylast/Makefile b/audio/py-pylast/Makefile
index 45e29669904b..cdd8155ffad8 100644
--- a/audio/py-pylast/Makefile
+++ b/audio/py-pylast/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python interface to Last.fm and Libre.fm
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
diff --git a/audio/py-pyliblo/Makefile b/audio/py-pyliblo/Makefile
index 22fbd1a45f7f..e31bc17f43fd 100644
--- a/audio/py-pyliblo/Makefile
+++ b/audio/py-pyliblo/Makefile
@@ -14,12 +14,11 @@ COMMENT= Python wrapper for the Liblo OSC Library
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:
diff --git a/audio/py-pysndfile/Makefile b/audio/py-pysndfile/Makefile
index 86811de18ae9..4d111ef6ac8f 100644
--- a/audio/py-pysndfile/Makefile
+++ b/audio/py-pysndfile/Makefile
@@ -11,13 +11,12 @@ COMMENT= Cython wrapper class for reading/writing soundfiles using libsndfile
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
diff --git a/audio/py-soundcloud/Makefile b/audio/py-soundcloud/Makefile
index 51a2f4bdab75..62578f868c8f 100644
--- a/audio/py-soundcloud/Makefile
+++ b/audio/py-soundcloud/Makefile
@@ -13,7 +13,7 @@ COMMENT= A friendly wrapper library for the Soundcloud API
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
diff --git a/audio/py-soundscrape/Makefile b/audio/py-soundscrape/Makefile
index a4e3abf977e7..8a90113917f4 100644
--- a/audio/py-soundscrape/Makefile
+++ b/audio/py-soundscrape/Makefile
@@ -13,16 +13,16 @@ COMMENT= SoundCloud downloader in python
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
diff --git a/audio/py-speechrecognition/Makefile b/audio/py-speechrecognition/Makefile
index 67bc2fd1d028..3a4cdbb5c527 100644
--- a/audio/py-speechrecognition/Makefile
+++ b/audio/py-speechrecognition/Makefile
@@ -16,7 +16,7 @@ GH_ACCOUNT= Uberi
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 @@ post-extract:
.include <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
diff --git a/audio/py-speex/Makefile b/audio/py-speex/Makefile
index 2fa617c33ce1..52442775f11a 100644
--- a/audio/py-speex/Makefile
+++ b/audio/py-speex/Makefile
@@ -13,10 +13,10 @@ DIST_SUBDIR= python
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:
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index 52479dc7ff1f..aa599215b80e 100644
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@@ -15,8 +15,8 @@ COMMENT= Object-oriented Python bindings for the vorbis library
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
diff --git a/audio/py-xmms2/Makefile b/audio/py-xmms2/Makefile
index 1c68249902c2..a344910b504b 100644
--- a/audio/py-xmms2/Makefile
+++ b/audio/py-xmms2/Makefile
@@ -9,12 +9,13 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/audio/py3-mutagen/Makefile b/audio/py3-mutagen/Makefile
deleted file mode 100644
index bce9cac31558..000000000000
--- a/audio/py3-mutagen/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-mutagen
-
-PORTSCOUT= ignore:1
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/audio/py3-pylast/Makefile b/audio/py3-pylast/Makefile
deleted file mode 100644
index 0210b6f2cac2..000000000000
--- a/audio/py3-pylast/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Created by: Kris Moore <kmoore@FreeBSD.org>
-# $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 <bsd.port.mk>
diff --git a/audio/py3-pylast/distinfo b/audio/py3-pylast/distinfo
deleted file mode 100644
index 23aeb56727db..000000000000
--- a/audio/py3-pylast/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (pylast-0.5.11.tar.gz) = bf35820be35447d55564d36072d40b09ac8a7fd41a6f1a7a9d408f4d0eaefac4
-SIZE (pylast-0.5.11.tar.gz) = 26146
diff --git a/audio/py3-pylast/pkg-descr b/audio/py3-pylast/pkg-descr
deleted file mode 100644
index 4049f029cf7d..000000000000
--- a/audio/py3-pylast/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A Python interface to Last.fm (and other API compatible social networks)
-
-WWW: http://code.google.com/p/pylast/
diff --git a/audio/pytone/Makefile b/audio/pytone/Makefile
index b30fe4d6a3b3..7bd4a4b53dad 100644
--- a/audio/pytone/Makefile
+++ b/audio/pytone/Makefile
@@ -15,8 +15,8 @@ COMMENT= Music jukebox written in Python with a curses GUI
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 @@ PLIST_FILES= etc/pytonerc.sample
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
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index a48413c4b7ac..c554cf217b3f 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -69,10 +69,10 @@ MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp \
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
diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index 176f4f8ffc2f..791bf12f4ced 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -12,9 +12,9 @@ COMMENT= Elegant music player for MPD
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 @@ OPTIONS_SUB= yes
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},' \
diff --git a/audio/soundconverter/Makefile b/audio/soundconverter/Makefile
index 4ab9cf227b54..11b89c0f31bb 100644
--- a/audio/soundconverter/Makefile
+++ b/audio/soundconverter/Makefile
@@ -13,7 +13,7 @@ COMMENT= Sound conversion application for the GNOME environment
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
diff --git a/benchmarks/py-naarad/Makefile b/benchmarks/py-naarad/Makefile
index a880d69eb036..de8920d32a15 100644
--- a/benchmarks/py-naarad/Makefile
+++ b/benchmarks/py-naarad/Makefile
@@ -12,9 +12,9 @@ COMMENT= Framework for performance analysis
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
diff --git a/benchmarks/py-zopkio/Makefile b/benchmarks/py-zopkio/Makefile
index f68ea44e64b0..372e9b1f084c 100644
--- a/benchmarks/py-zopkio/Makefile
+++ b/benchmarks/py-zopkio/Makefile
@@ -12,10 +12,10 @@ LICENSE= APACHE20
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
diff --git a/biology/libsbml/Makefile b/biology/libsbml/Makefile
index 6ae00f67c805..4ef28a036795 100644
--- a/biology/libsbml/Makefile
+++ b/biology/libsbml/Makefile
@@ -27,7 +27,7 @@ OPTIONS_SUB= yes
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" \
diff --git a/biology/py-biom-format/Makefile b/biology/py-biom-format/Makefile
index 03b3d210cc32..0c7c567cdafe 100644
--- a/biology/py-biom-format/Makefile
+++ b/biology/py-biom-format/Makefile
@@ -13,10 +13,10 @@ LICENSE= BSD3CLAUSE
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 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.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:
diff --git a/biology/py-biopython/Makefile b/biology/py-biopython/Makefile
index c893687ef364..edc8c7a1e2ef 100644
--- a/biology/py-biopython/Makefile
+++ b/biology/py-biopython/Makefile
@@ -20,6 +20,6 @@ OPTIONS_DEFINE= REPORTLAB
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 <bsd.port.mk>
diff --git a/biology/py-bx-python/Makefile b/biology/py-bx-python/Makefile
index 89ccb9749a3e..0a11dd8824da 100644
--- a/biology/py-bx-python/Makefile
+++ b/biology/py-bx-python/Makefile
@@ -14,7 +14,7 @@ LICENSE= MIT
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
diff --git a/biology/py-cutadapt/Makefile b/biology/py-cutadapt/Makefile
index 0d215ac15be5..863a1ee70ab2 100644
--- a/biology/py-cutadapt/Makefile
+++ b/biology/py-cutadapt/Makefile
@@ -12,7 +12,7 @@ COMMENT= Finds and removes adapter sequences, primers, poly-A tails, etc
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
diff --git a/biology/py-pysam/Makefile b/biology/py-pysam/Makefile
index 6bcbc6e2584e..afec069f8422 100644
--- a/biology/py-pysam/Makefile
+++ b/biology/py-pysam/Makefile
@@ -12,11 +12,8 @@ COMMENT= Python module for reading, manipulating and writing genomic data sets
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
diff --git a/biology/pycogent/Makefile b/biology/pycogent/Makefile
index f0725592332c..a70e2e31f00c 100644
--- a/biology/pycogent/Makefile
+++ b/biology/pycogent/Makefile
@@ -11,13 +11,12 @@ COMMENT= Toolkit for statistical analysis of biological sequences
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 <bsd.port.mk>
diff --git a/biology/pyfasta/Makefile b/biology/pyfasta/Makefile
index 2c7d49cd2532..c06752787757 100644
--- a/biology/pyfasta/Makefile
+++ b/biology/pyfasta/Makefile
@@ -6,6 +6,7 @@ PORTVERSION= 0.5.2
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
diff --git a/biology/python-nexus/Makefile b/biology/python-nexus/Makefile
index c55243d5e23a..bf0cb8d97943 100644
--- a/biology/python-nexus/Makefile
+++ b/biology/python-nexus/Makefile
@@ -5,6 +5,7 @@ PORTNAME= python-nexus
PORTVERSION= 1.53
CATEGORIES= biology python
MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Generic nexus file format reader for python
diff --git a/cad/brickutils/Makefile b/cad/brickutils/Makefile
index c69992c09ae0..e566b6d2a5af 100644
--- a/cad/brickutils/Makefile
+++ b/cad/brickutils/Makefile
@@ -20,7 +20,7 @@ COMMENT= Utility for building models with LEGO
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}
diff --git a/cad/linuxcnc-devel/Makefile b/cad/linuxcnc-devel/Makefile
index e44557571e34..f98af356fe1f 100644
--- a/cad/linuxcnc-devel/Makefile
+++ b/cad/linuxcnc-devel/Makefile
@@ -46,7 +46,7 @@ CONFIGURE_ARGS= --with-realtime=uspace --enable-non-distributable=yes \
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
diff --git a/cad/py-gdspy/Makefile b/cad/py-gdspy/Makefile
index ec63cc56ab0c..bffbe640d48a 100644
--- a/cad/py-gdspy/Makefile
+++ b/cad/py-gdspy/Makefile
@@ -11,7 +11,7 @@ COMMENT= Python module for creating GDSII stream files
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
diff --git a/cad/py-lcapy/Makefile b/cad/py-lcapy/Makefile
index 2dfd87a685a6..9ec124fd9523 100644
--- a/cad/py-lcapy/Makefile
+++ b/cad/py-lcapy/Makefile
@@ -10,11 +10,11 @@ COMMENT= Symbolic MDA Analysis Package for Linear Circuits
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-
diff --git a/cad/py-pycam/Makefile b/cad/py-pycam/Makefile
index ab91f41475d5..30d89bdb2774 100644
--- a/cad/py-pycam/Makefile
+++ b/cad/py-pycam/Makefile
@@ -13,9 +13,9 @@ COMMENT= Toolpath generator for 3-axis CNC machining
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
diff --git a/cad/python-gdsii/Makefile b/cad/python-gdsii/Makefile
index 0637824d4fc2..92bc2c8a17bd 100644
--- a/cad/python-gdsii/Makefile
+++ b/cad/python-gdsii/Makefile
@@ -11,7 +11,7 @@ COMMENT= GDSII manipulation library
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
diff --git a/cad/pythoncad/Makefile b/cad/pythoncad/Makefile
index ecb7e41268b0..6a6594577005 100644
--- a/cad/pythoncad/Makefile
+++ b/cad/pythoncad/Makefile
@@ -14,9 +14,9 @@ COMMENT= Open-source CAD package built designed around Python
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}
diff --git a/comms/chirp/Makefile b/comms/chirp/Makefile
index 5d1067cbce57..1be4b05297ba 100644
--- a/comms/chirp/Makefile
+++ b/comms/chirp/Makefile
@@ -15,11 +15,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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 <bsd.port.mk>
diff --git a/comms/congruity/Makefile b/comms/congruity/Makefile
index ea8ce46a901d..40e4dc6de629 100644
--- a/comms/congruity/Makefile
+++ b/comms/congruity/Makefile
@@ -12,7 +12,7 @@ COMMENT= GUI Logitech Harmony configuration tool
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+
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 8ffbfe1c7c54..71338a9a8b41 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -14,14 +14,14 @@ LICENSE= GPLv3
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 @@ TESTING_DESC= Include testing support
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
diff --git a/comms/owfs/Makefile b/comms/owfs/Makefile
index a1a6d775d62e..26731bdee748 100644
--- a/comms/owfs/Makefile
+++ b/comms/owfs/Makefile
@@ -57,7 +57,7 @@ OWPERL_USE= perl5=build,run
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
diff --git a/comms/py-bulksms/Makefile b/comms/py-bulksms/Makefile
index 60a4ea3f5409..4f2b45ce8474 100644
--- a/comms/py-bulksms/Makefile
+++ b/comms/py-bulksms/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/comms/py-hidapi/Makefile b/comms/py-hidapi/Makefile
index 23944b75b6c2..7c5f42faee15 100644
--- a/comms/py-hidapi/Makefile
+++ b/comms/py-hidapi/Makefile
@@ -13,11 +13,10 @@ COMMENT= Cython interface to comms/hidapi
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
diff --git a/comms/py-libconcord/Makefile b/comms/py-libconcord/Makefile
index f65b1e4474f9..49189d617e4d 100644
--- a/comms/py-libconcord/Makefile
+++ b/comms/py-libconcord/Makefile
@@ -17,7 +17,7 @@ LICENSE= GPLv2
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
diff --git a/comms/py-libimobiledevice/Makefile b/comms/py-libimobiledevice/Makefile
index 39a21d1b1265..ba1d40cd263a 100644
--- a/comms/py-libimobiledevice/Makefile
+++ b/comms/py-libimobiledevice/Makefile
@@ -8,13 +8,13 @@ MAINTAINER= avilla@FreeBSD.org
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
diff --git a/comms/py-qt5-serialport/Makefile b/comms/py-qt5-serialport/Makefile
index e16c64955b0a..5697103aa502 100644
--- a/comms/py-qt5-serialport/Makefile
+++ b/comms/py-qt5-serialport/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
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
diff --git a/comms/quisk/Makefile b/comms/quisk/Makefile
index 49d023d830f6..72564435277e 100644
--- a/comms/quisk/Makefile
+++ b/comms/quisk/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \
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
diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile
index 494c52802231..627ab5dbc60b 100644
--- a/comms/uhd/Makefile
+++ b/comms/uhd/Makefile
@@ -13,10 +13,10 @@ COMMENT= Ettus Research UHD driver framework
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
diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index 26cd3a204f23..7e97b8a6c6b0 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -21,9 +21,9 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \
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
@@ -103,9 +103,4 @@ post-install-DOCS-on:
${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 <bsd.port.post.mk>
diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile
index 64903a4539e3..ae29efc44956 100644
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@@ -13,9 +13,9 @@ COMMENT= Weak signal for HF ham radio communication package
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 \
@@ -63,9 +63,4 @@ do-fetch:
.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 <bsd.port.post.mk>
diff --git a/converters/py-bencode.py/Makefile b/converters/py-bencode.py/Makefile
index c04554d307c0..daff2e18547c 100644
--- a/converters/py-bencode.py/Makefile
+++ b/converters/py-bencode.py/Makefile
@@ -15,8 +15,8 @@ LICENSE_NAME= BitTorrent Open Source License
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
diff --git a/converters/py-rencode/Makefile b/converters/py-rencode/Makefile
index 2472b98c1ce1..ddaafc7846db 100644
--- a/converters/py-rencode/Makefile
+++ b/converters/py-rencode/Makefile
@@ -11,9 +11,7 @@ COMMENT= R-encoding and r-decoding implementation
LICENSE= GPLv3
-BUILD_DEPENDS= cython:lang/cython
-
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils cython
USES= python
post-install:
diff --git a/converters/py-zfec/Makefile b/converters/py-zfec/Makefile
index 3eec1695371e..fc55ec28cd8e 100644
--- a/converters/py-zfec/Makefile
+++ b/converters/py-zfec/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= darcsver:devel/py-darcsver \
unsort:devel/py-pyutil
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/converters/zbase32/Makefile b/converters/zbase32/Makefile
index 4656dfeb1567..2990ae752f87 100644
--- a/converters/zbase32/Makefile
+++ b/converters/zbase32/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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 <bsd.port.mk>
diff --git a/databases/Makefile b/databases/Makefile
index fc3d86929ffd..2195d4216160 100644
--- a/databases/Makefile
+++ b/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
diff --git a/databases/buzhug/Makefile b/databases/buzhug/Makefile
index aca5b76bb22a..0d6c10cd42ff 100644
--- a/databases/buzhug/Makefile
+++ b/databases/buzhug/Makefile
@@ -10,6 +10,6 @@ MAINTAINER= culot@FreeBSD.org
COMMENT= Pure-Python database engine
USES= python zip
-USE_PYTHON= distutils
+USE_PYTHON= distutils autoplist concurrent optsuffix
.include <bsd.port.mk>
diff --git a/databases/buzhug/pkg-plist b/databases/buzhug/pkg-plist
deleted file mode 100644
index e1025225a1f8..000000000000
--- a/databases/buzhug/pkg-plist
+++ /dev/null
@@ -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
diff --git a/databases/emma/Makefile b/databases/emma/Makefile
index 3c8e2c3562c4..2fdae192f7b1 100644
--- a/databases/emma/Makefile
+++ b/databases/emma/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES= http://www.fastflo.de/files/emma/downloads/python_src/
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
diff --git a/databases/gadfly/Makefile b/databases/gadfly/Makefile
index e3b0ea07c6d5..a0cb37985ef5 100644
--- a/databases/gadfly/Makefile
+++ b/databases/gadfly/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
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
diff --git a/databases/grass7/Makefile b/databases/grass7/Makefile
index 775ae951d3d6..1389f77593b7 100644
--- a/databases/grass7/Makefile
+++ b/databases/grass7/Makefile
@@ -25,7 +25,7 @@ COMMENT= Open source Geographical Information System (GIS)
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_USES= pgsql
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 <bsd.port.options.mk>
diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile
index 29d2f58c3f36..660301301275 100644
--- a/databases/metakit/Makefile
+++ b/databases/metakit/Makefile
@@ -26,7 +26,7 @@ OPTIONS_DEFINE= PYTHON TCL DOCS
OPTIONS_DEFAULT= PYTHON
OPTIONS_SUB= yes
-PYTHON_USES= python
+PYTHON_USES= python:2.7
PYTHON_CONFIGURE_ON= --with-python=${LOCALBASE}
PYTHON_CATEGORIES= python
diff --git a/databases/monetdb/Makefile b/databases/monetdb/Makefile
index 170b43d1d9c1..b1f5d27dfdbd 100644
--- a/databases/monetdb/Makefile
+++ b/databases/monetdb/Makefile
@@ -177,7 +177,7 @@ PLIST_SUB+= PYTHON="@comment "
.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 @@ CONFIGURE_ARGS+= --without-python2
.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} \
diff --git a/databases/mtools-mongodb/Makefile b/databases/mtools-mongodb/Makefile
index 6e692c7f98fb..5935e7900f9b 100644
--- a/databases/mtools-mongodb/Makefile
+++ b/databases/mtools-mongodb/Makefile
@@ -13,9 +13,9 @@ COMMENT= Setup test environments; parse, filter and visualize MongoDB log files
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
diff --git a/databases/mydbf2mysql/Makefile b/databases/mydbf2mysql/Makefile
index 372211b3140e..736e7cedd800 100644
--- a/databases/mydbf2mysql/Makefile
+++ b/databases/mydbf2mysql/Makefile
@@ -11,10 +11,10 @@ DISTNAME= MyDBF2MySQL-${PORTVERSION}
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}/
diff --git a/databases/openark-kit/Makefile b/databases/openark-kit/Makefile
index c0746f1380f8..c399ab295ed8 100644
--- a/databases/openark-kit/Makefile
+++ b/databases/openark-kit/Makefile
@@ -11,10 +11,10 @@ COMMENT= Common utilities for MySQL
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 <bsd.port.mk>
diff --git a/databases/pg_activity/Makefile b/databases/pg_activity/Makefile
index cbfe506de07a..7c1aa6b8f437 100644
--- a/databases/pg_activity/Makefile
+++ b/databases/pg_activity/Makefile
@@ -11,8 +11,8 @@ COMMENT= Htop like application for PostgreSQL server activity monitoring
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 @@ USE_GITHUB= yes
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:
diff --git a/databases/pgbarman/Makefile b/databases/pgbarman/Makefile
index d4db9ee88881..89173c0e6c6b 100644
--- a/databases/pgbarman/Makefile
+++ b/databases/pgbarman/Makefile
@@ -15,10 +15,10 @@ COMMENT= Backup and recovery manager for PostgreSQL
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 @@ GROUPS= barman
USES= pgsql python
WANT_PGSQL= client
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils concurrent optsuffix
PORTDOCS= tutorial.pdf
diff --git a/databases/pgloader/Makefile b/databases/pgloader/Makefile
index 26fc37f7bf6c..477fea6b9e66 100644
--- a/databases/pgloader/Makefile
+++ b/databases/pgloader/Makefile
@@ -11,10 +11,10 @@ MAINTAINER= pea@raveland.org
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
diff --git a/databases/pgworksheet/Makefile b/databases/pgworksheet/Makefile
index f60d023d10ad..cfdb48e27a1f 100644
--- a/databases/pgworksheet/Makefile
+++ b/databases/pgworksheet/Makefile
@@ -12,7 +12,7 @@ COMMENT= Simple PostreSQL GUI front end
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
diff --git a/databases/powa-web/Makefile b/databases/powa-web/Makefile
index 54860210a645..51a73f131c15 100644
--- a/databases/powa-web/Makefile
+++ b/databases/powa-web/Makefile
@@ -12,9 +12,9 @@ COMMENT= PostgreSQL Workload Analyzer is a performance tool for PostgreSQL
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
diff --git a/databases/py-Elixir/Makefile b/databases/py-Elixir/Makefile
index c66959dd1492..7611e44af44c 100644
--- a/databases/py-Elixir/Makefile
+++ b/databases/py-Elixir/Makefile
@@ -14,7 +14,7 @@ COMMENT= Declarative Mapper for SQLAlchemy
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
diff --git a/databases/py-Pyrseas/Makefile b/databases/py-Pyrseas/Makefile
index 68e967d2c6b5..3bb94738df10 100644
--- a/databases/py-Pyrseas/Makefile
+++ b/databases/py-Pyrseas/Makefile
@@ -12,9 +12,9 @@ COMMENT= Framework and utilities to upgrade and maintain a relational database
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
diff --git a/databases/py-agate-sql/Makefile b/databases/py-agate-sql/Makefile
index 8382b886f5f2..05548cfd2014 100644
--- a/databases/py-agate-sql/Makefile
+++ b/databases/py-agate-sql/Makefile
@@ -11,8 +11,8 @@ COMMENT= Add SQL read/write support to agate
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
diff --git a/databases/py-alembic/Makefile b/databases/py-alembic/Makefile
index 6ce8a82b6ea7..01a0f0fdd717 100644
--- a/databases/py-alembic/Makefile
+++ b/databases/py-alembic/Makefile
@@ -11,8 +11,8 @@ COMMENT= Database migration tool for SQLAlchemy
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
diff --git a/databases/py-apsw/Makefile b/databases/py-apsw/Makefile
index cde444ebd889..c866b2086834 100644
--- a/databases/py-apsw/Makefile
+++ b/databases/py-apsw/Makefile
@@ -14,7 +14,7 @@ LICENSE= ZLIB
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
diff --git a/databases/py-bsddb/Makefile b/databases/py-bsddb/Makefile
index b7e69165c0ee..4dcd08594e16 100644
--- a/databases/py-bsddb/Makefile
+++ b/databases/py-bsddb/Makefile
@@ -17,7 +17,7 @@ LICENSE= PSFL
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 @@ PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload
MAKE_ENV= BSDDB_VERSION=${BDB_LIB_NAME}
-.include <bsd.port.pre.mk>
-
-.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 @@ post-patch:
's,^\(#include.*\)\(db\.h.*\)$$,\1${BDB_INCLUDE_DIR}/\2,' \
${WRKSRC}/bsddb.h
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index d416ef88faea..8770ae3e6e63 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python extension module for BerkeleyDB 3 and 4
LICENSE= BSD3CLAUSE
-USES?= bdb python
+USES= bdb python
USE_PYTHON= distutils autoplist
PYDISTUTILS_CONFIGUREARGS=--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE}
diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile
index c551932e2e97..880f62bb07e6 100644
--- a/databases/py-carbon/Makefile
+++ b/databases/py-carbon/Makefile
@@ -12,10 +12,10 @@ COMMENT= Backend storage application for graphite
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
diff --git a/databases/py-couchdb/Makefile b/databases/py-couchdb/Makefile
index 4f51393f2cc4..cf7e60bd878e 100644
--- a/databases/py-couchdb/Makefile
+++ b/databases/py-couchdb/Makefile
@@ -13,9 +13,9 @@ COMMENT= Simple Library to Allow Python Applications to Use CouchDB
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 <bsd.port.mk>
diff --git a/databases/py-couchdb/pkg-plist b/databases/py-couchdb/pkg-plist
deleted file mode 100644
index 82c1a60d98ce..000000000000
--- a/databases/py-couchdb/pkg-plist
+++ /dev/null
@@ -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
diff --git a/databases/py-cql/Makefile b/databases/py-cql/Makefile
index cf0bf4d5f8d3..68c22f5a931c 100644
--- a/databases/py-cql/Makefile
+++ b/databases/py-cql/Makefile
@@ -13,9 +13,9 @@ COMMENT= Python DB-API 2.0 client interface for Cassandra
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
diff --git a/databases/py-django-transaction-hooks/Makefile b/databases/py-django-transaction-hooks/Makefile
index 8056e965cbff..6748f7e330b3 100644
--- a/databases/py-django-transaction-hooks/Makefile
+++ b/databases/py-django-transaction-hooks/Makefile
@@ -13,7 +13,7 @@ COMMENT= Django database backends to register transaction-commit hooks
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
diff --git a/databases/py-fakeredis/Makefile b/databases/py-fakeredis/Makefile
index af1823cc50f1..e57ef3fe93ff 100644
--- a/databases/py-fakeredis/Makefile
+++ b/databases/py-fakeredis/Makefile
@@ -12,7 +12,7 @@ COMMENT= Fake version of databases/py-redis for unit testing
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
diff --git a/databases/py-flask-sqlalchemy/Makefile b/databases/py-flask-sqlalchemy/Makefile
index e0c7c50b47aa..64fbd15bcd62 100644
--- a/databases/py-flask-sqlalchemy/Makefile
+++ b/databases/py-flask-sqlalchemy/Makefile
@@ -13,8 +13,8 @@ COMMENT= Adds SQLAlchemy support to Flask
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
diff --git a/databases/py-forgetsql/Makefile b/databases/py-forgetsql/Makefile
index 873c5114cbcd..a70c7d5f3350 100644
--- a/databases/py-forgetsql/Makefile
+++ b/databases/py-forgetsql/Makefile
@@ -23,8 +23,8 @@ PORTDOCS= BUGS README TODO
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 <bsd.port.options.mk>
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index ae56c622ad06..bb71606b8f0e 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= libgdbm.so:databases/gdbm
PORTSCOUT= ignore:1
USES= python tar:xz
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist allflavors
PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHONPREFIX_LIBDIR}/lib-dynload
diff --git a/databases/py-geoalchemy/Makefile b/databases/py-geoalchemy/Makefile
index 14b663b45018..3c900e8adf50 100644
--- a/databases/py-geoalchemy/Makefile
+++ b/databases/py-geoalchemy/Makefile
@@ -14,7 +14,7 @@ COMMENT= Using SQLAlchemy with Spatial Databases
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
diff --git a/databases/py-geoalchemy2/Makefile b/databases/py-geoalchemy2/Makefile
index 55a621a5b190..76d70ec9ce62 100644
--- a/databases/py-geoalchemy2/Makefile
+++ b/databases/py-geoalchemy2/Makefile
@@ -13,7 +13,7 @@ COMMENT= Using SQLAlchemy with Spatial Databases
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
diff --git a/databases/py-htsql-mysql/Makefile b/databases/py-htsql-mysql/Makefile
index f505105cef74..0cf5a3875a27 100644
--- a/databases/py-htsql-mysql/Makefile
+++ b/databases/py-htsql-mysql/Makefile
@@ -14,8 +14,8 @@ COMMENT= Database Query Language (MySQL Backend for HTSQL)
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
diff --git a/databases/py-htsql-pgsql/Makefile b/databases/py-htsql-pgsql/Makefile
index 6fae021d9d7f..a00a7a854fcf 100644
--- a/databases/py-htsql-pgsql/Makefile
+++ b/databases/py-htsql-pgsql/Makefile
@@ -14,8 +14,8 @@ COMMENT= Database Query Language (PostgreSQL Backend for HTSQL)
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
diff --git a/databases/py-htsql/Makefile b/databases/py-htsql/Makefile
index 3845c27aaf82..6984eaeab009 100644
--- a/databases/py-htsql/Makefile
+++ b/databases/py-htsql/Makefile
@@ -17,7 +17,7 @@ LICENSE= AGPLv3
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 <bsd.port.mk>
diff --git a/databases/py-kyotocabinet/Makefile b/databases/py-kyotocabinet/Makefile
index e1ac258458ea..3263398f4806 100644
--- a/databases/py-kyotocabinet/Makefile
+++ b/databases/py-kyotocabinet/Makefile
@@ -18,6 +18,6 @@ LICENSE= GPLv3
LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet
USE_PYTHON= autoplist distutils
-USES= python:3
+USES= python:3.4+
.include <bsd.port.mk>
diff --git a/databases/py-lmdb/Makefile b/databases/py-lmdb/Makefile
index 98a040237e6b..0d0e694ce778 100644
--- a/databases/py-lmdb/Makefile
+++ b/databases/py-lmdb/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME= OpenLDAP Public LIcense
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
diff --git a/databases/py-motor/Makefile b/databases/py-motor/Makefile
index c60a23984d59..0eaf58f2a91e 100644
--- a/databases/py-motor/Makefile
+++ b/databases/py-motor/Makefile
@@ -12,7 +12,7 @@ COMMENT= Non-blocking MongoDB driver for Tornado or asyncio
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
diff --git a/databases/py-mycli/Makefile b/databases/py-mycli/Makefile
index 8cbb04203682..5f34c522e7f8 100644
--- a/databases/py-mycli/Makefile
+++ b/databases/py-mycli/Makefile
@@ -13,14 +13,14 @@ COMMENT= CLI for MySQL Database with auto-completion and syntax highlighting
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
diff --git a/databases/py-mysql2pgsql/Makefile b/databases/py-mysql2pgsql/Makefile
index d8c94ec2c92b..d18e7af9ba32 100644
--- a/databases/py-mysql2pgsql/Makefile
+++ b/databases/py-mysql2pgsql/Makefile
@@ -12,11 +12,11 @@ COMMENT= Tool for migrating/converting from MySQL to PostgreSQL
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
diff --git a/databases/py-mysqlclient/Makefile b/databases/py-mysqlclient/Makefile
index 8dfd6d1b12be..de64a67d3f80 100644
--- a/databases/py-mysqlclient/Makefile
+++ b/databases/py-mysqlclient/Makefile
@@ -11,7 +11,7 @@ COMMENT= MySQL database connector for Python
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
diff --git a/databases/py-oursql/Makefile b/databases/py-oursql/Makefile
index a3df6f632896..dc88fff6e9b9 100644
--- a/databases/py-oursql/Makefile
+++ b/databases/py-oursql/Makefile
@@ -12,7 +12,7 @@ COMMENT= MySQL bindings for python
LICENSE= BSD2CLAUSE
-USES= mysql python
+USES= mysql python:2.7
USE_PYTHON= autoplist distutils
post-install:
diff --git a/databases/py-peewee/Makefile b/databases/py-peewee/Makefile
index 727ad8887d9e..f807fa649632 100644
--- a/databases/py-peewee/Makefile
+++ b/databases/py-peewee/Makefile
@@ -20,8 +20,8 @@ NO_ARCH= yes
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 <bsd.port.mk>
diff --git a/databases/py-pg_pqueue/Makefile b/databases/py-pg_pqueue/Makefile
index 2dbb27db5177..0c07251aa165 100644
--- a/databases/py-pg_pqueue/Makefile
+++ b/databases/py-pg_pqueue/Makefile
@@ -14,7 +14,7 @@ COMMENT= PostgreSQL PQ Protocol Modules
LICENSE= BSD3CLAUSE
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS
diff --git a/databases/py-pgcli/Makefile b/databases/py-pgcli/Makefile
index 280627165eb4..b8f06e6f1e86 100644
--- a/databases/py-pgcli/Makefile
+++ b/databases/py-pgcli/Makefile
@@ -13,16 +13,16 @@ COMMENT= CLI for Postgres Database with auto-completion and syntax highlighting
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
diff --git a/databases/py-pgspecial/Makefile b/databases/py-pgspecial/Makefile
index 6975d5b7dad9..48ff8788547a 100644
--- a/databases/py-pgspecial/Makefile
+++ b/databases/py-pgspecial/Makefile
@@ -12,8 +12,8 @@ COMMENT= Meta-commands handler for Postgres Database
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
diff --git a/databases/py-pgxnclient/Makefile b/databases/py-pgxnclient/Makefile
index 74d0e332f2d4..2bc7ed84527d 100644
--- a/databases/py-pgxnclient/Makefile
+++ b/databases/py-pgxnclient/Makefile
@@ -11,6 +11,6 @@ MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Command line tool to interact with the PostgreSQL Extension Network
USES= python
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist concurrent optsuffix
.include <bsd.port.mk>
diff --git a/databases/py-pickledb/Makefile b/databases/py-pickledb/Makefile
index 5db420fbad12..328cfd6f95ea 100644
--- a/databases/py-pickledb/Makefile
+++ b/databases/py-pickledb/Makefile
@@ -12,7 +12,7 @@ COMMENT= Lightweight, fast, and simple key-value store
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
diff --git a/databases/py-pickleshare/Makefile b/databases/py-pickleshare/Makefile
index ac81051b32c8..fab0faaead7a 100644
--- a/databases/py-pickleshare/Makefile
+++ b/databases/py-pickleshare/Makefile
@@ -20,7 +20,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index 34a60609c899..e2b60a96e47a 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/doc/COPYING.LESSER
OPTIONS_DEFINE= DOCS EXAMPLES
USE_PYTHON= autoplist concurrent distutils
-USES?= pgsql python
+USES= pgsql python
PORTDOCS= AUTHORS INSTALL NEWS PKG-INFO README.rst
PORTEXAMPLES= *
diff --git a/databases/py-psycopg2cffi/Makefile b/databases/py-psycopg2cffi/Makefile
index 57df92c8e8a7..05758accdacb 100644
--- a/databases/py-psycopg2cffi/Makefile
+++ b/databases/py-psycopg2cffi/Makefile
@@ -12,8 +12,8 @@ COMMENT= Implementation of the psycopg2 module using cffi
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
diff --git a/databases/py-pyhs/Makefile b/databases/py-pyhs/Makefile
index 783b5f457770..e490a2fb9b0b 100644
--- a/databases/py-pyhs/Makefile
+++ b/databases/py-pyhs/Makefile
@@ -12,7 +12,7 @@ DISTNAME= python-handler-socket-${PORTVERSION}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= HandlerSocket client for Python
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/databases/py-pymssql/Makefile b/databases/py-pymssql/Makefile
index fcd36456c50d..1424b3350d48 100644
--- a/databases/py-pymssql/Makefile
+++ b/databases/py-pymssql/Makefile
@@ -12,12 +12,11 @@ COMMENT= Python database interface for MS-SQL. Version 2
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
diff --git a/databases/py-pytc/Makefile b/databases/py-pytc/Makefile
index 62abed9ca02c..a718fe52a88a 100644
--- a/databases/py-pytc/Makefile
+++ b/databases/py-pytc/Makefile
@@ -13,7 +13,7 @@ COMMENT= Tokyo Cabinet Python bindings
LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
diff --git a/databases/py-python-rrdtool/Makefile b/databases/py-python-rrdtool/Makefile
index 705f69020a87..14108225dda9 100644
--- a/databases/py-python-rrdtool/Makefile
+++ b/databases/py-python-rrdtool/Makefile
@@ -14,7 +14,7 @@ LICENSE= LGPL3
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
diff --git a/databases/py-python-swiftclient/Makefile b/databases/py-python-swiftclient/Makefile
index 412aa90a75d4..d72cc4bb55fc 100644
--- a/databases/py-python-swiftclient/Makefile
+++ b/databases/py-python-swiftclient/Makefile
@@ -12,14 +12,14 @@ COMMENT= Python client library for OpenStack Object Storage (Swift)
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:
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile
index 032ef33f63d5..62f12f40d634 100644
--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
USES= python pyqt:4
USE_PYQT= sip_build core_run gui_run
+USE_PYTHON= flavors
USE_QT4= corelib gui sql \
moc_build qmake_build
diff --git a/databases/py-qt5-sql/Makefile b/databases/py-qt5-sql/Makefile
index 61227f13d89c..8eb60c7e7f80 100644
--- a/databases/py-qt5-sql/Makefile
+++ b/databases/py-qt5-sql/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
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
diff --git a/databases/py-queries/Makefile b/databases/py-queries/Makefile
index f9bc2f64540e..d5819b8b0751 100644
--- a/databases/py-queries/Makefile
+++ b/databases/py-queries/Makefile
@@ -13,7 +13,7 @@ COMMENT= Simplified PostgreSQL client built upon Psycopg2
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
diff --git a/databases/py-rb/Makefile b/databases/py-rb/Makefile
index 0834824f269d..5c5641049eab 100644
--- a/databases/py-rb/Makefile
+++ b/databases/py-rb/Makefile
@@ -11,7 +11,7 @@ COMMENT= Rb - the redis blaster
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
diff --git a/databases/py-redis/Makefile b/databases/py-redis/Makefile
index 7f4eaca2112c..254dc4349fa7 100644
--- a/databases/py-redis/Makefile
+++ b/databases/py-redis/Makefile
@@ -18,7 +18,7 @@ OPTIONS_DEFINE= HIREDIS
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
diff --git a/databases/py-riak/Makefile b/databases/py-riak/Makefile
index 9bce28c94ed1..675eb6ea0fe9 100644
--- a/databases/py-riak/Makefile
+++ b/databases/py-riak/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python client for Riak
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
diff --git a/databases/py-sqlalchemy-migrate/Makefile b/databases/py-sqlalchemy-migrate/Makefile
index 750d07eee671..3f9c02767810 100644
--- a/databases/py-sqlalchemy-migrate/Makefile
+++ b/databases/py-sqlalchemy-migrate/Makefile
@@ -13,13 +13,13 @@ COMMENT= Database schema migrations for SQLAlchemy
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
diff --git a/databases/py-sqlalchemy10/Makefile b/databases/py-sqlalchemy10/Makefile
index 250739a5b934..1a43d12d0883 100644
--- a/databases/py-sqlalchemy10/Makefile
+++ b/databases/py-sqlalchemy10/Makefile
@@ -14,8 +14,8 @@ COMMENT= Python SQL toolkit and Object Relational Mapper 1.0.x
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 @@ OPTIONS_DEFAULT= SQLITE
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 @@ PORTEXAMPLES= *
.include <bsd.port.pre.mk>
.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:
diff --git a/databases/py-sqlalchemy11/Makefile b/databases/py-sqlalchemy11/Makefile
index cb978b4a3eec..e280e75eb947 100644
--- a/databases/py-sqlalchemy11/Makefile
+++ b/databases/py-sqlalchemy11/Makefile
@@ -14,9 +14,9 @@ COMMENT= Python SQL toolkit and Object Relational Mapper 1.1.x
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 @@ USES= python
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
diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile
index 23cf3fea9931..20b7a674d007 100644
--- a/databases/py-sqlite3/Makefile
+++ b/databases/py-sqlite3/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3
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
diff --git a/databases/py-sqlite3dbm/Makefile b/databases/py-sqlite3dbm/Makefile
index a26a2d5a2887..d78897d3afa4 100644
--- a/databases/py-sqlite3dbm/Makefile
+++ b/databases/py-sqlite3dbm/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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 <bsd.port.mk>
diff --git a/databases/py-sqlobject/Makefile b/databases/py-sqlobject/Makefile
index cd4292e85bff..19708f4a7f83 100644
--- a/databases/py-sqlobject/Makefile
+++ b/databases/py-sqlobject/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python object for manipulation with SQL table row
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 @@ SYBASE_DESC= sybase support
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}
diff --git a/databases/py-swift/Makefile b/databases/py-swift/Makefile
index cd53b119737e..044ef37af155 100644
--- a/databases/py-swift/Makefile
+++ b/databases/py-swift/Makefile
@@ -13,22 +13,22 @@ COMMENT= Highly available, distributed, eventually consistent object/blob store
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
diff --git a/databases/py-sybase/Makefile b/databases/py-sybase/Makefile
index 290c567c4bd7..b347e812f341 100644
--- a/databases/py-sybase/Makefile
+++ b/databases/py-sybase/Makefile
@@ -16,7 +16,7 @@ LICENSE= BSD3CLAUSE
LIB_DEPENDS= libct.so:databases/freetds
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS THREADS EXAMPLES
diff --git a/databases/py-unqlite/Makefile b/databases/py-unqlite/Makefile
index 5b0112e6c5ec..dcffb65383b2 100644
--- a/databases/py-unqlite/Makefile
+++ b/databases/py-unqlite/Makefile
@@ -11,9 +11,7 @@ COMMENT= Fast Python bindings for the UnQLite embedded NoSQL database
LICENSE= MIT
-BUILD_DEPENDS= cython>0:lang/cython
-
USES= python
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist cython
.include <bsd.port.mk>
diff --git a/databases/py-xapian/Makefile b/databases/py-xapian/Makefile
index cf97ce71202d..ed4220660053 100644
--- a/databases/py-xapian/Makefile
+++ b/databases/py-xapian/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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 @@ CONFIGURE_ARGS= --datarootdir=${DATADIR} --docdir=${DOCSDIR} \
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USES= libtool python tar:xz
+USE_PYTHON= flavors
PORTDOCS= *
diff --git a/databases/py3-apsw/Makefile b/databases/py3-apsw/Makefile
deleted file mode 100644
index cee12aa69a44..000000000000
--- a/databases/py3-apsw/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-USES= localbase python:3.3+ sqlite:3
-
-PORTSCOUT= ignore:1
-
-MASTERDIR= ${.CURDIR}/../py-apsw
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/py3-bsddb3/Makefile b/databases/py3-bsddb3/Makefile
deleted file mode 100644
index f49bbedd1766..000000000000
--- a/databases/py3-bsddb3/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-bsddb3
-
-USES= bdb python:3.2+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/py3-mysqlclient/Makefile b/databases/py3-mysqlclient/Makefile
deleted file mode 100644
index 0bc5e5f2d68d..000000000000
--- a/databases/py3-mysqlclient/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-mysqlclient
-
-USES= python:3.3+ mysql
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/py3-psycopg2/Makefile b/databases/py3-psycopg2/Makefile
deleted file mode 100644
index b443cc8ed1d6..000000000000
--- a/databases/py3-psycopg2/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-psycopg2
-
-PORTSCOUT= ignore:1
-
-USES= pgsql python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/py34-gdbm/Makefile b/databases/py34-gdbm/Makefile
deleted file mode 100644
index 22f120f834cf..000000000000
--- a/databases/py34-gdbm/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-gdbm
-
-PYTHON_VERSION= python3.4
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/py34-sqlite3/Makefile b/databases/py34-sqlite3/Makefile
deleted file mode 100644
index b755b044d8fa..000000000000
--- a/databases/py34-sqlite3/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-sqlite3
-
-PYTHON_VERSION= python3.4
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/py35-gdbm/Makefile b/databases/py35-gdbm/Makefile
deleted file mode 100644
index 9013fe6859bb..000000000000
--- a/databases/py35-gdbm/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-gdbm
-
-PYTHON_VERSION= python3.5
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/py35-sqlite3/Makefile b/databases/py35-sqlite3/Makefile
deleted file mode 100644
index 024e9246feb0..000000000000
--- a/databases/py35-sqlite3/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-sqlite3
-
-PYTHON_VERSION= python3.5
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/py36-gdbm/Makefile b/databases/py36-gdbm/Makefile
deleted file mode 100644
index e35968d1d0e8..000000000000
--- a/databases/py36-gdbm/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-gdbm
-
-PYTHON_VERSION= python3.6
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/py36-sqlite3/Makefile b/databases/py36-sqlite3/Makefile
deleted file mode 100644
index 81958275eb42..000000000000
--- a/databases/py36-sqlite3/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-sqlite3
-
-PYTHON_VERSION= python3.6
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/pydbx/Makefile b/databases/pydbx/Makefile
index 9628b927bf6a..2b508ed7daab 100644
--- a/databases/pydbx/Makefile
+++ b/databases/pydbx/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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 <bsd.port.mk>
diff --git a/databases/pydbx/pkg-plist b/databases/pydbx/pkg-plist
deleted file mode 100644
index 11b1253df199..000000000000
--- a/databases/pydbx/pkg-plist
+++ /dev/null
@@ -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
diff --git a/databases/pyspatialite/Makefile b/databases/pyspatialite/Makefile
index 0f05c6e8c304..d6596455526a 100644
--- a/databases/pyspatialite/Makefile
+++ b/databases/pyspatialite/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= libspatialite.so:databases/spatialite \
OPTIONS_DEFINE= DOCS
-USES= iconv python
+USES= iconv python:2.7
USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.pre.mk>
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index e4ae45de6cac..b2277bc8f8ed 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -52,6 +52,7 @@ PERL_CONFIGURE_ON= --enable-perl --enable-perl-site-install
PERL_USES= perl5
PYTHON_CONFIGURE_ENABLE=python
PYTHON_USES= python
+PYTHON_USE= python=flavors,optsuffix
RUBY_CONFIGURE_ENABLE= ruby
RUBY_USE= RUBY=yes
diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile
index 185f65cb7b86..3d32014552a8 100644
--- a/databases/rrdtool12/Makefile
+++ b/databases/rrdtool12/Makefile
@@ -29,7 +29,7 @@ OPTIONS_DEFAULT= PERL
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MPYTHON}
-USES+= python
+USES+= python:2.7
PLIST_SUB+= WITH_PYTHON=""
CONFIGURE_ARGS+= --enable-python
.else
diff --git a/databases/zodb3/Makefile b/databases/zodb3/Makefile
index 90958a9bf694..3a9d72cfbfd0 100644
--- a/databases/zodb3/Makefile
+++ b/databases/zodb3/Makefile
@@ -14,12 +14,12 @@ COMMENT= Z - Object Database for python
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
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 010f457cd579..0d169f3cf314 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -19,32 +19,32 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
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 \
diff --git a/deskutils/conduit/Makefile b/deskutils/conduit/Makefile
index 6a3560919b93..c4240ea32b6b 100644
--- a/deskutils/conduit/Makefile
+++ b/deskutils/conduit/Makefile
@@ -11,15 +11,15 @@ MASTER_SITES= GNOME
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
diff --git a/deskutils/conkyemail/Makefile b/deskutils/conkyemail/Makefile
index 683e5d2f6cc9..ab6afeb8e2cf 100644
--- a/deskutils/conkyemail/Makefile
+++ b/deskutils/conkyemail/Makefile
@@ -13,7 +13,7 @@ COMMENT= Email script for conky
RUN_DEPENDS= conky:sysutils/conky
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
NO_BUILD= yes
NO_ARCH= yes
diff --git a/deskutils/conkyforecast/Makefile b/deskutils/conkyforecast/Makefile
index 2deb5d8a862a..756bc01c0ced 100644
--- a/deskutils/conkyforecast/Makefile
+++ b/deskutils/conkyforecast/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= conky:sysutils/conky \
pidof:sysutils/pidof
USES= gettext python fonts
-USE_PYTHON= distutils
+USE_PYTHON= distutils concurrent optsuffix
SUB_FILES= pkg-message
WRKSRC= ${WRKDIR}/src
diff --git a/deskutils/dosage/Makefile b/deskutils/dosage/Makefile
index ddc6a0f94def..f75e39c1130f 100644
--- a/deskutils/dosage/Makefile
+++ b/deskutils/dosage/Makefile
@@ -11,10 +11,10 @@ COMMENT= Application to keep a local mirror of web comics
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
diff --git a/deskutils/everygui/Makefile b/deskutils/everygui/Makefile
index 16db836f42fa..cf7ae793790a 100644
--- a/deskutils/everygui/Makefile
+++ b/deskutils/everygui/Makefile
@@ -13,7 +13,7 @@ COMMENT= Dynamic GUI for an OS command
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
diff --git a/deskutils/gbirthday/Makefile b/deskutils/gbirthday/Makefile
index b6ee8056fda2..d6b0524fc540 100644
--- a/deskutils/gbirthday/Makefile
+++ b/deskutils/gbirthday/Makefile
@@ -18,11 +18,11 @@ GH_TAGNAME= 7b431aa
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
diff --git a/deskutils/gcalcli/Makefile b/deskutils/gcalcli/Makefile
index 0ed15a2b43b4..9b08bf9d2613 100644
--- a/deskutils/gcalcli/Makefile
+++ b/deskutils/gcalcli/Makefile
@@ -12,11 +12,11 @@ COMMENT= Google Calendar Command Line Interface
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 @@ ICS_VCAL_DESC= Enable importing of ics/vcal files
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
diff --git a/deskutils/gnome-sound-recorder/Makefile b/deskutils/gnome-sound-recorder/Makefile
index fb5ff254c3bf..f04f9171ef9a 100644
--- a/deskutils/gnome-sound-recorder/Makefile
+++ b/deskutils/gnome-sound-recorder/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= libgjs.so:lang/gjs
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
diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile
index f509b93f3cf4..e69e8b59ebb8 100644
--- a/deskutils/gourmet/Makefile
+++ b/deskutils/gourmet/Makefile
@@ -12,16 +12,16 @@ COMMENT= GNOME recipe manager
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
diff --git a/deskutils/griffith/Makefile b/deskutils/griffith/Makefile
index 662080ae931b..5ed8d5566b41 100644
--- a/deskutils/griffith/Makefile
+++ b/deskutils/griffith/Makefile
@@ -13,10 +13,10 @@ COMMENT= Lightweight film collection manager
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_DEFINE= CHARDET LXML
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
diff --git a/deskutils/gtg/Makefile b/deskutils/gtg/Makefile
index 5499d4d486f9..b68eea6367a9 100644
--- a/deskutils/gtg/Makefile
+++ b/deskutils/gtg/Makefile
@@ -10,9 +10,9 @@ COMMENT= GTD organizer for the GNOME desktop environment
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 @@ USE_PYTHON= distutils autoplist
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 <bsd.port.options.mk>
diff --git a/deskutils/py-bugwarrior/Makefile b/deskutils/py-bugwarrior/Makefile
index ead6d76e4479..e570f77833ea 100644
--- a/deskutils/py-bugwarrior/Makefile
+++ b/deskutils/py-bugwarrior/Makefile
@@ -13,36 +13,36 @@ COMMENT= Sync issue & bug tracking systems with taskwarrior
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
diff --git a/deskutils/py-khal/Makefile b/deskutils/py-khal/Makefile
index 2cbe1ca2bab0..1bb3d1664363 100644
--- a/deskutils/py-khal/Makefile
+++ b/deskutils/py-khal/Makefile
@@ -13,17 +13,17 @@ COMMENT= CalDAV-based calendar
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
diff --git a/deskutils/py-pycarddav/Makefile b/deskutils/py-pycarddav/Makefile
index 8d7d44696e77..44202c982e4a 100644
--- a/deskutils/py-pycarddav/Makefile
+++ b/deskutils/py-pycarddav/Makefile
@@ -13,14 +13,14 @@ COMMENT= CardDAV based address book tool
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 <bsd.port.mk>
diff --git a/deskutils/py-pystash/Makefile b/deskutils/py-pystash/Makefile
index 372449f9255a..2d3d10937f70 100644
--- a/deskutils/py-pystash/Makefile
+++ b/deskutils/py-pystash/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/deskutils/py-taskw/Makefile b/deskutils/py-taskw/Makefile
index 693499d165d7..1e83d446b56d 100644
--- a/deskutils/py-taskw/Makefile
+++ b/deskutils/py-taskw/Makefile
@@ -13,10 +13,10 @@ COMMENT= Python bindings for your taskwarrior database
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
diff --git a/deskutils/py-vdirsyncer/Makefile b/deskutils/py-vdirsyncer/Makefile
index 46325940213b..37e814dadfd6 100644
--- a/deskutils/py-vdirsyncer/Makefile
+++ b/deskutils/py-vdirsyncer/Makefile
@@ -12,15 +12,15 @@ COMMENT= Synchronize calendars and contacts
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
diff --git a/deskutils/py-vobject/Makefile b/deskutils/py-vobject/Makefile
index 913b0710ae21..02a3d739a44f 100644
--- a/deskutils/py-vobject/Makefile
+++ b/deskutils/py-vobject/Makefile
@@ -12,8 +12,8 @@ COMMENT= ICalendar library
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
diff --git a/deskutils/pybookreader/Makefile b/deskutils/pybookreader/Makefile
index 5bda3497151c..39c818d01f82 100644
--- a/deskutils/pybookreader/Makefile
+++ b/deskutils/pybookreader/Makefile
@@ -11,9 +11,9 @@ DISTNAME= PyBookReader-${PORTVERSION}
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
diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index 32b6005c64d2..d5340386b9e2 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -16,10 +16,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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
diff --git a/deskutils/rednotebook/Makefile b/deskutils/rednotebook/Makefile
index e005fc37deb1..4f4163c40d64 100644
--- a/deskutils/rednotebook/Makefile
+++ b/deskutils/rednotebook/Makefile
@@ -12,10 +12,10 @@ COMMENT= Modern journal written in Python
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
diff --git a/deskutils/syncthing-gtk/Makefile b/deskutils/syncthing-gtk/Makefile
index 388c7c8b17bf..28b7eb4b80a5 100644
--- a/deskutils/syncthing-gtk/Makefile
+++ b/deskutils/syncthing-gtk/Makefile
@@ -10,8 +10,8 @@ COMMENT= Python based GUI for Syncthing
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
diff --git a/deskutils/taskcoach/Makefile b/deskutils/taskcoach/Makefile
index 69f6f40b5218..1c8d4b8ebc95 100644
--- a/deskutils/taskcoach/Makefile
+++ b/deskutils/taskcoach/Makefile
@@ -13,10 +13,10 @@ COMMENT= Friendly task manager
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+
diff --git a/deskutils/tel/Makefile b/deskutils/tel/Makefile
index 109270f6739a..4ebbff6f63be 100644
--- a/deskutils/tel/Makefile
+++ b/deskutils/tel/Makefile
@@ -14,7 +14,7 @@ LICENSE= MIT
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
diff --git a/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile
index 313aa00de672..bc520021ac82 100644
--- a/deskutils/virt-manager/Makefile
+++ b/deskutils/virt-manager/Makefile
@@ -12,13 +12,13 @@ COMMENT= Toolkit to interact with virtualization capabilities
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 \
diff --git a/deskutils/vnc2flv/Makefile b/deskutils/vnc2flv/Makefile
index 50e956812c0b..2ccde73ce3cd 100644
--- a/deskutils/vnc2flv/Makefile
+++ b/deskutils/vnc2flv/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/deskutils/wammu/Makefile b/deskutils/wammu/Makefile
index 26d24dc372a9..afef29dc6358 100644
--- a/deskutils/wammu/Makefile
+++ b/deskutils/wammu/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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
diff --git a/deskutils/zim/Makefile b/deskutils/zim/Makefile
index 3a63ed50c70a..b0b50a2218d6 100644
--- a/deskutils/zim/Makefile
+++ b/deskutils/zim/Makefile
@@ -12,10 +12,10 @@ COMMENT= Desktop wiki editor
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
diff --git a/devel/Makefile b/devel/Makefile
index 30cf11013e24..5c53ce764ec6 100644
--- a/devel/Makefile
+++ b/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
diff --git a/devel/ahven/Makefile b/devel/ahven/Makefile
index b5bec4021172..7f310869534b 100644
--- a/devel/ahven/Makefile
+++ b/devel/ahven/Makefile
@@ -23,7 +23,7 @@ NO_OPTIONS_SORT= yes
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
diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile
index e5a2163485c3..5c3f1f5b0f60 100644
--- a/devel/android-tools-adb/Makefile
+++ b/devel/android-tools-adb/Makefile
@@ -65,7 +65,7 @@ TEST_ALL_TARGET= adb_test
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:
diff --git a/devel/antlr/Makefile b/devel/antlr/Makefile
index 725be932da24..72ab4d6026a4 100644
--- a/devel/antlr/Makefile
+++ b/devel/antlr/Makefile
@@ -34,7 +34,7 @@ PORTDOCS= ANTLRException.gif closure.gif cpp-runtime.html \
OPTIONS_DEFINE= PYTHON DOCS
OPTIONS_SUB= yes
-PYTHON_USES= python
+PYTHON_USES= python:2.7
PYTHON_PORTDOCS= python-runtime.html
post-extract:
diff --git a/devel/arpc/Makefile b/devel/arpc/Makefile
index d1722ff2d5ae..489a971e8771 100644
--- a/devel/arpc/Makefile
+++ b/devel/arpc/Makefile
@@ -12,13 +12,13 @@ COMMENT= GRPC-like RPC library that supports file descriptor passing
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
diff --git a/devel/awscli/Makefile b/devel/awscli/Makefile
index 51e24c60ca2d..285b4ad4686b 100644
--- a/devel/awscli/Makefile
+++ b/devel/awscli/Makefile
@@ -5,6 +5,7 @@ PORTNAME= awscli
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 @@ COMMENT= Universal Command Line Interface for Amazon Web Services
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 <bsd.port.mk>
diff --git a/devel/b2/Makefile b/devel/b2/Makefile
index 59200e0b696f..c322998550be 100644
--- a/devel/b2/Makefile
+++ b/devel/b2/Makefile
@@ -12,15 +12,15 @@ COMMENT= Command Line Interface for Backblaze's B2 storage service
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
diff --git a/devel/bbfreeze/Makefile b/devel/bbfreeze/Makefile
index 97e41a621b21..2098e4e34c78 100644
--- a/devel/bbfreeze/Makefile
+++ b/devel/bbfreeze/Makefile
@@ -12,7 +12,7 @@ COMMENT= Module to create standalone executables from Python scripts
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
diff --git a/devel/bicyclerepair/Makefile b/devel/bicyclerepair/Makefile
index 40485a9b7628..91f678d12e96 100644
--- a/devel/bicyclerepair/Makefile
+++ b/devel/bicyclerepair/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX}
MAINTAINER= mwm@mired.org
COMMENT= Python refactoring tool
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS
diff --git a/devel/bpython/Makefile b/devel/bpython/Makefile
index 49a46c00e553..e3cb1cdd28bb 100644
--- a/devel/bpython/Makefile
+++ b/devel/bpython/Makefile
@@ -14,12 +14,12 @@ COMMENT= Fancy interface to the Python interpreter
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
diff --git a/devel/bzr-builder/Makefile b/devel/bzr-builder/Makefile
index f2fa26d9fe84..5b2c61ee2881 100644
--- a/devel/bzr-builder/Makefile
+++ b/devel/bzr-builder/Makefile
@@ -16,7 +16,7 @@ LICENSE= GPLv3
BUILD_DEPENDS= bzr:devel/bzr
RUN_DEPENDS= bzr:devel/bzr
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-colo/Makefile b/devel/bzr-colo/Makefile
index 3356d80eb8f7..16e59c91a299 100644
--- a/devel/bzr-colo/Makefile
+++ b/devel/bzr-colo/Makefile
@@ -16,7 +16,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= bzr:devel/bzr
RUN_DEPENDS= bzr:devel/bzr
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-explorer/Makefile b/devel/bzr-explorer/Makefile
index d50479faede2..ce63df98412c 100644
--- a/devel/bzr-explorer/Makefile
+++ b/devel/bzr-explorer/Makefile
@@ -13,10 +13,10 @@ COMMENT= Desktop application for using bzr
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 <bsd.port.mk>
diff --git a/devel/bzr-externals/Makefile b/devel/bzr-externals/Makefile
index 1ec19fe34216..8472856a5bc9 100644
--- a/devel/bzr-externals/Makefile
+++ b/devel/bzr-externals/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= bzr:devel/bzr
WRKSRC= ${WRKDIR}/externals
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-fastimport/Makefile b/devel/bzr-fastimport/Makefile
index 8a579ef98a5b..f0009e8bf9e9 100644
--- a/devel/bzr-fastimport/Makefile
+++ b/devel/bzr-fastimport/Makefile
@@ -14,9 +14,9 @@ LICENSE= GPLv2
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 <bsd.port.mk>
diff --git a/devel/bzr-git/Makefile b/devel/bzr-git/Makefile
index 26c49b575759..7f3d8267706a 100644
--- a/devel/bzr-git/Makefile
+++ b/devel/bzr-git/Makefile
@@ -15,10 +15,10 @@ LICENSE= GPLv2
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 <bsd.port.mk>
diff --git a/devel/bzr-gtk/Makefile b/devel/bzr-gtk/Makefile
index 11ed4347dd43..ef0dcf23fa8d 100644
--- a/devel/bzr-gtk/Makefile
+++ b/devel/bzr-gtk/Makefile
@@ -15,10 +15,10 @@ LICENSE= GPLv2
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
diff --git a/devel/bzr-loom/Makefile b/devel/bzr-loom/Makefile
index d4b6194828df..0c989e603671 100644
--- a/devel/bzr-loom/Makefile
+++ b/devel/bzr-loom/Makefile
@@ -16,7 +16,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= bzr:devel/bzr
RUN_DEPENDS= bzr:devel/bzr
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-pipeline/Makefile b/devel/bzr-pipeline/Makefile
index 0689cf5776a4..ed9186742521 100644
--- a/devel/bzr-pipeline/Makefile
+++ b/devel/bzr-pipeline/Makefile
@@ -16,7 +16,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= bzr:devel/bzr
RUN_DEPENDS= bzr:devel/bzr
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/devel/bzr-rewrite/Makefile b/devel/bzr-rewrite/Makefile
index 1063f284ad33..3214d09348d7 100644
--- a/devel/bzr-rewrite/Makefile
+++ b/devel/bzr-rewrite/Makefile
@@ -15,7 +15,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= bzr:devel/bzr
RUN_DEPENDS= bzr:devel/bzr
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-scmproj/Makefile b/devel/bzr-scmproj/Makefile
index e39fb794a351..efd4c6417264 100644
--- a/devel/bzr-scmproj/Makefile
+++ b/devel/bzr-scmproj/Makefile
@@ -16,7 +16,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= bzr:devel/bzr
RUN_DEPENDS= bzr:devel/bzr
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-stats/Makefile b/devel/bzr-stats/Makefile
index 4a424f041090..d96202b4bbb0 100644
--- a/devel/bzr-stats/Makefile
+++ b/devel/bzr-stats/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= bzr:devel/bzr
LICENSE= GPLv2
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-svn/Makefile b/devel/bzr-svn/Makefile
index 547a750edc55..9d47504a49a1 100644
--- a/devel/bzr-svn/Makefile
+++ b/devel/bzr-svn/Makefile
@@ -14,10 +14,10 @@ COMMENT= Plugin for bzr to work with svn
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 <bsd.port.mk>
diff --git a/devel/bzr-upload/Makefile b/devel/bzr-upload/Makefile
index f4502fd97a76..37ee98664329 100644
--- a/devel/bzr-upload/Makefile
+++ b/devel/bzr-upload/Makefile
@@ -16,7 +16,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= bzr:devel/bzr
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 8a413f248300..ca558a6aa6de 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -10,18 +10,15 @@ MASTER_SITES= CHEESESHOP
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
diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile
index 3d7204bdd518..b8ed98230fe9 100644
--- a/devel/bzrtools/Makefile
+++ b/devel/bzrtools/Makefile
@@ -19,7 +19,7 @@ GRAPHVIZ_DESC= graphviz for graph-ancestry
RSYNC_DESC= rsync for rspush
WRKSRC= ${WRKDIR}/bzrtools
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= BzrTools
diff --git a/devel/codeville/Makefile b/devel/codeville/Makefile
index 2f840fb67178..1e1b80affb83 100644
--- a/devel/codeville/Makefile
+++ b/devel/codeville/Makefile
@@ -12,7 +12,7 @@ COMMENT= Anarchic control version system without unnecessary re-merges
LICENSE= BSD3CLAUSE
NO_ARCH= yes
-USES= python tar:xz
+USES= python:2.7 tar:xz
USE_PYTHON= distutils autoplist
PORTDOCS= LICENSE.txt
diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 1745b477f9df..80150a1fbb57 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -47,7 +47,7 @@ TEST_CMAKE_BOOL= BUILD_TESTS
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
diff --git a/devel/cram/Makefile b/devel/cram/Makefile
index 573ba98547b2..28638258d729 100644
--- a/devel/cram/Makefile
+++ b/devel/cram/Makefile
@@ -13,10 +13,10 @@ COMMENT= Simple testing framework for command line applications
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
diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile
index 07db9ef7838b..3302eabe19fe 100644
--- a/devel/cvs2svn/Makefile
+++ b/devel/cvs2svn/Makefile
@@ -14,8 +14,8 @@ PATCH_SITES= LOCAL/ohauer
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 @@ SUBVERSION_DESC= Build with subversion support
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
diff --git a/devel/cx_Freeze/Makefile b/devel/cx_Freeze/Makefile
index 0672d5e3cb80..903e205fa060 100644
--- a/devel/cx_Freeze/Makefile
+++ b/devel/cx_Freeze/Makefile
@@ -10,7 +10,7 @@ MAINTAINER= araujo@FreeBSD.org
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 <bsd.port.mk>
diff --git a/devel/dissy/Makefile b/devel/dissy/Makefile
index ca8865145dff..0c282e4e50ce 100644
--- a/devel/dissy/Makefile
+++ b/devel/dissy/Makefile
@@ -12,8 +12,8 @@ COMMENT= Graphical frontend to the objdump disassembler
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
diff --git a/devel/ditrack/Makefile b/devel/ditrack/Makefile
index a8ae662d9f99..e30895afa814 100644
--- a/devel/ditrack/Makefile
+++ b/devel/ditrack/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
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
diff --git a/devel/drpython/Makefile b/devel/drpython/Makefile
index fa362256d705..2b06d6581aaf 100644
--- a/devel/drpython/Makefile
+++ b/devel/drpython/Makefile
@@ -17,13 +17,13 @@ LICENSE= GPLv2
# 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
diff --git a/devel/eblob/Makefile b/devel/eblob/Makefile
index 016cd97c096a..58727866c4db 100644
--- a/devel/eblob/Makefile
+++ b/devel/eblob/Makefile
@@ -34,7 +34,7 @@ CMAKE_ARGS+= -DWITH_ASSERTS=OFF
.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
diff --git a/devel/epydoc/Makefile b/devel/epydoc/Makefile
index 9fde3f55e2a3..1076e9513a87 100644
--- a/devel/epydoc/Makefile
+++ b/devel/epydoc/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python API documentation generation tool
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS UTF8
diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile
index 0000f896eff2..c0384383a283 100644
--- a/devel/eric6/Makefile
+++ b/devel/eric6/Makefile
@@ -5,15 +5,15 @@ PORTREVISION= 1
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_DESC= Python bindings for Qt4
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=
diff --git a/devel/eric6/Makefile.inc b/devel/eric6/Makefile.inc
index 4908bdb1d159..2435999b4c04 100644
--- a/devel/eric6/Makefile.inc
+++ b/devel/eric6/Makefile.inc
@@ -22,7 +22,7 @@ I18N_LANG?= ru
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
diff --git a/devel/euca2ools/Makefile b/devel/euca2ools/Makefile
index 40e59d4472a8..ae058108c675 100644
--- a/devel/euca2ools/Makefile
+++ b/devel/euca2ools/Makefile
@@ -13,11 +13,11 @@ COMMENT= Eucalyptus Command Line Tools
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
diff --git a/devel/fb-adb/Makefile b/devel/fb-adb/Makefile
index 09c57b8f75ab..f0f554cc6bb5 100644
--- a/devel/fb-adb/Makefile
+++ b/devel/fb-adb/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS= adb:devel/android-tools-adb
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
diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index 621e5a11e435..edd7ba90fbd9 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME}%20${PORTVERSION}
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
diff --git a/devel/gazpacho/Makefile b/devel/gazpacho/Makefile
index d999228f9107..4ef0c4e321c7 100644
--- a/devel/gazpacho/Makefile
+++ b/devel/gazpacho/Makefile
@@ -13,10 +13,10 @@ COMMENT= GUI builder for the GTK+ toolkit
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
diff --git a/devel/git-cola/Makefile b/devel/git-cola/Makefile
index c6dd5dd61f34..d3cf4e566376 100644
--- a/devel/git-cola/Makefile
+++ b/devel/git-cola/Makefile
@@ -11,8 +11,8 @@ COMMENT= Sleek and powerful Git GUI
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
diff --git a/devel/git-cvs/Makefile b/devel/git-cvs/Makefile
index 455ce8cc4fc5..9f1d217bf711 100644
--- a/devel/git-cvs/Makefile
+++ b/devel/git-cvs/Makefile
@@ -9,9 +9,9 @@ CATEGORIES= devel python
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
diff --git a/devel/git-review/Makefile b/devel/git-review/Makefile
index b818f1ae3e61..a051ee58b59b 100644
--- a/devel/git-review/Makefile
+++ b/devel/git-review/Makefile
@@ -11,12 +11,12 @@ COMMENT= Allow to push code to review and interact with a Gerrit server
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
diff --git a/devel/gitinspector/Makefile b/devel/gitinspector/Makefile
index afc12255a4b2..b24d1e4c67f5 100644
--- a/devel/gitinspector/Makefile
+++ b/devel/gitinspector/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= git:devel/git
NO_ARCH= yes
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils concurrent optsuffix
USES= python
GH_ACCOUNT= ejwa
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 05b6173023ad..bc45a2159852 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -39,7 +39,7 @@ OPTIONS_SUB= yes
OPTIONS_DEFINE= PYTHON
OPTIONS_DEFAULT=PYTHON
PYTHON_CONFIGURE_ENABLE= python
-PYTHON_USES= python:3
+PYTHON_USES= python:3.4+
PYTHON_USE= GNOME=py3gobject3
.include <bsd.port.mk>
diff --git a/devel/gnatpython/Makefile b/devel/gnatpython/Makefile
index 570161ce4e92..d9750131937e 100644
--- a/devel/gnatpython/Makefile
+++ b/devel/gnatpython/Makefile
@@ -13,7 +13,7 @@ LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING3
SNAPSHOT= 20140224
-USES= python tar:bzip2
+USES= python:2.7 tar:bzip2
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/gnome-builder/Makefile b/devel/gnome-builder/Makefile
index 615e535fa2e8..8e5fe44f23df 100644
--- a/devel/gnome-builder/Makefile
+++ b/devel/gnome-builder/Makefile
@@ -25,10 +25,11 @@ LIB_DEPENDS= libgit2-glib-1.0.so:devel/libgit2-glib \
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
diff --git a/devel/hgview/Makefile b/devel/hgview/Makefile
index 26a7c65c79f8..4b359dc9954e 100644
--- a/devel/hgview/Makefile
+++ b/devel/hgview/Makefile
@@ -13,10 +13,10 @@ COMMENT= Fast Mercurial log navigator written in pyqt4
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
diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile
index 26d506d1e226..a14177912acd 100644
--- a/devel/ipython/Makefile
+++ b/devel/ipython/Makefile
@@ -14,14 +14,14 @@ COMMENT= Enhanced Interactive Python shell
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 @@ PORTEXAMPLES= *
.include <bsd.port.pre.mk>
.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:
diff --git a/devel/libftdi/Makefile b/devel/libftdi/Makefile
index bfd3668f3756..33184b56a035 100644
--- a/devel/libftdi/Makefile
+++ b/devel/libftdi/Makefile
@@ -30,7 +30,7 @@ BOOST_CXXFLAGS= -I${LOCALBASE}/include
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
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 5d00b03d0bc8..0afff08b014e 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -36,18 +36,23 @@ INSTALL_TARGET= install-strip
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..
diff --git a/devel/libsigrokdecode/Makefile b/devel/libsigrokdecode/Makefile
index 473ed93e580f..197972088628 100644
--- a/devel/libsigrokdecode/Makefile
+++ b/devel/libsigrokdecode/Makefile
@@ -12,7 +12,7 @@ COMMENT= Framework for hardware logic analyzers, protocol decoders library
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
diff --git a/devel/meson/Makefile b/devel/meson/Makefile
index f40475de46fb..1d6c0c44b88a 100644
--- a/devel/meson/Makefile
+++ b/devel/meson/Makefile
@@ -15,6 +15,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ninja:devel/ninja
USES= python:3.4+
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils noflavors
.include <bsd.port.mk>
diff --git a/devel/nuitka/Makefile b/devel/nuitka/Makefile
index d9b1b03b764e..153df504c44b 100644
--- a/devel/nuitka/Makefile
+++ b/devel/nuitka/Makefile
@@ -14,6 +14,6 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USES= python tar:bzip2
-USE_PYTHON= autoplist concurrent distutils
+USE_PYTHON= autoplist concurrent distutils optsuffix
.include <bsd.port.mk>
diff --git a/devel/osc/Makefile b/devel/osc/Makefile
index 3d0552f60547..48404c4b4b6f 100644
--- a/devel/osc/Makefile
+++ b/devel/osc/Makefile
@@ -11,9 +11,9 @@ COMMENT= Command Line Interface to work with an openSUSE Build Service
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 @@ GH_ACCOUNT= openSUSE
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
diff --git a/devel/phpbt/Makefile b/devel/phpbt/Makefile
index febeed144f96..97c715dacc27 100644
--- a/devel/phpbt/Makefile
+++ b/devel/phpbt/Makefile
@@ -32,7 +32,7 @@ OPTIONS_DEFAULT=GNATS
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
diff --git a/devel/phpsh/Makefile b/devel/phpsh/Makefile
index 13232c760cfe..d097bf867c58 100644
--- a/devel/phpsh/Makefile
+++ b/devel/phpsh/Makefile
@@ -14,7 +14,7 @@ COMMENT= Interactive shell for PHP
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
diff --git a/devel/py-Acquisition/Makefile b/devel/py-Acquisition/Makefile
index 6e8d9a9b46cc..07fe38577648 100644
--- a/devel/py-Acquisition/Makefile
+++ b/devel/py-Acquisition/Makefile
@@ -13,10 +13,10 @@ COMMENT= Allows to obtain attributes from the containment hierarchy
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:
diff --git a/devel/py-AddOns/Makefile b/devel/py-AddOns/Makefile
index a569fe9908dd..7a4cf665fc05 100644
--- a/devel/py-AddOns/Makefile
+++ b/devel/py-AddOns/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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 <bsd.port.mk>
diff --git a/devel/py-Automat/Makefile b/devel/py-Automat/Makefile
index 9458242c6653..8f19592b3520 100644
--- a/devel/py-Automat/Makefile
+++ b/devel/py-Automat/Makefile
@@ -13,10 +13,10 @@ COMMENT= Finite-state machines in Python
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
diff --git a/devel/py-Breve/Makefile b/devel/py-Breve/Makefile
index fc25318e259e..6180231c6627 100644
--- a/devel/py-Breve/Makefile
+++ b/devel/py-Breve/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Python s-expression style template engine
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-BytecodeAssembler/Makefile b/devel/py-BytecodeAssembler/Makefile
index e441ffab6bb0..d7a3ecb8f750 100644
--- a/devel/py-BytecodeAssembler/Makefile
+++ b/devel/py-BytecodeAssembler/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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 <bsd.port.mk>
diff --git a/devel/py-DateTime/Makefile b/devel/py-DateTime/Makefile
index 9baac1697c9a..0a6dfa91bf77 100644
--- a/devel/py-DateTime/Makefile
+++ b/devel/py-DateTime/Makefile
@@ -14,10 +14,10 @@ COMMENT= Zope 2 DateTime data type
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 <bsd.port.mk>
diff --git a/devel/py-DocumentTemplate/Makefile b/devel/py-DocumentTemplate/Makefile
index bffa0c037783..0e07082d626f 100644
--- a/devel/py-DocumentTemplate/Makefile
+++ b/devel/py-DocumentTemplate/Makefile
@@ -13,15 +13,15 @@ COMMENT= Document Templating Markup Language (DTML)
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 <bsd.port.mk>
diff --git a/devel/py-Jinja2/Makefile b/devel/py-Jinja2/Makefile
index e5b2a77ae10e..6194285039c9 100644
--- a/devel/py-Jinja2/Makefile
+++ b/devel/py-Jinja2/Makefile
@@ -14,14 +14,17 @@ COMMENT?= Fast and easy to use stand-alone template engine
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_DEFINE?= BABEL EXAMPLES
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 @@ PY2TO3_ARGS= --fix=all --no-diffs --nobackups --verbose --write
.include <bsd.port.pre.mk>
.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}
diff --git a/devel/py-Missing/Makefile b/devel/py-Missing/Makefile
index 9d51acf777e0..2c7ae82d9b1f 100644
--- a/devel/py-Missing/Makefile
+++ b/devel/py-Missing/Makefile
@@ -13,9 +13,9 @@ COMMENT= Special Missing objects used in Zope2
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 <bsd.port.mk>
diff --git a/devel/py-MultiMapping/Makefile b/devel/py-MultiMapping/Makefile
index 82aaf4b9f0b9..13a5054009f2 100644
--- a/devel/py-MultiMapping/Makefile
+++ b/devel/py-MultiMapping/Makefile
@@ -13,9 +13,9 @@ COMMENT= Special MultiMapping objects used in Zope2
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 <bsd.port.mk>
diff --git a/devel/py-PEAK-Rules/Makefile b/devel/py-PEAK-Rules/Makefile
index d42bf85399fd..944684b25b84 100644
--- a/devel/py-PEAK-Rules/Makefile
+++ b/devel/py-PEAK-Rules/Makefile
@@ -12,12 +12,12 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.dev-r2686
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 <bsd.port.mk>
diff --git a/devel/py-Persistence/Makefile b/devel/py-Persistence/Makefile
index f2fd275177dc..bc32c0fba510 100644
--- a/devel/py-Persistence/Makefile
+++ b/devel/py-Persistence/Makefile
@@ -13,10 +13,10 @@ COMMENT= Persistent ExtensionClass
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 <bsd.port.mk>
diff --git a/devel/py-Products.ATContentTypes/Makefile b/devel/py-Products.ATContentTypes/Makefile
index dbb209ae9be0..f87af21dc6ac 100644
--- a/devel/py-Products.ATContentTypes/Makefile
+++ b/devel/py-Products.ATContentTypes/Makefile
@@ -12,34 +12,34 @@ COMMENT= Default Content Types for Plone
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 <bsd.port.mk>
diff --git a/devel/py-Products.ATReferenceBrowserWidget/Makefile b/devel/py-Products.ATReferenceBrowserWidget/Makefile
index 8947e40862f5..2c3af04082b7 100644
--- a/devel/py-Products.ATReferenceBrowserWidget/Makefile
+++ b/devel/py-Products.ATReferenceBrowserWidget/Makefile
@@ -13,10 +13,10 @@ COMMENT= Reference widget for Archetypes
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 <bsd.port.mk>
diff --git a/devel/py-Products.Archetypes/Makefile b/devel/py-Products.Archetypes/Makefile
index b9b0b1e3660a..9c12b2c9c357 100644
--- a/devel/py-Products.Archetypes/Makefile
+++ b/devel/py-Products.Archetypes/Makefile
@@ -12,45 +12,45 @@ COMMENT= Developers framework for rapidly implementing content types
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 <bsd.port.mk>
diff --git a/devel/py-Products.BTreeFolder2/Makefile b/devel/py-Products.BTreeFolder2/Makefile
index e4f445b29516..1e372c50c442 100644
--- a/devel/py-Products.BTreeFolder2/Makefile
+++ b/devel/py-Products.BTreeFolder2/Makefile
@@ -13,17 +13,17 @@ COMMENT= BTree based implementation for Zope 2's OFS
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 <bsd.port.mk>
diff --git a/devel/py-Products.CMFActionIcons/Makefile b/devel/py-Products.CMFActionIcons/Makefile
index 47ca85a6679e..ebbfbe089bc8 100644
--- a/devel/py-Products.CMFActionIcons/Makefile
+++ b/devel/py-Products.CMFActionIcons/Makefile
@@ -13,11 +13,11 @@ COMMENT= Action icons product for the Zope CMF
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 <bsd.port.mk>
diff --git a/devel/py-Products.CMFCalendar/Makefile b/devel/py-Products.CMFCalendar/Makefile
index a9f32672da7c..ffbca6eea8f6 100644
--- a/devel/py-Products.CMFCalendar/Makefile
+++ b/devel/py-Products.CMFCalendar/Makefile
@@ -13,11 +13,11 @@ COMMENT= Calendar product for the Zope Content Management Framework
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
diff --git a/devel/py-Products.CMFCore/Makefile b/devel/py-Products.CMFCore/Makefile
index 06debb96ab5d..bf8cbb57049c 100644
--- a/devel/py-Products.CMFCore/Makefile
+++ b/devel/py-Products.CMFCore/Makefile
@@ -13,11 +13,11 @@ COMMENT= Zope Content Management Framework core components
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
diff --git a/devel/py-Products.CMFDefault/Makefile b/devel/py-Products.CMFDefault/Makefile
index 56ac8aee440a..f83e5c365498 100644
--- a/devel/py-Products.CMFDefault/Makefile
+++ b/devel/py-Products.CMFDefault/Makefile
@@ -13,13 +13,13 @@ COMMENT= Default product for the Zope Content Management Framework
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 <bsd.port.mk>
diff --git a/devel/py-Products.CMFDiffTool/Makefile b/devel/py-Products.CMFDiffTool/Makefile
index 65552d5b9420..c51036e7509c 100644
--- a/devel/py-Products.CMFDiffTool/Makefile
+++ b/devel/py-Products.CMFDiffTool/Makefile
@@ -12,10 +12,10 @@ COMMENT= Diff tool for Plone
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
diff --git a/devel/py-Products.CMFDynamicViewFTI/Makefile b/devel/py-Products.CMFDynamicViewFTI/Makefile
index 339e30db0b2d..290c489df3ba 100644
--- a/devel/py-Products.CMFDynamicViewFTI/Makefile
+++ b/devel/py-Products.CMFDynamicViewFTI/Makefile
@@ -12,15 +12,15 @@ COMMENT= Product for dynamic views in CMF
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 <bsd.port.mk>
diff --git a/devel/py-Products.CMFEditions/Makefile b/devel/py-Products.CMFEditions/Makefile
index 1e40f53ce703..42930fb56a01 100644
--- a/devel/py-Products.CMFEditions/Makefile
+++ b/devel/py-Products.CMFEditions/Makefile
@@ -12,22 +12,22 @@ COMMENT= Versioning for Plone
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 <bsd.port.mk>
diff --git a/devel/py-Products.CMFFormController/Makefile b/devel/py-Products.CMFFormController/Makefile
index 1d310c8f3738..2d9474c08a36 100644
--- a/devel/py-Products.CMFFormController/Makefile
+++ b/devel/py-Products.CMFFormController/Makefile
@@ -12,13 +12,13 @@ COMMENT= Form validation mechanism for Zope CMF
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
diff --git a/devel/py-Products.CMFPlacefulWorkflow/Makefile b/devel/py-Products.CMFPlacefulWorkflow/Makefile
index fbcf0d05925b..1f1c970f82ae 100644
--- a/devel/py-Products.CMFPlacefulWorkflow/Makefile
+++ b/devel/py-Products.CMFPlacefulWorkflow/Makefile
@@ -12,14 +12,14 @@ COMMENT= Workflow policies for CMF and Plone
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 <bsd.port.mk>
diff --git a/devel/py-Products.CMFQuickInstallerTool/Makefile b/devel/py-Products.CMFQuickInstallerTool/Makefile
index 085c4a0d2039..1fd4c049995d 100644
--- a/devel/py-Products.CMFQuickInstallerTool/Makefile
+++ b/devel/py-Products.CMFQuickInstallerTool/Makefile
@@ -12,14 +12,14 @@ COMMENT= Facility for activation/deactivation of Zope CMF products
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
diff --git a/devel/py-Products.CMFTestCase/Makefile b/devel/py-Products.CMFTestCase/Makefile
index f981cdfb7136..3667e303482a 100644
--- a/devel/py-Products.CMFTestCase/Makefile
+++ b/devel/py-Products.CMFTestCase/Makefile
@@ -13,18 +13,18 @@ COMMENT= Integration testing framework for CMF
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 <bsd.port.mk>
diff --git a/devel/py-Products.CMFUid/Makefile b/devel/py-Products.CMFUid/Makefile
index c5e8b106832a..bde5b8a89ccb 100644
--- a/devel/py-Products.CMFUid/Makefile
+++ b/devel/py-Products.CMFUid/Makefile
@@ -13,11 +13,11 @@ COMMENT= Uid product for the Zope CMF
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 <bsd.port.mk>
diff --git a/devel/py-Products.DCWorkflow/Makefile b/devel/py-Products.DCWorkflow/Makefile
index c7d3259c7ad7..ba163656261e 100644
--- a/devel/py-Products.DCWorkflow/Makefile
+++ b/devel/py-Products.DCWorkflow/Makefile
@@ -13,11 +13,11 @@ COMMENT= DCWorkflow product for the Zope Content Management Framework
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 <bsd.port.mk>
diff --git a/devel/py-Products.ExtendedPathIndex/Makefile b/devel/py-Products.ExtendedPathIndex/Makefile
index 58c2c385cd84..9d5d8f205f05 100644
--- a/devel/py-Products.ExtendedPathIndex/Makefile
+++ b/devel/py-Products.ExtendedPathIndex/Makefile
@@ -13,11 +13,11 @@ COMMENT= Zope catalog index for paths
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 <bsd.port.mk>
diff --git a/devel/py-Products.ExternalMethod/Makefile b/devel/py-Products.ExternalMethod/Makefile
index fb573831a274..d3c183d43190 100644
--- a/devel/py-Products.ExternalMethod/Makefile
+++ b/devel/py-Products.ExternalMethod/Makefile
@@ -13,14 +13,14 @@ COMMENT= Support for external Python methods within a Zope 2 environment
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 <bsd.port.mk>
diff --git a/devel/py-Products.GenericSetup/Makefile b/devel/py-Products.GenericSetup/Makefile
index 5679df34e286..4f3a068f55bc 100644
--- a/devel/py-Products.GenericSetup/Makefile
+++ b/devel/py-Products.GenericSetup/Makefile
@@ -13,9 +13,9 @@ COMMENT= Read Zope configuration state from profile dirs / tarballs
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
diff --git a/devel/py-Products.LDAPMultiPlugins/Makefile b/devel/py-Products.LDAPMultiPlugins/Makefile
index 0a5433101240..fd1a2e7c8ea4 100644
--- a/devel/py-Products.LDAPMultiPlugins/Makefile
+++ b/devel/py-Products.LDAPMultiPlugins/Makefile
@@ -14,9 +14,9 @@ COMMENT= LDAP-backed plugins for the Zope2 PluggableAuthService
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
diff --git a/devel/py-Products.LDAPUserFolder/Makefile b/devel/py-Products.LDAPUserFolder/Makefile
index c0df817dad61..09803688c998 100644
--- a/devel/py-Products.LDAPUserFolder/Makefile
+++ b/devel/py-Products.LDAPUserFolder/Makefile
@@ -13,8 +13,8 @@ COMMENT= LDAP-enabled Zope 2 user folder
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
diff --git a/devel/py-Products.MIMETools/Makefile b/devel/py-Products.MIMETools/Makefile
index 59247a34460e..8749d86f816f 100644
--- a/devel/py-Products.MIMETools/Makefile
+++ b/devel/py-Products.MIMETools/Makefile
@@ -13,9 +13,9 @@ COMMENT= Provides the <!--#mime--> tag for DocumentTemplate
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 <bsd.port.mk>
diff --git a/devel/py-Products.Marshall/Makefile b/devel/py-Products.Marshall/Makefile
index 8d2a9c3ad756..cf941ee6c483 100644
--- a/devel/py-Products.Marshall/Makefile
+++ b/devel/py-Products.Marshall/Makefile
@@ -12,16 +12,16 @@ COMMENT= Configurable Marshallers for Archetypes
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
diff --git a/devel/py-Products.MimetypesRegistry/Makefile b/devel/py-Products.MimetypesRegistry/Makefile
index 1221e59f6f18..284b17b2943e 100644
--- a/devel/py-Products.MimetypesRegistry/Makefile
+++ b/devel/py-Products.MimetypesRegistry/Makefile
@@ -12,13 +12,13 @@ COMMENT= MIME type handling for Zope
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 <bsd.port.mk>
diff --git a/devel/py-Products.OFSP/Makefile b/devel/py-Products.OFSP/Makefile
index bc2b3acd3a35..5ea076876577 100644
--- a/devel/py-Products.OFSP/Makefile
+++ b/devel/py-Products.OFSP/Makefile
@@ -13,10 +13,10 @@ COMMENT= General Zope 2 help screens
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 <bsd.port.mk>
diff --git a/devel/py-Products.PasswordResetTool/Makefile b/devel/py-Products.PasswordResetTool/Makefile
index a863b7e9bf02..54b272bb398d 100644
--- a/devel/py-Products.PasswordResetTool/Makefile
+++ b/devel/py-Products.PasswordResetTool/Makefile
@@ -12,17 +12,17 @@ COMMENT= Password reset tool for Plone
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 <bsd.port.mk>
diff --git a/devel/py-Products.PlacelessTranslationService/Makefile b/devel/py-Products.PlacelessTranslationService/Makefile
index 93ea30c2d6ee..e6d842edabca 100644
--- a/devel/py-Products.PlacelessTranslationService/Makefile
+++ b/devel/py-Products.PlacelessTranslationService/Makefile
@@ -13,20 +13,20 @@ COMMENT= Internationalizing and localizing software for Zope 2
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
diff --git a/devel/py-Products.PloneTestCase/Makefile b/devel/py-Products.PloneTestCase/Makefile
index 8ea1f63b4845..a50025a7e23b 100644
--- a/devel/py-Products.PloneTestCase/Makefile
+++ b/devel/py-Products.PloneTestCase/Makefile
@@ -12,17 +12,17 @@ COMMENT= Integration testing framework for Plone
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 <bsd.port.mk>
diff --git a/devel/py-Products.PluginRegistry/Makefile b/devel/py-Products.PluginRegistry/Makefile
index 04317049c9ad..e978cda0ba27 100644
--- a/devel/py-Products.PluginRegistry/Makefile
+++ b/devel/py-Products.PluginRegistry/Makefile
@@ -14,7 +14,7 @@ COMMENT= Configure application plugins based on interfaces
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
diff --git a/devel/py-Products.PortalTransforms/Makefile b/devel/py-Products.PortalTransforms/Makefile
index cd673acf9663..3baa36080106 100644
--- a/devel/py-Products.PortalTransforms/Makefile
+++ b/devel/py-Products.PortalTransforms/Makefile
@@ -12,14 +12,14 @@ COMMENT= MIME based content transformations
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
diff --git a/devel/py-Products.PythonScripts/Makefile b/devel/py-Products.PythonScripts/Makefile
index d5e2bcb2beb4..649d89db4db1 100644
--- a/devel/py-Products.PythonScripts/Makefile
+++ b/devel/py-Products.PythonScripts/Makefile
@@ -13,14 +13,14 @@ COMMENT= Support for restricted execution of Python scripts in Zope 2
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 <bsd.port.mk>
diff --git a/devel/py-Products.ResourceRegistries/Makefile b/devel/py-Products.ResourceRegistries/Makefile
index acd7df838617..ec28009f1c49 100644
--- a/devel/py-Products.ResourceRegistries/Makefile
+++ b/devel/py-Products.ResourceRegistries/Makefile
@@ -12,15 +12,15 @@ COMMENT= Registry for managing CSS and JS
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
diff --git a/devel/py-Products.StandardCacheManagers/Makefile b/devel/py-Products.StandardCacheManagers/Makefile
index a7274859a593..a98f36650959 100644
--- a/devel/py-Products.StandardCacheManagers/Makefile
+++ b/devel/py-Products.StandardCacheManagers/Makefile
@@ -13,12 +13,12 @@ COMMENT= Cache managers for Zope 2
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 <bsd.port.mk>
diff --git a/devel/py-Products.ZCTextIndex/Makefile b/devel/py-Products.ZCTextIndex/Makefile
index 61ea803e2573..403eca357a63 100644
--- a/devel/py-Products.ZCTextIndex/Makefile
+++ b/devel/py-Products.ZCTextIndex/Makefile
@@ -12,15 +12,15 @@ COMMENT= Full text indexing for ZCatalog/Zope2
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 <bsd.port.mk>
diff --git a/devel/py-Products.ZCatalog/Makefile b/devel/py-Products.ZCatalog/Makefile
index 7d455d7585a4..4bf656c241f2 100644
--- a/devel/py-Products.ZCatalog/Makefile
+++ b/devel/py-Products.ZCatalog/Makefile
@@ -12,22 +12,22 @@ COMMENT= Zope2's indexing and search solution
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
diff --git a/devel/py-Products.ZSQLMethods/Makefile b/devel/py-Products.ZSQLMethods/Makefile
index e2768bb0ebe6..87af23ef4558 100644
--- a/devel/py-Products.ZSQLMethods/Makefile
+++ b/devel/py-Products.ZSQLMethods/Makefile
@@ -13,17 +13,17 @@ COMMENT= SQL method support for Zope 2
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 <bsd.port.mk>
diff --git a/devel/py-Products.ZopeVersionControl/Makefile b/devel/py-Products.ZopeVersionControl/Makefile
index 20caa22fc14b..2147f1b2a803 100644
--- a/devel/py-Products.ZopeVersionControl/Makefile
+++ b/devel/py-Products.ZopeVersionControl/Makefile
@@ -13,13 +13,13 @@ COMMENT= Zope Version Control
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 <bsd.port.mk>
diff --git a/devel/py-Products.statusmessages/Makefile b/devel/py-Products.statusmessages/Makefile
index 41f804640857..0f7adf2ae682 100644
--- a/devel/py-Products.statusmessages/Makefile
+++ b/devel/py-Products.statusmessages/Makefile
@@ -13,11 +13,11 @@ COMMENT= Handling of internationalized status messages for Zope
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 <bsd.port.mk>
diff --git a/devel/py-Products.validation/Makefile b/devel/py-Products.validation/Makefile
index c2e5eb9db1c6..bd6782d6e311 100644
--- a/devel/py-Products.validation/Makefile
+++ b/devel/py-Products.validation/Makefile
@@ -12,14 +12,14 @@ COMMENT= Data validation package for Archetypes
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 <bsd.port.mk>
diff --git a/devel/py-RPyC/Makefile b/devel/py-RPyC/Makefile
index 055fa8bfcec8..db01a469ca9d 100644
--- a/devel/py-RPyC/Makefile
+++ b/devel/py-RPyC/Makefile
@@ -16,10 +16,10 @@ LICENSE= MIT
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 <bsd.port.mk>
diff --git a/devel/py-Record/Makefile b/devel/py-Record/Makefile
index 1030b50a52ce..eaa073f0c08c 100644
--- a/devel/py-Record/Makefile
+++ b/devel/py-Record/Makefile
@@ -13,9 +13,9 @@ COMMENT= Special Record objects used in Zope2
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 <bsd.port.mk>
diff --git a/devel/py-SymbolType/Makefile b/devel/py-SymbolType/Makefile
index 66b4adf22570..ed5ae3c49397 100644
--- a/devel/py-SymbolType/Makefile
+++ b/devel/py-SymbolType/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wenheping@gmail.com
COMMENT= Simple Symbol Type for Python
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-ToscaWidgets/Makefile b/devel/py-ToscaWidgets/Makefile
index 927cd3992a74..53a7e653f911 100644
--- a/devel/py-ToscaWidgets/Makefile
+++ b/devel/py-ToscaWidgets/Makefile
@@ -13,9 +13,9 @@ COMMENT= Python framework for building reusable web components
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 <bsd.port.mk>
diff --git a/devel/py-XStatic-Angular-Bootstrap/Makefile b/devel/py-XStatic-Angular-Bootstrap/Makefile
index 5d976b4f2188..4f382fe547fe 100644
--- a/devel/py-XStatic-Angular-Bootstrap/Makefile
+++ b/devel/py-XStatic-Angular-Bootstrap/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-Angular-FileUpload/Makefile b/devel/py-XStatic-Angular-FileUpload/Makefile
index 7cd9591ce24f..da34f77c196c 100644
--- a/devel/py-XStatic-Angular-FileUpload/Makefile
+++ b/devel/py-XStatic-Angular-FileUpload/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-Angular-Gettext/Makefile b/devel/py-XStatic-Angular-Gettext/Makefile
index cd4002e669c7..5b9644623329 100644
--- a/devel/py-XStatic-Angular-Gettext/Makefile
+++ b/devel/py-XStatic-Angular-Gettext/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-Angular-Schema-Form/Makefile b/devel/py-XStatic-Angular-Schema-Form/Makefile
index 1b0cc7bb8e91..f0ccbd60e7e4 100644
--- a/devel/py-XStatic-Angular-Schema-Form/Makefile
+++ b/devel/py-XStatic-Angular-Schema-Form/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-Angular-lrdragndrop/Makefile b/devel/py-XStatic-Angular-lrdragndrop/Makefile
index ff67ccab144c..f249ad4f4074 100644
--- a/devel/py-XStatic-Angular-lrdragndrop/Makefile
+++ b/devel/py-XStatic-Angular-lrdragndrop/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-Angular/Makefile b/devel/py-XStatic-Angular/Makefile
index 20419eb00598..35a5eafd6c3c 100644
--- a/devel/py-XStatic-Angular/Makefile
+++ b/devel/py-XStatic-Angular/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-Bootstrap-Datepicker/Makefile b/devel/py-XStatic-Bootstrap-Datepicker/Makefile
index 564d3c377069..f2e6416b0511 100644
--- a/devel/py-XStatic-Bootstrap-Datepicker/Makefile
+++ b/devel/py-XStatic-Bootstrap-Datepicker/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-Bootstrap-SCSS/Makefile b/devel/py-XStatic-Bootstrap-SCSS/Makefile
index 6b2ab2dc3138..31b600c8cb89 100644
--- a/devel/py-XStatic-Bootstrap-SCSS/Makefile
+++ b/devel/py-XStatic-Bootstrap-SCSS/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-D3/Makefile b/devel/py-XStatic-D3/Makefile
index d75dcc0d9567..70fcced3a117 100644
--- a/devel/py-XStatic-D3/Makefile
+++ b/devel/py-XStatic-D3/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-Font-Awesome/Makefile b/devel/py-XStatic-Font-Awesome/Makefile
index b4d43d931d14..af238aa8d5d7 100644
--- a/devel/py-XStatic-Font-Awesome/Makefile
+++ b/devel/py-XStatic-Font-Awesome/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-Hogan/Makefile b/devel/py-XStatic-Hogan/Makefile
index 3656426dc2d9..5d67eac15c75 100644
--- a/devel/py-XStatic-Hogan/Makefile
+++ b/devel/py-XStatic-Hogan/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-JQuery-Migrate/Makefile b/devel/py-XStatic-JQuery-Migrate/Makefile
index 8cb2cb8ea88c..13223a68d99f 100644
--- a/devel/py-XStatic-JQuery-Migrate/Makefile
+++ b/devel/py-XStatic-JQuery-Migrate/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-JQuery.TableSorter/Makefile b/devel/py-XStatic-JQuery.TableSorter/Makefile
index 08c36dd9bf4f..499fda1b217a 100644
--- a/devel/py-XStatic-JQuery.TableSorter/Makefile
+++ b/devel/py-XStatic-JQuery.TableSorter/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-JQuery.quicksearch/Makefile b/devel/py-XStatic-JQuery.quicksearch/Makefile
index ea116f85cd7e..2f791e890e82 100644
--- a/devel/py-XStatic-JQuery.quicksearch/Makefile
+++ b/devel/py-XStatic-JQuery.quicksearch/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-JSEncrypt/Makefile b/devel/py-XStatic-JSEncrypt/Makefile
index aa2314438963..b5338019464b 100644
--- a/devel/py-XStatic-JSEncrypt/Makefile
+++ b/devel/py-XStatic-JSEncrypt/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-Jasmine/Makefile b/devel/py-XStatic-Jasmine/Makefile
index a4e7a01df43f..db22175838b1 100644
--- a/devel/py-XStatic-Jasmine/Makefile
+++ b/devel/py-XStatic-Jasmine/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-Rickshaw/Makefile b/devel/py-XStatic-Rickshaw/Makefile
index 5dd246c3967c..87cf77860e22 100644
--- a/devel/py-XStatic-Rickshaw/Makefile
+++ b/devel/py-XStatic-Rickshaw/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-Spin/Makefile b/devel/py-XStatic-Spin/Makefile
index 4d665b30e1c9..7eb8123861a9 100644
--- a/devel/py-XStatic-Spin/Makefile
+++ b/devel/py-XStatic-Spin/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-bootswatch/Makefile b/devel/py-XStatic-bootswatch/Makefile
index ab83b124b46d..30d1d0d1e5ad 100644
--- a/devel/py-XStatic-bootswatch/Makefile
+++ b/devel/py-XStatic-bootswatch/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-jQuery/Makefile b/devel/py-XStatic-jQuery/Makefile
index 8c7c30340a54..f90d7f2c7857 100644
--- a/devel/py-XStatic-jQuery/Makefile
+++ b/devel/py-XStatic-jQuery/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-jquery-ui/Makefile b/devel/py-XStatic-jquery-ui/Makefile
index b366e3742808..fc0ba3778833 100644
--- a/devel/py-XStatic-jquery-ui/Makefile
+++ b/devel/py-XStatic-jquery-ui/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-mdi/Makefile b/devel/py-XStatic-mdi/Makefile
index f6dea0a2e2cf..00c4cb1babad 100644
--- a/devel/py-XStatic-mdi/Makefile
+++ b/devel/py-XStatic-mdi/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-objectpath/Makefile b/devel/py-XStatic-objectpath/Makefile
index 22ee519be8ae..ec861b1d0c99 100644
--- a/devel/py-XStatic-objectpath/Makefile
+++ b/devel/py-XStatic-objectpath/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-roboto-fontface/Makefile b/devel/py-XStatic-roboto-fontface/Makefile
index db913b05f58b..2dfd3ebcec80 100644
--- a/devel/py-XStatic-roboto-fontface/Makefile
+++ b/devel/py-XStatic-roboto-fontface/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-smart-table/Makefile b/devel/py-XStatic-smart-table/Makefile
index eba5fff937dc..f54137c9d5f4 100644
--- a/devel/py-XStatic-smart-table/Makefile
+++ b/devel/py-XStatic-smart-table/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-term.js/Makefile b/devel/py-XStatic-term.js/Makefile
index 68a04f877b68..c2e946e7cd1f 100644
--- a/devel/py-XStatic-term.js/Makefile
+++ b/devel/py-XStatic-term.js/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-XStatic-tv4/Makefile b/devel/py-XStatic-tv4/Makefile
index e4cec40c0c3c..981f115f7ea1 100644
--- a/devel/py-XStatic-tv4/Makefile
+++ b/devel/py-XStatic-tv4/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-adb/Makefile b/devel/py-adb/Makefile
index 00922a4669a1..3be57282ce1e 100644
--- a/devel/py-adb/Makefile
+++ b/devel/py-adb/Makefile
@@ -12,8 +12,8 @@ COMMENT= Pure-python implementation of ADB and Fastboot protocols
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
diff --git a/devel/py-akismet/Makefile b/devel/py-akismet/Makefile
index 5f53f97db44a..574e2eda6be9 100644
--- a/devel/py-akismet/Makefile
+++ b/devel/py-akismet/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python interface to the Akismet API
LICENSE= BSD3CLAUSE
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= akismet
diff --git a/devel/py-aniso8601/Makefile b/devel/py-aniso8601/Makefile
index 0cff68eaff40..fea9a4ddfa82 100644
--- a/devel/py-aniso8601/Makefile
+++ b/devel/py-aniso8601/Makefile
@@ -12,7 +12,7 @@ COMMENT= Library for parsing ISO 8601 strings
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+
diff --git a/devel/py-anonfunc/Makefile b/devel/py-anonfunc/Makefile
index 1d51326d1b7d..4ba6ca4e8f7c 100644
--- a/devel/py-anonfunc/Makefile
+++ b/devel/py-anonfunc/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python module that provides easy anonymous function
LICENSE= BSD2CLAUSE
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
post-patch:
diff --git a/devel/py-apipkg/Makefile b/devel/py-apipkg/Makefile
index 90619cfb35ce..2ae3cabd7339 100644
--- a/devel/py-apipkg/Makefile
+++ b/devel/py-apipkg/Makefile
@@ -14,7 +14,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.mk>
diff --git a/devel/py-apptools/Makefile b/devel/py-apptools/Makefile
index 2c8a5861d1cf..76bf12b6f326 100644
--- a/devel/py-apptools/Makefile
+++ b/devel/py-apptools/Makefile
@@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
# 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
diff --git a/devel/py-apscheduler/Makefile b/devel/py-apscheduler/Makefile
index 990f0a758157..e2611943a197 100644
--- a/devel/py-apscheduler/Makefile
+++ b/devel/py-apscheduler/Makefile
@@ -13,12 +13,12 @@ COMMENT= In-process task scheduler with Cron-like capabilities
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 @@ TEST_ENV= ${MAKE_ENV} TZ=UTC
.include <bsd.port.pre.mk>
.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:
diff --git a/devel/py-archetypes.querywidget/Makefile b/devel/py-archetypes.querywidget/Makefile
index bf5d4406c545..4b716d785731 100644
--- a/devel/py-archetypes.querywidget/Makefile
+++ b/devel/py-archetypes.querywidget/Makefile
@@ -13,10 +13,10 @@ COMMENT= Widget for creating catalog queries
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 <bsd.port.mk>
diff --git a/devel/py-archetypes.referencebrowserwidget/Makefile b/devel/py-archetypes.referencebrowserwidget/Makefile
index 357dbfaea792..ce22858b0a10 100644
--- a/devel/py-archetypes.referencebrowserwidget/Makefile
+++ b/devel/py-archetypes.referencebrowserwidget/Makefile
@@ -12,11 +12,11 @@ COMMENT= Implementation of referencebrowser widget for Archetypes
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
diff --git a/devel/py-archetypes.schemaextender/Makefile b/devel/py-archetypes.schemaextender/Makefile
index e73987f1de30..18f426e6722e 100644
--- a/devel/py-archetypes.schemaextender/Makefile
+++ b/devel/py-archetypes.schemaextender/Makefile
@@ -13,9 +13,9 @@ COMMENT= Dynamically extend Archetypes schemas with named adapters
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 <bsd.port.mk>
diff --git a/devel/py-arrow/Makefile b/devel/py-arrow/Makefile
index 931185b22a6a..a7683c66e67f 100644
--- a/devel/py-arrow/Makefile
+++ b/devel/py-arrow/Makefile
@@ -13,7 +13,7 @@ COMMENT= Better dates and times for Python
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
diff --git a/devel/py-aspects/Makefile b/devel/py-aspects/Makefile
index b5f23f74331f..0cc481015a49 100644
--- a/devel/py-aspects/Makefile
+++ b/devel/py-aspects/Makefile
@@ -14,7 +14,7 @@ COMMENT= Lightweight aspect oriented programming library for Python
LICENSE= LGPL21
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
SUB_FILES= pkg-message
diff --git a/devel/py-astroid/Makefile b/devel/py-astroid/Makefile
index bd709c7853df..176d3d018f7a 100644
--- a/devel/py-astroid/Makefile
+++ b/devel/py-astroid/Makefile
@@ -12,9 +12,9 @@ COMMENT= abstract syntax tree for Python with inference support
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 @@ USES= python
.include <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
diff --git a/devel/py-asttokens/Makefile b/devel/py-asttokens/Makefile
index 1381f64e4cd4..df153461b43d 100644
--- a/devel/py-asttokens/Makefile
+++ b/devel/py-asttokens/Makefile
@@ -13,17 +13,17 @@ COMMENT= Annotate AST trees with source code positions
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 <bsd.port.pre.mk>
.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:
diff --git a/devel/py-atomiclong/Makefile b/devel/py-atomiclong/Makefile
index a8efacc4d813..3a5f13666c63 100644
--- a/devel/py-atomiclong/Makefile
+++ b/devel/py-atomiclong/Makefile
@@ -13,8 +13,8 @@ COMMENT= AtomicLong type using CFFI
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
diff --git a/devel/py-atpublic/Makefile b/devel/py-atpublic/Makefile
index 79d2e2e334f6..08166e7d6b07 100644
--- a/devel/py-atpublic/Makefile
+++ b/devel/py-atpublic/Makefile
@@ -11,7 +11,7 @@ COMMENT= Very simple decorator and function of module's all
LICENSE= APACHE20
-USES= python:3
+USES= python:3.3+
USE_PYTHON= autoplist distutils
MAKE_ENV= ATPUBLIC_BUILD_EXTENSION=1
diff --git a/devel/py-automaton/Makefile b/devel/py-automaton/Makefile
index 2c3e24a30ed2..7f7e26d5ef4d 100644
--- a/devel/py-automaton/Makefile
+++ b/devel/py-automaton/Makefile
@@ -12,10 +12,10 @@ COMMENT= Friendly state machines for python
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
diff --git a/devel/py-babel/Makefile b/devel/py-babel/Makefile
index e1eb992effb8..dd345df06862 100644
--- a/devel/py-babel/Makefile
+++ b/devel/py-babel/Makefile
@@ -1,18 +1,19 @@
-# Created by: Dryice Liu<dryice@dryice.name>
+# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
# $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 @@ PORTDOCS= docs/*
OPTIONS_DEFINE= DOCS
-post-install-DOCS-on:
+do-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
.for docfile in ${PORTDOCS}
${CP} -r ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/py-babel/distinfo b/devel/py-babel/distinfo
index 67bf3ea4e749..b39c1200320e 100644
--- a/devel/py-babel/distinfo
+++ b/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
diff --git a/devel/py-backports.functools_lru_cache/Makefile b/devel/py-backports.functools_lru_cache/Makefile
index 19d5c7f7374c..77a91bde9935 100644
--- a/devel/py-backports.functools_lru_cache/Makefile
+++ b/devel/py-backports.functools_lru_cache/Makefile
@@ -11,7 +11,7 @@ COMMENT= Backport of functools.lru_cache from Python 3.3
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
diff --git a/devel/py-backports.tempfile/Makefile b/devel/py-backports.tempfile/Makefile
index fb7e13d2d215..2d11b2bd441b 100644
--- a/devel/py-backports.tempfile/Makefile
+++ b/devel/py-backports.tempfile/Makefile
@@ -12,7 +12,7 @@ COMMENT= Backports of new features in the Python tempfile module
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
diff --git a/devel/py-backports.weakref/Makefile b/devel/py-backports.weakref/Makefile
index 52789a885ab8..4027a3364487 100644
--- a/devel/py-backports.weakref/Makefile
+++ b/devel/py-backports.weakref/Makefile
@@ -12,7 +12,7 @@ COMMENT= Backport of the weakref module from Python 3.4
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
diff --git a/devel/py-bandit/Makefile b/devel/py-bandit/Makefile
index fba07cb93494..80ccecc02521 100644
--- a/devel/py-bandit/Makefile
+++ b/devel/py-bandit/Makefile
@@ -13,10 +13,10 @@ COMMENT= Tool for finding common security issues in Python code
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}
diff --git a/devel/py-bcdoc/Makefile b/devel/py-bcdoc/Makefile
index 654dfcbd34ff..c987b1682637 100644
--- a/devel/py-bcdoc/Makefile
+++ b/devel/py-bcdoc/Makefile
@@ -12,8 +12,8 @@ COMMENT= Tools to help document botocore-based projects
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
diff --git a/devel/py-binplist/Makefile b/devel/py-binplist/Makefile
index 16d1ee9a68ef..0af92942628b 100644
--- a/devel/py-binplist/Makefile
+++ b/devel/py-binplist/Makefile
@@ -12,7 +12,7 @@ COMMENT= Binary plist parser
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
diff --git a/devel/py-biplist/Makefile b/devel/py-biplist/Makefile
index 97f1571e3605..4face8949f28 100644
--- a/devel/py-biplist/Makefile
+++ b/devel/py-biplist/Makefile
@@ -12,9 +12,9 @@ COMMENT= Library for reading/writing binary plists
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
diff --git a/devel/py-bison/Makefile b/devel/py-bison/Makefile
index 23ab3606e042..c1643dc2dcd6 100644
--- a/devel/py-bison/Makefile
+++ b/devel/py-bison/Makefile
@@ -15,11 +15,11 @@ COMMENT= Python-based parsing at the speed of C
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}
diff --git a/devel/py-blinker/Makefile b/devel/py-blinker/Makefile
index 06018cef5784..44631041ce8a 100644
--- a/devel/py-blinker/Makefile
+++ b/devel/py-blinker/Makefile
@@ -13,7 +13,7 @@ COMMENT= Fast, simple object-to-object and broadcast signaling
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
diff --git a/devel/py-bluelet/Makefile b/devel/py-bluelet/Makefile
index 7bca1d262a11..65011135f4a5 100644
--- a/devel/py-bluelet/Makefile
+++ b/devel/py-bluelet/Makefile
@@ -13,10 +13,6 @@ COMMENT= Pure-Python asynchronous I/O using coroutines
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 <bsd.port.mk>
diff --git a/devel/py-botocore/Makefile b/devel/py-botocore/Makefile
index 1a172db12b21..718ebe3d074d 100644
--- a/devel/py-botocore/Makefile
+++ b/devel/py-botocore/Makefile
@@ -13,9 +13,9 @@ COMMENT= Low-level, core functionality of boto 3
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
diff --git a/devel/py-bsd/Makefile b/devel/py-bsd/Makefile
index 22996ff25044..79f9a2e3d0ce 100644
--- a/devel/py-bsd/Makefile
+++ b/devel/py-bsd/Makefile
@@ -10,12 +10,11 @@ COMMENT= Python wrappers for various BSD libc and system calls
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 @@ GH_TAGNAME= 6d148fa
.include <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
diff --git a/devel/py-buildbot-console-view/Makefile b/devel/py-buildbot-console-view/Makefile
index ac550bc3e582..3f33fa004b12 100644
--- a/devel/py-buildbot-console-view/Makefile
+++ b/devel/py-buildbot-console-view/Makefile
@@ -13,8 +13,8 @@ COMMENT= Continuous Integration Framework (Console View)
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
diff --git a/devel/py-buildbot-grid-view/Makefile b/devel/py-buildbot-grid-view/Makefile
index c30489ae6d01..5016ad0d94d5 100644
--- a/devel/py-buildbot-grid-view/Makefile
+++ b/devel/py-buildbot-grid-view/Makefile
@@ -12,8 +12,8 @@ COMMENT= Continuous Integration Framework (Grid View)
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
diff --git a/devel/py-buildbot-waterfall-view/Makefile b/devel/py-buildbot-waterfall-view/Makefile
index 184490d373f6..ff29f944eeac 100644
--- a/devel/py-buildbot-waterfall-view/Makefile
+++ b/devel/py-buildbot-waterfall-view/Makefile
@@ -13,8 +13,8 @@ COMMENT= Continuous Integration Framework (Waterfall View)
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
diff --git a/devel/py-buildbot-worker/Makefile b/devel/py-buildbot-worker/Makefile
index 3cc65c1b6d95..c24c1bd6f2d6 100644
--- a/devel/py-buildbot-worker/Makefile
+++ b/devel/py-buildbot-worker/Makefile
@@ -14,10 +14,10 @@ COMMENT= Buildbot Worker Daemon
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
diff --git a/devel/py-buildbot-www/Makefile b/devel/py-buildbot-www/Makefile
index 3b67cccd3ede..a9b0fd56ab96 100644
--- a/devel/py-buildbot-www/Makefile
+++ b/devel/py-buildbot-www/Makefile
@@ -13,13 +13,13 @@ COMMENT= Continuous Integration Framework (WWW)
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
diff --git a/devel/py-buildbot/Makefile b/devel/py-buildbot/Makefile
index 05d601b68e9f..eea299f4253a 100644
--- a/devel/py-buildbot/Makefile
+++ b/devel/py-buildbot/Makefile
@@ -14,22 +14,22 @@ COMMENT= Continuous Integration Framework
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
diff --git a/devel/py-canonicaljson/Makefile b/devel/py-canonicaljson/Makefile
index 0015d7f102f3..23f04978b6a5 100644
--- a/devel/py-canonicaljson/Makefile
+++ b/devel/py-canonicaljson/Makefile
@@ -14,9 +14,9 @@ COMMENT= Canonical JSON
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
diff --git a/devel/py-castellan/Makefile b/devel/py-castellan/Makefile
index 926dfed7c125..6fd9a13de8f5 100644
--- a/devel/py-castellan/Makefile
+++ b/devel/py-castellan/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-cclib/Makefile b/devel/py-cclib/Makefile
index 0263e4523fdc..ec6c2480aa89 100644
--- a/devel/py-cclib/Makefile
+++ b/devel/py-cclib/Makefile
@@ -5,6 +5,7 @@ PORTNAME= cclib
PORTVERSION= 1.5.1
DISTVERSIONPREFIX= v
CATEGORIES= devel python
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= robak@FreeBSD.org
COMMENT= Parsers And Algorithms For Computational Chemistry
diff --git a/devel/py-cdg/Makefile b/devel/py-cdg/Makefile
index 042b985d3df6..8f1e65bc7f82 100644
--- a/devel/py-cdg/Makefile
+++ b/devel/py-cdg/Makefile
@@ -12,7 +12,7 @@ COMMENT= Library for working with call- and data-flow graphs
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
diff --git a/devel/py-celery/Makefile b/devel/py-celery/Makefile
index 5a4b79c2624c..3341e47276ac 100644
--- a/devel/py-celery/Makefile
+++ b/devel/py-celery/Makefile
@@ -13,10 +13,10 @@ COMMENT= Asynchronous task queue/job queue
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
diff --git a/devel/py-cffi/Makefile b/devel/py-cffi/Makefile
index fb7a5d808def..d32241314158 100644
--- a/devel/py-cffi/Makefile
+++ b/devel/py-cffi/Makefile
@@ -14,11 +14,11 @@ LICENSE= MIT
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 <bsd.port.pre.mk>
diff --git a/devel/py-check-manifest/Makefile b/devel/py-check-manifest/Makefile
index 3f9902deeb3f..4427f3a405a0 100644
--- a/devel/py-check-manifest/Makefile
+++ b/devel/py-check-manifest/Makefile
@@ -13,7 +13,7 @@ COMMENT= Check MANIFEST.in in a Python source package for completeness
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
diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile
index 8a2e786fb079..be1836144f0e 100644
--- a/devel/py-cheetah/Makefile
+++ b/devel/py-cheetah/Makefile
@@ -12,7 +12,7 @@ DISTNAME= Cheetah-${DISTVERSION}
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
diff --git a/devel/py-ciphon/Makefile b/devel/py-ciphon/Makefile
index 06059cdc6fe3..ec96d05f84ca 100644
--- a/devel/py-ciphon/Makefile
+++ b/devel/py-ciphon/Makefile
@@ -12,7 +12,7 @@ COMMENT= Module for python that adds cpan-like functionality
LICENSE= BSD2CLAUSE
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
post-install:
diff --git a/devel/py-circuits/Makefile b/devel/py-circuits/Makefile
index def3502f72aa..69d75e3caf91 100644
--- a/devel/py-circuits/Makefile
+++ b/devel/py-circuits/Makefile
@@ -13,7 +13,7 @@ COMMENT= Asynchronous Component-based Event Application Framework
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
diff --git a/devel/py-cjson/Makefile b/devel/py-cjson/Makefile
index d897c5cdca82..3ecfec057a5f 100644
--- a/devel/py-cjson/Makefile
+++ b/devel/py-cjson/Makefile
@@ -13,7 +13,7 @@ COMMENT= Fast JSON encoder/decoder for Python
LICENSE= LGPL20
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
post-install:
diff --git a/devel/py-cld/Makefile b/devel/py-cld/Makefile
index f97493b4394e..846b544b95e7 100644
--- a/devel/py-cld/Makefile
+++ b/devel/py-cld/Makefile
@@ -17,6 +17,7 @@ LICENSE= BSD3CLAUSE
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 \
diff --git a/devel/py-cli-helpers/Makefile b/devel/py-cli-helpers/Makefile
index 8db4f4c76521..1a2d1ad9932d 100644
--- a/devel/py-cli-helpers/Makefile
+++ b/devel/py-cli-helpers/Makefile
@@ -14,9 +14,9 @@ COMMENT= Helpers for building command-line apps
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 @@ USES= python
.include <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
diff --git a/devel/py-cliapp/Makefile b/devel/py-cliapp/Makefile
index e77088b7d500..3f7328db58eb 100644
--- a/devel/py-cliapp/Makefile
+++ b/devel/py-cliapp/Makefile
@@ -12,8 +12,8 @@ COMMENT= Python framework for command line utilities
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
diff --git a/devel/py-click-log/Makefile b/devel/py-click-log/Makefile
index d687a072502e..376985de127c 100644
--- a/devel/py-click-log/Makefile
+++ b/devel/py-click-log/Makefile
@@ -12,11 +12,11 @@ COMMENT= Logging integration for Click
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
diff --git a/devel/py-click-plugins/Makefile b/devel/py-click-plugins/Makefile
index 53ca2ba3df21..c4c045171955 100644
--- a/devel/py-click-plugins/Makefile
+++ b/devel/py-click-plugins/Makefile
@@ -13,7 +13,7 @@ COMMENT= Click extension to register CLI commands via setuptools
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
diff --git a/devel/py-click-threading/Makefile b/devel/py-click-threading/Makefile
index 7d9969f30d12..e62e6ed620f7 100644
--- a/devel/py-click-threading/Makefile
+++ b/devel/py-click-threading/Makefile
@@ -12,21 +12,16 @@ COMMENT= Multithreaded Click apps made easy
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 <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-click/Makefile b/devel/py-click/Makefile
index db93d3d70ab3..c5df1d5a3aed 100644
--- a/devel/py-click/Makefile
+++ b/devel/py-click/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python package for creating command line interfaces
LICENSE= BSD3CLAUSE
-USES?= python
+USES= python
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/devel/py-cliff/Makefile b/devel/py-cliff/Makefile
index a224529bca06..e90a07dcb365 100644
--- a/devel/py-cliff/Makefile
+++ b/devel/py-cliff/Makefile
@@ -12,14 +12,14 @@ COMMENT= Command Line Interface Formulation Framework
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
diff --git a/devel/py-clint/Makefile b/devel/py-clint/Makefile
index b01ccc09d0c4..9ecabbbafa7b 100644
--- a/devel/py-clint/Makefile
+++ b/devel/py-clint/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python command-line application tools
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
diff --git a/devel/py-clonedigger/Makefile b/devel/py-clonedigger/Makefile
index c53d0c4c951c..d1c59f9fd3c2 100644
--- a/devel/py-clonedigger/Makefile
+++ b/devel/py-clonedigger/Makefile
@@ -14,7 +14,7 @@ COMMENT= Detect similar code in Python and Java programs
LICENSE= GPLv2
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-cloudpickle/Makefile b/devel/py-cloudpickle/Makefile
index ad23cb713e1d..fc924243f9c0 100644
--- a/devel/py-cloudpickle/Makefile
+++ b/devel/py-cloudpickle/Makefile
@@ -13,7 +13,7 @@ COMMENT= Extended pickling support for Python objects
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
diff --git a/devel/py-cmdtest/Makefile b/devel/py-cmdtest/Makefile
index 48382d031ff1..ddf79567c284 100644
--- a/devel/py-cmdtest/Makefile
+++ b/devel/py-cmdtest/Makefile
@@ -12,12 +12,12 @@ COMMENT= Black box testing of Unix programs
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
diff --git a/devel/py-codecov/Makefile b/devel/py-codecov/Makefile
index d104dacfb157..d71abbf53719 100644
--- a/devel/py-codecov/Makefile
+++ b/devel/py-codecov/Makefile
@@ -13,11 +13,11 @@ COMMENT= Hosted coverage reports for Github, Bitbucket and Gitlab
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
diff --git a/devel/py-collective.z3cform.datetimewidget/Makefile b/devel/py-collective.z3cform.datetimewidget/Makefile
index fbb078e4f0ac..d98bcc03d444 100644
--- a/devel/py-collective.z3cform.datetimewidget/Makefile
+++ b/devel/py-collective.z3cform.datetimewidget/Makefile
@@ -12,9 +12,9 @@ COMMENT= z3c.form date and datetime widgets
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
diff --git a/devel/py-colorama/Makefile b/devel/py-colorama/Makefile
index 7aa915c09886..6170203d6868 100644
--- a/devel/py-colorama/Makefile
+++ b/devel/py-colorama/Makefile
@@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-coloredlogs/Makefile b/devel/py-coloredlogs/Makefile
index cab27e30eb38..ab4c2ec8bb79 100644
--- a/devel/py-coloredlogs/Makefile
+++ b/devel/py-coloredlogs/Makefile
@@ -12,10 +12,10 @@ COMMENT= Colored terminal output for Python logging module
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 <bsd.port.mk>
diff --git a/devel/py-columnize/Makefile b/devel/py-columnize/Makefile
index e7d6265475bc..fd7f86d51ff1 100644
--- a/devel/py-columnize/Makefile
+++ b/devel/py-columnize/Makefile
@@ -11,7 +11,7 @@ COMMENT= Format a simple (i.e. not nested) list into aligned columns
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 @@ USE_PYTHON= autoplist distutils
.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 <bsd.port.post.mk>
diff --git a/devel/py-configargparse/Makefile b/devel/py-configargparse/Makefile
index ed7b07ade33e..8e310613a1da 100644
--- a/devel/py-configargparse/Makefile
+++ b/devel/py-configargparse/Makefile
@@ -14,7 +14,7 @@ COMMENT= Drop-in replacement for argparse
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
diff --git a/devel/py-configobj/Makefile b/devel/py-configobj/Makefile
index 5ed31477ef9c..362eea58a2ae 100644
--- a/devel/py-configobj/Makefile
+++ b/devel/py-configobj/Makefile
@@ -13,7 +13,7 @@ COMMENT= Simple but powerful config file reader and writer
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
diff --git a/devel/py-construct/Makefile b/devel/py-construct/Makefile
index af83754c8be3..256e4492c009 100644
--- a/devel/py-construct/Makefile
+++ b/devel/py-construct/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python module for parsing and building of data structures
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
diff --git a/devel/py-construct28/Makefile b/devel/py-construct28/Makefile
index a458a17ff717..cb29cc3fe560 100644
--- a/devel/py-construct28/Makefile
+++ b/devel/py-construct28/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python module for parsing and building of data structures
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
diff --git a/devel/py-cov-core/Makefile b/devel/py-cov-core/Makefile
index 15b078a44ccc..68e56f9f476a 100644
--- a/devel/py-cov-core/Makefile
+++ b/devel/py-cov-core/Makefile
@@ -13,7 +13,7 @@ COMMENT= Plugin core for use by pytest-cov, nose-cov and nose2-cov
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
diff --git a/devel/py-cuisine/Makefile b/devel/py-cuisine/Makefile
index 95a31dc53e79..f03c16470ae2 100644
--- a/devel/py-cuisine/Makefile
+++ b/devel/py-cuisine/Makefile
@@ -12,7 +12,7 @@ COMMENT= Chef-like functionality for Fabric
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
diff --git a/devel/py-cursive/Makefile b/devel/py-cursive/Makefile
index db45af4f76a0..6f3f7ae3edfe 100644
--- a/devel/py-cursive/Makefile
+++ b/devel/py-cursive/Makefile
@@ -10,15 +10,15 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-curtsies/Makefile b/devel/py-curtsies/Makefile
index 611835d24c64..9caeed552ea6 100644
--- a/devel/py-curtsies/Makefile
+++ b/devel/py-curtsies/Makefile
@@ -13,8 +13,8 @@ COMMENT= Curses-like terminal wrapper, with colored strings
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
diff --git a/devel/py-cxx/Makefile b/devel/py-cxx/Makefile
index 73403c097e31..f6b608e7dbc3 100644
--- a/devel/py-cxx/Makefile
+++ b/devel/py-cxx/Makefile
@@ -11,7 +11,7 @@ DISTNAME= pycxx-${PORTVERSION}
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
diff --git a/devel/py-cycler/Makefile b/devel/py-cycler/Makefile
index 2b9c713b1ea6..b85bbd24d1b6 100644
--- a/devel/py-cycler/Makefile
+++ b/devel/py-cycler/Makefile
@@ -12,8 +12,8 @@ COMMENT= Composable style cycles
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
diff --git a/devel/py-d2to1/Makefile b/devel/py-d2to1/Makefile
index 162bd7d0b732..dff53e62ffcf 100644
--- a/devel/py-d2to1/Makefile
+++ b/devel/py-d2to1/Makefile
@@ -11,8 +11,8 @@ COMMENT= Distutils2-like setup.cfg files with setuptools setup.py
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
diff --git a/devel/py-daemon-runner/Makefile b/devel/py-daemon-runner/Makefile
index 4039b3493c4c..cd67abc47e71 100644
--- a/devel/py-daemon-runner/Makefile
+++ b/devel/py-daemon-runner/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-daemon/Makefile b/devel/py-daemon/Makefile
index b4c6b5b702b5..b50ca2764b4e 100644
--- a/devel/py-daemon/Makefile
+++ b/devel/py-daemon/Makefile
@@ -13,8 +13,8 @@ COMMENT= Well-behaved daemon framework for Python
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
diff --git a/devel/py-darcsver/Makefile b/devel/py-darcsver/Makefile
index 5d8ccca64d7b..ed8019d8d617 100644
--- a/devel/py-darcsver/Makefile
+++ b/devel/py-darcsver/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Generate a version number from darcs history
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
post-patch:
diff --git a/devel/py-dateutil/Makefile b/devel/py-dateutil/Makefile
index 08a2ad9c9181..00539ea6f049 100644
--- a/devel/py-dateutil/Makefile
+++ b/devel/py-dateutil/Makefile
@@ -12,9 +12,9 @@ COMMENT= Extensions to the standard Python datetime module
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
diff --git a/devel/py-dateutils/Makefile b/devel/py-dateutils/Makefile
index 295df4361cae..9f586796bcaa 100644
--- a/devel/py-dateutils/Makefile
+++ b/devel/py-dateutils/Makefile
@@ -12,11 +12,11 @@ COMMENT= Various utilities for working with date and datetime objects
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
diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile
index bd4c00f4d5c3..df0da43ebedb 100644
--- a/devel/py-dbus/Makefile
+++ b/devel/py-dbus/Makefile
@@ -11,6 +11,10 @@ COMMENT= Python2 bindings for the D-BUS messaging system
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"
diff --git a/devel/py3-dbus/pkg-plist b/devel/py-dbus/pkg-plist-py3
index db23fd4a18c1..db23fd4a18c1 100644
--- a/devel/py3-dbus/pkg-plist
+++ b/devel/py-dbus/pkg-plist-py3
diff --git a/devel/py-ddt/Makefile b/devel/py-ddt/Makefile
index 46193a48260a..e7a4d7f7513f 100644
--- a/devel/py-ddt/Makefile
+++ b/devel/py-ddt/Makefile
@@ -13,8 +13,8 @@ COMMENT= Data-Driven Tests
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
diff --git a/devel/py-debtcollector/Makefile b/devel/py-debtcollector/Makefile
index 39acf285dec2..15ef957ae5b0 100644
--- a/devel/py-debtcollector/Makefile
+++ b/devel/py-debtcollector/Makefile
@@ -12,10 +12,10 @@ COMMENT= Collection of Python deprecation patterns and strategies
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
diff --git a/devel/py-defusedxml/Makefile b/devel/py-defusedxml/Makefile
index 787b1fbc0955..b98dc273b699 100644
--- a/devel/py-defusedxml/Makefile
+++ b/devel/py-defusedxml/Makefile
@@ -12,7 +12,7 @@ COMMENT= XML bomb protection for Python stdlib modules
LICENSE= PSFL
-USES?= python
+USES= python
USE_PYTHON= distutils autoplist
PORTDOCS= *
diff --git a/devel/py-delfick_error/Makefile b/devel/py-delfick_error/Makefile
index 1d87a0bdeab3..8b63fee935db 100644
--- a/devel/py-delfick_error/Makefile
+++ b/devel/py-delfick_error/Makefile
@@ -10,19 +10,19 @@ COMMENT= Customized exception class
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
diff --git a/devel/py-deliciousapi/Makefile b/devel/py-deliciousapi/Makefile
index 55030cb35bbc..488f7dff5258 100644
--- a/devel/py-deliciousapi/Makefile
+++ b/devel/py-deliciousapi/Makefile
@@ -12,13 +12,13 @@ DISTNAME= DeliciousAPI-${PORTVERSION}
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 <bsd.port.mk>
diff --git a/devel/py-dialog/Makefile b/devel/py-dialog/Makefile
index dc4cbc4d6f66..b36bbcd08ff6 100644
--- a/devel/py-dialog/Makefile
+++ b/devel/py-dialog/Makefile
@@ -16,7 +16,7 @@ LICENSE= LGPL20
RUN_DEPENDS= cdialog:devel/cdialog
-USES= python tar:bzip2
+USES= python:2.7 tar:bzip2
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= pythondialog
diff --git a/devel/py-diazo/Makefile b/devel/py-diazo/Makefile
index 5c36650f992a..8f43856fccf8 100644
--- a/devel/py-diazo/Makefile
+++ b/devel/py-diazo/Makefile
@@ -12,12 +12,12 @@ COMMENT= Deliverance like language using a pure XSLT engine
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+
diff --git a/devel/py-django-rq-dashboard/Makefile b/devel/py-django-rq-dashboard/Makefile
index 115cec64e37c..1a64c0c71b5e 100644
--- a/devel/py-django-rq-dashboard/Makefile
+++ b/devel/py-django-rq-dashboard/Makefile
@@ -8,14 +8,14 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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 <bsd.port.mk>
diff --git a/devel/py-django-rq/Makefile b/devel/py-django-rq/Makefile
index 6a6f972c473a..c4b3308f11fc 100644
--- a/devel/py-django-rq/Makefile
+++ b/devel/py-django-rq/Makefile
@@ -14,8 +14,8 @@ COMMENT= Provides Django integration for RQ (Redis Queue)
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
diff --git a/devel/py-django-tastypie-mongoengine/Makefile b/devel/py-django-tastypie-mongoengine/Makefile
index c45afca2825e..e3ecb44a24fd 100644
--- a/devel/py-django-tastypie-mongoengine/Makefile
+++ b/devel/py-django-tastypie-mongoengine/Makefile
@@ -14,9 +14,9 @@ COMMENT= MongoEngine support for django-tastypie
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
diff --git a/devel/py-docker-py/Makefile b/devel/py-docker-py/Makefile
index 3d5975b7bf47..c5e52b7b54c8 100644
--- a/devel/py-docker-py/Makefile
+++ b/devel/py-docker-py/Makefile
@@ -12,7 +12,7 @@ COMMENT= API client for docker written in Python
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
diff --git a/devel/py-dockerpty/Makefile b/devel/py-dockerpty/Makefile
index 8c8f695830b1..f0b2e8c8e386 100644
--- a/devel/py-dockerpty/Makefile
+++ b/devel/py-dockerpty/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python library to use the pseudo-tty of a docker container
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
diff --git a/devel/py-docopt/Makefile b/devel/py-docopt/Makefile
index cb286a69ea3f..7ae309210609 100644
--- a/devel/py-docopt/Makefile
+++ b/devel/py-docopt/Makefile
@@ -15,7 +15,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE-MIT
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= distutils autoplist concurrent
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/devel/py-dogpile.cache/Makefile b/devel/py-dogpile.cache/Makefile
index eaacef8fde8c..214b73ee3120 100644
--- a/devel/py-dogpile.cache/Makefile
+++ b/devel/py-dogpile.cache/Makefile
@@ -12,7 +12,7 @@ COMMENT= Caching front-end based on the Dogpile lock
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
diff --git a/devel/py-doit/Makefile b/devel/py-doit/Makefile
index 5e477f8a19a7..da42a760bbe2 100644
--- a/devel/py-doit/Makefile
+++ b/devel/py-doit/Makefile
@@ -13,10 +13,10 @@ COMMENT= Task management & automation tool
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 @@ NO_ARCH= yes
do-test:
@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-easyprocess/Makefile b/devel/py-easyprocess/Makefile
index 01cd35138424..6a6dcc2bb345 100644
--- a/devel/py-easyprocess/Makefile
+++ b/devel/py-easyprocess/Makefile
@@ -13,9 +13,9 @@ COMMENT= Easy to use python subprocess interface
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
diff --git a/devel/py-efilter/Makefile b/devel/py-efilter/Makefile
index ecebeba38a58..f6d48e9ee468 100644
--- a/devel/py-efilter/Makefile
+++ b/devel/py-efilter/Makefile
@@ -14,10 +14,10 @@ COMMENT= EFILTER query language
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
diff --git a/devel/py-efl/Makefile b/devel/py-efl/Makefile
index 0f878b085c3e..3827540d92c5 100644
--- a/devel/py-efl/Makefile
+++ b/devel/py-efl/Makefile
@@ -14,20 +14,12 @@ COMMENT= Python bindings for EFL and Elementary
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 <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-entrypoints/Makefile b/devel/py-entrypoints/Makefile
index 6ca8be384fa7..adf2b1932491 100644
--- a/devel/py-entrypoints/Makefile
+++ b/devel/py-entrypoints/Makefile
@@ -12,7 +12,7 @@ COMMENT= Discover and load entry points from installed packages
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 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.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:
diff --git a/devel/py-envisage/Makefile b/devel/py-envisage/Makefile
index d609475dd5c8..feef23c6ffc4 100644
--- a/devel/py-envisage/Makefile
+++ b/devel/py-envisage/Makefile
@@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE PSFL LGPL20
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
diff --git a/devel/py-epsilon/Makefile b/devel/py-epsilon/Makefile
index 34873679c16b..66ab6c93378f 100644
--- a/devel/py-epsilon/Makefile
+++ b/devel/py-epsilon/Makefile
@@ -15,8 +15,8 @@ COMMENT= Set of Python utility modules used by DivMod projects
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
diff --git a/devel/py-extras/Makefile b/devel/py-extras/Makefile
index 810e12611123..d0c249ea0125 100644
--- a/devel/py-extras/Makefile
+++ b/devel/py-extras/Makefile
@@ -13,7 +13,7 @@ COMMENT= Useful extra bits for Python
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
diff --git a/devel/py-ezpyinline/Makefile b/devel/py-ezpyinline/Makefile
index 81ddce6fdf9e..020ad7244e0f 100644
--- a/devel/py-ezpyinline/Makefile
+++ b/devel/py-ezpyinline/Makefile
@@ -7,11 +7,12 @@ PORTREVISION= 1
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 <bsd.port.mk>
diff --git a/devel/py-fabric/Makefile b/devel/py-fabric/Makefile
index 1a0467b6ee02..a233e31f3f53 100644
--- a/devel/py-fabric/Makefile
+++ b/devel/py-fabric/Makefile
@@ -15,10 +15,10 @@ COMMENT= Simple, Pythonic remote execution and deployment
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
diff --git a/devel/py-fasteners/Makefile b/devel/py-fasteners/Makefile
index df79c62e6d63..6c1bba2cb8a4 100644
--- a/devel/py-fasteners/Makefile
+++ b/devel/py-fasteners/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-filemagic/Makefile b/devel/py-filemagic/Makefile
index fd09bcb39188..79aeb4817d0d 100644
--- a/devel/py-filemagic/Makefile
+++ b/devel/py-filemagic/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python API for libmagic, the library behind the Unix file command
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
diff --git a/devel/py-five.customerize/Makefile b/devel/py-five.customerize/Makefile
index 6504b56e64d9..caa5ee283fe3 100644
--- a/devel/py-five.customerize/Makefile
+++ b/devel/py-five.customerize/Makefile
@@ -13,21 +13,21 @@ COMMENT= TTW customization of template-based Zope views
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
diff --git a/devel/py-five.formlib/Makefile b/devel/py-five.formlib/Makefile
index 35956bc48eb6..9f8c2665b52b 100644
--- a/devel/py-five.formlib/Makefile
+++ b/devel/py-five.formlib/Makefile
@@ -13,21 +13,21 @@ COMMENT= zope.formlib integration for Zope 2
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 <bsd.port.mk>
diff --git a/devel/py-five.globalrequest/Makefile b/devel/py-five.globalrequest/Makefile
index 9d215b208827..eb279aa97c30 100644
--- a/devel/py-five.globalrequest/Makefile
+++ b/devel/py-five.globalrequest/Makefile
@@ -13,7 +13,7 @@ COMMENT= Zope 2 integration for zope.globalrequest
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
diff --git a/devel/py-five.localsitemanager/Makefile b/devel/py-five.localsitemanager/Makefile
index 52a93ac2590a..89556dcd8310 100644
--- a/devel/py-five.localsitemanager/Makefile
+++ b/devel/py-five.localsitemanager/Makefile
@@ -13,17 +13,17 @@ COMMENT= Local site manager implementation for Zope 2
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 <bsd.port.mk>
diff --git a/devel/py-flake8-builtins/Makefile b/devel/py-flake8-builtins/Makefile
index f679053053fd..375c1d448a0f 100644
--- a/devel/py-flake8-builtins/Makefile
+++ b/devel/py-flake8-builtins/Makefile
@@ -13,9 +13,9 @@ COMMENT= Check for python builtins being used as variables or parameters
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
diff --git a/devel/py-flake8-docstrings/Makefile b/devel/py-flake8-docstrings/Makefile
index 1e7351f643ec..f56c48386bfb 100644
--- a/devel/py-flake8-docstrings/Makefile
+++ b/devel/py-flake8-docstrings/Makefile
@@ -13,11 +13,11 @@ COMMENT= Extension for flake8 which uses pydocstyle to check docstrings
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
diff --git a/devel/py-flake8-import-order/Makefile b/devel/py-flake8-import-order/Makefile
index 9659fe7d97e2..e8c0e66ea2e1 100644
--- a/devel/py-flake8-import-order/Makefile
+++ b/devel/py-flake8-import-order/Makefile
@@ -14,10 +14,10 @@ COMMENT= Flake8 and pylama plugin that checks the ordering of import statements
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
diff --git a/devel/py-flake8-polyfill/Makefile b/devel/py-flake8-polyfill/Makefile
index 864e2270c975..5eba9c8dcc17 100644
--- a/devel/py-flake8-polyfill/Makefile
+++ b/devel/py-flake8-polyfill/Makefile
@@ -13,9 +13,9 @@ COMMENT= Polyfill package for Flake8 plugins
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
diff --git a/devel/py-flake8-quotes/Makefile b/devel/py-flake8-quotes/Makefile
index 7298fd821641..b2bc76609144 100644
--- a/devel/py-flake8-quotes/Makefile
+++ b/devel/py-flake8-quotes/Makefile
@@ -13,9 +13,9 @@ COMMENT= Flake8 lint for quotes
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
diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile
index dc7c9fa4992b..61100960df63 100644
--- a/devel/py-flake8/Makefile
+++ b/devel/py-flake8/Makefile
@@ -12,12 +12,12 @@ COMMENT= Code checking using pep8 and pyflakes
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
diff --git a/devel/py-flask-babel/Makefile b/devel/py-flask-babel/Makefile
index 7c5ba58ac67c..957df6773343 100644
--- a/devel/py-flask-babel/Makefile
+++ b/devel/py-flask-babel/Makefile
@@ -13,8 +13,8 @@ COMMENT= Adds i18n/l10n support to Flask applications
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
diff --git a/devel/py-flufl.i18n/Makefile b/devel/py-flufl.i18n/Makefile
index 0361d99ba00f..0e8fae187622 100644
--- a/devel/py-flufl.i18n/Makefile
+++ b/devel/py-flufl.i18n/Makefile
@@ -11,9 +11,9 @@ COMMENT= A high level API for Python internationalization
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 <bsd.port.mk>
diff --git a/devel/py-flufl.lock/Makefile b/devel/py-flufl.lock/Makefile
index 3d1731d30742..fc3ba42e2237 100644
--- a/devel/py-flufl.lock/Makefile
+++ b/devel/py-flufl.lock/Makefile
@@ -11,9 +11,9 @@ COMMENT= NFS-safe file locking with timeouts for POSIX systems
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 <bsd.port.mk>
diff --git a/devel/py-foolscap/Makefile b/devel/py-foolscap/Makefile
index 6d821db4f5c4..ff29212d6542 100644
--- a/devel/py-foolscap/Makefile
+++ b/devel/py-foolscap/Makefile
@@ -14,8 +14,8 @@ COMMENT= RPC protocol for Twisted Python
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
diff --git a/devel/py-fortran/Makefile b/devel/py-fortran/Makefile
index c7aa8f729f2c..8ed8c9ef3bd9 100644
--- a/devel/py-fortran/Makefile
+++ b/devel/py-fortran/Makefile
@@ -16,7 +16,7 @@ LICENSE= MIT
RUN_DEPENDS= ${PYNUMERIC}
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/devel/py-freenas.dispatcher/Makefile b/devel/py-freenas.dispatcher/Makefile
index cc474cc6d5f5..b8259c31400f 100644
--- a/devel/py-freenas.dispatcher/Makefile
+++ b/devel/py-freenas.dispatcher/Makefile
@@ -9,15 +9,15 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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 <bsd.port.mk>
diff --git a/devel/py-freenas.utils/Makefile b/devel/py-freenas.utils/Makefile
index 9a3721a292af..4b7d547f37a9 100644
--- a/devel/py-freenas.utils/Makefile
+++ b/devel/py-freenas.utils/Makefile
@@ -11,8 +11,8 @@ COMMENT= FreeNAS common Python modules
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
diff --git a/devel/py-freezegun/Makefile b/devel/py-freezegun/Makefile
index 9a62b5dc6013..5cf4ec37a466 100644
--- a/devel/py-freezegun/Makefile
+++ b/devel/py-freezegun/Makefile
@@ -14,13 +14,13 @@ COMMENT= Let your Python tests travel through time
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
diff --git a/devel/py-fsm/Makefile b/devel/py-fsm/Makefile
index 8ddb173de274..ecc360c5d13e 100644
--- a/devel/py-fsm/Makefile
+++ b/devel/py-fsm/Makefile
@@ -15,9 +15,9 @@ GH_ACCOUNT= oozie
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 <bsd.port.mk>
diff --git a/devel/py-fusefs/Makefile b/devel/py-fusefs/Makefile
index 999e8ad942c4..8ab72447aa12 100644
--- a/devel/py-fusefs/Makefile
+++ b/devel/py-fusefs/Makefile
@@ -19,7 +19,7 @@ CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}fusepy # fuse.py
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 \
diff --git a/devel/py-futurist/Makefile b/devel/py-futurist/Makefile
index 162eebb0bc1a..ea2d0d909fc8 100644
--- a/devel/py-futurist/Makefile
+++ b/devel/py-futurist/Makefile
@@ -12,12 +12,12 @@ COMMENT= Useful additions to futures, from the future
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
diff --git a/devel/py-fuzzywuzzy/Makefile b/devel/py-fuzzywuzzy/Makefile
index e12b172dfb84..4c1c7b900dc1 100644
--- a/devel/py-fuzzywuzzy/Makefile
+++ b/devel/py-fuzzywuzzy/Makefile
@@ -14,7 +14,7 @@ COMMENT= Fuzzy string matching using Levenshtein Distance
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
diff --git a/devel/py-game_sdl2/Makefile b/devel/py-game_sdl2/Makefile
index 1aa5213b4b23..b2e4a8315cff 100644
--- a/devel/py-game_sdl2/Makefile
+++ b/devel/py-game_sdl2/Makefile
@@ -14,7 +14,6 @@ COMMENT= Reimplementation of portions of the pygame API using SDL2
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,10 +21,12 @@ PORTSCOUT= site:http://www.renpy.org/dl/release/
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 \
-exec ${STRIP_CMD} {} +
diff --git a/devel/py-gamin/Makefile b/devel/py-gamin/Makefile
index eeec5065d34f..b668b7f0e672 100644
--- a/devel/py-gamin/Makefile
+++ b/devel/py-gamin/Makefile
@@ -16,7 +16,8 @@ PLIST= ${.CURDIR}/pkg-plist
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
diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile
index 5a55dd3083e3..6da11846a720 100644
--- a/devel/py-gdata/Makefile
+++ b/devel/py-gdata/Makefile
@@ -24,9 +24,9 @@ PYCRYPTO_DESC= Cryptography toolkit
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}/
diff --git a/devel/py-gdbgui/Makefile b/devel/py-gdbgui/Makefile
index 9410f95c5601..817c7f5e21cd 100644
--- a/devel/py-gdbgui/Makefile
+++ b/devel/py-gdbgui/Makefile
@@ -11,17 +11,17 @@ COMMENT= Browser-based frontend/gui for GDB
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
diff --git a/devel/py-gearman/Makefile b/devel/py-gearman/Makefile
index db2168c4a42a..d7523eb810c2 100644
--- a/devel/py-gearman/Makefile
+++ b/devel/py-gearman/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Gearman Library for Python
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-geojson/Makefile b/devel/py-geojson/Makefile
index 8d4cda32a137..1fdae92b955c 100644
--- a/devel/py-geojson/Makefile
+++ b/devel/py-geojson/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python's Encoder/decoder for simple GIS features
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
diff --git a/devel/py-geotypes/Makefile b/devel/py-geotypes/Makefile
index e6c548f7f316..b00bc441a00a 100644
--- a/devel/py-geotypes/Makefile
+++ b/devel/py-geotypes/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python Interface to Support PostGIS
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
diff --git a/devel/py-gevent/Makefile b/devel/py-gevent/Makefile
index 345250b7608b..f7b83a98936d 100644
--- a/devel/py-gevent/Makefile
+++ b/devel/py-gevent/Makefile
@@ -15,9 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
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
diff --git a/devel/py-git-up/Makefile b/devel/py-git-up/Makefile
index 3841fc0e2bd6..759231d71128 100644
--- a/devel/py-git-up/Makefile
+++ b/devel/py-git-up/Makefile
@@ -11,11 +11,11 @@ COMMENT= Python implementation of 'git up'
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
diff --git a/devel/py-gitdb/Makefile b/devel/py-gitdb/Makefile
index 2212c037cf05..c6a5bd06df2c 100644
--- a/devel/py-gitdb/Makefile
+++ b/devel/py-gitdb/Makefile
@@ -14,9 +14,9 @@ COMMENT= Pure Python git object database
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:
diff --git a/devel/py-gitdb2/Makefile b/devel/py-gitdb2/Makefile
index b50afb5413ee..879699e30d2f 100644
--- a/devel/py-gitdb2/Makefile
+++ b/devel/py-gitdb2/Makefile
@@ -13,7 +13,7 @@ COMMENT= Git Object Database
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
diff --git a/devel/py-gitless/Makefile b/devel/py-gitless/Makefile
index 3f16259e3399..9576454bd6cb 100644
--- a/devel/py-gitless/Makefile
+++ b/devel/py-gitless/Makefile
@@ -14,9 +14,9 @@ COMMENT= Version control system built on top of Git
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
diff --git a/devel/py-gitpython/Makefile b/devel/py-gitpython/Makefile
index c68d3a06203d..414b3c7edfb9 100644
--- a/devel/py-gitpython/Makefile
+++ b/devel/py-gitpython/Makefile
@@ -12,10 +12,10 @@ COMMENT= Python Git Library
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
diff --git a/devel/py-glance-store/Makefile b/devel/py-glance-store/Makefile
index cba1ae3ea26e..808745dc1cd2 100644
--- a/devel/py-glance-store/Makefile
+++ b/devel/py-glance-store/Makefile
@@ -12,20 +12,20 @@ DISTNAME= glance_store-${PORTVERSION}
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
diff --git a/devel/py-glob2/Makefile b/devel/py-glob2/Makefile
index 67d2bc438fd5..01674839e3fd 100644
--- a/devel/py-glob2/Makefile
+++ b/devel/py-glob2/Makefile
@@ -13,7 +13,7 @@ COMMENT= Glob that captures patterns and supports recursive wildcards
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+
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index af52f2dadcb8..782b95346da9 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -24,6 +24,7 @@ PORTSCOUT= ignore:1
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
diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile
index 967559c56ae1..681a4b174f0c 100644
--- a/devel/py-gobject3/Makefile
+++ b/devel/py-gobject3/Makefile
@@ -6,9 +6,12 @@ PKGNAMESUFFIX= 3
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"
diff --git a/devel/py3-gobject3/pkg-plist b/devel/py-gobject3/pkg-plist-py3
index 210fa58ba17c..210fa58ba17c 100644
--- a/devel/py3-gobject3/pkg-plist
+++ b/devel/py-gobject3/pkg-plist-py3
diff --git a/devel/py-google-apputils/Makefile b/devel/py-google-apputils/Makefile
index 0325539f43c6..a6c7cd34df11 100644
--- a/devel/py-google-apputils/Makefile
+++ b/devel/py-google-apputils/Makefile
@@ -14,9 +14,9 @@ COMMENT= Google Application Utilities for Python
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
diff --git a/devel/py-googleapis-common-protos/Makefile b/devel/py-googleapis-common-protos/Makefile
index f2ced16c25e0..fb880891dc73 100644
--- a/devel/py-googleapis-common-protos/Makefile
+++ b/devel/py-googleapis-common-protos/Makefile
@@ -11,7 +11,7 @@ COMMENT= Common protobufs used in Google APIs
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
diff --git a/devel/py-grab/Makefile b/devel/py-grab/Makefile
index 7763e36163ae..7e6735427668 100644
--- a/devel/py-grab/Makefile
+++ b/devel/py-grab/Makefile
@@ -11,13 +11,13 @@ COMMENT= Site scraping framework
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
diff --git a/devel/py-grpcio-tools/Makefile b/devel/py-grpcio-tools/Makefile
index 3ad478cbf622..a0789dde9dd3 100644
--- a/devel/py-grpcio-tools/Makefile
+++ b/devel/py-grpcio-tools/Makefile
@@ -12,7 +12,7 @@ COMMENT= Protobuf code generator for gRPC
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
diff --git a/devel/py-grpcio/Makefile b/devel/py-grpcio/Makefile
index 70cc49b56a01..2bf88c467f8c 100644
--- a/devel/py-grpcio/Makefile
+++ b/devel/py-grpcio/Makefile
@@ -13,8 +13,10 @@ COMMENT= HTTP/2-based RPC framework
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 @@ USE_PYTHON= autoplist distutils
CFLAGS+= -Ithird_party/boringssl/include
LDFLAGS+= -lcares
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-gtfslib/Makefile b/devel/py-gtfslib/Makefile
index e79dd038045a..8c692dffc0b8 100644
--- a/devel/py-gtfslib/Makefile
+++ b/devel/py-gtfslib/Makefile
@@ -12,12 +12,12 @@ COMMENT= Library for reading GTFS-based transit data in Python
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
diff --git a/devel/py-hash_ring/Makefile b/devel/py-hash_ring/Makefile
index 8a89322d4fc8..4ea4c89d6770 100644
--- a/devel/py-hash_ring/Makefile
+++ b/devel/py-hash_ring/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-hgsubversion/Makefile b/devel/py-hgsubversion/Makefile
index 9bbbef01df20..9875e311b014 100644
--- a/devel/py-hgsubversion/Makefile
+++ b/devel/py-hgsubversion/Makefile
@@ -22,9 +22,9 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.options.mk>
.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 <bsd.port.mk>
diff --git a/devel/py-hgtools/Makefile b/devel/py-hgtools/Makefile
index 7b9a357c1c10..ba04219fba5e 100644
--- a/devel/py-hgtools/Makefile
+++ b/devel/py-hgtools/Makefile
@@ -13,7 +13,7 @@ COMMENT= Classes and setuptools plugin for Mercurial repositories
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES?= python zip
+USES= python zip
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/devel/py-http-prompt/Makefile b/devel/py-http-prompt/Makefile
index 5af1ddde6601..143a2593580e 100644
--- a/devel/py-http-prompt/Makefile
+++ b/devel/py-http-prompt/Makefile
@@ -12,12 +12,12 @@ COMMENT= Interactive command-line HTTP client
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
diff --git a/devel/py-hypothesis/Makefile b/devel/py-hypothesis/Makefile
index 4d05f9ab1eaf..9d4b3350ff4c 100644
--- a/devel/py-hypothesis/Makefile
+++ b/devel/py-hypothesis/Makefile
@@ -12,7 +12,7 @@ COMMENT= Library for property based testing
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
diff --git a/devel/py-icalendar/Makefile b/devel/py-icalendar/Makefile
index a7bf8edb9671..d9e9e488224d 100644
--- a/devel/py-icalendar/Makefile
+++ b/devel/py-icalendar/Makefile
@@ -13,10 +13,10 @@ COMMENT= Parser and generator of iCalender files for Python
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
diff --git a/devel/py-interface/Makefile b/devel/py-interface/Makefile
index caddbd27ab94..1f4893252120 100644
--- a/devel/py-interface/Makefile
+++ b/devel/py-interface/Makefile
@@ -14,13 +14,15 @@ COMMENT= Python implementation of an Erlang node
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}
cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}
diff --git a/devel/py-interface/pkg-plist b/devel/py-interface/pkg-plist
deleted file mode 100644
index 117c7e8d99bc..000000000000
--- a/devel/py-interface/pkg-plist
+++ /dev/null
@@ -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
diff --git a/devel/py-intervaltree/Makefile b/devel/py-intervaltree/Makefile
index 62b532c33958..81b51f8a9c51 100644
--- a/devel/py-intervaltree/Makefile
+++ b/devel/py-intervaltree/Makefile
@@ -13,7 +13,7 @@ COMMENT= Editable interval tree data structure for Python 2 and 3
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
diff --git a/devel/py-invoke/Makefile b/devel/py-invoke/Makefile
index 9d2bff6cd4d7..f9097577d1c6 100644
--- a/devel/py-invoke/Makefile
+++ b/devel/py-invoke/Makefile
@@ -16,10 +16,10 @@ LICENSE= BSD2CLAUSE
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
diff --git a/devel/py-ipdb/Makefile b/devel/py-ipdb/Makefile
index a4eb3798417a..306eed6a1624 100644
--- a/devel/py-ipdb/Makefile
+++ b/devel/py-ipdb/Makefile
@@ -13,7 +13,7 @@ COMMENT= IPython-enabled pdb
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
diff --git a/devel/py-ipykernel/Makefile b/devel/py-ipykernel/Makefile
index 910c9cc1f527..e6e9628e5770 100644
--- a/devel/py-ipykernel/Makefile
+++ b/devel/py-ipykernel/Makefile
@@ -12,10 +12,10 @@ COMMENT= IPython Kernel for Jupyter
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
diff --git a/devel/py-ipyparallel/Makefile b/devel/py-ipyparallel/Makefile
index 3abb11fcef4a..ede0ff53299e 100644
--- a/devel/py-ipyparallel/Makefile
+++ b/devel/py-ipyparallel/Makefile
@@ -12,16 +12,16 @@ COMMENT= Interactive Parallel Computing with IPython
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
diff --git a/devel/py-ipywidgets/Makefile b/devel/py-ipywidgets/Makefile
index fa20136fb8b4..89565f0e8fc9 100644
--- a/devel/py-ipywidgets/Makefile
+++ b/devel/py-ipywidgets/Makefile
@@ -9,10 +9,10 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-iso8601/Makefile b/devel/py-iso8601/Makefile
index 1725cbd0e4a0..676085b57a6e 100644
--- a/devel/py-iso8601/Makefile
+++ b/devel/py-iso8601/Makefile
@@ -13,7 +13,7 @@ COMMENT= Simple module to parse ISO 8601 dates
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
diff --git a/devel/py-isodate/Makefile b/devel/py-isodate/Makefile
index 9013dc2db1a7..6e97c92fbbdd 100644
--- a/devel/py-isodate/Makefile
+++ b/devel/py-isodate/Makefile
@@ -12,7 +12,7 @@ COMMENT= ISO 8601 date/time/duration parser and formater
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
diff --git a/devel/py-isort/Makefile b/devel/py-isort/Makefile
index 6ca70635ee09..b55627fa6e48 100644
--- a/devel/py-isort/Makefile
+++ b/devel/py-isort/Makefile
@@ -12,8 +12,8 @@ COMMENT= Python utility/library to sort Python imports
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
diff --git a/devel/py-jaraco.classes/Makefile b/devel/py-jaraco.classes/Makefile
index f82df1a53c67..a8f70ab85b3e 100644
--- a/devel/py-jaraco.classes/Makefile
+++ b/devel/py-jaraco.classes/Makefile
@@ -12,8 +12,8 @@ COMMENT= Python class routines
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
diff --git a/devel/py-jaraco.functools/Makefile b/devel/py-jaraco.functools/Makefile
index 0b38e0ea7e3a..cc03a7e92429 100644
--- a/devel/py-jaraco.functools/Makefile
+++ b/devel/py-jaraco.functools/Makefile
@@ -12,7 +12,7 @@ COMMENT= Additional functools for Python
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 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
diff --git a/devel/py-jaraco.itertools/Makefile b/devel/py-jaraco.itertools/Makefile
index 897a5a680a26..c5403c6e98d0 100644
--- a/devel/py-jaraco.itertools/Makefile
+++ b/devel/py-jaraco.itertools/Makefile
@@ -12,10 +12,10 @@ COMMENT= Tools for working with iterables
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
diff --git a/devel/py-jaraco.logging/Makefile b/devel/py-jaraco.logging/Makefile
index f8b62c66107c..b43623460709 100644
--- a/devel/py-jaraco.logging/Makefile
+++ b/devel/py-jaraco.logging/Makefile
@@ -12,9 +12,9 @@ COMMENT= Additional facilities to supplement Python's stdlib logging module
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
diff --git a/devel/py-jaraco.timing/Makefile b/devel/py-jaraco.timing/Makefile
index 0aa7f3d8da4a..a46f8ac02d33 100644
--- a/devel/py-jaraco.timing/Makefile
+++ b/devel/py-jaraco.timing/Makefile
@@ -12,9 +12,9 @@ COMMENT= Routines pertinent to the fourth dimension
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
diff --git a/devel/py-jaraco.util/Makefile b/devel/py-jaraco.util/Makefile
index e053b18a4783..e09b0e786cef 100644
--- a/devel/py-jaraco.util/Makefile
+++ b/devel/py-jaraco.util/Makefile
@@ -12,10 +12,10 @@ COMMENT= General utility modules that supply commonly-used functionality
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
diff --git a/devel/py-jdcal/Makefile b/devel/py-jdcal/Makefile
index 99311fdb93a6..f2bf62bd3931 100644
--- a/devel/py-jdcal/Makefile
+++ b/devel/py-jdcal/Makefile
@@ -12,7 +12,7 @@ COMMENT= Module converting between Julian dates and calendar dates
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
diff --git a/devel/py-jedi/Makefile b/devel/py-jedi/Makefile
index 4891a2fb20df..4752e331148e 100644
--- a/devel/py-jedi/Makefile
+++ b/devel/py-jedi/Makefile
@@ -14,7 +14,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/devel/py-jenkins-job-builder/Makefile b/devel/py-jenkins-job-builder/Makefile
index f1e50e4a9c5d..96537c189834 100644
--- a/devel/py-jenkins-job-builder/Makefile
+++ b/devel/py-jenkins-job-builder/Makefile
@@ -13,12 +13,12 @@ COMMENT= Manage Jenkins jobs with YAML
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
diff --git a/devel/py-jira/Makefile b/devel/py-jira/Makefile
index 9d36ac0e006c..a3820be3c097 100644
--- a/devel/py-jira/Makefile
+++ b/devel/py-jira/Makefile
@@ -13,16 +13,16 @@ COMMENT= Library to ease use of the JIRA 5 REST APIs
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 @@ PARALLEL_DESC= Enable asynchronous requests
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 <bsd.port.mk>
diff --git a/devel/py-jsbeautifier/Makefile b/devel/py-jsbeautifier/Makefile
index bade3af9cf83..196737098740 100644
--- a/devel/py-jsbeautifier/Makefile
+++ b/devel/py-jsbeautifier/Makefile
@@ -12,8 +12,8 @@ COMMENT= JavaScript unobfuscator and beautifier
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
diff --git a/devel/py-json-sempai/Makefile b/devel/py-json-sempai/Makefile
index 589a31a8acd7..4cb9b5dd173d 100644
--- a/devel/py-json-sempai/Makefile
+++ b/devel/py-json-sempai/Makefile
@@ -11,7 +11,7 @@ COMMENT= Pythonic argument parser, that will make you smile
LICENSE= MIT
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
PORTDOCS= README.rst
diff --git a/devel/py-jsonlib/Makefile b/devel/py-jsonlib/Makefile
index 6e2b78139442..0c9c7d6308b7 100644
--- a/devel/py-jsonlib/Makefile
+++ b/devel/py-jsonlib/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= JSON Serializer/Deserializer for Python
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-jsonlib2/Makefile b/devel/py-jsonlib2/Makefile
index 692a92544695..b030a2ca5511 100644
--- a/devel/py-jsonlib2/Makefile
+++ b/devel/py-jsonlib2/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= JSON Serializer/Deserializer for Python
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-jsonpatch/Makefile b/devel/py-jsonpatch/Makefile
index 31270a9664e3..2f012b74d9dc 100644
--- a/devel/py-jsonpatch/Makefile
+++ b/devel/py-jsonpatch/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-jsonref/Makefile b/devel/py-jsonref/Makefile
index f6ab29e3767a..aa87a35e3a29 100644
--- a/devel/py-jsonref/Makefile
+++ b/devel/py-jsonref/Makefile
@@ -13,7 +13,7 @@ COMMENT= Implementation of JSON Reference for Python
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
diff --git a/devel/py-jsonrpclib-pelix/Makefile b/devel/py-jsonrpclib-pelix/Makefile
index 71d8df67d858..b7da7fc10f65 100644
--- a/devel/py-jsonrpclib-pelix/Makefile
+++ b/devel/py-jsonrpclib-pelix/Makefile
@@ -12,7 +12,7 @@ COMMENT= JSON-RPC over HTTP that mirrors xmlrpclib syntax
LICENSE= APACHE20
-USES= python:3
+USES= python:3.4+
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-jsonrpclib/Makefile b/devel/py-jsonrpclib/Makefile
index ae5f8bc88b4a..7667ed9c714a 100644
--- a/devel/py-jsonrpclib/Makefile
+++ b/devel/py-jsonrpclib/Makefile
@@ -21,7 +21,7 @@ CJSON_DESC= Use cjson instead of json or simplejson
.include <bsd.port.options.mk>
.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 <bsd.port.mk>
diff --git a/devel/py-jsonschema/Makefile b/devel/py-jsonschema/Makefile
index eb124f77a3f9..18bd85e84625 100644
--- a/devel/py-jsonschema/Makefile
+++ b/devel/py-jsonschema/Makefile
@@ -1,26 +1,27 @@
-# Created by: William Grzybowski <wg@FreeBSD.org>
+# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
# $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 <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
diff --git a/devel/py-jsonschema/distinfo b/devel/py-jsonschema/distinfo
index 10c789b09a55..14f677c8c0d5 100644
--- a/devel/py-jsonschema/distinfo
+++ b/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
diff --git a/devel/py-jupyter_client/Makefile b/devel/py-jupyter_client/Makefile
index 99e2cb7915ac..18e5ef5589a3 100644
--- a/devel/py-jupyter_client/Makefile
+++ b/devel/py-jupyter_client/Makefile
@@ -12,10 +12,10 @@ COMMENT= Jupyter protocol implementation and client libraries
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
diff --git a/devel/py-jupyter_console/Makefile b/devel/py-jupyter_console/Makefile
index cfecf9f304d8..d9872cfe9319 100644
--- a/devel/py-jupyter_console/Makefile
+++ b/devel/py-jupyter_console/Makefile
@@ -12,11 +12,11 @@ COMMENT= IPython-like terminal frontend for Jupyter kernels in any language
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
diff --git a/devel/py-jupyter_core/Makefile b/devel/py-jupyter_core/Makefile
index 4c6e44ede4d4..cad0ad378b58 100644
--- a/devel/py-jupyter_core/Makefile
+++ b/devel/py-jupyter_core/Makefile
@@ -12,11 +12,11 @@ COMMENT= Jupyter core package
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
diff --git a/devel/py-kaptan/Makefile b/devel/py-kaptan/Makefile
index 109acfdd7d49..0caba1ad8f37 100644
--- a/devel/py-kaptan/Makefile
+++ b/devel/py-kaptan/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python config parser for json, yaml
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
diff --git a/devel/py-kayako/Makefile b/devel/py-kayako/Makefile
index 7033c6db394b..8dde23186cae 100644
--- a/devel/py-kayako/Makefile
+++ b/devel/py-kayako/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-kazoo/Makefile b/devel/py-kazoo/Makefile
index e444cd11daa4..d63a28f3ef9d 100644
--- a/devel/py-kazoo/Makefile
+++ b/devel/py-kazoo/Makefile
@@ -12,8 +12,8 @@ COMMENT= Higher Level API to Zookeeper for Python
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
diff --git a/devel/py-keystoneauth1/Makefile b/devel/py-keystoneauth1/Makefile
index 602371ea498b..de23c85b2583 100644
--- a/devel/py-keystoneauth1/Makefile
+++ b/devel/py-keystoneauth1/Makefile
@@ -12,12 +12,12 @@ COMMENT= Authentication Library for OpenStack Identity
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
diff --git a/devel/py-keystonemiddleware/Makefile b/devel/py-keystonemiddleware/Makefile
index acd0c6b01e27..72516ff4d583 100644
--- a/devel/py-keystonemiddleware/Makefile
+++ b/devel/py-keystonemiddleware/Makefile
@@ -10,20 +10,20 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-kid/Makefile b/devel/py-kid/Makefile
index 366cbb61289c..3076b42fe1d9 100644
--- a/devel/py-kid/Makefile
+++ b/devel/py-kid/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-kjbuckets/Makefile b/devel/py-kjbuckets/Makefile
index 962430b549c2..bcf62a1b850a 100644
--- a/devel/py-kjbuckets/Makefile
+++ b/devel/py-kjbuckets/Makefile
@@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/../COPYRIGHT.txt
OPTIONS_DEFINE= DOCS EXAMPLES
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/${DISTNAME}/kjbuckets
diff --git a/devel/py-lazr.config/Makefile b/devel/py-lazr.config/Makefile
index c393fbe017ac..cc5974836680 100644
--- a/devel/py-lazr.config/Makefile
+++ b/devel/py-lazr.config/Makefile
@@ -13,8 +13,8 @@ COMMENT= Create configuration schemas, and process and validate configurations
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
diff --git a/devel/py-lazr.delegates/Makefile b/devel/py-lazr.delegates/Makefile
index bf1603d6b861..acd12dd22db7 100644
--- a/devel/py-lazr.delegates/Makefile
+++ b/devel/py-lazr.delegates/Makefile
@@ -13,8 +13,8 @@ COMMENT= Easily write objects that delegate behavior
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
diff --git a/devel/py-libpeas/Makefile b/devel/py-libpeas/Makefile
index a9505d5acd4e..ab798f1a7cd5 100644
--- a/devel/py-libpeas/Makefile
+++ b/devel/py-libpeas/Makefile
@@ -1,22 +1,16 @@
# Created by: Koop Mast <kwm@FreeBSD.org>
# $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= python2
-
-BUILD_WRKSRC= ${WRKSRC}/loaders/python
-INSTALL_WRKSRC= ${WRKSRC}/loaders/python
+LIBPEAS_SLAVE= 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"
diff --git a/devel/py3-libpeas/pkg-plist b/devel/py-libpeas/pkg-plist-py3
index 6c9c9ecb5280..6c9c9ecb5280 100644
--- a/devel/py3-libpeas/pkg-plist
+++ b/devel/py-libpeas/pkg-plist-py3
diff --git a/devel/py-libplist/Makefile b/devel/py-libplist/Makefile
index 1d5a434f9db9..d06e9fbe3758 100644
--- a/devel/py-libplist/Makefile
+++ b/devel/py-libplist/Makefile
@@ -8,11 +8,11 @@ MAINTAINER= avilla@FreeBSD.org
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
diff --git a/devel/py-libtaxii/Makefile b/devel/py-libtaxii/Makefile
index d4b832811292..08610cd8851d 100644
--- a/devel/py-libtaxii/Makefile
+++ b/devel/py-libtaxii/Makefile
@@ -13,9 +13,9 @@ COMMENT= Python library for handling TAXII Messages and invoking TAXII Services
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
diff --git a/devel/py-libzfs/Makefile b/devel/py-libzfs/Makefile
index b9b94591335c..54215475b801 100644
--- a/devel/py-libzfs/Makefile
+++ b/devel/py-libzfs/Makefile
@@ -18,21 +18,15 @@ GH_ACCOUNT= freenas
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 <bsd.port.pre.mk>
-.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)
diff --git a/devel/py-linecache2/Makefile b/devel/py-linecache2/Makefile
index ebd6be6f4edd..9c07bd4f0ee3 100644
--- a/devel/py-linecache2/Makefile
+++ b/devel/py-linecache2/Makefile
@@ -12,8 +12,8 @@ COMMENT= New features in linecache backported to Python 2
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
diff --git a/devel/py-llfuse/Makefile b/devel/py-llfuse/Makefile
index 0c4a67b75003..e0315d0d1bc6 100644
--- a/devel/py-llfuse/Makefile
+++ b/devel/py-llfuse/Makefile
@@ -14,7 +14,7 @@ LICENSE= LGPL20+
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:
diff --git a/devel/py-llvmlite/Makefile b/devel/py-llvmlite/Makefile
index cc994b97e53e..215f798888be 100644
--- a/devel/py-llvmlite/Makefile
+++ b/devel/py-llvmlite/Makefile
@@ -27,7 +27,7 @@ LLVM_VER= 39
# 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}
diff --git a/devel/py-lockfile/Makefile b/devel/py-lockfile/Makefile
index e4e5feb77d84..1a314e322aeb 100644
--- a/devel/py-lockfile/Makefile
+++ b/devel/py-lockfile/Makefile
@@ -13,8 +13,8 @@ COMMENT= Platform-independent file locking module
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
diff --git a/devel/py-log4py/Makefile b/devel/py-log4py/Makefile
index d749b6214370..631448291fc2 100644
--- a/devel/py-log4py/Makefile
+++ b/devel/py-log4py/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python logging module
LICENSE= MIT
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS
diff --git a/devel/py-logan/Makefile b/devel/py-logan/Makefile
index e97029354ac0..d39904e16c9a 100644
--- a/devel/py-logan/Makefile
+++ b/devel/py-logan/Makefile
@@ -11,10 +11,10 @@ COMMENT= Logan is a toolkit for running standalone Django applications
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
diff --git a/devel/py-logfury/Makefile b/devel/py-logfury/Makefile
index ec1ddc7a29ed..cbf7e3927bfc 100644
--- a/devel/py-logfury/Makefile
+++ b/devel/py-logfury/Makefile
@@ -12,8 +12,8 @@ COMMENT= Toolkit for logging of library method calls
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
diff --git a/devel/py-logilab-common/Makefile b/devel/py-logilab-common/Makefile
index 75786bd15c6d..6eff9f6446cc 100644
--- a/devel/py-logilab-common/Makefile
+++ b/devel/py-logilab-common/Makefile
@@ -13,8 +13,8 @@ COMMENT= Common low-level libraries shared among logilab projects
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
diff --git a/devel/py-louie/Makefile b/devel/py-louie/Makefile
index ef6dd9b3f150..f8690f69f761 100644
--- a/devel/py-louie/Makefile
+++ b/devel/py-louie/Makefile
@@ -12,9 +12,9 @@ COMMENT= Signal dispatching mechanism
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
diff --git a/devel/py-lxml/Makefile b/devel/py-lxml/Makefile
index 89c8a9659198..b23efd8ebe7c 100644
--- a/devel/py-lxml/Makefile
+++ b/devel/py-lxml/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/doc/licenses/BSD.txt
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
diff --git a/devel/py-manuel/Makefile b/devel/py-manuel/Makefile
index 47cd126d704d..c36fa46a7ad6 100644
--- a/devel/py-manuel/Makefile
+++ b/devel/py-manuel/Makefile
@@ -13,7 +13,7 @@ COMMENT= Lets you build tested documentation
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
diff --git a/devel/py-mccabe/Makefile b/devel/py-mccabe/Makefile
index dd4c1a99cc58..8e7e09cfe45d 100644
--- a/devel/py-mccabe/Makefile
+++ b/devel/py-mccabe/Makefile
@@ -13,9 +13,9 @@ COMMENT= Ned's script to check McCabe complexity
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
diff --git a/devel/py-mdv/Makefile b/devel/py-mdv/Makefile
index c96126e318c5..315c31d0fc06 100644
--- a/devel/py-mdv/Makefile
+++ b/devel/py-mdv/Makefile
@@ -13,9 +13,9 @@ COMMENT= Terminal markdown viewer
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
diff --git a/devel/py-meliae/Makefile b/devel/py-meliae/Makefile
index f5bce1d013f8..d3fdf5cd2dd3 100644
--- a/devel/py-meliae/Makefile
+++ b/devel/py-meliae/Makefile
@@ -13,10 +13,8 @@ COMMENT= Python Memory Usage Analyzer
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)
diff --git a/devel/py-memory_profiler/Makefile b/devel/py-memory_profiler/Makefile
index 20d616a58e4c..6b6dc7c2f66d 100644
--- a/devel/py-memory_profiler/Makefile
+++ b/devel/py-memory_profiler/Makefile
@@ -16,7 +16,7 @@ OPTIONS_DEFINE= PSUTIL
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
diff --git a/devel/py-microversion-parse/Makefile b/devel/py-microversion-parse/Makefile
index 53ec35d53747..3bc1bb305e47 100644
--- a/devel/py-microversion-parse/Makefile
+++ b/devel/py-microversion-parse/Makefile
@@ -13,7 +13,7 @@ COMMENT= Openstack microversion header parser
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
diff --git a/devel/py-minimongo/Makefile b/devel/py-minimongo/Makefile
index 2713e48aac42..02554e3823ba 100644
--- a/devel/py-minimongo/Makefile
+++ b/devel/py-minimongo/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-mock/Makefile b/devel/py-mock/Makefile
index 6beab0dc8d0b..a24ad1234985 100644
--- a/devel/py-mock/Makefile
+++ b/devel/py-mock/Makefile
@@ -13,19 +13,19 @@ COMMENT= Mock unit tests for Python
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 <bsd.port.pre.mk>
.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:
diff --git a/devel/py-mongoengine/Makefile b/devel/py-mongoengine/Makefile
index ccd4ab8e85e9..672e01add7b9 100644
--- a/devel/py-mongoengine/Makefile
+++ b/devel/py-mongoengine/Makefile
@@ -12,9 +12,9 @@ COMMENT= Object-Document-Mapper for working with MongoDB
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
diff --git a/devel/py-mwlib.ext/Makefile b/devel/py-mwlib.ext/Makefile
index 08dd2be09703..60cfe8cf03ee 100644
--- a/devel/py-mwlib.ext/Makefile
+++ b/devel/py-mwlib.ext/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Provide Dependencies for mwlib
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-mwlib.rl/Makefile b/devel/py-mwlib.rl/Makefile
index 05ab2b73f0f5..d2a3576799f9 100644
--- a/devel/py-mwlib.rl/Makefile
+++ b/devel/py-mwlib.rl/Makefile
@@ -14,13 +14,13 @@ LICENSE= BSD3CLAUSE
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 <bsd.port.mk>
diff --git a/devel/py-mwlib/Makefile b/devel/py-mwlib/Makefile
index b79e86028999..b704f5307a3d 100644
--- a/devel/py-mwlib/Makefile
+++ b/devel/py-mwlib/Makefile
@@ -13,25 +13,25 @@ COMMENT= Python's MediaWiki Parser and Utility Library
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 \
diff --git a/devel/py-mx-experimental/Makefile b/devel/py-mx-experimental/Makefile
index 4bd7b4b33cd2..ceeb4e1c064a 100644
--- a/devel/py-mx-experimental/Makefile
+++ b/devel/py-mx-experimental/Makefile
@@ -13,9 +13,9 @@ MAINTAINER= sergio@softshark.org
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
diff --git a/devel/py-mypy/Makefile b/devel/py-mypy/Makefile
index 7fca139ab937..099b498befad 100644
--- a/devel/py-mypy/Makefile
+++ b/devel/py-mypy/Makefile
@@ -13,7 +13,7 @@ COMMENT= Optional static typing for Python
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 @@ SHEBANG_FILES= typeshed/tests/pytype_test.py
.include <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
diff --git a/devel/py-nagioscheck/Makefile b/devel/py-nagioscheck/Makefile
index 557e77e5609b..ac2670c81a84 100644
--- a/devel/py-nagioscheck/Makefile
+++ b/devel/py-nagioscheck/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= python@FreeBSD.org
COMMENT= Class library for writing Nagios plugins
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-natsort/Makefile b/devel/py-natsort/Makefile
index 8c25b36fdce5..3ad4eff79d00 100644
--- a/devel/py-natsort/Makefile
+++ b/devel/py-natsort/Makefile
@@ -12,13 +12,13 @@ COMMENT= Natural sorting for python
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
diff --git a/devel/py-nbconvert/Makefile b/devel/py-nbconvert/Makefile
index 275dbfda6004..41249f8582d2 100644
--- a/devel/py-nbconvert/Makefile
+++ b/devel/py-nbconvert/Makefile
@@ -12,17 +12,17 @@ COMMENT= Converting Jupyter Notebooks
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
diff --git a/devel/py-nbformat/Makefile b/devel/py-nbformat/Makefile
index 573e41e96d3a..c52e3a197484 100644
--- a/devel/py-nbformat/Makefile
+++ b/devel/py-nbformat/Makefile
@@ -12,13 +12,13 @@ COMMENT= Jupyter Notebook format
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
diff --git a/devel/py-ncurses/Makefile b/devel/py-ncurses/Makefile
index 007e5efb2d64..cfa6ce2ea7b1 100644
--- a/devel/py-ncurses/Makefile
+++ b/devel/py-ncurses/Makefile
@@ -15,7 +15,7 @@ COMMENT= Ncurses binding for Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-USES= ncurses python
+USES= ncurses python:2.7
USE_PYTHON= distutils autoplist
post-patch:
diff --git a/devel/py-nose-cov/Makefile b/devel/py-nose-cov/Makefile
index 801c7566a286..9c6a6d474a9e 100644
--- a/devel/py-nose-cov/Makefile
+++ b/devel/py-nose-cov/Makefile
@@ -13,7 +13,7 @@ COMMENT= Nose plugin for coverage reporting
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
diff --git a/devel/py-nose/Makefile b/devel/py-nose/Makefile
index 1b736e6cd2fa..bfdf6742b28f 100644
--- a/devel/py-nose/Makefile
+++ b/devel/py-nose/Makefile
@@ -13,7 +13,7 @@ COMMENT= Discovery-based unittest extension
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/lgpl.txt
-USES?= python
+USES= python
USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.pre.mk>
diff --git a/devel/py-nose2/Makefile b/devel/py-nose2/Makefile
index 2834ccccbbf2..a65367a49d84 100644
--- a/devel/py-nose2/Makefile
+++ b/devel/py-nose2/Makefile
@@ -12,8 +12,8 @@ COMMENT= Next generations of nicer testing for Python
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
diff --git a/devel/py-noseofyeti/Makefile b/devel/py-noseofyeti/Makefile
index 08739bc57121..6f0fa2ac7b67 100644
--- a/devel/py-noseofyeti/Makefile
+++ b/devel/py-noseofyeti/Makefile
@@ -8,21 +8,21 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-notifier/Makefile b/devel/py-notifier/Makefile
index 5c17a299e519..c335850edc95 100644
--- a/devel/py-notifier/Makefile
+++ b/devel/py-notifier/Makefile
@@ -14,7 +14,7 @@ COMMENT= Generic notifier/event scheduler abstraction
LICENSE= LGPL20
-USES= python shebangfix
+USES= python:2.7 shebangfix
SHEBANG_FILES= examples/*.py
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= pynotifier
diff --git a/devel/py-notify/Makefile b/devel/py-notify/Makefile
index c7c9f3bf127f..85b415970807 100644
--- a/devel/py-notify/Makefile
+++ b/devel/py-notify/Makefile
@@ -17,6 +17,7 @@ LIB_DEPENDS= libnotify.so:devel/libnotify
USES= gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2
USE_GNOME= pygtk2
+USE_PYTHON= flavors
INSTALL_TARGET= install-strip
GNU_CONFIGURE= yes
diff --git a/devel/py-numba/Makefile b/devel/py-numba/Makefile
index f40ebeeac9c1..7674d537f5a0 100644
--- a/devel/py-numba/Makefile
+++ b/devel/py-numba/Makefile
@@ -14,8 +14,8 @@ COMMENT= Optimizing compiler for Python using LLVM
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 @@ USE_PYTHON= distutils autoplist
# 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 <bsd.port.post.mk>
diff --git a/devel/py-omnijson/Makefile b/devel/py-omnijson/Makefile
index 4580119c2a7f..6697a87c63b2 100644
--- a/devel/py-omnijson/Makefile
+++ b/devel/py-omnijson/Makefile
@@ -14,7 +14,7 @@ COMMENT= Wraps the best Python JSON installed
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
diff --git a/devel/py-openstacksdk/Makefile b/devel/py-openstacksdk/Makefile
index 8640f1f4fee3..60b7880c22cc 100644
--- a/devel/py-openstacksdk/Makefile
+++ b/devel/py-openstacksdk/Makefile
@@ -12,11 +12,11 @@ COMMENT= Unified SDK for OpenStack
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
diff --git a/devel/py-option_merge/Makefile b/devel/py-option_merge/Makefile
index 05fd51367929..c2da04b342ea 100644
--- a/devel/py-option_merge/Makefile
+++ b/devel/py-option_merge/Makefile
@@ -8,14 +8,14 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile
index 5543152142fe..63f05cd538a7 100644
--- a/devel/py-orbit/Makefile
+++ b/devel/py-orbit/Makefile
@@ -16,8 +16,9 @@ COMMENT= Python bindings for ORBit2
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
diff --git a/devel/py-ordered-set/Makefile b/devel/py-ordered-set/Makefile
index 02e5fafe5311..f0b580f38922 100644
--- a/devel/py-ordered-set/Makefile
+++ b/devel/py-ordered-set/Makefile
@@ -13,7 +13,7 @@ COMMENT= MutableSet that remembers its order, so that every entry has an index
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
diff --git a/devel/py-os-brick/Makefile b/devel/py-os-brick/Makefile
index ebb8cfb6ea41..ad48b0666cc8 100644
--- a/devel/py-os-brick/Makefile
+++ b/devel/py-os-brick/Makefile
@@ -12,21 +12,21 @@ COMMENT= Openstack cinder brick library for managing local volume attaches
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
diff --git a/devel/py-os-client-config/Makefile b/devel/py-os-client-config/Makefile
index 09a093d16f02..8007ce01a7c5 100644
--- a/devel/py-os-client-config/Makefile
+++ b/devel/py-os-client-config/Makefile
@@ -12,11 +12,11 @@ COMMENT= OpenStack Client Configuation Library
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
diff --git a/devel/py-os-vif/Makefile b/devel/py-os-vif/Makefile
index af49ca10d0fe..0bc4a63c7fdd 100644
--- a/devel/py-os-vif/Makefile
+++ b/devel/py-os-vif/Makefile
@@ -13,16 +13,16 @@ COMMENT= Library for plugging and unplugging virtual interfaces in openstack
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
diff --git a/devel/py-os-win/Makefile b/devel/py-os-win/Makefile
index 68f0ade55898..f14d62fe0250 100644
--- a/devel/py-os-win/Makefile
+++ b/devel/py-os-win/Makefile
@@ -12,14 +12,14 @@ COMMENT= Windows / Hyper-V library for openstack projects
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
diff --git a/devel/py-osc-lib/Makefile b/devel/py-osc-lib/Makefile
index 7014f6204244..993de2dca46d 100644
--- a/devel/py-osc-lib/Makefile
+++ b/devel/py-osc-lib/Makefile
@@ -12,16 +12,16 @@ COMMENT= OpenStackClient plugin library support
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
diff --git a/devel/py-oslo.cache/Makefile b/devel/py-oslo.cache/Makefile
index f617ff4623d6..0888fbee8ead 100644
--- a/devel/py-oslo.cache/Makefile
+++ b/devel/py-oslo.cache/Makefile
@@ -12,13 +12,13 @@ COMMENT= Cache storage for OpenStack projects
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
diff --git a/devel/py-oslo.concurrency/Makefile b/devel/py-oslo.concurrency/Makefile
index 6e88005fcc5d..17b10ee77751 100644
--- a/devel/py-oslo.concurrency/Makefile
+++ b/devel/py-oslo.concurrency/Makefile
@@ -12,15 +12,15 @@ COMMENT= Oslo Concurrency library
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
diff --git a/devel/py-oslo.config/Makefile b/devel/py-oslo.config/Makefile
index 71d963aad4bf..0203165ecf5e 100644
--- a/devel/py-oslo.config/Makefile
+++ b/devel/py-oslo.config/Makefile
@@ -12,13 +12,13 @@ COMMENT= Oslo Configuration library
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
diff --git a/devel/py-oslo.context/Makefile b/devel/py-oslo.context/Makefile
index 3284a44ce3a1..8ab278652dff 100644
--- a/devel/py-oslo.context/Makefile
+++ b/devel/py-oslo.context/Makefile
@@ -12,9 +12,9 @@ COMMENT= Oslo Context library
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
diff --git a/devel/py-oslo.db/Makefile b/devel/py-oslo.db/Makefile
index c75bb2b8085c..4833f16fea35 100644
--- a/devel/py-oslo.db/Makefile
+++ b/devel/py-oslo.db/Makefile
@@ -12,17 +12,17 @@ COMMENT= Oslo Database library
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
diff --git a/devel/py-oslo.i18n/Makefile b/devel/py-oslo.i18n/Makefile
index 7aa35ca7953e..c49194ca2693 100644
--- a/devel/py-oslo.i18n/Makefile
+++ b/devel/py-oslo.i18n/Makefile
@@ -11,9 +11,9 @@ COMMENT= Oslo i18n library
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
diff --git a/devel/py-oslo.log/Makefile b/devel/py-oslo.log/Makefile
index ff8297380439..0da93b1aa9b3 100644
--- a/devel/py-oslo.log/Makefile
+++ b/devel/py-oslo.log/Makefile
@@ -12,16 +12,16 @@ COMMENT= Oslo Log library
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
diff --git a/devel/py-oslo.messaging/Makefile b/devel/py-oslo.messaging/Makefile
index 626cc3febd59..2935c54f5cc5 100644
--- a/devel/py-oslo.messaging/Makefile
+++ b/devel/py-oslo.messaging/Makefile
@@ -12,32 +12,32 @@ COMMENT= Oslo Messaging API
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
diff --git a/devel/py-oslo.middleware/Makefile b/devel/py-oslo.middleware/Makefile
index fdbf8f7c0c1f..1e7dadd4ab5e 100644
--- a/devel/py-oslo.middleware/Makefile
+++ b/devel/py-oslo.middleware/Makefile
@@ -12,17 +12,17 @@ COMMENT= Oslo Middleware library
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
diff --git a/devel/py-oslo.policy/Makefile b/devel/py-oslo.policy/Makefile
index 32790abe6426..7e13c0da5523 100644
--- a/devel/py-oslo.policy/Makefile
+++ b/devel/py-oslo.policy/Makefile
@@ -12,14 +12,14 @@ COMMENT= Oslo Policy library
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
diff --git a/devel/py-oslo.privsep/Makefile b/devel/py-oslo.privsep/Makefile
index 48c4a1081ba1..f98af36fa4a1 100644
--- a/devel/py-oslo.privsep/Makefile
+++ b/devel/py-oslo.privsep/Makefile
@@ -12,16 +12,16 @@ COMMENT= Openstack library for privilege separation
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
diff --git a/devel/py-oslo.reports/Makefile b/devel/py-oslo.reports/Makefile
index 79a4794aa735..8492df0c0f53 100644
--- a/devel/py-oslo.reports/Makefile
+++ b/devel/py-oslo.reports/Makefile
@@ -12,13 +12,13 @@ COMMENT= Oslo.reports library
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
diff --git a/devel/py-oslo.rootwrap/Makefile b/devel/py-oslo.rootwrap/Makefile
index 4d8a6953e8b4..035652dc2dd8 100644
--- a/devel/py-oslo.rootwrap/Makefile
+++ b/devel/py-oslo.rootwrap/Makefile
@@ -12,8 +12,8 @@ COMMENT= Oslo rootwrap
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
diff --git a/devel/py-oslo.serialization/Makefile b/devel/py-oslo.serialization/Makefile
index 8b3148dab504..e1861382ea23 100644
--- a/devel/py-oslo.serialization/Makefile
+++ b/devel/py-oslo.serialization/Makefile
@@ -12,11 +12,11 @@ COMMENT= Oslo Serialization library
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
diff --git a/devel/py-oslo.service/Makefile b/devel/py-oslo.service/Makefile
index 1a3583d0c161..24d71bcb19c3 100644
--- a/devel/py-oslo.service/Makefile
+++ b/devel/py-oslo.service/Makefile
@@ -12,20 +12,20 @@ COMMENT= Oslo.service library
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
diff --git a/devel/py-oslo.utils/Makefile b/devel/py-oslo.utils/Makefile
index 2ded48797f79..8042ca0bf95e 100644
--- a/devel/py-oslo.utils/Makefile
+++ b/devel/py-oslo.utils/Makefile
@@ -11,17 +11,17 @@ COMMENT= Oslo Utility library
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
diff --git a/devel/py-oslo.versionedobjects/Makefile b/devel/py-oslo.versionedobjects/Makefile
index 07e910f50597..7d72abf5588f 100644
--- a/devel/py-oslo.versionedobjects/Makefile
+++ b/devel/py-oslo.versionedobjects/Makefile
@@ -12,19 +12,19 @@ COMMENT= Oslo versioned objects library
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
diff --git a/devel/py-oslo.vmware/Makefile b/devel/py-oslo.vmware/Makefile
index fe20c2725c49..0334526d84f6 100644
--- a/devel/py-oslo.vmware/Makefile
+++ b/devel/py-oslo.vmware/Makefile
@@ -12,19 +12,19 @@ COMMENT= Oslo VMware library
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
diff --git a/devel/py-osprofiler/Makefile b/devel/py-osprofiler/Makefile
index 36bd39406bc2..4e5f6a7fa64f 100644
--- a/devel/py-osprofiler/Makefile
+++ b/devel/py-osprofiler/Makefile
@@ -10,15 +10,15 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-palm/Makefile b/devel/py-palm/Makefile
index 999fec9a821f..867b2ed13da4 100644
--- a/devel/py-palm/Makefile
+++ b/devel/py-palm/Makefile
@@ -13,8 +13,8 @@ COMMENT= Fast Protocol Buffer library for Python
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
diff --git a/devel/py-pathlib/Makefile b/devel/py-pathlib/Makefile
index d81ad75e2220..60eb0e4dfa35 100644
--- a/devel/py-pathlib/Makefile
+++ b/devel/py-pathlib/Makefile
@@ -17,7 +17,7 @@ USE_PYTHON= distutils autoplist
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 <bsd.port.options.mk>
diff --git a/devel/py-pathlib2/Makefile b/devel/py-pathlib2/Makefile
index 7a1c83056cce..ee606e303084 100644
--- a/devel/py-pathlib2/Makefile
+++ b/devel/py-pathlib2/Makefile
@@ -13,7 +13,7 @@ COMMENT= Object-oriented filesystem paths
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 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.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:
diff --git a/devel/py-pathtools/Makefile b/devel/py-pathtools/Makefile
index 2e0803377247..4252f4059085 100644
--- a/devel/py-pathtools/Makefile
+++ b/devel/py-pathtools/Makefile
@@ -20,11 +20,11 @@ USE_PYTHON= distutils autoplist
.include <bsd.port.options.mk>
.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} \
diff --git a/devel/py-pbr/Makefile b/devel/py-pbr/Makefile
index 7f4f576a6f32..74e0f87ab2b4 100644
--- a/devel/py-pbr/Makefile
+++ b/devel/py-pbr/Makefile
@@ -13,11 +13,11 @@ COMMENT= Python Build Reasonableness
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
diff --git a/devel/py-pefile/Makefile b/devel/py-pefile/Makefile
index 65e71c487b85..2dd627d1250c 100644
--- a/devel/py-pefile/Makefile
+++ b/devel/py-pefile/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python module to read and work with PE files
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
diff --git a/devel/py-pex/Makefile b/devel/py-pex/Makefile
index 5e8c4453ca24..9b61c1cb6cf1 100644
--- a/devel/py-pex/Makefile
+++ b/devel/py-pex/Makefile
@@ -12,7 +12,7 @@ COMMENT= PEX packaging toolchain
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
diff --git a/devel/py-phabricator/Makefile b/devel/py-phabricator/Makefile
index dd9c8e265535..f28cec843623 100644
--- a/devel/py-phabricator/Makefile
+++ b/devel/py-phabricator/Makefile
@@ -12,8 +12,8 @@ COMMENT= Phabricator API Bindings
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
diff --git a/devel/py-pid/Makefile b/devel/py-pid/Makefile
index 42e42703d19d..18724a68590b 100644
--- a/devel/py-pid/Makefile
+++ b/devel/py-pid/Makefile
@@ -12,7 +12,7 @@ COMMENT= Pidfile management for Python
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-pika-pool/Makefile b/devel/py-pika-pool/Makefile
index b8941d30df17..5450f11a31a8 100644
--- a/devel/py-pika-pool/Makefile
+++ b/devel/py-pika-pool/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-pinocchio/Makefile b/devel/py-pinocchio/Makefile
index 3c5cd37efe3e..5b2d81ea2587 100644
--- a/devel/py-pinocchio/Makefile
+++ b/devel/py-pinocchio/Makefile
@@ -11,7 +11,7 @@ COMMENT= Pinocchio plugins for the nose testing framework
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
diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile
index 4ccf8cfd15b4..0c461c1f2f7d 100644
--- a/devel/py-pip/Makefile
+++ b/devel/py-pip/Makefile
@@ -13,27 +13,27 @@ LICENSE= MIT
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
diff --git a/devel/py-plan/Makefile b/devel/py-plan/Makefile
index f461ae11c716..aca827c0ad93 100644
--- a/devel/py-plan/Makefile
+++ b/devel/py-plan/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python package for writing and deploying cron jobs
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
diff --git a/devel/py-pluggy/Makefile b/devel/py-pluggy/Makefile
index b2edd9dd21d6..890735908133 100644
--- a/devel/py-pluggy/Makefile
+++ b/devel/py-pluggy/Makefile
@@ -13,9 +13,9 @@ COMMENT= Plugin and hook calling mechanisms for Python
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
diff --git a/devel/py-ply/Makefile b/devel/py-ply/Makefile
index e66bcc0bd673..767bb87ef7b8 100644
--- a/devel/py-ply/Makefile
+++ b/devel/py-ply/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python Lex-Yacc
LICENSE= BSD3CLAUSE
-USES?= python
+USES= python
USES+= shebangfix
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
diff --git a/devel/py-positional/Makefile b/devel/py-positional/Makefile
index fffb55eb6943..761974a6d970 100644
--- a/devel/py-positional/Makefile
+++ b/devel/py-positional/Makefile
@@ -12,7 +12,7 @@ COMMENT= Library to enforce positional or key-word arguments
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
diff --git a/devel/py-pqueue/Makefile b/devel/py-pqueue/Makefile
index 75eb8c93f386..da17b0b7c77e 100644
--- a/devel/py-pqueue/Makefile
+++ b/devel/py-pqueue/Makefile
@@ -15,7 +15,7 @@ COMMENT= Fibonacci-Heap based Priority-Queue Extension for Python
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= python tar:bzip2
+USES= python:2.7 tar:bzip2
USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/PQueue
diff --git a/devel/py-pretend/Makefile b/devel/py-pretend/Makefile
index 58f762e380d2..e8fe307e11bb 100644
--- a/devel/py-pretend/Makefile
+++ b/devel/py-pretend/Makefile
@@ -13,9 +13,9 @@ COMMENT= Library for stubbing in Python
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
diff --git a/devel/py-prioritized_methods/Makefile b/devel/py-prioritized_methods/Makefile
index 81f390d99c44..a35b9b9c6340 100644
--- a/devel/py-prioritized_methods/Makefile
+++ b/devel/py-prioritized_methods/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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 <bsd.port.mk>
diff --git a/devel/py-prompt_toolkit/Makefile b/devel/py-prompt_toolkit/Makefile
index 0506f442fbb0..817c68a9adc7 100644
--- a/devel/py-prompt_toolkit/Makefile
+++ b/devel/py-prompt_toolkit/Makefile
@@ -13,13 +13,13 @@ COMMENT= Library for building powerful interactive command lines in Python
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 <bsd.port.mk>
diff --git a/devel/py-protobuf/Makefile b/devel/py-protobuf/Makefile
index 99e50a15a830..86e21eb07506 100644
--- a/devel/py-protobuf/Makefile
+++ b/devel/py-protobuf/Makefile
@@ -13,15 +13,15 @@ COMMENT= Google protobuf Python Client Library
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
diff --git a/devel/py-protocols-devel/Makefile b/devel/py-protocols-devel/Makefile
index 3a9ef90fa71a..2a68fcf70bcc 100644
--- a/devel/py-protocols-devel/Makefile
+++ b/devel/py-protocols-devel/Makefile
@@ -12,9 +12,9 @@ DISTNAME= ${PORTNAME}-1.0a0dev-r2302
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
diff --git a/devel/py-protocols/Makefile b/devel/py-protocols/Makefile
index 57b0808b534b..8141a6979b8d 100644
--- a/devel/py-protocols/Makefile
+++ b/devel/py-protocols/Makefile
@@ -12,7 +12,7 @@ DISTNAME= PyProtocols-${PORTVERSION}
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:
diff --git a/devel/py-ptrace/Makefile b/devel/py-ptrace/Makefile
index d8639bb3408d..0ce166662148 100644
--- a/devel/py-ptrace/Makefile
+++ b/devel/py-ptrace/Makefile
@@ -14,9 +14,9 @@ COMMENT= Python binding of ptrace
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}
diff --git a/devel/py-pudb/Makefile b/devel/py-pudb/Makefile
index 83c7f7d58e5f..31a9b855e59a 100644
--- a/devel/py-pudb/Makefile
+++ b/devel/py-pudb/Makefile
@@ -13,8 +13,8 @@ COMMENT= Full-screen, console-based Python debugger
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
diff --git a/devel/py-py/Makefile b/devel/py-py/Makefile
index 3b311279a2c9..341bab494742 100644
--- a/devel/py-py/Makefile
+++ b/devel/py-py/Makefile
@@ -13,10 +13,10 @@ COMMENT= Library with cross-python path, ini-parsing, io, code, log facilities
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:
diff --git a/devel/py-pyasn1-modules/Makefile b/devel/py-pyasn1-modules/Makefile
index b35e8573833a..9061a6f42c81 100644
--- a/devel/py-pyasn1-modules/Makefile
+++ b/devel/py-pyasn1-modules/Makefile
@@ -12,7 +12,7 @@ COMMENT= Collection of ASN.1 data structures for py-pyasn1
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
diff --git a/devel/py-pyasn1/Makefile b/devel/py-pyasn1/Makefile
index 4f68a9a5871d..c68dad6a56ed 100644
--- a/devel/py-pyasn1/Makefile
+++ b/devel/py-pyasn1/Makefile
@@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.rst
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= autoplist distutils
do-test:
diff --git a/devel/py-pycadf/Makefile b/devel/py-pycadf/Makefile
index fa3b86fc41b9..538025fb7248 100644
--- a/devel/py-pycadf/Makefile
+++ b/devel/py-pycadf/Makefile
@@ -10,12 +10,12 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-pycallgraph/Makefile b/devel/py-pycallgraph/Makefile
index eb7c2b947824..2e5e23d74848 100644
--- a/devel/py-pycallgraph/Makefile
+++ b/devel/py-pycallgraph/Makefile
@@ -17,10 +17,10 @@ LICENSE= GPLv2
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
diff --git a/devel/py-pycallgraph/pkg-plist b/devel/py-pycallgraph/pkg-plist
index d00387c14301..48008aa2857e 100644
--- a/devel/py-pycallgraph/pkg-plist
+++ b/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
diff --git a/devel/py-pycmd/Makefile b/devel/py-pycmd/Makefile
index 0b2ed678506c..da65f376893d 100644
--- a/devel/py-pycmd/Makefile
+++ b/devel/py-pycmd/Makefile
@@ -13,8 +13,8 @@ COMMENT= Tools for managing/searching Python related files
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
diff --git a/devel/py-pycodestyle/Makefile b/devel/py-pycodestyle/Makefile
index 3e52b82b34f8..f7083d5cd06c 100644
--- a/devel/py-pycodestyle/Makefile
+++ b/devel/py-pycodestyle/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python style guide checker
LICENSE= MIT # mentioned as "Expat"
-USES?= python
+USES= python
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
diff --git a/devel/py-pycparser/Makefile b/devel/py-pycparser/Makefile
index 5918e596a180..968cccfb5365 100644
--- a/devel/py-pycparser/Makefile
+++ b/devel/py-pycparser/Makefile
@@ -13,7 +13,7 @@ COMMENT= C parser in Python
LICENSE= BSD3CLAUSE
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/devel/py-pydenticon/Makefile b/devel/py-pydenticon/Makefile
index 76102fbe7126..eea2729cabf5 100644
--- a/devel/py-pydenticon/Makefile
+++ b/devel/py-pydenticon/Makefile
@@ -14,7 +14,7 @@ COMMENT= Library for generating identicons - an enhanced port of Sigil
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
diff --git a/devel/py-pydocstyle/Makefile b/devel/py-pydocstyle/Makefile
index 66e9874b57e1..628e9c402bed 100644
--- a/devel/py-pydocstyle/Makefile
+++ b/devel/py-pydocstyle/Makefile
@@ -14,10 +14,10 @@ COMMENT= Python docstring style checker
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
diff --git a/devel/py-pydrive/Makefile b/devel/py-pydrive/Makefile
index 20bf3d07709c..47a50b041a76 100644
--- a/devel/py-pydrive/Makefile
+++ b/devel/py-pydrive/Makefile
@@ -13,8 +13,8 @@ COMMENT= Google drive api made easy
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
diff --git a/devel/py-pyechonest/Makefile b/devel/py-pyechonest/Makefile
index cd963966e1ba..45bbcbb3b66a 100644
--- a/devel/py-pyechonest/Makefile
+++ b/devel/py-pyechonest/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python interface to The Echo Nest APIs
LICENSE= MIT
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/devel/py-pyface/Makefile b/devel/py-pyface/Makefile
index 29ef2edca4d3..b71accab15f9 100644
--- a/devel/py-pyface/Makefile
+++ b/devel/py-pyface/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE_EPL= ${WRKSRC}/image_LICENSE_Eclipse.txt
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
diff --git a/devel/py-pyflakes/Makefile b/devel/py-pyflakes/Makefile
index f18c4888956f..db77b0be5d37 100644
--- a/devel/py-pyflakes/Makefile
+++ b/devel/py-pyflakes/Makefile
@@ -13,7 +13,7 @@ COMMENT= Passive checker of Python programs
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES?= python
+USES= python
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
diff --git a/devel/py-pygdbmi/Makefile b/devel/py-pygdbmi/Makefile
index 2edec9b09b3d..6bacd8d03e6b 100644
--- a/devel/py-pygdbmi/Makefile
+++ b/devel/py-pygdbmi/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
GH_ACCOUNT= cs01
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/devel/py-pygit2/Makefile b/devel/py-pygit2/Makefile
index 8671a0aa0962..7cef004ddf20 100644
--- a/devel/py-pygit2/Makefile
+++ b/devel/py-pygit2/Makefile
@@ -13,12 +13,12 @@ COMMENT= Python bindings for libgit2
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
diff --git a/devel/py-pyicu/Makefile b/devel/py-pyicu/Makefile
index b4364c55d398..a9adcd6d75fa 100644
--- a/devel/py-pyicu/Makefile
+++ b/devel/py-pyicu/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libicudata.so:devel/icu
-USES?= python
+USES= python
USE_CXXSTD= c++11
USE_PYTHON= distutils autoplist
diff --git a/devel/py-pyinotify/Makefile b/devel/py-pyinotify/Makefile
index 691d423c5673..57b0f5b2d2f2 100644
--- a/devel/py-pyinotify/Makefile
+++ b/devel/py-pyinotify/Makefile
@@ -14,6 +14,6 @@ LICENSE= MIT
LIB_DEPENDS= libinotify.so:devel/libinotify
USES= python
-USE_PYTHON= distutils
+USE_PYTHON= distutils py3kplist
.include <bsd.port.mk>
diff --git a/devel/py-pyinstaller/Makefile b/devel/py-pyinstaller/Makefile
index 19517332b42d..14f9e729f190 100644
--- a/devel/py-pyinstaller/Makefile
+++ b/devel/py-pyinstaller/Makefile
@@ -22,7 +22,7 @@ BROKEN_sparc64= Does not compile: error: size of array stb__testsize2_uinta is
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}
diff --git a/devel/py-pykde4/Makefile b/devel/py-pykde4/Makefile
index d378bfa55218..3eeb06ec4a00 100644
--- a/devel/py-pykde4/Makefile
+++ b/devel/py-pykde4/Makefile
@@ -17,6 +17,7 @@ USE_KDE= kdelibs nepomuk-core okular pimlibs \
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
diff --git a/devel/py-pyke/Makefile b/devel/py-pyke/Makefile
index a27178a55210..c9db84090920 100644
--- a/devel/py-pyke/Makefile
+++ b/devel/py-pyke/Makefile
@@ -12,9 +12,9 @@ COMMENT= Python Knowledge Engine
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
diff --git a/devel/py-pylru-cache/Makefile b/devel/py-pylru-cache/Makefile
index 2789f084302f..3ca26dd7a81d 100644
--- a/devel/py-pylru-cache/Makefile
+++ b/devel/py-pylru-cache/Makefile
@@ -14,7 +14,7 @@ COMMENT= LRU cache for Python
LICENSE= BSD3CLAUSE GPLv3
LICENSE_COMB= dual
-USES?= python
+USES= python
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-pymarc/Makefile b/devel/py-pymarc/Makefile
index cddf983326a2..0cff5e9ebf4a 100644
--- a/devel/py-pymarc/Makefile
+++ b/devel/py-pymarc/Makefile
@@ -13,7 +13,7 @@ COMMENT= Read Write And Modify MARC Bibliographic Data
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
diff --git a/devel/py-pyopencl/Makefile b/devel/py-pyopencl/Makefile
index ac203b12060d..e9b55d43d38c 100644
--- a/devel/py-pyopencl/Makefile
+++ b/devel/py-pyopencl/Makefile
@@ -14,18 +14,18 @@ LICENSE= MIT
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" \
diff --git a/devel/py-pyqi/Makefile b/devel/py-pyqi/Makefile
index 6c5da65945a7..24459bf9d8e4 100644
--- a/devel/py-pyqi/Makefile
+++ b/devel/py-pyqi/Makefile
@@ -14,6 +14,6 @@ LICENSE= BSD3CLAUSE
NO_ARCH= yes
USE_PYTHON= autoplist distutils
-USES= pgsql python
+USES= pgsql python:2.7
.include <bsd.port.mk>
diff --git a/devel/py-pyral/Makefile b/devel/py-pyral/Makefile
index 0fb781f9f820..f1eacd1a26f3 100644
--- a/devel/py-pyral/Makefile
+++ b/devel/py-pyral/Makefile
@@ -12,8 +12,8 @@ COMMENT= Rally REST Tookit for Python
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
diff --git a/devel/py-pyrfc3339/Makefile b/devel/py-pyrfc3339/Makefile
index 0c63498694ad..c86e01301aac 100644
--- a/devel/py-pyrfc3339/Makefile
+++ b/devel/py-pyrfc3339/Makefile
@@ -14,8 +14,8 @@ COMMENT= Generate and parse RFC 3339 timestamps
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
diff --git a/devel/py-pyro/Makefile b/devel/py-pyro/Makefile
index 89aaa80ca590..29e7ecf5ef5d 100644
--- a/devel/py-pyro/Makefile
+++ b/devel/py-pyro/Makefile
@@ -14,7 +14,7 @@ COMMENT= Distributed Object Middleware for Python(IPC/RPC)
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 @@ PORTEXAMPLES= *
.include <bsd.port.pre.mk>
.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:
diff --git a/devel/py-pystorm/Makefile b/devel/py-pystorm/Makefile
index d1510e094da9..0e55dea110f1 100644
--- a/devel/py-pystorm/Makefile
+++ b/devel/py-pystorm/Makefile
@@ -13,12 +13,12 @@ COMMENT= Battle-tested Apache Storm Multi-Lang implementation for Python
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
diff --git a/devel/py-pyte/Makefile b/devel/py-pyte/Makefile
index 378f34164d43..a8a9c6923555 100644
--- a/devel/py-pyte/Makefile
+++ b/devel/py-pyte/Makefile
@@ -11,8 +11,8 @@ COMMENT= Simple VTXXX-compatible terminal emulator
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
diff --git a/devel/py-pytest-asyncio/Makefile b/devel/py-pytest-asyncio/Makefile
index 215fe5eb2a44..7c26015eae74 100644
--- a/devel/py-pytest-asyncio/Makefile
+++ b/devel/py-pytest-asyncio/Makefile
@@ -11,7 +11,7 @@ COMMENT= Py.test plugin providing fixtures and markers for asyncio
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+
diff --git a/devel/py-pytest-cache/Makefile b/devel/py-pytest-cache/Makefile
index 1645d20e997a..3d83008527b6 100644
--- a/devel/py-pytest-cache/Makefile
+++ b/devel/py-pytest-cache/Makefile
@@ -13,9 +13,9 @@ COMMENT= Pytest plugin with mechanisms for caching across test runs
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
diff --git a/devel/py-pytest-capturelog/Makefile b/devel/py-pytest-capturelog/Makefile
index 1c2a2060bf4e..ece18d7398d3 100644
--- a/devel/py-pytest-capturelog/Makefile
+++ b/devel/py-pytest-capturelog/Makefile
@@ -12,9 +12,9 @@ COMMENT= Py.test plugin to capture log messages
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 <bsd.port.mk>
diff --git a/devel/py-pytest-cov/Makefile b/devel/py-pytest-cov/Makefile
index 7ace9c9b8a94..4f7fd25a8038 100644
--- a/devel/py-pytest-cov/Makefile
+++ b/devel/py-pytest-cov/Makefile
@@ -12,8 +12,8 @@ COMMENT= Pytest plugin for measuring coverage
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
diff --git a/devel/py-pytest-django/Makefile b/devel/py-pytest-django/Makefile
index 7109012d8225..765678b70e07 100644
--- a/devel/py-pytest-django/Makefile
+++ b/devel/py-pytest-django/Makefile
@@ -10,14 +10,14 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-pytest-localserver/Makefile b/devel/py-pytest-localserver/Makefile
index 089f82d0e3a6..de0c73c1e64b 100644
--- a/devel/py-pytest-localserver/Makefile
+++ b/devel/py-pytest-localserver/Makefile
@@ -13,10 +13,10 @@ COMMENT= Py.test Plugin to test server connections locally
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
diff --git a/devel/py-pytest-mock/Makefile b/devel/py-pytest-mock/Makefile
index aa0df3097d4d..e043ddae5ddd 100644
--- a/devel/py-pytest-mock/Makefile
+++ b/devel/py-pytest-mock/Makefile
@@ -12,8 +12,8 @@ COMMENT= Thin wrapper around the mock package for easier use with py.test
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
diff --git a/devel/py-pytest-runner/Makefile b/devel/py-pytest-runner/Makefile
index 6f5263287569..da2160b04b49 100644
--- a/devel/py-pytest-runner/Makefile
+++ b/devel/py-pytest-runner/Makefile
@@ -12,9 +12,9 @@ COMMENT= Test support for pytest runner in setup.py
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
diff --git a/devel/py-pytest-timeout/Makefile b/devel/py-pytest-timeout/Makefile
index 4bcb30745bf3..e06a87f64c23 100644
--- a/devel/py-pytest-timeout/Makefile
+++ b/devel/py-pytest-timeout/Makefile
@@ -13,12 +13,12 @@ COMMENT= Pytest plugin to abort hanging tests
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}
diff --git a/devel/py-pytest-tornado/Makefile b/devel/py-pytest-tornado/Makefile
index 9d2fa5d6a23c..9431017264e3 100644
--- a/devel/py-pytest-tornado/Makefile
+++ b/devel/py-pytest-tornado/Makefile
@@ -11,8 +11,8 @@ COMMENT= Py.test plugin providing fixtures and markers for tornado
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
diff --git a/devel/py-pytest-xdist/Makefile b/devel/py-pytest-xdist/Makefile
index f35a8e1316b6..375dec838403 100644
--- a/devel/py-pytest-xdist/Makefile
+++ b/devel/py-pytest-xdist/Makefile
@@ -13,14 +13,14 @@ COMMENT= Py.test plugin for distributed testing and loop-on-failing modes
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
-
-USES?= python
+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
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
diff --git a/devel/py-pytest/Makefile b/devel/py-pytest/Makefile
index a56d802f61b2..18bef8562adc 100644
--- a/devel/py-pytest/Makefile
+++ b/devel/py-pytest/Makefile
@@ -12,17 +12,17 @@ COMMENT= Simple powerful testing with Python
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:
diff --git a/devel/py-python-bugzilla/Makefile b/devel/py-python-bugzilla/Makefile
index fd4c241b1f35..b52157618165 100644
--- a/devel/py-python-bugzilla/Makefile
+++ b/devel/py-python-bugzilla/Makefile
@@ -13,7 +13,7 @@ COMMENT= Bugzilla XMLRPC access module
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
diff --git a/devel/py-python-dtrace/Makefile b/devel/py-python-dtrace/Makefile
index 4844cb3213ac..4f913c00759a 100644
--- a/devel/py-python-dtrace/Makefile
+++ b/devel/py-python-dtrace/Makefile
@@ -11,10 +11,7 @@ COMMENT= DTrace consumer for Python based on libdtrace
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 <bsd.port.mk>
diff --git a/devel/py-python-gist/Makefile b/devel/py-python-gist/Makefile
index 521ca2bfd137..5f2df583ccd5 100644
--- a/devel/py-python-gist/Makefile
+++ b/devel/py-python-gist/Makefile
@@ -12,12 +12,12 @@ COMMENT= Command line interface for working with github gists
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
diff --git a/devel/py-python-jenkins/Makefile b/devel/py-python-jenkins/Makefile
index b31619393c70..26363c9b7564 100644
--- a/devel/py-python-jenkins/Makefile
+++ b/devel/py-python-jenkins/Makefile
@@ -12,10 +12,10 @@ COMMENT= Python bindings for the remote Jenkins API
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
diff --git a/devel/py-python-magic/Makefile b/devel/py-python-magic/Makefile
index 2b45ea43e8ec..d68a8f1984c0 100644
--- a/devel/py-python-magic/Makefile
+++ b/devel/py-python-magic/Makefile
@@ -12,7 +12,7 @@ COMMENT= File type identification using libmagic
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES?= python
+USES= python
USE_GITHUB= yes
USE_PYTHON= autoplist distutils
diff --git a/devel/py-pytools/Makefile b/devel/py-pytools/Makefile
index fe9745c55546..fe03615544e5 100644
--- a/devel/py-pytools/Makefile
+++ b/devel/py-pytools/Makefile
@@ -12,10 +12,10 @@ COMMENT= Collection of tools for Python
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
diff --git a/devel/py-pytz/Makefile b/devel/py-pytz/Makefile
index c9813289ee46..c0631f7f1c73 100644
--- a/devel/py-pytz/Makefile
+++ b/devel/py-pytz/Makefile
@@ -13,7 +13,7 @@ COMMENT= World Timezone Definitions for Python
LICENSE= MIT
-USES?= python zip
+USES= python zip
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/devel/py-pyutil/Makefile b/devel/py-pyutil/Makefile
index 7506e0940044..7d08795601c8 100644
--- a/devel/py-pyutil/Makefile
+++ b/devel/py-pyutil/Makefile
@@ -12,7 +12,7 @@ COMMENT= Collection of mature utilities for Python programmers
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
diff --git a/devel/py-pyvalid/Makefile b/devel/py-pyvalid/Makefile
index ba99b28a1e66..8e54e98f02bb 100644
--- a/devel/py-pyvalid/Makefile
+++ b/devel/py-pyvalid/Makefile
@@ -11,9 +11,9 @@ COMMENT= Python validation tool
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 <bsd.port.mk>
diff --git a/devel/py-pyvisa-py/Makefile b/devel/py-pyvisa-py/Makefile
index ef86570e9b08..3ce117846f70 100644
--- a/devel/py-pyvisa-py/Makefile
+++ b/devel/py-pyvisa-py/Makefile
@@ -23,9 +23,9 @@ DRIVERS_DESC= Additional modules
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 <bsd.port.mk>
diff --git a/devel/py-pyvisa/Makefile b/devel/py-pyvisa/Makefile
index f9983cf42091..819ff4e6812b 100644
--- a/devel/py-pyvisa/Makefile
+++ b/devel/py-pyvisa/Makefile
@@ -11,7 +11,7 @@ COMMENT= Python VISA bindings for GPIB, RS232, and USB instruments
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 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
diff --git a/devel/py-pyxb/Makefile b/devel/py-pyxb/Makefile
index 368f4583cfca..eae50955c593 100644
--- a/devel/py-pyxb/Makefile
+++ b/devel/py-pyxb/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python XML schema bindings
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
diff --git a/devel/py-pyxml2obj/Makefile b/devel/py-pyxml2obj/Makefile
index fdba35ef456c..e52b3bbe9f7c 100644
--- a/devel/py-pyxml2obj/Makefile
+++ b/devel/py-pyxml2obj/Makefile
@@ -12,7 +12,7 @@ COMMENT= Simple way to convert xml to python object and vice versa
LICENSE= MIT
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-qpid/Makefile b/devel/py-qpid/Makefile
index 1b732d64949f..6ec45a05b840 100644
--- a/devel/py-qpid/Makefile
+++ b/devel/py-qpid/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python library for qpid, a connection-oriented messaging API
LICENSE= APACHE20
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-qserve/Makefile b/devel/py-qserve/Makefile
index 1261ed09b657..f1552875ed79 100644
--- a/devel/py-qserve/Makefile
+++ b/devel/py-qserve/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Job queue server
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile
index 0df678401a1e..2b427252ce72 100644
--- a/devel/py-qt4-assistant/Makefile
+++ b/devel/py-qt4-assistant/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
USES= python pyqt:4
USE_PYQT= sip_build core_run
+USE_PYTHON= flavors
USE_QT4= assistantclient corelib gui network \
moc_build qmake_build
diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile
index cffd3bd484ee..1d42739b16a5 100644
--- a/devel/py-qt4-core/Makefile
+++ b/devel/py-qt4-core/Makefile
@@ -13,7 +13,7 @@ CONFIGURE_ARGS= --enable QtCore
PYQT_DIST= yes
USES= python pyqt:4
-USE_PYTHON= py3kplist
+USE_PYTHON= py3kplist flavors
USE_PYQT= sip
USE_QT4= corelib qmake_build moc_build
diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile
index 976278a10700..e938e345fd85 100644
--- a/devel/py-qt4-dbus/Makefile
+++ b/devel/py-qt4-dbus/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
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
diff --git a/devel/py-qt4-dbussupport/Makefile b/devel/py-qt4-dbussupport/Makefile
index 102b057aac9d..08c896f2d097 100644
--- a/devel/py-qt4-dbussupport/Makefile
+++ b/devel/py-qt4-dbussupport/Makefile
@@ -7,14 +7,16 @@ CATEGORIES= devel python
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 @@ INSTALL_WRKSRC= ${WRKSRC}/dbus
PLIST_FILES= %%PYTHON_SITELIBDIR%%/dbus/mainloop/qt.so
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-qt4-declarative/Makefile b/devel/py-qt4-declarative/Makefile
index f3d663ed0f0b..8e742a3067f3 100644
--- a/devel/py-qt4-declarative/Makefile
+++ b/devel/py-qt4-declarative/Makefile
@@ -11,6 +11,7 @@ PYQT_DIST= yes
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
diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile
index 44b0d528eb1b..bd565263ec10 100644
--- a/devel/py-qt4-designer/Makefile
+++ b/devel/py-qt4-designer/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
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
diff --git a/devel/py-qt4-designerplugin/Makefile b/devel/py-qt4-designerplugin/Makefile
index b6d74e49aba1..50aee9ecbe0e 100644
--- a/devel/py-qt4-designerplugin/Makefile
+++ b/devel/py-qt4-designerplugin/Makefile
@@ -17,6 +17,7 @@ PYQT_DIST= yes
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
diff --git a/devel/py-qt4-help/Makefile b/devel/py-qt4-help/Makefile
index 03c6e732c21b..bc6f9be9bf00 100644
--- a/devel/py-qt4-help/Makefile
+++ b/devel/py-qt4-help/Makefile
@@ -11,6 +11,7 @@ PYQT_DIST= yes
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
diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile
index 63b527bd6cbc..1a1a5ed8c134 100644
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@@ -22,6 +22,7 @@ QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS.
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 @@ DEBUG_CONFIGURE_ON= --debug --trace
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
diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile
index 420d33826d25..4ee99032fade 100644
--- a/devel/py-qt4-script/Makefile
+++ b/devel/py-qt4-script/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
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
diff --git a/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile
index 2d78cd589cd7..11e6440123c1 100644
--- a/devel/py-qt4-scripttools/Makefile
+++ b/devel/py-qt4-scripttools/Makefile
@@ -12,6 +12,7 @@ PYQT_DIST= yes
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
diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile
index 96470d6182b9..7977dc1ea657 100644
--- a/devel/py-qt4-test/Makefile
+++ b/devel/py-qt4-test/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
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
diff --git a/devel/py-qt4/Makefile b/devel/py-qt4/Makefile
index 74a68ad050b0..6478f59ed947 100644
--- a/devel/py-qt4/Makefile
+++ b/devel/py-qt4/Makefile
@@ -10,6 +10,7 @@ MAINTAINER= kde@FreeBSD.org
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 \
diff --git a/devel/py-qt5-core/Makefile b/devel/py-qt5-core/Makefile
index ce29992893d1..90e1fad30cd0 100644
--- a/devel/py-qt5-core/Makefile
+++ b/devel/py-qt5-core/Makefile
@@ -10,7 +10,7 @@ CONFIGURE_ARGS= --enable QtCore
PYQT_DIST= yes
USES= python pyqt:5
-USE_PYTHON= py3kplist
+USE_PYTHON= py3kplist flavors
USE_PYQT= sip_build
USE_QT5= core qmake_build
diff --git a/devel/py-qt5-dbus/Makefile b/devel/py-qt5-dbus/Makefile
index 96038d60cb24..8062d95edcc8 100644
--- a/devel/py-qt5-dbus/Makefile
+++ b/devel/py-qt5-dbus/Makefile
@@ -11,6 +11,7 @@ PYQT_DIST= yes
USES= python pyqt:5
USE_PYQT= sip_build core_run
+USE_PYTHON= flavors
USE_QT5= core dbus qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/devel/py-qt5-dbussupport/Makefile b/devel/py-qt5-dbussupport/Makefile
index d3442d8b5546..c2ac2179f636 100644
--- a/devel/py-qt5-dbussupport/Makefile
+++ b/devel/py-qt5-dbussupport/Makefile
@@ -6,14 +6,15 @@ CATEGORIES= devel python
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 @@ INSTALL_WRKSRC= ${WRKSRC}/dbus
PLIST_FILES= %%PYTHON_SITELIBDIR%%/dbus/mainloop/pyqt5.so
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-qt5-designer/Makefile b/devel/py-qt5-designer/Makefile
index 526bd6c80323..05a268894ebd 100644
--- a/devel/py-qt5-designer/Makefile
+++ b/devel/py-qt5-designer/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
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
diff --git a/devel/py-qt5-designerplugin/Makefile b/devel/py-qt5-designerplugin/Makefile
index 95dd7639c55f..43177853f9bb 100644
--- a/devel/py-qt5-designerplugin/Makefile
+++ b/devel/py-qt5-designerplugin/Makefile
@@ -17,6 +17,7 @@ PYQT_DIST= yes
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
diff --git a/devel/py-qt5-help/Makefile b/devel/py-qt5-help/Makefile
index eff7eb1c0c3b..8382bb7cb4ff 100644
--- a/devel/py-qt5-help/Makefile
+++ b/devel/py-qt5-help/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
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
diff --git a/devel/py-qt5-qscintilla2/Makefile b/devel/py-qt5-qscintilla2/Makefile
index f7808d14e87f..ec06716f2a6e 100644
--- a/devel/py-qt5-qscintilla2/Makefile
+++ b/devel/py-qt5-qscintilla2/Makefile
@@ -22,6 +22,7 @@ QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS.
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
diff --git a/devel/py-qt5-test/Makefile b/devel/py-qt5-test/Makefile
index 539ec9090b65..f3298a6c6bf9 100644
--- a/devel/py-qt5-test/Makefile
+++ b/devel/py-qt5-test/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
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
diff --git a/devel/py-qt5/Makefile b/devel/py-qt5/Makefile
index 86a20b87fb9b..310b48d16b7e 100644
--- a/devel/py-qt5/Makefile
+++ b/devel/py-qt5/Makefile
@@ -9,6 +9,7 @@ MAINTAINER= kde@FreeBSD.org
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 \
diff --git a/devel/py-qtconsole/Makefile b/devel/py-qtconsole/Makefile
index 5609946b5b0c..3060cc65eaa8 100644
--- a/devel/py-qtconsole/Makefile
+++ b/devel/py-qtconsole/Makefile
@@ -9,11 +9,11 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-ramlfications/Makefile b/devel/py-ramlfications/Makefile
index 04b93c33e432..0f6989d4fd82 100644
--- a/devel/py-ramlfications/Makefile
+++ b/devel/py-ramlfications/Makefile
@@ -13,11 +13,11 @@ COMMENT= Python parser for RAML
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
diff --git a/devel/py-rauth/Makefile b/devel/py-rauth/Makefile
index 4370fb4bdaa5..dcd84ce0bd9d 100644
--- a/devel/py-rauth/Makefile
+++ b/devel/py-rauth/Makefile
@@ -12,10 +12,10 @@ COMMENT= Python library for OAuth 1.0/a, 2.0, and Ofly consumers
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
diff --git a/devel/py-raven/Makefile b/devel/py-raven/Makefile
index aded0ab7e71e..a7aee953561b 100644
--- a/devel/py-raven/Makefile
+++ b/devel/py-raven/Makefile
@@ -21,7 +21,7 @@ USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
diff --git a/devel/py-rebulk/Makefile b/devel/py-rebulk/Makefile
index 6c3d4067163a..658272263a8d 100644
--- a/devel/py-rebulk/Makefile
+++ b/devel/py-rebulk/Makefile
@@ -12,8 +12,8 @@ COMMENT= Python library that performs advanced searches in strings
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
diff --git a/devel/py-rednose/Makefile b/devel/py-rednose/Makefile
index f5e01d24c7c1..5531dea7b0ce 100644
--- a/devel/py-rednose/Makefile
+++ b/devel/py-rednose/Makefile
@@ -12,8 +12,8 @@ COMMENT= Coloured output for nosetests
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
diff --git a/devel/py-repoze.tm2/Makefile b/devel/py-repoze.tm2/Makefile
index 9b706a48f0aa..6322afe2cee7 100644
--- a/devel/py-repoze.tm2/Makefile
+++ b/devel/py-repoze.tm2/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-repoze.what-pylons/Makefile b/devel/py-repoze.what-pylons/Makefile
index d58e1f272dc0..2a162d2dd9dd 100644
--- a/devel/py-repoze.what-pylons/Makefile
+++ b/devel/py-repoze.what-pylons/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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 <bsd.port.mk>
diff --git a/devel/py-repoze.what/Makefile b/devel/py-repoze.what/Makefile
index ede04a546eba..18327912887f 100644
--- a/devel/py-repoze.what/Makefile
+++ b/devel/py-repoze.what/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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 <bsd.port.mk>
diff --git a/devel/py-repoze.who-friendlyform/Makefile b/devel/py-repoze.who-friendlyform/Makefile
index 86c18bd1f85e..8e0a0e514437 100644
--- a/devel/py-repoze.who-friendlyform/Makefile
+++ b/devel/py-repoze.who-friendlyform/Makefile
@@ -10,14 +10,14 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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 <bsd.port.mk>
diff --git a/devel/py-repoze.who-testutil/Makefile b/devel/py-repoze.who-testutil/Makefile
index 6ef32c5add4c..c973bc79859a 100644
--- a/devel/py-repoze.who-testutil/Makefile
+++ b/devel/py-repoze.who-testutil/Makefile
@@ -14,11 +14,11 @@ COMMENT= Test utilities for repoze.who-powered applications
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
diff --git a/devel/py-repoze.who/Makefile b/devel/py-repoze.who/Makefile
index 61f730d2086e..26debf056003 100644
--- a/devel/py-repoze.who/Makefile
+++ b/devel/py-repoze.who/Makefile
@@ -15,8 +15,8 @@ LICENSE_NAME= Repoze License
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
diff --git a/devel/py-repoze.xmliter/Makefile b/devel/py-repoze.xmliter/Makefile
index e0fbd9775dad..66680ca90595 100644
--- a/devel/py-repoze.xmliter/Makefile
+++ b/devel/py-repoze.xmliter/Makefile
@@ -14,8 +14,8 @@ LICENSE_NAME= Repoze License
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
diff --git a/devel/py-requestsexceptions/Makefile b/devel/py-requestsexceptions/Makefile
index 3b7fb698637b..17b421e9fa47 100644
--- a/devel/py-requestsexceptions/Makefile
+++ b/devel/py-requestsexceptions/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-resourcepackage/Makefile b/devel/py-resourcepackage/Makefile
index 1c90dbc0ceb7..c67e69ae8987 100644
--- a/devel/py-resourcepackage/Makefile
+++ b/devel/py-resourcepackage/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ResourcePackage-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Automated resource-as-package embedding mechanism
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-responses/Makefile b/devel/py-responses/Makefile
index 4dc94779d389..46884622739f 100644
--- a/devel/py-responses/Makefile
+++ b/devel/py-responses/Makefile
@@ -12,8 +12,8 @@ COMMENT= Utility library for mocking out the requests Python library
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
diff --git a/devel/py-retrying/Makefile b/devel/py-retrying/Makefile
index 661f5d489078..b37e49415ff9 100644
--- a/devel/py-retrying/Makefile
+++ b/devel/py-retrying/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-riak_pb/Makefile b/devel/py-riak_pb/Makefile
index 78d722f49b5e..db0289fc891e 100644
--- a/devel/py-riak_pb/Makefile
+++ b/devel/py-riak_pb/Makefile
@@ -12,7 +12,7 @@ COMMENT= Riak Protocol Buffers Messages
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
diff --git a/devel/py-robotframework-databaselibrary/Makefile b/devel/py-robotframework-databaselibrary/Makefile
index 2d5e4dcbb0a2..bd12d2f04294 100644
--- a/devel/py-robotframework-databaselibrary/Makefile
+++ b/devel/py-robotframework-databaselibrary/Makefile
@@ -12,7 +12,7 @@ COMMENT= Utilities meant for Robot Frameworks usage
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
diff --git a/devel/py-robotframework-pabot/Makefile b/devel/py-robotframework-pabot/Makefile
index 34d74748e25d..027eb46d096c 100644
--- a/devel/py-robotframework-pabot/Makefile
+++ b/devel/py-robotframework-pabot/Makefile
@@ -12,8 +12,8 @@ COMMENT= Parallel executor for Robot Framework test cases
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
diff --git a/devel/py-robotframework-ride/Makefile b/devel/py-robotframework-ride/Makefile
index a1004f04833a..7b33c6ee8fb1 100644
--- a/devel/py-robotframework-ride/Makefile
+++ b/devel/py-robotframework-ride/Makefile
@@ -12,9 +12,9 @@ COMMENT= Test data editor for Robot Framework
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
diff --git a/devel/py-robotframework-selenium2library/Makefile b/devel/py-robotframework-selenium2library/Makefile
index cb3803b3e75d..37ee59b4a791 100644
--- a/devel/py-robotframework-selenium2library/Makefile
+++ b/devel/py-robotframework-selenium2library/Makefile
@@ -13,8 +13,8 @@ COMMENT= Web testing library for Robot Framework
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
diff --git a/devel/py-robotremoteserver/Makefile b/devel/py-robotremoteserver/Makefile
index a2f102df8bf4..31da55d9787d 100644
--- a/devel/py-robotremoteserver/Makefile
+++ b/devel/py-robotremoteserver/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python Remote Server for Robot Framework
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
diff --git a/devel/py-rply/Makefile b/devel/py-rply/Makefile
index b6f28fc66637..de8ef8e530c1 100644
--- a/devel/py-rply/Makefile
+++ b/devel/py-rply/Makefile
@@ -13,7 +13,7 @@ COMMENT= Pure python parser generator, that also works with RPython
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
diff --git a/devel/py-rq/Makefile b/devel/py-rq/Makefile
index 9b15ee604c5e..e19eade21e3b 100644
--- a/devel/py-rq/Makefile
+++ b/devel/py-rq/Makefile
@@ -12,8 +12,8 @@ COMMENT= Simple library for creating background jobs, and processing them
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
diff --git a/devel/py-ruamel.ordereddict/Makefile b/devel/py-ruamel.ordereddict/Makefile
index cd70339b4619..80a8cdcd3028 100644
--- a/devel/py-ruamel.ordereddict/Makefile
+++ b/devel/py-ruamel.ordereddict/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python dict that keeps keys in insertion sorted order
LICENSE= MIT
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/devel/py-rubymarshal/Makefile b/devel/py-rubymarshal/Makefile
index e5d5b15588c0..480b203ac5ab 100644
--- a/devel/py-rubymarshal/Makefile
+++ b/devel/py-rubymarshal/Makefile
@@ -14,7 +14,7 @@ COMMENT= Read and write Ruby-marshalled data
LICENSE= WTFPL
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES?= python
+USES= python
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/devel/py-ruledispatch/Makefile b/devel/py-ruledispatch/Makefile
index a658f68fe960..fceed2b38d28 100644
--- a/devel/py-ruledispatch/Makefile
+++ b/devel/py-ruledispatch/Makefile
@@ -16,10 +16,10 @@ COMMENT= Rule-based Dispatching and Generic Functions
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)
diff --git a/devel/py-rwt/Makefile b/devel/py-rwt/Makefile
index ecca8729d193..4d0e44cc751f 100644
--- a/devel/py-rwt/Makefile
+++ b/devel/py-rwt/Makefile
@@ -12,11 +12,11 @@ COMMENT= RWT (Run With This) provides on-demand dependency resolution
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 <bsd.port.mk>
diff --git a/devel/py-rwt/pkg-plist b/devel/py-rwt/pkg-plist
deleted file mode 100644
index 017d42ff0fec..000000000000
--- a/devel/py-rwt/pkg-plist
+++ /dev/null
@@ -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
diff --git a/devel/py-sanetime/Makefile b/devel/py-sanetime/Makefile
index 2f0759311b65..06bb59d39ea0 100644
--- a/devel/py-sanetime/Makefile
+++ b/devel/py-sanetime/Makefile
@@ -14,9 +14,9 @@ COMMENT= Sane date/time Python interface, with Django support
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
diff --git a/devel/py-scripttest/Makefile b/devel/py-scripttest/Makefile
index 7f4dd13eb272..d18406d24299 100644
--- a/devel/py-scripttest/Makefile
+++ b/devel/py-scripttest/Makefile
@@ -11,9 +11,9 @@ COMMENT= Helper to test command-line scripts
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
diff --git a/devel/py-selection/Makefile b/devel/py-selection/Makefile
index c25fa0eba27c..9fe6d7a136f4 100644
--- a/devel/py-selection/Makefile
+++ b/devel/py-selection/Makefile
@@ -11,9 +11,9 @@ COMMENT= API to extract content from HTML & XML documents
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
diff --git a/devel/py-selectors34/Makefile b/devel/py-selectors34/Makefile
index 1881f8cb0940..0b8cbb2b59d9 100644
--- a/devel/py-selectors34/Makefile
+++ b/devel/py-selectors34/Makefile
@@ -11,7 +11,7 @@ COMMENT= Backport of the selectors module from Python 3.4
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
diff --git a/devel/py-semantic_version/Makefile b/devel/py-semantic_version/Makefile
index 557ba5e1bfe9..4a4ec3bd4fb8 100644
--- a/devel/py-semantic_version/Makefile
+++ b/devel/py-semantic_version/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python library provides a few tools to handle SemVer in Python
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
diff --git a/devel/py-setproctitle/Makefile b/devel/py-setproctitle/Makefile
index b80d394cdc79..2a97d05b5bb0 100644
--- a/devel/py-setproctitle/Makefile
+++ b/devel/py-setproctitle/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python module to customize the process title
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-USES?= python
+USES= python
USE_PYTHON= autoplist distutils
PORTDOCS= HISTORY.rst README.rst
diff --git a/devel/py-setuptools-pkg/Makefile b/devel/py-setuptools-pkg/Makefile
index 693c1512fa9e..e58db64b753c 100644
--- a/devel/py-setuptools-pkg/Makefile
+++ b/devel/py-setuptools-pkg/Makefile
@@ -13,9 +13,9 @@ COMMENT= Plugin for setuptools to build FreeBSD pkg
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
diff --git a/devel/py27-setuptools/Makefile b/devel/py-setuptools/Makefile
index 92a1fdc7c294..3c5d3322c22b 100644
--- a/devel/py27-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -13,9 +13,8 @@ COMMENT= Python packages installer
LICENSE= PSFL
NO_ARCH= yes
-USES?= python:2.7
-USES+= zip
-USE_PYTHON= autoplist concurrent distutils
+USES= python zip
+USE_PYTHON= autoplist concurrent distutils allflavors
PYDISTUTILS_SETUP= ${PYSETUP}
@@ -33,9 +32,9 @@ SUB_LIST+= PYTHON_VER=${PYTHON_VER}
# 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
+#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${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
post-install:
diff --git a/devel/py27-setuptools/distinfo b/devel/py-setuptools/distinfo
index 5f7e67934c46..5f7e67934c46 100644
--- a/devel/py27-setuptools/distinfo
+++ b/devel/py-setuptools/distinfo
diff --git a/devel/py27-setuptools/files/easy-install.pth.dist b/devel/py-setuptools/files/easy-install.pth.dist
index e7ab88be464d..e7ab88be464d 100644
--- a/devel/py27-setuptools/files/easy-install.pth.dist
+++ b/devel/py-setuptools/files/easy-install.pth.dist
diff --git a/devel/py27-setuptools/files/pkg-message.in b/devel/py-setuptools/files/pkg-message.in
index 1797c069d7a7..1797c069d7a7 100644
--- a/devel/py27-setuptools/files/pkg-message.in
+++ b/devel/py-setuptools/files/pkg-message.in
diff --git a/devel/py27-setuptools/pkg-descr b/devel/py-setuptools/pkg-descr
index d7b599c66f2e..d7b599c66f2e 100644
--- a/devel/py27-setuptools/pkg-descr
+++ b/devel/py-setuptools/pkg-descr
diff --git a/devel/py-setuptools_darcs/Makefile b/devel/py-setuptools_darcs/Makefile
index 6fe67b2ab5d3..f31783f4c27e 100644
--- a/devel/py-setuptools_darcs/Makefile
+++ b/devel/py-setuptools_darcs/Makefile
@@ -13,7 +13,7 @@ COMMENT= Setuptools plugin for darcs
BUILD_DEPENDS= darcsver:devel/py-darcsver
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-setuptools_scm/Makefile b/devel/py-setuptools_scm/Makefile
index 80a5add766e1..8f02ddd10e9a 100644
--- a/devel/py-setuptools_scm/Makefile
+++ b/devel/py-setuptools_scm/Makefile
@@ -12,7 +12,7 @@ COMMENT= Setuptools plugin to manage your versions by scm tags
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES?= python
+USES= python
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/devel/py-simplejson/Makefile b/devel/py-simplejson/Makefile
index 98beed4ea434..177a9245ad87 100644
--- a/devel/py-simplejson/Makefile
+++ b/devel/py-simplejson/Makefile
@@ -14,7 +14,7 @@ COMMENT= Simple, fast, extensible JSON encoder/decoder
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USES?= python
+USES= python
USE_PYTHON= autoplist concurrent distutils
post-install:
diff --git a/devel/py-simpy/Makefile b/devel/py-simpy/Makefile
index e50437257fec..75cd3533aa72 100644
--- a/devel/py-simpy/Makefile
+++ b/devel/py-simpy/Makefile
@@ -21,7 +21,7 @@ TKINTER_DESC= py-tkinter for plot
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}
diff --git a/devel/py-singledispatch/Makefile b/devel/py-singledispatch/Makefile
index 320f7f717747..f7bc29d5445b 100644
--- a/devel/py-singledispatch/Makefile
+++ b/devel/py-singledispatch/Makefile
@@ -13,7 +13,7 @@ COMMENT= Backport of functools.singledispatch from Python 3.4
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
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index c5032083c5eb..f460224914d3 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= kde@FreeBSD.org
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 @@ DEBUG_CONFIGURE_ON= --debug
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 && \
diff --git a/devel/py-six/Makefile b/devel/py-six/Makefile
index 44e3ef414912..b58062e19270 100644
--- a/devel/py-six/Makefile
+++ b/devel/py-six/Makefile
@@ -13,9 +13,9 @@ COMMENT= Python 2 and 3 compatibility utilities
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
diff --git a/devel/py-smmap2/Makefile b/devel/py-smmap2/Makefile
index 1358d39b901d..cd89ed162d3c 100644
--- a/devel/py-smmap2/Makefile
+++ b/devel/py-smmap2/Makefile
@@ -12,7 +12,7 @@ COMMENT= Sliding-window memory map manager
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
diff --git a/devel/py-sortedcontainers/Makefile b/devel/py-sortedcontainers/Makefile
index 8452ddf12637..79f9733f6c01 100644
--- a/devel/py-sortedcontainers/Makefile
+++ b/devel/py-sortedcontainers/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python Sorted Container Types: SortedList, SortedDict, and SortedSet
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
diff --git a/devel/py-spyder/Makefile b/devel/py-spyder/Makefile
index 03d0f5483699..0dbf32f10ce4 100644
--- a/devel/py-spyder/Makefile
+++ b/devel/py-spyder/Makefile
@@ -13,10 +13,10 @@ COMMENT= Scientific PYthon Development EnviRonment, an alternative to IDLE
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 @@ SCIPY_DESC= Signal/image processing
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}'|" \
diff --git a/devel/py-sqlcc/Makefile b/devel/py-sqlcc/Makefile
index d7c2cdf357a3..0aba18c4c9fb 100644
--- a/devel/py-sqlcc/Makefile
+++ b/devel/py-sqlcc/Makefile
@@ -12,9 +12,9 @@ COMMENT= Python SQL Command Composer
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 <bsd.port.mk>
diff --git a/devel/py-stackexchange/Makefile b/devel/py-stackexchange/Makefile
index 02d2b48c600f..faeb7736627b 100644
--- a/devel/py-stackexchange/Makefile
+++ b/devel/py-stackexchange/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python binding to the StackExchange website APIs
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
diff --git a/devel/py-stevedore/Makefile b/devel/py-stevedore/Makefile
index f572d79e9de6..e463b7d38793 100644
--- a/devel/py-stevedore/Makefile
+++ b/devel/py-stevedore/Makefile
@@ -12,9 +12,9 @@ COMMENT= Manage dynamic plugins for Python applications
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
diff --git a/devel/py-streamparse/Makefile b/devel/py-streamparse/Makefile
index a4fc9859a3f3..42fcde9f2514 100644
--- a/devel/py-streamparse/Makefile
+++ b/devel/py-streamparse/Makefile
@@ -13,18 +13,18 @@ COMMENT= Python analysis of Apache Storm streams
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
diff --git a/devel/py-structlog/Makefile b/devel/py-structlog/Makefile
index 0c83bf53371c..cf3ab7e18af1 100644
--- a/devel/py-structlog/Makefile
+++ b/devel/py-structlog/Makefile
@@ -15,8 +15,8 @@ LICENSE_COMB= dual
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
diff --git a/devel/py-stsci.distutils/Makefile b/devel/py-stsci.distutils/Makefile
index 4a32abf121f6..3d33d4b3e645 100644
--- a/devel/py-stsci.distutils/Makefile
+++ b/devel/py-stsci.distutils/Makefile
@@ -12,7 +12,7 @@ COMMENT= Packaging utilities used by some of STScI's packages
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
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index f8d879e7640c..5324f9ebe101 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -14,6 +14,7 @@ MASTERDIR= ${.CURDIR}/../../devel/subversion
PKGDIR= ${.CURDIR}
USES+= python
+USE_PYTHON= flavors py3kplist
SVN_BUILD_BINDINGS= yes
SVN_BUILD_ADDONS= yes
diff --git a/devel/py-subvertpy/Makefile b/devel/py-subvertpy/Makefile
index 77d12cfbe069..40a69423d72b 100644
--- a/devel/py-subvertpy/Makefile
+++ b/devel/py-subvertpy/Makefile
@@ -14,7 +14,7 @@ LICENSE= GPLv2
BUILD_DEPENDS+= svn:devel/subversion
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
MAKE_ENV= HOME=/dev/null
INSTALL_TARGET= install-strip
diff --git a/devel/py-sure/Makefile b/devel/py-sure/Makefile
index a4c88430cd35..1243d802f7d2 100644
--- a/devel/py-sure/Makefile
+++ b/devel/py-sure/Makefile
@@ -12,9 +12,9 @@ COMMENT= Utility belt for automated testing in Python for Python
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
diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile
index 13260bd7a1fa..6fcbcb94308b 100644
--- a/devel/py-tables/Makefile
+++ b/devel/py-tables/Makefile
@@ -14,21 +14,20 @@ COMMENT= Hierarchical database for Python
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
diff --git a/devel/py-tabulate/Makefile b/devel/py-tabulate/Makefile
index 5c6498c4a6eb..e7548992311d 100644
--- a/devel/py-tabulate/Makefile
+++ b/devel/py-tabulate/Makefile
@@ -13,7 +13,7 @@ COMMENT= Pretty-print tabular data in Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES?= python
+USES= python
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/devel/py-tarantool-queue/Makefile b/devel/py-tarantool-queue/Makefile
index 40f70e940e8f..4ab69258277d 100644
--- a/devel/py-tarantool-queue/Makefile
+++ b/devel/py-tarantool-queue/Makefile
@@ -12,8 +12,8 @@ COMMENT= Python bindings for Tarantool queue
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
diff --git a/devel/py-taskflow/Makefile b/devel/py-taskflow/Makefile
index 7bd8caed15b9..6efd9c46df36 100644
--- a/devel/py-taskflow/Makefile
+++ b/devel/py-taskflow/Makefile
@@ -12,28 +12,28 @@ COMMENT= Taskflow structured state management library
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 <bsd.port.mk>
diff --git a/devel/py-tempora/Makefile b/devel/py-tempora/Makefile
index edccc5b401ab..50f8f2f46832 100644
--- a/devel/py-tempora/Makefile
+++ b/devel/py-tempora/Makefile
@@ -12,9 +12,9 @@ COMMENT= Objects and routines pertaining to date and time
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
diff --git a/devel/py-tempstorage/Makefile b/devel/py-tempstorage/Makefile
index a535fc2b1362..eb64bbbe8192 100644
--- a/devel/py-tempstorage/Makefile
+++ b/devel/py-tempstorage/Makefile
@@ -13,10 +13,10 @@ COMMENT= RAM-based storage for ZODB
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 <bsd.port.mk>
diff --git a/devel/py-tenacity/Makefile b/devel/py-tenacity/Makefile
index c1ea018cd219..0c4a202e9471 100644
--- a/devel/py-tenacity/Makefile
+++ b/devel/py-tenacity/Makefile
@@ -12,7 +12,7 @@ COMMENT= Task retrying for python library
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
diff --git a/devel/py-terminable_thread/Makefile b/devel/py-terminable_thread/Makefile
index 2b426b2876ee..8c03037304b8 100644
--- a/devel/py-terminable_thread/Makefile
+++ b/devel/py-terminable_thread/Makefile
@@ -13,7 +13,7 @@ LICENSE= PD
LICENSE_FILE= ${WRKSRC}/COPYING
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/devel/py-testgears/Makefile b/devel/py-testgears/Makefile
index a4faffa3bb04..02404fda3644 100644
--- a/devel/py-testgears/Makefile
+++ b/devel/py-testgears/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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 <bsd.port.mk>
diff --git a/devel/py-testinfra/Makefile b/devel/py-testinfra/Makefile
index 40da50a7427e..af18f8e0c377 100644
--- a/devel/py-testinfra/Makefile
+++ b/devel/py-testinfra/Makefile
@@ -13,9 +13,9 @@ COMMENT= Testinfra python module Serverspec-like for infrastructure testing
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
diff --git a/devel/py-testoob/Makefile b/devel/py-testoob/Makefile
index 1706acc3fd54..0b668d3a9d3c 100644
--- a/devel/py-testoob/Makefile
+++ b/devel/py-testoob/Makefile
@@ -22,6 +22,6 @@ NO_ARCH= yes
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 <bsd.port.mk>
diff --git a/devel/py-testpath/Makefile b/devel/py-testpath/Makefile
index f3db84918318..5902daa8eb73 100644
--- a/devel/py-testpath/Makefile
+++ b/devel/py-testpath/Makefile
@@ -11,7 +11,7 @@ COMMENT= Test utilities for Python code working with files and commands
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 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.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:
diff --git a/devel/py-testtools/Makefile b/devel/py-testtools/Makefile
index 59ace2f600c1..f54c0573721c 100644
--- a/devel/py-testtools/Makefile
+++ b/devel/py-testtools/Makefile
@@ -12,8 +12,8 @@ COMMENT= Extensions to the Python library's unit testing framework
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
diff --git a/devel/py3-threema-msgapi/Makefile b/devel/py-threema-msgapi/Makefile
index 5efe6c837850..ebfce85b65f9 100644
--- a/devel/py3-threema-msgapi/Makefile
+++ b/devel/py-threema-msgapi/Makefile
@@ -19,9 +19,9 @@ 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
+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 <bsd.port.mk>
diff --git a/devel/py3-threema-msgapi/distinfo b/devel/py-threema-msgapi/distinfo
index 8a6201370a3f..8a6201370a3f 100644
--- a/devel/py3-threema-msgapi/distinfo
+++ b/devel/py-threema-msgapi/distinfo
diff --git a/devel/py3-threema-msgapi/pkg-descr b/devel/py-threema-msgapi/pkg-descr
index 956c8790f206..956c8790f206 100644
--- a/devel/py3-threema-msgapi/pkg-descr
+++ b/devel/py-threema-msgapi/pkg-descr
diff --git a/devel/py-tinyarray/Makefile b/devel/py-tinyarray/Makefile
index 188a699becaa..f653ca48fcc5 100644
--- a/devel/py-tinyarray/Makefile
+++ b/devel/py-tinyarray/Makefile
@@ -12,7 +12,7 @@ COMMENT= Arrays of numbers for Python, optimized for small sizes
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
diff --git a/devel/py-tinyrpc/Makefile b/devel/py-tinyrpc/Makefile
index 30f5e17d40d0..d3615d2e5144 100644
--- a/devel/py-tinyrpc/Makefile
+++ b/devel/py-tinyrpc/Makefile
@@ -25,9 +25,9 @@ ZEROMQ_DESC= ZeroMQ support
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 <bsd.port.mk>
diff --git a/devel/py-tooz/Makefile b/devel/py-tooz/Makefile
index 67fa4ad1da8d..617e75c5b7de 100644
--- a/devel/py-tooz/Makefile
+++ b/devel/py-tooz/Makefile
@@ -12,18 +12,18 @@ COMMENT= Coordination library for distributed systems
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
diff --git a/devel/py-toposort/Makefile b/devel/py-toposort/Makefile
index a6a99ab41fa9..8b47a460b23a 100644
--- a/devel/py-toposort/Makefile
+++ b/devel/py-toposort/Makefile
@@ -13,7 +13,7 @@ COMMENT= Topological sorting algorithm for Python
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USES?= python
+USES= python
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/devel/py-tox/Makefile b/devel/py-tox/Makefile
index 63c3f0ecd02c..6af282802423 100644
--- a/devel/py-tox/Makefile
+++ b/devel/py-tox/Makefile
@@ -13,14 +13,14 @@ COMMENT= Virtualenv-based automation of test activities
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
-
-USES?= python
+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
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
diff --git a/devel/py-traceback2/Makefile b/devel/py-traceback2/Makefile
index 8cbf8a5dc158..1e70b695bb56 100644
--- a/devel/py-traceback2/Makefile
+++ b/devel/py-traceback2/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-traitlets/Makefile b/devel/py-traitlets/Makefile
index 672b90f5e095..69591b2c416b 100644
--- a/devel/py-traitlets/Makefile
+++ b/devel/py-traitlets/Makefile
@@ -13,10 +13,10 @@ COMMENT= Configuration system for Python applications
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 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.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:
diff --git a/devel/py-transaction/Makefile b/devel/py-transaction/Makefile
index 9786b00bded7..eba69885cc36 100644
--- a/devel/py-transaction/Makefile
+++ b/devel/py-transaction/Makefile
@@ -12,7 +12,7 @@ COMMENT= Transaction management for Python
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
diff --git a/devel/py-trollius/Makefile b/devel/py-trollius/Makefile
index 08fa3a0b8036..19aee0521cd3 100644
--- a/devel/py-trollius/Makefile
+++ b/devel/py-trollius/Makefile
@@ -20,9 +20,9 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.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
diff --git a/devel/py-tw.forms/Makefile b/devel/py-tw.forms/Makefile
index 1667c1b5d7ab..cf6e21891714 100644
--- a/devel/py-tw.forms/Makefile
+++ b/devel/py-tw.forms/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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 <bsd.port.mk>
diff --git a/devel/py-twext/Makefile b/devel/py-twext/Makefile
index 4ac34889d656..4077b5712f8c 100644
--- a/devel/py-twext/Makefile
+++ b/devel/py-twext/Makefile
@@ -10,16 +10,16 @@ COMMENT= Extensions to Twisted
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.
diff --git a/devel/py-twilio/Makefile b/devel/py-twilio/Makefile
index 769cd95d02f0..ae6770ecfc65 100644
--- a/devel/py-twilio/Makefile
+++ b/devel/py-twilio/Makefile
@@ -11,9 +11,9 @@ COMMENT= Python module for communicating with the Twilio API
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
diff --git a/devel/py-twine/Makefile b/devel/py-twine/Makefile
index 7c60ac0e589b..adf1a156cf5d 100644
--- a/devel/py-twine/Makefile
+++ b/devel/py-twine/Makefile
@@ -12,11 +12,11 @@ COMMENT= Collection of utilities for interacting with PyPI
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
diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index 1b943b8f14fe..cb32f409872d 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -14,11 +14,11 @@ COMMENT= Asynchronous networking framework written in Python
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
diff --git a/devel/py-txaio/Makefile b/devel/py-txaio/Makefile
index d55e4b4e388d..ffb1771c24f5 100644
--- a/devel/py-txaio/Makefile
+++ b/devel/py-txaio/Makefile
@@ -13,9 +13,9 @@ COMMENT= Compatibility API between asyncio/Twisted/Trollius
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 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.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:
diff --git a/devel/py-tzlocal/Makefile b/devel/py-tzlocal/Makefile
index f19e4ef0d68d..11ef0aace601 100644
--- a/devel/py-tzlocal/Makefile
+++ b/devel/py-tzlocal/Makefile
@@ -12,9 +12,9 @@ COMMENT= Returns the tzinfo object for the local timezone
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
diff --git a/devel/py-ua_parser/Makefile b/devel/py-ua_parser/Makefile
index 08bf5790ba35..e0b56700b6d3 100644
--- a/devel/py-ua_parser/Makefile
+++ b/devel/py-ua_parser/Makefile
@@ -13,9 +13,9 @@ COMMENT= Python port of Browserscope's user agent parser
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
diff --git a/devel/py-unittest2/Makefile b/devel/py-unittest2/Makefile
index b7c090c0227c..6787d907958c 100644
--- a/devel/py-unittest2/Makefile
+++ b/devel/py-unittest2/Makefile
@@ -11,12 +11,12 @@ COMMENT= New features in unittest backported to Python 2
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
diff --git a/devel/py-unpaddedbase64/Makefile b/devel/py-unpaddedbase64/Makefile
index dac4d3ae95df..272ea4b43dc8 100644
--- a/devel/py-unpaddedbase64/Makefile
+++ b/devel/py-unpaddedbase64/Makefile
@@ -13,7 +13,7 @@ COMMENT= Unpadded Base64
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
diff --git a/devel/py-update_checker/Makefile b/devel/py-update_checker/Makefile
index 874f5106ccab..a41835896204 100644
--- a/devel/py-update_checker/Makefile
+++ b/devel/py-update_checker/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python module that will check for package updates
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
diff --git a/devel/py-urwid/Makefile b/devel/py-urwid/Makefile
index 6fec64b2f8e4..066c7bc7d0b5 100644
--- a/devel/py-urwid/Makefile
+++ b/devel/py-urwid/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
OPTIONS_DEFINE= EXAMPLES
-USES?= python
+USES= python
USE_PYTHON= autoplist concurrent distutils
PORTEXAMPLES= *
diff --git a/devel/py-urwidtrees/Makefile b/devel/py-urwidtrees/Makefile
index 6122dac8c2db..96a8c7c36314 100644
--- a/devel/py-urwidtrees/Makefile
+++ b/devel/py-urwidtrees/Makefile
@@ -11,8 +11,8 @@ COMMENT= Tree widgets for py-urwid
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
diff --git a/devel/py-user_agents/Makefile b/devel/py-user_agents/Makefile
index 97604073b486..8bf2c9565926 100644
--- a/devel/py-user_agents/Makefile
+++ b/devel/py-user_agents/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME:S/_/-/}-${PORTVERSION}
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
diff --git a/devel/py-utils/Makefile b/devel/py-utils/Makefile
index 732848c2732b..877e6de50e15 100644
--- a/devel/py-utils/Makefile
+++ b/devel/py-utils/Makefile
@@ -11,7 +11,7 @@ DISTNAME= pythonutils-${PORTVERSION}
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}
diff --git a/devel/py-vcrpy/Makefile b/devel/py-vcrpy/Makefile
index 09d4fc7d177f..c159e3f7358d 100644
--- a/devel/py-vcrpy/Makefile
+++ b/devel/py-vcrpy/Makefile
@@ -14,11 +14,11 @@ COMMENT= Automatically mock HTTP interactions to simplify and speed up testing
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 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.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:
diff --git a/devel/py-vcversioner/Makefile b/devel/py-vcversioner/Makefile
index 15850dd6f8de..e0ea1c127ff2 100644
--- a/devel/py-vcversioner/Makefile
+++ b/devel/py-vcversioner/Makefile
@@ -1,17 +1,20 @@
+# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
# $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 <bsd.port.mk>
diff --git a/devel/py-vcversioner/distinfo b/devel/py-vcversioner/distinfo
index 8e6a03c0e95e..54eed9e0176b 100644
--- a/devel/py-vcversioner/distinfo
+++ b/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
diff --git a/devel/py-verboselogs/Makefile b/devel/py-verboselogs/Makefile
index f2ebbc4d1c56..b5c27b9eeb07 100644
--- a/devel/py-verboselogs/Makefile
+++ b/devel/py-verboselogs/Makefile
@@ -13,7 +13,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.mk>
diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile
index 7ca433eeac29..890fb354dceb 100644
--- a/devel/py-virtualenv/Makefile
+++ b/devel/py-virtualenv/Makefile
@@ -10,14 +10,14 @@ COMMENT= Tool for creating isolated Python environments
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
diff --git a/devel/py-virtualenvwrapper/Makefile b/devel/py-virtualenvwrapper/Makefile
index e9b26a5added..6b40f376034d 100644
--- a/devel/py-virtualenvwrapper/Makefile
+++ b/devel/py-virtualenvwrapper/Makefile
@@ -13,17 +13,17 @@ COMMENT= Set of extensions to virtualenv
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} \
diff --git a/devel/py-voluptuous/Makefile b/devel/py-voluptuous/Makefile
index 92ebb6493ad9..91db22d54894 100644
--- a/devel/py-voluptuous/Makefile
+++ b/devel/py-voluptuous/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_GITHUB= yes
GH_ACCOUNT= alecthomas
-USES?= python
+USES= python
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/devel/py-warlock/Makefile b/devel/py-warlock/Makefile
index 5ff3a0a45656..17d81a705afd 100644
--- a/devel/py-warlock/Makefile
+++ b/devel/py-warlock/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/devel/py-watchdog/Makefile b/devel/py-watchdog/Makefile
index 6b63aca3f773..328b1ef8fdf8 100644
--- a/devel/py-watchdog/Makefile
+++ b/devel/py-watchdog/Makefile
@@ -12,12 +12,12 @@ COMMENT= Python API library to monitor file system events
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 @@ USE_PYTHON= autoplist distutils
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}
diff --git a/devel/py-wcwidth/Makefile b/devel/py-wcwidth/Makefile
index dee34aa8fb84..28f2fc19c847 100644
--- a/devel/py-wcwidth/Makefile
+++ b/devel/py-wcwidth/Makefile
@@ -13,7 +13,7 @@ COMMENT= Determine the printable width of the terminal
LICENSE= MIT
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.mk>
diff --git a/devel/py-weblib/Makefile b/devel/py-weblib/Makefile
index 410157d22d20..ab4d1b0ed38c 100644
--- a/devel/py-weblib/Makefile
+++ b/devel/py-weblib/Makefile
@@ -11,10 +11,10 @@ COMMENT= Set of tools for web scraping projects
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
diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile
index d4a05f07b5be..fac2d7400d2a 100644
--- a/devel/py-wheel/Makefile
+++ b/devel/py-wheel/Makefile
@@ -19,10 +19,10 @@ PIP_DESC= Use pip to install wheels
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
diff --git a/devel/py-widgetsnbextension/Makefile b/devel/py-widgetsnbextension/Makefile
index 8cc990a491e3..7e768595a15c 100644
--- a/devel/py-widgetsnbextension/Makefile
+++ b/devel/py-widgetsnbextension/Makefile
@@ -10,7 +10,7 @@ MAINTAINER= swills@FreeBSD.org
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
diff --git a/devel/py-wsme/Makefile b/devel/py-wsme/Makefile
index a8ec0bd16504..e2824ff0cc41 100644
--- a/devel/py-wsme/Makefile
+++ b/devel/py-wsme/Makefile
@@ -11,12 +11,12 @@ DISTNAME= WSME-${PORTVERSION}
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
diff --git a/devel/py-xattr/Makefile b/devel/py-xattr/Makefile
index e8d119c1edd4..06d64b266e58 100644
--- a/devel/py-xattr/Makefile
+++ b/devel/py-xattr/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python wrapper for extended filesystem attributes
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
diff --git a/devel/py-xcaplib/Makefile b/devel/py-xcaplib/Makefile
index 3d821c2cde90..867844d169a5 100644
--- a/devel/py-xcaplib/Makefile
+++ b/devel/py-xcaplib/Makefile
@@ -13,9 +13,9 @@ COMMENT= Python XCAP client library
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
diff --git a/devel/py-xdg/Makefile b/devel/py-xdg/Makefile
index e7a2a93be690..672583f00486 100644
--- a/devel/py-xdg/Makefile
+++ b/devel/py-xdg/Makefile
@@ -16,7 +16,7 @@ COMMENT= Python library to access freedesktop.org standards
LICENSE= LGPL20
NO_ARCH= yes
-USES= python:2
+USES= python
USE_PYTHON= autoplist distutils
post-patch:
diff --git a/devel/py-xmltodict/Makefile b/devel/py-xmltodict/Makefile
index 7a43959ba66a..cdf731a55f50 100644
--- a/devel/py-xmltodict/Makefile
+++ b/devel/py-xmltodict/Makefile
@@ -12,7 +12,7 @@ COMMENT= XML parser that returns python dictionaries
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
diff --git a/devel/py-xxhash/Makefile b/devel/py-xxhash/Makefile
index 6550324f62f6..607225cdde14 100644
--- a/devel/py-xxhash/Makefile
+++ b/devel/py-xxhash/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python bindings for the xxHash library
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
diff --git a/devel/py-yaml/Makefile b/devel/py-yaml/Makefile
index ad467e9eff7f..ff5f3cac9d07 100644
--- a/devel/py-yaml/Makefile
+++ b/devel/py-yaml/Makefile
@@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
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}
diff --git a/devel/py-yandex-money-sdk/Makefile b/devel/py-yandex-money-sdk/Makefile
index 436ff2dffa15..e080ea06f28e 100644
--- a/devel/py-yandex-money-sdk/Makefile
+++ b/devel/py-yandex-money-sdk/Makefile
@@ -11,9 +11,9 @@ COMMENT= SDK yandex money API
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
diff --git a/devel/py-ydbf/Makefile b/devel/py-ydbf/Makefile
index 6014caea86a4..27a34db40bd2 100644
--- a/devel/py-ydbf/Makefile
+++ b/devel/py-ydbf/Makefile
@@ -13,7 +13,7 @@ COMMENT= Yelded DBF reader/writer for Python
LICENSE= GPLv2
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-yum-metadata-parser/Makefile b/devel/py-yum-metadata-parser/Makefile
index ad543538c855..a664603b92dd 100644
--- a/devel/py-yum-metadata-parser/Makefile
+++ b/devel/py-yum-metadata-parser/Makefile
@@ -14,7 +14,7 @@ COMMENT= Fast metadata parser for yum
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
diff --git a/devel/py-yunomi/Makefile b/devel/py-yunomi/Makefile
index 48f6cc8fe660..78cf626013e6 100644
--- a/devel/py-yunomi/Makefile
+++ b/devel/py-yunomi/Makefile
@@ -16,7 +16,7 @@ LICENSE= MIT
PORTDOCS= README.rst \
HISTORY.rst
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS
diff --git a/devel/py-z3c.autoinclude/Makefile b/devel/py-z3c.autoinclude/Makefile
index 1ab6515302ee..4e96ea46af5f 100644
--- a/devel/py-z3c.autoinclude/Makefile
+++ b/devel/py-z3c.autoinclude/Makefile
@@ -12,11 +12,11 @@ COMMENT= Automatically include ZCML
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
diff --git a/devel/py-z3c.batching/Makefile b/devel/py-z3c.batching/Makefile
index bf87de645757..6e587f80977d 100644
--- a/devel/py-z3c.batching/Makefile
+++ b/devel/py-z3c.batching/Makefile
@@ -13,8 +13,8 @@ COMMENT= Simple sequence batching
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
diff --git a/devel/py-z3c.caching/Makefile b/devel/py-z3c.caching/Makefile
index 1194eca0c762..51903ea31bc5 100644
--- a/devel/py-z3c.caching/Makefile
+++ b/devel/py-z3c.caching/Makefile
@@ -13,14 +13,14 @@ COMMENT= Caching infrastructure for web apps
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 <bsd.port.mk>
diff --git a/devel/py-z3c.form/Makefile b/devel/py-z3c.form/Makefile
index 936b8f1884ff..e8367526178b 100644
--- a/devel/py-z3c.form/Makefile
+++ b/devel/py-z3c.form/Makefile
@@ -13,27 +13,27 @@ COMMENT= Advanced form and widget framework for Zope 3
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 <bsd.port.mk>
diff --git a/devel/py-z3c.formwidget.query/Makefile b/devel/py-z3c.formwidget.query/Makefile
index 62e46595caf0..b4e810f9decd 100644
--- a/devel/py-z3c.formwidget.query/Makefile
+++ b/devel/py-z3c.formwidget.query/Makefile
@@ -13,13 +13,13 @@ COMMENT= Source query widget for z3c.form
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 <bsd.port.mk>
diff --git a/devel/py-z3c.zcmlhook/Makefile b/devel/py-z3c.zcmlhook/Makefile
index bf2f66e14d10..2a8f6d63972d 100644
--- a/devel/py-z3c.zcmlhook/Makefile
+++ b/devel/py-z3c.zcmlhook/Makefile
@@ -13,10 +13,10 @@ COMMENT= Easily hook into the ZCML processing machinery
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
diff --git a/devel/py-zExceptions/Makefile b/devel/py-zExceptions/Makefile
index c058a561658b..a322e0fb2608 100644
--- a/devel/py-zExceptions/Makefile
+++ b/devel/py-zExceptions/Makefile
@@ -13,11 +13,11 @@ COMMENT= Contains common exceptions used in Zope2
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 <bsd.port.mk>
diff --git a/devel/py-zLOG/Makefile b/devel/py-zLOG/Makefile
index f6ea6e16ed71..d1fd7af96a8d 100644
--- a/devel/py-zLOG/Makefile
+++ b/devel/py-zLOG/Makefile
@@ -13,7 +13,7 @@ COMMENT= General logging facility
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
diff --git a/devel/py-zkpython/Makefile b/devel/py-zkpython/Makefile
index 66913b4694cf..47dcd886c777 100644
--- a/devel/py-zkpython/Makefile
+++ b/devel/py-zkpython/Makefile
@@ -14,7 +14,7 @@ LICENSE= APACHE20
LIB_DEPENDS= libzookeeper_mt.so:devel/libzookeeper
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/devel/py-zope.annotation/Makefile b/devel/py-zope.annotation/Makefile
index 7cfcf43bccd4..34bd98e0bb41 100644
--- a/devel/py-zope.annotation/Makefile
+++ b/devel/py-zope.annotation/Makefile
@@ -13,13 +13,13 @@ COMMENT= Object annotation mechanism
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.applicationcontrol/Makefile b/devel/py-zope.app.applicationcontrol/Makefile
index eb832c0353cf..3adac2dd2b13 100644
--- a/devel/py-zope.app.applicationcontrol/Makefile
+++ b/devel/py-zope.app.applicationcontrol/Makefile
@@ -13,16 +13,16 @@ COMMENT= Zope application control
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.appsetup/Makefile b/devel/py-zope.app.appsetup/Makefile
index e7f962bd3efa..ccbe2de54996 100644
--- a/devel/py-zope.app.appsetup/Makefile
+++ b/devel/py-zope.app.appsetup/Makefile
@@ -13,21 +13,21 @@ COMMENT= Zope app setup helper
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.basicskin/Makefile b/devel/py-zope.app.basicskin/Makefile
index ea2aba0207ae..bfbf91cabbb3 100644
--- a/devel/py-zope.app.basicskin/Makefile
+++ b/devel/py-zope.app.basicskin/Makefile
@@ -13,9 +13,9 @@ COMMENT= Zope ZMI Basic Skin
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
diff --git a/devel/py-zope.app.broken/Makefile b/devel/py-zope.app.broken/Makefile
index 3efd2c5d3923..6db76d3f7005 100644
--- a/devel/py-zope.app.broken/Makefile
+++ b/devel/py-zope.app.broken/Makefile
@@ -13,15 +13,15 @@ COMMENT= Zope Broken (ZODB) Object Support
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.cache/Makefile b/devel/py-zope.app.cache/Makefile
index 934cfb3839fd..7500298c6fce 100644
--- a/devel/py-zope.app.cache/Makefile
+++ b/devel/py-zope.app.cache/Makefile
@@ -13,20 +13,20 @@ COMMENT= Zope Caching Framework
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.component/Makefile b/devel/py-zope.app.component/Makefile
index c55192ec4170..179b795c17f9 100644
--- a/devel/py-zope.app.component/Makefile
+++ b/devel/py-zope.app.component/Makefile
@@ -13,22 +13,22 @@ COMMENT= Local Zope Component Support
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.container/Makefile b/devel/py-zope.app.container/Makefile
index f95520302c6d..d12b9fe5e1f1 100644
--- a/devel/py-zope.app.container/Makefile
+++ b/devel/py-zope.app.container/Makefile
@@ -13,26 +13,26 @@ COMMENT= Zope Container
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.content/Makefile b/devel/py-zope.app.content/Makefile
index 81cbd28ffe33..c84917d3833d 100644
--- a/devel/py-zope.app.content/Makefile
+++ b/devel/py-zope.app.content/Makefile
@@ -13,12 +13,12 @@ COMMENT= Zope Content Type
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.debug/Makefile b/devel/py-zope.app.debug/Makefile
index e3c3bb5d5fa1..ad712c28927f 100644
--- a/devel/py-zope.app.debug/Makefile
+++ b/devel/py-zope.app.debug/Makefile
@@ -13,11 +13,11 @@ COMMENT= Zope Debug Mode
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.dependable/Makefile b/devel/py-zope.app.dependable/Makefile
index 1e6374b4d6be..902f1f0379a9 100644
--- a/devel/py-zope.app.dependable/Makefile
+++ b/devel/py-zope.app.dependable/Makefile
@@ -13,15 +13,15 @@ COMMENT= Simple Dependency API
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.error/Makefile b/devel/py-zope.app.error/Makefile
index d5b98234e1f6..edec60fdc939 100644
--- a/devel/py-zope.app.error/Makefile
+++ b/devel/py-zope.app.error/Makefile
@@ -13,12 +13,12 @@ COMMENT= Error reporting utility management UI for Zope3
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.exception/Makefile b/devel/py-zope.app.exception/Makefile
index fbe4f8134cbf..2b60bac7473a 100644
--- a/devel/py-zope.app.exception/Makefile
+++ b/devel/py-zope.app.exception/Makefile
@@ -13,15 +13,15 @@ COMMENT= Zope 3 exception views
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.file/Makefile b/devel/py-zope.app.file/Makefile
index b8b49d8fa5b1..c6add7f884f2 100644
--- a/devel/py-zope.app.file/Makefile
+++ b/devel/py-zope.app.file/Makefile
@@ -12,20 +12,20 @@ COMMENT= File and Image -- Zope 3 Content Components
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
diff --git a/devel/py-zope.app.folder/Makefile b/devel/py-zope.app.folder/Makefile
index 94f45008688a..6198067e3fa4 100644
--- a/devel/py-zope.app.folder/Makefile
+++ b/devel/py-zope.app.folder/Makefile
@@ -13,11 +13,11 @@ COMMENT= Folder Content Type for Zope 3
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.form/Makefile b/devel/py-zope.app.form/Makefile
index 7a78fc72d7b7..c749180d36f8 100644
--- a/devel/py-zope.app.form/Makefile
+++ b/devel/py-zope.app.form/Makefile
@@ -13,23 +13,23 @@ COMMENT= The Original Zope 3 Form Framework
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.generations/Makefile b/devel/py-zope.app.generations/Makefile
index 1f00f8021cba..48bbafe5a2ec 100644
--- a/devel/py-zope.app.generations/Makefile
+++ b/devel/py-zope.app.generations/Makefile
@@ -13,15 +13,15 @@ COMMENT= ZMI UI for zope.generations
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.http/Makefile b/devel/py-zope.app.http/Makefile
index f376df98f25f..876a80088e1d 100644
--- a/devel/py-zope.app.http/Makefile
+++ b/devel/py-zope.app.http/Makefile
@@ -13,12 +13,12 @@ COMMENT= HTTP Behavior for the Zope Publisher
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.pagetemplate/Makefile b/devel/py-zope.app.pagetemplate/Makefile
index 6f136958b996..8442f32a01b0 100644
--- a/devel/py-zope.app.pagetemplate/Makefile
+++ b/devel/py-zope.app.pagetemplate/Makefile
@@ -13,20 +13,20 @@ COMMENT= PageTemplate integration for Zope 3
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.publication/Makefile b/devel/py-zope.app.publication/Makefile
index c2a89c68ddda..c9bea5962195 100644
--- a/devel/py-zope.app.publication/Makefile
+++ b/devel/py-zope.app.publication/Makefile
@@ -13,17 +13,17 @@ COMMENT= Zope publication
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.publisher/Makefile b/devel/py-zope.app.publisher/Makefile
index 9f3824eb8c34..09a9370533c1 100644
--- a/devel/py-zope.app.publisher/Makefile
+++ b/devel/py-zope.app.publisher/Makefile
@@ -13,21 +13,21 @@ COMMENT= Means for configuration of Zope 3 style views and resources
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.renderer/Makefile b/devel/py-zope.app.renderer/Makefile
index 0410ea86320f..a475fde29f74 100644
--- a/devel/py-zope.app.renderer/Makefile
+++ b/devel/py-zope.app.renderer/Makefile
@@ -13,15 +13,15 @@ COMMENT= Text Renderer Framework
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
diff --git a/devel/py-zope.app.rotterdam/Makefile b/devel/py-zope.app.rotterdam/Makefile
index 7cb933610d86..5f96e2c64b89 100644
--- a/devel/py-zope.app.rotterdam/Makefile
+++ b/devel/py-zope.app.rotterdam/Makefile
@@ -13,20 +13,20 @@ COMMENT= Zope 3 ZMI Skin
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.schema/Makefile b/devel/py-zope.app.schema/Makefile
index 0d16551462fd..c11fea2d9e7d 100644
--- a/devel/py-zope.app.schema/Makefile
+++ b/devel/py-zope.app.schema/Makefile
@@ -13,9 +13,9 @@ COMMENT= Component Architecture based Vocabulary Registry
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
diff --git a/devel/py-zope.app.testing/Makefile b/devel/py-zope.app.testing/Makefile
index 46d2701bab39..309bbd3dcedb 100644
--- a/devel/py-zope.app.testing/Makefile
+++ b/devel/py-zope.app.testing/Makefile
@@ -13,26 +13,26 @@ COMMENT= Zope Application Testing Support
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.zcmlfiles/Makefile b/devel/py-zope.app.zcmlfiles/Makefile
index 6aed86432aee..c241cc740939 100644
--- a/devel/py-zope.app.zcmlfiles/Makefile
+++ b/devel/py-zope.app.zcmlfiles/Makefile
@@ -13,44 +13,44 @@ COMMENT= Zope application server ZCML files
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 <bsd.port.mk>
diff --git a/devel/py-zope.app.zopeappgenerations/Makefile b/devel/py-zope.app.zopeappgenerations/Makefile
index acfd2ff98553..8637bf63313b 100644
--- a/devel/py-zope.app.zopeappgenerations/Makefile
+++ b/devel/py-zope.app.zopeappgenerations/Makefile
@@ -13,14 +13,14 @@ COMMENT= Zope Application ZODB Update Generations
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 <bsd.port.mk>
diff --git a/devel/py-zope.applicationcontrol/Makefile b/devel/py-zope.applicationcontrol/Makefile
index b5e87545b6a0..36cc6966cd97 100644
--- a/devel/py-zope.applicationcontrol/Makefile
+++ b/devel/py-zope.applicationcontrol/Makefile
@@ -13,13 +13,13 @@ COMMENT= Zope applicationcontrol
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 <bsd.port.mk>
diff --git a/devel/py-zope.broken/Makefile b/devel/py-zope.broken/Makefile
index a915fa0985da..2d1bb3596cb4 100644
--- a/devel/py-zope.broken/Makefile
+++ b/devel/py-zope.broken/Makefile
@@ -13,7 +13,7 @@ COMMENT= Zope Broken Object Interfaces
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
diff --git a/devel/py-zope.browser/Makefile b/devel/py-zope.browser/Makefile
index 61f39ee1a12d..6a08719e102e 100644
--- a/devel/py-zope.browser/Makefile
+++ b/devel/py-zope.browser/Makefile
@@ -12,7 +12,7 @@ COMMENT= Shared Zope Toolkit browser components
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
diff --git a/devel/py-zope.browsermenu/Makefile b/devel/py-zope.browsermenu/Makefile
index d4b6afd39c51..3dde06d0267d 100644
--- a/devel/py-zope.browsermenu/Makefile
+++ b/devel/py-zope.browsermenu/Makefile
@@ -13,18 +13,18 @@ COMMENT= Browser menu implementation for Zope
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 <bsd.port.mk>
diff --git a/devel/py-zope.browserpage/Makefile b/devel/py-zope.browserpage/Makefile
index 92dad31eeb16..015295a047d5 100644
--- a/devel/py-zope.browserpage/Makefile
+++ b/devel/py-zope.browserpage/Makefile
@@ -12,19 +12,19 @@ COMMENT= ZCML directives for configuring browser views for Zope
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 <bsd.port.mk>
diff --git a/devel/py-zope.browserresource/Makefile b/devel/py-zope.browserresource/Makefile
index cb8e4d2ddc89..359d0ac51c3f 100644
--- a/devel/py-zope.browserresource/Makefile
+++ b/devel/py-zope.browserresource/Makefile
@@ -14,15 +14,15 @@ COMMENT= Browser resources implementation for Zope
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
diff --git a/devel/py-zope.component/Makefile b/devel/py-zope.component/Makefile
index 9bf4fe36a274..0a478f122a66 100644
--- a/devel/py-zope.component/Makefile
+++ b/devel/py-zope.component/Makefile
@@ -14,8 +14,8 @@ COMMENT= Zope Component Architecture
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
diff --git a/devel/py-zope.componentvocabulary/Makefile b/devel/py-zope.componentvocabulary/Makefile
index 44e5e11cccf1..d1574207af04 100644
--- a/devel/py-zope.componentvocabulary/Makefile
+++ b/devel/py-zope.componentvocabulary/Makefile
@@ -13,13 +13,13 @@ COMMENT= Zope Component vocabularies
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 <bsd.port.mk>
diff --git a/devel/py-zope.configuration/Makefile b/devel/py-zope.configuration/Makefile
index 46b56d944ce3..9c790e0478af 100644
--- a/devel/py-zope.configuration/Makefile
+++ b/devel/py-zope.configuration/Makefile
@@ -14,9 +14,9 @@ COMMENT= Zope Configuration Markup Language (ZCML)
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
diff --git a/devel/py-zope.container/Makefile b/devel/py-zope.container/Makefile
index a9856288b5a7..d1b8d78d11fe 100644
--- a/devel/py-zope.container/Makefile
+++ b/devel/py-zope.container/Makefile
@@ -13,24 +13,24 @@ COMMENT= Zope Container
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 <bsd.port.mk>
diff --git a/devel/py-zope.contentprovider/Makefile b/devel/py-zope.contentprovider/Makefile
index 3f676e8cc1ef..f2eb005da233 100644
--- a/devel/py-zope.contentprovider/Makefile
+++ b/devel/py-zope.contentprovider/Makefile
@@ -13,13 +13,13 @@ COMMENT= Content Provider Framework for Zope Templates
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
diff --git a/devel/py-zope.copy/Makefile b/devel/py-zope.copy/Makefile
index dd31065afe5f..27a9f52c93c7 100644
--- a/devel/py-zope.copy/Makefile
+++ b/devel/py-zope.copy/Makefile
@@ -13,7 +13,7 @@ COMMENT= Pluggable object copying mechanism
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
diff --git a/devel/py-zope.copypastemove/Makefile b/devel/py-zope.copypastemove/Makefile
index 00afd8f66ee0..2d6dfae9cca7 100644
--- a/devel/py-zope.copypastemove/Makefile
+++ b/devel/py-zope.copypastemove/Makefile
@@ -13,17 +13,17 @@ COMMENT= Copy, Paste, and Move support for content components
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 <bsd.port.mk>
diff --git a/devel/py-zope.deferredimport/Makefile b/devel/py-zope.deferredimport/Makefile
index 29d613c42d2b..3d2ab50f3794 100644
--- a/devel/py-zope.deferredimport/Makefile
+++ b/devel/py-zope.deferredimport/Makefile
@@ -13,7 +13,7 @@ COMMENT= Allows to import names that will be resolved when used in the code
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
diff --git a/devel/py-zope.dublincore/Makefile b/devel/py-zope.dublincore/Makefile
index be356f81f1a6..39b1d90bfbb5 100644
--- a/devel/py-zope.dublincore/Makefile
+++ b/devel/py-zope.dublincore/Makefile
@@ -13,15 +13,15 @@ COMMENT= Zope Dublin Core implementation
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 <bsd.port.mk>
diff --git a/devel/py-zope.error/Makefile b/devel/py-zope.error/Makefile
index 9dd9a8ef83ed..95160c90cf6b 100644
--- a/devel/py-zope.error/Makefile
+++ b/devel/py-zope.error/Makefile
@@ -13,12 +13,12 @@ COMMENT= Error reporting utility for Zope3
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 <bsd.port.mk>
diff --git a/devel/py-zope.exceptions/Makefile b/devel/py-zope.exceptions/Makefile
index 51042992f869..7a01a72e5d63 100644
--- a/devel/py-zope.exceptions/Makefile
+++ b/devel/py-zope.exceptions/Makefile
@@ -14,7 +14,7 @@ COMMENT= General Zope Exceptions
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
diff --git a/devel/py-zope.filerepresentation/Makefile b/devel/py-zope.filerepresentation/Makefile
index 5b95fb891d72..bcec837552ab 100644
--- a/devel/py-zope.filerepresentation/Makefile
+++ b/devel/py-zope.filerepresentation/Makefile
@@ -13,8 +13,8 @@ COMMENT= File-system Representation Interfaces
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
diff --git a/devel/py-zope.formlib/Makefile b/devel/py-zope.formlib/Makefile
index 2a93de0fbb72..41daace79bb4 100644
--- a/devel/py-zope.formlib/Makefile
+++ b/devel/py-zope.formlib/Makefile
@@ -13,23 +13,23 @@ COMMENT= Form generation and validation library for Zope
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 <bsd.port.mk>
diff --git a/devel/py-zope.generations/Makefile b/devel/py-zope.generations/Makefile
index 18bc77c631de..2fca597bb412 100644
--- a/devel/py-zope.generations/Makefile
+++ b/devel/py-zope.generations/Makefile
@@ -13,10 +13,10 @@ COMMENT= Zope application schema generations
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
diff --git a/devel/py-zope.globalrequest/Makefile b/devel/py-zope.globalrequest/Makefile
index 64fd89e817fc..a66a07669edf 100644
--- a/devel/py-zope.globalrequest/Makefile
+++ b/devel/py-zope.globalrequest/Makefile
@@ -12,9 +12,9 @@ COMMENT= Global way of retrieving the currently active request
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
diff --git a/devel/py-zope.i18n/Makefile b/devel/py-zope.i18n/Makefile
index 9a1c31de880d..e1f7761a2634 100644
--- a/devel/py-zope.i18n/Makefile
+++ b/devel/py-zope.i18n/Makefile
@@ -12,12 +12,12 @@ DIST_SUBDIR= zope
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
diff --git a/devel/py-zope.lifecycleevent/Makefile b/devel/py-zope.lifecycleevent/Makefile
index 2a0815237007..251e3669fb9f 100644
--- a/devel/py-zope.lifecycleevent/Makefile
+++ b/devel/py-zope.lifecycleevent/Makefile
@@ -13,9 +13,9 @@ COMMENT= Object life-cycle events
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
diff --git a/devel/py-zope.location/Makefile b/devel/py-zope.location/Makefile
index cc76f43d8fbb..28a3ba9a9358 100644
--- a/devel/py-zope.location/Makefile
+++ b/devel/py-zope.location/Makefile
@@ -13,10 +13,10 @@ COMMENT= Zope Location
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
diff --git a/devel/py-zope.minmax/Makefile b/devel/py-zope.minmax/Makefile
index 7cf83a6d36a3..6a39072f4723 100644
--- a/devel/py-zope.minmax/Makefile
+++ b/devel/py-zope.minmax/Makefile
@@ -13,10 +13,10 @@ COMMENT= Homogeneous values favoring maximum or minimum
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 <bsd.port.mk>
diff --git a/devel/py-zope.pagetemplate/Makefile b/devel/py-zope.pagetemplate/Makefile
index fe4ed2f62432..e35295821626 100644
--- a/devel/py-zope.pagetemplate/Makefile
+++ b/devel/py-zope.pagetemplate/Makefile
@@ -13,16 +13,16 @@ COMMENT= Zope Page Templates
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 <bsd.port.mk>
diff --git a/devel/py-zope.processlifetime/Makefile b/devel/py-zope.processlifetime/Makefile
index e497e4d74cd5..dfa13b445640 100644
--- a/devel/py-zope.processlifetime/Makefile
+++ b/devel/py-zope.processlifetime/Makefile
@@ -13,7 +13,7 @@ COMMENT= Zope process lifetime events
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
diff --git a/devel/py-zope.ptresource/Makefile b/devel/py-zope.ptresource/Makefile
index 3fe4a24a824a..7c1eb014d0c9 100644
--- a/devel/py-zope.ptresource/Makefile
+++ b/devel/py-zope.ptresource/Makefile
@@ -13,13 +13,13 @@ COMMENT= Page template resource plugin for zope.browserresource
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 <bsd.port.mk>
diff --git a/devel/py-zope.publisher/Makefile b/devel/py-zope.publisher/Makefile
index 3b511de404c6..4d2506ab3b5a 100644
--- a/devel/py-zope.publisher/Makefile
+++ b/devel/py-zope.publisher/Makefile
@@ -13,19 +13,19 @@ COMMENT= Publishes Python objects on the web
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 <bsd.port.mk>
diff --git a/devel/py-zope.ramcache/Makefile b/devel/py-zope.ramcache/Makefile
index 4dde4dd4273f..d4607e4dd732 100644
--- a/devel/py-zope.ramcache/Makefile
+++ b/devel/py-zope.ramcache/Makefile
@@ -13,12 +13,12 @@ COMMENT= Zope RAM Cache
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 <bsd.port.mk>
diff --git a/devel/py-zope.schema/Makefile b/devel/py-zope.schema/Makefile
index 7942d0a5a1ac..dea3aa88d73a 100644
--- a/devel/py-zope.schema/Makefile
+++ b/devel/py-zope.schema/Makefile
@@ -13,8 +13,8 @@ COMMENT= Zope Interface extension for defining data schemas
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
diff --git a/devel/py-zope.site/Makefile b/devel/py-zope.site/Makefile
index f4c8ce6d6bee..d435b626bf40 100644
--- a/devel/py-zope.site/Makefile
+++ b/devel/py-zope.site/Makefile
@@ -13,16 +13,16 @@ COMMENT= Local registries for zope component architecture
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 <bsd.port.mk>
diff --git a/devel/py-zope.size/Makefile b/devel/py-zope.size/Makefile
index 65e862221d32..7670f4162054 100644
--- a/devel/py-zope.size/Makefile
+++ b/devel/py-zope.size/Makefile
@@ -13,8 +13,8 @@ COMMENT= Interfaces and simple adapter that give the size of an object
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
diff --git a/devel/py-zope.tales/Makefile b/devel/py-zope.tales/Makefile
index 8836b048d491..f5638d2f4499 100644
--- a/devel/py-zope.tales/Makefile
+++ b/devel/py-zope.tales/Makefile
@@ -13,10 +13,10 @@ COMMENT= Zope Template Application Language Expression Syntax (TALES)
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 <bsd.port.mk>
diff --git a/devel/py-zope.testbrowser/Makefile b/devel/py-zope.testbrowser/Makefile
index 065786bf7337..1d17a372b55e 100644
--- a/devel/py-zope.testbrowser/Makefile
+++ b/devel/py-zope.testbrowser/Makefile
@@ -12,11 +12,11 @@ COMMENT= Programmable browser for functional black-box tests
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
diff --git a/devel/py-zope.testing/Makefile b/devel/py-zope.testing/Makefile
index 7c9300fd245d..053bd2d819cc 100644
--- a/devel/py-zope.testing/Makefile
+++ b/devel/py-zope.testing/Makefile
@@ -14,8 +14,8 @@ COMMENT= Zope testing helpers
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
diff --git a/devel/py-zope.traversing/Makefile b/devel/py-zope.traversing/Makefile
index 638a5964c127..46f28a67f108 100644
--- a/devel/py-zope.traversing/Makefile
+++ b/devel/py-zope.traversing/Makefile
@@ -13,13 +13,13 @@ COMMENT= Resolving paths in the object hierarchy
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
diff --git a/devel/py-zope.viewlet/Makefile b/devel/py-zope.viewlet/Makefile
index c6463975d025..fcb6e6097498 100644
--- a/devel/py-zope.viewlet/Makefile
+++ b/devel/py-zope.viewlet/Makefile
@@ -13,19 +13,19 @@ COMMENT= Zope Viewlets
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 <bsd.port.mk>
diff --git a/devel/py3-Jinja2/Makefile b/devel/py3-Jinja2/Makefile
deleted file mode 100644
index 480df814c56f..000000000000
--- a/devel/py3-Jinja2/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
-# $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 <bsd.port.mk>
diff --git a/devel/py3-Jinja2/distinfo b/devel/py3-Jinja2/distinfo
deleted file mode 100644
index af9899535258..000000000000
--- a/devel/py3-Jinja2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1496757802
-SHA256 (Jinja2-2.9.6.tar.gz) = ddaa01a212cd6d641401cb01b605f4a4d9f37bfc93043d7f760ec70fb99ff9ff
-SIZE (Jinja2-2.9.6.tar.gz) = 437659
diff --git a/devel/py3-Jinja2/pkg-descr b/devel/py3-Jinja2/pkg-descr
deleted file mode 100644
index c468787a090a..000000000000
--- a/devel/py3-Jinja2/pkg-descr
+++ /dev/null
@@ -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/
diff --git a/devel/py3-apipkg/Makefile b/devel/py3-apipkg/Makefile
deleted file mode 100644
index 14526548e67b..000000000000
--- a/devel/py3-apipkg/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-apipkg
-
-USES= python:3.1+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-asttokens/Makefile b/devel/py3-asttokens/Makefile
deleted file mode 100644
index 91310fb46b6b..000000000000
--- a/devel/py3-asttokens/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-asttokens
-
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py3-six
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-babel/Makefile b/devel/py3-babel/Makefile
deleted file mode 100644
index 1cf146506fe9..000000000000
--- a/devel/py3-babel/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
-# $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 <bsd.port.mk>
diff --git a/devel/py3-babel/distinfo b/devel/py3-babel/distinfo
deleted file mode 100644
index b39c1200320e..000000000000
--- a/devel/py3-babel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1505757363
-SHA256 (Babel-2.5.1.tar.gz) = 6007daf714d0cd5524bbe436e2d42b3c20e68da66289559341e48d2cd6d25811
-SIZE (Babel-2.5.1.tar.gz) = 6612869
diff --git a/devel/py3-babel/pkg-descr b/devel/py3-babel/pkg-descr
deleted file mode 100644
index a29f09dfbc5a..000000000000
--- a/devel/py3-babel/pkg-descr
+++ /dev/null
@@ -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/
diff --git a/devel/py3-babel/pkg-plist b/devel/py3-babel/pkg-plist
deleted file mode 100644
index 18fd1eb06b27..000000000000
--- a/devel/py3-babel/pkg-plist
+++ /dev/null
@@ -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
diff --git a/devel/py3-cffi/Makefile b/devel/py3-cffi/Makefile
deleted file mode 100644
index 18af4227bf78..000000000000
--- a/devel/py3-cffi/Makefile
+++ /dev/null
@@ -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"
diff --git a/devel/py3-click-log/Makefile b/devel/py3-click-log/Makefile
deleted file mode 100644
index 7ae9bada6336..000000000000
--- a/devel/py3-click-log/Makefile
+++ /dev/null
@@ -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"
diff --git a/devel/py3-click-threading/Makefile b/devel/py3-click-threading/Makefile
deleted file mode 100644
index 40a94034401c..000000000000
--- a/devel/py3-click-threading/Makefile
+++ /dev/null
@@ -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"
diff --git a/devel/py3-click/Makefile b/devel/py3-click/Makefile
deleted file mode 100644
index 9eaf6cc5ec96..000000000000
--- a/devel/py3-click/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Philip Paeps <philip@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-click
-
-USES= python:3.2+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-colorama/Makefile b/devel/py3-colorama/Makefile
deleted file mode 100644
index e0f128612034..000000000000
--- a/devel/py3-colorama/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-colorama
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-coloredlogs/Makefile b/devel/py3-coloredlogs/Makefile
deleted file mode 100644
index a47acb37d035..000000000000
--- a/devel/py3-coloredlogs/Makefile
+++ /dev/null
@@ -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"
diff --git a/devel/py3-dateutil/Makefile b/devel/py3-dateutil/Makefile
deleted file mode 100644
index 20aaf3f5fe0d..000000000000
--- a/devel/py3-dateutil/Makefile
+++ /dev/null
@@ -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"
diff --git a/devel/py3-dbus/Makefile b/devel/py3-dbus/Makefile
deleted file mode 100644
index d6bc89ecdf0d..000000000000
--- a/devel/py3-dbus/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $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"
diff --git a/devel/py3-dbus/distinfo b/devel/py3-dbus/distinfo
deleted file mode 100644
index 30a68e423361..000000000000
--- a/devel/py3-dbus/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (dbus-python-1.1.1.tar.gz) = 8917ca4fb8f4d693aee18d200cbad166b2c938dfb88c03bb4ab3d90a7c915e88
-SIZE (dbus-python-1.1.1.tar.gz) = 596476
diff --git a/devel/py3-dbus/pkg-descr b/devel/py3-dbus/pkg-descr
deleted file mode 100644
index 39ce5c24ee2b..000000000000
--- a/devel/py3-dbus/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Python bindings for the D-BUS interprocess messaging system.
-
-WWW: http://dbus.freedesktop.org/doc/dbus-python/
diff --git a/devel/py3-defusedxml/Makefile b/devel/py3-defusedxml/Makefile
deleted file mode 100644
index 7e3c5f1d0b7d..000000000000
--- a/devel/py3-defusedxml/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-defusedxml
-
-USES= python:3.2+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-docopt/Makefile b/devel/py3-docopt/Makefile
deleted file mode 100644
index 9d06a8b25d39..000000000000
--- a/devel/py3-docopt/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-docopt
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-flake8-builtins/Makefile b/devel/py3-flake8-builtins/Makefile
deleted file mode 100644
index 60f9e018f8b9..000000000000
--- a/devel/py3-flake8-builtins/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-flake8-builtins
-
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py3-flake8
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-flake8-docstrings/Makefile b/devel/py3-flake8-docstrings/Makefile
deleted file mode 100644
index 48dc59621635..000000000000
--- a/devel/py3-flake8-docstrings/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $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"
diff --git a/devel/py3-flake8-import-order/Makefile b/devel/py3-flake8-import-order/Makefile
deleted file mode 100644
index 83e3ac3357db..000000000000
--- a/devel/py3-flake8-import-order/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $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"
diff --git a/devel/py3-flake8-polyfill/Makefile b/devel/py3-flake8-polyfill/Makefile
deleted file mode 100644
index 9c2c0363b8b7..000000000000
--- a/devel/py3-flake8-polyfill/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-flake8-polyfill
-
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py3-flake8
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-flake8-quotes/Makefile b/devel/py3-flake8-quotes/Makefile
deleted file mode 100644
index 0a3d066f0e5c..000000000000
--- a/devel/py3-flake8-quotes/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-flake8-quotes
-
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py3-flake8
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-flake8/Makefile b/devel/py3-flake8/Makefile
deleted file mode 100644
index b275474c9a94..000000000000
--- a/devel/py3-flake8/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $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"
diff --git a/devel/py3-freezegun/Makefile b/devel/py3-freezegun/Makefile
deleted file mode 100644
index dd17c5afdeb5..000000000000
--- a/devel/py3-freezegun/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $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"
diff --git a/devel/py3-gobject3/Makefile b/devel/py3-gobject3/Makefile
deleted file mode 100644
index 162c9a52828b..000000000000
--- a/devel/py3-gobject3/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $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"
diff --git a/devel/py3-hgtools/Makefile b/devel/py3-hgtools/Makefile
deleted file mode 100644
index 3a55bfc4c62d..000000000000
--- a/devel/py3-hgtools/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-hgtools
-
-USES= python:3 zip
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-icalendar/Makefile b/devel/py3-icalendar/Makefile
deleted file mode 100644
index 4f774ee9b86b..000000000000
--- a/devel/py3-icalendar/Makefile
+++ /dev/null
@@ -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"
diff --git a/devel/py3-jedi/Makefile b/devel/py3-jedi/Makefile
deleted file mode 100644
index 4cbe9a408fbc..000000000000
--- a/devel/py3-jedi/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-jedi
-
-USES= python:3.1+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-jsonschema/Makefile b/devel/py3-jsonschema/Makefile
deleted file mode 100644
index 9f56bb40bd47..000000000000
--- a/devel/py3-jsonschema/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
-# $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 <bsd.port.mk>
diff --git a/devel/py3-jsonschema/distinfo b/devel/py3-jsonschema/distinfo
deleted file mode 100644
index 14f677c8c0d5..000000000000
--- a/devel/py3-jsonschema/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1488112296
-SHA256 (jsonschema-2.6.0.tar.gz) = 6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02
-SIZE (jsonschema-2.6.0.tar.gz) = 53252
diff --git a/devel/py3-jsonschema/pkg-descr b/devel/py3-jsonschema/pkg-descr
deleted file mode 100644
index 70a4a02d308d..000000000000
--- a/devel/py3-jsonschema/pkg-descr
+++ /dev/null
@@ -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
diff --git a/devel/py3-libpeas/Makefile b/devel/py3-libpeas/Makefile
deleted file mode 100644
index cbbbcd8ed8f7..000000000000
--- a/devel/py3-libpeas/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Koop Mast <kwm@FreeBSD.org>
-# $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"
diff --git a/devel/py3-libzfs/Makefile b/devel/py3-libzfs/Makefile
deleted file mode 100644
index b68dcbd9ca2d..000000000000
--- a/devel/py3-libzfs/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-
-MASTERDIR= ${.CURDIR}/../py-libzfs
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-llfuse/Makefile b/devel/py3-llfuse/Makefile
deleted file mode 100644
index 6150a561de10..000000000000
--- a/devel/py3-llfuse/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-llfuse
-
-USES= compiler:c++11-lang fuse pkgconfig python:3.2+ tar:bz2
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-lxml/Makefile b/devel/py3-lxml/Makefile
deleted file mode 100644
index 8143e6988bd0..000000000000
--- a/devel/py3-lxml/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-lxml
-
-USES= python:3.2+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-mccabe/Makefile b/devel/py3-mccabe/Makefile
deleted file mode 100644
index 7c7ec61cc787..000000000000
--- a/devel/py3-mccabe/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-mccabe
-
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py3-pytest-runner
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-mock/Makefile b/devel/py3-mock/Makefile
deleted file mode 100644
index 1d968e3b28bf..000000000000
--- a/devel/py3-mock/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $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"
diff --git a/devel/py3-nose/Makefile b/devel/py3-nose/Makefile
deleted file mode 100644
index 20accbe4378c..000000000000
--- a/devel/py3-nose/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-nose
-
-USES= python:3.1+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-pbr/Makefile b/devel/py3-pbr/Makefile
deleted file mode 100644
index 0c6d2bbac3c2..000000000000
--- a/devel/py3-pbr/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pbr
-
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py3-pip
-
-USES= python:3.3+ shebangfix
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-pip/Makefile b/devel/py3-pip/Makefile
deleted file mode 100644
index dee3b20d71e3..000000000000
--- a/devel/py3-pip/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $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"
diff --git a/devel/py3-pluggy/Makefile b/devel/py3-pluggy/Makefile
deleted file mode 100644
index 96918b36ba51..000000000000
--- a/devel/py3-pluggy/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pluggy
-
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-ply/Makefile b/devel/py3-ply/Makefile
deleted file mode 100644
index 11760fbc09aa..000000000000
--- a/devel/py3-ply/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-ply
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-pretend/Makefile b/devel/py3-pretend/Makefile
deleted file mode 100644
index d0383f07a8ca..000000000000
--- a/devel/py3-pretend/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pretend
-
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest
-
-USES= python:3.2+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-prompt_toolkit/Makefile b/devel/py3-prompt_toolkit/Makefile
deleted file mode 100644
index 8bb04a80b172..000000000000
--- a/devel/py3-prompt_toolkit/Makefile
+++ /dev/null
@@ -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"
diff --git a/devel/py3-protobuf/Makefile b/devel/py3-protobuf/Makefile
deleted file mode 100644
index b29c3f5f700e..000000000000
--- a/devel/py3-protobuf/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-protobuf
-
-PORTSCOUT= ignore:1
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-py/Makefile b/devel/py3-py/Makefile
deleted file mode 100644
index d28e8c966a48..000000000000
--- a/devel/py3-py/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-py
-
-PORTSCOUT= ignore:1
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-pyasn1/Makefile b/devel/py3-pyasn1/Makefile
deleted file mode 100644
index c049e7caf4d3..000000000000
--- a/devel/py3-pyasn1/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Martin Jackson <mhjacks@swbell.net>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pyasn1
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-pycodestyle/Makefile b/devel/py3-pycodestyle/Makefile
deleted file mode 100644
index f8efae46b20e..000000000000
--- a/devel/py3-pycodestyle/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pycodestyle
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-pycparser/Makefile b/devel/py3-pycparser/Makefile
deleted file mode 100644
index 7a93b3ecf410..000000000000
--- a/devel/py3-pycparser/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pycparser
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-pydocstyle/Makefile b/devel/py3-pydocstyle/Makefile
deleted file mode 100644
index 4e099f1a4cf2..000000000000
--- a/devel/py3-pydocstyle/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $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"
diff --git a/devel/py3-pyflakes/Makefile b/devel/py3-pyflakes/Makefile
deleted file mode 100644
index a81c5778e28c..000000000000
--- a/devel/py3-pyflakes/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pyflakes
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-pygit2/Makefile b/devel/py3-pygit2/Makefile
deleted file mode 100644
index 195404b74ec3..000000000000
--- a/devel/py3-pygit2/Makefile
+++ /dev/null
@@ -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"
diff --git a/devel/py3-pyicu/Makefile b/devel/py3-pyicu/Makefile
deleted file mode 100644
index 90979ab8bc58..000000000000
--- a/devel/py3-pyicu/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Ben Woods <woodsb02@gmail.com>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pyicu
-
-USES= python:3.2+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-pylru-cache/Makefile b/devel/py3-pylru-cache/Makefile
deleted file mode 100644
index 0e3a281d299f..000000000000
--- a/devel/py3-pylru-cache/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Philip Paeps <philip@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pylru-cache
-
-USES= python:3.2+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-pytest-capturelog/Makefile b/devel/py3-pytest-capturelog/Makefile
deleted file mode 100644
index 4de3a7d234e9..000000000000
--- a/devel/py3-pytest-capturelog/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pytest-capturelog
-
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.1.1:devel/py3-py
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-pytest-runner/Makefile b/devel/py3-pytest-runner/Makefile
deleted file mode 100644
index 309f88fee722..000000000000
--- a/devel/py3-pytest-runner/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $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"
diff --git a/devel/py3-pytest-timeout/Makefile b/devel/py3-pytest-timeout/Makefile
deleted file mode 100644
index 5d3a77b01b76..000000000000
--- a/devel/py3-pytest-timeout/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pytest-timeout
-
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.4:devel/py3-pytest
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-pytest-xdist/Makefile b/devel/py3-pytest-xdist/Makefile
deleted file mode 100644
index eb7216f3c728..000000000000
--- a/devel/py3-pytest-xdist/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $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"
diff --git a/devel/py3-pytest/Makefile b/devel/py3-pytest/Makefile
deleted file mode 100644
index 33eb2f0166de..000000000000
--- a/devel/py3-pytest/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pytest
-
-USES= python:3.3+
-
-PORTSCOUT= ignore:1
-
-SLAVE_SUFFIX= ${PYTHON_MAJOR_VER}
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-python-magic/Makefile b/devel/py3-python-magic/Makefile
deleted file mode 100644
index f8a48acf79c7..000000000000
--- a/devel/py3-python-magic/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Kubilay Kocak <koobs@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-python-magic
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-pytz/Makefile b/devel/py3-pytz/Makefile
deleted file mode 100644
index a8a1335dd2c4..000000000000
--- a/devel/py3-pytz/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pytz
-
-USES= python:3.3+ zip
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-rubymarshal/Makefile b/devel/py3-rubymarshal/Makefile
deleted file mode 100644
index 8e0776631a00..000000000000
--- a/devel/py3-rubymarshal/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-rubymarshal
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-scripttest/Makefile b/devel/py3-scripttest/Makefile
deleted file mode 100644
index 682db76e4cda..000000000000
--- a/devel/py3-scripttest/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-scripttest
-
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-setproctitle/Makefile b/devel/py3-setproctitle/Makefile
deleted file mode 100644
index 1a37bc49263b..000000000000
--- a/devel/py3-setproctitle/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-setproctitle
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-setuptools_scm/Makefile b/devel/py3-setuptools_scm/Makefile
deleted file mode 100644
index fc216e57b4dc..000000000000
--- a/devel/py3-setuptools_scm/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: rs.os
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-setuptools_scm
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-simplejson/Makefile b/devel/py3-simplejson/Makefile
deleted file mode 100644
index 306e836b50ec..000000000000
--- a/devel/py3-simplejson/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-PORTREVISION= 1
-
-MASTERDIR= ${.CURDIR}/../py-simplejson
-
-PORTSCOUT= ignore:1
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-six/Makefile b/devel/py3-six/Makefile
deleted file mode 100644
index 592decabeecf..000000000000
--- a/devel/py3-six/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-six
-
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest
-
-PORTSCOUT= ignore:1
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-tabulate/Makefile b/devel/py3-tabulate/Makefile
deleted file mode 100644
index 11351b190099..000000000000
--- a/devel/py3-tabulate/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-tabulate
-
-USES= python:3.1+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-toposort/Makefile b/devel/py3-toposort/Makefile
deleted file mode 100644
index 1b91add10479..000000000000
--- a/devel/py3-toposort/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-toposort
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-tox/Makefile b/devel/py3-tox/Makefile
deleted file mode 100644
index 499c9d150c34..000000000000
--- a/devel/py3-tox/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $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"
diff --git a/devel/py3-tzlocal/Makefile b/devel/py3-tzlocal/Makefile
deleted file mode 100644
index 96072541f45b..000000000000
--- a/devel/py3-tzlocal/Makefile
+++ /dev/null
@@ -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"
diff --git a/devel/py3-urwid/Makefile b/devel/py3-urwid/Makefile
deleted file mode 100644
index 8d42e6d252f6..000000000000
--- a/devel/py3-urwid/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: rs.os
-# $FreeBSD$
-
-PORTSCOUT= ignore:1
-
-USES= python:3.3+
-
-MASTERDIR= ${.CURDIR}/../py-urwid
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-vcversioner/Makefile b/devel/py3-vcversioner/Makefile
deleted file mode 100644
index 943fdf891283..000000000000
--- a/devel/py3-vcversioner/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
-# $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 <bsd.port.mk>
diff --git a/devel/py3-vcversioner/distinfo b/devel/py3-vcversioner/distinfo
deleted file mode 100644
index 54eed9e0176b..000000000000
--- a/devel/py3-vcversioner/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1465721148
-SHA256 (vcversioner-2.16.0.0.tar.gz) = dae60c17a479781f44a4010701833f1829140b1eeccd258762a74974aa06e19b
-SIZE (vcversioner-2.16.0.0.tar.gz) = 9024
diff --git a/devel/py3-vcversioner/pkg-descr b/devel/py3-vcversioner/pkg-descr
deleted file mode 100644
index 4f31888f753f..000000000000
--- a/devel/py3-vcversioner/pkg-descr
+++ /dev/null
@@ -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
diff --git a/devel/py3-verboselogs/Makefile b/devel/py3-verboselogs/Makefile
deleted file mode 100644
index ea8e4f023c69..000000000000
--- a/devel/py3-verboselogs/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-verboselogs
-
-PORTSCOUT= ignore:1
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-virtualenv/Makefile b/devel/py3-virtualenv/Makefile
deleted file mode 100644
index e02a06895efa..000000000000
--- a/devel/py3-virtualenv/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $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"
diff --git a/devel/py3-voluptuous/Makefile b/devel/py3-voluptuous/Makefile
deleted file mode 100644
index 113ffb5d266d..000000000000
--- a/devel/py3-voluptuous/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-voluptuous
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-wcwidth/Makefile b/devel/py3-wcwidth/Makefile
deleted file mode 100644
index 04a36c845868..000000000000
--- a/devel/py3-wcwidth/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-wcwidth
-
-USES= python:3.4+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py3-xdg/Makefile b/devel/py3-xdg/Makefile
deleted file mode 100644
index e227889caf35..000000000000
--- a/devel/py3-xdg/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Created by: michael johnson <ahze@ahze.net>
-# $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 <bsd.port.mk>
diff --git a/devel/py3-xdg/distinfo b/devel/py3-xdg/distinfo
deleted file mode 100644
index c3a868b4c088..000000000000
--- a/devel/py3-xdg/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (pyxdg-0.25.tar.gz) = 81e883e0b9517d624e8b0499eb267b82a815c0b7146d5269f364988ae031279d
-SIZE (pyxdg-0.25.tar.gz) = 48935
diff --git a/devel/py3-xdg/files/patch-xdg_BaseDirectory.py b/devel/py3-xdg/files/patch-xdg_BaseDirectory.py
deleted file mode 100644
index 23fa9b13f8c5..000000000000
--- a/devel/py3-xdg/files/patch-xdg_BaseDirectory.py
+++ /dev/null
@@ -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')
diff --git a/devel/py3-xdg/pkg-descr b/devel/py3-xdg/pkg-descr
deleted file mode 100644
index c2c58f2a7c5e..000000000000
--- a/devel/py3-xdg/pkg-descr
+++ /dev/null
@@ -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
diff --git a/devel/py3-yaml/Makefile b/devel/py3-yaml/Makefile
deleted file mode 100644
index d17d55a12059..000000000000
--- a/devel/py3-yaml/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-yaml
-
-USES= python:3.1+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py34-setuptools/Makefile b/devel/py34-setuptools/Makefile
deleted file mode 100644
index 2097907f7b2c..000000000000
--- a/devel/py34-setuptools/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py27-setuptools
-
-PORTSCOUT= ignore:1
-
-USES= python:3.4
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py35-setuptools/Makefile b/devel/py35-setuptools/Makefile
deleted file mode 100644
index 3b3038944a2d..000000000000
--- a/devel/py35-setuptools/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py27-setuptools
-
-PORTSCOUT= ignore:1
-
-USES= python:3.5
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py36-setuptools/Makefile b/devel/py36-setuptools/Makefile
deleted file mode 100644
index 500332586632..000000000000
--- a/devel/py36-setuptools/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py27-setuptools
-
-PORTSCOUT= ignore:1
-
-USES= python:3.6
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py_static_check/Makefile b/devel/py_static_check/Makefile
index fb541a9c906f..c4e4d3193008 100644
--- a/devel/py_static_check/Makefile
+++ b/devel/py_static_check/Makefile
@@ -12,9 +12,9 @@ COMMENT= Statically check your python code
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 <bsd.port.mk>
diff --git a/devel/pycanberra/Makefile b/devel/pycanberra/Makefile
index aa973fca25cf..d16c1a3efedb 100644
--- a/devel/pycanberra/Makefile
+++ b/devel/pycanberra/Makefile
@@ -12,7 +12,7 @@ LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
USES= python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils optsuffix
USE_GITHUB= yes
GH_ACCOUNT= totdb
diff --git a/devel/pychecker/Makefile b/devel/pychecker/Makefile
index cc25e519a670..d2b59a18a494 100644
--- a/devel/pychecker/Makefile
+++ b/devel/pychecker/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python source code checking tool to help hunting common bugs
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/devel/pydbus-common/Makefile b/devel/pydbus-common/Makefile
index 4118765e2dcd..0a9e01b2ae8b 100644
--- a/devel/pydbus-common/Makefile
+++ b/devel/pydbus-common/Makefile
@@ -68,12 +68,8 @@ do-install:
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 \
diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile
index edebf02ff597..b9ff41f8393c 100644
--- a/devel/pygobject3-common/Makefile
+++ b/devel/pygobject3-common/Makefile
@@ -55,16 +55,16 @@ USE_GNOME+= glib20 introspection
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:
diff --git a/devel/pylint/Makefile b/devel/pylint/Makefile
index cbdc0f8f7ae1..fc291c5e3a2a 100644
--- a/devel/pylint/Makefile
+++ b/devel/pylint/Makefile
@@ -13,12 +13,16 @@ COMMENT= Analyzes python source code looking for bugs and signs of poor quality
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
@@ -29,12 +33,12 @@ SHEBANG_FILES= pylint/test/data/ascript
.include <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
diff --git a/devel/pymacs/Makefile b/devel/pymacs/Makefile
index 979dc001376c..bde2065e2817 100644
--- a/devel/pymacs/Makefile
+++ b/devel/pymacs/Makefile
@@ -15,7 +15,7 @@ LICENSE= GPLv2
USE_GITHUB= yes
GH_ACCOUNT= pinard
-USES= python
+USES= python:2.7
USE_EMACS= yes
USE_PYTHON= distutils
diff --git a/devel/pyobfuscate/Makefile b/devel/pyobfuscate/Makefile
index abd4c2833547..7021ec158371 100644
--- a/devel/pyobfuscate/Makefile
+++ b/devel/pyobfuscate/Makefile
@@ -16,7 +16,7 @@ GH_ACCOUNT= astrand
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
diff --git a/devel/pypersrc/Makefile b/devel/pypersrc/Makefile
index f9e728fc0651..8da287c8dcc0 100644
--- a/devel/pypersrc/Makefile
+++ b/devel/pypersrc/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python/Tkinter based source browser
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}
diff --git a/devel/pyrex/Makefile b/devel/pyrex/Makefile
index fd262030b377..e9dec6a1a55c 100644
--- a/devel/pyrex/Makefile
+++ b/devel/pyrex/Makefile
@@ -5,7 +5,7 @@ PORTNAME= pyrex
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
diff --git a/devel/pyside/Makefile b/devel/pyside/Makefile
index 39bf8a8955e9..6dfccdf47fb1 100644
--- a/devel/pyside/Makefile
+++ b/devel/pyside/Makefile
@@ -30,6 +30,7 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} \
PYTHON_VERSION=${PYTHON_VERSION}
USES= cmake python:2 tar:bzip2
+USE_PYTHON= flavors
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/devel/pysvn/Makefile b/devel/pysvn/Makefile
index 0122139a011c..eef341c9868f 100644
--- a/devel/pysvn/Makefile
+++ b/devel/pysvn/Makefile
@@ -18,16 +18,15 @@ LIB_DEPENDS= libsvn_client-1.so:devel/subversion \
# 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
diff --git a/devel/qbzr/Makefile b/devel/qbzr/Makefile
index eaf5f78bdd42..48b9fbd24945 100644
--- a/devel/qbzr/Makefile
+++ b/devel/qbzr/Makefile
@@ -14,13 +14,13 @@ COMMENT= Qt interface for bzr
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
diff --git a/devel/qct/Makefile b/devel/qct/Makefile
index 022169d61ae1..13873b9aa9cc 100644
--- a/devel/qct/Makefile
+++ b/devel/qct/Makefile
@@ -13,7 +13,7 @@ COMMENT= QCT GUI commit tool
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
diff --git a/devel/rbtools/Makefile b/devel/rbtools/Makefile
index 9922d1cfcaf5..3d0880aa84c3 100644
--- a/devel/rbtools/Makefile
+++ b/devel/rbtools/Makefile
@@ -11,14 +11,14 @@ COMMENT= Set of client tools to use with Review Board
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 <bsd.port.mk>
diff --git a/devel/renpy/Makefile b/devel/renpy/Makefile
index 9676ab30cc96..98fede8cfb83 100644
--- a/devel/renpy/Makefile
+++ b/devel/renpy/Makefile
@@ -16,13 +16,12 @@ LICENSE_NAME_DejaVu= Bitstream Vera and Arev fonts license
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 @@ PORTSCOUT?= site:http://www.renpy.org/dl/release/
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+="the_question tutorial"
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}
diff --git a/devel/runsnakerun/Makefile b/devel/runsnakerun/Makefile
index ac044b82a46c..3223fff52db9 100644
--- a/devel/runsnakerun/Makefile
+++ b/devel/runsnakerun/Makefile
@@ -13,8 +13,8 @@ COMMENT= GUI Viewer for Python profiling runs
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
diff --git a/devel/tailor/Makefile b/devel/tailor/Makefile
index 9000005a566f..0261c025b900 100644
--- a/devel/tailor/Makefile
+++ b/devel/tailor/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${LOCALBASE}/bin/rsync:net/rsync
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
NO_ARCH= yes
diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile
index f2dbaa25b30e..adcfb2c2b2fa 100644
--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@@ -13,8 +13,8 @@ LICENSE= GPLv2
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
diff --git a/devel/trac-bitten/Makefile b/devel/trac-bitten/Makefile
index d62cd0ade2c4..b512626d5963 100644
--- a/devel/trac-bitten/Makefile
+++ b/devel/trac-bitten/Makefile
@@ -34,7 +34,7 @@ BITTEN_MASTER_RUN_DEPENDS= tracd:www/trac
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}
diff --git a/devel/viewvc/Makefile b/devel/viewvc/Makefile
index 93e476164fde..668ddcdea7b3 100644
--- a/devel/viewvc/Makefile
+++ b/devel/viewvc/Makefile
@@ -33,8 +33,8 @@ LIGHTTPD_RUN_DEPENDS= lighttpd:www/lighttpd
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 <bsd.port.options.mk>
@@ -46,7 +46,7 @@ SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \
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}
diff --git a/dns/Makefile b/dns/Makefile
index 717f3bfd8452..e2f8e242fdf0 100644
--- a/dns/Makefile
+++ b/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
diff --git a/dns/bundy/Makefile b/dns/bundy/Makefile
index cef1152b61bd..ecdeaca73aba 100644
--- a/dns/bundy/Makefile
+++ b/dns/bundy/Makefile
@@ -19,12 +19,12 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
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 @@ USE_GITHUB= yes
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
diff --git a/dns/dnsrecon/Makefile b/dns/dnsrecon/Makefile
index 989d04ea3b1d..85e94d1ce6dd 100644
--- a/dns/dnsrecon/Makefile
+++ b/dns/dnsrecon/Makefile
@@ -11,9 +11,9 @@ COMMENT= DNS enumeration tool
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
diff --git a/dns/dnsviz/Makefile b/dns/dnsviz/Makefile
index 84c191c47720..621a5e4883d8 100644
--- a/dns/dnsviz/Makefile
+++ b/dns/dnsviz/Makefile
@@ -10,12 +10,12 @@ COMMENT= Analysis and visualization of DNS/DNSSEC behavior
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
diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile
index a8c8d4100043..0bcb5788e4f9 100644
--- a/dns/ldns/Makefile
+++ b/dns/ldns/Makefile
@@ -59,13 +59,14 @@ EXAMPLES_INSTALL_TARGET= install-examples
.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:
diff --git a/dns/maradns/Makefile b/dns/maradns/Makefile
index db79cea2c551..76e48918be6a 100644
--- a/dns/maradns/Makefile
+++ b/dns/maradns/Makefile
@@ -31,7 +31,7 @@ OPTIONS_SUB= yes
CONV_DESC= Install bind2csv2 tool (needs python)
IPV6_CONFIGURE_ON= --ipv6
-CONV_USES= python:run
+CONV_USES= python:2.7,run
PORTDOCS= *
PORTEXAMPLES= *
diff --git a/dns/py-dns-lexicon/Makefile b/dns/py-dns-lexicon/Makefile
index a82eebdd0dc6..b9a5f58f9069 100644
--- a/dns/py-dns-lexicon/Makefile
+++ b/dns/py-dns-lexicon/Makefile
@@ -13,9 +13,9 @@ COMMENT= Manipulate DNS records on various DNS providers in a standardized way
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
diff --git a/dns/py-dnschain/Makefile b/dns/py-dnschain/Makefile
index ecfc5e733e64..84c9515a3a7d 100644
--- a/dns/py-dnschain/Makefile
+++ b/dns/py-dnschain/Makefile
@@ -12,7 +12,7 @@ COMMENT= Library for looking up blockchain data via DNSChain
LICENSE= MPL20
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/dns/py-dnspython/Makefile b/dns/py-dnspython/Makefile
index ddb5759460e9..f8d764a2d1e2 100644
--- a/dns/py-dnspython/Makefile
+++ b/dns/py-dnspython/Makefile
@@ -14,12 +14,12 @@ LICENSE= ISCL
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
diff --git a/dns/py-easyzone/Makefile b/dns/py-easyzone/Makefile
index 99fc8eca2a20..eec61e6d8dd9 100644
--- a/dns/py-easyzone/Makefile
+++ b/dns/py-easyzone/Makefile
@@ -13,7 +13,7 @@ COMMENT= DNS Zone abstraction module for Python
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
diff --git a/dns/py-idna/Makefile b/dns/py-idna/Makefile
index 5bcb4dae5eb3..4e7383794faa 100644
--- a/dns/py-idna/Makefile
+++ b/dns/py-idna/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/dns/py-namebench/Makefile b/dns/py-namebench/Makefile
index f97f550cce64..bac13ad2d016 100644
--- a/dns/py-namebench/Makefile
+++ b/dns/py-namebench/Makefile
@@ -15,18 +15,18 @@ COMMENT= Open Source DNS benchmark utility
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 <bsd.port.options.mk>
.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
diff --git a/dns/py-py3dns/Makefile b/dns/py-py3dns/Makefile
index 7e773e13ecdd..311cf4754ae5 100644
--- a/dns/py-py3dns/Makefile
+++ b/dns/py-py3dns/Makefile
@@ -16,7 +16,7 @@ LICENSE_NAME= CNRI LICENSE AGREEMENT
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
diff --git a/dns/py-pydnstable/Makefile b/dns/py-pydnstable/Makefile
index 37e842249ed7..51cc44d5046d 100644
--- a/dns/py-pydnstable/Makefile
+++ b/dns/py-pydnstable/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT
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
diff --git a/dns/py-pywdns/Makefile b/dns/py-pywdns/Makefile
index 4575dd0e06e6..3dda87195ed4 100644
--- a/dns/py-pywdns/Makefile
+++ b/dns/py-pywdns/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT
LIB_DEPENDS= libwdns.so:dns/wdns
-USES= pkgconfig python
+USES= pkgconfig python:2.7
USE_PYTHON= autoplist distutils
post-patch:
diff --git a/dns/py-tldextract/Makefile b/dns/py-tldextract/Makefile
index 4ca76d78d211..b11e4c66a312 100644
--- a/dns/py-tldextract/Makefile
+++ b/dns/py-tldextract/Makefile
@@ -12,7 +12,7 @@ COMMENT= Separate the TLD from the registered domain and subdomains of a URL
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
diff --git a/dns/py3-dnspython/Makefile b/dns/py3-dnspython/Makefile
deleted file mode 100644
index 1e618eac7a8f..000000000000
--- a/dns/py3-dnspython/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-dnspython
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/dns/py3-idna/Makefile b/dns/py3-idna/Makefile
deleted file mode 100644
index 02e14e4224fb..000000000000
--- a/dns/py3-idna/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Kubilay Kocak <koobs@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-idna
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/dns/sshfp/Makefile b/dns/sshfp/Makefile
index ecaabdef3014..dd09652060cd 100644
--- a/dns/sshfp/Makefile
+++ b/dns/sshfp/Makefile
@@ -11,11 +11,12 @@ COMMENT= Generate SSHFP DNS records from knownhosts files or ssh-keyscan
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
diff --git a/editors/fileobj/Makefile b/editors/fileobj/Makefile
index f194af72b3e2..1bc89ede5442 100644
--- a/editors/fileobj/Makefile
+++ b/editors/fileobj/Makefile
@@ -16,7 +16,7 @@ GH_ACCOUNT= kusumi
USE_GITHUB= yes
USES= python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils concurrent optsuffix
PLIST_FILES= man/man1/fileobj.1.gz
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 15e3548e4267..5a593b6f120e 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= gedit>=0:editors/gedit
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 @@ GLIB_SCHEMAS= org.gnome.gedit.plugins.drawspaces.gschema.xml \
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
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 0d7f251a294b..ce181062bc39 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= libenchant.so:textproc/enchant \
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
diff --git a/editors/gwrite/Makefile b/editors/gwrite/Makefile
index 089507f6789c..8de253deded4 100644
--- a/editors/gwrite/Makefile
+++ b/editors/gwrite/Makefile
@@ -14,16 +14,16 @@ COMMENT= Simple HTML format editor
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}
diff --git a/editors/leo/Makefile b/editors/leo/Makefile
index 807e9675660e..8e80c4357065 100644
--- a/editors/leo/Makefile
+++ b/editors/leo/Makefile
@@ -15,8 +15,8 @@ COMMENT= Advanced outline editor for programmers
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 @@ DESKTOP_ENTRIES="Leo" "Literate Editor with Outlines" \
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
diff --git a/editors/py-room/Makefile b/editors/py-room/Makefile
index e867ad002a19..a3251d4feb08 100644
--- a/editors/py-room/Makefile
+++ b/editors/py-room/Makefile
@@ -12,9 +12,9 @@ DISTNAME= py${PORTNAME}-${PORTVERSION}
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
diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile
index 9b8e263cef17..d510b2c31b32 100644
--- a/editors/texworks/Makefile
+++ b/editors/texworks/Makefile
@@ -47,7 +47,7 @@ PORTDOCS= *
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:
diff --git a/emulators/dynagen/Makefile b/emulators/dynagen/Makefile
index 84ca66957550..80003d9efecd 100644
--- a/emulators/dynagen/Makefile
+++ b/emulators/dynagen/Makefile
@@ -12,7 +12,7 @@ COMMENT= Text-based front end for Dynamips development version
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 @@ PORTDOCS= *
PORTEXAMPLES= *
PORTDATA= *
-USES= dos2unix python shebangfix
+USES= dos2unix python:2.7 shebangfix
SHEBANG_FILES= *.py dynagen
USE_PYTHON= distutils autoplist
diff --git a/emulators/dynagui/Makefile b/emulators/dynagui/Makefile
index bb28f60a3ba0..ffc8af6709e4 100644
--- a/emulators/dynagui/Makefile
+++ b/emulators/dynagui/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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
diff --git a/emulators/gns3/Makefile b/emulators/gns3/Makefile
index 3e2279e016a7..58b4ff1e652b 100644
--- a/emulators/gns3/Makefile
+++ b/emulators/gns3/Makefile
@@ -14,16 +14,16 @@ COMMENT= Graphical Cisco network simulator
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
diff --git a/emulators/loemu/Makefile b/emulators/loemu/Makefile
index efc47579fb7d..c4ed6466cfe3 100644
--- a/emulators/loemu/Makefile
+++ b/emulators/loemu/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2 \
${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
diff --git a/emulators/py-gns3-converter/Makefile b/emulators/py-gns3-converter/Makefile
index a9d5898fa8bb..9021d4b0ac25 100644
--- a/emulators/py-gns3-converter/Makefile
+++ b/emulators/py-gns3-converter/Makefile
@@ -10,7 +10,7 @@ COMMENT= Convert old GNS3 (<=0.8.7) topologies to newer versions
LICENSE= GPLv3
-USES= python:3
-USE_PYTHON= distutils autoplist
+USES= python:3.4+
+USE_PYTHON= distutils autoplist optsuffix
.include <bsd.port.mk>
diff --git a/emulators/py-nova/Makefile b/emulators/py-nova/Makefile
index 332b051d6c24..c03066857b55 100644
--- a/emulators/py-nova/Makefile
+++ b/emulators/py-nova/Makefile
@@ -13,65 +13,65 @@ COMMENT= OpenStack compute service
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
diff --git a/emulators/swine/Makefile b/emulators/swine/Makefile
index 1526f10ec742..b199984c4bb4 100644
--- a/emulators/swine/Makefile
+++ b/emulators/swine/Makefile
@@ -23,7 +23,7 @@ USE_GITHUB= yes
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
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index c08137817b50..1691f0bb0441 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -149,7 +149,7 @@ USE_TEX= dvipsk:build formats:build
.if ${PORT_OPTIONS:MPYTHON}
USES+= python
-USE_PYTHON= distutils noegginfo
+USE_PYTHON= distutils noegginfo noflavors
PYDISTUTILS_PKGNAME= vboxapi
PYDISTUTILS_PKGVERSION= 1.0
.else
diff --git a/finance/bitcoin-armory/Makefile b/finance/bitcoin-armory/Makefile
index c96a273029c7..2a4396a92862 100644
--- a/finance/bitcoin-armory/Makefile
+++ b/finance/bitcoin-armory/Makefile
@@ -14,10 +14,10 @@ LICENSE= AGPLv3
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
diff --git a/finance/electrum/Makefile b/finance/electrum/Makefile
index d22856fadb6a..db7e52582b40 100644
--- a/finance/electrum/Makefile
+++ b/finance/electrum/Makefile
@@ -14,33 +14,26 @@ COMMENT= Easy to use Bitcoin client
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 <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/finance/electrum2/Makefile b/finance/electrum2/Makefile
index c9c8319a16a9..858db12ff625 100644
--- a/finance/electrum2/Makefile
+++ b/finance/electrum2/Makefile
@@ -16,15 +16,15 @@ COMMENT= Easy to use Bitcoin client (legacy version)
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.*
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index faa4369a2a5b..668c9ef38d0e 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -53,7 +53,7 @@ DATABASE_RUN_DEPENDS= libdbi-drivers>=0:databases/libdbi-drivers
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
diff --git a/finance/py-python-obelisk/Makefile b/finance/py-python-obelisk/Makefile
index 168228cff82c..15ab4d769feb 100644
--- a/finance/py-python-obelisk/Makefile
+++ b/finance/py-python-obelisk/Makefile
@@ -14,9 +14,9 @@ COMMENT= Python native client for the obelisk blockchain server
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
diff --git a/finance/py-stripe/Makefile b/finance/py-stripe/Makefile
index 9cd560736436..8e9155170d37 100644
--- a/finance/py-stripe/Makefile
+++ b/finance/py-stripe/Makefile
@@ -14,10 +14,10 @@ COMMENT= Stripe Python bindings
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
diff --git a/finance/py-vatnumber/Makefile b/finance/py-vatnumber/Makefile
index cffb05983be5..94bdf14dc1a7 100644
--- a/finance/py-vatnumber/Makefile
+++ b/finance/py-vatnumber/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python module to validate VAT numbers
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
diff --git a/finance/sabernetdcs-client/Makefile b/finance/sabernetdcs-client/Makefile
index 31b8e1983e2f..dda38d739f27 100644
--- a/finance/sabernetdcs-client/Makefile
+++ b/finance/sabernetdcs-client/Makefile
@@ -15,11 +15,11 @@ COMMENT= SaberNet DCS - A labor data collection system
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
diff --git a/finance/tryton28/Makefile b/finance/tryton28/Makefile
index 68ce15c68989..b20293f9e049 100644
--- a/finance/tryton28/Makefile
+++ b/finance/tryton28/Makefile
@@ -13,8 +13,8 @@ COMMENT= Tryton Application Platform (Gtk+ Client)
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].*
diff --git a/finance/trytond28/Makefile b/finance/trytond28/Makefile
index c81693ef48da..10ef912a99df 100644
--- a/finance/trytond28/Makefile
+++ b/finance/trytond28/Makefile
@@ -14,13 +14,13 @@ COMMENT= Tryton Application Platform (Server)
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 @@ SUB_LIST= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
PIDDIR?= /var/run
LOGDIR?= /var/log
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
post-patch:
@@ -52,19 +52,19 @@ post-patch:
.include <bsd.port.options.mk>
.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:
diff --git a/finance/trytond28_account/Makefile b/finance/trytond28_account/Makefile
index c497a40db0e7..fb3c59b46502 100644
--- a/finance/trytond28_account/Makefile
+++ b/finance/trytond28_account/Makefile
@@ -15,11 +15,11 @@ LICENSE= GPLv3
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 <bsd.port.mk>
diff --git a/finance/trytond28_account_asset/Makefile b/finance/trytond28_account_asset/Makefile
index ad7cbbdb359b..ba140647ce20 100644
--- a/finance/trytond28_account_asset/Makefile
+++ b/finance/trytond28_account_asset/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_product>=2.8.0:finance/trytond28_product \
CONFLICTS= trytond_account-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_account_be/Makefile b/finance/trytond28_account_be/Makefile
index 7da9ef4f9af3..eec3ff8ac830 100644
--- a/finance/trytond28_account_be/Makefile
+++ b/finance/trytond28_account_be/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_account>=2.8.1:finance/trytond28_account
CONFLICTS= trytond_account-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_account_invoice/Makefile b/finance/trytond28_account_invoice/Makefile
index a1d333a9aa09..144939af5746 100644
--- a/finance/trytond28_account_invoice/Makefile
+++ b/finance/trytond28_account_invoice/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= trytond28_account_product>=2.8.0:finance/trytond28_account_product
CONFLICTS= trytond_account_invoice-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_account_invoice_history/Makefile b/finance/trytond28_account_invoice_history/Makefile
index 1d3679a76a7c..ba511594bc69 100644
--- a/finance/trytond28_account_invoice_history/Makefile
+++ b/finance/trytond28_account_invoice_history/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_account_invoice>=2.8.2:finance/trytond28_account_invoice
CONFLICTS= trytond_account_invoice_history-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_account_invoice_line_standalone/Makefile b/finance/trytond28_account_invoice_line_standalone/Makefile
index a8d12325aa84..faf109acfc75 100644
--- a/finance/trytond28_account_invoice_line_standalone/Makefile
+++ b/finance/trytond28_account_invoice_line_standalone/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_account_invoice>=2.8.2:finance/trytond28_account_invoice
CONFLICTS= trytond_account_invoice_line_standalone-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_account_product/Makefile b/finance/trytond28_account_product/Makefile
index 4939365a8b32..e73dc50a8b46 100644
--- a/finance/trytond28_account_product/Makefile
+++ b/finance/trytond28_account_product/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= trytond28_account>=2.8.1:finance/trytond28_account \
CONFLICTS= trytond_account_product-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_account_statement/Makefile b/finance/trytond28_account_statement/Makefile
index d78c03eb35f2..bfa79cfc7f73 100644
--- a/finance/trytond28_account_statement/Makefile
+++ b/finance/trytond28_account_statement/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= trytond28_account_invoice>=2.8.2:finance/trytond28_account_invoice
CONFLICTS= trytond_account_statement-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_account_stock_anglo_saxon/Makefile b/finance/trytond28_account_stock_anglo_saxon/Makefile
index 12b5892472c3..31f7ef8fac4f 100644
--- a/finance/trytond28_account_stock_anglo_saxon/Makefile
+++ b/finance/trytond28_account_stock_anglo_saxon/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_account_invoice>=2.8.2:finance/trytond28_account_invoice
CONFLICTS= trytond_account_stock_anglo_saxon-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_account_stock_continental/Makefile b/finance/trytond28_account_stock_continental/Makefile
index 4819fd0f7efa..66f8b6354adc 100644
--- a/finance/trytond28_account_stock_continental/Makefile
+++ b/finance/trytond28_account_stock_continental/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= trytond28_account_product>=2.8.0:finance/trytond28_account_product
CONFLICTS= trytond_account_stock_continental-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_analytic_account/Makefile b/finance/trytond28_analytic_account/Makefile
index 9d04fbb98158..19e6b1edbb17 100644
--- a/finance/trytond28_analytic_account/Makefile
+++ b/finance/trytond28_analytic_account/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= trytond28_company>=2.8.0:finance/trytond28_company \
CONFLICTS= trytond_analytic_account-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_analytic_invoice/Makefile b/finance/trytond28_analytic_invoice/Makefile
index a62c7c60b85e..169f4dedf217 100644
--- a/finance/trytond28_analytic_invoice/Makefile
+++ b/finance/trytond28_analytic_invoice/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= trytond28_analytic_account>=2.8.0:finance/trytond28_analytic_accoun
CONFLICTS= trytond_analytic_invoice-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_analytic_purchase/Makefile b/finance/trytond28_analytic_purchase/Makefile
index d03eda58a8b9..47f44e2c6d03 100644
--- a/finance/trytond28_analytic_purchase/Makefile
+++ b/finance/trytond28_analytic_purchase/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= trytond28_analytic_account>=2.8.0:finance/trytond28_analytic_accoun
CONFLICTS= trytond_analytic_purchase-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_analytic_sale/Makefile b/finance/trytond28_analytic_sale/Makefile
index 8fd412b78a24..3512df9c8713 100644
--- a/finance/trytond28_analytic_sale/Makefile
+++ b/finance/trytond28_analytic_sale/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= trytond28_analytic_account>=2.8.0:finance/trytond28_analytic_accoun
CONFLICTS= trytond_analytic_sale-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_calendar/Makefile b/finance/trytond28_calendar/Makefile
index 13580f940fb6..1c55b2de732f 100644
--- a/finance/trytond28_calendar/Makefile
+++ b/finance/trytond28_calendar/Makefile
@@ -14,14 +14,14 @@ COMMENT= Tryton Application Platform (Calendar Module)
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 <bsd.port.mk>
diff --git a/finance/trytond28_calendar_classification/Makefile b/finance/trytond28_calendar_classification/Makefile
index 5055838da072..bae48aa713e0 100644
--- a/finance/trytond28_calendar_classification/Makefile
+++ b/finance/trytond28_calendar_classification/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_calendar>=2.8.0:finance/trytond28_calendar
CONFLICTS= trytond_calendar_classification-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_calendar_scheduling/Makefile b/finance/trytond28_calendar_scheduling/Makefile
index e4999adaf47d..f78803c11f34 100644
--- a/finance/trytond28_calendar_scheduling/Makefile
+++ b/finance/trytond28_calendar_scheduling/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= trytond28_calendar>=2.8.0:finance/trytond28_calendar
CONFLICTS= trytond_calendar_scheduling-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_calendar_todo/Makefile b/finance/trytond28_calendar_todo/Makefile
index a27fe62c50a0..8a0333c3ec07 100644
--- a/finance/trytond28_calendar_todo/Makefile
+++ b/finance/trytond28_calendar_todo/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= trytond28_calendar>=2.8.0:finance/trytond28_calendar
CONFLICTS= trytond_calendar_todo-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_carrier/Makefile b/finance/trytond28_carrier/Makefile
index e0a9d256396c..714c3c306108 100644
--- a/finance/trytond28_carrier/Makefile
+++ b/finance/trytond28_carrier/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= trytond28_party>=2.8.0:finance/trytond28_party \
CONFLICTS= trytond_carrier-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_carrier_percentage/Makefile b/finance/trytond28_carrier_percentage/Makefile
index 902f0a6c6b40..f0b9ffc9a076 100644
--- a/finance/trytond28_carrier_percentage/Makefile
+++ b/finance/trytond28_carrier_percentage/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= trytond28_carrier>=2.8.0:finance/trytond28_carrier \
CONFLICTS= trytond_carrier_percentage-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_carrier_weight/Makefile b/finance/trytond28_carrier_weight/Makefile
index eda078171e40..21506314214a 100644
--- a/finance/trytond28_carrier_weight/Makefile
+++ b/finance/trytond28_carrier_weight/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_product_measurements>=2.8.0:finance/trytond28_product_mea
CONFLICTS= trytond_carrier_weight-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_company/Makefile b/finance/trytond28_company/Makefile
index f3b503d5a12e..5e2ffb5172aa 100644
--- a/finance/trytond28_company/Makefile
+++ b/finance/trytond28_company/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= trytond28_party>=2.8.0:finance/trytond28_party \
CONFLICTS= trytond_company-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_company_work_time/Makefile b/finance/trytond28_company_work_time/Makefile
index ae9d022b61b2..3b3af668d057 100644
--- a/finance/trytond28_company_work_time/Makefile
+++ b/finance/trytond28_company_work_time/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_company>=2.8.0:finance/trytond28_company
CONFLICTS= trytond_company_work_time-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_country/Makefile b/finance/trytond28_country/Makefile
index d78c79cd1ecc..cc93abbc7018 100644
--- a/finance/trytond28_country/Makefile
+++ b/finance/trytond28_country/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= trytond28>=2.8.2:finance/trytond28
CONFLICTS= trytond_country-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_currency/Makefile b/finance/trytond28_currency/Makefile
index 04ed570f6be4..102e266399e0 100644
--- a/finance/trytond28_currency/Makefile
+++ b/finance/trytond28_currency/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= trytond28>=2.8.2:finance/trytond28
CONFLICTS= trytond_currency-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_dashboard/Makefile b/finance/trytond28_dashboard/Makefile
index ce7a54f5b297..fe1e040fab8b 100644
--- a/finance/trytond28_dashboard/Makefile
+++ b/finance/trytond28_dashboard/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28>=2.8.2:finance/trytond28
CONFLICTS= trytond_dashboard-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_ldap_authentication/Makefile b/finance/trytond28_ldap_authentication/Makefile
index a7921b437f66..29a09ef202e7 100644
--- a/finance/trytond28_ldap_authentication/Makefile
+++ b/finance/trytond28_ldap_authentication/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= trytond28_ldap_connection>=2.8.0:finance/trytond28_ldap_connection
CONFLICTS= trytond_ldap_authentication-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_ldap_connection/Makefile b/finance/trytond28_ldap_connection/Makefile
index 80cf6d737aa2..81b5fb1bac42 100644
--- a/finance/trytond28_ldap_connection/Makefile
+++ b/finance/trytond28_ldap_connection/Makefile
@@ -15,11 +15,11 @@ COMMENT= Tryton Application Platform (LDAP Connection Module)
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 <bsd.port.mk>
diff --git a/finance/trytond28_party/Makefile b/finance/trytond28_party/Makefile
index 95755481688e..041199a66419 100644
--- a/finance/trytond28_party/Makefile
+++ b/finance/trytond28_party/Makefile
@@ -15,11 +15,11 @@ LICENSE= GPLv3
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 <bsd.port.mk>
diff --git a/finance/trytond28_party_siret/Makefile b/finance/trytond28_party_siret/Makefile
index 1010095eb630..54ef7c185c2e 100644
--- a/finance/trytond28_party_siret/Makefile
+++ b/finance/trytond28_party_siret/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_party>=2.8.0:finance/trytond28_party
CONFLICTS= trytond_party_siret-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_party_vcarddav/Makefile b/finance/trytond28_party_vcarddav/Makefile
index e420c601c1bd..37cc73cba703 100644
--- a/finance/trytond28_party_vcarddav/Makefile
+++ b/finance/trytond28_party_vcarddav/Makefile
@@ -15,12 +15,12 @@ COMMENT= Tryton Application Platform (Party VCardDAV Module)
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 <bsd.port.mk>
diff --git a/finance/trytond28_product/Makefile b/finance/trytond28_product/Makefile
index d7c3f131287c..fc5b81f28ec5 100644
--- a/finance/trytond28_product/Makefile
+++ b/finance/trytond28_product/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= trytond28>=2.8.2:finance/trytond28
CONFLICTS= trytond_product-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_product_attribute/Makefile b/finance/trytond28_product_attribute/Makefile
index 950d7e91805b..ce1d012852a8 100644
--- a/finance/trytond28_product_attribute/Makefile
+++ b/finance/trytond28_product_attribute/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_product>=2.8.0:finance/trytond28_product
CONFLICTS= trytond_product_attribute-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_product_cost_fifo/Makefile b/finance/trytond28_product_cost_fifo/Makefile
index c44d59792f56..82d0d5be2af1 100644
--- a/finance/trytond28_product_cost_fifo/Makefile
+++ b/finance/trytond28_product_cost_fifo/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_product>=2.8.0:finance/trytond28_product \
CONFLICTS= trytond_product_cost_fifo-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_product_cost_history/Makefile b/finance/trytond28_product_cost_history/Makefile
index c520759db487..7345da73e8b6 100644
--- a/finance/trytond28_product_cost_history/Makefile
+++ b/finance/trytond28_product_cost_history/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_product>=2.8.0:finance/trytond28_product
CONFLICTS= trytond_product_cost_history-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_product_measurements/Makefile b/finance/trytond28_product_measurements/Makefile
index 723ddca28527..58d13d2d0468 100644
--- a/finance/trytond28_product_measurements/Makefile
+++ b/finance/trytond28_product_measurements/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_product>=2.8.0:finance/trytond28_product
CONFLICTS= trytond_product_measurements-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_product_price_list/Makefile b/finance/trytond28_product_price_list/Makefile
index 0979eb2fa282..860cf1e186b7 100644
--- a/finance/trytond28_product_price_list/Makefile
+++ b/finance/trytond28_product_price_list/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= trytond28_product>=2.8.0:finance/trytond28_product \
CONFLICTS= trytond_product_price_list-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_production/Makefile b/finance/trytond28_production/Makefile
index a6a65c4d8989..2ec98930e8c3 100644
--- a/finance/trytond28_production/Makefile
+++ b/finance/trytond28_production/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= trytond28_product>=2.8.0:finance/trytond28_product \
CONFLICTS= trytond_production-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_project/Makefile b/finance/trytond28_project/Makefile
index 25051008081c..978397a0d05b 100644
--- a/finance/trytond28_project/Makefile
+++ b/finance/trytond28_project/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= trytond28>=2.8.2:finance/trytond28 \
CONFLICTS= trytond_project-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_project_invoice/Makefile b/finance/trytond28_project_invoice/Makefile
index b18f173bd8d5..1a7b6cf4fb4b 100644
--- a/finance/trytond28_project_invoice/Makefile
+++ b/finance/trytond28_project_invoice/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= trytond28_timesheet>=2.8.0:finance/trytond28_timesheet \
CONFLICTS= trytond_project_invoice-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_project_plan/Makefile b/finance/trytond28_project_plan/Makefile
index 3913baacdb98..36319c965f26 100644
--- a/finance/trytond28_project_plan/Makefile
+++ b/finance/trytond28_project_plan/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= trytond28_project>=2.8.0:finance/trytond28_project
CONFLICTS= trytond_project_plan-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_project_revenue/Makefile b/finance/trytond28_project_revenue/Makefile
index b0f049d18027..74d405d27b2f 100644
--- a/finance/trytond28_project_revenue/Makefile
+++ b/finance/trytond28_project_revenue/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_project>=2.8.0:finance/trytond28_project \
CONFLICTS= trytond_project_revenue-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_purchase/Makefile b/finance/trytond28_purchase/Makefile
index 4412e2474134..ce1210bc733a 100644
--- a/finance/trytond28_purchase/Makefile
+++ b/finance/trytond28_purchase/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_stock>=2.8.2:finance/trytond28_stock \
CONFLICTS= trytond_purchase-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_purchase_invoice_line_standalone/Makefile b/finance/trytond28_purchase_invoice_line_standalone/Makefile
index 929d91943c37..55f595537bd2 100644
--- a/finance/trytond28_purchase_invoice_line_standalone/Makefile
+++ b/finance/trytond28_purchase_invoice_line_standalone/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_purchase>=2.8.0:finance/trytond28_purchase \
CONFLICTS= trytond_purchase_invoice_line_standalone-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_purchase_shipment_cost/Makefile b/finance/trytond28_purchase_shipment_cost/Makefile
index 845b8da4661a..2542409cc95d 100644
--- a/finance/trytond28_purchase_shipment_cost/Makefile
+++ b/finance/trytond28_purchase_shipment_cost/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= trytond28_carrier>=2.8.0:finance/trytond28_carrier \
CONFLICTS= trytond_purchase_shipment_cost-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_sale/Makefile b/finance/trytond28_sale/Makefile
index d8fd6e88f8db..aeca0b758484 100644
--- a/finance/trytond28_sale/Makefile
+++ b/finance/trytond28_sale/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_account_invoice>=2.8.2:finance/trytond28_account_invoice
CONFLICTS= trytond_sale-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_sale_opportunity/Makefile b/finance/trytond28_sale_opportunity/Makefile
index 78d861fa75ca..167481a7c078 100644
--- a/finance/trytond28_sale_opportunity/Makefile
+++ b/finance/trytond28_sale_opportunity/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= trytond28_sale>=2.8.1:finance/trytond28_sale
CONFLICTS= trytond_sale_opportunity-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_sale_price_list/Makefile b/finance/trytond28_sale_price_list/Makefile
index ff5fb9f92629..48511179c6f6 100644
--- a/finance/trytond28_sale_price_list/Makefile
+++ b/finance/trytond28_sale_price_list/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= trytond28_party>=2.8.0:finance/trytond28_party \
CONFLICTS= trytond_sale_price_list-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_sale_shipment_cost/Makefile b/finance/trytond28_sale_shipment_cost/Makefile
index e65dc368b6d7..fc362f108a2c 100644
--- a/finance/trytond28_sale_shipment_cost/Makefile
+++ b/finance/trytond28_sale_shipment_cost/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= trytond28_carrier>=2.8.0:finance/trytond28_carrier \
CONFLICTS= trytond_sale_shipment_cost-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_sale_supply/Makefile b/finance/trytond28_sale_supply/Makefile
index 49f09a19638b..f8dc98906800 100644
--- a/finance/trytond28_sale_supply/Makefile
+++ b/finance/trytond28_sale_supply/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= trytond28_sale>=2.8.1:finance/trytond28_sale
CONFLICTS= trytond_sale_supply-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_sale_supply_drop_shipment/Makefile b/finance/trytond28_sale_supply_drop_shipment/Makefile
index 48b96e683c68..60b1c6bf0f06 100644
--- a/finance/trytond28_sale_supply_drop_shipment/Makefile
+++ b/finance/trytond28_sale_supply_drop_shipment/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= trytond28_sale_supply>=2.8.1:finance/trytond28_sale_supply
CONFLICTS= trytond_sale_supply_drop_shipment-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_stock/Makefile b/finance/trytond28_stock/Makefile
index 6d4fb63cd2ef..fa655e7b0ef7 100644
--- a/finance/trytond28_stock/Makefile
+++ b/finance/trytond28_stock/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= trytond28_party>=2.8.0:finance/trytond28_party \
CONFLICTS= trytond_stock-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_stock_forecast/Makefile b/finance/trytond28_stock_forecast/Makefile
index 58cbd6912d89..bbba00ca76fc 100644
--- a/finance/trytond28_stock_forecast/Makefile
+++ b/finance/trytond28_stock_forecast/Makefile
@@ -13,12 +13,12 @@ COMMENT= Tryton Application Platform (Stock Forecast Module)
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 <bsd.port.mk>
diff --git a/finance/trytond28_stock_inventory_location/Makefile b/finance/trytond28_stock_inventory_location/Makefile
index 5f75cf5dcf4f..a551f84caf15 100644
--- a/finance/trytond28_stock_inventory_location/Makefile
+++ b/finance/trytond28_stock_inventory_location/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= trytond28_stock>=2.8.2:finance/trytond28_stock
CONFLICTS= trytond_stock_inventory_location-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_stock_location_sequence/Makefile b/finance/trytond28_stock_location_sequence/Makefile
index a90b81939dc7..dc028d14fa07 100644
--- a/finance/trytond28_stock_location_sequence/Makefile
+++ b/finance/trytond28_stock_location_sequence/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= trytond28_stock>=2.8.2:finance/trytond28_stock
CONFLICTS= trytond_stock_location_sequence-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_stock_lot/Makefile b/finance/trytond28_stock_lot/Makefile
index 961e049895b2..16ba039444b2 100644
--- a/finance/trytond28_stock_lot/Makefile
+++ b/finance/trytond28_stock_lot/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_product>=2.8.0:finance/trytond28_product \
CONFLICTS= trytond_stock_lot-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_stock_product_location/Makefile b/finance/trytond28_stock_product_location/Makefile
index 33cf5302dc5a..f43e7ab489ca 100644
--- a/finance/trytond28_stock_product_location/Makefile
+++ b/finance/trytond28_stock_product_location/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_product>=2.8.0:finance/trytond28_product \
CONFLICTS= trytond_stock_product_location-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_stock_split/Makefile b/finance/trytond28_stock_split/Makefile
index 16a17bee654f..fac803d4888f 100644
--- a/finance/trytond28_stock_split/Makefile
+++ b/finance/trytond28_stock_split/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= trytond28_stock>=2.8.2:finance/trytond28_stock
CONFLICTS= trytond_stock_split-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_stock_supply/Makefile b/finance/trytond28_stock_supply/Makefile
index 1bee68076b8e..4ec5d9248549 100644
--- a/finance/trytond28_stock_supply/Makefile
+++ b/finance/trytond28_stock_supply/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_stock>=2.8.2:finance/trytond28_stock \
CONFLICTS= trytond_stock_supply-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_stock_supply_day/Makefile b/finance/trytond28_stock_supply_day/Makefile
index 7c6cf582559e..d24f9ca9b72e 100644
--- a/finance/trytond28_stock_supply_day/Makefile
+++ b/finance/trytond28_stock_supply_day/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_stock>=2.8.2:finance/trytond28_stock \
CONFLICTS= trytond_stock_supply_day-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_stock_supply_forecast/Makefile b/finance/trytond28_stock_supply_forecast/Makefile
index d4bf8e03077c..cf20c32b328d 100644
--- a/finance/trytond28_stock_supply_forecast/Makefile
+++ b/finance/trytond28_stock_supply_forecast/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= trytond28_stock_supply>=2.8.1:finance/trytond28_stock_supply \
CONFLICTS= trytond_stock_supply_forecast-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_stock_supply_production/Makefile b/finance/trytond28_stock_supply_production/Makefile
index 8d18e8c2921c..71da3125bada 100644
--- a/finance/trytond28_stock_supply_production/Makefile
+++ b/finance/trytond28_stock_supply_production/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= trytond28>=2.8.2:finance/trytond28 \
CONFLICTS= trytond_stock_supply_production-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/finance/trytond28_timesheet/Makefile b/finance/trytond28_timesheet/Makefile
index 23b8da1b1750..dad762100d66 100644
--- a/finance/trytond28_timesheet/Makefile
+++ b/finance/trytond28_timesheet/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= trytond28_company_work_time>=2.8.0:finance/trytond28_company_work_t
CONFLICTS= trytond_timesheet-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/french/aster/Makefile b/french/aster/Makefile
index 175b5a8ca093..aeda99fa77d6 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -46,7 +46,7 @@ LIB_DEPENDS+= libhdf5-18.so:science/hdf5-18 \
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
diff --git a/french/trytond28_account_fr/Makefile b/french/trytond28_account_fr/Makefile
index 0713f3701a2e..0550729982eb 100644
--- a/french/trytond28_account_fr/Makefile
+++ b/french/trytond28_account_fr/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_account>=2.8.1:finance/trytond28_account
CONFLICTS= trytond_account_fr-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/ftp/py-ftputil/Makefile b/ftp/py-ftputil/Makefile
index b1edb4bbeb81..6c3a143b0c68 100644
--- a/ftp/py-ftputil/Makefile
+++ b/ftp/py-ftputil/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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}
diff --git a/ftp/py-pyftpdlib/Makefile b/ftp/py-pyftpdlib/Makefile
index 6a8d0d1ff80d..71d34e9b837f 100644
--- a/ftp/py-pyftpdlib/Makefile
+++ b/ftp/py-pyftpdlib/Makefile
@@ -22,8 +22,8 @@ OPTIONS_DEFAULT= SENDFILE OPENSSL
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= *
diff --git a/games/anki/Makefile b/games/anki/Makefile
index 3d6d6425e28a..f9744db50314 100644
--- a/games/anki/Makefile
+++ b/games/anki/Makefile
@@ -16,12 +16,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
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
diff --git a/games/balazar/Makefile b/games/balazar/Makefile
index bad6c9792258..9f403f40da3b 100644
--- a/games/balazar/Makefile
+++ b/games/balazar/Makefile
@@ -15,17 +15,17 @@ LICENSE= GPLv2+
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
diff --git a/games/balazarbrothers/Makefile b/games/balazarbrothers/Makefile
index 3b6cc8c4bebb..4ce53205ad68 100644
--- a/games/balazarbrothers/Makefile
+++ b/games/balazarbrothers/Makefile
@@ -18,15 +18,15 @@ BROKEN= conflicting dependencies
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 @@ DESKTOP_ENTRIES="BalazarBrothers" "" "" "balazarbrothers" "" ""
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 \
diff --git a/games/bouncy/Makefile b/games/bouncy/Makefile
index 90cc87ce3514..0cb0e58247d2 100644
--- a/games/bouncy/Makefile
+++ b/games/bouncy/Makefile
@@ -19,7 +19,7 @@ LICENSE= GPLv2
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}
diff --git a/games/brainworkshop/Makefile b/games/brainworkshop/Makefile
index 103177de5ac4..d920cef86f33 100644
--- a/games/brainworkshop/Makefile
+++ b/games/brainworkshop/Makefile
@@ -12,7 +12,7 @@ COMMENT= Free open-source version of the Dual N-Back mental exercise
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
diff --git a/games/childsplay/Makefile b/games/childsplay/Makefile
index 6d2f4c423372..f3d99d9fb2d5 100644
--- a/games/childsplay/Makefile
+++ b/games/childsplay/Makefile
@@ -13,9 +13,9 @@ COMMENT= Educative games for children
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
diff --git a/games/craft/Makefile b/games/craft/Makefile
index 3f21673dba8c..1adc271533df 100644
--- a/games/craft/Makefile
+++ b/games/craft/Makefile
@@ -26,7 +26,7 @@ USES= cmake compiler:c11
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
diff --git a/games/endgame-singularity/Makefile b/games/endgame-singularity/Makefile
index b528f1d5a049..40c209c1ae9f 100644
--- a/games/endgame-singularity/Makefile
+++ b/games/endgame-singularity/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= py*-game>=1.8:devel/py-game \
USE_GITHUB= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
USE_SDL= image mixer
PORTDOCS= AUTHORS Changelog README.txt TODO
diff --git a/games/funnyboat/Makefile b/games/funnyboat/Makefile
index 10f27de7247a..ee4fc92e6757 100644
--- a/games/funnyboat/Makefile
+++ b/games/funnyboat/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= python:run zip
+USES= python:2.7,run zip
NO_BUILD= yes
NO_ARCH= yes
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 0c04ec3c4ee4..8f1a7cc9b167 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -13,12 +13,12 @@ LICENSE= GPLv3
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 \
diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index bcadea05ef3f..041e6d6f10d5 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES= SF
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
diff --git a/games/hypatia_engine/Makefile b/games/hypatia_engine/Makefile
index 2e43350ba224..947838beaecd 100644
--- a/games/hypatia_engine/Makefile
+++ b/games/hypatia_engine/Makefile
@@ -12,11 +12,11 @@ COMMENT= Game engine for 2D top-down, tile-based action RPGs
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 <bsd.port.mk>
diff --git a/games/jools/Makefile b/games/jools/Makefile
index 2ec7e0b2b6f2..49a4ea4570a7 100644
--- a/games/jools/Makefile
+++ b/games/jools/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${PYGAME}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
PORTDOCS= POINTS manual.html manual.pdf manual.tex
diff --git a/games/kye/Makefile b/games/kye/Makefile
index 58b6c964b896..d3260e1e849a 100644
--- a/games/kye/Makefile
+++ b/games/kye/Makefile
@@ -23,7 +23,7 @@ RESTRICTED= kye-data_nuke_levels is charityware
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
diff --git a/games/magicor/Makefile b/games/magicor/Makefile
index 33fff5cb847d..5bf8376f872c 100644
--- a/games/magicor/Makefile
+++ b/games/magicor/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
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
diff --git a/games/nelly/Makefile b/games/nelly/Makefile
index 88f849bd4471..2c8e3e5dcf2c 100644
--- a/games/nelly/Makefile
+++ b/games/nelly/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
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
diff --git a/games/outerspace/Makefile b/games/outerspace/Makefile
index 9ac271e0ae15..c4d264c002d1 100644
--- a/games/outerspace/Makefile
+++ b/games/outerspace/Makefile
@@ -12,7 +12,7 @@ COMMENT= On-line strategy game
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game
-USES= python
+USES= python:2.7
NO_BUILD= yes
NO_ARCH= yes
diff --git a/games/plutocracy/Makefile b/games/plutocracy/Makefile
index 7e0fefcb1a5a..0890ad379933 100644
--- a/games/plutocracy/Makefile
+++ b/games/plutocracy/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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
diff --git a/games/poker-engine/Makefile b/games/poker-engine/Makefile
index d39083cc89f8..881b035708d3 100644
--- a/games/poker-engine/Makefile
+++ b/games/poker-engine/Makefile
@@ -14,15 +14,16 @@ LICENSE= GPLv3+
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:
diff --git a/games/ptkei/Makefile b/games/ptkei/Makefile
index 59b2e65333eb..06291acbf890 100644
--- a/games/ptkei/Makefile
+++ b/games/ptkei/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python/Tk graphical client for Wolfpack Empire servers
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:
diff --git a/games/py-fife/Makefile b/games/py-fife/Makefile
index 7955103baf5f..44fb66b62e0d 100644
--- a/games/py-fife/Makefile
+++ b/games/py-fife/Makefile
@@ -61,6 +61,7 @@ LOGGING_CMAKE_BOOL= logging
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
diff --git a/games/py-mnemosyne/Makefile b/games/py-mnemosyne/Makefile
index 093f2625d87f..5f771b40cfec 100644
--- a/games/py-mnemosyne/Makefile
+++ b/games/py-mnemosyne/Makefile
@@ -15,12 +15,12 @@ COMMENT= Flash-card tool which optimises your learning process
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
diff --git a/games/py-poker-eval/Makefile b/games/py-poker-eval/Makefile
index 8c54a82d69d9..3349255277b0 100644
--- a/games/py-poker-eval/Makefile
+++ b/games/py-poker-eval/Makefile
@@ -18,6 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpoker-eval.so:games/poker-eval
USES= autoreconf libtool pathfix pkgconfig python:2
+USE_PYTHON= flavors
GNU_CONFIGURE= yes
CONFIGURE_ARGS= PYTHON=""
diff --git a/games/py-sgflib/Makefile b/games/py-sgflib/Makefile
index 76d61e19ff9e..f9ccbc987a7a 100644
--- a/games/py-sgflib/Makefile
+++ b/games/py-sgflib/Makefile
@@ -17,6 +17,7 @@ LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/lgpl.txt
USES= python shebangfix
+USE_PYTHON= flavors
NO_BUILD= yes
NO_ARCH= yes
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}
diff --git a/games/py-sgfsummary/Makefile b/games/py-sgfsummary/Makefile
index 629e61fd0305..9ccb08671351 100644
--- a/games/py-sgfsummary/Makefile
+++ b/games/py-sgfsummary/Makefile
@@ -12,9 +12,10 @@ DISTNAME= ${PORTNAME}
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
diff --git a/games/pydance/Makefile b/games/pydance/Makefile
index 9ce303f2a370..02241b7df9c5 100644
--- a/games/pydance/Makefile
+++ b/games/pydance/Makefile
@@ -18,7 +18,7 @@ COMMENT= Dancing simulation game similar to the kind in arcades
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
diff --git a/games/pyfa/Makefile b/games/pyfa/Makefile
index a59375a9f1d1..8870dcfd6137 100644
--- a/games/pyfa/Makefile
+++ b/games/pyfa/Makefile
@@ -13,9 +13,9 @@ COMMENT= Fitting tool for EVE Online
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 @@ WX_COMPS= wx:run python:run
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}
diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index 034be7a758cb..b53f4e89ba84 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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
diff --git a/games/pyspacewar/Makefile b/games/pyspacewar/Makefile
index 133b598e1769..5b2e7b5b2c97 100644
--- a/games/pyspacewar/Makefile
+++ b/games/pyspacewar/Makefile
@@ -18,7 +18,7 @@ USE_GITHUB= yes
GH_ACCOUNT= mgedmin
GH_TAGNAME= f872564
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
PORTDOCS= *.rst
diff --git a/games/pysycache/Makefile b/games/pysycache/Makefile
index 678ef350ebce..8a51b0843ba2 100644
--- a/games/pysycache/Makefile
+++ b/games/pysycache/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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
diff --git a/games/pythonchess/Makefile b/games/pythonchess/Makefile
index 4e7986baf1ef..df959432b04a 100644
--- a/games/pythonchess/Makefile
+++ b/games/pythonchess/Makefile
@@ -17,7 +17,7 @@ COMMENT= Small program for playing chess against the computer
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/}
diff --git a/games/pythonsudoku/Makefile b/games/pythonsudoku/Makefile
index 0149704d40f0..82208b1db70c 100644
--- a/games/pythonsudoku/Makefile
+++ b/games/pythonsudoku/Makefile
@@ -20,8 +20,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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
diff --git a/games/retroarch/Makefile b/games/retroarch/Makefile
index 488fc5e838b3..151d59f818d9 100644
--- a/games/retroarch/Makefile
+++ b/games/retroarch/Makefile
@@ -44,7 +44,7 @@ OPENAL_USES= openal:soft
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
@@ -80,6 +80,10 @@ post-patch:
/^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:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch
@${REINPLACE_CMD} -e 's|# libretro_directory =|libretro_directory = "${PREFIX}/libexec/libretro"|' \
diff --git a/games/slune/Makefile b/games/slune/Makefile
index 804bbb705dd7..d40b07d643c6 100644
--- a/games/slune/Makefile
+++ b/games/slune/Makefile
@@ -14,12 +14,12 @@ COMMENT= 3D game. includes racing, car-crashing, and lots of action
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
diff --git a/games/unknown-horizons/Makefile b/games/unknown-horizons/Makefile
index 31f3fbfdd201..1a69f8bd8ce1 100644
--- a/games/unknown-horizons/Makefile
+++ b/games/unknown-horizons/Makefile
@@ -13,10 +13,10 @@ LICENSE= GPLv2+
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
diff --git a/games/wxlauncher/Makefile b/games/wxlauncher/Makefile
index 2e10fa56f46a..95cf8f9bb394 100644
--- a/games/wxlauncher/Makefile
+++ b/games/wxlauncher/Makefile
@@ -13,8 +13,8 @@ COMMENT= Multi-platform launcher for the Freespace 2 Source Code Project
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
diff --git a/games/zephulor/Makefile b/games/zephulor/Makefile
index 39fae5c6df4e..396d2598ffad 100644
--- a/games/zephulor/Makefile
+++ b/games/zephulor/Makefile
@@ -18,7 +18,7 @@ LICENSE= GPLv2
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
diff --git a/german/trytond28_account_de_skr03/Makefile b/german/trytond28_account_de_skr03/Makefile
index caaef8521bba..05ac48464243 100644
--- a/german/trytond28_account_de_skr03/Makefile
+++ b/german/trytond28_account_de_skr03/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_account>=2.8.1:finance/trytond28_account
CONFLICTS= trytond_account_de_skr03-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/graphics/Makefile b/graphics/Makefile
index 3d6b4fe26eaa..7f556e6ded60 100644
--- a/graphics/Makefile
+++ b/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
diff --git a/graphics/boxer/Makefile b/graphics/boxer/Makefile
index 78210244ccec..10d53c301283 100644
--- a/graphics/boxer/Makefile
+++ b/graphics/boxer/Makefile
@@ -20,7 +20,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= box:graphics/box
-USES= python
+USES= python:2.7
USE_GNOME= pygtk2
USE_PYTHON= distutils autoplist
USE_LDCONFIG= yes
diff --git a/graphics/caffe/Makefile b/graphics/caffe/Makefile
index 6c398dbeff69..dbfb7298cb99 100644
--- a/graphics/caffe/Makefile
+++ b/graphics/caffe/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
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 @@ LIB_DEPENDS= libsnappy.so:archivers/snappy \
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
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index 0bada2c1c7c8..122e40ea9ecb 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -45,7 +45,7 @@ LUA_LIB_DEPENDS= libtolua++-${LUA_VER}.so:lang/tolua++
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
diff --git a/graphics/curator/Makefile b/graphics/curator/Makefile
index 93008a241be0..4ece00e60ee7 100644
--- a/graphics/curator/Makefile
+++ b/graphics/curator/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org
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
diff --git a/graphics/driconf/Makefile b/graphics/driconf/Makefile
index 38d499adc654..793b47f4e56c 100644
--- a/graphics/driconf/Makefile
+++ b/graphics/driconf/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2
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:
diff --git a/graphics/entangle/Makefile b/graphics/entangle/Makefile
index 4446d7176ae8..a346f5dea815 100644
--- a/graphics/entangle/Makefile
+++ b/graphics/entangle/Makefile
@@ -20,9 +20,9 @@ LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 \
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
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index 75e5115948c7..b38fe0fb9fc1 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -42,8 +42,8 @@ CHAMPLAIN_LIB_DEPENDS= libcogl.so:graphics/cogl \
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"
diff --git a/graphics/facedetect/Makefile b/graphics/facedetect/Makefile
index 372d6b07ebf0..b2916672f019 100644
--- a/graphics/facedetect/Makefile
+++ b/graphics/facedetect/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.txt
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
diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile
index d884ea8ccc39..9d3818961308 100644
--- a/graphics/geos/Makefile
+++ b/graphics/geos/Makefile
@@ -27,7 +27,7 @@ PLIST_SUB= PORTVERSION=${PORTVERSION}
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}"
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index 77479e2c3023..c5967c5e3211 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -21,7 +21,7 @@ USE_GITHUB= yes
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
diff --git a/graphics/graphene/Makefile b/graphics/graphene/Makefile
index e05e8682aa6f..58a516ce44d9 100644
--- a/graphics/graphene/Makefile
+++ b/graphics/graphene/Makefile
@@ -11,7 +11,7 @@ COMMENT= Optimizations for speeding up vector operations
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
diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index 8a2fe4cbc992..28569894c2e9 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -15,8 +15,8 @@ LICENSE= GPLv2
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
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 264ae1fd9160..9a46715cabfd 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -48,7 +48,7 @@ AUTOPANOSIFTC_DESC= Install graphics/autopano-sift-c
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
diff --git a/graphics/imgtops/Makefile b/graphics/imgtops/Makefile
index 0f1e84b11bee..93bc552b5435 100644
--- a/graphics/imgtops/Makefile
+++ b/graphics/imgtops/Makefile
@@ -13,9 +13,9 @@ COMMENT= Create efficient Encapsulated Postscript files from images
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:
diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile
index 977ee6949718..0a00f32df16b 100644
--- a/graphics/lensfun/Makefile
+++ b/graphics/lensfun/Makefile
@@ -28,8 +28,8 @@ PYHELPERS_DESC= Install database helper scripts (need Python 3)
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 <bsd.port.mk>
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index 53da6d2fa288..b2432b5413f3 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -73,7 +73,7 @@ PROJ_LIB_DEPENDS= libproj.so:graphics/proj
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 <bsd.port.pre.mk>
diff --git a/graphics/mirage/Makefile b/graphics/mirage/Makefile
index 040fd2abf19b..d9d2c98ed918 100644
--- a/graphics/mirage/Makefile
+++ b/graphics/mirage/Makefile
@@ -12,7 +12,7 @@ COMMENT= Fast and simple image viewer
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
diff --git a/graphics/opencolorio/Makefile b/graphics/opencolorio/Makefile
index 41840c7859e6..8427c3cfa0b3 100644
--- a/graphics/opencolorio/Makefile
+++ b/graphics/opencolorio/Makefile
@@ -63,7 +63,7 @@ CMAKE_ARGS+= -DOCIO_BUILD_APPS:BOOL=OFF \
-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
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index eec552524509..32c572e28ed0 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -142,6 +142,7 @@ LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv
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
diff --git a/graphics/piglit/Makefile b/graphics/piglit/Makefile
index 39a70536efff..02a73554d7ed 100644
--- a/graphics/piglit/Makefile
+++ b/graphics/piglit/Makefile
@@ -13,16 +13,16 @@ LICENSE_COMB= multi
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
diff --git a/graphics/py-PyOpenGL-accelerate/Makefile b/graphics/py-PyOpenGL-accelerate/Makefile
index 2a801dbfb383..a72c2964a3c4 100644
--- a/graphics/py-PyOpenGL-accelerate/Makefile
+++ b/graphics/py-PyOpenGL-accelerate/Makefile
@@ -13,11 +13,10 @@ COMMENT= OpenGL acceleration code for PyOpenGL
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 <bsd.port.mk>
diff --git a/graphics/py-PyOpenGL/Makefile b/graphics/py-PyOpenGL/Makefile
index 02bce0f2a713..e17484b0f6f4 100644
--- a/graphics/py-PyOpenGL/Makefile
+++ b/graphics/py-PyOpenGL/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= python@FreeBSD.org
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 @@ USES= dos2unix python
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 \
diff --git a/graphics/py-PyX/Makefile b/graphics/py-PyX/Makefile
index 948dd906ddb5..bf8e084d9d27 100644
--- a/graphics/py-PyX/Makefile
+++ b/graphics/py-PyX/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python package for creating encapsulated PostScript figures
LICENSE= GPLv2
-USES= python:3
+USES= python:3.4+
USE_TEX= latex:build
USE_PYTHON= autoplist distutils
diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile
index 0ea7671e3129..651c20ae0d3b 100644
--- a/graphics/py-actdiag/Makefile
+++ b/graphics/py-actdiag/Makefile
@@ -13,9 +13,9 @@ COMMENT= Simple activity-diagram image generator
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
diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile
index b4163e5d9279..bf9d1d88d1dc 100644
--- a/graphics/py-blockdiag/Makefile
+++ b/graphics/py-blockdiag/Makefile
@@ -13,9 +13,9 @@ COMMENT= Simple block-diagram image generator
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 @@ PDF_DESC= Enable PDF output
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
diff --git a/graphics/py-blockdiagcontrib-cisco/Makefile b/graphics/py-blockdiagcontrib-cisco/Makefile
index c8025776b613..2254f8e81db8 100644
--- a/graphics/py-blockdiagcontrib-cisco/Makefile
+++ b/graphics/py-blockdiagcontrib-cisco/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
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
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index bb6d2a834494..0151a061f1af 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -18,9 +18,12 @@ LICENSE_FILE_MPL11= ${WRKSRC}/COPYING-MPL-1.1
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}
diff --git a/graphics/py3-cairo/pkg-plist b/graphics/py-cairo/pkg-plist-py3
index 6ec2d15cc0b8..6ec2d15cc0b8 100644
--- a/graphics/py3-cairo/pkg-plist
+++ b/graphics/py-cairo/pkg-plist-py3
diff --git a/graphics/py-cairocffi/Makefile b/graphics/py-cairocffi/Makefile
index dcd07d81df17..03967743a3a6 100644
--- a/graphics/py-cairocffi/Makefile
+++ b/graphics/py-cairocffi/Makefile
@@ -13,10 +13,14 @@ COMMENT= Cairo cffi-based cairo bindings for Python
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
diff --git a/graphics/py-django-easy-thumbnails/Makefile b/graphics/py-django-easy-thumbnails/Makefile
index 4ce75eb72f5c..deea5a184827 100644
--- a/graphics/py-django-easy-thumbnails/Makefile
+++ b/graphics/py-django-easy-thumbnails/Makefile
@@ -12,7 +12,7 @@ COMMENT= Easy thumbnails for Django
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
diff --git a/graphics/py-djvulibre/Makefile b/graphics/py-djvulibre/Makefile
index ff89275a9499..7e08147170ec 100644
--- a/graphics/py-djvulibre/Makefile
+++ b/graphics/py-djvulibre/Makefile
@@ -12,11 +12,10 @@ COMMENT= Python support for the DjVu image format
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
diff --git a/graphics/py-editobj/Makefile b/graphics/py-editobj/Makefile
index b10418ee5def..f38f5bd9e442 100644
--- a/graphics/py-editobj/Makefile
+++ b/graphics/py-editobj/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= acm@FreeBSD.org
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}
diff --git a/graphics/py-exiv2/Makefile b/graphics/py-exiv2/Makefile
index a8c9485ed41a..68f1c15652fc 100644
--- a/graphics/py-exiv2/Makefile
+++ b/graphics/py-exiv2/Makefile
@@ -16,6 +16,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2\
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
diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index e3dba8c5667c..0a83f62583a1 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python interface to the GD library
LIB_DEPENDS= libgd.so:graphics/gd
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist pythonprefix
PYSETUP= setup.py
diff --git a/graphics/py-gdal/Makefile b/graphics/py-gdal/Makefile
index f8001877e04f..c28912ec27d6 100644
--- a/graphics/py-gdal/Makefile
+++ b/graphics/py-gdal/Makefile
@@ -27,8 +27,8 @@ WRKSRC_SUBDIR= swig/python
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:
diff --git a/graphics/py-gizeh/Makefile b/graphics/py-gizeh/Makefile
index 18eda196cec6..4707d7c3eb78 100644
--- a/graphics/py-gizeh/Makefile
+++ b/graphics/py-gizeh/Makefile
@@ -12,7 +12,7 @@ COMMENT= Simple vector graphics in Python
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
diff --git a/graphics/py-glewpy/Makefile b/graphics/py-glewpy/Makefile
index e85bbd0cfb66..9f217bc7146a 100644
--- a/graphics/py-glewpy/Makefile
+++ b/graphics/py-glewpy/Makefile
@@ -16,9 +16,9 @@ PATCHFILES= glewpy-${PORTVERSION}-generatedsources.diff.bz2
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
diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile
index dfb86f7ce969..9f16125f04d4 100644
--- a/graphics/py-goocanvas/Makefile
+++ b/graphics/py-goocanvas/Makefile
@@ -18,9 +18,10 @@ LIB_DEPENDS= libgoocanvas.so:graphics/goocanvas
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:
diff --git a/graphics/py-graphviz/Makefile b/graphics/py-graphviz/Makefile
index 8a738ca730c7..f3cde0b181fa 100644
--- a/graphics/py-graphviz/Makefile
+++ b/graphics/py-graphviz/Makefile
@@ -14,8 +14,8 @@ LICENSE= MIT
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
diff --git a/graphics/py-graphy/Makefile b/graphics/py-graphy/Makefile
index b299558b1a0f..9f41a1467734 100644
--- a/graphics/py-graphy/Makefile
+++ b/graphics/py-graphy/Makefile
@@ -15,6 +15,7 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= python:run tar:bzip2
+USE_PYTHON= flavors
PORTDOCS= README
PORTEXAMPLES= *
diff --git a/graphics/py-imagesize/Makefile b/graphics/py-imagesize/Makefile
index 77ccba373e44..8bbe08eec321 100644
--- a/graphics/py-imagesize/Makefile
+++ b/graphics/py-imagesize/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python image size library
LICENSE= MIT
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/graphics/py-imgurpython/Makefile b/graphics/py-imgurpython/Makefile
index 07ff59ec43c4..c11e1b950534 100644
--- a/graphics/py-imgurpython/Makefile
+++ b/graphics/py-imgurpython/Makefile
@@ -11,7 +11,7 @@ COMMENT= Python client for the Imgur API
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
diff --git a/graphics/py-leather/Makefile b/graphics/py-leather/Makefile
index 89527cf728c3..5c35a25cb630 100644
--- a/graphics/py-leather/Makefile
+++ b/graphics/py-leather/Makefile
@@ -11,7 +11,7 @@ COMMENT= Charting library for those who need charts now
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
diff --git a/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile
index 5c295997fb4d..3fb535ccc804 100644
--- a/graphics/py-mayavi/Makefile
+++ b/graphics/py-mayavi/Makefile
@@ -26,10 +26,10 @@ BUILD_DEPENDS= vtk6>=6.1.0_8:math/vtk6 \
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
diff --git a/graphics/py-mcomix/Makefile b/graphics/py-mcomix/Makefile
index 219b183820e1..13ab6146c510 100644
--- a/graphics/py-mcomix/Makefile
+++ b/graphics/py-mcomix/Makefile
@@ -13,7 +13,7 @@ COMMENT= GTK2 comic book viewer
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
diff --git a/graphics/py-nwdiag/Makefile b/graphics/py-nwdiag/Makefile
index 9cea67acd398..7e93bb569da3 100644
--- a/graphics/py-nwdiag/Makefile
+++ b/graphics/py-nwdiag/Makefile
@@ -13,9 +13,9 @@ COMMENT= Simple network-diagram image generator
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
diff --git a/graphics/py-openexr/Makefile b/graphics/py-openexr/Makefile
index e60ad467993c..b415d09e1270 100644
--- a/graphics/py-openexr/Makefile
+++ b/graphics/py-openexr/Makefile
@@ -15,7 +15,7 @@ COMMENT= Python module for ILM's OpenEXR image format and library
LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
post-extract:
diff --git a/graphics/py-paint/Makefile b/graphics/py-paint/Makefile
index e21c201a6746..c7b1f4c427a6 100644
--- a/graphics/py-paint/Makefile
+++ b/graphics/py-paint/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= libpng.so:graphics/png \
OPTIONS_DEFINE= EXAMPLES
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
USE_GNOME= libartlgpl2
NO_WRKSUBDIR= yes
diff --git a/graphics/py-pillow/Makefile b/graphics/py-pillow/Makefile
index 17f1a7682cb2..9f52ecbf2990 100644
--- a/graphics/py-pillow/Makefile
+++ b/graphics/py-pillow/Makefile
@@ -45,15 +45,15 @@ TIFF_VARS= PYDISTUTILS_BUILDARGS+=--enable-tiff
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
diff --git a/graphics/py-plotly/Makefile b/graphics/py-plotly/Makefile
index c9b0959293b8..3b72a312b72b 100644
--- a/graphics/py-plotly/Makefile
+++ b/graphics/py-plotly/Makefile
@@ -12,9 +12,9 @@ COMMENT= Plotting library for collaborative, interactive, publication-quality gr
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
diff --git a/graphics/py-poppler/Makefile b/graphics/py-poppler/Makefile
index 32d504ceea14..7ef131dd4bcf 100644
--- a/graphics/py-poppler/Makefile
+++ b/graphics/py-poppler/Makefile
@@ -17,7 +17,8 @@ COMMENT= Python bindings for the Poppler PDF rendering library
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 <bsd.port.mk>
diff --git a/graphics/py-pycha/Makefile b/graphics/py-pycha/Makefile
index ddbf7ccad59a..51abba345772 100644
--- a/graphics/py-pycha/Makefile
+++ b/graphics/py-pycha/Makefile
@@ -18,6 +18,6 @@ USE_PYTHON= distutils autoplist
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 <bsd.port.mk>
diff --git a/graphics/py-pycollada/Makefile b/graphics/py-pycollada/Makefile
index d75c82af7413..37fe3b965f48 100644
--- a/graphics/py-pycollada/Makefile
+++ b/graphics/py-pycollada/Makefile
@@ -11,8 +11,8 @@ COMMENT= Python library for reading and writing collada documents
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 @@ USE_PYTHON= autoplist distutils
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 <bsd.port.mk>
diff --git a/graphics/py-pydot/Makefile b/graphics/py-pydot/Makefile
index 3b0fb3864b47..4110570ba4e6 100644
--- a/graphics/py-pydot/Makefile
+++ b/graphics/py-pydot/Makefile
@@ -14,7 +14,7 @@ LICENSE= MIT
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
diff --git a/graphics/py-pyembree/Makefile b/graphics/py-pyembree/Makefile
index c71756f26ad2..5818a523f08c 100644
--- a/graphics/py-pyembree/Makefile
+++ b/graphics/py-pyembree/Makefile
@@ -14,13 +14,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
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
diff --git a/graphics/py-pygal/Makefile b/graphics/py-pygal/Makefile
index 0d5f317adb5a..b872bbafa570 100644
--- a/graphics/py-pygal/Makefile
+++ b/graphics/py-pygal/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python svg graph plotting library
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
diff --git a/graphics/py-pyganim/Makefile b/graphics/py-pyganim/Makefile
index 1fadc329d947..0069d610fcb6 100644
--- a/graphics/py-pyganim/Makefile
+++ b/graphics/py-pyganim/Makefile
@@ -13,7 +13,7 @@ COMMENT= Sprite animation module for Pygame
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
diff --git a/graphics/py-pygooglechart/Makefile b/graphics/py-pygooglechart/Makefile
index 2bd74730ef37..26ca5ca4ef37 100644
--- a/graphics/py-pygooglechart/Makefile
+++ b/graphics/py-pygooglechart/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Complete Python wrapper for the Google Chart API
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
PORTEXAMPLES= *
diff --git a/graphics/py-pygraphviz/Makefile b/graphics/py-pygraphviz/Makefile
index 823572b54418..c8a068cf40c7 100644
--- a/graphics/py-pygraphviz/Makefile
+++ b/graphics/py-pygraphviz/Makefile
@@ -14,9 +14,9 @@ LICENSE= BSD3CLAUSE
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
diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile
index f19864a8ab81..72891b027ff9 100644
--- a/graphics/py-qt4-svg/Makefile
+++ b/graphics/py-qt4-svg/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
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
diff --git a/graphics/py-qt5-svg/Makefile b/graphics/py-qt5-svg/Makefile
index 82ad199c2ea6..863e8de197c1 100644
--- a/graphics/py-qt5-svg/Makefile
+++ b/graphics/py-qt5-svg/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
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
diff --git a/graphics/py-rabbyt/Makefile b/graphics/py-rabbyt/Makefile
index 2a57b990a6ec..d366c3369729 100644
--- a/graphics/py-rabbyt/Makefile
+++ b/graphics/py-rabbyt/Makefile
@@ -13,7 +13,7 @@ DISTNAME= Rabbyt-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Fast sprite library for Python
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
USE_GL= gl glu
diff --git a/graphics/py-sane/Makefile b/graphics/py-sane/Makefile
index f8513ee4af65..e1b3a4cc3676 100644
--- a/graphics/py-sane/Makefile
+++ b/graphics/py-sane/Makefile
@@ -14,10 +14,10 @@ MAINTAINER= buganini@gmail.com
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
diff --git a/graphics/py-scikit-image/Makefile b/graphics/py-scikit-image/Makefile
index e0980ef22552..deb3b314c3ce 100644
--- a/graphics/py-scikit-image/Makefile
+++ b/graphics/py-scikit-image/Makefile
@@ -13,23 +13,21 @@ LICENSE= BSD3CLAUSE
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
-
-USES= cpe python
+ ${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: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
diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile
index aab6a9acdd79..065edeaa385c 100644
--- a/graphics/py-seqdiag/Makefile
+++ b/graphics/py-seqdiag/Makefile
@@ -13,9 +13,9 @@ COMMENT= Simple sequence-diagram image generator
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
diff --git a/graphics/py-sk1/Makefile b/graphics/py-sk1/Makefile
index 9ce225682797..f826d212abe7 100644
--- a/graphics/py-sk1/Makefile
+++ b/graphics/py-sk1/Makefile
@@ -13,11 +13,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
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
diff --git a/graphics/py-sorl-thumbnail/Makefile b/graphics/py-sorl-thumbnail/Makefile
index 31d06e52e5af..705103840e64 100644
--- a/graphics/py-sorl-thumbnail/Makefile
+++ b/graphics/py-sorl-thumbnail/Makefile
@@ -13,12 +13,12 @@ COMMENT= Sorl-thumbnail provides an easy way to generate image thumbnails
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 @@ OPTIONS_DEFAULT= DJANGO
.include <bsd.port.options.mk>
.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}
diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile
index 1b0705ce7e50..59ac59a3db2b 100644
--- a/graphics/py-soya3d/Makefile
+++ b/graphics/py-soya3d/Makefile
@@ -14,15 +14,15 @@ DIST_SUBDIR= python
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
diff --git a/graphics/py-stltools/Makefile b/graphics/py-stltools/Makefile
index d1f9c5a45eba..11aad1b536c6 100644
--- a/graphics/py-stltools/Makefile
+++ b/graphics/py-stltools/Makefile
@@ -24,7 +24,7 @@ EXAMPLES= test/cube.stl test/cube_bin.stl
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}
diff --git a/graphics/py-toyplot/Makefile b/graphics/py-toyplot/Makefile
index fb79b4a20be6..8357f2075839 100644
--- a/graphics/py-toyplot/Makefile
+++ b/graphics/py-toyplot/Makefile
@@ -12,13 +12,13 @@ COMMENT= Modern plotting toolkit supporting electronic publishing
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 <bsd.port.mk>
diff --git a/graphics/py-traitsui/Makefile b/graphics/py-traitsui/Makefile
index 11b866f0e5be..9d46042bd85e 100644
--- a/graphics/py-traitsui/Makefile
+++ b/graphics/py-traitsui/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE_LGPL21= ${WRKSRC}/image_LICENSE_Nuvola.txt
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
diff --git a/graphics/py3-cairo/Makefile b/graphics/py3-cairo/Makefile
deleted file mode 100644
index 442843e6fee9..000000000000
--- a/graphics/py3-cairo/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Created by: Michael Johnson <ahze@FreeBSD.org>
-# $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 <bsd.port.mk>
diff --git a/graphics/py3-cairo/distinfo b/graphics/py3-cairo/distinfo
deleted file mode 100644
index 206460c5c8f7..000000000000
--- a/graphics/py3-cairo/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1506344417
-SHA256 (pycairo-1.14.1.tar.gz) = 0d13a0a6eeaf0c357db04392943eb9b25767445608d31dde1307f003f68c5754
-SIZE (pycairo-1.14.1.tar.gz) = 154394
diff --git a/graphics/py3-cairo/pkg-descr b/graphics/py3-cairo/pkg-descr
deleted file mode 100644
index 95ccd8a92e07..000000000000
--- a/graphics/py3-cairo/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Python 3 bindings for Cairo.
-
-WWW: https://github.com/pygobject/pycairo
diff --git a/graphics/py3-imagesize/Makefile b/graphics/py3-imagesize/Makefile
deleted file mode 100644
index 8b51d361bf88..000000000000
--- a/graphics/py3-imagesize/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-imagesize
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/graphics/py3-pillow/Makefile b/graphics/py3-pillow/Makefile
deleted file mode 100644
index d95a17090886..000000000000
--- a/graphics/py3-pillow/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $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"
diff --git a/graphics/py3-pygraphviz/Makefile b/graphics/py3-pygraphviz/Makefile
deleted file mode 100644
index 088ffcc9d4ee..000000000000
--- a/graphics/py3-pygraphviz/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $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"
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 09ab2581c492..4baf855c98c9 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -89,48 +89,48 @@ GRASS_CMAKE_OFF= -DWITH_GRASS7:BOOL=FALSE
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
diff --git a/graphics/sk1libs/Makefile b/graphics/sk1libs/Makefile
index 80a4356b9287..50a2e54ccec5 100644
--- a/graphics/sk1libs/Makefile
+++ b/graphics/sk1libs/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/GNU_LGPL_v2
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 \
diff --git a/graphics/tilecache/Makefile b/graphics/tilecache/Makefile
index 254398e6671d..9a08a92317b3 100644
--- a/graphics/tilecache/Makefile
+++ b/graphics/tilecache/Makefile
@@ -10,13 +10,13 @@ MASTER_SITES= http://tilecache.org/
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
diff --git a/graphics/uniconvertor/Makefile b/graphics/uniconvertor/Makefile
index 38d443034922..5b65270889d5 100644
--- a/graphics/uniconvertor/Makefile
+++ b/graphics/uniconvertor/Makefile
@@ -15,9 +15,9 @@ LICENSE_COMB= multi
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:
diff --git a/graphics/uniconvw/Makefile b/graphics/uniconvw/Makefile
index a46fe96668da..d3d32d7fe059 100644
--- a/graphics/uniconvw/Makefile
+++ b/graphics/uniconvw/Makefile
@@ -18,9 +18,9 @@ LICENSE_FILE_LGPL20+ = ${WRKSRC}/src/GNU_LGPL_v2
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
diff --git a/graphics/variety/Makefile b/graphics/variety/Makefile
index 05e811ae91f2..c960c72f4ccb 100644
--- a/graphics/variety/Makefile
+++ b/graphics/variety/Makefile
@@ -14,19 +14,19 @@ COMMENT= Wallpaper changer
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 \
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 5121fe260387..0907625d8776 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -53,7 +53,7 @@ OPTIONS_DEFAULT= PYTHON
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
diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile
index 2f43a5f143ef..fc499a6bd023 100644
--- a/irc/bitlbee/Makefile
+++ b/irc/bitlbee/Makefile
@@ -83,7 +83,7 @@ OTR_LIB_DEPENDS= libotr.so.5:security/libotr \
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
diff --git a/irc/py-fishcrypt/Makefile b/irc/py-fishcrypt/Makefile
index 5fe24000b4aa..ac3f942affee 100644
--- a/irc/py-fishcrypt/Makefile
+++ b/irc/py-fishcrypt/Makefile
@@ -11,8 +11,8 @@ DIST_SUBDIR= python
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_PROJECT= py-${PORTNAME}
GH_TAGNAME= 43554b1a
USES= dos2unix python:run shebangfix
+USE_PYTHON= flavors
SHEBANG_FILES= fishcrypt.py
NO_BUILD= yes
diff --git a/irc/py-irc/Makefile b/irc/py-irc/Makefile
index 9fac59e2a8cc..a1e2c6931453 100644
--- a/irc/py-irc/Makefile
+++ b/irc/py-irc/Makefile
@@ -13,12 +13,12 @@ COMMENT= IRC protocol client library for Python
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
diff --git a/irc/py-limnoria/Makefile b/irc/py-limnoria/Makefile
index fa99f4290829..99917bb961c1 100644
--- a/irc/py-limnoria/Makefile
+++ b/irc/py-limnoria/Makefile
@@ -12,7 +12,7 @@ COMMENT= Modified version of Supybot (IRC bot and framework)
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 @@ TIME_DESC= Time Plugin: Extra time features (via dateutil/pytz)
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
diff --git a/irc/py-supybot/Makefile b/irc/py-supybot/Makefile
index d326e69eb0e5..cbc13614ada9 100644
--- a/irc/py-supybot/Makefile
+++ b/irc/py-supybot/Makefile
@@ -15,7 +15,7 @@ COMMENT= Supybot - A Superb Python IRC bot
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
diff --git a/irc/znc/Makefile b/irc/znc/Makefile
index d2f08cb358ce..d13769ff7dce 100644
--- a/irc/znc/Makefile
+++ b/irc/znc/Makefile
@@ -54,7 +54,7 @@ PERL_USES= perl5
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
diff --git a/japanese/ibus-anthy/Makefile b/japanese/ibus-anthy/Makefile
index e3d8a3bdec48..b41bf645e86d 100644
--- a/japanese/ibus-anthy/Makefile
+++ b/japanese/ibus-anthy/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libanthy.so:japanese/anthy \
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= \
diff --git a/japanese/kana-no-quiz/Makefile b/japanese/kana-no-quiz/Makefile
index b3f960274113..8536a80abb83 100644
--- a/japanese/kana-no-quiz/Makefile
+++ b/japanese/kana-no-quiz/Makefile
@@ -19,7 +19,7 @@ NO_BUILD= yes
NO_ARCH= yes
-USES= gettext python tar:bzip2
+USES= gettext python:2.7 tar:bzip2
USE_GNOME= pygtk2:run
USE_PYTHON= distutils autoplist
diff --git a/japanese/py-mecab/Makefile b/japanese/py-mecab/Makefile
index 9d06c1f785bc..b2ff4a8ed78b 100644
--- a/japanese/py-mecab/Makefile
+++ b/japanese/py-mecab/Makefile
@@ -17,7 +17,7 @@ LICENSE_COMB= dual
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
diff --git a/japanese/py-tegaki-gtk/Makefile b/japanese/py-tegaki-gtk/Makefile
index afc16d9e434f..fdb1d717771c 100644
--- a/japanese/py-tegaki-gtk/Makefile
+++ b/japanese/py-tegaki-gtk/Makefile
@@ -15,9 +15,9 @@ COMMENT= Tegaki PyGTK interface
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
diff --git a/japanese/py-tegaki/Makefile b/japanese/py-tegaki/Makefile
index c4a493cff976..6a180551357c 100644
--- a/japanese/py-tegaki/Makefile
+++ b/japanese/py-tegaki/Makefile
@@ -14,9 +14,9 @@ COMMENT= Open-source Chinese and Japanese handwriting recognition
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
diff --git a/japanese/py-zinnia/Makefile b/japanese/py-zinnia/Makefile
index b08aa7214ffe..b4f64eb47aed 100644
--- a/japanese/py-zinnia/Makefile
+++ b/japanese/py-zinnia/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= zinnia:japanese/zinnia
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= ${PORTNAME}_python
PYDISTUTILS_PKGVERSION= 0.0.0
diff --git a/japanese/tegaki-recognize/Makefile b/japanese/tegaki-recognize/Makefile
index a1eb1b60f975..5e49c8a1d156 100644
--- a/japanese/tegaki-recognize/Makefile
+++ b/japanese/tegaki-recognize/Makefile
@@ -14,7 +14,7 @@ COMMENT= Open-Source Chinese and Japanese Handwriting Recognition
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
diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile
index c5b5335aff7a..d440d24a928b 100644
--- a/japanese/tomoe/Makefile
+++ b/japanese/tomoe/Makefile
@@ -36,7 +36,7 @@ MYSQL_USE= MYSQL=yes
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
diff --git a/lang/Makefile b/lang/Makefile
index 43b2f8c32bf3..9537ec578098 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -47,7 +47,6 @@
SUBDIR += cparser
SUBDIR += csharp-mode.el
SUBDIR += cython
- SUBDIR += cython3
SUBDIR += diveintopython
SUBDIR += dlang-tools
SUBDIR += dlv
diff --git a/lang/cdent/Makefile b/lang/cdent/Makefile
index bbc759585162..be75222be23a 100644
--- a/lang/cdent/Makefile
+++ b/lang/cdent/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES= CHEESESHOP
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 <bsd.port.mk>
diff --git a/lang/cython/Makefile b/lang/cython/Makefile
index 95bafc0af125..9faed36fff74 100644
--- a/lang/cython/Makefile
+++ b/lang/cython/Makefile
@@ -6,6 +6,7 @@ PORTVERSION= 0.26
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 @@ COMMENT= Compiler for Writing C Extensions for the Python Language
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 \
diff --git a/lang/cython3/Makefile b/lang/cython3/Makefile
deleted file mode 100644
index 44228ec46f0a..000000000000
--- a/lang/cython3/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-MASTERDIR= ${.CURDIR}/../cython
-
-PKGNAMESUFFIX= 3
-
-USES= python:3.3+
-USE_PYTHON= concurrent
-UNIQUE_SUFFIX= ${PKGNAMESUFFIX}
-
-.include "${MASTERDIR}/Makefile"
diff --git a/lang/micropython/Makefile b/lang/micropython/Makefile
index 4752d6038bb6..d84ff19fa5d9 100644
--- a/lang/micropython/Makefile
+++ b/lang/micropython/Makefile
@@ -13,7 +13,7 @@ LICENSE= MIT
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
diff --git a/lang/py-clojure/Makefile b/lang/py-clojure/Makefile
index 5b59c120f36c..6bd1e9cd9ee1 100644
--- a/lang/py-clojure/Makefile
+++ b/lang/py-clojure/Makefile
@@ -13,7 +13,7 @@ COMMENT= Implementation of Clojure in Python
LICENSE= EPL
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/lang/py-hy/Makefile b/lang/py-hy/Makefile
index cf49e2b1fccc..ab874586992b 100644
--- a/lang/py-hy/Makefile
+++ b/lang/py-hy/Makefile
@@ -13,15 +13,15 @@ COMMENT= Hy is a dialect of Lisp that is embedded in Python
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
diff --git a/lang/py-qt5-qml/Makefile b/lang/py-qt5-qml/Makefile
index e5a0c34b4771..380ffed63fb5 100644
--- a/lang/py-qt5-qml/Makefile
+++ b/lang/py-qt5-qml/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
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
diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile
index 36193208d5e9..f9121015cf04 100644
--- a/lang/pypy/Makefile
+++ b/lang/pypy/Makefile
@@ -94,7 +94,7 @@ PYPY_MINMEM_BUILD_DEPENDS= pypy:lang/pypy
.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
diff --git a/lang/python-tools/Makefile b/lang/python-tools/Makefile
index 027af2887b12..86f4494a91bf 100644
--- a/lang/python-tools/Makefile
+++ b/lang/python-tools/Makefile
@@ -39,10 +39,6 @@ UNIQUE_SUFFIX_FILES= ${SCRIPT_FILES:C/^.*/bin\/&/g} \
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 \
diff --git a/lang/python34/files/pkg-message.in b/lang/python34/files/pkg-message.in
index c2325386f571..5fb6e462a0b7 100644
--- a/lang/python34/files/pkg-message.in
+++ b/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%%
===========================================================================
diff --git a/lang/python35/files/pkg-message.in b/lang/python35/files/pkg-message.in
index c2325386f571..5fb6e462a0b7 100644
--- a/lang/python35/files/pkg-message.in
+++ b/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%%
===========================================================================
diff --git a/lang/python36/files/pkg-message.in b/lang/python36/files/pkg-message.in
index c2325386f571..5fb6e462a0b7 100644
--- a/lang/python36/files/pkg-message.in
+++ b/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%%
===========================================================================
diff --git a/lang/tinypy/Makefile b/lang/tinypy/Makefile
index 3561ae9e684b..bf4c67005d72 100644
--- a/lang/tinypy/Makefile
+++ b/lang/tinypy/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
GH_ACCOUNT= philhassey
-USES= python:build
+USES= python:2.7,build
USE_PYTHON= distutils noegginfo
USE_GITHUB= yes
diff --git a/mail/courier-pythonfilter/Makefile b/mail/courier-pythonfilter/Makefile
index cc1de1c9ffab..0f499591b83c 100644
--- a/mail/courier-pythonfilter/Makefile
+++ b/mail/courier-pythonfilter/Makefile
@@ -11,8 +11,8 @@ COMMENT= Framework for courier filter development in python
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 @@ OPTIONS_DEFAULT= DEBUG WHITELIST_RELAY WHITELIST_AUTH
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
diff --git a/mail/isbg/Makefile b/mail/isbg/Makefile
index 0116f95259e8..bc8896472a6d 100644
--- a/mail/isbg/Makefile
+++ b/mail/isbg/Makefile
@@ -12,13 +12,13 @@ COMMENT= Scan an IMAP inbox for spam using SpamAssassin
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 <bsd.port.mk>
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 86597f31e287..5f0e23d4de1f 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -141,8 +141,8 @@ RUN_DEPENDS+= mknmz:databases/namazu2
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} ""
diff --git a/mail/mailpile/Makefile b/mail/mailpile/Makefile
index d0b1481d91cb..45dd9459a788 100644
--- a/mail/mailpile/Makefile
+++ b/mail/mailpile/Makefile
@@ -12,17 +12,17 @@ COMMENT= Locally hosted web-browser based mail client
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 \
diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile
index f1b673bedcd6..3a3772f30869 100644
--- a/mail/mailutils/Makefile
+++ b/mail/mailutils/Makefile
@@ -62,7 +62,7 @@ NLS_CONFIGURE_ENABLE= nls
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
diff --git a/mail/muttils/Makefile b/mail/muttils/Makefile
index 567104dd8c50..1af3a43d0031 100644
--- a/mail/muttils/Makefile
+++ b/mail/muttils/Makefile
@@ -15,7 +15,7 @@ CONFLICTS= zh-wenju-[0-9]* talkfilters-[0-9]* reed-[0-9]*
CHANGESET= 8bb26094df06
WRKSRC= ${WRKDIR}/blacktrash-${PORTNAME}-${CHANGESET}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
PORTEXAMPLES= *
diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 459159666e41..72152daa3c31 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -17,8 +17,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
## 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}
diff --git a/mail/postfix-policyd-spf-python/Makefile b/mail/postfix-policyd-spf-python/Makefile
index be217b2d1585..78940e4cbe68 100644
--- a/mail/postfix-policyd-spf-python/Makefile
+++ b/mail/postfix-policyd-spf-python/Makefile
@@ -15,9 +15,9 @@ COMMENT= Pure Python Postfix policy daemon for SPF checking
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
diff --git a/mail/py-Products.MailHost/Makefile b/mail/py-Products.MailHost/Makefile
index 3de17e61c457..fa79970f0cdc 100644
--- a/mail/py-Products.MailHost/Makefile
+++ b/mail/py-Products.MailHost/Makefile
@@ -13,17 +13,17 @@ COMMENT= Zope.sendmail integration for Zope 2
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 <bsd.port.mk>
diff --git a/mail/py-afew/Makefile b/mail/py-afew/Makefile
index 27cc60735b76..57364d80b85b 100644
--- a/mail/py-afew/Makefile
+++ b/mail/py-afew/Makefile
@@ -11,9 +11,9 @@ COMMENT= Initial tagging script for notmuch mail
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 @@ USE_PYTHON= autoplist distutils
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/
diff --git a/mail/py-apolicy/Makefile b/mail/py-apolicy/Makefile
index 49162494b0d8..f9d513f89ae9 100644
--- a/mail/py-apolicy/Makefile
+++ b/mail/py-apolicy/Makefile
@@ -15,9 +15,9 @@ COMMENT= ACL system for Postfix, as a policy daemon
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
diff --git a/mail/py-dkimpy/Makefile b/mail/py-dkimpy/Makefile
index df6e5d9056ac..4405e9318d3a 100644
--- a/mail/py-dkimpy/Makefile
+++ b/mail/py-dkimpy/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python library for DKIM email signing and verification
LICENSE= ZLIB
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns@${FLAVOR}
NO_ARCH= yes
diff --git a/mail/py-flufl.bounce/Makefile b/mail/py-flufl.bounce/Makefile
index d3910b6367e4..4ad1b731d281 100644
--- a/mail/py-flufl.bounce/Makefile
+++ b/mail/py-flufl.bounce/Makefile
@@ -11,17 +11,10 @@ COMMENT= API for detecting the original bouncing email addresses from a bounce m
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 <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/py-fuglu/Makefile b/mail/py-fuglu/Makefile
index d8515ad72a33..9fd4bee2852b 100644
--- a/mail/py-fuglu/Makefile
+++ b/mail/py-fuglu/Makefile
@@ -13,9 +13,9 @@ COMMENT= Mail scanning daemon for Postfix written in Python
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 @@ SPAMASSASSIN_DESC= Use SpamAssassin
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
diff --git a/mail/py-libgmail/Makefile b/mail/py-libgmail/Makefile
index efcafd00d0dc..42f4bad6c01a 100644
--- a/mail/py-libgmail/Makefile
+++ b/mail/py-libgmail/Makefile
@@ -13,7 +13,7 @@ COMMENT= Library to provide access to Gmail via Python
BUILD_DEPENDS= py*-mechanize>=0:www/py-mechanize
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/mail/py-ppolicy/Makefile b/mail/py-ppolicy/Makefile
index 1573b99ead7f..f70011828e5d 100644
--- a/mail/py-ppolicy/Makefile
+++ b/mail/py-ppolicy/Makefile
@@ -11,10 +11,10 @@ MASTER_SITES= http://kmlinux.fjfi.cvut.cz/~vokac/activities/ppolicy/download/%SU
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 @@ SUB_FILES= pkg-message
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
diff --git a/mail/py-premailer/Makefile b/mail/py-premailer/Makefile
index d203fcca71e6..4ae5764b6251 100644
--- a/mail/py-premailer/Makefile
+++ b/mail/py-premailer/Makefile
@@ -12,12 +12,12 @@ COMMENT= Turns CSS blocks into style attributes
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
diff --git a/mail/py-pyspf/Makefile b/mail/py-pyspf/Makefile
index 717519282feb..c9652b11e0dc 100644
--- a/mail/py-pyspf/Makefile
+++ b/mail/py-pyspf/Makefile
@@ -14,8 +14,8 @@ COMMENT= SPF (Sender Policy Framework) implemented in Python
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 @@ SHEBANG_FILES= spf.py
.include <bsd.port.pre.mk>
.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
diff --git a/mail/py-spambayes/Makefile b/mail/py-spambayes/Makefile
index 773c439c12f7..d8c441d8d57b 100644
--- a/mail/py-spambayes/Makefile
+++ b/mail/py-spambayes/Makefile
@@ -12,9 +12,9 @@ COMMENT= Bayesian anti-spam filter written in Python
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
diff --git a/mail/py-zope.sendmail/Makefile b/mail/py-zope.sendmail/Makefile
index c08f903cc46b..3f3f65140290 100644
--- a/mail/py-zope.sendmail/Makefile
+++ b/mail/py-zope.sendmail/Makefile
@@ -13,13 +13,13 @@ COMMENT= Zope sendmail
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
diff --git a/mail/pyzor/Makefile b/mail/pyzor/Makefile
index 817912202183..98b7448e032e 100644
--- a/mail/pyzor/Makefile
+++ b/mail/pyzor/Makefile
@@ -13,7 +13,7 @@ COMMENT= Collaborative, networked system to detect and block spam
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
diff --git a/mail/rss2email2/Makefile b/mail/rss2email2/Makefile
index 21b3f8419a22..a5d279feee23 100644
--- a/mail/rss2email2/Makefile
+++ b/mail/rss2email2/Makefile
@@ -14,8 +14,8 @@ COMMENT= Emails posts from subscribed RSS/Atom newsfeeds
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
diff --git a/mail/rss2email3/Makefile b/mail/rss2email3/Makefile
index e80fe7fc265e..b528ed483911 100644
--- a/mail/rss2email3/Makefile
+++ b/mail/rss2email3/Makefile
@@ -12,8 +12,8 @@ COMMENT= Emails posts from subscribed RSS/Atom newsfeeds
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 @@ CONFLICTS_INSTALL= py*-rss2email-2.*
PORTDOCS= AUTHORS CHANGELOG README
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
${INSTALL_MAN} ${WRKSRC}/r2e.1 ${STAGEDIR}${MANPREFIX}/man/man1
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/spamdb-curses/Makefile b/mail/spamdb-curses/Makefile
index f6c60a5338c9..9b9534d416a0 100644
--- a/mail/spamdb-curses/Makefile
+++ b/mail/spamdb-curses/Makefile
@@ -13,7 +13,7 @@ LICENSE= MIT
RUN_DEPENDS= ${LOCALBASE}/sbin/spamdb:mail/spamd
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/mail/svnmailer/Makefile b/mail/svnmailer/Makefile
index 4fcabfded319..0ba4ab4ba6e0 100644
--- a/mail/svnmailer/Makefile
+++ b/mail/svnmailer/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX}
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
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 90d59213d439..45d81ff1c5da 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python-based SPAM reduction system
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
diff --git a/math/cadabra2/Makefile b/math/cadabra2/Makefile
index 8b68818e859c..46b7d4796cc3 100644
--- a/math/cadabra2/Makefile
+++ b/math/cadabra2/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= libboost_python.so:devel/boost-python-libs \
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
diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile
index 4e8582574d7f..5c1500585a41 100644
--- a/math/ceres-solver/Makefile
+++ b/math/ceres-solver/Makefile
@@ -42,7 +42,7 @@ CUSTOM_BLAS_DESC= Handcoded BLAS routines instead of Eigen
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
diff --git a/math/convertall/Makefile b/math/convertall/Makefile
index 5ab4221d4618..e828e6c89ba4 100644
--- a/math/convertall/Makefile
+++ b/math/convertall/Makefile
@@ -39,11 +39,4 @@ do-install:
-d ${DATADIR} -f ${DATADIR_REL})
(cd ${STAGEDIR}${DOCSDIR} && ${RM} INSTALL LICENSE)
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/fityk/Makefile b/math/fityk/Makefile
index 61897048b9f8..5c7e64843ffb 100644
--- a/math/fityk/Makefile
+++ b/math/fityk/Makefile
@@ -46,7 +46,7 @@ OPTIONS_DEFAULT= PYTHON
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:
diff --git a/math/gracetmpl/Makefile b/math/gracetmpl/Makefile
index a41704b694e5..4496d7aee81d 100644
--- a/math/gracetmpl/Makefile
+++ b/math/gracetmpl/Makefile
@@ -10,13 +10,14 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
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" \
diff --git a/math/lybniz/Makefile b/math/lybniz/Makefile
index b78d19aaa0c6..acca054f92dd 100644
--- a/math/lybniz/Makefile
+++ b/math/lybniz/Makefile
@@ -12,7 +12,7 @@ COMMENT= Mathematical function graph plotter
LICENSE= BSD3CLAUSE
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
USE_GNOME= pygtk2
diff --git a/math/nlopt/Makefile b/math/nlopt/Makefile
index 6727e7966b85..4f15bb64682b 100644
--- a/math/nlopt/Makefile
+++ b/math/nlopt/Makefile
@@ -17,8 +17,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 8758018260f1..b8e860fa1404 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -58,7 +58,7 @@ LUA_USES= lua:51
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}
diff --git a/math/py-PyWavelets/Makefile b/math/py-PyWavelets/Makefile
index bd36eae7c9d1..87b9a2e37f16 100644
--- a/math/py-PyWavelets/Makefile
+++ b/math/py-PyWavelets/Makefile
@@ -13,17 +13,15 @@ LICENSE= MIT
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
diff --git a/math/py-apgl/Makefile b/math/py-apgl/Makefile
index bb6b0fc17955..1c287370f2d5 100644
--- a/math/py-apgl/Makefile
+++ b/math/py-apgl/Makefile
@@ -13,7 +13,7 @@ COMMENT= Fast python graph library with some machine learning features
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
diff --git a/math/py-basemap/Makefile b/math/py-basemap/Makefile
index 172ee9ff272c..e8f4e5638905 100644
--- a/math/py-basemap/Makefile
+++ b/math/py-basemap/Makefile
@@ -14,10 +14,10 @@ LICENSE= GPLv2 LGPL21 MIT
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
diff --git a/math/py-bitmath/Makefile b/math/py-bitmath/Makefile
index 77b8507a6cca..6189312e2857 100644
--- a/math/py-bitmath/Makefile
+++ b/math/py-bitmath/Makefile
@@ -18,6 +18,6 @@ USE_PYTHON= autoplist distutils
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 <bsd.port.mk>
diff --git a/math/py-bottleneck/Makefile b/math/py-bottleneck/Makefile
index 1d712f9f3c78..90246581a891 100644
--- a/math/py-bottleneck/Makefile
+++ b/math/py-bottleneck/Makefile
@@ -13,13 +13,12 @@ COMMENT= Collection of fast NumPy array functions written in Cython
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}
diff --git a/math/py-colormath/Makefile b/math/py-colormath/Makefile
index 6532b964c53a..26378e5b8860 100644
--- a/math/py-colormath/Makefile
+++ b/math/py-colormath/Makefile
@@ -12,10 +12,10 @@ COMMENT= Module that spares the user from directly dealing with color math
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 <bsd.port.mk>
diff --git a/math/py-fastcluster/Makefile b/math/py-fastcluster/Makefile
index ba9d8fca8cfb..38a8251e3c01 100644
--- a/math/py-fastcluster/Makefile
+++ b/math/py-fastcluster/Makefile
@@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE
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 \
diff --git a/math/py-fiat/Makefile b/math/py-fiat/Makefile
index 37fd5d2e70f7..e24c84594d1a 100644
--- a/math/py-fiat/Makefile
+++ b/math/py-fiat/Makefile
@@ -14,7 +14,7 @@ COMMENT= FInite element Automatic Tabulator
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
diff --git a/math/py-gato/Makefile b/math/py-gato/Makefile
index 7cf67094fd2f..65546ec16d74 100644
--- a/math/py-gato/Makefile
+++ b/math/py-gato/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python-based toolbox to visualise algorithms on graphs
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= *
diff --git a/math/py-gnuplot/Makefile b/math/py-gnuplot/Makefile
index 1e4cb121aeb8..cb0212692e73 100644
--- a/math/py-gnuplot/Makefile
+++ b/math/py-gnuplot/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS= gnuplot:math/gnuplot \
${PYNUMPY}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/math/py-graphillion/Makefile b/math/py-graphillion/Makefile
index a9118df96039..276396a648aa 100644
--- a/math/py-graphillion/Makefile
+++ b/math/py-graphillion/Makefile
@@ -14,7 +14,7 @@ COMMENT= Fast, lightweight graphset operation library in Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
post-install:
diff --git a/math/py-keras/Makefile b/math/py-keras/Makefile
index 0a372e7068d2..fd050dfa6ecd 100644
--- a/math/py-keras/Makefile
+++ b/math/py-keras/Makefile
@@ -11,9 +11,9 @@ COMMENT= Deep Learning library for Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}theano>=0.8.0:math/py-theano \
- ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}theano>=0.8.0:math/py-theano@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
USES= python:-3.5
USE_PYTHON= autoplist distutils
diff --git a/math/py-luminol/Makefile b/math/py-luminol/Makefile
index ef17e9c41e25..cbf3da0e827e 100644
--- a/math/py-luminol/Makefile
+++ b/math/py-luminol/Makefile
@@ -12,8 +12,8 @@ COMMENT= Light weight python library for time series data analysis
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy \
- ${PYTHON_PKGNAMEPREFIX}numpy>=1.6.2,1:math/py-numpy
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}numpy>=1.6.2,1:math/py-numpy@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/math/py-mathdom/Makefile b/math/py-mathdom/Makefile
index da6665b66193..70d04a1ec2a1 100644
--- a/math/py-mathdom/Makefile
+++ b/math/py-mathdom/Makefile
@@ -14,9 +14,9 @@ COMMENT= Content MathML in Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
index c8d0ce1466cf..83b113e31c3c 100644
--- a/math/py-matplotlib/Makefile
+++ b/math/py-matplotlib/Makefile
@@ -19,11 +19,11 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig \
libtcl86.so:lang/tcl86
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \
- ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado
+ ${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR}
USE_GITHUB= yes
@@ -54,8 +54,8 @@ QT5AGGBACKEND_USE= PYQT=sip,widgets
QT5AGGBACKEND_VARS= QT5AGG_BACKEND=True
QT5AGGBACKEND_VARS_OFF= QT5AGG_BACKEND=False
TKAGGBACKEND_DESC= TKAgg backend support
-TKAGGBACKEND_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
-TKAGGBACKEND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
+TKAGGBACKEND_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR}
+TKAGGBACKEND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR}
TKAGGBACKEND_USES= tk:run
TKAGGBACKEND_VARS= TKAGG_BACKEND=True
TKAGGBACKEND_VARS_OFF= TKAGG_BACKEND=False
diff --git a/math/py-mpmath/Makefile b/math/py-mpmath/Makefile
index 4980be452c5e..a3bbfec49524 100644
--- a/math/py-mpmath/Makefile
+++ b/math/py-mpmath/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python Library for Arbitrary-precision Floating-point Arithmetic
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gmpy.so:math/py-gmpy
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gmpy.so:math/py-gmpy@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/math/py-munkres/Makefile b/math/py-munkres/Makefile
index abc4e9ee830f..0c93a4d23bd7 100644
--- a/math/py-munkres/Makefile
+++ b/math/py-munkres/Makefile
@@ -14,10 +14,6 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= python
-USE_PYTHON= distutils
-
-PLIST_FILES= %%PYTHON_SITELIBDIR%%/munkres.py \
- %%PYTHON_SITELIBDIR%%/munkres.pyc \
- %%PYTHON_SITELIBDIR%%/munkres.pyo
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index 427eaf8b447b..ead14654e467 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -14,13 +14,13 @@ COMMENT= Tools for complex networks
LICENSE= BSD3CLAUSE
-RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator
+RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${FLAVOR}
-# ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx \
-# ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils
+# ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx@${FLAVOR} \
+# ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${FLAVOR}
NO_ARCH= yes
-USES= python shebangfix
+USES= python:2.7 shebangfix
USE_PYTHON= autoplist concurrent distutils
SHEBANG_FILES= examples/graph/atlas.py \
examples/multigraph/chess_masters.py \
@@ -35,20 +35,20 @@ OPTIONS_GROUP_RENDER= MPL GRAPHVIZ
OPTIONS_DEFAULT= NUMPY SCIPY MPL GRAPHVIZ YAML
NUMPY_DESC= Matrix representation of graphs
-NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy
+NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy@${FLAVOR}
SCIPY_DESC= Sparse matrix representation of graphs
-SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:science/py-scipy \
- ${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:science/py-scikit-sparse
+SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:science/py-scipy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:science/py-scikit-sparse@${FLAVOR}
MPL_DESC= Flexible graph rendering
-MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:math/py-matplotlib
+MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:math/py-matplotlib@${FLAVOR}
GRAPHVIZ_DESC= Additional graph layout and rendering algorithms
-GRAPHVIZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz
+GRAPHVIZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz@${FLAVOR}
YAML_DESC= Reading and writing YAML files
-YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml
+YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR}
.include <bsd.port.pre.mk>
diff --git a/math/py-numarray/Makefile b/math/py-numarray/Makefile
index 8b7ccf597e95..60897ad6ff26 100644
--- a/math/py-numarray/Makefile
+++ b/math/py-numarray/Makefile
@@ -13,7 +13,7 @@ COMMENT= Numeric array manipulation extension module for Python
LICENSE= BSD3CLAUSE
-USES= python shebangfix
+USES= python:2.7 shebangfix
SHEBANG_FILES= Examples/convolve/benchmark.py
USE_PYTHON= distutils autoplist
diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index fa0b0e2e1db3..8a72d2e0b1bd 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY= Numeric-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Numeric Extension to Python
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/Numeric-${PORTVERSION}
diff --git a/math/py-numexpr/Makefile b/math/py-numexpr/Makefile
index e2618cba021f..66a6e5b37681 100644
--- a/math/py-numexpr/Makefile
+++ b/math/py-numexpr/Makefile
@@ -13,7 +13,7 @@ COMMENT= Fast numerical array expression evaluator for Python and NumPy
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.7,1:math/py-numpy
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.7,1:math/py-numpy@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PYTHON= autoplist concurrent distutils
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 7ecf64969b7e..374ed0fedfdd 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -22,7 +22,7 @@ PYDISTUTILS_BUILDARGS= --fcompiler=gnu95
PYDISTUTILS_CONFIGUREARGS= --fcompiler=gnu95
USES= fortran python
USE_GITHUB= yes
-USE_PYTHON= concurrent distutils py3kplist
+USE_PYTHON= concurrent distutils py3kplist cython allflavors
LDFLAGS+= -shared
OPTIONS_DEFINE= DOCS SUITESPARSE TESTS
@@ -42,9 +42,7 @@ NETLIB_USES= blaslapack:netlib
NETLIB_LIB_DEPENDS= libcblas.so:math/cblas
OPENBLAS_USES= blaslapack:openblas
SUITESPARSE_LIB_DEPENDS=libumfpack.so:math/suitesparse
-TESTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose
-
-BUILD_DEPENDS+= cython:lang/cython
+TESTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR}
.include <bsd.port.pre.mk>
diff --git a/math/py-nzmath/Makefile b/math/py-nzmath/Makefile
index 59e319eb1419..eb20b8e9343e 100644
--- a/math/py-nzmath/Makefile
+++ b/math/py-nzmath/Makefile
@@ -11,7 +11,7 @@ DISTNAME= NZMATH-${PORTVERSION}
MAINTAINER= wen@FreeBSD.org
COMMENT= Number theory oriented calculation system
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= NZMATH
diff --git a/math/py-pandas/Makefile b/math/py-pandas/Makefile
index 5236367eb387..7a992cf991b1 100644
--- a/math/py-pandas/Makefile
+++ b/math/py-pandas/Makefile
@@ -13,27 +13,26 @@ LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS:= ${BUILD_DEPENDS} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
TEST_DEPENDS:= ${RUN_DEPENDS} \
nosetests-${PYTHON_VER}:devel/py-nose \
- cython:lang/cython \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 \
- ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \
- ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables \
- ${PYTHON_PKGNAMEPREFIX}bottleneck>0:math/py-bottleneck \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib \
- ${PYTHON_PKGNAMEPREFIX}numexpr>=2.4.6:math/py-numexpr \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy \
- ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.2.0:textproc/py-openpyxl \
- ${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd \
- ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt \
- ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter \
- ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup \
- ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bottleneck>0:math/py-bottleneck@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}numexpr>=2.4.6:math/py-numexpr@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.2.0:textproc/py-openpyxl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR}
# Note: we cannot include math/py-statsmodels in TEST_DEPENDS because it
# depends upon us for BUILD and RUN.
@@ -68,35 +67,35 @@ SQL_DESC= SQLAlchemy ORM Add-ons
HTML_DESC= HTML Parsing/Generation Add-ons
EXCEL_DESC= MS Excel I/O Add-ons
-MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib
-SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy
-BTLNCK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottleneck>0:math/py-bottleneck
-NUMEXPR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numexpr>=2.4.6:math/py-numexpr
-BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto
-TABLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables
+MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR}
+SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR}
+BTLNCK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottleneck>0:math/py-bottleneck@${FLAVOR}
+NUMEXPR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numexpr>=2.4.6:math/py-numexpr@${FLAVOR}
+BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR}
+TABLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables@${FLAVOR}
-LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml
-HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
-JINJA2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2
-OPENPYXL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.2.0:textproc/py-openpyxl
-XLRD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd
-XLWT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt
-XLSX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter
+LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR}
+HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${FLAVOR}
+JINJA2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR}
+OPENPYXL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.2.0:textproc/py-openpyxl@${FLAVOR}
+XLRD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd@${FLAVOR}
+XLWT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt@${FLAVOR}
+XLSX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${FLAVOR}
-ALCHEMY10_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10
-ALCHEMY11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>0:databases/py-sqlalchemy11
+ALCHEMY10_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR}
+ALCHEMY11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>0:databases/py-sqlalchemy11@${FLAVOR}
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MLXML} || ${PORT_OPTIONS:MHTML5LIB}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${FLAVOR}
.endif
SUB_FILES= pkg-message
# Official support for 2.7, 3.5, and 3.6
USES= python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils cython
# Uncomment the following line to enable regression-test
# on a headless (X11-less) host (eg: RedPorts)
diff --git a/math/py-patsy/Makefile b/math/py-patsy/Makefile
index 0c0f3578b371..da2c62819b3d 100644
--- a/math/py-patsy/Makefile
+++ b/math/py-patsy/Makefile
@@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE PSFL
LICENSE_COMB= multi
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
USES= python zip
USE_PYTHON= distutils autoplist
diff --git a/math/py-plastex/Makefile b/math/py-plastex/Makefile
index bca443410abb..3ccfd5ef8306 100644
--- a/math/py-plastex/Makefile
+++ b/math/py-plastex/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= LaTeX Document Processing Framework
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= tiarno
diff --git a/math/py-probstat/Makefile b/math/py-probstat/Makefile
index 79c084ca926f..0eb948d1f56c 100644
--- a/math/py-probstat/Makefile
+++ b/math/py-probstat/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Probability And Statistics Utils for Python
-USES= python tar:tgz
+USES= python:2.7 tar:tgz
USE_PYTHON= distutils autoplist
post-install:
diff --git a/math/py-pybloom/Makefile b/math/py-pybloom/Makefile
index 70102edd01a2..9d403d843f29 100644
--- a/math/py-pybloom/Makefile
+++ b/math/py-pybloom/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Probabilistic data structure
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bitarray>0:devel/py-bitarray
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bitarray>0:devel/py-bitarray@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
USE_GITHUB= yes
diff --git a/math/py-pymc/Makefile b/math/py-pymc/Makefile
index 81b7695e2ff2..dc6c288d6677 100644
--- a/math/py-pymc/Makefile
+++ b/math/py-pymc/Makefile
@@ -17,15 +17,15 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
BUILD_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR}
LIB_DEPENDS= liblapack.so:math/lapack \
libblas.so:math/blas
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
LDFLAGS+= -shared
diff --git a/math/py-pysparse/Makefile b/math/py-pysparse/Makefile
index d756f98c2700..d8904ceae11d 100644
--- a/math/py-pysparse/Makefile
+++ b/math/py-pysparse/Makefile
@@ -13,8 +13,8 @@ COMMENT= Fast sparse matrix library for Python
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2,1:math/py-numpy
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2,1:math/py-numpy
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2,1:math/py-numpy@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2,1:math/py-numpy@${FLAVOR}
LIB_DEPENDS= liblapack.so:math/lapack \
libblas.so:math/blas \
libopenblas.so:math/openblas \
@@ -26,7 +26,7 @@ GH_TAGNAME= f8430bd
LDFLAGS+= -shared # Workaround for an obscure bug in py-numpy, see https://github.com/numpy/numpy/issues/7779
-USES= fortran python # fortran is needed for the correct build flags passed to py-numpy extension build process
+USES= fortran python:2.7 # fortran is needed for the correct build flags passed to py-numpy extension build process
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/math/py-scientific/Makefile b/math/py-scientific/Makefile
index 7368a17ae8c2..992cc5b75f71 100644
--- a/math/py-scientific/Makefile
+++ b/math/py-scientific/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYNUMPY}
LIB_DEPENDS= libnetcdf.so:science/netcdf
RUN_DEPENDS= ${PYNUMPY}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/math/py-statsmodels/Makefile b/math/py-statsmodels/Makefile
index c52b8e474413..9e2d18cc9e36 100644
--- a/math/py-statsmodels/Makefile
+++ b/math/py-statsmodels/Makefile
@@ -12,19 +12,18 @@ COMMENT= Complement to SciPy for statistical computations
LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ${PYNUMPY} \
- cython:lang/cython \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy \
- ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas \
- ${PYTHON_PKGNAMEPREFIX}patsy>0:math/py-patsy
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}patsy>0:math/py-patsy@${FLAVOR}
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy \
- ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas \
- ${PYTHON_PKGNAMEPREFIX}patsy>0:math/py-patsy
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}patsy>0:math/py-patsy@${FLAVOR}
OPTIONS_DEFINE= DOCS EXAMPLES
USES= python shebangfix
-USE_PYTHON= autoplist distutils concurrent
+USE_PYTHON= autoplist distutils concurrent cython
USE_GITHUB= yes
GH_TAGNAME= 8e812cd
SHEBANG_FILES= tools/*.py statsmodels/datasets/*/data.py statsmodels/tools/print_version.py \
diff --git a/math/py-sympy/Makefile b/math/py-sympy/Makefile
index 057e860579cb..06435ea3f5c5 100644
--- a/math/py-sympy/Makefile
+++ b/math/py-sympy/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python Library For Symbolic Mathematics
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpmath>=0.19:math/py-mpmath
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpmath>=0.19:math/py-mpmath@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
@@ -20,7 +20,7 @@ USE_PYTHON= autoplist distutils
OPTIONS_DEFINE= PYGLET
PYGLET_DESC= Enable plotting support
-PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:graphics/py-pyglet
+PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:graphics/py-pyglet@${FLAVOR}
post-patch:
@${REINPLACE_CMD} -e "s#share/man/man1#man/man1#" ${WRKSRC}/setup.py
diff --git a/math/py-theano/Makefile b/math/py-theano/Makefile
index 611e8615e28f..8dabc6a1cd6e 100644
--- a/math/py-theano/Makefile
+++ b/math/py-theano/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= demon@FreeBSD.org
COMMENT= Optimizing compiler for evaluating math expressions on CPUs and GPUs
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.8.0:science/py-scipy
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.8.0:science/py-scipy@${FLAVOR}
USES= compiler:openmp python
USE_PYTHON= concurrent distutils autoplist
diff --git a/math/py-yt/Makefile b/math/py-yt/Makefile
index 2d35bd68a127..fe20e8d14296 100644
--- a/math/py-yt/Makefile
+++ b/math/py-yt/Makefile
@@ -13,19 +13,18 @@ COMMENT= Analysis and visualization toolkit for volumetric data
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING.txt
-BUILD_DEPENDS= cython:lang/cython \
+BUILD_DEPENDS= ${PYNUMPY} \
+ ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree@${FLAVOR}
+RUN_DEPENDS= isympy:math/py-sympy@${FLAVOR} \
${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree
-RUN_DEPENDS= isympy:math/py-sympy \
- ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib \
+ ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}ipython>=1.0:devel/ipython
LIB_DEPENDS= libembree.so:graphics/embree \
libomp.so:devel/openmp
-USES= dos2unix localbase python:-3.5
-USE_PYTHON= autoplist distutils
+USES= dos2unix localbase python:2.7
+USE_PYTHON= autoplist distutils cython
post-patch:
@${REINPLACE_CMD} -e "s|check_for_pyembree() is not None|True|; s|check_for_openmp() is True|True|" \
diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index b98565d8e052..56eba779644c 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -37,9 +37,9 @@ DOCS_RUN_DEPENDS= qtiplot-doc>=0:math/qtiplot-doc
DOCS_USE= QT4=assistant-adp_run
PYTHON_DESC= Python scripting support
-PYTHON_USES= python
+PYTHON_USES= python:2.7
PYTHON_BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui
-PYTHON_RUN_DEPENDS:= ${PYTHON_BUILD_DEPENDS}
+PYTHON_RUN_DEPENDS= ${PYTHON_BUILD_DEPENDS}
PYTHON_CONFIGURE_ENV= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \
PYTHON_VERSION=${PYTHON_VERSION}
diff --git a/math/rpcalc/Makefile b/math/rpcalc/Makefile
index b8af31587762..791e824fb608 100644
--- a/math/rpcalc/Makefile
+++ b/math/rpcalc/Makefile
@@ -34,11 +34,4 @@ do-install:
-d ${DATADIR} -f ${DATADIR_REL})
(cd ${STAGEDIR}${DOCSDIR} && ${RM} INSTALL LICENSE)
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/rpy/Makefile b/math/rpy/Makefile
index a4ff8df01d94..b428bbb8530b 100644
--- a/math/rpy/Makefile
+++ b/math/rpy/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYNUMPY}
LIB_DEPENDS= libR.so:math/R
RUN_DEPENDS= ${PYNUMPY}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
LDFLAGS+= -L${LOCALBASE}/lib/R/modules -L${LOCALBASE}/lib/R/lib
diff --git a/math/rpy2/Makefile b/math/rpy2/Makefile
index bbe4ccfcb265..aca3da0c117e 100644
--- a/math/rpy2/Makefile
+++ b/math/rpy2/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libR.so:math/R
RUN_DEPENDS= ${PYNUMPY}
USES= fortran python readline
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist concurrent optsuffix
LDFLAGS+= -Wl,--as-needed
pre-configure:
diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index 4e6ae8b82556..008caf3536dc 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -138,7 +138,7 @@ IGNORE= python wrapping requires shared libraries.\
Run make config again and enable the SHARED option
.endif
USES+= python
-USE_PYTHON= distutils
+USE_PYTHON= distutils noflavors
PYDISTUTILS_PKGNAME= VTK
# INSTALLS_EGGINFO support has been removed
# INSTALLS_EGGINFO= yes
diff --git a/math/vtk6/Makefile b/math/vtk6/Makefile
index 35ac8655268d..69c6e5a8a475 100644
--- a/math/vtk6/Makefile
+++ b/math/vtk6/Makefile
@@ -178,13 +178,14 @@ PLIST_SUB+= JAVA="@comment "
.endif
.if ${PORT_OPTIONS:MPYTHON}
-USES+= python
+USES+= python:2.7
+USE_PYTHON= flavors
CMAKE_ARGS+= -DVTK_WRAP_PYTHON:BOOL=ON \
-DVTK_INSTALL_PYTHON_MODULE_DIR:STRING=${PYTHONPREFIX_SITELIBDIR} \
-DModule_vtkRenderingMatplotlib:BOOL=ON \
-DModule_vtkPythonInterpreter:BOOL=ON
PLIST_SUB+= PYTHON=""
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib
+RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${FLAVOR}
.else
CMAKE_ARGS+= -DVTK_WRAP_PYTHON:BOOL=OFF
PLIST_SUB+= PYTHON="@comment "
diff --git a/math/z3/Makefile b/math/z3/Makefile
index d83fc8318b94..e6bfcfbc907b 100644
--- a/math/z3/Makefile
+++ b/math/z3/Makefile
@@ -28,8 +28,8 @@ DEBUG_CONFIGURE_ON= --debug
PYTHON_DESC= Enable python bindings
PYTHON_CONFIGURE_ON= --python
-PYTHON_USES= python
-PYTHON_USES_OFF= python:build
+PYTHON_USES= python:2.7
+PYTHON_USES_OFF= python:2.7,build
STATIC_DESC= Build static z3 library
STATIC_CONFIGURE_ON= --staticlib
diff --git a/misc/Makefile b/misc/Makefile
index ee63a64136f0..9f5b98fda89c 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -399,8 +399,6 @@
SUBDIR += py-spdx-lookup
SUBDIR += py-tqdm
SUBDIR += py-yolk
- SUBDIR += py3-pexpect
- SUBDIR += py3-tqdm
SUBDIR += pylize
SUBDIR += qbrew
SUBDIR += qlas
diff --git a/misc/fbless/Makefile b/misc/fbless/Makefile
index b1b5fff4952d..0f434c24545a 100644
--- a/misc/fbless/Makefile
+++ b/misc/fbless/Makefile
@@ -10,7 +10,7 @@ COMMENT= Text-mode fb2 books reader
LICENSE= GPLv2
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
USE_GITHUB= yes
GH_ACCOUNT= matimatik
diff --git a/misc/iso-codes/Makefile b/misc/iso-codes/Makefile
index 7b75cc881d21..6a6429be740c 100644
--- a/misc/iso-codes/Makefile
+++ b/misc/iso-codes/Makefile
@@ -11,8 +11,10 @@ COMMENT= Lists of the country, language, and currency iso names
LICENSE= LGPL21
-USES= gettext gmake pathfix python:3,build tar:xz
+USES= gettext gmake pathfix python:3.4+,build tar:xz
GNU_CONFIGURE= yes
NO_ARCH= yes
+BINARY_ALIAS= python3=${PYTHON_VERSION}
+
.include <bsd.port.mk>
diff --git a/misc/metalink-editor/Makefile b/misc/metalink-editor/Makefile
index 806908ce19ba..d7a2ab1ef208 100644
--- a/misc/metalink-editor/Makefile
+++ b/misc/metalink-editor/Makefile
@@ -15,7 +15,7 @@ COMMENT= GUI editor to create and edit metalinks
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/license.txt
-USES= dos2unix python zip
+USES= dos2unix python:2.7 zip
DOS2UNIX_REGEX= .*\.txt
NO_WRKSUBDIR= yes
USE_PYTHON= distutils
diff --git a/misc/py-YABT/Makefile b/misc/py-YABT/Makefile
index 44194fdc251e..54d28c8fab04 100644
--- a/misc/py-YABT/Makefile
+++ b/misc/py-YABT/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= General Purpose Braille Translation System
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/misc/py-cinder/Makefile b/misc/py-cinder/Makefile
index 568765343437..6e5a618c2fd7 100644
--- a/misc/py-cinder/Makefile
+++ b/misc/py-cinder/Makefile
@@ -12,72 +12,72 @@ COMMENT= OpenStack Storage Service (Cinder)
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}Babel>=2.3.4:devel/py-babel \
- ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator \
- ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \
- ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \
- ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet \
- ${PYTHON_PKGNAMEPREFIX}httplib2>=0.7.5:www/py-httplib2 \
- ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \
- ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.7:net/py-ipaddress \
- ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \
- ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware \
- ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.5.0:security/py-oauth2client \
- ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \
- ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \
- ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \
- ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db \
- ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log \
- ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging \
- ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware \
- ${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.reports>=0.6.0:devel/py-oslo.reports \
- ${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.0.0:devel/py-oslo.rootwrap \
- ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
- ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \
- ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects \
- ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler \
- ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0:security/py-paramiko \
- ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste \
- ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing \
- ${PYTHON_PKGNAMEPREFIX}python-barbicanclient>=4.0.0:net/py-python-barbicanclient \
- ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient \
- ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \
- ${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient \
- ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=2.2.0:databases/py-python-swiftclient \
- ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \
- ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \
- ${PYTHON_PKGNAMEPREFIX}taskflow>=1.26.0:devel/py-taskflow \
- ${PYTHON_PKGNAMEPREFIX}rtslib-fb>=0:devel/py-rtslib-fb \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \
- ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
- ${PYTHON_PKGNAMEPREFIX}oslo.vmware>=2.11.0:devel/py-oslo.vmware \
- ${PYTHON_PKGNAMEPREFIX}os-brick>=1.6.1:devel/py-os-brick \
- ${PYTHON_PKGNAMEPREFIX}os-win>=0.2.3:devel/py-os-win \
- ${PYTHON_PKGNAMEPREFIX}tooz>=1.28.0:devel/py-tooz \
- ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.4.1:www/py-google-api-python-client \
- ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${FLAVOR} \
+ ${PY_ENUM34} \
+ ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.7.5:www/py-httplib2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \
+ ${PY_IPADDRESS} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.5.0:security/py-oauth2client@${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}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware@${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.reports>=0.6.0:devel/py-oslo.reports@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.0.0:devel/py-oslo.rootwrap@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0:security/py-paramiko@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-barbicanclient>=4.0.0:net/py-python-barbicanclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=2.2.0:databases/py-python-swiftclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}taskflow>=1.26.0:devel/py-taskflow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rtslib-fb>=0:devel/py-rtslib-fb@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.vmware>=2.11.0:devel/py-oslo.vmware@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}os-brick>=1.6.1:devel/py-os-brick@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}os-win>=0.2.3:devel/py-os-win@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tooz>=1.28.0:devel/py-tooz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.4.1:www/py-google-api-python-client@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${FLAVOR}
EXTRA_PATCHES= ${FILESDIR}/01-remotefs.patch:-p1 \
${FILESDIR}/02-nfs.patch:-p1
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
USE_RC_SUBR= cinder-api \
diff --git a/misc/py-crudini/Makefile b/misc/py-crudini/Makefile
index 7e85ab90233c..43373151ed6e 100644
--- a/misc/py-crudini/Makefile
+++ b/misc/py-crudini/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= alexander.nusov@nfvexpress.com
COMMENT= Utility for manipulating ini files
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iniparse>=0.3.2:devel/py-iniparse
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iniparse>=0.3.2:devel/py-iniparse@${FLAVOR}
NO_ARCH= yes
diff --git a/misc/py-fuzzy/Makefile b/misc/py-fuzzy/Makefile
index c1e383f449ae..2955409d7ffb 100644
--- a/misc/py-fuzzy/Makefile
+++ b/misc/py-fuzzy/Makefile
@@ -13,13 +13,11 @@ COMMENT= Fast Python phonetic algorithms
LICENSE= MIT ART20
LICENSE_COMB= multi
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm \
- cython:lang/cython
-RUN_DEPENDS= cython:lang/cython
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
USES= python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils cython cython_run
do-test:
@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest
diff --git a/misc/py-glance/Makefile b/misc/py-glance/Makefile
index c864a1449f0a..ddb2c042ee90 100644
--- a/misc/py-glance/Makefile
+++ b/misc/py-glance/Makefile
@@ -13,54 +13,54 @@ COMMENT= OpenStack Image Service
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}eventlet>=0:net/py-eventlet \
- ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \
- ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \
- ${PYTHON_PKGNAMEPREFIX}httplib2>=0.7.5:www/py-httplib2 \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \
- ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \
- ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \
- ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \
- ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \
- ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist \
- ${PYTHON_PKGNAMEPREFIX}taskflow>=1.26.0:devel/py-taskflow \
- ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \
- ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware \
- ${PYTHON_PKGNAMEPREFIX}wsme>=0.8:devel/py-wsme \
- ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \
- ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste \
- ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \
- ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \
- ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
- ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log \
- ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging \
- ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware \
- ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy \
- ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \
- ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler \
- ${PYTHON_PKGNAMEPREFIX}glance-store>=0.18.0:devel/py-glance-store \
- ${PYTHON_PKGNAMEPREFIX}semantic_version>=2.3.1:devel/py-semantic_version \
- ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \
- ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography \
- ${PYTHON_PKGNAMEPREFIX}cursive>=0.1.1:devel/py-cursive \
- ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \
- ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic \
- ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.7.5:www/py-httplib2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${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}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}taskflow>=1.26.0:devel/py-taskflow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wsme>=0.8:devel/py-wsme@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}glance-store>=0.18.0:devel/py-glance-store@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}semantic_version>=2.3.1:devel/py-semantic_version@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cursive>=0.1.1:devel/py-cursive@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse@${FLAVOR}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils noegginfo
USE_RC_SUBR= glance-api glance-registry glance-scrubber glance-glare
diff --git a/misc/py-osd/Makefile b/misc/py-osd/Makefile
index 363172728059..8f01b6f0ecf1 100644
--- a/misc/py-osd/Makefile
+++ b/misc/py-osd/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= novel@FreeBSD.org
COMMENT= Python wrapper for osd, for displaying text on your X display
LIB_DEPENDS= libxosd.so:misc/xosd
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/misc/py-pexpect/Makefile b/misc/py-pexpect/Makefile
index 6f3d8afcd7d3..e03b331bab2f 100644
--- a/misc/py-pexpect/Makefile
+++ b/misc/py-pexpect/Makefile
@@ -12,9 +12,9 @@ COMMENT= Pure Python Expect-like module
LICENSE= ISCL
-RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}ptyprocess>=0:sysutils/py-ptyprocess
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ptyprocess>=0:sysutils/py-ptyprocess@${FLAVOR}
-USES?= python
+USES= python
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/misc/py-pyprind/Makefile b/misc/py-pyprind/Makefile
index 94aa1a3b08ec..97935d792763 100644
--- a/misc/py-pyprind/Makefile
+++ b/misc/py-pyprind/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python Progress Bar and Percent Indicator Utility
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
- ${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:sysutils/py-psutil
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:sysutils/py-psutil@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
@@ -24,7 +24,7 @@ NO_ARCH= yes
OPTIONS_DEFINE= PSUTIL
PSUTIL_DESC= Support monitoring CPU and memory usage
-PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:sysutils/py-psutil
+PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:sysutils/py-psutil@${FLAVOR}
do-test:
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
diff --git a/misc/py-qt4-demo/Makefile b/misc/py-qt4-demo/Makefile
index caf56f1831dd..8f15f491279d 100644
--- a/misc/py-qt4-demo/Makefile
+++ b/misc/py-qt4-demo/Makefile
@@ -16,7 +16,7 @@ DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
NO_BUILD= yes
USES= python pyqt:4
-USE_PYTHON= py3kplist
+USE_PYTHON= py3kplist flavors
EXAMPLESDIR= ${PREFIX}/share/examples/py-qt4
diff --git a/misc/py-qt4-doc/Makefile b/misc/py-qt4-doc/Makefile
index bbc85ce178f6..b6dcd8900fab 100644
--- a/misc/py-qt4-doc/Makefile
+++ b/misc/py-qt4-doc/Makefile
@@ -17,6 +17,7 @@ NO_BUILD= yes
USES= python pyqt:4
USE_PYQT= #
+USE_PYTHON= flavors
DOCSDIR= ${PREFIX}/share/doc/py-qt4
diff --git a/misc/py-qt5-demo/Makefile b/misc/py-qt5-demo/Makefile
index c76b3a450b31..fd0e838a7e6c 100644
--- a/misc/py-qt5-demo/Makefile
+++ b/misc/py-qt5-demo/Makefile
@@ -22,7 +22,7 @@ USE_PYQT= core_run dbus_run designer_run \
sql_run svg_run test_run webkit_run xml_run \
xmlpatterns_run sip_run qscintilla2_run \
printsupport_run serialport_run webkitwidgets_run widgets_run
-USE_PYTHON= py3kplist
+USE_PYTHON= py3kplist flavors
EXAMPLESDIR= ${PREFIX}/share/examples/py-qt5
diff --git a/misc/py-qt5-doc/Makefile b/misc/py-qt5-doc/Makefile
index c4f16efdc5a9..cc7870423fd5 100644
--- a/misc/py-qt5-doc/Makefile
+++ b/misc/py-qt5-doc/Makefile
@@ -17,6 +17,7 @@ PORTSCOUT= limit:^${PYQT5_VERSION}
USES= python pyqt:5
USE_PYQT= #
+USE_PYTHON= flavors
DOCSDIR= ${PREFIX}/share/doc/py-qt5
diff --git a/misc/py-socli/Makefile b/misc/py-socli/Makefile
index 451be6f1c38b..5b204408d1d6 100644
--- a/misc/py-socli/Makefile
+++ b/misc/py-socli/Makefile
@@ -12,13 +12,13 @@ COMMENT= Stack overflow command line interface
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama \
- ${PYTHON_PKGNAMEPREFIX}stackexchange>=0:devel/py-stackexchange \
- ${PYTHON_PKGNAMEPREFIX}urwid>=0:devel/py-urwid \
- ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup \
- ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stackexchange>=0:devel/py-stackexchange@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urwid>=0:devel/py-urwid@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist concurrent distutils
USE_GITHUB= yes
diff --git a/misc/py-spdx-lookup/Makefile b/misc/py-spdx-lookup/Makefile
index 9c7afe334a6e..083b10e58ace 100644
--- a/misc/py-spdx-lookup/Makefile
+++ b/misc/py-spdx-lookup/Makefile
@@ -12,7 +12,7 @@ COMMENT= SPDX license list query tool
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}spdx>0:misc/py-spdx
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}spdx>0:misc/py-spdx@${FLAVOR}
USES= python:3.3+
USE_PYTHON= autoplist distutils
diff --git a/misc/py-tqdm/Makefile b/misc/py-tqdm/Makefile
index 1f1c9a250f50..2e287b24b957 100644
--- a/misc/py-tqdm/Makefile
+++ b/misc/py-tqdm/Makefile
@@ -12,7 +12,7 @@ COMMENT= Fast, extensible progress bar for Python
LICENSE= MIT MPL20
LICENSE_COMB= multi
-USES?= python
+USES= python
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/misc/py3-pexpect/Makefile b/misc/py3-pexpect/Makefile
deleted file mode 100644
index df26e74748ce..000000000000
--- a/misc/py3-pexpect/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pexpect
-
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ptyprocess>=0:sysutils/py3-ptyprocess
-
-USES= python:3.2+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/misc/py3-tqdm/Makefile b/misc/py3-tqdm/Makefile
deleted file mode 100644
index 4c8a1129c0ce..000000000000
--- a/misc/py3-tqdm/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-tqdm
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/misc/pylize/Makefile b/misc/pylize/Makefile
index 04cdc372d0a6..dba359c31a2a 100644
--- a/misc/pylize/Makefile
+++ b/misc/pylize/Makefile
@@ -13,9 +13,9 @@ MAINTAINER= dryice@dryice.name
COMMENT= Presentation generation tool
BUILD_DEPENDS= python:lang/python \
- ${PYTHON_SITELIBDIR}/HTMLgen.py:www/py-HTMLgen \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
- ${PYTHON_SITELIBDIR}/em.py:textproc/py-empy
+ ${PYTHON_SITELIBDIR}/HTMLgen.py:www/py-HTMLgen@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/em.py:textproc/py-empy@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2 tar:bzip2
diff --git a/misc/wotsap/Makefile b/misc/wotsap/Makefile
index e33ecfd70524..08193675701a 100644
--- a/misc/wotsap/Makefile
+++ b/misc/wotsap/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= danilo@FreeBSD.org
COMMENT= Web of trust statistics and pathfinder
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
USES= python:2,run shebangfix
NO_BUILD= yes
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 1bcd07f53e40..e69a860158e8 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -340,7 +340,6 @@
SUBDIR += py-soco
SUBDIR += py-subliminal
SUBDIR += py-tvnamer
- SUBDIR += py3-gstreamer1
SUBDIR += pyjama
SUBDIR += pymp
SUBDIR += qmmp
diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile
index 24813fd12569..054cea904e85 100644
--- a/multimedia/freevo/Makefile
+++ b/multimedia/freevo/Makefile
@@ -16,15 +16,15 @@ RUN_DEPENDS= mplayer:multimedia/mplayer \
mencoder:multimedia/mencoder \
aumix:audio/aumix \
tv_cat:textproc/p5-xmltv \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0_1:devel/py-zope.interface \
- ${PYTHON_SITELIBDIR}/kaa/__init__.py:multimedia/py-kaa-base \
- ${PYTHON_SITELIBDIR}/kaa/imlib2/__init__.py:multimedia/py-kaa-imlib2 \
- ${PYTHON_SITELIBDIR}/kaa/metadata/__init__.py:multimedia/py-kaa-metadata \
- ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32 \
- ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
- ${PYTHON_SITELIBDIR}/Numeric/Numeric_headers/__init__.py:math/py-numeric \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0_1:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/kaa/__init__.py:multimedia/py-kaa-base@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/kaa/imlib2/__init__.py:multimedia/py-kaa-imlib2@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/kaa/metadata/__init__.py:multimedia/py-kaa-metadata@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/Numeric/Numeric_headers/__init__.py:math/py-numeric@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
FREEVO_USER= freevo
FREEVO_GROUP= ${FREEVO_USER}
@@ -33,7 +33,7 @@ FREEVO_HOME= /var/db/${FREEVO_USER}
USERS= ${FREEVO_USER}
GROUPS= ${FREEVO_GROUP}
-SUB_LIST+= PYTHON_VERSION=${PYTHON_DEFAULT_VERSION} \
+SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} \
PORTVERSION=${PORTVERSION} \
FREEVO_HOME=${FREEVO_HOME}
SUB_FILES= pkg-message pkg-deinstall
diff --git a/multimedia/freevo/files/freevo.in b/multimedia/freevo/files/freevo.in
index 17b6e7ae88c8..08cb5465333d 100644
--- a/multimedia/freevo/files/freevo.in
+++ b/multimedia/freevo/files/freevo.in
@@ -30,7 +30,7 @@ freevo_uid=`pw usershow ${freevo_user} | awk -F: '{print $3}'`
freevo_dir=`pw usershow ${freevo_user} | awk -F: '{print $9}'`
command="%%PREFIX%%/bin/freevo"
-command_interpreter="%%PREFIX%%/bin/%%PYTHON_VERSION%%"
+command_interpreter="%%PYTHON_CMD%%"
# freevo needs PATH set so it can determine python version
export PATH=/bin:/usr/bin:%%PREFIX%%/bin:${freevo_dir}/bin
diff --git a/multimedia/gaupol/Makefile b/multimedia/gaupol/Makefile
index 19bbbadda535..d4506a0ba1c5 100644
--- a/multimedia/gaupol/Makefile
+++ b/multimedia/gaupol/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= iso-codes>=0:misc/iso-codes \
USE_GNOME= pygtk2 intltool
USE_PYTHON= distutils
-USES= desktop-file-utils python
+USES= desktop-file-utils python:2.7
INSTALLS_ICONS= yes
NO_ARCH= yes
diff --git a/multimedia/gdvrecv/Makefile b/multimedia/gdvrecv/Makefile
index e6a59519a653..490c2f8cc4b7 100644
--- a/multimedia/gdvrecv/Makefile
+++ b/multimedia/gdvrecv/Makefile
@@ -13,7 +13,7 @@ COMMENT= DV tools for FreeBSD
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USES= python tar:bzip2
+USES= python:2.7 tar:bzip2
USE_GNOME= pygtk2
USE_PYTHON= distutils
DESKTOP_ENTRIES="Capture Video" \
diff --git a/multimedia/gpodder/Makefile b/multimedia/gpodder/Makefile
index 5ce098be6c21..57db5325195c 100644
--- a/multimedia/gpodder/Makefile
+++ b/multimedia/gpodder/Makefile
@@ -14,12 +14,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= intltool-extract:textproc/intltool \
help2man:misc/help2man
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib \
- ${PYTHON_PKGNAMEPREFIX}mygpoclient>=1.4:devel/py-mygpoclient \
- ${PYTHON_PKGNAMEPREFIX}podcastparser>0:devel/py-podcastparser \
- ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus \
- ${PYTHON_PKGNAMEPREFIX}eyed3>=0:audio/py-eyed3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mygpoclient>=1.4:devel/py-mygpoclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}podcastparser>0:devel/py-podcastparser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}eyed3>=0:audio/py-eyed3@${PY_FLAVOR}
OPTIONS_DEFINE= GTK2 NOTIFY MUTAGEN OGG2MP3
OPTIONS_DEFAULT= GTK2
@@ -27,8 +27,8 @@ OPTIONS_SUB= yes
MUTAGEN_DESC= Allow metadata manipulation
OGG2MP3_DESC= Ogg Vorbis conversion to MP3 support
OPTIONS_EXCLUDE= NLS
-NOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0:devel/py-notify
-MUTAGEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen
+NOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0:devel/py-notify@${PY_FLAVOR}
+MUTAGEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen@${PY_FLAVOR}
OGG2MP3_RUN_DEPENDS= lame:audio/lame \
oggdec:audio/vorbis-tools
diff --git a/multimedia/gstreamer1-plugins-gnonlin/Makefile b/multimedia/gstreamer1-plugins-gnonlin/Makefile
index 9e7e58dab7a2..001836c180a7 100644
--- a/multimedia/gstreamer1-plugins-gnonlin/Makefile
+++ b/multimedia/gstreamer1-plugins-gnonlin/Makefile
@@ -10,7 +10,7 @@ DISTNAME= gnonlin-${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= GStreamer lib for writing non-linear audio and video
-USES= libtool pkgconfig python:3,build tar:xz
+USES= libtool pkgconfig python:3.4+,build tar:xz
GNU_CONFIGURE= yes
USE_GSTREAMER1= good
INSTALL_TARGET= install-strip
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index 2776a1b9dad0..7841a84c7323 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -57,7 +57,7 @@ LIB_DEPENDS= libass.so:multimedia/libass \
libvorbis.so:audio/libvorbis \
libxslt.so:textproc/libxslt \
libyajl.so:devel/yajl
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
ONLY_FOR_ARCHS= amd64 armv6 armv7 i386
KODI_ARCH_i386= x86
diff --git a/multimedia/libkate/Makefile b/multimedia/libkate/Makefile
index 7ab982c58e2a..098e2e9d2680 100644
--- a/multimedia/libkate/Makefile
+++ b/multimedia/libkate/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+= --disable-doc
.if ${PORT_OPTIONS:MKATEDJ}
RUN_DEPENDS= ${LOCALBASE}/bin/oggz:audio/liboggz
-USES+= python shebangfix
+USES+= python:2.7 shebangfix
SHEBANG_FILES= tools/KateDJ/KateDJ
USE_WX= 3.0+
WX_COMPS= wx python:lib
diff --git a/multimedia/livestreamer/Makefile b/multimedia/livestreamer/Makefile
index 8b4f394b860f..5e604467b1d0 100644
--- a/multimedia/livestreamer/Makefile
+++ b/multimedia/livestreamer/Makefile
@@ -15,10 +15,10 @@ LICENSE= BSD2CLAUSE MIT APACHE20
LICENSE_COMB= multi
RUN_DEPENDS= rtmpdump:multimedia/rtmpdump \
- ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}futures>=0:devel/py-futures \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}librtmp>=0:multimedia/py-librtmp
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
+ ${PY_FUTURES} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}librtmp>=0:multimedia/py-librtmp@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/multimedia/mimms/Makefile b/multimedia/mimms/Makefile
index b5e1afb45303..94a7f9e79fde 100644
--- a/multimedia/mimms/Makefile
+++ b/multimedia/mimms/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libmms.so:net/libmms
-USES= python tar:bzip2
+USES= python:2.7 tar:bzip2
USE_PYTHON= distutils
PYDISTUTILS_PKGVERSION= 3.2
NO_ARCH= yes
diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile
index 2f41b59b166d..6fc6ed9d1f78 100644
--- a/multimedia/miro/Makefile
+++ b/multimedia/miro/Makefile
@@ -13,29 +13,29 @@ COMMENT= Video player to get internet TV broadcasts
LICENSE= GPLv2
-BUILD_DEPENDS= pyrexc:devel/pyrex \
- ${PYTHON_SITELIBDIR}/webkit/__init__.py:www/py-webkitgtk \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/webkit/__init__.py:www/py-webkitgtk@${FLAVOR} \
update-mime-database:misc/shared-mime-info \
${LOCALBASE}/include/boost/numeric/ublas/matrix.hpp:devel/boost-libs \
${LOCALBASE}/include/taglib/taglib.h:audio/taglib
LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \
libsqlite3.so:databases/sqlite3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
- ${PYTHON_SITELIBDIR}/dbus/glib.py:devel/py-dbus \
- ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:devel/py-notify \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/dbus/glib.py:devel/py-dbus@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:devel/py-notify@${FLAVOR} \
${PYTHON_SITELIBDIR}/libtorrent.so:net-p2p/libtorrent-rasterbar-python \
- ${PYTHON_SITELIBDIR}/webkit/webkit.so:www/py-webkitgtk \
- ${PYTHON_SITELIBDIR}/gtk-2.0/gconf.so:x11-toolkits/py-gnome2 \
- ${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl \
- ${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen
+ ${PYTHON_SITELIBDIR}/webkit/webkit.so:www/py-webkitgtk@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/gtk-2.0/gconf.so:x11-toolkits/py-gnome2@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen@${FLAVOR}
BUILD_WRKSRC= ${WRKSRC}/linux
INSTALL_WRKSRC= ${WRKSRC}/linux
USE_GNOME= gconf2 gtk20
USE_GSTREAMER= python gconf
-USES= gettext gmake pkgconfig desktop-file-utils python shared-mime-info shebangfix
+USES= gettext gmake pkgconfig desktop-file-utils python:2.7 shared-mime-info shebangfix
SHEBANG_FILES= resources/testdata/7digital-replies/generate.py \
resources/testdata/echonest-replies/generate.py
USE_PYTHON= distutils
diff --git a/multimedia/mmpython/Makefile b/multimedia/mmpython/Makefile
index 09a2882cea43..bb660ea4eff1 100644
--- a/multimedia/mmpython/Makefile
+++ b/multimedia/mmpython/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libdvdread.so:multimedia/libdvdread
RUN_DEPENDS= lsdvd:multimedia/lsdvd
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
post-patch:
diff --git a/multimedia/mps-youtube/Makefile b/multimedia/mps-youtube/Makefile
index 147a74854ca5..6e1c3a033786 100644
--- a/multimedia/mps-youtube/Makefile
+++ b/multimedia/mps-youtube/Makefile
@@ -13,7 +13,7 @@ COMMENT= Terminal based YouTube jukebox with playlist management
LICENSE= GPLv3
RUN_DEPENDS= ca_root_nss>=3.17.3:security/ca_root_nss \
- ${PYTHON_PKGNAMEPREFIX}pafy>=0.5.0:www/py-pafy
+ ${PYTHON_PKGNAMEPREFIX}pafy>=0.5.0:www/py-pafy@${FLAVOR}
CONVERTER_DESC= Converter to MP3 and other formats
@@ -39,16 +39,9 @@ PLIST_FILES= bin/${PORTNAME}
SUB_FILES= ${PORTNAME}
USES= python:3.3+
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils optsuffix
post-install:
${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/openshot/Makefile b/multimedia/openshot/Makefile
index 83eafebd4191..be78aa6ef678 100644
--- a/multimedia/openshot/Makefile
+++ b/multimedia/openshot/Makefile
@@ -14,11 +14,11 @@ LICENSE= GPLv3
RUN_DEPENDS= ffmpeg:multimedia/ffmpeg \
frei0r-plugins>=0:graphics/frei0r-plugins \
- ${PYTHON_PKGNAMEPREFIX}goocanvas>=0:graphics/py-goocanvas \
- ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2 \
- ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}mlt>=0:multimedia/py-mlt \
- ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg \
+ ${PYTHON_PKGNAMEPREFIX}goocanvas>=0:graphics/py-goocanvas@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mlt>=0:multimedia/py-mlt@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${FLAVOR} \
scrollkeeper-install:textproc/rarian \
sox:audio/sox
diff --git a/multimedia/photofilmstrip/Makefile b/multimedia/photofilmstrip/Makefile
index e34e1e8c3ff9..5a715ab06ccc 100644
--- a/multimedia/photofilmstrip/Makefile
+++ b/multimedia/photofilmstrip/Makefile
@@ -14,11 +14,11 @@ COMMENT= Creates movies out of your pictures
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
RUN_DEPENDS= mencoder:multimedia/mencoder \
mplayer:multimedia/mplayer
-USES= python gettext
+USES= python:2.7 gettext
USE_PYTHON= distutils autoplist
USE_WX= 3.0+
WX_COMPS= python:lib
diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile
index c0cfda4bb648..e484aad4f4c9 100644
--- a/multimedia/pitivi/Makefile
+++ b/multimedia/pitivi/Makefile
@@ -15,7 +15,7 @@ LICENSE= LGPL21+
RUN_DEPENDS= py*-zope.interface>=0:devel/py-zope.interface \
${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas
-USES= gettext gmake localbase pkgconfig python shebangfix tar:bzip2
+USES= gettext gmake localbase pkgconfig python:2.7 shebangfix tar:bzip2
SHEBANG_FILES= bin/pitivi.in
USE_GNOME= intltool pygtk2
USE_GSTREAMER= gnonlin python good
diff --git a/multimedia/plexpy/Makefile b/multimedia/plexpy/Makefile
index ff482970f82b..5456001e35fe 100644
--- a/multimedia/plexpy/Makefile
+++ b/multimedia/plexpy/Makefile
@@ -13,8 +13,8 @@ COMMENT= Monitoring, analytics, and notifications for Plex Media Server
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
USE_RC_SUBR= ${PORTNAME}
diff --git a/multimedia/py-cec/Makefile b/multimedia/py-cec/Makefile
index 0f8c14589c2d..5e2c0a0e1f28 100644
--- a/multimedia/py-cec/Makefile
+++ b/multimedia/py-cec/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libcec.so:multimedia/libcec
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index 18a821c31359..c6e8b8388224 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -16,14 +16,15 @@ COMMENT= Python bindings for gstreamer
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2@${FLAVOR}
PORTSCOUT= limit:0\.10\..*
USES= gmake libtool pathfix pkgconfig python:2 tar:bzip2
USE_GNOME= pygobject
USE_GSTREAMER= yes
+USE_PYTHON= flavors
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
PLIST_SUB= VERSION="${GST_VERSION}"
diff --git a/multimedia/py-gstreamer1/Makefile b/multimedia/py-gstreamer1/Makefile
index fcfd60225a57..5a80ef2ec3cd 100644
--- a/multimedia/py-gstreamer1/Makefile
+++ b/multimedia/py-gstreamer1/Makefile
@@ -10,15 +10,23 @@ PKGNAMESUFFIX= 1
DISTNAME= gst-python-${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
-COMMENT= GStreamer python 2 bindings
+COMMENT= GStreamer python bindings
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
PORTSCOUT= limitw:1,even
-USES= gmake libtool localbase pathfix pkgconfig python:2.7 tar:xz
+USES= gmake libtool localbase pathfix pkgconfig python tar:xz
+.if ${FLAVOR:Upy27:Mpy2*}
USE_GNOME= pygobject3
+.else
+USE_GNOME= py3gobject3
+.endif
+py34_PLIST= ${.CURDIR}/pkg-plist-py3
+py35_PLIST= ${.CURDIR}/pkg-plist-py3
+py36_PLIST= ${.CURDIR}/pkg-plist-py3
+USE_PYTHON= flavors
USE_GSTREAMER1= yes
GNU_CONFIGURE= yes
PLIST_SUB= VERSION="${GST_VERSION}"
diff --git a/multimedia/py3-gstreamer1/pkg-plist b/multimedia/py-gstreamer1/pkg-plist-py3
index 8c84c64e48dc..8c84c64e48dc 100644
--- a/multimedia/py3-gstreamer1/pkg-plist
+++ b/multimedia/py-gstreamer1/pkg-plist-py3
diff --git a/multimedia/py-guessit/Makefile b/multimedia/py-guessit/Makefile
index eea7145f1ee7..0cf865f0b5cb 100644
--- a/multimedia/py-guessit/Makefile
+++ b/multimedia/py-guessit/Makefile
@@ -12,9 +12,9 @@ COMMENT= Extract as much information as possible from a video file
LICENSE= LGPL3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}babelfish>=0.5.5:devel/py-babelfish \
- ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}rebulk>=0.9.0:devel/py-rebulk
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}babelfish>=0.5.5:devel/py-babelfish@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rebulk>=0.9.0:devel/py-rebulk@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/multimedia/py-kaa-base/Makefile b/multimedia/py-kaa-base/Makefile
index a52129f9e9d1..2d6b552bc8b9 100644
--- a/multimedia/py-kaa-base/Makefile
+++ b/multimedia/py-kaa-base/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= fbsd@opal.com
COMMENT= Kaa Media Repository
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \
- ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= python
+USES= python:2.7
USE_GNOME= glib20
USE_PYTHON= distutils autoplist
diff --git a/multimedia/py-kaa-imlib2/Makefile b/multimedia/py-kaa-imlib2/Makefile
index daa48a10ae62..baae49cd2aaa 100644
--- a/multimedia/py-kaa-imlib2/Makefile
+++ b/multimedia/py-kaa-imlib2/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= fbsd@opal.com
COMMENT= Kaa Media Repository - imlib2 wrapper for python
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/kaa/__init__.py:multimedia/py-kaa-base
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/kaa/__init__.py:multimedia/py-kaa-base@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
LIB_DEPENDS= libImlib2.so:graphics/imlib2
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/multimedia/py-kaa-metadata/Makefile b/multimedia/py-kaa-metadata/Makefile
index 8aeb711736a1..550acfefc635 100644
--- a/multimedia/py-kaa-metadata/Makefile
+++ b/multimedia/py-kaa-metadata/Makefile
@@ -12,8 +12,8 @@ MAINTAINER= fbsd@opal.com
COMMENT= Kaa Media Repository - media file metadata parser
LIB_DEPENDS= libdvdread.so:multimedia/libdvdread
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kaa-base>0:multimedia/py-kaa-base \
- ${PYTHON_PKGNAMEPREFIX}exiv2>0:graphics/py-exiv2
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kaa-base>0:multimedia/py-kaa-base@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}exiv2>0:graphics/py-exiv2@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2
diff --git a/multimedia/py-librtmp/Makefile b/multimedia/py-librtmp/Makefile
index 6bf9207e6ae1..746b2e72ecd3 100644
--- a/multimedia/py-librtmp/Makefile
+++ b/multimedia/py-librtmp/Makefile
@@ -14,8 +14,8 @@ COMMENT= Python bindings for librtmp, built with cffi
LICENSE= BSD2CLAUSE
LIB_DEPENDS= librtmp.so:multimedia/librtmp
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi@${FLAVOR}
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -26,7 +26,7 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
diff --git a/multimedia/py-mlt/Makefile b/multimedia/py-mlt/Makefile
index 99c26b5e383b..b8f66953bd91 100644
--- a/multimedia/py-mlt/Makefile
+++ b/multimedia/py-mlt/Makefile
@@ -8,6 +8,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
BUILD_DEPENDS= python:lang/python
USES= python:2
+USE_PYTHON= flavors
MASTERDIR= ${.CURDIR:H}/mlt
SLAVEPORT= swig Python
diff --git a/multimedia/py-moviepy/Makefile b/multimedia/py-moviepy/Makefile
index 7c3ebc7f8bdf..49d21e3088af 100644
--- a/multimedia/py-moviepy/Makefile
+++ b/multimedia/py-moviepy/Makefile
@@ -14,14 +14,14 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENCE.txt
RUN_DEPENDS= convert:graphics/ImageMagick \
- ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator \
- ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm \
- ${PYTHON_PKGNAMEPREFIX}imageio>0:graphics/py-imageio \
- ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy
+ ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}imageio>0:graphics/py-imageio@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/multimedia/py-openlp/Makefile b/multimedia/py-openlp/Makefile
index 7bd5cc5e5d19..d998a656f88a 100644
--- a/multimedia/py-openlp/Makefile
+++ b/multimedia/py-openlp/Makefile
@@ -12,20 +12,20 @@ COMMENT= Open Source Lyrics Projection
LICENSE= GPLv2
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip \
- ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32 \
- ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10 \
- ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet \
- ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \
- ${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.6.1:databases/py-sqlalchemy-migrate \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.6.1:databases/py-sqlalchemy-migrate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \
unoconv:textproc/unoconv
-USES= desktop-file-utils pyqt:4 python
+USES= desktop-file-utils pyqt:4 python:2.7
USE_PYQT= core gui \
network_run opengl_run phonon_run svg_run test_run webkit_run
USE_PYTHON= distutils autoplist
diff --git a/multimedia/py-periscope/Makefile b/multimedia/py-periscope/Makefile
index 2623436924af..022b213d049c 100644
--- a/multimedia/py-periscope/Makefile
+++ b/multimedia/py-periscope/Makefile
@@ -17,12 +17,12 @@ COMMENT= Subtitles searching module
LICENSE= LGPL3
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PYTHON= distutils autoplist
NO_WRKSUBDIR= yes
-USES= desktop-file-utils python
+USES= desktop-file-utils python:2.7
OPTIONS_DEFINE= UNRAR
OPTIONS_DEFAULT= UNRAR
diff --git a/multimedia/py-pretty_midi/Makefile b/multimedia/py-pretty_midi/Makefile
index c450628fde0c..7ee5ed1fe162 100644
--- a/multimedia/py-pretty_midi/Makefile
+++ b/multimedia/py-pretty_midi/Makefile
@@ -12,8 +12,8 @@ COMMENT= Utility functions for handling MIDI data in a nice/intuitive way
LICENSE= MIT
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}mido>=1.1.16:multimedia/py-mido \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+ ${PYTHON_PKGNAMEPREFIX}mido>=1.1.16:multimedia/py-mido@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/multimedia/py-qt4-multimedia/Makefile b/multimedia/py-qt4-multimedia/Makefile
index ce2dc0ae7114..a4eaad076793 100644
--- a/multimedia/py-qt4-multimedia/Makefile
+++ b/multimedia/py-qt4-multimedia/Makefile
@@ -12,6 +12,7 @@ PYQT_DIST= yes
USES= python pyqt:4
USE_PYQT= sip_build core_run gui_run
+USE_PYTHON= flavors
USE_QT4= corelib gui multimedia moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/multimedia/py-qt4-phonon/Makefile b/multimedia/py-qt4-phonon/Makefile
index 2b729f666f61..e5cb96056726 100644
--- a/multimedia/py-qt4-phonon/Makefile
+++ b/multimedia/py-qt4-phonon/Makefile
@@ -11,6 +11,7 @@ PYQT_DIST= yes
USES= python pyqt:4
USE_PYQT= sip_build core_run gui_run
+USE_PYTHON= flavors
USE_QT4= corelib gui phonon moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/multimedia/py-qt5-multimedia/Makefile b/multimedia/py-qt5-multimedia/Makefile
index 1f75979d133e..11fa656dd2aa 100644
--- a/multimedia/py-qt5-multimedia/Makefile
+++ b/multimedia/py-qt5-multimedia/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
USES= python pyqt:5
USE_GL= gl
USE_PYQT= sip_build core_run gui_run network_run
+USE_PYTHON= flavors
USE_QT5= core gui multimedia network qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/multimedia/py-qt5-multimediawidgets/Makefile b/multimedia/py-qt5-multimediawidgets/Makefile
index 1338b5c4d123..24f22e76645b 100644
--- a/multimedia/py-qt5-multimediawidgets/Makefile
+++ b/multimedia/py-qt5-multimediawidgets/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
USES= python pyqt:5
USE_GL= gl
USE_PYQT= sip_build core_run multimedia_run widgets_run
+USE_PYTHON= flavors
USE_QT5= core gui multimedia network widgets qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/multimedia/py-soco/Makefile b/multimedia/py-soco/Makefile
index e56255d392ee..79322b8a5072 100644
--- a/multimedia/py-soco/Makefile
+++ b/multimedia/py-soco/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python library to control Sonos speakers
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.rst
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= SoCo
diff --git a/multimedia/py-subliminal/Makefile b/multimedia/py-subliminal/Makefile
index 1e9aed30ecfc..4a83a7d8530e 100644
--- a/multimedia/py-subliminal/Makefile
+++ b/multimedia/py-subliminal/Makefile
@@ -12,22 +12,22 @@ COMMENT= Python library to search and download subtitles
LICENSE= LGPL3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.4.0:www/py-beautifulsoup \
- ${PYTHON_PKGNAMEPREFIX}enzyme>=0.4.1:multimedia/py-enzyme \
- ${PYTHON_PKGNAMEPREFIX}guessit>=2.1.0:multimedia/py-guessit \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}click>=4.0:devel/py-click \
- ${PYTHON_PKGNAMEPREFIX}stevedore>=1.0.0:devel/py-stevedore \
- ${PYTHON_PKGNAMEPREFIX}chardet>=2.3.0:textproc/py-chardet \
- ${PYTHON_PKGNAMEPREFIX}pysrt>=1.0.1:textproc/py-pysrt \
- ${PYTHON_PKGNAMEPREFIX}babelfish>=0.5.2:devel/py-babelfish \
- ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.0:devel/py-dogpile.cache \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3:devel/py-appdirs \
- ${PYTHON_PKGNAMEPREFIX}rarfile>=2.7:archivers/py-rarfile \
- ${PYTHON_PKGNAMEPREFIX}pytz>=2012c:devel/py-pytz
-
-USES= python:2.7+
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.4.0:www/py-beautifulsoup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}enzyme>=0.4.1:multimedia/py-enzyme@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}guessit>=2.1.0:multimedia/py-guessit@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>=4.0:devel/py-click@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.0.0:devel/py-stevedore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}chardet>=2.3.0:textproc/py-chardet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pysrt>=1.0.1:textproc/py-pysrt@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}babelfish>=0.5.2:devel/py-babelfish@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.0:devel/py-dogpile.cache@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3:devel/py-appdirs@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rarfile>=2.7:archivers/py-rarfile@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2012c:devel/py-pytz@${FLAVOR}
+
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
@@ -35,7 +35,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3200
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/multimedia/py-tvnamer/Makefile b/multimedia/py-tvnamer/Makefile
index a9d35593e5c8..481299c66cdc 100644
--- a/multimedia/py-tvnamer/Makefile
+++ b/multimedia/py-tvnamer/Makefile
@@ -12,10 +12,10 @@ COMMENT= Automatically names downloaded/recorded TV-episode
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tvdb_api>=1.5:www/py-tvdb_api
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tvdb_api>=1.5:www/py-tvdb_api
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tvdb_api>=1.5:www/py-tvdb_api@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tvdb_api>=1.5:www/py-tvdb_api@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/multimedia/py3-gstreamer1/Makefile b/multimedia/py3-gstreamer1/Makefile
deleted file mode 100644
index e3fc6953afa9..000000000000
--- a/multimedia/py3-gstreamer1/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Created by: Koop Mast <kwm@rainbow-runner.nl>
-# $FreeBSD$
-
-PORTNAME= gstreamer
-PORTVERSION= 1.12.3
-CATEGORIES= multimedia python
-MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX= 1
-DISTNAME= gst-python-${PORTVERSION}
-
-MAINTAINER= multimedia@FreeBSD.org
-COMMENT= GStreamer python 3 bindings
-
-LICENSE= LGPL21
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-PORTSCOUT= limitw:1,even
-
-USES= gmake libtool localbase pathfix pkgconfig python:3.6+ tar:xz
-USE_GNOME= py3gobject3
-USE_GSTREAMER1= yes
-GNU_CONFIGURE= yes
-PLIST_SUB= VERSION="${GST_VERSION}"
-INSTALL_TARGET= install-strip
-
-.include <bsd.port.mk>
diff --git a/multimedia/py3-gstreamer1/distinfo b/multimedia/py3-gstreamer1/distinfo
deleted file mode 100644
index 541a693bd38b..000000000000
--- a/multimedia/py3-gstreamer1/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1506168993
-SHA256 (gst-python-1.12.3.tar.xz) = c3f529dec1294633132690806703b80bad5752eff482eaf81f209c2aba012ba7
-SIZE (gst-python-1.12.3.tar.xz) = 388220
diff --git a/multimedia/py3-gstreamer1/pkg-descr b/multimedia/py3-gstreamer1/pkg-descr
deleted file mode 100644
index b88c3a7b068e..000000000000
--- a/multimedia/py3-gstreamer1/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-gst-python provides a convenient wrapper for the GStreamer library for
-use in Python programs, and takes care of many of the boring details
-such as managing memory and type casting.
-
-WWW: http://gstreamer.freedesktop.org/
diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile
index a28bdbcba040..980766a094dd 100644
--- a/multimedia/quodlibet/Makefile
+++ b/multimedia/quodlibet/Makefile
@@ -13,16 +13,16 @@ COMMENT= GTK+-based audio player written in Python
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs \
- ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${FLAVOR} \
${LOCALBASE}/libexec/notification-daemon:deskutils/notification-daemon
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
libwebkit2gtk-4.0.so:www/webkit2-gtk3
USE_PYTHON= distutils autoplist
USE_GNOME= gtk30 intltool pygobject3
-USES= desktop-file-utils display gettext python
+USES= desktop-file-utils display gettext python:2.7
PYDISTUTILS_INSTALLNOSINGLE= yes
USE_GSTREAMER1= good
@@ -49,10 +49,10 @@ WAVPACK_USE= GSTREAMER1=wavpack
AAC_LIB_DEPENDS= libmp4v2.so:multimedia/mp4v2
AAC_USE= GSTREAMER1=faad
-DBUS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus
-DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus
+DBUS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${FLAVOR}
+DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${FLAVOR}
-REMOTE_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser
-REMOTE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser
+REMOTE_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser@${FLAVOR}
+REMOTE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser@${FLAVOR}
.include <bsd.port.mk>
diff --git a/multimedia/syncplay/Makefile b/multimedia/syncplay/Makefile
index 8ca2047fb180..1b03b74f6473 100644
--- a/multimedia/syncplay/Makefile
+++ b/multimedia/syncplay/Makefile
@@ -10,7 +10,7 @@ COMMENT= Synchronize video playback over networks
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
USES= desktop-file-utils gmake python:2.7
USE_GITHUB= yes
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 11a5d457699f..134e9f1c1051 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= libgdata.so:devel/libgdata \
libtotem-plparser.so:multimedia/totem-pl-parser
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \
- ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas \
+ ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} \
gnome-settings-daemon>=2.91.0:sysutils/gnome-settings-daemon \
gnome-icon-theme-symbolic>=2.91.0:x11-themes/gnome-icon-theme-symbolic \
grilo-plugins2>=0:net/grilo-plugins2
diff --git a/multimedia/tovid/Makefile b/multimedia/tovid/Makefile
index 9dc0c759a7d0..2f5cba37f891 100644
--- a/multimedia/tovid/Makefile
+++ b/multimedia/tovid/Makefile
@@ -24,10 +24,10 @@ RUN_DEPENDS= mplayer:multimedia/mplayer \
normalize:audio/normalize \
lame:audio/lame \
gnubc>0:math/gnubc \
- ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \
+ ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} \
bash:shells/bash
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
USE_GITHUB= yes
GH_ACCOUNT= tovid-suite
diff --git a/multimedia/vapoursynth/Makefile b/multimedia/vapoursynth/Makefile
index b9b96f530617..9c221e843a82 100644
--- a/multimedia/vapoursynth/Makefile
+++ b/multimedia/vapoursynth/Makefile
@@ -64,8 +64,9 @@ CORE_LIB_DEPENDS= libzimg.so:graphics/sekrit-twc-zimg
CORE_USES= compiler:c++11-lib
CORE_CONFIGURE_ENABLE= core
-PYTHON_USES= python:3.3-
-PYTHON_BUILD_DEPENDS= cython:lang/cython
+PYTHON_USES= python:3.3+
+PYTHON_USE= python=cython
+PYTHON_VARS= BINARY_ALIAS=cython=cython-${PYTHON_VER}
PYTHON_CONFIGURE_ENABLE= python-module
PYTHON_IMPLIES= CORE
diff --git a/net-im/cjc/Makefile b/net-im/cjc/Makefile
index d49ceda29441..580524358718 100644
--- a/net-im/cjc/Makefile
+++ b/net-im/cjc/Makefile
@@ -12,7 +12,7 @@ COMMENT= Console Jabber Client
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyxmpp>=0:net-im/py-pyxmpp
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyxmpp>=0:net-im/py-pyxmpp@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= Jajcus
diff --git a/net-im/fugu/Makefile b/net-im/fugu/Makefile
index 71aa27cf0a72..9e02b9ad2ebf 100644
--- a/net-im/fugu/Makefile
+++ b/net-im/fugu/Makefile
@@ -12,9 +12,9 @@ COMMENT= Graphical client for the Gale instant messaging system
LICENSE= GPLv2
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw@${FLAVOR}
-USES= python ssl
+USES= python:2.7 ssl
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index 5fdcd044aa66..b6ba5342f29c 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -12,11 +12,11 @@ COMMENT= Jabber client based on a plugin system
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1 \
- ${PYTHON_PKGNAMEPREFIX}nbxmpp>0:net-im/py-nbxmpp \
- ${PYTHON_PKGNAMEPREFIX}python-gnupg>0:security/py-python-gnupg
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nbxmpp>0:net-im/py-nbxmpp@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-gnupg>0:security/py-python-gnupg@${PY_FLAVOR}
NO_ARCH= yes
USES= cpe dos2unix gmake localbase pathfix python:2.7 tar:bzip2
@@ -36,9 +36,9 @@ CRYPTO_DESC= End to end encryption support
GUPNP_DESC= UPnP IGD protocol support
SPELL_DESC= Spell checking support
-AVAHI_RUN_DEPENDS= avahi-discover:net/py-avahi
-CRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
-DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:devel/py-dbus
+AVAHI_RUN_DEPENDS= avahi-discover:net/py-avahi@${PY_FLAVOR}
+CRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR}
+DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:devel/py-dbus@${PY_FLAVOR}
GUPNP_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gupnp/__init__.py:net/gupnp-igd
NLS_USES= gettext
SPELL_LIB_DEPENDS= libgtkspell.so:textproc/gtkspell
diff --git a/net-im/hotot/Makefile b/net-im/hotot/Makefile
index 73a2fa6cea62..492886722b13 100644
--- a/net-im/hotot/Makefile
+++ b/net-im/hotot/Makefile
@@ -15,7 +15,7 @@ USE_GITHUB= yes
GH_ACCOUNT= lyricat
GH_PROJECT= Hotot
-USES= cmake gettext kde:4 python
+USES= cmake gettext kde:4 python:2.7
USE_GNOME= intltool
INSTALLS_ICONS= yes
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index db3e460b634d..053c0bcdd952 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -26,7 +26,7 @@ INSTALL_TARGET= install-strip
.if !defined(PIDGIN_SLAVE)
# Pidgin slave ports that require the following functionality, must explicitly
# set these macros themselves.
-USES+= iconv python shebangfix
+USES+= iconv python:2.7 shebangfix
USE_LDCONFIG= yes
SHEBANG_FILES= libpurple/purple-remote \
libpurple/purple-url-handler
diff --git a/net-im/papyon/Makefile b/net-im/papyon/Makefile
index 5a6e225c4372..d3f28c0ceb8e 100644
--- a/net-im/papyon/Makefile
+++ b/net-im/papyon/Makefile
@@ -11,24 +11,19 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Fork of pymsn to support the telepathy MSN connection manager
-BUILD_DEPENDS= py*-openssl>0:security/py-openssl \
- ${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto \
- ${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:multimedia/py-gstreamer \
+BUILD_DEPENDS= py*-openssl>0:security/py-openssl@${FLAVOR} \
+ ${PY_ENUM34} \
+ ${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto@${FLAVOR} \
+ ${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:multimedia/py-gstreamer@${FLAVOR} \
${PYTHON_SITELIBDIR}/farsight.so:net-im/farsight2
-RUN_DEPENDS= py*-openssl>0:security/py-openssl \
- ${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto \
- ${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:multimedia/py-gstreamer \
+RUN_DEPENDS= py*-openssl>0:security/py-openssl@${FLAVOR} \
+ ${PY_ENUM34} \
+ ${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto@${FLAVOR} \
+ ${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:multimedia/py-gstreamer@${FLAVOR} \
${PYTHON_SITELIBDIR}/farsight.so:net-im/farsight2
USE_GNOME= pygobject
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3400
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/pebrot/Makefile b/net-im/pebrot/Makefile
index 03f46f268dbd..667bbbd0c8c7 100644
--- a/net-im/pebrot/Makefile
+++ b/net-im/pebrot/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= kevlo@FreeBSD.org
COMMENT= Text-based MSN messenger client
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net-im/poezio/Makefile b/net-im/poezio/Makefile
index ab224cf43c0f..499534b2e07d 100644
--- a/net-im/poezio/Makefile
+++ b/net-im/poezio/Makefile
@@ -12,17 +12,10 @@ COMMENT= Console XMPP client
LICENSE= ZLIB
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython \
- ${PYTHON_SITELIBDIR}/sleekxmpp/__init__.py:net-im/py-sleekxmpp
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/sleekxmpp/__init__.py:net-im/py-sleekxmpp@${FLAVOR}
USES= tar:xz python:3.3+
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist optsuffix
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/proxy65/Makefile b/net-im/proxy65/Makefile
index e5bbe7936b68..31f7342e78b9 100644
--- a/net-im/proxy65/Makefile
+++ b/net-im/proxy65/Makefile
@@ -10,9 +10,9 @@ COMMENT= XEP-0065 SOCKS5 Bytestreams external component for Jabber
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= mmatuska
diff --git a/net-im/py-fbmq/Makefile b/net-im/py-fbmq/Makefile
index ebf6033d29f7..8779358e5f30 100644
--- a/net-im/py-fbmq/Makefile
+++ b/net-im/py-fbmq/Makefile
@@ -11,8 +11,8 @@ COMMENT= Python library for using the Facebook Messenger API
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/net-im/py-jabber/Makefile b/net-im/py-jabber/Makefile
index 9ed2db7a87f8..4bbc8931eabc 100644
--- a/net-im/py-jabber/Makefile
+++ b/net-im/py-jabber/Makefile
@@ -11,7 +11,7 @@ DISTNAME= jabberpy-${PORTVERSION}-0
MAINTAINER= flz@FreeBSD.org
COMMENT= Python Jabber library
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
PLIST_FILES= ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/jabber.pth
diff --git a/net-im/py-jabberbot/Makefile b/net-im/py-jabberbot/Makefile
index 4aa289851958..bce5c6a108d4 100644
--- a/net-im/py-jabberbot/Makefile
+++ b/net-im/py-jabberbot/Makefile
@@ -12,7 +12,7 @@ COMMENT= Simple Jabber Bot for Python
LICENSE= GPLv3
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xmpppy>0:net-im/py-xmpppy
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xmpppy>0:net-im/py-xmpppy@${FLAVOR}
USES= python:2
USE_PYTHON= distutils autoplist
diff --git a/net-im/py-libturpial/Makefile b/net-im/py-libturpial/Makefile
index 8654f5559a69..c1f9079fc1de 100644
--- a/net-im/py-libturpial/Makefile
+++ b/net-im/py-libturpial/Makefile
@@ -13,9 +13,9 @@ COMMENT= Twitter API
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.4.0:devel/py-simplejson \
- ${PYTHON_PKGNAMEPREFIX}oauth>=1.0.1:net/py-oauth \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.2.0:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.4.0:devel/py-simplejson@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauth>=1.0.1:net/py-oauth@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.2.0:www/py-requests@${FLAVOR}
USES= python:2
USE_PYTHON= distutils autoplist
diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile
index 048edcfff9d0..76d2f1ffc1c1 100644
--- a/net-im/py-matrix-synapse/Makefile
+++ b/net-im/py-matrix-synapse/Makefile
@@ -15,39 +15,39 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
# Keep the RUN_DEPENDS layout similar to the master/synapse/python_dependencies.py file
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema \
- ${PYTHON_PKGNAMEPREFIX}frozendict>=0.5:devel/py-frozendict \
- ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.1.0:devel/py-unpaddedbase64 \
- ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson \
- ${PYTHON_PKGNAMEPREFIX}signedjson>=1.0.0:security/py-signedjson \
- ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl \
- ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0:security/py-service_identity \
- ${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted \
- ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1 \
- ${PYTHON_PKGNAMEPREFIX}daemonize>=2.4.2:devel/py-daemonize \
- ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.4:security/py-bcrypt \
- ${PYTHON_PKGNAMEPREFIX}pillow>=3.1.1:graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}pydenticon>=0.2:devel/py-pydenticon \
- ${PYTHON_PKGNAMEPREFIX}ujson>=1.35:devel/py-ujson \
- ${PYTHON_PKGNAMEPREFIX}blist>=1.3.6:devel/py-blist \
- ${PYTHON_PKGNAMEPREFIX}pysaml2>=4.0.2:security/py-pysaml2 \
- ${PYTHON_PKGNAMEPREFIX}pymacaroons-pynacl>=0.9.3:security/py-pymacaroons-pynacl \
- ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3.0:devel/py-msgpack-python \
- ${PYTHON_PKGNAMEPREFIX}phonenumbers>=8.2.0:devel/py-phonenumbers
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}frozendict>=0.5:devel/py-frozendict@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.1.0:devel/py-unpaddedbase64@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}signedjson>=1.0.0:security/py-signedjson@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0:security/py-service_identity@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}daemonize>=2.4.2:devel/py-daemonize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.4:security/py-bcrypt@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=3.1.1:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pydenticon>=0.2:devel/py-pydenticon@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ujson>=1.35:devel/py-ujson@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}blist>=1.3.6:devel/py-blist@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pysaml2>=4.0.2:security/py-pysaml2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pymacaroons-pynacl>=0.9.3:security/py-pymacaroons-pynacl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3.0:devel/py-msgpack-python@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}phonenumbers>=8.2.0:devel/py-phonenumbers@${FLAVOR}
# Conditional requirements that aren't so conditional
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}matrix-angular-sdk>=0.6.6:devel/py-matrix-angular-sdk \
- ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \
- ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}matrix-angular-sdk>=0.6.6:devel/py-matrix-angular-sdk@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR}
# Dependencies that aren't declared in python_dependencies.py which I have discovered
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.10.0:devel/py-simplejson \
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.10.0:devel/py-simplejson@${FLAVOR} \
${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv \
- ${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${FLAVOR}
USES= python
USE_GITHUB= yes
@@ -76,11 +76,11 @@ NO_ARCH= yes
OPTIONS_DEFINE= EMAIL LDAP PGSQL SQLITE
OPTIONS_DEFAULT= SQLITE
EMAIL_DESC= Email notifications for missed messages
-EMAIL_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}bleach>=1.4.2:www/py-bleach
-LDAP_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}matrix-synapse-ldap3>=0.1:net/py-matrix-synapse-ldap3
-PGSQL_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
-SQLITE_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+EMAIL_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bleach>=1.4.2:www/py-bleach@${FLAVOR}
+LDAP_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}matrix-synapse-ldap3>=0.1:net/py-matrix-synapse-ldap3@${FLAVOR}
+PGSQL_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
+SQLITE_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
.include <bsd.port.options.mk>
diff --git a/net-im/py-nbxmpp/Makefile b/net-im/py-nbxmpp/Makefile
index abf9ec08974d..9ef8c6817350 100644
--- a/net-im/py-nbxmpp/Makefile
+++ b/net-im/py-nbxmpp/Makefile
@@ -12,7 +12,7 @@ COMMENT= Non blocking Jabber/XMPP module
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR}
NO_ARCH= yes
USES= python:2.7+
diff --git a/net-im/py-punjab/Makefile b/net-im/py-punjab/Makefile
index 9911f1bf8514..5385c6cca882 100644
--- a/net-im/py-punjab/Makefile
+++ b/net-im/py-punjab/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= HTTP XMPP client interface
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/net-im/py-python-telegram-bot/Makefile b/net-im/py-python-telegram-bot/Makefile
index 258abc2b0034..3bf7eb5bdf42 100644
--- a/net-im/py-python-telegram-bot/Makefile
+++ b/net-im/py-python-telegram-bot/Makefile
@@ -12,8 +12,8 @@ COMMENT= Not just a Python wrapper around the Telegram Bot API
LICENSE= LGPL3
-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
@@ -22,8 +22,8 @@ USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3400
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/net-im/py-pyxmpp/Makefile b/net-im/py-pyxmpp/Makefile
index 202786462d43..8ccb771b302b 100644
--- a/net-im/py-pyxmpp/Makefile
+++ b/net-im/py-pyxmpp/Makefile
@@ -14,9 +14,9 @@ COMMENT= Python XMPP library
LICENSE= LGPL21 # only
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython \
- ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.18.2:security/py-m2crypto \
- ${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.18.2:security/py-m2crypto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/${DISTNAME}
@@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
USE_GITHUB= yes
GH_ACCOUNT= Jajcus
-USES= python shebangfix
+USES= python:2.7 shebangfix
SHEBANG_FILES= auxtools/*.py examples/*.py tests/*.py utils/*.py
USE_PYTHON= distutils autoplist
diff --git a/net-im/py-slackclient/Makefile b/net-im/py-slackclient/Makefile
index ab3fdc17bc67..ff9ae77461c8 100644
--- a/net-im/py-slackclient/Makefile
+++ b/net-im/py-slackclient/Makefile
@@ -11,10 +11,10 @@ COMMENT= Python client for Slack.com
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${FLAVOR}
USES= python:-2.7
USE_GITHUB= yes
diff --git a/net-im/py-telepot/Makefile b/net-im/py-telepot/Makefile
index 399f78fd3591..8a606d6330c5 100644
--- a/net-im/py-telepot/Makefile
+++ b/net-im/py-telepot/Makefile
@@ -11,7 +11,7 @@ COMMENT= Python framework for Telegram Bot API
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${FLAVOR}
NO_ARCH= yes
USES= python zip
diff --git a/net-im/py-unmessage/Makefile b/net-im/py-unmessage/Makefile
index 0bf946631c6b..da9eefed6f67 100644
--- a/net-im/py-unmessage/Makefile
+++ b/net-im/py-unmessage/Makefile
@@ -14,13 +14,13 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= tor:security/tor \
- ${PYTHON_PKGNAMEPREFIX}opuslib>=1.1.0:audio/py-opuslib \
- ${PYTHON_PKGNAMEPREFIX}pyaudio>=0.2.10:audio/py-pyaudio \
- ${PYTHON_PKGNAMEPREFIX}pyaxo>=0.7.3:security/py-pyaxo \
- ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl \
- ${PYTHON_PKGNAMEPREFIX}pyperclip>=1.5.27:devel/py-pyperclip \
- ${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted \
- ${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.0:security/py-txtorcon
+ ${PYTHON_PKGNAMEPREFIX}opuslib>=1.1.0:audio/py-opuslib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyaudio>=0.2.10:audio/py-pyaudio@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyaxo>=0.7.3:security/py-pyaxo@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyperclip>=1.5.27:devel/py-pyperclip@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.0:security/py-txtorcon@${FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/net-im/py-xmpppy-irc/Makefile b/net-im/py-xmpppy-irc/Makefile
index 002c36a12a73..a524559e20f8 100644
--- a/net-im/py-xmpppy-irc/Makefile
+++ b/net-im/py-xmpppy-irc/Makefile
@@ -14,10 +14,11 @@ COMMENT= Xmpp to irc transport
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xmpp/__init__.py:net-im/py-xmpppy \
- ${PYTHON_PKGNAMEPREFIX}irc>0:irc/py-irc
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xmpp/__init__.py:net-im/py-xmpppy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}irc>0:irc/py-irc@${FLAVOR}
-USES= python
+USES= python:2.7
+USE_PYTHON= flavors
NO_BUILD= yes
NO_ARCH= yes
FILES= irc.py jep0106.py jep0133.py test_jep0106.py
diff --git a/net-im/py-xmpppy-yahoo/Makefile b/net-im/py-xmpppy-yahoo/Makefile
index 51027c5fb799..56d5d74eaa72 100644
--- a/net-im/py-xmpppy-yahoo/Makefile
+++ b/net-im/py-xmpppy-yahoo/Makefile
@@ -18,7 +18,7 @@ EJABBERD_DESC= transport with ejabberd
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xmpp/__init__.py:net-im/py-xmpppy \
${PYTHON_SITELIBDIR}/DNS/__init__.py:dns/py-dns
-USES= python
+USES= python:2.7
NO_BUILD= yes
FILES= adhoc.py config.py jep0133.py roomlist.py xmlconfig.py \
yahoo_helpers.py avatar.py htmlutils.py migratespool.py toolbox.py \
diff --git a/net-im/py-xmpppy/Makefile b/net-im/py-xmpppy/Makefile
index f39e8001eeb9..851d57e605a9 100644
--- a/net-im/py-xmpppy/Makefile
+++ b/net-im/py-xmpppy/Makefile
@@ -12,9 +12,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}rc1
MAINTAINER= vg@FreeBSD.org
COMMENT= Python library that provides easy scripting with Jabber
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.7.1:dns/py-dnspython
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.7.1:dns/py-dnspython@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
post-patch:
diff --git a/net-im/turpial/Makefile b/net-im/turpial/Makefile
index d43caa3dc3d0..5dabdce36ccc 100644
--- a/net-im/turpial/Makefile
+++ b/net-im/turpial/Makefile
@@ -12,11 +12,11 @@ COMMENT= Twitter client written in Python
LICENSE= GPLv3
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify \
- ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.7:devel/py-setproctitle \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}libturpial>=1.7.0:net-im/py-libturpial
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.7:devel/py-setproctitle@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}libturpial>=1.7.0:net-im/py-libturpial@${FLAVOR}
USES= pyqt:4 python:2
USE_PYQT= core_run gui_run network_run phonon_run webkit_run
diff --git a/net-mgmt/2ping/Makefile b/net-mgmt/2ping/Makefile
index b1bf0e92423d..71ff48653f9a 100644
--- a/net-mgmt/2ping/Makefile
+++ b/net-mgmt/2ping/Makefile
@@ -13,7 +13,7 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
NO_ARCH= yes
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils optsuffix
USES= python:3.4+
.include <bsd.port.mk>
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index 85add0b92874..f16c92cd44f0 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -298,6 +298,7 @@
SUBDIR += prometheus
SUBDIR += pushgateway
SUBDIR += py-adal
+ SUBDIR += py-dnsdiag
SUBDIR += py-ipcalc
SUBDIR += py-ipy
SUBDIR += py-msrest
@@ -312,7 +313,6 @@
SUBDIR += py-snmp4-mibs
SUBDIR += py-snmp_passpersist
SUBDIR += py-yapsnmp
- SUBDIR += py3-dnsdiag
SUBDIR += qkismet
SUBDIR += rackmonkey
SUBDIR += rancid3
diff --git a/net-mgmt/crmsh/Makefile b/net-mgmt/crmsh/Makefile
index 49f16539773f..3248b69a5286 100644
--- a/net-mgmt/crmsh/Makefile
+++ b/net-mgmt/crmsh/Makefile
@@ -13,15 +13,16 @@ LICENSE_FILE= ${WRKSRC}/COPYING
# Set the build/run depends on setuptools instead of adding distutils to USE_PYTHON
# because the crmsh build uses autotools which then calls setup.py.
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= ClusterLabs
USES= autoreconf gmake python:2 shebangfix
+USE_PYTHON= flavors
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-ocf-root=${PREFIX}/lib/ocf
NO_ARCH= yes
diff --git a/net-mgmt/flowd/Makefile b/net-mgmt/flowd/Makefile
index 9e045454b551..688dd7dfc1c5 100644
--- a/net-mgmt/flowd/Makefile
+++ b/net-mgmt/flowd/Makefile
@@ -34,7 +34,7 @@ USE_PERL5+= build run
.endif
.if ${PORT_OPTIONS:MPYTHON}
-USES+= python
+USES+= python:2.7
PLIST_SUB+= PYTHON_VER=${PYTHON_VER}
.endif
diff --git a/net-mgmt/nagstamon/Makefile b/net-mgmt/nagstamon/Makefile
index 8db697e0b43a..8eea9b4e6142 100644
--- a/net-mgmt/nagstamon/Makefile
+++ b/net-mgmt/nagstamon/Makefile
@@ -15,7 +15,7 @@ COMMENT= Nagios status monitor for your desktop
LICENSE= GPLv2
RUN_DEPENDS= sox:audio/sox \
- ${PYTHON_PKGNAMEPREFIX}keyring>=1.3:security/py-keyring
+ ${PYTHON_PKGNAMEPREFIX}keyring>=1.3:security/py-keyring@${FLAVOR}
USES= cpe python:2
CPE_VENDOR= henri_wahl
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index aa120c40e13d..1bf28d2cf01c 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -76,8 +76,8 @@ TLS_CONFIGURE_ON= --with-security-modules=tsm --with-transports=TLSTCP,DTLSUDP
PYDISTUTILS_PKGNAME?= netsnmp-python
PYDISTUTILS_PKGVERSION?= 1.0a1
USES+= python
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools
CONFIGURE_ARGS+=--with-python-modules
CONFIGURE_ENV+= PYTHONPROG="${PYTHON_CMD}"
MAKE_ENV+= PYDISTUTILS_INSTALLARGS="${PYDISTUTILS_INSTALLARGS}" STAGEDIR="${STAGEDIR}"
diff --git a/net-mgmt/onionlauncher/Makefile b/net-mgmt/onionlauncher/Makefile
index d7561f57233a..6577e86fac64 100644
--- a/net-mgmt/onionlauncher/Makefile
+++ b/net-mgmt/onionlauncher/Makefile
@@ -11,14 +11,14 @@ COMMENT= Launcher for Tor
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=0.18:security/py-stem \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=0.18:security/py-stem@${FLAVOR} \
tor:security/tor
USE_GITHUB= yes
GH_ACCOUNT= neelchauhan
GH_PROJECT= OnionLauncher
-USES= pyqt:5 python
+USES= pyqt:5 python:2.7
USE_PYTHON= autoplist distutils
USE_PYQT= core_run gui_run widgets_run
diff --git a/net-mgmt/py-adal/Makefile b/net-mgmt/py-adal/Makefile
index 94bd6ebc6c2b..426b17dfbdf3 100644
--- a/net-mgmt/py-adal/Makefile
+++ b/net-mgmt/py-adal/Makefile
@@ -12,10 +12,10 @@ COMMENT= Authentication ot Azure Active Directory for python apps
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net-mgmt/py3-dnsdiag/Makefile b/net-mgmt/py-dnsdiag/Makefile
index 128466089e1f..228d0c3e22bd 100644
--- a/net-mgmt/py3-dnsdiag/Makefile
+++ b/net-mgmt/py-dnsdiag/Makefile
@@ -12,17 +12,10 @@ COMMENT= DNS Diagnostics and measurement tools (ping, traceroute)
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython \
- ${PYTHON_PKGNAMEPREFIX}cymruwhois>=1.6:net/py-cymruwhois
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cymruwhois>=1.6:net/py-cymruwhois@${FLAVOR}
USES= python:3.3+
USE_PYTHON= autoplist distutils
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/py3-dnsdiag/distinfo b/net-mgmt/py-dnsdiag/distinfo
index 1567f90d7968..1567f90d7968 100644
--- a/net-mgmt/py3-dnsdiag/distinfo
+++ b/net-mgmt/py-dnsdiag/distinfo
diff --git a/net-mgmt/py3-dnsdiag/pkg-descr b/net-mgmt/py-dnsdiag/pkg-descr
index d5a60c2101f0..d5a60c2101f0 100644
--- a/net-mgmt/py3-dnsdiag/pkg-descr
+++ b/net-mgmt/py-dnsdiag/pkg-descr
diff --git a/net-mgmt/py-ipcalc/Makefile b/net-mgmt/py-ipcalc/Makefile
index d4440121747d..d11bf7e6b45f 100644
--- a/net-mgmt/py-ipcalc/Makefile
+++ b/net-mgmt/py-ipcalc/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Module to perform IP subnet calculations
USES= python
-USE_PYTHON= distutils
+USE_PYTHON= distutils autoplist
NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/net-mgmt/py-ipcalc/pkg-plist b/net-mgmt/py-ipcalc/pkg-plist
deleted file mode 100644
index 6b5618f5aa70..000000000000
--- a/net-mgmt/py-ipcalc/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PYTHON_SITELIBDIR%%/ipcalc.pyo
-%%PYTHON_SITELIBDIR%%/ipcalc.pyc
-%%PYTHON_SITELIBDIR%%/ipcalc.py
diff --git a/net-mgmt/py-msrest/Makefile b/net-mgmt/py-msrest/Makefile
index 4fcabda91c0f..1b09a866d0b0 100644
--- a/net-mgmt/py-msrest/Makefile
+++ b/net-mgmt/py-msrest/Makefile
@@ -12,10 +12,10 @@ COMMENT= AutoRest swagger generator Python client runtime
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi \
- ${PYTHON_PKGNAMEPREFIX}isodate>=0.5.4:devel/py-isodate \
- ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>0:www/py-requests-oauthlib \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}isodate>=0.5.4:devel/py-isodate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>0:www/py-requests-oauthlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
@@ -23,7 +23,7 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
diff --git a/net-mgmt/py-msrestazure/Makefile b/net-mgmt/py-msrestazure/Makefile
index 998ccc8724b6..ee55757b7579 100644
--- a/net-mgmt/py-msrestazure/Makefile
+++ b/net-mgmt/py-msrestazure/Makefile
@@ -12,9 +12,9 @@ COMMENT= Azure-specific AutoRest swagger generator Python client runtime
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring \
- ${PYTHON_PKGNAMEPREFIX}msrest>0:net-mgmt/py-msrest \
- ${PYTHON_PKGNAMEPREFIX}adal>0:net-mgmt/py-adal
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msrest>0:net-mgmt/py-msrest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}adal>0:net-mgmt/py-adal@${FLAVOR}
USES= python zip
USE_PYTHON= autoplist distutils
diff --git a/net-mgmt/py-pynsca/Makefile b/net-mgmt/py-pynsca/Makefile
index 2e027b838126..a7f9bf571c48 100644
--- a/net-mgmt/py-pynsca/Makefile
+++ b/net-mgmt/py-pynsca/Makefile
@@ -14,15 +14,15 @@ LICENSE= MPL11
OPTIONS_DEFINE= AES 3DES
AES_DESC= Provide AES encryption
-AES_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}mcrypt>=0:security/py-mcrypt
+AES_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}mcrypt>=0:security/py-mcrypt@${FLAVOR}
3DES_DESC= Provide 3DES encryption
-3DES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto
+3DES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR}
OPTIONS_DEFAULT=AES 3DES
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils concurrent
.include <bsd.port.mk>
diff --git a/net-mgmt/py-pysmi/Makefile b/net-mgmt/py-pysmi/Makefile
index ee877c27a004..ccacfd33c5a3 100644
--- a/net-mgmt/py-pysmi/Makefile
+++ b/net-mgmt/py-pysmi/Makefile
@@ -13,7 +13,7 @@ COMMENT= SNMP/SMI MIB parsing in Python
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${FLAVOR}
NO_ARCH= yes
USES= python shebangfix
diff --git a/net-mgmt/py-pyzabbix/Makefile b/net-mgmt/py-pyzabbix/Makefile
index 39a09b572450..1f087ab927ca 100644
--- a/net-mgmt/py-pyzabbix/Makefile
+++ b/net-mgmt/py-pyzabbix/Makefile
@@ -12,7 +12,7 @@ COMMENT= Zabbix API Python Library
LICENSE= LGPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.0:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.0:www/py-requests@${FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/net-mgmt/py-snmp4-apps/Makefile b/net-mgmt/py-snmp4-apps/Makefile
index 06325104906c..5ae0661227e3 100644
--- a/net-mgmt/py-snmp4-apps/Makefile
+++ b/net-mgmt/py-snmp4-apps/Makefile
@@ -14,7 +14,7 @@ COMMENT= Command line utilities for pysnmp4
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net-mgmt/py-snmp4-mibs/Makefile b/net-mgmt/py-snmp4-mibs/Makefile
index 5af9f7fffc29..df70f8e381e4 100644
--- a/net-mgmt/py-snmp4-mibs/Makefile
+++ b/net-mgmt/py-snmp4-mibs/Makefile
@@ -15,7 +15,7 @@ COMMENT= Additional python MIB files for pysnmp4 and friends
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net-mgmt/py-snmp4/Makefile b/net-mgmt/py-snmp4/Makefile
index 504e3dd20fd6..c1248cc164fb 100644
--- a/net-mgmt/py-snmp4/Makefile
+++ b/net-mgmt/py-snmp4/Makefile
@@ -15,8 +15,8 @@ COMMENT= SNMP framework for Python
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.2:devel/py-pyasn1 \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.4.1:security/py-pycrypto
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.2:devel/py-pyasn1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.4.1:security/py-pycrypto@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net-mgmt/seafile-client/Makefile b/net-mgmt/seafile-client/Makefile
index ff8d12f16d99..ee08827e3cb0 100644
--- a/net-mgmt/seafile-client/Makefile
+++ b/net-mgmt/seafile-client/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= libsearpc.so:devel/libsearpc \
libevent.so:devel/libevent \
libuuid.so:misc/e2fsprogs-libuuid \
libjansson.so:devel/jansson
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3 \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \
bash:shells/bash
USES= autoreconf iconv libarchive libtool localbase mysql \
diff --git a/net-mgmt/seafile-server/Makefile b/net-mgmt/seafile-server/Makefile
index 9568b568230b..269174ccd8c6 100644
--- a/net-mgmt/seafile-server/Makefile
+++ b/net-mgmt/seafile-server/Makefile
@@ -22,8 +22,8 @@ LIB_DEPENDS= libsearpc.so:devel/libsearpc \
libevent.so:devel/libevent \
libuuid.so:misc/e2fsprogs-libuuid \
libjansson.so:devel/jansson
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3 \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \
bash:shells/bash
CONFLICTS= seafile-[0-9]*
diff --git a/net-mgmt/tornova/Makefile b/net-mgmt/tornova/Makefile
index 1eeba8c28c76..18534dbfc37b 100644
--- a/net-mgmt/tornova/Makefile
+++ b/net-mgmt/tornova/Makefile
@@ -11,7 +11,7 @@ COMMENT= Frontend for Tor
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=0.18:security/py-stem \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=0.18:security/py-stem@${FLAVOR} \
tor:security/tor
USE_GITHUB= yes
diff --git a/net-mgmt/wmi-client/Makefile b/net-mgmt/wmi-client/Makefile
index 7abfd8ae2786..6fdbe1f3105f 100644
--- a/net-mgmt/wmi-client/Makefile
+++ b/net-mgmt/wmi-client/Makefile
@@ -29,7 +29,7 @@ PROGS= bin/wmic bin/winexe
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MPYTHON}
-USES+= python
+USES+= python:2.7
MAKE_ARGS+= PYTHON="${PYTHON_CMD}" PY_LIBDIR="${PYTHONPREFIX_SITELIBDIR}"
PLIST_SUB+= PYTHON=""
.else
diff --git a/net-p2p/bitmessage/Makefile b/net-p2p/bitmessage/Makefile
index 484b423d63fb..5d5baf1fb1fd 100644
--- a/net-p2p/bitmessage/Makefile
+++ b/net-p2p/bitmessage/Makefile
@@ -12,18 +12,18 @@ COMMENT= Secure P2P communications client
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:devel/py-qt4-core \
- ${PYTHON_PKGNAMEPREFIX}qt4-network>=${PYQT4_VERSION}:net/py-qt4-network \
- ${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:x11-toolkits/py-qt4-gui \
- ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python \
- ${PYTHON_PKGNAMEPREFIX}pyopencl>0:devel/py-pyopencl
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:devel/py-qt4-core@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}qt4-network>=${PYQT4_VERSION}:net/py-qt4-network@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:x11-toolkits/py-qt4-gui@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyopencl>0:devel/py-pyopencl@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= Bitmessage
GH_PROJECT= PyBitmessage
-USES= gmake python pyqt:4 ssl
+USES= gmake python:2.7 pyqt:4 ssl
USE_PYQT= core_run gui_run network_run
USE_PYTHON= distutils autoplist
INSTALLS_ICONS= yes
diff --git a/net-p2p/couchpotato/Makefile b/net-p2p/couchpotato/Makefile
index 46b6a5489378..48a62b6aad2d 100644
--- a/net-p2p/couchpotato/Makefile
+++ b/net-p2p/couchpotato/Makefile
@@ -11,9 +11,9 @@ COMMENT= Automatic NZB and torrent downloader
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR}
USE_RC_SUBR= couchpotato
SUB_LIST= PYTHON_CMD=${PYTHON_CMD} USERS=${USERS}
diff --git a/net-p2p/deluge-cli/Makefile b/net-p2p/deluge-cli/Makefile
index fd8eaa894b05..71d401d149fa 100644
--- a/net-p2p/deluge-cli/Makefile
+++ b/net-p2p/deluge-cli/Makefile
@@ -14,13 +14,13 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= intltool-merge:textproc/intltool
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0.18:devel/py-xdg \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0.18:devel/py-xdg@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0:net-p2p/libtorrent-rasterbar-python \
- ${PYTHON_PKGNAMEPREFIX}openssl>=0.8:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:textproc/py-chardet \
- ${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako \
- ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0.8:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:textproc/py-chardet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
USES= gettext python:-2.7
USE_PYTHON= autoplist distutils
diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile
index 08b7f3eca8cc..a2797bba49b3 100644
--- a/net-p2p/deluge/Makefile
+++ b/net-p2p/deluge/Makefile
@@ -10,9 +10,9 @@ COMMENT= Bittorrent client using Python, GTK2, and libtorrent-rasterbar
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus \
- ${PYTHON_PKGNAMEPREFIX}game>=1.8.1:devel/py-game \
- ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}game>=1.8.1:devel/py-game@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify@${PY_FLAVOR} \
xdg-utils>=1.0.2:devel/xdg-utils \
deluge:net-p2p/deluge-cli
USE_GNOME= librsvg2 pygtk2
diff --git a/net-p2p/libtorrent-rasterbar-python/Makefile b/net-p2p/libtorrent-rasterbar-python/Makefile
index fc84a3b4bdee..058fc66f102a 100644
--- a/net-p2p/libtorrent-rasterbar-python/Makefile
+++ b/net-p2p/libtorrent-rasterbar-python/Makefile
@@ -15,7 +15,7 @@ BUILD_WRKSRC= ${WRKSRC}/bindings/python
INSTALL_WRKSRC= ${BUILD_WRKSRC}
SLAVE_PORT= yes
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= python_libtorrent
diff --git a/net-p2p/py-py2play/Makefile b/net-p2p/py-py2play/Makefile
index 63ea79c53422..29527f227c06 100644
--- a/net-p2p/py-py2play/Makefile
+++ b/net-p2p/py-py2play/Makefile
@@ -15,7 +15,7 @@ COMMENT= Peer-to-peer network game engine
LICENSE= GPLv2
DIST_SUBDIR= python
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= Py2Play
EXAMPLESDIR= ${PREFIX}/share/examples/py-py2play
diff --git a/net-p2p/py-transmissionrpc/Makefile b/net-p2p/py-transmissionrpc/Makefile
index 42952261f1ee..edd22b7e1b4a 100644
--- a/net-p2p/py-transmissionrpc/Makefile
+++ b/net-p2p/py-transmissionrpc/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python module that communicates with Transmission through JSON-RPC
LICENSE= MIT
-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
diff --git a/net-p2p/py-vertex/Makefile b/net-p2p/py-vertex/Makefile
index adcb2f8a66ff..d958d385dfe7 100644
--- a/net-p2p/py-vertex/Makefile
+++ b/net-p2p/py-vertex/Makefile
@@ -15,9 +15,9 @@ COMMENT= Vertex is an implementation of the Q2Q protocol
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}epsilon>=0:devel/py-epsilon \
- ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}epsilon>=0:devel/py-epsilon@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist distutils
diff --git a/net-p2p/tribler/Makefile b/net-p2p/tribler/Makefile
index 02f82e443ca6..7ceb72d7304e 100644
--- a/net-p2p/tribler/Makefile
+++ b/net-p2p/tribler/Makefile
@@ -15,21 +15,21 @@ LICENSE= LGPL21 MIT
LICENSE_COMB= multi
BUILD_DEPENDS= xpmtoppm:graphics/netpbm
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apsw>0:databases/py-apsw \
- ${PYTHON_PKGNAMEPREFIX}leveldb>0:databases/py-leveldb \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}gmpy>0:math/py-gmpy \
- ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \
- ${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0.16.4:net-p2p/libtorrent-rasterbar-python \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apsw>0:databases/py-apsw@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}leveldb>0:databases/py-leveldb@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gmpy>0:math/py-gmpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0.16.4:net-p2p/libtorrent-rasterbar-python@${PY_FLAVOR} \
libsodium>0:security/libsodium \
- ${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser \
- ${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+ ${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
NO_ARCH= yes
NO_WRKSUBDIR= yes
diff --git a/net/Makefile b/net/Makefile
index e2e3c367b962..926eb4125f30 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1089,9 +1089,6 @@
SUBDIR += py-xmlrpc
SUBDIR += py-zope.proxy
SUBDIR += py-zsi
- SUBDIR += py3-netifaces
- SUBDIR += py3-pysocks
- SUBDIR += py3-urllib3
SUBDIR += pygopherd
SUBDIR += pynids
SUBDIR += pyrad
diff --git a/net/ceph-devel/Makefile b/net/ceph-devel/Makefile
index b6a32c5580c0..35036a3ecef0 100644
--- a/net/ceph-devel/Makefile
+++ b/net/ceph-devel/Makefile
@@ -20,7 +20,6 @@ IGNORE_FreeBSD_10= Doesnt build for FreeBSD 10.x
BUILD_DEPENDS= \
yasm:devel/yasm \
pkgconf:devel/pkgconf \
- cython>=0.25.2:lang/cython \
sphinx-build:textproc/py-sphinx \
${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \
gperf:devel/gperf
@@ -50,6 +49,7 @@ RUN_DEPENDS= \
CONFLICTS_INSTALL= ceph
USES= gmake cmake:outsource,noninja python:2.7 fuse gettext-runtime shebangfix
+USE_PYTHON= cython
USE_GITHUB= yes
GH_ACCOUNT= wjwithagen:DEFAULT
GH_TUPLE+= ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus
diff --git a/net/ceph/Makefile b/net/ceph/Makefile
index 339282fcf4be..e7c5ef5be0da 100644
--- a/net/ceph/Makefile
+++ b/net/ceph/Makefile
@@ -19,8 +19,7 @@ IGNORE_FreeBSD_10= Doesnt build for FreeBSD 10.x
BUILD_DEPENDS= \
yasm:devel/yasm \
pkgconf:devel/pkgconf \
- cython>=0.25.2:lang/cython \
- sphinx-build:textproc/py-sphinx \
+ sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \
gperf:devel/gperf \
${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
LIB_DEPENDS= \
@@ -43,12 +42,13 @@ RUN_DEPENDS= \
xml:textproc/xmlstarlet \
jq:textproc/jq \
flock:sysutils/flock \
- virtualenv:devel/py-virtualenv \
- ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable
+ virtualenv:devel/py-virtualenv@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR}
CONFLICTS_INSTALL= ceph-devel
USES= gmake cmake:outsource,noninja python:2.7 fuse gettext-runtime shebangfix
+USE_PYTHON= cython
USE_GITHUB= yes
GH_ACCOUNT= ceph:DEFAULT
GH_TUPLE+= ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus
diff --git a/net/cloud-init-azure/Makefile b/net/cloud-init-azure/Makefile
index 2a16db74708e..2866450d5905 100644
--- a/net/cloud-init-azure/Makefile
+++ b/net/cloud-init-azure/Makefile
@@ -16,18 +16,18 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= dmidecode>0:sysutils/dmidecode \
e2fsprogs>0:sysutils/e2fsprogs \
python>0:lang/python \
- ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah \
- ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable \
- ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib \
- ${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch \
- ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer
+ ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${FLAVOR}
ETCDIR= ${PREFIX}/etc/cloud
diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile
index e63a72ae9840..39746f431651 100644
--- a/net/cloud-init/Makefile
+++ b/net/cloud-init/Makefile
@@ -15,17 +15,17 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= dmidecode>0:sysutils/dmidecode \
sudo>0:security/sudo \
gpart>0:sysutils/gpart \
- ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable \
- ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}oauth>0:net/py-oauth \
- ${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch \
- ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer
+ ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauth>0:net/py-oauth@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${FLAVOR}
ETCDIR= ${PREFIX}/etc/cloud
diff --git a/net/dpdk/Makefile b/net/dpdk/Makefile
index 71f79518e989..510bbe51e194 100644
--- a/net/dpdk/Makefile
+++ b/net/dpdk/Makefile
@@ -29,7 +29,7 @@ TOOLS_DESC= Install tool scripts
DEBUG_MAKE_ENV= EXTRA_CFLAGS='-O0 -g'
TOOLS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyelftools>=0:devel/py-pyelftools
-TOOLS_USES= python
+TOOLS_USES= python:2.7
# build up the list of files in the compiled directory that should be executable
EXEC_FILES= app/cmdline_test \
diff --git a/net/dshell/Makefile b/net/dshell/Makefile
index e849754265f2..51ba8184e80e 100644
--- a/net/dshell/Makefile
+++ b/net/dshell/Makefile
@@ -13,11 +13,11 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= bash:shells/bash \
- ${PYTHON_PKGNAMEPREFIX}pygeoip>0:net/py-pygeoip \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}dpkt>0:net/py-dpkt \
- ${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy \
- ${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap
+ ${PYTHON_PKGNAMEPREFIX}pygeoip>0:net/py-pygeoip@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dpkt>0:net/py-dpkt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_GITHUB= yes
diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index d2a1752d2846..e87220c20f40 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -98,7 +98,7 @@ PGSQL_CONFIGURE_WITH= rlm_sql_postgresql
PYTHON_CONFIGURE_WITH= rlm_python
PYTHON_CONFIGURE_ON= --with-rlm-python-lib-dir=${PYTHON_LIBDIR} \
--with-rlm-python-include-dir=${PYTHON_INCLUDEDIR}
-PYTHON_USES= python gettext-runtime
+PYTHON_USES= python:2.7 gettext-runtime
PYTHON_VARS= SHEBANG_FILES+=src/modules/rlm_python/*.py
REDIS_CONFIGURE_WITH= rlm_redis rlm_rediswho
REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis
diff --git a/net/googlecl/Makefile b/net/googlecl/Makefile
index c8d0ab1fab8e..e3a396be242c 100644
--- a/net/googlecl/Makefile
+++ b/net/googlecl/Makefile
@@ -11,9 +11,9 @@ COMMENT= Command line tools for the Google Data APIs
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/License
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata \
- ${PYTHON_PKGNAMEPREFIX}oauth2client>0:security/py-oauth2client \
- ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauth2client>0:security/py-oauth2client@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2@${FLAVOR}
USES= python:2
USE_PYTHON= autoplist distutils
diff --git a/net/gupnp-igd/Makefile b/net/gupnp-igd/Makefile
index c1e7490012ff..3697b0c80942 100644
--- a/net/gupnp-igd/Makefile
+++ b/net/gupnp-igd/Makefile
@@ -29,7 +29,7 @@ USE_LDCONFIG= yes
USES= gmake gnome libtool pathfix pkgconfig tar:xz
PYTHON_CONFIGURE_ENABLE=python
-PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject>=2.12.0:devel/py-gobject
+PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject>=2.12.0:devel/py-gobject@${PY_FLAVOR}
PYTHON_USES= python:2
post-patch:
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 2107811bf5ff..b5f4168597c0 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -17,10 +17,10 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
libpeas-1.0.so:devel/libpeas \
libjson-glib-1.0.so:devel/json-glib
RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
- ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas
+ ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR}
USES= desktop-file-utils gettext gmake gnome libtool localbase \
- pathfix pkgconfig python:3 sqlite tar:bzip2
+ pathfix pkgconfig python:3.4+ sqlite tar:bzip2
USE_GNOME= cairo dconf:run gtk30 intltool introspection \
libxslt libxml2
GNU_CONFIGURE= yes
diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index c8d147111d5e..ecd1553b9649 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -66,7 +66,7 @@ DBUS_USES= python:2
DBUS_USE= GNOME=glib20
DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
libdbus-1.so:devel/dbus
-DBUS_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus
+DBUS_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR}
MYSQL_USE= MYSQL=yes
MYSQL_CONFIGURE_OFF=--with-mysql-config=/nonexistent
ACL_LIB_DEPENDS= libsunacl.so:sysutils/libsunacl
diff --git a/net/neubot/Makefile b/net/neubot/Makefile
index 266a2dae9bad..62628bf9790b 100644
--- a/net/neubot/Makefile
+++ b/net/neubot/Makefile
@@ -11,7 +11,7 @@ COMMENT= Measures neutrality of your network connection in the background
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
USES= python:2
NO_BUILD= yes
diff --git a/net/nsscache/Makefile b/net/nsscache/Makefile
index 6f2c04784d8c..f57ec43fbce2 100644
--- a/net/nsscache/Makefile
+++ b/net/nsscache/Makefile
@@ -12,8 +12,8 @@ COMMENT= Python utility to create a local cache of directory services
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl \
- ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${FLAVOR}
USES= python:2
USE_PYTHON= autoplist distutils
diff --git a/net/pdb/Makefile b/net/pdb/Makefile
index 743fbc34807f..5557bcd3a0ba 100644
--- a/net/pdb/Makefile
+++ b/net/pdb/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= gnn@FreeBSD.org
COMMENT= Packet Debugger
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pcs/__init__.py:net/py-pcs
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pcs/__init__.py:net/py-pcs@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils pythonprefix
.include <bsd.port.mk>
diff --git a/net/py-GeoIP2/Makefile b/net/py-GeoIP2/Makefile
index fe1307dd4cbf..65729bb531c1 100644
--- a/net/py-GeoIP2/Makefile
+++ b/net/py-GeoIP2/Makefile
@@ -13,8 +13,8 @@ COMMENT= MaxMind GeoIP2 Python API
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maxminddb>=1.1.0:net/py-maxminddb \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.4:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maxminddb>=1.1.0:net/py-maxminddb@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.4:www/py-requests@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= maxmind
diff --git a/net/py-amqp/Makefile b/net/py-amqp/Makefile
index 687d4dc16bb1..61faeab808f8 100644
--- a/net/py-amqp/Makefile
+++ b/net/py-amqp/Makefile
@@ -12,9 +12,9 @@ COMMENT= Low-level AMQP client for Python (fork of amqplib)
LICENSE= LGPL21
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
- ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index 7faf7584b97d..18d9d62e9cf3 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -10,11 +10,11 @@ PKGNAMESUFFIX= # empty
MAINTAINER= gnome@FreeBSD.org
COMMENT= Python interface to the Avahi mDNS system
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm \
- ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${FLAVOR}
LIB_DEPENDS= libavahi-client.so:net/avahi-app
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm \
- ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${FLAVOR}
MASTERDIR= ${.CURDIR}/../avahi-app
BUILD_WRKSRC= ${WRKSRC}/avahi-python
@@ -26,6 +26,7 @@ AVAHI_SLAVE= python
USE_GNOME= pygtk2
USES= python:2
+USE_PYTHON= flavors
MANPAGES= avahi-bookmarks.1 avahi-discover.1
post-patch:
diff --git a/net/py-beanstalkc/Makefile b/net/py-beanstalkc/Makefile
index 9830731d9a98..6b55874ee991 100644
--- a/net/py-beanstalkc/Makefile
+++ b/net/py-beanstalkc/Makefile
@@ -12,17 +12,17 @@ COMMENT= Simple beanstalkd client library for Python
LICENSE= APACHE20
-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
+USES= python:2.7
USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= YAML
OPTIONS_DEFAULT= YAML
YAML_DESC= Support parsing YAML responses
-YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
+YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
diff --git a/net/py-cjdns/Makefile b/net/py-cjdns/Makefile
index 7bd51313aea0..4b0569126c01 100644
--- a/net/py-cjdns/Makefile
+++ b/net/py-cjdns/Makefile
@@ -12,7 +12,7 @@ COMMENT= Library to interact with the cjdns admin interface
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-cloudflare-scrape/Makefile b/net/py-cloudflare-scrape/Makefile
index 17310458e134..01058805dbb5 100644
--- a/net/py-cloudflare-scrape/Makefile
+++ b/net/py-cloudflare-scrape/Makefile
@@ -11,7 +11,7 @@ COMMENT= Python module to bypass Cloudflare's anti-bot page
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyExecJS>=0:devel/py-PyExecJS
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyExecJS>=0:devel/py-PyExecJS@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net/py-coherence/Makefile b/net/py-coherence/Makefile
index 8f8327f6b618..acb877dc68c4 100644
--- a/net/py-coherence/Makefile
+++ b/net/py-coherence/Makefile
@@ -12,16 +12,16 @@ COMMENT= DLNA/UPnP media server and framework for the digital living
LICENSE= PD
LICENSE_FILE= ${WRKSRC}/LICENCE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.3:devel/py-configobj \
- ${PYTHON_PKGNAMEPREFIX}twisted>8.2:devel/py-twisted \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}Louie>0:devel/py-louie
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.3:devel/py-configobj@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>8.2:devel/py-twisted@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Louie>0:devel/py-louie@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= coherence-project
GH_TAGNAME= 4d5ee5f
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/net/py-ec2-cli-tools/Makefile b/net/py-ec2-cli-tools/Makefile
index cc781a685d25..ab82b2d9a88e 100644
--- a/net/py-ec2-cli-tools/Makefile
+++ b/net/py-ec2-cli-tools/Makefile
@@ -13,7 +13,7 @@ COMMENT= Helpful CLI utilities for querying and connecting to EC2 instances
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.0:devel/py-boto \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.0:devel/py-boto@${FLAVOR} \
bash:shells/bash
USE_PYTHON= distutils autoplist
diff --git a/net/py-eventlet/Makefile b/net/py-eventlet/Makefile
index 809a679d5df8..5231c3944a9c 100644
--- a/net/py-eventlet/Makefile
+++ b/net/py-eventlet/Makefile
@@ -12,10 +12,10 @@ COMMENT= Concurrent networking library for Python
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3:devel/py-greenlet \
- ${PYTHON_PKGNAMEPREFIX}enum-compat>=0.0.2:devel/py-enum-compat \
- ${PYTHON_PKGNAMEPREFIX}enum34>=1.1.6:devel/py-enum34
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3:devel/py-greenlet@${FLAVOR} \
+ ${PY_ENUM_COMPAT} \
+ ${PY_ENUM34}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net/py-gspread/Makefile b/net/py-gspread/Makefile
index d79491c72f75..1dd8a114c204 100644
--- a/net/py-gspread/Makefile
+++ b/net/py-gspread/Makefile
@@ -12,7 +12,7 @@ COMMENT= Google Spreadsheets Python API
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.2.1:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.2.1:www/py-requests@${FLAVOR}
USES= python:2
USE_PYTHON= distutils autoplist
diff --git a/net/py-gspreadsheet/Makefile b/net/py-gspreadsheet/Makefile
index bcee24b71e91..b1f55a61bd0c 100644
--- a/net/py-gspreadsheet/Makefile
+++ b/net/py-gspreadsheet/Makefile
@@ -12,8 +12,8 @@ COMMENT= Wrapper around Google Spreadsheets to look like csv.DictReader
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
USES= python:2
USE_PYTHON= distutils autoplist
diff --git a/net/py-httpstat/Makefile b/net/py-httpstat/Makefile
index d4470f79ad75..df7d4c4109cf 100644
--- a/net/py-httpstat/Makefile
+++ b/net/py-httpstat/Makefile
@@ -18,7 +18,7 @@ USE_GITHUB= yes
GH_ACCOUNT= reorx
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/net/py-impacket/Makefile b/net/py-impacket/Makefile
index b6358c392d13..32bf37bf9774 100644
--- a/net/py-impacket/Makefile
+++ b/net/py-impacket/Makefile
@@ -14,9 +14,9 @@ COMMENT= Collection of Python classes providing access to network packets
LICENSE= APACHE11
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1 \
- ${PYTHON_PKGNAMEPREFIX}pcapy>=0:net/py-pcapy \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pcapy>=0:net/py-pcapy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR}
USES= dos2unix python
USE_PYTHON= autoplist distutils
diff --git a/net/py-kombu/Makefile b/net/py-kombu/Makefile
index 15e14dfc48e6..cb0c3120c1b3 100644
--- a/net/py-kombu/Makefile
+++ b/net/py-kombu/Makefile
@@ -13,8 +13,8 @@ COMMENT= AMQP messaging framework for Python
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amqp>=1.4.7:net/py-amqp \
- ${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:devel/py-anyjson
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amqp>=1.4.7:net/py-amqp@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:devel/py-anyjson@${FLAVOR}
OPTIONS_DEFINE= BEANSTALK BOTO MONGODB REDIS SQLALCHEMY ZMQ
@@ -25,12 +25,12 @@ REDIS_DESC= Include Redis transport support
SQLALCHEMY_DESC=Include SQLAlchemy transport support
ZMQ_DESC= Include ZMQ transport support
-BEANSTALK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beanstalkc>0:net/py-beanstalkc
-BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=2.6.0:devel/py-boto
+BEANSTALK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beanstalkc>0:net/py-beanstalkc@${FLAVOR}
+BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=2.6.0:devel/py-boto@${FLAVOR}
MONGODB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo
-REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis
-SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10
-ZMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=13.1.0:net/py-pyzmq
+REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${FLAVOR}
+SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR}
+ZMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=13.1.0:net/py-pyzmq@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-ldap/Makefile b/net/py-ldap/Makefile
index f7bb126396ee..08b3e5c493e0 100644
--- a/net/py-ldap/Makefile
+++ b/net/py-ldap/Makefile
@@ -13,8 +13,8 @@ COMMENT= LDAP module for python, for OpenLDAP2
LICENSE= PSFL
LICENSE_FILE= ${WRKSRC}/LICENCE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 \
- ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:devel/py-pyasn1-modules
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:devel/py-pyasn1-modules@${FLAVOR}
CONFLICTS_INSTALL= py27-pyldap
USES= python:-2.7
diff --git a/net/py-ldap3/Makefile b/net/py-ldap3/Makefile
index 91688eb17ce8..0c777de10527 100644
--- a/net/py-ldap3/Makefile
+++ b/net/py-ldap3/Makefile
@@ -12,7 +12,7 @@ COMMENT= Strictly RFC 4511 conforming LDAP V3 pure Python client
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR}
NO_ARCH= yes
USES= python:2.7+
diff --git a/net/py-ldaptor/Makefile b/net/py-ldaptor/Makefile
index 250777d66f5a..1233c24bcc7c 100644
--- a/net/py-ldaptor/Makefile
+++ b/net/py-ldaptor/Makefile
@@ -15,9 +15,9 @@ COMMENT= Pure-python LDAP module for Twisted
LICENSE= MIT LGPL21+
LICENSE_COMB= multi
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \
- ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
GITVERSION= aad8ded658b36337a08aeb7402b6b67eb8771bea
diff --git a/net/py-libcloud/Makefile b/net/py-libcloud/Makefile
index 9477a96d7a5c..a2827ae15c4d 100644
--- a/net/py-libcloud/Makefile
+++ b/net/py-libcloud/Makefile
@@ -14,7 +14,7 @@ COMMENT= Standard client library for many popular cloud providers
LICENSE= APACHE20
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}
NO_ARCH= yes
diff --git a/net/py-libdnet/Makefile b/net/py-libdnet/Makefile
index 42f17c9359ad..736869671d92 100644
--- a/net/py-libdnet/Makefile
+++ b/net/py-libdnet/Makefile
@@ -17,7 +17,8 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/dnet.so \
LIBDNET_SLAVE= yes
-USES= python
+USES= python:2.7
+USE_PYTHON= flavors
CONFIGURE_ARGS= --with-python=${PYTHON_CMD}
.if defined(MAINTAINER_MODE)
diff --git a/net/py-magic-wormhole/Makefile b/net/py-magic-wormhole/Makefile
index 3e345cbaf2a7..8f2fb0321963 100644
--- a/net/py-magic-wormhole/Makefile
+++ b/net/py-magic-wormhole/Makefile
@@ -9,17 +9,17 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= swills@FreeBSD.org
COMMENT= Get things from one computer to another, safely
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}autobahn>=0.14.1:www/py-autobahn \
- ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click \
- ${PYTHON_PKGNAMEPREFIX}hkdf>0:security/py-hkdf \
- ${PYTHON_PKGNAMEPREFIX}humanize>=0:devel/py-humanize \
- ${PYTHON_PKGNAMEPREFIX}idna>=0.6:dns/py-idna \
- ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl \
- ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}spake2>=0.7:security/py-spake2 \
- ${PYTHON_PKGNAMEPREFIX}tqdm>=4.13.0:misc/py-tqdm \
- ${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.3:security/py-txtorcon
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}autobahn>=0.14.1:www/py-autobahn@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hkdf>0:security/py-hkdf@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}humanize>=0:devel/py-humanize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}idna>=0.6:dns/py-idna@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}spake2>=0.7:security/py-spake2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tqdm>=4.13.0:misc/py-tqdm@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.3:security/py-txtorcon@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-matrix-synapse-ldap3/Makefile b/net/py-matrix-synapse-ldap3/Makefile
index cb4aac141a2a..cae193c6b900 100644
--- a/net/py-matrix-synapse-ldap3/Makefile
+++ b/net/py-matrix-synapse-ldap3/Makefile
@@ -13,7 +13,7 @@ COMMENT= LDAP3 auth provider for Matrix Synapse
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap3>=0.9.5:net/py-ldap3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap3>=0.9.5:net/py-ldap3@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-maxminddb/Makefile b/net/py-maxminddb/Makefile
index a1d7409cca26..ebfc02117856 100644
--- a/net/py-maxminddb/Makefile
+++ b/net/py-maxminddb/Makefile
@@ -25,7 +25,7 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3300
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr@${FLAVOR}
.endif
post-install:
diff --git a/net/py-miniupnpc/Makefile b/net/py-miniupnpc/Makefile
index fb6cf0b4a4ad..20b014740792 100644
--- a/net/py-miniupnpc/Makefile
+++ b/net/py-miniupnpc/Makefile
@@ -12,13 +12,15 @@ MASTERDIR= ${.CURDIR}/../miniupnpc
USES= python
USE_PYTHON= autoplist distutils
-WRKDIR= ${WRKDIRPREFIX}${MASTERDIR}/${_WRKDIR}
PLIST= ${.CURDIR}/pkg-plist
post-patch:
${REINPLACE_CMD} 's/\(version\)="[^"]*"/\1="${PORTVERSION}"/' \
${WRKSRC}/setup.py
+pre-build:
+ ${CP} $$(make FLAVOR= -C ${MASTERDIR} -V WRKSRC)/libminiupnpc.a ${WRKSRC}
+
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/miniupnpc.so
diff --git a/net/py-msrplib/Makefile b/net/py-msrplib/Makefile
index 3ee06fb1e776..059caa70bc6b 100644
--- a/net/py-msrplib/Makefile
+++ b/net/py-msrplib/Makefile
@@ -16,10 +16,10 @@ COMMENT= Python MSRP client library
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}application>=1.1.0:devel/py-application \
- ${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.15:net/py-eventlet \
- ${PYTHON_PKGNAMEPREFIX}gnutls>=1.1.6:security/py-gnutls \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}application>=1.1.0:devel/py-application@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.15:net/py-eventlet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gnutls>=1.1.6:security/py-gnutls@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/net/py-ndg_httpsclient/Makefile b/net/py-ndg_httpsclient/Makefile
index a84c6d49ff76..a2bb37344bb1 100644
--- a/net/py-ndg_httpsclient/Makefile
+++ b/net/py-ndg_httpsclient/Makefile
@@ -13,8 +13,8 @@ COMMENT= Enhance HTTPS support for httplib and urllib2
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/ndg/httpsclient/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.4:devel/py-pyasn1 \
- ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.4:devel/py-pyasn1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/net/py-netaddr/Makefile b/net/py-netaddr/Makefile
index 45a78cec5e85..273a132c1818 100644
--- a/net/py-netaddr/Makefile
+++ b/net/py-netaddr/Makefile
@@ -13,7 +13,7 @@ COMMENT= Manipulation of IPv4, IPv6, CIDR, EUI and MAC network addresses
LICENSE= BSD3CLAUSE MIT
LICENSE_COMB= multi
-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= autoplist concurrent distutils
diff --git a/net/py-netif/Makefile b/net/py-netif/Makefile
index 0f8f8a376445..39a419b59b21 100644
--- a/net/py-netif/Makefile
+++ b/net/py-netif/Makefile
@@ -12,8 +12,7 @@ COMMENT= Python network configuration library for FreeBSD
LICENSE= BSD2CLAUSE
-BUILD_DEPENDS= cython>0:lang/cython
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsd>0:devel/py-bsd
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsd>0:devel/py-bsd@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= freenas
@@ -21,12 +20,12 @@ GH_PROJECT= py-netif
GH_TAGNAME= a102b4f
USES= python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils cython
.include <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
diff --git a/net/py-netifaces/Makefile b/net/py-netifaces/Makefile
index bd6f08fd18ca..67ee95185331 100644
--- a/net/py-netifaces/Makefile
+++ b/net/py-netifaces/Makefile
@@ -1,18 +1,21 @@
-# Created by: Stanislav Svirid <count@211.ru>
+# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
# $FreeBSD$
PORTNAME= netifaces
-PORTVERSION= 0.10.5
+PORTVERSION= 0.10.6
CATEGORIES= net python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= count@211.ru
-COMMENT= Getting network addresses from Python
+MAINTAINER= bofh@FreeBSD.org
+COMMENT= Getting network addresses from Python 3
LICENSE= MIT
USES= python
USE_PYTHON= autoplist distutils
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/netifaces.so
+
.include <bsd.port.mk>
diff --git a/net/py-netifaces/distinfo b/net/py-netifaces/distinfo
index 0e2115a2cc12..5ecdf46f2a00 100644
--- a/net/py-netifaces/distinfo
+++ b/net/py-netifaces/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478617707
-SHA256 (netifaces-0.10.5.tar.gz) = 59d8ad52dd3116fcb6635e175751b250dc783fb011adba539558bd764e5d628b
-SIZE (netifaces-0.10.5.tar.gz) = 24879
+TIMESTAMP = 1505758293
+SHA256 (netifaces-0.10.6.tar.gz) = 0c4da523f36d36f1ef92ee183f2512f3ceb9a9d2a45f7d19cda5a42c6689ebe0
+SIZE (netifaces-0.10.6.tar.gz) = 25166
diff --git a/net/py-netlib/Makefile b/net/py-netlib/Makefile
index 1b1d545cd707..e487391202f2 100644
--- a/net/py-netlib/Makefile
+++ b/net/py-netlib/Makefile
@@ -13,10 +13,10 @@ COMMENT= Collection of network utilities
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 \
- ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-netstring/Makefile b/net/py-netstring/Makefile
index 7faf018321c2..f6044bdede76 100644
--- a/net/py-netstring/Makefile
+++ b/net/py-netstring/Makefile
@@ -11,7 +11,7 @@ DISTNAME= python-${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python module implementing the netstring protocol
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/net/py-nnpy/Makefile b/net/py-nnpy/Makefile
index 9882647cdc89..47c4567e8b3b 100644
--- a/net/py-nnpy/Makefile
+++ b/net/py-nnpy/Makefile
@@ -12,7 +12,7 @@ COMMENT= cffi-based Python bindings for nanomsg
LICENSE= MIT
LIB_DEPENDS= libnanomsg.so:net/nanomsg
-BUILD_DEPENDS= ${PYTHONPREFIX_SITELIBDIR}/_cffi_backend.so:devel/py-cffi
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/net/py-oauth2/Makefile b/net/py-oauth2/Makefile
index 4a1f12499569..4534b4e5f7ed 100644
--- a/net/py-oauth2/Makefile
+++ b/net/py-oauth2/Makefile
@@ -12,10 +12,10 @@ COMMENT= Python library for OAuth version 1.0
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2@${FLAVOR}
TEST_DEPENDS:= ${RUN_DEPENDS} \
- ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+ ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
OPTIONS_DEFINE= TESTS
TESTS_DESC= Install test suite requirements
diff --git a/net/py-pcap/Makefile b/net/py-pcap/Makefile
index 7a8d4d95d412..bc13417571b0 100644
--- a/net/py-pcap/Makefile
+++ b/net/py-pcap/Makefile
@@ -15,7 +15,7 @@ COMMENT= Python interface to LBL Packet Capture library (libpcap)
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= LIBPCAP
diff --git a/net/py-pcs/Makefile b/net/py-pcs/Makefile
index 5d434a3bf754..c5a8e2b1d66d 100644
--- a/net/py-pcs/Makefile
+++ b/net/py-pcs/Makefile
@@ -14,13 +14,11 @@ COMMENT= Protocol Construction Set
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-BUILD_DEPENDS= cython>=0.11.2:lang/cython
-
PORTDOCS= pcs.pdf
PORTEXAMPLES= *
USES= python:2.7
-USE_PYTHON= distutils pythonprefix
+USE_PYTHON= distutils pythonprefix cython
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/net/py-port-for/Makefile b/net/py-port-for/Makefile
index 5d4be49b8e96..8637878624b8 100644
--- a/net/py-port-for/Makefile
+++ b/net/py-port-for/Makefile
@@ -13,8 +13,8 @@ COMMENT= Utility that helps with local TCP ports managment
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
- ${PYTHON_PKGNAMEPREFIX}mock>=0.8:devel/py-mock
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=0.8:devel/py-mock@${FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/net/py-pyldap/Makefile b/net/py-pyldap/Makefile
index ec6304eda494..45adba608a58 100644
--- a/net/py-pyldap/Makefile
+++ b/net/py-pyldap/Makefile
@@ -11,7 +11,7 @@ COMMENT= Fork of python-ldap with Python 3 support
LICENSE= PSFL
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0:devel/py-pyasn1-modules
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0:devel/py-pyasn1-modules@${FLAVOR}
CONFLICTS_INSTALL= py27-ldap
USES= python
diff --git a/net/py-pynsq/Makefile b/net/py-pynsq/Makefile
index 66c1328b3d41..0dedcf5c17b3 100644
--- a/net/py-pynsq/Makefile
+++ b/net/py-pynsq/Makefile
@@ -13,11 +13,11 @@ COMMENT= Official Python client library for NSQ
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
- ${PYTHON_PKGNAMEPREFIX}python-snappy>0:archivers/py-python-snappy \
- ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-snappy>0:archivers/py-python-snappy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${FLAVOR}
USES= python:-2.7
USE_GITHUB= yes
diff --git a/net/py-pypcap/Makefile b/net/py-pypcap/Makefile
index b77de7b9f53e..239af98aa39b 100644
--- a/net/py-pypcap/Makefile
+++ b/net/py-pypcap/Makefile
@@ -14,12 +14,12 @@ COMMENT= Simplified object-oriented Python extension module for libpcap
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= pyrexc:devel/pyrex
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= dugsong
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
post-patch:
diff --git a/net/py-pyshark/Makefile b/net/py-pyshark/Makefile
index 5e53a690c613..80cced1def2a 100644
--- a/net/py-pyshark/Makefile
+++ b/net/py-pyshark/Makefile
@@ -13,10 +13,10 @@ COMMENT= Pyhon packet parsing using wireshark dissectors
LICENSE= MIT
RUN_DEPENDS= tshark>0:net/tshark \
- ${PYTHON_PKGNAMEPREFIX}trollius>0:devel/py-trollius \
- ${PYTHON_PKGNAMEPREFIX}logbook>0:devel/py-logbook \
- ${PYTHON_PKGNAMEPREFIX}py>0:devel/py-py \
- ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml
+ ${PYTHON_PKGNAMEPREFIX}trollius>0:devel/py-trollius@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}logbook>0:devel/py-logbook@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}py>0:devel/py-py@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR}
USES= python zip
USE_PYTHON= autoplist distutils
diff --git a/net/py-pysmb/Makefile b/net/py-pysmb/Makefile
index 408c647f5053..a170aed04bd0 100644
--- a/net/py-pysmb/Makefile
+++ b/net/py-pysmb/Makefile
@@ -14,7 +14,7 @@ COMMENT= SMB/CIFS library written in Python
LICENSE= ZLIB
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${FLAVOR}
OPTIONS_DEFINE= DOCS
diff --git a/net/py-pysocks/Makefile b/net/py-pysocks/Makefile
index 6b63e7490f1e..d74dafc7b2b4 100644
--- a/net/py-pysocks/Makefile
+++ b/net/py-pysocks/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python SOCKS module
LICENSE= BSD3CLAUSE
-USES?= python
+USES= python
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
diff --git a/net/py-python-barbicanclient/Makefile b/net/py-python-barbicanclient/Makefile
index 10bccb7deed1..e6f217c90eb6 100644
--- a/net/py-python-barbicanclient/Makefile
+++ b/net/py-python-barbicanclient/Makefile
@@ -12,15 +12,15 @@ COMMENT= Client Library for OpenStack Barbican Key Management API
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}six>=1.9.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \
- ${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}cliff>=0:devel/py-cliff
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${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}cliff>=0:devel/py-cliff@${FLAVOR}
NO_ARCH= yes
diff --git a/net/py-python-ceilometerclient/Makefile b/net/py-python-ceilometerclient/Makefile
index 68b1ff45440a..416c77358ffb 100644
--- a/net/py-python-ceilometerclient/Makefile
+++ b/net/py-python-ceilometerclient/Makefile
@@ -13,17 +13,17 @@ COMMENT= OpenStack Telemetry API Client Library
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}stevedore>=1.10.0:devel/py-stevedore \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.5.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}keystoneauth1>=2.1.0:devel/py-keystoneauth1 \
- ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.10.0:devel/py-stevedore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.5.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}keystoneauth1>=2.1.0:devel/py-keystoneauth1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR}
NO_ARCH= yes
diff --git a/net/py-python-cinderclient/Makefile b/net/py-python-cinderclient/Makefile
index 1d42185d629e..6e7f7b44d475 100644
--- a/net/py-python-cinderclient/Makefile
+++ b/net/py-python-cinderclient/Makefile
@@ -10,15 +10,15 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= alexander.nusov@nfvexpress.com
COMMENT= Client for the OpenStack Cinder API
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \
- ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \
- ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1 \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
- ${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}prettytable>=0:devel/py-prettytable@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${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}
USES= python shebangfix
SHEBANG_FILES= cinderclient/tests/functional/hooks/post_test_hook.sh
diff --git a/net/py-python-designateclient/Makefile b/net/py-python-designateclient/Makefile
index b16aee5177b2..045c7aeeaba7 100644
--- a/net/py-python-designateclient/Makefile
+++ b/net/py-python-designateclient/Makefile
@@ -12,17 +12,17 @@ COMMENT= OpenStack DNS-as-a-Service - Client
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-RUN_DEPENDS+= ${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}osc-lib>=1.2.0:devel/py-osc-lib \
- ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.14.0:devel/py-keystoneauth1 \
- ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \
- ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \
- ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff
+RUN_DEPENDS+= ${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}osc-lib>=1.2.0:devel/py-osc-lib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.14.0:devel/py-keystoneauth1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff@${FLAVOR}
NO_ARCH= yes
diff --git a/net/py-python-glanceclient/Makefile b/net/py-python-glanceclient/Makefile
index 721bbd366eb2..2f8b85e85327 100644
--- a/net/py-python-glanceclient/Makefile
+++ b/net/py-python-glanceclient/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= alexander.nusov@nfvexpress.com
COMMENT= Client for the OpenStack Glance API
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \
- ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \
- ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}warlock>=0:devel/py-warlock \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}warlock>=0:devel/py-warlock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR}
USES= python shebangfix
SHEBANG_FILES= glanceclient/tests/functional/hooks/post_test_hook.sh
diff --git a/net/py-python-heatclient/Makefile b/net/py-python-heatclient/Makefile
index cbea42dbbbfb..7126b10e325e 100644
--- a/net/py-python-heatclient/Makefile
+++ b/net/py-python-heatclient/Makefile
@@ -13,25 +13,25 @@ COMMENT= OpenStack Orchestration API Client Library
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=3.2.0:databases/py-python-swiftclient \
- ${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}osc-lib>=1.2.0:devel/py-osc-lib \
- ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1 \
- ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \
- ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \
- ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=3.2.0:databases/py-python-swiftclient@${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}osc-lib>=1.2.0:devel/py-osc-lib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR}
NO_ARCH= yes
-USES= python shebangfix
+USES= python:2.7 shebangfix
USE_PYTHON= autoplist distutils
SHEBANG_FILES= heatclient/tests/functional/hooks/post_test_hook.sh
diff --git a/net/py-python-keystoneclient/Makefile b/net/py-python-keystoneclient/Makefile
index 33dcec7aff5f..79dc899773a7 100644
--- a/net/py-python-keystoneclient/Makefile
+++ b/net/py-python-keystoneclient/Makefile
@@ -12,17 +12,17 @@ COMMENT= Client for the OpenStack Keystone API
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \
- ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1 \
- ${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.serialization>=1.10.0:devel/py-oslo.serialization \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
- ${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}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${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.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${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}
USES= python shebangfix
SHEBANG_FILES= keystoneclient/tests/functional/hooks/post_test_hook.sh
diff --git a/net/py-python-neutronclient/Makefile b/net/py-python-neutronclient/Makefile
index c5a8a98901c1..c9c8def0f85e 100644
--- a/net/py-python-neutronclient/Makefile
+++ b/net/py-python-neutronclient/Makefile
@@ -10,20 +10,20 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= alexander.nusov@nfvexpress.com
COMMENT= Client for the OpenStack Neutron API
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \
- ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \
- ${PYTHON_PKGNAMEPREFIX}osc-lib>=1.0.2:devel/py-osc-lib \
- ${PYTHON_PKGNAMEPREFIX}cliff>=0:devel/py-cliff \
- ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \
- ${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.utils>=3.16.0:devel/py-oslo.utils \
- ${PYTHON_PKGNAMEPREFIX}os-client-config>=0:devel/py-os-client-config \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}osc-lib>=1.0.2:devel/py-osc-lib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cliff>=0:devel/py-cliff@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${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.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}os-client-config>=0:devel/py-os-client-config@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR}
USES= python shebangfix
SHEBANG_FILES= neutronclient/tests/functional/hooks/post_test_hook.sh
diff --git a/net/py-python-novaclient/Makefile b/net/py-python-novaclient/Makefile
index f4fee5de9ac4..78bb90e3a7b2 100644
--- a/net/py-python-novaclient/Makefile
+++ b/net/py-python-novaclient/Makefile
@@ -10,17 +10,17 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= novel@FreeBSD.org
COMMENT= Client for the OpenStack Nova API
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \
- ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \
- ${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.utils>=3.16.0:devel/py-oslo.utils \
- ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${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.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR}
USES= python shebangfix
SHEBANG_FILES= novaclient/tests/functional/hooks/post_test_hook.sh
diff --git a/net/py-python-openstackclient/Makefile b/net/py-python-openstackclient/Makefile
index adacbc0670b6..94d9f65b3003 100644
--- a/net/py-python-openstackclient/Makefile
+++ b/net/py-python-openstackclient/Makefile
@@ -13,19 +13,19 @@ COMMENT= Client for the OpenStack
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \
- ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff \
- ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1 \
- ${PYTHON_PKGNAMEPREFIX}openstacksdk>=0.9.10:devel/py-openstacksdk \
- ${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \
- ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=2.5.0:net/py-python-glanceclient \
- ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient \
- ${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient \
- ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient \
- ${PYTHON_PKGNAMEPREFIX}python-neutronclient>=0:net/py-python-neutronclient
+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}cliff>=2.3.0:devel/py-cliff@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openstacksdk>=0.9.10:devel/py-openstacksdk@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib@${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}python-glanceclient>=2.5.0:net/py-python-glanceclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-neutronclient>=0:net/py-python-neutronclient@${FLAVOR}
USES= python shebangfix
USE_PYTHON= distutils autoplist noegginfo
diff --git a/net/py-python-twitter/Makefile b/net/py-python-twitter/Makefile
index 891f69fab5d6..cf124dce12fe 100644
--- a/net/py-python-twitter/Makefile
+++ b/net/py-python-twitter/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python wrapper around the Twitter API
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/net/py-pyvmomi/Makefile b/net/py-pyvmomi/Makefile
index f9dc9b89552c..aed8ac8cffe4 100644
--- a/net/py-pyvmomi/Makefile
+++ b/net/py-pyvmomi/Makefile
@@ -11,11 +11,11 @@ COMMENT= Python SDK for the VMware vSphere API of ESX, ESXi, and vCenter
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR}
USES= python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils concurrent optsuffix
post-patch:
${REINPLACE_CMD} -E "/data_files/s|\[\(''|\[\('${DOCSDIR}'|" ${WRKSRC}/setup.py
diff --git a/net/py-pyzmq/Makefile b/net/py-pyzmq/Makefile
index f56ecdee30db..98cb12d18de5 100644
--- a/net/py-pyzmq/Makefile
+++ b/net/py-pyzmq/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python bindings for ZeroMQ
LICENSE= LGPL3
LIB_DEPENDS= libzmq.so:net/libzmq4
-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
@@ -22,7 +22,7 @@ PYDISTUTILS_CONFIGUREARGS= --zmq=${LOCALBASE}
.include <bsd.port.pre.mk>
.if ${PYTHON_VER} == 3.3
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>0:devel/py-asyncio
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>0:devel/py-asyncio@${FLAVOR}
.endif
do-test:
diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile
index e5668ee45fc3..60e0c14ade5e 100644
--- a/net/py-qt4-network/Makefile
+++ b/net/py-qt4-network/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
USES= python pyqt:4
USE_PYQT= sip_build core_run
+USE_PYTHON= flavors
USE_QT4= moc_build corelib network qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/net/py-qt5-network/Makefile b/net/py-qt5-network/Makefile
index 15098a27c737..81efa320da8c 100644
--- a/net/py-qt5-network/Makefile
+++ b/net/py-qt5-network/Makefile
@@ -11,6 +11,7 @@ PYQT_DIST= yes
USES= python pyqt:5
USE_PYQT= sip_build core_run
+USE_PYTHON= flavors
USE_QT5= core network qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/net/py-rabbitpy/Makefile b/net/py-rabbitpy/Makefile
index ed3879bc63ce..0c23bf83d403 100644
--- a/net/py-rabbitpy/Makefile
+++ b/net/py-rabbitpy/Makefile
@@ -11,8 +11,8 @@ COMMENT= RabbitMQ client library for Python
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pamqp>0:net/py-pamqp
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pamqp>0:net/py-pamqp
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pamqp>0:net/py-pamqp@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pamqp>0:net/py-pamqp@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/net/py-rainbowstream/Makefile b/net/py-rainbowstream/Makefile
index 751ed88b5ed6..ad8717db5f64 100644
--- a/net/py-rainbowstream/Makefile
+++ b/net/py-rainbowstream/Makefile
@@ -14,16 +14,16 @@ COMMENT= Smart and nice Twitter client on terminal
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.5.3:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}pyfiglet>0:misc/py-pyfiglet \
- ${PYTHON_PKGNAMEPREFIX}twitter-tools>0:net/py-twitter-tools \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.5.3:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyfiglet>0:misc/py-pyfiglet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twitter-tools>0:net/py-twitter-tools@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${FLAVOR}
# Actually 2.7,3.2-
-USES= python:2.7-
+USES= python:2.7
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
diff --git a/net/py-ripe.atlas.cousteau/Makefile b/net/py-ripe.atlas.cousteau/Makefile
index ab36f2ad6c7e..81801cba1c7b 100644
--- a/net/py-ripe.atlas.cousteau/Makefile
+++ b/net/py-ripe.atlas.cousteau/Makefile
@@ -13,10 +13,10 @@ COMMENT= Python wrapper around the RIPE Atlas API
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}socketio-client>=0.6.5:net/py-socketio-client \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}websocket-client<0.39:www/py-websocket-client
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}socketio-client>=0.6.5:net/py-socketio-client@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}websocket-client<0.39:www/py-websocket-client@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/net/py-ripe.atlas.sagan/Makefile b/net/py-ripe.atlas.sagan/Makefile
index 74adfb4e72c7..d167e335dce6 100644
--- a/net/py-ripe.atlas.sagan/Makefile
+++ b/net/py-ripe.atlas.sagan/Makefile
@@ -13,9 +13,9 @@ COMMENT= Parsing library for RIPE Atlas measurement results
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-ripe.atlas.tools/Makefile b/net/py-ripe.atlas.tools/Makefile
index 04c3e819370c..929c7512a929 100644
--- a/net/py-ripe.atlas.tools/Makefile
+++ b/net/py-ripe.atlas.tools/Makefile
@@ -13,13 +13,13 @@ COMMENT= Official command-line client for RIPE Atlas
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}ripe.atlas.cousteau>=1.0.4:net/py-ripe.atlas.cousteau \
- ${PYTHON_PKGNAMEPREFIX}ripe.atlas.sagan>=1.1.4:net/py-ripe.atlas.sagan \
- ${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ripe.atlas.cousteau>=1.0.4:net/py-ripe.atlas.cousteau@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ripe.atlas.sagan>=1.1.4:net/py-ripe.atlas.sagan@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile
index abb31192a780..3bd95ad5f031 100644
--- a/net/py-s3cmd/Makefile
+++ b/net/py-s3cmd/Makefile
@@ -12,7 +12,7 @@ COMMENT= Unix-like tools to manipulate stored files from the command line
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR}
USES= python:2
USE_PYTHON= autoplist distutils
diff --git a/net/py-s3transfer/Makefile b/net/py-s3transfer/Makefile
index 8433d838e98a..512d03cfc081 100644
--- a/net/py-s3transfer/Makefile
+++ b/net/py-s3transfer/Makefile
@@ -12,9 +12,9 @@ COMMENT= Amazon S3 Transfer Manager for Python
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.3.0:devel/py-botocore
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.3:devel/py-nose \
- ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.3.0:devel/py-botocore@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.3:devel/py-nose@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${FLAVOR}
#Actually -2.7,3.3-3.5
USES= python
@@ -25,7 +25,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3000
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>=2.2.0:devel/py-futures
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>=2.2.0:devel/py-futures@${FLAVOR}
.endif
# setup.py test runs integration tests which fail
diff --git a/net/py-shodan/Makefile b/net/py-shodan/Makefile
index 4d61e0cda532..0242c675bd2b 100644
--- a/net/py-shodan/Makefile
+++ b/net/py-shodan/Makefile
@@ -12,10 +12,10 @@ COMMENT= Python library and command-line utility for Shodan
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter \
- ${PYTHON_PKGNAMEPREFIX}click-plugins>=1.0.3:devel/py-click-plugins \
- ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click-plugins>=1.0.3:devel/py-click-plugins@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile
index 3d47f0c8de1a..c9bb3b285c5f 100644
--- a/net/py-soappy/Makefile
+++ b/net/py-soappy/Makefile
@@ -13,8 +13,8 @@ COMMENT= SOAP Services for Python
# Actual LICENSE is in GH Repo but not in pypi release
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml \
- ${PYTHON_PKGNAMEPREFIX}wstools>0:textproc/py-wstools
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wstools>0:textproc/py-wstools@${FLAVOR}
USES= python:2 zip
USE_PYTHON= autoplist distutils
diff --git a/net/py-socketio-client/Makefile b/net/py-socketio-client/Makefile
index 0b2a656af498..a5716ba298fa 100644
--- a/net/py-socketio-client/Makefile
+++ b/net/py-socketio-client/Makefile
@@ -13,9 +13,9 @@ COMMENT= Socket.io client library for Python
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net/py-sshuttle/Makefile b/net/py-sshuttle/Makefile
index 9bbb6567d7fc..9e6b2a682cab 100644
--- a/net/py-sshuttle/Makefile
+++ b/net/py-sshuttle/Makefile
@@ -13,9 +13,9 @@ COMMENT= Full-featured VPN over an SSH tunnel
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/net/py-stomp.py/Makefile b/net/py-stomp.py/Makefile
index dec674756cc2..541279b73c3f 100644
--- a/net/py-stomp.py/Makefile
+++ b/net/py-stomp.py/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python STOMP client, supporting >=1.0 and <=1.2 of the protocol
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest@${FLAVOR}
OPTIONS_DEFINE= DOXYGEN
DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
diff --git a/net/py-terminado/Makefile b/net/py-terminado/Makefile
index 2743aeee34f3..c56eba3d4007 100644
--- a/net/py-terminado/Makefile
+++ b/net/py-terminado/Makefile
@@ -11,8 +11,8 @@ COMMENT= Terminals served to term.js using Tornado websockets
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess \
- ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net/py-tofu/Makefile b/net/py-tofu/Makefile
index f5bc67caab48..309742fe8765 100644
--- a/net/py-tofu/Makefile
+++ b/net/py-tofu/Makefile
@@ -15,7 +15,7 @@ COMMENT= Practical high-level network game engine
LICENSE= GPLv2+
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
OPTIONS_DEFINE= EXAMPLES
diff --git a/net/py-tweepy/Makefile b/net/py-tweepy/Makefile
index 0f1e23c6b8e5..a3fbd422fd58 100644
--- a/net/py-tweepy/Makefile
+++ b/net/py-tweepy/Makefile
@@ -12,13 +12,13 @@ COMMENT= Twitter API library for Python
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4.1:www/py-requests-oauthlib \
- ${PYTHON_PKGNAMEPREFIX}six>=1.7.3:devel/py-six
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
- ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock \
- ${PYTHON_PKGNAMEPREFIX}vcrpy>=1.1.2:devel/py-vcrpy
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4.1:www/py-requests-oauthlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.7.3:devel/py-six@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vcrpy>=1.1.2:devel/py-vcrpy@${FLAVOR}
USES= python
USE_GITHUB= yes
@@ -31,7 +31,7 @@ TEST_ENV= USE_REPLAY=1
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3000
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2@${FLAVOR}
.endif
do-test:
diff --git a/net/py-twitter-tools/Makefile b/net/py-twitter-tools/Makefile
index 4e382b8c45d3..b048408eddc6 100644
--- a/net/py-twitter-tools/Makefile
+++ b/net/py-twitter-tools/Makefile
@@ -11,12 +11,12 @@ PKGNAMESUFFIX= -tools
MAINTAINER= koobs@FreeBSD.org
COMMENT= Python API and command-line toolset for Twitter
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= python
+USES= python:2.7
USE_PYTHON= distutils concurrent autoplist
USE_GITHUB= yes
diff --git a/net/py-txamqp/Makefile b/net/py-txamqp/Makefile
index bee276366c5d..9b53610145e7 100644
--- a/net/py-txamqp/Makefile
+++ b/net/py-txamqp/Makefile
@@ -13,8 +13,8 @@ DISTNAME= python-${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= python@FreeBSD.org
COMMENT= Twisted Python library for the AMQP messaging protocol
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}thrift>=0:devel/py-thrift \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}thrift>=0:devel/py-thrift@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
NO_ARCH= yes
USES= python:2
diff --git a/net/py-upnp-inspector/Makefile b/net/py-upnp-inspector/Makefile
index 982a5b455ff9..834d8198b909 100644
--- a/net/py-upnp-inspector/Makefile
+++ b/net/py-upnp-inspector/Makefile
@@ -13,9 +13,9 @@ COMMENT= UPnP Device and Service analyzer
LICENSE= PD
LICENSE_FILE= ${WRKSRC}/LICENCE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Coherence>=0.6.4:net/py-coherence
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Coherence>=0.6.4:net/py-coherence@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/net/py-urllib3/Makefile b/net/py-urllib3/Makefile
index 8c02e4dc8bb8..7da693e1fb6e 100644
--- a/net/py-urllib3/Makefile
+++ b/net/py-urllib3/Makefile
@@ -13,16 +13,16 @@ COMMENT= HTTP library with thread-safe connection pooling, file post, and more
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cryptography \
- ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna \
- ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.7:net/py-pysocks
-TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \
- ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest
-#TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tornado>=0:www/py-tornado
-
-USES?= python
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cryptography@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.7:net/py-pysocks@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR}
+#TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tornado>=0:www/py-tornado@${FLAVOR}
+
+USES= python
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
SUB_FILES= pkg-message
@@ -30,13 +30,11 @@ SUB_FILES= pkg-message
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3300
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddress>=0:net/py-ipaddress
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddress>=0:net/py-ipaddress@${FLAVOR}
.endif
-.if ${PYTHON_REL} < 3300
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi
-.elif ${PYTHON_REL} < 3400
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py3-certifi
+.if ${PYTHON_REL} < 3400
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/net/py-wmi-query/Makefile b/net/py-wmi-query/Makefile
index 77c8340c78f7..44064c472d6b 100644
--- a/net/py-wmi-query/Makefile
+++ b/net/py-wmi-query/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python scripts to get wmi data classes in a dict
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}impacket>=0:net/py-impacket
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}impacket>=0:net/py-impacket@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/net/py-wolframalpha/Makefile b/net/py-wolframalpha/Makefile
index 41906cbbe42a..0f57db921b22 100644
--- a/net/py-wolframalpha/Makefile
+++ b/net/py-wolframalpha/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Python Client for Wolfram Alpha
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools \
- ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR}
USES= python:2 zip
USE_PYTHON= autoplist distutils
diff --git a/net/py-xmlrpc/Makefile b/net/py-xmlrpc/Makefile
index 8d8f0cc06db3..57696324d148 100644
--- a/net/py-xmlrpc/Makefile
+++ b/net/py-xmlrpc/Makefile
@@ -15,7 +15,7 @@ COMMENT= Fast implementation of the xmlrpc spec for Python
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= EXAMPLES
diff --git a/net/py-zope.proxy/Makefile b/net/py-zope.proxy/Makefile
index 5506393e8a59..fe7ed222bc56 100644
--- a/net/py-zope.proxy/Makefile
+++ b/net/py-zope.proxy/Makefile
@@ -14,7 +14,7 @@ COMMENT= Generic Transparent Proxies
LICENSE= ZPL21
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:devel/py-zope.interface
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:devel/py-zope.interface@${FLAVOR}
USES= python zip
USE_PYTHON= distutils autoplist
diff --git a/net/py3-netifaces/Makefile b/net/py3-netifaces/Makefile
deleted file mode 100644
index 50093557436a..000000000000
--- a/net/py3-netifaces/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= netifaces
-PORTVERSION= 0.10.6
-CATEGORIES= net python
-MASTER_SITES= CHEESESHOP
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER= bofh@FreeBSD.org
-COMMENT= Getting network addresses from Python 3
-
-LICENSE= MIT
-
-USES= python:3.3+
-USE_PYTHON= autoplist distutils
-
-post-install:
- ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/netifaces.so
-
-.include <bsd.port.mk>
diff --git a/net/py3-netifaces/distinfo b/net/py3-netifaces/distinfo
deleted file mode 100644
index 5ecdf46f2a00..000000000000
--- a/net/py3-netifaces/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1505758293
-SHA256 (netifaces-0.10.6.tar.gz) = 0c4da523f36d36f1ef92ee183f2512f3ceb9a9d2a45f7d19cda5a42c6689ebe0
-SIZE (netifaces-0.10.6.tar.gz) = 25166
diff --git a/net/py3-netifaces/pkg-descr b/net/py3-netifaces/pkg-descr
deleted file mode 100644
index 198cf3a29379..000000000000
--- a/net/py3-netifaces/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Getting network addresses from Python
-
-It's been irritating me for ages that it isn't possible to
-straightforwardly get the network address(es) of the machine
-you're running on from a Python program.
-
-WWW: https://pypi.python.org/pypi/netifaces
diff --git a/net/py3-pysocks/Makefile b/net/py3-pysocks/Makefile
deleted file mode 100644
index 2e5124b014b9..000000000000
--- a/net/py3-pysocks/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Neil Booth
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pysocks
-
-PORTSCOUT= ignore:1
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/py3-urllib3/Makefile b/net/py3-urllib3/Makefile
deleted file mode 100644
index a3b41bff8df2..000000000000
--- a/net/py3-urllib3/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-urllib3
-
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py3-cryptography \
- ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py3-idna \
- ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py3-openssl \
- ${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.7:net/py3-pysocks
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py3-mock \
- ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py3-nose \
- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py3-pytest
-
-PORTSCOUT= ignore:1
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index f2d0b83ffda2..81318a99e5c4 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -12,7 +12,7 @@ COMMENT= Multiprotocol Information Server
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
USE_GITHUB= yes
diff --git a/net/pynids/Makefile b/net/pynids/Makefile
index c5686bea1272..98bf2a1f5ba6 100644
--- a/net/pynids/Makefile
+++ b/net/pynids/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python interface to libnids
LIB_DEPENDS= libnet.so:net/libnet
-USES= pkgconfig python
+USES= pkgconfig python:2.7
USE_GNOME= glib20
USE_PYTHON= distutils autoplist pythonprefix
diff --git a/net/pythondirector/Makefile b/net/pythondirector/Makefile
index 8e5f605eb499..6e5c64151519 100644
--- a/net/pythondirector/Makefile
+++ b/net/pythondirector/Makefile
@@ -13,13 +13,13 @@ COMMENT= TCP load balancer written in Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/doc/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
OPTIONS_DEFINE= DOCS
NO_ARCH= yes
USE_PYTHON= autoplist distutils
-USES= python
+USES= python:2.7
PORTDOCS= *
diff --git a/net/reposado/Makefile b/net/reposado/Makefile
index 487cee63faf7..7b5c4bdda6db 100644
--- a/net/reposado/Makefile
+++ b/net/reposado/Makefile
@@ -16,7 +16,7 @@ GH_TAGNAME= de2fdb6
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
SUB_FILES= pkg-message
diff --git a/net/s3ql/Makefile b/net/s3ql/Makefile
index 5cdb406c6460..467e42cc7906 100644
--- a/net/s3ql/Makefile
+++ b/net/s3ql/Makefile
@@ -11,18 +11,18 @@ COMMENT= File system that stores all its data in the cloud
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apsw>=3.7:databases/py3-apsw \
- ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py3-defusedxml \
- ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py3-requests \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py3-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}llfuse>=0:devel/py3-llfuse \
- ${PYTHON_PKGNAMEPREFIX}dugong>=0:net/py-dugong \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apsw>=3.7:databases/py-apsw@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}llfuse>=0:devel/py-llfuse@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dugong>=0:net/py-dugong@${FLAVOR} \
psmisc>=0:sysutils/psmisc \
ca_root_nss>=0:security/ca_root_nss
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= localbase python:3.3+ sqlite tar:bz2
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils optsuffix
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/s3ql/deltadump.so
diff --git a/net/samba44/Makefile b/net/samba44/Makefile
index 906566f5406c..70438c60e8d6 100644
--- a/net/samba44/Makefile
+++ b/net/samba44/Makefile
@@ -88,12 +88,12 @@ RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive
BUILD_DEPENDS+= p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
PLIST_SUB+= PIDL=""
# External Python modules
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR}
PLIST_SUB+= PY_DNSPYTHON="@comment "
#
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
PLIST_SUB+= PY_ISO8601="@comment "
# talloc
BUILD_DEPENDS+= talloc>=2.1.6:devel/talloc
diff --git a/net/samba45/Makefile b/net/samba45/Makefile
index c7dce1d3838d..5dbd244ed5be 100644
--- a/net/samba45/Makefile
+++ b/net/samba45/Makefile
@@ -123,12 +123,12 @@ RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive
BUILD_DEPENDS+= p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
PLIST_SUB+= PIDL=""
# External Python modules
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR}
PLIST_SUB+= PY_DNSPYTHON="@comment "
#
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
PLIST_SUB+= PY_ISO8601="@comment "
# talloc
BUILD_DEPENDS+= talloc>=2.1.8:devel/talloc
diff --git a/net/samba46/Makefile b/net/samba46/Makefile
index dde952c1affd..804a4495b8c1 100644
--- a/net/samba46/Makefile
+++ b/net/samba46/Makefile
@@ -122,12 +122,12 @@ RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive
# Needed for IDL compiler
BUILD_DEPENDS+= p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
# External Python modules
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR}
PLIST_SUB+= PY_DNSPYTHON="@comment "
#
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
PLIST_SUB+= PY_ISO8601="@comment "
# talloc
BUILD_DEPENDS+= talloc>=2.1.9:devel/talloc
diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index 66f8c064c184..1ba000b9d2a4 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -12,10 +12,10 @@ COMMENT= Powerful interactive packet manipulation program in python
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dnet.so:net/py-libdnet \
- ${PYTHON_SITELIBDIR}/pcap.py:net/py-pcap
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dnet.so:net/py-libdnet@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/pcap.py:net/py-pcap@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
NO_ARCH= yes
@@ -30,9 +30,9 @@ NMAP_DESC= nmap OS signatures database
MANUF_DESC= wireshark's MANUF MAC database
SOX_DESC= Support for VoIP
-PYX_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyx/__init__.py:graphics/py-PyX12
-PYCRYPTO_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Crypto/__init__.py:security/py-pycrypto
-PYGNUPLOT_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Gnuplot/__init__.py:math/py-gnuplot
+PYX_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyx/__init__.py:graphics/py-PyX12@${FLAVOR}
+PYCRYPTO_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Crypto/__init__.py:security/py-pycrypto@${FLAVOR}
+PYGNUPLOT_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Gnuplot/__init__.py:math/py-gnuplot@${FLAVOR}
GRAPH_RUN_DEPENDS= ${LOCALBASE}/bin/MagickCore-config:graphics/ImageMagick \
${LOCALBASE}/bin/dot:graphics/graphviz
P0F_BASE_RUN_DEPENDS= ${LOCALBASE}/etc/p0f.fp:net-mgmt/p0f
diff --git a/net/sippy_b2bua/Makefile b/net/sippy_b2bua/Makefile
index c4f4cbb45a08..f65853e1f73e 100644
--- a/net/sippy_b2bua/Makefile
+++ b/net/sippy_b2bua/Makefile
@@ -11,11 +11,11 @@ DISTNAME= sippy-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
COMMENT= SIP Back-to-back user agent (B2BUA) server with Radius support
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
NO_ARCH= yes
USE_PYTHON= distutils
-USES= python
+USES= python:2.7
PYDISTUTILS_PKGNAME= sippy
DOCSDIR= ${PREFIX}/share/doc/${PYDISTUTILS_PKGNAME}
diff --git a/net/splatd/Makefile b/net/splatd/Makefile
index 0ebfc3327dfd..0e5d4ff521c6 100644
--- a/net/splatd/Makefile
+++ b/net/splatd/Makefile
@@ -13,13 +13,13 @@ COMMENT= Splat is the Scalable Periodic LDAP Attribute Transmogrifier
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${LOCALBASE}/bin/zconfig:devel/py-zconfig \
- ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap
-RUN_DEPENDS= ${LOCALBASE}/bin/zconfig:devel/py-zconfig \
- ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+BUILD_DEPENDS= ${LOCALBASE}/bin/zconfig:devel/py-zconfig@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${FLAVOR}
+RUN_DEPENDS= ${LOCALBASE}/bin/zconfig:devel/py-zconfig@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= splat
USE_RC_SUBR= splatd
diff --git a/net/tcpwatch/Makefile b/net/tcpwatch/Makefile
index c79117e42b7a..e40a475d9115 100644
--- a/net/tcpwatch/Makefile
+++ b/net/tcpwatch/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES= http://hathawaymix.org/Software/TCPWatch/
MAINTAINER= ports@FreeBSD.org
COMMENT= TCP monitoring and logging tool with support for HTTP 1.1
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR}
WRKSRC= ${WRKDIR}/${PORTNAME}
USES= python
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist concurrent optsuffix
.include <bsd.port.mk>
diff --git a/net/tiny-network-utilities/Makefile b/net/tiny-network-utilities/Makefile
index 282d11151313..4e09d7496ae7 100644
--- a/net/tiny-network-utilities/Makefile
+++ b/net/tiny-network-utilities/Makefile
@@ -10,8 +10,8 @@ COMMENT= Minimalistic DHCP, UDP proxy, etc server implementations
LICENSE= BSD4CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \
- ${PYTHON_PKGNAMEPREFIX}hexdump>0:textproc/py-hexdump
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hexdump>0:textproc/py-hexdump@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= yurivict
@@ -25,13 +25,6 @@ FILES_EXEC= tiny-dhcp-server tiny-udp-proxy tiny-udp-anti-nat
FILES_LIB= net_checksums tiny_utils
PLIST_FILES= ${FILES_EXEC:%=bin/%} ${FILES_LIB:%=${PYTHON_SITELIBDIR}/%.py}
-.include <bsd.port.pre.mk>
-
-.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
-
do-install:
.for file_exec in ${FILES_EXEC}
${INSTALL_SCRIPT} ${WRKSRC}/${file_exec}.py \
@@ -43,4 +36,4 @@ do-install:
${STAGEDIR}${PYTHON_SITELIBDIR}/${file_lib}.py
.endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/turses/Makefile b/net/turses/Makefile
index 23c4e1fc635c..de3e9a88beb5 100644
--- a/net/turses/Makefile
+++ b/net/turses/Makefile
@@ -12,11 +12,11 @@ COMMENT= Python Twitter client for the console
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.3.0:devel/py-urwid \
- ${PYTHON_PKGNAMEPREFIX}tweepy>=3.1.0:net/py-tweepy \
- ${PYTHON_PKGNAMEPREFIX}future>=0.14.3:devel/py-future
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
- ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.3.0:devel/py-urwid@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tweepy>=3.1.0:net/py-tweepy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.14.3:devel/py-future@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
@@ -26,7 +26,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3000
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${FLAVOR}
.endif
do-test:
diff --git a/news/hellanzb/Makefile b/news/hellanzb/Makefile
index 3476341ec175..f3c65ef2fd03 100644
--- a/news/hellanzb/Makefile
+++ b/news/hellanzb/Makefile
@@ -15,8 +15,8 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= par2:archivers/par2cmdline \
flac:audio/flac \
shorten:audio/shorten \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted \
- ${PYTHON_PKGNAMEPREFIX}yenc>=0:news/py-yenc \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yenc>=0:news/py-yenc@${FLAVOR} \
mac:audio/mac
USE_PYTHON= distutils
diff --git a/news/py-pynzb/Makefile b/news/py-pynzb/Makefile
index da515918bf07..d85577767537 100644
--- a/news/py-pynzb/Makefile
+++ b/news/py-pynzb/Makefile
@@ -18,6 +18,6 @@ USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= LXML
LXML_DESC= Add support for py-lxml
-LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.1:devel/py-lxml
+LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.1:devel/py-lxml@${FLAVOR}
.include <bsd.port.mk>
diff --git a/news/py-yenc/Makefile b/news/py-yenc/Makefile
index d92939a57aab..bf2de8e9ff12 100644
--- a/news/py-yenc/Makefile
+++ b/news/py-yenc/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= jlaffaye@FreeBSD.org
COMMENT= yenc decoding module for Python in C
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/news/rawdog/Makefile b/news/rawdog/Makefile
index a46c27933e62..2c2c2715570c 100644
--- a/news/rawdog/Makefile
+++ b/news/rawdog/Makefile
@@ -12,9 +12,9 @@ COMMENT= Simple RSS aggregator
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
NO_ARCH= yes
diff --git a/news/sabnzbdplus/Makefile b/news/sabnzbdplus/Makefile
index 17234765ebc7..d79a3a495e02 100644
--- a/news/sabnzbdplus/Makefile
+++ b/news/sabnzbdplus/Makefile
@@ -10,9 +10,9 @@ COMMENT= Web-interface based binary newsgrabber in python, with nzb support
LICENSE= BSD2CLAUSE BSD3CLAUSE GPLv2+ ISCL MIT PSFL
LICENSE_COMB= multi
-RUN_DEPENDS= cheetah:devel/py-cheetah \
- ${PYTHON_SITELIBDIR}/pythonutils/configobj.py:devel/py-utils \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+RUN_DEPENDS= cheetah:devel/py-cheetah@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/pythonutils/configobj.py:devel/py-utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= sabnzbd
@@ -43,9 +43,9 @@ FEEDPARSER_DESC= rss-feed support
YENC_DESC= yenc support
PAR2CMDLINE_RUN_DEPENDS= par2repair:archivers/par2cmdline-tbb
-FEEDPARSER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser
-YENC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sabyenc>=0:news/py-sabyenc
-SSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography
+FEEDPARSER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR}
+YENC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sabyenc>=0:news/py-sabyenc@${PY_FLAVOR}
+SSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR}
UNRAR_RUN_DEPENDS= unrar:archivers/unrar
7ZIP_RUN_DEPENDS= 7za:archivers/p7zip
diff --git a/news/xpn/Makefile b/news/xpn/Makefile
index cc71fb851338..6ad91e8fdfb8 100644
--- a/news/xpn/Makefile
+++ b/news/xpn/Makefile
@@ -12,8 +12,8 @@ COMMENT= X Python Newsreader
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>=2.24.0:x11-toolkits/py-gtk2 \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.9:databases/py-sqlite3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>=2.24.0:x11-toolkits/py-gtk2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.9:databases/py-sqlite3@${PY_FLAVOR}
NO_BUILD= yes
diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile
index a6fab4dbb36f..9c860fd0795b 100644
--- a/polish/ekg2/Makefile
+++ b/polish/ekg2/Makefile
@@ -70,7 +70,7 @@ PERL_CONFIGURE_WITH= perl
PERL_USES= perl5
PYTHON_CONFIGURE_WITH= python
-PYTHON_USES= python shebangfix
+PYTHON_USES= python:2.7 shebangfix
SHEBANG_FILES= contrib/python/notify-bubble.py
SQLITE_CONFIGURE_WITH= sqlite3
diff --git a/ports-mgmt/portell/Makefile b/ports-mgmt/portell/Makefile
index 55279fd0001e..064739c70ceb 100644
--- a/ports-mgmt/portell/Makefile
+++ b/ports-mgmt/portell/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.freebsdcluster.org/~mich/software/
MAINTAINER= mich@FreeBSD.org
COMMENT= Quick display of FreeBSD port descriptions
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb@${PY_FLAVOR}
USES= python:-2.7 shebangfix zip
SHEBANG_FILES= *.py
diff --git a/ports-mgmt/py-pytoport/Makefile b/ports-mgmt/py-pytoport/Makefile
index 51e67535120d..23aa1147d1a8 100644
--- a/ports-mgmt/py-pytoport/Makefile
+++ b/ports-mgmt/py-pytoport/Makefile
@@ -16,18 +16,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
GH_ACCOUNT= freebsd
GH_PROJECT= pytoport
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}spdx-lookup>=0.3.0:misc/py-spdx-lookup \
- ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}spdx-lookup>=0.3.0:misc/py-spdx-lookup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${FLAVOR}
USES= python:3.3+
USE_GITHUB= yes
USE_PYTHON= autoplist distutils
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/print/Makefile b/print/Makefile
index f402496f5232..1fb59416065b 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -205,8 +205,6 @@
SUBDIR += py-rtf
SUBDIR += py-stapler
SUBDIR += py-trml2pdf
- SUBDIR += py3-fonttools
- SUBDIR += py3-pycups
SUBDIR += qpdf
SUBDIR += qpdfview
SUBDIR += qt5-printsupport
diff --git a/print/biblio-py/Makefile b/print/biblio-py/Makefile
index 8d68777a146b..8fe0d6547f80 100644
--- a/print/biblio-py/Makefile
+++ b/print/biblio-py/Makefile
@@ -11,7 +11,7 @@ COMMENT= Package to manage bibliography written in python
LICENSE= GPLv2
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/print/cloudprint/Makefile b/print/cloudprint/Makefile
index 83319ce6462d..cf0be1b9b889 100644
--- a/print/cloudprint/Makefile
+++ b/print/cloudprint/Makefile
@@ -10,10 +10,10 @@ COMMENT= Google Cloud Print proxy for local CUPS printers
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>=0:print/py-pycups \
- ${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse \
- ${PYTHON_PKGNAMEPREFIX}daemon>0:devel/py-daemon \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>=0:print/py-pycups@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}daemon>0:devel/py-daemon@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= armooo
@@ -21,7 +21,7 @@ GH_TAGNAME= 108b9f0
NO_ARCH= yes
USES= python
-USE_PYTHON= autoplist concurrent distutils
+USE_PYTHON= autoplist concurrent distutils optsuffix
USE_RC_SUBR= ${PORTNAME}
USERS= cups
diff --git a/print/dot2tex/Makefile b/print/dot2tex/Makefile
index e3296cf0cfda..53dc8fb5a4c7 100644
--- a/print/dot2tex/Makefile
+++ b/print/dot2tex/Makefile
@@ -11,7 +11,7 @@ COMMENT= Graphviz to LaTeX converter
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.4.8:devel/py-pyparsing \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.4.8:devel/py-pyparsing@${FLAVOR} \
dot:graphics/graphviz
NO_ARCH= yes
diff --git a/print/frescobaldi/Makefile b/print/frescobaldi/Makefile
index e2c50fa49da6..cdd348d65da3 100644
--- a/print/frescobaldi/Makefile
+++ b/print/frescobaldi/Makefile
@@ -13,14 +13,14 @@ COMMENT= Music score editor for lilypond
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4 \
- ${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly@${FLAVOR}
-USES= gettext kde:4 python:-3.4 desktop-file-utils
+USES= gettext kde:4 python:2.7 desktop-file-utils
USE_GITHUB= yes
GH_ACCOUNT= wbsoft
USE_KDE= kdelibs pykde4_build pykde4_run
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist optsuffix
INSTALLS_ICONS= yes
NO_ARCH= yes
diff --git a/print/pkipplib/Makefile b/print/pkipplib/Makefile
index 292c4388ee28..6c82bba86ae1 100644
--- a/print/pkipplib/Makefile
+++ b/print/pkipplib/Makefile
@@ -12,7 +12,7 @@ COMMENT= Create and parse IPP requests
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
NO_ARCH= yes
diff --git a/print/pkpgcounter/Makefile b/print/pkpgcounter/Makefile
index 77efeada0cd9..06a79e483518 100644
--- a/print/pkpgcounter/Makefile
+++ b/print/pkpgcounter/Makefile
@@ -10,13 +10,13 @@ MASTER_SITES= http://www.pykota.com/software/pkpgcounter/download/tarballs/
MAINTAINER= ports@FreeBSD.org
COMMENT= Count pages and ink coverage percent
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
PORTDOCS= README COPYING BUGS CREDITS NEWS
OPTIONS_DEFINE= DOCS
diff --git a/print/py-fonttools/Makefile b/print/py-fonttools/Makefile
index d864e436f15d..1281fb31a8cd 100644
--- a/print/py-fonttools/Makefile
+++ b/print/py-fonttools/Makefile
@@ -13,7 +13,7 @@ COMMENT= Open source library for manipulating fonts, written in Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES?= python zip
+USES= python zip
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
diff --git a/print/py-pollyreports/Makefile b/print/py-pollyreports/Makefile
index dc493d245647..df689d1b17f8 100644
--- a/print/py-pollyreports/Makefile
+++ b/print/py-pollyreports/Makefile
@@ -19,6 +19,6 @@ USE_PYTHON= autoplist distutils
OPTIONS_DEFINE= REPORTLAB
REPORTLAB_DESC= Install Reportlab
-REPORTLAB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>=3.0:print/py-reportlab
+REPORTLAB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>=3.0:print/py-reportlab@${FLAVOR}
.include <bsd.port.mk>
diff --git a/print/py-pycups/Makefile b/print/py-pycups/Makefile
index eaf784e0d017..bc669d2836e8 100644
--- a/print/py-pycups/Makefile
+++ b/print/py-pycups/Makefile
@@ -17,9 +17,9 @@ LICENSE_COMB= dual
LIB_DEPENDS= libcups.so:print/cups
USE_PYTHON= autoplist concurrent distutils
-USES?= iconv localbase python tar:bzip2
+USES= iconv localbase python tar:bzip2
-SLAVEDIRS= print/py3-pycups
+SLAVEDIRS= print/py-pycups@${PY_FLAVOR}
.include <bsd.port.pre.mk>
diff --git a/print/py-pyscript/Makefile b/print/py-pyscript/Makefile
index 4ba941c5b3e6..7f06ce69597b 100644
--- a/print/py-pyscript/Makefile
+++ b/print/py-pyscript/Makefile
@@ -17,7 +17,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES
PYSCRIPT_MANUAL=doc/manual/pyscript.pdf
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
USE_TEX= latex dvipsk
diff --git a/print/py-qt5-printsupport/Makefile b/print/py-qt5-printsupport/Makefile
index 4f93a56c5265..730f77f2f4c4 100644
--- a/print/py-qt5-printsupport/Makefile
+++ b/print/py-qt5-printsupport/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
USES= python pyqt:5
USE_GL= gl
USE_PYQT= sip_build core_run widgets_run
+USE_PYTHON= flavors
USE_QT5= core gui printsupport widgets qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/print/py-relatorio/Makefile b/print/py-relatorio/Makefile
index 7d2c04b96531..c9a0299ef49e 100644
--- a/print/py-relatorio/Makefile
+++ b/print/py-relatorio/Makefile
@@ -10,12 +10,12 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Templating library able to output odt and pdf files
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi \
- ${PYTHON_PKGNAMEPREFIX}lxml>=2.2:devel/py-lxml
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycha>=0.5.0:graphics/py-pycha \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.07:devel/py-yaml
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.2:devel/py-lxml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycha>=0.5.0:graphics/py-pycha@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.07:devel/py-yaml@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 318f55060f0d..6c42b28eb632 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -16,7 +16,7 @@ COMMENT= Library to create PDF documents using the Python language
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= distutils autoplist
diff --git a/print/py-reportlab1/Makefile b/print/py-reportlab1/Makefile
index c38e0e7cbdd2..f85daf78cedc 100644
--- a/print/py-reportlab1/Makefile
+++ b/print/py-reportlab1/Makefile
@@ -21,7 +21,7 @@ CONFLICTS= py*-reportlab[^1]-[^1].* \
PORTSCOUT= ignore:1 # Last version of 1.X branch
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/reportlab_${PORTVERSION:S/./_/g}/reportlab
diff --git a/print/py-stapler/Makefile b/print/py-stapler/Makefile
index b3ee8ef14499..c65d60dc7cc2 100644
--- a/print/py-stapler/Makefile
+++ b/print/py-stapler/Makefile
@@ -14,8 +14,8 @@ COMMENT= Manipulate PDF documents from the command line
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}more-itertools>=2.2:devel/py-more-itertools \
- ${PYTHON_PKGNAMEPREFIX}pdf2>=1.24:print/py-pdf2
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}more-itertools>=2.2:devel/py-more-itertools@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pdf2>=1.24:print/py-pdf2@${FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/print/py-trml2pdf/Makefile b/print/py-trml2pdf/Makefile
index 686b0dd7058a..30261c2ba8b0 100644
--- a/print/py-trml2pdf/Makefile
+++ b/print/py-trml2pdf/Makefile
@@ -11,13 +11,14 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@caomhin.org
COMMENT= Tiny RML2PDF easily creates PDF documents
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1@${FLAVOR}
NO_BUILD= yes
NO_ARCH= yes
-USES= python shebangfix tar:bzip2
+USES= python:2.7 shebangfix tar:bzip2
+USE_PYTHON= flavors
SHEBANG_FILES= trml2pdf/trml2pdf.py
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/print/py3-fonttools/Makefile b/print/py3-fonttools/Makefile
deleted file mode 100644
index cd3193d848f6..000000000000
--- a/print/py3-fonttools/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-fonttools
-
-PORTSCOUT= ignore:1
-
-USES= python:3 zip
-
-.include "${MASTERDIR}/Makefile"
diff --git a/print/py3-pycups/Makefile b/print/py3-pycups/Makefile
deleted file mode 100644
index dd9502fde78d..000000000000
--- a/print/py3-pycups/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-USES= iconv localbase python:3.3+ tar:bzip2
-
-PORTSCOUT= ignore:1
-
-MASTERDIR= ${.CURDIR}/../py-pycups
-
-.include "${MASTERDIR}/Makefile"
diff --git a/print/ttfquery/Makefile b/print/ttfquery/Makefile
index a42ba8041470..a2d470387716 100644
--- a/print/ttfquery/Makefile
+++ b/print/ttfquery/Makefile
@@ -14,11 +14,11 @@ COMMENT= FontTools-based package for querying system fonts
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/license.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>0:print/py-fonttools \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>0:print/py-fonttools@${FLAVOR} \
${PYNUMPY}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/science/avogadro/Makefile b/science/avogadro/Makefile
index b50c786f73c0..9cbc8598882d 100644
--- a/science/avogadro/Makefile
+++ b/science/avogadro/Makefile
@@ -35,10 +35,10 @@ OPTIONS_SUB= yes
PYTHON_USES= python:2
PYTHON_BUILD_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip
+ ${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip@${PY_FLAVOR}
PYTHON_LIB_DEPENDS= libboost_python.so:devel/boost-python-libs
PYTHON_RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip
+ ${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip@${PY_FLAVOR}
PYTHON_CMAKE_ON= -DENABLE_PYTHON=ON \
-DPYTHON_INCLUDE_DIR:PATH=${WRKDIR}/include/${PYTHON_VERSION}
PYTHON_CMAKE_OFF= -DENABLE_PYTHON=OFF
diff --git a/science/brian/Makefile b/science/brian/Makefile
index 4edc38975fa0..c9e85805a40f 100644
--- a/science/brian/Makefile
+++ b/science/brian/Makefile
@@ -9,12 +9,12 @@ MASTER_SITES= CHEESESHOP
MAINTAINER= wen@FreeBSD.org
COMMENT= Clock-driven simulator for spiking neural networks
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.1.0,1:math/py-numpy \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.6.0:science/py-scipy \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.90.1:math/py-matplotlib
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.1.0,1:math/py-numpy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.6.0:science/py-scipy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.90.1:math/py-matplotlib@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 82f0d7dfb745..cd5d21b80ca1 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -90,7 +90,7 @@ NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf
NETCDF_CMAKE_ON= -DNETCDF:BOOL=YES -DHDF:BOOL=NO
NETCDF_CMAKE_OFF= -DNETCDF:BOOL=NO
-PYTHON_USES= python
+PYTHON_USES= python:2.7
PYTHON_BUILD_DEPENDS= ${PYNUMPY}
PYTHON_RUN_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib
diff --git a/science/gramps/Makefile b/science/gramps/Makefile
index eb3b098c4f41..77ea9d7ff708 100644
--- a/science/gramps/Makefile
+++ b/science/gramps/Makefile
@@ -13,9 +13,9 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libosmgpsmap-1.0.so:x11-toolkits/osm-gps-map
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb3>0:databases/py3-bsddb3 \
- ${PYTHON_PKGNAMEPREFIX}pyicu>=1.8:devel/py3-pyicu \
- ${PYTHON_PKGNAMEPREFIX}pygraphviz>=0:graphics/py3-pygraphviz \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb3>0:databases/py-bsddb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyicu>=1.8:devel/py-pyicu@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygraphviz>=0:graphics/py-pygraphviz@${PY_FLAVOR} \
xdg-open:devel/xdg-utils
USE_GITHUB= yes
@@ -24,7 +24,7 @@ GH_ACCOUNT= gramps-project
NO_ARCH= yes
USES= desktop-file-utils gettext shared-mime-info python:3.2+
USE_GNOME= cairo gtk30 intltool librsvg2 pango py3gobject3
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils optsuffix
CONFIGURE_ARGS= --disable-mime-install
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
@@ -39,7 +39,7 @@ TTFFREEFONT_DESC= More font support in reports
GEXIV_LIB_DEPENDS= libgexiv2.so:graphics/gexiv2
GTKSPELL_LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3
-PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py3-pillow
+PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
RCS_RUN_DEPENDS= rcsdiff:devel/rcs
TTFFREEFONT_RUN_DEPENDS=${LOCALBASE}/share/fonts/freefont-ttf/FreeMono.ttf:x11-fonts/freefont-ttf
diff --git a/science/gwyddion/Makefile b/science/gwyddion/Makefile
index c707924f7f3b..9200c45cc9b1 100644
--- a/science/gwyddion/Makefile
+++ b/science/gwyddion/Makefile
@@ -40,7 +40,7 @@ OPTIONS_SUB= yes
PERL_USES= perl5
PERL_CONFIGURE_WITH= perl
-PYTHON_USES= python
+PYTHON_USES= python:2.7
PYTHON_USE= gnome=pygtksourceview
PYTHON_CONFIGURE_ENABLE= pygwy
PYTHON_CONFIGURE_WITH= gtksourceview python
diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index 19b58006e6a5..b08794248b46 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -42,7 +42,7 @@ USE_GL= gl
USE_XORG= x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm
USE_LDCONFIG= yes
USE_GSTREAMER= yes
-USES= alias desktop-file-utils cmake:outsource jpeg python shebangfix
+USES= alias desktop-file-utils cmake:outsource jpeg python:2.7 shebangfix
INSTALLS_ICONS= yes
CMAKE_ARGS+= -DBUILD_SHARED_LIBS="ON" \
diff --git a/science/psychopy/Makefile b/science/psychopy/Makefile
index 61cfe3f21eae..2d2c2f48db6c 100644
--- a/science/psychopy/Makefile
+++ b/science/psychopy/Makefile
@@ -11,14 +11,14 @@ COMMENT= Psychophysics toolkit for Python
LICENSE= GPLv3+
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=0:devel/py-configobj
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=0:graphics/py-pyglet \
- ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.90.1:math/py-matplotlib \
- ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.6.0:science/py-scipy \
- ${PYTHON_PKGNAMEPREFIX}openpyxl>0:textproc/py-openpyxl \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=0:devel/py-configobj@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=0:graphics/py-pyglet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.90.1:math/py-matplotlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.6.0:science/py-scipy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openpyxl>0:textproc/py-openpyxl@${FLAVOR} \
dejavu>0:x11-fonts/dejavu \
${PYGAME} \
${PYNUMPY}
@@ -27,7 +27,7 @@ NO_ARCH= yes
USE_GITHUB= yes
-USES= fortran python
+USES= fortran python:2.7
USE_PYTHON= autoplist distutils
USE_WX= 2.8
WX_COMPS= python
@@ -45,7 +45,7 @@ OPTIONS_DEFINE_i386= PYGLET
OPTIONS_DEFAULT_i386= PYGLET
PYGLET_DESC= Drawing support via Pyglet
-PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:graphics/py-pyglet
+PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:graphics/py-pyglet@${FLAVOR}
.include <bsd.port.options.mk>
diff --git a/science/py-DendroPy/Makefile b/science/py-DendroPy/Makefile
index 6f0995c6a479..54fc6f3aab7c 100644
--- a/science/py-DendroPy/Makefile
+++ b/science/py-DendroPy/Makefile
@@ -12,6 +12,10 @@ COMMENT= Phylogenetic computing library
LICENSE= BSD3CLAUSE
+py34_BROKEN= does not package
+py35_BROKEN= does not package
+py36_BROKEN= does not package
+
USES= python
USE_PYTHON= distutils
diff --git a/science/py-cdo/Makefile b/science/py-cdo/Makefile
index 0434b8626520..6b3554eab634 100644
--- a/science/py-cdo/Makefile
+++ b/science/py-cdo/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python binding to CDO (Climate Data Operators)
LICENSE= GPLv2
RUN_DEPENDS= cdo:science/cdo \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/science/py-h5py/Makefile b/science/py-h5py/Makefile
index 6e0e4ae7ed4c..5670f0092d62 100644
--- a/science/py-h5py/Makefile
+++ b/science/py-h5py/Makefile
@@ -13,17 +13,16 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/licenses/license.txt
BUILD_DEPENDS= ${PYNUMPY} \
- cython:lang/cython \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${FLAVOR}
LIB_DEPENDS= libhdf5.so:science/hdf5
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
USE_GITHUB= yes
USES= python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils cython
PORTDOCS= *
PORTEXAMPLES= multiprocessing_example.py swmr_multiprocess.py \
diff --git a/science/py-hcluster/Makefile b/science/py-hcluster/Makefile
index 0a0021bf11d9..bbbaeffacca9 100644
--- a/science/py-hcluster/Makefile
+++ b/science/py-hcluster/Makefile
@@ -15,10 +15,10 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
post-install:
diff --git a/science/py-mdp/Makefile b/science/py-mdp/Makefile
index f0be28f32e80..7ec041c363db 100644
--- a/science/py-mdp/Makefile
+++ b/science/py-mdp/Makefile
@@ -26,7 +26,7 @@ SCIPY_DESC= Instal SciPy versions of eigensolver, FFT and convolution
LIBSVM_RUN_DEPENDS= libsvm>2.91:science/libsvm \
libsvm-python>2.91:science/libsvm-python
-PP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pp>0:devel/py-pp
-SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.5.2:science/py-scipy
+PP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pp>0:devel/py-pp@${FLAVOR}
+SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.5.2:science/py-scipy@${FLAVOR}
.include <bsd.port.mk>
diff --git a/science/py-mlpy/Makefile b/science/py-mlpy/Makefile
index 0af7310c0d47..7203cdf74cac 100644
--- a/science/py-mlpy/Makefile
+++ b/science/py-mlpy/Makefile
@@ -13,8 +13,7 @@ COMMENT= High performance Python package for predictive modeling
LICENSE= GPLv3
-BUILD_DEPENDS= ${PYNUMPY} \
- cython>0:lang/cython
+BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS:= ${BUILD_DEPENDS}
LIB_DEPENDS= libgsl.so:math/gsl
@@ -22,6 +21,6 @@ USE_LDCONFIG= yes
CFLAGS+= -I${LOCALBASE}/include -I${PYTHON_SITELIBDIR}/numpy/core
LDFLAGS+= -L${LOCALBASE}/lib
USES= python
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist cython
.include <bsd.port.mk>
diff --git a/science/py-netCDF4/Makefile b/science/py-netCDF4/Makefile
index 025e0c4723a9..65d2ac91acb7 100644
--- a/science/py-netCDF4/Makefile
+++ b/science/py-netCDF4/Makefile
@@ -14,8 +14,7 @@ COMMENT= Python Interface to the NetCDF Library (versions 3 and 4)
LICENSE= MIT
-BUILD_DEPENDS= ${PYNUMPY} \
- ${LOCALBASE}/bin/cython:lang/cython
+BUILD_DEPENDS= ${PYNUMPY}
LIB_DEPENDS= libhdf5.so:science/hdf5 \
libnetcdf.so:science/netcdf
RUN_DEPENDS:= ${BUILD_DEPENDS}
@@ -23,7 +22,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= DOCS EXAMPLES
USES= python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils cython
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/science/py-obspy/Makefile b/science/py-obspy/Makefile
index e8d13f2be6b6..1ee2a8345062 100644
--- a/science/py-obspy/Makefile
+++ b/science/py-obspy/Makefile
@@ -14,17 +14,17 @@ COMMENT= Python framework for seismological observatories
LICENSE= LGPL3
BUILD_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.9.0:science/py-scipy \
- ${PYTHON_PKGNAMEPREFIX}future>=0.12.4:devel/py-future \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1.0:math/py-matplotlib \
- ${PYTHON_PKGNAMEPREFIX}lxml>=2.2:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}suds>=0.4.0:net/py-suds \
- ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.9.0:science/py-scipy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.12.4:devel/py-future@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1.0:math/py-matplotlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.2:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}suds>=0.4.0:net/py-suds@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= fortran python shebangfix zip
+USES= fortran python:2.7 shebangfix zip
SHEBANG_FILES= obspy/taup/tests/data/TauP_test_data/gendata.sh
USE_LDCONFIG= yes
LDFLAGS+= -shared
diff --git a/science/py-paida/Makefile b/science/py-paida/Makefile
index e2e081b0452e..fe44d778faf5 100644
--- a/science/py-paida/Makefile
+++ b/science/py-paida/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-3.2.1_2.10.1
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-3.2.1_2.10.1
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR}
MAINTAINER= ports@FreeBSD.org
COMMENT= Pure Python scientific analysis package
diff --git a/science/py-pysal/Makefile b/science/py-pysal/Makefile
index 83edf134417a..05e2649d9067 100644
--- a/science/py-pysal/Makefile
+++ b/science/py-pysal/Makefile
@@ -14,10 +14,10 @@ COMMENT= Cross-platform library of spatial analysis functions
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.3,1:math/py-numpy \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.3,1:math/py-numpy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-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
diff --git a/science/py-pyteomics.biolccc/Makefile b/science/py-pyteomics.biolccc/Makefile
index d3ea547106ba..2c567cdf3933 100644
--- a/science/py-pyteomics.biolccc/Makefile
+++ b/science/py-pyteomics.biolccc/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python bindings for BioLCCC
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/science/py-pyteomics/Makefile b/science/py-pyteomics/Makefile
index b1df14781462..25666c544c9c 100644
--- a/science/py-pyteomics/Makefile
+++ b/science/py-pyteomics/Makefile
@@ -12,11 +12,11 @@ COMMENT= Python modules for proteomics data analysis
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${FLAVOR} \
${PYNUMPY}
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/science/py-scikit-fuzzy/Makefile b/science/py-scikit-fuzzy/Makefile
index bd80e9c81ee5..6a2c2a309094 100644
--- a/science/py-scikit-fuzzy/Makefile
+++ b/science/py-scikit-fuzzy/Makefile
@@ -14,11 +14,11 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}networkx>=1.9.0:math/py-networkx \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.9.0:science/py-scipy
+ ${PYTHON_PKGNAMEPREFIX}networkx>=1.9.0:math/py-networkx@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.9.0:science/py-scipy@${FLAVOR}
BUILD_DEPENDS= ${RUN_DEPENDS}
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/science/py-scikit-learn/Makefile b/science/py-scikit-learn/Makefile
index e70b4428af35..75633d6dd056 100644
--- a/science/py-scikit-learn/Makefile
+++ b/science/py-scikit-learn/Makefile
@@ -12,7 +12,7 @@ MAINTAINER= demon@FreeBSD.org
COMMENT= Machine learning algorithms for python
BUILD_DEPENDS= ${PYNUMPY} \
- ${PYTHON_SITELIBDIR}/scipy/version.py:science/py-scipy
+ ${PYTHON_SITELIBDIR}/scipy/version.py:science/py-scipy@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= fortran python
diff --git a/science/py-scikit-sparse/Makefile b/science/py-scikit-sparse/Makefile
index 19fee0e164f8..3f62950686ee 100644
--- a/science/py-scikit-sparse/Makefile
+++ b/science/py-scikit-sparse/Makefile
@@ -15,13 +15,12 @@ COMMENT= Sparse matrix package
LICENSE= BSD2CLAUSE
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_SITELIBDIR}/scipy/version.py:science/py-scipy
-BUILD_DEPENDS= ${RUN_DEPENDS} \
- cython>0:lang/cython
+ ${PYTHON_SITELIBDIR}/scipy/version.py:science/py-scipy@${FLAVOR}
+BUILD_DEPENDS= ${RUN_DEPENDS}
LIB_DEPENDS= libumfpack.so:math/suitesparse
USES= fortran python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils cython
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -shared
diff --git a/science/py-scimath/Makefile b/science/py-scimath/Makefile
index 41b84e61ff4f..8043a7b4d7ac 100644
--- a/science/py-scimath/Makefile
+++ b/science/py-scimath/Makefile
@@ -14,11 +14,11 @@ COMMENT= Scientific and Mathematical calculations
LICENSE= BSD3CLAUSE LGPL3
LICENSE_COMB= dual
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=3.6.0:devel/py-traits \
- ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=3.6.0:devel/py-traits@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/science/py-scoria/Makefile b/science/py-scoria/Makefile
index e1cb4de53f73..8e83967dc5bf 100644
--- a/science/py-scoria/Makefile
+++ b/science/py-scoria/Makefile
@@ -12,7 +12,7 @@ COMMENT= Lightweight molecule manipulation codebase
LICENSE= APACHE20
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/science/py-tensorflow/Makefile b/science/py-tensorflow/Makefile
index d350a019802c..ec015d60f2f1 100644
--- a/science/py-tensorflow/Makefile
+++ b/science/py-tensorflow/Makefile
@@ -14,21 +14,21 @@ LICENSE= APACHE20
BROKEN= fails to build
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel \
- ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${FLAVOR} \
bash:shells/bash
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy \
- ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.8:textproc/py-markdown \
- ${PYTHON_PKGNAMEPREFIX}bleach>=1.4.2:www/py-bleach \
- ${PYTHON_PKGNAMEPREFIX}html5lib>=0.9999999:www/py-html5lib \
- ${PYTHON_PKGNAMEPREFIX}protobuf>=3.2.0:devel/py-protobuf \
- ${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel \
- ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}backports.weakref>=0:devel/py-backports.weakref \
- ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11.10:www/py-werkzeug
-
-USES= python shebangfix
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.8:textproc/py-markdown@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bleach>=1.4.2:www/py-bleach@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html5lib>=0.9999999:www/py-html5lib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.2.0:devel/py-protobuf@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}backports.weakref>=0:devel/py-backports.weakref@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11.10:www/py-werkzeug@${FLAVOR}
+
+USES= python:2.7 shebangfix
USE_GITHUB= yes
GH_TUPLE= amutu:tensorflow_third_party:v${PORTVERSION}:tf/tensorflow_third_party
diff --git a/science/pybrain/Makefile b/science/pybrain/Makefile
index db29fb0c58df..8de02fba8bb9 100644
--- a/science/pybrain/Makefile
+++ b/science/pybrain/Makefile
@@ -10,11 +10,11 @@ COMMENT= PyBrain is the swiss army knife for neural networking
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.7.1:science/py-scipy
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.7.1:science/py-scipy@${FLAVOR}
USE_GITHUB= yes
USES= python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils concurrent optsuffix
.include <bsd.port.mk>
diff --git a/science/pycdf/Makefile b/science/pycdf/Makefile
index 92d9ffe5007c..04d5be53b4f6 100644
--- a/science/pycdf/Makefile
+++ b/science/pycdf/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
LDFLAGS+= "-L${LOCALBASE}/lib"
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
post-install:
diff --git a/science/sigrok-firmware-utils/Makefile b/science/sigrok-firmware-utils/Makefile
index d7a16709c020..0124e2caa1f9 100644
--- a/science/sigrok-firmware-utils/Makefile
+++ b/science/sigrok-firmware-utils/Makefile
@@ -15,7 +15,7 @@ COMMENT= Sigrok firmware extraction utils
LICENSE= GPLv2
-USES= python:3
+USES= python:3.4+
NO_BUILD= yes
PORTDOCS= README.parsepe
diff --git a/science/tfel/Makefile b/science/tfel/Makefile
index 2ac37e823fd7..ff18f4d06630 100644
--- a/science/tfel/Makefile
+++ b/science/tfel/Makefile
@@ -22,10 +22,9 @@ GNUPLOT_BUILD_DEPENDS= gnuplot:math/gnuplot
GNUPLOT_RUN_DEPENDS= gnuplot:math/gnuplot
PYTHON_LIB_DEPENDS= libboost_python.so:devel/boost-python-libs
-PYTHON_USES= localbase python
+PYTHON_USES= localbase python:2.7
PYTHON_CONFIGURE_ARGS= --enable-python-bindings
PYTHON_CONFIGURE_WITH= boost=${LOCALBASE}
-PYTHON_USES= localbase python
USES= libtool tar:bzip2
GNU_CONFIGURE= yes
diff --git a/science/veusz/Makefile b/science/veusz/Makefile
index ddc7a200ce2f..d150d1984c1d 100644
--- a/science/veusz/Makefile
+++ b/science/veusz/Makefile
@@ -15,7 +15,7 @@ LICENSE= GPLv2
RUN_DEPENDS= ${PYNUMPY}
BUILD_DEPENDS:= ${RUN_DEPENDS}
-USES= pyqt:4 python
+USES= pyqt:4 python:2.7
USE_PYQT= gui svg
USE_PYTHON= distutils autoplist
diff --git a/security/Makefile b/security/Makefile
index f2d04aa304fb..d5fce145d7ea 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1002,14 +1002,6 @@
SUBDIR += py-zope.securitypolicy
SUBDIR += py-zope.session
SUBDIR += py-zxcvbn-python
- SUBDIR += py3-certifi
- SUBDIR += py3-cryptography
- SUBDIR += py3-ecdsa
- SUBDIR += py3-libnacl
- SUBDIR += py3-openssl
- SUBDIR += py3-pbkdf2
- SUBDIR += py3-pyaes
- SUBDIR += py3-pycrypto
SUBDIR += qtkeychain-qt4
SUBDIR += qtkeychain-qt5
SUBDIR += quantis
diff --git a/security/arm/Makefile b/security/arm/Makefile
index 8d895492914d..b0cf62ad14f4 100644
--- a/security/arm/Makefile
+++ b/security/arm/Makefile
@@ -16,7 +16,7 @@ COMMENT= Terminal status monitor for Tor
LICENSE= GPLv3
USE_PYTHON= distutils
-USES= python shebangfix tar:bzip2
+USES= python:2.7 shebangfix tar:bzip2
SHEBANG_FILES= src/resources/torrcOverride/override.py
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/security/binwalk/Makefile b/security/binwalk/Makefile
index 6a4f8f0c0049..56cb261f367a 100644
--- a/security/binwalk/Makefile
+++ b/security/binwalk/Makefile
@@ -13,7 +13,7 @@ LICENSE= MIT
USES= python
USE_GITHUB= yes
GH_ACCOUNT= devttys0
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils optsuffix concurrent
RUN_DEPENDS= 7z:archivers/p7zip \
cabextract:archivers/cabextract
diff --git a/security/blindelephant/Makefile b/security/blindelephant/Makefile
index 85988c2d5f55..f28605122a62 100644
--- a/security/blindelephant/Makefile
+++ b/security/blindelephant/Makefile
@@ -14,7 +14,7 @@ COMMENT= Fingerprint the web applications used by a web site
LICENSE= LGPL3
-USES= python tar:bzip2
+USES= python:2.7 tar:bzip2
USE_PYTHON= distutils
NO_ARCH= yes
diff --git a/security/broccoli/Makefile b/security/broccoli/Makefile
index 8c618575f997..1f1772dd1e41 100644
--- a/security/broccoli/Makefile
+++ b/security/broccoli/Makefile
@@ -43,7 +43,7 @@ PYTHON_DESC= Build python bindings for broccoli
RUBY_DESC= Build ruby bindings for broccoli
DEBUG_CMAKE_ON= -D ENABLE_DEBUG:BOOL=true
-PYTHON_USES= python
+PYTHON_USES= python:2.7
PYTHON_CMAKE_ON= -D PY_MOD_INSTALL_DIR:PATH=${PYTHON_SITELIBDIR}
PYTHON_CMAKE_OFF= -D DISABLE_PYTHON_BINDINGS:BOOL=true
RUBY_USE= ruby=yes
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index d13bab754eff..80f3a98434c0 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -76,10 +76,10 @@ USE_QT5= buildtools_build core testlib
. if ${SLAVEPORT} == "python"
BUILD_DEPENDS+= swig3.0:devel/swig30 \
- ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
+ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR}
USES+= python
-USE_PYTHON= py3kplist
+USE_PYTHON= py3kplist flavors
CONFIGURE_ENV+= SWIG=${LOCALBASE}/bin/swig3.0
PLIST_SUB+= VERSION=${PORTVERSION}
. endif
diff --git a/security/kedpm/Makefile b/security/kedpm/Makefile
index 5615f54fcf5c..e59edbc441ec 100644
--- a/security/kedpm/Makefile
+++ b/security/kedpm/Makefile
@@ -12,11 +12,11 @@ COMMENT= Simple application for managing personal data
LICENSE= GPLv2+
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_GNOME= pygtk2
USE_PYTHON= autoplist distutils
diff --git a/security/lasso/Makefile b/security/lasso/Makefile
index c4ecd438fa99..ec9fc3aa3d6a 100644
--- a/security/lasso/Makefile
+++ b/security/lasso/Makefile
@@ -51,9 +51,9 @@ PLIST_SUB+= PHP5="@comment "
.if ${PORT_OPTIONS:MPYTHON}
CONFIGURE_ARGS+= --enable-python
PLIST_SUB+= PYTHON=""
-USES+= python
+USES+= python:2.7
.else
-USES+= python:build
+USES+= python:2.7,build
CONFIGURE_ARGS+= --disable-python
PLIST_SUB+= PYTHON="@comment "
.endif
diff --git a/security/libpwquality/pkg-plist b/security/libpwquality/pkg-plist
index f0ec5c926869..b764767e7ac8 100644
--- a/security/libpwquality/pkg-plist
+++ b/security/libpwquality/pkg-plist
@@ -7,7 +7,7 @@ lib/libpwquality.so
lib/libpwquality.so.1
lib/libpwquality.so.1.0.2
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pwquality.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pwquality-1.2.4-py2.7.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pwquality-1.2.4-py%%PYTHON_VER%%.egg-info
libdata/pkgconfig/pwquality.pc
man/man1/pwmake.1.gz
man/man1/pwscore.1.gz
diff --git a/security/morphis/Makefile b/security/morphis/Makefile
index 1173446049e5..d93413597fdf 100644
--- a/security/morphis/Makefile
+++ b/security/morphis/Makefile
@@ -14,8 +14,8 @@ BROKEN= Does not package
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>0:databases/py-sqlalchemy11
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>0:databases/py-sqlalchemy11@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= yurivict
@@ -27,13 +27,6 @@ PLIST_SUB= USER=${USER} GROUP=${GROUP}
USES= python:3.4+
NO_ARCH= yes
-.include <bsd.port.pre.mk>
-
-.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
-
USER= nobody
GROUP= nobody
@@ -52,4 +45,4 @@ do-install:
${INSTALL_SCRIPT} ${WRKDIR}/morphis-cmd ${STAGEDIR}${PREFIX}/bin/morphis
${INSTALL_SCRIPT} ${WRKDIR}/morphis-service ${STAGEDIR}${PREFIX}/etc/rc.d/morphis
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/nyx/Makefile b/security/nyx/Makefile
index 606ee5050ba2..f228ff6de188 100644
--- a/security/nyx/Makefile
+++ b/security/nyx/Makefile
@@ -12,8 +12,8 @@ COMMENT= Command-line monitor for Tor
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=1.6.0:security/py-stem \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=1.6.0:security/py-stem@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
USES= python:2.6+
USE_PYTHON= distutils autoplist
diff --git a/security/obfsproxy/Makefile b/security/obfsproxy/Makefile
index 220fc049dc19..da37279bf0b9 100644
--- a/security/obfsproxy/Makefile
+++ b/security/obfsproxy/Makefile
@@ -13,12 +13,12 @@ COMMENT= Pluggable transport proxy
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyptlib>=0.0.5:security/py-pyptlib \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted \
- ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyptlib>=0.0.5:security/py-pyptlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
SUB_FILES= pkg-message
PYDISTUTILS_PKGNAME=obfsproxy
diff --git a/security/pssh/Makefile b/security/pssh/Makefile
index 485d544c3c0e..1906647e7b12 100644
--- a/security/pssh/Makefile
+++ b/security/pssh/Makefile
@@ -15,6 +15,6 @@ RUN_DEPENDS= rsync:net/rsync
NO_ARCH= yes
USES= python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils concurrent optsuffix
.include <bsd.port.mk>
diff --git a/security/pwman3/Makefile b/security/pwman3/Makefile
index a1637ea016ea..3b7f2355c07d 100644
--- a/security/pwman3/Makefile
+++ b/security/pwman3/Makefile
@@ -12,10 +12,10 @@ DISTNAME= Pwman3-${PORTVERSION}
MAINTAINER= yarodin@gmail.com
COMMENT= Console password management application with sql storage
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:security/py-pycrypto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR}
USES= python
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist concurrent optsuffix
.include <bsd.port.mk>
diff --git a/security/py-AccessControl/Makefile b/security/py-AccessControl/Makefile
index 3df28ad01143..4e8ea41c74b4 100644
--- a/security/py-AccessControl/Makefile
+++ b/security/py-AccessControl/Makefile
@@ -13,23 +13,23 @@ COMMENT= Security framework for Zope2
LICENSE= ZPL21
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-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}Persistence>=0:devel/py-Persistence \
- ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record \
- ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \
- ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
- ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \
- zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
- ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \
- ${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.security>=0:security/py-zope.security \
- ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing
+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}Persistence>=0:devel/py-Persistence@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${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.security>=0:security/py-zope.security@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/security/py-Products.PlonePAS/Makefile b/security/py-Products.PlonePAS/Makefile
index 9228f40389c3..3e82dd2a9ce4 100644
--- a/security/py-Products.PlonePAS/Makefile
+++ b/security/py-Products.PlonePAS/Makefile
@@ -12,14 +12,14 @@ COMMENT= Adapts the PluggableAuthService for use by Plone
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session \
- ${PYTHON_PKGNAMEPREFIX}plone.protect>0:security/py-plone.protect \
- ${PYTHON_PKGNAMEPREFIX}plone.i18n>0:www/py-plone.i18n \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
- ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \
- ${PYTHON_PKGNAMEPREFIX}zope.deprecation>0:devel/py-zope.deprecation
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.protect>0:security/py-plone.protect@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.i18n>0:www/py-plone.i18n@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deprecation>0:devel/py-zope.deprecation@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip zope
diff --git a/security/py-Products.PluggableAuthService/Makefile b/security/py-Products.PluggableAuthService/Makefile
index fa4526e8579d..a2142092062c 100644
--- a/security/py-Products.PluggableAuthService/Makefile
+++ b/security/py-Products.PluggableAuthService/Makefile
@@ -13,8 +13,8 @@ COMMENT= Pluggable Zope2 authentication / authorization framework
LICENSE= ZPL21
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:devel/py-Products.PluginRegistry \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:devel/py-Products.PluginRegistry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/security/py-RestrictedPython/Makefile b/security/py-RestrictedPython/Makefile
index 330ba8b0e09c..cdef5abf0e89 100644
--- a/security/py-RestrictedPython/Makefile
+++ b/security/py-RestrictedPython/Makefile
@@ -13,7 +13,7 @@ COMMENT= Restricted execution environment for Python
LICENSE= ZPL21
-USES= python:2 zip
+USES= python zip
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py-SecretStorage/Makefile b/security/py-SecretStorage/Makefile
index dfb172591cfd..99ec96a6bbe8 100644
--- a/security/py-SecretStorage/Makefile
+++ b/security/py-SecretStorage/Makefile
@@ -13,7 +13,7 @@ COMMENT= Store passwords using the SecretService DBus API
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR}
NO_ARCH= yes
USES= python
@@ -22,9 +22,9 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} > 3000
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py3-dbus
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus@${PY_FLAVOR}
.else
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/security/py-YubiOTP/Makefile b/security/py-YubiOTP/Makefile
index 8d7c748bb1f9..5f46fa0e850a 100644
--- a/security/py-YubiOTP/Makefile
+++ b/security/py-YubiOTP/Makefile
@@ -12,8 +12,8 @@ COMMENT= Library for verifying YubiKey OTP tokens
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/security/py-acme/Makefile b/security/py-acme/Makefile
index ab5e8de9d947..c2ccb35c7e98 100644
--- a/security/py-acme/Makefile
+++ b/security/py-acme/Makefile
@@ -14,15 +14,15 @@ COMMENT= ACME protocol implementation in Python
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0.8:security/py-cryptography \
- ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339 \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.10:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
- ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0.8:security/py-cryptography@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/py-setuptools@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/security/py-artifacts/Makefile b/security/py-artifacts/Makefile
index 861865b960c5..3a8feff0458d 100644
--- a/security/py-artifacts/Makefile
+++ b/security/py-artifacts/Makefile
@@ -14,8 +14,8 @@ COMMENT= ForensicArtifacts.com Artifact Repository
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yapf>=0:textproc/py-yapf
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yapf>=0:textproc/py-yapf@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/security/py-bcrypt/Makefile b/security/py-bcrypt/Makefile
index b4bf1079bf12..a81ca37f3231 100644
--- a/security/py-bcrypt/Makefile
+++ b/security/py-bcrypt/Makefile
@@ -13,8 +13,8 @@ COMMENT= Modern password hashing for your software and your servers
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.1:devel/py-pytest
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.1:devel/py-pytest@${FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/security/py-borg.localrole/Makefile b/security/py-borg.localrole/Makefile
index 1cf649c8c30e..d7863a0de583 100644
--- a/security/py-borg.localrole/Makefile
+++ b/security/py-borg.localrole/Makefile
@@ -13,18 +13,18 @@ COMMENT= PAS plugin which can manage local roles via an adapter lookup
LICENSE= LGPL20
-RUN_DEPENDS= ${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.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}Products.PlonePAS>=0:security/py-Products.PlonePAS \
- ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \
- ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition
+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.deferredimport>=0:devel/py-zope.deferredimport@${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}Products.PlonePAS>=0:security/py-Products.PlonePAS@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR}
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py-btchip-python/Makefile b/security/py-btchip-python/Makefile
index 165efbbaa376..f2dd1a82db3a 100644
--- a/security/py-btchip-python/Makefile
+++ b/security/py-btchip-python/Makefile
@@ -13,10 +13,10 @@ COMMENT= Python communication library for Ledger Hardware Wallet
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mnemonic>=0:security/py-mnemonic \
- ${PYTHON_PKGNAMEPREFIX}pyscard>0:security/py-pyscard \
- ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa \
- ${PYTHON_PKGNAMEPREFIX}hidapi>=0:comms/py-hidapi
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mnemonic>=0:security/py-mnemonic@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyscard>0:security/py-pyscard@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hidapi>=0:comms/py-hidapi@${FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile
index 66194bd7210f..4e129330b469 100644
--- a/security/py-certbot/Makefile
+++ b/security/py-certbot/Makefile
@@ -14,19 +14,19 @@ COMMENT= Let's Encrypt client
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${PORTVERSION}:security/py-acme \
- ${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse \
- ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj \
- ${PYTHON_PKGNAMEPREFIX}cryptography>=1.2:security/py-cryptography \
- ${PYTHON_PKGNAMEPREFIX}parsedatetime>=1.3:devel/py-parsedatetime \
- ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339 \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${PORTVERSION}:security/py-acme@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>=1.2:security/py-cryptography@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}parsedatetime>=1.3:devel/py-parsedatetime@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/py-setuptools@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
# Actually 2.7,3.3+
USES= python
diff --git a/security/py-certifi/Makefile b/security/py-certifi/Makefile
index 4fd3eaf422e8..8eb8035b2ac4 100644
--- a/security/py-certifi/Makefile
+++ b/security/py-certifi/Makefile
@@ -13,7 +13,7 @@ COMMENT= Mozilla SSL certificates
LICENSE= MPL20
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.mk>
diff --git a/security/py-cryptkit/Makefile b/security/py-cryptkit/Makefile
index 8b82df92df7e..158b0ca6fc28 100644
--- a/security/py-cryptkit/Makefile
+++ b/security/py-cryptkit/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Cryptographic Toolkit for Python
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
post-install:
diff --git a/security/py-cryptography/Makefile b/security/py-cryptography/Makefile
index 9fb790f7122b..c1347cb2334d 100644
--- a/security/py-cryptography/Makefile
+++ b/security/py-cryptography/Makefile
@@ -15,35 +15,26 @@ LICENSE_COMB= dual
LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.APACHE
LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE.BSD
-BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}cffi>=1.7:devel/py-cffi
-RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}asn1crypto>=0.21.0:devel/py-asn1crypto \
- ${PYTHON_PKGNAMEPREFIX}cffi>=1.7:devel/py-cffi \
- ${PYTHON_PKGNAMEPREFIX}idna>=2.1:dns/py-idna
-TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>=2.9.0:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.7:devel/py-cffi@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}asn1crypto>=0.21.0:devel/py-asn1crypto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cffi>=1.7:devel/py-cffi@${FLAVOR} \
+ ${PY_ENUM34} ${PY_IPADDRESS} \
+ ${PYTHON_PKGNAMEPREFIX}idna>=2.1:dns/py-idna@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.9.0:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${FLAVOR}
# Python 2.7, 3.4-3.6
-USES?= python ssl
+USES= python ssl
USE_PYTHON= autoplist concurrent distutils
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3300
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddress>0:net/py-ipaddress
-.endif
-
-.if ${PYTHON_REL} < 3300
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
-.endif
-
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cryptography/hazmat/bindings/*.so
do-test:
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/py-cybox/Makefile b/security/py-cybox/Makefile
index b4dd935fa8cb..9bf2f02ebf50 100644
--- a/security/py-cybox/Makefile
+++ b/security/py-cybox/Makefile
@@ -13,10 +13,10 @@ COMMENT= Python library for parsing, manipulating, and generating CybOX content
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}mixbox>=1.0.2:security/py-mixbox
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mixbox>=1.0.2:security/py-mixbox@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= CybOXProject
diff --git a/security/py-dfdatetime/Makefile b/security/py-dfdatetime/Makefile
index d5311f6e7ee2..6fe527a1497a 100644
--- a/security/py-dfdatetime/Makefile
+++ b/security/py-dfdatetime/Makefile
@@ -14,7 +14,7 @@ COMMENT= Digital Forensics Date and Time
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}
NO_ARCH= yes
USES= python
diff --git a/security/py-dfvfs/Makefile b/security/py-dfvfs/Makefile
index bae9c72592fa..0332693c7483 100644
--- a/security/py-dfvfs/Makefile
+++ b/security/py-dfvfs/Makefile
@@ -27,12 +27,12 @@ RUN_DEPENDS= libbde>=a:devel/libbde \
libvmdk>=e:devel/libvmdk \
libvshadow>=0:devel/libvshadow \
libvslvm>=e:devel/libvslvm \
- ${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct \
- ${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+ ${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
@@ -42,7 +42,7 @@ USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3300
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyliblzma>=0:archivers/py-pyliblzma
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyliblzma>=0:archivers/py-pyliblzma@${FLAVOR}
TEST_ENV= ${MAKE_ENV} PYTHONHTTPSVERIFY=0
.else
TEST_DEPENDS+= ca_root_nss>=0:security/ca_root_nss
diff --git a/security/py-dfwinreg/Makefile b/security/py-dfwinreg/Makefile
index 6d9b94957b1f..1dca112ae30a 100644
--- a/security/py-dfwinreg/Makefile
+++ b/security/py-dfwinreg/Makefile
@@ -15,9 +15,9 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= libregf>=a:devel/libregf \
- ${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct \
- ${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+ ${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/security/py-docker-pycreds/Makefile b/security/py-docker-pycreds/Makefile
index c117514f4714..a626c8377ff2 100644
--- a/security/py-docker-pycreds/Makefile
+++ b/security/py-docker-pycreds/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python bindings for the docker credentials store API
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/security/py-ecdsa/Makefile b/security/py-ecdsa/Makefile
index 17c678955ddd..2084ff848c20 100644
--- a/security/py-ecdsa/Makefile
+++ b/security/py-ecdsa/Makefile
@@ -13,7 +13,7 @@ COMMENT= ECDSA cryptographic signature library (pure python)
LICENSE= MIT
-USES?= python
+USES= python
USE_PYTHON= distutils autoplist
regression-test: build
diff --git a/security/py-fail2ban/Makefile b/security/py-fail2ban/Makefile
index e2ddeac7ff5a..221a5b99b8af 100644
--- a/security/py-fail2ban/Makefile
+++ b/security/py-fail2ban/Makefile
@@ -12,7 +12,7 @@ COMMENT= Scans log files and bans IP that makes too many password failures
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
OPTIONS_DEFINE= DOCS
diff --git a/security/py-fchksum/Makefile b/security/py-fchksum/Makefile
index c2a2945bff64..90ab0529cdec 100644
--- a/security/py-fchksum/Makefile
+++ b/security/py-fchksum/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python module to find the checksum of files
LICENSE= GPLv2
PLIST_FILES= %%PYTHON_SITELIBDIR%%/fchksum.so
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= python-fchksum
diff --git a/security/py-first-server/Makefile b/security/py-first-server/Makefile
index 99c5d7ee5abb..7428861730a7 100644
--- a/security/py-first-server/Makefile
+++ b/security/py-first-server/Makefile
@@ -12,19 +12,20 @@ COMMENT= Function Identification and Recovery Signature Tool
LICENSE= GPLv2
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.8:databases/py-mysqlclient
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}django>=1.11.4:www/py-django
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11.11:www/py-werkzeug
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.2:www/py-httplib2
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oauth2client>=3.0.0:security/py-oauth2client
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.5.3:www/py-google-api-python-client
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}capstone>=3.0.4:devel/py-capstone
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.8:databases/py-mysqlclient@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}django>=1.11.4:www/py-django@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11.11:www/py-werkzeug@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.2:www/py-httplib2@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oauth2client>=3.0.0:security/py-oauth2client@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.5.3:www/py-google-api-python-client@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}capstone>=3.0.4:devel/py-capstone@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= vrtadmin
GH_PROJECT= FIRST-server
USES= python
+USE_PYTHON= flavors
NO_BUILD= yes
diff --git a/security/py-flask-httpauth/Makefile b/security/py-flask-httpauth/Makefile
index fc29c7fc2eef..52b76abcebdc 100644
--- a/security/py-flask-httpauth/Makefile
+++ b/security/py-flask-httpauth/Makefile
@@ -12,7 +12,7 @@ COMMENT= Basic and Digest HTTP authentication for Flask routes
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${FLAVOR}
NO_ARCH= yes
USES= python:2.7+
diff --git a/security/py-gixy/Makefile b/security/py-gixy/Makefile
index 29958dca2f03..fee437009374 100644
--- a/security/py-gixy/Makefile
+++ b/security/py-gixy/Makefile
@@ -13,12 +13,12 @@ COMMENT= Tool to analyze Nginx configuration for security misconfiguration
LICENSE= APACHE20
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.5:devel/py-pyparsing
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-property
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configargparse>=0.11.0:devel/py-configargparse
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}argparse>=1.4.0:devel/py-argparse
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.5:devel/py-pyparsing@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-property@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configargparse>=0.11.0:devel/py-configargparse@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}argparse>=1.4.0:devel/py-argparse@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/security/py-gnupg/Makefile b/security/py-gnupg/Makefile
index 1864f39245ca..02604df34b5e 100644
--- a/security/py-gnupg/Makefile
+++ b/security/py-gnupg/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python wrapper for GnuPG
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:sysutils/py-psutil
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:sysutils/py-psutil@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/security/py-google-auth/Makefile b/security/py-google-auth/Makefile
index dd6e8c3090f5..9145fead98d3 100644
--- a/security/py-google-auth/Makefile
+++ b/security/py-google-auth/Makefile
@@ -13,11 +13,11 @@ COMMENT= Google Authentication Library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cachetools>=2.0.0:devel/py-cachetools \
- ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1 \
- ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.5:devel/py-pyasn1-modules \
- ${PYTHON_PKGNAMEPREFIX}rsa>=3.1.4:security/py-rsa \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cachetools>=2.0.0:devel/py-cachetools@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.5:devel/py-pyasn1-modules@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rsa>=3.1.4:security/py-rsa@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/security/py-gpsoauth/Makefile b/security/py-gpsoauth/Makefile
index a4353326573a..caf2de64853f 100644
--- a/security/py-gpsoauth/Makefile
+++ b/security/py-gpsoauth/Makefile
@@ -12,11 +12,11 @@ COMMENT= Python client library for Google Play Services OAuth
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient \
- ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.4:security/py-pycryptodome \
- ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.4:security/py-pycryptodome@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= simon-weber
diff --git a/security/py-halberd/Makefile b/security/py-halberd/Makefile
index 48f5172a5200..cf1120c31dd5 100644
--- a/security/py-halberd/Makefile
+++ b/security/py-halberd/Makefile
@@ -13,7 +13,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/security/py-itsdangerous/Makefile b/security/py-itsdangerous/Makefile
index 239c7a0fcb2e..3149ba0fdb35 100644
--- a/security/py-itsdangerous/Makefile
+++ b/security/py-itsdangerous/Makefile
@@ -17,6 +17,6 @@ USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= JSON
-JSON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:devel/py-simplejson
+JSON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:devel/py-simplejson@${FLAVOR}
.include <bsd.port.mk>
diff --git a/security/py-keyczar/Makefile b/security/py-keyczar/Makefile
index 3d3a62e2f5d6..fc45226783fa 100644
--- a/security/py-keyczar/Makefile
+++ b/security/py-keyczar/Makefile
@@ -13,8 +13,8 @@ COMMENT= Toolkit for safe and simple cryptography
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:security/py-pycrypto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR}
NO_ARCH= yes
USES= python:2
diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile
index c113313d9655..c9e5ab931d74 100644
--- a/security/py-keyring/Makefile
+++ b/security/py-keyring/Makefile
@@ -12,7 +12,7 @@ COMMENT= Store and access your passwords safely
LICENSE= PSFL
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.1:devel/py-setuptools_scm
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.1:devel/py-setuptools_scm@${FLAVOR}
NO_ARCH= yes
USES= python
@@ -24,8 +24,8 @@ DBUS_DESC= Install Python DBUS to support the kwallet backend
KEYRINGS_ALT_DESC= Install Alternate Python keyring implementations backend
SECRET_SERVICE_DESC= Install SecretStorage to support the SecretService backend
-DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus
-KEYRINGS_ALT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyrings.alt>0:security/py-keyrings.alt
-SECRET_SERVICE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}SecretStorage>=1.0.0:security/py-SecretStorage
+DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${FLAVOR}
+KEYRINGS_ALT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyrings.alt>0:security/py-keyrings.alt@${FLAVOR}
+SECRET_SERVICE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}SecretStorage>=1.0.0:security/py-SecretStorage@${FLAVOR}
.include <bsd.port.mk>
diff --git a/security/py-keyrings.alt/Makefile b/security/py-keyrings.alt/Makefile
index 3b84f35da850..59f52a3041a4 100644
--- a/security/py-keyrings.alt/Makefile
+++ b/security/py-keyrings.alt/Makefile
@@ -13,8 +13,8 @@ COMMENT= Alternate Python keyring implementations
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm
-RUN_DEPENDS= ${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}six>0:devel/py-six@${FLAVOR}
NO_ARCH= yes
USES= python
@@ -26,9 +26,9 @@ GNOME_KEYRING_DESC= Install GNOME Keyring to support the Gnome backend
KEYCZAR_DESC= Install keyczar to support keyring encryption
PYFS_DESC= Install pyfilesystem to support the pyfs backend
-ENCRYPTED_FILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto
+ENCRYPTED_FILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto@${FLAVOR}
GNOME_KEYRING_USE= GNOME=pygobject3
-KEYCZAR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyczar>=0.71c:security/py-keyczar
-PYFS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fs>=0.5:devel/py-fs
+KEYCZAR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyczar>=0.71c:security/py-keyczar@${FLAVOR}
+PYFS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fs>=0.5:devel/py-fs@${FLAVOR}
.include <bsd.port.mk>
diff --git a/security/py-keystone/Makefile b/security/py-keystone/Makefile
index 0313229ffce4..9a22df90a4c5 100644
--- a/security/py-keystone/Makefile
+++ b/security/py-keystone/Makefile
@@ -13,42 +13,42 @@ COMMENT= OpenStack Keystone
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}Babel>=2.3.4:devel/py-babel \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob \
- ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \
- ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste \
- ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \
- ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \
- ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \
- ${PYTHON_PKGNAMEPREFIX}passlib>=1.6:security/py-passlib \
- ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \
- ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware \
- ${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.messaging>=5.2.0:devel/py-oslo.messaging \
- ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
- ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log \
- ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware \
- ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy \
- ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \
- ${PYTHON_PKGNAMEPREFIX}oauthlib>=0.6:security/py-oauthlib \
- ${PYTHON_PKGNAMEPREFIX}pysaml2>=0:security/py-pysaml2 \
- ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.2:devel/py-dogpile.cache \
- ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \
- ${PYTHON_PKGNAMEPREFIX}pycadf>=0:devel/py-pycadf \
- ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python \
- ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler \
- ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse \
- ${PYTHON_PKGNAMEPREFIX}python-editor>=0:devel/py-python-editor
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}passlib>=1.6:security/py-passlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware@${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.messaging>=5.2.0:devel/py-oslo.messaging@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy@${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}oauthlib>=0.6:security/py-oauthlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pysaml2>=0:security/py-pysaml2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.2:devel/py-dogpile.cache@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycadf>=0:devel/py-pycadf@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-editor>=0:devel/py-python-editor@${FLAVOR}
NO_ARCH= yes
diff --git a/security/py-libnacl/Makefile b/security/py-libnacl/Makefile
index 5658c9de623f..01675ff5e4ba 100644
--- a/security/py-libnacl/Makefile
+++ b/security/py-libnacl/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libsodium.so:security/libsodium
-USES?= python
+USES= python
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index 4931dd2319a8..7f6089eaca82 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -29,7 +29,7 @@ post-install:
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/security/py-maec/Makefile b/security/py-maec/Makefile
index ae7f0031770f..e9ae68db5e24 100644
--- a/security/py-maec/Makefile
+++ b/security/py-maec/Makefile
@@ -13,10 +13,10 @@ COMMENT= Python library for parsing, manipulating, and generating MAEC content
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.13:security/py-cybox \
- ${PYTHON_PKGNAMEPREFIX}mixbox>=0.0.13:security/py-mixbox
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.13:security/py-cybox@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mixbox>=0.0.13:security/py-mixbox@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/security/py-mcrypt/Makefile b/security/py-mcrypt/Makefile
index 4516483dc3c4..217321fef975 100644
--- a/security/py-mcrypt/Makefile
+++ b/security/py-mcrypt/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libmcrypt.so:security/libmcrypt
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
PYDISTUTILS_BUILDARGS= -L${LOCALBASE}/lib
PYDISTUTILS_BUILD_TARGET= build_ext
diff --git a/security/py-mhash/Makefile b/security/py-mhash/Makefile
index 450e0616f10f..ab2ab93b3aa6 100644
--- a/security/py-mhash/Makefile
+++ b/security/py-mhash/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libmhash.so:security/mhash
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
CFLAGS+= -I${LOCALBASE}/include
diff --git a/security/py-mixbox/Makefile b/security/py-mixbox/Makefile
index 50f659d09765..67c4ae1c837a 100644
--- a/security/py-mixbox/Makefile
+++ b/security/py-mixbox/Makefile
@@ -12,9 +12,9 @@ COMMENT= Utility library for cybox, maec, and stix
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}ordered-set>=0:devel/py-ordered-set
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ordered-set>=0:devel/py-ordered-set@${FLAVOR}
NO_ARCH= yes
USES= python
@@ -23,7 +23,7 @@ USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3400
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}weakrefmethod>=1.0.3:devel/py-weakrefmethod
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}weakrefmethod>=1.0.3:devel/py-weakrefmethod@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/security/py-mnemonic/Makefile b/security/py-mnemonic/Makefile
index 0a783ea98533..486a271e2fbb 100644
--- a/security/py-mnemonic/Makefile
+++ b/security/py-mnemonic/Makefile
@@ -12,7 +12,7 @@ COMMENT= Implementation of Bitcoin BIP-0039
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/security/py-oauth2client/Makefile b/security/py-oauth2client/Makefile
index 19762d144a79..19aba8024f56 100644
--- a/security/py-oauth2client/Makefile
+++ b/security/py-oauth2client/Makefile
@@ -12,11 +12,11 @@ COMMENT= OAuth 2.0 client library
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:www/py-httplib2 \
- ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1 \
- ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.5:devel/py-pyasn1-modules \
- ${PYTHON_PKGNAMEPREFIX}rsa>=3.1.4:security/py-rsa \
- ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:www/py-httplib2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.5:devel/py-pyasn1-modules@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rsa>=3.1.4:security/py-rsa@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/security/py-oauthlib/Makefile b/security/py-oauthlib/Makefile
index 37485303f056..a89180d433eb 100644
--- a/security/py-oauthlib/Makefile
+++ b/security/py-oauthlib/Makefile
@@ -13,10 +13,10 @@ COMMENT= RFC-compliant implementation of the OAuth request-signing logic
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
- ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \
- ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt \
- ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${FLAVOR}
OPTIONS_DEFINE= RSA SIGNALS SIGNEDTOKEN
OPTIONS_DEFAULT= RSA SIGNALS SIGNEDTOKEN
@@ -25,10 +25,10 @@ RSA_DESC= Enable RSA Support
SIGNALS_DESC= Enable signal support
SIGNEDTOKEN_DESC= Support for Signed Token
-RSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography
-SIGNALS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker
-SIGNEDTOKEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \
- ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt
+RSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR}
+SIGNALS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${FLAVOR}
+SIGNEDTOKEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
@@ -38,7 +38,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3000
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
.endif
do-test:
diff --git a/security/py-openssl/Makefile b/security/py-openssl/Makefile
index adf25adfd140..28371798c5ab 100644
--- a/security/py-openssl/Makefile
+++ b/security/py-openssl/Makefile
@@ -14,12 +14,12 @@ COMMENT= Python interface to the OpenSSL library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}cryptography>1.9:security/py-cryptography \
- ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>1.9:security/py-cryptography@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR}
OPTIONS_DEFINE= EXAMPLES
-USES?= cpe python
+USES= cpe python
USE_PYTHON= autoplist concurrent distutils pythonprefix
CPE_VENDOR= jean-paul_calderone
diff --git a/security/py-paramiko/Makefile b/security/py-paramiko/Makefile
index a44b635ef533..55f8b28e843c 100644
--- a/security/py-paramiko/Makefile
+++ b/security/py-paramiko/Makefile
@@ -13,11 +13,11 @@ COMMENT= Python SSH2 protocol library
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt \
- ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \
- ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa \
- ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 \
- ${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl@${FLAVOR}
USES?= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/security/py-paramiko1/Makefile b/security/py-paramiko1/Makefile
index b25a26167f64..30fc2406856c 100644
--- a/security/py-paramiko1/Makefile
+++ b/security/py-paramiko1/Makefile
@@ -12,8 +12,8 @@ COMMENT= Python SSH2 protocol library
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \
- ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/security/py-passlib/Makefile b/security/py-passlib/Makefile
index 14326226e497..e03b5c65aaa7 100644
--- a/security/py-passlib/Makefile
+++ b/security/py-passlib/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python password hashing framework supporting over 30 schemes
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.1:devel/py-nose
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.1:devel/py-nose@${FLAVOR}
# Python 2.6,3.3-3.6
USES= python
diff --git a/security/py-pbkdf2/Makefile b/security/py-pbkdf2/Makefile
index f3d62483f6a4..9d57997b95fc 100644
--- a/security/py-pbkdf2/Makefile
+++ b/security/py-pbkdf2/Makefile
@@ -12,7 +12,7 @@ COMMENT= PKCS5 v2.0 PBKDF2 Module
LICENSE= MIT
-USES?= python
+USES= python
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py-plaso/Makefile b/security/py-plaso/Makefile
index 4ac046af70e0..14c8bbb25afd 100644
--- a/security/py-plaso/Makefile
+++ b/security/py-plaso/Makefile
@@ -27,28 +27,27 @@ RUN_DEPENDS= hachoir-core>=0:devel/hachoir-core \
libolecf>=a:devel/libolecf \
libregf>=a:devel/libregf \
libscca>=a:devel/libscca \
- ${PYTHON_PKGNAMEPREFIX}artifacts>=0:security/py-artifacts \
- ${PYTHON_PKGNAMEPREFIX}bencode.py>=0:converters/py-bencode.py \
- ${PYTHON_PKGNAMEPREFIX}binplist>=0:devel/py-binplist \
- ${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime \
- ${PYTHON_PKGNAMEPREFIX}dfvfs>=0:security/py-dfvfs \
- ${PYTHON_PKGNAMEPREFIX}dfwinreg>=0:security/py-dfwinreg \
- ${PYTHON_PKGNAMEPREFIX}dpkt>=0:net/py-dpkt \
- ${PYTHON_PKGNAMEPREFIX}efilter>=0:devel/py-efilter \
- ${PYTHON_PKGNAMEPREFIX}pefile>=0:devel/py-pefile \
- ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil \
- ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \
- ${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk \
- ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}pyzmq>=0:net/py-pyzmq \
- ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter \
- ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock
+ ${PYTHON_PKGNAMEPREFIX}artifacts>=0:security/py-artifacts@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bencode.py>=0:converters/py-bencode.py@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}binplist>=0:devel/py-binplist@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dfvfs>=0:security/py-dfvfs@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dfwinreg>=0:security/py-dfwinreg@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dpkt>=0:net/py-dpkt@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}efilter>=0:devel/py-efilter@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pefile>=0:devel/py-pefile@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyzmq>=0:net/py-pyzmq@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
@@ -59,7 +58,7 @@ TEST_ENV= ${MAKE_ENV} PYTHONHTTPSVERIFY=0
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3300
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyliblzma>=0:archivers/py-pyliblzma
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyliblzma>=0:archivers/py-pyliblzma@${FLAVOR}
.endif
do-test:
diff --git a/security/py-plone.app.openid/Makefile b/security/py-plone.app.openid/Makefile
index f7c485605738..c62885dc2a52 100644
--- a/security/py-plone.app.openid/Makefile
+++ b/security/py-plone.app.openid/Makefile
@@ -12,18 +12,18 @@ COMMENT= Plone OpenID authentication support
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.openid>=0:security/py-plone.openid \
- ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
- ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \
- ${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}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=2.0.10:security/py-Products.PlonePAS \
- ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.openid>=0:security/py-plone.openid@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${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}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=2.0.10:security/py-Products.PlonePAS@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${FLAVOR}
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/security/py-plone.keyring/Makefile b/security/py-plone.keyring/Makefile
index 4019ecdd7f21..8cb6817a036e 100644
--- a/security/py-plone.keyring/Makefile
+++ b/security/py-plone.keyring/Makefile
@@ -12,13 +12,13 @@ COMMENT= Manage secrets
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/security/py-plone.openid/Makefile b/security/py-plone.openid/Makefile
index a8a6bc18f0e9..044d18dc5d2b 100644
--- a/security/py-plone.openid/Makefile
+++ b/security/py-plone.openid/Makefile
@@ -13,14 +13,14 @@ COMMENT= OpenID authentication support for PAS
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-openid>=0:security/py-python-openid \
- ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
- ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
- ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \
- zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-openid>=0:security/py-python-openid@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR}
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/security/py-plone.protect/Makefile b/security/py-plone.protect/Makefile
index d3466ec44c30..3f4baa1ebc79 100644
--- a/security/py-plone.protect/Makefile
+++ b/security/py-plone.protect/Makefile
@@ -12,12 +12,12 @@ COMMENT= Security for browser forms
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.keyring>1.0:security/py-plone.keyring \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.keyring>1.0:security/py-plone.keyring@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/security/py-plone.session/Makefile b/security/py-plone.session/Makefile
index e09d48804f97..c8099110028f 100644
--- a/security/py-plone.session/Makefile
+++ b/security/py-plone.session/Makefile
@@ -12,13 +12,13 @@ COMMENT= Session based authentication for Zope
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${FLAVOR}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/security/py-potr/Makefile b/security/py-potr/Makefile
index 368ff6cd763b..4c6a87fa66ec 100644
--- a/security/py-potr/Makefile
+++ b/security/py-potr/Makefile
@@ -13,7 +13,7 @@ COMMENT= Pure Python Off-The-Record encryption
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR}
USES= python zip
USE_PYTHON= autoplist distutils
diff --git a/security/py-pow/Makefile b/security/py-pow/Makefile
index 7148a3234b0a..6c9705f4503a 100644
--- a/security/py-pow/Makefile
+++ b/security/py-pow/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python OpenSSL Wrappers
LICENSE= BSD3CLAUSE
-USES= python ssl
+USES= python:2.7 ssl
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= POW
diff --git a/security/py-pyaes/Makefile b/security/py-pyaes/Makefile
index aa888e689e1d..38ef936cb951 100644
--- a/security/py-pyaes/Makefile
+++ b/security/py-pyaes/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/security/py-pyaff4/Makefile b/security/py-pyaff4/Makefile
index adaa6e50b1fb..8b96756832c1 100644
--- a/security/py-pyaff4/Makefile
+++ b/security/py-pyaff4/Makefile
@@ -12,9 +12,9 @@ COMMENT= Python Advanced Forensic Format Version 4 library
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}intervaltree>=2.1.0:devel/py-intervaltree \
- ${PYTHON_PKGNAMEPREFIX}python-snappy>=0.5:archivers/py-python-snappy \
- ${PYTHON_PKGNAMEPREFIX}rdflib>=4.2.1:textproc/py-rdflib
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}intervaltree>=2.1.0:devel/py-intervaltree@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-snappy>=0.5:archivers/py-python-snappy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rdflib>=4.2.1:textproc/py-rdflib@${FLAVOR}
NO_ARCH= yes
USES= python zip
diff --git a/security/py-pyaxo/Makefile b/security/py-pyaxo/Makefile
index d875e9a6c7f6..92900bb1e144 100644
--- a/security/py-pyaxo/Makefile
+++ b/security/py-pyaxo/Makefile
@@ -13,9 +13,9 @@ COMMENT= Python implementation of the Axolotl ratchet protocol
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}passlib>=1.6.1:security/py-passlib \
- ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}passlib>=1.6.1:security/py-passlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/security/py-pycrypto/Makefile b/security/py-pycrypto/Makefile
index 7e5b401143fd..a1fa4f46becd 100644
--- a/security/py-pycrypto/Makefile
+++ b/security/py-pycrypto/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= koobs@FreeBSD.org
COMMENT= Python Cryptography Toolkit
-USES?= python
+USES= python
USE_PYTHON= distutils autoplist
GNU_CONFIGURE= yes
diff --git a/security/py-pycryptopp/Makefile b/security/py-pycryptopp/Makefile
index d0fed26a40df..845f2aef77e4 100644
--- a/security/py-pycryptopp/Makefile
+++ b/security/py-pycryptopp/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python Wrappers for the Crypto++ Library
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}darcsver>0:devel/py-darcsver \
- ${PYTHON_PKGNAMEPREFIX}setuptools_darcs>0:devel/py-setuptools_darcs
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}darcsver>0:devel/py-darcsver@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools_darcs>0:devel/py-setuptools_darcs@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py-pyelliptic/Makefile b/security/py-pyelliptic/Makefile
index 2c629649ecf2..f8f7dcbcebfa 100644
--- a/security/py-pyelliptic/Makefile
+++ b/security/py-pyelliptic/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python OpenSSL wrapper
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= yann2192
diff --git a/security/py-pymacaroons-pynacl/Makefile b/security/py-pymacaroons-pynacl/Makefile
index c2022d02ed9a..79e0a9bd5b05 100644
--- a/security/py-pymacaroons-pynacl/Makefile
+++ b/security/py-pymacaroons-pynacl/Makefile
@@ -14,11 +14,11 @@ COMMENT= Macaroon library for Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl \
- ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
- ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${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}
USES= python
USE_GITHUB= yes
diff --git a/security/py-pynacl/Makefile b/security/py-pynacl/Makefile
index 80997a29c73b..1828fb69b74a 100644
--- a/security/py-pynacl/Makefile
+++ b/security/py-pynacl/Makefile
@@ -14,11 +14,11 @@ COMMENT= PyNaCl is a Python binding to the Networking and Cryptography library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.1:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}hypothesis>=1.11.4:devel/py-hypothesis
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.1:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hypothesis>=1.11.4:devel/py-hypothesis@${FLAVOR}
USES= python localbase
USE_PYTHON= autoplist distutils
diff --git a/security/py-pysaml2/Makefile b/security/py-pysaml2/Makefile
index 22a9ffabadbb..b1d38e15cdb8 100644
--- a/security/py-pysaml2/Makefile
+++ b/security/py-pysaml2/Makefile
@@ -13,20 +13,20 @@ COMMENT= Python implementation of SAML Version 2
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator \
- ${PYTHON_PKGNAMEPREFIX}requests>1.0.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}repoze.who>0:devel/py-repoze.who \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>2.5:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>1.0.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.who>0:devel/py-repoze.who@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>2.5:security/py-pycrypto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
xmlsec1:security/xmlsec1
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
- ${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/security/py-python-registry/Makefile b/security/py-python-registry/Makefile
index 42bd0de52d99..22e79254a6b5 100644
--- a/security/py-python-registry/Makefile
+++ b/security/py-python-registry/Makefile
@@ -30,7 +30,7 @@ PORTEXAMPLES= *
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3400
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34@${FLAVOR}
.endif
post-install-DOCS-on:
diff --git a/security/py-python-social-auth/Makefile b/security/py-python-social-auth/Makefile
index 9b4acd1cc3c4..ecb6e067d763 100644
--- a/security/py-python-social-auth/Makefile
+++ b/security/py-python-social-auth/Makefile
@@ -12,12 +12,12 @@ COMMENT= Python Social Auth is a social authentication/registration mechanism
LICENSE= BSD3CLAUSE
-RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}python-openid>=2.2:security/py-python-openid \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.5.1:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}oauthlib>=0.3.8:security/py-oauthlib \
- ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.1:www/py-requests-oauthlib \
- ${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt
+RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}python-openid>=2.2:security/py-python-openid@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.5.1:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauthlib>=0.3.8:security/py-oauthlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.1:www/py-requests-oauthlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/security/py-rekall-core/Makefile b/security/py-rekall-core/Makefile
index 5d6e00bb3d13..c003d41c4ee7 100644
--- a/security/py-rekall-core/Makefile
+++ b/security/py-rekall-core/Makefile
@@ -13,24 +13,24 @@ COMMENT= CORE component of the Rekall framework
LICENSE= GPLv2
RUN_DEPENDS= cabextract:archivers/cabextract \
- ${PYTHON_PKGNAMEPREFIX}artifacts>=20160114:security/py-artifacts \
- ${PYTHON_PKGNAMEPREFIX}pyaff4>=0.24.p1:security/py-pyaff4 \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}acora>=2.0:textproc/py-acora \
- ${PYTHON_PKGNAMEPREFIX}arrow>=0.7.0:devel/py-arrow \
- ${PYTHON_PKGNAMEPREFIX}efilter>=1.3,1:devel/py-efilter \
- ${PYTHON_PKGNAMEPREFIX}intervaltree>=2.1.0:devel/py-intervaltree \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}pyelftools>=0.24:devel/py-pyelftools \
- ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.5:devel/py-pyparsing \
- ${PYTHON_PKGNAMEPREFIX}pytz>=2016.4,1:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}psutil>=4.0:sysutils/py-psutil \
- ${PYTHON_PKGNAMEPREFIX}capstone>=3.0.4:devel/py-capstone \
- ${PYTHON_PKGNAMEPREFIX}yara>=3.4.0:security/py-yara \
- ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.4.4:devel/py-sortedcontainers \
- ${PYTHON_PKGNAMEPREFIX}pytsk>=20160721:sysutils/py-pytsk \
- ${PYTHON_PKGNAMEPREFIX}ipaddr>=2.1.11:devel/py-ipaddr \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil
+ ${PYTHON_PKGNAMEPREFIX}artifacts>=20160114:security/py-artifacts@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyaff4>=0.24.p1:security/py-pyaff4@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}acora>=2.0:textproc/py-acora@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}arrow>=0.7.0:devel/py-arrow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}efilter>=1.3,1:devel/py-efilter@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}intervaltree>=2.1.0:devel/py-intervaltree@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyelftools>=0.24:devel/py-pyelftools@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.5:devel/py-pyparsing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2016.4,1:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psutil>=4.0:sysutils/py-psutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}capstone>=3.0.4:devel/py-capstone@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yara>=3.4.0:security/py-yara@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.4.4:devel/py-sortedcontainers@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytsk>=20160721:sysutils/py-pytsk@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipaddr>=2.1.11:devel/py-ipaddr@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/security/py-rekall/Makefile b/security/py-rekall/Makefile
index d75215c3b197..daecb9d0c5be 100644
--- a/security/py-rekall/Makefile
+++ b/security/py-rekall/Makefile
@@ -12,7 +12,7 @@ COMMENT= Memory forensics analysis framework
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rekall-core>=1.5.0.p:security/py-rekall-core \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rekall-core>=1.5.0.p:security/py-rekall-core@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}ipython>=5.0.0:devel/ipython
NO_ARCH= yes
diff --git a/security/py-rekall_gui/Makefile b/security/py-rekall_gui/Makefile
index 5e9e209e09b3..69d71f28ea3e 100644
--- a/security/py-rekall_gui/Makefile
+++ b/security/py-rekall_gui/Makefile
@@ -16,12 +16,12 @@ IGNORE= does not work with rekall-core 1.6.0
DEPRECATED= PoC that is no longer supported
EXPIRATION_DATE= 2017-11-29
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rekall-core>=1.5.0.p:security/py-rekall-core \
- ${PYTHON_PKGNAMEPREFIX}codegen>=1.0:devel/py-codegen \
- ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}Flask-Sockets>=0:www/py-flask-sockets \
- ${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:devel/py-gevent \
- ${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0.9.3:www/py-gevent-websocket
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rekall-core>=1.5.0.p:security/py-rekall-core@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}codegen>=1.0:devel/py-codegen@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Sockets>=0:www/py-flask-sockets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:devel/py-gevent@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0.9.3:www/py-gevent-websocket@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/security/py-requests-kerberos/Makefile b/security/py-requests-kerberos/Makefile
index 4e33b844dea6..567ff18ca198 100644
--- a/security/py-requests-kerberos/Makefile
+++ b/security/py-requests-kerberos/Makefile
@@ -13,8 +13,8 @@ COMMENT= Kerberos authentication handler for python-requests
LICENSE= ISCL
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>1.1.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}kerberos>1.1.1:security/py-kerberos
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>1.1.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}kerberos>1.1.1:security/py-kerberos@${FLAVOR}
USES= python:2
USE_PYTHON= distutils autoplist
diff --git a/security/py-rsa/Makefile b/security/py-rsa/Makefile
index 05fa9300d98d..583669441825 100644
--- a/security/py-rsa/Makefile
+++ b/security/py-rsa/Makefile
@@ -13,11 +13,11 @@ COMMENT= Pure-Python RSA implementation
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:devel/py-pyasn1
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:devel/py-pyasn1@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
USES= python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils concurrent
NO_ARCH= yes
diff --git a/security/py-service_identity/Makefile b/security/py-service_identity/Makefile
index b8c41d85b223..79bac8ac5527 100644
--- a/security/py-service_identity/Makefile
+++ b/security/py-service_identity/Makefile
@@ -13,11 +13,11 @@ COMMENT= Service identity verification for pyOpenSSL
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=15.2:devel/py-attrs \
- ${PYTHON_PKGNAMEPREFIX}openssl>=0.15:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1 \
- ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.8:devel/py-pyasn1-modules \
- ${PYTHON_PKGNAMEPREFIX}characteristic>=14.1:devel/py-characteristic
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=15.2:devel/py-attrs@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0.15:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.8:devel/py-pyasn1-modules@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}characteristic>=14.1:devel/py-characteristic@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/security/py-signedjson/Makefile b/security/py-signedjson/Makefile
index ff41765821b5..45a0efec9912 100644
--- a/security/py-signedjson/Makefile
+++ b/security/py-signedjson/Makefile
@@ -14,10 +14,10 @@ COMMENT= Sign JSON with Ed25519 signatures
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl \
- ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.0.1:devel/py-unpaddedbase64 \
- ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.0.1:devel/py-unpaddedbase64@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/security/py-ssh/Makefile b/security/py-ssh/Makefile
index cc6550a4f4e0..21f4812ed8a9 100644
--- a/security/py-ssh/Makefile
+++ b/security/py-ssh/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Python SSH2 protocol library
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/security/py-sslstrip/Makefile b/security/py-sslstrip/Makefile
index 4723072cdfd3..69766f7ee2e7 100644
--- a/security/py-sslstrip/Makefile
+++ b/security/py-sslstrip/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= kitchetech@gmail.com
COMMENT= Python program for SSL stripping
-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}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py-stem/Makefile b/security/py-stem/Makefile
index 627b952bfef0..dc3b8d10d00d 100644
--- a/security/py-stem/Makefile
+++ b/security/py-stem/Makefile
@@ -13,10 +13,10 @@ COMMENT= Python controller library for Tor
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
- ${PYTHON_PKGNAMEPREFIX}pyflakes>0:devel/py-pyflakes \
- ${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyflakes>0:devel/py-pyflakes@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${FLAVOR}
USES= python:2.6+
USE_PYTHON= distutils autoplist
diff --git a/security/py-stix/Makefile b/security/py-stix/Makefile
index c536b722df90..d982c64afae4 100644
--- a/security/py-stix/Makefile
+++ b/security/py-stix/Makefile
@@ -13,12 +13,12 @@ COMMENT= Python library for parsing, manipulating, and generating STIX content
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.13:security/py-cybox \
- ${PYTHON_PKGNAMEPREFIX}mixbox>=1.0.2:security/py-mixbox
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
- ${PYTHON_PKGNAMEPREFIX}maec>=4.1.0.13:security/py-maec
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.13:security/py-cybox@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mixbox>=1.0.2:security/py-mixbox@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}maec>=4.1.0.13:security/py-maec@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= STIXProject
diff --git a/security/py-trezor/Makefile b/security/py-trezor/Makefile
index 74bfdd6c3e31..ae15cb80583c 100644
--- a/security/py-trezor/Makefile
+++ b/security/py-trezor/Makefile
@@ -13,10 +13,10 @@ COMMENT= Client side implementation for TREZOR Bitcoin hardware wallets
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mnemonic>=0:security/py-mnemonic \
- ${PYTHON_PKGNAMEPREFIX}hidapi>=0:comms/py-hidapi \
- ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa \
- ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mnemonic>=0:security/py-mnemonic@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hidapi>=0:comms/py-hidapi@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf@${FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/security/py-tuf/Makefile b/security/py-tuf/Makefile
index 0175760cda3a..6bf56e47813d 100644
--- a/security/py-tuf/Makefile
+++ b/security/py-tuf/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= koobs@FreeBSD.org
COMMENT= Framework for securing software update systems
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601 \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl@${FLAVOR}
# Actually 2.6-3.5
USES= python
diff --git a/security/py-txtorcon/Makefile b/security/py-txtorcon/Makefile
index efb6a81de3f4..02873a49d5fd 100644
--- a/security/py-txtorcon/Makefile
+++ b/security/py-txtorcon/Makefile
@@ -13,13 +13,13 @@ COMMENT= Twisted-based Tor controller client
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=15.5.0:devel/py-twisted \
- ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.16:net/py-ipaddress \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.1:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}incremental>0:devel/py-incremental \
- ${PYTHON_PKGNAMEPREFIX}Automat>0:devel/py-Automat
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=15.5.0:devel/py-twisted@${FLAVOR} \
+ ${PY_IPADDRESS} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.1:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}incremental>0:devel/py-incremental@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Automat>0:devel/py-Automat@${FLAVOR}
-USES= python:2.7 shebangfix
+USES= python shebangfix
USE_PYTHON= distutils autoplist
NO_ARCH= yes
SHEBANG_FILES= examples/*.py
diff --git a/security/py-volatility/Makefile b/security/py-volatility/Makefile
index d4ee0c2f99da..26258196d093 100644
--- a/security/py-volatility/Makefile
+++ b/security/py-volatility/Makefile
@@ -14,12 +14,12 @@ COMMENT= Advanced memory forensics framework
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}distorm>=0:devel/py-distorm \
- ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara \
- ${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}distorm>=0:devel/py-distorm@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 shebangfix zip
diff --git a/security/py-vulndb/Makefile b/security/py-vulndb/Makefile
index 052748b41d90..de8edf439911 100644
--- a/security/py-vulndb/Makefile
+++ b/security/py-vulndb/Makefile
@@ -12,7 +12,7 @@ COMMENT= Provides access to the vulndb information in Python
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>=1.1:devel/py-setuptools-git
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>=1.1:devel/py-setuptools-git@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/security/py-yubioath-desktop/Makefile b/security/py-yubioath-desktop/Makefile
index e8191cb9dbe6..17b48d6651f2 100644
--- a/security/py-yubioath-desktop/Makefile
+++ b/security/py-yubioath-desktop/Makefile
@@ -11,14 +11,14 @@ COMMENT= GUI for displaying OATH codes with a Yubikey
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyscard>0:security/py-pyscard \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click \
- pyside${PYTHON_PKGNAMESUFFIX}>0:devel/pyside \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyscard>0:security/py-pyscard@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \
+ pyside${PYTHON_PKGNAMESUFFIX}>0:devel/pyside@${FLAVOR} \
pcsc-spy:devel/pcsc-lite \
${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/${OPSYS}/libccid.so:devel/libccid
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/security/py-zope.app.authentication/Makefile b/security/py-zope.app.authentication/Makefile
index 803268f390e4..380619011fb8 100644
--- a/security/py-zope.app.authentication/Makefile
+++ b/security/py-zope.app.authentication/Makefile
@@ -13,27 +13,27 @@ COMMENT= Principals and groups management for the pluggable authentication
LICENSE= ZPL21
-RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
- ${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.formlib>=4.0.2:devel/py-zope.formlib \
- ${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.location>=0:devel/py-zope.location \
- ${PYTHON_PKGNAMEPREFIX}zope.password>=3.5.1:security/py-zope.password \
- ${PYTHON_PKGNAMEPREFIX}zope.pluggableauth>=1.1:security/py-zope.pluggableauth \
- ${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.app.container>=0:devel/py-zope.app.container \
- ${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${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.formlib>=4.0.2:devel/py-zope.formlib@${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.location>=0:devel/py-zope.location@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.password>=3.5.1:security/py-zope.password@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.pluggableauth>=1.1:security/py-zope.pluggableauth@${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.app.container>=0:devel/py-zope.app.container@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py-zope.app.localpermission/Makefile b/security/py-zope.app.localpermission/Makefile
index 5a1f334ee331..a89eed964655 100644
--- a/security/py-zope.app.localpermission/Makefile
+++ b/security/py-zope.app.localpermission/Makefile
@@ -13,14 +13,14 @@ COMMENT= Local Persistent Permissions for zope.security
LICENSE= ZPL21
-RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${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.location>=0:devel/py-zope.location \
- ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${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}zope.location>=0:devel/py-zope.location@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py-zope.app.principalannotation/Makefile b/security/py-zope.app.principalannotation/Makefile
index 6bf8ce331a9f..3560dd8b69ab 100644
--- a/security/py-zope.app.principalannotation/Makefile
+++ b/security/py-zope.app.principalannotation/Makefile
@@ -13,12 +13,12 @@ COMMENT= Bootstrap subscriber and browser menu item for zope.principalannotation
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
- ${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.principalannotation>=0:security/py-zope.principalannotation
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${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.principalannotation>=0:security/py-zope.principalannotation@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py-zope.app.security/Makefile b/security/py-zope.app.security/Makefile
index fefaf856e045..59e63c7cc880 100644
--- a/security/py-zope.app.security/Makefile
+++ b/security/py-zope.app.security/Makefile
@@ -13,20 +13,20 @@ COMMENT= ZMI Views For Zope3 Security Components
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.app.localpermission>=0:security/py-zope.app.localpermission \
- ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \
- ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher \
- ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
- ${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.principalregistry>=0:security/py-zope.principalregistry \
- ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \
- ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
- ${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:security/py-zope.securitypolicy \
- ${PYTHON_PKGNAMEPREFIX}zope.login>=0:security/py-zope.login
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.app.localpermission>=0:security/py-zope.app.localpermission@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${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.principalregistry>=0:security/py-zope.principalregistry@${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.securitypolicy>=0:security/py-zope.securitypolicy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.login>=0:security/py-zope.login@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py-zope.app.securitypolicy/Makefile b/security/py-zope.app.securitypolicy/Makefile
index 9c71eecba148..213fc33597d6 100644
--- a/security/py-zope.app.securitypolicy/Makefile
+++ b/security/py-zope.app.securitypolicy/Makefile
@@ -13,23 +13,23 @@ COMMENT= ZMI-based management views for zope.securitypolicy
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
- ${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=3.8:security/py-zope.app.authentication \
- ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \
- ${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:security/py-zope.app.security \
- ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
- ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
- ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
- ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=3.4.2: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.schema>=0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
- ${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:security/py-zope.securitypolicy
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=3.8:security/py-zope.app.authentication@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:security/py-zope.app.security@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${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>=3.4.2: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.schema>=0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:security/py-zope.securitypolicy@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py-zope.authentication/Makefile b/security/py-zope.authentication/Makefile
index 0b46d99bb4be..ff8c81b81a04 100644
--- a/security/py-zope.authentication/Makefile
+++ b/security/py-zope.authentication/Makefile
@@ -13,14 +13,14 @@ COMMENT= Definition of authentication basics for the Zope Framework
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.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.browser>=0:devel/py-zope.browser@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.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 zip
+USES= python:2.7 zip
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py-zope.login/Makefile b/security/py-zope.login/Makefile
index 22890dcb9fcb..ae0f107ada45 100644
--- a/security/py-zope.login/Makefile
+++ b/security/py-zope.login/Makefile
@@ -13,12 +13,12 @@ COMMENT= Login helpers for zope.publisher / authentication
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
- ${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.authentication>=0:security/py-zope.authentication@${FLAVOR} \
+ ${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 zip
+USES= python:2.7 zip
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py-zope.password/Makefile b/security/py-zope.password/Makefile
index f57d6aa8c9c9..1b99a76402cd 100644
--- a/security/py-zope.password/Makefile
+++ b/security/py-zope.password/Makefile
@@ -13,9 +13,9 @@ COMMENT= Password encoding and checking utilities
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0: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}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/security/py-zope.pluggableauth/Makefile b/security/py-zope.pluggableauth/Makefile
index a9b1c1d47f43..77cf5136628b 100644
--- a/security/py-zope.pluggableauth/Makefile
+++ b/security/py-zope.pluggableauth/Makefile
@@ -13,22 +13,22 @@ COMMENT= Pluggable Authentication Utility
LICENSE= ZPL21
-RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
- ${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.password>=3.5.1:security/py-zope.password \
- ${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.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.authentication>=0:security/py-zope.authentication@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${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.password>=3.5.1:security/py-zope.password@${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.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 <bsd.port.mk>
diff --git a/security/py-zope.principalannotation/Makefile b/security/py-zope.principalannotation/Makefile
index 832add9268da..80415db2a181 100644
--- a/security/py-zope.principalannotation/Makefile
+++ b/security/py-zope.principalannotation/Makefile
@@ -13,15 +13,15 @@ COMMENT= Annotations for Zope Principals
LICENSE= ZPL21
-RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${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.site>=0:devel/py-zope.site
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${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.site>=0:devel/py-zope.site@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py-zope.principalregistry/Makefile b/security/py-zope.principalregistry/Makefile
index 2c02d3549788..6ebfed898791 100644
--- a/security/py-zope.principalregistry/Makefile
+++ b/security/py-zope.principalregistry/Makefile
@@ -13,13 +13,13 @@ COMMENT= Global principal registry component for Zope3
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.password>=0:security/py-zope.password \
- ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.password>=0:security/py-zope.password@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py-zope.security/Makefile b/security/py-zope.security/Makefile
index 64f4e14ba072..38b20dc291c5 100644
--- a/security/py-zope.security/Makefile
+++ b/security/py-zope.security/Makefile
@@ -14,17 +14,17 @@ COMMENT= Zope Security Framework
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.location>=0:devel/py-zope.location \
- ${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:net/py-zope.proxy \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \
- ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration
+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.location>=0:devel/py-zope.location@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:net/py-zope.proxy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py-zope.securitypolicy/Makefile b/security/py-zope.securitypolicy/Makefile
index 80ce543eed74..46097153a138 100644
--- a/security/py-zope.securitypolicy/Makefile
+++ b/security/py-zope.securitypolicy/Makefile
@@ -13,19 +13,19 @@ COMMENT= Default security policy for Zope3
LICENSE= ZPL21
-RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
- ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
- ${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.location>=0:devel/py-zope.location \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
- ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:devel/py-zope.dublincore
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${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.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} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:devel/py-zope.dublincore@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py-zope.session/Makefile b/security/py-zope.session/Makefile
index 75f2c06e0865..b9958ae899cf 100644
--- a/security/py-zope.session/Makefile
+++ b/security/py-zope.session/Makefile
@@ -13,15 +13,15 @@ COMMENT= Client identification and sessions for Zope
LICENSE= ZPL21
-RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${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.location>=0:devel/py-zope.location \
- ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
- ${PYTHON_PKGNAMEPREFIX}zope.minmax>=0:devel/py-zope.minmax
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${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}zope.location>=0:devel/py-zope.location@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.minmax>=0:devel/py-zope.minmax@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/security/py3-certifi/Makefile b/security/py3-certifi/Makefile
deleted file mode 100644
index 3096ddede420..000000000000
--- a/security/py3-certifi/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Olivier Duchateau <duchateau.olivier@gmail.com>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-certifi
-
-PORTSCOUT= ignore:1
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/security/py3-cryptography/Makefile b/security/py3-cryptography/Makefile
deleted file mode 100644
index 7a91f24d21f2..000000000000
--- a/security/py3-cryptography/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-cryptography
-
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py3-cffi
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py3-six \
- ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:devel/py3-pyasn1 \
- ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py3-cffi \
- ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py3-idna
-
-USES= python:3.3+ ssl
-
-.include "${MASTERDIR}/Makefile"
diff --git a/security/py3-ecdsa/Makefile b/security/py3-ecdsa/Makefile
deleted file mode 100644
index 9d265c915ca4..000000000000
--- a/security/py3-ecdsa/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-ecdsa
-
-USES= python:3.2+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/security/py3-libnacl/Makefile b/security/py3-libnacl/Makefile
deleted file mode 100644
index e957b78259ac..000000000000
--- a/security/py3-libnacl/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Philip Paeps <philip@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-libnacl
-
-USES= python:3.2+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/security/py3-openssl/Makefile b/security/py3-openssl/Makefile
deleted file mode 100644
index 5c628d6a6e88..000000000000
--- a/security/py3-openssl/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-openssl
-
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0.2.1:security/py3-cryptography \
- ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py3-six
-
-USES= cpe python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/security/py3-pbkdf2/Makefile b/security/py3-pbkdf2/Makefile
deleted file mode 100644
index ef76ab5ae76c..000000000000
--- a/security/py3-pbkdf2/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pbkdf2
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/security/py3-pyaes/Makefile b/security/py3-pyaes/Makefile
deleted file mode 100644
index d7ca721e8551..000000000000
--- a/security/py3-pyaes/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pyaes
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/security/py3-pycrypto/Makefile b/security/py3-pycrypto/Makefile
deleted file mode 100644
index 628225c16743..000000000000
--- a/security/py3-pycrypto/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pycrypto
-
-USES= python:3.2+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/security/suricata/Makefile b/security/suricata/Makefile
index 2d5b8eb9d34e..ecfb7e532e56 100644
--- a/security/suricata/Makefile
+++ b/security/suricata/Makefile
@@ -109,7 +109,7 @@ REDIS_CONFIGURE_ON= --enable-hiredis \
--with-libhiredis-includes=${LOCALBASE}/include \
--with-libhiredis-libraries=${LOCALBASE}/lib
-SC_USES= python
+SC_USES= python:2.7
SC_CONFIGURE_ENABLE= python
TESTS_CONFIGURE_ENABLE= unittests
diff --git a/security/switzerland/Makefile b/security/switzerland/Makefile
index ac567b605f21..dca12c64c690 100644
--- a/security/switzerland/Makefile
+++ b/security/switzerland/Makefile
@@ -11,7 +11,7 @@ COMMENT= Test the integrity of communications over networks and firewalls
LICENSE= GPLv3
-USES= python tar:tgz
+USES= python:2.7 tar:tgz
USE_PYTHON= distutils
PORTDOCS= *
diff --git a/security/umit/Makefile b/security/umit/Makefile
index c026617225e5..7a1c3f67b838 100644
--- a/security/umit/Makefile
+++ b/security/umit/Makefile
@@ -14,12 +14,12 @@ COMMENT= Nmap frontend developed with Python and PyGTK
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \
${LOCALBASE}/bin/nmap:security/nmap
NO_ARCH= yes
-USES= python shebangfix tar:bzip2
+USES= python:2.7 shebangfix tar:bzip2
USE_GNOME= pygtk2
USE_PYTHON= distutils
INSTALLS_ICONS= yes
@@ -34,7 +34,7 @@ DESKTOP_ENTRIES="Umit" "GUI frontend for Nmap security/port scanner" "umit" \
OPTIONS_DEFINE= DOCS
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
+DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/security/vinetto/Makefile b/security/vinetto/Makefile
index 1e32181ce85b..74c9b8f1741c 100644
--- a/security/vinetto/Makefile
+++ b/security/vinetto/Makefile
@@ -14,10 +14,10 @@ COMMENT= Forensics tool to examine Thumbs.db files
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-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
+USE_PYTHON= autoplist distutils concurrent optsuffix
PYDISTUTILS_PKGVERSION= 0.06alpha
NO_ARCH= yes
diff --git a/security/w3af/Makefile b/security/w3af/Makefile
index e7b7ec2a4715..ca9d0e37d1e1 100644
--- a/security/w3af/Makefile
+++ b/security/w3af/Makefile
@@ -12,56 +12,57 @@ COMMENT= Web Application Attack and Audit Framework
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/doc/GPL
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson \
- ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}soappy>=0:net/py-soappy \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}fpconst>0:math/py-fpconst \
- ${PYTHON_PKGNAMEPREFIX}nltk>0:textproc/py-nltk \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}soappy>=0:net/py-soappy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}fpconst>0:math/py-fpconst@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nltk>0:textproc/py-nltk@${FLAVOR} \
${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}pdf>0:print/py-pdf \
+ ${PYTHON_PKGNAMEPREFIX}pdf>0:print/py-pdf@${FLAVOR} \
scapy>0:net/scapy \
- ${PYTHON_PKGNAMEPREFIX}wordnet>0:textproc/py-wordnet \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}pyClamd>=0.2.2:security/py-pyclamd \
- ${PYTHON_PKGNAMEPREFIX}pygithub>=1.21:devel/py-pygithub \
- ${PYTHON_PKGNAMEPREFIX}GitPython>=0.3.2:devel/py-gitpython \
- ${PYTHON_PKGNAMEPREFIX}pybloomfiltermmap>=0.3.11:devel/py-pybloomfiltermmap \
- ${PYTHON_PKGNAMEPREFIX}esmre>=0.3.1:textproc/py-esmre \
- ${PYTHON_PKGNAMEPREFIX}phply>=0.9.1:devel/py-phply \
- ${PYTHON_PKGNAMEPREFIX}stopit>=1.1.0:devel/py-stopit \
- ${PYTHON_PKGNAMEPREFIX}chardet>=2.1.1:textproc/py-chardet \
- ${PYTHON_PKGNAMEPREFIX}tblib>=0.2.0:devel/py-tblib \
- ${PYTHON_PKGNAMEPREFIX}pdfminer=20140328:textproc/py-pdfminer \
- ${PYTHON_PKGNAMEPREFIX}futures>=2.1.5:devel/py-futures \
- ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.3.3:net/py-ndg_httpsclient \
- ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:devel/py-pyasn1 \
- ${PYTHON_PKGNAMEPREFIX}lxml>=0.3.2:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}guess-language>=0.2:textproc/py-guess-language \
- ${PYTHON_PKGNAMEPREFIX}cluster>=1.1.1b3:devel/py-cluster \
- ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.4:devel/py-msgpack-python \
- ${PYTHON_PKGNAMEPREFIX}python-ntlm>=1.0.1:net/py-python-ntlm \
- ${PYTHON_PKGNAMEPREFIX}halberd>=0.2.4:security/py-halberd \
- ${PYTHON_PKGNAMEPREFIX}darts.util.lru>=0.5:devel/py-darts.util.lru \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.3:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}vulndb>=0.0.17:security/py-vulndb \
- ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.1:textproc/py-markdown
+ ${PYTHON_PKGNAMEPREFIX}wordnet>0:textproc/py-wordnet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyClamd>=0.2.2:security/py-pyclamd@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygithub>=1.21:devel/py-pygithub@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}GitPython>=0.3.2:devel/py-gitpython@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pybloomfiltermmap>=0.3.11:devel/py-pybloomfiltermmap@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}esmre>=0.3.1:textproc/py-esmre@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}phply>=0.9.1:devel/py-phply@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stopit>=1.1.0:devel/py-stopit@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}chardet>=2.1.1:textproc/py-chardet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tblib>=0.2.0:devel/py-tblib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pdfminer=20140328:textproc/py-pdfminer@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}futures>=2.1.5:devel/py-futures@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.3.3:net/py-ndg_httpsclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:devel/py-pyasn1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0.3.2:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}guess-language>=0.2:textproc/py-guess-language@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cluster>=1.1.1b3:devel/py-cluster@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.4:devel/py-msgpack-python@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-ntlm>=1.0.1:net/py-python-ntlm@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}halberd>=0.2.4:security/py-halberd@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}darts.util.lru>=0.5:devel/py-darts.util.lru@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.3:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vulndb>=0.0.17:security/py-vulndb@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.1:textproc/py-markdown@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= andresriancho
-USES= gettext python shebangfix
+USES= gettext python:2.7 shebangfix
+USE_PYTHON= flavors
SHEBANG_FILES= tools/* w3af_console w3af_gui
NO_BUILD= yes
OPTIONS_DEFINE= GUI DOCS
OPTIONS_SUB= yes
-GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>0:graphics/py-pygraphviz \
- ${PYTHON_PKGNAMEPREFIX}gtksourceview>=2.10.1:x11-toolkits/py-gtksourceview \
- ${PYTHON_PKGNAMEPREFIX}xdot>=0.7:x11/py-xdot \
- ${PYTHON_PKGNAMEPREFIX}webkitgtk>=1.1.8:www/py-webkitgtk
+GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>0:graphics/py-pygraphviz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gtksourceview>=2.10.1:x11-toolkits/py-gtksourceview@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xdot>=0.7:x11/py-xdot@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webkitgtk>=1.1.8:www/py-webkitgtk@${FLAVOR}
GUI_USE= GNOME=pygtk2
diff --git a/security/wapiti/Makefile b/security/wapiti/Makefile
index c9aba0fc2f25..53666d24449e 100644
--- a/security/wapiti/Makefile
+++ b/security/wapiti/Makefile
@@ -12,8 +12,8 @@ COMMENT= Wapiti is a vulnerability scanner for web applications
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32 \
- ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests@${FLAVOR}
USES= python:2
USE_PYTHON= distutils autoplist
diff --git a/security/yubikey-piv-manager/Makefile b/security/yubikey-piv-manager/Makefile
index 0f48e2bd1682..8f9290babaa7 100644
--- a/security/yubikey-piv-manager/Makefile
+++ b/security/yubikey-piv-manager/Makefile
@@ -12,11 +12,11 @@ COMMENT= YubiKey PIV Manager
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:devel/pyside \
+RUN_DEPENDS= pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:devel/pyside@${FLAVOR} \
yubico-piv-tool:security/yubico-piv-tool
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
PLIST_FILES+= man/man1/pivman.1.gz \
diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
index 5b2cd57669bb..5348bf487290 100644
--- a/security/zenmap/Makefile
+++ b/security/zenmap/Makefile
@@ -7,7 +7,7 @@ MAINTAINER= woodsb02@FreeBSD.org
COMMENT= GUI frontend for the Nmap scanning utility
RUN_DEPENDS= nmap:security/nmap \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
MASTERDIR= ${.CURDIR}/../nmap
PATCHDIR= ${.CURDIR}/files
@@ -16,7 +16,7 @@ DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
PKGDIR= ${.CURDIR}
WRKSRC_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
-USES= dos2unix python tar:bzip2
+USES= dos2unix python:2.7 tar:bzip2
DOS2UNIX_GLOB= *.xml
USE_GNOME= pygtk2
USE_PYTHON= autoplist distutils
diff --git a/security/zeronet/Makefile b/security/zeronet/Makefile
index 44869992aa80..30af5fca36dd 100644
--- a/security/zeronet/Makefile
+++ b/security/zeronet/Makefile
@@ -12,9 +12,9 @@ COMMENT= Decentralized websites using Bitcoin crypto and BitTorrent network
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python \
- ${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:devel/py-gevent \
- ${PYTHON_PKGNAMEPREFIX}stem>0:security/py-stem
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:devel/py-gevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stem>0:security/py-stem@${PY_FLAVOR}
SUB_FILES= zeronet-service zeronet-cmd pkg-message
SUB_LIST= LOCALBASE=${LOCALBASE} USER=${USER} GROUP=${GROUP}
@@ -30,7 +30,7 @@ NO_ARCH= yes
OPTIONS_DEFINE= DEBUG
-DEBUG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug
+DEBUG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${PY_FLAVOR}
.include <bsd.port.options.mk>
diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index bf35bb6d3508..04657c0636c1 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -13,7 +13,7 @@ LICENSE= GPLv2
LIB_DEPENDS+= libpcre2-32.so:devel/pcre2
-USES= autoreconf cpe gmake libtool ncurses pkgconfig pathfix python:3 \
+USES= autoreconf cpe gmake libtool ncurses pkgconfig pathfix python:3.4+ \
localbase compiler:c++11-lang shebangfix
SHEBANG_FILES= share/tools/*.py share/tools/web_config/webconfig.py
diff --git a/shells/lshell/Makefile b/shells/lshell/Makefile
index db2869f7c699..d74e66a80fee 100644
--- a/shells/lshell/Makefile
+++ b/shells/lshell/Makefile
@@ -15,7 +15,7 @@ GH_PROJECT= lshell
GH_TAGNAME= 279d7ab
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_GITHUB= yes
USE_PYTHON= distutils
diff --git a/shells/xonsh/Makefile b/shells/xonsh/Makefile
index 5903a54817c3..98524b92e87a 100644
--- a/shells/xonsh/Makefile
+++ b/shells/xonsh/Makefile
@@ -11,7 +11,7 @@ COMMENT= Python-ish BASH-wards shell
LICENSE= BSD2CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amalgamate>=0:devel/py-amalgamate
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amalgamate>=0:devel/py-amalgamate@${FLAVOR}
NO_ARCH= yes
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 69f0eac97139..05c2b2d07e39 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -931,9 +931,6 @@
SUBDIR += py-uptime
SUBDIR += py-zdaemon
SUBDIR += py-zfs
- SUBDIR += py3-execnet
- SUBDIR += py3-pkginfo
- SUBDIR += py3-ptyprocess
SUBDIR += pydf
SUBDIR += qchroot
SUBDIR += qjail
diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile
index e97b01e8825e..4f9cca8ddd97 100644
--- a/sysutils/ansible/Makefile
+++ b/sysutils/ansible/Makefile
@@ -13,12 +13,12 @@ COMMENT= Radically simple IT automation
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath \
- ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \
- ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
+RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
CONFLICTS?= ansible1-* ansible23-*
@@ -26,7 +26,7 @@ EXTRA_PATCHES?= #
NO_ARCH= yes
USES?= cpe python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils concurrent optsuffix
CPE_VENDOR= ansibleworks
SUB_FILES= pkg-message
diff --git a/sysutils/ansible1/Makefile b/sysutils/ansible1/Makefile
index a8770820ec13..08b15b6b077a 100644
--- a/sysutils/ansible1/Makefile
+++ b/sysutils/ansible1/Makefile
@@ -10,10 +10,10 @@ CONFLICTS= ansible-* ansible23-*
MASTERDIR= ${.CURDIR}/../ansible
DISTINFO_FILE= ${.CURDIR}/distinfo
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
USES= cpe python:2 shebangfix
diff --git a/sysutils/azure-agent/Makefile b/sysutils/azure-agent/Makefile
index 680a0fc18e42..043b13620036 100644
--- a/sysutils/azure-agent/Makefile
+++ b/sysutils/azure-agent/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= python:lang/python \
bash:shells/bash \
base64:converters/base64 \
dmidecode:sysutils/dmidecode \
- ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1 \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${FLAVOR} \
${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
NO_BUILD= yes
diff --git a/sysutils/backupchecker/Makefile b/sysutils/backupchecker/Makefile
index 95be94900b76..0ab7835d89d5 100644
--- a/sysutils/backupchecker/Makefile
+++ b/sysutils/backupchecker/Makefile
@@ -14,7 +14,7 @@ USE_GITHUB= yes
NO_ARCH= yes
USES= python:3.3+
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils optsuffix
PORTDOCS= README.md
diff --git a/sysutils/bamf/Makefile b/sysutils/bamf/Makefile
index bc4f40f8e266..908a95c7c53b 100644
--- a/sysutils/bamf/Makefile
+++ b/sysutils/bamf/Makefile
@@ -14,8 +14,8 @@ LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/COPYING.LGPL
BUILD_DEPENDS= vapigen:lang/vala \
- ${PYTHON_PKGNAMEPREFIX}libxml2>=2.8.0:textproc/py-libxml2 \
- ${PYTHON_PKGNAMEPREFIX}libxslt>=1.1.28:textproc/py-libxslt
+ ${PYTHON_PKGNAMEPREFIX}libxml2>=2.8.0:textproc/py-libxml2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}libxslt>=1.1.28:textproc/py-libxslt@${PY_FLAVOR}
LIB_DEPENDS= libgtop-2.0.so:devel/libgtop \
libdbus-glib-1.so:devel/dbus-glib \
libstartup-notification-1.so:x11/startup-notification
diff --git a/sysutils/battray/Makefile b/sysutils/battray/Makefile
index 59063d48c345..0f193960e2b0 100644
--- a/sysutils/battray/Makefile
+++ b/sysutils/battray/Makefile
@@ -14,7 +14,7 @@ LICENSE= MIT
USES= python:3.3+
USE_GNOME= py3gobject3
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils optsuffix
USE_GITHUB= yes
GH_ACCOUNT= Carpetsmoker
diff --git a/sysutils/bsdploy/Makefile b/sysutils/bsdploy/Makefile
index 9c6c577ee1de..841b181e182d 100644
--- a/sysutils/bsdploy/Makefile
+++ b/sysutils/bsdploy/Makefile
@@ -9,20 +9,20 @@ MASTER_SITES= CHEESESHOP
MAINTAINER= koobs@FreeBSD.org
COMMENT= Container Management for FreeBSD Jails
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
- ${PYTHON_PKGNAMEPREFIX}pyliblzma>0:archivers/py-pyliblzma \
- ${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy \
- ${PYTHON_PKGNAMEPREFIX}ploy_ansible>=1.3.0:sysutils/py-ploy_ansible \
- ${PYTHON_PKGNAMEPREFIX}ploy_ezjail>=1.2.0:sysutils/py-ploy_ezjail \
- ${PYTHON_PKGNAMEPREFIX}ploy_fabric>=1.1.0:sysutils/py-ploy_fabric
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyliblzma>0:archivers/py-pyliblzma@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ploy_ansible>=1.3.0:sysutils/py-ploy_ansible@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ploy_ezjail>=1.2.0:sysutils/py-ploy_ezjail@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ploy_fabric>=1.1.0:sysutils/py-ploy_fabric@${FLAVOR}
OPTIONS_DEFINE= EC2
OPTIONS_DEFAULT= EC2
EC2_DESC= Support Amazon Web Services EC2 hosts
-EC2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy_ec2>0:sysutils/py-ploy_ec2
+EC2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy_ec2>0:sysutils/py-ploy_ec2@${FLAVOR}
USES= python:-2.7 zip
USE_PYTHON= autoplist distutils
diff --git a/sysutils/catfish/Makefile b/sysutils/catfish/Makefile
index a744b54ff7e7..879e0199dbcf 100644
--- a/sysutils/catfish/Makefile
+++ b/sysutils/catfish/Makefile
@@ -12,13 +12,13 @@ COMMENT= GTK search utility
LICENSE= GPLv3
RUN_DEPENDS= \
- ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra \
- ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect \
- ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3 \
+ ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${FLAVOR} \
gksu:sysutils/gksu
BUILD_DEPENDS= ${RUN_DEPENDS}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
USE_GNOME= gtk30 intltool
diff --git a/sysutils/createrepo/Makefile b/sysutils/createrepo/Makefile
index 5206107fe022..335ea0a092b9 100644
--- a/sysutils/createrepo/Makefile
+++ b/sysutils/createrepo/Makefile
@@ -11,13 +11,14 @@ COMMENT= Utility to create and manage RPM metadata repositories
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser \
- ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \
- ${PYTHON_SITELIBDIR}/urlgrabber/__init__.py:www/py-urlgrabber \
- ${PYTHON_SITELIBDIR}/yum/__init__.py:sysutils/yum \
- ${PYTHON_SITELIBDIR}/deltarpm.py:sysutils/deltarpm
-
-USES= gmake python shebangfix
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/urlgrabber/__init__.py:www/py-urlgrabber@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/yum/__init__.py:sysutils/yum@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/deltarpm.py:sysutils/deltarpm@${FLAVOR}
+
+USES= gmake python:2.7 shebangfix
+USE_PYTHON= flavors
SHEBANG_FILES= *.py */*.py Makefile
BUILD_DEPENDS+= ginstall:sysutils/coreutils
diff --git a/sysutils/deltarpm/Makefile b/sysutils/deltarpm/Makefile
index 38e7e0b658c5..d50ecbced7ba 100644
--- a/sysutils/deltarpm/Makefile
+++ b/sysutils/deltarpm/Makefile
@@ -14,6 +14,7 @@ LICENSE= BSD3CLAUSE
LIB_DEPENDS= librpm.so:archivers/rpm4
USES= gmake python shebangfix tar:bz2
+USE_PYTHON= flavors optsuffix
SHEBANG_FILES= drpmsync
ALL_TARGET= all
diff --git a/sysutils/docker-compose/Makefile b/sysutils/docker-compose/Makefile
index 3f55b681269c..923b98ed3661 100644
--- a/sysutils/docker-compose/Makefile
+++ b/sysutils/docker-compose/Makefile
@@ -11,34 +11,35 @@ COMMENT= Define and run multi-container applications with Docker
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-property \
- ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama \
- ${PYTHON_PKGNAMEPREFIX}docker>=2.2.1:sysutils/py-docker \
- ${PYTHON_PKGNAMEPREFIX}dockerpty>=0.4.1:devel/py-dockerpty \
- ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt \
- ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.16:net/py-ipaddress \
- ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}texttable>=0.9.0:textproc/py-texttable \
- ${PYTHON_PKGNAMEPREFIX}websocket-client>=0.32.0:www/py-websocket-client
-
-USES= python
-USE_PYTHON= distutils autoplist
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-property@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docker>=2.2.1:sysutils/py-docker@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dockerpty>=0.4.1:devel/py-dockerpty@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.16:net/py-ipaddress@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}texttable>=0.9.0:textproc/py-texttable@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}websocket-client>=0.32.0:www/py-websocket-client@${FLAVOR}
+
+USES= python:-3.3
+USE_PYTHON= distutils autoplist concurrent optsuffix
.include <bsd.port.pre.mk>
.if ${PYTHON_SUFFIX} < 35
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname@${FLAVOR}
.endif
.if ${PYTHON_SUFFIX} < 34
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR}
.endif
.if ${PYTHON_SUFFIX} < 32
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.16:net/py-ipaddress@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 43645a0d8d5e..35473da912a3 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -13,7 +13,7 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= librsync.so:net/librsync2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fasteners>=0:devel/py-fasteners
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fasteners>=0:devel/py-fasteners@${FLAVOR}
USES= python:2
USE_PYTHON= autoplist distutils
@@ -41,15 +41,15 @@ PEXPECT_DESC= pexpect and use ssh binaries
FTP_RUN_DEPENDS= ncftp>=3.2.2:ftp/ncftp3
FTPS_RUN_DEPENDS= lftp>=3.7.15:ftp/lftp
-GDOCS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata
-GIO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject>0:devel/py-gobject \
+GDOCS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata@${FLAVOR}
+GIO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject>0:devel/py-gobject@${FLAVOR} \
dbus>0:devel/dbus
GNUPG_RUN_DEPENDS= gnupg1>=1.4.7:security/gnupg1
GNUPG2_RUN_DEPENDS= gpg2:security/gnupg
NLS_USES= gettext
-PARAMIKO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:security/py-paramiko
-PEXPECT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect
-S3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.6b:devel/py-boto
+PARAMIKO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:security/py-paramiko@${FLAVOR}
+PEXPECT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${FLAVOR}
+S3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.6b:devel/py-boto@${FLAVOR}
post-patch:
.for f in cfbackend _cf_cloudfiles _cf_pyrax
diff --git a/sysutils/dvdvideo/Makefile b/sysutils/dvdvideo/Makefile
index ce1eb11772e9..b2ffd1d702c0 100644
--- a/sysutils/dvdvideo/Makefile
+++ b/sysutils/dvdvideo/Makefile
@@ -15,8 +15,8 @@ COMMENT= Video DVD backup tool
LICENSE= GPLv3
NO_ARCH= yes
-USES= python:3 tar:tgz
-USE_PYTHON= autoplist distutils
+USES= python:3.4+ tar:tgz
+USE_PYTHON= autoplist distutils optsuffix
OPTIONS_DEFINE= DVDCSS
.if !defined(PACKAGE_BUILDING)
diff --git a/sysutils/farbot/Makefile b/sysutils/farbot/Makefile
index 8766416b9c65..cc1921b1152d 100644
--- a/sysutils/farbot/Makefile
+++ b/sysutils/farbot/Makefile
@@ -19,7 +19,7 @@ GH_ACCOUNT= threerings
GH_PROJECT= farbot
GH_TAGNAME= c824009
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
PYDISTUTILS_PKGNAME= farb
PYDISTUTILS_PKGVERSION= 0.1
diff --git a/sysutils/feather/Makefile b/sysutils/feather/Makefile
index aaf14a0cab8b..9df32621dc39 100644
--- a/sysutils/feather/Makefile
+++ b/sysutils/feather/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= sysutils python
MAINTAINER= ports@FreeBSD.org
COMMENT= Python script for managing tarsnap backups
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
tarsnap>=0:sysutils/tarsnap
USES= python:2,run
diff --git a/sysutils/fusefs-gitfs/Makefile b/sysutils/fusefs-gitfs/Makefile
index c62cdf813433..aa7570fcab1b 100644
--- a/sysutils/fusefs-gitfs/Makefile
+++ b/sysutils/fusefs-gitfs/Makefile
@@ -10,19 +10,19 @@ COMMENT= Version controlled file system
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomiclong>0:devel/py-atomiclong \
- ${PYTHON_PKGNAMEPREFIX}fusepy>=2.0.2:devel/py-fusepy \
- ${PYTHON_PKGNAMEPREFIX}pygit2>=0.24.1:devel/py-pygit2 \
- ${PYTHON_PKGNAMEPREFIX}raven>=5.27.0:devel/py-raven \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.1:devel/py-pytest
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomiclong>0:devel/py-atomiclong@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}fusepy>=2.0.2:devel/py-fusepy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygit2>=0.24.1:devel/py-pygit2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}raven>=5.27.0:devel/py-raven@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.1:devel/py-pytest@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= PressLabs
NO_ARCH= yes
USES= python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils concurrent optsuffix
post-patch:
@${REINPLACE_CMD} -e 's/==/>=/' ${WRKSRC}/*requirements.txt
@@ -34,7 +34,7 @@ do-test:
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3300
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${FLAVOR}
.else
post-patch: patch-py3k-mock
patch-py3k-mock:
diff --git a/sysutils/fusefs-wikipediafs/Makefile b/sysutils/fusefs-wikipediafs/Makefile
index c7a20e1c0a86..a572f1dd69c1 100644
--- a/sysutils/fusefs-wikipediafs/Makefile
+++ b/sysutils/fusefs-wikipediafs/Makefile
@@ -13,9 +13,9 @@ COMMENT= Mount mediawikis
LICENSE= GPLv2
-RUN_DEPENDS= py*-fusefs>=0.2:devel/py-fusefs
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fusefs>=0.2:devel/py-fusefs@${FLAVOR}
-USES= fuse python
+USES= fuse python:2.7
USE_PYTHON= autoplist distutils
PORTDOCS= AUTHORS ChangeLog HACKING NEWS README TODO
NO_ARCH= yes
diff --git a/sysutils/hachoir-urwid/Makefile b/sysutils/hachoir-urwid/Makefile
index 8a032cfec9f2..33ed3b0dd0b5 100644
--- a/sysutils/hachoir-urwid/Makefile
+++ b/sysutils/hachoir-urwid/Makefile
@@ -10,7 +10,7 @@ MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Binary file explorer
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:devel/hachoir-parser \
- ${PYTHON_SITELIBDIR}/urwid/__init__.py:devel/py-urwid
+ ${PYTHON_SITELIBDIR}/urwid/__init__.py:devel/py-urwid@${FLAVOR}
USES= python:2.7
USE_PYTHON= distutils
diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile
index 695e470d2abb..63ff88a6cf94 100644
--- a/sysutils/iocage/Makefile
+++ b/sysutils/iocage/Makefile
@@ -11,17 +11,17 @@ COMMENT= FreeBSD jail manager written in Python3
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py3-pytest-runner
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py3-click \
- ${PYTHON_PKGNAMEPREFIX}tqdm>=4.10.0:misc/py3-tqdm \
- ${PYTHON_PKGNAMEPREFIX}coloredlogs>0:devel/py3-coloredlogs \
- ${PYTHON_PKGNAMEPREFIX}verboselogs>0:devel/py3-verboselogs \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tqdm>=4.10.0:misc/py-tqdm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}coloredlogs>0:devel/py-coloredlogs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}verboselogs>0:devel/py-verboselogs@${PY_FLAVOR} \
ca_root_nss>0:security/ca_root_nss \
- ${PYTHON_PKGNAMEPREFIX}texttable>=0.8.7:textproc/py3-texttable \
- ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py3-pytest-runner \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py3-requests \
- ${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py3-libzfs \
- ${PYTHON_PKGNAMEPREFIX}pygit2>=0.24.1:devel/py3-pygit2
+ ${PYTHON_PKGNAMEPREFIX}texttable>=0.8.7:textproc/py-texttable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py-libzfs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygit2>=0.24.1:devel/py-pygit2@${PY_FLAVOR}
USE_GITHUB= yes
diff --git a/sysutils/jadm/Makefile b/sysutils/jadm/Makefile
index f86ea295b044..9045e24c8dd5 100644
--- a/sysutils/jadm/Makefile
+++ b/sysutils/jadm/Makefile
@@ -12,14 +12,14 @@ COMMENT= FreeBSD jail framework with zfs, vnet and jail.conf support
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko \
- ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:net/py-netifaces \
- ${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate \
- ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.6:net/py-ipaddress
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko \
- ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:net/py-netifaces \
- ${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate \
- ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.6:net/py-ipaddress
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:net/py-netifaces@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate@${FLAVOR} \
+ ${PY_IPADDRESS}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:net/py-netifaces@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate@${FLAVOR} \
+ ${PY_IPADDRESS}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/sysutils/lfm/Makefile b/sysutils/lfm/Makefile
index f424857b9d53..b700c3659577 100644
--- a/sysutils/lfm/Makefile
+++ b/sysutils/lfm/Makefile
@@ -14,7 +14,7 @@ LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
NO_ARCH= yes
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils optsuffix
USES= python:3.4+
PLIST_FILES= man/man1/lfm.1.gz
diff --git a/sysutils/mog/Makefile b/sysutils/mog/Makefile
index 8e11539abd07..e17ebe093a36 100644
--- a/sysutils/mog/Makefile
+++ b/sysutils/mog/Makefile
@@ -11,13 +11,13 @@ COMMENT= Different take on the UNIX tool cat
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments \
- mdv:devel/py-mdv
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${FLAVOR} \
+ mdv:devel/py-mdv@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
USE_GITHUB= yes
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils concurrent optsuffix
NO_ARCH= yes
GH_ACCOUNT= witchard
diff --git a/sysutils/ohmu/Makefile b/sysutils/ohmu/Makefile
index 0edfff75b41f..31e7092509a3 100644
--- a/sysutils/ohmu/Makefile
+++ b/sysutils/ohmu/Makefile
@@ -11,14 +11,14 @@ COMMENT= Tool to view space usage in your terminal
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scandir>=1.3:sysutils/py-scandir \
- ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scandir>=1.3:sysutils/py-scandir@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= paul-nechifor
USES= python
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils concurrent optsuffix
NO_ARCH= yes
pre-configure:
diff --git a/sysutils/py-bcfg2/Makefile b/sysutils/py-bcfg2/Makefile
index 1cd5dd262765..faee92ecce71 100644
--- a/sysutils/py-bcfg2/Makefile
+++ b/sysutils/py-bcfg2/Makefile
@@ -12,24 +12,24 @@ COMMENT= Configuration management system written in Python
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}daemon>=0:devel/py-daemon \
- ${PYTHON_PKGNAMEPREFIX}gamin>=0:devel/py-gamin \
- ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile \
- ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}daemon>=0:devel/py-daemon@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gamin>=0:devel/py-gamin@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR}
OPTIONS_DEFINE= CHEETAH GENSHI
CHEETAH_DESC= Support Cheetah Templates
GENSHI_DESC= Support Genshi Templates
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
USE_RC_SUBR= bcfg2
SUB_LIST= PYTHON_CMD=${PYTHON_CMD}
PORTDOCS= COPYRIGHT README
-CHEETAH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=0:devel/py-cheetah
-GENSHI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0:textproc/py-genshi
+CHEETAH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=0:devel/py-cheetah@${FLAVOR}
+GENSHI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0:textproc/py-genshi@${FLAVOR}
post-patch:
@${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py
diff --git a/sysutils/py-cdmi/Makefile b/sysutils/py-cdmi/Makefile
index 18b2762aeccd..f486470ceb99 100644
--- a/sysutils/py-cdmi/Makefile
+++ b/sysutils/py-cdmi/Makefile
@@ -12,14 +12,14 @@ COMMENT= CDMI on OpenStack Swift implementation
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}swift>0:databases/py-swift \
- ${PYTHON_PKGNAMEPREFIX}webob>0:www/py-webob
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}swift>0:databases/py-swift@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>0:www/py-webob@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= osaddon
GH_TAGNAME= f0e3ad9
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/sysutils/py-consul/Makefile b/sysutils/py-consul/Makefile
index a2d95e640b7e..e792204e7aa0 100644
--- a/sysutils/py-consul/Makefile
+++ b/sysutils/py-consul/Makefile
@@ -4,16 +4,17 @@ PORTNAME= py-consul
PORTVERSION= 0.7.2
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= jhixson@gmail.com
COMMENT= Python client for consul
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py3-requests \
- ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py3-requests \
- ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR}
USES= python:3.3+
diff --git a/sysutils/py-croniter/Makefile b/sysutils/py-croniter/Makefile
index b58786cf70da..96e3f4735463 100644
--- a/sysutils/py-croniter/Makefile
+++ b/sysutils/py-croniter/Makefile
@@ -12,7 +12,7 @@ COMMENT= Iteration support for datetime objects with cron like format
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR}
USES= python zip
USE_PYTHON= distutils autoplist
diff --git a/sysutils/py-crontab/Makefile b/sysutils/py-crontab/Makefile
index 0424db4124f7..8fb20c13c1c0 100644
--- a/sysutils/py-crontab/Makefile
+++ b/sysutils/py-crontab/Makefile
@@ -13,8 +13,8 @@ COMMENT= Read and write crontab files using a direct API
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}croniter>0:sysutils/py-croniter
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}croniter>0:sysutils/py-croniter@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/sysutils/py-diffoscope/Makefile b/sysutils/py-diffoscope/Makefile
index 20383a92ca57..8c33516f43ff 100644
--- a/sysutils/py-diffoscope/Makefile
+++ b/sysutils/py-diffoscope/Makefile
@@ -13,15 +13,15 @@ COMMENT= In-depth comparison of files, archives, and directories
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libarchive-c>=0:archivers/py3-libarchive-c \
- ${PYTHON_PKGNAMEPREFIX}python-magic>=0:devel/py3-python-magic \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libarchive-c>=0:archivers/py-libarchive-c@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-magic>=0:devel/py-python-magic@${FLAVOR} \
gdiff:textproc/diffutils
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest \
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \
zipinfo:archivers/unzip \
isoinfo:sysutils/cdrkit \
rpm2cpio:archivers/rpm2cpio
-USES= python:3.4+
+USES= python:3.5+
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
diff --git a/sysutils/py-dlipower/Makefile b/sysutils/py-dlipower/Makefile
index cf82197317ce..37beda186494 100644
--- a/sysutils/py-dlipower/Makefile
+++ b/sysutils/py-dlipower/Makefile
@@ -13,9 +13,9 @@ COMMENT= CLI interface to Digital Logger's (DLI) Power Strips
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR}
USES= python shebangfix
SHEBANG_FILES= scripts/fence_dli
diff --git a/sysutils/py-docker/Makefile b/sysutils/py-docker/Makefile
index 781d022c22fc..1f22dfc8d4d0 100644
--- a/sysutils/py-docker/Makefile
+++ b/sysutils/py-docker/Makefile
@@ -12,11 +12,11 @@ COMMENT= Python library for the Docker Engine API
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client \
- ${PYTHON_PKGNAMEPREFIX}docker-pycreds>0:security/py-docker-pycreds
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docker-pycreds>0:security/py-docker-pycreds@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
@@ -24,11 +24,11 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_SUFFIX} < 35
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname@${FLAVOR}
.endif
.if ${PYTHON_SUFFIX} < 33
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddress>0:net/py-ipaddress
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddress>0:net/py-ipaddress@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/sysutils/py-execnet/Makefile b/sysutils/py-execnet/Makefile
index 16125cde0df0..c33a95e394d2 100644
--- a/sysutils/py-execnet/Makefile
+++ b/sysutils/py-execnet/Makefile
@@ -13,11 +13,11 @@ COMMENT= Distributed Python deployment and communication
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm
-RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.4:devel/py-apipkg
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.4:devel/py-apipkg@${FLAVOR}
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.mk>
diff --git a/sysutils/py-ezjailremote/Makefile b/sysutils/py-ezjailremote/Makefile
index c73eb872bffe..37af97b322bc 100644
--- a/sysutils/py-ezjailremote/Makefile
+++ b/sysutils/py-ezjailremote/Makefile
@@ -13,13 +13,13 @@ COMMENT= Remote control and convenience wrapper for ezjail
LICENSE= BSD2CLAUSE
RUN_DEPENDS= ezjail-admin:sysutils/ezjail \
- ${PYTHON_PKGNAMEPREFIX}fabric>0:devel/py-fabric
+ ${PYTHON_PKGNAMEPREFIX}fabric>0:devel/py-fabric@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= tomster
GH_PROJECT= ezjail-remote
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/sysutils/py-filelike/Makefile b/sysutils/py-filelike/Makefile
index fe71d8fb1305..98f8a502c084 100644
--- a/sysutils/py-filelike/Makefile
+++ b/sysutils/py-filelike/Makefile
@@ -6,11 +6,12 @@ PORTVERSION= 0.4.1
PORTREVISION= 1
CATEGORIES= sysutils python
MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= dikshie@sfc.wide.ad.jp
COMMENT= Python module for building and manipulating file-like object
USES= python
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist concurrent
.include <bsd.port.mk>
diff --git a/sysutils/py-freenas.cli/Makefile b/sysutils/py-freenas.cli/Makefile
index 960777b3e30d..5f06aa96ced6 100644
--- a/sysutils/py-freenas.cli/Makefile
+++ b/sysutils/py-freenas.cli/Makefile
@@ -10,18 +10,18 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wg@FreeBSD.org
COMMENT= FreeNAS Command Line Interface
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}columnize>0:devel/py-columnize \
- ${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu \
- ${PYTHON_PKGNAMEPREFIX}natural>0:devel/py-natural \
- ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \
- ${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor \
- ${PYTHON_PKGNAMEPREFIX}texttable>0:textproc/py-texttable \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils \
- ${PYTHON_PKGNAMEPREFIX}freenas.dispatcher>0:devel/py-freenas.dispatcher
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}columnize>0:devel/py-columnize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}natural>0:devel/py-natural@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}texttable>0:textproc/py-texttable@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}freenas.dispatcher>0:devel/py-freenas.dispatcher@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/sysutils/py-glances/Makefile b/sysutils/py-glances/Makefile
index 1e6a62b2aab9..25d314614f5d 100644
--- a/sysutils/py-glances/Makefile
+++ b/sysutils/py-glances/Makefile
@@ -13,7 +13,7 @@ COMMENT= CLI curses based monitoring tool for GNU/Linux and BSD OS
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=2.1.1:sysutils/py-psutil
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=2.1.1:sysutils/py-psutil@${FLAVOR}
OPTIONS_DEFINE= DOCS
OPTIONS_SUB= yes
diff --git a/sysutils/py-gmailfs-fuse/Makefile b/sysutils/py-gmailfs-fuse/Makefile
index a9fc54c528c9..e2945b4938a7 100644
--- a/sysutils/py-gmailfs-fuse/Makefile
+++ b/sysutils/py-gmailfs-fuse/Makefile
@@ -11,7 +11,7 @@ COMMENT= Use an IMAP server (like gmail) as normal storage
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fusefs>=0.2:devel/py-fusefs
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fusefs>=0.2:devel/py-fusefs@${FLAVOR}
USES= fuse python:2.7
USE_PYTHON= autoplist distutils
diff --git a/sysutils/py-google-compute-engine/Makefile b/sysutils/py-google-compute-engine/Makefile
index c7c0d8581dd8..a640e431bcd7 100644
--- a/sysutils/py-google-compute-engine/Makefile
+++ b/sysutils/py-google-compute-engine/Makefile
@@ -12,9 +12,9 @@ COMMENT= Guest Environment for Google Compute Engine
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \
- ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \
- ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${FLAVOR} \
sudo:security/sudo
USES= python
diff --git a/sysutils/py-halite/Makefile b/sysutils/py-halite/Makefile
index fef9a851069e..e27a68511dc4 100644
--- a/sysutils/py-halite/Makefile
+++ b/sysutils/py-halite/Makefile
@@ -13,8 +13,8 @@ COMMENT= SaltStack Web UI
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}salt>=0.17.0:sysutils/py-salt \
- ${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}salt>=0.17.0:sysutils/py-salt@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy@${FLAVOR}
USES= python:2
USE_PYTHON= distutils autoplist
diff --git a/sysutils/py-honcho/Makefile b/sysutils/py-honcho/Makefile
index b9c66d4017d7..6a51f69fd7df 100644
--- a/sysutils/py-honcho/Makefile
+++ b/sysutils/py-honcho/Makefile
@@ -13,9 +13,9 @@ COMMENT= Managing Procfile-based applications tool
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= nickstenning
diff --git a/sysutils/py-nomad/Makefile b/sysutils/py-nomad/Makefile
index 4dd11ab64e31..f807a8379605 100644
--- a/sysutils/py-nomad/Makefile
+++ b/sysutils/py-nomad/Makefile
@@ -3,14 +3,15 @@
PORTNAME= py-nomad
PORTVERSION= 0.5.0
CATEGORIES= sysutils
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= jhixson@gmail.com
COMMENT= Python client for nomad
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py3-requests
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py3-requests
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR}
USES= python:3.3+
diff --git a/sysutils/py-pkginfo/Makefile b/sysutils/py-pkginfo/Makefile
index 5ad143adeccd..659d2fd9e67d 100644
--- a/sysutils/py-pkginfo/Makefile
+++ b/sysutils/py-pkginfo/Makefile
@@ -12,7 +12,7 @@ COMMENT= Query metadatdata from sdists / bdists / installed packages
LICENSE= MIT
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.mk>
diff --git a/sysutils/py-ploy/Makefile b/sysutils/py-ploy/Makefile
index 85aa76f51622..f8092809bb34 100644
--- a/sysutils/py-ploy/Makefile
+++ b/sysutils/py-ploy/Makefile
@@ -14,9 +14,9 @@ COMMENT= Manage servers through a central configuration
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy \
- ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \
- ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/sysutils/py-ploy_ansible/Makefile b/sysutils/py-ploy_ansible/Makefile
index 1229e9c0804d..297e67e25e63 100644
--- a/sysutils/py-ploy_ansible/Makefile
+++ b/sysutils/py-ploy_ansible/Makefile
@@ -13,13 +13,13 @@ COMMENT= Plugin to integrate Ansible with ploy
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
- ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy \
- ${PYTHON_PKGNAMEPREFIX}execnet>0:sysutils/py-execnet \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}execnet>0:sysutils/py-execnet@${FLAVOR} \
ansible1<2.0:sysutils/ansible1
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
- ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog@${FLAVOR}
USES= python:-2.7
USE_PYTHON= autoplist distutils
diff --git a/sysutils/py-ploy_ec2/Makefile b/sysutils/py-ploy_ec2/Makefile
index e452b15a8945..81370ca9ae08 100644
--- a/sysutils/py-ploy_ec2/Makefile
+++ b/sysutils/py-ploy_ec2/Makefile
@@ -13,10 +13,10 @@ COMMENT= Plugin for ploy to provision Amazon EC2 instances
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
- ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy \
- ${PYTHON_PKGNAMEPREFIX}boto>=2.0:devel/py-boto \
- ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}boto>=2.0:devel/py-boto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${FLAVOR}
USES= python:-2.7
USE_PYTHON= autoplist distutils
diff --git a/sysutils/py-ploy_ezjail/Makefile b/sysutils/py-ploy_ezjail/Makefile
index 9c4931f1a0e7..3019f97810c6 100644
--- a/sysutils/py-ploy_ezjail/Makefile
+++ b/sysutils/py-ploy_ezjail/Makefile
@@ -13,9 +13,9 @@ COMMENT= Plugin for ploy to provision FreeBSD jails using ezjail
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
- ${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy \
- ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/sysutils/py-ploy_fabric/Makefile b/sysutils/py-ploy_fabric/Makefile
index ca642865e288..dd65f7e7111d 100644
--- a/sysutils/py-ploy_fabric/Makefile
+++ b/sysutils/py-ploy_fabric/Makefile
@@ -13,8 +13,8 @@ COMMENT= Ploy plugin for integration with Fabric
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy \
- ${PYTHON_PKGNAMEPREFIX}fabric>=1.4.0,1:devel/py-fabric
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}fabric>=1.4.0,1:devel/py-fabric@${FLAVOR}
USES= python:-2.7 zip
USE_PYTHON= autoplist distutils
diff --git a/sysutils/py-plumbum/Makefile b/sysutils/py-plumbum/Makefile
index 2350337ef6ed..349fffed5ec3 100644
--- a/sysutils/py-plumbum/Makefile
+++ b/sysutils/py-plumbum/Makefile
@@ -12,7 +12,7 @@ COMMENT= Shell combinators and more for python
LICENSE= MIT
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/sysutils/py-psutil/Makefile b/sysutils/py-psutil/Makefile
index 9a546d21d30b..9fb0aa394a1a 100644
--- a/sysutils/py-psutil/Makefile
+++ b/sysutils/py-psutil/Makefile
@@ -13,8 +13,8 @@ COMMENT= Process utilities module for Python
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \
- ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${FLAVOR}
USE_PYTHON= autoplist concurrent distutils
USES= python
diff --git a/sysutils/py-ptyprocess/Makefile b/sysutils/py-ptyprocess/Makefile
index 5ac66bb37721..a5cc898f1bd4 100644
--- a/sysutils/py-ptyprocess/Makefile
+++ b/sysutils/py-ptyprocess/Makefile
@@ -11,7 +11,7 @@ COMMENT= Run a subprocess in a pseudo terminal
LICENSE= ISCL
-USES?= python
+USES= python
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index 4d9f591ceb5e..3b573a0827bc 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -13,19 +13,24 @@ COMMENT= Distributed remote execution and configuration management system
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe \
- ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3\
- ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto \
- ${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore \
- ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud \
- ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python \
- ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar \
- ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:www/py-tornado \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
-
-USES= cpe python:2.7+
+py34_BROKEN= fails to package
+py35_BROKEN= fails to package
+py36_BROKEN= fails to package
+
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:www/py-tornado@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
+
+USES= cpe python
+
CPE_VENDOR= saltstack
CPE_PRODUCT= salt
USE_PYTHON= autoplist distutils
@@ -63,26 +68,26 @@ RAET_DESC= Install dependencies required for RAET transport
TCP_DESC= Install dependencies required for TCP transport
ZEROMQ_DESC= Install dependencies required for ZeroMQ transport
-RAET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libnacl>=1.0.0:security/py-libnacl \
- ${PYTHON_PKGNAMEPREFIX}ioflo>=1.1.7:devel/py-ioflo \
- ${PYTHON_PKGNAMEPREFIX}raet>=0.6.0:net/py-raet
+RAET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libnacl>=1.0.0:security/py-libnacl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ioflo>=1.1.7:devel/py-ioflo@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}raet>=0.6.0:net/py-raet@${FLAVOR}
-TCP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto
+TCP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR}
-ZEROMQ_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq
-ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto
+ZEROMQ_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${FLAVOR}
+ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR}
.include <bsd.port.pre.mk>
# Python 2.7-3.3 require enum34, unnecessary for Python 3.4+
.if ${PYTHON_REL} < 3400
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR}
.endif
# Python 3+ comes with futures built-in
.if ${PYTHON_REL} < 3200
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>=2.0:devel/py-futures
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>=2.0:devel/py-futures@${FLAVOR}
.endif
post-patch:
diff --git a/sysutils/py-shutilwhich/Makefile b/sysutils/py-shutilwhich/Makefile
index 50efaa436b98..901865e946a5 100644
--- a/sysutils/py-shutilwhich/Makefile
+++ b/sysutils/py-shutilwhich/Makefile
@@ -11,7 +11,7 @@ COMMENT= shutil.which for those not using Python 3.3
LICENSE= PSFL
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
USES= python:-3.3
USE_GITHUB= yes
diff --git a/sysutils/py-stdiff/Makefile b/sysutils/py-stdiff/Makefile
index 2a4a5a598144..d788ab14849f 100644
--- a/sysutils/py-stdiff/Makefile
+++ b/sysutils/py-stdiff/Makefile
@@ -4,11 +4,12 @@ PORTNAME= stdiff
PORTVERSION= 0.2.1
CATEGORIES= sysutils python
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= araujo@FreeBSD.org
COMMENT= Spot The Difference is a file integrity checker
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS
diff --git a/sysutils/py-superlance/Makefile b/sysutils/py-superlance/Makefile
index d38fec79bfa1..30ef0ec9c4cd 100644
--- a/sysutils/py-superlance/Makefile
+++ b/sysutils/py-superlance/Makefile
@@ -13,7 +13,7 @@ COMMENT= Superlance plugins for supervisord
LICENSE= BSD4CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor@${FLAVOR}
NO_ARCH= yes
diff --git a/sysutils/py-supervisor/Makefile b/sysutils/py-supervisor/Makefile
index 8af46080249d..a32fe1bfa7f0 100644
--- a/sysutils/py-supervisor/Makefile
+++ b/sysutils/py-supervisor/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= hizel@vyborg.ru
COMMENT= System for controlling process state under UNIX
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meld3>=0.6.5:www/py-meld3
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0.5.0:devel/py-mock
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meld3>=0.6.5:www/py-meld3@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0.5.0:devel/py-mock@${FLAVOR}
PORTDOCS= *.txt *.rst
diff --git a/sysutils/py-tmuxp/Makefile b/sysutils/py-tmuxp/Makefile
index a21758220958..d8e2b7263e88 100644
--- a/sysutils/py-tmuxp/Makefile
+++ b/sysutils/py-tmuxp/Makefile
@@ -13,9 +13,9 @@ COMMENT= Session manager for tmux
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argcomplete>=0:devel/py-argcomplete \
- ${PYTHON_PKGNAMEPREFIX}kaptan>=0.5.7:devel/py-kaptan \
- ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3:devel/py-colorama \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argcomplete>=0:devel/py-argcomplete@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}kaptan>=0.5.7:devel/py-kaptan@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3:devel/py-colorama@${FLAVOR} \
tmux:sysutils/tmux
NO_ARCH= yes
diff --git a/sysutils/py-zdaemon/Makefile b/sysutils/py-zdaemon/Makefile
index 5671c8a65d30..5d61965152aa 100644
--- a/sysutils/py-zdaemon/Makefile
+++ b/sysutils/py-zdaemon/Makefile
@@ -13,7 +13,7 @@ COMMENT= Daemon Process Control Library and Tools for Unix-bases Systems
LICENSE= ZPL21
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>0:devel/py-zconfig
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>0:devel/py-zconfig@${FLAVOR}
NO_ARCH= yes
USES= python zip
diff --git a/sysutils/py3-execnet/Makefile b/sysutils/py3-execnet/Makefile
deleted file mode 100644
index 3e8308b55b92..000000000000
--- a/sysutils/py3-execnet/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-execnet
-
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py3-setuptools_scm
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.4:devel/py3-apipkg
-
-USES= python:3.2+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/py3-pkginfo/Makefile b/sysutils/py3-pkginfo/Makefile
deleted file mode 100644
index b61d7e097b66..000000000000
--- a/sysutils/py3-pkginfo/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: rs.os
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pkginfo
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/py3-ptyprocess/Makefile b/sysutils/py3-ptyprocess/Makefile
deleted file mode 100644
index 62c834fff6dc..000000000000
--- a/sysutils/py3-ptyprocess/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-ptyprocess
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/qzeitgeist/Makefile b/sysutils/qzeitgeist/Makefile
index 1a9cb51488b9..c72b6f6fc1af 100644
--- a/sysutils/qzeitgeist/Makefile
+++ b/sysutils/qzeitgeist/Makefile
@@ -20,7 +20,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= rapper:textproc/raptor2 \
${PYTHON_SITELIBDIR}/rdflib/__init__.py:textproc/py-rdflib
-USES= cmake kde:4 python:build tar:bzip2
+USES= cmake kde:4 python:2.7,build tar:bzip2
USE_KDE= automoc4
USE_QT4= corelib dbus declarative qtestlib \
moc_build qmake_build rcc_build uic_build
diff --git a/sysutils/rdiff-backup-devel/Makefile b/sysutils/rdiff-backup-devel/Makefile
index 41e88e0c09e8..624d5c1e1e98 100644
--- a/sysutils/rdiff-backup-devel/Makefile
+++ b/sysutils/rdiff-backup-devel/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= librsync.so:net/librsync2
CONFLICTS= rdiff-backup-[0-9]*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
MAN1S= rdiff-backup.1 rdiff-backup-statistics.1
diff --git a/sysutils/sample/Makefile b/sysutils/sample/Makefile
index d40f0ae08154..ac781fe2303e 100644
--- a/sysutils/sample/Makefile
+++ b/sysutils/sample/Makefile
@@ -13,7 +13,6 @@ LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ${LOCALBASE}/lib/libbfd.a:devel/libbfd \
${LOCALBASE}/lib/libiberty.a:devel/gnulibiberty \
${LOCALBASE}/lib/libxo.a:devel/libxo \
- ${LOCALBASE}/bin/cython:lang/cython \
${LOCALBASE}/bin/python:lang/python
BROKEN_i386= does not build: don't know how to make sample_support_i386.c
@@ -25,6 +24,7 @@ GH_ACCOUNT= freenas
GH_TAGNAME= 45e2b86
USES= python:build kmod
+USE_PYTHON= cython
MAKE_ENV= SYSDIR=${SRC_BASE}/sys
diff --git a/sysutils/solaar/Makefile b/sysutils/solaar/Makefile
index b390522356d6..f051c4f31691 100644
--- a/sysutils/solaar/Makefile
+++ b/sysutils/solaar/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${LOCALBASE}/lib/libhidapi.so:comms/hidapi
USES= python
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist concurrent optsuffix
USE_GITHUB= yes
GH_ACCOUNT= pwr
@@ -29,7 +29,7 @@ GH_TAGNAME= 53ec751
NO_ARCH= yes
OPTIONS_DEFINE= GUI
-GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py${PYTHON_MAJOR_VER:S/2//}-gobject3
+GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${FLAVOR}
post-patch:
@${CP} ${FILESDIR}/hidapi.py ${WRKSRC}/lib/hidapi/udev.py
diff --git a/sysutils/tentakel/Makefile b/sysutils/tentakel/Makefile
index 23a677be9939..b8b46b778813 100644
--- a/sysutils/tentakel/Makefile
+++ b/sysutils/tentakel/Makefile
@@ -13,7 +13,7 @@ COMMENT= Program for executing commands on many hosts in parallel
WRKSRC= ${WRKDIR}/${DISTNAME}/py
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS
diff --git a/sysutils/xen-guest-tools/Makefile b/sysutils/xen-guest-tools/Makefile
index 24679aa9bf4d..95f591f71ae0 100644
--- a/sysutils/xen-guest-tools/Makefile
+++ b/sysutils/xen-guest-tools/Makefile
@@ -19,7 +19,7 @@ ONLY_FOR_ARCHS= amd64 i386
ONLY_FOR_ARCHS_REASON= not yet ported to anything other than amd64 or i386
CONFLICTS= xen-tools-[0-9]*
-USES= gmake python:2.7:configure perl5 gettext-runtime:build gettext-tools:build pkgconfig
+USES= gmake python:2.7,configure perl5 gettext-runtime:build gettext-tools:build pkgconfig
USE_PERL5= build
GNU_CONFIGURE= yes
CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} PYTHON_PATH=${PYTHON_CMD}
diff --git a/sysutils/yum/Makefile b/sysutils/yum/Makefile
index fad3ec5c0adc..93485b96f632 100644
--- a/sysutils/yum/Makefile
+++ b/sysutils/yum/Makefile
@@ -17,15 +17,16 @@ BUILD_DEPENDS= bash:shells/bash \
intltool-update:textproc/intltool
RUN_DEPENDS= bash:shells/bash \
${PYTHON_SITELIBDIR}/rpm/__init__.py:archivers/rpm4 \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
- ${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser \
- ${PYTHON_PKGNAMEPREFIX}iniparse>0:devel/py-iniparse \
- ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iniparse>0:devel/py-iniparse@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber@${FLAVOR}
ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386
ONLY_FOR_ARCHS_REASON= linux is not available for ${ARCH}
-USES= cpe gettext gmake python shebangfix
+USES= cpe gettext gmake python:2.7 shebangfix
+USE_PYTHON= flavors
SHEBANG_FILES= etc/yum-updatesd.init
CPE_VENDOR= baseurl
diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile
index 9d8072d7adb4..fcc803ebdd9a 100644
--- a/sysutils/zeitgeist/Makefile
+++ b/sysutils/zeitgeist/Makefile
@@ -16,9 +16,9 @@ LICENSE_COMB= multi
BUILD_DEPENDS= valac:lang/vala \
dee-tool:devel/dee \
rapper:textproc/raptor2 \
- ${PYTHON_PKGNAMEPREFIX}rdflib>=4.1.1:textproc/py-rdflib
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg \
- ${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus
+ ${PYTHON_PKGNAMEPREFIX}rdflib>=4.1.1:textproc/py-rdflib@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus@${PY_FLAVOR}
USE_GNOME= intlhack glib20 introspection:build
GNU_CONFIGURE= yes
diff --git a/textproc/Makefile b/textproc/Makefile
index bce80d63cde1..ac8152bfccae 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1266,6 +1266,7 @@
SUBDIR += py-agate-dbf
SUBDIR += py-agate-excel
SUBDIR += py-alabaster
+ SUBDIR += py-asciinema
SUBDIR += py-asv
SUBDIR += py-autopep8
SUBDIR += py-awesome-slugify
@@ -1314,6 +1315,7 @@
SUBDIR += py-nltk
SUBDIR += py-numpydoc
SUBDIR += py-openpyxl
+ SUBDIR += py-pager
SUBDIR += py-pandocfilters
SUBDIR += py-paragrep
SUBDIR += py-parsel
@@ -1397,25 +1399,6 @@
SUBDIR += py-zope.tal
SUBDIR += py-zpt
SUBDIR += py2html
- SUBDIR += py3-MarkupSafe
- SUBDIR += py3-alabaster
- SUBDIR += py3-asciinema
- SUBDIR += py3-chardet
- SUBDIR += py3-docutils
- SUBDIR += py3-feedparser
- SUBDIR += py3-humanfriendly
- SUBDIR += py3-hunspell
- SUBDIR += py3-libxml2
- SUBDIR += py3-numpydoc
- SUBDIR += py3-pager
- SUBDIR += py3-pyPEG2
- SUBDIR += py3-pygments
- SUBDIR += py3-pystemmer
- SUBDIR += py3-qrcode
- SUBDIR += py3-snowballstemmer
- SUBDIR += py3-sphinx
- SUBDIR += py3-sphinx_rtd_theme
- SUBDIR += py3-texttable
SUBDIR += pychm
SUBDIR += qprint
SUBDIR += qrcodegen
diff --git a/textproc/archmage/Makefile b/textproc/archmage/Makefile
index 6f7e95fbbfba..8924701af090 100644
--- a/textproc/archmage/Makefile
+++ b/textproc/archmage/Makefile
@@ -15,7 +15,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/chm/chm.py:textproc/pychm \
- ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32
+ ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${FLAVOR}
NO_BUILD= yes
USES= cpe python:2 tar:bzip2
diff --git a/textproc/cdiff/Makefile b/textproc/cdiff/Makefile
index fb96da17679e..0f9483a2f49c 100644
--- a/textproc/cdiff/Makefile
+++ b/textproc/cdiff/Makefile
@@ -18,7 +18,7 @@ USE_GITHUB=
GH_ACCOUNT= ymattw
USES= python
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist concurrent optsuffix
NO_ARCH= yes
OPTIONS_DEFINE= DOCS
diff --git a/textproc/cmark/Makefile b/textproc/cmark/Makefile
index 32e2c72ee548..b60c3211e279 100644
--- a/textproc/cmark/Makefile
+++ b/textproc/cmark/Makefile
@@ -11,7 +11,7 @@ COMMENT= CommonMark parsing and rendering library and program in C
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cmake:outsource python:3,test
+USES= cmake:outsource python:3.4+,test
USE_GITHUB= yes
GH_ACCOUNT= commonmark
USE_LDCONFIG= yes
diff --git a/textproc/coccigrep/Makefile b/textproc/coccigrep/Makefile
index 86e1e441f2a3..b2bfa038ea43 100644
--- a/textproc/coccigrep/Makefile
+++ b/textproc/coccigrep/Makefile
@@ -17,7 +17,7 @@ USE_GITHUB= yes
GH_ACCOUNT= regit
USES= python
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist concurrent optsuffix
PLIST_FILES= man/man1/coccigrep.1.gz \
${DATADIR_REL}/cocci-grep.el \
diff --git a/textproc/codespell/Makefile b/textproc/codespell/Makefile
index dae471052df6..080a3e11d02f 100644
--- a/textproc/codespell/Makefile
+++ b/textproc/codespell/Makefile
@@ -10,7 +10,7 @@ COMMENT= Source code spelling checker
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= python:3
+USES= python:3.4+
USE_GITHUB= yes
GH_ACCOUNT= lucasdemarchi
diff --git a/textproc/ibus-el/Makefile b/textproc/ibus-el/Makefile
index d3f92e0c08fc..3aa2deb95966 100644
--- a/textproc/ibus-el/Makefile
+++ b/textproc/ibus-el/Makefile
@@ -14,7 +14,7 @@ COMMENT= IBus client for GNU Emacs
RUN_DEPENDS= ibus-daemon:textproc/ibus \
${PYTHON_SITELIBDIR}/Xlib/X.py:x11-toolkits/py-xlib
-USES= python:run
+USES= python:2.7,run
USE_EMACS= yes
LICENSE= GPLv3
diff --git a/textproc/ibus-typing-booster/Makefile b/textproc/ibus-typing-booster/Makefile
index 5ce7628808f9..7becae4fff5f 100644
--- a/textproc/ibus-typing-booster/Makefile
+++ b/textproc/ibus-typing-booster/Makefile
@@ -11,18 +11,18 @@ COMMENT= Faster typing by context sensitive completion
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py3-xdg \
- ${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py3-gobject3 \
- ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/${PYTHON_PKGNAMEPREFIX}sqlite3
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py-xdg@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py-gobject3@${PY_FLAVOR} \
+ ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR}
LIB_DEPENDS= libibus-1.0.so:textproc/ibus \
libm17n.so:devel/m17n-lib
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py3-xdg \
- ${PYTHON_SITELIBDIR}/dbus/bus.py:devel/py3-dbus \
- ${PYTHON_SITELIBDIR}/hunspell.so:textproc/py3-hunspell \
- ${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py3-gobject3 \
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py-xdg@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/dbus/bus.py:devel/py-dbus@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/hunspell.so:textproc/py-hunspell@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py-gobject3@${PY_FLAVOR} \
${LOCALBASE}/share/unicode/ucd/Index.txt:textproc/UCD \
${LOCALBASE}/share/unicode/cldr/readme.html:textproc/CLDR\
- ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/${PYTHON_PKGNAMEPREFIX}sqlite3
+ ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR}
TEST_DEPENDS= ${LOCALBASE}/share/hunspell/de_DE.dic:german/hunspell \
${LOCALBASE}/share/hunspell/ko_KR.aff:korean/hunspell \
${LOCALBASE}/share/hunspell/en_US.aff:textproc/en-hunspell
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 1be4b246a5bf..4c30fd5c0102 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -16,10 +16,10 @@ COMMENT= Intelligent Input Bus for Linux / Unix OS
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \
${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus \
- ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify@${PY_FLAVOR} \
${LOCALBASE}/share/xml/iso-codes/iso_639.xml:misc/iso-codes \
setxkbmap:x11/setxkbmap
LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
diff --git a/textproc/icdiff/Makefile b/textproc/icdiff/Makefile
index 23e88b69cab5..e7cfbc14e8ec 100644
--- a/textproc/icdiff/Makefile
+++ b/textproc/icdiff/Makefile
@@ -12,7 +12,7 @@ COMMENT= Improved colored diff
LICENSE= PSFL
USES= python
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist concurrent optsuffix
NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/textproc/loook/Makefile b/textproc/loook/Makefile
index 2bc50e5ad094..b89d6347f68b 100644
--- a/textproc/loook/Makefile
+++ b/textproc/loook/Makefile
@@ -14,7 +14,7 @@ COMMENT= Simple Python tool that search in LibreOffice/OpenOffice files
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR}
WRKSRC= ${WRKDIR}
diff --git a/textproc/plover/Makefile b/textproc/plover/Makefile
index 7a1aa8435516..d2364b1754df 100644
--- a/textproc/plover/Makefile
+++ b/textproc/plover/Makefile
@@ -12,11 +12,11 @@ COMMENT= Open source solution for stenography
LICENSE= GPLv2
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-xlib \
- ${PYTHON_PKGNAMEPREFIX}serial>=0:comms/py-serial \
- ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-xlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}serial>=0:comms/py-serial@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
USE_WX= 3.0+
WX_COMPS= wx
diff --git a/textproc/pootle/Makefile b/textproc/pootle/Makefile
index 3107994f870c..4bac5a0af244 100644
--- a/textproc/pootle/Makefile
+++ b/textproc/pootle/Makefile
@@ -15,21 +15,21 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= translate-toolkit>=1.11.0:textproc/translate-toolkit \
- ${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south\
- ${PYTHON_PKGNAMEPREFIX}cssmin>=0.1.4:www/py-cssmin \
- ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.4:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}django-taggit>0.10:www/py-django-taggit \
- ${PYTHON_PKGNAMEPREFIX}django-assets>=0.8:www/py-django-assets \
- ${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south \
- ${PYTHON_PKGNAMEPREFIX}django-voting>=0.1:www/py-django-voting \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson \
- ${PYTHON_PKGNAMEPREFIX}argparse>=0:devel/py-argparse \
- ${PYTHON_PKGNAMEPREFIX}diff-match-patch>=0:textproc/py-diff-match-patch
+ ${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cssmin>=0.1.4:www/py-cssmin@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.4:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-taggit>0.10:www/py-django-taggit@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-assets>=0.8:www/py-django-assets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-voting>=0.1:www/py-django-voting@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}argparse>=0:devel/py-argparse@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}diff-match-patch>=0:textproc/py-diff-match-patch@${FLAVOR}
# actually diff-match-patch is a dependency of translate-toolkit,
# but only this port uses it.
NO_ARCH= yes
-USES= gettext python tar:bzip2 shebangfix
+USES= gettext python:2.7 tar:bzip2 shebangfix
USE_PYTHON= autoplist distutils
SHEBANG_FILES= pootle/assets/admin/js/compress.py
@@ -49,14 +49,14 @@ OPTIONS_DEFAULT=MEMCACHED MYSQL
MEMCACHED_DESC= Use memcached to improve performance
-LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap2>0:devel/py-ldap2
+LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap2>0:devel/py-ldap2@${FLAVOR}
MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached
-MEMCACHED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=1.45:databases/py-python-memcached
+MEMCACHED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=1.45:databases/py-python-memcached@${FLAVOR}
-MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${FLAVOR}
-PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
SUBVERSION_RUN_DEPENDS= svn:devel/subversion
diff --git a/textproc/py-agate-dbf/Makefile b/textproc/py-agate-dbf/Makefile
index 8d652d73f78d..d8042836d24a 100644
--- a/textproc/py-agate-dbf/Makefile
+++ b/textproc/py-agate-dbf/Makefile
@@ -11,8 +11,8 @@ COMMENT= Support reading dbf files for agate
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate \
- ${PYTHON_PKGNAMEPREFIX}dbfread>=2.0.5:textproc/py-dbfread
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dbfread>=2.0.5:textproc/py-dbfread@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-agate-excel/Makefile b/textproc/py-agate-excel/Makefile
index 059fb9cb76c9..b75a0a5a23d2 100644
--- a/textproc/py-agate-excel/Makefile
+++ b/textproc/py-agate-excel/Makefile
@@ -11,9 +11,9 @@ COMMENT= Support reading Excel files for agate
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate \
- ${PYTHON_PKGNAMEPREFIX}xlrd>=0.9.4:textproc/py-xlrd \
- ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.3.0:textproc/py-openpyxl
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xlrd>=0.9.4:textproc/py-xlrd@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.3.0:textproc/py-openpyxl@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-agate/Makefile b/textproc/py-agate/Makefile
index 86070eeb5687..4fd410e6e5ca 100644
--- a/textproc/py-agate/Makefile
+++ b/textproc/py-agate/Makefile
@@ -11,13 +11,13 @@ COMMENT= Data analysis library optimized for humans
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}pytimeparse>=1.1.5:devel/py-pytimeparse \
- ${PYTHON_PKGNAMEPREFIX}Babel>=2.0:devel/py-babel \
- ${PYTHON_PKGNAMEPREFIX}parsedatetime>=2.1:devel/py-parsedatetime \
- ${PYTHON_PKGNAMEPREFIX}isodate>=0.5.4:devel/py-isodate \
- ${PYTHON_PKGNAMEPREFIX}python-slugify>=1.2.1:textproc/py-python-slugify \
- ${PYTHON_PKGNAMEPREFIX}leather>=0.3.2:graphics/py-leather
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytimeparse>=1.1.5:devel/py-pytimeparse@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=2.0:devel/py-babel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}parsedatetime>=2.1:devel/py-parsedatetime@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}isodate>=0.5.4:devel/py-isodate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-slugify>=1.2.1:textproc/py-python-slugify@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}leather>=0.3.2:graphics/py-leather@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-alabaster/Makefile b/textproc/py-alabaster/Makefile
index 709a45d21454..418d725536cb 100644
--- a/textproc/py-alabaster/Makefile
+++ b/textproc/py-alabaster/Makefile
@@ -12,7 +12,7 @@ COMMENT= Modified Kr Sphinx theme
LICENSE= MIT
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py3-asciinema/Makefile b/textproc/py-asciinema/Makefile
index dd3dd3c8e16e..527bbcee344e 100644
--- a/textproc/py3-asciinema/Makefile
+++ b/textproc/py-asciinema/Makefile
@@ -11,7 +11,7 @@ COMMENT= Tool for recording and sharing terminal sessions
LICENSE= GPLv3+
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py3-requests \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests@${FLAVOR} \
ca_root_nss>=0:security/ca_root_nss
USES= python:3.3+
diff --git a/textproc/py3-asciinema/distinfo b/textproc/py-asciinema/distinfo
index 6567268d269c..6567268d269c 100644
--- a/textproc/py3-asciinema/distinfo
+++ b/textproc/py-asciinema/distinfo
diff --git a/textproc/py3-asciinema/pkg-descr b/textproc/py-asciinema/pkg-descr
index aba5693b6a1f..aba5693b6a1f 100644
--- a/textproc/py3-asciinema/pkg-descr
+++ b/textproc/py-asciinema/pkg-descr
diff --git a/textproc/py-autopep8/Makefile b/textproc/py-autopep8/Makefile
index 67c74ba62b1c..fef0e7b9e50b 100644
--- a/textproc/py-autopep8/Makefile
+++ b/textproc/py-autopep8/Makefile
@@ -12,7 +12,7 @@ COMMENT= Automatically formats Python code to conform to the PEP 8 style guide
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.3:devel/py-pycodestyle
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.3:devel/py-pycodestyle@${FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/textproc/py-awesome-slugify/Makefile b/textproc/py-awesome-slugify/Makefile
index e6e00fc0a3db..ee860ba6ccfa 100644
--- a/textproc/py-awesome-slugify/Makefile
+++ b/textproc/py-awesome-slugify/Makefile
@@ -11,9 +11,9 @@ COMMENT= Flexible slugify function
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex \
- ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.14:converters/py-unidecode
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.14:converters/py-unidecode@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-chardet/Makefile b/textproc/py-chardet/Makefile
index 30b3eebe3832..7d81ef84a311 100644
--- a/textproc/py-chardet/Makefile
+++ b/textproc/py-chardet/Makefile
@@ -13,12 +13,12 @@ COMMENT= Universal encoding detector for Python 2 and 3
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${FLAVOR}
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= autoplist concurrent distutils
do-test:
diff --git a/textproc/py-cloud_sptheme/Makefile b/textproc/py-cloud_sptheme/Makefile
index dc1ee66c4135..a1b2b8616619 100644
--- a/textproc/py-cloud_sptheme/Makefile
+++ b/textproc/py-cloud_sptheme/Makefile
@@ -14,10 +14,10 @@ COMMENT= Sphinx theme
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3:textproc/py-sphinx \
- ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3:textproc/py-sphinx \
- ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3:textproc/py-sphinx@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3:textproc/py-sphinx@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-creole/Makefile b/textproc/py-creole/Makefile
index bb73283269ed..5c3d2bcb7a0a 100644
--- a/textproc/py-creole/Makefile
+++ b/textproc/py-creole/Makefile
@@ -13,7 +13,7 @@ COMMENT= Markup converter in pure Python
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/docutils/__init__.py:textproc/py-docutils
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/docutils/__init__.py:textproc/py-docutils@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-csvkit/Makefile b/textproc/py-csvkit/Makefile
index bb29cbad3ab3..67539871458d 100644
--- a/textproc/py-csvkit/Makefile
+++ b/textproc/py-csvkit/Makefile
@@ -11,11 +11,11 @@ COMMENT= Command line tools for working with CSV
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.4:textproc/py-agate \
- ${PYTHON_PKGNAMEPREFIX}agate-excel>=0.2.0:textproc/py-agate-excel \
- ${PYTHON_PKGNAMEPREFIX}agate-dbf>=0.2.0:textproc/py-agate-dbf \
- ${PYTHON_PKGNAMEPREFIX}agate-sql>=0.5.0:databases/py-agate-sql \
- ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.4:textproc/py-agate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}agate-excel>=0.2.0:textproc/py-agate-excel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}agate-dbf>=0.2.0:textproc/py-agate-dbf@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}agate-sql>=0.5.0:databases/py-agate-sql@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index 634d5c29eb2e..db87dfb3f95c 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -13,15 +13,15 @@ COMMENT= Python Documentation Utilities
LICENSE= BSD2CLAUSE GPLv3+ PD PSFL
LICENSE_COMB= multi
-PORTSCOUT?= limit:^[0-9\.]*$$
+PORTSCOUT= limit:^[0-9\.]*$$
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
-USES?= python
+USES= python
OPTIONS_DEFINE= PYGMENTS
PYGMENTS_DESC= Syntax highlighting
-PYGMENTS_RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments
+PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR}
SCRIPTS= rst2html rst2latex rst2man rst2odt rst2odt_prepstyles \
rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html
diff --git a/textproc/py-elasticsearch-curator-py/Makefile b/textproc/py-elasticsearch-curator-py/Makefile
index 4701f909c5cb..fcf4134054d5 100644
--- a/textproc/py-elasticsearch-curator-py/Makefile
+++ b/textproc/py-elasticsearch-curator-py/Makefile
@@ -13,9 +13,9 @@ COMMENT= Python index manager for Elasticsearch
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.3:net/py-urllib3 \
- ${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.8.0:textproc/py-elasticsearch-py \
- ${PYTHON_PKGNAMEPREFIX}click>=3.3:devel/py-click
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.3:net/py-urllib3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.8.0:textproc/py-elasticsearch-py@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>=3.3:devel/py-click@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= elastic
diff --git a/textproc/py-elasticsearch-dsl-py/Makefile b/textproc/py-elasticsearch-dsl-py/Makefile
index 5c453b352162..ac4d5b012deb 100644
--- a/textproc/py-elasticsearch-dsl-py/Makefile
+++ b/textproc/py-elasticsearch-dsl-py/Makefile
@@ -11,7 +11,7 @@ COMMENT= High level Python client for Elasticsearch
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= elastic
diff --git a/textproc/py-elasticsearch-py/Makefile b/textproc/py-elasticsearch-py/Makefile
index d538cb76e730..096ef3ca8975 100644
--- a/textproc/py-elasticsearch-py/Makefile
+++ b/textproc/py-elasticsearch-py/Makefile
@@ -11,7 +11,7 @@ COMMENT= Official Python low-level client for Elasticsearch
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.2:net/py-urllib3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.2:net/py-urllib3@${FLAVOR}
NO_ARCH= yes
USE_GITHUB= yes
diff --git a/textproc/py-elasticsearch2-dsl-py/Makefile b/textproc/py-elasticsearch2-dsl-py/Makefile
index 97605fffdd8d..47c357cbed9d 100644
--- a/textproc/py-elasticsearch2-dsl-py/Makefile
+++ b/textproc/py-elasticsearch2-dsl-py/Makefile
@@ -11,7 +11,7 @@ COMMENT= High level Python client for Elasticsearch
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= elastic
diff --git a/textproc/py-elib.intl/Makefile b/textproc/py-elib.intl/Makefile
index 1bfefb6252aa..2c4ff953ca16 100644
--- a/textproc/py-elib.intl/Makefile
+++ b/textproc/py-elib.intl/Makefile
@@ -18,7 +18,7 @@ USE_GITHUB= yes
PORTSCOUT= ignore:1
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index 12872a5d76e2..abe535241055 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFAULT=WX
WX_DESC= Provide a wxSpellCheckerDialog
OPTIONS_SUB= yes
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
WX_USE= WX=3.0+
diff --git a/textproc/py-errorhandler/Makefile b/textproc/py-errorhandler/Makefile
index 28576375b5d2..7322f32b300c 100644
--- a/textproc/py-errorhandler/Makefile
+++ b/textproc/py-errorhandler/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= dikshie@sfc.wide.ad.jp
COMMENT= Logging framework handler that tracks when messages above a certain level have been logged
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-feedparser/Makefile b/textproc/py-feedparser/Makefile
index cea169f16e81..377b82b7fa96 100644
--- a/textproc/py-feedparser/Makefile
+++ b/textproc/py-feedparser/Makefile
@@ -13,7 +13,7 @@ COMMENT= Universal feed parser written in Python
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES?= python tar:bzip2
+USES= python tar:bzip2
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/textproc/py-genshi/Makefile b/textproc/py-genshi/Makefile
index 5e889dd8ebdd..722021a12200 100644
--- a/textproc/py-genshi/Makefile
+++ b/textproc/py-genshi/Makefile
@@ -23,7 +23,7 @@ USE_PYTHON= distutils autoplist
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MBABEL}
-RUN_DEPENDS+= ${PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel
+RUN_DEPENDS+= ${PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel@${FLAVOR}
.endif
.include <bsd.port.mk>
diff --git a/textproc/py-humanfriendly/Makefile b/textproc/py-humanfriendly/Makefile
index 341dd9ef47a9..32817aaf23b0 100644
--- a/textproc/py-humanfriendly/Makefile
+++ b/textproc/py-humanfriendly/Makefile
@@ -13,13 +13,13 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3300
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>0:devel/py-monotonic
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>0:devel/py-monotonic@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/textproc/py-hunspell/Makefile b/textproc/py-hunspell/Makefile
index 0bd14252ac17..b3276e36d64b 100644
--- a/textproc/py-hunspell/Makefile
+++ b/textproc/py-hunspell/Makefile
@@ -15,7 +15,7 @@ LICENSE= LGPL3
LIB_DEPENDS= libhunspell-${HSPLVER}.so:textproc/hunspell
-USES?= python
+USES= python
USES+= localbase
USE_PYTHON= distutils
diff --git a/textproc/py-hyperestraier-python/Makefile b/textproc/py-hyperestraier-python/Makefile
index 61528f0f3cdb..f273e1d2fe76 100644
--- a/textproc/py-hyperestraier-python/Makefile
+++ b/textproc/py-hyperestraier-python/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= jun-g@daemonfreaks.com
COMMENT= Pure Python HyperEstraier library
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
PORTEXAMPLES= example.py asyn_example.py
diff --git a/textproc/py-hypua2jamo/Makefile b/textproc/py-hypua2jamo/Makefile
index a8a2e91292ad..250241035aaa 100644
--- a/textproc/py-hypua2jamo/Makefile
+++ b/textproc/py-hypua2jamo/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= zi@FreeBSD.org
COMMENT= Convert Hanyang-PUA code to unicode Hangul Jamo
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-libtre/Makefile b/textproc/py-libtre/Makefile
index 7b4c286a2229..3e87abd20dd3 100644
--- a/textproc/py-libtre/Makefile
+++ b/textproc/py-libtre/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libtre.so:textproc/libtre
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= python tar:bzip2
+USES= python:2.7 tar:bzip2
USE_PYTHON= distutils autoplist
BUILD_WRKSRC= ${WRKSRC}/python
diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
index 1320484796c2..0e9cb5f4086b 100644
--- a/textproc/py-libxml2/Makefile
+++ b/textproc/py-libxml2/Makefile
@@ -14,8 +14,8 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC}
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-USE_GNOME+= libxml2
-USES+= python:2 gettext-runtime
+USE_GNOME= libxml2
+USES= python gettext-runtime
USE_PYTHON= autoplist distutils
CPPFLAGS+= `${PYTHON_CMD}-config --cflags`
diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile
index ddd49f20175c..fb37d71ee9ba 100644
--- a/textproc/py-libxslt/Makefile
+++ b/textproc/py-libxslt/Makefile
@@ -7,6 +7,10 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Python interface for XSLT C library for GNOME
+py34_BROKEN= does not package
+py35_BROKEN= does not package
+py36_BROKEN= does not package
+
MASTERDIR= ${.CURDIR}/../libxslt
BUILD_WRKSRC= ${WRKSRC}/python
INSTALL_WRKSRC= ${BUILD_WRKSRC}
@@ -15,6 +19,7 @@ PLIST= ${.CURDIR}/pkg-plist
USE_GNOME= libxslt
USES+= python
+USE_PYTHON= flavors
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--with-python=${PYTHON_CMD}
diff --git a/textproc/py-ltxml/Makefile b/textproc/py-ltxml/Makefile
index 3dde7a13f4c6..5091b73c1858 100644
--- a/textproc/py-ltxml/Makefile
+++ b/textproc/py-ltxml/Makefile
@@ -17,7 +17,7 @@ LICENSE= GPLv2 # only `GPL' is mentioned, assuming v2
BUILD_DEPENDS= ${LOCALBASE}/include/ltxml12/lt-safe.h:textproc/ltxml
RUN_DEPENDS= ${LOCALBASE}/include/ltxml12/lt-safe.h:textproc/ltxml
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
USE_LDCONFIG= yes
diff --git a/textproc/py-m2r/Makefile b/textproc/py-m2r/Makefile
index f8c74daef78a..96b29d5657fa 100644
--- a/textproc/py-m2r/Makefile
+++ b/textproc/py-m2r/Makefile
@@ -13,10 +13,10 @@ COMMENT= Convert markdown formatted file with reST markup to reST format
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \
- ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune \
- ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR}
# Actually 2.7,3.4+
USES= python
@@ -27,7 +27,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3300
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
.endif
do-test:
diff --git a/textproc/py-mako/Makefile b/textproc/py-mako/Makefile
index 86d4fd95d4e9..0e26fdeeb233 100644
--- a/textproc/py-mako/Makefile
+++ b/textproc/py-mako/Makefile
@@ -13,12 +13,12 @@ COMMENT= Super-fast templating language in Python
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe \
- ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe \
- ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile
index d6ddb7a4eeb8..e3dc8aed4600 100644
--- a/textproc/py-markdown/Makefile
+++ b/textproc/py-markdown/Makefile
@@ -14,11 +14,11 @@ COMMENT= Python implementation of Markdown
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
- ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \
- ${PYTHON_PKGNAMEPREFIX}pytidylib>0:textproc/py-pytidylib \
- ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytidylib>0:textproc/py-pytidylib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/textproc/py-mistune/Makefile b/textproc/py-mistune/Makefile
index 2ca58918f4d9..c0f1b8da17f2 100644
--- a/textproc/py-mistune/Makefile
+++ b/textproc/py-mistune/Makefile
@@ -13,7 +13,7 @@ COMMENT= Fastest markdown parser in pure Python
LICENSE= BSD3CLAUSE
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 distutils
diff --git a/textproc/py-nltk/Makefile b/textproc/py-nltk/Makefile
index b304faa79cb1..c0eadb667c6e 100644
--- a/textproc/py-nltk/Makefile
+++ b/textproc/py-nltk/Makefile
@@ -13,9 +13,9 @@ COMMENT= Natural language toolkit written in python
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.09:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.09:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-numpydoc/Makefile b/textproc/py-numpydoc/Makefile
index 0fa5aed761f1..32f1a89349da 100644
--- a/textproc/py-numpydoc/Makefile
+++ b/textproc/py-numpydoc/Makefile
@@ -13,11 +13,11 @@ COMMENT= Sphinx extension to support docstrings in Numpy format
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx
-TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR}
-USES?= python
+USES= python
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/textproc/py-openpyxl/Makefile b/textproc/py-openpyxl/Makefile
index de23cd9d94fa..b9d4548fcc05 100644
--- a/textproc/py-openpyxl/Makefile
+++ b/textproc/py-openpyxl/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python library to read/write Excel 2007 xlsx/xlsm files
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENCE.rst
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jdcal>=0:devel/py-jdcal \
- ${PYTHON_PKGNAMEPREFIX}et_xmlfile>=0:textproc/py-et_xmlfile
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jdcal>=0:devel/py-jdcal@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}et_xmlfile>=0:textproc/py-et_xmlfile@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/textproc/py3-pager/Makefile b/textproc/py-pager/Makefile
index ff794b9fe525..ff794b9fe525 100644
--- a/textproc/py3-pager/Makefile
+++ b/textproc/py-pager/Makefile
diff --git a/textproc/py3-pager/distinfo b/textproc/py-pager/distinfo
index 786d500a307c..786d500a307c 100644
--- a/textproc/py3-pager/distinfo
+++ b/textproc/py-pager/distinfo
diff --git a/textproc/py3-pager/pkg-descr b/textproc/py-pager/pkg-descr
index e2a19326bca1..e2a19326bca1 100644
--- a/textproc/py3-pager/pkg-descr
+++ b/textproc/py-pager/pkg-descr
diff --git a/textproc/py-paragrep/Makefile b/textproc/py-paragrep/Makefile
index 8f3519446506..dca937aa4f63 100644
--- a/textproc/py-paragrep/Makefile
+++ b/textproc/py-paragrep/Makefile
@@ -12,7 +12,7 @@ COMMENT= Paragraph Grep Utility
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grizzled>=0.8.1:devel/py-grizzled
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grizzled>=0.8.1:devel/py-grizzled@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/textproc/py-parsel/Makefile b/textproc/py-parsel/Makefile
index cac6e2369128..bcc5dff25ed5 100644
--- a/textproc/py-parsel/Makefile
+++ b/textproc/py-parsel/Makefile
@@ -11,11 +11,11 @@ COMMENT= Library to extract data from HTML and XML using XPath and CSS selectors
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:www/py-cssselect \
- ${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}w3lib>=1.8.0:www/py-w3lib
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:www/py-cssselect@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}w3lib>=1.8.0:www/py-w3lib@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-parsimonious/Makefile b/textproc/py-parsimonious/Makefile
index 54e7f5658401..d768089ec48d 100644
--- a/textproc/py-parsimonious/Makefile
+++ b/textproc/py-parsimonious/Makefile
@@ -12,7 +12,7 @@ COMMENT= PEGs based parser in Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-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
diff --git a/textproc/py-pyPEG2/Makefile b/textproc/py-pyPEG2/Makefile
index d319c08cca07..a698c2e033a5 100644
--- a/textproc/py-pyPEG2/Makefile
+++ b/textproc/py-pyPEG2/Makefile
@@ -13,7 +13,7 @@ COMMENT= Parsing Expression Grammar (PEG) parser for Python
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USES?= python
+USES= python
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/textproc/py-pyelasticsearch/Makefile b/textproc/py-pyelasticsearch/Makefile
index ca74cc8fea49..70e9899631f9 100644
--- a/textproc/py-pyelasticsearch/Makefile
+++ b/textproc/py-pyelasticsearch/Makefile
@@ -13,11 +13,11 @@ COMMENT= Flexible, high-scale API to elasticsearch
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi \
- ${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:devel/py-simplejson \
- ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8:net/py-urllib3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:devel/py-simplejson@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8:net/py-urllib3@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-pyes/Makefile b/textproc/py-pyes/Makefile
index f28d716c4abf..09b8b74375ba 100644
--- a/textproc/py-pyes/Makefile
+++ b/textproc/py-pyes/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= dvl@FreeBSD.org
COMMENT= Python connector for ElasticSearch - the pythonic way to use ElasticSearch
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${FLAVOR}
USES= python:2
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile
index 7530d1ddbb06..886172945091 100644
--- a/textproc/py-pygments/Makefile
+++ b/textproc/py-pygments/Makefile
@@ -13,7 +13,7 @@ COMMENT= Syntax highlighter written in Python
LICENSE= BSD2CLAUSE
-USES?= python
+USES= python
USE_PYTHON= distutils concurrent autoplist
NO_ARCH= yes
diff --git a/textproc/py-pyhwp/Makefile b/textproc/py-pyhwp/Makefile
index 40ec70ab471e..8fa2d6c206ad 100644
--- a/textproc/py-pyhwp/Makefile
+++ b/textproc/py-pyhwp/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= zi@FreeBSD.org
COMMENT= HWP Document Format v5 parser & processor
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel \
- ${PYTHON_PKGNAMEPREFIX}olefile>=0.40:devel/py-olefile \
- ${PYTHON_PKGNAMEPREFIX}hypua2jamo>0:textproc/py-hypua2jamo \
- ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}olefile>=0.40:devel/py-olefile@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hypua2jamo>0:textproc/py-hypua2jamo@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${FLAVOR}
BUILD_DEPENDS:= ${RUN_DEPENDS}
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-pyscss/Makefile b/textproc/py-pyscss/Makefile
index e12ce5748057..3358fa226c2d 100644
--- a/textproc/py-pyscss/Makefile
+++ b/textproc/py-pyscss/Makefile
@@ -12,11 +12,10 @@ COMMENT= Compiler for SCSS flavor of the Sass language
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 \
- ${PYTHON_PKGNAMEPREFIX}pathlib>0:devel/py-pathlib
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PY_ENUM34} ${PY_PATHLIB}
LIB_DEPENDS= libpcre.so:devel/pcre
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= Kronuz
diff --git a/textproc/py-pysrt/Makefile b/textproc/py-pysrt/Makefile
index 38aa56123c26..4482ae1e15dc 100644
--- a/textproc/py-pysrt/Makefile
+++ b/textproc/py-pysrt/Makefile
@@ -12,7 +12,7 @@ COMMENT= SubRip (.srt) subtitle parser and writer
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-pystemmer/Makefile b/textproc/py-pystemmer/Makefile
index 64055062e71c..16699b88378d 100644
--- a/textproc/py-pystemmer/Makefile
+++ b/textproc/py-pystemmer/Makefile
@@ -16,7 +16,7 @@ COMMENT= Snowball Stemming Algorithms for Information Retrieval
LICENSE= MIT BSD3CLAUSE
LICENSE_COMB= dual
-USES?= python
+USES= python
USE_PYTHON= distutils autoplist
post-install:
diff --git a/textproc/py-python-augeas/Makefile b/textproc/py-python-augeas/Makefile
index f374cfe73e87..f8b0bc095644 100644
--- a/textproc/py-python-augeas/Makefile
+++ b/textproc/py-python-augeas/Makefile
@@ -12,7 +12,11 @@ COMMENT= Pure python bindings for Augeas
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi
+py34_BROKEN= does not package
+py35_BROKEN= does not package
+py36_BROKEN= does not package
+
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${FLAVOR}
LIB_DEPENDS= libaugeas.so:textproc/augeas
USES= python
diff --git a/textproc/py-python-docx/Makefile b/textproc/py-python-docx/Makefile
index f6772fba8953..62e13767e6cd 100644
--- a/textproc/py-python-docx/Makefile
+++ b/textproc/py-python-docx/Makefile
@@ -11,7 +11,7 @@ COMMENT= Python library for creating and updating Microsoft Word files
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml@${FLAVOR}
# Python3 ready
USES= python
diff --git a/textproc/py-python-slugify/Makefile b/textproc/py-python-slugify/Makefile
index cd6a68eaa4cc..d6584dc0509e 100644
--- a/textproc/py-python-slugify/Makefile
+++ b/textproc/py-python-slugify/Makefile
@@ -11,7 +11,7 @@ COMMENT= Slugify application that handles unicode
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.16:converters/py-unidecode
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.16:converters/py-unidecode@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-qrcode/Makefile b/textproc/py-qrcode/Makefile
index e2b3c9d3ba99..c735a9bde156 100644
--- a/textproc/py-qrcode/Makefile
+++ b/textproc/py-qrcode/Makefile
@@ -13,18 +13,10 @@ COMMENT= QR Code image generator
LICENSE= BSD3CLAUSE
-USES?= python
-USE_PYTHON= autoplist distutils
-
-.include <bsd.port.pre.mk>
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${FLAVOR}
-.if ${PYTHON_REL} > 3000
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py3-six \
- ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py3-pillow
-.else
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow
-.endif
-
-.include <bsd.port.post.mk>
+USES= python
+USE_PYTHON= autoplist distutils
+.include <bsd.port.mk>
diff --git a/textproc/py-qt4-xml/Makefile b/textproc/py-qt4-xml/Makefile
index ed8fa0367fca..a9bb98c4be82 100644
--- a/textproc/py-qt4-xml/Makefile
+++ b/textproc/py-qt4-xml/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
USES= python pyqt:4
USE_PYQT= sip_build core_run
+USE_PYTHON= flavors
USE_QT4= corelib xml moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/textproc/py-qt4-xmlpatterns/Makefile b/textproc/py-qt4-xmlpatterns/Makefile
index ef68ab5e43f5..d50d72c96c27 100644
--- a/textproc/py-qt4-xmlpatterns/Makefile
+++ b/textproc/py-qt4-xmlpatterns/Makefile
@@ -12,6 +12,7 @@ PYQT_DIST= yes
USES= python pyqt:4
USE_PYQT= sip_build core_run network_run
+USE_PYTHON= flavors
USE_QT4= corelib network xmlpatterns moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/textproc/py-qt5-xml/Makefile b/textproc/py-qt5-xml/Makefile
index 1ec5ca6887e1..3f2c43d7a339 100644
--- a/textproc/py-qt5-xml/Makefile
+++ b/textproc/py-qt5-xml/Makefile
@@ -11,6 +11,7 @@ PYQT_DIST= yes
USES= python pyqt:5
USE_PYQT= sip_build core_run
+USE_PYTHON= flavors
USE_QT5= core xml buildtools_build qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/textproc/py-qt5-xmlpatterns/Makefile b/textproc/py-qt5-xmlpatterns/Makefile
index 2f183406642c..7d24aa98fc04 100644
--- a/textproc/py-qt5-xmlpatterns/Makefile
+++ b/textproc/py-qt5-xmlpatterns/Makefile
@@ -11,6 +11,7 @@ PYQT_DIST= yes
USES= python pyqt:5
USE_PYQT= sip_build core_run network_run
+USE_PYTHON= flavors
USE_QT5= core network xmlpatterns qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/textproc/py-rdflib/Makefile b/textproc/py-rdflib/Makefile
index d68d02897f4f..edd9ed08bfb0 100644
--- a/textproc/py-rdflib/Makefile
+++ b/textproc/py-rdflib/Makefile
@@ -12,10 +12,10 @@ COMMENT= Python library for RDF manipulation
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}isodate>=0:devel/py-isodate \
- ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing \
- ${PYTHON_PKGNAMEPREFIX}sparqlwrapper>=1.5.2:textproc/py-sparqlwrapper \
- ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}isodate>=0:devel/py-isodate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sparqlwrapper>=1.5.2:textproc/py-sparqlwrapper@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-rst2html5/Makefile b/textproc/py-rst2html5/Makefile
index 84c68cf2d1c3..ebf44634c814 100644
--- a/textproc/py-rst2html5/Makefile
+++ b/textproc/py-rst2html5/Makefile
@@ -12,11 +12,11 @@ COMMENT= Produces HTML5 documents from reStructuredText sources
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi \
- ${PYTHON_PKGNAMEPREFIX}pygments>=2.1:textproc/py-pygments \
- ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=2.1:textproc/py-pygments@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/textproc/py-rstyoutube/Makefile b/textproc/py-rstyoutube/Makefile
index 2a1c11345d37..6ee2a23612eb 100644
--- a/textproc/py-rstyoutube/Makefile
+++ b/textproc/py-rstyoutube/Makefile
@@ -12,7 +12,7 @@ COMMENT= Embed YouTube videos in reStructuredText documents
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${FLAVOR}
USES= python:2
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-rxp/Makefile b/textproc/py-rxp/Makefile
index 426a6c4608a9..eb5acdc9a8a6 100644
--- a/textproc/py-rxp/Makefile
+++ b/textproc/py-rxp/Makefile
@@ -15,7 +15,7 @@ COMMENT= Fast validating XML parser for Python
OPTIONS_DEFINE= DOCS EXAMPLES
NO_WRKSUBDIR= yes
-USES= python tar:tgz
+USES= python:2.7 tar:tgz
USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/py-rxp
diff --git a/textproc/py-scour/Makefile b/textproc/py-scour/Makefile
index ceac29530a52..0ceba1b9cc25 100644
--- a/textproc/py-scour/Makefile
+++ b/textproc/py-scour/Makefile
@@ -12,7 +12,7 @@ COMMENT= SVG scrubber
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-snowballstemmer/Makefile b/textproc/py-snowballstemmer/Makefile
index ea2b460d65c6..ce9c8c8b0fb9 100644
--- a/textproc/py-snowballstemmer/Makefile
+++ b/textproc/py-snowballstemmer/Makefile
@@ -12,13 +12,13 @@ COMMENT= Snowball stemming library collection for Python
LICENSE= BSD2CLAUSE
-USES?= python
+USES= python
USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= PYSTEMMER
OPTIONS_DEFAULT=PYSTEMMER
PYSTEMMER_DESC= Use PyStemmer to accelerate
-PYSTEMMER_RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pystemmer>0:textproc/py-pystemmer
+PYSTEMMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pystemmer>0:textproc/py-pystemmer@${FLAVOR}
.include <bsd.port.mk>
diff --git a/textproc/py-sphinx-hieroglyph/Makefile b/textproc/py-sphinx-hieroglyph/Makefile
index 198e0132afdd..db470971d03b 100644
--- a/textproc/py-sphinx-hieroglyph/Makefile
+++ b/textproc/py-sphinx-hieroglyph/Makefile
@@ -13,7 +13,7 @@ COMMENT= Sphinx extension which builds HTML presentations
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4:textproc/py-sphinx
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4:textproc/py-sphinx@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= nyergler
diff --git a/textproc/py-sphinx-intl/Makefile b/textproc/py-sphinx-intl/Makefile
index 1dde6d4f6c77..727ac4ade6fe 100644
--- a/textproc/py-sphinx-intl/Makefile
+++ b/textproc/py-sphinx-intl/Makefile
@@ -14,9 +14,9 @@ COMMENT= Sphinx-intl translation features
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx \
- ${PKGNAMEPREFIX}polib>=1.0.6:devel/py-polib \
- ${PKGNAMEPREFIX}six>=1.8.0:devel/py-six
+RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR} \
+ ${PKGNAMEPREFIX}polib>=1.0.6:devel/py-polib@${FLAVOR} \
+ ${PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile
index 06ce3b7e56ee..ecce8981393d 100644
--- a/textproc/py-sphinx/Makefile
+++ b/textproc/py-sphinx/Makefile
@@ -17,23 +17,22 @@ COMMENT= Python documentation generator
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils \
- ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six
-RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel\
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils \
- ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments \
- ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel \
- ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0.1:textproc/py-sphinx_rtd_theme \
- ${PYTHON_PKGNAMEPREFIX}alabaster>=0.7:textproc/py-alabaster \
- ${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer \
- ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}imagesize>=0.7.1:graphics/py-imagesize \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0.1:textproc/py-sphinx_rtd_theme@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}alabaster>=0.7:textproc/py-alabaster@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}imagesize>=0.7.1:graphics/py-imagesize@${FLAVOR} \
${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-USES?= python
-USE_PYTHON= autoplist distutils
+USES= python
+USE_PYTHON= autoplist distutils concurrent
NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/textproc/py-sphinx_numfig/Makefile b/textproc/py-sphinx_numfig/Makefile
index c27e9e13ef21..89f477724d3e 100644
--- a/textproc/py-sphinx_numfig/Makefile
+++ b/textproc/py-sphinx_numfig/Makefile
@@ -12,9 +12,10 @@ COMMENT= Autonumbering figures in Sphinx
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx
+RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${FLAVOR}
-USES= python tar:tgz
+USES= python:2.7 tar:tgz
+USE_PYTHON= flavors
NO_BUILD= yes
SPHINXDIR= ${PYTHON_LIBDIR}/site-packages/sphinx
PLIST_FILES= ${SPHINXDIR}/ext/numfig.py ${SPHINXDIR}/ext/numfig.pyc
diff --git a/textproc/py-sphinx_rtd_theme/Makefile b/textproc/py-sphinx_rtd_theme/Makefile
index 2a7984d61864..4efb27860863 100644
--- a/textproc/py-sphinx_rtd_theme/Makefile
+++ b/textproc/py-sphinx_rtd_theme/Makefile
@@ -13,7 +13,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
NO_ARCH= yes
-USES?= python
+USES= python
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-sphinx_wikipedia/Makefile b/textproc/py-sphinx_wikipedia/Makefile
index 4186f6c15869..67334bb16c91 100644
--- a/textproc/py-sphinx_wikipedia/Makefile
+++ b/textproc/py-sphinx_wikipedia/Makefile
@@ -11,9 +11,10 @@ COMMENT= Sphinx extension which adds role to create links to Wikipedia articles
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx
+RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${FLAVOR}
USES= python
+USE_PYTHON= flavors
NO_BUILD= yes
USE_GITHUB= yes
GH_ACCOUNT= quiver
diff --git a/textproc/py-sphinxcontrib-adadomain/Makefile b/textproc/py-sphinxcontrib-adadomain/Makefile
index 1c56ac9d91a6..65763b8d12d5 100644
--- a/textproc/py-sphinxcontrib-adadomain/Makefile
+++ b/textproc/py-sphinxcontrib-adadomain/Makefile
@@ -14,7 +14,7 @@ COMMENT= Sphinx Adadomain Extension
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
+RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-sphinxcontrib-bitbucket/Makefile b/textproc/py-sphinxcontrib-bitbucket/Makefile
index c5a1a8b3befd..b577a5bdc6fb 100644
--- a/textproc/py-sphinxcontrib-bitbucket/Makefile
+++ b/textproc/py-sphinxcontrib-bitbucket/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Sphinx/BitBucket integration
-RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
+RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-sphinxcontrib-fulltoc/Makefile b/textproc/py-sphinxcontrib-fulltoc/Makefile
index 2a0a14def53a..f7d7e17a2cf9 100644
--- a/textproc/py-sphinxcontrib-fulltoc/Makefile
+++ b/textproc/py-sphinxcontrib-fulltoc/Makefile
@@ -12,8 +12,8 @@ COMMENT= Sphinx Fulltoc Extension
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr
-RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
+BUILD_DEPENDS= ${PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr@${FLAVOR}
+RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-sphinxcontrib-httpdomain/Makefile b/textproc/py-sphinxcontrib-httpdomain/Makefile
index 4f12e11b019a..96d00d55db75 100644
--- a/textproc/py-sphinxcontrib-httpdomain/Makefile
+++ b/textproc/py-sphinxcontrib-httpdomain/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wg@FreeBSD.org
COMMENT= Sphinx domain for HTTP APIs
-RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
+RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-sphinxcontrib-programoutput/Makefile b/textproc/py-sphinxcontrib-programoutput/Makefile
index 3e65c474ca22..5658ecf18b3a 100644
--- a/textproc/py-sphinxcontrib-programoutput/Makefile
+++ b/textproc/py-sphinxcontrib-programoutput/Makefile
@@ -13,7 +13,7 @@ COMMENT= Sphinx extension to include program output
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.5:textproc/py-sphinx
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.5:textproc/py-sphinx@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-syck/Makefile b/textproc/py-syck/Makefile
index 569c549c6604..7321f3c80272 100644
--- a/textproc/py-syck/Makefile
+++ b/textproc/py-syck/Makefile
@@ -15,7 +15,7 @@ COMMENT= Python binding for Syck, a YAML parser and emitter
BUILD_DEPENDS= ${LOCALBASE}/lib/libsyck.a:textproc/syck
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
post-patch:
diff --git a/textproc/py-texttable/Makefile b/textproc/py-texttable/Makefile
index 2763905460e5..cd1776ce6000 100644
--- a/textproc/py-texttable/Makefile
+++ b/textproc/py-texttable/Makefile
@@ -13,10 +13,10 @@ COMMENT= Module for creating simple ASCII tables
LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR}
-USES?= python
+USES= python
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
diff --git a/textproc/py-toronado/Makefile b/textproc/py-toronado/Makefile
index 562a6cb6fb8f..d643b00c1f62 100644
--- a/textproc/py-toronado/Makefile
+++ b/textproc/py-toronado/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= tj@FreeBSD.org
COMMENT= Fast lxml-based CSS stylesheet inliner
-RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect \
- ${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils \
- ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml
+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}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-trans/Makefile b/textproc/py-trans/Makefile
index cb6e18bf5fdd..5add1c400872 100644
--- a/textproc/py-trans/Makefile
+++ b/textproc/py-trans/Makefile
@@ -11,7 +11,7 @@ COMMENT= Module for performing transliteration
LICENSE= BSD
-USES= python tar:bzip2
+USES= python:2.7 tar:bzip2
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/textproc/py-transifex-client/Makefile b/textproc/py-transifex-client/Makefile
index a7d23e86c2df..1116c21d3edd 100644
--- a/textproc/py-transifex-client/Makefile
+++ b/textproc/py-transifex-client/Makefile
@@ -13,8 +13,8 @@ COMMENT= Command line interface for Transifex
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/textproc/py-wicked/Makefile b/textproc/py-wicked/Makefile
index afddd45c4109..1763456f1632 100644
--- a/textproc/py-wicked/Makefile
+++ b/textproc/py-wicked/Makefile
@@ -12,12 +12,12 @@ COMMENT= Compact syntax for doing wiki-like content linking and creation
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
- ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${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= autoplist distutils
.include <bsd.port.mk>
diff --git a/textproc/py-wstools/Makefile b/textproc/py-wstools/Makefile
index 143685eecdc8..1a4c12726a84 100644
--- a/textproc/py-wstools/Makefile
+++ b/textproc/py-wstools/Makefile
@@ -12,11 +12,11 @@ COMMENT= WSDL parsing services for Python
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
NO_ARCH= yes
-USES= python:2.7+
+USES= python
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/textproc/py-wtforms/Makefile b/textproc/py-wtforms/Makefile
index a8657489d735..33939ab170eb 100644
--- a/textproc/py-wtforms/Makefile
+++ b/textproc/py-wtforms/Makefile
@@ -15,11 +15,11 @@ COMMENT= Flexible forms validation and rendering library for python
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pep8>0:devel/pep8 \
- ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR}
OPTIONS_DEFINE= DOCS
diff --git a/textproc/py-xlutils/Makefile b/textproc/py-xlutils/Makefile
index 4fbb190fc92d..88af92337ccc 100644
--- a/textproc/py-xlutils/Makefile
+++ b/textproc/py-xlutils/Makefile
@@ -12,8 +12,8 @@ COMMENT= Utilities for working with Excel files that require both xlrd and xlwt
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.2:textproc/py-xlrd \
- ${PYTHON_PKGNAMEPREFIX}xlwt>=0.7.4:textproc/py-xlwt
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.2:textproc/py-xlrd@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xlwt>=0.7.4:textproc/py-xlwt@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2
diff --git a/textproc/py-xlwriter/Makefile b/textproc/py-xlwriter/Makefile
index ce94ca3fa56f..ef0f71606cec 100644
--- a/textproc/py-xlwriter/Makefile
+++ b/textproc/py-xlwriter/Makefile
@@ -11,7 +11,7 @@ DISTNAME= pyXLWriter-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python library for generating Excel-compatible spreadsheets
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= distutils autoplist
PORTEXAMPLES= *
diff --git a/textproc/py-xlwt/Makefile b/textproc/py-xlwt/Makefile
index b503317b0340..6fd65151ca27 100644
--- a/textproc/py-xlwt/Makefile
+++ b/textproc/py-xlwt/Makefile
@@ -12,7 +12,7 @@ COMMENT= Writing data and formatting information from Excel files
LICENSE= BSD4CLAUSE
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.mk>
diff --git a/textproc/py-zope.app.i18n/Makefile b/textproc/py-zope.app.i18n/Makefile
index 76c488ddcca0..6d3c0d9c288a 100644
--- a/textproc/py-zope.app.i18n/Makefile
+++ b/textproc/py-zope.app.i18n/Makefile
@@ -13,17 +13,17 @@ COMMENT= Persistent translation domains and message catalogs
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.9:devel/py-zope.publisher \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
- ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
- ${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.security>=0:security/py-zope.security \
- zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.9:devel/py-zope.publisher@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${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.security>=0:security/py-zope.security@${FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-zope.app.locales/Makefile b/textproc/py-zope.app.locales/Makefile
index 90261359f09c..ae7b8288a52e 100644
--- a/textproc/py-zope.app.locales/Makefile
+++ b/textproc/py-zope.app.locales/Makefile
@@ -13,11 +13,11 @@ COMMENT= Zope locale extraction and management utilities
LICENSE= ZPL21
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid \
- ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
- ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
- ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal
+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.i18n>=0:devel/py-zope.i18n@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${FLAVOR}
NO_ARCH= yes
USES= python:-2.7
diff --git a/textproc/py-zope.tal/Makefile b/textproc/py-zope.tal/Makefile
index 492609142e41..a9fd882abbe0 100644
--- a/textproc/py-zope.tal/Makefile
+++ b/textproc/py-zope.tal/Makefile
@@ -13,8 +13,8 @@ COMMENT= Zope Template Application Language (TAL)
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 zip
USE_PYTHON= distutils autoplist
diff --git a/textproc/py3-MarkupSafe/Makefile b/textproc/py3-MarkupSafe/Makefile
deleted file mode 100644
index 61183b0ef34b..000000000000
--- a/textproc/py3-MarkupSafe/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= MarkupSafe
-PORTVERSION= 1.0
-CATEGORIES= textproc python
-MASTER_SITES= CHEESESHOP
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER= bofh@FreeBSD.org
-COMMENT= Implements XML/HTML/XHTML Markup safe string for Python
-
-LICENSE= BSD3CLAUSE
-LICENSE_FILE= ${WRKSRC}/LICENSE
-
-USES= python:3.3+
-USE_PYTHON= autoplist concurrent distutils
-
-post-install:
- ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/markupsafe/_speedups.so
-
-.include <bsd.port.mk>
diff --git a/textproc/py3-MarkupSafe/distinfo b/textproc/py3-MarkupSafe/distinfo
deleted file mode 100644
index b7777bd27bac..000000000000
--- a/textproc/py3-MarkupSafe/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1489176826
-SHA256 (MarkupSafe-1.0.tar.gz) = a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665
-SIZE (MarkupSafe-1.0.tar.gz) = 14356
diff --git a/textproc/py3-MarkupSafe/pkg-descr b/textproc/py3-MarkupSafe/pkg-descr
deleted file mode 100644
index 06d057ad5a10..000000000000
--- a/textproc/py3-MarkupSafe/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-py-MarkupSafe is a python module that implements a XML/HTML/XHTML Markup
-safe string.
-
-WWW: https://pypi.python.org/pypi/MarkupSafe/
diff --git a/textproc/py3-alabaster/Makefile b/textproc/py3-alabaster/Makefile
deleted file mode 100644
index c3d732c90db7..000000000000
--- a/textproc/py3-alabaster/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-alabaster
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-chardet/Makefile b/textproc/py3-chardet/Makefile
deleted file mode 100644
index 8b86131ed22c..000000000000
--- a/textproc/py3-chardet/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-chardet
-
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py3-pytest-runner
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-docutils/Makefile b/textproc/py3-docutils/Makefile
deleted file mode 100644
index 4186de03148f..000000000000
--- a/textproc/py3-docutils/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-docutils
-
-PORTSCOUT= ignore:1
-
-USES= python:3.3+
-
-PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py3-pygments
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-feedparser/Makefile b/textproc/py3-feedparser/Makefile
deleted file mode 100644
index 1b9a58700812..000000000000
--- a/textproc/py3-feedparser/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-feedparser
-
-USES= python:3.3+ tar:bzip2
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-humanfriendly/Makefile b/textproc/py3-humanfriendly/Makefile
deleted file mode 100644
index 876a03f09373..000000000000
--- a/textproc/py3-humanfriendly/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-humanfriendly
-
-PORTSCOUT= ignore:1
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-hunspell/Makefile b/textproc/py3-hunspell/Makefile
deleted file mode 100644
index 52708394692f..000000000000
--- a/textproc/py3-hunspell/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-hunspell
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-libxml2/Makefile b/textproc/py3-libxml2/Makefile
deleted file mode 100644
index 9926e1371f12..000000000000
--- a/textproc/py3-libxml2/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Created by: Alexander Nedotsukov <bland@FreeBSD.org>
-# $FreeBSD$
-
-PORTREVISION= 0
-CATEGORIES= textproc gnome python
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Python interface for XML parser library for GNOME
-
-MASTERDIR= ${.CURDIR}/../libxml2
-BUILD_WRKSRC= ${WRKSRC}/python
-INSTALL_WRKSRC= ${BUILD_WRKSRC}
-DESCR= ${.CURDIR}/pkg-descr
-PLIST= ${.CURDIR}/pkg-plist
-
-USE_GNOME+= libxml2
-USES= python:3 gettext-runtime
-USE_PYTHON= autoplist distutils
-
-CPPFLAGS+= `${PYTHON_CMD}-config --cflags`
-LDFLAGS+= -L${LOCALBASE}/lib `${PYTHON_CMD}-config --libs`
-CONFIGURE_ARGS= --with-iconv=${ICONV_PREFIX} \
- --with-html-dir=${PREFIX}/share/doc \
- --with-html-subdir=${PORTNAME} \
- --with-python=${PYTHON_CMD}
-
-DOCSDIR= ${PREFIX}/share/doc/py-libxml2
-EXAMPLESDIR= ${PREFIX}/share/examples/py-libxml2
-
-post-install:
- @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-libxml2/pkg-descr b/textproc/py3-libxml2/pkg-descr
deleted file mode 100644
index afb7cf4dd299..000000000000
--- a/textproc/py3-libxml2/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Python interface for XML parser library for GNOME
-
-WWW: http://xmlsoft.org/
diff --git a/textproc/py3-numpydoc/Makefile b/textproc/py3-numpydoc/Makefile
deleted file mode 100644
index 236670fbc8d6..000000000000
--- a/textproc/py3-numpydoc/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-numpydoc
-
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py3-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py3-sphinx
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py3-nose
-
-USES= python:3.4+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-pyPEG2/Makefile b/textproc/py3-pyPEG2/Makefile
deleted file mode 100644
index 2ea7945297e1..000000000000
--- a/textproc/py3-pyPEG2/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pyPEG2
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-pygments/Makefile b/textproc/py3-pygments/Makefile
deleted file mode 100644
index 9487486f7ac4..000000000000
--- a/textproc/py3-pygments/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pygments
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-pystemmer/Makefile b/textproc/py3-pystemmer/Makefile
deleted file mode 100644
index 3a4222df32e1..000000000000
--- a/textproc/py3-pystemmer/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-pystemmer
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-qrcode/Makefile b/textproc/py3-qrcode/Makefile
deleted file mode 100644
index 204d2aa49106..000000000000
--- a/textproc/py3-qrcode/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-qrcode
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-snowballstemmer/Makefile b/textproc/py3-snowballstemmer/Makefile
deleted file mode 100644
index 663fe0722683..000000000000
--- a/textproc/py3-snowballstemmer/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-snowballstemmer
-
-USES= python:3.3+
-
-PYSTEMMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pystemmer>0:textproc/py3-pystemmer
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-sphinx/Makefile b/textproc/py3-sphinx/Makefile
deleted file mode 100644
index 533e86f7b8f8..000000000000
--- a/textproc/py3-sphinx/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-sphinx
-
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py3-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py3-docutils \
- ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py3-six
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py3-babel\
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py3-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py3-docutils \
- ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py3-pygments \
- ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py3-babel \
- ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0.1:textproc/py3-sphinx_rtd_theme \
- ${PYTHON_PKGNAMEPREFIX}alabaster>=0.7:textproc/py3-alabaster \
- ${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py3-snowballstemmer \
- ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py3-six \
- ${PYTHON_PKGNAMEPREFIX}imagesize>=0.7.1:graphics/py3-imagesize \
- ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-sphinx_rtd_theme/Makefile b/textproc/py3-sphinx_rtd_theme/Makefile
deleted file mode 100644
index 3181aff62a9e..000000000000
--- a/textproc/py3-sphinx_rtd_theme/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Danilo G. Baio <dbaio@bsd.com.br>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-sphinx_rtd_theme
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-texttable/Makefile b/textproc/py3-texttable/Makefile
deleted file mode 100644
index f67602a5ab13..000000000000
--- a/textproc/py3-texttable/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-texttable
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
index 28d4ca1732dd..b7b8b59a4a4b 100644
--- a/textproc/sigil/Makefile
+++ b/textproc/sigil/Makefile
@@ -14,14 +14,14 @@ LICENSE= GPLv3+
LIB_DEPENDS= libminizip.so:archivers/minizip \
libpcre.so:devel/pcre \
libhunspell-1.6.so:textproc/hunspell
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py3-lxml
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= Sigil-Ebook
GH_PROJECT= Sigil
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
- pkgconfig python:3 shebangfix
+ pkgconfig python:3.4+ shebangfix
SHEBANG_FILES= src/Resource_Files/plugin_launchers/python/*.py \
src/Resource_Files/python3lib/*.py
USE_QT5= concurrent core gui network printsupport svg webkit \
diff --git a/textproc/silvercity/Makefile b/textproc/silvercity/Makefile
index 1419bad5f3ef..7eee02cd061d 100644
--- a/textproc/silvercity/Makefile
+++ b/textproc/silvercity/Makefile
@@ -11,7 +11,7 @@ DISTNAME= SilverCity-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Lexing package for over 20 programming and markup languages
-USES= dos2unix python
+USES= dos2unix python:2.7
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= SilverCity
diff --git a/textproc/translate-toolkit/Makefile b/textproc/translate-toolkit/Makefile
index 0350a3b7dfd1..29761d284a62 100644
--- a/textproc/translate-toolkit/Makefile
+++ b/textproc/translate-toolkit/Makefile
@@ -11,21 +11,21 @@ COMMENT= Converts between many translation formats
LICENSE= GPLv2
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject@${FLAVOR} \
msghack:devel/gettext-msghack \
- ${PYTHON_PKGNAMEPREFIX}iniparse>=0:devel/py-iniparse \
- ${PYTHON_PKGNAMEPREFIX}levenshtein>=0:devel/py-levenshtein \
- ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
+ ${PYTHON_PKGNAMEPREFIX}iniparse>=0:devel/py-iniparse@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}levenshtein>=0:devel/py-levenshtein@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \
iso-codes>=1.3:misc/iso-codes \
bash:shells/bash \
- ${PYTHON_PKGNAMEPREFIX}utidylib>=0:www/py-utidylib
+ ${PYTHON_PKGNAMEPREFIX}utidylib>=0:www/py-utidylib@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
# Can use psyco (on i386)
NO_ARCH= yes
-USES= gettext python:2.7+
+USES= gettext python:2.7
USE_PYTHON= autoplist distutils
# list of manual pages to generate
diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index 8c52b89a45e2..de0867e66361 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -11,10 +11,10 @@ COMMENT= Tool to create RFCs and related documents from XML, as per RFC2629
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.8:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.8:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${FLAVOR}
USES= python
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist concurrent optsuffix
.include <bsd.port.mk>
diff --git a/textproc/xsv/Makefile b/textproc/xsv/Makefile
index 1dcea42ead18..61908468f8b1 100644
--- a/textproc/xsv/Makefile
+++ b/textproc/xsv/Makefile
@@ -13,9 +13,9 @@ COMMENT= XML Schema Validator
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ltxml>0:textproc/py-ltxml
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ltxml>0:textproc/py-ltxml@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/textproc/yould/Makefile b/textproc/yould/Makefile
index ed9d51ad05eb..7d4441a68ef4 100644
--- a/textproc/yould/Makefile
+++ b/textproc/yould/Makefile
@@ -13,7 +13,7 @@ COMMENT= Pronounceable word generator
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/www/Makefile b/www/Makefile
index 9060524462c9..f033a08d15cc 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1886,9 +1886,6 @@
SUBDIR += py-wsgidav
SUBDIR += py-yarl
SUBDIR += py-zope.app.wsgi
- SUBDIR += py3-cssutils
- SUBDIR += py3-httplib2
- SUBDIR += py3-requests
SUBDIR += pyblosxom
SUBDIR += pycarddav
SUBDIR += pydio
diff --git a/www/butterfly/Makefile b/www/butterfly/Makefile
index e0caa1da6078..47fb94df9d71 100644
--- a/www/butterfly/Makefile
+++ b/www/butterfly/Makefile
@@ -11,12 +11,13 @@ COMMENT= Web terminal based on websocket and tornado
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado \
- ${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass@${FLAVOR}
USES= python
-USE_PYTHON= autoplist distutils
+# Can't use concurrent here, it changes ETCDIR, and breaks post-install.
+USE_PYTHON= autoplist distutils optsuffix
NO_ARCH= yes
USE_RC_SUBR= butterfly
SUB_FILES= pkg-message
diff --git a/www/calendarserver/Makefile b/www/calendarserver/Makefile
index 662773b5107f..364ac55670de 100644
--- a/www/calendarserver/Makefile
+++ b/www/calendarserver/Makefile
@@ -12,21 +12,21 @@ COMMENT= Calendar and Contacts Server from Apple (RFC 4791, RFC 6352)
LICENSE= APACHE20
RUN_DEPENDS= memcached:databases/memcached \
- ${PYTHON_PKGNAMEPREFIX}calendar>=2.1:devel/py-calendar \
- ${PYTHON_PKGNAMEPREFIX}PyGreSQL>=5.0:databases/py-PyGreSQL \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.6:databases/py-pg8000 \
- ${PYTHON_PKGNAMEPREFIX}psutil>=4.3.0:sysutils/py-psutil \
- ${PYTHON_PKGNAMEPREFIX}pytz>=2016.7:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \
- ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.10:devel/py-setproctitle \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}twext>=0.20160817:devel/py-twext \
- ${PYTHON_PKGNAMEPREFIX}twisted>=16.4.1:devel/py-twisted \
- ${PYTHON_PKGNAMEPREFIX}xattr>=0.7.8:devel/py-xattr \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.3:devel/py-zope.interface
+ ${PYTHON_PKGNAMEPREFIX}calendar>=2.1:devel/py-calendar@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PyGreSQL>=5.0:databases/py-PyGreSQL@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.6:databases/py-pg8000@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psutil>=4.3.0:sysutils/py-psutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2016.7:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.10:devel/py-setproctitle@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twext>=0.20160817:devel/py-twext@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=16.4.1:devel/py-twisted@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xattr>=0.7.8:devel/py-xattr@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.3:devel/py-zope.interface@${FLAVOR}
PORTDOCS= *
PORTEXAMPLES= *
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 556ac03c8d8e..b7fa4f1a59ac 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -16,8 +16,8 @@ LICENSE_COMB= multi
BUILD_DEPENDS= python:lang/python \
bash:shells/bash \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
.if !defined(GN_ONLY)
BUILD_DEPENDS+= gperf:devel/gperf \
@@ -28,7 +28,7 @@ BUILD_DEPENDS+= gperf:devel/gperf \
node:www/node \
${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
- ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
+ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}
.endif
.if !defined(GN_ONLY)
diff --git a/www/ddgr/Makefile b/www/ddgr/Makefile
index c742cdaabb31..92138c3eb67e 100644
--- a/www/ddgr/Makefile
+++ b/www/ddgr/Makefile
@@ -12,13 +12,13 @@ COMMENT= DuckDuckGo from the terminal
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py3-requests \
- ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py3-urllib3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= jarun
-USES= python:3
+USES= python:3.4+
NO_ARCH= yes
NO_BUILD= yes
diff --git a/www/feedjack/Makefile b/www/feedjack/Makefile
index fe393931a131..38f50c85e39a 100644
--- a/www/feedjack/Makefile
+++ b/www/feedjack/Makefile
@@ -10,11 +10,11 @@ DISTNAME= Feedjack-${PORTVERSION}
MAINTAINER= flz@FreeBSD.org
COMMENT= Feed aggregator written in Python using the Django framework
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser \
- django-admin.py:www/py-django18
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser@${FLAVOR} \
+ django-admin.py:www/py-django18@${FLAVOR}
DIST_SUBDIR= python
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/geeknote/Makefile b/www/geeknote/Makefile
index 5dfc69315e31..129dfba8cd9e 100644
--- a/www/geeknote/Makefile
+++ b/www/geeknote/Makefile
@@ -11,12 +11,12 @@ COMMENT= Command line client for Evernote
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}evernote>=1.17:www/py-evernote \
- ${PYTHON_PKGNAMEPREFIX}html2text>0:textproc/py-html2text \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 \
- ${PYTHON_PKGNAMEPREFIX}markdown2>0:textproc/py-markdown2 \
- ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup \
- ${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}evernote>=1.17:www/py-evernote@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html2text>0:textproc/py-html2text@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown2>0:textproc/py-markdown2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift@${FLAVOR}
USES= python:-2.7
USE_GITHUB= yes
diff --git a/www/google-appengine/Makefile b/www/google-appengine/Makefile
index 669830bca5aa..f806bd575d64 100644
--- a/www/google-appengine/Makefile
+++ b/www/google-appengine/Makefile
@@ -14,9 +14,9 @@ COMMENT= Development tools for Google App Engine (SDK)
LICENSE= APACHE20 BSD3CLAUSE GPLv2 LGPL21 MIT MPL11 PSFL
LICENSE_COMB= multi
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${PY_FLAVOR}
NO_BUILD= yes
@@ -40,7 +40,7 @@ GAESCRIPTS= _php_runtime.py _python_runtime.py appcfg.py \
gen_protorpc.py php_cli.py remote_api_shell.py \
run_tests.py wrapper_util.py
-MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${PY_FLAVOR}
PHP_USE= mysql=server
PHP_VARS= gaedatadir+=php want_mysql_ver=55
diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index 936c921a41fd..31a78bcaa235 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -25,9 +25,9 @@ BUILD_DEPENDS= gperf:devel/gperf \
node:www/node \
${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \
- ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}
LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher \
libsnappy.so:archivers/snappy \
diff --git a/www/jtoolkit/Makefile b/www/jtoolkit/Makefile
index 331db0d64195..c348239c51d9 100644
--- a/www/jtoolkit/Makefile
+++ b/www/jtoolkit/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Webapp framework with modpython-based and stand-alone modes
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kid>=0.9.5:devel/py-kid
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kid>=0.9.5:devel/py-kid@${FLAVOR}
# Has optional dependencies on database engines
# Can optionally use py-lucene (on i386)
diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile
index 2a7182eab9d8..1bf20c6f4863 100644
--- a/www/linkchecker/Makefile
+++ b/www/linkchecker/Makefile
@@ -14,8 +14,8 @@ COMMENT= Check HTML documents for broken links
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython \
- ${PYTHON_PKGNAMEPREFIX}requests>=2:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2:www/py-requests@${FLAVOR}
WRKSRC= ${WRKDIR}/${DISTNAME}
@@ -31,7 +31,7 @@ OPTIONS_SUB= yes
CLAMAV_DESC= Clam Antivirus
CLAMAV_RUN_DEPENDS= clamscan:security/clamav
-GEOIP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}GeoIP>0:net/py-GeoIP
+GEOIP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}GeoIP>0:net/py-GeoIP@${FLAVOR}
GTK2_USE= gnome=pygtk2
LOGIN_DESC= Login form submission
LOGIN_RUN_DEPENDS= twill>=0:www/twill
@@ -39,11 +39,11 @@ NLS_USES= gettext
QT4_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-noqt-setup.py
QT4_USES= pyqt:4
QT4_USE= PYQT=core_run,gui_run,help_run,qscintilla2_run,sql_run
-SQLITE3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+SQLITE3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
SYNTAX_DESC= HTML/CSS syntax check
SYNTAX_RUN_DEPENDS=\
- ${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.5:www/py-cssutils \
- ${PYTHON_PKGNAMEPREFIX}utidylib>=0.2:www/py-utidylib
+ ${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.5:www/py-cssutils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}utidylib>=0.2:www/py-utidylib@${FLAVOR}
.include <bsd.port.options.mk>
diff --git a/www/mitmproxy/Makefile b/www/mitmproxy/Makefile
index 3bd4f8174632..e89fbff14946 100644
--- a/www/mitmproxy/Makefile
+++ b/www/mitmproxy/Makefile
@@ -12,34 +12,32 @@ COMMENT= SSL-capable man-in-the-middle proxy
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.2:devel/py3-click \
- ${PYTHON_PKGNAMEPREFIX}blinker>=1.4:devel/py-blinker \
- ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi \
- ${PYTHON_PKGNAMEPREFIX}construct28>=2.8:devel/py-construct28 \
- ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3:security/py-cryptography \
- ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1:www/py-cssutils \
- ${PYTHON_PKGNAMEPREFIX}html2text>=2016.1.8:textproc/py-html2text \
- ${PYTHON_PKGNAMEPREFIX}passlib>=1.6.5:security/py-passlib \
- ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1 \
- ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.3:devel/py-pyparsing \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.13.2:devel/py-ruamel.yaml \
- ${PYTHON_PKGNAMEPREFIX}tornado>=4.3:www/py-tornado \
- ${PYTHON_PKGNAMEPREFIX}urwid>=1.3.1:devel/py-urwid \
- ${PYTHON_PKGNAMEPREFIX}watchdog>=0.8.3:devel/py-watchdog \
- ${PYTHON_PKGNAMEPREFIX}brotli>=0.5.1:archivers/py-brotli \
- ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.5.4:devel/py-sortedcontainers \
- ${PYTHON_PKGNAMEPREFIX}pyperclip>=1.5.22:devel/py-pyperclip \
- ${PYTHON_PKGNAMEPREFIX}hyperframe>=5.0.0:www/py-hyperframe \
- ${PYTHON_PKGNAMEPREFIX}kaitaistruct>=0.6:devel/py-kaitaistruct \
- ${PYTHON_PKGNAMEPREFIX}jsbeautifier>=1.6.3:devel/py-jsbeautifier \
- ${PYTHON_PKGNAMEPREFIX}h2>=3.0.0:www/py-h2
-
-BROKEN= fails in dependency check: mitmproxy-2.0.1 depends on package: py36-blinker>=1.4 - not found
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.2:devel/py-click@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}blinker>=1.4:devel/py-blinker@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}construct28>=2.8:devel/py-construct28@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3:security/py-cryptography@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1:www/py-cssutils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html2text>=2016.1.8:textproc/py-html2text@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}passlib>=1.6.5:security/py-passlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.3:devel/py-pyparsing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.13.2:devel/py-ruamel.yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>=4.3:www/py-tornado@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urwid>=1.3.1:devel/py-urwid@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}watchdog>=0.8.3:devel/py-watchdog@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}brotli>=0.5.1:archivers/py-brotli@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.5.4:devel/py-sortedcontainers@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyperclip>=1.5.22:devel/py-pyperclip@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hyperframe>=5.0.0:www/py-hyperframe@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}kaitaistruct>=0.6:devel/py-kaitaistruct@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsbeautifier>=1.6.3:devel/py-jsbeautifier@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}h2>=3.0.0:www/py-h2@${FLAVOR}
USES= python:3.5+
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist optsuffix
NO_ARCH= yes
USE_GITHUB= yes
diff --git a/www/moinmoin/Makefile b/www/moinmoin/Makefile
index fd0e393adf32..e6896d6847bf 100644
--- a/www/moinmoin/Makefile
+++ b/www/moinmoin/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python clone of WikiWiki
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/docs/licenses/COPYING
-USES= cpe python shebangfix
+USES= cpe python:2.7 shebangfix
CPE_VENDOR= moinmo
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= moin
diff --git a/www/planet/Makefile b/www/planet/Makefile
index a791b48aabff..6bb0174b5305 100644
--- a/www/planet/Makefile
+++ b/www/planet/Makefile
@@ -12,7 +12,7 @@ COMMENT= Planet is a flexible feed aggregator - and more!
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/Tidy/Tidy.py:devel/py-mx-experimental \
${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb
-USES= python tar:bzip2
+USES= python:2.7 tar:bzip2
NO_BUILD= yes
NO_ARCH= yes
SUB_FILES= pkg-message
diff --git a/www/plone/Makefile b/www/plone/Makefile
index 81afd21ff9d4..e82c287618e7 100644
--- a/www/plone/Makefile
+++ b/www/plone/Makefile
@@ -12,20 +12,20 @@ COMMENT= Plone Content Management System
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFPlacefulWorkflow>=0:devel/py-Products.CMFPlacefulWorkflow \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFPlone>=0:www/py-Products.CMFPlone \
- ${PYTHON_PKGNAMEPREFIX}plone.app.caching>=0:www/py-plone.app.caching \
- ${PYTHON_PKGNAMEPREFIX}plone.app.dexterity>0:www/py-plone.app.dexterity \
- ${PYTHON_PKGNAMEPREFIX}plone.app.iterate>=0:www/py-plone.app.iterate \
- ${PYTHON_PKGNAMEPREFIX}plone.app.openid>=0:security/py-plone.app.openid \
- ${PYTHON_PKGNAMEPREFIX}plone.app.theming>0:www/py-plone.app.theming \
- ${PYTHON_PKGNAMEPREFIX}wicked>=0:textproc/py-wicked
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFPlacefulWorkflow>=0:devel/py-Products.CMFPlacefulWorkflow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFPlone>=0:www/py-Products.CMFPlone@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.caching>=0:www/py-plone.app.caching@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.dexterity>0:www/py-plone.app.dexterity@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.iterate>=0:www/py-plone.app.iterate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.openid>=0:security/py-plone.app.openid@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.theming>0:www/py-plone.app.theming@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wicked>=0:textproc/py-wicked@${FLAVOR}
OPTIONS_DEFINE= LDAP
-LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.ldap>=1.2.6:www/py-plone.app.ldap
+LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.ldap>=1.2.6:www/py-plone.app.ldap@${FLAVOR}
NO_ARCH= yes
-USES= cpe python
+USES= cpe python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile
index 8c342bfdebf9..a5d1edcca6b2 100644
--- a/www/py-HTMLgen/Makefile
+++ b/www/py-HTMLgen/Makefile
@@ -15,6 +15,7 @@ MAINTAINER= python@FreeBSD.org
COMMENT= Python library for the generation of HTML documents
USES= python:2 shebangfix
+USE_PYTHON= flavors
NO_BUILD= yes
NO_ARCH= yes
SHEBANG_FILES= HTMLutil.py barchart.py
diff --git a/www/py-MechanicalSoup/Makefile b/www/py-MechanicalSoup/Makefile
index 776d07289712..7dd0554dd94b 100644
--- a/www/py-MechanicalSoup/Makefile
+++ b/www/py-MechanicalSoup/Makefile
@@ -13,15 +13,15 @@ COMMENT= Python library for automating interaction with websites
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup \
- ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.11:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov \
- ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock \
- ${PYTHON_PKGNAMEPREFIX}requests-mock>=0:www/py-requests-mock
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.11:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-mock>=0:www/py-requests-mock@${FLAVOR}
USE_GITHUB= yes
diff --git a/www/py-Products.CMFPlone/Makefile b/www/py-Products.CMFPlone/Makefile
index db5ab5cab2ef..f98fe5bac5f5 100644
--- a/www/py-Products.CMFPlone/Makefile
+++ b/www/py-Products.CMFPlone/Makefile
@@ -12,108 +12,108 @@ COMMENT= Plone Content Management System (core)
LICENSE= GPLv2
-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}pillow>0:graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}Products.ATContentTypes>=2.1.3:devel/py-Products.ATContentTypes \
- ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFActionIcons>=0:devel/py-Products.CMFActionIcons \
- ${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.CMFDiffTool>=0:devel/py-Products.CMFDiffTool \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid \
- ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow \
- ${PYTHON_PKGNAMEPREFIX}Products.ExtendedPathIndex>=0:devel/py-Products.ExtendedPathIndex \
- ${PYTHON_PKGNAMEPREFIX}Products.ExternalEditor>=0:devel/py-Products.ExternalEditor \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.8.0:devel/py-Products.GenericSetup \
- ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry \
- ${PYTHON_PKGNAMEPREFIX}Products.PasswordResetTool>=0:devel/py-Products.PasswordResetTool \
- ${PYTHON_PKGNAMEPREFIX}Products.PlacelessTranslationService>=0:devel/py-Products.PlacelessTranslationService \
- ${PYTHON_PKGNAMEPREFIX}Products.PloneLanguageTool>=0:devel/py-Products.PloneLanguageTool \
- ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS \
- ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \
- ${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:devel/py-Products.PluginRegistry \
- ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms \
- ${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>=0:devel/py-Products.ResourceRegistries \
- ${PYTHON_PKGNAMEPREFIX}Products.TinyMCE>=0:www/py-Products.TinyMCE \
- ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \
- zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>0:devel/py-archetypes.querywidget \
- ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget \
- ${PYTHON_PKGNAMEPREFIX}borg.localrole>=0:security/py-borg.localrole \
- ${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize \
- ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \
- ${PYTHON_PKGNAMEPREFIX}plone.app.blob>=0:www/py-plone.app.blob \
- ${PYTHON_PKGNAMEPREFIX}plone.app.collection>0:www/py-plone.app.collection \
- ${PYTHON_PKGNAMEPREFIX}plone.app.content>=0:www/py-plone.app.content \
- ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>0:www/py-plone.app.contentlisting \
- ${PYTHON_PKGNAMEPREFIX}plone.app.contentmenu>=1.1.6:www/py-plone.app.contentmenu \
- ${PYTHON_PKGNAMEPREFIX}plone.app.contentrules>=0:www/py-plone.app.contentrules \
- ${PYTHON_PKGNAMEPREFIX}plone.app.controlpanel>=0:www/py-plone.app.controlpanel \
- ${PYTHON_PKGNAMEPREFIX}plone.app.customerize>=0:www/py-plone.app.customerize \
- ${PYTHON_PKGNAMEPREFIX}plone.app.discussion>=0:www/py-plone.app.discussion \
- ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder \
- ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \
- ${PYTHON_PKGNAMEPREFIX}plone.app.i18n>=0:www/py-plone.app.i18n \
- ${PYTHON_PKGNAMEPREFIX}plone.app.jquery>0:www/py-plone.app.jquery \
- ${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:www/py-plone.app.jquerytools \
- ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=1.1.7:www/py-plone.app.layout \
- ${PYTHON_PKGNAMEPREFIX}plone.app.linkintegrity>=1.0.3:www/py-plone.app.linkintegrity \
- ${PYTHON_PKGNAMEPREFIX}plone.app.locales>=0:www/py-plone.app.locales \
- ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \
- ${PYTHON_PKGNAMEPREFIX}plone.app.redirector>=0:www/py-plone.app.redirector \
- ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=0:www/py-plone.app.registry \
- ${PYTHON_PKGNAMEPREFIX}plone.app.search>0:www/py-plone.app.search \
- ${PYTHON_PKGNAMEPREFIX}plone.app.upgrade>=0:www/py-plone.app.upgrade \
- ${PYTHON_PKGNAMEPREFIX}plone.app.users>=0:www/py-plone.app.users \
- ${PYTHON_PKGNAMEPREFIX}plone.app.uuid>=0:www/py-plone.app.uuid \
- ${PYTHON_PKGNAMEPREFIX}plone.app.viewletmanager>=0:www/py-plone.app.viewletmanager \
- ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \
- ${PYTHON_PKGNAMEPREFIX}plone.app.workflow>=0:www/py-plone.app.workflow \
- ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching \
- ${PYTHON_PKGNAMEPREFIX}plone.browserlayer>=1.0rc4:www/py-plone.browserlayer \
- ${PYTHON_PKGNAMEPREFIX}plone.contentrules>=0:www/py-plone.contentrules \
- ${PYTHON_PKGNAMEPREFIX}plone.fieldsets>=0:www/py-plone.fieldsets \
- ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \
- ${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer \
- ${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:www/py-plone.intelligenttext \
- ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking \
- ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}plone.portlet.collection>=0:www/py-plone.portlet.collection \
- ${PYTHON_PKGNAMEPREFIX}plone.portlet.static>=0:www/py-plone.portlet.static \
- ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
- ${PYTHON_PKGNAMEPREFIX}plone.protect>1.0:security/py-plone.protect \
- ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry \
- ${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session \
- ${PYTHON_PKGNAMEPREFIX}plone.theme>=0:www/py-plone.theme \
- ${PYTHON_PKGNAMEPREFIX}plonetheme.classic>=0:www/py-plonetheme.classic \
- ${PYTHON_PKGNAMEPREFIX}plonetheme.sunburst>=0:www/py-plonetheme.sunburst \
- ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
- ${PYTHON_PKGNAMEPREFIX}z3c.autoinclude>=0:devel/py-z3c.autoinclude \
- ${PYTHON_PKGNAMEPREFIX}zope.app.locales>=3.6.0:textproc/py-zope.app.locales \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
- ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \
- ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation \
- ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
- ${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.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.site>=0:devel/py-zope.site \
- ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext \
- ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \
- ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales \
- ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
+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}pillow>0:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ATContentTypes>=2.1.3:devel/py-Products.ATContentTypes@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFActionIcons>=0:devel/py-Products.CMFActionIcons@${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.CMFDiffTool>=0:devel/py-Products.CMFDiffTool@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ExtendedPathIndex>=0:devel/py-Products.ExtendedPathIndex@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ExternalEditor>=0:devel/py-Products.ExternalEditor@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.8.0:devel/py-Products.GenericSetup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PasswordResetTool>=0:devel/py-Products.PasswordResetTool@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PlacelessTranslationService>=0:devel/py-Products.PlacelessTranslationService@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PloneLanguageTool>=0:devel/py-Products.PloneLanguageTool@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:devel/py-Products.PluginRegistry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>=0:devel/py-Products.ResourceRegistries@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.TinyMCE>=0:www/py-Products.TinyMCE@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>0:devel/py-archetypes.querywidget@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}borg.localrole>=0:security/py-borg.localrole@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.blob>=0:www/py-plone.app.blob@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.collection>0:www/py-plone.app.collection@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.content>=0:www/py-plone.app.content@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>0:www/py-plone.app.contentlisting@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.contentmenu>=1.1.6:www/py-plone.app.contentmenu@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.contentrules>=0:www/py-plone.app.contentrules@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.controlpanel>=0:www/py-plone.app.controlpanel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.customerize>=0:www/py-plone.app.customerize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.discussion>=0:www/py-plone.app.discussion@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.i18n>=0:www/py-plone.app.i18n@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.jquery>0:www/py-plone.app.jquery@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:www/py-plone.app.jquerytools@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=1.1.7:www/py-plone.app.layout@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.linkintegrity>=1.0.3:www/py-plone.app.linkintegrity@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.locales>=0:www/py-plone.app.locales@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.redirector>=0:www/py-plone.app.redirector@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=0:www/py-plone.app.registry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.search>0:www/py-plone.app.search@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.upgrade>=0:www/py-plone.app.upgrade@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.users>=0:www/py-plone.app.users@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.uuid>=0:www/py-plone.app.uuid@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.viewletmanager>=0:www/py-plone.app.viewletmanager@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.workflow>=0:www/py-plone.app.workflow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.browserlayer>=1.0rc4:www/py-plone.browserlayer@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.contentrules>=0:www/py-plone.contentrules@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.fieldsets>=0:www/py-plone.fieldsets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:www/py-plone.intelligenttext@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlet.collection>=0:www/py-plone.portlet.collection@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlet.static>=0:www/py-plone.portlet.static@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.protect>1.0:security/py-plone.protect@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.theme>=0:www/py-plone.theme@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plonetheme.classic>=0:www/py-plonetheme.classic@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plonetheme.sunburst>=0:www/py-plonetheme.sunburst@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.autoinclude>=0:devel/py-z3c.autoinclude@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.locales>=3.6.0:textproc/py-zope.app.locales@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${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.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.site>=0:devel/py-zope.site@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-Products.PloneLDAP/Makefile b/www/py-Products.PloneLDAP/Makefile
index a2505cde5af5..b74bf7590cfb 100644
--- a/www/py-Products.PloneLDAP/Makefile
+++ b/www/py-Products.PloneLDAP/Makefile
@@ -13,9 +13,9 @@ COMMENT= LDAP/Active Directory support for Plone
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>0:security/py-Products.PlonePAS \
- ${PYTHON_PKGNAMEPREFIX}Products.LDAPMultiPlugins>=1.10:devel/py-Products.LDAPMultiPlugins \
- ${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:devel/py-Products.LDAPUserFolder
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>0:security/py-Products.PlonePAS@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.LDAPMultiPlugins>=1.10:devel/py-Products.LDAPMultiPlugins@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:devel/py-Products.LDAPUserFolder@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-Products.TinyMCE/Makefile b/www/py-Products.TinyMCE/Makefile
index 5e99d948b6ae..d6ce4515c706 100644
--- a/www/py-Products.TinyMCE/Makefile
+++ b/www/py-Products.TinyMCE/Makefile
@@ -12,14 +12,14 @@ COMMENT= Adds support for TinyMCE to Plone
LICENSE= LGPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.imaging>=1.0.2:www/py-plone.app.imaging \
- ${PYTHON_PKGNAMEPREFIX}plone.outputfilters>=0:www/py-plone.outputfilters \
- ${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile \
- ${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout \
- ${PYTHON_PKGNAMEPREFIX}plone.caching>0:www/py-plone.caching \
- ${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>0:devel/py-Products.ResourceRegistries \
- ${PYTHON_PKGNAMEPREFIX}zope.app.content>0:devel/py-zope.app.content \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.imaging>=1.0.2:www/py-plone.app.imaging@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.outputfilters>=0:www/py-plone.outputfilters@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.caching>0:www/py-plone.caching@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>0:devel/py-Products.ResourceRegistries@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.content>0:devel/py-zope.app.content@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-WebError/Makefile b/www/py-WebError/Makefile
index c80354e46adc..bb92fc35805a 100644
--- a/www/py-WebError/Makefile
+++ b/www/py-WebError/Makefile
@@ -12,10 +12,10 @@ COMMENT= Web Error handling and exception catching
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.7:www/py-paste \
- ${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments \
- ${PYTHON_PKGNAMEPREFIX}Tempita>=0.3:textproc/py-Tempita \
- ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.7:www/py-paste@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Tempita>=0.3:textproc/py-Tempita@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-WebTest/Makefile b/www/py-WebTest/Makefile
index 04079e7f5193..9d02a2e18cef 100644
--- a/www/py-WebTest/Makefile
+++ b/www/py-WebTest/Makefile
@@ -11,14 +11,14 @@ COMMENT= Helper to test WSGI applications
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup \
- ${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup \
- ${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob@${FLAVOR}
USE_GITHUB= yes
diff --git a/www/py-aiohttp-wsgi/Makefile b/www/py-aiohttp-wsgi/Makefile
index 9fdc82cc42e7..1b2d0a285c4f 100644
--- a/www/py-aiohttp-wsgi/Makefile
+++ b/www/py-aiohttp-wsgi/Makefile
@@ -11,7 +11,7 @@ COMMENT= WSGI adapter for aiohttp
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${FLAVOR}
USES= python:3.4+
USE_PYTHON= autoplist distutils
diff --git a/www/py-aiohttp/Makefile b/www/py-aiohttp/Makefile
index ec527b781073..1a778308fb99 100644
--- a/www/py-aiohttp/Makefile
+++ b/www/py-aiohttp/Makefile
@@ -13,17 +13,16 @@ COMMENT= HTTP client/server for asyncio
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= cython:lang/cython
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py3-chardet \
- ${PYTHON_PKGNAMEPREFIX}multidict>0:www/py-multidict \
- ${PYTHON_PKGNAMEPREFIX}yarl>0:www/py-yarl \
- ${PYTHON_PKGNAMEPREFIX}async_timeout>0:devel/py-async_timeout
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout \
- ${PYTHON_PKGNAMEPREFIX}gunicorn>0:www/py-gunicorn
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}multidict>0:www/py-multidict@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yarl>0:www/py-yarl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}async_timeout>0:devel/py-async_timeout@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gunicorn>0:www/py-gunicorn@${FLAVOR}
USES= python:3.4+
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils cython
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/aiohttp/*.so
diff --git a/www/py-autobahn/Makefile b/www/py-autobahn/Makefile
index 845a1c74f442..d6898e3af81a 100644
--- a/www/py-autobahn/Makefile
+++ b/www/py-autobahn/Makefile
@@ -13,11 +13,11 @@ COMMENT= WebSocket client & server library, WAMP real-time framework
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}txaio>=2.2.0:devel/py-txaio
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.7.2:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \
- ${PYTHON_PKGNAMEPREFIX}trollius>0:devel/py-trollius # Not really a depends, but the test doesnt skip
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}txaio>=2.2.0:devel/py-txaio@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.7.2:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}trollius>0:devel/py-trollius@${FLAVOR} # Not really a depends, but the test doesnt skip
USES= python
USE_GITHUB= yes
@@ -29,37 +29,25 @@ GH_ACCOUNT= crossbario
GH_PROJECT= autobahn-python
OPTIONS_DEFINE= ACCELERATE SERIALIZATION
-OPTIONS_MULTI= BACKENDS
-OPTIONS_MULTI_BACKENDS= ASYNCIO TWISTED
-OPTIONS_DEFAULT= ACCELERATE SERIALIZATION TWISTED
+OPTIONS_DEFAULT= ACCELERATE SERIALIZATION
BACKENDS_DESC= Networking Backends
ACCELERATE_DESC= WebSocket and JSON Acceleration
-ASYNCIO_DESC= asyncio (PEP-3156) Backend (Python 3.x ONLY)
SERIALIZATION_DESC= WAMPv2 Binary Serialization
-TWISTED_DESC= Twisted Backend (Python 2.x ONLY)
-ACCELERATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wsaccel>=0.6.2:www/py-wsaccel \
- ${PYTHON_PKGNAMEPREFIX}ujson>=1.33:devel/py-ujson
+ACCELERATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wsaccel>=0.6.2:www/py-wsaccel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ujson>=1.33:devel/py-ujson@${FLAVOR}
-SERIALIZATION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python
-
-TWISTED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}twisted>=12.1:devel/py-twisted
+SERIALIZATION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python@${FLAVOR}
.include <bsd.port.pre.mk>
-.if ${PORT_OPTIONS:MTWISTED} && ${PYTHON_REL} >= 3000
-BROKEN= Twisted currently only supports Python 2.x. Disable the TWISTED option and use ASYNCIO instead
-.endif
-
-.if ${PORT_OPTIONS:MASYNCIO}
-.if ${PYTHON_REL} <= 3000
-BROKEN= ASYNCIO requires Python 3.x. Disable the ASYNCIO option and use TWISTED instead
-.elif ${PYTHON_REL} <= 3300
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>=3.4.3:devel/py-asyncio
-.endif
+.if ${FLAVOR} == python2
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=12.1:devel/py-twisted@${FLAVOR}
+.elif ${FLAVOR} == python3 && ${PYTHON_REL} <= 3300
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>=3.4.3:devel/py-asyncio@${FLAVOR}
.endif
do-test:
diff --git a/www/py-aws-requests-auth/Makefile b/www/py-aws-requests-auth/Makefile
index 8ed094d424a7..5e22b24c255d 100644
--- a/www/py-aws-requests-auth/Makefile
+++ b/www/py-aws-requests-auth/Makefile
@@ -13,8 +13,8 @@ COMMENT= Authenticate to AWS with Amazon's signature v4 signing process
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.14.0:www/py-requests
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.14.0:www/py-requests@${FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/www/py-beaker/Makefile b/www/py-beaker/Makefile
index 233ae204945c..645650bbc624 100644
--- a/www/py-beaker/Makefile
+++ b/www/py-beaker/Makefile
@@ -20,7 +20,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} <= 3200
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}funcsigs>=1.0.2:devel/py-funcsigs
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}funcsigs>=1.0.2:devel/py-funcsigs@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/www/py-bleach/Makefile b/www/py-bleach/Makefile
index fe064c5de847..00a3c6a765d8 100644
--- a/www/py-bleach/Makefile
+++ b/www/py-bleach/Makefile
@@ -13,9 +13,9 @@ COMMENT= Easy whitelist-based HTML-sanitizing tool
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}html5lib>=0.999:www/py-html5lib
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3:devel/py-nose
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html5lib>=0.999:www/py-html5lib@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3:devel/py-nose@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-blogofile/Makefile b/www/py-blogofile/Makefile
index 9cfbb015822a..e4b816c6e467 100644
--- a/www/py-blogofile/Makefile
+++ b/www/py-blogofile/Makefile
@@ -13,17 +13,17 @@ COMMENT= Static website compiler and blog engine
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \
- ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe \
- ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}textile>0:www/py-textile \
- ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}textile>0:www/py-textile@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
USES= python:2
USE_PYTHON= autoplist distutils
diff --git a/www/py-bokeh/Makefile b/www/py-bokeh/Makefile
index 2bc7fcce8a89..3464bfc84970 100644
--- a/www/py-bokeh/Makefile
+++ b/www/py-bokeh/Makefile
@@ -13,13 +13,13 @@ COMMENT= Interactive Web Plotting for Python
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2 \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${FLAVOR} \
${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}tornado>=4.3:www/py-tornado
+ ${PYTHON_PKGNAMEPREFIX}tornado>=4.3:www/py-tornado@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils concurrent
@@ -29,7 +29,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} == 2700
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>3.0.3:devel/py-futures
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>3.0.3:devel/py-futures@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/www/py-boto3/Makefile b/www/py-boto3/Makefile
index 9db0978af1c1..45d14d78fdc3 100644
--- a/www/py-boto3/Makefile
+++ b/www/py-boto3/Makefile
@@ -12,11 +12,11 @@ COMMENT= AWS SDK for Python
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.4.1:devel/py-botocore \
- ${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1:devel/py-jmespath \
- ${PYTHON_PKGNAMEPREFIX}s3transfer>=0.1.0:net/py-s3transfer
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.4.1:devel/py-botocore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1:devel/py-jmespath@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}s3transfer>=0.1.0:net/py-s3transfer@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
# Actually -2.7,3.3-3.5
USES= python
diff --git a/www/py-bottle-cork/Makefile b/www/py-bottle-cork/Makefile
index 6fd1d06c1f1f..544c58c45635 100644
--- a/www/py-bottle-cork/Makefile
+++ b/www/py-bottle-cork/Makefile
@@ -11,8 +11,8 @@ COMMENT= Bottle authentication and authorization module
LICENSE= LGPL3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottle>0:www/py-bottle \
- ${PYTHON_PKGNAMEPREFIX}beaker>0:www/py-beaker
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottle>0:www/py-bottle@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beaker>0:www/py-beaker@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= FedericoCeratto
@@ -26,9 +26,9 @@ OPTIONS_DEFINE= SQLITE MONGODB SQLALCHEMY EXAMPLES
.include <bsd.port.options.mk>
-SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
MONGODB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo
-SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10
+SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR}
.if ${PORT_OPTIONS:MEXAMPLES}
post-install:
diff --git a/www/py-buku/Makefile b/www/py-buku/Makefile
index 0385e77c445b..b4ac323b263a 100644
--- a/www/py-buku/Makefile
+++ b/www/py-buku/Makefile
@@ -12,13 +12,13 @@ COMMENT= Powerful command-line bookmark manager
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup \
- ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py3-cryptography \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py3-requests \
- ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py3-urllib3 \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py${PYTHON_SUFFIX}-sqlite3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cryptography@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
-USES= python:3
+USES= python:3.4+
USE_GITHUB= yes
USE_PYTHON= autoplist distutils
NO_ARCH= yes
@@ -28,14 +28,7 @@ GH_PROJECT= Buku
PLIST_FILES= man/man1/buku.1.gz
-.include <bsd.port.pre.mk>
-
-.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:
${INSTALL_MAN} ${WRKSRC}/buku.1 ${STAGEDIR}${MANPREFIX}/man/man1
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/py-cachecontrol/Makefile b/www/py-cachecontrol/Makefile
index 03f029184a07..2524663d70df 100644
--- a/www/py-cachecontrol/Makefile
+++ b/www/py-cachecontrol/Makefile
@@ -12,8 +12,8 @@ COMMENT= Caching algorithms in httplib2 for use with requests session object
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}lockfile>=0.9:devel/py-lockfile
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lockfile>=0.9:devel/py-lockfile@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-caldav/Makefile b/www/py-caldav/Makefile
index 2eb98b57da2f..a2956fd9a8ed 100644
--- a/www/py-caldav/Makefile
+++ b/www/py-caldav/Makefile
@@ -16,9 +16,9 @@ LICENSE_COMB= dual
USES= python
USE_PYTHON= distutils autoplist
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}lxml>=3.6.0:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=3.6.0:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject@${FLAVOR}
.include <bsd.port.mk>
diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile
index a1847f4de7d9..b73a864e3afa 100644
--- a/www/py-cherrypy/Makefile
+++ b/www/py-cherrypy/Makefile
@@ -14,8 +14,8 @@ COMMENT= Pythonic, object-oriented web development framework
LICENSE= BSD3CLAUSE
-EXAMPLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah \
- ${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:databases/py-sqlobject
+EXAMPLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:databases/py-sqlobject@${FLAVOR}
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
OPTIONS_DEFINE= EXAMPLES
diff --git a/www/py-collective.easytemplate/Makefile b/www/py-collective.easytemplate/Makefile
index 8e2285d52562..911e640b86e1 100644
--- a/www/py-collective.easytemplate/Makefile
+++ b/www/py-collective.easytemplate/Makefile
@@ -13,11 +13,11 @@ COMMENT= Dynamic HTML generation and scripting for Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.3:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}plone.portlet.static>=0:www/py-plone.portlet.static \
- ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser \
- ${PYTHON_PKGNAMEPREFIX}collective.templateengines>=0.3:www/py-collective.templateengines
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.3:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlet.static>=0:www/py-plone.portlet.static@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}collective.templateengines>=0.3:www/py-collective.templateengines@${FLAVOR}
USES= python:2 zip
USE_PYTHON= autoplist distutils
diff --git a/www/py-collective.templateengines/Makefile b/www/py-collective.templateengines/Makefile
index 0bf510559791..3572e114b09c 100644
--- a/www/py-collective.templateengines/Makefile
+++ b/www/py-collective.templateengines/Makefile
@@ -13,7 +13,7 @@ COMMENT= Template engine abstraction layer for Python
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore@${FLAVOR}
USES= python:2 zip
USE_PYTHON= distutils autoplist
diff --git a/www/py-cookies/Makefile b/www/py-cookies/Makefile
index f9dc42add2ae..77f7cae47d1a 100644
--- a/www/py-cookies/Makefile
+++ b/www/py-cookies/Makefile
@@ -12,7 +12,7 @@ COMMENT= Friendlier RFC 6265-compliant cookie parser/renderer
LICENSE= MIT
-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
diff --git a/www/py-cssutils/Makefile b/www/py-cssutils/Makefile
index 2ada7e6c99a6..b9fad5f6f7f6 100644
--- a/www/py-cssutils/Makefile
+++ b/www/py-cssutils/Makefile
@@ -20,12 +20,10 @@ OPTIONS_DEFINE= EXAMPLES
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
-USES?= python
+USES= python
PORTEXAMPLES= *
-SLAVEDIRS= www/py3-cssutils
-
post-install-EXAMPLES-on:
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}/
diff --git a/www/py-ddgr/Makefile b/www/py-ddgr/Makefile
index 768aa36204dc..939bb98c548d 100644
--- a/www/py-ddgr/Makefile
+++ b/www/py-ddgr/Makefile
@@ -12,12 +12,12 @@ COMMENT= Command line tool for performing DuckDuckGo web searches
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py3-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${FLAVOR}
USES= python:3.3+ shebangfix
USE_GITHUB= yes
GH_ACCOUNT= jarun
-USE_PYTHON= concurrent requests
+USE_PYTHON= concurrent flavors
NO_BUILD= yes
NO_ARCH= yes
SHEBANG_FILES= ${PORTNAME}
diff --git a/www/py-django-allauth/Makefile b/www/py-django-allauth/Makefile
index 86c4374f0335..b35f7f29d450 100644
--- a/www/py-django-allauth/Makefile
+++ b/www/py-django-allauth/Makefile
@@ -12,7 +12,7 @@ COMMENT= User registration with social account authentication
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6:www/py-django18
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6:www/py-django18@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-annotations/Makefile b/www/py-django-annotations/Makefile
index a5a30226cccf..ba1ab27f75a9 100644
--- a/www/py-django-annotations/Makefile
+++ b/www/py-django-annotations/Makefile
@@ -9,13 +9,13 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= swills@FreeBSD.org
COMMENT= Django implementation of annotatorjs Storage
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-cors-headers>=1.1.0:www/py-django-cors-headers \
- ${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.3.2:www/py-djangorestframework \
- ${PYTHON_PKGNAMEPREFIX}django-rq>0:devel/py-django-rq \
- ${PYTHON_PKGNAMEPREFIX}django-rq-dashboard>0:devel/py-django-rq-dashboard \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-cors-headers>=1.1.0:www/py-django-cors-headers@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.3.2:www/py-djangorestframework@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-rq>0:devel/py-django-rq@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-rq-dashboard>0:devel/py-django-rq-dashboard@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR}
-USES= python
+USES= python:2.7
USE_GITHUB= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-django-annoying/Makefile b/www/py-django-annoying/Makefile
index d28cf03ce01d..fccbd078a9a3 100644
--- a/www/py-django-annoying/Makefile
+++ b/www/py-django-annoying/Makefile
@@ -12,7 +12,7 @@ COMMENT= Eliminate annoying things in the Django framework
LICENSE= BSD3CLAUSE
-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}
USE_GITHUB= yes
diff --git a/www/py-django-appconf/Makefile b/www/py-django-appconf/Makefile
index fc7b908fc826..586c0755726f 100644
--- a/www/py-django-appconf/Makefile
+++ b/www/py-django-appconf/Makefile
@@ -12,7 +12,7 @@ COMMENT= Helper class for handling configuration defaults gracefully
LICENSE= BSD3CLAUSE
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:2.7+
diff --git a/www/py-django-appmedia/Makefile b/www/py-django-appmedia/Makefile
index 92b940899927..60b6b1d43a00 100644
--- a/www/py-django-appmedia/Makefile
+++ b/www/py-django-appmedia/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= kurt.lidl@cello.com
COMMENT= Serve static content from within django app directories
-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}
USES= python:2
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-assets/Makefile b/www/py-django-assets/Makefile
index e18223dd38e0..d1b195b0f9bd 100644
--- a/www/py-django-assets/Makefile
+++ b/www/py-django-assets/Makefile
@@ -11,8 +11,8 @@ COMMENT= Compress and merge CSS and Javascript files
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}webassets>0:www/py-webassets
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webassets>0:www/py-webassets@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-auth-ldap/Makefile b/www/py-django-auth-ldap/Makefile
index 482922d7a690..1d1c01d4ce74 100644
--- a/www/py-django-auth-ldap/Makefile
+++ b/www/py-django-auth-ldap/Makefile
@@ -13,7 +13,7 @@ COMMENT= LDAP integration for django.contrib.auth
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3.1:www/py-django18
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3.1:www/py-django18@${FLAVOR}
NO_ARCH= yes
USES= python
@@ -22,9 +22,9 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3000
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${FLAVOR}
.else
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyldap>0:net/py-pyldap
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyldap>0:net/py-pyldap@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/www/py-django-babel/Makefile b/www/py-django-babel/Makefile
index eaa4a75dee85..e8dad0451046 100644
--- a/www/py-django-babel/Makefile
+++ b/www/py-django-babel/Makefile
@@ -13,8 +13,8 @@ COMMENT= Utilities for using Babel in django
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}Babel>=0:devel/py-babel
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=0:devel/py-babel@${FLAVOR}
NO_ARCH= yes
diff --git a/www/py-django-bitfield/Makefile b/www/py-django-bitfield/Makefile
index 82818e9c0a2a..985bcd9609ee 100644
--- a/www/py-django-bitfield/Makefile
+++ b/www/py-django-bitfield/Makefile
@@ -12,8 +12,8 @@ COMMENT= BitField in Django
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
NO_ARCH= yes
USES= python:2.7+
diff --git a/www/py-django-bootstrap-form/Makefile b/www/py-django-bootstrap-form/Makefile
index f774d4cf313e..1546342041c9 100644
--- a/www/py-django-bootstrap-form/Makefile
+++ b/www/py-django-bootstrap-form/Makefile
@@ -16,6 +16,6 @@ LICENSE= MIT
USES= python
USE_PYTHON= distutils autoplist
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18@${FLAVOR}
.include <bsd.port.mk>
diff --git a/www/py-django-bulk-update/Makefile b/www/py-django-bulk-update/Makefile
index 8b953de83f6d..ae3a03b83bdb 100644
--- a/www/py-django-bulk-update/Makefile
+++ b/www/py-django-bulk-update/Makefile
@@ -12,7 +12,7 @@ COMMENT= Bulk update using a single query over Django ORM
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django110>0:www/py-django110
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django110>0:www/py-django110@${FLAVOR}
NO_ARCH= yes
USES= python:2.7-3.4
diff --git a/www/py-django-caching-app-plugins/Makefile b/www/py-django-caching-app-plugins/Makefile
index b8f8a7d545e8..c2787affac4b 100644
--- a/www/py-django-caching-app-plugins/Makefile
+++ b/www/py-django-caching-app-plugins/Makefile
@@ -14,8 +14,8 @@ COMMENT= Django app for writing pluggable reusable django applications
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.rst
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-classy-tags/Makefile b/www/py-django-classy-tags/Makefile
index 145c48d4a7ee..fc6673f53b95 100644
--- a/www/py-django-classy-tags/Makefile
+++ b/www/py-django-classy-tags/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= cs@FreeBSD.org
COMMENT= Class based template tags for Django
-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}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile
index 69911e269bb4..519993a8d917 100644
--- a/www/py-django-cms/Makefile
+++ b/www/py-django-cms/Makefile
@@ -13,12 +13,12 @@ COMMENT= Content management system built with the Django framework
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}south>=0.7.3:databases/py-south \
- ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.4.1:www/py-django-classy-tags \
- ${PYTHON_PKGNAMEPREFIX}django-mptt>=0.5.2:www/py-django-mptt \
- ${PYTHON_PKGNAMEPREFIX}django-sekizai>=0.6.1:www/py-django-sekizai \
- ${PYTHON_PKGNAMEPREFIX}html5lib>=0.90:www/py-html5lib
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}south>=0.7.3:databases/py-south@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.4.1:www/py-django-classy-tags@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-mptt>=0.5.2:www/py-django-mptt@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-sekizai>=0.6.1:www/py-django-sekizai@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html5lib>=0.90:www/py-html5lib@${FLAVOR}
USES= python:2
USE_PYTHON= autoplist distutils
@@ -27,8 +27,8 @@ OPTIONS_MULTI= DATABASE
OPTIONS_DEFAULT=SQLITE
OPTIONS_MULTI_DATABASE=MYSQL PGSQL SQLITE
-MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
-PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
-SQLIE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
+SQLIE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
.include <bsd.port.mk>
diff --git a/www/py-django-configurations/Makefile b/www/py-django-configurations/Makefile
index 1b43abcd5d6c..5ffe5874c519 100644
--- a/www/py-django-configurations/Makefile
+++ b/www/py-django-configurations/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}django-
MAINTAINER= tj@FreeBSD.org
COMMENT= Django project configuration using the composability of Python classes
-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
diff --git a/www/py-django-constance/Makefile b/www/py-django-constance/Makefile
index e9960e84db86..bc8cb73a1fbd 100644
--- a/www/py-django-constance/Makefile
+++ b/www/py-django-constance/Makefile
@@ -13,10 +13,10 @@ COMMENT= Dynamic Django settings
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis \
- ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage \
- ${PYTHON_PKGNAMEPREFIX}django-picklefield>=0:www/py-django-picklefield \
- ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-picklefield>=0:www/py-django-picklefield@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-contact-form/Makefile b/www/py-django-contact-form/Makefile
index 463e5d9e4d73..ff7a0b953b0b 100644
--- a/www/py-django-contact-form/Makefile
+++ b/www/py-django-contact-form/Makefile
@@ -12,7 +12,7 @@ COMMENT= Generic contact-form application for Django
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
NO_ARCH= yes
diff --git a/www/py-django-contrib-comments/Makefile b/www/py-django-contrib-comments/Makefile
index 6623e045f25c..91f98b0564e9 100644
--- a/www/py-django-contrib-comments/Makefile
+++ b/www/py-django-contrib-comments/Makefile
@@ -13,7 +13,7 @@ COMMENT= Code formerly known as django.contrib.comments
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-cors-headers/Makefile b/www/py-django-cors-headers/Makefile
index 294cb66df656..c2275dcba2b1 100644
--- a/www/py-django-cors-headers/Makefile
+++ b/www/py-django-cors-headers/Makefile
@@ -11,7 +11,7 @@ COMMENT= Handles server headers required for Cross-Origin Resource Sharing
LICENSE= MIT
-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
diff --git a/www/py-django-crispy-forms/Makefile b/www/py-django-crispy-forms/Makefile
index 062775f86c6f..f2efd498cd30 100644
--- a/www/py-django-crispy-forms/Makefile
+++ b/www/py-django-crispy-forms/Makefile
@@ -12,7 +12,7 @@ COMMENT= The best way to have Django DRY forms
LICENSE= MIT
-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 concurrent
diff --git a/www/py-django-datetime-widget/Makefile b/www/py-django-datetime-widget/Makefile
index a794bb7713dd..df93d9d71d5f 100644
--- a/www/py-django-datetime-widget/Makefile
+++ b/www/py-django-datetime-widget/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple and clean widget for DateTimeField
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR}
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
diff --git a/www/py-django-debug-toolbar/Makefile b/www/py-django-debug-toolbar/Makefile
index ee0444ce4a65..a3acf08e5b51 100644
--- a/www/py-django-debug-toolbar/Makefile
+++ b/www/py-django-debug-toolbar/Makefile
@@ -12,8 +12,8 @@ COMMENT= Configurable set of panels to display debug information
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.4.2:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}sqlparse>0:databases/py-sqlparse
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.4.2:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlparse>0:databases/py-sqlparse@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-devel/Makefile b/www/py-django-devel/Makefile
index 1f7f880c80e8..cb9416995a75 100644
--- a/www/py-django-devel/Makefile
+++ b/www/py-django-devel/Makefile
@@ -14,7 +14,7 @@ COMMENT= High-level Python Web framework
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR}
SNAPSHOTDATE= 20150709
@@ -40,11 +40,11 @@ HTMLDOCS_DESC= Install HTML documentation (requires Sphinx)
PLIST_FILES= man/man1/django-admin.1.gz
-HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
-PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
-MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
-SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
-FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup
+HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
+FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR}
.include <bsd.port.options.mk>
diff --git a/www/py-django-dpaste/Makefile b/www/py-django-dpaste/Makefile
index 631705d4903a..1596c5453c63 100644
--- a/www/py-django-dpaste/Makefile
+++ b/www/py-django-dpaste/Makefile
@@ -13,16 +13,16 @@ COMMENT= Django based pastebin
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}django-mptt>=0.8.3:www/py-django-mptt \
- ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-mptt>=0.8.3:www/py-django-mptt@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR}
OPTIONS_DEFINE= MIGRATIONS
MIGRATIONS_DESC= Schema and data migration support (via south)
-MIGRATIONS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}south>=0.8.2:databases/py-south
+MIGRATIONS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}south>=0.8.2:databases/py-south@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-evolution/Makefile b/www/py-django-evolution/Makefile
index 73c6f485dc1a..f1bdde353413 100644
--- a/www/py-django-evolution/Makefile
+++ b/www/py-django-evolution/Makefile
@@ -13,12 +13,12 @@ COMMENT= Database schema evolution tool for the Django web framework
LICENSE= BSD3CLAUSE
-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}
USE_GITHUB= yes
GH_ACCOUNT= beanbaginc
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
post-extract:
diff --git a/www/py-django-extensions/Makefile b/www/py-django-extensions/Makefile
index 9e0d3c2afd7a..0e179d530354 100644
--- a/www/py-django-extensions/Makefile
+++ b/www/py-django-extensions/Makefile
@@ -13,8 +13,8 @@ COMMENT= Global custom management extensions for the Django Framework
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
NO_ARCH= yes
USES= python:2
diff --git a/www/py-django-filer/Makefile b/www/py-django-filer/Makefile
index 60f61123e5e5..1a6c1868276a 100644
--- a/www/py-django-filer/Makefile
+++ b/www/py-django-filer/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= xenophon+fbsdports@irtnog.org
COMMENT= File and Image Management Application for django
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}django-easy-thumbnails>=0:graphics/py-django-easy-thumbnails \
- ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-easy-thumbnails>=0:graphics/py-django-easy-thumbnails@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-guardian/Makefile b/www/py-django-guardian/Makefile
index 46e1356bd67b..9abad2a3fc3e 100644
--- a/www/py-django-guardian/Makefile
+++ b/www/py-django-guardian/Makefile
@@ -12,8 +12,8 @@ COMMENT= Implementation of per object permissions for Django
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
NO_ARCH= yes
USES= python:2.7+
diff --git a/www/py-django-happenings/Makefile b/www/py-django-happenings/Makefile
index 297812c1e27f..2dcaf7d5d68d 100644
--- a/www/py-django-happenings/Makefile
+++ b/www/py-django-happenings/Makefile
@@ -13,8 +13,8 @@ COMMENT= Event calendar app for Django
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR}
CONFLICTS_INSTALL= py*-django-mptt
diff --git a/www/py-django-haystack/Makefile b/www/py-django-haystack/Makefile
index 2471448f8a29..8061133b95d9 100644
--- a/www/py-django-haystack/Makefile
+++ b/www/py-django-haystack/Makefile
@@ -13,7 +13,7 @@ COMMENT= Pluggable search for Django
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
NO_ARCH= yes
USES= python:2.7+
diff --git a/www/py-django-hijack/Makefile b/www/py-django-hijack/Makefile
index abe89bc5b915..65195fe2d40e 100644
--- a/www/py-django-hijack/Makefile
+++ b/www/py-django-hijack/Makefile
@@ -13,7 +13,7 @@ COMMENT= Allows DJango superusers to login as other users
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-htmlmin/Makefile b/www/py-django-htmlmin/Makefile
index 3dfb0165bc0c..49ef4aaf459c 100644
--- a/www/py-django-htmlmin/Makefile
+++ b/www/py-django-htmlmin/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= demon@FreeBSD.org
COMMENT= HTML minifier for Python
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bs4/element.py:www/py-beautifulsoup \
- ${PYTHON_SITELIBDIR}/html5lib/html5parser.py:www/py-html5lib
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bs4/element.py:www/py-beautifulsoup@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/html5lib/html5parser.py:www/py-html5lib@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-json-rpc/Makefile b/www/py-django-json-rpc/Makefile
index c34c06bd68f1..89e8870fd923 100644
--- a/www/py-django-json-rpc/Makefile
+++ b/www/py-django-json-rpc/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= jhixson@gmail.com
COMMENT= Simple JSON-RPC implementation for Django
-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}
LICENSE= MIT
diff --git a/www/py-django-jsonfield/Makefile b/www/py-django-jsonfield/Makefile
index c0ede316a2c6..6e50a6a667c7 100644
--- a/www/py-django-jsonfield/Makefile
+++ b/www/py-django-jsonfield/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}django-
MAINTAINER= tj@FreeBSD.org
COMMENT= Reusable JSONField model for Django to store ad-hoc data
-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
diff --git a/www/py-django-keyedcache/Makefile b/www/py-django-keyedcache/Makefile
index 2e8b33a9b2f4..28faf1dc767d 100644
--- a/www/py-django-keyedcache/Makefile
+++ b/www/py-django-keyedcache/Makefile
@@ -13,7 +13,7 @@ COMMENT= Simplified, speedy way to manage caching in Django apps
LICENSE= BSD3CLAUSE
-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}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-ldapdb/Makefile b/www/py-django-ldapdb/Makefile
index 965175b07461..abc9a3fdb375 100644
--- a/www/py-django-ldapdb/Makefile
+++ b/www/py-django-ldapdb/Makefile
@@ -13,10 +13,10 @@ COMMENT= Support for django models over LDAP
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6.0:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}ldap>=2.0:net/py-ldap
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6.0:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ldap>=2.0:net/py-ldap@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-livesettings/Makefile b/www/py-django-livesettings/Makefile
index 59186c7ccfd4..bf2a14c748d4 100644
--- a/www/py-django-livesettings/Makefile
+++ b/www/py-django-livesettings/Makefile
@@ -13,8 +13,8 @@ COMMENT= Configure Django project settings via admin interface
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR}
USES= python:2
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-markdownx/Makefile b/www/py-django-markdownx/Makefile
index 6eb8a842071e..5af3af2cf20b 100644
--- a/www/py-django-markdownx/Makefile
+++ b/www/py-django-markdownx/Makefile
@@ -12,8 +12,8 @@ COMMENT= Django Markdown editor with image uploads and live preview
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR}
USE_GITHUB= yes
diff --git a/www/py-django-mezzanine/Makefile b/www/py-django-mezzanine/Makefile
index b202a4a9285d..767bc1cdb253 100644
--- a/www/py-django-mezzanine/Makefile
+++ b/www/py-django-mezzanine/Makefile
@@ -14,20 +14,20 @@ COMMENT= Content management platform built using the Django framework
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}django-contrib-comments>0:www/py-django-contrib-comments \
- ${PYTHON_PKGNAMEPREFIX}django-mezzanine-filebrowser>=0.4.6:www/py-django-mezzanine-filebrowser \
- ${PYTHON_PKGNAMEPREFIX}django-mezzanine-grappelli>=0.4.5:www/py-django-mezzanine-grappelli \
- ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal \
- ${PYTHON_PKGNAMEPREFIX}bleach>=1.4:www/py-bleach \
- ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.1.3:www/py-beautifulsoup \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4:www/py-requests-oauthlib \
- ${PYTHON_PKGNAMEPREFIX}future>=0.9.0:devel/py-future \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-contrib-comments>0:www/py-django-contrib-comments@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-mezzanine-filebrowser>=0.4.6:www/py-django-mezzanine-filebrowser@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-mezzanine-grappelli>=0.4.5:www/py-django-mezzanine-grappelli@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bleach>=1.4:www/py-bleach@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.1.3:www/py-beautifulsoup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4:www/py-requests-oauthlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.9.0:devel/py-future@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${FLAVOR}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pep8>=1.4.1:devel/pep8 \
- ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:devel/py-pyflakes
+ ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:devel/py-pyflakes@${FLAVOR}
USES= gettext python
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-django-mptt/Makefile b/www/py-django-mptt/Makefile
index 563527b3b926..65e3b334fab0 100644
--- a/www/py-django-mptt/Makefile
+++ b/www/py-django-mptt/Makefile
@@ -12,7 +12,7 @@ COMMENT= Utilities for implementing Modified Preorder Tree Traversal in Django
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 # >= 1.8
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} # >= 1.8
CONFLICTS_INSTALL= py*-django-happenings
diff --git a/www/py-django-openid-auth/Makefile b/www/py-django-openid-auth/Makefile
index ab540b380622..f411198731a7 100644
--- a/www/py-django-openid-auth/Makefile
+++ b/www/py-django-openid-auth/Makefile
@@ -14,10 +14,10 @@ COMMENT= OpenID integration for django.contrib.auth
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3.1:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}python-openid>=2.2.5:security/py-python-openid
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3.1:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-openid>=2.2.5:security/py-python-openid@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
NO_WRKSUBDIR= yes
diff --git a/www/py-django-otp-yubikey/Makefile b/www/py-django-otp-yubikey/Makefile
index 98d253c14279..5a156654641e 100644
--- a/www/py-django-otp-yubikey/Makefile
+++ b/www/py-django-otp-yubikey/Makefile
@@ -12,8 +12,8 @@ COMMENT= Plugin that verifies YubiKey OTP tokens
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}YubiOTP>=0.2.1:security/py-YubiOTP \
- ${PYTHON_PKGNAMEPREFIX}django-otp>0.4.0:www/py-django-otp
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}YubiOTP>=0.2.1:security/py-YubiOTP@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-otp>0.4.0:www/py-django-otp@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-overextends/Makefile b/www/py-django-overextends/Makefile
index e65b5c5fdd0f..62bb7bf4efcf 100644
--- a/www/py-django-overextends/Makefile
+++ b/www/py-django-overextends/Makefile
@@ -12,8 +12,8 @@ COMMENT= Django reusable app enabling circular template inheritance
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}sphinx-me>=0.1.2:textproc/py-sphinx-me
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx-me>=0.1.2:textproc/py-sphinx-me@${FLAVOR}
NO_ARCH= yes
diff --git a/www/py-django-paging/Makefile b/www/py-django-paging/Makefile
index 3f1c4c200c41..a284e54c36a1 100644
--- a/www/py-django-paging/Makefile
+++ b/www/py-django-paging/Makefile
@@ -11,7 +11,7 @@ DISTNAME= django-${PORTNAME}-${PORTVERSION}
MAINTAINER= tj@FreeBSD.org
COMMENT= Paging module for Django
-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
diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile
index c8c97914bac5..37a7ec12b87e 100644
--- a/www/py-django-photologue/Makefile
+++ b/www/py-django-photologue/Makefile
@@ -12,11 +12,11 @@ COMMENT= Powerful image management and gallery application for Django
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}django-sortedm2m>0:www/py-django-sortedm2m \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-sortedm2m>0:www/py-django-sortedm2m@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-picklefield/Makefile b/www/py-django-picklefield/Makefile
index 6a68cd3b8112..904ba46e7c5e 100644
--- a/www/py-django-picklefield/Makefile
+++ b/www/py-django-picklefield/Makefile
@@ -14,8 +14,8 @@ COMMENT= Pickled object field for Django
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-pipeline/Makefile b/www/py-django-pipeline/Makefile
index 6723c13b8307..93bb6d4a11b7 100644
--- a/www/py-django-pipeline/Makefile
+++ b/www/py-django-pipeline/Makefile
@@ -20,7 +20,7 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3200
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/www/py-django-post_office/Makefile b/www/py-django-post_office/Makefile
index 2021b88f8a80..0197eaad0baf 100644
--- a/www/py-django-post_office/Makefile
+++ b/www/py-django-post_office/Makefile
@@ -14,8 +14,8 @@ COMMENT= Django app to monitor and send mail asynchronously
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-jsonfield>=0:www/py-django-jsonfield \
- ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-jsonfield>=0:www/py-django-jsonfield@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-profiles/Makefile b/www/py-django-profiles/Makefile
index a63e961d9962..652925005581 100644
--- a/www/py-django-profiles/Makefile
+++ b/www/py-django-profiles/Makefile
@@ -15,14 +15,16 @@ COMMENT= User-profile application for Django
LICENSE= BSD3CLAUSE
-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}
WRKSRC= ${WRKDIR}/${PORTNAME}
USES= python
-USE_PYTHON= distutils
-DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
+USE_PYTHON= distutils autoplist
+DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
OPTIONS_DEFINE= DOCS
+PORTDOCS= *
+
.include <bsd.port.options.mk>
post-install:
diff --git a/www/py-django-profiles/pkg-plist b/www/py-django-profiles/pkg-plist
deleted file mode 100644
index 82780123e68b..000000000000
--- a/www/py-django-profiles/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-%%PYTHON_SITELIBDIR%%/profiles/__init__.py
-%%PYTHON_SITELIBDIR%%/profiles/__init__.pyc
-%%PYTHON_SITELIBDIR%%/profiles/__init__.pyo
-%%PYTHON_SITELIBDIR%%/profiles/urls.py
-%%PYTHON_SITELIBDIR%%/profiles/urls.pyc
-%%PYTHON_SITELIBDIR%%/profiles/urls.pyo
-%%PYTHON_SITELIBDIR%%/profiles/utils.py
-%%PYTHON_SITELIBDIR%%/profiles/utils.pyc
-%%PYTHON_SITELIBDIR%%/profiles/utils.pyo
-%%PYTHON_SITELIBDIR%%/profiles/views.py
-%%PYTHON_SITELIBDIR%%/profiles/views.pyc
-%%PYTHON_SITELIBDIR%%/profiles/views.pyo
-%%PORTDOCS%%%%DOCSDIR%%/overview.txt
-%%PORTDOCS%%%%DOCSDIR%%/views.txt
diff --git a/www/py-django-pyscss/Makefile b/www/py-django-pyscss/Makefile
index 5b06a77d9108..c05f0d6783e0 100644
--- a/www/py-django-pyscss/Makefile
+++ b/www/py-django-pyscss/Makefile
@@ -13,8 +13,8 @@ COMMENT= Makes it easier to use PySCSS in Django
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}pyscss>=1.3.4:textproc/py-pyscss
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyscss>=1.3.4:textproc/py-pyscss@${FLAVOR}
NO_ARCH= yes
diff --git a/www/py-django-recaptcha/Makefile b/www/py-django-recaptcha/Makefile
index 685d6bdb31bf..3afb3ab59179 100644
--- a/www/py-django-recaptcha/Makefile
+++ b/www/py-django-recaptcha/Makefile
@@ -11,7 +11,7 @@ DISTNAME= django-${PORTNAME}-${PORTVERSION}
MAINTAINER= tj@FreeBSD.org
COMMENT= Django reCAPTCHA form field/widget integration app
-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
diff --git a/www/py-django-redis/Makefile b/www/py-django-redis/Makefile
index 2888ff5e1725..84229ff3023c 100644
--- a/www/py-django-redis/Makefile
+++ b/www/py-django-redis/Makefile
@@ -12,13 +12,13 @@ COMMENT= Full featured Redis cache/session backend for Django
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}redis>=2.10.0:databases/py-redis
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}redis>=2.10.0:databases/py-redis@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fakeredis>=0:databases/py-fakeredis \
- ${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis \
- ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \
- ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0:devel/py-msgpack-python
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fakeredis>=0:databases/py-fakeredis@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0:devel/py-msgpack-python@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-registration-defaults/Makefile b/www/py-django-registration-defaults/Makefile
index ab126b172c83..c102d6b6b2c7 100644
--- a/www/py-django-registration-defaults/Makefile
+++ b/www/py-django-registration-defaults/Makefile
@@ -13,7 +13,7 @@ COMMENT= Default templates and settings for django-registration
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-registration>=0:www/py-django-registration
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-registration>=0:www/py-django-registration@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-registration-redux/Makefile b/www/py-django-registration-redux/Makefile
index fda48d737ba0..f009c1f0e86d 100644
--- a/www/py-django-registration-redux/Makefile
+++ b/www/py-django-registration-redux/Makefile
@@ -13,7 +13,7 @@ COMMENT= User-registration application for Django
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-registration/Makefile b/www/py-django-registration/Makefile
index 23c7d1e6c81f..d0ab591446fc 100644
--- a/www/py-django-registration/Makefile
+++ b/www/py-django-registration/Makefile
@@ -12,7 +12,7 @@ COMMENT= User-registration application for Django
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-reversion/Makefile b/www/py-django-reversion/Makefile
index 008e94599e1d..ee16e2c0ad57 100644
--- a/www/py-django-reversion/Makefile
+++ b/www/py-django-reversion/Makefile
@@ -13,9 +13,9 @@ COMMENT= Provides comprehensive version control facilities to Django apps
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/www/py-django-sekizai/Makefile b/www/py-django-sekizai/Makefile
index 12a1f4b84e9d..3c69d0f80742 100644
--- a/www/py-django-sekizai/Makefile
+++ b/www/py-django-sekizai/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= xenophon+fbsdports@irtnog.org
COMMENT= Block templating system for Django
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.1:www/py-django-classy-tags
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.1:www/py-django-classy-tags@${FLAVOR}
USES= python:2
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-signals-ahoy/Makefile b/www/py-django-signals-ahoy/Makefile
index 0f1ed530819c..d797d4d0d4f5 100644
--- a/www/py-django-signals-ahoy/Makefile
+++ b/www/py-django-signals-ahoy/Makefile
@@ -14,7 +14,7 @@ COMMENT= Extended set of signals for use by Django apps
LICENSE= BSD3CLAUSE
-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}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-simple-captcha/Makefile b/www/py-django-simple-captcha/Makefile
index 9164c64aeff3..c7c4774b0cd2 100644
--- a/www/py-django-simple-captcha/Makefile
+++ b/www/py-django-simple-captcha/Makefile
@@ -13,9 +13,9 @@ COMMENT= Simple, yet powerful, Django captcha application
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}pillow>=2.0.0:graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=2.0.0:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-simple-history/Makefile b/www/py-django-simple-history/Makefile
index b6499a9c023a..49e186520e04 100644
--- a/www/py-django-simple-history/Makefile
+++ b/www/py-django-simple-history/Makefile
@@ -11,7 +11,7 @@ COMMENT= Store model history and view/revert changes from admin site
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 # >= 1.8
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} # >= 1.8
USE_GITHUB= yes
diff --git a/www/py-django-social-auth/Makefile b/www/py-django-social-auth/Makefile
index a5033323cbf2..1a8dcc996c7c 100644
--- a/www/py-django-social-auth/Makefile
+++ b/www/py-django-social-auth/Makefile
@@ -11,8 +11,8 @@ DISTNAME= django-${PORTNAME}-${PORTVERSION}
MAINTAINER= tj@FreeBSD.org
COMMENT= Setup social authentication/authorization mechanism for Django
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}python-social-auth>=0:security/py-python-social-auth
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-social-auth>=0:security/py-python-social-auth@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-sortedm2m/Makefile b/www/py-django-sortedm2m/Makefile
index 7487120ae94a..c0b89cfea942 100644
--- a/www/py-django-sortedm2m/Makefile
+++ b/www/py-django-sortedm2m/Makefile
@@ -13,7 +13,7 @@ COMMENT= Replacement for Django's many to many field
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-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}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-star-ratings/Makefile b/www/py-django-star-ratings/Makefile
index aea887720135..7121d9b9bdf8 100644
--- a/www/py-django-star-ratings/Makefile
+++ b/www/py-django-star-ratings/Makefile
@@ -12,7 +12,7 @@ COMMENT= Django app to add star ratings to models
LICENSE= BSD3CLAUSE
-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}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-statici18n/Makefile b/www/py-django-statici18n/Makefile
index 6546dedc7c9f..787a0198b3a7 100644
--- a/www/py-django-statici18n/Makefile
+++ b/www/py-django-statici18n/Makefile
@@ -13,10 +13,10 @@ COMMENT= Helper for generating Javascript catalog to static files
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}django-appconf>=0.6:www/py-django-appconf
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-appconf>=0.6:www/py-django-appconf@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/www/py-django-subdomains/Makefile b/www/py-django-subdomains/Makefile
index 3d5692d7161e..4ba5ecf82b1c 100644
--- a/www/py-django-subdomains/Makefile
+++ b/www/py-django-subdomains/Makefile
@@ -12,7 +12,7 @@ COMMENT= Subdomains helpers for the Django framework
LICENSE= MIT
-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
diff --git a/www/py-django-sudo/Makefile b/www/py-django-sudo/Makefile
index b13491abad38..8ebb48e5baa2 100644
--- a/www/py-django-sudo/Makefile
+++ b/www/py-django-sudo/Makefile
@@ -13,7 +13,7 @@ COMMENT= Sudo mode is an extra layer of security for Django
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
diff --git a/www/py-django-tables2/Makefile b/www/py-django-tables2/Makefile
index a8e983baf6b1..b84c4d99bc35 100644
--- a/www/py-django-tables2/Makefile
+++ b/www/py-django-tables2/Makefile
@@ -13,8 +13,8 @@ COMMENT= Table/data-grid framework for Django
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
NO_ARCH= yes
diff --git a/www/py-django-tagging/Makefile b/www/py-django-tagging/Makefile
index 8db8d6861f48..f101e4b4f70f 100644
--- a/www/py-django-tagging/Makefile
+++ b/www/py-django-tagging/Makefile
@@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE MIT
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-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}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-taggit/Makefile b/www/py-django-taggit/Makefile
index 183fc4a560ad..13fb61a12e23 100644
--- a/www/py-django-taggit/Makefile
+++ b/www/py-django-taggit/Makefile
@@ -12,7 +12,7 @@ COMMENT= Reusable Django application for simple tagging
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= autoplist distutils
diff --git a/www/py-django-tastypie/Makefile b/www/py-django-tastypie/Makefile
index b44f3af3db7d..1d0ca7fef21b 100644
--- a/www/py-django-tastypie/Makefile
+++ b/www/py-django-tastypie/Makefile
@@ -12,13 +12,13 @@ COMMENT= Create REST API for Django apps
LICENSE= BSD3CLAUSE
-MY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil
+MY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR}
BUILD_DEPENDS= ${MY_DEPENDS}
RUN_DEPENDS?= ${MY_DEPENDS} \
- ${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18
+ ${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-templatetag-sugar/Makefile b/www/py-django-templatetag-sugar/Makefile
index aa683a3dc6f7..09ec45e8d70c 100644
--- a/www/py-django-templatetag-sugar/Makefile
+++ b/www/py-django-templatetag-sugar/Makefile
@@ -11,7 +11,7 @@ DISTNAME= django-${PORTNAME}-${PORTVERSION}
MAINTAINER= tj@FreeBSD.org
COMMENT= Library to make writing templatetags in Django sweet
-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
diff --git a/www/py-django-threaded-multihost/Makefile b/www/py-django-threaded-multihost/Makefile
index 03d8d0a3783d..c2c263accd2d 100644
--- a/www/py-django-threaded-multihost/Makefile
+++ b/www/py-django-threaded-multihost/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@caomhin.org
COMMENT= Multi-host utilities to Django
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
LICENSE= BSD3CLAUSE
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-tinymce/Makefile b/www/py-django-tinymce/Makefile
index 3262cc6976ca..d2903947c8b8 100644
--- a/www/py-django-tinymce/Makefile
+++ b/www/py-django-tinymce/Makefile
@@ -13,7 +13,7 @@ COMMENT= Django application to use TinyMCE editor
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
NO_ARCH= yes
diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index fc2f0a4dc752..cf0dec2e40fe 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -21,11 +21,12 @@ DJANGO111_DESC= Use Django 1.11.x
PORTSCOUT= ignore:1
USES= cpe metaport python:run
+USE_PYTHON= flavors
CPE_VENDOR= djangoproject
-DJANGO18_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
-DJANGO110_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django110>=0:www/py-django110
-DJANGO111_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111
+DJANGO18_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
+DJANGO110_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django110>=0:www/py-django110@${FLAVOR}
+DJANGO111_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${FLAVOR}
.include <bsd.port.mk>
diff --git a/www/py-django110/Makefile b/www/py-django110/Makefile
index 6a5e59cb81f5..91390077b17c 100644
--- a/www/py-django110/Makefile
+++ b/www/py-django110/Makefile
@@ -17,7 +17,7 @@ COMMENT= High-level Python Web Framework
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}
NO_ARCH= yes
USES= cpe python shebangfix
@@ -40,11 +40,11 @@ HTMLDOCS_DESC= Install HTML documentation (requires Sphinx)
PLIST_FILES= man/man1/django-admin.1.gz
-HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
-PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
-MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
-SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
-FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup
+HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
+FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR}
.include <bsd.port.options.mk>
diff --git a/www/py-django111/Makefile b/www/py-django111/Makefile
index 306966eee49d..f4ca1bb31c32 100644
--- a/www/py-django111/Makefile
+++ b/www/py-django111/Makefile
@@ -19,7 +19,7 @@ COMMENT= High-level Python Web Framework
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}
NO_ARCH= yes
USES= cpe python shebangfix
@@ -42,11 +42,11 @@ HTMLDOCS_DESC= Install HTML documentation (requires Sphinx)
PLIST_FILES= man/man1/django-admin.1.gz
-HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
-PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
-MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
-SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
-FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup
+HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
+FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR}
.include <bsd.port.options.mk>
diff --git a/www/py-django18/Makefile b/www/py-django18/Makefile
index d47d58d894c3..5bec7e0f807d 100644
--- a/www/py-django18/Makefile
+++ b/www/py-django18/Makefile
@@ -18,7 +18,7 @@ COMMENT= High-level Python Web Framework (1.8.x LTS)
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}
NO_ARCH= yes
USES= cpe python shebangfix
@@ -41,11 +41,11 @@ HTMLDOCS_DESC= Install HTML documentation (requires Sphinx)
PLIST_FILES= man/man1/django-admin.1.gz
-HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
-PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
-MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb
-SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
-FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup
+HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
+FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR}
.include <bsd.port.options.mk>
diff --git a/www/py-django_compressor/Makefile b/www/py-django_compressor/Makefile
index 60d0161a8ae2..443c75e52ebc 100644
--- a/www/py-django_compressor/Makefile
+++ b/www/py-django_compressor/Makefile
@@ -13,10 +13,10 @@ COMMENT= Compresses linked and inline JavaScript/CSS into a single cached file
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}versiontools>=1.8.2:devel/py-versiontools
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-appconf>=0.4:www/py-django-appconf \
- ${PYTHON_PKGNAMEPREFIX}rcssmin>=0:archivers/py-rcssmin \
- ${PYTHON_PKGNAMEPREFIX}rjsmin>=0:archivers/py-rjsmin
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}versiontools>=1.8.2:devel/py-versiontools@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-appconf>=0.4:www/py-django-appconf@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rcssmin>=0:archivers/py-rcssmin@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rjsmin>=0:archivers/py-rjsmin@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
@@ -28,9 +28,9 @@ LXML_DESC= Enable LxmlParser
HTML5LIB_DESC= Enable Html5LibParser
SLIMIT_DESC= Enable SlimIt JavaScript filter
-BEAUTIFULSOUP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup
-LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml
-HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
-SLIMIT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}slimit>=0.8.1:www/py-slimit
+BEAUTIFULSOUP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${FLAVOR}
+LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR}
+HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${FLAVOR}
+SLIMIT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}slimit>=0.8.1:www/py-slimit@${FLAVOR}
.include <bsd.port.mk>
diff --git a/www/py-django_openstack_auth/Makefile b/www/py-django_openstack_auth/Makefile
index d93f88a62083..c1dbcddfddff 100644
--- a/www/py-django_openstack_auth/Makefile
+++ b/www/py-django_openstack_auth/Makefile
@@ -12,14 +12,14 @@ COMMENT= Django authentication backend for use with OpenStack Identity
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.17.0:devel/py-keystoneauth1 \
- ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient \
- ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.17.0:devel/py-oslo.policy \
- ${PYTHON_PKGNAMEPREFIX}oslo.config>=0:devel/py-oslo.config \
- ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.17.0:devel/py-keystoneauth1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.17.0:devel/py-oslo.policy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=0:devel/py-oslo.config@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
NO_ARCH= yes
diff --git a/www/py-django_polymorphic/Makefile b/www/py-django_polymorphic/Makefile
index e52d81b0b10c..b10f48c653a3 100644
--- a/www/py-django_polymorphic/Makefile
+++ b/www/py-django_polymorphic/Makefile
@@ -13,7 +13,7 @@ COMMENT= Seamless Polymorphic Inheritance for Django Models
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-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
diff --git a/www/py-djangotoolbox/Makefile b/www/py-djangotoolbox/Makefile
index 48b671d0ee7f..54fcdf3751b7 100644
--- a/www/py-djangotoolbox/Makefile
+++ b/www/py-djangotoolbox/Makefile
@@ -13,7 +13,7 @@ COMMENT= Common API for running Django on non-relational/NoSQL databases
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
diff --git a/www/py-dojango/Makefile b/www/py-dojango/Makefile
index 0308146145b1..98ef6507ad03 100644
--- a/www/py-dojango/Makefile
+++ b/www/py-dojango/Makefile
@@ -14,7 +14,7 @@ COMMENT= Django application for building dojo
USES= python
USE_PYTHON= distutils autoplist
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6:www/py-django18
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6:www/py-django18@${FLAVOR}
OPTIONS_DEFINE= JAVA
diff --git a/www/py-evernote/Makefile b/www/py-evernote/Makefile
index 5726a3215193..8a2225161509 100644
--- a/www/py-evernote/Makefile
+++ b/www/py-evernote/Makefile
@@ -12,8 +12,8 @@ COMMENT= Evernote SDK for Python
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauth2>0:net/py-oauth2 \
- ${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauth2>0:net/py-oauth2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift@${FLAVOR}
USES= python:-2.7
USE_PYTHON= autoplist distutils
diff --git a/www/py-falcon/Makefile b/www/py-falcon/Makefile
index c0f4a53d7365..5ecf75b2180b 100644
--- a/www/py-falcon/Makefile
+++ b/www/py-falcon/Makefile
@@ -12,12 +12,11 @@ COMMENT= High-performance Python framework for building cloud APIs
LICENSE= APACHE20
-BUILD_DEPENDS= cython>=0.11.2:lang/cython
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}testtools>=0:devel/py-testtools \
- ${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}testtools>=0:devel/py-testtools@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse@${FLAVOR}
USES= python
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist cython
.include <bsd.port.mk>
diff --git a/www/py-fedex/Makefile b/www/py-fedex/Makefile
index 9d72e202dc4f..56bcf7b632ad 100644
--- a/www/py-fedex/Makefile
+++ b/www/py-fedex/Makefile
@@ -12,7 +12,7 @@ COMMENT= Light wrapper around Fedex's Web Services SOAP API using suds
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}suds>=0:net/py-suds
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}suds>=0:net/py-suds@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-feedgenerator/Makefile b/www/py-feedgenerator/Makefile
index 0e4ebf9574c1..c039e0e697a9 100644
--- a/www/py-feedgenerator/Makefile
+++ b/www/py-feedgenerator/Makefile
@@ -13,8 +13,8 @@ COMMENT= Standalone version of django.utils.feedgenerator
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-flask-admin/Makefile b/www/py-flask-admin/Makefile
index 67f1bf11b8d7..bcdbeecce91f 100644
--- a/www/py-flask-admin/Makefile
+++ b/www/py-flask-admin/Makefile
@@ -12,8 +12,8 @@ COMMENT= Flask extension for adding admin interfaces to Flask applications
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}wtforms>0:textproc/py-wtforms
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wtforms>0:textproc/py-wtforms@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-api/Makefile b/www/py-flask-api/Makefile
index fe789f6b4b09..110314ba97d9 100644
--- a/www/py-flask-api/Makefile
+++ b/www/py-flask-api/Makefile
@@ -12,7 +12,7 @@ COMMENT= Browsable Web APIs for Flask
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0.10.1:www/py-flask
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0.10.1:www/py-flask@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-flask-assets/Makefile b/www/py-flask-assets/Makefile
index adc470f7fc31..59e1c7dc417f 100644
--- a/www/py-flask-assets/Makefile
+++ b/www/py-flask-assets/Makefile
@@ -12,8 +12,8 @@ COMMENT= Asset management for flask
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}webassets>=0:www/py-webassets
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webassets>=0:www/py-webassets@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-bootstrap/Makefile b/www/py-flask-bootstrap/Makefile
index 48ba78e8d0ac..2506d639579e 100644
--- a/www/py-flask-bootstrap/Makefile
+++ b/www/py-flask-bootstrap/Makefile
@@ -12,7 +12,7 @@ COMMENT= Flask extension that adds Bootstrap to your projects
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-cache/Makefile b/www/py-flask-cache/Makefile
index 32d609790041..21bcc0977838 100644
--- a/www/py-flask-cache/Makefile
+++ b/www/py-flask-cache/Makefile
@@ -13,7 +13,7 @@ COMMENT= Cache support for your Flask application
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.8:www/py-flask
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.8:www/py-flask@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-compress/Makefile b/www/py-flask-compress/Makefile
index 3ebf86c25ba0..bb94dd71d9dd 100644
--- a/www/py-flask-compress/Makefile
+++ b/www/py-flask-compress/Makefile
@@ -12,8 +12,8 @@ COMMENT= Extension for Flask that compresses responses with gzip
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.11:www/py-flask
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.11:www/py-flask@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-cors/Makefile b/www/py-flask-cors/Makefile
index 21f47e142f0c..a319f6667b7c 100644
--- a/www/py-flask-cors/Makefile
+++ b/www/py-flask-cors/Makefile
@@ -12,8 +12,8 @@ COMMENT= Cross-origin resource sharing (CORS) for Flask
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-flatpages/Makefile b/www/py-flask-flatpages/Makefile
index 6676a31335a1..b0f531f1391d 100644
--- a/www/py-flask-flatpages/Makefile
+++ b/www/py-flask-flatpages/Makefile
@@ -13,9 +13,9 @@ COMMENT= Provides flat static pages to a Flask application
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-login/Makefile b/www/py-flask-login/Makefile
index b17e1f0cf1cc..0d622682632b 100644
--- a/www/py-flask-login/Makefile
+++ b/www/py-flask-login/Makefile
@@ -12,7 +12,7 @@ COMMENT= User session management for Flask
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-oauthlib/Makefile b/www/py-flask-oauthlib/Makefile
index 1c60d4670962..a2803ce07981 100644
--- a/www/py-flask-oauthlib/Makefile
+++ b/www/py-flask-oauthlib/Makefile
@@ -12,9 +12,9 @@ COMMENT= OAuthlib for Flask
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib \
- ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>0:www/py-requests-oauthlib
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>0:www/py-requests-oauthlib@${FLAVOR}
NO_ARCH= yes
USES= python:2.7+
diff --git a/www/py-flask-principal/Makefile b/www/py-flask-principal/Makefile
index b6390c68c7dc..5094265b3da9 100644
--- a/www/py-flask-principal/Makefile
+++ b/www/py-flask-principal/Makefile
@@ -12,8 +12,8 @@ COMMENT= Identity management for flask
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}blinker>=0:devel/py-blinker
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}blinker>=0:devel/py-blinker@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-restful/Makefile b/www/py-flask-restful/Makefile
index 75d0f7457263..d53a8ce6ffbd 100644
--- a/www/py-flask-restful/Makefile
+++ b/www/py-flask-restful/Makefile
@@ -12,10 +12,10 @@ COMMENT= Simple framework for creating REST APIs with Flask
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aniso8601>0:devel/py-aniso8601 \
- ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aniso8601>0:devel/py-aniso8601@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-flask-restplus/Makefile b/www/py-flask-restplus/Makefile
index 2c33a273c13a..ae28a95b34ab 100644
--- a/www/py-flask-restplus/Makefile
+++ b/www/py-flask-restplus/Makefile
@@ -11,14 +11,14 @@ COMMENT= Extension for Flask that adds support for quickly building REST APIs
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.8:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}aniso8601>=0.82:devel/py-aniso8601
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker \
- ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.8:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}aniso8601>=0.82:devel/py-aniso8601@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}flask-restplus08
@@ -32,7 +32,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3300
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
.endif
do-test:
diff --git a/www/py-flask-socketio/Makefile b/www/py-flask-socketio/Makefile
index e1f8d88ec18c..f7b8dfc93245 100644
--- a/www/py-flask-socketio/Makefile
+++ b/www/py-flask-socketio/Makefile
@@ -11,10 +11,10 @@ COMMENT= Socket.IO integration for Flask applications
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0:www/py-gevent-websocket \
- ${PYTHON_PKGNAMEPREFIX}python-engineio>=1.0.0:devel/py-python-engineio \
- ${PYTHON_PKGNAMEPREFIX}python-socketio>=1.5.0:devel/py-python-socketio
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0:www/py-gevent-websocket@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-engineio>=1.0.0:devel/py-python-engineio@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-socketio>=1.5.0:devel/py-python-socketio@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-flask-sockets/Makefile b/www/py-flask-sockets/Makefile
index a3124874a005..5aa67db109e5 100644
--- a/www/py-flask-sockets/Makefile
+++ b/www/py-flask-sockets/Makefile
@@ -12,9 +12,9 @@ COMMENT= Elegant WebSockets for your Flask apps
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent \
- ${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0:www/py-gevent-websocket
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0:www/py-gevent-websocket@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-flask-uploads/Makefile b/www/py-flask-uploads/Makefile
index 1bd62a3bc864..56ac3d42cca4 100644
--- a/www/py-flask-uploads/Makefile
+++ b/www/py-flask-uploads/Makefile
@@ -12,7 +12,7 @@ COMMENT= Flexible and efficient upload handling for Flask
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask@${FLAVOR}
NO_ARCH= yes
USES= python:2.7+
diff --git a/www/py-flask-wtf/Makefile b/www/py-flask-wtf/Makefile
index bd3940541f18..589f802d0bc8 100644
--- a/www/py-flask-wtf/Makefile
+++ b/www/py-flask-wtf/Makefile
@@ -12,10 +12,10 @@ COMMENT= Simple integration of Flask and WTForms
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}wtforms>0:textproc/py-wtforms
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
- ${PYTHON_PKGNAMEPREFIX}Flask-Babel>0:devel/py-flask-babel
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wtforms>0:textproc/py-wtforms@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Babel>0:devel/py-flask-babel@${FLAVOR}
OPTIONS_DEFINE= TESTS
TESTS_DESC= Install test suite dependencies
diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile
index 99b88d3b693b..e9c09f3a8072 100644
--- a/www/py-flask/Makefile
+++ b/www/py-flask/Makefile
@@ -12,10 +12,10 @@ COMMENT= Micro web framework
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11:www/py-werkzeug \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}itsdangerous>=0.24:security/py-itsdangerous \
- ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11:www/py-werkzeug@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}itsdangerous>=0.24:security/py-itsdangerous@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click@${FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/www/py-flexget/Makefile b/www/py-flexget/Makefile
index cff2c28fcd55..bd4f4f15f2f3 100644
--- a/www/py-flexget/Makefile
+++ b/www/py-flexget/Makefile
@@ -13,40 +13,40 @@ COMMENT= Program to automate downloading from different sources
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10 \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}rpyc>0:devel/py-RPyC \
- ${PYTHON_PKGNAMEPREFIX}apscheduler>=3.2.0:devel/py-apscheduler \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \
- ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.0:devel/py-jsonschema \
- ${PYTHON_PKGNAMEPREFIX}path.py>=8.1.1:devel/py-path.py \
- ${PYTHON_PKGNAMEPREFIX}pathlib>=1.0:devel/py-pathlib \
- ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar \
- ${PYTHON_PKGNAMEPREFIX}guessit>=2.1.0:multimedia/py-guessit \
- ${PYTHON_PKGNAMEPREFIX}pynzb>0:news/py-pynzb \
- ${PYTHON_PKGNAMEPREFIX}zxcvbn-python>0:security/py-zxcvbn-python \
- ${PYTHON_PKGNAMEPREFIX}plumbum>=1.2:sysutils/py-plumbum \
- ${PYTHON_PKGNAMEPREFIX}colorclass>=2.2.0:textproc/py-colorclass \
- ${PYTHON_PKGNAMEPREFIX}feedparser>=5.2.1:textproc/py-feedparser \
- ${PYTHON_PKGNAMEPREFIX}rss2gen>0:textproc/py-rss2gen \
- ${PYTHON_PKGNAMEPREFIX}terminaltables>=3.1.0:textproc/py-terminaltables \
- ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5:www/py-beautifulsoup \
- ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.7.0:www/py-cherrypy \
- ${PYTHON_PKGNAMEPREFIX}Flask>=0.7:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}Flask-Compress>=1.2.1:www/py-flask-compress \
- ${PYTHON_PKGNAMEPREFIX}Flask-Cors>=2.1.2:www/py-flask-cors \
- ${PYTHON_PKGNAMEPREFIX}Flask-Login>=0.4.0:www/py-flask-login \
- ${PYTHON_PKGNAMEPREFIX}Flask-RESTful>=0.3.3:www/py-flask-restful \
- ${PYTHON_PKGNAMEPREFIX}flask-restplus>=0.10.1:www/py-flask-restplus \
- ${PYTHON_PKGNAMEPREFIX}html5lib>=0.11:www/py-html5lib \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.8.0:www/py-requests
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog \
- ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \
- ${PYTHON_PKGNAMEPREFIX}vcrpy>0:devel/py-vcrpy
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rpyc>0:devel/py-RPyC@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}apscheduler>=3.2.0:devel/py-apscheduler@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.0:devel/py-jsonschema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}path.py>=8.1.1:devel/py-path.py@${FLAVOR} \
+ ${PY_PATHLIB} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}guessit>=2.1.0:multimedia/py-guessit@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pynzb>0:news/py-pynzb@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zxcvbn-python>0:security/py-zxcvbn-python@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plumbum>=1.2:sysutils/py-plumbum@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}colorclass>=2.2.0:textproc/py-colorclass@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}feedparser>=5.2.1:textproc/py-feedparser@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rss2gen>0:textproc/py-rss2gen@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}terminaltables>=3.1.0:textproc/py-terminaltables@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5:www/py-beautifulsoup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.7.0:www/py-cherrypy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask>=0.7:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Compress>=1.2.1:www/py-flask-compress@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Cors>=2.1.2:www/py-flask-cors@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Login>=0.4.0:www/py-flask-login@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-RESTful>=0.3.3:www/py-flask-restful@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}flask-restplus>=0.10.1:www/py-flask-restplus@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html5lib>=0.11:www/py-html5lib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.8.0:www/py-requests@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vcrpy>0:devel/py-vcrpy@${FLAVOR}
USE_GITHUB= yes
GH_PROJECT= Flexget
@@ -65,7 +65,7 @@ do-test:
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3300
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/www/py-flup/Makefile b/www/py-flup/Makefile
index fcb54837ca44..0ddb908bfe37 100644
--- a/www/py-flup/Makefile
+++ b/www/py-flup/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Random assortment of WSGI servers, middleware
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-formalchemy/Makefile b/www/py-formalchemy/Makefile
index 48b728e42119..61fb4e49589b 100644
--- a/www/py-formalchemy/Makefile
+++ b/www/py-formalchemy/Makefile
@@ -13,14 +13,14 @@ COMMENT= Toolkit for creating HTML form elements
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0:textproc/py-MarkupSafe \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.4.5:databases/py-sqlalchemy10 \
- ${PYTHON_PKGNAMEPREFIX}Tempita>=0.4:textproc/py-Tempita \
- ${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:www/py-webhelpers \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.6.3:www/py-webob
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0:textproc/py-MarkupSafe@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.4.5:databases/py-sqlalchemy10@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Tempita>=0.4:textproc/py-Tempita@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:www/py-webhelpers@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.6.3:www/py-webob@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/www/py-frappe-bench/Makefile b/www/py-frappe-bench/Makefile
index 2ffe89e7dcaf..4a36163d95e2 100644
--- a/www/py-frappe-bench/Makefile
+++ b/www/py-frappe-bench/Makefile
@@ -13,21 +13,21 @@ COMMENT= Frappe / ERPNext apps setup tool
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}honcho>0:sysutils/py-honcho \
- ${PYTHON_PKGNAMEPREFIX}semantic_version>0:devel/py-semantic_version \
- ${PYTHON_PKGNAMEPREFIX}GitPython>=1.0.1:devel/py-gitpython \
- ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}honcho>0:sysutils/py-honcho@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}semantic_version>0:devel/py-semantic_version@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}GitPython>=1.0.1:devel/py-gitpython@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR} \
git:devel/git
USE_GITHUB= yes
GH_ACCOUNT= frappe
GH_PROJECT= bench
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils concurrent
.include <bsd.port.mk>
diff --git a/www/py-frozen-flask/Makefile b/www/py-frozen-flask/Makefile
index 5d0f327a9a87..2703ac1e2eda 100644
--- a/www/py-frozen-flask/Makefile
+++ b/www/py-frozen-flask/Makefile
@@ -12,7 +12,7 @@ COMMENT= Freezes a Flask application into a set of static files
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-funkload/Makefile b/www/py-funkload/Makefile
index 819a2cfd73dd..d140f9f6ffb8 100644
--- a/www/py-funkload/Makefile
+++ b/www/py-funkload/Makefile
@@ -12,9 +12,9 @@ COMMENT= Functional and load web tester
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
${LOCALBASE}/bin/gnuplot:math/gnuplot \
- ${PYTHON_PKGNAMEPREFIX}webunit>=1.3.8:www/py-webunit \
+ ${PYTHON_PKGNAMEPREFIX}webunit>=1.3.8:www/py-webunit@${FLAVOR} \
tcpwatch.py:net/tcpwatch
USES= python:2
diff --git a/www/py-gandi.cli/Makefile b/www/py-gandi.cli/Makefile
index 819693c21f9e..403e7081b485 100644
--- a/www/py-gandi.cli/Makefile
+++ b/www/py-gandi.cli/Makefile
@@ -13,10 +13,10 @@ COMMENT= Gandi command line interface
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}click>=3.1:devel/py-click \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>=3.1:devel/py-click@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy@${FLAVOR}
# Actually 2.6-3.6(+)
USES= python
@@ -27,7 +27,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3300
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
.endif
do-test:
diff --git a/www/py-gevent-websocket/Makefile b/www/py-gevent-websocket/Makefile
index c8e225240459..9cff173f5d68 100644
--- a/www/py-gevent-websocket/Makefile
+++ b/www/py-gevent-websocket/Makefile
@@ -13,7 +13,7 @@ COMMENT= WebSocket library for the gevent networking library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-goobook/Makefile b/www/py-goobook/Makefile
index 4e5698d72914..fcac41630952 100644
--- a/www/py-goobook/Makefile
+++ b/www/py-goobook/Makefile
@@ -13,10 +13,10 @@ COMMENT= Search your Google contacts from the command-line or Mutt
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.4.12:security/py-oauth2client \
- ${PYTHON_PKGNAMEPREFIX}gdata>=2.0.18:devel/py-gdata \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.0:devel/py-simplejson \
- ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:www/py-httplib2
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.4.12:security/py-oauth2client@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gdata>=2.0.18:devel/py-gdata@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.0:devel/py-simplejson@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:www/py-httplib2@${FLAVOR}
NO_ARCH= yes
USES= python:-2.7
diff --git a/www/py-google-api-python-client/Makefile b/www/py-google-api-python-client/Makefile
index 2f616c506ae8..c651974af0ca 100644
--- a/www/py-google-api-python-client/Makefile
+++ b/www/py-google-api-python-client/Makefile
@@ -12,13 +12,13 @@ COMMENT= Google API Client Library for Python
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.2:www/py-httplib2 \
- ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.5.0:security/py-oauth2client \
- ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.2:www/py-httplib2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.5.0:security/py-oauth2client@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${FLAVOR}
DJANGO_DESC= Use the library with Django
-DJANGO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3:www/py-django18
+DJANGO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3:www/py-django18@${FLAVOR}
GAE_DESC= Use the library with Google App Engine
GAE_RUN_DEPENDS= google-appengine>=1.4.3:www/google-appengine
@@ -30,7 +30,7 @@ USES= python
USE_PYTHON= autoplist distutils
WEBTEST_DESC= Use WebTest helper to test WSGI apps
-WEBTEST_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}WebTest>=1.3.3:www/py-WebTest \
- ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl
+WEBTEST_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}WebTest>=1.3.3:www/py-WebTest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${FLAVOR}
.include <bsd.port.mk>
diff --git a/www/py-google-cloud-core/Makefile b/www/py-google-cloud-core/Makefile
index 65805551b0fc..7feb1e87b657 100644
--- a/www/py-google-cloud-core/Makefile
+++ b/www/py-google-cloud-core/Makefile
@@ -11,11 +11,11 @@ COMMENT= API Client library for Google Cloud: Core Helpers
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}googleapis-common-protos>0:devel/py-googleapis-common-protos \
- ${PYTHON_PKGNAMEPREFIX}google-auth>0:security/py-google-auth \
- ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}googleapis-common-protos>0:devel/py-googleapis-common-protos@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}google-auth>0:security/py-google-auth@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/www/py-google-cloud-storage/Makefile b/www/py-google-cloud-storage/Makefile
index 8ff4d115dd1b..9454a305a60f 100644
--- a/www/py-google-cloud-storage/Makefile
+++ b/www/py-google-cloud-storage/Makefile
@@ -11,10 +11,10 @@ COMMENT= Python Client for Google Cloud Storage
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google-cloud-core>0:www/py-google-cloud-core \
- ${PYTHON_PKGNAMEPREFIX}google-auth>0:security/py-google-auth \
- ${PYTHON_PKGNAMEPREFIX}google-resumable-media>0:www/py-google-resumable-media \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google-cloud-core>0:www/py-google-cloud-core@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}google-auth>0:security/py-google-auth@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}google-resumable-media>0:www/py-google-resumable-media@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/www/py-google-resumable-media/Makefile b/www/py-google-resumable-media/Makefile
index f73d01644e4d..5aff2ee61e91 100644
--- a/www/py-google-resumable-media/Makefile
+++ b/www/py-google-resumable-media/Makefile
@@ -11,7 +11,7 @@ COMMENT= Utilities for Google Media Downloads and Resumable Uploads
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/www/py-google/Makefile b/www/py-google/Makefile
index 77bef400dd6a..f0bd67276edc 100644
--- a/www/py-google/Makefile
+++ b/www/py-google/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python bindings to the Google search engine
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-graphite-api/Makefile b/www/py-graphite-api/Makefile
index 2681604ffc05..7a7afbf6205e 100644
--- a/www/py-graphite-api/Makefile
+++ b/www/py-graphite-api/Makefile
@@ -13,15 +13,15 @@ COMMENT= Graphite-web, without the interface - just the rendering HTTP API
LICENSE= APACHE20
RUN_DEPENDS= \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}Flask-Cache>=0.13.1:www/py-flask-cache \
- ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.1.1:devel/py-tzlocal \
- ${PYTHON_PKGNAMEPREFIX}structlog>=16.0.0:devel/py-structlog \
- ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.0:devel/py-pyparsing \
- ${PYTHON_PKGNAMEPREFIX}yaml>3.1:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}cairocffi>=0.7.2:graphics/py-cairocffi \
- ${PYTHON_PKGNAMEPREFIX}gunicorn>=19.4.1:www/py-gunicorn \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Cache>=0.13.1:www/py-flask-cache@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.1.1:devel/py-tzlocal@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}structlog>=16.0.0:devel/py-structlog@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.0:devel/py-pyparsing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>3.1:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cairocffi>=0.7.2:graphics/py-cairocffi@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gunicorn>=19.4.1:www/py-gunicorn@${FLAVOR} \
xorg-fonts-truetype>=0:x11-fonts/xorg-fonts-truetype
NO_ARCH= yes
diff --git a/www/py-graphite-web/Makefile b/www/py-graphite-web/Makefile
index 0171d248d22c..e08d48feaf84 100644
--- a/www/py-graphite-web/Makefile
+++ b/www/py-graphite-web/Makefile
@@ -12,11 +12,11 @@ COMMENT= Enterprise scalable realtime graphing platform
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:graphics/py-cairo \
- ${PYTHON_PKGNAMEPREFIX}carbon>=${PORTVERSION}:databases/py-carbon \
- ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}django-tagging>=0.3.1:www/py-django-tagging \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:graphics/py-cairo@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}carbon>=${PORTVERSION}:databases/py-carbon@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-tagging>=0.3.1:www/py-django-tagging@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
xorg-fonts-truetype>=0:x11-fonts/xorg-fonts-truetype
FETCH_ARGS= -o ${DISTNAME}${EXTRACT_SUFX}
diff --git a/www/py-grequests/Makefile b/www/py-grequests/Makefile
index 9b2cb33712be..03779c69104a 100644
--- a/www/py-grequests/Makefile
+++ b/www/py-grequests/Makefile
@@ -13,9 +13,9 @@ COMMENT= Requests with Gevent to make asyncronous HTTP requests
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= kennethreitz
diff --git a/www/py-gunicorn/Makefile b/www/py-gunicorn/Makefile
index 8e6063e73435..df86eda1d66b 100644
--- a/www/py-gunicorn/Makefile
+++ b/www/py-gunicorn/Makefile
@@ -12,7 +12,7 @@ COMMENT= WSGI HTTP Server for UNIX
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}
OPTIONS_DEFINE= PROCTITLE
OPTIONS_DEFAULT= PROCTITLE
@@ -25,11 +25,11 @@ GEVENT_DESC= Gevent async worker (Requires Python < 3.x)
PROCTITLE_DESC= Custom process titles with setproctitle(3)
TORNADO_DESC= Tornado async worker
-EVENTLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.7:net/py-eventlet
-GAIOHTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp
-GEVENT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0.12.2:devel/py-gevent
-PROCTITLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle
-TORNADO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>=2.2:www/py-tornado
+EVENTLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.7:net/py-eventlet@${FLAVOR}
+GAIOHTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${FLAVOR}
+GEVENT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0.12.2:devel/py-gevent@${FLAVOR}
+PROCTITLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${FLAVOR}
+TORNADO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>=2.2:www/py-tornado@${FLAVOR}
USES= python
USE_GITHUB= yes
@@ -46,7 +46,7 @@ NO_ARCH= yes
BROKEN= GAIOHTTP requires Python 3.3+ but this port is building with Python ${PYTHON_VER}. \
Disable the GAIOHTTP option or change the version of Python to build with, using DEFAULT_VERSIONS
.endif
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
.endif
.if ${PYTHON_REL} > 3000 && ${PORT_OPTIONS:MGEVENT}
diff --git a/www/py-h2/Makefile b/www/py-h2/Makefile
index 39a84baab9f9..d77f3ea2ccfd 100644
--- a/www/py-h2/Makefile
+++ b/www/py-h2/Makefile
@@ -12,8 +12,8 @@ COMMENT= HTTP/2 State-Machine based protocol implementation
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hyperframe>=5.0.0:www/py-hyperframe \
- ${PYTHON_PKGNAMEPREFIX}hpack>=2.3:www/py-hpack
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hyperframe>=5.0.0:www/py-hyperframe@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hpack>=2.3:www/py-hpack@${FLAVOR}
USES?= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-horizon/Makefile b/www/py-horizon/Makefile
index 5ace60e526ad..a46b3ee890b2 100644
--- a/www/py-horizon/Makefile
+++ b/www/py-horizon/Makefile
@@ -13,70 +13,70 @@ COMMENT= OpenStack Dashboard (Horizon)
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}Babel>=2.3.4:devel/py-babel \
- ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}Pint>=0.5:devel/py-Pint \
- ${PYTHON_PKGNAMEPREFIX}django-babel>=0.5.1:www/py-django-babel \
- ${PYTHON_PKGNAMEPREFIX}django_compressor>=2.0:www/py-django_compressor \
- ${PYTHON_PKGNAMEPREFIX}django_openstack_auth>=2.4.0:www/py-django_openstack_auth \
- ${PYTHON_PKGNAMEPREFIX}django-pyscss>=2.0.2:www/py-django-pyscss \
- ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \
- ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr \
- ${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.i18n>=2.1.0:devel/py-oslo.i18n \
- ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy \
- ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \
- ${PYTHON_PKGNAMEPREFIX}pyscss>=1.3.4:textproc/py-pyscss \
- ${PYTHON_PKGNAMEPREFIX}python-ceilometerclient>=2.5.0:net/py-python-ceilometerclient \
- ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient \
- ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient \
- ${PYTHON_PKGNAMEPREFIX}python-heatclient>=1.4.0:net/py-python-heatclient \
- ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \
- ${PYTHON_PKGNAMEPREFIX}python-neutronclient>=5.1.0:net/py-python-neutronclient \
- ${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient \
- ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=2.2.0:databases/py-python-swiftclient \
- ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.1.0:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}XStatic>=1.0.0:devel/py-XStatic \
- ${PYTHON_PKGNAMEPREFIX}XStatic-Angular>=1.3.7:devel/py-XStatic-Angular \
- ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Bootstrap>=0.11.0.2:devel/py-XStatic-Angular-Bootstrap \
- ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-FileUpload>=12.0.4.0:devel/py-XStatic-Angular-FileUpload \
- ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Gettext>=2.1.0.2:devel/py-XStatic-Angular-Gettext \
- ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-lrdragndrop>=1.0.2.2:devel/py-XStatic-Angular-lrdragndrop \
- ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Schema-Form>=0.8.13.0:devel/py-XStatic-Angular-Schema-Form \
- ${PYTHON_PKGNAMEPREFIX}XStatic-Bootstrap-Datepicker>=1.3.1.0:devel/py-XStatic-Bootstrap-Datepicker \
- ${PYTHON_PKGNAMEPREFIX}XStatic-Bootstrap-SCSS>=3:devel/py-XStatic-Bootstrap-SCSS \
- ${PYTHON_PKGNAMEPREFIX}XStatic-bootswatch>=3.3.5.3:devel/py-XStatic-bootswatch \
- ${PYTHON_PKGNAMEPREFIX}XStatic-D3>=3.1.6.2:devel/py-XStatic-D3 \
- ${PYTHON_PKGNAMEPREFIX}XStatic-Hogan>=2.0.0.2:devel/py-XStatic-Hogan \
- ${PYTHON_PKGNAMEPREFIX}XStatic-Font-Awesome>=4.3.0:devel/py-XStatic-Font-Awesome \
- ${PYTHON_PKGNAMEPREFIX}XStatic-Jasmine>=2.1.2.0:devel/py-XStatic-Jasmine \
- ${PYTHON_PKGNAMEPREFIX}XStatic-jQuery>=1.7.2:devel/py-XStatic-jQuery \
- ${PYTHON_PKGNAMEPREFIX}XStatic-JQuery-Migrate>=1.2.1.1:devel/py-XStatic-JQuery-Migrate \
- ${PYTHON_PKGNAMEPREFIX}XStatic-JQuery.quicksearch>=2.0.3.1:devel/py-XStatic-JQuery.quicksearch \
- ${PYTHON_PKGNAMEPREFIX}XStatic-JQuery.TableSorter>=2.14.5.1:devel/py-XStatic-JQuery.TableSorter \
- ${PYTHON_PKGNAMEPREFIX}XStatic-jquery-ui>=1.10.1:devel/py-XStatic-jquery-ui \
- ${PYTHON_PKGNAMEPREFIX}XStatic-JSEncrypt>=2.0.0.2:devel/py-XStatic-JSEncrypt \
- ${PYTHON_PKGNAMEPREFIX}XStatic-mdi>=1.4.57.0:devel/py-XStatic-mdi \
- ${PYTHON_PKGNAMEPREFIX}XStatic-objectpath>=1.2.1.0:devel/py-XStatic-objectpath \
- ${PYTHON_PKGNAMEPREFIX}XStatic-Rickshaw>=1.5.0:devel/py-XStatic-Rickshaw \
- ${PYTHON_PKGNAMEPREFIX}XStatic-roboto-fontface>=0.4.3.2:devel/py-XStatic-roboto-fontface \
- ${PYTHON_PKGNAMEPREFIX}XStatic-smart-table>=0:devel/py-XStatic-smart-table \
- ${PYTHON_PKGNAMEPREFIX}XStatic-Spin>=1.2.5.2:devel/py-XStatic-Spin \
- ${PYTHON_PKGNAMEPREFIX}XStatic-term.js>=0.0.4:devel/py-XStatic-term.js \
- ${PYTHON_PKGNAMEPREFIX}XStatic-tv4>=1.2.7.0:devel/py-XStatic-tv4
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Pint>=0.5:devel/py-Pint@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-babel>=0.5.1:www/py-django-babel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django_compressor>=2.0:www/py-django_compressor@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django_openstack_auth>=2.4.0:www/py-django_openstack_auth@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-pyscss>=2.0.2:www/py-django-pyscss@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${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.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy@${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}pyscss>=1.3.4:textproc/py-pyscss@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-ceilometerclient>=2.5.0:net/py-python-ceilometerclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-heatclient>=1.4.0:net/py-python-heatclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-neutronclient>=5.1.0:net/py-python-neutronclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=2.2.0:databases/py-python-swiftclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.1.0:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic>=1.0.0:devel/py-XStatic@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Angular>=1.3.7:devel/py-XStatic-Angular@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Bootstrap>=0.11.0.2:devel/py-XStatic-Angular-Bootstrap@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-FileUpload>=12.0.4.0:devel/py-XStatic-Angular-FileUpload@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Gettext>=2.1.0.2:devel/py-XStatic-Angular-Gettext@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-lrdragndrop>=1.0.2.2:devel/py-XStatic-Angular-lrdragndrop@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Schema-Form>=0.8.13.0:devel/py-XStatic-Angular-Schema-Form@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Bootstrap-Datepicker>=1.3.1.0:devel/py-XStatic-Bootstrap-Datepicker@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Bootstrap-SCSS>=3:devel/py-XStatic-Bootstrap-SCSS@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-bootswatch>=3.3.5.3:devel/py-XStatic-bootswatch@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-D3>=3.1.6.2:devel/py-XStatic-D3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Hogan>=2.0.0.2:devel/py-XStatic-Hogan@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Font-Awesome>=4.3.0:devel/py-XStatic-Font-Awesome@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Jasmine>=2.1.2.0:devel/py-XStatic-Jasmine@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-jQuery>=1.7.2:devel/py-XStatic-jQuery@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-JQuery-Migrate>=1.2.1.1:devel/py-XStatic-JQuery-Migrate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-JQuery.quicksearch>=2.0.3.1:devel/py-XStatic-JQuery.quicksearch@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-JQuery.TableSorter>=2.14.5.1:devel/py-XStatic-JQuery.TableSorter@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-jquery-ui>=1.10.1:devel/py-XStatic-jquery-ui@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-JSEncrypt>=2.0.0.2:devel/py-XStatic-JSEncrypt@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-mdi>=1.4.57.0:devel/py-XStatic-mdi@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-objectpath>=1.2.1.0:devel/py-XStatic-objectpath@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Rickshaw>=1.5.0:devel/py-XStatic-Rickshaw@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-roboto-fontface>=0.4.3.2:devel/py-XStatic-roboto-fontface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-smart-table>=0:devel/py-XStatic-smart-table@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Spin>=1.2.5.2:devel/py-XStatic-Spin@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-term.js>=0.0.4:devel/py-XStatic-term.js@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-tv4>=1.2.7.0:devel/py-XStatic-tv4@${FLAVOR}
EXTRA_PATCHES= ${FILESDIR}/01-django.patch:-p1 \
${FILESDIR}/02-fix-floating-ips.patch:-p1
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
USERS= horizon
diff --git a/www/py-html/Makefile b/www/py-html/Makefile
index 74cc61a4f48f..b3063280c5d7 100644
--- a/www/py-html/Makefile
+++ b/www/py-html/Makefile
@@ -12,7 +12,7 @@ COMMENT= Simple, elegant HTML, XHTML and XML generation
LICENSE= BSD3CLAUSE
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/www/py-html5-parser/Makefile b/www/py-html5-parser/Makefile
index b186d29489d8..ec57e345e14d 100644
--- a/www/py-html5-parser/Makefile
+++ b/www/py-html5-parser/Makefile
@@ -11,7 +11,7 @@ COMMENT= Fast implementation of the HTML 5 parsing spec for Python
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.8.0:devel/py-lxml
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.8.0:devel/py-lxml@${FLAVOR}
USES= pkgconfig python
USE_PYTHON= autoplist distutils
diff --git a/www/py-html5lib/Makefile b/www/py-html5lib/Makefile
index 2c44dc6ad632..ca0de5b8f53e 100644
--- a/www/py-html5lib/Makefile
+++ b/www/py-html5lib/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python based HTML parser based on the HTML5 spec
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
diff --git a/www/py-httpie/Makefile b/www/py-httpie/Makefile
index dc5f8fe909ab..df137c1b54b7 100644
--- a/www/py-httpie/Makefile
+++ b/www/py-httpie/Makefile
@@ -12,8 +12,8 @@ COMMENT= Command line HTTP client
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.11.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.11.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= jakubroztocil
diff --git a/www/py-httplib2/Makefile b/www/py-httplib2/Makefile
index e538dd9f5fd9..0c644ab8e240 100644
--- a/www/py-httplib2/Makefile
+++ b/www/py-httplib2/Makefile
@@ -14,6 +14,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_PYTHON= autoplist distutils
-USES?= python
+USES= python
.include <bsd.port.mk>
diff --git a/www/py-hyper/Makefile b/www/py-hyper/Makefile
index dd0dfbd7d2da..26f17c991424 100644
--- a/www/py-hyper/Makefile
+++ b/www/py-hyper/Makefile
@@ -13,9 +13,9 @@ COMMENT= HTTP/2 Client for Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
@@ -25,7 +25,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} == 3300 || (${PYTHON_VER} == 2.7 && ${PYTHON_REL} < 2709)
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl \
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl@${FLAVOR} \
${PYTHON_PGNAMEPREFIX}service_identity>=14.0.0:security/py-service_identity
.endif
diff --git a/www/py-imdbpy/Makefile b/www/py-imdbpy/Makefile
index c15dd8163e95..f93cd83991f5 100644
--- a/www/py-imdbpy/Makefile
+++ b/www/py-imdbpy/Makefile
@@ -15,7 +15,7 @@ COMMENT= Retrieve and manage the data of the IMDb movie database
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR}
OPTIONS_DEFINE= DOCS SQLALCHEMY
OPTIONS_DEFAULT=SQLALCHEMY
@@ -29,8 +29,8 @@ SHEBANG_FILES= docs/goodies/download_applydiffs.py \
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
-SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.10.0:databases/py-sqlalchemy-migrate \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10
+SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.10.0:databases/py-sqlalchemy-migrate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR}
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}/
diff --git a/www/py-jsonfield/Makefile b/www/py-jsonfield/Makefile
index 32b63ece8734..71d3e9cad0d6 100644
--- a/www/py-jsonfield/Makefile
+++ b/www/py-jsonfield/Makefile
@@ -13,7 +13,7 @@ COMMENT= Reusable JSONField model for Django to store validated JSON
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django110>=0:www/py-django110
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django110>=0:www/py-django110@${FLAVOR}
CONFLICTS_INSTALL=py*-django-jsonfield
diff --git a/www/py-jswebkit/Makefile b/www/py-jswebkit/Makefile
index c1ff042b47e0..f4959d67c558 100644
--- a/www/py-jswebkit/Makefile
+++ b/www/py-jswebkit/Makefile
@@ -12,12 +12,10 @@ DISTNAME= python-${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
COMMENT= WebKit/JavaScriptCore Python bindings
-BUILD_DEPENDS= cython:lang/cython
-RUN_DEPENDS:= ${BUILD_DEPENDS}
LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2
USES= pkgconfig python:2
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist cython cython_run
WRKSRC= ${WRKDIR}/python-${PORTNAME}-${PORTVERSION}
post-install:
diff --git a/www/py-kallithea/Makefile b/www/py-kallithea/Makefile
index 8adb69c0a718..2b4c00652583 100644
--- a/www/py-kallithea/Makefile
+++ b/www/py-kallithea/Makefile
@@ -15,28 +15,28 @@ COMMENT= Fast and powerful management tool for Mercurial and Git
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}waitress>=0.8.8:www/py-waitress \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.0.8:www/py-webob \
- ${PYTHON_PKGNAMEPREFIX}WebTest>=1.4.3:www/py-WebTest \
- ${PYTHON_PKGNAMEPREFIX}pylons>=1.0:www/py-pylons \
- ${PYTHON_PKGNAMEPREFIX}beaker>=1.6.4:www/py-beaker \
- ${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:www/py-webhelpers \
- ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.10:databases/py-sqlalchemy10 \
- ${PYTHON_PKGNAMEPREFIX}mako>=0.9.0:textproc/py-mako \
- ${PYTHON_PKGNAMEPREFIX}pygments>=1.5:textproc/py-pygments \
- ${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:textproc/py-whoosh \
- ${PYTHON_PKGNAMEPREFIX}celery>=2.2.5:devel/py-celery \
- ${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:textproc/py-markdown \
- ${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:textproc/py-docutils \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
- ${PYTHON_PKGNAMEPREFIX}urlobject>=2.3.4:www/py-urlobject \
- ${PYTHON_PKGNAMEPREFIX}routes>=1.13:www/py-routes \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}waitress>=0.8.8:www/py-waitress@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.0.8:www/py-webob@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}WebTest>=1.4.3:www/py-WebTest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pylons>=1.0:www/py-pylons@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beaker>=1.6.4:www/py-beaker@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:www/py-webhelpers@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.10:databases/py-sqlalchemy10@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>=0.9.0:textproc/py-mako@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=1.5:textproc/py-pygments@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:textproc/py-whoosh@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}celery>=2.2.5:devel/py-celery@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:textproc/py-markdown@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:textproc/py-docutils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urlobject>=2.3.4:www/py-urlobject@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}routes>=1.13:www/py-routes@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dulwich>=0.9.9:devel/dulwich \
- ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.3.0:security/py-bcrypt \
+ ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.3.0:security/py-bcrypt@${FLAVOR} \
mercurial>=2.9:devel/mercurial
USES= python:2.7
@@ -51,6 +51,6 @@ OPTIONS_DEFINE= GIT LDAP
GIT_DESC= Git repositories support
GIT_RUN_DEPENDS= git:devel/git
-LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap:net/py-ldap
+LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap:net/py-ldap@${FLAVOR}
.include <bsd.port.mk>
diff --git a/www/py-libsass/Makefile b/www/py-libsass/Makefile
index 34f2f60cd6cc..c23526485680 100644
--- a/www/py-libsass/Makefile
+++ b/www/py-libsass/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN_powerpc64= fails to compile: cc1plus: error: unrecognized command line option -std=c++0x
-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
diff --git a/www/py-multidict/Makefile b/www/py-multidict/Makefile
index 8820b0bf7992..43b0d2142b79 100644
--- a/www/py-multidict/Makefile
+++ b/www/py-multidict/Makefile
@@ -12,9 +12,7 @@ COMMENT= Multidict implementation
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= cython:lang/cython
-
USES= python:3.4+
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils cython
.include <bsd.port.mk>
diff --git a/www/py-nevow/Makefile b/www/py-nevow/Makefile
index 7da3fbac845f..c44e53af8c4b 100644
--- a/www/py-nevow/Makefile
+++ b/www/py-nevow/Makefile
@@ -15,7 +15,7 @@ COMMENT= Web application templating system, based on the Twisted Woven
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
USE_PYTHON= autoplist distutils
USES= gettext python
diff --git a/www/py-notebook/Makefile b/www/py-notebook/Makefile
index 04b6eac47b18..99dcacf81881 100644
--- a/www/py-notebook/Makefile
+++ b/www/py-notebook/Makefile
@@ -12,16 +12,16 @@ COMMENT= Web-based notebook environment for interactive computing
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING.md
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel \
- ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils \
- ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client \
- ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core \
- ${PYTHON_PKGNAMEPREFIX}nbconvert>=0:devel/py-nbconvert \
- ${PYTHON_PKGNAMEPREFIX}nbformat>=0:devel/py-nbformat \
- ${PYTHON_PKGNAMEPREFIX}terminado>=0.3.3:net/py-terminado \
- ${PYTHON_PKGNAMEPREFIX}tornado>=4:www/py-tornado \
- ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2.1:devel/py-traitlets
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nbconvert>=0:devel/py-nbconvert@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nbformat>=0:devel/py-nbformat@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}terminado>=0.3.3:net/py-terminado@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>=4:www/py-tornado@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2.1:devel/py-traitlets@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-octoprint/Makefile b/www/py-octoprint/Makefile
index 8046d514457d..199310449deb 100644
--- a/www/py-octoprint/Makefile
+++ b/www/py-octoprint/Makefile
@@ -12,35 +12,35 @@ COMMENT= Web interface for controlling a 3D printer
LICENSE= AGPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.11.1:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11.1:www/py-werkzeug \
- ${PYTHON_PKGNAMEPREFIX}tornado>=4.4.2:www/py-tornado \
- ${PYTHON_PKGNAMEPREFIX}sockjs-tornado>=1.0.2:www/py-sockjs-tornado \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}Flask-Login>=0.3.2:www/py-flask-login \
- ${PYTHON_PKGNAMEPREFIX}Flask-Principal>=0.4:www/py-flask-principal \
- ${PYTHON_PKGNAMEPREFIX}Flask-Babel>=0.11.1:devel/py-flask-babel \
- ${PYTHON_PKGNAMEPREFIX}Flask-Assets>=0.12:www/py-flask-assets \
- ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.4:textproc/py-markdown \
- ${PYTHON_PKGNAMEPREFIX}serial>=3.2:comms/py-serial \
- ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.17:net/py-netaddr \
- ${PYTHON_PKGNAMEPREFIX}watchdog>=0.8.2:devel/py-watchdog \
- ${PYTHON_PKGNAMEPREFIX}sarge>=0.1.4:devel/py-sarge \
- ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10:net/py-netifaces \
- ${PYTHON_PKGNAMEPREFIX}pylru>=1.0.9:devel/py-pylru \
- ${PYTHON_PKGNAMEPREFIX}rsa>=3.3:security/py-rsa \
- ${PYTHON_PKGNAMEPREFIX}pkginfo>=1.2.1:sysutils/py-pkginfo \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}semantic_version>=2.4.2:devel/py-semantic_version \
- ${PYTHON_PKGNAMEPREFIX}psutil>=4.3.0:sysutils/py-psutil \
- ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click \
- ${PYTHON_PKGNAMEPREFIX}awesome-slugify>=1.6.5:textproc/py-awesome-slugify \
- ${PYTHON_PKGNAMEPREFIX}feedparser>=5.2.1:textproc/py-feedparser \
- ${PYTHON_PKGNAMEPREFIX}chainmap>=1.0.2:devel/py-chainmap \
- ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \
- ${PYTHON_PKGNAMEPREFIX}scandir>=1.3:sysutils/py-scandir
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.11.1:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11.1:www/py-werkzeug@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>=4.4.2:www/py-tornado@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sockjs-tornado>=1.0.2:www/py-sockjs-tornado@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Login>=0.3.2:www/py-flask-login@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Principal>=0.4:www/py-flask-principal@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Babel>=0.11.1:devel/py-flask-babel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Assets>=0.12:www/py-flask-assets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.4:textproc/py-markdown@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}serial>=3.2:comms/py-serial@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.17:net/py-netaddr@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}watchdog>=0.8.2:devel/py-watchdog@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sarge>=0.1.4:devel/py-sarge@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10:net/py-netifaces@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pylru>=1.0.9:devel/py-pylru@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rsa>=3.3:security/py-rsa@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pkginfo>=1.2.1:sysutils/py-pkginfo@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}semantic_version>=2.4.2:devel/py-semantic_version@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psutil>=4.3.0:sysutils/py-psutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}awesome-slugify>=1.6.5:textproc/py-awesome-slugify@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}feedparser>=5.2.1:textproc/py-feedparser@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}chainmap>=1.0.2:devel/py-chainmap@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scandir>=1.3:sysutils/py-scandir@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
BROKEN= checksum mismatch
diff --git a/www/py-paste/Makefile b/www/py-paste/Makefile
index f0d420956f38..2f104133667f 100644
--- a/www/py-paste/Makefile
+++ b/www/py-paste/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Tools for using a Web Server Gateway Interface stack
-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
diff --git a/www/py-pastedeploy/Makefile b/www/py-pastedeploy/Makefile
index 4dbc911bdd76..95d88a0281e1 100644
--- a/www/py-pastedeploy/Makefile
+++ b/www/py-pastedeploy/Makefile
@@ -12,7 +12,7 @@ COMMENT= Load, configure, and compose WSGI applications and servers
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.6:www/py-paste
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.6:www/py-paste@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/www/py-pastescript/Makefile b/www/py-pastescript/Makefile
index d93ba29bbf91..937be68cbc06 100644
--- a/www/py-pastescript/Makefile
+++ b/www/py-pastescript/Makefile
@@ -12,15 +12,15 @@ COMMENT= Pluggable command-line frontend
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.0.1:devel/py-cheetah \
- ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup \
- ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:www/py-paste \
- ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.2:www/py-pastedeploy \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}wsgiutils>0:devel/py-wsgiutils
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.0.1:devel/py-cheetah@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:www/py-paste@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.2:www/py-pastedeploy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wsgiutils>0:devel/py-wsgiutils@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
post-extract:
diff --git a/www/py-pelican/Makefile b/www/py-pelican/Makefile
index 926cda4e27ba..6f486dab076f 100644
--- a/www/py-pelican/Makefile
+++ b/www/py-pelican/Makefile
@@ -13,15 +13,15 @@ COMMENT= Static site generator written in Python
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}feedgenerator>=1.6:www/py-feedgenerator \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker \
- ${PYTHON_PKGNAMEPREFIX}unidecode>0:converters/py-unidecode \
- ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}feedgenerator>=1.6:www/py-feedgenerator@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}unidecode>0:converters/py-unidecode@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
NO_ARCH= yes
USES= python shebangfix
@@ -36,10 +36,10 @@ OPTIONS_DEFINE= MARKDOWN SYNTAX
OPTIONS_DEFAULT= MARKDOWN SYNTAX
MARKDOWN_DESC= Markdown markup language format support
-MARKDOWN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown
+MARKDOWN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${FLAVOR}
SYNTAX_DESC= Syntax Highlighting (via pygments)
-SYNTAX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.4:textproc/py-pygments
+SYNTAX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.4:textproc/py-pygments@${FLAVOR}
do-test:
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
diff --git a/www/py-planet/Makefile b/www/py-planet/Makefile
index d1fa403ea8d4..1023ca74f676 100644
--- a/www/py-planet/Makefile
+++ b/www/py-planet/Makefile
@@ -12,9 +12,9 @@ COMMENT= Python client library and CLI for Planet's public API #'
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click \
- ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}requests-futures>=0:www/py-requests-futures
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-futures>=0:www/py-requests-futures@${FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-plone.alterego/Makefile b/www/py-plone.alterego/Makefile
index bafeaf2faf15..73a7f66d8a6b 100644
--- a/www/py-plone.alterego/Makefile
+++ b/www/py-plone.alterego/Makefile
@@ -14,7 +14,7 @@ COMMENT= Low level support for dynamic modules
LICENSE= LGPL20
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.app.blob/Makefile b/www/py-plone.app.blob/Makefile
index 4dd931bafd7f..ccae3c13f91a 100644
--- a/www/py-plone.app.blob/Makefile
+++ b/www/py-plone.app.blob/Makefile
@@ -12,11 +12,11 @@ COMMENT= ZODB blob support for Plone
LICENSE= GPLv2
-RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=3.8.1:databases/zodb3 \
- ${PYTHON_PKGNAMEPREFIX}zope.proxy>=3.4:net/py-zope.proxy \
- ${PYTHON_PKGNAMEPREFIX}archetypes.schemaextender>=1.6:devel/py-archetypes.schemaextender \
- ${PYTHON_PKGNAMEPREFIX}plone.app.imaging>1.0:www/py-plone.app.imaging \
- ${PYTHON_PKGNAMEPREFIX}plone.scale>=0:www/py-plone.scale
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=3.8.1:databases/zodb3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.proxy>=3.4:net/py-zope.proxy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}archetypes.schemaextender>=1.6:devel/py-archetypes.schemaextender@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.imaging>1.0:www/py-plone.app.imaging@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.scale>=0:www/py-plone.scale@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.app.caching/Makefile b/www/py-plone.app.caching/Makefile
index 2993f7e99beb..591b9f41b80f 100644
--- a/www/py-plone.app.caching/Makefile
+++ b/www/py-plone.app.caching/Makefile
@@ -12,29 +12,29 @@ COMMENT= Plone UI and default rules for plone.caching/z3c.caching
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}plone.caching>=0:www/py-plone.caching \
- ${PYTHON_PKGNAMEPREFIX}plone.cachepurging>=0:www/py-plone.cachepurging \
- ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.0:www/py-plone.app.registry \
- ${PYTHON_PKGNAMEPREFIX}zope.browserresource>0:devel/py-zope.browserresource \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
- ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \
- ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect \
- ${PYTHON_PKGNAMEPREFIX}plone.registry>=1.0:www/py-plone.registry \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \
- ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
- ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform \
- ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form \
- ${PYTHON_PKGNAMEPREFIX}z3c.zcmlhook>=0:devel/py-z3c.zcmlhook
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.caching>=0:www/py-plone.caching@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.cachepurging>=0:www/py-plone.cachepurging@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.0:www/py-plone.app.registry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserresource>0:devel/py-zope.browserresource@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.registry>=1.0:www/py-plone.registry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.zcmlhook>=0:devel/py-z3c.zcmlhook@${FLAVOR}
NO_ARCH= yes
-USES= python zope
+USES= python:2.7 zope
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.app.collection/Makefile b/www/py-plone.app.collection/Makefile
index 4acd770c74dd..fac4e9718064 100644
--- a/www/py-plone.app.collection/Makefile
+++ b/www/py-plone.app.collection/Makefile
@@ -12,27 +12,27 @@ COMMENT= Tools for constructing navigation and site sections
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>=1.0.2:devel/py-archetypes.querywidget \
- ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting \
- ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \
- ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \
- ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \
- ${PYTHON_PKGNAMEPREFIX}plone.portlet.collection>0:www/py-plone.portlet.collection \
- ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
- ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool \
- ${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation \
- ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
- ${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.schema>=0:devel/py-zope.schema
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>=1.0.2:devel/py-archetypes.querywidget@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlet.collection>0:www/py-plone.portlet.collection@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${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.schema>=0:devel/py-zope.schema@${FLAVOR}
NO_ARCH= yes
-USES= python zope
+USES= python:2.7 zope
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.app.content/Makefile b/www/py-plone.app.content/Makefile
index 4a36a3766cea..8eed43fe3396 100644
--- a/www/py-plone.app.content/Makefile
+++ b/www/py-plone.app.content/Makefile
@@ -12,22 +12,22 @@ COMMENT= Content Views for Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching \
- ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \
- ${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.component>=0:devel/py-zope.component \
- ${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 \
- ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
- ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.2.0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${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.component>=0:devel/py-zope.component@${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} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.2.0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope zip
diff --git a/www/py-plone.app.contentlisting/Makefile b/www/py-plone.app.contentlisting/Makefile
index 0e1324065044..701bbebefbc4 100644
--- a/www/py-plone.app.contentlisting/Makefile
+++ b/www/py-plone.app.contentlisting/Makefile
@@ -13,10 +13,10 @@ COMMENT= Listing of content for the Plone CMS
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}
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.app.contentmenu/Makefile b/www/py-plone.app.contentmenu/Makefile
index 802349f7a8df..bfed3bc6e760 100644
--- a/www/py-plone.app.contentmenu/Makefile
+++ b/www/py-plone.app.contentmenu/Makefile
@@ -12,23 +12,23 @@ COMMENT= Plone's content menu implementation
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking \
- ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}plone.app.content>=2.0:www/py-plone.app.content \
- ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:devel/py-zope.browsermenu \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
- ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
- ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
- ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher \
- ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.content>=2.0:www/py-plone.app.content@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:devel/py-zope.browsermenu@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${FLAVOR}
NO_ARCH= yes
-USES= python zope
+USES= python:2.7 zope
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.app.contentrules/Makefile b/www/py-plone.app.contentrules/Makefile
index 52cd09c2d344..c930363ecc8b 100644
--- a/www/py-plone.app.contentrules/Makefile
+++ b/www/py-plone.app.contentrules/Makefile
@@ -12,32 +12,32 @@ COMMENT= Plone integration for plone.contentrules
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib \
- ${PYTHON_PKGNAMEPREFIX}plone.contentrules>=0:www/py-plone.contentrules \
- ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}plone.stringinterp>=0:www/py-plone.stringinterp \
- ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \
- ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \
- ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
- ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
- ${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.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.publisher>=3.11.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.traversing>=0:devel/py-zope.traversing \
- ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
- ${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}Products.statusmessages>=0:devel/py-Products.statusmessages \
- zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.contentrules>=0:www/py-plone.contentrules@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.stringinterp>=0:www/py-plone.stringinterp@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \
+ ${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.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.publisher>=3.11.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.traversing>=0:devel/py-zope.traversing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${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} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.app.controlpanel/Makefile b/www/py-plone.app.controlpanel/Makefile
index 160b4b7d342d..48ef0b9f6d55 100644
--- a/www/py-plone.app.controlpanel/Makefile
+++ b/www/py-plone.app.controlpanel/Makefile
@@ -12,32 +12,32 @@ COMMENT= Formlib-based controlpanels for Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \
- ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \
- ${PYTHON_PKGNAMEPREFIX}plone.app.workflow>=0:www/py-plone.app.workflow \
- ${PYTHON_PKGNAMEPREFIX}plone.fieldsets>=0:www/py-plone.fieldsets \
- ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect \
- ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking \
- ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
- ${PYTHON_PKGNAMEPREFIX}zope.cachedescriptors>=0:devel/py-zope.cachedescriptors \
- ${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.i18n>=0:devel/py-zope.i18n \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache \
- ${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}Acquisition>=0:devel/py-Acquisition \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \
- ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS \
- ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms \
- ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \
- zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.workflow>=0:www/py-plone.app.workflow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.fieldsets>=0:www/py-plone.fieldsets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.cachedescriptors>=0:devel/py-zope.cachedescriptors@${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.i18n>=0:devel/py-zope.i18n@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache@${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}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip zope
diff --git a/www/py-plone.app.customerize/Makefile b/www/py-plone.app.customerize/Makefile
index 9bf49ffc43f1..c31a8c469ea6 100644
--- a/www/py-plone.app.customerize/Makefile
+++ b/www/py-plone.app.customerize/Makefile
@@ -12,18 +12,18 @@ COMMENT= Integrate five.customerize into Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize \
- ${PYTHON_PKGNAMEPREFIX}plone.browserlayer>=0:www/py-plone.browserlayer \
- ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
- ${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 \
- ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.browserlayer>=0:www/py-plone.browserlayer@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \
+ ${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} \
+ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
#USES= zope
diff --git a/www/py-plone.app.dexterity/Makefile b/www/py-plone.app.dexterity/Makefile
index 9046b9d71adb..daded9c431e7 100644
--- a/www/py-plone.app.dexterity/Makefile
+++ b/www/py-plone.app.dexterity/Makefile
@@ -12,32 +12,32 @@ COMMENT= Flexible CMF content
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.z3cform.datetimewidget>0:devel/py-collective.z3cform.datetimewidget \
- ${PYTHON_PKGNAMEPREFIX}plone.app.textfield>0:www/py-plone.app.textfield \
- ${PYTHON_PKGNAMEPREFIX}plone.behavior>0:www/py-plone.behavior \
- ${PYTHON_PKGNAMEPREFIX}plone.dexterity>0:www/py-plone.dexterity \
- ${PYTHON_PKGNAMEPREFIX}plone.formwidget.namedfile>0:www/py-plone.formwidget.namedfile \
- ${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile \
- ${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822 \
- ${PYTHON_PKGNAMEPREFIX}plone.schemaeditor>0:www/py-plone.schemaeditor \
- ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}plone.app.content>0:www/py-plone.app.content \
- ${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout \
- ${PYTHON_PKGNAMEPREFIX}plone.app.uuid>0:www/py-plone.app.uuid \
- ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>0:www/py-plone.app.z3cform \
- ${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform \
- ${PYTHON_PKGNAMEPREFIX}plone.contentrules>0:www/py-plone.contentrules \
- ${PYTHON_PKGNAMEPREFIX}plone.portlets>0:www/py-plone.portlets \
- ${PYTHON_PKGNAMEPREFIX}plone.supermodel>0:www/py-plone.supermodel \
- ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup \
- ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \
- ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.z3cform.datetimewidget>0:devel/py-collective.z3cform.datetimewidget@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.textfield>0:www/py-plone.app.textfield@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.behavior>0:www/py-plone.behavior@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.dexterity>0:www/py-plone.dexterity@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.formwidget.namedfile>0:www/py-plone.formwidget.namedfile@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.schemaeditor>0:www/py-plone.schemaeditor@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.content>0:www/py-plone.app.content@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.uuid>0:www/py-plone.app.uuid@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>0:www/py-plone.app.z3cform@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.contentrules>0:www/py-plone.contentrules@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>0:www/py-plone.portlets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.supermodel>0:www/py-plone.supermodel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.app.discussion/Makefile b/www/py-plone.app.discussion/Makefile
index 7cc01b8be076..35f99bdd44f5 100644
--- a/www/py-plone.app.discussion/Makefile
+++ b/www/py-plone.app.discussion/Makefile
@@ -12,23 +12,23 @@ COMMENT= Enhanced discussion support for Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.monkeypatcher>=0:devel/py-collective.monkeypatcher \
- ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout \
- ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=0:www/py-plone.app.registry \
- ${PYTHON_PKGNAMEPREFIX}plone.app.uuid>=0:www/py-plone.app.uuid \
- ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform \
- ${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer \
- ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry \
- ${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0:www/py-plone.z3cform \
- zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
- ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
- ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
- ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
- ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
- ${PYTHON_PKGNAMEPREFIX}z3c.form>=2.3.3:devel/py-z3c.form
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.monkeypatcher>=0:devel/py-collective.monkeypatcher@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=0:www/py-plone.app.registry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.uuid>=0:www/py-plone.app.uuid@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0:www/py-plone.z3cform@${FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>=2.3.3:devel/py-z3c.form@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.app.folder/Makefile b/www/py-plone.app.folder/Makefile
index 08ffd9c35d4a..8f2670180dab 100644
--- a/www/py-plone.app.folder/Makefile
+++ b/www/py-plone.app.folder/Makefile
@@ -12,10 +12,10 @@ COMMENT= Integration package for plone.folder into Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup \
- ${PYTHON_PKGNAMEPREFIX}plone.folder>0:www/py-plone.folder \
- ${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.folder>0:www/py-plone.folder@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.app.form/Makefile b/www/py-plone.app.form/Makefile
index a482f28530a4..17d783805ae3 100644
--- a/www/py-plone.app.form/Makefile
+++ b/www/py-plone.app.form/Makefile
@@ -12,23 +12,23 @@ COMMENT= zope.formlib integration for Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib \
- ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking \
- ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \
- ${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>=4.0:devel/py-zope.formlib \
- ${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.schema>=0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \
- ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
- ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${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>=4.0:devel/py-zope.formlib@${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.schema>=0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.app.i18n/Makefile b/www/py-plone.app.i18n/Makefile
index 2018df5fff07..9c608147d70d 100644
--- a/www/py-plone.app.i18n/Makefile
+++ b/www/py-plone.app.i18n/Makefile
@@ -13,7 +13,7 @@ COMMENT= Plone specific i18n extensions
LICENSE= GPLv2
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.app.imaging/Makefile b/www/py-plone.app.imaging/Makefile
index 01a7a898e071..a3f791a894cc 100644
--- a/www/py-plone.app.imaging/Makefile
+++ b/www/py-plone.app.imaging/Makefile
@@ -12,12 +12,12 @@ COMMENT= User-configurable, blob-aware image scaling for Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.scale>0:www/py-plone.scale \
- ${PYTHON_PKGNAMEPREFIX}z3c.caching>0:devel/py-z3c.caching \
- ${PYTHON_PKGNAMEPREFIX}five.globalrequest>0:devel/py-five.globalrequest
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.scale>0:www/py-plone.scale@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.caching>0:devel/py-z3c.caching@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}five.globalrequest>0:devel/py-five.globalrequest@${FLAVOR}
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.app.iterate/Makefile b/www/py-plone.app.iterate/Makefile
index d3f32fc529f3..d2fcfc80861d 100644
--- a/www/py-plone.app.iterate/Makefile
+++ b/www/py-plone.app.iterate/Makefile
@@ -12,25 +12,25 @@ COMMENT= Check-out and check-in staging for Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking \
- ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${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.lifecycleevent>0:devel/py-zope.lifecycleevent \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
- ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
- ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
- ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFPlacefulWorkflow>=0:devel/py-Products.CMFPlacefulWorkflow \
- ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow \
- ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \
- zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${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.lifecycleevent>0:devel/py-zope.lifecycleevent@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFPlacefulWorkflow>=0:devel/py-Products.CMFPlacefulWorkflow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.app.jquery/Makefile b/www/py-plone.app.jquery/Makefile
index ff301e98f8da..bce6e8fe6140 100644
--- a/www/py-plone.app.jquery/Makefile
+++ b/www/py-plone.app.jquery/Makefile
@@ -12,11 +12,11 @@ COMMENT= jQuery integration for Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
+RUN_DEPENDS= ${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 <bsd.port.mk>
diff --git a/www/py-plone.app.jquerytools/Makefile b/www/py-plone.app.jquerytools/Makefile
index 67e6b0cfe87d..9e2b89fc5422 100644
--- a/www/py-plone.app.jquerytools/Makefile
+++ b/www/py-plone.app.jquerytools/Makefile
@@ -12,9 +12,9 @@ COMMENT= jQuery Tools integration for Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${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}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
diff --git a/www/py-plone.app.layout/Makefile b/www/py-plone.app.layout/Makefile
index ed8405b25ad7..54feb84dd095 100644
--- a/www/py-plone.app.layout/Makefile
+++ b/www/py-plone.app.layout/Makefile
@@ -12,26 +12,26 @@ COMMENT= Layout mechanisms for Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.viewletmanager>=1.2:www/py-plone.app.viewletmanager \
- ${PYTHON_PKGNAMEPREFIX}plone.app.content>0:www/py-plone.app.content \
- ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \
- ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
- ${PYTHON_PKGNAMEPREFIX}plone.registry>0:www/py-plone.registry \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation \
- ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
- ${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}zope.schema>=0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
- ${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.CMFDefault>=0:devel/py-Products.CMFDefault \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=1.2.2:devel/py-Products.CMFEditions
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.viewletmanager>=1.2:www/py-plone.app.viewletmanager@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.content>0:www/py-plone.app.content@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.registry>0:www/py-plone.registry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${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}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${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.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=1.2.2:devel/py-Products.CMFEditions@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.app.ldap/Makefile b/www/py-plone.app.ldap/Makefile
index f985bbe1631a..6ca86ed70e82 100644
--- a/www/py-plone.app.ldap/Makefile
+++ b/www/py-plone.app.ldap/Makefile
@@ -13,16 +13,16 @@ COMMENT= LDAP control panel for Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.PloneLDAP>=1.0:www/py-Products.PloneLDAP \
- ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup \
- ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap \
- ${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.lifecycleevent>0:devel/py-zope.lifecycleevent \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PloneLDAP>=1.0:www/py-Products.PloneLDAP@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${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}zope.lifecycleevent>0:devel/py-zope.lifecycleevent@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-plone.app.linkintegrity/Makefile b/www/py-plone.app.linkintegrity/Makefile
index 9be9bfa2c66d..483503d72d99 100644
--- a/www/py-plone.app.linkintegrity/Makefile
+++ b/www/py-plone.app.linkintegrity/Makefile
@@ -12,10 +12,10 @@ COMMENT= Manage link integrity in Plone
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}
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.app.portlets/Makefile b/www/py-plone.app.portlets/Makefile
index 96b1463ec199..60dd3e720c9f 100644
--- a/www/py-plone.app.portlets/Makefile
+++ b/www/py-plone.app.portlets/Makefile
@@ -12,39 +12,39 @@ COMMENT= Plone integration for the basic plone.portlets package
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib \
- ${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize \
- ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \
- ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}plone.portlets>=1.1:www/py-plone.portlets \
- ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \
- ${PYTHON_PKGNAMEPREFIX}plone.app.i18n>=0:www/py-plone.app.i18n \
- ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=1.2:www/py-plone.app.layout \
- ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \
- ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
- ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
- ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=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.contentprovider>=0:devel/py-zope.contentprovider \
- ${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.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.traversing>=0:devel/py-zope.traversing \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
- ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \
- zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
- ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
- ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>=1.1:www/py-plone.portlets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.i18n>=0:www/py-plone.app.i18n@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=1.2:www/py-plone.app.layout@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=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.contentprovider>=0:devel/py-zope.contentprovider@${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.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.traversing>=0:devel/py-zope.traversing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.app.querystring/Makefile b/www/py-plone.app.querystring/Makefile
index c932b5fb93e9..a4395d488cc2 100644
--- a/www/py-plone.app.querystring/Makefile
+++ b/www/py-plone.app.querystring/Makefile
@@ -12,25 +12,25 @@ COMMENT= Tools to parse stored queries to actual results
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting \
- ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout \
- ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.1:www/py-plone.app.registry \
- ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \
- ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching \
- ${PYTHON_PKGNAMEPREFIX}plone.registry>0:www/py-plone.registry \
- ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:devel/py-zope.dottedname \
- ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>0:devel/py-zope.globalrequest \
- ${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.schema>0:devel/py-zope.schema
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.1:www/py-plone.app.registry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.registry>0:www/py-plone.registry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:devel/py-zope.dottedname@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>0:devel/py-zope.globalrequest@${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.schema>0:devel/py-zope.schema@${FLAVOR}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.app.redirector/Makefile b/www/py-plone.app.redirector/Makefile
index 52a94bfad17a..3168f4fecae4 100644
--- a/www/py-plone.app.redirector/Makefile
+++ b/www/py-plone.app.redirector/Makefile
@@ -12,10 +12,10 @@ COMMENT= Redirection tool
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.app.registry/Makefile b/www/py-plone.app.registry/Makefile
index d3ab57c709b8..324774b68e11 100644
--- a/www/py-plone.app.registry/Makefile
+++ b/www/py-plone.app.registry/Makefile
@@ -12,18 +12,18 @@ COMMENT= Zope 2 and Plone integration for plone.registry
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.registry>=1.0:www/py-plone.registry \
- ${PYTHON_PKGNAMEPREFIX}plone.supermodel>=1.1:www/py-plone.supermodel \
- ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform \
- ${PYTHON_PKGNAMEPREFIX}plone.autoform>=1.0:www/py-plone.autoform \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
- ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \
- ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
- ${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}zope.dottedname>=0:devel/py-zope.dottedname
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.registry>=1.0:www/py-plone.registry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.supermodel>=1.1:www/py-plone.supermodel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.autoform>=1.0:www/py-plone.autoform@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \
+ ${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}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.app.search/Makefile b/www/py-plone.app.search/Makefile
index f216806de569..bbbfd69574e6 100644
--- a/www/py-plone.app.search/Makefile
+++ b/www/py-plone.app.search/Makefile
@@ -12,10 +12,10 @@ COMMENT= Search user interface for Plone CMS
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting@${FLAVOR}
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.app.testing/Makefile b/www/py-plone.app.testing/Makefile
index b2773550a7f9..db0f7cc4653d 100644
--- a/www/py-plone.app.testing/Makefile
+++ b/www/py-plone.app.testing/Makefile
@@ -12,18 +12,18 @@ COMMENT= Testing tools for Plone-the-application, based on plone.testing
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
- ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
- ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \
- ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \
- ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}plone.testing>=0:www/py-plone.testing \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.testing>=0:www/py-plone.testing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR}
NO_ARCH= yes
-USES= python zip zope
+USES= python:2.7 zip zope
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.app.textfield/Makefile b/www/py-plone.app.textfield/Makefile
index d2abb53043a8..d8de5c2cb583 100644
--- a/www/py-plone.app.textfield/Makefile
+++ b/www/py-plone.app.textfield/Makefile
@@ -12,10 +12,10 @@ COMMENT= Text field with MIME type support
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
- zodb${PYTHON_PKGNAMESUFFIX}>=3.8.1:databases/zodb3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=3.8.1:databases/zodb3@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-plone.app.theming/Makefile b/www/py-plone.app.theming/Makefile
index be6863be5649..3dba49f508bc 100644
--- a/www/py-plone.app.theming/Makefile
+++ b/www/py-plone.app.theming/Makefile
@@ -13,21 +13,21 @@ COMMENT= Integrates the Diazo theming engine with Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}diazo>=0:devel/py-diazo \
- ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils \
- ${PYTHON_PKGNAMEPREFIX}roman>0:math/py-roman \
- ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.4:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.0:www/py-plone.app.registry \
- ${PYTHON_PKGNAMEPREFIX}plone.subrequest>=0:www/py-plone.subrequest \
- ${PYTHON_PKGNAMEPREFIX}plone.transformchain>=0:www/py-plone.transformchain \
- ${PYTHON_PKGNAMEPREFIX}plone.resource>=1.0,1:www/py-plone.resource \
- ${PYTHON_PKGNAMEPREFIX}plone.resourceeditor>0:www/py-plone.resourceeditor \
- ${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:devel/py-repoze.xmliter \
- ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest \
- ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}diazo>=0:devel/py-diazo@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}roman>0:math/py-roman@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.4:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.0:www/py-plone.app.registry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.subrequest>=0:www/py-plone.subrequest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.transformchain>=0:www/py-plone.transformchain@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.resource>=1.0,1:www/py-plone.resource@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.resourceeditor>0:www/py-plone.resourceeditor@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:devel/py-repoze.xmliter@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR}
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.app.upgrade/Makefile b/www/py-plone.app.upgrade/Makefile
index 149c10720368..79fd3ff2c225 100644
--- a/www/py-plone.app.upgrade/Makefile
+++ b/www/py-plone.app.upgrade/Makefile
@@ -12,36 +12,36 @@ COMMENT= Upgrade machinery for Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}borg.localrole>=0:security/py-borg.localrole \
- ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \
- ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
- ${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session \
- ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder \
- ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \
- ${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.location>=0:devel/py-zope.location \
- ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache \
- ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
- ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
- ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes \
- ${PYTHON_PKGNAMEPREFIX}Products.contentmigration>=0:devel/py-Products.contentmigration \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid \
- ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
- ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry \
- ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS \
- ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \
- ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms \
- ${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>=0:devel/py-Products.ResourceRegistries \
- ${PYTHON_PKGNAMEPREFIX}Products.SecureMailHost>=0:mail/py-Products.SecureMailHost \
- ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>=2.13.4:devel/py-Products.ZCatalog
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}borg.localrole>=0:security/py-borg.localrole@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${FLAVOR} \
+ ${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.location>=0:devel/py-zope.location@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.contentmigration>=0:devel/py-Products.contentmigration@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>=0:devel/py-Products.ResourceRegistries@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.SecureMailHost>=0:mail/py-Products.SecureMailHost@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>=2.13.4:devel/py-Products.ZCatalog@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.app.users/Makefile b/www/py-plone.app.users/Makefile
index 834a3afe75b1..227b5877dc69 100644
--- a/www/py-plone.app.users/Makefile
+++ b/www/py-plone.app.users/Makefile
@@ -12,20 +12,20 @@ COMMENT= Users and groups related things
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib \
- ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect \
- ${PYTHON_PKGNAMEPREFIX}plone.app.controlpanel>=2.1:www/py-plone.app.controlpanel \
- ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${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.schema>=0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>0:security/py-Products.PlonePAS \
- ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \
- zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.controlpanel>=2.1:www/py-plone.app.controlpanel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${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.schema>=0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>0:security/py-Products.PlonePAS@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.app.uuid/Makefile b/www/py-plone.app.uuid/Makefile
index 494c8abe1ac7..3ae3d0f0acd3 100644
--- a/www/py-plone.app.uuid/Makefile
+++ b/www/py-plone.app.uuid/Makefile
@@ -12,13 +12,13 @@ COMMENT= Plone integration for the basic plone.uuid package
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid \
- ${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer \
- ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR}
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.app.viewletmanager/Makefile b/www/py-plone.app.viewletmanager/Makefile
index dc500dba4448..060032ae7fc8 100644
--- a/www/py-plone.app.viewletmanager/Makefile
+++ b/www/py-plone.app.viewletmanager/Makefile
@@ -12,18 +12,18 @@ COMMENT= Configurable viewlet manager
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
- ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
- zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
- ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>0:www/py-plone.app.vocabularies
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>0:www/py-plone.app.vocabularies@${FLAVOR}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
#USES= zope
diff --git a/www/py-plone.app.vocabularies/Makefile b/www/py-plone.app.vocabularies/Makefile
index a7c4b702dce4..c5e10270c820 100644
--- a/www/py-plone.app.vocabularies/Makefile
+++ b/www/py-plone.app.vocabularies/Makefile
@@ -12,20 +12,20 @@ COMMENT= Collection of generally useful vocabularies
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.formlib>0:devel/py-zope.formlib \
- ${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.schema>=0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore
+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.formlib>0:devel/py-zope.formlib@${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.schema>=0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR}
NO_ARCH= yes
-USES= python zope
+USES= python:2.7 zope
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.app.workflow/Makefile b/www/py-plone.app.workflow/Makefile
index 3c0f01ac5c1d..aa2fd61b1fe8 100644
--- a/www/py-plone.app.workflow/Makefile
+++ b/www/py-plone.app.workflow/Makefile
@@ -12,26 +12,26 @@ COMMENT= Workflow and security settings for Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction \
- ${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.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.dottedname>0:devel/py-zope.dottedname \
- ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent \
- ${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.DCWorkflow>0:devel/py-Products.DCWorkflow \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup \
- ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>0:devel/py-Products.statusmessages
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction@${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.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.dottedname>0:devel/py-zope.dottedname@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent@${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.DCWorkflow>0:devel/py-Products.DCWorkflow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>0:devel/py-Products.statusmessages@${FLAVOR}
NO_ARCH= yes
-USES= python zip zope
+USES= python:2.7 zip zope
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.app.z3cform/Makefile b/www/py-plone.app.z3cform/Makefile
index a6f68d87a229..3ab95453ea5c 100644
--- a/www/py-plone.app.z3cform/Makefile
+++ b/www/py-plone.app.z3cform/Makefile
@@ -12,18 +12,18 @@ COMMENT= Collection of widgets, templates for use with z3c.form and Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.z3cform.datetimewidget>=0.1:devel/py-collective.z3cform.datetimewidget \
- ${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0.5.11:www/py-plone.z3cform \
- ${PYTHON_PKGNAMEPREFIX}plone.protect>0:security/py-plone.protect \
- ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form \
- ${PYTHON_PKGNAMEPREFIX}z3c.formwidget.query>0:devel/py-z3c.formwidget.query \
- ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage \
- ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.z3cform.datetimewidget>=0.1:devel/py-collective.z3cform.datetimewidget@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0.5.11:www/py-plone.z3cform@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.protect>0:security/py-plone.protect@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.formwidget.query>0:devel/py-z3c.formwidget.query@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing@${FLAVOR}
NO_ARCH= yes
-USES= python zip zope
+USES= python:2.7 zip zope
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.autoform/Makefile b/www/py-plone.autoform/Makefile
index 6ded8a9c595f..959670582126 100644
--- a/www/py-plone.autoform/Makefile
+++ b/www/py-plone.autoform/Makefile
@@ -12,13 +12,13 @@ COMMENT= Tools to construct z3c.form forms
LICENSE= LGPL20
-RUN_DEPENDS= ${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 \
- ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
- ${PYTHON_PKGNAMEPREFIX}plone.supermodel>=1.1:www/py-plone.supermodel \
- ${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0:www/py-plone.z3cform \
- ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form
+RUN_DEPENDS= ${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} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.supermodel>=1.1:www/py-plone.supermodel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0:www/py-plone.z3cform@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.behavior/Makefile b/www/py-plone.behavior/Makefile
index 1ba4a395ee98..fc817d73d4b3 100644
--- a/www/py-plone.behavior/Makefile
+++ b/www/py-plone.behavior/Makefile
@@ -12,11 +12,11 @@ COMMENT= Infrastructure for maintaining a registry of available behaviors
LICENSE= BSD3CLAUSE
-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.annotation>0:devel/py-zope.annotation \
- ${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.annotation>0:devel/py-zope.annotation@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>0:devel/py-zope.configuration@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.browserlayer/Makefile b/www/py-plone.browserlayer/Makefile
index 64fc54a2b131..48dc012c6799 100644
--- a/www/py-plone.browserlayer/Makefile
+++ b/www/py-plone.browserlayer/Makefile
@@ -12,14 +12,14 @@ COMMENT= Browser layer management for Zope 2 applications
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.traversing>=3.9.0:devel/py-zope.traversing \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4: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.traversing>=3.9.0:devel/py-zope.traversing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4:devel/py-Products.GenericSetup@${FLAVOR} \
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
#USES= zope
diff --git a/www/py-plone.cachepurging/Makefile b/www/py-plone.cachepurging/Makefile
index c2197ec29ecc..b8cff5f11c79 100644
--- a/www/py-plone.cachepurging/Makefile
+++ b/www/py-plone.cachepurging/Makefile
@@ -12,17 +12,17 @@ COMMENT= Cache purging support for Zope 2 applications
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest \
- ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry \
- ${PYTHON_PKGNAMEPREFIX}z3c.caching>0:devel/py-z3c.caching \
- ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${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.lifecycleevent>=0:devel/py-zope.lifecycleevent \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.caching>0:devel/py-z3c.caching@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${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.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.caching/Makefile b/www/py-plone.caching/Makefile
index 4e7e3cdb937e..e054ec0dd509 100644
--- a/www/py-plone.caching/Makefile
+++ b/www/py-plone.caching/Makefile
@@ -12,17 +12,17 @@ COMMENT= Zope 2 integration for z3c.caching
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}z3c.caching>=0:devel/py-z3c.caching \
- ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${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}plone.transformchain>=0:www/py-plone.transformchain \
- ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}z3c.caching>=0:devel/py-z3c.caching@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${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}plone.transformchain>=0:www/py-plone.transformchain@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest@${FLAVOR}
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
#USES= zope
diff --git a/www/py-plone.contentrules/Makefile b/www/py-plone.contentrules/Makefile
index 04f50497cd40..4caabbe51c56 100644
--- a/www/py-plone.contentrules/Makefile
+++ b/www/py-plone.contentrules/Makefile
@@ -12,17 +12,17 @@ COMMENT= Plone ContentRules Engine
LICENSE= GPLv2
-RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${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.configuration>=0:devel/py-zope.configuration \
- ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
- ${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.schema>=0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \
+ ${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.configuration>=0:devel/py-zope.configuration@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${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.schema>=0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.dexterity/Makefile b/www/py-plone.dexterity/Makefile
index 89c7560e4d9b..822d9f91b816 100644
--- a/www/py-plone.dexterity/Makefile
+++ b/www/py-plone.dexterity/Makefile
@@ -12,34 +12,34 @@ COMMENT= Flexible CMF content
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.alterego>0:www/py-plone.alterego \
- ${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform \
- ${PYTHON_PKGNAMEPREFIX}plone.behavior>0:www/py-plone.behavior \
- ${PYTHON_PKGNAMEPREFIX}plone.folder>0:www/py-plone.folder \
- ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822 \
- ${PYTHON_PKGNAMEPREFIX}plone.supermodel>0:www/py-plone.supermodel \
- ${PYTHON_PKGNAMEPREFIX}plone.synchronize>0:www/py-plone.synchronize \
- ${PYTHON_PKGNAMEPREFIX}plone.uuid>0:www/py-plone.uuid \
- ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>0:devel/py-Products.CMFDefault \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>0:devel/py-Products.CMFDynamicViewFTI \
- ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>0:devel/py-Products.statusmessages \
- ${PYTHON_PKGNAMEPREFIX}zope.annotation>0:devel/py-zope.annotation \
- ${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.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.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 \
- ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>0:devel/py-zope.filerepresentation \
- ${PYTHON_PKGNAMEPREFIX}zope.size>0:devel/py-zope.size \
- zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.alterego>0:www/py-plone.alterego@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.behavior>0:www/py-plone.behavior@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.folder>0:www/py-plone.folder@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.supermodel>0:www/py-plone.supermodel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.synchronize>0:www/py-plone.synchronize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.uuid>0:www/py-plone.uuid@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>0:devel/py-Products.CMFDefault@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>0:devel/py-Products.CMFDynamicViewFTI@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>0:devel/py-Products.statusmessages@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>0:devel/py-zope.annotation@${FLAVOR} \
+ ${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.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.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} \
+ ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>0:devel/py-zope.filerepresentation@${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 zope
diff --git a/www/py-plone.fieldsets/Makefile b/www/py-plone.fieldsets/Makefile
index 78a315b9f55d..9b363e4a4f19 100644
--- a/www/py-plone.fieldsets/Makefile
+++ b/www/py-plone.fieldsets/Makefile
@@ -12,14 +12,14 @@ COMMENT= Allows to group fields into different fieldsets
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.folder/Makefile b/www/py-plone.folder/Makefile
index 92dfdceac47a..169a7f5e40a9 100644
--- a/www/py-plone.folder/Makefile
+++ b/www/py-plone.folder/Makefile
@@ -12,17 +12,17 @@ COMMENT= BTree-based folder implementation with order support
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}Products.BTreeFolder2>0:devel/py-Products.BTreeFolder2 \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>0:devel/py-Products.ZCatalog \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.annotation>0:devel/py-zope.annotation \
- ${PYTHON_PKGNAMEPREFIX}zope.container>0:devel/py-zope.container
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.BTreeFolder2>0:devel/py-Products.BTreeFolder2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>0:devel/py-Products.ZCatalog@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>0:devel/py-zope.annotation@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>0:devel/py-zope.container@${FLAVOR}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.formwidget.namedfile/Makefile b/www/py-plone.formwidget.namedfile/Makefile
index 989f10d6fb1a..33c1accdd0e4 100644
--- a/www/py-plone.formwidget.namedfile/Makefile
+++ b/www/py-plone.formwidget.namedfile/Makefile
@@ -12,9 +12,9 @@ COMMENT= Image widget for z3c.form and Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile \
- ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form \
- ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.i18n/Makefile b/www/py-plone.i18n/Makefile
index ded09a33f7b7..992b628f1ac3 100644
--- a/www/py-plone.i18n/Makefile
+++ b/www/py-plone.i18n/Makefile
@@ -12,14 +12,14 @@ COMMENT= Advanced i18n/l10n features
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${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}unidecode>=0:converters/py-unidecode
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${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}unidecode>=0:converters/py-unidecode@${FLAVOR}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.indexer/Makefile b/www/py-plone.indexer/Makefile
index 2a43e5670b62..6773217be7f0 100644
--- a/www/py-plone.indexer/Makefile
+++ b/www/py-plone.indexer/Makefile
@@ -12,10 +12,10 @@ COMMENT= Hooks to facilitate managing custom index values
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>0:devel/py-Products.ZCatalog
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>0:devel/py-Products.ZCatalog@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.intelligenttext/Makefile b/www/py-plone.intelligenttext/Makefile
index 9526830fdb2e..d337598e0ede 100644
--- a/www/py-plone.intelligenttext/Makefile
+++ b/www/py-plone.intelligenttext/Makefile
@@ -13,7 +13,7 @@ COMMENT= Transforms from text/x-web-intelligent to text/html
LICENSE= GPLv2
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.locking/Makefile b/www/py-plone.locking/Makefile
index 156a5118ddf1..8195474fd9af 100644
--- a/www/py-plone.locking/Makefile
+++ b/www/py-plone.locking/Makefile
@@ -12,16 +12,16 @@ COMMENT= WebDAV locking support
LICENSE= GPLv2
-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}zope.schema>=0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
- ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
- ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
+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}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${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} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.memoize/Makefile b/www/py-plone.memoize/Makefile
index 6f093b2c6704..ce3111c978a5 100644
--- a/www/py-plone.memoize/Makefile
+++ b/www/py-plone.memoize/Makefile
@@ -12,10 +12,10 @@ COMMENT= Decorators for caching the values of functions and methods
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache
+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.interface>=0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.namedfile/Makefile b/www/py-plone.namedfile/Makefile
index 43997fd15b1f..3c3f51337e64 100644
--- a/www/py-plone.namedfile/Makefile
+++ b/www/py-plone.namedfile/Makefile
@@ -12,13 +12,13 @@ COMMENT= File types and fields for images, files and blob files with filenames
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage \
- ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.copy>0:devel/py-zope.copy \
- ${PYTHON_PKGNAMEPREFIX}zope.security>0:security/py-zope.security \
- ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing \
- ${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822 \
- ${PYTHON_PKGNAMEPREFIX}zope.app.file>0:devel/py-zope.app.file
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.copy>0:devel/py-zope.copy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>0:security/py-zope.security@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.file>0:devel/py-zope.app.file@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.outputfilters/Makefile b/www/py-plone.outputfilters/Makefile
index 6be083555771..2bfdfb403d87 100644
--- a/www/py-plone.outputfilters/Makefile
+++ b/www/py-plone.outputfilters/Makefile
@@ -12,10 +12,10 @@ COMMENT= Transformations applied to HTML in Plone text fields
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${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
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${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}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.portlet.collection/Makefile b/www/py-plone.portlet.collection/Makefile
index b410152a1417..591d7394705f 100644
--- a/www/py-plone.portlet.collection/Makefile
+++ b/www/py-plone.portlet.collection/Makefile
@@ -12,11 +12,11 @@ COMMENT= Portlet that fetches results from a collection
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
- ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
- ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \
- ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \
- ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.portlet.static/Makefile b/www/py-plone.portlet.static/Makefile
index 663ab3962f50..660832e243c0 100644
--- a/www/py-plone.portlet.static/Makefile
+++ b/www/py-plone.portlet.static/Makefile
@@ -12,18 +12,18 @@ COMMENT= Simple static HTML portlet for Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
- ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \
- ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \
- ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${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.schema>=0:devel/py-zope.schema
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${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.schema>=0:devel/py-zope.schema@${FLAVOR}
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
#USES= zope
diff --git a/www/py-plone.portlets/Makefile b/www/py-plone.portlets/Makefile
index b2585709146f..1119cbbd09e1 100644
--- a/www/py-plone.portlets/Makefile
+++ b/www/py-plone.portlets/Makefile
@@ -12,16 +12,16 @@ COMMENT= Extension of zope.viewlet to support dynamic portlets
LICENSE= GPLv2
-RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
- ${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.contentprovider>=0:devel/py-zope.contentprovider \
- ${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.site>=0:devel/py-zope.site
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \
+ ${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.contentprovider>=0:devel/py-zope.contentprovider@${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.site>=0:devel/py-zope.site@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.registry/Makefile b/www/py-plone.registry/Makefile
index c27e0240096d..112aa4bf9b12 100644
--- a/www/py-plone.registry/Makefile
+++ b/www/py-plone.registry/Makefile
@@ -12,12 +12,12 @@ COMMENT= Registry for storing application settings
LICENSE= GPLv2
-RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
- ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.resource/Makefile b/www/py-plone.resource/Makefile
index bcb0000da389..85afb47f4c89 100644
--- a/www/py-plone.resource/Makefile
+++ b/www/py-plone.resource/Makefile
@@ -13,16 +13,16 @@ COMMENT= Publishes directories of static files via the ZPublisher
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \
- ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
- ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation \
- ${PYTHON_PKGNAMEPREFIX}z3c.caching>=0:devel/py-z3c.caching \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}plone.caching>=0:www/py-plone.caching
+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.traversing>=0:devel/py-zope.traversing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.caching>=0:devel/py-z3c.caching@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.caching>=0:www/py-plone.caching@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.resourceeditor/Makefile b/www/py-plone.resourceeditor/Makefile
index a8d95f85e99c..5b751b28738f 100644
--- a/www/py-plone.resourceeditor/Makefile
+++ b/www/py-plone.resourceeditor/Makefile
@@ -13,11 +13,11 @@ COMMENT= Resources for integrating ACE into Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}plone.resource>0:www/py-plone.resource
+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.publisher>0:devel/py-zope.publisher@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.resource>0:www/py-plone.resource@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-plone.rfc822/Makefile b/www/py-plone.rfc822/Makefile
index 71740eee2021..8158684d5c49 100644
--- a/www/py-plone.rfc822/Makefile
+++ b/www/py-plone.rfc822/Makefile
@@ -12,10 +12,10 @@ COMMENT= RFC822 marshalling for zope.schema fields
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.scale/Makefile b/www/py-plone.scale/Makefile
index 6def6abf78b9..001f7f02505c 100644
--- a/www/py-plone.scale/Makefile
+++ b/www/py-plone.scale/Makefile
@@ -12,10 +12,10 @@ COMMENT= Image scaling
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence
+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.interface>=0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.schemaeditor/Makefile b/www/py-plone.schemaeditor/Makefile
index 469256a52f90..15cb8677ff7f 100644
--- a/www/py-plone.schemaeditor/Makefile
+++ b/www/py-plone.schemaeditor/Makefile
@@ -12,18 +12,18 @@ COMMENT= Provides through-the-web editing of a zope schema/interface
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.container>0:devel/py-zope.container \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \
- ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \
- ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form \
- ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform \
- ${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>0:devel/py-zope.container@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform@${FLAVOR}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.stringinterp/Makefile b/www/py-plone.stringinterp/Makefile
index 4e4fb574caf1..5f8d5ae0020c 100644
--- a/www/py-plone.stringinterp/Makefile
+++ b/www/py-plone.stringinterp/Makefile
@@ -12,11 +12,11 @@ COMMENT= Adaptable string interpolation
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
- ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR}
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.subrequest/Makefile b/www/py-plone.subrequest/Makefile
index 3ea683a59cbf..8dc4e9da363d 100644
--- a/www/py-plone.subrequest/Makefile
+++ b/www/py-plone.subrequest/Makefile
@@ -12,11 +12,11 @@ COMMENT= Subrequests for Zope2
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest \
- ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:devel/py-zope.globalrequest
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:devel/py-zope.globalrequest@${FLAVOR}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.supermodel/Makefile b/www/py-plone.supermodel/Makefile
index de271e83c72f..84fdd90f90f7 100644
--- a/www/py-plone.supermodel/Makefile
+++ b/www/py-plone.supermodel/Makefile
@@ -12,14 +12,14 @@ COMMENT= Serialize Zope schema definitions to and from XML
LICENSE= BSD3CLAUSE
-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.deferredimport>=0:devel/py-zope.deferredimport \
- ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
- ${PYTHON_PKGNAMEPREFIX}z3c.zcmlhook>=0:devel/py-z3c.zcmlhook \
- ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml
+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.deferredimport>=0:devel/py-zope.deferredimport@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.zcmlhook>=0:devel/py-z3c.zcmlhook@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.synchronize/Makefile b/www/py-plone.synchronize/Makefile
index de8fd31a9a99..0590d1906582 100644
--- a/www/py-plone.synchronize/Makefile
+++ b/www/py-plone.synchronize/Makefile
@@ -14,7 +14,7 @@ COMMENT= Simple decorators to support synchronized methods
LICENSE= BSD3CLAUSE
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.testing/Makefile b/www/py-plone.testing/Makefile
index 6cb7b6659b6d..877ed82284ee 100644
--- a/www/py-plone.testing/Makefile
+++ b/www/py-plone.testing/Makefile
@@ -12,7 +12,7 @@ COMMENT= Testing infrastructure for Zope and Plone projects
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.theme/Makefile b/www/py-plone.theme/Makefile
index 29af3781d9de..f72cbaee08ab 100644
--- a/www/py-plone.theme/Makefile
+++ b/www/py-plone.theme/Makefile
@@ -12,14 +12,14 @@ COMMENT= Tools for managing themes in CMF and Plone sites
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.publisher>=0:devel/py-zope.publisher \
- ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore
+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} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR}
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
#USES= zope
diff --git a/www/py-plone.transformchain/Makefile b/www/py-plone.transformchain/Makefile
index a9344bbd4b5c..4c00d2a96a7b 100644
--- a/www/py-plone.transformchain/Makefile
+++ b/www/py-plone.transformchain/Makefile
@@ -12,9 +12,9 @@ COMMENT= Hook into repoze.zope2 for third party packages
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema
+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.schema>=0:devel/py-zope.schema@${FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.uuid/Makefile b/www/py-plone.uuid/Makefile
index 2f5e4e661537..4be645962650 100644
--- a/www/py-plone.uuid/Makefile
+++ b/www/py-plone.uuid/Makefile
@@ -13,13 +13,13 @@ COMMENT= UUIDs for content items
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage \
- ${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
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage@${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}
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plone.z3cform/Makefile b/www/py-plone.z3cform/Makefile
index 517afe5d198a..d9eb24eb8ee4 100644
--- a/www/py-plone.z3cform/Makefile
+++ b/www/py-plone.z3cform/Makefile
@@ -12,14 +12,14 @@ COMMENT= Library that allows use of z3c.form with Zope 2 and the CMF
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching \
- ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form \
- ${PYTHON_PKGNAMEPREFIX}zope.i18n>=3.4:devel/py-zope.i18n \
- ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=3.4:devel/py-zope.i18n@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR}
NO_ARCH= yes
-USES= python zip zope
+USES= python:2.7 zip zope
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plonetheme.classic/Makefile b/www/py-plonetheme.classic/Makefile
index 5239996609ad..3a9dc76fa1f8 100644
--- a/www/py-plonetheme.classic/Makefile
+++ b/www/py-plonetheme.classic/Makefile
@@ -13,7 +13,7 @@ COMMENT= Classic Plone 3 default theme
LICENSE= GPLv2
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-plonetheme.sunburst/Makefile b/www/py-plonetheme.sunburst/Makefile
index a9a145d5d959..6bb10a523464 100644
--- a/www/py-plonetheme.sunburst/Makefile
+++ b/www/py-plonetheme.sunburst/Makefile
@@ -13,7 +13,7 @@ COMMENT= Default theme for Plone 4
LICENSE= GPLv2
NO_ARCH= yes
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
.include <bsd.port.mk>
diff --git a/www/py-poster/Makefile b/www/py-poster/Makefile
index 2e8518b5e27a..6b540aac7e0a 100644
--- a/www/py-poster/Makefile
+++ b/www/py-poster/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Streaming HTTP uploads and multipart/form-data encoding
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
post-extract:
diff --git a/www/py-praw/Makefile b/www/py-praw/Makefile
index e9fadee5ee4f..a0250878c493 100644
--- a/www/py-praw/Makefile
+++ b/www/py-praw/Makefile
@@ -13,11 +13,11 @@ COMMENT= Python Reddit API Wrapper
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.9:devel/py-decorator \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}update_checker>=0.11:devel/py-update_checker
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.9:devel/py-decorator@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}update_checker>=0.11:devel/py-update_checker@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${FLAVOR}
# TEST_DEPENDS to be ported
# betamax >=0.5.1
diff --git a/www/py-puppetboard/Makefile b/www/py-puppetboard/Makefile
index a281248e7d85..0ad6b4c33fb8 100644
--- a/www/py-puppetboard/Makefile
+++ b/www/py-puppetboard/Makefile
@@ -12,11 +12,11 @@ COMMENT= Web interface to PuppetDB
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.9.4:www/py-flask-wtf \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe \
- ${PYTHON_PKGNAMEPREFIX}pypuppetdb>=0.1.1:databases/py-pypuppetdb \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.2.1:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.9.4:www/py-flask-wtf@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pypuppetdb>=0.1.1:databases/py-pypuppetdb@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.2.1:www/py-requests@${FLAVOR}
CONFLICTS_INSTALL=puppetboard02-*
USE_GITHUB= yes
diff --git a/www/py-puppetboard02/Makefile b/www/py-puppetboard02/Makefile
index 0768c36a948c..e99861257206 100644
--- a/www/py-puppetboard02/Makefile
+++ b/www/py-puppetboard02/Makefile
@@ -13,11 +13,11 @@ COMMENT= Web interface to PuppetDB
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.9.4:www/py-flask-wtf \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe \
- ${PYTHON_PKGNAMEPREFIX}pypuppetdb03>=0.2.0:databases/py-pypuppetdb03 \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.2.1:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.9.4:www/py-flask-wtf@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pypuppetdb03>=0.2.0:databases/py-pypuppetdb03@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.2.1:www/py-requests@${FLAVOR}
CONFLICTS_INSTALL=puppetboard-*
USE_GITHUB= yes
diff --git a/www/py-py-restclient/Makefile b/www/py-py-restclient/Makefile
index 5bf73828214e..c1120ffc53c3 100644
--- a/www/py-py-restclient/Makefile
+++ b/www/py-py-restclient/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Python REST Client
-RUN_DEPENDS= ${PKGNAMEPREFIX}httplib2>=0:www/py-httplib2
+RUN_DEPENDS= ${PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-pySmartDL/Makefile b/www/py-pySmartDL/Makefile
index e668ccb71114..82cd942ffb34 100644
--- a/www/py-pySmartDL/Makefile
+++ b/www/py-pySmartDL/Makefile
@@ -18,7 +18,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_VER} == "2.7"
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/www/py-pyjwt/Makefile b/www/py-pyjwt/Makefile
index 733b1a76823a..dbcc8bc9860d 100644
--- a/www/py-pyjwt/Makefile
+++ b/www/py-pyjwt/Makefile
@@ -15,9 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# Some tests are skipped without pycrypto, but its not
# referenced as a requirement anymore.
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
@@ -25,7 +25,7 @@ USE_PYTHON= distutils concurrent autoplist
OPTIONS_DEFINE= RSASSA
RSASSA_DESC= RSASSA-PKCS1 v1.5 signature support
-RSASSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography
+RSASSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR}
NO_ARCH= yes
diff --git a/www/py-pylons/Makefile b/www/py-pylons/Makefile
index aad8d49556f6..2faca82eb363 100644
--- a/www/py-pylons/Makefile
+++ b/www/py-pylons/Makefile
@@ -14,24 +14,24 @@ COMMENT= Python based web framework
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}routes>=1.12.3:www/py-routes \
- ${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:www/py-webhelpers \
- ${PYTHON_PKGNAMEPREFIX}beaker>=1.5.4:www/py-beaker \
- ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.5.1:www/py-paste \
- ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \
- ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.7.4.2:www/py-pastescript \
- ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.1:devel/py-simplejson \
- ${PYTHON_PKGNAMEPREFIX}decorator>=3.3.2:devel/py-decorator \
- ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose \
- ${PYTHON_PKGNAMEPREFIX}mako>=0.5.0:textproc/py-mako \
- ${PYTHON_PKGNAMEPREFIX}WebError>=0.10.3:www/py-WebError \
- ${PYTHON_PKGNAMEPREFIX}WebTest>=1.3.1:www/py-WebTest \
- ${PYTHON_PKGNAMEPREFIX}Tempita>=0.5.1:textproc/py-Tempita \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.15:textproc/py-MarkupSafe \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.1.1:www/py-webob
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}routes>=1.12.3:www/py-routes@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:www/py-webhelpers@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beaker>=1.5.4:www/py-beaker@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.5.1:www/py-paste@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.7.4.2:www/py-pastescript@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.1:devel/py-simplejson@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>=3.3.2:devel/py-decorator@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>=0.5.0:textproc/py-mako@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}WebError>=0.10.3:www/py-WebError@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}WebTest>=1.3.1:www/py-WebTest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Tempita>=0.5.1:textproc/py-Tempita@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.15:textproc/py-MarkupSafe@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.1.1:www/py-webob@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-pyocclient/Makefile b/www/py-pyocclient/Makefile
index cb9bffe74b5e..8bb99a5d5f67 100644
--- a/www/py-pyocclient/Makefile
+++ b/www/py-pyocclient/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python Owncloud client library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests@${FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-pyquery/Makefile b/www/py-pyquery/Makefile
index 5002249080ba..f9eded270850 100644
--- a/www/py-pyquery/Makefile
+++ b/www/py-pyquery/Makefile
@@ -12,18 +12,18 @@ COMMENT= Jquery-like library for python
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:www/py-cssselect \
- ${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:www/py-cssselect \
- ${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:www/py-cssselect@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:www/py-cssselect@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob@${FLAVOR}
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
OPTIONS_DEFINE= DOCS
-USES= python zip
+USES= python:2.7 zip
USE_PYTHON= autoplist distutils
NO_ARCH= yes
diff --git a/www/py-pyramid/Makefile b/www/py-pyramid/Makefile
index 3bbfccaa414d..6cd527032119 100644
--- a/www/py-pyramid/Makefile
+++ b/www/py-pyramid/Makefile
@@ -15,17 +15,17 @@ LICENSE_NAME= Repoze License
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \
- ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0.4:devel/py-repoze.lru \
- ${PYTHON_PKGNAMEPREFIX}translationstring>=0.4:textproc/py-translationstring \
- ${PYTHON_PKGNAMEPREFIX}venusian>=1.0,1:devel/py-venusian \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.3.1:www/py-webob \
- ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=3.5.0:devel/py-zope.deprecation \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.8.0:devel/py-zope.interface
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0.4:devel/py-repoze.lru@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}translationstring>=0.4:textproc/py-translationstring@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}venusian>=1.0,1:devel/py-venusian@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.3.1:www/py-webob@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=3.5.0:devel/py-zope.deprecation@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.8.0:devel/py-zope.interface@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}WebTest>=1.1:www/py-WebTest \
-# ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.0:devel/py-zope.component
+#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}WebTest>=1.1:www/py-WebTest@${FLAVOR} \
+# ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.0:devel/py-zope.component@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-pyramid_rpc/Makefile b/www/py-pyramid_rpc/Makefile
index 10e3dbc50056..48a57fa47300 100644
--- a/www/py-pyramid_rpc/Makefile
+++ b/www/py-pyramid_rpc/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= RPC support for the Pyramid web framework
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyramid>=0:www/py-pyramid
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyramid>=0:www/py-pyramid@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/www/py-pysearch/Makefile b/www/py-pysearch/Makefile
index 43911843bd6b..740feada9c8c 100644
--- a/www/py-pysearch/Makefile
+++ b/www/py-pysearch/Makefile
@@ -12,7 +12,7 @@ DISTNAME= pYsearch-${PORTVERSION}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Yahoo Search Web Services SDK for Python
-USES= python shebangfix
+USES= python:2.7 shebangfix
SHEBANG_FILES= examples/profile.py \
examples/websearch.py
USE_PYTHON= distutils
diff --git a/www/py-python-digitalocean/Makefile b/www/py-python-digitalocean/Makefile
index bdd5786c2f51..04bd96724cf5 100644
--- a/www/py-python-digitalocean/Makefile
+++ b/www/py-python-digitalocean/Makefile
@@ -12,7 +12,7 @@ COMMENT= API to manage digitalocean.com droplets
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-pywebdav/Makefile b/www/py-pywebdav/Makefile
index b44b9cfb76c7..4cab93a2bfe8 100644
--- a/www/py-pywebdav/Makefile
+++ b/www/py-pywebdav/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= WebDAV Library and Server for Python
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-pywikibot/Makefile b/www/py-pywikibot/Makefile
index b5ac6bd03903..c19f0b150a4d 100644
--- a/www/py-pywikibot/Makefile
+++ b/www/py-pywikibot/Makefile
@@ -12,7 +12,7 @@ COMMENT= Wikipedia bot for Python
LICENSE= MIT
-RUN_DEPENDS= ${PKGNAMEPREFIX}httplib2>=0:www/py-httplib2
+RUN_DEPENDS= ${PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
@@ -26,11 +26,11 @@ GOOGLE_DESC= Support for Google search
MWPARSE_DESC= Support for MediaWiki parser
PILLOW_DESC= Support for image processing via pillow module
-ISBN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stdnum>=0:devel/py-stdnum
-PYDOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot
-MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oursql>=0:databases/py-oursql
-GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google>=0:www/py-google
-MWPARSE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwparserfromhell>=0:textproc/py-mwparserfromhell
-PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
+ISBN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stdnum>=0:devel/py-stdnum@${FLAVOR}
+PYDOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oursql>=0:databases/py-oursql@${FLAVOR}
+GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google>=0:www/py-google@${FLAVOR}
+MWPARSE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwparserfromhell>=0:textproc/py-mwparserfromhell@${FLAVOR}
+PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR}
.include <bsd.port.mk>
diff --git a/www/py-qp/Makefile b/www/py-qp/Makefile
index 60ab5ae5d7ba..a0e9505f4227 100644
--- a/www/py-qp/Makefile
+++ b/www/py-qp/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Python web framework to use qpy and durus together
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}durus>=0:devel/py-durus \
- ${PYTHON_PKGNAMEPREFIX}qpy>=1.7:www/py-qpy
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}durus>=0:devel/py-durus@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}qpy>=1.7:www/py-qpy@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/www/py-qt4-webkit/Makefile b/www/py-qt4-webkit/Makefile
index 600b179db076..63207191a5df 100644
--- a/www/py-qt4-webkit/Makefile
+++ b/www/py-qt4-webkit/Makefile
@@ -12,6 +12,7 @@ PYQT_DIST= yes
USES= python pyqt:4
USE_PYQT= sip_build core_run gui_run network_run
+USE_PYTHON= flavors
USE_QT4= corelib gui network webkit \
moc_build qmake_build
diff --git a/www/py-qt5-webkit/Makefile b/www/py-qt5-webkit/Makefile
index c01856bf94ca..021d74f513c7 100644
--- a/www/py-qt5-webkit/Makefile
+++ b/www/py-qt5-webkit/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= www devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtWebKit module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:devel/py-sip
-RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT5_VERSION}:x11-toolkits/py-qt5-gui
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:devel/py-sip@${FLAVOR}
+RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT5_VERSION}:x11-toolkits/py-qt5-gui@${FLAVOR}
CONFIGURE_ARGS= --enable QtWebKit
PYQT_DIST= yes
@@ -16,6 +16,7 @@ PYQT_DIST= yes
USES= python pyqt:5
USE_GL= gl
USE_PYQT= sip_build core_run gui_run network_run
+USE_PYTHON= flavors
USE_QT5= core gui network webkit qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/www/py-qt5-webkitwidgets/Makefile b/www/py-qt5-webkitwidgets/Makefile
index c19fb9bf59cb..713f2cf1892e 100644
--- a/www/py-qt5-webkitwidgets/Makefile
+++ b/www/py-qt5-webkitwidgets/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
USES= python pyqt:5
USE_GL= gl
USE_PYQT= sip_build core_run printsupport_run webkit_run widgets_run
+USE_PYTHON= flavors
USE_QT5= core gui network printsupport webkit widgets \
qmake_build
diff --git a/www/py-rackspace-monitoring/Makefile b/www/py-rackspace-monitoring/Makefile
index 5ad472628ed5..eb4627b8d356 100644
--- a/www/py-rackspace-monitoring/Makefile
+++ b/www/py-rackspace-monitoring/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python client library for Rackspace Cloud Monitoring
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14:net/py-libcloud
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14:net/py-libcloud@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-requestbuilder/Makefile b/www/py-requestbuilder/Makefile
index bf03290a96e0..022391fbb1a8 100644
--- a/www/py-requestbuilder/Makefile
+++ b/www/py-requestbuilder/Makefile
@@ -13,8 +13,8 @@ COMMENT= Command line-driven HTTP request builder
LICENSE= ISCL
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.4:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.4:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
USES= python:-2.7
USE_PYTHON= distutils autoplist
diff --git a/www/py-requests-cache/Makefile b/www/py-requests-cache/Makefile
index 27d57bbe67ee..9ac687642a96 100644
--- a/www/py-requests-cache/Makefile
+++ b/www/py-requests-cache/Makefile
@@ -13,9 +13,9 @@ COMMENT= Persistent cache for requests library
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.1.0:www/py-requests
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.1.0:www/py-requests@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
# Python 2.6-3.5(+) 20171026
USES= python
diff --git a/www/py-requests-file/Makefile b/www/py-requests-file/Makefile
index 29193d787371..a224699624c8 100644
--- a/www/py-requests-file/Makefile
+++ b/www/py-requests-file/Makefile
@@ -11,8 +11,8 @@ COMMENT= Transport adapter for use with the Requests Python library
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
NO_ARCH= yes
diff --git a/www/py-requests-futures/Makefile b/www/py-requests-futures/Makefile
index 0a510e57f48c..6eda7ba6fc7e 100644
--- a/www/py-requests-futures/Makefile
+++ b/www/py-requests-futures/Makefile
@@ -15,14 +15,14 @@ LICENSE= APACHE20
USES= python
USE_PYTHON= autoplist distutils
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_VER} == "2.7"
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/www/py-requests-mock/Makefile b/www/py-requests-mock/Makefile
index d1bd2f4ca698..4f8bdabfc979 100644
--- a/www/py-requests-mock/Makefile
+++ b/www/py-requests-mock/Makefile
@@ -13,9 +13,9 @@ COMMENT= Mock out responses from the requests package
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0:devel/py-pbr
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.1:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0:devel/py-pbr@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.1:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-requests-oauthlib/Makefile b/www/py-requests-oauthlib/Makefile
index bec57a020069..fa1ad4104eca 100644
--- a/www/py-requests-oauthlib/Makefile
+++ b/www/py-requests-oauthlib/Makefile
@@ -12,9 +12,9 @@ COMMENT= OAuthlib authentication support for Requests
LICENSE= ISCL
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauthlib>=0.6.2:security/py-oauthlib \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauthlib>=0.6.2:security/py-oauthlib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-requests-toolbelt/Makefile b/www/py-requests-toolbelt/Makefile
index de434eac2633..e5e4d9524b3f 100644
--- a/www/py-requests-toolbelt/Makefile
+++ b/www/py-requests-toolbelt/Makefile
@@ -11,7 +11,7 @@ COMMENT= Utility belt for advanced users of python-requests
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.0.1:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.0.1:www/py-requests@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-requests/Makefile b/www/py-requests/Makefile
index 6b92ad08f702..677952c31085 100644
--- a/www/py-requests/Makefile
+++ b/www/py-requests/Makefile
@@ -14,17 +14,17 @@ COMMENT= HTTP library written in Python for human beings
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py-chardet \
- ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna \
- ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3 \
- ${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py-certifi
-TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist \
- ${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py-execnet \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py-chardet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py-certifi@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py-execnet@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
# Actually 2.6-2.7,3.3+
-USES?= python
+USES= python
USE_PYTHON= autoplist concurrent distutils
CONFLICTS_INSTALL= py*-requests1-*
diff --git a/www/py-restclient/Makefile b/www/py-restclient/Makefile
index 8c9a39c49f7b..fb6ab3e3887c 100644
--- a/www/py-restclient/Makefile
+++ b/www/py-restclient/Makefile
@@ -13,7 +13,7 @@ COMMENT= Convenient library for writing REST clients
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PKGNAMEPREFIX}httplib2>=0:www/py-httplib2
+RUN_DEPENDS= ${PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-rhodecode/Makefile b/www/py-rhodecode/Makefile
index f7d79f18c580..06ad3ae6c721 100644
--- a/www/py-rhodecode/Makefile
+++ b/www/py-rhodecode/Makefile
@@ -14,28 +14,28 @@ COMMENT= Fast and powerful management tool for Mercurial and GIT
LICENSE= GPLv3
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylons>=1.0:www/py-pylons \
- ${PYTHON_PKGNAMEPREFIX}waitress>=0.8.4:www/py-waitress \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.0.8:www/py-webob \
- ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode \
- ${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:www/py-webhelpers \
- ${PYTHON_PKGNAMEPREFIX}mako>=0.7.3:textproc/py-mako \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.10:databases/py-sqlalchemy10 \
- ${PYTHON_PKGNAMEPREFIX}pygments>=1.5:textproc/py-pygments \
- ${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:textproc/py-whoosh \
- ${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylons>=1.0:www/py-pylons@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}waitress>=0.8.4:www/py-waitress@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.0.8:www/py-webob@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:www/py-webhelpers@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>=0.7.3:textproc/py-mako@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.10:databases/py-sqlalchemy10@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=1.5:textproc/py-pygments@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:textproc/py-whoosh@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.7:devel/dulwich \
- ${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:textproc/py-markdown \
- ${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:textproc/py-docutils \
- ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \
- ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.2:security/py-bcrypt \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=2.5.2:devel/py-simplejson \
- ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript \
- ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0:devel/py-repoze.lru \
- ${PYTHON_PKGNAMEPREFIX}celery>=0:devel/py-celery \
+ ${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:textproc/py-markdown@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:textproc/py-docutils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.2:security/py-bcrypt@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.5.2:devel/py-simplejson@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0:devel/py-repoze.lru@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}celery>=0:devel/py-celery@${FLAVOR} \
mercurial>=2.6:devel/mercurial
USES= python:2
@@ -52,7 +52,7 @@ GIT_DESC= GIT support
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MLDAP}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.6:net/py-ldap
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.6:net/py-ldap@${FLAVOR}
.endif
.if ${PORT_OPTIONS:MGIT}
diff --git a/www/py-rollbar/Makefile b/www/py-rollbar/Makefile
index 3f393fd3fc7c..9df99021a792 100644
--- a/www/py-rollbar/Makefile
+++ b/www/py-rollbar/Makefile
@@ -11,8 +11,8 @@ COMMENT= Easy and powerful exception tracking with Rollbar
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}six>=1.5.7:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.5.7:devel/py-six@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-routes/Makefile b/www/py-routes/Makefile
index dfca5b700cfe..25a912aa96d3 100644
--- a/www/py-routes/Makefile
+++ b/www/py-routes/Makefile
@@ -13,8 +13,8 @@ COMMENT= Routing package for Python that matches URLs to dicts and vice versa
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0.3:devel/py-repoze.lru
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0.3:devel/py-repoze.lru@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-scgi/Makefile b/www/py-scgi/Makefile
index 8e08f83a09fb..5a55a7c896b8 100644
--- a/www/py-scgi/Makefile
+++ b/www/py-scgi/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python server implementation of the Simple Common Gateway Protocol
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-scrapy/Makefile b/www/py-scrapy/Makefile
index eb544bc66c57..221771fe07d4 100644
--- a/www/py-scrapy/Makefile
+++ b/www/py-scrapy/Makefile
@@ -13,15 +13,15 @@ COMMENT= High level scraping and web crawling framework
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=15.5.0:devel/py-twisted \
- ${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}w3lib>=1.14.2:www/py-w3lib \
- ${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:www/py-cssselect \
- ${PYTHON_PKGNAMEPREFIX}queuelib>=1.2.2:sysutils/py-queuelib \
- ${PYTHON_PKGNAMEPREFIX}pydispatcher>=2.0.5:devel/py-pydispatcher \
- ${PYTHON_PKGNAMEPREFIX}service_identity>0:security/py-service_identity \
- ${PYTHON_PKGNAMEPREFIX}parsel>=1.1:textproc/py-parsel
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=15.5.0:devel/py-twisted@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}w3lib>=1.14.2:www/py-w3lib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:www/py-cssselect@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}queuelib>=1.2.2:sysutils/py-queuelib@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pydispatcher>=2.0.5:devel/py-pydispatcher@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}service_identity>0:security/py-service_identity@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}parsel>=1.1:textproc/py-parsel@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
@@ -32,7 +32,7 @@ OPTIONS_DEFAULT=SSL
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MSSL}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR}
.endif
.include <bsd.port.mk>
diff --git a/www/py-seafdav/Makefile b/www/py-seafdav/Makefile
index ac22bbea06da..a64ea23ec55f 100644
--- a/www/py-seafdav/Makefile
+++ b/www/py-seafdav/Makefile
@@ -16,6 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= python:-2.7 shebangfix
USE_GITHUB= yes
GH_ACCOUNT= haiwen
+USE_PYTHON= flavors
SHEBANG_FILES= *.sh *.template wsgidav/addons/seafile/*.py
NO_ARCH= yes
diff --git a/www/py-seafobj/Makefile b/www/py-seafobj/Makefile
index 481353fa533c..12309eabe5e3 100644
--- a/www/py-seafobj/Makefile
+++ b/www/py-seafobj/Makefile
@@ -16,6 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USES= python:-2.7 shebangfix
USE_GITHUB= yes
GH_ACCOUNT= haiwen
+USE_PYTHON= flavors
SHEBANG_FILES= *.sh *.py
NO_ARCH= yes
diff --git a/www/py-searx/Makefile b/www/py-searx/Makefile
index 831893a0a13d..ca6cc67b3cc5 100644
--- a/www/py-searx/Makefile
+++ b/www/py-searx/Makefile
@@ -12,17 +12,17 @@ COMMENT= Searx / a privacy-respecting, hackable metasearch engine
LICENSE= AGPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.0:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}Flask-Babel>=0.11.1:devel/py-flask-babel \
- ${PYTHON_PKGNAMEPREFIX}lxml>=3.6.0:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.4.1:net/py-ndg_httpsclient \
- ${PYTHON_PKGNAMEPREFIX}openssl>=0.15.1:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments \
- ${PYTHON_PKGNAMEPREFIX}Flask>=0.11.1:www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.10:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug \
- ${PYTHON_PKGNAMEPREFIX}certifi>=2016.2.28:security/py-certifi
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.0:devel/py-dateutil@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Babel>=0.11.1:devel/py-flask-babel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=3.6.0:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.4.1:net/py-ndg_httpsclient@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0.15.1:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask>=0.11.1:www/py-flask@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}certifi>=2016.2.28:security/py-certifi@${FLAVOR}
USE_RC_SUBR= searx
diff --git a/www/py-selector/Makefile b/www/py-selector/Makefile
index 08117b202500..306a78d61dc9 100644
--- a/www/py-selector/Makefile
+++ b/www/py-selector/Makefile
@@ -12,7 +12,7 @@ COMMENT= WSGI request delegation (a.k.a. routing)
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}resolver>=0.2.1:devel/py-resolver
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}resolver>=0.2.1:devel/py-resolver@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-slimit/Makefile b/www/py-slimit/Makefile
index 90865bdf2deb..b15f816af5af 100644
--- a/www/py-slimit/Makefile
+++ b/www/py-slimit/Makefile
@@ -11,8 +11,8 @@ COMMENT= JavaScript minifier written in Python
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${FLAVOR}
USES= python:2 zip
USE_PYTHON= distutils autoplist
@@ -22,7 +22,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} >= 3000
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
pre-build:
@cd ${WRKSRC} && 2to3-${PYTHON_VER} -w src
.endif
diff --git a/www/py-slimmer/Makefile b/www/py-slimmer/Makefile
index 4bc0f5719f33..15b426d7c07e 100644
--- a/www/py-slimmer/Makefile
+++ b/www/py-slimmer/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= corsmith@gmail.com
COMMENT= Whitespace optimizer for CSS, HTML and XHTML output
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-slumber/Makefile b/www/py-slumber/Makefile
index 616459f0eaee..4415937cc194 100644
--- a/www/py-slumber/Makefile
+++ b/www/py-slumber/Makefile
@@ -12,13 +12,13 @@ COMMENT= Library that makes consuming a REST API easier and more convenient
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
OPTIONS_DEFINE= YAML
YAML_DESC= YAML serializer support
-YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
+YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/www/py-sockjs-tornado/Makefile b/www/py-sockjs-tornado/Makefile
index ece2d4e9475a..188483fcbeb1 100644
--- a/www/py-sockjs-tornado/Makefile
+++ b/www/py-sockjs-tornado/Makefile
@@ -12,7 +12,7 @@ COMMENT= SockJS python server implementation on top of Tornado framework
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR}
NO_ARCH= yes
USES= python:2.7+
diff --git a/www/py-splinter/Makefile b/www/py-splinter/Makefile
index 18e6865fc1e7..24ae57cc90ca 100644
--- a/www/py-splinter/Makefile
+++ b/www/py-splinter/Makefile
@@ -12,11 +12,11 @@ COMMENT= Browser abstraction for web acceptance testing
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}selenium>=2.47:www/py-selenium \
- ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.4:devel/py-zope.testbrowser \
- ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}selenium>=2.47:www/py-selenium@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.4:devel/py-zope.testbrowser@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-spyne/Makefile b/www/py-spyne/Makefile
index 3b2b8046bf1a..2824856ea993 100644
--- a/www/py-spyne/Makefile
+++ b/www/py-spyne/Makefile
@@ -12,10 +12,10 @@ COMMENT= Transport and architecture agnostic RPC library
LICENSE= LGPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
-USES= python
+USES= python:2.7
.include <bsd.port.mk>
diff --git a/www/py-textile/Makefile b/www/py-textile/Makefile
index acc0ef3df493..6783ea4309c8 100644
--- a/www/py-textile/Makefile
+++ b/www/py-textile/Makefile
@@ -12,8 +12,8 @@ COMMENT= Textile markup generator written in Python
LICENSE= BSD2CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner \
- ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-tornado/Makefile b/www/py-tornado/Makefile
index 5467cc4281c9..b65ccffa1543 100644
--- a/www/py-tornado/Makefile
+++ b/www/py-tornado/Makefile
@@ -18,12 +18,12 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3400
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch \
- ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${FLAVOR}
.endif
.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports_abc>=0.4:devel/py-backports_abc
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports_abc>=0.4:devel/py-backports_abc@${FLAVOR}
.endif
post-build:
diff --git a/www/py-trello/Makefile b/www/py-trello/Makefile
index cea90d631d7f..dea0b5dd94b8 100644
--- a/www/py-trello/Makefile
+++ b/www/py-trello/Makefile
@@ -16,7 +16,7 @@ LICENSE_NAME= Fog Creek Software
LICENSE_FILE= ${WRKSRC}/PKG-INFO
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.9.1:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.9.1:www/py-requests@${FLAVOR}
USES= python:-2.7 zip
USE_PYTHON= autoplist distutils
diff --git a/www/py-treq/Makefile b/www/py-treq/Makefile
index c3b2ec7ee803..8667b9c969be 100644
--- a/www/py-treq/Makefile
+++ b/www/py-treq/Makefile
@@ -12,18 +12,18 @@ COMMENT= Requests-like API built on top of twisted.web's Agent
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}incremental>=0:devel/py-incremental
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs \
- ${PYTHON_PKGNAMEPREFIX}twisted>=16.4.0:devel/py-twisted \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:www/py-requests
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}incremental>=0:devel/py-incremental@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=16.4.0:devel/py-twisted@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:www/py-requests@${FLAVOR}
# Depend directly on twisted[tls] dependencies
# As Twisted port may not (optionally) install them
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl \
- ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \
- ${PYTHON_PKGNAMEPREFIX}idna>=2.4:dns/py-idna
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}idna>=2.4:dns/py-idna@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR}
USES= python:2.7+ # Actually 2.7+,3.3+
USE_PYTHON= autoplist distutils
diff --git a/www/py-turbogears2/Makefile b/www/py-turbogears2/Makefile
index dcb9a0f67127..e4bce1515e1a 100644
--- a/www/py-turbogears2/Makefile
+++ b/www/py-turbogears2/Makefile
@@ -12,10 +12,10 @@ COMMENT= Python-Based Framework for Rapid Web Development
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}crank>=0:devel/py-crank \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0:textproc/py-MarkupSafe \
- ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0:devel/py-repoze.lru
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}crank>=0:devel/py-crank@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0:textproc/py-MarkupSafe@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0:devel/py-repoze.lru@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-tvdb_api/Makefile b/www/py-tvdb_api/Makefile
index a0e9dabb7745..cc42ec2c5c9f 100644
--- a/www/py-tvdb_api/Makefile
+++ b/www/py-tvdb_api/Makefile
@@ -14,9 +14,9 @@ COMMENT= API interface to TheTVDB.com
LICENSE= UNLICENSE
LICENSE_FILE= ${WRKSRC}/UNLICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}requests-cache>0:www/py-requests-cache
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-cache>0:www/py-requests-cache@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-txrequests/Makefile b/www/py-txrequests/Makefile
index b599fe5474b4..4899e0dfb64d 100644
--- a/www/py-txrequests/Makefile
+++ b/www/py-txrequests/Makefile
@@ -13,8 +13,8 @@ COMMENT= Asynchronous Python HTTP for Humans
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}twisted>=9.0.0:devel/py-twisted
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=9.0.0:devel/py-twisted@${FLAVOR}
USES= python:-2.7
USE_PYTHON= autoplist distutils
diff --git a/www/py-urlgrabber/Makefile b/www/py-urlgrabber/Makefile
index c9a8db971414..bd171e1ba920 100644
--- a/www/py-urlgrabber/Makefile
+++ b/www/py-urlgrabber/Makefile
@@ -14,7 +14,7 @@ COMMENT= High-level cross-protocol url-grabber
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.0_1:ftp/py-pycurl
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.0_1:ftp/py-pycurl@${FLAVOR}
DOCS_MAKE_ENV= INSTALL_DOCS=yes
DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
diff --git a/www/py-user_agent/Makefile b/www/py-user_agent/Makefile
index 47d2d0719640..b8f603aa4ad9 100644
--- a/www/py-user_agent/Makefile
+++ b/www/py-user_agent/Makefile
@@ -11,7 +11,7 @@ COMMENT= Generates random, valid User-Agent values
LICENSE= MIT
-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+
diff --git a/www/py-w3lib/Makefile b/www/py-w3lib/Makefile
index 022e0a883396..99df52732ca2 100644
--- a/www/py-w3lib/Makefile
+++ b/www/py-w3lib/Makefile
@@ -11,7 +11,7 @@ COMMENT= Library of web-related functions
LICENSE= BSD3CLAUSE
-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+
diff --git a/www/py-webhelpers/Makefile b/www/py-webhelpers/Makefile
index ab5c5dd82193..adc8e96faebf 100644
--- a/www/py-webhelpers/Makefile
+++ b/www/py-webhelpers/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python helper functions for writing templates in web applications
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}routes>=1.1:www/py-routes \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.11:textproc/py-MarkupSafe
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}routes>=1.1:www/py-routes@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.11:textproc/py-MarkupSafe@${FLAVOR}
USES= python:2
USE_PYTHON= distutils autoplist
diff --git a/www/py-webkitgtk/Makefile b/www/py-webkitgtk/Makefile
index 0f603a9125f1..e775e5df4c84 100644
--- a/www/py-webkitgtk/Makefile
+++ b/www/py-webkitgtk/Makefile
@@ -21,5 +21,6 @@ GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USES= gmake libtool pathfix pkgconfig python:2 tar:bzip2
USE_GNOME= glib20 libxslt pygtk2
+USE_PYTHON= flavors
.include <bsd.port.mk>
diff --git a/www/py-webob/Makefile b/www/py-webob/Makefile
index 0edca5644acc..2e976c5d7f3d 100644
--- a/www/py-webob/Makefile
+++ b/www/py-webob/Makefile
@@ -12,7 +12,7 @@ COMMENT= WSGI request and response Python object
LICENSE= MIT
-DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx
+DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
OPTIONS_DEFINE= DOCS TESTS
diff --git a/www/py-werkzeug/Makefile b/www/py-werkzeug/Makefile
index 03ab5c4c3291..eee33c9d10cb 100644
--- a/www/py-werkzeug/Makefile
+++ b/www/py-werkzeug/Makefile
@@ -14,12 +14,12 @@ COMMENT= Python utilities collection for building WSGI applications
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl@${FLAVOR}
OPTIONS_DEFINE= EXAMPLES WATCHDOG
WATCHDOG_DESC= Monitor filesystem events
-WATCHDOG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}watchdog>=0.8:devel/py-watchdog \
- ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor
+WATCHDOG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}watchdog>=0.8:devel/py-watchdog@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-wikipedia/Makefile b/www/py-wikipedia/Makefile
index f8c435441274..275986532558 100644
--- a/www/py-wikipedia/Makefile
+++ b/www/py-wikipedia/Makefile
@@ -12,8 +12,8 @@ COMMENT= Wikipedia API for Python
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.7:www/py-requests
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.7:www/py-requests@${FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-ws4py/Makefile b/www/py-ws4py/Makefile
index f433298fcfac..67dae774eadf 100644
--- a/www/py-ws4py/Makefile
+++ b/www/py-ws4py/Makefile
@@ -23,9 +23,9 @@ CHERRYPY_DESC= CherryPy server support
GEVENT_DESC= gevent-based client/server support
TORNADO_DESC= Tornado client support
-CHERRYPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2.2:www/py-cherrypy
-GEVENT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:devel/py-gevent
-TORNADO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>=3.1:www/py-tornado
+CHERRYPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2.2:www/py-cherrypy@${FLAVOR}
+GEVENT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:devel/py-gevent@${FLAVOR}
+TORNADO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>=3.1:www/py-tornado@${FLAVOR}
# Do not install files which will not work
post-patch-CHERRYPY-off:
diff --git a/www/py-wsgiauth/Makefile b/www/py-wsgiauth/Makefile
index 65db402b4453..0a311b2545f6 100644
--- a/www/py-wsgiauth/Makefile
+++ b/www/py-wsgiauth/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= bamby@sippysoft.com
COMMENT= WSGI authentication middleware
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-wsgidav/Makefile b/www/py-wsgidav/Makefile
index 9804d115809a..59b7cefecbbe 100644
--- a/www/py-wsgidav/Makefile
+++ b/www/py-wsgidav/Makefile
@@ -11,13 +11,13 @@ COMMENT= WSGI based WebDAV server for sharing resources
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy \
- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}cov-core>=0:devel/py-cov-core \
- ${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest \
- ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cov-core>=0:devel/py-cov-core@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${FLAVOR}
NO_ARCH= yes
USES= python zip
diff --git a/www/py-yarl/Makefile b/www/py-yarl/Makefile
index 76f36ffa5840..faa3c6292454 100644
--- a/www/py-yarl/Makefile
+++ b/www/py-yarl/Makefile
@@ -12,13 +12,12 @@ COMMENT= Yet another URL library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= cython:lang/cython
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}multidict>=2.0:www/py-multidict
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
- ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}multidict>=2.0:www/py-multidict@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR}
USES= python:3.4+
-USE_PYTHON= autoplist distutils
+USE_PYTHON= autoplist distutils cython
do-test:
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
diff --git a/www/py-zope.app.wsgi/Makefile b/www/py-zope.app.wsgi/Makefile
index 76caf8e730ad..d6d2be293a15 100644
--- a/www/py-zope.app.wsgi/Makefile
+++ b/www/py-zope.app.wsgi/Makefile
@@ -13,28 +13,28 @@ COMMENT= WSGI application for the zope.publisher
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest \
- ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig \
- zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.14:devel/py-zope.app.appsetup \
- ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \
- ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \
- ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
- ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
- ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=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.lifecycleevent>=0:devel/py-zope.lifecycleevent \
- ${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session \
- ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
- ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:devel/py-zope.testbrowser \
- ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \
- ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.14:devel/py-zope.app.appsetup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=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.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:devel/py-zope.testbrowser@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py3-cssutils/Makefile b/www/py3-cssutils/Makefile
deleted file mode 100644
index 60dd2b095221..000000000000
--- a/www/py3-cssutils/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-USES= python:3.3+
-
-PORTSCOUT= ignore:1
-
-MASTERDIR= ${.CURDIR}/../py-cssutils
-
-.include "${MASTERDIR}/Makefile"
diff --git a/www/py3-httplib2/Makefile b/www/py3-httplib2/Makefile
deleted file mode 100644
index 869d6ab1fa60..000000000000
--- a/www/py3-httplib2/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-httplib2
-
-USES= python:3
-
-.include "${MASTERDIR}/Makefile"
diff --git a/www/py3-requests/Makefile b/www/py3-requests/Makefile
deleted file mode 100644
index 156e032eb785..000000000000
--- a/www/py3-requests/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-requests
-
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py3-chardet \
- ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py3-idna \
- ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py3-urllib3 \
- ${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py3-certifi
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py3-pytest \
- ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py3-pytest-xdist \
- ${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py3-execnet \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py3-mock
-
-USES= python:3.3+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/www/pycarddav/Makefile b/www/pycarddav/Makefile
index cf5ba140b154..0239dcc16f21 100644
--- a/www/pycarddav/Makefile
+++ b/www/pycarddav/Makefile
@@ -13,12 +13,12 @@ COMMENT= Simple to use CardDAV CLI client
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}vobject>0:deskutils/py-vobject \
- ${PYTHON_PKGNAMEPREFIX}urwid>0:devel/py-urwid \
- ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg \
- ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vobject>0:deskutils/py-vobject@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urwid>0:devel/py-urwid@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
USES= python:2
USE_PYTHON= autoplist distutils
diff --git a/www/pyjamas/Makefile b/www/pyjamas/Makefile
index 65459f079363..ac812a37c0ae 100644
--- a/www/pyjamas/Makefile
+++ b/www/pyjamas/Makefile
@@ -12,7 +12,7 @@ MAINTAINER= nivit@FreeBSD.org
COMMENT= Port of Google Web Toolkit to Python
# install/require some libraries in sys.prefix
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist pythonprefix
REINPLACE_ARGS= -i '' -e 's,../../bin,${PREFIX}/bin,'
diff --git a/www/qutebrowser/Makefile b/www/qutebrowser/Makefile
index 8caba81a5bdc..7663a9fe66f1 100644
--- a/www/qutebrowser/Makefile
+++ b/www/qutebrowser/Makefile
@@ -11,21 +11,21 @@ COMMENT= Keyboard-focused browser with a minimal GUI
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs \
- ${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py3-colorama \
- ${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py3-cssutils \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0:textproc/py3-MarkupSafe \
- ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \
- ${PYTHON_PKGNAMEPREFIX}pyPEG2>=0:textproc/py3-pyPEG2 \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0:textproc/py-MarkupSafe@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyPEG2>=0:textproc/py-pyPEG2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip@${FLAVOR}
NO_ARCH= yes
USES= python:3.5+ pyqt:5
USE_PYQT= core opengl printsupport sql webkit webkitwidgets widgets qml
USE_QT5= sql-sqlite3
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist optsuffix
USE_GITHUB= yes
.include <bsd.port.mk>
diff --git a/www/radicale/Makefile b/www/radicale/Makefile
index bc4b61c733a7..3b0f2f9bf282 100644
--- a/www/radicale/Makefile
+++ b/www/radicale/Makefile
@@ -35,11 +35,11 @@ USES+= python
.endif
.if ${PORT_OPTIONS:MHTTP}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}requests1>=0:www/py-requests1
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}requests1>=0:www/py-requests1@${FLAVOR}
.endif
.if ${PORT_OPTIONS:MLDAP}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ldap>=0:net/py-ldap
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ldap>=0:net/py-ldap@${FLAVOR}
.endif
post-patch:
diff --git a/www/roundup/Makefile b/www/roundup/Makefile
index 0fcb52c32af5..5bfeea6ed84f 100644
--- a/www/roundup/Makefile
+++ b/www/roundup/Makefile
@@ -12,7 +12,7 @@ COMMENT= Issue-Tracking System for Knowledge Workers
LICENSE= PSFL
LICENSE_FILE= ${WRKSRC}/COPYING.txt
-USES= cpe gettext python
+USES= cpe gettext python:2.7
CPE_VENDOR= roundup-tracker
USE_PYTHON= distutils
NO_ARCH= yes
@@ -21,9 +21,9 @@ OPTIONS_DEFINE= SQLITE PGSQL MYSQL NLS
OPTIONS_DEFAULT=SQLITE
OPTIONS_SUB= yes
-SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
-PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
-MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${FLAVOR}
SCRIPTS= roundup-admin roundup-demo roundup-gettext roundup-mailgw \
roundup-server roundup-xmlrpc-server
diff --git a/www/rtv/Makefile b/www/rtv/Makefile
index 87c5addfed5e..ce88259e2d1d 100644
--- a/www/rtv/Makefile
+++ b/www/rtv/Makefile
@@ -11,23 +11,23 @@ COMMENT= Commandline client for reddit
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}kitchen>=1.2.4:devel/py-kitchen \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.1:www/py-beautifulsoup \
- ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.10:devel/py-decorator
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}kitchen>=1.2.4:devel/py-kitchen@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.1:www/py-beautifulsoup@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.10:devel/py-decorator@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= michael-lazar
NO_ARCH= yes
USES= python
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils autoplist concurrent optsuffix
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3600
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mailcap_fix>=0.1.3:devel/py-mailcap-fix
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mailcap_fix>=0.1.3:devel/py-mailcap-fix@${FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/www/seahub/Makefile b/www/seahub/Makefile
index 8ce7db0b8a76..1865e1979ae2 100644
--- a/www/seahub/Makefile
+++ b/www/seahub/Makefile
@@ -14,25 +14,25 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= bash:shells/bash \
${LOCALBASE}/www/haiwen/seafile-server/seafile/bin/seaf-server:net-mgmt/seafile-server \
- ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
- ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}django-statici18n>=0:www/py-django-statici18n \
- ${PYTHON_PKGNAMEPREFIX}djangorestframework>=0:www/py-djangorestframework \
- ${PYTHON_PKGNAMEPREFIX}django_compressor>=0:www/py-django_compressor \
- ${PYTHON_PKGNAMEPREFIX}django-formtools>=0:www/py-django-formtools \
- ${PYTHON_PKGNAMEPREFIX}django-post_office>=0:www/py-django-post_office \
- ${PYTHON_PKGNAMEPREFIX}django-constance>=0:www/py-django-constance \
- ${PYTHON_PKGNAMEPREFIX}gunicorn>=0:www/py-gunicorn \
- ${PYTHON_PKGNAMEPREFIX}flup>=0:www/py-flup \
- ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl \
- ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb \
- ${PYTHON_PKGNAMEPREFIX}qrcode>0:textproc/py-qrcode \
- ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures
+ ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-statici18n>=0:www/py-django-statici18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}djangorestframework>=0:www/py-djangorestframework@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django_compressor>=0:www/py-django_compressor@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-formtools>=0:www/py-django-formtools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-post_office>=0:www/py-django-post_office@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-constance>=0:www/py-django-constance@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gunicorn>=0:www/py-gunicorn@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}flup>=0:www/py-flup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}qrcode>0:textproc/py-qrcode@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${PY_FLAVOR}
USES= python:-2.7 shebangfix
USE_GITHUB= yes
@@ -50,10 +50,10 @@ SEAFOBJ_DESC= Enable Seafile file object modeling support
SEAFDAV_DESC= Enable Seafile WsgiDav-based support
SEAFOBJ_CONFIGURE_WITH= seafobj
-SEAFOBJ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}seafobj>0:www/py-seafobj
+SEAFOBJ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}seafobj>0:www/py-seafobj@${PY_FLAVOR}
SEAFDAV_CONFIGURE_WITH= seafdav
-SEAFDAV_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}seafdav>0:www/py-seafdav
+SEAFDAV_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}seafdav>0:www/py-seafdav@${PY_FLAVOR}
NLS_USES= gettext iconv
NLS_CONFIGURE_OFF= --disable-nls
diff --git a/www/trac-OhlohWidgetsMacro/Makefile b/www/trac-OhlohWidgetsMacro/Makefile
index f2525792e4f9..7da5f8a081ad 100644
--- a/www/trac-OhlohWidgetsMacro/Makefile
+++ b/www/trac-OhlohWidgetsMacro/Makefile
@@ -13,10 +13,10 @@ COMMENT= Trac macro to embed Ohloh widgets
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycerberus>=0.3:devel/py-pycerberus \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycerberus>=0.3:devel/py-pycerberus@${FLAVOR} \
tracd:www/trac
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/www/trac-TracGoogleAnalytics/Makefile b/www/trac-TracGoogleAnalytics/Makefile
index 33f19967ffd1..096863e1862f 100644
--- a/www/trac-TracGoogleAnalytics/Makefile
+++ b/www/trac-TracGoogleAnalytics/Makefile
@@ -15,10 +15,10 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= tracd:www/trac \
- ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi
+ ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/www/trac-advancedticketworkflow/Makefile b/www/trac-advancedticketworkflow/Makefile
index 8f2783e2da3f..2ee3371c0e86 100644
--- a/www/trac-advancedticketworkflow/Makefile
+++ b/www/trac-advancedticketworkflow/Makefile
@@ -15,7 +15,7 @@ COMMENT= Advanced Ticket Workflow Plugin for Trac
RUN_DEPENDS= tracd:www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/www/trac-iniadmin/Makefile b/www/trac-iniadmin/Makefile
index b12926d6adc1..ec753a17927b 100644
--- a/www/trac-iniadmin/Makefile
+++ b/www/trac-iniadmin/Makefile
@@ -15,7 +15,7 @@ COMMENT= Edit all trac.ini option via the WebAdminPlugin
RUN_DEPENDS= tracd:www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/www/trac-ldapauthstore/Makefile b/www/trac-ldapauthstore/Makefile
index a7066ba9c31e..85e926a6db08 100644
--- a/www/trac-ldapauthstore/Makefile
+++ b/www/trac-ldapauthstore/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= tracd:www/trac \
trac-accountmanager>0:www/trac-accountmanager \
trac-ldap>0:www/trac-ldap \
- ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap
+ ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${FLAVOR}
NO_ARCH= yes
PORTSCOUT= ignore:1
diff --git a/www/trac-permredirect/Makefile b/www/trac-permredirect/Makefile
index 70fde7c5f3a4..b2a00e5a8802 100644
--- a/www/trac-permredirect/Makefile
+++ b/www/trac-permredirect/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= tracd:www/trac
FETCH_BEFORE_ARGS= -o ${DISTFILES}
REV= 13353
-USES= python zip:infozip
+USES= python:2.7 zip:infozip
USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/tags/${PORTVERSION}
NO_ARCH= yes
diff --git a/www/trac-privatetickets/Makefile b/www/trac-privatetickets/Makefile
index 40d2cf74f063..901a4ba74497 100644
--- a/www/trac-privatetickets/Makefile
+++ b/www/trac-privatetickets/Makefile
@@ -15,7 +15,7 @@ LICENSE= BSD2CLAUSE
RUN_DEPENDS= tracd:www/trac
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/www/trac-ticketimport/Makefile b/www/trac-ticketimport/Makefile
index 62e0a95a4766..f830360da379 100644
--- a/www/trac-ticketimport/Makefile
+++ b/www/trac-ticketimport/Makefile
@@ -13,7 +13,7 @@ COMMENT= Import or update tickets from a CSV file or Excel file
LICENSE= BSD3CLAUSE # "same license as trac"
RUN_DEPENDS= tracd:www/trac \
- ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.1:textproc/py-xlrd
+ ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.1:textproc/py-xlrd@${FLAVOR}
USES= python:2
USE_PYTHON= distutils autoplist
diff --git a/www/trac-tocmacro/Makefile b/www/trac-tocmacro/Makefile
index f8e32d48fd45..0cfc8f0789f1 100644
--- a/www/trac-tocmacro/Makefile
+++ b/www/trac-tocmacro/Makefile
@@ -14,7 +14,7 @@ COMMENT= Table of contents macro
RUN_DEPENDS= tracd:www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/www/trac-tweakui/Makefile b/www/trac-tweakui/Makefile
index d6f112c5ea20..e1bb78c851ea 100644
--- a/www/trac-tweakui/Makefile
+++ b/www/trac-tweakui/Makefile
@@ -15,7 +15,7 @@ COMMENT= Easily tweak Trac pages with JavaScript expressions
RUN_DEPENDS= tracd:www/trac
-USES= dos2unix python zip
+USES= dos2unix python:2.7 zip
DOS2UNIX_REGEX= .*\.(css|html|js|py|txt)$
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/www/trac-wikigoodies/Makefile b/www/trac-wikigoodies/Makefile
index a0ca639600b8..861b5424afc3 100644
--- a/www/trac-wikigoodies/Makefile
+++ b/www/trac-wikigoodies/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= tracd:www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/www/trac-wikinotification/Makefile b/www/trac-wikinotification/Makefile
index 7a81dab68381..45af8074c15d 100644
--- a/www/trac-wikinotification/Makefile
+++ b/www/trac-wikinotification/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= tracd:www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/www/trac-wikitemplates/Makefile b/www/trac-wikitemplates/Makefile
index 21409968e7db..74f21c59bf9e 100644
--- a/www/trac-wikitemplates/Makefile
+++ b/www/trac-wikitemplates/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= tracd:www/trac
# ${PYTHON_SITELIBDIR}/TracCtxtnavAdd-2.0-py${PYTHON_VER}.egg:www/trac-ctxtnavadd
WRKSRC= ${WRKDIR}/${PORTNAME}plugin
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/www/trac/Makefile b/www/trac/Makefile
index 2ed741214105..cec050de5c83 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -14,10 +14,10 @@ COMMENT= Enhanced wiki and issue tracking system for software projects
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \
- ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \
- ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${FLAVOR}
USES= python:-2.7 shebangfix
SHEBANG_FILES= trac/tests/functional/better_twill.py trac/tests/functional/tester.py \
@@ -41,12 +41,12 @@ DOCUTILS_DESC= Allow additional text markup
PYGMENTS_DESC= Use generic syntax highlighter
TZ_DESC= Process Time Zones
-DOCUTILS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils
-PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments
-TZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
-PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
-SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
-SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion
+DOCUTILS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${FLAVOR}
+PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${FLAVOR}
+TZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
+SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${FLAVOR}
post-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample-plugins
diff --git a/www/trytond28_google_maps/Makefile b/www/trytond28_google_maps/Makefile
index 4aedbb512620..12164e83a562 100644
--- a/www/trytond28_google_maps/Makefile
+++ b/www/trytond28_google_maps/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_party>=2.8.0:finance/trytond28_party
CONFLICTS= trytond_google_maps-2.[46].*
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/twill/Makefile b/www/twill/Makefile
index 49f53fa7d941..b0efb878c340 100644
--- a/www/twill/Makefile
+++ b/www/twill/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://darcs.idyll.org/~t/projects/
MAINTAINER= jun-g@daemonfreaks.com
COMMENT= Simple scripting language for Web browsing
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/www/uwsgi/Makefile b/www/uwsgi/Makefile
index b1805f11e9dc..f134bcba4a26 100644
--- a/www/uwsgi/Makefile
+++ b/www/uwsgi/Makefile
@@ -14,7 +14,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= pkgconfig python ssl
-USE_PYTHON= distutils
+USE_PYTHON= distutils concurrent optsuffix
USE_RC_SUBR= uwsgi
CFLAGS+= -I${OPENSSLINC}
diff --git a/www/uwsgitop/Makefile b/www/uwsgitop/Makefile
index 6e78c0698bc3..533c867ecba1 100644
--- a/www/uwsgitop/Makefile
+++ b/www/uwsgitop/Makefile
@@ -10,7 +10,7 @@ MAINTAINER= demon@FreeBSD.org
COMMENT= uWSGI top-like app
USES= python
-USE_PYTHON= distutils
+USE_PYTHON= distutils concurrent optsuffix
PLIST_FILES= bin/uwsgitop %%DOCSDIR%%/README.rst
diff --git a/www/uzbl/Makefile b/www/uzbl/Makefile
index 5487f6f75679..eef49dc29389 100644
--- a/www/uzbl/Makefile
+++ b/www/uzbl/Makefile
@@ -13,14 +13,14 @@ COMMENT= Web interface tools which adhere to the unix philosophy
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2 \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libsoup-2.4.so:devel/libsoup
RUN_DEPENDS= socat:net/socat \
dmenu:x11/dmenu \
- ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser
+ ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${PY_FLAVOR}
USES= gmake pkgconfig python:2 desktop-file-utils gettext-runtime shebangfix
USE_XORG= x11
diff --git a/www/wadcomblog/Makefile b/www/wadcomblog/Makefile
index e91d9542218f..a5d0ae313ad7 100644
--- a/www/wadcomblog/Makefile
+++ b/www/wadcomblog/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://laffaye.free.fr/distfiles/ \
MAINTAINER= jlaffaye@FreeBSD.org
COMMENT= Simple open-source static blog engine written in Python
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/www/web2ldap/Makefile b/www/web2ldap/Makefile
index f50eb1040d24..42d864ee64de 100644
--- a/www/web2ldap/Makefile
+++ b/www/web2ldap/Makefile
@@ -12,9 +12,9 @@ COMMENT= Python-based WWW gateway to LDAP servers
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.0:net/py-ldap \
- ${PYTHON_SITELIBDIR}/pyweblib/__init__.py:www/py-pyweblib \
- ${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.0:net/py-ldap@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/pyweblib/__init__.py:www/py-pyweblib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr@${PY_FLAVOR} \
${LOCALBASE}/etc/mime.types:misc/mime-support
OPTIONS_DEFINE= DOCS
diff --git a/www/webpy/Makefile b/www/webpy/Makefile
index 775de7d68191..d17951ebc205 100644
--- a/www/webpy/Makefile
+++ b/www/webpy/Makefile
@@ -13,7 +13,7 @@ COMMENT= Web Framework For Python
LICENSE= PD
-USES= python
+USES= python:2.7
USE_PYTHON= autoplist distutils
PYDISTUTILS_PKGNAME= web.py
diff --git a/www/xist/Makefile b/www/xist/Makefile
index 32492a9e641f..c00c08ad25ba 100644
--- a/www/xist/Makefile
+++ b/www/xist/Makefile
@@ -14,11 +14,11 @@ COMMENT= XML-based extensible HTML generator
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0,1:www/py3-cssutils \
- ${PYTHON_PKGNAMEPREFIX}lxml>=3.4:devel/py3-lxml \
- ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py3-pillow
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0,1:www/py-cssutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=3.4:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${PY_FLAVOR}
-USES= python:3 tar:bzip2
+USES= python:3.6+ tar:bzip2
USE_PYTHON= autoplist distutils
post-install:
diff --git a/www/you-get/Makefile b/www/you-get/Makefile
index 4ce85f2fa82a..d9f05dc57faa 100644
--- a/www/you-get/Makefile
+++ b/www/you-get/Makefile
@@ -17,8 +17,8 @@ RUN_DEPENDS= ffmpeg:multimedia/ffmpeg
OPTIONS_DEFINE= RTMPDUMP
NO_ARCH= yes
-USE_PYTHON= autoplist distutils
-USES= python:3
+USE_PYTHON= autoplist distutils optsuffix
+USES= python:3.4+
RTMPDUMP_RUN_DEPENDS= rtmpdump:multimedia/rtmpdump
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index 6fc6161751e4..a76dc0126b87 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -14,72 +14,72 @@ COMMENT= Object-based web application platform Version 2.13
LICENSE= ZPL21
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=2.13.2: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}MultiMapping>=0:devel/py-MultiMapping \
- ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \
- ${PYTHON_PKGNAMEPREFIX}Products.OFSP>=2.13.2:devel/py-Products.OFSP \
- ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>=0:devel/py-Products.ZCatalog \
- ${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}zconfig>=0:devel/py-zconfig \
- zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
- ${PYTHON_PKGNAMEPREFIX}ZopeUndo>=0:devel/py-ZopeUndo \
- ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils \
- ${PYTHON_PKGNAMEPREFIX}initgroups>=0:devel/py-initgroups \
- ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
- ${PYTHON_PKGNAMEPREFIX}tempstorage>=0:devel/py-tempstorage \
- ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
- ${PYTHON_PKGNAMEPREFIX}zdaemon>=0:sysutils/py-zdaemon \
- ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \
- ${PYTHON_PKGNAMEPREFIX}zLOG>=0:devel/py-zLOG \
- ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
- ${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.container>=0:devel/py-zope.container \
- ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \
- ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \
- ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \
- ${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.pagetemplate>=0:devel/py-zope.pagetemplate \
- ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \
- ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \
- ${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:devel/py-zope.ptresource \
- ${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.sendmail>=0:mail/py-zope.sendmail \
- ${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:devel/py-zope.sequencesort \
- ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
- ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \
- ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext \
- ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \
- ${PYTHON_PKGNAMEPREFIX}zope.tales>=3.5.0:devel/py-zope.tales \
- ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=0:devel/py-zope.testbrowser \
- ${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}Products.BTreeFolder2>=0:devel/py-Products.BTreeFolder2 \
- ${PYTHON_PKGNAMEPREFIX}Products.ExternalMethod>=0:devel/py-Products.ExternalMethod \
- ${PYTHON_PKGNAMEPREFIX}Products.MailHost>=0:mail/py-Products.MailHost \
- ${PYTHON_PKGNAMEPREFIX}Products.MIMETools>=0:devel/py-Products.MIMETools \
- ${PYTHON_PKGNAMEPREFIX}Products.PythonScripts>=0:devel/py-Products.PythonScripts \
- ${PYTHON_PKGNAMEPREFIX}Products.StandardCacheManagers>=0:devel/py-Products.StandardCacheManagers \
- ${PYTHON_PKGNAMEPREFIX}manuel>=0:devel/py-manuel
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=2.13.2: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}MultiMapping>=0:devel/py-MultiMapping@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.OFSP>=2.13.2:devel/py-Products.OFSP@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>=0:devel/py-Products.ZCatalog@${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}zconfig>=0:devel/py-zconfig@${FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ZopeUndo>=0:devel/py-ZopeUndo@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}initgroups>=0:devel/py-initgroups@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tempstorage>=0:devel/py-tempstorage@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zdaemon>=0:sysutils/py-zdaemon@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zLOG>=0:devel/py-zLOG@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \
+ ${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.container>=0:devel/py-zope.container@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${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.pagetemplate>=0:devel/py-zope.pagetemplate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:devel/py-zope.ptresource@${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.sendmail>=0:mail/py-zope.sendmail@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:devel/py-zope.sequencesort@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tales>=3.5.0:devel/py-zope.tales@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=0:devel/py-zope.testbrowser@${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}Products.BTreeFolder2>=0:devel/py-Products.BTreeFolder2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ExternalMethod>=0:devel/py-Products.ExternalMethod@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.MailHost>=0:mail/py-Products.MailHost@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.MIMETools>=0:devel/py-Products.MIMETools@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PythonScripts>=0:devel/py-Products.PythonScripts@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.StandardCacheManagers>=0:devel/py-Products.StandardCacheManagers@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}manuel>=0:devel/py-manuel@${FLAVOR}
USES= python:-2.7
USE_PYTHON= autoplist distutils
diff --git a/x11-fm/sunflower/Makefile b/x11-fm/sunflower/Makefile
index 4fc555dd4ac7..ac34222573b1 100644
--- a/x11-fm/sunflower/Makefile
+++ b/x11-fm/sunflower/Makefile
@@ -11,11 +11,11 @@ COMMENT= Twin-panel file manager
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet \
- ${PYTHON_PKGNAMEPREFIX}notify>0:devel/py-notify \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
- ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1:devel/py-setproctitle \
- ${PYTHON_PKGNAMEPREFIX}dbus>=1.2.0:devel/py-dbus
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}notify>0:devel/py-notify@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1:devel/py-setproctitle@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dbus>=1.2.0:devel/py-dbus@${PY_FLAVOR}
WRKSRC= ${WRKDIR}/Sunflower
@@ -29,7 +29,7 @@ OPTIONS_DEFINE= VTE
OPTIONS_DEFAULT=VTE
VTE_DESC= Use VTE terminal widget
-VTE_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}vte>0:x11-toolkits/py-vte
+VTE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vte>0:x11-toolkits/py-vte@${PY_FLAVOR}
post-patch:
${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/Sunflower.py
diff --git a/x11-fonts/font-manager/Makefile b/x11-fonts/font-manager/Makefile
index 1b8c2a09ba8f..acd6f48004b1 100644
--- a/x11-fonts/font-manager/Makefile
+++ b/x11-fonts/font-manager/Makefile
@@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libsqlite3.so:databases/sqlite3
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= FontManager
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index ec7cd497f860..981b5d14253b 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -219,9 +219,6 @@
SUBDIR += py-wxPython28-common
SUBDIR += py-wxPython30
SUBDIR += py-xlib
- SUBDIR += py34-tkinter
- SUBDIR += py35-tkinter
- SUBDIR += py36-tkinter
SUBDIR += pypy-tkinter
SUBDIR += qt4-declarative
SUBDIR += qt4-gui
diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index b2aac27a00cd..7052e4bedfe9 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -13,10 +13,10 @@ MAINTAINER= fmysh@iijmio-mail.jp
COMMENT= High-level compound graphics widgets for Python
OPTIONS_DEFINE= DOCS EXAMPLES
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR}
LIB_DEPENDS= libBLT25.so:x11-toolkits/blt
-USES= python shebangfix
+USES= python:2.7 shebangfix
USE_PYTHON= distutils
SHEBANG_FILES= Pmw/Pmw_1_3/bin/bundlepmw.py
diff --git a/x11-toolkits/py-SquareMap/Makefile b/x11-toolkits/py-SquareMap/Makefile
index c007969b490d..36cd87526f35 100644
--- a/x11-toolkits/py-SquareMap/Makefile
+++ b/x11-toolkits/py-SquareMap/Makefile
@@ -13,7 +13,7 @@ COMMENT= Hierarchic visualization control for wxPython
LICENSE= BSD2CLAUSE
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
USE_WX= 3.0+
WX_COMPS= python
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index be57745b3273..8c57587f6555 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -18,12 +18,13 @@ OPTIONS_DEFINE= EXAMPLES
OPTIONS_SUB= yes
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/ORBit.so:devel/py-orbit
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ORBit.so:devel/py-orbit
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/ORBit.so:devel/py-orbit@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ORBit.so:devel/py-orbit@${FLAVOR}
USES= gettext gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2
USE_LDCONFIG= yes
USE_GNOME= libgnomeui pygtk2
+USE_PYTHON= flavors
GNU_CONFIGURE= yes
CONFIGURE_ENV= PTHREAD_LIBS="-lpthread"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index cf5b35f81f75..ca92ca0ded5f 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -15,11 +15,12 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Set of Python bindings for GTK+
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${FLAVOR}
USES= gettext gmake libtool pathfix pkgconfig python:2 tar:bzip2
USE_GNOME= libglade2 pygobject
+USE_PYTHON= flavors
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/x11-toolkits/py-gtkglext/Makefile b/x11-toolkits/py-gtkglext/Makefile
index 63caf4621160..91ebc24bbe1b 100644
--- a/x11-toolkits/py-gtkglext/Makefile
+++ b/x11-toolkits/py-gtkglext/Makefile
@@ -12,12 +12,13 @@ DISTNAME= pygtkglext-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python binding for GtkGLExt
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL@${FLAVOR}
LIB_DEPENDS= libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL@${FLAVOR}
-USES= gmake libtool pathfix pkgconfig python tar:bzip2
+USES= gmake libtool pathfix pkgconfig python:2.7 tar:bzip2
USE_GNOME= pygtk2
+USE_PYTHON= flavors
GNU_CONFIGURE= yes
post-install:
diff --git a/x11-toolkits/py-gui/Makefile b/x11-toolkits/py-gui/Makefile
index 590b9c1b48e1..781a3c5e8b9a 100644
--- a/x11-toolkits/py-gui/Makefile
+++ b/x11-toolkits/py-gui/Makefile
@@ -12,19 +12,19 @@ DISTNAME= PyGUI-${PORTVERSION}-1
MAINTAINER= python@FreeBSD.org
COMMENT= Cross-platform pythonic GUI API
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/Distutils/__init__.py:devel/pyrex
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR}
OPTIONS_DEFINE= DOCS EXAMPLES OPENGL
USE_GNOME= pygtk2
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
WRKSRC= ${WRKDIR}/PyGUI-${PORTVERSION}
-OPENGL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext
+OPENGL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext@${FLAVOR}
post-patch:
@${REINPLACE_CMD} -e 's|"GUI.Cocoa",||g' ${WRKSRC}/setup.py
diff --git a/x11-toolkits/py-kivy/Makefile b/x11-toolkits/py-kivy/Makefile
index cd1c272d1e19..c94b409ce584 100644
--- a/x11-toolkits/py-kivy/Makefile
+++ b/x11-toolkits/py-kivy/Makefile
@@ -16,17 +16,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN= fails to build
-BUILD_DEPENDS= cython:lang/cython
LIB_DEPENDS= libmtdev.so:devel/libmtdev
-TEST_DEPENDS= nosetests-${PYTHON_VER}:devel/py-nose
+TEST_DEPENDS= nosetests-${PYTHON_VER}:devel/py-nose@${FLAVOR}
MAKE_ENV= KIVY_NO_CONFIG=yes KIVY_NO_FILELOG=yes USE_OPENGL_ES2=1 \
PYTHONPATH=${WRKSRC}
USE_GITHUB= yes
-USES= display:test python uniquefiles:dirs
+USES= display:test python:2.7 uniquefiles:dirs
USE_GL= egl gl glesv2
-USE_PYTHON= autoplist concurrent distutils
+USE_PYTHON= autoplist concurrent distutils cython
PYDISTUTILS_BUILD_TARGET= build_ext
PYDISTUTILS_BUILDARGS= --inplace
@@ -53,20 +52,20 @@ SPELLING_DESC= Spell checking support
TEXT_DESC= Text rendering support (compulsory)
WINDOW_DESC= Window support (compulsory)
-DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx
+DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx@${FLAVOR}
ENCHANT_DESC= Spell checking support via Enchant
-ENCHANT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant
+ENCHANT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${FLAVOR}
GSTREAMER_MAKE_ENV= USE_GSTREAMER=1
GSTREAMER_MAKE_ENV_OFF= USE_GSTREAMER=0
GSTREAMER_LIB_DEPENDS= libgstreamer-1.0.so:multimedia/gstreamer1
-GSTREAMER_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygst.py:multimedia/py-gstreamer
+GSTREAMER_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygst.py:multimedia/py-gstreamer@${FLAVOR}
GSTREAMER_USES= pkgconfig
-OPENCV_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv
+OPENCV_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv@${FLAVOR}
PIL_DESC= Text and window rendering support via Pillow
-PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
+PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR}
PYGAME_DESC= Window, text and image rendering support via PyGame
-PYGAME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game
-PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>0:graphics/py-pyglet
+PYGAME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${FLAVOR}
+PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>0:graphics/py-pyglet@${FLAVOR}
SDL2_DESC= Simple Direct Media Layer v2.0 support
SDL2_MAKE_ENV= USE_SDL2=1
SDL2_MAKE_ENV_OFF= USE_SDL2=0
diff --git a/x11-toolkits/py-kiwi-gtk/Makefile b/x11-toolkits/py-kiwi-gtk/Makefile
index aecd3593e1f9..f6300ba4d522 100644
--- a/x11-toolkits/py-kiwi-gtk/Makefile
+++ b/x11-toolkits/py-kiwi-gtk/Makefile
@@ -17,7 +17,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES
NO_ARCH= yes
USE_GNOME= libglade2 pygtk2
USE_PYTHON= autoplist distutils
-USES= gettext python uniquefiles:dirs
+USES= gettext python:2.7 uniquefiles:dirs
PORTDOCS= *
PORTEXAMPLES= *
diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile
index 8dea42d43525..0168552232b0 100644
--- a/x11-toolkits/py-qt4-gui/Makefile
+++ b/x11-toolkits/py-qt4-gui/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
USES= python pyqt:4
USE_PYQT= sip_build core_run
+USE_PYTHON= flavors
USE_QT4= corelib gui imageformats_run inputmethods_run iconengines_run \
moc_build qmake_build
diff --git a/x11-toolkits/py-qt5-gui/Makefile b/x11-toolkits/py-qt5-gui/Makefile
index d96cecd5fbc0..49e3ec542646 100644
--- a/x11-toolkits/py-qt5-gui/Makefile
+++ b/x11-toolkits/py-qt5-gui/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
USES= python pyqt:5
USE_GL= gl
USE_PYQT= sip_build core_run
+USE_PYTHON= flavors
USE_QT5= core gui qmake_build imageformats_run
OPTIONS_DEFINE= API DEBUG
diff --git a/x11-toolkits/py-qt5-quick/Makefile b/x11-toolkits/py-qt5-quick/Makefile
index 1ac17d9c68f5..056b3fc98629 100644
--- a/x11-toolkits/py-qt5-quick/Makefile
+++ b/x11-toolkits/py-qt5-quick/Makefile
@@ -11,6 +11,7 @@ PYQT_DIST= yes
USES= python pyqt:5
USE_PYQT= sip_build core_run gui_run
+USE_PYTHON= flavors
USE_QT5= core quick qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/x11-toolkits/py-qt5-widgets/Makefile b/x11-toolkits/py-qt5-widgets/Makefile
index d07957114102..1bee75400a55 100644
--- a/x11-toolkits/py-qt5-widgets/Makefile
+++ b/x11-toolkits/py-qt5-widgets/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
USES= python pyqt:5
USE_GL= gl
USE_PYQT= sip_build core_run gui_run
+USE_PYTHON= flavors
USE_QT5= core gui widgets qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/x11-toolkits/py-sexy/Makefile b/x11-toolkits/py-sexy/Makefile
index 826e0943f9f2..fe90c6d0c6de 100644
--- a/x11-toolkits/py-sexy/Makefile
+++ b/x11-toolkits/py-sexy/Makefile
@@ -16,8 +16,9 @@ LICENSE= LGPL21
LIB_DEPENDS= libsexy.so:x11-toolkits/libsexy
-USES= libtool pkgconfig python
+USES= libtool pkgconfig python:2.7
USE_GNOME= pygtk2
+USE_PYTHON= flavors
GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile
index 48d1f47c2438..f8f1d7086cf7 100644
--- a/x11-toolkits/py-tkinter/Makefile
+++ b/x11-toolkits/py-tkinter/Makefile
@@ -16,8 +16,8 @@ LICENSE= PSFL
PORTSCOUT= ignore:1
-USE_PYTHON= distutils autoplist
USES= python tar:xz tk
+USE_PYTHON= distutils autoplist allflavors
DIST_SUBDIR= python
DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
diff --git a/x11-toolkits/py-tktreectrl/Makefile b/x11-toolkits/py-tktreectrl/Makefile
index 71d9e2eaecf1..467421e3777e 100644
--- a/x11-toolkits/py-tktreectrl/Makefile
+++ b/x11-toolkits/py-tktreectrl/Makefile
@@ -12,10 +12,10 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= TkTreectrl Python bindings
LIB_DEPENDS= libtreectrl.so.1:x11-toolkits/tktreectrl
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \
- ${PYTHON_SITELIBDIR}/Pmw/__init__.py:x11-toolkits/py-Pmw
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/Pmw/__init__.py:x11-toolkits/py-Pmw@${FLAVOR}
-USES= python tk:run zip
+USES= python:2.7 tk:run zip
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= TkinterTreectrl
PYDISTUTILS_PKGVERSION= ${PORTVERSION:R}
diff --git a/x11-toolkits/py-vte/Makefile b/x11-toolkits/py-vte/Makefile
index cf741684c5c7..fff995f5e638 100644
--- a/x11-toolkits/py-vte/Makefile
+++ b/x11-toolkits/py-vte/Makefile
@@ -15,8 +15,9 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC}
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-USES= python
+USES= python:2.7
USE_GNOME= intltool pygtk2 vte
+USE_PYTHON= flavors
CONFIGURE_ARGS= --enable-python \
--disable-Bsymbolic \
--disable-freetypetest
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index fc6fe3cbaa56..670524630c56 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -13,13 +13,13 @@ PKGNAMESUFFIX= 28
MAINTAINER= python@FreeBSD.org
COMMENT= Python bindings for the wxWidgets/GTK GUI toolkit
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${FLAVOR}
WRKSRC_SUBDIR= wxPython
DIST_SUBDIR= python
USE_PYTHON= distutils
-USES= gettext gmake pkgconfig python shebangfix tar:bzip2
+USES= gettext gmake pkgconfig python:2.7 shebangfix tar:bzip2
SHEBANG_FILES= wx/tools/Editra/Editra.pyw
PYDISTUTILS_BUILDARGS= \
@@ -76,8 +76,8 @@ PYDISTUTILS_BUILDARGS+= \
INSTALL_MULTIVERSION=1
.else
## These are shared
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}wxPython28-common>0:x11-toolkits/py-wxPython28-common \
- ${PYTHON_SITELIBDIR}/wxversion.py:x11-toolkits/py-wxPython-common
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}wxPython28-common>0:x11-toolkits/py-wxPython28-common@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/wxversion.py:x11-toolkits/py-wxPython-common@${FLAVOR}
PYDISTUTILS_BUILDARGS+= \
NO_HEADERS=1 \
diff --git a/x11-toolkits/py-wxPython30/Makefile b/x11-toolkits/py-wxPython30/Makefile
index cfa971e70102..820c3a17f9e2 100644
--- a/x11-toolkits/py-wxPython30/Makefile
+++ b/x11-toolkits/py-wxPython30/Makefile
@@ -16,14 +16,14 @@ DIST_SUBDIR= python
WRKSRC_SUBDIR= wxPython
-USES= compiler:c++11-lib python shebangfix tar:bzip2
+USES= compiler:c++11-lib python:2.7 shebangfix tar:bzip2
SHEBANG_FILES= wx/tools/Editra/Editra.pyw
.if defined(WITH_WXVERSION_ONLY)
PKGNAMESUFFIX= -common
-USE_PYTHON= py3kplist
+USE_PYTHON= py3kplist flavors
do-build:
${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${PYTHON_SITELIBDIR} -f ${WRKSRC}/wxversion
@@ -39,7 +39,7 @@ do-install:
WXPORT= gtk2
WX_PYTHON_DIR= wx-${WX_VERSION}-${WXPORT}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wxPython-common>0:x11-toolkits/py-wxPython-common
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wxPython-common>0:x11-toolkits/py-wxPython-common@${FLAVOR}
USES+= gettext pkgconfig
USE_WX= 3.0
diff --git a/x11-toolkits/py-xlib/Makefile b/x11-toolkits/py-xlib/Makefile
index 901ec2623df4..ea9fd77d4a9b 100644
--- a/x11-toolkits/py-xlib/Makefile
+++ b/x11-toolkits/py-xlib/Makefile
@@ -11,9 +11,9 @@ COMMENT= X11 library for Python
LICENSE= GPLv2+
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
GH_ACCOUNT= python-xlib
GH_PROJECT= python-xlib
diff --git a/x11-toolkits/py34-tkinter/Makefile b/x11-toolkits/py34-tkinter/Makefile
deleted file mode 100644
index c9daeb38fbaf..000000000000
--- a/x11-toolkits/py34-tkinter/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-tkinter
-
-PYTHON_VERSION= python3.4
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/py35-tkinter/Makefile b/x11-toolkits/py35-tkinter/Makefile
deleted file mode 100644
index 6e55813977ab..000000000000
--- a/x11-toolkits/py35-tkinter/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-tkinter
-
-PYTHON_VERSION= python3.5
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/py36-tkinter/Makefile b/x11-toolkits/py36-tkinter/Makefile
deleted file mode 100644
index 30a5678892cc..000000000000
--- a/x11-toolkits/py36-tkinter/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../py-tkinter
-
-PYTHON_VERSION= python3.6
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-wm/compizconfig-python/Makefile b/x11-wm/compizconfig-python/Makefile
index 52582b828e46..35cb1d1ee7af 100644
--- a/x11-wm/compizconfig-python/Makefile
+++ b/x11-wm/compizconfig-python/Makefile
@@ -13,12 +13,13 @@ COMMENT= Python bindings for the compizconfig library
BUILD_DEPENDS= \
${LOCALBASE}/libdata/pkgconfig/compiz.pc:x11-wm/compiz \
${LOCALBASE}/libdata/pkgconfig/libcompizconfig.pc:x11-wm/libcompizconfig \
- ${PYTHON_SITELIBDIR}/Pyrex/Distutils/__init__.py:devel/pyrex
+ ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
GNU_CONFIGURE= yes
USES= gmake libtool pathfix pkgconfig python:2 tar:bzip2
USE_GNOME= glib20
+USE_PYTHON= flavors
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/compizconfig.so
diff --git a/x11-wm/obapps/Makefile b/x11-wm/obapps/Makefile
index 31808bb5a47f..cd6509cd86a6 100644
--- a/x11-wm/obapps/Makefile
+++ b/x11-wm/obapps/Makefile
@@ -16,9 +16,9 @@ COMMENT= Graphical editor for Openbox application settings
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-xlib
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-xlib@${FLAVOR}
-USES= python
+USES= python:2.7
USE_PYTHON= distutils
USE_WX= 3.0+
WX_COMPS= python:run
diff --git a/x11-wm/obkey/Makefile b/x11-wm/obkey/Makefile
index b4b1cf9a40d9..2aeabbb90aa5 100644
--- a/x11-wm/obkey/Makefile
+++ b/x11-wm/obkey/Makefile
@@ -17,7 +17,7 @@ LICENSE= MIT
RUN_DEPENDS= py27-gtk2>=2.14:x11-toolkits/py-gtk2
-USES= desktop-file-utils gettext python
+USES= desktop-file-utils gettext python:2.7
USE_PYTHON= distutils
NO_ARCH= yes
diff --git a/x11-wm/obmenu/Makefile b/x11-wm/obmenu/Makefile
index 1a2cf2365ee3..e9d2e91411cc 100644
--- a/x11-wm/obmenu/Makefile
+++ b/x11-wm/obmenu/Makefile
@@ -13,7 +13,7 @@ COMMENT= Menu manager for Openbox supporting both static and pipe menus
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= python shebangfix
+USES= python:2.7 shebangfix
USE_GNOME= pygtk2
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= obMenu
diff --git a/x11-wm/plwm/Makefile b/x11-wm/plwm/Makefile
index b99130d371f2..3f9751950b28 100644
--- a/x11-wm/plwm/Makefile
+++ b/x11-wm/plwm/Makefile
@@ -13,12 +13,12 @@ COMMENT= Window manager construction kit
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib@${FLAVOR}
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
PORTDOCS= *
diff --git a/x11-wm/qtile/Makefile b/x11-wm/qtile/Makefile
index 2b0ec71c10e7..61caf22be1ba 100644
--- a/x11-wm/qtile/Makefile
+++ b/x11-wm/qtile/Makefile
@@ -13,15 +13,15 @@ COMMENT= Small, flexible, scriptable tiling window manager written in Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xpyb>0:x11/xpyb \
- ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xpyb>0:x11/xpyb@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= qtile
USE_GNOME= pygobject pygtk2
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
NO_ARCH= yes
diff --git a/x11/arandr/Makefile b/x11/arandr/Makefile
index 05aa31962be2..7a4e4c1f504a 100644
--- a/x11/arandr/Makefile
+++ b/x11/arandr/Makefile
@@ -12,14 +12,14 @@ COMMENT= Another XRandR GUI
LICENSE= GPLv3
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0.6:textproc/py-docutils
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0.6:textproc/py-docutils@${FLAVOR}
RUN_DEPENDS= xrandr>0:x11/xrandr \
- ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2
+ ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2@${FLAVOR}
OPTIONS_DEFINE= DOCS
USE_PYTHON= distutils
-USES+= gettext desktop-file-utils python
+USES+= gettext desktop-file-utils python:2.7
PORTDOCS= ChangeLog NEWS README TODO
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 4ac8b2d301c4..f317b2e72289 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS= iso-codes>=0:misc/iso-codes \
xkeyboard-config>=0:x11/xkeyboard-config \
libxkbfile>=0:x11/libxkbfile
-USES+= bison gettext gmake gnome libtool localbase pathfix pkgconfig python:3
+USES+= bison gettext gmake gnome libtool localbase pathfix pkgconfig python:3.4+
USE_GNOME= gtk30 intlhack introspection:build referencehack
USE_XORG= x11 xrandr xext
USE_LDCONFIG= yes
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 961bed5b5b26..10c0fa1d8bba 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -41,7 +41,7 @@ LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
libcogl.so:graphics/cogl \
libclutter-1.0.so:graphics/clutter \
libgjs.so:lang/gjs
-RUN_DEPENDS= py*-dbus>=0:devel/py-dbus \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
nss>=0:security/nss \
gnome-control-center:sysutils/gnome-control-center \
ca_root_nss>=0:security/ca_root_nss \
@@ -50,7 +50,7 @@ RUN_DEPENDS= py*-dbus>=0:devel/py-dbus \
PORTSCOUT= limitw:1,even
USES= compiler:c11 cpe gettext gmake gnome libtool localbase \
- pathfix pkgconfig sqlite tar:xz webplugin:native
+ pathfix pkgconfig python:3.4+ sqlite tar:xz webplugin:native
USE_GNOME= cairo evolutiondataserver3 gdkpixbuf2 gtk30 intltool \
introspection libxml2
USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr
diff --git a/x11/guake/Makefile b/x11/guake/Makefile
index 504c0f15f8d6..77a5a48f3a1f 100644
--- a/x11/guake/Makefile
+++ b/x11/guake/Makefile
@@ -12,15 +12,15 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gnome-common>=3.14.0:devel/gnome-common \
- ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus \
- ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1_9:devel/py-notify \
- ${PYTHON_PKGNAMEPREFIX}vte>=0.26.2_1:x11-toolkits/py-vte \
- ${PYTHON_PKGNAMEPREFIX}xdg>=0.19:devel/py-xdg
+ ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1_9:devel/py-notify@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vte>=0.26.2_1:x11-toolkits/py-vte@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xdg>=0.19:devel/py-xdg@${PY_FLAVOR}
RUN_DEPENDS= keybinder>=0.3.0:x11/keybinder \
- ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus \
- ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1_9:devel/py-notify \
- ${PYTHON_PKGNAMEPREFIX}vte>=0.26.2_1:x11-toolkits/py-vte \
- ${PYTHON_PKGNAMEPREFIX}xdg>=0.19:devel/py-xdg
+ ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1_9:devel/py-notify@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vte>=0.26.2_1:x11-toolkits/py-vte@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xdg>=0.19:devel/py-xdg@${PY_FLAVOR}
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/ooxcb/Makefile b/x11/ooxcb/Makefile
index 181f8f12c502..ab3c8707f045 100644
--- a/x11/ooxcb/Makefile
+++ b/x11/ooxcb/Makefile
@@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE
NO_ARCH= yes
-USES= python
+USES= python:2.7
USE_PYTHON= distutils autoplist
USE_XORG= xcb
diff --git a/x11/py-pyvirtualdisplay/Makefile b/x11/py-pyvirtualdisplay/Makefile
index 55b846ba07d3..fbaae742dfd3 100644
--- a/x11/py-pyvirtualdisplay/Makefile
+++ b/x11/py-pyvirtualdisplay/Makefile
@@ -15,11 +15,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= xorg-vfbserver>0:x11-servers/xorg-vfbserver \
xauth>0:x11/xauth \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver \
- ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog \
- ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \
- ${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
+ ${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} \
+ ${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess@${FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist distutils
diff --git a/x11/py-qt4-opengl/Makefile b/x11/py-qt4-opengl/Makefile
index 8d4ccbb96ee7..c265eec4d1cb 100644
--- a/x11/py-qt4-opengl/Makefile
+++ b/x11/py-qt4-opengl/Makefile
@@ -15,6 +15,7 @@ PYQT_DIST= yes
USES= python pyqt:4
USE_GL= gl
USE_PYQT= sip_build core_run gui_run
+USE_PYTHON= flavors
USE_QT4= corelib gui opengl moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/x11/py-qt5-opengl/Makefile b/x11/py-qt5-opengl/Makefile
index f9de6b0d2401..b89bfed3c973 100644
--- a/x11/py-qt5-opengl/Makefile
+++ b/x11/py-qt5-opengl/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST= yes
USES= python pyqt:5
USE_GL= gl
USE_PYQT= sip_build core_run gui_run widgets_run
+USE_PYTHON= flavors
USE_QT5= core gui opengl widgets qmake_build
OPTIONS_DEFINE= API DEBUG
diff --git a/x11/terminator/Makefile b/x11/terminator/Makefile
index dbd31fb0b572..0db199a1a705 100644
--- a/x11/terminator/Makefile
+++ b/x11/terminator/Makefile
@@ -12,11 +12,11 @@ COMMENT= Multiple GNOME terminals in one window
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0:devel/py-notify \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0:devel/py-notify@${FLAVOR} \
${PYTHON_SITELIBDIR}/keybinder/_keybinder.so:x11/keybinder \
- ${PYTHON_PKGNAMEPREFIX}vte>=0:x11-toolkits/py-vte
+ ${PYTHON_PKGNAMEPREFIX}vte>=0:x11-toolkits/py-vte@${FLAVOR}
-USES= python
+USES= python:2.7
USE_GNOME= pygtk2 intltool
USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= Terminator
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 06175b96d15f..b837f496b6d2 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -42,7 +42,7 @@ OPTIONS_SUB= yes
DISTRIBUTION_DESC= Build with networking support
-DBUS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah
+DBUS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah@${PY_FLAVOR}
DBUS_CONFIGURE_ENABLE= dbus
DBUS_USES= python:2.7
diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index 13b90719732a..e2ecfeb31bc7 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -12,35 +12,34 @@ COMMENT= Xpra gives you persistent remote applications for X
LICENSE= GPLv2
-BUILD_DEPENDS= cython:lang/cython \
- ${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2 \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2@${FLAVOR} \
${PYNUMPY}
LIB_DEPENDS= libturbojpeg.so:graphics/libjpeg-turbo \
libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4 \
- ${PYTHON_PKGNAMEPREFIX}rencode>1:converters/py-rencode \
- ${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus \
- ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify \
- ${PYTHON_PKGNAMEPREFIX}xxhash>0:devel/py-xxhash \
- ${PYTHON_PKGNAMEPREFIX}pillow>=3.0:graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=3.1.0:graphics/py-PyOpenGL \
- ${PYTHON_PKGNAMEPREFIX}PyOpenGL-accelerate>=3.1.0:graphics/py-PyOpenGL-accelerate \
- ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rencode>1:converters/py-rencode@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xxhash>0:devel/py-xxhash@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=3.0:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=3.1.0:graphics/py-PyOpenGL@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PyOpenGL-accelerate>=3.1.0:graphics/py-PyOpenGL-accelerate@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${FLAVOR} \
ssh-askpass:security/openssh-askpass \
- ${PYTHON_PKGNAMEPREFIX}cryptography>1:security/py-cryptography \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>1:security/py-cryptography@${FLAVOR} \
setxkbmap:x11/setxkbmap \
xauth:x11/xauth \
xkbcomp:x11/xkbcomp \
${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
Xvfb:x11-servers/xorg-vfbserver \
- ${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2 \
- ${PYTHON_PKGNAMEPREFIX}gtkglext>1:x11-toolkits/py-gtkglext \
+ ${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gtkglext>1:x11-toolkits/py-gtkglext@${FLAVOR} \
${PYNUMPY}
USES= desktop-file-utils fortran gettext-runtime pkgconfig python:2 shared-mime-info shebangfix tar:xz
USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango
-USE_PYTHON= distutils
+USE_PYTHON= distutils cython
USE_XORG= x11 xcomposite xdamage xext xfixes xkbfile xrandr xtst
PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHON_VER=${PYTHON_VER}
SHEBANG_FILES= cups/xpraforwarder
@@ -61,14 +60,14 @@ WEBCAM_DESC= Enable webcam forwarding (client only)
X264_DESC= Enable X264 encoder
X265_DESC= Enable X265 encoder (slow)
-AVAHI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}avahi>0:net/py-avahi
+AVAHI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}avahi>0:net/py-avahi@${FLAVOR}
AVAHI_VARS= XPRA_OPTIONS+=mdns
AVCODEC_VARS= XPRA_OPTIONS+=dec_avcodec2
-CUPS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>1:print/py-pycups
+CUPS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>1:print/py-pycups@${FLAVOR}
CUPS_VARS= XPRA_OPTIONS+=printing
FFMPEG_VARS= XPRA_OPTIONS+=enc_ffmpeg
-GSTREAMER_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1
-GSTREAMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1
+GSTREAMER_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${FLAVOR}
+GSTREAMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${FLAVOR}
GSTREAMER_USE= GSTREAMER1=flac,lame,mpg123,ogg,opus,vorbis,wavpack
GSTREAMER_VARS= XPRA_OPTIONS+=sound
HTML5_VARS= XPRA_OPTIONS+=html5
@@ -78,7 +77,7 @@ SWSCALE_LIB_DEPENDS= libswscale.so:multimedia/ffmpeg
SWSCALE_VARS= XPRA_OPTIONS+=csc_swscale
VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx
VPX_VARS= XPRA_OPTIONS+=vpx
-WEBCAM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opencv>2:graphics/py-opencv
+WEBCAM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opencv>2:graphics/py-opencv@${FLAVOR}
WEBCAM_VARS= XPRA_OPTIONS+=webcam
X264_LIB_DEPENDS= libx264.so:multimedia/libx264
X264_VARS= XPRA_OPTIONS+=enc_x264
diff --git a/x11/xpyb/Makefile b/x11/xpyb/Makefile
index 655391aeed46..7435b06106e1 100644
--- a/x11/xpyb/Makefile
+++ b/x11/xpyb/Makefile
@@ -14,7 +14,8 @@ COMMENT= Python bindings to access X Window System protocol via libxcb
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:x11/xcb-proto \
xcb-proto>=1.7.1:x11/xcb-proto
-USES= libtool pathfix pkgconfig python tar:bzip2
+USES= libtool pathfix pkgconfig python:2.7 tar:bzip2
+USE_PYTHON= flavors
USE_XORG= xcb
PORTDOCS= README COPYING INSTALL NEWS XcbPythonBinding.txt