aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2018-06-20 17:05:41 +0000
committerMathieu Arnold <mat@FreeBSD.org>2018-06-20 17:05:41 +0000
commit4376dbbb58dab5a7bf7a8240ca39b562de78343b (patch)
tree8997a738fc5162cf5f1383dd3c61c0423454979b
parent6cb7ca00bb0a9a3aa67008824300ee8d16203a1b (diff)
downloadports-4376dbbb58dab5a7bf7a8240ca39b562de78343b.tar.gz
ports-4376dbbb58dab5a7bf7a8240ca39b562de78343b.zip
Use PY_FLAVOR for dependencies.
FLAVOR is the current port's flavor, it should not be used outside of this scope. Sponsored by: Absolight
Notes
Notes: svn path=/head/; revision=472884
-rw-r--r--accessibility/speech-dispatcher/Makefile2
-rw-r--r--archivers/py-attic/Makefile4
-rw-r--r--archivers/py-libarchive-c/Makefile2
-rw-r--r--archivers/py-lz4/Makefile10
-rw-r--r--archivers/py-zstandard/Makefile2
-rw-r--r--astro/gpsd/Makefile6
-rw-r--r--astro/py-RO/Makefile8
-rw-r--r--astro/py-aipy/Makefile6
-rw-r--r--astro/py-astLib/Makefile8
-rw-r--r--astro/py-horoscopegenerator/Makefile2
-rw-r--r--astro/py-metpy/Makefile12
-rw-r--r--audio/beets/Makefile60
-rw-r--r--audio/mbox/Makefile4
-rw-r--r--audio/mpdbrowser/Makefile2
-rw-r--r--audio/picard/Makefile4
-rw-r--r--audio/pithos/Makefile8
-rw-r--r--audio/puddletag/Makefile8
-rw-r--r--audio/py-SoundFile/Makefile2
-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/Makefile12
-rw-r--r--audio/py-karaoke/Makefile2
-rw-r--r--audio/py-py-jack/Makefile2
-rw-r--r--audio/py-pylast/Makefile2
-rw-r--r--audio/py-soundcloud/Makefile2
-rw-r--r--audio/py-sounddevice/Makefile4
-rw-r--r--audio/py-soundscrape/Makefile20
-rw-r--r--audio/py-speechrecognition/Makefile4
-rw-r--r--audio/py-speex/Makefile2
-rw-r--r--audio/py-vorbis/Makefile4
-rw-r--r--audio/py-xmms2/Makefile2
-rw-r--r--audio/pytone/Makefile8
-rw-r--r--audio/sonata/Makefile10
-rw-r--r--benchmarks/py-naarad/Makefile6
-rw-r--r--benchmarks/py-zopkio/Makefile10
-rw-r--r--biology/py-Genesis-PyAPI/Makefile4
-rw-r--r--biology/py-biom-format/Makefile12
-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/pycogent/Makefile4
-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/py-pyfda/Makefile6
-rw-r--r--cad/python-gdsii/Makefile2
-rw-r--r--cad/pythoncad/Makefile2
-rw-r--r--comms/chirp/Makefile6
-rw-r--r--comms/py-libimobiledevice/Makefile4
-rw-r--r--converters/py-bencode.py/Makefile4
-rw-r--r--converters/py-zfec/Makefile4
-rw-r--r--converters/zbase32/Makefile2
-rw-r--r--databases/emma/Makefile2
-rw-r--r--databases/gadfly/Makefile2
-rw-r--r--databases/mtools-mongodb/Makefile6
-rw-r--r--databases/mydbf2mysql/Makefile4
-rw-r--r--databases/openark-kit/Makefile2
-rw-r--r--databases/pg_activity/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/Makefile8
-rw-r--r--databases/py-carbon/Makefile10
-rw-r--r--databases/py-couchdb/Makefile2
-rw-r--r--databases/py-cql/Makefile2
-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-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-influxdb/Makefile8
-rw-r--r--databases/py-lmdb/Makefile2
-rw-r--r--databases/py-marshmallow-sqlalchemy/Makefile4
-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-peewee/Makefile6
-rw-r--r--databases/py-pgcli/Makefile20
-rw-r--r--databases/py-pgspecial/Makefile4
-rw-r--r--databases/py-pickledb/Makefile2
-rw-r--r--databases/py-pickleshare/Makefile2
-rw-r--r--databases/py-psycopg2cffi/Makefile4
-rw-r--r--databases/py-pum/Makefile4
-rw-r--r--databases/py-pymssql/Makefile2
-rw-r--r--databases/py-python-arango/Makefile8
-rw-r--r--databases/py-python-memcached/Makefile2
-rw-r--r--databases/py-python-swiftclient/Makefile6
-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-sispy/Makefile2
-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-sqlalchemy12/Makefile16
-rw-r--r--databases/py-sqlite3dbm/Makefile4
-rw-r--r--databases/py-sqlobject/Makefile12
-rw-r--r--databases/py-swift/Makefile20
-rw-r--r--databases/py-tarantool/Makefile2
-rw-r--r--databases/py-whisper/Makefile2
-rw-r--r--databases/py-xapian/Makefile2
-rw-r--r--databases/zodb3/Makefile12
-rw-r--r--deskutils/dosage/Makefile2
-rw-r--r--deskutils/gourmet/Makefile22
-rw-r--r--deskutils/gtg/Makefile8
-rw-r--r--deskutils/py-bugwarrior/Makefile42
-rw-r--r--deskutils/py-khal/Makefile28
-rw-r--r--deskutils/py-pystash/Makefile8
-rw-r--r--deskutils/py-taskw/Makefile8
-rw-r--r--deskutils/py-vdirsyncer/Makefile16
-rw-r--r--deskutils/py-vobject/Makefile4
-rw-r--r--deskutils/pybookreader/Makefile2
-rw-r--r--deskutils/pypanel/Makefile2
-rw-r--r--deskutils/rednotebook/Makefile6
-rw-r--r--deskutils/syncthing-gtk/Makefile6
-rw-r--r--deskutils/taskcoach/Makefile2
-rw-r--r--deskutils/virt-manager/Makefile12
-rw-r--r--deskutils/zim/Makefile6
-rw-r--r--devel/b2/Makefile12
-rw-r--r--devel/bbfreeze/Makefile2
-rw-r--r--devel/bpython/Makefile12
-rw-r--r--devel/bzr-explorer/Makefile2
-rw-r--r--devel/bzr-fastimport/Makefile2
-rw-r--r--devel/bzr-git/Makefile4
-rw-r--r--devel/bzr-gtk/Makefile2
-rw-r--r--devel/bzr-svn/Makefile2
-rw-r--r--devel/bzr/Makefile2
-rw-r--r--devel/cram/Makefile8
-rw-r--r--devel/cvs2svn/Makefile6
-rw-r--r--devel/dissy/Makefile4
-rw-r--r--devel/drpython/Makefile2
-rw-r--r--devel/euca2ools/Makefile10
-rw-r--r--devel/fnorb/Makefile2
-rw-r--r--devel/gazpacho/Makefile2
-rw-r--r--devel/git-cvs/Makefile6
-rw-r--r--devel/git-review/Makefile4
-rw-r--r--devel/hg-git/Makefile2
-rw-r--r--devel/hgview/Makefile4
-rw-r--r--devel/ipython/Makefile20
-rw-r--r--devel/osc/Makefile6
-rw-r--r--devel/plasma/Makefile14
-rw-r--r--devel/py-Acquisition/Makefile4
-rw-r--r--devel/py-AddOns/Makefile2
-rw-r--r--devel/py-Automat/Makefile8
-rw-r--r--devel/py-BytecodeAssembler/Makefile4
-rw-r--r--devel/py-DateTime/Makefile4
-rw-r--r--devel/py-DocumentTemplate/Makefile14
-rw-r--r--devel/py-IBMQuantumExperience/Makefile4
-rw-r--r--devel/py-Jinja2/Makefile8
-rw-r--r--devel/py-Missing/Makefile2
-rw-r--r--devel/py-MultiMapping/Makefile2
-rw-r--r--devel/py-PEAK-Rules/Makefile6
-rw-r--r--devel/py-Persistence/Makefile4
-rw-r--r--devel/py-Products.ATContentTypes/Makefile50
-rw-r--r--devel/py-Products.ATReferenceBrowserWidget/Makefile4
-rw-r--r--devel/py-Products.Archetypes/Makefile72
-rw-r--r--devel/py-Products.BTreeFolder2/Makefile16
-rw-r--r--devel/py-Products.CMFActionIcons/Makefile6
-rw-r--r--devel/py-Products.CMFCalendar/Makefile10
-rw-r--r--devel/py-Products.CMFCore/Makefile10
-rw-r--r--devel/py-Products.CMFDefault/Makefile8
-rw-r--r--devel/py-Products.CMFDiffTool/Makefile8
-rw-r--r--devel/py-Products.CMFDynamicViewFTI/Makefile14
-rw-r--r--devel/py-Products.CMFEditions/Makefile26
-rw-r--r--devel/py-Products.CMFFormController/Makefile14
-rw-r--r--devel/py-Products.CMFPlacefulWorkflow/Makefile10
-rw-r--r--devel/py-Products.CMFQuickInstallerTool/Makefile16
-rw-r--r--devel/py-Products.CMFTestCase/Makefile20
-rw-r--r--devel/py-Products.CMFUid/Makefile6
-rw-r--r--devel/py-Products.DCWorkflow/Makefile6
-rw-r--r--devel/py-Products.ExtendedPathIndex/Makefile6
-rw-r--r--devel/py-Products.ExternalMethod/Makefile10
-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/Makefile2
-rw-r--r--devel/py-Products.Marshall/Makefile20
-rw-r--r--devel/py-Products.MimetypesRegistry/Makefile10
-rw-r--r--devel/py-Products.OFSP/Makefile4
-rw-r--r--devel/py-Products.PasswordResetTool/Makefile16
-rw-r--r--devel/py-Products.PlacelessTranslationService/Makefile24
-rw-r--r--devel/py-Products.PloneTestCase/Makefile18
-rw-r--r--devel/py-Products.PluginRegistry/Makefile2
-rw-r--r--devel/py-Products.PortalTransforms/Makefile16
-rw-r--r--devel/py-Products.PythonScripts/Makefile12
-rw-r--r--devel/py-Products.ResourceRegistries/Makefile18
-rw-r--r--devel/py-Products.StandardCacheManagers/Makefile6
-rw-r--r--devel/py-Products.ZCTextIndex/Makefile14
-rw-r--r--devel/py-Products.ZCatalog/Makefile32
-rw-r--r--devel/py-Products.ZSQLMethods/Makefile18
-rw-r--r--devel/py-Products.ZopeVersionControl/Makefile10
-rw-r--r--devel/py-Products.statusmessages/Makefile6
-rw-r--r--devel/py-Products.validation/Makefile10
-rw-r--r--devel/py-PyUtilib/Makefile4
-rw-r--r--devel/py-RPyC/Makefile2
-rw-r--r--devel/py-Record/Makefile2
-rw-r--r--devel/py-ToscaWidgets/Makefile2
-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/Makefile6
-rw-r--r--devel/py-aniso8601/Makefile2
-rw-r--r--devel/py-apns2/Makefile6
-rw-r--r--devel/py-apptools/Makefile4
-rw-r--r--devel/py-apscheduler/Makefile20
-rw-r--r--devel/py-archetypes.querywidget/Makefile4
-rw-r--r--devel/py-archetypes.referencebrowserwidget/Makefile10
-rw-r--r--devel/py-archetypes.schemaextender/Makefile2
-rw-r--r--devel/py-argcomplete/Makefile8
-rw-r--r--devel/py-arrow/Makefile4
-rw-r--r--devel/py-astroid/Makefile10
-rw-r--r--devel/py-asttokens/Makefile6
-rw-r--r--devel/py-atomiclong/Makefile4
-rw-r--r--devel/py-automaton/Makefile8
-rw-r--r--devel/py-avro/Makefile4
-rw-r--r--devel/py-babel/Makefile2
-rw-r--r--devel/py-backports.functools_lru_cache/Makefile4
-rw-r--r--devel/py-backports.shutil_get_terminal_size/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-bidict/Makefile4
-rw-r--r--devel/py-binplist/Makefile2
-rw-r--r--devel/py-biplist/Makefile4
-rw-r--r--devel/py-bison/Makefile2
-rw-r--r--devel/py-black/Makefile6
-rw-r--r--devel/py-blinker/Makefile2
-rw-r--r--devel/py-botocore/Makefile6
-rw-r--r--devel/py-bsd/Makefile4
-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/Makefile8
-rw-r--r--devel/py-castellan/Makefile18
-rw-r--r--devel/py-cdg/Makefile2
-rw-r--r--devel/py-celery/Makefile8
-rw-r--r--devel/py-cffi/Makefile4
-rw-r--r--devel/py-check-manifest/Makefile2
-rw-r--r--devel/py-cheetah/Makefile2
-rw-r--r--devel/py-circuits/Makefile2
-rw-r--r--devel/py-cli-helpers/Makefile10
-rw-r--r--devel/py-cliapp/Makefile4
-rw-r--r--devel/py-click-log/Makefile6
-rw-r--r--devel/py-click-plugins/Makefile2
-rw-r--r--devel/py-click-threading/Makefile4
-rw-r--r--devel/py-cliff/Makefile16
-rw-r--r--devel/py-cligj/Makefile2
-rw-r--r--devel/py-clint/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-coloredlogs/Makefile2
-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-confusable_homoglyphs/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/Makefile6
-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-dateutil/Makefile2
-rw-r--r--devel/py-dateutils/Makefile6
-rw-r--r--devel/py-ddt/Makefile4
-rw-r--r--devel/py-debtcollector/Makefile8
-rw-r--r--devel/py-delfick_error/Makefile14
-rw-r--r--devel/py-deliciousapi/Makefile4
-rw-r--r--devel/py-deprecation/Makefile2
-rw-r--r--devel/py-diazo/Makefile12
-rw-r--r--devel/py-django-rq-dashboard/Makefile2
-rw-r--r--devel/py-django-rq/Makefile10
-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-dogpile.cache/Makefile2
-rw-r--r--devel/py-doit/Makefile8
-rw-r--r--devel/py-easyprocess/Makefile6
-rw-r--r--devel/py-efilter/Makefile8
-rw-r--r--devel/py-efl/Makefile4
-rw-r--r--devel/py-ejson/Makefile2
-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-eventlib/Makefile10
-rw-r--r--devel/py-extras/Makefile2
-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/Makefile26
-rw-r--r--devel/py-five.globalrequest/Makefile2
-rw-r--r--devel/py-five.localsitemanager/Makefile18
-rw-r--r--devel/py-fixtures/Makefile6
-rw-r--r--devel/py-flake8-builtins/Makefile2
-rw-r--r--devel/py-flake8-docstrings/Makefile6
-rw-r--r--devel/py-flake8-import-order/Makefile2
-rw-r--r--devel/py-flake8-polyfill/Makefile2
-rw-r--r--devel/py-flake8-quotes/Makefile2
-rw-r--r--devel/py-flake8/Makefile10
-rw-r--r--devel/py-flask-babel/Makefile4
-rw-r--r--devel/py-fluent-logger/Makefile2
-rw-r--r--devel/py-flufl.i18n/Makefile2
-rw-r--r--devel/py-flufl.lock/Makefile2
-rw-r--r--devel/py-foolscap/Makefile4
-rw-r--r--devel/py-fortran/Makefile2
-rw-r--r--devel/py-freenas.dispatcher/Makefile14
-rw-r--r--devel/py-freenas.utils/Makefile4
-rw-r--r--devel/py-freezegun/Makefile10
-rw-r--r--devel/py-fsm/Makefile2
-rw-r--r--devel/py-futurist/Makefile10
-rw-r--r--devel/py-fuzzywuzzy/Makefile2
-rw-r--r--devel/py-gdata/Makefile6
-rw-r--r--devel/py-gdbgui/Makefile16
-rw-r--r--devel/py-geojson/Makefile4
-rw-r--r--devel/py-gevent/Makefile6
-rw-r--r--devel/py-git-up/Makefile10
-rw-r--r--devel/py-git_semver/Makefile4
-rw-r--r--devel/py-gitdb2/Makefile2
-rw-r--r--devel/py-gitless/Makefile8
-rw-r--r--devel/py-glance-store/Makefile26
-rw-r--r--devel/py-glob2/Makefile2
-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/Makefile4
-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-http-prompt/Makefile12
-rw-r--r--devel/py-hypothesis/Makefile6
-rw-r--r--devel/py-icalendar/Makefile4
-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/Makefile18
-rw-r--r--devel/py-jira/Makefile28
-rw-r--r--devel/py-jsbeautifier/Makefile4
-rw-r--r--devel/py-jsonlines/Makefile2
-rw-r--r--devel/py-jsonpatch/Makefile2
-rw-r--r--devel/py-jsonref/Makefile2
-rw-r--r--devel/py-jsonrpclib/Makefile2
-rw-r--r--devel/py-jsonschema/Makefile4
-rw-r--r--devel/py-jupyter_client/Makefile10
-rw-r--r--devel/py-jupyter_console/Makefile10
-rw-r--r--devel/py-jupyter_core/Makefile10
-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/Makefile10
-rw-r--r--devel/py-keystonemiddleware/Makefile28
-rw-r--r--devel/py-lazr.config/Makefile4
-rw-r--r--devel/py-lazr.delegates/Makefile4
-rw-r--r--devel/py-libtaxii/Makefile6
-rw-r--r--devel/py-linecache2/Makefile4
-rw-r--r--devel/py-llvmcpy/Makefile8
-rw-r--r--devel/py-lockfile/Makefile4
-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/Makefile2
-rw-r--r--devel/py-manuel/Makefile2
-rw-r--r--devel/py-mccabe/Makefile2
-rw-r--r--devel/py-mdv/Makefile6
-rw-r--r--devel/py-medikit/Makefile18
-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-minio/Makefile8
-rw-r--r--devel/py-mock/Makefile8
-rw-r--r--devel/py-mondrian/Makefile2
-rw-r--r--devel/py-mongoengine/Makefile6
-rw-r--r--devel/py-mongokit/Makefile2
-rw-r--r--devel/py-monty/Makefile2
-rw-r--r--devel/py-munch/Makefile2
-rw-r--r--devel/py-mwlib.rl/Makefile8
-rw-r--r--devel/py-mwlib/Makefile36
-rw-r--r--devel/py-mx-experimental/Makefile2
-rw-r--r--devel/py-mypy/Makefile6
-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-nose-cov/Makefile2
-rw-r--r--devel/py-nose2/Makefile6
-rw-r--r--devel/py-noseofyeti/Makefile18
-rw-r--r--devel/py-notify2/Makefile2
-rw-r--r--devel/py-numba/Makefile8
-rw-r--r--devel/py-oletools/Makefile2
-rw-r--r--devel/py-omnijson/Makefile2
-rw-r--r--devel/py-openstacksdk/Makefile10
-rw-r--r--devel/py-option_merge/Makefile10
-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/Makefile12
-rw-r--r--devel/py-oslo.config/Makefile16
-rw-r--r--devel/py-oslo.context/Makefile4
-rw-r--r--devel/py-oslo.db/Makefile24
-rw-r--r--devel/py-oslo.i18n/Makefile6
-rw-r--r--devel/py-oslo.log/Makefile22
-rw-r--r--devel/py-oslo.messaging/Makefile38
-rw-r--r--devel/py-oslo.middleware/Makefile22
-rw-r--r--devel/py-oslo.policy/Makefile16
-rw-r--r--devel/py-oslo.privsep/Makefile18
-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-packaging/Makefile4
-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/Makefile2
-rw-r--r--devel/py-pbr/Makefile2
-rw-r--r--devel/py-pefile/Makefile4
-rw-r--r--devel/py-pep8-naming/Makefile2
-rw-r--r--devel/py-period/Makefile2
-rw-r--r--devel/py-pew/Makefile10
-rw-r--r--devel/py-pex/Makefile2
-rw-r--r--devel/py-phabricator/Makefile4
-rw-r--r--devel/py-phply/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-tools/Makefile8
-rw-r--r--devel/py-pip/Makefile20
-rw-r--r--devel/py-pipenv/Makefile8
-rw-r--r--devel/py-pkgconfig/Makefile2
-rw-r--r--devel/py-plan/Makefile2
-rw-r--r--devel/py-positional/Makefile2
-rw-r--r--devel/py-pretend/Makefile2
-rw-r--r--devel/py-prioritized_methods/Makefile2
-rw-r--r--devel/py-prompt_toolkit/Makefile4
-rw-r--r--devel/py-protobuf/Makefile4
-rw-r--r--devel/py-ptrace/Makefile2
-rw-r--r--devel/py-pudb/Makefile4
-rw-r--r--devel/py-py/Makefile2
-rw-r--r--devel/py-pyasn1-modules/Makefile2
-rw-r--r--devel/py-pycadf/Makefile12
-rw-r--r--devel/py-pycmd/Makefile4
-rw-r--r--devel/py-pydenticon/Makefile4
-rw-r--r--devel/py-pydocstyle/Makefile6
-rw-r--r--devel/py-pydrive/Makefile4
-rw-r--r--devel/py-pyface/Makefile2
-rw-r--r--devel/py-pyfcm/Makefile2
-rw-r--r--devel/py-pyformance/Makefile2
-rw-r--r--devel/py-pygit2/Makefile4
-rw-r--r--devel/py-pyke/Makefile2
-rw-r--r--devel/py-pymarc/Makefile2
-rw-r--r--devel/py-pyopencl/Makefile20
-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/Makefile6
-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/Makefile2
-rw-r--r--devel/py-pytest-cov/Makefile4
-rw-r--r--devel/py-pytest-flake8/Makefile4
-rw-r--r--devel/py-pytest-localserver/Makefile8
-rw-r--r--devel/py-pytest-mock/Makefile4
-rw-r--r--devel/py-pytest-runner/Makefile2
-rw-r--r--devel/py-pytest-sugar/Makefile4
-rw-r--r--devel/py-pytest-timeout/Makefile6
-rw-r--r--devel/py-pytest-tornado/Makefile4
-rw-r--r--devel/py-pytest-xdist/Makefile12
-rw-r--r--devel/py-pytest/Makefile24
-rw-r--r--devel/py-python-bugzilla/Makefile2
-rw-r--r--devel/py-python-gist/Makefile12
-rw-r--r--devel/py-python-gitlab/Makefile10
-rw-r--r--devel/py-python-jenkins/Makefile8
-rw-r--r--devel/py-pytools/Makefile8
-rw-r--r--devel/py-pyutil/Makefile4
-rw-r--r--devel/py-pyvalid/Makefile2
-rw-r--r--devel/py-pyvisa-py/Makefile4
-rw-r--r--devel/py-pyvisa/Makefile2
-rw-r--r--devel/py-pyxb/Makefile2
-rw-r--r--devel/py-qt4-dbussupport/Makefile4
-rw-r--r--devel/py-qt5-dbussupport/Makefile4
-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/Makefile6
-rw-r--r--devel/py-repoze.what/Makefile4
-rw-r--r--devel/py-repoze.who-friendlyform/Makefile12
-rw-r--r--devel/py-repoze.who-testutil/Makefile4
-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-responses/Makefile16
-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-rwt/Makefile6
-rw-r--r--devel/py-sanetime/Makefile6
-rw-r--r--devel/py-scripttest/Makefile2
-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-setuptools-pkg/Makefile6
-rw-r--r--devel/py-setuptools/Makefile4
-rw-r--r--devel/py-simpy/Makefile2
-rw-r--r--devel/py-singledispatch/Makefile2
-rw-r--r--devel/py-six/Makefile2
-rw-r--r--devel/py-smmap2/Makefile2
-rw-r--r--devel/py-sortedcontainers/Makefile2
-rw-r--r--devel/py-sqlcc/Makefile2
-rw-r--r--devel/py-stackexchange/Makefile2
-rw-r--r--devel/py-stevedore/Makefile4
-rw-r--r--devel/py-strategies/Makefile4
-rw-r--r--devel/py-streamparse/Makefile18
-rw-r--r--devel/py-structlog/Makefile4
-rw-r--r--devel/py-stsci.distutils/Makefile2
-rw-r--r--devel/py-sure/Makefile6
-rw-r--r--devel/py-tables/Makefile4
-rw-r--r--devel/py-tarantool-queue/Makefile4
-rw-r--r--devel/py-taskflow/Makefile32
-rw-r--r--devel/py-tempora/Makefile10
-rw-r--r--devel/py-tempstorage/Makefile4
-rw-r--r--devel/py-tenacity/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-testresources/Makefile10
-rw-r--r--devel/py-testscenarios/Makefile6
-rw-r--r--devel/py-testtools/Makefile6
-rw-r--r--devel/py-threema-msgapi/Makefile12
-rw-r--r--devel/py-tinyarray/Makefile2
-rw-r--r--devel/py-tinyrpc/Makefile12
-rw-r--r--devel/py-tooz/Makefile20
-rw-r--r--devel/py-traceback2/Makefile8
-rw-r--r--devel/py-traitlets/Makefile10
-rw-r--r--devel/py-transaction/Makefile2
-rw-r--r--devel/py-trollius/Makefile2
-rw-r--r--devel/py-tw.forms/Makefile8
-rw-r--r--devel/py-twext/Makefile10
-rw-r--r--devel/py-twiggy/Makefile2
-rw-r--r--devel/py-twilio/Makefile6
-rw-r--r--devel/py-twisted/Makefile10
-rw-r--r--devel/py-txaio/Makefile10
-rw-r--r--devel/py-tzlocal/Makefile2
-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-urwidtrees/Makefile4
-rw-r--r--devel/py-user_agents/Makefile2
-rw-r--r--devel/py-validators/Makefile4
-rw-r--r--devel/py-vcrpy/Makefile14
-rw-r--r--devel/py-virtualenv/Makefile6
-rw-r--r--devel/py-virtualenvwrapper/Makefile12
-rw-r--r--devel/py-warlock/Makefile6
-rw-r--r--devel/py-watchdog/Makefile10
-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-xarray/Makefile6
-rw-r--r--devel/py-xattr/Makefile4
-rw-r--r--devel/py-xcaplib/Makefile6
-rw-r--r--devel/py-xdis/Makefile8
-rw-r--r--devel/py-xmltodict/Makefile2
-rw-r--r--devel/py-xxhash/Makefile2
-rw-r--r--devel/py-yandex-money-sdk/Makefile6
-rw-r--r--devel/py-z3c.autoinclude/Makefile10
-rw-r--r--devel/py-z3c.batching/Makefile4
-rw-r--r--devel/py-z3c.caching/Makefile12
-rw-r--r--devel/py-z3c.form/Makefile38
-rw-r--r--devel/py-z3c.formwidget.query/Makefile10
-rw-r--r--devel/py-z3c.zcmlhook/Makefile8
-rw-r--r--devel/py-zExceptions/Makefile6
-rw-r--r--devel/py-zLOG/Makefile2
-rw-r--r--devel/py-zope.annotation/Makefile10
-rw-r--r--devel/py-zope.app.applicationcontrol/Makefile16
-rw-r--r--devel/py-zope.app.appsetup/Makefile26
-rw-r--r--devel/py-zope.app.basicskin/Makefile6
-rw-r--r--devel/py-zope.app.broken/Makefile14
-rw-r--r--devel/py-zope.app.cache/Makefile24
-rw-r--r--devel/py-zope.app.component/Makefile28
-rw-r--r--devel/py-zope.app.container/Makefile36
-rw-r--r--devel/py-zope.app.content/Makefile8
-rw-r--r--devel/py-zope.app.debug/Makefile6
-rw-r--r--devel/py-zope.app.dependable/Makefile14
-rw-r--r--devel/py-zope.app.error/Makefile8
-rw-r--r--devel/py-zope.app.exception/Makefile14
-rw-r--r--devel/py-zope.app.file/Makefile28
-rw-r--r--devel/py-zope.app.folder/Makefile6
-rw-r--r--devel/py-zope.app.form/Makefile30
-rw-r--r--devel/py-zope.app.generations/Makefile14
-rw-r--r--devel/py-zope.app.http/Makefile8
-rw-r--r--devel/py-zope.app.pagetemplate/Makefile24
-rw-r--r--devel/py-zope.app.publication/Makefile18
-rw-r--r--devel/py-zope.app.publisher/Makefile26
-rw-r--r--devel/py-zope.app.renderer/Makefile18
-rw-r--r--devel/py-zope.app.rotterdam/Makefile24
-rw-r--r--devel/py-zope.app.schema/Makefile6
-rw-r--r--devel/py-zope.app.testing/Makefile36
-rw-r--r--devel/py-zope.app.zcmlfiles/Makefile72
-rw-r--r--devel/py-zope.app.zopeappgenerations/Makefile12
-rw-r--r--devel/py-zope.applicationcontrol/Makefile10
-rw-r--r--devel/py-zope.broken/Makefile2
-rw-r--r--devel/py-zope.browser/Makefile2
-rw-r--r--devel/py-zope.browsermenu/Makefile20
-rw-r--r--devel/py-zope.browserpage/Makefile20
-rw-r--r--devel/py-zope.browserresource/Makefile18
-rw-r--r--devel/py-zope.component/Makefile4
-rw-r--r--devel/py-zope.componentvocabulary/Makefile10
-rw-r--r--devel/py-zope.configuration/Makefile6
-rw-r--r--devel/py-zope.container/Makefile32
-rw-r--r--devel/py-zope.contentprovider/Makefile14
-rw-r--r--devel/py-zope.copy/Makefile2
-rw-r--r--devel/py-zope.copypastemove/Makefile18
-rw-r--r--devel/py-zope.deferredimport/Makefile2
-rw-r--r--devel/py-zope.dublincore/Makefile14
-rw-r--r--devel/py-zope.error/Makefile8
-rw-r--r--devel/py-zope.exceptions/Makefile2
-rw-r--r--devel/py-zope.filerepresentation/Makefile4
-rw-r--r--devel/py-zope.formlib/Makefile28
-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/Makefile4
-rw-r--r--devel/py-zope.pagetemplate/Makefile16
-rw-r--r--devel/py-zope.processlifetime/Makefile2
-rw-r--r--devel/py-zope.ptresource/Makefile10
-rw-r--r--devel/py-zope.publisher/Makefile22
-rw-r--r--devel/py-zope.ramcache/Makefile8
-rw-r--r--devel/py-zope.schema/Makefile4
-rw-r--r--devel/py-zope.site/Makefile16
-rw-r--r--devel/py-zope.size/Makefile4
-rw-r--r--devel/py-zope.tales/Makefile4
-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/Makefile22
-rw-r--r--devel/py_static_check/Makefile2
-rw-r--r--devel/pygobject3-common/Makefile4
-rw-r--r--devel/pylint/Makefile16
-rw-r--r--devel/qbzr/Makefile4
-rw-r--r--devel/rbtools/Makefile6
-rw-r--r--devel/renpy/Makefile6
-rw-r--r--devel/runsnakerun/Makefile4
-rw-r--r--devel/tortoisehg/Makefile4
-rw-r--r--dns/dnsviz/Makefile6
-rw-r--r--dns/py-cloudflare/Makefile8
-rw-r--r--dns/py-dns-lexicon/Makefile6
-rw-r--r--dns/py-dnspython/Makefile2
-rw-r--r--dns/py-easyzone/Makefile2
-rw-r--r--dns/py-idna_ssl/Makefile10
-rw-r--r--dns/py-namebench/Makefile12
-rw-r--r--dns/py-py3dns/Makefile2
-rw-r--r--dns/py-tld/Makefile2
-rw-r--r--dns/py-tldextract/Makefile2
-rw-r--r--dns/sshfp/Makefile8
-rw-r--r--editors/gwrite/Makefile10
-rw-r--r--editors/leo/Makefile6
-rw-r--r--editors/py-room/Makefile2
-rw-r--r--emulators/dynagen/Makefile2
-rw-r--r--emulators/gns3/Makefile6
-rw-r--r--emulators/py-nova/Makefile114
-rw-r--r--finance/electrum/Makefile24
-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/Makefile2
-rw-r--r--finance/tryton28/Makefile4
-rw-r--r--finance/trytond28/Makefile22
-rw-r--r--finance/trytond28_account/Makefile2
-rw-r--r--finance/trytond28_calendar/Makefile8
-rw-r--r--finance/trytond28_ldap_connection/Makefile2
-rw-r--r--finance/trytond28_party/Makefile2
-rw-r--r--finance/trytond28_party_vcarddav/Makefile4
-rw-r--r--finance/trytond28_stock_forecast/Makefile2
-rw-r--r--ftp/py-pyftpdlib/Makefile4
-rw-r--r--ftp/py-sftp/Makefile2
-rw-r--r--games/balazar/Makefile12
-rw-r--r--games/glchess/Makefile2
-rw-r--r--games/hypatia_engine/Makefile4
-rw-r--r--games/poker-engine/Makefile12
-rw-r--r--games/py-sgfsummary/Makefile2
-rw-r--r--games/pythonsudoku/Makefile4
-rw-r--r--games/slune/Makefile8
-rw-r--r--games/unknown-horizons/Makefile8
-rw-r--r--graphics/caffe/Makefile12
-rw-r--r--graphics/imgtops/Makefile2
-rw-r--r--graphics/py-PyOpenGL/Makefile6
-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-cairocffi/Makefile2
-rw-r--r--graphics/py-cartopy/Makefile6
-rw-r--r--graphics/py-gdal/Makefile4
-rw-r--r--graphics/py-gizeh/Makefile2
-rw-r--r--graphics/py-glewpy/Makefile2
-rw-r--r--graphics/py-graphviz/Makefile4
-rw-r--r--graphics/py-imageio/Makefile2
-rw-r--r--graphics/py-imgurpython/Makefile2
-rw-r--r--graphics/py-leather/Makefile2
-rw-r--r--graphics/py-mcomix/Makefile2
-rw-r--r--graphics/py-nwdiag/Makefile6
-rw-r--r--graphics/py-photocollage/Makefile6
-rw-r--r--graphics/py-pillow/Makefile8
-rw-r--r--graphics/py-plotly/Makefile8
-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-pygal/Makefile2
-rw-r--r--graphics/py-pygraphviz/Makefile2
-rw-r--r--graphics/py-sane/Makefile2
-rw-r--r--graphics/py-scikit-image/Makefile20
-rw-r--r--graphics/py-seqdiag/Makefile6
-rw-r--r--graphics/py-sk1/Makefile10
-rw-r--r--graphics/py-soya3d/Makefile8
-rw-r--r--graphics/py-stltools/Makefile2
-rw-r--r--graphics/py-toyplot/Makefile10
-rw-r--r--graphics/py-traitsui/Makefile2
-rw-r--r--graphics/tilecache/Makefile4
-rw-r--r--graphics/uniconvertor/Makefile2
-rw-r--r--graphics/uniconvw/Makefile2
-rw-r--r--graphics/variety/Makefile22
-rw-r--r--irc/py-fishcrypt/Makefile4
-rw-r--r--irc/py-irc/Makefile12
-rw-r--r--irc/py-limnoria/Makefile20
-rw-r--r--japanese/py-tegaki-gtk/Makefile2
-rw-r--r--japanese/py-tegaki/Makefile2
-rw-r--r--japanese/tegaki-recognize/Makefile2
-rw-r--r--lang/cdent/Makefile2
-rw-r--r--lang/py-hy/Makefile18
-rw-r--r--mail/courier-pythonfilter/Makefile2
-rw-r--r--mail/isbg/Makefile2
-rw-r--r--mail/mailpile/Makefile10
-rw-r--r--mail/postfix-policyd-spf-python/Makefile4
-rw-r--r--mail/py-Products.MailHost/Makefile16
-rw-r--r--mail/py-alot/Makefile14
-rw-r--r--mail/py-apolicy/Makefile6
-rw-r--r--mail/py-dkimpy/Makefile6
-rw-r--r--mail/py-flask-mail/Makefile4
-rw-r--r--mail/py-flufl.bounce/Makefile4
-rw-r--r--mail/py-fuglu/Makefile12
-rw-r--r--mail/py-ppolicy/Makefile10
-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/rss2email3/Makefile4
-rw-r--r--mail/svnmailer/Makefile2
-rw-r--r--math/gracetmpl/Makefile4
-rw-r--r--math/py-Diofant/Makefile20
-rw-r--r--math/py-GridDataFormats/Makefile2
-rw-r--r--math/py-PyMetis/Makefile4
-rw-r--r--math/py-PyWavelets/Makefile4
-rw-r--r--math/py-Pyomo/Makefile4
-rw-r--r--math/py-apgl/Makefile2
-rw-r--r--math/py-basemap/Makefile2
-rw-r--r--math/py-bitmath/Makefile2
-rw-r--r--math/py-bottleneck/Makefile2
-rw-r--r--math/py-colormath/Makefile4
-rw-r--r--math/py-cyipopt/Makefile4
-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-keras/Makefile8
-rw-r--r--math/py-levmar/Makefile2
-rw-r--r--math/py-luminol/Makefile4
-rw-r--r--math/py-mathdom/Makefile2
-rw-r--r--math/py-matplotlib/Makefile16
-rw-r--r--math/py-mpmath/Makefile2
-rw-r--r--math/py-networkx/Makefile18
-rw-r--r--math/py-numexpr/Makefile2
-rw-r--r--math/py-numpy/Makefile2
-rw-r--r--math/py-pandas/Makefile42
-rw-r--r--math/py-patsy/Makefile2
-rw-r--r--math/py-plastex/Makefile2
-rw-r--r--math/py-pybloom/Makefile2
-rw-r--r--math/py-pymc/Makefile8
-rw-r--r--math/py-pymc3/Makefile16
-rw-r--r--math/py-pyneqsys/Makefile10
-rw-r--r--math/py-pyodesys/Makefile8
-rw-r--r--math/py-pysparse/Makefile4
-rw-r--r--math/py-pysym/Makefile2
-rw-r--r--math/py-scikit-umfpack/Makefile4
-rw-r--r--math/py-secp256k1/Makefile4
-rw-r--r--math/py-statsmodels/Makefile6
-rw-r--r--math/py-sympy/Makefile4
-rw-r--r--math/py-theano/Makefile2
-rw-r--r--math/py-yt/Makefile10
-rw-r--r--misc/py-PyUserInput/Makefile2
-rw-r--r--misc/py-cinder/Makefile112
-rw-r--r--misc/py-crudini/Makefile2
-rw-r--r--misc/py-fuzzy/Makefile4
-rw-r--r--misc/py-glance/Makefile84
-rw-r--r--misc/py-orange3-datafusion/Makefile2
-rw-r--r--misc/py-orange3-network/Makefile4
-rw-r--r--misc/py-orange3-timeseries/Makefile8
-rw-r--r--misc/py-osd/Makefile2
-rw-r--r--misc/py-pexpect/Makefile2
-rw-r--r--misc/py-progressbar2/Makefile6
-rw-r--r--misc/py-pyprind/Makefile6
-rw-r--r--misc/py-python-utils/Makefile4
-rw-r--r--misc/py-scikit-fusion/Makefile4
-rw-r--r--misc/py-serverfiles/Makefile2
-rw-r--r--misc/py-soapy_power/Makefile6
-rw-r--r--misc/py-socli/Makefile10
-rw-r--r--misc/py-spdx-lookup/Makefile2
-rw-r--r--misc/pylize/Makefile6
-rw-r--r--multimedia/freevo/Makefile18
-rw-r--r--multimedia/gaupol/Makefile4
-rw-r--r--multimedia/livestreamer/Makefile6
-rw-r--r--multimedia/miro/Makefile20
-rw-r--r--multimedia/mps-youtube/Makefile2
-rw-r--r--multimedia/openshot/Makefile10
-rw-r--r--multimedia/photofilmstrip/Makefile2
-rw-r--r--multimedia/py-gstreamer/Makefile4
-rw-r--r--multimedia/py-guessit/Makefile6
-rw-r--r--multimedia/py-kaa-base/Makefile4
-rw-r--r--multimedia/py-kaa-imlib2/Makefile2
-rw-r--r--multimedia/py-kaa-metadata/Makefile4
-rw-r--r--multimedia/py-librtmp/Makefile6
-rw-r--r--multimedia/py-moviepy/Makefile6
-rw-r--r--multimedia/py-openlp/Makefile22
-rw-r--r--multimedia/py-periscope/Makefile2
-rw-r--r--multimedia/py-pretty_midi/Makefile4
-rw-r--r--multimedia/py-soco/Makefile4
-rw-r--r--multimedia/py-subliminal/Makefile28
-rw-r--r--multimedia/py-tvnamer/Makefile4
-rw-r--r--multimedia/quodlibet/Makefile14
-rw-r--r--multimedia/tovid/Makefile2
-rw-r--r--net-im/fugu/Makefile2
-rw-r--r--net-im/papyon/Makefile12
-rw-r--r--net-im/poezio/Makefile4
-rw-r--r--net-im/proxy65/Makefile6
-rw-r--r--net-im/py-fbmq/Makefile4
-rw-r--r--net-im/py-jabberbot/Makefile2
-rw-r--r--net-im/py-libturpial/Makefile6
-rw-r--r--net-im/py-matrix-synapse/Makefile66
-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-slackclient/Makefile12
-rw-r--r--net-im/py-sleekxmpp/Makefile2
-rw-r--r--net-im/py-telepot/Makefile4
-rw-r--r--net-im/py-unmessage/Makefile14
-rw-r--r--net-im/py-xmpppy-irc/Makefile4
-rw-r--r--net-im/py-xmpppy/Makefile2
-rw-r--r--net-im/toot/Makefile10
-rw-r--r--net-im/turpial/Makefile10
-rw-r--r--net-mgmt/nagstamon/Makefile2
-rw-r--r--net-mgmt/onionlauncher/Makefile2
-rw-r--r--net-mgmt/py-adal/Makefile8
-rw-r--r--net-mgmt/py-dnsdiag/Makefile4
-rw-r--r--net-mgmt/py-junos-eznc/Makefile18
-rw-r--r--net-mgmt/py-msrest/Makefile8
-rw-r--r--net-mgmt/py-msrestazure/Makefile6
-rw-r--r--net-mgmt/py-napalm/Makefile30
-rw-r--r--net-mgmt/py-ncclient/Makefile6
-rw-r--r--net-mgmt/py-prometheus-client/Makefile4
-rw-r--r--net-mgmt/py-pyeapi/Makefile2
-rw-r--r--net-mgmt/py-pynsca/Makefile4
-rw-r--r--net-mgmt/py-pynxos/Makefile6
-rw-r--r--net-mgmt/py-pysmi/Makefile6
-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/tornova/Makefile2
-rw-r--r--net-p2p/deluge-cli/Makefile12
-rw-r--r--net-p2p/py-transmissionrpc/Makefile2
-rw-r--r--net-p2p/py-vertex/Makefile6
-rw-r--r--net/cloud-init-azure/Makefile24
-rw-r--r--net/cloud-init/Makefile22
-rw-r--r--net/googlecl/Makefile6
-rw-r--r--net/nsscache/Makefile4
-rw-r--r--net/pdb/Makefile2
-rw-r--r--net/py-GeoIP2/Makefile4
-rw-r--r--net/py-amqp/Makefile8
-rw-r--r--net/py-avahi/Makefile8
-rw-r--r--net/py-beanstalkc/Makefile6
-rw-r--r--net/py-cjdns/Makefile2
-rw-r--r--net/py-cloudflare-scrape/Makefile2
-rw-r--r--net/py-coherence/Makefile8
-rw-r--r--net/py-ec2-cli-tools/Makefile2
-rw-r--r--net/py-eventlet/Makefile4
-rw-r--r--net/py-flask-xml-rpc/Makefile4
-rw-r--r--net/py-gntp/Makefile2
-rw-r--r--net/py-gspread/Makefile2
-rw-r--r--net/py-gspreadsheet/Makefile4
-rw-r--r--net/py-haproxyctl/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-libfte/Makefile2
-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-msrplib/Makefile10
-rw-r--r--net/py-ndg_httpsclient/Makefile4
-rw-r--r--net/py-netaddr/Makefile2
-rw-r--r--net/py-netif/Makefile2
-rw-r--r--net/py-netlib/Makefile4
-rw-r--r--net/py-nnpy/Makefile2
-rw-r--r--net/py-oauth2/Makefile6
-rw-r--r--net/py-port-for/Makefile4
-rw-r--r--net/py-portend/Makefile4
-rw-r--r--net/py-pynsq/Makefile10
-rw-r--r--net/py-pyshark/Makefile8
-rw-r--r--net/py-pysmb/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/Makefile28
-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-pyvmomi/Makefile4
-rw-r--r--net/py-pyzmq/Makefile4
-rw-r--r--net/py-rabbitpy/Makefile4
-rw-r--r--net/py-rainbowstream/Makefile14
-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/Makefile6
-rw-r--r--net/py-shodan/Makefile8
-rw-r--r--net/py-smart_open/Makefile12
-rw-r--r--net/py-soappy/Makefile4
-rw-r--r--net/py-socketio-client/Makefile6
-rw-r--r--net/py-softlayer/Makefile14
-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/Makefile2
-rw-r--r--net/py-txamqp/Makefile4
-rw-r--r--net/py-upnp-inspector/Makefile2
-rw-r--r--net/py-urllib3/Makefile18
-rw-r--r--net/py-wmi-query/Makefile2
-rw-r--r--net/py-wolframalpha/Makefile6
-rw-r--r--net/py-zeroconf/Makefile4
-rw-r--r--net/py-zope.proxy/Makefile2
-rw-r--r--net/pythondirector/Makefile2
-rw-r--r--net/s3ql/Makefile12
-rw-r--r--net/scapy/Makefile12
-rw-r--r--net/sippy_b2bua/Makefile2
-rw-r--r--net/splatd/Makefile10
-rw-r--r--net/tcpwatch/Makefile2
-rw-r--r--net/turses/Makefile12
-rw-r--r--news/hellanzb/Makefile4
-rw-r--r--news/py-pynzb/Makefile2
-rw-r--r--news/rawdog/Makefile2
-rw-r--r--ports-mgmt/py-pytoport/Makefile4
-rw-r--r--print/cloudprint/Makefile8
-rw-r--r--print/dot2tex/Makefile2
-rw-r--r--print/frescobaldi/Makefile4
-rw-r--r--print/pkpgcounter/Makefile2
-rw-r--r--print/py-pollyreports/Makefile2
-rw-r--r--print/py-relatorio/Makefile10
-rw-r--r--print/py-reportlab/Makefile2
-rw-r--r--print/py-stapler/Makefile4
-rw-r--r--print/py-trml2pdf/Makefile4
-rw-r--r--print/ttfquery/Makefile2
-rw-r--r--science/brian/Makefile6
-rw-r--r--science/psychopy/Makefile34
-rw-r--r--science/py-MDAnalysis/Makefile20
-rw-r--r--science/py-MDAnalysisTests/Makefile10
-rw-r--r--science/py-OpenFermion/Makefile12
-rw-r--r--science/py-cdo/Makefile2
-rw-r--r--science/py-h5py/Makefile6
-rw-r--r--science/py-hcluster/Makefile2
-rw-r--r--science/py-mdp/Makefile4
-rw-r--r--science/py-mmtf-python/Makefile2
-rw-r--r--science/py-obspy/Makefile16
-rw-r--r--science/py-openpiv/Makefile12
-rw-r--r--science/py-paida/Makefile2
-rw-r--r--science/py-pymatgen/Makefile24
-rw-r--r--science/py-pymol/Makefile4
-rw-r--r--science/py-pyosf/Makefile4
-rw-r--r--science/py-pysal/Makefile6
-rw-r--r--science/py-pyteomics/Makefile4
-rw-r--r--science/py-scikit-fuzzy/Makefile4
-rw-r--r--science/py-scikit-learn/Makefile2
-rw-r--r--science/py-scikit-sparse/Makefile2
-rw-r--r--science/py-scimath/Makefile4
-rw-r--r--science/py-scoria/Makefile2
-rw-r--r--science/py-tensorflow/Makefile24
-rw-r--r--science/pybrain/Makefile2
-rw-r--r--security/gpgme/Makefile4
-rw-r--r--security/kedpm/Makefile2
-rw-r--r--security/nyx/Makefile4
-rw-r--r--security/pwman3/Makefile4
-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-SecretStorage/Makefile4
-rw-r--r--security/py-YubiOTP/Makefile4
-rw-r--r--security/py-artifacts/Makefile4
-rw-r--r--security/py-asyncssh/Makefile4
-rw-r--r--security/py-backports.ssl_match_hostname/Makefile2
-rw-r--r--security/py-bcrypt/Makefile4
-rw-r--r--security/py-borg.localrole/Makefile20
-rw-r--r--security/py-btchip-python/Makefile8
-rw-r--r--security/py-certbot-nginx/Makefile4
-rw-r--r--security/py-cryptography/Makefile14
-rw-r--r--security/py-cybox/Makefile8
-rw-r--r--security/py-docker-pycreds/Makefile2
-rw-r--r--security/py-fail2ban/Makefile2
-rw-r--r--security/py-first-server/Makefile14
-rw-r--r--security/py-flask-httpauth/Makefile2
-rw-r--r--security/py-flask-kerberos/Makefile4
-rw-r--r--security/py-flask-saml/Makefile6
-rw-r--r--security/py-gixy/Makefile12
-rw-r--r--security/py-gnupg/Makefile2
-rw-r--r--security/py-google-auth/Makefile8
-rw-r--r--security/py-gpsoauth/Makefile10
-rw-r--r--security/py-itsdangerous/Makefile2
-rw-r--r--security/py-josepy/Makefile20
-rw-r--r--security/py-keyczar/Makefile4
-rw-r--r--security/py-keyring/Makefile10
-rw-r--r--security/py-keyrings.alt/Makefile10
-rw-r--r--security/py-keystone/Makefile70
-rw-r--r--security/py-m2crypto/Makefile2
-rw-r--r--security/py-maec/Makefile8
-rw-r--r--security/py-mixbox/Makefile8
-rw-r--r--security/py-mnemonic/Makefile2
-rw-r--r--security/py-netmiko/Makefile10
-rw-r--r--security/py-oauth2client/Makefile10
-rw-r--r--security/py-oauthlib/Makefile18
-rw-r--r--security/py-obfsproxy-tor/Makefile10
-rw-r--r--security/py-openssl/Makefile4
-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-plone.app.openid/Makefile18
-rw-r--r--security/py-plone.keyring/Makefile8
-rw-r--r--security/py-plone.openid/Makefile10
-rw-r--r--security/py-plone.protect/Makefile6
-rw-r--r--security/py-plone.session/Makefile8
-rw-r--r--security/py-potr/Makefile2
-rw-r--r--security/py-pyaxo/Makefile6
-rw-r--r--security/py-pycryptopp/Makefile4
-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/Makefile28
-rw-r--r--security/py-python-social-auth/Makefile12
-rw-r--r--security/py-python3-openid/Makefile2
-rw-r--r--security/py-pywinrm/Makefile12
-rw-r--r--security/py-requests-credssp/Makefile6
-rw-r--r--security/py-requests-kerberos/Makefile4
-rw-r--r--security/py-rsa/Makefile4
-rw-r--r--security/py-scp/Makefile2
-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/Makefile4
-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/Makefile8
-rw-r--r--security/py-volatility/Makefile12
-rw-r--r--security/py-vulndb/Makefile2
-rw-r--r--security/py-yubikey-manager/Makefile8
-rw-r--r--security/py-yubioath-desktop/Makefile8
-rw-r--r--security/py-zope.app.authentication/Makefile38
-rw-r--r--security/py-zope.app.localpermission/Makefile12
-rw-r--r--security/py-zope.app.principalannotation/Makefile8
-rw-r--r--security/py-zope.app.security/Makefile24
-rw-r--r--security/py-zope.app.securitypolicy/Makefile30
-rw-r--r--security/py-zope.authentication/Makefile12
-rw-r--r--security/py-zope.login/Makefile8
-rw-r--r--security/py-zope.password/Makefile6
-rw-r--r--security/py-zope.pluggableauth/Makefile28
-rw-r--r--security/py-zope.principalannotation/Makefile14
-rw-r--r--security/py-zope.principalregistry/Makefile10
-rw-r--r--security/py-zope.security/Makefile18
-rw-r--r--security/py-zope.securitypolicy/Makefile22
-rw-r--r--security/py-zope.session/Makefile14
-rw-r--r--security/umit/Makefile4
-rw-r--r--security/vinetto/Makefile2
-rw-r--r--security/w3af/Makefile72
-rw-r--r--security/wapiti/Makefile16
-rw-r--r--security/yubikey-piv-manager/Makefile2
-rw-r--r--security/zenmap/Makefile2
-rw-r--r--shells/xonsh/Makefile2
-rw-r--r--sysutils/azure-agent/Makefile2
-rw-r--r--sysutils/bsdploy/Makefile18
-rw-r--r--sysutils/catfish/Makefile4
-rw-r--r--sysutils/createrepo/Makefile10
-rw-r--r--sysutils/docker-compose/Makefile26
-rw-r--r--sysutils/duplicity/Makefile12
-rw-r--r--sysutils/farbot/Makefile4
-rw-r--r--sysutils/fusefs-gitfs/Makefile14
-rw-r--r--sysutils/fusefs-wikipediafs/Makefile2
-rw-r--r--sysutils/hachoir-urwid/Makefile2
-rw-r--r--sysutils/jadm/Makefile12
-rw-r--r--sysutils/mog/Makefile4
-rw-r--r--sysutils/ohmu/Makefile4
-rw-r--r--sysutils/py-bcfg2/Makefile12
-rw-r--r--sysutils/py-cdmi/Makefile4
-rw-r--r--sysutils/py-consul/Makefile8
-rw-r--r--sysutils/py-croniter/Makefile2
-rw-r--r--sysutils/py-crontab/Makefile4
-rw-r--r--sysutils/py-diffoscope/Makefile6
-rw-r--r--sysutils/py-dlipower/Makefile6
-rw-r--r--sysutils/py-docker/Makefile12
-rw-r--r--sysutils/py-execnet/Makefile4
-rw-r--r--sysutils/py-ezjailremote/Makefile2
-rw-r--r--sysutils/py-freenas.cli/Makefile20
-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-mqttwarn/Makefile4
-rw-r--r--sysutils/py-ploy/Makefile6
-rw-r--r--sysutils/py-ploy_ansible/Makefile14
-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/Makefile2
-rw-r--r--sysutils/py-salt/Makefile36
-rw-r--r--sysutils/py-shutilwhich/Makefile2
-rw-r--r--sysutils/py-superlance/Makefile2
-rw-r--r--sysutils/py-supervisor/Makefile4
-rw-r--r--sysutils/py-tmuxp/Makefile8
-rw-r--r--sysutils/py-zdaemon/Makefile2
-rw-r--r--sysutils/yum/Makefile8
-rw-r--r--textproc/archmage/Makefile2
-rw-r--r--textproc/plover/Makefile6
-rw-r--r--textproc/pootle/Makefile28
-rw-r--r--textproc/py-CommonMark/Makefile2
-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-autopep8/Makefile2
-rw-r--r--textproc/py-awesome-slugify/Makefile6
-rw-r--r--textproc/py-bibtexparser/Makefile4
-rw-r--r--textproc/py-chardet/Makefile6
-rw-r--r--textproc/py-citeproc-py-styles/Makefile6
-rw-r--r--textproc/py-citeproc-py/Makefile4
-rw-r--r--textproc/py-cloud_sptheme/Makefile4
-rw-r--r--textproc/py-creole/Makefile2
-rw-r--r--textproc/py-csvkit/Makefile10
-rw-r--r--textproc/py-docutils/Makefile2
-rw-r--r--textproc/py-duecredit/Makefile6
-rw-r--r--textproc/py-elasticsearch-async/Makefile12
-rw-r--r--textproc/py-elasticsearch-dsl/Makefile6
-rw-r--r--textproc/py-elasticsearch/Makefile2
-rw-r--r--textproc/py-elasticsearch5/Makefile2
-rw-r--r--textproc/py-genshi/Makefile2
-rw-r--r--textproc/py-gensim/Makefile6
-rw-r--r--textproc/py-humanfriendly/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-mkdocs-nature/Makefile2
-rw-r--r--textproc/py-mkdocs/Makefile14
-rw-r--r--textproc/py-nltk/Makefile6
-rw-r--r--textproc/py-numpydoc/Makefile6
-rw-r--r--textproc/py-openpyxl/Makefile4
-rw-r--r--textproc/py-orange3-text/Makefile30
-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-parso/Makefile4
-rw-r--r--textproc/py-pdfminer3k/Makefile2
-rw-r--r--textproc/py-pyes/Makefile4
-rw-r--r--textproc/py-pyhamcrest/Makefile2
-rw-r--r--textproc/py-pyhwp/Makefile10
-rw-r--r--textproc/py-pyscss/Makefile4
-rw-r--r--textproc/py-pysrt/Makefile2
-rw-r--r--textproc/py-python-augeas/Makefile2
-rw-r--r--textproc/py-python-docx/Makefile2
-rw-r--r--textproc/py-python-slugify/Makefile2
-rw-r--r--textproc/py-qrcode/Makefile4
-rw-r--r--textproc/py-rdflib/Makefile8
-rw-r--r--textproc/py-rnc2rng/Makefile2
-rw-r--r--textproc/py-rstyoutube/Makefile2
-rw-r--r--textproc/py-scour/Makefile2
-rw-r--r--textproc/py-snowballstemmer/Makefile2
-rw-r--r--textproc/py-sphinx-hieroglyph/Makefile2
-rw-r--r--textproc/py-sphinx-intl/Makefile6
-rw-r--r--textproc/py-sphinx/Makefile38
-rw-r--r--textproc/py-sphinx_numfig/Makefile2
-rw-r--r--textproc/py-sphinx_wikipedia/Makefile2
-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-texttable/Makefile8
-rw-r--r--textproc/py-toronado/Makefile6
-rw-r--r--textproc/py-transifex-client/Makefile4
-rw-r--r--textproc/py-wicked/Makefile8
-rw-r--r--textproc/py-wstools/Makefile4
-rw-r--r--textproc/py-wtforms/Makefile8
-rw-r--r--textproc/py-xlutils/Makefile4
-rw-r--r--textproc/py-zope.app.i18n/Makefile18
-rw-r--r--textproc/py-zope.app.locales/Makefile10
-rw-r--r--textproc/py-zope.tal/Makefile4
-rw-r--r--textproc/translate-toolkit/Makefile14
-rw-r--r--textproc/xml2rfc/Makefile6
-rw-r--r--textproc/xsv/Makefile2
-rw-r--r--www/butterfly/Makefile6
-rw-r--r--www/calendarserver/Makefile32
-rw-r--r--www/feedjack/Makefile4
-rw-r--r--www/geeknote/Makefile12
-rw-r--r--www/jtoolkit/Makefile2
-rw-r--r--www/linkchecker/Makefile12
-rw-r--r--www/mitmproxy/Makefile46
-rw-r--r--www/plone/Makefile18
-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/Makefile22
-rw-r--r--www/py-arxiv/Makefile4
-rw-r--r--www/py-autobahn/Makefile22
-rw-r--r--www/py-aws-requests-auth/Makefile4
-rw-r--r--www/py-azure-storage/Makefile8
-rw-r--r--www/py-beaker/Makefile2
-rw-r--r--www/py-bleach/Makefile8
-rw-r--r--www/py-blogofile/Makefile22
-rw-r--r--www/py-bokeh/Makefile12
-rw-r--r--www/py-boto3/Makefile10
-rw-r--r--www/py-bottle-cork/Makefile8
-rw-r--r--www/py-branca/Makefile2
-rw-r--r--www/py-buku/Makefile10
-rw-r--r--www/py-cachecontrol/Makefile8
-rw-r--r--www/py-caldav/Makefile8
-rw-r--r--www/py-cheroot/Makefile6
-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-ddgr/Makefile2
-rw-r--r--www/py-django-allauth/Makefile10
-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-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-braces/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-contact-form/Makefile4
-rw-r--r--www/py-django-contrib-comments/Makefile2
-rw-r--r--www/py-django-crispy-forms/Makefile2
-rw-r--r--www/py-django-datetime-widget/Makefile4
-rw-r--r--www/py-django-debug-toolbar/Makefile4
-rw-r--r--www/py-django-evolution/Makefile2
-rw-r--r--www/py-django-extensions/Makefile6
-rw-r--r--www/py-django-guardian/Makefile4
-rw-r--r--www/py-django-happenings/Makefile4
-rw-r--r--www/py-django-hijack/Makefile2
-rw-r--r--www/py-django-htmlmin/Makefile4
-rw-r--r--www/py-django-js-asset/Makefile2
-rw-r--r--www/py-django-json-rpc/Makefile2
-rw-r--r--www/py-django-jsonfield2/Makefile2
-rw-r--r--www/py-django-keyedcache/Makefile2
-rw-r--r--www/py-django-livesettings/Makefile4
-rw-r--r--www/py-django-mezzanine/Makefile26
-rw-r--r--www/py-django-model-utils/Makefile2
-rw-r--r--www/py-django-mptt/Makefile2
-rw-r--r--www/py-django-netfields/Makefile4
-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-profiles/Makefile2
-rw-r--r--www/py-django-pyscss/Makefile4
-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/Makefile4
-rw-r--r--www/py-django-signals-ahoy/Makefile2
-rw-r--r--www/py-django-social-auth/Makefile4
-rw-r--r--www/py-django-solo/Makefile2
-rw-r--r--www/py-django-sortedm2m/Makefile2
-rw-r--r--www/py-django-star-ratings/Makefile8
-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/Makefile4
-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/Makefile4
-rw-r--r--www/py-django-tinymce/Makefile2
-rw-r--r--www/py-django-widget-tweaks/Makefile2
-rw-r--r--www/py-django/Makefile6
-rw-r--r--www/py-django111/Makefile10
-rw-r--r--www/py-django18/Makefile12
-rw-r--r--www/py-django20/Makefile10
-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/Makefile6
-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-apscheduler/Makefile6
-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-marshmallow/Makefile6
-rw-r--r--www/py-flask-migrate/Makefile6
-rw-r--r--www/py-flask-moment/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-script/Makefile2
-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/Makefile68
-rw-r--r--www/py-folium/Makefile10
-rw-r--r--www/py-formalchemy/Makefile12
-rw-r--r--www/py-frappe-bench/Makefile16
-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-core/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/Makefile14
-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/Makefile112
-rw-r--r--www/py-html5-parser/Makefile2
-rw-r--r--www/py-html5lib/Makefile4
-rw-r--r--www/py-httmock/Makefile2
-rw-r--r--www/py-httpie/Makefile4
-rw-r--r--www/py-hyper/Makefile6
-rw-r--r--www/py-hyperlink/Makefile2
-rw-r--r--www/py-imdbpy/Makefile6
-rw-r--r--www/py-internetarchive/Makefile14
-rw-r--r--www/py-jsonfield/Makefile2
-rw-r--r--www/py-kallithea/Makefile46
-rw-r--r--www/py-lesscpy/Makefile10
-rw-r--r--www/py-libsass/Makefile2
-rw-r--r--www/py-livereload/Makefile4
-rw-r--r--www/py-mwoauth/Makefile10
-rw-r--r--www/py-nevow/Makefile2
-rw-r--r--www/py-notebook/Makefile24
-rw-r--r--www/py-paste/Makefile2
-rw-r--r--www/py-pastedeploy/Makefile2
-rw-r--r--www/py-pastescript/Makefile12
-rw-r--r--www/py-pelican/Makefile22
-rw-r--r--www/py-planet/Makefile6
-rw-r--r--www/py-plone.app.blob/Makefile10
-rw-r--r--www/py-plone.app.caching/Makefile40
-rw-r--r--www/py-plone.app.collection/Makefile36
-rw-r--r--www/py-plone.app.content/Makefile32
-rw-r--r--www/py-plone.app.contentlisting/Makefile2
-rw-r--r--www/py-plone.app.contentmenu/Makefile28
-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/Makefile18
-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.imaging/Makefile6
-rw-r--r--www/py-plone.app.iterate/Makefile38
-rw-r--r--www/py-plone.app.jquery/Makefile4
-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/Makefile2
-rw-r--r--www/py-plone.app.portlets/Makefile66
-rw-r--r--www/py-plone.app.querystring/Makefile32
-rw-r--r--www/py-plone.app.redirector/Makefile2
-rw-r--r--www/py-plone.app.registry/Makefile24
-rw-r--r--www/py-plone.app.search/Makefile2
-rw-r--r--www/py-plone.app.testing/Makefile18
-rw-r--r--www/py-plone.app.textfield/Makefile8
-rw-r--r--www/py-plone.app.theming/Makefile24
-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/Makefile8
-rw-r--r--www/py-plone.app.viewletmanager/Makefile18
-rw-r--r--www/py-plone.app.vocabularies/Makefile22
-rw-r--r--www/py-plone.app.workflow/Makefile34
-rw-r--r--www/py-plone.app.z3cform/Makefile18
-rw-r--r--www/py-plone.autoform/Makefile14
-rw-r--r--www/py-plone.behavior/Makefile10
-rw-r--r--www/py-plone.browserlayer/Makefile10
-rw-r--r--www/py-plone.cachepurging/Makefile22
-rw-r--r--www/py-plone.caching/Makefile16
-rw-r--r--www/py-plone.contentrules/Makefile22
-rw-r--r--www/py-plone.dexterity/Makefile56
-rw-r--r--www/py-plone.fieldsets/Makefile10
-rw-r--r--www/py-plone.folder/Makefile16
-rw-r--r--www/py-plone.formwidget.namedfile/Makefile6
-rw-r--r--www/py-plone.i18n/Makefile10
-rw-r--r--www/py-plone.indexer/Makefile8
-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/Makefile18
-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/Makefile18
-rw-r--r--www/py-plone.stringinterp/Makefile4
-rw-r--r--www/py-plone.subrequest/Makefile4
-rw-r--r--www/py-plone.supermodel/Makefile16
-rw-r--r--www/py-plone.testing/Makefile2
-rw-r--r--www/py-plone.theme/Makefile10
-rw-r--r--www/py-plone.transformchain/Makefile6
-rw-r--r--www/py-plone.uuid/Makefile8
-rw-r--r--www/py-plone.z3cform/Makefile10
-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-puppetboard03/Makefile14
-rw-r--r--www/py-py-restclient/Makefile2
-rw-r--r--www/py-pyjwt/Makefile8
-rw-r--r--www/py-pylons/Makefile36
-rw-r--r--www/py-pyocclient/Makefile4
-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-python-digitalocean/Makefile2
-rw-r--r--www/py-python-dotenv/Makefile2
-rw-r--r--www/py-pywikibot/Makefile22
-rw-r--r--www/py-qp/Makefile4
-rw-r--r--www/py-qt5-webkit/Makefile4
-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/Makefile2
-rw-r--r--www/py-requests-mock/Makefile6
-rw-r--r--www/py-requests-oauthlib/Makefile6
-rw-r--r--www/py-requests/Makefile14
-rw-r--r--www/py-requests_ntlm/Makefile6
-rw-r--r--www/py-restclient/Makefile2
-rw-r--r--www/py-rhodecode/Makefile46
-rw-r--r--www/py-rollbar/Makefile4
-rw-r--r--www/py-routes/Makefile4
-rw-r--r--www/py-scrapy/Makefile20
-rw-r--r--www/py-selector/Makefile2
-rw-r--r--www/py-slimit/Makefile6
-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/Makefile2
-rw-r--r--www/py-sseclient/Makefile4
-rw-r--r--www/py-swapper/Makefile2
-rw-r--r--www/py-textile/Makefile4
-rw-r--r--www/py-tornado/Makefile4
-rw-r--r--www/py-tornado4/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-webob/Makefile10
-rw-r--r--www/py-websocket-client/Makefile4
-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-wsgidav/Makefile14
-rw-r--r--www/py-yarl/Makefile8
-rw-r--r--www/py-zope.app.wsgi/Makefile40
-rw-r--r--www/pycarddav/Makefile12
-rw-r--r--www/radicale/Makefile6
-rw-r--r--www/radicale2/Makefile16
-rw-r--r--www/roundup/Makefile6
-rw-r--r--www/rtv/Makefile12
-rw-r--r--www/trac-OhlohWidgetsMacro/Makefile2
-rw-r--r--www/trac-TracGoogleAnalytics/Makefile2
-rw-r--r--www/trac-devel/Makefile24
-rw-r--r--www/trac-ldapauthstore/Makefile2
-rw-r--r--www/trac-ticketimport/Makefile2
-rw-r--r--www/trac/Makefile20
-rw-r--r--www/web2ldap/Makefile8
-rw-r--r--www/zope213/Makefile132
-rw-r--r--x11-fonts/py-QtAwesome/Makefile4
-rw-r--r--x11-toolkits/py-Pmw/Makefile2
-rw-r--r--x11-toolkits/py-gnome2/Makefile4
-rw-r--r--x11-toolkits/py-gtk2/Makefile4
-rw-r--r--x11-toolkits/py-gtkglext/Makefile4
-rw-r--r--x11-toolkits/py-gui/Makefile4
-rw-r--r--x11-toolkits/py-kivy/Makefile20
-rw-r--r--x11-toolkits/py-tktreectrl/Makefile4
-rw-r--r--x11-toolkits/py-wxPython28/Makefile6
-rw-r--r--x11-toolkits/py-wxPython30/Makefile2
-rw-r--r--x11-toolkits/py-xlib/Makefile6
-rw-r--r--x11-wm/compizconfig-python/Makefile2
-rw-r--r--x11-wm/obapps/Makefile2
-rw-r--r--x11-wm/plwm/Makefile4
-rw-r--r--x11-wm/qtile/Makefile4
-rw-r--r--x11/arandr/Makefile4
-rw-r--r--x11/menulibre/Makefile6
-rw-r--r--x11/py-pyvirtualdisplay/Makefile10
-rw-r--r--x11/terminator/Makefile4
-rw-r--r--x11/xpra/Makefile36
1617 files changed, 6801 insertions, 6801 deletions
diff --git a/accessibility/speech-dispatcher/Makefile b/accessibility/speech-dispatcher/Makefile
index dab7ebd24079..62ce6b324f6a 100644
--- a/accessibility/speech-dispatcher/Makefile
+++ b/accessibility/speech-dispatcher/Makefile
@@ -95,7 +95,7 @@ USES+= python:3.3+ shebangfix
SHEBANG_FILES= src/api/python/speechd_config/spd-conf
USE_PYTHON= flavors
LIB_DEPENDS+= libspeechd.so:accessibility/speech-dispatcher
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${PY_FLAVOR}
.endif
diff --git a/archivers/py-attic/Makefile b/archivers/py-attic/Makefile
index ab33233cdb95..afbc7ba373c6 100644
--- a/archivers/py-attic/Makefile
+++ b/archivers/py-attic/Makefile
@@ -15,8 +15,8 @@ COMMENT= Deduplicating backup program
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.10:devel/py-msgpack@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.10:devel/py-msgpack@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.10:devel/py-msgpack@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0.1.10:devel/py-msgpack@${PY_FLAVOR}
USES= python:3.3+ ssl
USE_PYTHON= autoplist distutils
diff --git a/archivers/py-libarchive-c/Makefile b/archivers/py-libarchive-c/Makefile
index 9e35747eb572..60496e250739 100644
--- a/archivers/py-libarchive-c/Makefile
+++ b/archivers/py-libarchive-c/Makefile
@@ -11,7 +11,7 @@ COMMENT= Python interface to libarchive
LICENSE= LGPL20+
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/archivers/py-lz4/Makefile b/archivers/py-lz4/Makefile
index 679476ad8609..28b8d5370f16 100644
--- a/archivers/py-lz4/Makefile
+++ b/archivers/py-lz4/Makefile
@@ -13,11 +13,11 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= liblz4>=1.7.5:archivers/liblz4 \
- ${PYTHON_PKGNAMEPREFIX}pkgconfig>=0:devel/py-pkgconfig@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pkgconfig>=0:devel/py-pkgconfig@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
LIB_DEPENDS= liblz4.so:archivers/liblz4
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
USE_PYTHON= distutils py3kplist
USES= python
@@ -30,7 +30,7 @@ post-install:
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3000
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/archivers/py-zstandard/Makefile b/archivers/py-zstandard/Makefile
index cd74e958d27d..1fd3da09c4d7 100644
--- a/archivers/py-zstandard/Makefile
+++ b/archivers/py-zstandard/Makefile
@@ -11,7 +11,7 @@ COMMENT= Zstandard bindings for Python, a full-featured version
LICENSE= BSD2CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.8.0:devel/py-cffi@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.8.0:devel/py-cffi@${PY_FLAVOR}
LIB_DEPENDS= libzstd.so:archivers/zstd
USES= localbase python
diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile
index b40216a42e72..77fc5540b368 100644
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -138,9 +138,9 @@ QTBIND_PLIST_SUB= QTBIND=""
QTBIND_PLIST_SUB_OFF= QTBIND="@comment "
RECONFIGURE_MAKE_ARGS_OFF= reconfigure=no
CPPBIND_MAKE_ARGS_OFF= libgpsmm=no
-X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${FLAVOR}
-#X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${FLAVOR}
+X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
+#X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR}
X11_USE= GNOME=gtk30
# Build control
diff --git a/astro/py-RO/Makefile b/astro/py-RO/Makefile
index c3878478be41..9bef1b521669 100644
--- a/astro/py-RO/Makefile
+++ b/astro/py-RO/Makefile
@@ -13,7 +13,7 @@ COMMENT= Package of Python astronomical utilities
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= ASTROPY MATPLOTLIB PYGAME
@@ -27,8 +27,8 @@ NO_ARCH= yes
USES= python
USE_PYTHON= autoplist distutils
-ASTROPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astropy>=0:astro/py-astropy@${FLAVOR}
-MATPLOTLIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${FLAVOR}
-PYGAME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>=1.8.1:devel/py-game@${FLAVOR}
+ASTROPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astropy>=0:astro/py-astropy@${PY_FLAVOR}
+MATPLOTLIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${PY_FLAVOR}
+PYGAME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>=1.8.1:devel/py-game@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/astro/py-aipy/Makefile b/astro/py-aipy/Makefile
index 0ff61e316e81..a7c6756a5c01 100644
--- a/astro/py-aipy/Makefile
+++ b/astro/py-aipy/Makefile
@@ -14,9 +14,9 @@ COMMENT= Astronomical Interferometry in PYthon
LICENSE= GPLv2+
BUILD_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}pyephem>=0:astro/pyephem@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}astropy>=1.0:astro/py-astropy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pyephem>=0:astro/pyephem@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}astropy>=1.0:astro/py-astropy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/astro/py-astLib/Makefile b/astro/py-astLib/Makefile
index ca87dc10ee4a..31eb252d4bfa 100644
--- a/astro/py-astLib/Makefile
+++ b/astro/py-astLib/Makefile
@@ -13,11 +13,11 @@ COMMENT= Astronomy modules for Python
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astropy>=1.1:astro/py-astropy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astropy>=1.1:astro/py-astropy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${PY_FLAVOR} \
${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.7.0:science/py-scipy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.7.0:science/py-scipy@${PY_FLAVOR}
PORTSCOUT= skipv:0.15,0.17,0.17.1 # incorrect versioning upstream
diff --git a/astro/py-horoscopegenerator/Makefile b/astro/py-horoscopegenerator/Makefile
index e9292c16bb0e..4af32c9d96a0 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nltk>0:textproc/py-nltk@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/astro/py-metpy/Makefile b/astro/py-metpy/Makefile
index 0bdb803f08a2..73647026f345 100644
--- a/astro/py-metpy/Makefile
+++ b/astro/py-metpy/Makefile
@@ -15,12 +15,12 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${ENUM34} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4:math/py-matplotlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}numpy>=1.10.0:math/py-numpy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pint>=0.8:converters/py-pint@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.4:graphics/py-pyproj@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.14:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}xarray>=0.9.6:devel/py-xarray@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}numpy>=1.10.0:math/py-numpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pint>=0.8:converters/py-pint@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.4:graphics/py-pyproj@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.14:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xarray>=0.9.6:devel/py-xarray@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/audio/beets/Makefile b/audio/beets/Makefile
index 4a357bf20997..67b5a6404b38 100644
--- a/audio/beets/Makefile
+++ b/audio/beets/Makefile
@@ -13,14 +13,14 @@ COMMENT= Media library management system for obsessive-compulsive music geeks
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jellyfish>=0:devel/py-jellyfish@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}munkres>=0:math/py-munkres@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mutagen>=1.33:audio/py-mutagen@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jellyfish>=0:devel/py-jellyfish@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}munkres>=0:math/py-munkres@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mutagen>=1.33:audio/py-mutagen@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
${PY_ENUM34}
USES= python
@@ -61,36 +61,36 @@ 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@${FLAVOR}
+ACOUSTICBRAINZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
BADFILES_RUN_DEPENDS= flac:audio/flac \
mp3val:audio/mp3val
-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.2.1: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}
+BEATPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.6.1:www/py-requests-oauthlib@${PY_FLAVOR}
+BPD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>=0:multimedia/py-gstreamer1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gobject>=0:devel/py-gobject@${PY_FLAVOR}
+CHROMA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyacoustid>=0:audio/py-pyacoustid@${PY_FLAVOR}
+DISCOGS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discogs-client>=2.2.1:audio/py-discogs-client@${PY_FLAVOR}
+EMBYUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
+FETCHART_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
FFMPEG_RUN_DEPENDS= ffmpeg>=2:multimedia/ffmpeg
-GMUSIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gmusicapi>=0:audio/py-gmusicapi@${FLAVOR}
+GMUSIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gmusicapi>=0:audio/py-gmusicapi@${PY_FLAVOR}
IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick
IPFS_RUN_DEPENDS= ipfs-go:sysutils/ipfs-go
-KODIUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR}
-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.4.2:audio/py-mpd2@${FLAVOR}
-PLEXUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR}
+KODIUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
+LASTFM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylast>=0:audio/py-pylast@${PY_FLAVOR}
+LASTIMPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
+LYRICS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
+LYRICS_GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR}
+METASYNC_DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR}
+MPDSTATS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd2>=0.4.2:audio/py-mpd2@${PY_FLAVOR}
+PLEXUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_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@${FLAVOR}
-THUMBNAILS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${FLAVOR}
+SPOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
+THUMBNAILS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_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}
+WEB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR}
+WEB_CORS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask-Cors>=0:www/py-flask-cors@${PY_FLAVOR}
post-install:
${INSTALL} ${WRKSRC}/man/beet.1 ${STAGEDIR}${PREFIX}/man/man1/
diff --git a/audio/mbox/Makefile b/audio/mbox/Makefile
index 06608147ad32..ec8986133ea7 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ogg>0:audio/py-ogg@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis@${PY_FLAVOR} \
lame:audio/lame \
oggenc:audio/vorbis-tools \
mplayer:multimedia/mplayer
diff --git a/audio/mpdbrowser/Makefile b/audio/mpdbrowser/Makefile
index 79becf1343bb..937eb00fc5f9 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:audio/py-mpd@${PY_FLAVOR}
USES= gettext iconv python:2.7 tar:tgz
USE_GNOME= intltool pygtk2
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index e56b81f9119e..c027f96c7566 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -15,8 +15,8 @@ COMMENT= Next generation MusicBrainz Tagger
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discid>=0.5.2:audio/py-discid@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mutagen>=1.23:audio/py-mutagen@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discid>=0.5.2:audio/py-discid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mutagen>=1.23:audio/py-mutagen@${PY_FLAVOR}
USES= gettext pyqt:4 python:2.7 desktop-file-utils
USE_PYQT= core_run gui_run network_run xml_run sip
diff --git a/audio/pithos/Makefile b/audio/pithos/Makefile
index 2c285fab57ec..729baffdfe49 100644
--- a/audio/pithos/Makefile
+++ b/audio/pithos/Makefile
@@ -13,10 +13,10 @@ LICENSE= GPLv3
USE_GITHUB= yes
-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} \
+RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/gi/overrides/Gst.py:multimedia/py-gstreamer1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pylast>0:audio/py-pylast@${PY_FLAVOR} \
git:devel/git
USE_GNOME= gtk30 pygobject3
diff --git a/audio/puddletag/Makefile b/audio/puddletag/Makefile
index 244e20fea2e8..6459ad22dc89 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@${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}
+ ${PYTHON_PKGNAMEPREFIX}musicbrainz2>=0:audio/py-musicbrainz2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mutagen>=1.14:audio/py-mutagen@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configobj>=4.5.0:devel/py-configobj@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:devel/py-pyparsing@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= keithgg
diff --git a/audio/py-SoundFile/Makefile b/audio/py-SoundFile/Makefile
index 2eee5d9d25b6..49b9aca60978 100644
--- a/audio/py-SoundFile/Makefile
+++ b/audio/py-SoundFile/Makefile
@@ -14,7 +14,7 @@ COMMENT= Audio library based on libsndfile, CFFI and NumPy
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0.6:devel/py-cffi@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0.6:devel/py-cffi@${PY_FLAVOR} \
${PYNUMPY} \
${PREFIX}/lib/libsndfile.so:audio/libsndfile
diff --git a/audio/py-aubio/Makefile b/audio/py-aubio/Makefile
index 9d476793864b..5ba2d8923621 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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}nose2>=0.6.5:devel/py-nose2@${PY_FLAVOR}
USES+= python
USE_PYTHON= autoplist distutils
diff --git a/audio/py-discogs-client/Makefile b/audio/py-discogs-client/Makefile
index 5461288aa1ef..585a9dc13f02 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oauthlib>=0:security/py-oauthlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauthlib>=0:security/py-oauthlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/audio/py-gmusicapi/Makefile b/audio/py-gmusicapi/Makefile
index d5518affe0ec..8c7d816a0367 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.2:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.0:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mutagen>=1.18:audio/py-mutagen@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.2:security/py-oauth2client@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gpsoauth>=0.0:security/py-gpsoauth@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}validictory>=0.9.3:devel/py-validictory@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MechanicalSoup>0:www/py-MechanicalSoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/audio/py-gmusicproxy/Makefile b/audio/py-gmusicproxy/Makefile
index 063908f9389a..114b97ff5032 100644
--- a/audio/py-gmusicproxy/Makefile
+++ b/audio/py-gmusicproxy/Makefile
@@ -13,12 +13,12 @@ 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gmusicapi>=10.1.0:audio/py-gmusicapi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>=-0.10.4:net/py-netifaces@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}eyed3>=0.7.8:audio/py-eyed3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}daemon>=2.0.5:devel/py-daemon@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 61981aebba93..fdc53f97cf80 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@${FLAVOR}
+MUTAGEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR}
BIN_SCRIPTS= cdg2mpg pycdg pykar pykaraoke pykaraoke_mini pympg
DATA_FONTS= DejaVuSans.ttf DejaVuSansCondensed.ttf \
diff --git a/audio/py-py-jack/Makefile b/audio/py-py-jack/Makefile
index def732f89a15..b777981e39ab 100644
--- a/audio/py-py-jack/Makefile
+++ b/audio/py-py-jack/Makefile
@@ -14,7 +14,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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR}
USES= python:-2.7 localbase
USE_PYTHON= distutils autoplist
diff --git a/audio/py-pylast/Makefile b/audio/py-pylast/Makefile
index cdd8155ffad8..b42df9b18639 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/audio/py-soundcloud/Makefile b/audio/py-soundcloud/Makefile
index 2158b2b81f78..187419bdcb91 100644
--- a/audio/py-soundcloud/Makefile
+++ b/audio/py-soundcloud/Makefile
@@ -13,7 +13,7 @@ COMMENT= Friendly wrapper library for the Soundcloud API
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/audio/py-sounddevice/Makefile b/audio/py-sounddevice/Makefile
index 23f31c67564b..0c79901cc855 100644
--- a/audio/py-sounddevice/Makefile
+++ b/audio/py-sounddevice/Makefile
@@ -12,8 +12,8 @@ COMMENT= Play and record sound through OSS in python programs
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \
${PYNUMPY} \
portaudio>0:audio/portaudio
diff --git a/audio/py-soundscrape/Makefile b/audio/py-soundscrape/Makefile
index 16a8cc52ea01..1ebd0cf6eb31 100644
--- a/audio/py-soundscrape/Makefile
+++ b/audio/py-soundscrape/Makefile
@@ -12,16 +12,16 @@ COMMENT= SoundCloud downloader in python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=1.31.0:audio/py-mutagen@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}soundcloud>=0.4.1:audio/py-soundcloud@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}clint>=0.3.2:devel/py-clint@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}demjson>=2.2.2:devel/py-demjson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}fudge>=1.0.3:devel/py-fudge@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>=1.3.7:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=3.3.1:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wheel>=0.24.0:devel/py-wheel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.9.0:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/audio/py-speechrecognition/Makefile b/audio/py-speechrecognition/Makefile
index 3cbc7bc45bda..09ce27dc83ac 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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio@${PY_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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>=0.3:devel/py-monotonic@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/audio/py-speex/Makefile b/audio/py-speex/Makefile
index 52442775f11a..edd56ca8756b 100644
--- a/audio/py-speex/Makefile
+++ b/audio/py-speex/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR= python
MAINTAINER= ports@FreeBSD.org
COMMENT= Python bindings for the Speex compressor/decompressor audio codec
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>=0.9.6.2:devel/pyrex@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>=0.9.6.2:devel/pyrex@${PY_FLAVOR}
LIB_DEPENDS= libspeex.so:audio/speex
USES= python:2.7
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index 4212366d74bb..62c2cc98122f 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg@${PY_FLAVOR}
LIB_DEPENDS= libvorbis.so:audio/libvorbis
USES= python:2.7
diff --git a/audio/py-xmms2/Makefile b/audio/py-xmms2/Makefile
index c53e3c3dfe04..526d9d17e0a2 100644
--- a/audio/py-xmms2/Makefile
+++ b/audio/py-xmms2/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= madpilot@FreeBSD.org
COMMENT= Python Bindings for XMMS2
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${PY_FLAVOR}
LIB_DEPENDS+= libxmmsclient.so:audio/xmms2
MASTERDIR= ${.CURDIR}/../xmms2
diff --git a/audio/pytone/Makefile b/audio/pytone/Makefile
index 34805efa44bd..03ac74813009 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR}
USES= ncurses python:2.7
USE_PYTHON= autoplist distutils
@@ -30,11 +30,11 @@ PLIST_FILES= etc/pytonerc.sample
OPTIONS_DEFINE= MAD MPG123 MPG321 VORBIS
OPTIONS_DEFAULT= MAD VORBIS
-MAD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymad>0:audio/py-pymad@${FLAVOR}
+MAD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymad>0:audio/py-pymad@${PY_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@${FLAVOR}
+VORBIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis@${PY_FLAVOR}
post-patch:
.for i in pytone pytonectl
diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index 791bf12f4ced..dbedfd9b31ec 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -12,7 +12,7 @@ COMMENT= Elegant music player for MPD
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:audio/py-mpd@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:audio/py-mpd@${PY_FLAVOR}
USES= gettext pkgconfig python:2.7
USE_GNOME= pygtk2
@@ -30,11 +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@${FLAVOR}
-PYGNOMEEXTRAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gnome-extras>=2.25.3_4:x11-toolkits/py-gnome-extras@${FLAVOR}
+MMKEYS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus@${PY_FLAVOR}
+PYGNOMEEXTRAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gnome-extras>=2.25.3_4:x11-toolkits/py-gnome-extras@${PY_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}
+TAGLIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tagpy>=0.94.5:audio/py-tagpy@${PY_FLAVOR}
+ZSI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zsi>=2.0,1:net/py-zsi@${PY_FLAVOR}
post-patch:
@${REINPLACE_CMD} -e 's,%%DOCSDIR%%,${DOCSDIR},' \
diff --git a/benchmarks/py-naarad/Makefile b/benchmarks/py-naarad/Makefile
index 2bcdbfe2acea..fd7c28e42d92 100644
--- a/benchmarks/py-naarad/Makefile
+++ b/benchmarks/py-naarad/Makefile
@@ -13,9 +13,9 @@ COMMENT= Framework for performance analysis
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-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} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=2013.8,1:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}luminol>0:math/py-luminol@${PY_FLAVOR} \
bash:shells/bash \
gawk:lang/gawk
diff --git a/benchmarks/py-zopkio/Makefile b/benchmarks/py-zopkio/Makefile
index 1a3af6e304d7..8d71baa17054 100644
--- a/benchmarks/py-zopkio/Makefile
+++ b/benchmarks/py-zopkio/Makefile
@@ -12,11 +12,11 @@ COMMENT= Functional and Performance Test Framework
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}naarad>=1.0.15:benchmarks/py-naarad@${FLAVOR} \
- ${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} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}naarad>=1.0.15:benchmarks/py-naarad@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}kazoo>=1.1:devel/py-kazoo@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}paramiko>=1.10.1:security/py-paramiko@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}junit-xml>0:textproc/py-junit-xml@${PY_FLAVOR} \
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/biology/py-Genesis-PyAPI/Makefile b/biology/py-Genesis-PyAPI/Makefile
index 130d17b9a64d..a4797fa56624 100644
--- a/biology/py-Genesis-PyAPI/Makefile
+++ b/biology/py-Genesis-PyAPI/Makefile
@@ -12,8 +12,8 @@ COMMENT= API for the Genesis platform for genetics information processing
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.6.0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}slumber>=0.7.1:www/py-slumber@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.6.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}slumber>=0.7.1:www/py-slumber@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/biology/py-biom-format/Makefile b/biology/py-biom-format/Makefile
index f81beef6df74..a0a3629b7d99 100644
--- a/biology/py-biom-format/Makefile
+++ b/biology/py-biom-format/Makefile
@@ -13,11 +13,11 @@ LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}h5py>=2.6.0:science/py-h5py@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.16.1:science/py-scipy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}h5py>=2.6.0:science/py-h5py@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.16.1:science/py-scipy@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= biocore
@@ -28,7 +28,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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyqi>=0.2.0:devel/py-pyqi@${PY_FLAVOR}
.endif
post-extract:
diff --git a/biology/py-biopython/Makefile b/biology/py-biopython/Makefile
index 8fc480159f3f..7f7577f13bfc 100644
--- a/biology/py-biopython/Makefile
+++ b/biology/py-biopython/Makefile
@@ -24,7 +24,7 @@ OPTIONS_DEFINE= REPORTLAB
OPTIONS_DEFAULT= REPORTLAB
REPORTLAB_DESC= PDF support in Bio.Graphics module
-REPORTLAB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${FLAVOR}
+REPORTLAB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR}
pre-configure: # unbreak for python3: README.rst can't be decoded with the ascii codec: https://github.com/biopython/biopython/issues/1649
@truncate -s 0 ${WRKSRC}/README.rst
diff --git a/biology/py-bx-python/Makefile b/biology/py-bx-python/Makefile
index 12593741c665..a4173c035a72 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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}python-lzo>0:archivers/py-python-lzo@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= compiler python
diff --git a/biology/py-cutadapt/Makefile b/biology/py-cutadapt/Makefile
index baeb10c157d4..fbdd81df4650 100644
--- a/biology/py-cutadapt/Makefile
+++ b/biology/py-cutadapt/Makefile
@@ -11,7 +11,7 @@ COMMENT= Finds and removes adapter sequences, primers, poly-A tails, etc
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xopen>0:archivers/py-xopen@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xopen>0:archivers/py-xopen@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils py3kplist
diff --git a/biology/pycogent/Makefile b/biology/pycogent/Makefile
index 9050584c0ca5..6a882e6fb888 100644
--- a/biology/pycogent/Makefile
+++ b/biology/pycogent/Makefile
@@ -12,8 +12,8 @@ COMMENT= Toolkit for statistical analysis of biological sequences
LICENSE= GPLv2
BUILD_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:-2.7
diff --git a/cad/py-gdspy/Makefile b/cad/py-gdspy/Makefile
index 0521fd5f9d09..bd90522dcbfa 100644
--- a/cad/py-gdspy/Makefile
+++ b/cad/py-gdspy/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python module for creating GDSII stream files
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/cad/py-lcapy/Makefile b/cad/py-lcapy/Makefile
index ad78135574ec..4e5161e466b4 100644
--- a/cad/py-lcapy/Makefile
+++ b/cad/py-lcapy/Makefile
@@ -12,10 +12,10 @@ COMMENT= Symbolic MDA Analysis Package for Linear Circuits
LICENSE= LGPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/cad/py-pycam/Makefile b/cad/py-pycam/Makefile
index f53788f8de62..6899b13e14f8 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@${FLAVOR} \
- ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL@${FLAVOR} \
- ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext@${PY_FLAVOR}
USES= python:-2.7
USE_PYTHON= distutils autoplist
diff --git a/cad/py-pyfda/Makefile b/cad/py-pyfda/Makefile
index 414222c2b088..88c98323d7c2 100644
--- a/cad/py-pyfda/Makefile
+++ b/cad/py-pyfda/Makefile
@@ -14,10 +14,10 @@ COMMENT= GUI tool for designing and analysing discrete time filters
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
USES= python:3.4+ pyqt:5
USE_PYTHON= distutils autoplist
diff --git a/cad/python-gdsii/Makefile b/cad/python-gdsii/Makefile
index 92bc2c8a17bd..36414d324813 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/cad/pythoncad/Makefile b/cad/pythoncad/Makefile
index 6a6594577005..7c328bb822d6 100644
--- a/cad/pythoncad/Makefile
+++ b/cad/pythoncad/Makefile
@@ -14,7 +14,7 @@ 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2@${PY_FLAVOR}
USES= python:2.7 shebangfix
USE_PYTHON= distutils
diff --git a/comms/chirp/Makefile b/comms/chirp/Makefile
index 1be4b05297ba..05034dee6580 100644
--- a/comms/chirp/Makefile
+++ b/comms/chirp/Makefile
@@ -15,9 +15,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${CHIRP_DEPENDS}
RUN_DEPENDS= ${CHIRP_DEPENDS}
-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}
+CHIRP_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2@${PY_FLAVOR}
USES= desktop-file-utils gettext python:2.7
USE_PYTHON= distutils autoplist
diff --git a/comms/py-libimobiledevice/Makefile b/comms/py-libimobiledevice/Makefile
index 6e0aa46f0bd1..2b1f6145fbc4 100644
--- a/comms/py-libimobiledevice/Makefile
+++ b/comms/py-libimobiledevice/Makefile
@@ -8,8 +8,8 @@ MAINTAINER= avilla@FreeBSD.org
COMMENT= Python bindings for libimobiledevice
LIB_DEPENDS= libimobiledevice.so:${MASTER_PORT}
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libplist>0:devel/py-libplist@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libplist>0:devel/py-libplist@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libplist>0:devel/py-libplist@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libplist>0:devel/py-libplist@${PY_FLAVOR}
PORTSCOUT= ignore:1
diff --git a/converters/py-bencode.py/Makefile b/converters/py-bencode.py/Makefile
index b4eb319be4d1..01bb54f68b77 100644
--- a/converters/py-bencode.py/Makefile
+++ b/converters/py-bencode.py/Makefile
@@ -14,8 +14,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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/converters/py-zfec/Makefile b/converters/py-zfec/Makefile
index db33822f6053..81e91e78299b 100644
--- a/converters/py-zfec/Makefile
+++ b/converters/py-zfec/Makefile
@@ -13,8 +13,8 @@ COMMENT= Fast erasure codec for Python
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING.GPL
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argparse>=0:devel/py-argparse@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyutil>=0:devel/py-pyutil@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argparse>=0:devel/py-argparse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyutil>=0:devel/py-pyutil@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist concurrent
diff --git a/converters/zbase32/Makefile b/converters/zbase32/Makefile
index 2990ae752f87..9b3a19b0048a 100644
--- a/converters/zbase32/Makefile
+++ b/converters/zbase32/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Base32 Encoder/Decoder
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_darcs>=1.2.11:devel/py-setuptools_darcs@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_darcs>=1.2.11:devel/py-setuptools_darcs@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/databases/emma/Makefile b/databases/emma/Makefile
index 2fdae192f7b1..b40fca059963 100644
--- a/databases/emma/Makefile
+++ b/databases/emma/Makefile
@@ -10,7 +10,7 @@ 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${PY_FLAVOR}
USES= python:2.7
USE_GNOME= pygtk2
diff --git a/databases/gadfly/Makefile b/databases/gadfly/Makefile
index a70bbef320df..dd730a3400a3 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/kjbuckets.so:devel/py-kjbuckets@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/databases/mtools-mongodb/Makefile b/databases/mtools-mongodb/Makefile
index 19d58df8e494..043e81241e7a 100644
--- a/databases/mtools-mongodb/Makefile
+++ b/databases/mtools-mongodb/Makefile
@@ -14,9 +14,9 @@ COMMENT= Setup test environments; parse, filter and visualize MongoDB log files
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
USE_PYTHON= autoplist distutils
USES= python:2.7
diff --git a/databases/mydbf2mysql/Makefile b/databases/mydbf2mysql/Makefile
index 736e7cedd800..99688bd92f2b 100644
--- a/databases/mydbf2mysql/Makefile
+++ b/databases/mydbf2mysql/Makefile
@@ -11,8 +11,8 @@ 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@${FLAVOR}
-RUN_DEPENDS+= ydbf>=0.0.1:devel/py-ydbf@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${PY_FLAVOR}
+RUN_DEPENDS+= ydbf>=0.0.1:devel/py-ydbf@${PY_FLAVOR}
USES= python:2.7 tar:bzip2
USE_PYTHON= distutils autoplist
diff --git a/databases/openark-kit/Makefile b/databases/openark-kit/Makefile
index c399ab295ed8..a5fd6ab13505 100644
--- a/databases/openark-kit/Makefile
+++ b/databases/openark-kit/Makefile
@@ -11,7 +11,7 @@ COMMENT= Common utilities for MySQL
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/databases/pg_activity/Makefile b/databases/pg_activity/Makefile
index fb3a4e4348f3..af00dc329dfb 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
diff --git a/databases/pgworksheet/Makefile b/databases/pgworksheet/Makefile
index b6aa3faf92af..bac6557371e5 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyPgSQL/libpq/__init__.py:databases/py-pyPgSQL@${PY_FLAVOR}
USES= pgsql python:2.7 tar:bzip2
USE_GNOME= pygtk2
diff --git a/databases/powa-web/Makefile b/databases/powa-web/Makefile
index 51a73f131c15..573ffb769a90 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0:databases/py-sqlalchemy10@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tornado>=2.0:www/py-tornado@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0:databases/py-sqlalchemy10@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>=2.0:www/py-tornado@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/databases/py-Elixir/Makefile b/databases/py-Elixir/Makefile
index 7611e44af44c..0f1a383e8054 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.4.0:databases/py-sqlalchemy10@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/databases/py-Pyrseas/Makefile b/databases/py-Pyrseas/Makefile
index 897cad17b09a..2424918b333f 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5:databases/py-psycopg2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/databases/py-agate-sql/Makefile b/databases/py-agate-sql/Makefile
index 262c1ee8072f..71da2e6e44c3 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.8:databases/py-sqlalchemy10@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.8:databases/py-sqlalchemy10@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/databases/py-alembic/Makefile b/databases/py-alembic/Makefile
index 11b389d5f7f8..4169376dc9ee 100644
--- a/databases/py-alembic/Makefile
+++ b/databases/py-alembic/Makefile
@@ -11,10 +11,10 @@ COMMENT= Database migration tool for SQLAlchemy
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}python-editor>=0:devel/py-python-editor@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-editor>=0:devel/py-python-editor@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile
index f78baac0034c..ac93e88c6723 100644
--- a/databases/py-carbon/Makefile
+++ b/databases/py-carbon/Makefile
@@ -12,12 +12,12 @@ COMMENT= Backend storage application for graphite
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cachetools>=1.1.0:devel/py-cachetools@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:net/py-txamqp@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cachetools>=1.1.0:devel/py-cachetools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:net/py-txamqp@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}whisper>=0.9.10:databases/py-whisper@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}whisper>=0.9.10:databases/py-whisper@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= distutils
diff --git a/databases/py-couchdb/Makefile b/databases/py-couchdb/Makefile
index cf7e60bd878e..6751153e8f5f 100644
--- a/databases/py-couchdb/Makefile
+++ b/databases/py-couchdb/Makefile
@@ -13,7 +13,7 @@ COMMENT= Simple Library to Allow Python Applications to Use CouchDB
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist concurrent pythonprefix
diff --git a/databases/py-cql/Makefile b/databases/py-cql/Makefile
index 68c22f5a931c..d98b18a0b6f4 100644
--- a/databases/py-cql/Makefile
+++ b/databases/py-cql/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python DB-API 2.0 client interface for Cassandra
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/thrift/Thrift.py:devel/py-thrift@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/thrift/Thrift.py:devel/py-thrift@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils
diff --git a/databases/py-django-transaction-hooks/Makefile b/databases/py-django-transaction-hooks/Makefile
index 396bcd37a8be..e6538d87910f 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}django>=1.8:www/py-django@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/databases/py-fakeredis/Makefile b/databases/py-fakeredis/Makefile
index 94160c34d020..04674a3df62f 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/databases/py-flask-sqlalchemy/Makefile b/databases/py-flask-sqlalchemy/Makefile
index 64fbd15bcd62..00ca5f887774 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.8:databases/py-sqlalchemy10@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.8:databases/py-sqlalchemy10@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/databases/py-forgetsql/Makefile b/databases/py-forgetsql/Makefile
index e1b56a3ed2c3..0c2cb13812a5 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@${FLAVOR}
-PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${PY_FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
.include <bsd.port.options.mk>
diff --git a/databases/py-geoalchemy/Makefile b/databases/py-geoalchemy/Makefile
index 4156c2b54a0f..5b0ffa194911 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}sqlalchemy12>=0.6.1:databases/py-sqlalchemy12@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0.6.1:databases/py-sqlalchemy12@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist distutils
diff --git a/databases/py-geoalchemy2/Makefile b/databases/py-geoalchemy2/Makefile
index 047df6e1e9de..5fb4af48e369 100644
--- a/databases/py-geoalchemy2/Makefile
+++ b/databases/py-geoalchemy2/Makefile
@@ -14,7 +14,7 @@ COMMENT= Using SQLAlchemy with Spatial Databases
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0.8:databases/py-sqlalchemy12@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0.8:databases/py-sqlalchemy12@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/databases/py-htsql-mysql/Makefile b/databases/py-htsql-mysql/Makefile
index b516f716797d..27848c6ef8e4 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}htsql>2.3:databases/py-htsql@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/databases/py-htsql-pgsql/Makefile b/databases/py-htsql-pgsql/Makefile
index 1418c330fcac..0d0def2b3dd7 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}htsql>2.3:databases/py-htsql@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/databases/py-htsql/Makefile b/databases/py-htsql/Makefile
index 9bf36c95fc30..468ae198bd9d 100644
--- a/databases/py-htsql/Makefile
+++ b/databases/py-htsql/Makefile
@@ -17,7 +17,7 @@ LICENSE= AGPLv3
USES= python:2.7
USE_PYTHON= distutils autoplist
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/databases/py-influxdb/Makefile b/databases/py-influxdb/Makefile
index cd82505f0651..8d8c07e835d4 100644
--- a/databases/py-influxdb/Makefile
+++ b/databases/py-influxdb/Makefile
@@ -11,10 +11,10 @@ COMMENT= Python Client for InfluxDB
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/databases/py-lmdb/Makefile b/databases/py-lmdb/Makefile
index 0d0e694ce778..e183fa2e252a 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0.8:devel/py-cffi@${PY_FLAVOR}
LIB_DEPENDS= liblmdb.so:databases/lmdb
USES= localbase python
diff --git a/databases/py-marshmallow-sqlalchemy/Makefile b/databases/py-marshmallow-sqlalchemy/Makefile
index bf3630d341d6..54271dbf13cf 100644
--- a/databases/py-marshmallow-sqlalchemy/Makefile
+++ b/databases/py-marshmallow-sqlalchemy/Makefile
@@ -13,8 +13,8 @@ COMMENT= SQLAlchemy integration with the marshmallow serialization library
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}marshmallow>=2.0.0:devel/py-marshmallow@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.2:databases/py-sqlalchemy12@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}marshmallow>=2.0.0:devel/py-marshmallow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.2:databases/py-sqlalchemy12@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/databases/py-motor/Makefile b/databases/py-motor/Makefile
index 0eaf58f2a91e..886d78632449 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=3.3:databases/pymongo@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/databases/py-mycli/Makefile b/databases/py-mycli/Makefile
index c553186410b9..13d4e93cd227 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>=1.0.1: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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cli-helpers>=1.0.1:devel/py-cli-helpers@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.5:devel/py-configobj@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>=1.0.0:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.10:devel/py-prompt_toolkit@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pymysql>=0.6.7:databases/py-pymysql@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.2:databases/py-sqlparse@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/databases/py-mysql2pgsql/Makefile b/databases/py-mysql2pgsql/Makefile
index 30a82929fe80..681827298b68 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.4.2:databases/py-psycopg2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/databases/py-peewee/Makefile b/databases/py-peewee/Makefile
index 7620df5cd628..a816c5fabf6f 100644
--- a/databases/py-peewee/Makefile
+++ b/databases/py-peewee/Makefile
@@ -19,9 +19,9 @@ OPTIONS_DEFAULT= SQLITE
USES= localbase python sqlite
USE_PYTHON= distutils cython autoplist concurrent
-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}
+SQLITE_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+MYSQL_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${PY_FLAVOR}
+PGSQL_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:databases/py-psycopg2@${PY_FLAVOR}
post-install:
@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/playhouse/_speedups.so
diff --git a/databases/py-pgcli/Makefile b/databases/py-pgcli/Makefile
index eea9ec3cc2f5..786ce57fbf51 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>=1.0.1: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.10.0:databases/py-pgspecial@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.10:devel/py-prompt_toolkit@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cli-helpers>=1.0.1:devel/py-cli-helpers@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}humanize>=0.5.1:devel/py-humanize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pgspecial>=1.10.0:databases/py-pgspecial@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.10:devel/py-prompt_toolkit@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.4:databases/py-psycopg2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.9:devel/py-setproctitle@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.2:databases/py-sqlparse@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/databases/py-pgspecial/Makefile b/databases/py-pgspecial/Makefile
index 245ba98efa3d..14923117cea8 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1.19:databases/py-sqlparse@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1.19:databases/py-sqlparse@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/databases/py-pickledb/Makefile b/databases/py-pickledb/Makefile
index 328cfd6f95ea..b47836c6384e 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/databases/py-pickleshare/Makefile b/databases/py-pickleshare/Makefile
index fb080ef5f355..070804f007e8 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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/databases/py-psycopg2cffi/Makefile b/databases/py-psycopg2cffi/Makefile
index 430fcdbb9f0f..b5bf3db6e551 100644
--- a/databases/py-psycopg2cffi/Makefile
+++ b/databases/py-psycopg2cffi/Makefile
@@ -13,8 +13,8 @@ COMMENT= Implementation of the psycopg2 module using cffi
LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}
USES= pgsql python
USE_PYTHON= autoplist distutils
diff --git a/databases/py-pum/Makefile b/databases/py-pum/Makefile
index b8601d3d78db..d52f09b2c822 100644
--- a/databases/py-pum/Makefile
+++ b/databases/py-pum/Makefile
@@ -11,8 +11,8 @@ COMMENT= Postgres upgrade manager
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.3:databases/py-psycopg2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.3:databases/py-psycopg2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
USES= python:3.4+
USE_PYTHON= distutils concurrent autoplist
diff --git a/databases/py-pymssql/Makefile b/databases/py-pymssql/Makefile
index 1424b3350d48..139715cc7751 100644
--- a/databases/py-pymssql/Makefile
+++ b/databases/py-pymssql/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python database interface for MS-SQL. Version 2
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>0:devel/py-setuptools-git@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>0:devel/py-setuptools-git@${PY_FLAVOR}
LIB_DEPENDS= libsybdb.so:databases/freetds
USES= python
diff --git a/databases/py-python-arango/Makefile b/databases/py-python-arango/Makefile
index c3b251380d3a..6b88fab41ede 100644
--- a/databases/py-python-arango/Makefile
+++ b/databases/py-python-arango/Makefile
@@ -12,10 +12,10 @@ COMMENT= Python driver for ArangoDB
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/databases/py-python-memcached/Makefile b/databases/py-python-memcached/Makefile
index 18958dbbc9ec..0f3400ec6deb 100644
--- a/databases/py-python-memcached/Makefile
+++ b/databases/py-python-memcached/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python API for memcached, a distributed memory cache daemon
LICENSE= PSFL
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/databases/py-python-swiftclient/Makefile b/databases/py-python-swiftclient/Makefile
index d20599826ad1..b3feff787365 100644
--- a/databases/py-python-swiftclient/Makefile
+++ b/databases/py-python-swiftclient/Makefile
@@ -12,12 +12,12 @@ COMMENT= Python client library for OpenStack Object Storage (Swift)
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:devel/py-pbr@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:devel/py-pbr@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
RUN_DEPENDS+= ${PY_FUTURES} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=1.1:www/py-requests@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=1.1:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/databases/py-queries/Makefile b/databases/py-queries/Makefile
index 86e77bac133a..449d71ce9535 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:databases/py-psycopg2@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/databases/py-rb/Makefile b/databases/py-rb/Makefile
index 5c5641049eab..a8215c785948 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=2.6:databases/py-redis@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/databases/py-redis/Makefile b/databases/py-redis/Makefile
index 254dc4349fa7..f76a610b6890 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@${FLAVOR}
+HIREDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hiredis>0:databases/py-hiredis@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist concurrent
diff --git a/databases/py-riak/Makefile b/databases/py-riak/Makefile
index 675eb6ea0fe9..b1c4f55080b7 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}riak_pb>=2.0.0:devel/py-riak_pb@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl@${PY_FLAVOR}
USES= python:-2.7
USE_PYTHON= autoplist distutils
diff --git a/databases/py-sispy/Makefile b/databases/py-sispy/Makefile
index 744134d8200c..8942d2591844 100644
--- a/databases/py-sispy/Makefile
+++ b/databases/py-sispy/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python client library for interacting with the SIS RESTful API
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/databases/py-sqlalchemy-migrate/Makefile b/databases/py-sqlalchemy-migrate/Makefile
index 3f9c02767810..d7631d57e961 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.8:databases/py-sqlalchemy10@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Tempita>=0.4:textproc/py-Tempita@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlparse>0:databases/py-sqlparse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/databases/py-sqlalchemy10/Makefile b/databases/py-sqlalchemy10/Makefile
index e20f20afd6fe..12100e662400 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_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@${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}
+MSSQL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pymssql.py:databases/py-pymssql@${PY_FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:databases/py-psycopg2@${PY_FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+SYBASE_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Sybase.py:databases/py-sybase@${PY_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@${FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${PY_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@${FLAVOR}
+#MYSQL_RUN_DEPENDS+= pymysql>=0.5:databases/py-pymysql@${PY_FLAVOR}
.endif
pre-build:
diff --git a/databases/py-sqlalchemy11/Makefile b/databases/py-sqlalchemy11/Makefile
index c375df1d740a..68ab37988d34 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR}
CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy1[02]
@@ -31,11 +31,11 @@ USES= python
PORTDOCS= *
PORTEXAMPLES= *
-MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymssql>=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}
+MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymssql>=0:databases/py-pymssql@${PY_FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymysql>=0:databases/py-pymysql@${PY_FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.0:databases/py-psycopg2@${PY_FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
+SYBASE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sybase>=0:databases/py-sybase@${PY_FLAVOR}
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/sqlalchemy/*.so
diff --git a/databases/py-sqlalchemy12/Makefile b/databases/py-sqlalchemy12/Makefile
index f7208ab738b2..6e22ef306f4e 100644
--- a/databases/py-sqlalchemy12/Makefile
+++ b/databases/py-sqlalchemy12/Makefile
@@ -14,9 +14,9 @@ COMMENT= Python SQL toolkit and Object Relational Mapper 1.2.x
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR}
CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy1[01]
@@ -31,11 +31,11 @@ USES= python
PORTDOCS= *
PORTEXAMPLES= *
-MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymssql>=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}
+MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymssql>=0:databases/py-pymssql@${PY_FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymysql>=0:databases/py-pymysql@${PY_FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.0:databases/py-psycopg2@${PY_FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
+SYBASE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sybase>=0:databases/py-sybase@${PY_FLAVOR}
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/sqlalchemy/*.so
diff --git a/databases/py-sqlite3dbm/Makefile b/databases/py-sqlite3dbm/Makefile
index d78897d3afa4..efc0f121c405 100644
--- a/databases/py-sqlite3dbm/Makefile
+++ b/databases/py-sqlite3dbm/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Sqlite-backed dictionary
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/databases/py-sqlobject/Makefile b/databases/py-sqlobject/Makefile
index 047d63e9d1a1..1736b25e816b 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.2:www/py-formencode@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
@@ -26,12 +26,12 @@ SYBASE_DESC= sybase support
PORTDOCS= *
-MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${PY_FLAVOR}
MYSQL_VARS= PY_MYSQL=:2.7
-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}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${PY_FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
+MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymssql>=0:databases/py-pymssql@${PY_FLAVOR}
+SYBASE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sybase>=0.37:databases/py-sybase@${PY_FLAVOR}
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/databases/py-swift/Makefile b/databases/py-swift/Makefile
index 044ef37af155..5f32077d28e1 100644
--- a/databases/py-swift/Makefile
+++ b/databases/py-swift/Makefile
@@ -13,18 +13,18 @@ COMMENT= Highly available, distributed, eventually consistent object/blob store
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:devel/py-pbr@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:devel/py-pbr@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-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} \
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}PasteDeploy>0:www/py-pastedeploy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dnspython>=1.10.0:dns/py-dnspython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.8:net/py-eventlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=0:databases/py-python-swiftclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=0.9.8:www/py-webob@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xattr>=0:devel/py-xattr@${PY_FLAVOR} \
memcached>=0:databases/memcached \
rsync>=3.0:net/rsync
diff --git a/databases/py-tarantool/Makefile b/databases/py-tarantool/Makefile
index a9c79b26db94..c5d275834331 100644
--- a/databases/py-tarantool/Makefile
+++ b/databases/py-tarantool/Makefile
@@ -12,7 +12,7 @@ COMMENT= Client library for Tarantool Database
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0.4:devel/py-msgpack@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0.4:devel/py-msgpack@${PY_FLAVOR}
NO_ARCH= yes
REINPLACE_ARGS= -i ''
diff --git a/databases/py-whisper/Makefile b/databases/py-whisper/Makefile
index d40e6b43a335..b91de0c9ccd3 100644
--- a/databases/py-whisper/Makefile
+++ b/databases/py-whisper/Makefile
@@ -12,7 +12,7 @@ COMMENT= Fixed-size database, similar in design to RRD
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/databases/py-xapian/Makefile b/databases/py-xapian/Makefile
index cffeeb9eaaad..9d6e9db10355 100644
--- a/databases/py-xapian/Makefile
+++ b/databases/py-xapian/Makefile
@@ -37,7 +37,7 @@ USE_PYTHON= flavors
PORTDOCS= *
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4.8:textproc/py-sphinx@${FLAVOR}
+DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4.8:textproc/py-sphinx@${PY_FLAVOR}
.include <bsd.port.pre.mk>
diff --git a/databases/zodb3/Makefile b/databases/zodb3/Makefile
index a069b7a01fe2..9e885f4246e5 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zdaemon>=0:sysutils/py-zdaemon@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zclockfile>=1.0.0:devel/py-zclockfile@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=1.0.0:devel/py-zope.event@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/deskutils/dosage/Makefile b/deskutils/dosage/Makefile
index f75e39c1130f..6e317a0199e1 100644
--- a/deskutils/dosage/Makefile
+++ b/deskutils/dosage/Makefile
@@ -11,7 +11,7 @@ COMMENT= Application to keep a local mirror of web comics
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist concurrent optsuffix
diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile
index 4212af72e4b7..1f7375bc6183 100644
--- a/deskutils/gourmet/Makefile
+++ b/deskutils/gourmet/Makefile
@@ -12,20 +12,20 @@ COMMENT= GNOME recipe manager
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}poppler>=0:graphics/py-poppler@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rtf>=0:print/py-rtf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32@${PY_FLAVOR}
OPTIONS_DEFINE= IPYTHON
IPYTHON_DESC= Interactive shell support
-IPYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${FLAVOR}
+IPYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR}
USES= gettext python:-2.7
USE_GNOME= intltool pygnome2 pygtk2
diff --git a/deskutils/gtg/Makefile b/deskutils/gtg/Makefile
index cdadeed3aab1..a116aa7bf7ac 100644
--- a/deskutils/gtg/Makefile
+++ b/deskutils/gtg/Makefile
@@ -11,9 +11,9 @@ COMMENT= GTD organizer for the GNOME desktop environment
LICENSE= GPLv3
-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} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}liblarch>=2.1:devel/py-liblarch@${PY_FLAVOR} \
xset:x11/xset
USE_GNOME= pygobject pygtk2
@@ -25,7 +25,7 @@ USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= CHEETAH
CHEETAH_DESC= Needed for export plugin to work
OPTIONS_EXCLUDE= NLS DOCS
-CHEETAH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah@${FLAVOR}
+CHEETAH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah@${PY_FLAVOR}
.include <bsd.port.options.mk>
diff --git a/deskutils/py-bugwarrior/Makefile b/deskutils/py-bugwarrior/Makefile
index 3d57958a3c4f..814aac6cf9c6 100644
--- a/deskutils/py-bugwarrior/Makefile
+++ b/deskutils/py-bugwarrior/Makefile
@@ -14,38 +14,38 @@ COMMENT= Sync issue & bug tracking systems with taskwarrior
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-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}future>=0.16.0:devel/py-future@${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}configparser>=0:devel/py-configparser@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twiggy>0:devel/py-twiggy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}taskw>=0.8:deskutils/py-taskw@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.2:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.3:devel/py-dogpile.cache@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lockfile>=0.9.1:devel/py-lockfile@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
OPTIONS_DEFINE= BUGZILLA JIRA PHABRICATOR
OPTIONS_DEFAULT= BUGZILLA JIRA PHABRICATOR
BUGZILLA_DESC= Enable Bugzilla support
-BUGZILLA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-bugzilla>0:devel/py-python-bugzilla@${FLAVOR}
+BUGZILLA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-bugzilla>0:devel/py-python-bugzilla@${PY_FLAVOR}
JIRA_DESC= Enabla Atlassian Jira support
-JIRA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jira>0:devel/py-jira@${FLAVOR}
+JIRA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jira>0:devel/py-jira@${PY_FLAVOR}
PHABRICATOR_DESC= Enable Phabricator support
-PHABRICATOR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}phabricator>0:devel/py-phabricator@${FLAVOR}
+PHABRICATOR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}phabricator>0:devel/py-phabricator@${PY_FLAVOR}
TRAC_DESC= Enable Trac support
-TRAC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}offtrac>0:devel/py-offtrac@${FLAVOR}
+TRAC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}offtrac>0:devel/py-offtrac@${PY_FLAVOR}
USES= python:-2.7
USE_PYTHON= autoplist concurrent distutils
diff --git a/deskutils/py-khal/Makefile b/deskutils/py-khal/Makefile
index 517c421b6b3c..b9f33dfacd09 100644
--- a/deskutils/py-khal/Makefile
+++ b/deskutils/py-khal/Makefile
@@ -13,19 +13,19 @@ COMMENT= CalDAV-based calendar
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>1.12.0:devel/py-setuptools_scm@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}click-log>=0.2.0:devel/py-click-log@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}configobj>=0:devel/py-configobj@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}icalendar>=3.11.7:devel/py-icalendar@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}urwid>=0:devel/py-urwid@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0:deskutils/py-vdirsyncer@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>1.12.0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click-log>=0.2.0:devel/py-click-log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configobj>=0:devel/py-configobj@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}icalendar>=3.11.7:devel/py-icalendar@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urwid>=0:devel/py-urwid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0:deskutils/py-vdirsyncer@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_FLAVOR}
USES= python:3.4+
USE_PYTHON= autoplist distutils
@@ -35,7 +35,7 @@ NO_ARCH= yes
OPTIONS_DEFINE= SETPROCTITLE
SETPROCTITLE_DESC= Set the process title
-SETPROCTITLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setproctitle>=0:devel/py-setproctitle@${FLAVOR}
+SETPROCTITLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setproctitle>=0:devel/py-setproctitle@${PY_FLAVOR}
PLIST_FILES= share/zsh/site-functions/__khal
diff --git a/deskutils/py-pystash/Makefile b/deskutils/py-pystash/Makefile
index 2d3d10937f70..5702d4a6cfee 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}clint>=0.3.7:devel/py-clint@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xerox>=0.3.1:devel/py-xerox@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/deskutils/py-taskw/Makefile b/deskutils/py-taskw/Makefile
index 1e83d446b56d..c11023aa2ec3 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.4:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/deskutils/py-vdirsyncer/Makefile b/deskutils/py-vdirsyncer/Makefile
index 4edeec69857d..13d7b36416e6 100644
--- a/deskutils/py-vdirsyncer/Makefile
+++ b/deskutils/py-vdirsyncer/Makefile
@@ -12,13 +12,13 @@ COMMENT= Synchronize calendars and contacts
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}requests>=2.4.1:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.4.0:www/py-requests-toolbelt@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.10.1:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click-log>=0.1.3:devel/py-click-log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click-threading>=0.1.2:devel/py-click-threading@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.4.1:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.4.0:www/py-requests-toolbelt@${PY_FLAVOR}
USES= python:3.4+
USE_PYTHON= autoplist distutils
@@ -27,6 +27,6 @@ NO_ARCH= yes
OPTIONS_DEFINE= GOOGLE
GOOGLE_DESC= Enable Google Calendar support
-GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib@${FLAVOR}
+GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/deskutils/py-vobject/Makefile b/deskutils/py-vobject/Makefile
index 02a3d739a44f..17860063e5a5 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/deskutils/pybookreader/Makefile b/deskutils/pybookreader/Makefile
index 39c818d01f82..46e09626131a 100644
--- a/deskutils/pybookreader/Makefile
+++ b/deskutils/pybookreader/Makefile
@@ -11,7 +11,7 @@ DISTNAME= PyBookReader-${PORTVERSION}
MAINTAINER= ufo@februality.com
COMMENT= Program for reading e-books
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils
diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index 867d3c44717a..101a352f4c7c 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -16,7 +16,7 @@ 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Xlib/X.py:x11-toolkits/py-xlib@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/deskutils/rednotebook/Makefile b/deskutils/rednotebook/Makefile
index 52db3572fd42..9d026c6b71f6 100644
--- a/deskutils/rednotebook/Makefile
+++ b/deskutils/rednotebook/Makefile
@@ -13,10 +13,10 @@ COMMENT= Modern journal written in Python
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk@${PY_FLAVOR} \
${LOCALBASE}/bin/xdg-open:devel/xdg-utils \
- ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR}
USES= desktop-file-utils gettext python:2.7
diff --git a/deskutils/syncthing-gtk/Makefile b/deskutils/syncthing-gtk/Makefile
index 5c021fad9cf7..ce9e9f4a0438 100644
--- a/deskutils/syncthing-gtk/Makefile
+++ b/deskutils/syncthing-gtk/Makefile
@@ -10,9 +10,9 @@ COMMENT= Python based GUI for Syncthing
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \
libappindicator>=0:devel/libappindicator \
syncthing>=0.13:net/syncthing
diff --git a/deskutils/taskcoach/Makefile b/deskutils/taskcoach/Makefile
index 6d7e29b95c65..1a3d6ca3708a 100644
--- a/deskutils/taskcoach/Makefile
+++ b/deskutils/taskcoach/Makefile
@@ -13,7 +13,7 @@ COMMENT= Friendly task manager
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 shebangfix
diff --git a/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile
index a977822b3b9e..a8bbb27c0bd0 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:textproc/py-libxml2@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:devel/py-dbus@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:textproc/py-libxml2@${PY_FLAVOR} \
vte3>=0:x11-toolkits/vte3 \
- ${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} \
+ ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urlgrabber>=0:www/py-urlgrabber@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}libvirt>=0:devel/py-libvirt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_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/zim/Makefile b/deskutils/zim/Makefile
index 41dd903c711b..d3cfa8f66af9 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \
xdg-open:devel/xdg-utils \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
NO_ARCH= yes
USES= desktop-file-utils gettext python:-2.7 shared-mime-info
diff --git a/devel/b2/Makefile b/devel/b2/Makefile
index 51cf9bb7e24e..a11737f926ea 100644
--- a/devel/b2/Makefile
+++ b/devel/b2/Makefile
@@ -12,13 +12,13 @@ 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@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=0.8.0:devel/py-arrow@${PY_FLAVOR} \
${PY_FUTURES} \
- ${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}
+ ${PYTHON_PKGNAMEPREFIX}logfury>=0.1.2:devel/py-logfury@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tqdm>=4.5.0:misc/py-tqdm@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist concurrent optsuffix
diff --git a/devel/bbfreeze/Makefile b/devel/bbfreeze/Makefile
index 690b29628e6d..edb0f9875c23 100644
--- a/devel/bbfreeze/Makefile
+++ b/devel/bbfreeze/Makefile
@@ -13,7 +13,7 @@ COMMENT= Module to create standalone executables from Python scripts
LICENSE= ZLIB
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}altgraph>=0.9:math/py-altgraph@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}altgraph>=0.9:math/py-altgraph@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}bbfreeze-loader>=1.1.0:devel/bbfreeze-loader@${PY_FLAVOR}
USES= python:2.7 zip
diff --git a/devel/bpython/Makefile b/devel/bpython/Makefile
index 6dd74a916bb2..2a0aed99766a 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}curtsies>=0.1.18:devel/py-curtsies@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${PY_FLAVOR}
OPTIONS_DEFINE= EXAMPLES NLS
OPTIONS_SUB= yes
diff --git a/devel/bzr-explorer/Makefile b/devel/bzr-explorer/Makefile
index ce63df98412c..b315437c4187 100644
--- a/devel/bzr-explorer/Makefile
+++ b/devel/bzr-explorer/Makefile
@@ -13,7 +13,7 @@ COMMENT= Desktop application for using bzr
LICENSE= GPLv2
BUILD_DEPENDS= bzr:devel/bzr
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bzrlib/plugins/qbzr/__init__.py:devel/qbzr@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bzrlib/plugins/qbzr/__init__.py:devel/qbzr@${PY_FLAVOR} \
bzr:devel/bzr
USES= gettext python:2.7
diff --git a/devel/bzr-fastimport/Makefile b/devel/bzr-fastimport/Makefile
index f0009e8bf9e9..0e98fe56a294 100644
--- a/devel/bzr-fastimport/Makefile
+++ b/devel/bzr-fastimport/Makefile
@@ -14,7 +14,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= bzr:devel/bzr
RUN_DEPENDS= bzr:devel/bzr \
- ${PYTHON_SITELIBDIR}/fastimport/__init__.py:devel/py-fastimport@${FLAVOR}
+ ${PYTHON_SITELIBDIR}/fastimport/__init__.py:devel/py-fastimport@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/bzr-git/Makefile b/devel/bzr-git/Makefile
index 7f3d8267706a..24e102790dc9 100644
--- a/devel/bzr-git/Makefile
+++ b/devel/bzr-git/Makefile
@@ -15,8 +15,8 @@ LICENSE= GPLv2
BUILD_DEPENDS= bzr:devel/bzr
RUN_DEPENDS= bzr:devel/bzr \
- ${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.0:devel/dulwich@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.0:devel/dulwich@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/bzr-gtk/Makefile b/devel/bzr-gtk/Makefile
index 546bf3dfb73a..926333ea1bd1 100644
--- a/devel/bzr-gtk/Makefile
+++ b/devel/bzr-gtk/Makefile
@@ -15,7 +15,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= bzr:devel/bzr
RUN_DEPENDS= bzr:devel/bzr \
- ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR}
USES= desktop-file-utils python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/bzr-svn/Makefile b/devel/bzr-svn/Makefile
index 9d47504a49a1..88bc5ed0d92d 100644
--- a/devel/bzr-svn/Makefile
+++ b/devel/bzr-svn/Makefile
@@ -14,7 +14,7 @@ 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@${FLAVOR} \
+RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/subvertpy/__init__.py:devel/py-subvertpy@${PY_FLAVOR} \
bzr:devel/bzr
USES= python:2.7
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index f65c0fbbd80a..131dcfa00203 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -15,7 +15,7 @@ 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@${FLAVOR}
+SFTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko@${PY_FLAVOR}
CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
USE_PYTHON= distutils cython
diff --git a/devel/cram/Makefile b/devel/cram/Makefile
index 28638258d729..92127abcce35 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pep8>=0:devel/pep8@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyflakes>=0:devel/py-pyflakes@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}check-manifest>=0:devel/py-check-manifest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pep8>=0:devel/pep8@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyflakes>=0:devel/py-pyflakes@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile
index 558e017b8121..449150b1cd4b 100644
--- a/devel/cvs2svn/Makefile
+++ b/devel/cvs2svn/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES= http://cvs2svn.tigris.org/files/documents/1462/49543/ \
MAINTAINER= ohauer@FreeBSD.org
COMMENT= CVS to Subversion Repository Converter
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} \
cvs:devel/cvs
USES= shebangfix python:2.7
@@ -31,7 +31,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@${FLAVOR}
+SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR}
GIT_RUN_DEPENDS= ${LOCALBASE}/bin/git:devel/git
BAZAAR_RUN_DEPENDS= ${LOCALBASE}/bin/bzr:devel/bzr
diff --git a/devel/dissy/Makefile b/devel/dissy/Makefile
index 04599912b192..a25c1a5c916b 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk@${PY_FLAVOR}
LIB_DEPENDS= librsvg-2.so:graphics/librsvg2
USES= python:2.7
diff --git a/devel/drpython/Makefile b/devel/drpython/Makefile
index f4e59f87733e..f3492ccb5545 100644
--- a/devel/drpython/Makefile
+++ b/devel/drpython/Makefile
@@ -17,7 +17,7 @@ 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
RUN_DEPENDS= xdg-open:devel/xdg-utils
NO_ARCH= yes
diff --git a/devel/euca2ools/Makefile b/devel/euca2ools/Makefile
index ae058108c675..980bd282aa4a 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requestbuilder>=0.4:www/py-requestbuilder@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
USES= python:2.7
USE_GITHUB= yes
diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index edd7ba90fbd9..ed2547a45016 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -10,7 +10,7 @@ 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
USES= python:2.7 shebangfix
USE_PYTHON= distutils noegginfo
diff --git a/devel/gazpacho/Makefile b/devel/gazpacho/Makefile
index 6f2662735b51..c4b342c77dac 100644
--- a/devel/gazpacho/Makefile
+++ b/devel/gazpacho/Makefile
@@ -13,7 +13,7 @@ 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kiwi-gtk>=0:x11-toolkits/py-kiwi-gtk@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= desktop-file-utils gettext python:2.7
diff --git a/devel/git-cvs/Makefile b/devel/git-cvs/Makefile
index 9f1d217bf711..0ef43d830a58 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rcsparse>0:devel/py-rcsparse@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rcsparse>0:devel/py-rcsparse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
LICENSE_FILE= ${WRKSRC}/LICENSE
diff --git a/devel/git-review/Makefile b/devel/git-review/Makefile
index 79dd7d7ef484..0b7f55ba1e4c 100644
--- a/devel/git-review/Makefile
+++ b/devel/git-review/Makefile
@@ -11,9 +11,9 @@ 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR}
RUN_DEPENDS= git:devel/git \
- ${PYTHON_PKGNAMEPREFIX}requests>2.4:www/py-requests@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}requests>2.4:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils concurrent optsuffix
diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile
index bb165fc15ea0..619f4f85face 100644
--- a/devel/hg-git/Makefile
+++ b/devel/hg-git/Makefile
@@ -15,7 +15,7 @@ COMMENT= Mercurial extension to pull from or push to a Git repository
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dulwich>=*:devel/dulwich@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dulwich>=*:devel/dulwich@${PY_FLAVOR} \
mercurial>=*:devel/mercurial
PORTDOCS= README.md
diff --git a/devel/hgview/Makefile b/devel/hgview/Makefile
index d299d7706673..4d58836a22f9 100644
--- a/devel/hgview/Makefile
+++ b/devel/hgview/Makefile
@@ -14,8 +14,8 @@ COMMENT= Fast Mercurial log navigator written in pyqt4
LICENSE= GPLv2
RUN_DEPENDS= hg:devel/mercurial \
- ${PYTHON_PKGNAMEPREFIX}mx-base>0:lang/py-mx-base@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}mx-base>0:lang/py-mx-base@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR}
BUILD_DEPENDS= hg:devel/mercurial \
xmlto:textproc/xmlto \
asciidoc:textproc/asciidoc
diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile
index a4a1ecbc7434..1d7a59040070 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pickleshare>=0:databases/py-pickleshare@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.4:devel/py-prompt_toolkit@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplegeneric>0.8:devel/py-simplegeneric@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent 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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size>=0:devel/py-backports.shutil_get_terminal_size@${PY_FLAVOR}
.endif
.if ${PYTHON_REL} < 3400
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${PY_FLAVOR}
.endif
post-install:
diff --git a/devel/osc/Makefile b/devel/osc/Makefile
index b24892137b45..78e5a3991a9f 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber@${FLAVOR}
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= openSUSE
diff --git a/devel/plasma/Makefile b/devel/plasma/Makefile
index 6b3234b0dff8..105c3e7d0dc1 100644
--- a/devel/plasma/Makefile
+++ b/devel/plasma/Makefile
@@ -14,13 +14,13 @@ BUILD_DEPENDS= bash:shells/bash \
binutils>=2:devel/binutils \
capstone>=3:devel/capstone3
RUN_DEPENDS= binutils>=2:devel/binutils \
- ${PYTHON_PKGNAMEPREFIX}capstone>=3:devel/py-capstone@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}keystone-engine>=:devel/py-keystone-engine@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pefile>=0:devel/py-pefile@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyelftools>=0:devel/py-pyelftools@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}capstone>=3:devel/py-capstone@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystone-engine>=:devel/py-keystone-engine@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pefile>=0:devel/py-pefile@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyelftools>=0:devel/py-pyelftools@${PY_FLAVOR}
USES= python:3.4+ shebangfix
diff --git a/devel/py-Acquisition/Makefile b/devel/py-Acquisition/Makefile
index 07fe38577648..e9600fa3bf78 100644
--- a/devel/py-Acquisition/Makefile
+++ b/devel/py-Acquisition/Makefile
@@ -13,8 +13,8 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:devel/py-ExtensionClass@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/devel/py-AddOns/Makefile b/devel/py-AddOns/Makefile
index 7a4cf665fc05..ac8828b0d74d 100644
--- a/devel/py-AddOns/Makefile
+++ b/devel/py-AddOns/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wenheping@gmail.com
COMMENT= Dynamically extend other objects with AddOns
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7 zip
diff --git a/devel/py-Automat/Makefile b/devel/py-Automat/Makefile
index a5b821e6c1e3..40a1a9b3e0a4 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}m2r>0:textproc/py-m2r@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=16.1.0:devel/py-attrs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-BytecodeAssembler/Makefile b/devel/py-BytecodeAssembler/Makefile
index d7a3ecb8f750..38863a717d44 100644
--- a/devel/py-BytecodeAssembler/Makefile
+++ b/devel/py-BytecodeAssembler/Makefile
@@ -10,8 +10,8 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}SymbolType>0:devel/py-SymbolType@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}SymbolType>0:devel/py-SymbolType@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7 zip
diff --git a/devel/py-DateTime/Makefile b/devel/py-DateTime/Makefile
index 0a6dfa91bf77..e71973c9dfdc 100644
--- a/devel/py-DateTime/Makefile
+++ b/devel/py-DateTime/Makefile
@@ -14,8 +14,8 @@ COMMENT= Zope 2 DateTime data type
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
USES= python zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-DocumentTemplate/Makefile b/devel/py-DocumentTemplate/Makefile
index 0e07082d626f..fb38700fdda8 100644
--- a/devel/py-DocumentTemplate/Makefile
+++ b/devel/py-DocumentTemplate/Makefile
@@ -13,13 +13,13 @@ COMMENT= Document Templating Markup Language (DTML)
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:devel/py-zope.sequencesort@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-IBMQuantumExperience/Makefile b/devel/py-IBMQuantumExperience/Makefile
index cc80c4face45..16f09227ca24 100644
--- a/devel/py-IBMQuantumExperience/Makefile
+++ b/devel/py-IBMQuantumExperience/Makefile
@@ -11,8 +11,8 @@ COMMENT= Python library for the Quantum Experience API
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests_ntlm>=0:www/py-requests_ntlm@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests_ntlm>=0:www/py-requests_ntlm@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-Jinja2/Makefile b/devel/py-Jinja2/Makefile
index 4a008085ff72..e0c486c9cfb3 100644
--- a/devel/py-Jinja2/Makefile
+++ b/devel/py-Jinja2/Makefile
@@ -14,8 +14,8 @@ 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe@${PY_FLAVOR}
NO_ARCH= yes
USES= python
@@ -32,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@${FLAVOR}
+BABEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR}
PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER}
PY2TO3_ARGS= --fix=all --no-diffs --nobackups --verbose --write
@@ -40,7 +40,7 @@ PY2TO3_ARGS= --fix=all --no-diffs --nobackups --verbose --write
.include <bsd.port.pre.mk>
.if ${PKGNAMESUFFIX} == "-doc"
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR}
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
PORTDOCS= *
PORT_OPTIONS:= ${PORT_OPTIONS:NEXAMPLES}
diff --git a/devel/py-Missing/Makefile b/devel/py-Missing/Makefile
index 2c7ae82d9b1f..c146c09520a5 100644
--- a/devel/py-Missing/Makefile
+++ b/devel/py-Missing/Makefile
@@ -13,7 +13,7 @@ COMMENT= Special Missing objects used in Zope2
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-MultiMapping/Makefile b/devel/py-MultiMapping/Makefile
index 13a5054009f2..a6f1d97427c8 100644
--- a/devel/py-MultiMapping/Makefile
+++ b/devel/py-MultiMapping/Makefile
@@ -13,7 +13,7 @@ COMMENT= Special MultiMapping objects used in Zope2
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-PEAK-Rules/Makefile b/devel/py-PEAK-Rules/Makefile
index 944684b25b84..b9d076e92655 100644
--- a/devel/py-PEAK-Rules/Makefile
+++ b/devel/py-PEAK-Rules/Makefile
@@ -12,9 +12,9 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}AddOns>=0.6:devel/py-AddOns@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}BytecodeAssembler>0:devel/py-BytecodeAssembler@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Extremes>=1.1.1:devel/py-extremes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}AddOns>=0.6:devel/py-AddOns@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}BytecodeAssembler>0:devel/py-BytecodeAssembler@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/devel/py-Persistence/Makefile b/devel/py-Persistence/Makefile
index bc32c0fba510..a7d92ebe4934 100644
--- a/devel/py-Persistence/Makefile
+++ b/devel/py-Persistence/Makefile
@@ -13,8 +13,8 @@ COMMENT= Persistent ExtensionClass
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \
- zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-Products.ATContentTypes/Makefile b/devel/py-Products.ATContentTypes/Makefile
index f87af21dc6ac..83cf33def54a 100644
--- a/devel/py-Products.ATContentTypes/Makefile
+++ b/devel/py-Products.ATContentTypes/Makefile
@@ -12,31 +12,31 @@ COMMENT= Default Content Types for Plone
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ATReferenceBrowserWidget>=0:devel/py-Products.ATReferenceBrowserWidget@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist distutils
diff --git a/devel/py-Products.ATReferenceBrowserWidget/Makefile b/devel/py-Products.ATReferenceBrowserWidget/Makefile
index 2c3af04082b7..d71172c03a10 100644
--- a/devel/py-Products.ATReferenceBrowserWidget/Makefile
+++ b/devel/py-Products.ATReferenceBrowserWidget/Makefile
@@ -13,8 +13,8 @@ COMMENT= Reference widget for Archetypes
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-Products.Archetypes/Makefile b/devel/py-Products.Archetypes/Makefile
index 9c12b2c9c357..c8827b062a18 100644
--- a/devel/py-Products.Archetypes/Makefile
+++ b/devel/py-Products.Archetypes/Makefile
@@ -12,42 +12,42 @@ COMMENT= Developers framework for rapidly implementing content types
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:devel/py-Products.CMFCalendar@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.Marshall>=0:devel/py-Products.Marshall@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=2.0.3:devel/py-Products.MimetypesRegistry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PlacelessTranslationService>=0:devel/py-Products.PlacelessTranslationService@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.folder>=0:www/py-plone.folder@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:devel/py-Products.ZSQLMethods@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist distutils
diff --git a/devel/py-Products.BTreeFolder2/Makefile b/devel/py-Products.BTreeFolder2/Makefile
index 1e372c50c442..fa5db7d92414 100644
--- a/devel/py-Products.BTreeFolder2/Makefile
+++ b/devel/py-Products.BTreeFolder2/Makefile
@@ -13,14 +13,14 @@ 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:devel/py-ExtensionClass@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-Products.CMFActionIcons/Makefile b/devel/py-Products.CMFActionIcons/Makefile
index ebbfbe089bc8..87e222f22aa3 100644
--- a/devel/py-Products.CMFActionIcons/Makefile
+++ b/devel/py-Products.CMFActionIcons/Makefile
@@ -13,9 +13,9 @@ COMMENT= Action icons product for the Zope CMF
LICENSE= ZPL21
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-Products.CMFCalendar/Makefile b/devel/py-Products.CMFCalendar/Makefile
index ffbca6eea8f6..744dd044a291 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.form>0:devel/py-zope.app.form@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-Products.CMFCore/Makefile b/devel/py-Products.CMFCore/Makefile
index bf8cbb57049c..685116313bc0 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:devel/py-Products.ZSQLMethods@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.publication>0:devel/py-zope.app.publication@${PY_FLAVOR}
NO_ARCH= yes
#USES= zope # cyclic dependency
diff --git a/devel/py-Products.CMFDefault/Makefile b/devel/py-Products.CMFDefault/Makefile
index f83e5c365498..4d8be3df209a 100644
--- a/devel/py-Products.CMFDefault/Makefile
+++ b/devel/py-Products.CMFDefault/Makefile
@@ -13,10 +13,10 @@ 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=1.0.2:devel/py-five.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-Products.CMFDiffTool/Makefile b/devel/py-Products.CMFDiffTool/Makefile
index c51036e7509c..93fedd019969 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-Products.CMFDynamicViewFTI/Makefile b/devel/py-Products.CMFDynamicViewFTI/Makefile
index 290c489df3ba..b2d1e90446d7 100644
--- a/devel/py-Products.CMFDynamicViewFTI/Makefile
+++ b/devel/py-Products.CMFDynamicViewFTI/Makefile
@@ -12,13 +12,13 @@ COMMENT= Product for dynamic views in CMF
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:devel/py-zope.browsermenu@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/devel/py-Products.CMFEditions/Makefile b/devel/py-Products.CMFEditions/Makefile
index 42930fb56a01..4fb4912c3ad9 100644
--- a/devel/py-Products.CMFEditions/Makefile
+++ b/devel/py-Products.CMFEditions/Makefile
@@ -12,19 +12,19 @@ COMMENT= Versioning for Plone
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.copy>0:devel/py-zope.copy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4.0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ZopeVersionControl>=0:devel/py-Products.ZopeVersionControl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/devel/py-Products.CMFFormController/Makefile b/devel/py-Products.CMFFormController/Makefile
index 2d9474c08a36..e2b23f1dc8f3 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-Products.CMFPlacefulWorkflow/Makefile b/devel/py-Products.CMFPlacefulWorkflow/Makefile
index 1f1c970f82ae..22ccbd81b790 100644
--- a/devel/py-Products.CMFPlacefulWorkflow/Makefile
+++ b/devel/py-Products.CMFPlacefulWorkflow/Makefile
@@ -12,11 +12,11 @@ COMMENT= Workflow policies for CMF and Plone
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-Products.CMFQuickInstallerTool/Makefile b/devel/py-Products.CMFQuickInstallerTool/Makefile
index 1fd4c049995d..5fb848f6acfb 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/devel/py-Products.CMFTestCase/Makefile b/devel/py-Products.CMFTestCase/Makefile
index 3667e303482a..44de28bc78bc 100644
--- a/devel/py-Products.CMFTestCase/Makefile
+++ b/devel/py-Products.CMFTestCase/Makefile
@@ -13,16 +13,16 @@ COMMENT= Integration testing framework for CMF
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:devel/py-Products.CMFCalendar@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-Products.CMFUid/Makefile b/devel/py-Products.CMFUid/Makefile
index bde5b8a89ccb..91a99279d52b 100644
--- a/devel/py-Products.CMFUid/Makefile
+++ b/devel/py-Products.CMFUid/Makefile
@@ -13,9 +13,9 @@ COMMENT= Uid product for the Zope CMF
LICENSE= ZPL21
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-Products.DCWorkflow/Makefile b/devel/py-Products.DCWorkflow/Makefile
index ba163656261e..ccaa0a0b131d 100644
--- a/devel/py-Products.DCWorkflow/Makefile
+++ b/devel/py-Products.DCWorkflow/Makefile
@@ -13,9 +13,9 @@ COMMENT= DCWorkflow product for the Zope Content Management Framework
LICENSE= ZPL21
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-Products.ExtendedPathIndex/Makefile b/devel/py-Products.ExtendedPathIndex/Makefile
index 9d5d8f205f05..f4db40dce1c2 100644
--- a/devel/py-Products.ExtendedPathIndex/Makefile
+++ b/devel/py-Products.ExtendedPathIndex/Makefile
@@ -13,9 +13,9 @@ COMMENT= Zope catalog index for paths
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>0:security/py-AccessControl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3@${PY_FLAVOR}
USES= python:2.7 zope zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-Products.ExternalMethod/Makefile b/devel/py-Products.ExternalMethod/Makefile
index d3c183d43190..8669d3e38a89 100644
--- a/devel/py-Products.ExternalMethod/Makefile
+++ b/devel/py-Products.ExternalMethod/Makefile
@@ -13,11 +13,11 @@ 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/devel/py-Products.GenericSetup/Makefile b/devel/py-Products.GenericSetup/Makefile
index 4f3a068f55bc..9b72825f435c 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/devel/py-Products.LDAPMultiPlugins/Makefile b/devel/py-Products.LDAPMultiPlugins/Makefile
index 9c4d71ec1a68..7dcb6c718cdd 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:devel/py-Products.LDAPUserFolder@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=1.4.0:security/py-Products.PluggableAuthService@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:net/py-ldap@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:devel/py-Products.LDAPUserFolder@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=1.4.0:security/py-Products.PluggableAuthService@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-Products.LDAPUserFolder/Makefile b/devel/py-Products.LDAPUserFolder/Makefile
index 09803688c998..b77b6fc2c573 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:net/py-ldap@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>=0.4.2:devel/py-setuptools-git@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:net/py-ldap@${PY_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 8749d86f816f..2e744680a290 100644
--- a/devel/py-Products.MIMETools/Makefile
+++ b/devel/py-Products.MIMETools/Makefile
@@ -13,7 +13,7 @@ COMMENT= Provides the <!--#mime--> tag for DocumentTemplate
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-Products.Marshall/Makefile b/devel/py-Products.Marshall/Makefile
index 8718718c789b..0c034203c7b9 100644
--- a/devel/py-Products.Marshall/Makefile
+++ b/devel/py-Products.Marshall/Makefile
@@ -13,16 +13,16 @@ COMMENT= Configurable Marshallers for Archetypes
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deprecation>0:devel/py-zope.deprecation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= autoplist distutils
diff --git a/devel/py-Products.MimetypesRegistry/Makefile b/devel/py-Products.MimetypesRegistry/Makefile
index 284b17b2943e..f3a54e51ba8f 100644
--- a/devel/py-Products.MimetypesRegistry/Makefile
+++ b/devel/py-Products.MimetypesRegistry/Makefile
@@ -12,11 +12,11 @@ COMMENT= MIME type handling for Zope
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= autoplist distutils
diff --git a/devel/py-Products.OFSP/Makefile b/devel/py-Products.OFSP/Makefile
index 5ea076876577..0237c35525fd 100644
--- a/devel/py-Products.OFSP/Makefile
+++ b/devel/py-Products.OFSP/Makefile
@@ -13,8 +13,8 @@ COMMENT= General Zope 2 help screens
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-Products.PasswordResetTool/Makefile b/devel/py-Products.PasswordResetTool/Makefile
index 54b272bb398d..71669efa652f 100644
--- a/devel/py-Products.PasswordResetTool/Makefile
+++ b/devel/py-Products.PasswordResetTool/Makefile
@@ -12,14 +12,14 @@ COMMENT= Password reset tool for Plone
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip zope
diff --git a/devel/py-Products.PlacelessTranslationService/Makefile b/devel/py-Products.PlacelessTranslationService/Makefile
index e6d842edabca..c08f7707baa7 100644
--- a/devel/py-Products.PlacelessTranslationService/Makefile
+++ b/devel/py-Products.PlacelessTranslationService/Makefile
@@ -13,18 +13,18 @@ COMMENT= Internationalizing and localizing software for Zope 2
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-gettext>0:textproc/py-python-gettext@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
USES= python:2.7 shebangfix zip
USE_PYTHON= autoplist distutils
diff --git a/devel/py-Products.PloneTestCase/Makefile b/devel/py-Products.PloneTestCase/Makefile
index a50025a7e23b..28c9cc15fcac 100644
--- a/devel/py-Products.PloneTestCase/Makefile
+++ b/devel/py-Products.PloneTestCase/Makefile
@@ -12,15 +12,15 @@ COMMENT= Integration testing framework for Plone
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ATContentTypes>=0:devel/py-Products.ATContentTypes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
USE_PYTHON= autoplist distutils
USES= python:2.7 zope zip
diff --git a/devel/py-Products.PluginRegistry/Makefile b/devel/py-Products.PluginRegistry/Makefile
index e978cda0ba27..b13fa3b5850a 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-Products.PortalTransforms/Makefile b/devel/py-Products.PortalTransforms/Makefile
index 3baa36080106..c0ba3759780f 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:www/py-plone.intelligenttext@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown>=1.7:textproc/py-markdown@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-Products.PythonScripts/Makefile b/devel/py-Products.PythonScripts/Makefile
index 649d89db4db1..eca2c943f79f 100644
--- a/devel/py-Products.PythonScripts/Makefile
+++ b/devel/py-Products.PythonScripts/Makefile
@@ -13,12 +13,12 @@ COMMENT= Support for restricted execution of Python scripts in Zope 2
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-Products.ResourceRegistries/Makefile b/devel/py-Products.ResourceRegistries/Makefile
index ec28009f1c49..f8f5bae46a03 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.registry>0:www/py-plone.app.registry@${PY_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 a98f36650959..c3a9945cdc31 100644
--- a/devel/py-Products.StandardCacheManagers/Makefile
+++ b/devel/py-Products.StandardCacheManagers/Makefile
@@ -13,9 +13,9 @@ COMMENT= Cache managers for Zope 2
LICENSE= ZPL21
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-Products.ZCTextIndex/Makefile b/devel/py-Products.ZCTextIndex/Makefile
index 403eca357a63..bb0b8e013084 100644
--- a/devel/py-Products.ZCTextIndex/Makefile
+++ b/devel/py-Products.ZCTextIndex/Makefile
@@ -12,13 +12,13 @@ COMMENT= Full text indexing for ZCatalog/Zope2
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-Products.ZCatalog/Makefile b/devel/py-Products.ZCatalog/Makefile
index 4bf656c241f2..fb5dc2e45ebe 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ZCTextIndex>=0:devel/py-Products.ZCTextIndex@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${PY_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 87af23ef4558..4e91b7af17c4 100644
--- a/devel/py-Products.ZSQLMethods/Makefile
+++ b/devel/py-Products.ZSQLMethods/Makefile
@@ -13,15 +13,15 @@ COMMENT= SQL method support for Zope 2
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-Products.ZopeVersionControl/Makefile b/devel/py-Products.ZopeVersionControl/Makefile
index 2147f1b2a803..eaf44b6eeed1 100644
--- a/devel/py-Products.ZopeVersionControl/Makefile
+++ b/devel/py-Products.ZopeVersionControl/Makefile
@@ -13,11 +13,11 @@ COMMENT= Zope Version Control
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-Products.statusmessages/Makefile b/devel/py-Products.statusmessages/Makefile
index 0f7adf2ae682..0465ed104ce5 100644
--- a/devel/py-Products.statusmessages/Makefile
+++ b/devel/py-Products.statusmessages/Makefile
@@ -13,9 +13,9 @@ COMMENT= Handling of internationalized status messages for Zope
LICENSE= BSD3CLAUSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-Products.validation/Makefile b/devel/py-Products.validation/Makefile
index bd6782d6e311..0f0c5404f961 100644
--- a/devel/py-Products.validation/Makefile
+++ b/devel/py-Products.validation/Makefile
@@ -12,11 +12,11 @@ COMMENT= Data validation package for Archetypes
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/devel/py-PyUtilib/Makefile b/devel/py-PyUtilib/Makefile
index f9c106cf0691..e0ca5d7ee812 100644
--- a/devel/py-PyUtilib/Makefile
+++ b/devel/py-PyUtilib/Makefile
@@ -11,8 +11,8 @@ COMMENT= Collection of Python utilities
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/devel/py-RPyC/Makefile b/devel/py-RPyC/Makefile
index db01a469ca9d..554a9982d818 100644
--- a/devel/py-RPyC/Makefile
+++ b/devel/py-RPyC/Makefile
@@ -16,7 +16,7 @@ LICENSE= MIT
OPTIONS_DEFINE= PLUMBUM
OPTIONS_DEFAULT=PLUMBUM
-PLUMBUM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plumbum>0:sysutils/py-plumbum@${FLAVOR}
+PLUMBUM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plumbum>0:sysutils/py-plumbum@${PY_FLAVOR}
PLUMBUM_DESC= Required for features like rpyc_classic.py and zero deploy
USES= python
diff --git a/devel/py-Record/Makefile b/devel/py-Record/Makefile
index eaa073f0c08c..144e973e1afa 100644
--- a/devel/py-Record/Makefile
+++ b/devel/py-Record/Makefile
@@ -13,7 +13,7 @@ COMMENT= Special Record objects used in Zope2
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-ToscaWidgets/Makefile b/devel/py-ToscaWidgets/Makefile
index 53a7e653f911..63a50d0850ea 100644
--- a/devel/py-ToscaWidgets/Makefile
+++ b/devel/py-ToscaWidgets/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python framework for building reusable web components
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-XStatic-Angular-Bootstrap/Makefile b/devel/py-XStatic-Angular-Bootstrap/Makefile
index 4f382fe547fe..b4d7c679c6c5 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-XStatic-Angular-FileUpload/Makefile b/devel/py-XStatic-Angular-FileUpload/Makefile
index da34f77c196c..3ed7b1b2cd22 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_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 5b9644623329..9873b65ce863 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_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 f0ccbd60e7e4..90a6ee83a1c4 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_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 f249ad4f4074..e015c47426b8 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/devel/py-XStatic-Angular/Makefile b/devel/py-XStatic-Angular/Makefile
index 35a5eafd6c3c..0ca7586c2b25 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_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 f2e6416b0511..7f0aaf9c9631 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_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 31b600c8cb89..d78b8f789c7b 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/devel/py-XStatic-D3/Makefile b/devel/py-XStatic-D3/Makefile
index 70fcced3a117..fc20281bcdf3 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_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 af238aa8d5d7..054841bfe53c 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/devel/py-XStatic-Hogan/Makefile b/devel/py-XStatic-Hogan/Makefile
index 5d67eac15c75..0cb254958c3d 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_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 13223a68d99f..bd6b340f5cec 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_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 499fda1b217a..5dafaf8edb96 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_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 2f791e890e82..ecb322187946 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/devel/py-XStatic-JSEncrypt/Makefile b/devel/py-XStatic-JSEncrypt/Makefile
index b5338019464b..347bc9b86a87 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/devel/py-XStatic-Jasmine/Makefile b/devel/py-XStatic-Jasmine/Makefile
index db22175838b1..a980d15aba60 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/devel/py-XStatic-Rickshaw/Makefile b/devel/py-XStatic-Rickshaw/Makefile
index 87cf77860e22..feec1a246f22 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/devel/py-XStatic-Spin/Makefile b/devel/py-XStatic-Spin/Makefile
index 7eb8123861a9..21b1b7dde51b 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/devel/py-XStatic-bootswatch/Makefile b/devel/py-XStatic-bootswatch/Makefile
index 30d1d0d1e5ad..b66beda482d2 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/devel/py-XStatic-jQuery/Makefile b/devel/py-XStatic-jQuery/Makefile
index f90d7f2c7857..7269a46639a6 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_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 fc0ba3778833..12b6b4defad0 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/devel/py-XStatic-mdi/Makefile b/devel/py-XStatic-mdi/Makefile
index 00c4cb1babad..0572d0a6fbd6 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/devel/py-XStatic-objectpath/Makefile b/devel/py-XStatic-objectpath/Makefile
index ec861b1d0c99..1a01e090af80 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_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 2dfd3ebcec80..ec0813fd03d6 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_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 f54137c9d5f4..d0d93dcca132 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_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 c2e946e7cd1f..6abc2d460786 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/devel/py-XStatic-tv4/Makefile b/devel/py-XStatic-tv4/Makefile
index 981f115f7ea1..0a36ccac405a 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/devel/py-adb/Makefile b/devel/py-adb/Makefile
index 09f94c7946b5..0d57d488eef1 100644
--- a/devel/py-adb/Makefile
+++ b/devel/py-adb/Makefile
@@ -11,9 +11,9 @@ COMMENT= Pure-python implementation of ADB and Fastboot protocols
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libusb1>=1.0.16:devel/py-libusb1@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.21.1:security/py-m2crypto@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libusb1>=1.0.16:devel/py-libusb1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.21.1:security/py-m2crypto@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= google
diff --git a/devel/py-aniso8601/Makefile b/devel/py-aniso8601/Makefile
index 4c38680890d3..b58a87c6b6dd 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-apns2/Makefile b/devel/py-apns2/Makefile
index 4b458e39879a..b12b257d3971 100644
--- a/devel/py-apns2/Makefile
+++ b/devel/py-apns2/Makefile
@@ -12,9 +12,9 @@ COMMENT= Python client for Apple Push Notification service
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}hyper>0:www/py-hyper@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyjwt>0:www/py-pyjwt@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hyper>0:www/py-hyper@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyjwt>0:www/py-pyjwt@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-apptools/Makefile b/devel/py-apptools/Makefile
index 76bf12b6f326..abc8a0078226 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.:devel/py-configobj@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.:devel/py-configobj@${PY_FLAVOR}
USES= python:-2.7
USE_PYTHON= autoplist distutils
diff --git a/devel/py-apscheduler/Makefile b/devel/py-apscheduler/Makefile
index cb576bc8c5a4..8098797c60dc 100644
--- a/devel/py-apscheduler/Makefile
+++ b/devel/py-apscheduler/Makefile
@@ -13,13 +13,13 @@ 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
RUN_DEPENDS= ${PY_FUTURES} \
- ${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}
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.2:devel/py-tzlocal@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>=0.7:devel/py-pytest-capturelog@${PY_FLAVOR}
NO_ARCH= yes
USES= python
@@ -29,11 +29,11 @@ TEST_ENV= ${MAKE_ENV} TZ=UTC
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3300
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs@${FLAVOR}
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs@${PY_FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
.else
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-tornado>0:devel/py-pytest-tornado@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-tornado>0:devel/py-pytest-tornado@${PY_FLAVOR}
.endif
post-patch:
diff --git a/devel/py-archetypes.querywidget/Makefile b/devel/py-archetypes.querywidget/Makefile
index 4b716d785731..fb7b3916fa30 100644
--- a/devel/py-archetypes.querywidget/Makefile
+++ b/devel/py-archetypes.querywidget/Makefile
@@ -13,8 +13,8 @@ COMMENT= Widget for creating catalog queries
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.querystring>=1.0.3:www/py-plone.app.querystring@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:www/py-plone.app.jquerytools@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-archetypes.referencebrowserwidget/Makefile b/devel/py-archetypes.referencebrowserwidget/Makefile
index ce22858b0a10..fa2f68d404c7 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=1.1:www/py-plone.app.jquerytools@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-archetypes.schemaextender/Makefile b/devel/py-archetypes.schemaextender/Makefile
index 18f426e6722e..5628c96fd621 100644
--- a/devel/py-archetypes.schemaextender/Makefile
+++ b/devel/py-archetypes.schemaextender/Makefile
@@ -13,7 +13,7 @@ COMMENT= Dynamically extend Archetypes schemas with named adapters
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-argcomplete/Makefile b/devel/py-argcomplete/Makefile
index 4ccd597ba874..d17c1b9edc47 100644
--- a/devel/py-argcomplete/Makefile
+++ b/devel/py-argcomplete/Makefile
@@ -13,10 +13,10 @@ COMMENT= Bash tab completion for argparse
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.rst
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-arrow/Makefile b/devel/py-arrow/Makefile
index e0ae0ea0e9bc..9071117997f2 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
@@ -21,7 +21,7 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3000
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=0:devel/py-backports.functools_lru_cache@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=0:devel/py-backports.functools_lru_cache@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/devel/py-astroid/Makefile b/devel/py-astroid/Makefile
index 8d741caa828c..9a50ace4b6ad 100644
--- a/devel/py-astroid/Makefile
+++ b/devel/py-astroid/Makefile
@@ -13,9 +13,9 @@ LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.LESSER
RUN_DEPENDS= ${PY_ENUM34} \
- ${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}
+ ${PYTHON_PKGNAMEPREFIX}lazy-object-proxy>=0:devel/py-lazy-object-proxy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wrapt>=0:devel/py-wrapt@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
@@ -24,8 +24,8 @@ USES= python
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3400
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=0:devel/py-backports.functools_lru_cache@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=0:devel/py-backports.functools_lru_cache@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/devel/py-asttokens/Makefile b/devel/py-asttokens/Makefile
index 4e8d94e6faa4..765abadc5a99 100644
--- a/devel/py-asttokens/Makefile
+++ b/devel/py-asttokens/Makefile
@@ -13,9 +13,9 @@ COMMENT= Annotate AST trees with source code positions
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}astroid>0:devel/py-astroid@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}astroid>0:devel/py-astroid@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-atomiclong/Makefile b/devel/py-atomiclong/Makefile
index 451ff9472336..179b9b55775d 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-automaton/Makefile b/devel/py-automaton/Makefile
index 7f7e26d5ef4d..bd1714c99866 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-avro/Makefile b/devel/py-avro/Makefile
index 91e3115980b7..017f814c3f98 100644
--- a/devel/py-avro/Makefile
+++ b/devel/py-avro/Makefile
@@ -13,8 +13,8 @@ COMMENT= Data serialization system for python
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/src/avro/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-snappy>=0:archivers/py-python-snappy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.9:devel/py-simplejson@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-snappy>=0:archivers/py-python-snappy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.9:devel/py-simplejson@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-babel/Makefile b/devel/py-babel/Makefile
index 654cb1796b2f..ceb4c289de42 100644
--- a/devel/py-babel/Makefile
+++ b/devel/py-babel/Makefile
@@ -13,7 +13,7 @@ COMMENT= Collection of tools for internationalizing Python applications
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-backports.functools_lru_cache/Makefile b/devel/py-backports.functools_lru_cache/Makefile
index badd7fd768d4..9a87b971023a 100644
--- a/devel/py-backports.functools_lru_cache/Makefile
+++ b/devel/py-backports.functools_lru_cache/Makefile
@@ -11,8 +11,8 @@ 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports>=0:devel/py-backports@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports>=0:devel/py-backports@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist distutils
diff --git a/devel/py-backports.shutil_get_terminal_size/Makefile b/devel/py-backports.shutil_get_terminal_size/Makefile
index 50c834710b60..d4f9e8923a99 100644
--- a/devel/py-backports.shutil_get_terminal_size/Makefile
+++ b/devel/py-backports.shutil_get_terminal_size/Makefile
@@ -12,7 +12,7 @@ COMMENT= Backport of the get_terminal_size function from Python 3.3's shutil
LICENSE= PSFL
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports>0:devel/py-backports@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports>0:devel/py-backports@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-backports.tempfile/Makefile b/devel/py-backports.tempfile/Makefile
index 2d11b2bd441b..3e555f69b7d0 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-backports.weakref/Makefile b/devel/py-backports.weakref/Makefile
index 4027a3364487..67f71129f64a 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-bandit/Makefile b/devel/py-bandit/Makefile
index 40cbab17710a..0ca8e1736cbf 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.5.0:devel/py-stevedore@${PY_FLAVOR}
MAKE_ENV+= PBR_VERSION=${PORTVERSION}
diff --git a/devel/py-bcdoc/Makefile b/devel/py-bcdoc/Makefile
index c987b1682637..d12a6e33ae2d 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-bidict/Makefile b/devel/py-bidict/Makefile
index 6433db26f4b2..0ef7ca0cb1e9 100644
--- a/devel/py-bidict/Makefile
+++ b/devel/py-bidict/Makefile
@@ -12,8 +12,8 @@ COMMENT= Bidirectional map implementation and related functionality
LICENSE= MPL20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-binplist/Makefile b/devel/py-binplist/Makefile
index 13a88fc0ce81..226f74f6bfdf 100644
--- a/devel/py-binplist/Makefile
+++ b/devel/py-binplist/Makefile
@@ -15,7 +15,7 @@ LICENSE= APACHE20
DEPRECATED= Not depended upon anymore, no longer maintained upstream
EXPIRATION_DATE= 2018-06-25
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-biplist/Makefile b/devel/py-biplist/Makefile
index 2142262f9b94..e914f1be1acd 100644
--- a/devel/py-biplist/Makefile
+++ b/devel/py-biplist/Makefile
@@ -13,8 +13,8 @@ COMMENT= Library for reading/writing binary plists
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-bison/Makefile b/devel/py-bison/Makefile
index e225d35ee4c5..0eae771839fe 100644
--- a/devel/py-bison/Makefile
+++ b/devel/py-bison/Makefile
@@ -15,7 +15,7 @@ COMMENT= Python-based parsing at the speed of C
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>=0.9.6.2:devel/pyrex@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>=0.9.6.2:devel/pyrex@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/devel/py-black/Makefile b/devel/py-black/Makefile
index 0a452a2c585a..1983a8d885eb 100644
--- a/devel/py-black/Makefile
+++ b/devel/py-black/Makefile
@@ -12,9 +12,9 @@ COMMENT= Python code formatter
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pypandoc>0:textproc/py-pypandoc@${FLAVOR} # pypandoc is optional, but recommended
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pypandoc>0:textproc/py-pypandoc@${PY_FLAVOR} # pypandoc is optional, but recommended
USES= python:3.6+
USE_PYTHON= distutils autoplist concurrent
diff --git a/devel/py-blinker/Makefile b/devel/py-blinker/Makefile
index 44631041ce8a..a155fec6c590 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-botocore/Makefile b/devel/py-botocore/Makefile
index a2f2404315f3..69a9bf50ec78 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1:devel/py-jmespath@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1:devel/py-jmespath@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-bsd/Makefile b/devel/py-bsd/Makefile
index 0ccd98c41c67..119f541c7549 100644
--- a/devel/py-bsd/Makefile
+++ b/devel/py-bsd/Makefile
@@ -10,9 +10,9 @@ COMMENT= Python wrappers for various BSD libc and system calls
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
RUN_DEPENDS= ${PY_ENUM34} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils cython
diff --git a/devel/py-buildbot-console-view/Makefile b/devel/py-buildbot-console-view/Makefile
index 3f33fa004b12..206892ca7379 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-buildbot-grid-view/Makefile b/devel/py-buildbot-grid-view/Makefile
index 5016ad0d94d5..da6416f6ecdb 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-buildbot-waterfall-view/Makefile b/devel/py-buildbot-waterfall-view/Makefile
index ff29f944eeac..d347085b08b3 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-buildbot-worker/Makefile b/devel/py-buildbot-worker/Makefile
index 73622ab264e7..2bda4aeb5024 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-buildbot-www/Makefile b/devel/py-buildbot-www/Makefile
index a9b0fd56ab96..8005901a5031 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot>=${PORTVERSION}:devel/py-buildbot@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-console-view>=${PORTVERSION}:devel/py-buildbot-console-view@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}buildbot-grid-view>=${PORTVERSION}:devel/py-buildbot-grid-view@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}buildbot-waterfall-view>=${PORTVERSION}:devel/py-buildbot-waterfall-view@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-buildbot/Makefile b/devel/py-buildbot/Makefile
index eea299f4253a..1ce84174c3f2 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lz4>=0:archivers/py-lz4@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.4.0:www/py-pyjwt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ramlfications>0:devel/py-ramlfications@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}buildbot-worker>=${PORTVERSION}:devel/py-buildbot-worker@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}buildbot-www>=${PORTVERSION}:devel/py-buildbot-www@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR}
USES= python
USE_RC_SUBR= buildbot
diff --git a/devel/py-canonicaljson/Makefile b/devel/py-canonicaljson/Makefile
index 09d62ed383ca..2cae03487c9c 100644
--- a/devel/py-canonicaljson/Makefile
+++ b/devel/py-canonicaljson/Makefile
@@ -13,10 +13,10 @@ COMMENT= Canonical JSON
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}frozendict>=1.0:devel/py-frozendict@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=3.6.5:devel/py-simplejson@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}frozendict>=1.0:devel/py-frozendict@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=3.6.5:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-castellan/Makefile b/devel/py-castellan/Makefile
index 6fd9a13de8f5..6621ef687b99 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>=1.0:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.policy>=0.5.0:devel/py-oslo.policy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-cdg/Makefile b/devel/py-cdg/Makefile
index 8f1e65bc7f82..c704d747e237 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-celery/Makefile b/devel/py-celery/Makefile
index 20c77f53895f..0c64305975b8 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}billiard>=3.3.0.21:devel/py-billiard@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=1.5:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}kombu>=3.0.36:net/py-kombu@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-cffi/Makefile b/devel/py-cffi/Makefile
index 597b72d53998..357efc414749 100644
--- a/devel/py-cffi/Makefile
+++ b/devel/py-cffi/Makefile
@@ -14,8 +14,8 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libffi.so:devel/libffi
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
# Actually 2.6-2.7,3.2-3.5
USES= localbase python compiler
diff --git a/devel/py-check-manifest/Makefile b/devel/py-check-manifest/Makefile
index 00a551cf61cb..f63ccf9c8eaa 100644
--- a/devel/py-check-manifest/Makefile
+++ b/devel/py-check-manifest/Makefile
@@ -13,7 +13,7 @@ COMMENT= Tool to check the completeness of MANIFEST.in for Python packages
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.rst
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile
index be1836144f0e..9dd362b3d7ca 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-circuits/Makefile b/devel/py-circuits/Makefile
index 69d75e3caf91..29b4568a7fe5 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-cli-helpers/Makefile b/devel/py-cli-helpers/Makefile
index a83b9dbb39e9..de06c3d91b04 100644
--- a/devel/py-cli-helpers/Makefile
+++ b/devel/py-cli-helpers/Makefile
@@ -14,10 +14,10 @@ COMMENT= Helpers for building command-line apps
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tabulate>=0.8.2:devel/py-tabulate@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}terminaltables>=3.0.0:textproc/py-terminaltables@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tabulate>=0.8.2:devel/py-tabulate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}terminaltables>=3.0.0:textproc/py-terminaltables@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
@@ -26,7 +26,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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.csv>=1.0.0:devel/py-backports.csv@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/devel/py-cliapp/Makefile b/devel/py-cliapp/Makefile
index 0758fa38d7f0..703709180988 100644
--- a/devel/py-cliapp/Makefile
+++ b/devel/py-cliapp/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python framework for command line utilities
LICENSE= GPLv2
LICENSE_FILES= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
USES= python:2.7
NO_ARCH= yes
diff --git a/devel/py-click-log/Makefile b/devel/py-click-log/Makefile
index 376985de127c..d40b3a226cbd 100644
--- a/devel/py-click-log/Makefile
+++ b/devel/py-click-log/Makefile
@@ -12,9 +12,9 @@ COMMENT= Logging integration for Click
LICENSE= MIT
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-click-plugins/Makefile b/devel/py-click-plugins/Makefile
index c4c045171955..9d12cb871c89 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-click-threading/Makefile b/devel/py-click-threading/Makefile
index e62e6ed620f7..249ec518b372 100644
--- a/devel/py-click-threading/Makefile
+++ b/devel/py-click-threading/Makefile
@@ -12,9 +12,9 @@ COMMENT= Multithreaded Click apps made easy
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
${PY_FUTURES}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
${RUN_DEPENDS}
USES= python
diff --git a/devel/py-cliff/Makefile b/devel/py-cliff/Makefile
index 54217a7e1aa3..e9f9dc1d75a3 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cmd2>=0.6.7:devel/py-cmd2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}unicodecsv>=0.8.0:devel/py-unicodecsv@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.7:devel/py-pyparsing@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-cligj/Makefile b/devel/py-cligj/Makefile
index bc698475d8a7..50f8a817c925 100644
--- a/devel/py-cligj/Makefile
+++ b/devel/py-cligj/Makefile
@@ -11,7 +11,7 @@ COMMENT= Click-based argument and option decorators for Python GIS cli
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>4.0:devel/py-click@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>4.0:devel/py-click@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-clint/Makefile b/devel/py-clint/Makefile
index 9ecabbbafa7b..0e70b5a22df6 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-cloudpickle/Makefile b/devel/py-cloudpickle/Makefile
index fc924243f9c0..40c8cda8762d 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-cmdtest/Makefile b/devel/py-cmdtest/Makefile
index cc7b98ced6e7..4d9abc3db782 100644
--- a/devel/py-cmdtest/Makefile
+++ b/devel/py-cmdtest/Makefile
@@ -13,12 +13,12 @@ COMMENT= Black box testing of Unix programs
LICENSE= GPLv3
LICENSE_FILES= ${WRKSRC}/COPYING
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cliapp>0:devel/py-cliapp@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ttystatus>0:devel/py-ttystatus@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cliapp>0:devel/py-cliapp@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ttystatus>0:devel/py-ttystatus@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils concurrent autoplist
diff --git a/devel/py-codecov/Makefile b/devel/py-codecov/Makefile
index 6861887702ae..53fbb6112fc3 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
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.7.9:www/py-requests@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ddt>0:devel/py-ddt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_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 d98bcc03d444..69986826e8fb 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/devel/py-coloredlogs/Makefile b/devel/py-coloredlogs/Makefile
index 4377423d5e9b..81651c7ef529 100644
--- a/devel/py-coloredlogs/Makefile
+++ b/devel/py-coloredlogs/Makefile
@@ -12,7 +12,7 @@ COMMENT= Colored terminal output for Python logging module
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}humanfriendly>=4.7:textproc/py-humanfriendly@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}humanfriendly>=4.7:textproc/py-humanfriendly@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-columnize/Makefile b/devel/py-columnize/Makefile
index fc8ab6f9245c..6f81ec1b3412 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@${FLAVOR}
+MY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_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@${FLAVOR}
+MY_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size>=1.0:devel/py-backports.shutil_get_terminal_size@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/devel/py-configargparse/Makefile b/devel/py-configargparse/Makefile
index 46debb2db4de..a1a06ff2de3d 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-configobj/Makefile b/devel/py-configobj/Makefile
index 362eea58a2ae..fca54f4ff631 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-confusable_homoglyphs/Makefile b/devel/py-confusable_homoglyphs/Makefile
index f4bdd415b3a8..2c990b3ae246 100644
--- a/devel/py-confusable_homoglyphs/Makefile
+++ b/devel/py-confusable_homoglyphs/Makefile
@@ -13,7 +13,7 @@ COMMENT= Detect confusable usage of unicode homoglyphs
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-construct/Makefile b/devel/py-construct/Makefile
index 256e4492c009..81e93251840e 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-construct28/Makefile b/devel/py-construct28/Makefile
index cb29cc3fe560..80700650772f 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-cov-core/Makefile b/devel/py-cov-core/Makefile
index eec7a1a27742..eb18a15a6627 100644
--- a/devel/py-cov-core/Makefile
+++ b/devel/py-cov-core/Makefile
@@ -14,7 +14,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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=3.6:devel/py-coverage@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-cuisine/Makefile b/devel/py-cuisine/Makefile
index f03c16470ae2..162e0b93f40c 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fabric>=1.7,1:devel/py-fabric@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-cursive/Makefile b/devel/py-cursive/Makefile
index 6f3f7ae3edfe..1e480ce6867b 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-curtsies/Makefile b/devel/py-curtsies/Makefile
index 0c2c534e5899..31792b898831 100644
--- a/devel/py-curtsies/Makefile
+++ b/devel/py-curtsies/Makefile
@@ -14,8 +14,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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.4:devel/py-wcwidth@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blessings>=1.5:devel/py-blessings@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.4:devel/py-wcwidth@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
@@ -24,7 +24,7 @@ USES= python
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/devel/py-cycler/Makefile b/devel/py-cycler/Makefile
index 44cf3734c5ce..433012ab05f0 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-d2to1/Makefile b/devel/py-d2to1/Makefile
index dff53e62ffcf..617456414450 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/py-setuptools@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/devel/py-daemon-runner/Makefile b/devel/py-daemon-runner/Makefile
index cd67abc47e71..a4b8a9c90bc4 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}daemon>0:devel/py-daemon@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-daemon/Makefile b/devel/py-daemon/Makefile
index b50ca2764b4e..9b6e716026c3 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lockfile>=0.10:devel/py-lockfile@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lockfile>=0.10:devel/py-lockfile@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/devel/py-dateutil/Makefile b/devel/py-dateutil/Makefile
index 00539ea6f049..da934303d18d 100644
--- a/devel/py-dateutil/Makefile
+++ b/devel/py-dateutil/Makefile
@@ -12,7 +12,7 @@ COMMENT= Extensions to the standard Python datetime module
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/devel/py-dateutils/Makefile b/devel/py-dateutils/Makefile
index 9f586796bcaa..cc6fd46e6bf5 100644
--- a/devel/py-dateutils/Makefile
+++ b/devel/py-dateutils/Makefile
@@ -12,9 +12,9 @@ COMMENT= Various utilities for working with date and datetime objects
LICENSE= BSD3CLAUSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/devel/py-ddt/Makefile b/devel/py-ddt/Makefile
index fa8961692448..a2ed561f1abe 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-debtcollector/Makefile b/devel/py-debtcollector/Makefile
index 15ef957ae5b0..d45a06d4a306 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-delfick_error/Makefile b/devel/py-delfick_error/Makefile
index 39b068325e45..379b6f965a65 100644
--- a/devel/py-delfick_error/Makefile
+++ b/devel/py-delfick_error/Makefile
@@ -10,16 +10,16 @@ COMMENT= Customized exception class
LICENSE= MIT
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}total-ordering>0:devel/py-total-ordering@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:devel/py-noseofyeti@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
DOCS_BUILD_DEPENDS= \
- ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cloud_sptheme>0:textproc/py-cloud_sptheme@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cloud_sptheme>0:textproc/py-cloud_sptheme@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-deliciousapi/Makefile b/devel/py-deliciousapi/Makefile
index 488f7dff5258..7e68466bd573 100644
--- a/devel/py-deliciousapi/Makefile
+++ b/devel/py-deliciousapi/Makefile
@@ -12,8 +12,8 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=1.7:devel/py-simplejson@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=1.7:devel/py-simplejson@${PY_FLAVOR}
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
diff --git a/devel/py-deprecation/Makefile b/devel/py-deprecation/Makefile
index 9e4bb1ceb0fb..23da77bc76eb 100644
--- a/devel/py-deprecation/Makefile
+++ b/devel/py-deprecation/Makefile
@@ -13,7 +13,7 @@ COMMENT= Library to handle automated deprecations
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-diazo/Makefile b/devel/py-diazo/Makefile
index aef17b0ba33f..71a3f4c05d87 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:devel/py-repoze.xmliter@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-django-rq-dashboard/Makefile b/devel/py-django-rq-dashboard/Makefile
index e4b1625351c1..c1fc546a7efb 100644
--- a/devel/py-django-rq-dashboard/Makefile
+++ b/devel/py-django-rq-dashboard/Makefile
@@ -12,7 +12,7 @@ COMMENT= Monitor your RQ queues, jobs and workers from the Django admin
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENCE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-rq>0:devel/py-django-rq@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-rq>0:devel/py-django-rq@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-django-rq/Makefile b/devel/py-django-rq/Makefile
index b857afeb9461..6a87762fbf53 100644
--- a/devel/py-django-rq/Makefile
+++ b/devel/py-django-rq/Makefile
@@ -14,11 +14,11 @@ COMMENT= Provides Django integration for RQ (Redis Queue)
LICENSE= MIT
TEST_DEPENDS= redis-server:databases/redis \
- ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}rq>=0.5.5:devel/py-rq@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rq>=0.5.5:devel/py-rq@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-django-tastypie-mongoengine/Makefile b/devel/py-django-tastypie-mongoengine/Makefile
index 0b7b13ed1333..ef3fe95b727c 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:devel/py-mongoengine@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${FLAVOR}
+RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}django-tastypie>=0.9.12:www/py-django-tastypie@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:devel/py-mongoengine@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= wlanslovenija
diff --git a/devel/py-docker-py/Makefile b/devel/py-docker-py/Makefile
index c5e52b7b54c8..7945a58b73d8 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-dockerpty/Makefile b/devel/py-dockerpty/Makefile
index f0b2e8c8e386..cfb8a675cfe7 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docker>0:sysutils/py-docker@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-dogpile.cache/Makefile b/devel/py-dogpile.cache/Makefile
index 214b73ee3120..14a4c0777dca 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-doit/Makefile b/devel/py-doit/Makefile
index da42a760bbe2..0b401ea1a1b7 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
USES= python:3.3+
USE_PYTHON= distutils autoplist
diff --git a/devel/py-easyprocess/Makefile b/devel/py-easyprocess/Makefile
index 6a6dcc2bb345..8aa5ab377349 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
NO_ARCH= YES
USE_PYTHON= autoplist distutils
diff --git a/devel/py-efilter/Makefile b/devel/py-efilter/Makefile
index d5521118e6c8..ded30a7d41a2 100644
--- a/devel/py-efilter/Makefile
+++ b/devel/py-efilter/Makefile
@@ -16,10 +16,10 @@ LICENSE= APACHE20
CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}rekall-efilter-[0-9]*
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2011:devel/py-pytz@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-efl/Makefile b/devel/py-efl/Makefile
index 3827540d92c5..da403b278b9c 100644
--- a/devel/py-efl/Makefile
+++ b/devel/py-efl/Makefile
@@ -14,9 +14,9 @@ COMMENT= Python bindings for EFL and Elementary
LICENSE= GPLv3 LGPL3
LICENSE_COMB= multi
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus@${PY_FLAVOR}
LIB_DEPENDS= libefl.so:devel/efl
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus@${PY_FLAVOR}
DIST_SUBDIR= enlightenment
USES= pkgconfig python tar:xz
diff --git a/devel/py-ejson/Makefile b/devel/py-ejson/Makefile
index 041ced535ca4..ff5dc0931d1d 100644
--- a/devel/py-ejson/Makefile
+++ b/devel/py-ejson/Makefile
@@ -13,7 +13,7 @@ COMMENT= Extensible JSON serializers and deserializers
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-entrypoints/Makefile b/devel/py-entrypoints/Makefile
index adf2b1932491..8cadd0f69c64 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>=3.5:devel/py-configparser@${PY_FLAVOR}
.endif
do-test:
diff --git a/devel/py-envisage/Makefile b/devel/py-envisage/Makefile
index feef23c6ffc4..fd6d1f7e09f0 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits@${PY_FLAVOR}
USES= python:-2.7
USE_PYTHON= autoplist distutils
diff --git a/devel/py-epsilon/Makefile b/devel/py-epsilon/Makefile
index bfa062016336..33d67b58b8f7 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
# bin/benchmark
CONFLICTS_INSTALL= brlcad
diff --git a/devel/py-eventlib/Makefile b/devel/py-eventlib/Makefile
index 1391995d454e..401ca0829e6e 100644
--- a/devel/py-eventlib/Makefile
+++ b/devel/py-eventlib/Makefile
@@ -13,11 +13,11 @@ COMMENT= Library to make it easy to track events in python/django apps
LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}celery>=3.0.0:devel/py-celery@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ejson>=0:devel/py-ejson@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}logan>=0.5.0:devel/py-logan@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}redis>=2.7.1:databases/py-redis@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}celery>=3.0.0:devel/py-celery@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ejson>=0:devel/py-ejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}logan>=0.5.0:devel/py-logan@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}redis>=2.7.1:databases/py-redis@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-extras/Makefile b/devel/py-extras/Makefile
index d0c249ea0125..4c83d13824e0 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}testtools>0:devel/py-testtools@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-fabric/Makefile b/devel/py-fabric/Makefile
index a233e31f3f53..8c69834ccec6 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.10:security/py-paramiko@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0.6:devel/py-Jinja2@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-fasteners/Makefile b/devel/py-fasteners/Makefile
index 6c1bba2cb8a4..be42095e4f10 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}monotonic>=0.1:devel/py-monotonic@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}monotonic>=0.1:devel/py-monotonic@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-filemagic/Makefile b/devel/py-filemagic/Makefile
index 79aeb4817d0d..bdd76a97a432 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
OPTIONS_DEFINE= TESTS
diff --git a/devel/py-five.customerize/Makefile b/devel/py-five.customerize/Makefile
index 70b3f35ad3f8..cb730f59fadf 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR}
USE_PYTHON= distutils autoplist
USES= python:2.7 zope zip
diff --git a/devel/py-five.formlib/Makefile b/devel/py-five.formlib/Makefile
index 9f8c2665b52b..9df9d49fe048 100644
--- a/devel/py-five.formlib/Makefile
+++ b/devel/py-five.formlib/Makefile
@@ -13,19 +13,19 @@ COMMENT= zope.formlib integration for Zope 2
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-five.globalrequest/Makefile b/devel/py-five.globalrequest/Makefile
index eb279aa97c30..259a67d9523a 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:devel/py-zope.globalrequest@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-five.localsitemanager/Makefile b/devel/py-five.localsitemanager/Makefile
index 89556dcd8310..19eb945f6ca7 100644
--- a/devel/py-five.localsitemanager/Makefile
+++ b/devel/py-five.localsitemanager/Makefile
@@ -13,15 +13,15 @@ COMMENT= Local site manager implementation for Zope 2
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-fixtures/Makefile b/devel/py-fixtures/Makefile
index 02f7957b8527..d0852430393f 100644
--- a/devel/py-fixtures/Makefile
+++ b/devel/py-fixtures/Makefile
@@ -15,9 +15,9 @@ LICENSE_COMB= dual
LICENSE_FILE_APACHE20= ${WRKSRC}/Apache-2.0
LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/BSD
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.11:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}testtools>=0.9.22:devel/py-testtools@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.11:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}testtools>=0.9.22:devel/py-testtools@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-flake8-builtins/Makefile b/devel/py-flake8-builtins/Makefile
index 3ed1c5a5f844..9485168a3780 100644
--- a/devel/py-flake8-builtins/Makefile
+++ b/devel/py-flake8-builtins/Makefile
@@ -13,7 +13,7 @@ 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-flake8-docstrings/Makefile b/devel/py-flake8-docstrings/Makefile
index a8eec58de44e..ce46659c7027 100644
--- a/devel/py-flake8-docstrings/Makefile
+++ b/devel/py-flake8-docstrings/Makefile
@@ -13,9 +13,9 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}flake8-polyfill>=0:devel/py-flake8-polyfill@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pydocstyle>=0:devel/py-pydocstyle@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}flake8-polyfill>=0:devel/py-flake8-polyfill@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pydocstyle>=0:devel/py-pydocstyle@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-flake8-import-order/Makefile b/devel/py-flake8-import-order/Makefile
index bcb5a2949bc5..65e06aa7f819 100644
--- a/devel/py-flake8-import-order/Makefile
+++ b/devel/py-flake8-import-order/Makefile
@@ -13,7 +13,7 @@ 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycodestyle>=0:devel/py-pycodestyle@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-flake8-polyfill/Makefile b/devel/py-flake8-polyfill/Makefile
index ee07a3afcfcb..949614789c65 100644
--- a/devel/py-flake8-polyfill/Makefile
+++ b/devel/py-flake8-polyfill/Makefile
@@ -13,7 +13,7 @@ COMMENT= Polyfill package for Flake8 plugins
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-flake8-quotes/Makefile b/devel/py-flake8-quotes/Makefile
index 164335a09546..cb298ed10c44 100644
--- a/devel/py-flake8-quotes/Makefile
+++ b/devel/py-flake8-quotes/Makefile
@@ -13,7 +13,7 @@ COMMENT= Flake8 lint for quotes
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile
index 79d7767fe828..16f165fff9df 100644
--- a/devel/py-flake8/Makefile
+++ b/devel/py-flake8/Makefile
@@ -12,11 +12,11 @@ COMMENT= Code checking using pep8 and pyflakes
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
RUN_DEPENDS= ${PY_ENUM34} \
- ${PYTHON_PKGNAMEPREFIX}mccabe>=0.6.0:devel/py-mccabe@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.0.0:devel/py-pycodestyle@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyflakes>=1.5.0:devel/py-pyflakes@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}mccabe>=0.6.0:devel/py-mccabe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.0.0:devel/py-pycodestyle@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyflakes>=1.5.0:devel/py-pyflakes@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
@@ -25,7 +25,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3200
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/devel/py-flask-babel/Makefile b/devel/py-flask-babel/Makefile
index 957df6773343..30201fa74335 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Babel>=2.3:devel/py-babel@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=2.3:devel/py-babel@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist distutils
diff --git a/devel/py-fluent-logger/Makefile b/devel/py-fluent-logger/Makefile
index e3ab3c96542a..91a633f0035b 100644
--- a/devel/py-fluent-logger/Makefile
+++ b/devel/py-fluent-logger/Makefile
@@ -13,7 +13,7 @@ COMMENT= Structured logger for Fluentd (Python)
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-flufl.i18n/Makefile b/devel/py-flufl.i18n/Makefile
index 4cbc973d1862..a2382d811ba9 100644
--- a/devel/py-flufl.i18n/Makefile
+++ b/devel/py-flufl.i18n/Makefile
@@ -11,7 +11,7 @@ COMMENT= A high level API for Python internationalization
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic@${PY_FLAVOR}
USES= python:3.4+
USE_PYTHON= autoplist distutils
diff --git a/devel/py-flufl.lock/Makefile b/devel/py-flufl.lock/Makefile
index fc3ba42e2237..2d81e21d3810 100644
--- a/devel/py-flufl.lock/Makefile
+++ b/devel/py-flufl.lock/Makefile
@@ -11,7 +11,7 @@ COMMENT= NFS-safe file locking with timeouts for POSIX systems
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic@${PY_FLAVOR}
USES= python:3.4+
USE_PYTHON= autoplist distutils
diff --git a/devel/py-foolscap/Makefile b/devel/py-foolscap/Makefile
index bc7b200e8036..6c267b82f113 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
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=16.0.0:devel/py-twisted@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=16.0.0:devel/py-twisted@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-fortran/Makefile b/devel/py-fortran/Makefile
index 66e884451b48..e06f26b871f5 100644
--- a/devel/py-fortran/Makefile
+++ b/devel/py-fortran/Makefile
@@ -14,7 +14,7 @@ COMMENT= Creating extensions to the Python language with Fortran routines
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numeric>0:math/py-numeric@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numeric>0:math/py-numeric@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/devel/py-freenas.dispatcher/Makefile b/devel/py-freenas.dispatcher/Makefile
index b8259c31400f..1f02d5fa4102 100644
--- a/devel/py-freenas.dispatcher/Makefile
+++ b/devel/py-freenas.dispatcher/Makefile
@@ -9,13 +9,13 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wg@FreeBSD.org
COMMENT= FreeNAS dispatcher client
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ws4py>0:www/py-ws4py@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/devel/py-freenas.utils/Makefile b/devel/py-freenas.utils/Makefile
index 4b7d547f37a9..73cc2fd7fc97 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-freezegun/Makefile b/devel/py-freezegun/Makefile
index 5cf4ec37a466..dd5fa274cb7d 100644
--- a/devel/py-freezegun/Makefile
+++ b/devel/py-freezegun/Makefile
@@ -14,11 +14,11 @@ COMMENT= Let your Python tests travel through time
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-fsm/Makefile b/devel/py-fsm/Makefile
index ecc360c5d13e..dbb8b6c79587 100644
--- a/devel/py-fsm/Makefile
+++ b/devel/py-fsm/Makefile
@@ -15,7 +15,7 @@ GH_ACCOUNT= oozie
GH_PROJECT= python-fsm
GH_TAGNAME= bf888123
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.0:graphics/py-pygraphviz@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.0:graphics/py-pygraphviz@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-futurist/Makefile b/devel/py-futurist/Makefile
index d584188b576d..36364c25c6f8 100644
--- a/devel/py-futurist/Makefile
+++ b/devel/py-futurist/Makefile
@@ -13,12 +13,12 @@ COMMENT= Useful additions to futures, from the future
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}contextlib2>=0.4.0:devel/py-contextlib2@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}contextlib2>=0.4.0:devel/py-contextlib2@${PY_FLAVOR} \
${PY_FUTURES} \
- ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}prettytable>=0.7.1:devel/py-prettytable@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0.7.1:devel/py-prettytable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-fuzzywuzzy/Makefile b/devel/py-fuzzywuzzy/Makefile
index a93290c184b0..9c9b418a7f80 100644
--- a/devel/py-fuzzywuzzy/Makefile
+++ b/devel/py-fuzzywuzzy/Makefile
@@ -14,7 +14,7 @@ COMMENT= Fuzzy string matching using Levenshtein Distance
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-Levenshtein>0:devel/py-python-Levenshtein@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-Levenshtein>0:devel/py-python-Levenshtein@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile
index 7190cafd18d6..5db819bf601a 100644
--- a/devel/py-gdata/Makefile
+++ b/devel/py-gdata/Makefile
@@ -25,9 +25,9 @@ PYCRYPTO_DESC= Cryptography toolkit
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
-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}
+M2CRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.20:security/py-m2crypto@${PY_FLAVOR}
+PYCRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR}
+GMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gmpy>0:math/py-gmpy@${PY_FLAVOR}
post-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
diff --git a/devel/py-gdbgui/Makefile b/devel/py-gdbgui/Makefile
index 9dfd2cd121e4..1177c212191d 100644
--- a/devel/py-gdbgui/Makefile
+++ b/devel/py-gdbgui/Makefile
@@ -11,14 +11,14 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Flask-Compress>=1.4.0:www/py-flask-compress@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.12.2:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Compress>=1.4.0:www/py-flask-compress@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-SocketIO>=2.9.0:www/py-flask-socketio@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}eventlet>=0.21.0:net/py-eventlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygdbmi>=0.7.3.3:devel/py-pygdbmi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pypugjs>=4.2.0:devel/py-pypugjs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gevent>=1.2.2:devel/py-gevent@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= cs01
diff --git a/devel/py-geojson/Makefile b/devel/py-geojson/Makefile
index 1fdae92b955c..5bfbab1e0b3e 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>1.9:devel/py-simplejson@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.0:devel/py-nose@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>1.9:devel/py-simplejson@${PY_FLAVOR}
PORTDOCS= LICENSE.rst CHANGELOG.rst README.rst
diff --git a/devel/py-gevent/Makefile b/devel/py-gevent/Makefile
index 192856650a72..5f32b47c42f5 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.13:devel/py-greenlet@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.13:devel/py-greenlet@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.13:devel/py-greenlet@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.13:devel/py-greenlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_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 759231d71128..dae846c1ec5e 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.0.0:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}GitPython>=2.1.1:devel/py-gitpython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR}
NO_ARCH= yes
USES= dos2unix python zip
diff --git a/devel/py-git_semver/Makefile b/devel/py-git_semver/Makefile
index b620ba94901f..a55b53628288 100644
--- a/devel/py-git_semver/Makefile
+++ b/devel/py-git_semver/Makefile
@@ -12,8 +12,8 @@ COMMENT= Semantic versions management integrated to git
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}GitPython>=2.1.7:devel/py-gitpython@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}semantic_version>=2.6.0:devel/py-semantic_version@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}GitPython>=2.1.7:devel/py-gitpython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}semantic_version>=2.6.0:devel/py-semantic_version@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-gitdb2/Makefile b/devel/py-gitdb2/Makefile
index ec7063a70ff2..402878f38f9b 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}smmap2>=2.0.0:devel/py-smmap2@${PY_FLAVOR}
CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}gitdb
diff --git a/devel/py-gitless/Makefile b/devel/py-gitless/Makefile
index 81f5cadf6f21..be373dc0367f 100644
--- a/devel/py-gitless/Makefile
+++ b/devel/py-gitless/Makefile
@@ -13,11 +13,11 @@ COMMENT= Version control system built on top of Git
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clint>=0.5.1:devel/py-clint@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pygit2>=0.26.0:devel/py-pygit2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sh>=1.12.14:devel/py-sh@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clint>=0.5.1:devel/py-clint@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygit2>=0.26.0:devel/py-pygit2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sh>=1.12.14:devel/py-sh@${PY_FLAVOR} \
git:devel/git
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-glance-store/Makefile b/devel/py-glance-store/Makefile
index 7718d36bd05b..af7fb5dacc64 100644
--- a/devel/py-glance-store/Makefile
+++ b/devel/py-glance-store/Makefile
@@ -15,20 +15,20 @@ COMMENT= OpenStack Image Service Store Library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_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}
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR}
USES= python shebangfix
USE_PYTHON= autoplist distutils
diff --git a/devel/py-glob2/Makefile b/devel/py-glob2/Makefile
index b5c14c7e033f..162991ecab90 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-google-apputils/Makefile b/devel/py-google-apputils/Makefile
index 66f9e5c92e08..84575462b9fd 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>2:devel/py-dateutil@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-gflags>2:devel/py-python-gflags@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>2:devel/py-dateutil@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-googleapis-common-protos/Makefile b/devel/py-googleapis-common-protos/Makefile
index fb880891dc73..7c9dd2da35ee 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-grab/Makefile b/devel/py-grab/Makefile
index 7e6735427668..47a217b59c40 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}selection>0:devel/py-selection@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-grpcio-tools/Makefile b/devel/py-grpcio-tools/Makefile
index fb732f716b3d..2f1f96166856 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grpcio>1:devel/py-grpcio@${PY_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 86bd2cc8c0aa..efc566d5ca19 100644
--- a/devel/py-grpcio/Makefile
+++ b/devel/py-grpcio/Makefile
@@ -12,10 +12,10 @@ COMMENT= HTTP/2-based RPC framework
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>1:devel/py-six@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>1:devel/py-six@${PY_FLAVOR} \
${PY_ENUM34} \
${PY_FUTURES} \
- ${PYTHON_PKGNAMEPREFIX}protobuf>=3:devel/py-protobuf@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}protobuf>=3:devel/py-protobuf@${PY_FLAVOR}
LIB_DEPENDS= libcares.so:dns/c-ares
BROKEN_powerpc64= fails to compile: cpu-ppc64le.c: 'AT_HWCAP2' undeclared
diff --git a/devel/py-gtfslib/Makefile b/devel/py-gtfslib/Makefile
index 8c692dffc0b8..72a666eafe54 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>=0.6.1:databases/py-sqlalchemy11@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docopt>=0.6:devel/py-docopt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.18:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyqtree>=0.24:devel/py-pyqtree@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyshp>=1.2.12:devel/py-pyshp@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-hash_ring/Makefile b/devel/py-hash_ring/Makefile
index 4ea4c89d6770..25f644817858 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-hgsubversion/Makefile b/devel/py-hgsubversion/Makefile
index 3b4a19ee09c5..061bf68a192a 100644
--- a/devel/py-hgsubversion/Makefile
+++ b/devel/py-hgsubversion/Makefile
@@ -23,9 +23,9 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MSUBVERTPY}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subvertpy>=0:devel/py-subvertpy@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subvertpy>=0:devel/py-subvertpy@${PY_FLAVOR}
.else
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR}
.endif
.include <bsd.port.mk>
diff --git a/devel/py-http-prompt/Makefile b/devel/py-http-prompt/Makefile
index 6869c06a610f..cf798322defc 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}parsimonious>=0.6.2:textproc/py-parsimonious@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.0: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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}parsimonious>=0.6.2:textproc/py-parsimonious@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.0:devel/py-prompt_toolkit@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httpie>=0.9.2:www/py-httpie@${PY_FLAVOR}
NO_ARCH= yes
SUB_FILES= pkg-message
diff --git a/devel/py-hypothesis/Makefile b/devel/py-hypothesis/Makefile
index a99d721308c2..c589866689b3 100644
--- a/devel/py-hypothesis/Makefile
+++ b/devel/py-hypothesis/Makefile
@@ -12,10 +12,10 @@ COMMENT= Library for property based testing
LICENSE= MPL20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=16.0.0:devel/py-attrs@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=16.0.0:devel/py-attrs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
${PY_ENUM34} \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-icalendar/Makefile b/devel/py-icalendar/Makefile
index d9e9e488224d..ab7b8e19cb05 100644
--- a/devel/py-icalendar/Makefile
+++ b/devel/py-icalendar/Makefile
@@ -13,8 +13,8 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-intervaltree/Makefile b/devel/py-intervaltree/Makefile
index 81b51f8a9c51..160f2a1b8ebe 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=0:devel/py-sortedcontainers@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-invoke/Makefile b/devel/py-invoke/Makefile
index f9097577d1c6..298aef1fee7c 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@${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}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}semantic_version>0:devel/py-semantic_version@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}twine>0:devel/py-twine@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR}
NO_ARCH= YES
diff --git a/devel/py-ipdb/Makefile b/devel/py-ipdb/Makefile
index ac660670abbc..4176872240de 100644
--- a/devel/py-ipdb/Makefile
+++ b/devel/py-ipdb/Makefile
@@ -13,7 +13,7 @@ COMMENT= IPython-enabled pdb
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0.10.2:devel/ipython@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0.10.2:devel/ipython@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-ipykernel/Makefile b/devel/py-ipykernel/Makefile
index 33cd04d8f0e0..3fa42ca7a5dd 100644
--- a/devel/py-ipykernel/Makefile
+++ b/devel/py-ipykernel/Makefile
@@ -13,10 +13,10 @@ COMMENT= IPython Kernel for Jupyter
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING.md
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>=4.0:www/py-tornado@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}traitlets>=4.1.0:devel/py-traitlets@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/devel/py-ipyparallel/Makefile b/devel/py-ipyparallel/Makefile
index 5c91dc100e4a..97b892b811a2 100644
--- a/devel/py-ipyparallel/Makefile
+++ b/devel/py-ipyparallel/Makefile
@@ -12,17 +12,17 @@ COMMENT= Interactive Parallel Computing with IPython
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING.md
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_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} \
- ${PYTHON_PKGNAMEPREFIX}traitlets>=4.3:devel/py-traitlets@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}notebook>=0:www/py-notebook@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyzmq>=13:net/py-pyzmq@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>=4.0:www/py-tornado@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}traitlets>=4.3:devel/py-traitlets@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-ipywidgets/Makefile b/devel/py-ipywidgets/Makefile
index 3341235dcb35..de744149317d 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipykernel>=4.2.2:devel/py-ipykernel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}widgetsnbextension>=1.2:devel/py-widgetsnbextension@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-iso8601/Makefile b/devel/py-iso8601/Makefile
index 676085b57a6e..cb8aa3a3986a 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-isodate/Makefile b/devel/py-isodate/Makefile
index 6e97c92fbbdd..5204d9bc6efc 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-isort/Makefile b/devel/py-isort/Makefile
index 0f9c53513aba..aa895ae41976 100644
--- a/devel/py-isort/Makefile
+++ b/devel/py-isort/Makefile
@@ -13,8 +13,8 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PY_FUTURES}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-jaraco.classes/Makefile b/devel/py-jaraco.classes/Makefile
index a8f70ab85b3e..e058fe22d3c1 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@${FLAVOR}
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-jaraco.functools/Makefile b/devel/py-jaraco.functools/Makefile
index cc03a7e92429..93393354cc85 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_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@${FLAVOR}
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/devel/py-jaraco.itertools/Makefile b/devel/py-jaraco.itertools/Makefile
index c5403c6e98d0..94960614033d 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}inflect>0:devel/py-inflect@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-jaraco.logging/Makefile b/devel/py-jaraco.logging/Makefile
index b43623460709..a1ce4e6b58af 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tempora>0:devel/py-tempora@${FLAVOR}
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tempora>0:devel/py-tempora@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-jaraco.timing/Makefile b/devel/py-jaraco.timing/Makefile
index a46f8ac02d33..09e4ea6ce758 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-jaraco.util/Makefile b/devel/py-jaraco.util/Makefile
index e09b0e786cef..f40662948708 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jaraco.timing>0:devel/py-jaraco.timing@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools@${PY_FLAVOR}
USES= python zip
USE_PYTHON= autoplist distutils
diff --git a/devel/py-jdcal/Makefile b/devel/py-jdcal/Makefile
index 153252f7d599..2884641bc0f0 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-jedi/Makefile b/devel/py-jedi/Makefile
index 0563fbc65c1f..16a0345e33b5 100644
--- a/devel/py-jedi/Makefile
+++ b/devel/py-jedi/Makefile
@@ -13,7 +13,7 @@ COMMENT= Autocompletion tool for Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}parso>=0.2.0:textproc/py-parso@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}parso>=0.2.0:textproc/py-parso@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-jenkins-job-builder/Makefile b/devel/py-jenkins-job-builder/Makefile
index 6e0807086bbc..56f8458f8350 100644
--- a/devel/py-jenkins-job-builder/Makefile
+++ b/devel/py-jenkins-job-builder/Makefile
@@ -12,15 +12,15 @@ COMMENT= Manage Jenkins jobs with YAML
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}stevedore>0:devel/py-stevedore@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}python-jenkins>0:devel/py-python-jenkins@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}fasteners>0:devel/py-fasteners@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>0:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-jenkins>0:devel/py-python-jenkins@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}fasteners>0:devel/py-fasteners@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-jira/Makefile b/devel/py-jira/Makefile
index 09b654bf7c3c..a92680ef01c2 100644
--- a/devel/py-jira/Makefile
+++ b/devel/py-jira/Makefile
@@ -13,17 +13,17 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sphinx>=1.6.5:textproc/py-sphinx@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx>=1.6.5:textproc/py-sphinx@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.3:www/py-requests-oauthlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.4:security/py-tlslite@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr@${PY_FLAVOR}
TEST_DEPENDS:= ${RUN_DEPENDS} \
- ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
OPTIONS_DEFINE= MAGIC PARALLEL SHELL TESTS
OPTIONS_DEFAULT= MAGIC PARALLEL SHELL
@@ -33,13 +33,13 @@ 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@${FLAVOR}
-PARALLEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grequests>0:www/py-grequests@${FLAVOR}
-SHELL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0.13:devel/ipython@${FLAVOR}
+MAGIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filemagic>=1.6:devel/py-filemagic@${PY_FLAVOR}
+PARALLEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grequests>0:www/py-grequests@${PY_FLAVOR}
+SHELL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0.13:devel/ipython@${PY_FLAVOR}
TESTS_BUILD_DEPENDS= ${TEST_DEPENDS}
TEST_DEPENDS:= ${RUN_DEPENDS} \
- ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-jsbeautifier/Makefile b/devel/py-jsbeautifier/Makefile
index 196737098740..f2d0a14ea2bc 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}editorconfig>=0.12.0:editors/py-editorconfig@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}editorconfig>=0.12.0:editors/py-editorconfig@${PY_FLAVOR}
USES?= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-jsonlines/Makefile b/devel/py-jsonlines/Makefile
index d0fdd041cb7c..0ec9746cd020 100644
--- a/devel/py-jsonlines/Makefile
+++ b/devel/py-jsonlines/Makefile
@@ -13,7 +13,7 @@ COMMENT= Library with helpers for the jsonlines file format
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.rst
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-jsonpatch/Makefile b/devel/py-jsonpatch/Makefile
index 9d7445358ea9..cc3902a469fb 100644
--- a/devel/py-jsonpatch/Makefile
+++ b/devel/py-jsonpatch/Makefile
@@ -11,7 +11,7 @@ COMMENT= Apply JSON-Patches (RFC 6902)
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-jsonref/Makefile b/devel/py-jsonref/Makefile
index aa87a35e3a29..3c9289ab2ea9 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.0:www/py-requests@${PY_FLAVOR}
USES?= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-jsonrpclib/Makefile b/devel/py-jsonrpclib/Makefile
index 03dc15b9d150..f99353b637b2 100644
--- a/devel/py-jsonrpclib/Makefile
+++ b/devel/py-jsonrpclib/Makefile
@@ -22,7 +22,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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cjson>0:devel/py-cjson@${PY_FLAVOR}
.endif
.include <bsd.port.mk>
diff --git a/devel/py-jsonschema/Makefile b/devel/py-jsonschema/Makefile
index cd5e84c5d483..486532359516 100644
--- a/devel/py-jsonschema/Makefile
+++ b/devel/py-jsonschema/Makefile
@@ -13,7 +13,7 @@ COMMENT= JSON Schema validation for Python
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
@@ -22,7 +22,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_VER} == "2.7"
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/devel/py-jupyter_client/Makefile b/devel/py-jupyter_client/Makefile
index f6b16f60b8b1..8a1d0d0ac508 100644
--- a/devel/py-jupyter_client/Makefile
+++ b/devel/py-jupyter_client/Makefile
@@ -12,11 +12,11 @@ COMMENT= Jupyter protocol implementation and client libraries
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING.md
-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}tornado>=4.1:www/py-tornado@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyzmq>=13:net/py-pyzmq@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>=4.1:www/py-tornado@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-jupyter_console/Makefile b/devel/py-jupyter_console/Makefile
index 65eba07ecd46..2e2ac7072f5b 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.4:devel/py-prompt_toolkit@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-jupyter_core/Makefile b/devel/py-jupyter_core/Makefile
index c02bb24c9613..b869c7d4cec4 100644
--- a/devel/py-jupyter_core/Makefile
+++ b/devel/py-jupyter_core/Makefile
@@ -13,11 +13,11 @@ COMMENT= Jupyter core package
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING.md
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-kaptan/Makefile b/devel/py-kaptan/Makefile
index 3fa31e5b145b..c616064e933a 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>=3.12:devel/py-yaml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-kayako/Makefile b/devel/py-kayako/Makefile
index 56df31509766..ace3046ded30 100644
--- a/devel/py-kayako/Makefile
+++ b/devel/py-kayako/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= rm@FreeBSD.org
COMMENT= Python API Wrapper for Kayako
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-kazoo/Makefile b/devel/py-kazoo/Makefile
index d63a28f3ef9d..6b0e43a7c131 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:devel/py-gevent@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:devel/py-gevent@${PY_FLAVOR}
USES= gmake python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-keystoneauth1/Makefile b/devel/py-keystoneauth1/Makefile
index cdfa229f10ec..70bfa89c25ce 100644
--- a/devel/py-keystoneauth1/Makefile
+++ b/devel/py-keystoneauth1/Makefile
@@ -12,11 +12,11 @@ COMMENT= Authentication Library for OpenStack Identity
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-keystonemiddleware/Makefile b/devel/py-keystonemiddleware/Makefile
index 72516ff4d583..b92bdc6c90ac 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycadf>=0:devel/py-pycadf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}positional>=1.1.1:devel/py-positional@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.17.0:devel/py-keystoneauth1@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-lazr.config/Makefile b/devel/py-lazr.config/Makefile
index cc5974836680..aadc6a951eab 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lazr.delegates>=2.0.3:devel/py-lazr.delegates@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lazr.delegates>=2.0.3:devel/py-lazr.delegates@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-lazr.delegates/Makefile b/devel/py-lazr.delegates/Makefile
index acd12dd22db7..e7e1c05dcab0 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}nose>=1.3.7:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>=1.3.7:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-libtaxii/Makefile b/devel/py-libtaxii/Makefile
index 08610cd8851d..c4e4f36dd642 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4.1:devel/py-dateutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4.1:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist distutils
diff --git a/devel/py-linecache2/Makefile b/devel/py-linecache2/Makefile
index 9c07bd4f0ee3..c57500d0f781 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-llvmcpy/Makefile b/devel/py-llvmcpy/Makefile
index e7033e41f0e6..9770bd0fe058 100644
--- a/devel/py-llvmcpy/Makefile
+++ b/devel/py-llvmcpy/Makefile
@@ -14,10 +14,10 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION} \
- ${PYTHON_PKGNAMEPREFIX}appdirs>=0:devel/py-appdirs@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pycparser>=0:devel/py-pycparser@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}shutilwhich>=0:sysutils/py-shutilwhich@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}appdirs>=0:devel/py-appdirs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycparser>=0:devel/py-pycparser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}shutilwhich>=0:sysutils/py-shutilwhich@${PY_FLAVOR}
USES= python:-3.3 # sysutils/py-shutilwhich has this
USE_GITHUB= yes
diff --git a/devel/py-lockfile/Makefile b/devel/py-lockfile/Makefile
index 1a314e322aeb..f77652b1dd83 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-logan/Makefile b/devel/py-logan/Makefile
index 87dea5036016..1b949c18fcc2 100644
--- a/devel/py-logan/Makefile
+++ b/devel/py-logan/Makefile
@@ -13,10 +13,10 @@ COMMENT= Toolkit for running standalone Django applications
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.5:www/py-django111@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.5:www/py-django111@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>=0.8.0:devel/py-mock@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.5:www/py-django111@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.5:www/py-django111@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=0.8.0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-logfury/Makefile b/devel/py-logfury/Makefile
index 20eb8b999624..f2ac87072577 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}funcsigs>=1.0.2:devel/py-funcsigs@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}funcsigs>=1.0.2:devel/py-funcsigs@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-logilab-common/Makefile b/devel/py-logilab-common/Makefile
index 6eff9f6446cc..4905110b503a 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-louie/Makefile b/devel/py-louie/Makefile
index d38c3265a9f3..eb74125a4cff 100644
--- a/devel/py-louie/Makefile
+++ b/devel/py-louie/Makefile
@@ -12,7 +12,7 @@ COMMENT= Signal dispatching mechanism
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.8.3:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.8.3:devel/py-nose@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-manuel/Makefile b/devel/py-manuel/Makefile
index 389cbce70896..2559c966f667 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-mccabe/Makefile b/devel/py-mccabe/Makefile
index 8e7e09cfe45d..d9288e350dda 100644
--- a/devel/py-mccabe/Makefile
+++ b/devel/py-mccabe/Makefile
@@ -13,7 +13,7 @@ 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-mdv/Makefile b/devel/py-mdv/Makefile
index 315c31d0fc06..bfbdd32ee0e0 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/devel/py-medikit/Makefile b/devel/py-medikit/Makefile
index d9d0d78a2e4c..79b6f90b7ddb 100644
--- a/devel/py-medikit/Makefile
+++ b/devel/py-medikit/Makefile
@@ -12,15 +12,15 @@ COMMENT= Automated release engineer assistant
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9:devel/py-Jinja2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}git_semver>=0.2.1:devel/py-git_semver@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mondrian>=0.6.6:devel/py-mondrian@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}packaging>=17.0:devel/py-packaging@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pip-tools>=1.11:devel/py-pip-tools@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}stevedore>=1.28:devel/py-stevedore@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}whistle>=1.0:devel/py-whistle@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yapf>=0.20:textproc/py-yapf@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}git_semver>=0.2.1:devel/py-git_semver@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mondrian>=0.6.6:devel/py-mondrian@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}packaging>=17.0:devel/py-packaging@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pip-tools>=1.11:devel/py-pip-tools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.28:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}whistle>=1.0:devel/py-whistle@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yapf>=0.20:textproc/py-yapf@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist distutils
diff --git a/devel/py-memory_profiler/Makefile b/devel/py-memory_profiler/Makefile
index 3084dac3e8d8..6c7668673d02 100644
--- a/devel/py-memory_profiler/Makefile
+++ b/devel/py-memory_profiler/Makefile
@@ -13,7 +13,7 @@ COMMENT= Module for monitoring memory usage of a python program
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-microversion-parse/Makefile b/devel/py-microversion-parse/Makefile
index 3bc1bb305e47..0f58994d6441 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-minimongo/Makefile b/devel/py-minimongo/Makefile
index 02554e3823ba..ecc93ae65465 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=1.9:databases/pymongo@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-minio/Makefile b/devel/py-minio/Makefile
index 76c37879ece7..8f771d2f9c85 100644
--- a/devel/py-minio/Makefile
+++ b/devel/py-minio/Makefile
@@ -11,10 +11,10 @@ COMMENT= Minio library for Amazon S3 compatible cloud storage
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-mock/Makefile b/devel/py-mock/Makefile
index a24ad1234985..0d53e057f11f 100644
--- a/devel/py-mock/Makefile
+++ b/devel/py-mock/Makefile
@@ -13,10 +13,10 @@ COMMENT= Mock unit tests for Python
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-TESTS_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${FLAVOR}
+TESTS_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR}
NO_ARCH= yes
USES= python
@@ -25,7 +25,7 @@ USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3300
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}funcsigs>=0:devel/py-funcsigs@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}funcsigs>=0:devel/py-funcsigs@${PY_FLAVOR}
.endif
do-test:
diff --git a/devel/py-mondrian/Makefile b/devel/py-mondrian/Makefile
index cfe4eccc1656..91040561c202 100644
--- a/devel/py-mondrian/Makefile
+++ b/devel/py-mondrian/Makefile
@@ -12,7 +12,7 @@ COMMENT= Logging with pretty colored squares
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-mongoengine/Makefile b/devel/py-mongoengine/Makefile
index 672e01add7b9..cd9dbc295624 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}rednose>0:devel/py-rednose@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=2.7:databases/pymongo@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rednose>0:devel/py-rednose@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=2.7:databases/pymongo@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-mongokit/Makefile b/devel/py-mongokit/Makefile
index 44c60f56aede..5fe6ac2a97d9 100644
--- a/devel/py-mongokit/Makefile
+++ b/devel/py-mongokit/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= mail@derzinn.de
COMMENT= Python ORM-like layer on top of pymongo
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=2.0.1:databases/pymongo@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=2.0.1:databases/pymongo@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-monty/Makefile b/devel/py-monty/Makefile
index 11d1865360cc..3203cc7a28ea 100644
--- a/devel/py-monty/Makefile
+++ b/devel/py-monty/Makefile
@@ -12,7 +12,7 @@ COMMENT= Supplementary useful functions for Python not in the standard library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.rst
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-munch/Makefile b/devel/py-munch/Makefile
index 121a2943fce2..6f7a06454b3a 100644
--- a/devel/py-munch/Makefile
+++ b/devel/py-munch/Makefile
@@ -11,7 +11,7 @@ COMMENT= Python dict that provides attribute-style access (a la JavaScript)
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-mwlib.rl/Makefile b/devel/py-mwlib.rl/Makefile
index d2a3576799f9..627951c63fba 100644
--- a/devel/py-mwlib.rl/Makefile
+++ b/devel/py-mwlib.rl/Makefile
@@ -14,10 +14,10 @@ LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ${LOCALBASE}/bin/texvc:print/texvc \
${LOCALBASE}/bin/fribidi:converters/fribidi \
- ${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}
+ ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mwlib>=0.12.14:devel/py-mwlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mwlib.ext>=0.12.3:devel/py-mwlib.ext@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7 zip
diff --git a/devel/py-mwlib/Makefile b/devel/py-mwlib/Makefile
index 1321eede8a3a..5a5b46f76498 100644
--- a/devel/py-mwlib/Makefile
+++ b/devel/py-mwlib/Makefile
@@ -12,24 +12,24 @@ COMMENT= Python's MediaWiki Parser and Utility Library
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.2:devel/py-apipkg@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}bottle>=0.10:www/py-bottle@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.2:devel/py-apipkg@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bottle>=0.10:www/py-bottle@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}odfpy>=0.9:devel/py-odfpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pdf>=1.12:print/py-pdf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}py>=1.4.0:devel/py-py@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}qserve>=0:devel/py-qserve@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>2.0.8:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3dbm>=0:databases/py-sqlite3dbm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob@${PY_FLAVOR}
USES= python:2.7 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 ceeb4e1c064a..c1b3050437d5 100644
--- a/devel/py-mx-experimental/Makefile
+++ b/devel/py-mx-experimental/Makefile
@@ -13,7 +13,7 @@ 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@${FLAVOR}
+#RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:lang/py-mx-base@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils
diff --git a/devel/py-mypy/Makefile b/devel/py-mypy/Makefile
index 9e4021e3c361..bc35a6730d52 100644
--- a/devel/py-mypy/Makefile
+++ b/devel/py-mypy/Makefile
@@ -15,8 +15,8 @@ LICENSE= MIT PSFL
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}typed-ast>=1.1.0:devel/py-typed-ast@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}psutil>=5.4.0:sysutils/py-psutil@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}typed-ast>=1.1.0:devel/py-typed-ast@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psutil>=5.4.0:sysutils/py-psutil@${PY_FLAVOR}
NO_ARCH= yes
USES= python:3.4+ shebangfix
@@ -26,7 +26,7 @@ SHEBANG_FILES= typeshed/tests/*.py
.include <bsd.port.pre.mk>
.if ${PYTHON_VER} < 3.5
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=3.5.3:devel/py-typing@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=3.5.3:devel/py-typing@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/devel/py-natsort/Makefile b/devel/py-natsort/Makefile
index aa44fc34c4a4..4fc908558f92 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fastnumbers>0:devel/py-fastnumbers@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hypothesis>=3.8.0:devel/py-hypothesis@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pathlib>0:devel/py-pathlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-nbconvert/Makefile b/devel/py-nbconvert/Makefile
index 279e3fd4c801..97b61d8b4618 100644
--- a/devel/py-nbconvert/Makefile
+++ b/devel/py-nbconvert/Makefile
@@ -13,17 +13,17 @@ COMMENT= Converting Jupyter Notebooks
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-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.7.4:textproc/py-mistune@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}nbformat>=4.4: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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bleach>=0:www/py-bleach@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}entrypoints>=0.2.2:devel/py-entrypoints@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jupyter_client>=4.2:devel/py-jupyter_client@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mistune>=0.7.4:textproc/py-mistune@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nbformat>=4.4:devel/py-nbformat@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pandocfilters>=1.4.1:textproc/py-pandocfilters@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-nbformat/Makefile b/devel/py-nbformat/Makefile
index f67c4484a774..c1eff0093b77 100644
--- a/devel/py-nbformat/Makefile
+++ b/devel/py-nbformat/Makefile
@@ -13,13 +13,13 @@ COMMENT= Jupyter Notebook format
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING.md
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.4:devel/py-jsonschema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}traitlets>=4.1:devel/py-traitlets@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-nose-cov/Makefile b/devel/py-nose-cov/Makefile
index e8cf3a9b056b..b516a7233f2e 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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-nose2/Makefile b/devel/py-nose2/Makefile
index ccc851b1e179..04e2ba687762 100644
--- a/devel/py-nose2/Makefile
+++ b/devel/py-nose2/Makefile
@@ -12,10 +12,10 @@ COMMENT= Next generations of nicer testing for Python
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/license.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=4.4.1:devel/py-coverage@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.7:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=4.4.1:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.7:devel/py-six@${PY_FLAVOR}
-py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${FLAVOR}
+py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-noseofyeti/Makefile b/devel/py-noseofyeti/Makefile
index b3edab68dfad..c0188cad5d9d 100644
--- a/devel/py-noseofyeti/Makefile
+++ b/devel/py-noseofyeti/Makefile
@@ -8,18 +8,18 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= truckman@FreeBSD.org
COMMENT= Nose plugin providing BDD dsl for Python
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}should_dsl>0:devel/py-should_dsl@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
DOCS_BUILD_DEPENDS= \
- ${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}
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pinocchio>0:devel/py-pinocchio@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}should_dsl>0:devel/py-should_dsl@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 shebangfix
diff --git a/devel/py-notify2/Makefile b/devel/py-notify2/Makefile
index bf2b4d40888f..da94cfffcf41 100644
--- a/devel/py-notify2/Makefile
+++ b/devel/py-notify2/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python interface to DBus notifications
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-numba/Makefile b/devel/py-numba/Makefile
index d257aa233b44..dd0b7744f654 100644
--- a/devel/py-numba/Makefile
+++ b/devel/py-numba/Makefile
@@ -13,9 +13,9 @@ COMMENT= Optimizing compiler for Python using LLVM
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>1.7,1:math/py-numpy@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>1.7,1:math/py-numpy@${PY_FLAVOR}
RUN_DEPENDS= ${PY_ENUM34} \
- ${PYTHON_PKGNAMEPREFIX}llvmlite>=0.12:devel/py-llvmlite@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}llvmlite>=0.12:devel/py-llvmlite@${PY_FLAVOR}
USES= python fortran
USE_PYTHON= distutils concurrent autoplist
@@ -24,8 +24,8 @@ USE_PYTHON= distutils concurrent autoplist
# Required for Python 2.7
.if ${PYTHON_REL} < 3400
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs@${PY_FLAVOR}
.endif
post-install:
diff --git a/devel/py-oletools/Makefile b/devel/py-oletools/Makefile
index 4905dbb4cb97..555c391070f0 100644
--- a/devel/py-oletools/Makefile
+++ b/devel/py-oletools/Makefile
@@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE MIT
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/oletools/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR}
NO_ARCH= yes
USES= dos2unix python zip
diff --git a/devel/py-omnijson/Makefile b/devel/py-omnijson/Makefile
index 6697a87c63b2..d0ec15fec143 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= kennethreitz
diff --git a/devel/py-openstacksdk/Makefile b/devel/py-openstacksdk/Makefile
index 60b7880c22cc..0252a73f1092 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.14.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}os-client-config>=1.22.0:devel/py-os-client-config@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist noegginfo
diff --git a/devel/py-option_merge/Makefile b/devel/py-option_merge/Makefile
index c2da04b342ea..9af9cb076304 100644
--- a/devel/py-option_merge/Makefile
+++ b/devel/py-option_merge/Makefile
@@ -8,11 +8,11 @@ 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}delfick_error>=1.6:devel/py-delfick_error@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:devel/py-noseofyeti@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-ordered-set/Makefile b/devel/py-ordered-set/Makefile
index f0b580f38922..188c2746ab55 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-os-brick/Makefile b/devel/py-os-brick/Makefile
index ad48b0666cc8..60ef11806c22 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}os-win>=1.3.0:devel/py-os-win@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-os-client-config/Makefile b/devel/py-os-client-config/Makefile
index 8007ce01a7c5..a5cce488668e 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.1.0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.1.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requestsexceptions>=1.1.1:devel/py-requestsexceptions@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist noegginfo
diff --git a/devel/py-os-vif/Makefile b/devel/py-os-vif/Makefile
index 0bc4a63c7fdd..1021a2be705e 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-os-win/Makefile b/devel/py-os-win/Makefile
index f14d62fe0250..36719e57184e 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-osc-lib/Makefile b/devel/py-osc-lib/Makefile
index 993de2dca46d..939a4bb3bfc6 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}os-client-config>=1.22.0:devel/py-os-client-config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-oslo.cache/Makefile b/devel/py-oslo.cache/Makefile
index 67b3ace59632..eb68869a121d 100644
--- a/devel/py-oslo.cache/Makefile
+++ b/devel/py-oslo.cache/Makefile
@@ -13,13 +13,13 @@ COMMENT= Cache storage for OpenStack projects
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.2:devel/py-dogpile.cache@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.2:devel/py-dogpile.cache@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-oslo.concurrency/Makefile b/devel/py-oslo.concurrency/Makefile
index a79b3a215dc6..d00f0a40a347 100644
--- a/devel/py-oslo.concurrency/Makefile
+++ b/devel/py-oslo.concurrency/Makefile
@@ -13,13 +13,13 @@ COMMENT= Oslo Concurrency library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
RUN_DEPENDS= ${PY_ENUM34} \
- ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7.0:devel/py-fasteners@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7.0:devel/py-fasteners@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-oslo.config/Makefile b/devel/py-oslo.config/Makefile
index 6de1a5a62c09..6b9fed7a11d7 100644
--- a/devel/py-oslo.config/Makefile
+++ b/devel/py-oslo.config/Makefile
@@ -13,15 +13,15 @@ COMMENT= Oslo Configuration library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
${PY_ENUM34} \
- ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}rfc3986>=0.3.1:www/py-rfc3986@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rfc3986>=0.3.1:www/py-rfc3986@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-oslo.context/Makefile b/devel/py-oslo.context/Makefile
index 2a8ad26b0b29..9b4a059e3432 100644
--- a/devel/py-oslo.context/Makefile
+++ b/devel/py-oslo.context/Makefile
@@ -13,8 +13,8 @@ COMMENT= Oslo Context library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-oslo.db/Makefile b/devel/py-oslo.db/Makefile
index c0e26bffae88..cd0e1f35287b 100644
--- a/devel/py-oslo.db/Makefile
+++ b/devel/py-oslo.db/Makefile
@@ -13,18 +13,18 @@ COMMENT= Oslo Database library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}alembic>=0.8.10:databases/py-alembic@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.11.0:databases/py-sqlalchemy-migrate@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.10:databases/py-sqlalchemy10@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}testresources>=0:devel/py-testresources@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}testscenarios>=0:devel/py-testscenarios@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}alembic>=0.8.10:databases/py-alembic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.11.0:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.10:databases/py-sqlalchemy10@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}testresources>=0:devel/py-testresources@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}testscenarios>=0:devel/py-testscenarios@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-oslo.i18n/Makefile b/devel/py-oslo.i18n/Makefile
index 1b5b550fc628..5fac2ff81f4c 100644
--- a/devel/py-oslo.i18n/Makefile
+++ b/devel/py-oslo.i18n/Makefile
@@ -12,9 +12,9 @@ COMMENT= Oslo i18n library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-oslo.log/Makefile b/devel/py-oslo.log/Makefile
index fecc8e60ccb2..5b9e175a1411 100644
--- a/devel/py-oslo.log/Makefile
+++ b/devel/py-oslo.log/Makefile
@@ -13,17 +13,17 @@ COMMENT= Oslo Log library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.serialization>2.18.0:devel/py-oslo.serialization@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyinotify>=0.9.6:devel/py-pyinotify@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyinotify>=0.9.6:devel/py-pyinotify@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-oslo.messaging/Makefile b/devel/py-oslo.messaging/Makefile
index 90bff3faca96..8538001ea3a5 100644
--- a/devel/py-oslo.messaging/Makefile
+++ b/devel/py-oslo.messaging/Makefile
@@ -13,26 +13,26 @@ COMMENT= Oslo Messaging API
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amqp>=2.1.1:net/py-amqp@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cachetools>=2.0.0:devel/py-cachetools@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amqp>=2.1.1:net/py-amqp@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cachetools>=2.0.0:devel/py-cachetools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
${PY_FUTURES} \
- ${PYTHON_PKGNAMEPREFIX}futurist>=1.2.0:devel/py-futurist@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}kombu>=4.0.0:net/py-kombu@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.31.0:devel/py-oslo.middleware@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.24.0:devel/py-oslo.service@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}futurist>=1.2.0:devel/py-futurist@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}kombu>=4.0.0:net/py-kombu@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.31.0:devel/py-oslo.middleware@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.24.0:devel/py-oslo.service@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-oslo.middleware/Makefile b/devel/py-oslo.middleware/Makefile
index ac2b08e1b8ce..31296011b414 100644
--- a/devel/py-oslo.middleware/Makefile
+++ b/devel/py-oslo.middleware/Makefile
@@ -13,17 +13,17 @@ COMMENT= Oslo Middleware library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.1.0:devel/py-oslo.config@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}statsd>=3.2.1:devel/py-statsd@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.1.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}statsd>=3.2.1:devel/py-statsd@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-oslo.policy/Makefile b/devel/py-oslo.policy/Makefile
index 3b701941c90a..dfb71769059f 100644
--- a/devel/py-oslo.policy/Makefile
+++ b/devel/py-oslo.policy/Makefile
@@ -13,14 +13,14 @@ COMMENT= Oslo Policy library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-oslo.privsep/Makefile b/devel/py-oslo.privsep/Makefile
index f0b338293bf5..a62beecaa293 100644
--- a/devel/py-oslo.privsep/Makefile
+++ b/devel/py-oslo.privsep/Makefile
@@ -13,16 +13,16 @@ COMMENT= Openstack library for privilege separation
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.7.0:devel/py-cffi@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.7.0:devel/py-cffi@${PY_FLAVOR} \
${PY_ENUM34} \
- ${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.10:devel/py-greenlet@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.0:devel/py-msgpack@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.10:devel/py-greenlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.0:devel/py-msgpack@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-oslo.reports/Makefile b/devel/py-oslo.reports/Makefile
index 3d159cb62b71..edff67f9fcaf 100644
--- a/devel/py-oslo.reports/Makefile
+++ b/devel/py-oslo.reports/Makefile
@@ -13,13 +13,13 @@ COMMENT= Oslo.reports library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}psutil>=3.2.2:sysutils/py-psutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psutil>=3.2.2:sysutils/py-psutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-oslo.rootwrap/Makefile b/devel/py-oslo.rootwrap/Makefile
index cb039986f966..a53e91a3eee7 100644
--- a/devel/py-oslo.rootwrap/Makefile
+++ b/devel/py-oslo.rootwrap/Makefile
@@ -13,8 +13,8 @@ COMMENT= Oslo rootwrap
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-oslo.serialization/Makefile b/devel/py-oslo.serialization/Makefile
index 5a9dc3d9fc66..076c7891220a 100644
--- a/devel/py-oslo.serialization/Makefile
+++ b/devel/py-oslo.serialization/Makefile
@@ -13,11 +13,11 @@ COMMENT= Oslo Serialization library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0.4.0:devel/py-msgpack@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0.4.0:devel/py-msgpack@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-oslo.service/Makefile b/devel/py-oslo.service/Makefile
index 91cefc86cd2e..33c2343dfa07 100644
--- a/devel/py-oslo.service/Makefile
+++ b/devel/py-oslo.service/Makefile
@@ -13,20 +13,20 @@ COMMENT= Oslo.service library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.10:devel/py-greenlet@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.25.0:devel/py-oslo.concurrency@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.1.0:devel/py-oslo.config@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Paste>=2.0.2:www/py-paste@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}routes>=2.3.1:www/py-routes@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.10:devel/py-greenlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.25.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.1.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Paste>=2.0.2:www/py-paste@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}routes>=2.3.1:www/py-routes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-oslo.utils/Makefile b/devel/py-oslo.utils/Makefile
index 81dc72aec8c1..8b8aa3c275a7 100644
--- a/devel/py-oslo.utils/Makefile
+++ b/devel/py-oslo.utils/Makefile
@@ -12,16 +12,16 @@ COMMENT= Oslo Utility library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.0:devel/py-pyparsing@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.0:devel/py-pyparsing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
@@ -30,7 +30,7 @@ USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3000
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}funcsigs>=1.0.0:devel/py-funcsigs@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}funcsigs>=1.0.0:devel/py-funcsigs@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/devel/py-oslo.versionedobjects/Makefile b/devel/py-oslo.versionedobjects/Makefile
index 2b9842a044e8..f82f8cd4c631 100644
--- a/devel/py-oslo.versionedobjects/Makefile
+++ b/devel/py-oslo.versionedobjects/Makefile
@@ -13,19 +13,19 @@ COMMENT= Oslo versioned objects library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.26.0:devel/py-oslo.concurrency@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.29.0:devel/py-oslo.messaging@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.26.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.29.0:devel/py-oslo.messaging@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-oslo.vmware/Makefile b/devel/py-oslo.vmware/Makefile
index a39427874765..cc5e40f5ea9a 100644
--- a/devel/py-oslo.vmware/Makefile
+++ b/devel/py-oslo.vmware/Makefile
@@ -13,19 +13,19 @@ COMMENT= Oslo VMware library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.26.0:devel/py-oslo.concurrency@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}suds-jurko>=0.6:net/py-suds-jurko@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}urllib3>=.1.21.1:net/py-urllib3@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.26.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}suds-jurko>=0.6:net/py-suds-jurko@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urllib3>=.1.21.1:net/py-urllib3@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-osprofiler/Makefile b/devel/py-osprofiler/Makefile
index 4e5f6a7fa64f..42cbcf565a88 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.13:net/py-netaddr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-packaging/Makefile b/devel/py-packaging/Makefile
index 85b2c6ea313b..dd822aa1564d 100644
--- a/devel/py-packaging/Makefile
+++ b/devel/py-packaging/Makefile
@@ -15,8 +15,8 @@ LICENSE_COMB= dual
LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.APACHE
LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/LICENSE.BSD
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.2:devel/py-pyparsing@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.2:devel/py-pyparsing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-palm/Makefile b/devel/py-palm/Makefile
index 0101441b1fed..db5bb512e28a 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simpleparse>0:devel/py-simpleparse@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simpleparse>0:devel/py-simpleparse@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/devel/py-pathlib/Makefile b/devel/py-pathlib/Makefile
index 6649672c81bf..df1fe12b041d 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@${FLAVOR}
+DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
PORTDOCS= *
DOCS_VARS= PYDISTUTILS_BUILD_TARGET+=build_sphinx
diff --git a/devel/py-pathlib2/Makefile b/devel/py-pathlib2/Makefile
index ec696999c71d..5ba0413e06dd 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}scandir>=0:sysutils/py-scandir@${PY_FLAVOR}
.endif
do-test:
diff --git a/devel/py-pathtools/Makefile b/devel/py-pathtools/Makefile
index 7602bea412fc..e719a14e4cfb 100644
--- a/devel/py-pathtools/Makefile
+++ b/devel/py-pathtools/Makefile
@@ -20,7 +20,7 @@ USE_PYTHON= distutils autoplist
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR}
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
post-build:
diff --git a/devel/py-pbr/Makefile b/devel/py-pbr/Makefile
index 74e0f87ab2b4..d019c7416f2e 100644
--- a/devel/py-pbr/Makefile
+++ b/devel/py-pbr/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python Build Reasonableness
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-pefile/Makefile b/devel/py-pefile/Makefile
index c5fa9b2e226b..995730265c26 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-pep8-naming/Makefile b/devel/py-pep8-naming/Makefile
index 082bf8715bb3..cb088bb59043 100644
--- a/devel/py-pep8-naming/Makefile
+++ b/devel/py-pep8-naming/Makefile
@@ -13,7 +13,7 @@ COMMENT= Check PEP-8 naming conventions, plugin for flake8
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8-polyfill>=0:devel/py-flake8-polyfill@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8-polyfill>=0:devel/py-flake8-polyfill@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-period/Makefile b/devel/py-period/Makefile
index dab37c8e765f..0a82822b1c5c 100644
--- a/devel/py-period/Makefile
+++ b/devel/py-period/Makefile
@@ -12,7 +12,7 @@ COMMENT= Basic time period checking library
LICENSE= ART20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-pew/Makefile b/devel/py-pew/Makefile
index fea51ab30f6c..95fbb0324e40 100644
--- a/devel/py-pew/Makefile
+++ b/devel/py-pew/Makefile
@@ -12,8 +12,8 @@ COMMENT= Tool to manage multiple virtualenvs
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.11:devel/py-virtualenv@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}virtualenv-clone>=0.2.5:devel/py-virtualenv-clone@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.11:devel/py-virtualenv@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}virtualenv-clone>=0.2.5:devel/py-virtualenv-clone@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
@@ -27,9 +27,9 @@ SHEBANG_FILES= pew/shell_config/complete_deploy
.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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pathlib>=0:devel/py-pathlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}shutilwhich>=0:sysutils/py-shutilwhich@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size>=0:devel/py-backports.shutil_get_terminal_size@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pathlib>=0:devel/py-pathlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}shutilwhich>=0:sysutils/py-shutilwhich@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/devel/py-pex/Makefile b/devel/py-pex/Makefile
index 9b61c1cb6cf1..d6e6fbb48204 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>=0.24.0:devel/py-wheel@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-phabricator/Makefile b/devel/py-phabricator/Makefile
index f28cec843623..5e384324766b 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-phply/Makefile b/devel/py-phply/Makefile
index 893e780cb615..6b67739184a8 100644
--- a/devel/py-phply/Makefile
+++ b/devel/py-phply/Makefile
@@ -11,8 +11,8 @@ COMMENT= PHP lexer and parser in Python
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-pid/Makefile b/devel/py-pid/Makefile
index 18724a68590b..511780fed0c3 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-pika-pool/Makefile b/devel/py-pika-pool/Makefile
index 5450f11a31a8..cd14b06775a5 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pika>=0.9.0:devel/py-pika@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-pinocchio/Makefile b/devel/py-pinocchio/Makefile
index 5b2d81ea2587..3fadbf7c8432 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-pip-tools/Makefile b/devel/py-pip-tools/Makefile
index 615f0b0b2124..b672ee68e251 100644
--- a/devel/py-pip-tools/Makefile
+++ b/devel/py-pip-tools/Makefile
@@ -15,10 +15,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN_powerpc64= fails to compile: UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 6865: ordinal not in range(128)
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6:devel/py-click@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}first>=0:devel/py-first@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}first>=0:devel/py-first@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile
index 7b54b84a1d3f..3b7dfb7569c6 100644
--- a/devel/py-pip/Makefile
+++ b/devel/py-pip/Makefile
@@ -13,21 +13,21 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
# Tests also need bzr, git, otherwise they fail
-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} \
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.10:devel/py-virtualenv@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scripttest>=1.3:devel/py-scripttest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} \
git>0:devel/git \
bzr>0:devel/bzr
OPTIONS_DEFINE= DOCS
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
+DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
DOCS_PORTDOCS= *
DOCS_VARS= PYDISTUTILS_BUILD_TARGET=build_sphinx \
PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"
diff --git a/devel/py-pipenv/Makefile b/devel/py-pipenv/Makefile
index 0dbbfd9dc128..333e79d59b08 100644
--- a/devel/py-pipenv/Makefile
+++ b/devel/py-pipenv/Makefile
@@ -13,10 +13,10 @@ COMMENT= Python Development Workflow for Humans
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}virtualenv-clone>=0.2.5:devel/py-virtualenv-clone@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}virtualenv-clone>=0.2.5:devel/py-virtualenv-clone@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-pkgconfig/Makefile b/devel/py-pkgconfig/Makefile
index 5092a5e9ceed..59ba70df67df 100644
--- a/devel/py-pkgconfig/Makefile
+++ b/devel/py-pkgconfig/Makefile
@@ -13,7 +13,7 @@ COMMENT= Interface Python with pkg-config
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-plan/Makefile b/devel/py-plan/Makefile
index aca827c0ad93..7a69d6c529db 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=2.1:devel/py-click@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-positional/Makefile b/devel/py-positional/Makefile
index 761974a6d970..7d36744a1930 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-pretend/Makefile b/devel/py-pretend/Makefile
index e8fe307e11bb..c0d38c6d5f52 100644
--- a/devel/py-pretend/Makefile
+++ b/devel/py-pretend/Makefile
@@ -13,7 +13,7 @@ COMMENT= Library for stubbing in Python
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.rst
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-prioritized_methods/Makefile b/devel/py-prioritized_methods/Makefile
index a35b9b9c6340..d39a71ff5bde 100644
--- a/devel/py-prioritized_methods/Makefile
+++ b/devel/py-prioritized_methods/Makefile
@@ -11,7 +11,7 @@ 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0.5:devel/py-PEAK-Rules@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/devel/py-prompt_toolkit/Makefile b/devel/py-prompt_toolkit/Makefile
index 817c68a9adc7..a51fd3d75ba6 100644
--- a/devel/py-prompt_toolkit/Makefile
+++ b/devel/py-prompt_toolkit/Makefile
@@ -13,8 +13,8 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-protobuf/Makefile b/devel/py-protobuf/Makefile
index 05cc8c4098a6..3b90ca119607 100644
--- a/devel/py-protobuf/Makefile
+++ b/devel/py-protobuf/Makefile
@@ -14,8 +14,8 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/../LICENSE
BUILD_DEPENDS= protoc:devel/protobuf \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR}
DO_MAKE_TEST= ${PYTHON_CMD} ${PYDISTUTILS_SETUP}
NO_ARCH= yes
diff --git a/devel/py-ptrace/Makefile b/devel/py-ptrace/Makefile
index 0ce166662148..7f938445430a 100644
--- a/devel/py-ptrace/Makefile
+++ b/devel/py-ptrace/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python binding of ptrace
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}distorm>0:devel/py-distorm@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}distorm>0:devel/py-distorm@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-pudb/Makefile b/devel/py-pudb/Makefile
index 31a9b855e59a..581f70a3d085 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}urwid>=1.1.1:devel/py-urwid@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urwid>=1.1.1:devel/py-urwid@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-py/Makefile b/devel/py-py/Makefile
index 584030ced652..b331b6afaeca 100644
--- a/devel/py-py/Makefile
+++ b/devel/py-py/Makefile
@@ -13,7 +13,7 @@ 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-pyasn1-modules/Makefile b/devel/py-pyasn1-modules/Makefile
index d8509a15050f..257d43c7200f 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.4.1:devel/py-pyasn1@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.4.1:devel/py-pyasn1@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
diff --git a/devel/py-pycadf/Makefile b/devel/py-pycadf/Makefile
index 538025fb7248..ca4f82f37e19 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-pycmd/Makefile b/devel/py-pycmd/Makefile
index da65f376893d..cc498dd45f06 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.4.9:devel/py-py@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-pydenticon/Makefile b/devel/py-pydenticon/Makefile
index 7af834df153a..c7f619107c01 100644
--- a/devel/py-pydenticon/Makefile
+++ b/devel/py-pydenticon/Makefile
@@ -13,8 +13,8 @@ COMMENT= Library for generating identicons - an enhanced port of Sigil
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-pydocstyle/Makefile b/devel/py-pydocstyle/Makefile
index 1c882832093e..a4b984eaca15 100644
--- a/devel/py-pydocstyle/Makefile
+++ b/devel/py-pydocstyle/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python docstring style checker
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE-MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py-snowballstemmer@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py-snowballstemmer@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
@@ -23,7 +23,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3200
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/devel/py-pydrive/Makefile b/devel/py-pydrive/Makefile
index 47a50b041a76..69b602e4a872 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.5.2:www/py-google-api-python-client@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-pyface/Makefile b/devel/py-pyface/Makefile
index 90e940211886..0e2e5cd9a67c 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-pyfcm/Makefile b/devel/py-pyfcm/Makefile
index f8e39ccb3b9a..5b1522e426a4 100644
--- a/devel/py-pyfcm/Makefile
+++ b/devel/py-pyfcm/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python client for Firebase Cloud Messaging
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-pyformance/Makefile b/devel/py-pyformance/Makefile
index 5b566d8f584d..f64d1ff830de 100644
--- a/devel/py-pyformance/Makefile
+++ b/devel/py-pyformance/Makefile
@@ -13,7 +13,7 @@ COMMENT= Toolset for performance measurement and statistics
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
diff --git a/devel/py-pygit2/Makefile b/devel/py-pygit2/Makefile
index 8bb85696fbd3..182c8869f53b 100644
--- a/devel/py-pygit2/Makefile
+++ b/devel/py-pygit2/Makefile
@@ -15,10 +15,10 @@ COMMENT= Python bindings for libgit2
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}
LIB_DEPENDS= libgit2.so:devel/libgit2
RUN_DEPENDS= ${BUILD_DEPENDS} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-pyke/Makefile b/devel/py-pyke/Makefile
index c9db84090920..9ae148e54ef6 100644
--- a/devel/py-pyke/Makefile
+++ b/devel/py-pyke/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python Knowledge Engine
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=2.3:devel/py-ply@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=2.3:devel/py-ply@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils
diff --git a/devel/py-pymarc/Makefile b/devel/py-pymarc/Makefile
index 393a1bcbc420..81d775561059 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-pyopencl/Makefile b/devel/py-pyopencl/Makefile
index e4235a94d9a2..40b8bf88235c 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR}
LIB_DEPENDS= ${PY_BOOST} \
libOpenCL.so:devel/ocl-icd
-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.6:devel/py-pytools@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:devel/py-decorator@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>=0.3.6:textproc/py-mako@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=2:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytools>=2017.6:devel/py-pytools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
CONFIGURE_ARGS= BOOST_INC_DIR="${LOCALBASE}/include" \
BOOST_LIB_DIR="${LOCALBASE}/lib" \
diff --git a/devel/py-pyral/Makefile b/devel/py-pyral/Makefile
index f1eacd1a26f3..8162fde97c65 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.12.5:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.12.5:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-pyrfc3339/Makefile b/devel/py-pyrfc3339/Makefile
index c86e01301aac..fee48823a4fe 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-pyro/Makefile b/devel/py-pyro/Makefile
index 38a8c0371551..d3bfc239db63 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.24:devel/py-serpent@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}serpent>=1.24:devel/py-serpent@${PY_FLAVOR}
NO_ARCH= yes
USES= dos2unix python
@@ -26,7 +26,7 @@ PORTEXAMPLES= *
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3400
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}selectors34>0:devel/py-selectors34@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}selectors34>0:devel/py-selectors34@${PY_FLAVOR}
.endif
post-install:
diff --git a/devel/py-pystorm/Makefile b/devel/py-pystorm/Makefile
index 36eaffb0e8cd..9edd18c0641c 100644
--- a/devel/py-pystorm/Makefile
+++ b/devel/py-pystorm/Makefile
@@ -16,9 +16,9 @@ LICENSE= APACHE20
USES= python:2.7
USE_PYTHON= autoplist distutils
-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>0:devel/py-msgpack@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR}
NO_ARCH= yes
REINPLACE_ARGS= -i ''
diff --git a/devel/py-pyte/Makefile b/devel/py-pyte/Makefile
index 1fc501ac9bea..fc5365dedb86 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-pytest-asyncio/Makefile b/devel/py-pytest-asyncio/Makefile
index 7c26015eae74..745d1b4d430e 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/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.6:devel/py-pytest@${PY_FLAVOR}
NO_ARCH= yes
USES= python:3.5+
diff --git a/devel/py-pytest-cache/Makefile b/devel/py-pytest-cache/Makefile
index 3d83008527b6..84608d723819 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}execnet>=1.2:sysutils/py-execnet@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.2:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}execnet>=1.2:sysutils/py-execnet@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-pytest-capturelog/Makefile b/devel/py-pytest-capturelog/Makefile
index ece18d7398d3..11694311b18e 100644
--- a/devel/py-pytest-capturelog/Makefile
+++ b/devel/py-pytest-capturelog/Makefile
@@ -12,7 +12,7 @@ COMMENT= Py.test plugin to capture log messages
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.1.1:devel/py-py@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.1.1:devel/py-py@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-pytest-cov/Makefile b/devel/py-pytest-cov/Makefile
index 98484de943b6..2639791b3aeb 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=3.7.1:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-pytest-flake8/Makefile b/devel/py-pytest-flake8/Makefile
index ebfcbaafab54..5ba209113d46 100644
--- a/devel/py-pytest-flake8/Makefile
+++ b/devel/py-pytest-flake8/Makefile
@@ -13,8 +13,8 @@ COMMENT= pytest plugin to check FLAKE8 requirement
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=3.5:devel/py-flake8@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest>=3.2:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=3.5:devel/py-flake8@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=3.2:devel/py-pytest@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-pytest-localserver/Makefile b/devel/py-pytest-localserver/Makefile
index de0c73c1e64b..189bb287fd41 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.10:www/py-werkzeug@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-pytest-mock/Makefile b/devel/py-pytest-mock/Makefile
index 216387155ed9..a2f1ab43be6a 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-setuptools_scm@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
NO_ARCH= yes
USES+= python
diff --git a/devel/py-pytest-runner/Makefile b/devel/py-pytest-runner/Makefile
index da2160b04b49..5be8c768b67e 100644
--- a/devel/py-pytest-runner/Makefile
+++ b/devel/py-pytest-runner/Makefile
@@ -12,7 +12,7 @@ COMMENT= Test support for pytest runner in setup.py
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-pytest-sugar/Makefile b/devel/py-pytest-sugar/Makefile
index 89ad0dcf15a8..d437a77b4d59 100644
--- a/devel/py-pytest-sugar/Makefile
+++ b/devel/py-pytest-sugar/Makefile
@@ -13,8 +13,8 @@ COMMENT= Changes the look and feel of pytest
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.9:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.9:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-pytest-timeout/Makefile b/devel/py-pytest-timeout/Makefile
index 3f7f54754efb..4a11bc4e1cbc 100644
--- a/devel/py-pytest-timeout/Makefile
+++ b/devel/py-pytest-timeout/Makefile
@@ -13,9 +13,9 @@ COMMENT= Pytest plugin to abort hanging tests
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-pytest-tornado/Makefile b/devel/py-pytest-tornado/Makefile
index 10d729dca874..133829893d50 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tornado>=4:www/py-tornado@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>=4:www/py-tornado@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-pytest-xdist/Makefile b/devel/py-pytest-xdist/Makefile
index 375dec838403..18ed6e5de976 100644
--- a/devel/py-pytest-xdist/Makefile
+++ b/devel/py-pytest-xdist/Makefile
@@ -13,12 +13,12 @@ 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py-execnet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}py>=1.4.22:devel/py-py@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-pytest/Makefile b/devel/py-pytest/Makefile
index 042edf91a35e..b2e944b4eec4 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-setuptools_scm@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=17.2.0:devel/py-attrs@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}py>=1.5.0:devel/py-py@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pluggy>=0.5:devel/py-pluggy@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=17.2.0:devel/py-attrs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}py>=1.5.0:devel/py-py@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pluggy>=0.5:devel/py-pluggy@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:devel/py-pytest-xdist@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted@${PY_FLAVOR}
NO_ARCH= yes
USES= python
@@ -34,7 +34,7 @@ do-test:
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3000
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}funcsigs>=0:devel/py-funcsigs@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}funcsigs>=0:devel/py-funcsigs@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/devel/py-python-bugzilla/Makefile b/devel/py-python-bugzilla/Makefile
index 2796a8414fb9..f78b7b24a6dc 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-python-gist/Makefile b/devel/py-python-gist/Makefile
index 1217443c487b..44dfe1bd4de3 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}python-gnupg>=0.4.1: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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-gnupg>=0.4.1:security/py-python-gnupg@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/devel/py-python-gitlab/Makefile b/devel/py-python-gitlab/Makefile
index cc34209358cf..9c501a5d36f5 100644
--- a/devel/py-python-gitlab/Makefile
+++ b/devel/py-python-gitlab/Makefile
@@ -12,14 +12,14 @@ COMMENT= Interact with GitLab API
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.4.2:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httmock>0:www/py-httmock@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.4.2:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httmock>0:www/py-httmock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
+DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
DOCS_PORTDOCS= *
DOCS_VARS= PYDISTUTILS_BUILD_TARGET=build_sphinx \
PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"
diff --git a/devel/py-python-jenkins/Makefile b/devel/py-python-jenkins/Makefile
index d6cbb900fbc3..faebed45e61a 100644
--- a/devel/py-python-jenkins/Makefile
+++ b/devel/py-python-jenkins/Makefile
@@ -11,10 +11,10 @@ COMMENT= Python bindings for the remote Jenkins API
LICENSE= BSD3CLAUSE
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:devel/py-pbr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}multi_key_dict>0:devel/py-multi_key_dict@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-pytools/Makefile b/devel/py-pytools/Makefile
index 91b65aa7875a..3493955c9b2b 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:devel/py-decorator@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}numpy>=1.6.0,1:math/py-numpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-pyutil/Makefile b/devel/py-pyutil/Makefile
index e1453d6be5dd..627e82e0c5f4 100644
--- a/devel/py-pyutil/Makefile
+++ b/devel/py-pyutil/Makefile
@@ -13,8 +13,8 @@ COMMENT= Collection of mature utilities for Python programmers
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.0:devel/py-simplejson@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zbase32>=1.0:converters/zbase32@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.0:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zbase32>=1.0:converters/zbase32@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-pyvalid/Makefile b/devel/py-pyvalid/Makefile
index 8e54e98f02bb..97879231ba6f 100644
--- a/devel/py-pyvalid/Makefile
+++ b/devel/py-pyvalid/Makefile
@@ -11,7 +11,7 @@ COMMENT= Python validation tool
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/devel/py-pyvisa-py/Makefile b/devel/py-pyvisa-py/Makefile
index f27dae3d7bd5..9467863817ce 100644
--- a/devel/py-pyvisa-py/Makefile
+++ b/devel/py-pyvisa-py/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFINE= SERIAL USB
SERIAL_DESC= Access to devices via RS-232
USB_DESC= Access to devices via USB
-SERIAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}serial>=0:comms/py-serial@${FLAVOR}
-USB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}usb>=0:devel/py-usb@${FLAVOR}
+SERIAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}serial>=0:comms/py-serial@${PY_FLAVOR}
+USB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}usb>=0:devel/py-usb@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/devel/py-pyvisa/Makefile b/devel/py-pyvisa/Makefile
index d8766c165846..d4d99bd96ef0 100644
--- a/devel/py-pyvisa/Makefile
+++ b/devel/py-pyvisa/Makefile
@@ -14,7 +14,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PY_ENUM34} \
- ${PYTHON_PKGNAMEPREFIX}pyvisa-py>=0:devel/py-pyvisa-py@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pyvisa-py>=0:devel/py-pyvisa-py@${PY_FLAVOR}
USES= python
USE_LOCALE= en_US.UTF-8
diff --git a/devel/py-pyxb/Makefile b/devel/py-pyxb/Makefile
index eae50955c593..66ea599d8717 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-qt4-dbussupport/Makefile b/devel/py-qt4-dbussupport/Makefile
index 54fa6c022727..9991d92c2293 100644
--- a/devel/py-qt4-dbussupport/Makefile
+++ b/devel/py-qt4-dbussupport/Makefile
@@ -6,8 +6,8 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt event loop support for dbus-python
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${PY_FLAVOR}
CONFIGURE_ARGS= --enable QtCore
PYQT_DIST= yes
diff --git a/devel/py-qt5-dbussupport/Makefile b/devel/py-qt5-dbussupport/Makefile
index ade23d809063..f138f23f2392 100644
--- a/devel/py-qt5-dbussupport/Makefile
+++ b/devel/py-qt5-dbussupport/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt event loop support for dbus-python
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${PY_FLAVOR}
CONFIGURE_ARGS= --enable QtCore
PYQT_DIST= yes
diff --git a/devel/py-qtconsole/Makefile b/devel/py-qtconsole/Makefile
index 6a0a98fb562a..942d2814bc6e 100644
--- a/devel/py-qtconsole/Makefile
+++ b/devel/py-qtconsole/Makefile
@@ -12,11 +12,11 @@ COMMENT= Qt-based console for Jupyter with support for rich media output
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING.md
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jupyter_client>=4.1:devel/py-jupyter_client@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipykernel>=4.1:devel/py-ipykernel@${PY_FLAVOR}
USES= pyqt:4 python
USE_PYQT= core gui svg
diff --git a/devel/py-ramlfications/Makefile b/devel/py-ramlfications/Makefile
index 0f6989d4fd82..60d81e3a94be 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=16.0.0:devel/py-attrs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonref>=0.1:devel/py-jsonref@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown2>=2.3.2:textproc/py-markdown2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xmltodict>=0.10.1:devel/py-xmltodict@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
USES?= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-rauth/Makefile b/devel/py-rauth/Makefile
index dcd84ce0bd9d..eb8dd6fb6614 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.2.1:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/devel/py-raven/Makefile b/devel/py-raven/Makefile
index f5547cfab431..8c660833c916 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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/devel/py-rebulk/Makefile b/devel/py-rebulk/Makefile
index 658272263a8d..83d10359d174 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-rednose/Makefile b/devel/py-rednose/Makefile
index 5531dea7b0ce..71c285018439 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}termstyle>0:devel/py-termstyle@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}termstyle>0:devel/py-termstyle@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-repoze.tm2/Makefile b/devel/py-repoze.tm2/Makefile
index 6322afe2cee7..fe2230fe49c0 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-repoze.what-pylons/Makefile b/devel/py-repoze.what-pylons/Makefile
index 2a162d2dd9dd..c593c34cda4e 100644
--- a/devel/py-repoze.what-pylons/Makefile
+++ b/devel/py-repoze.what-pylons/Makefile
@@ -11,9 +11,9 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}repoze.what>=0:devel/py-repoze.what@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylons>=0.9.7:www/py-pylons@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.what>=0:devel/py-repoze.what@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/devel/py-repoze.what/Makefile b/devel/py-repoze.what/Makefile
index 18327912887f..c099547ab012 100644
--- a/devel/py-repoze.what/Makefile
+++ b/devel/py-repoze.what/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Authorization for WSGI applications
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:www/py-paste@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}repoze.who-testutil>=0:devel/py-repoze.who-testutil@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:www/py-paste@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.who-testutil>=0:devel/py-repoze.who-testutil@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/devel/py-repoze.who-friendlyform/Makefile b/devel/py-repoze.who-friendlyform/Makefile
index 8e0a0e514437..687d8e813989 100644
--- a/devel/py-repoze.who-friendlyform/Makefile
+++ b/devel/py-repoze.who-friendlyform/Makefile
@@ -10,12 +10,12 @@ 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who@${PY_FLAVOR}
+RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-repoze.who-testutil/Makefile b/devel/py-repoze.who-testutil/Makefile
index c973bc79859a..e04cde06d528 100644
--- a/devel/py-repoze.who-testutil/Makefile
+++ b/devel/py-repoze.who-testutil/Makefile
@@ -14,8 +14,8 @@ COMMENT= Test utilities for repoze.who-powered applications
LICENSE= BSD4CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.3:www/py-pastedeploy@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.3:www/py-pastedeploy@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/devel/py-repoze.who/Makefile b/devel/py-repoze.who/Makefile
index 26debf056003..7acdbdace082 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/devel/py-repoze.xmliter/Makefile b/devel/py-repoze.xmliter/Makefile
index 66680ca90595..b101ed8fd3d9 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.1:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR}
USES= python zip
USE_PYTHON= autoplist distutils
diff --git a/devel/py-requestsexceptions/Makefile b/devel/py-requestsexceptions/Makefile
index 17b421e9fa47..5aaddb5a27c7 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-responses/Makefile b/devel/py-responses/Makefile
index d16a3dda2d36..3c47f91ce140 100644
--- a/devel/py-responses/Makefile
+++ b/devel/py-responses/Makefile
@@ -13,14 +13,14 @@ COMMENT= Utility library for mocking out the requests Python library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cookies>=0:www/py-cookies@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=3.7.1:devel/py-coverage@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-localserver>=0:devel/py-pytest-localserver@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cookies>=0:www/py-cookies@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=3.7.1:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-localserver>=0:devel/py-pytest-localserver@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-retrying/Makefile b/devel/py-retrying/Makefile
index b37e49415ff9..9125e692b11d 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-riak_pb/Makefile b/devel/py-riak_pb/Makefile
index db0289fc891e..a1888a57bdbc 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>=2.4.1:devel/py-protobuf@${PY_FLAVOR}
USES= python:-2.7
USE_PYTHON= autoplist distutils
diff --git a/devel/py-robotframework-databaselibrary/Makefile b/devel/py-robotframework-databaselibrary/Makefile
index bd12d2f04294..77adcf2c3810 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= franz-see
diff --git a/devel/py-robotframework-pabot/Makefile b/devel/py-robotframework-pabot/Makefile
index 791768666a88..d8666663cbe5 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}robotremoteserver>=1.0.1:devel/py-robotremoteserver@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}robotremoteserver>=1.0.1:devel/py-robotremoteserver@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-robotframework-ride/Makefile b/devel/py-robotframework-ride/Makefile
index ee11e37f75c2..b216f0182d23 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}robotframework-selenium2library>=1.1.0:devel/py-robotframework-selenium2library@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}robotframework-selenium2library>=1.1.0:devel/py-robotframework-selenium2library@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
NO_ARCH= yes
USES= python:-2.7
diff --git a/devel/py-robotframework-selenium2library/Makefile b/devel/py-robotframework-selenium2library/Makefile
index d624700aec33..41a7422aab41 100644
--- a/devel/py-robotframework-selenium2library/Makefile
+++ b/devel/py-robotframework-selenium2library/Makefile
@@ -14,8 +14,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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/devel/py-robotremoteserver/Makefile b/devel/py-robotremoteserver/Makefile
index 31da55d9787d..f884e594fd7f 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-rply/Makefile b/devel/py-rply/Makefile
index de8ef8e530c1..4a358b53b7a6 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-rq/Makefile b/devel/py-rq/Makefile
index e19eade21e3b..969cc67f23f7 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=2.7:databases/py-redis@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-rwt/Makefile b/devel/py-rwt/Makefile
index febd1542be68..c9fb7755a6de 100644
--- a/devel/py-rwt/Makefile
+++ b/devel/py-rwt/Makefile
@@ -12,9 +12,9 @@ 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-sanetime/Makefile b/devel/py-sanetime/Makefile
index 06bb59d39ea0..fc050f4ec884 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>=2010:devel/py-pytz@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2010:devel/py-pytz@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-scripttest/Makefile b/devel/py-scripttest/Makefile
index 9c2ceca935c1..8b5f6e6f0689 100644
--- a/devel/py-scripttest/Makefile
+++ b/devel/py-scripttest/Makefile
@@ -12,7 +12,7 @@ COMMENT= Helper to test command-line scripts
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/docs/license.rst
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-selection/Makefile b/devel/py-selection/Makefile
index 9fe6d7a136f4..efcb9e91ac50 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-selectors34/Makefile b/devel/py-selectors34/Makefile
index 144b1ae88f1b..25d1fc2af96b 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python:-3.3
diff --git a/devel/py-semantic_version/Makefile b/devel/py-semantic_version/Makefile
index 9d12d45c35c3..290729e2fdaa 100644
--- a/devel/py-semantic_version/Makefile
+++ b/devel/py-semantic_version/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python library provides a few tools to handle SemVer in Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= rbarrois
diff --git a/devel/py-setuptools-pkg/Makefile b/devel/py-setuptools-pkg/Makefile
index e58db64b753c..b843f915a470 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/py-setuptools@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=18.2:devel/py-setuptools@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index 5b753c628d06..08f120bbb9c0 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -33,9 +33,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@${FLAVOR}
+#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
#.if ${PYTHON_REL} < 3300
-#TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+#TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
#.endif
post-install:
diff --git a/devel/py-simpy/Makefile b/devel/py-simpy/Makefile
index 75cd3533aa72..69c8018e18e7 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@${FLAVOR}
+TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/py-singledispatch/Makefile b/devel/py-singledispatch/Makefile
index f7bc29d5445b..d54095e1c722 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python:-3.3
USE_PYTHON= distutils concurrent autoplist
diff --git a/devel/py-six/Makefile b/devel/py-six/Makefile
index b58062e19270..6b6abea6a6a6 100644
--- a/devel/py-six/Makefile
+++ b/devel/py-six/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python 2 and 3 compatibility utilities
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-smmap2/Makefile b/devel/py-smmap2/Makefile
index 76129cc36319..49291af6f555 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}smmap
diff --git a/devel/py-sortedcontainers/Makefile b/devel/py-sortedcontainers/Makefile
index cfe05a842615..59fffb75051a 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-sqlcc/Makefile b/devel/py-sqlcc/Makefile
index 0aba18c4c9fb..58b33c40113d 100644
--- a/devel/py-sqlcc/Makefile
+++ b/devel/py-sqlcc/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python SQL Command Composer
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pythk>=0:devel/pythk@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pythk>=0:devel/pythk@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils
diff --git a/devel/py-stackexchange/Makefile b/devel/py-stackexchange/Makefile
index faeb7736627b..15751d83f6aa 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-stevedore/Makefile b/devel/py-stevedore/Makefile
index 2478839a17ce..bc13ac6d1993 100644
--- a/devel/py-stevedore/Makefile
+++ b/devel/py-stevedore/Makefile
@@ -13,8 +13,8 @@ COMMENT= Manage dynamic plugins for Python applications
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-strategies/Makefile b/devel/py-strategies/Makefile
index 3ba65adf23a4..e30d0720cf92 100644
--- a/devel/py-strategies/Makefile
+++ b/devel/py-strategies/Makefile
@@ -12,8 +12,8 @@ COMMENT= Programmatic control flow
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}multipledispatch>0:devel/py-multipledispatch@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}toolz>0:devel/py-toolz@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}multipledispatch>0:devel/py-multipledispatch@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}toolz>0:devel/py-toolz@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-streamparse/Makefile b/devel/py-streamparse/Makefile
index 42fcde9f2514..fbb3297acd93 100644
--- a/devel/py-streamparse/Makefile
+++ b/devel/py-streamparse/Makefile
@@ -16,15 +16,15 @@ LICENSE= APACHE20
USES= python:2.7
USE_PYTHON= autoplist distutils
-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}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}fabric3>0:devel/py-fabric3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pystorm>=3.1.0:devel/py-pystorm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}thriftpy>=0.3.2:devel/py-thriftpy@${PY_FLAVOR}
NO_ARCH= YES
diff --git a/devel/py-structlog/Makefile b/devel/py-structlog/Makefile
index cf3ab7e18af1..af936dbaaa36 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3:devel/py-colorama@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-stsci.distutils/Makefile b/devel/py-stsci.distutils/Makefile
index 3d33d4b3e645..ee93f5a4553e 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}d2to1>0:devel/py-d2to1@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-sure/Makefile b/devel/py-sure/Makefile
index 1243d802f7d2..4d27bfe3c23f 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile
index fb11e3586201..b4ac02f9d85b 100644
--- a/devel/py-tables/Makefile
+++ b/devel/py-tables/Makefile
@@ -13,7 +13,7 @@ COMMENT= Hierarchical database for Python
LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:math/py-numexpr@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:math/py-numexpr@${PY_FLAVOR}
LIB_DEPENDS= libhdf5.so:science/hdf5 \
liblzo2.so:archivers/lzo2 \
libucl.so:archivers/ucl
@@ -26,7 +26,7 @@ PORTEXAMPLES= *
OPTIONS_DEFINE= PYREX EXAMPLES
PYREX_DESC= Use code generated by Pyrex to build
-PYREX_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR}
+PYREX_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${PY_FLAVOR}
post-patch:
@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/setup.py
diff --git a/devel/py-tarantool-queue/Makefile b/devel/py-tarantool-queue/Makefile
index 682843232b8b..b45dbe4da584 100644
--- a/devel/py-tarantool-queue/Makefile
+++ b/devel/py-tarantool-queue/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python bindings for Tarantool queue
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tarantool>=0:databases/py-tarantool@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tarantool>=0:databases/py-tarantool@${PY_FLAVOR}
NO_ARCH= yes
REINPLACE_ARGS= -i ''
diff --git a/devel/py-taskflow/Makefile b/devel/py-taskflow/Makefile
index fd238342102d..8ffb821ff5a2 100644
--- a/devel/py-taskflow/Makefile
+++ b/devel/py-taskflow/Makefile
@@ -13,24 +13,24 @@ COMMENT= Taskflow structured state management library
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_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}
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}networkx>=1.10:math/py-networkx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}contextlib2>=0.4.0:devel/py-contextlib2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cachetools>=1.1.0:devel/py-cachetools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}automaton>=0.5.0:devel/py-automaton@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-tempora/Makefile b/devel/py-tempora/Makefile
index 49cf62632792..7260ea750709 100644
--- a/devel/py-tempora/Makefile
+++ b/devel/py-tempora/Makefile
@@ -13,11 +13,11 @@ COMMENT= Objects and routines pertaining to date and time
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-sugar>=0.9.1:devel/py-pytest-sugar@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-sugar>=0.9.1:devel/py-pytest-sugar@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-tempstorage/Makefile b/devel/py-tempstorage/Makefile
index eb64bbbe8192..51d031591f11 100644
--- a/devel/py-tempstorage/Makefile
+++ b/devel/py-tempstorage/Makefile
@@ -13,8 +13,8 @@ COMMENT= RAM-based storage for ZODB
LICENSE= ZPL21
-RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=3.9.0:databases/zodb3@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing@${FLAVOR}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=3.9.0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-tenacity/Makefile b/devel/py-tenacity/Makefile
index 0c4a202e9471..c756b4bc6dc9 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/devel/py-testinfra/Makefile b/devel/py-testinfra/Makefile
index 4c2f03f7e825..51c1b03d0b46 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>1.4:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>1.4:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-testoob/Makefile b/devel/py-testoob/Makefile
index 0b668d3a9d3c..5f51e9773e77 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@${FLAVOR}
+TWISTED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/devel/py-testpath/Makefile b/devel/py-testpath/Makefile
index 5902daa8eb73..186bd0732803 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_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@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib>=0:devel/py-pathlib@${PY_FLAVOR}
.endif
post-extract:
diff --git a/devel/py-testresources/Makefile b/devel/py-testresources/Makefile
index 16a04ca84e3b..b784559fb7c7 100644
--- a/devel/py-testresources/Makefile
+++ b/devel/py-testresources/Makefile
@@ -15,11 +15,11 @@ LICENSE_COMB= dual
LICENSE_FILE_APACHE20= ${WRKSRC}/Apache-2.0
LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/BSD
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}fixtures>=0:devel/py-fixtures@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}testtools>=0:devel/py-testtools@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}fixtures>=0:devel/py-fixtures@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}testtools>=0:devel/py-testtools@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-testscenarios/Makefile b/devel/py-testscenarios/Makefile
index b57b477f4865..ee3ee06b7adb 100644
--- a/devel/py-testscenarios/Makefile
+++ b/devel/py-testscenarios/Makefile
@@ -15,9 +15,9 @@ LICENSE_COMB= dual
LICENSE_FILE_APACHE20= ${WRKSRC}/Apache-2.0
LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/BSD
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.11:devel/py-pbr@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}testtools>=0:devel/py-testtools@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.11:devel/py-pbr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}testtools>=0:devel/py-testtools@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-testtools/Makefile b/devel/py-testtools/Makefile
index f3c0def8412d..8987a0b4e28c 100644
--- a/devel/py-testtools/Makefile
+++ b/devel/py-testtools/Makefile
@@ -13,9 +13,9 @@ COMMENT= Extensions to the Python standard library unit testing framework
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.11:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}extras>=1.0.0:devel/py-extras@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}traceback2>=0:devel/py-traceback2@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.11:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}extras>=1.0.0:devel/py-extras@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}traceback2>=0:devel/py-traceback2@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-threema-msgapi/Makefile b/devel/py-threema-msgapi/Makefile
index 1df996bcd208..b93edc444122 100644
--- a/devel/py-threema-msgapi/Makefile
+++ b/devel/py-threema-msgapi/Makefile
@@ -19,11 +19,11 @@ USE_GITHUB= yes
GH_ACCOUNT= lgrahl
GH_PROJECT= threema-msgapi-sdk-python
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pylru-cache>0:devel/py-pylru-cache@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}logbook>0:devel/py-logbook@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}libnacl>0:security/py-libnacl@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pylru-cache>0:devel/py-pylru-cache@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}logbook>0:devel/py-logbook@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}libnacl>0:security/py-libnacl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/devel/py-tinyarray/Makefile b/devel/py-tinyarray/Makefile
index f653ca48fcc5..d63c93027f8b 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-tinyrpc/Makefile b/devel/py-tinyrpc/Makefile
index 8167a777bc61..d32d788885c6 100644
--- a/devel/py-tinyrpc/Makefile
+++ b/devel/py-tinyrpc/Makefile
@@ -12,8 +12,8 @@ COMMENT= Modular RPC Libray
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
@@ -28,9 +28,9 @@ HTTP_DESC= HTTP support
WSGI_DESC= WSGI support
ZEROMQ_DESC= ZeroMQ support
-HTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent-websocket>0:www/py-gevent-websocket@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
-WSGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${FLAVOR}
-ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${FLAVOR}
+HTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent-websocket>0:www/py-gevent-websocket@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
+WSGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${PY_FLAVOR}
+ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/devel/py-tooz/Makefile b/devel/py-tooz/Makefile
index 70fa859660d6..ced6ca9a5612 100644
--- a/devel/py-tooz/Makefile
+++ b/devel/py-tooz/Makefile
@@ -13,18 +13,18 @@ COMMENT= Coordination library for distributed systems
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_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>=0.4.0:devel/py-msgpack@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}voluptuous>=0.8.9:devel/py-voluptuous@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.15.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.4.0:devel/py-msgpack@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners@${PY_FLAVOR}
NO_ARCH= yes
REINPLACE_ARGS= -i ''
diff --git a/devel/py-traceback2/Makefile b/devel/py-traceback2/Makefile
index 1e70b695bb56..a7e0aeb955a9 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR}
LICENSE= PSFL
diff --git a/devel/py-traitlets/Makefile b/devel/py-traitlets/Makefile
index 30f7b9f8895f..cf4e1ab46197 100644
--- a/devel/py-traitlets/Makefile
+++ b/devel/py-traitlets/Makefile
@@ -13,11 +13,11 @@ COMMENT= Configuration system for Python applications
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING.md
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} \
${PY_ENUM34} \
- ${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}
+ ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
@@ -26,7 +26,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_VER} == 2.7
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
.endif
do-test:
diff --git a/devel/py-transaction/Makefile b/devel/py-transaction/Makefile
index eba69885cc36..cac74e16441b 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/devel/py-trollius/Makefile b/devel/py-trollius/Makefile
index 01a94e395004..cba795c009e0 100644
--- a/devel/py-trollius/Makefile
+++ b/devel/py-trollius/Makefile
@@ -22,7 +22,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3300
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
.endif
do-test:
diff --git a/devel/py-tw.forms/Makefile b/devel/py-tw.forms/Makefile
index cf6e21891714..fc89f195d74f 100644
--- a/devel/py-tw.forms/Makefile
+++ b/devel/py-tw.forms/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ychsiao@ychsiao.org
COMMENT= Web Widgets for building and validating forms
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:devel/py-ToscaWidgets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}formencode>=0:www/py-formencode@${PY_FLAVOR}
+RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:devel/py-ToscaWidgets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}formencode>=0:www/py-formencode@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-twext/Makefile b/devel/py-twext/Makefile
index b41bdb7c028c..0481ff8bf1dc 100644
--- a/devel/py-twext/Makefile
+++ b/devel/py-twext/Makefile
@@ -10,9 +10,9 @@ COMMENT= Extensions to Twisted
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0.6:devel/py-cffi@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=16.6:devel/py-twisted@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0.6:devel/py-cffi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=16.6:devel/py-twisted@${PY_FLAVOR}
OPTIONS_DEFINE= DAL POSTGRES
OPTIONS_DEFAULT= DAL POSTGRES
@@ -20,8 +20,8 @@ OPTIONS_DEFAULT= DAL POSTGRES
DAL_DESC= Enables use of the Database Abstraction Layer.
POSTGRES_DESC= Enables support for Postgres database connectivity.
-DAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlparse020>=0.2.0:databases/py-sqlparse020@${FLAVOR}
-POSTGRES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.2:databases/py-pg8000@${FLAVOR}
+DAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlparse020>=0.2.0:databases/py-sqlparse020@${PY_FLAVOR}
+POSTGRES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.2:databases/py-pg8000@${PY_FLAVOR}
.include <bsd.port.options.mk>
diff --git a/devel/py-twiggy/Makefile b/devel/py-twiggy/Makefile
index b4a85e720a59..f720e9a0cc65 100644
--- a/devel/py-twiggy/Makefile
+++ b/devel/py-twiggy/Makefile
@@ -14,7 +14,7 @@ COMMENT= Pythonic logger
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-twilio/Makefile b/devel/py-twilio/Makefile
index 1f3bb8085268..352165149f64 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index cb32f409872d..6f4e0297862e 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}constantly>=15.1:devel/py-constantly@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hyperlink>=17.1.1:www/py-hyperlink@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}incremental>=16.10.1:devel/py-incremental@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Automat>=0.3.0:devel/py-Automat@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python tar:bzip2
diff --git a/devel/py-txaio/Makefile b/devel/py-txaio/Makefile
index ffb1771c24f5..7f8578d7fb10 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_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@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}trollius>=2.0:devel/py-trollius@${PY_FLAVOR}
.elif ${PYTHON_REL} >= 3300
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>=3.4.3:devel/py-asyncio@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>=3.4.3:devel/py-asyncio@${PY_FLAVOR}
.endif
do-test:
diff --git a/devel/py-tzlocal/Makefile b/devel/py-tzlocal/Makefile
index 11ef0aace601..0ab2e355357e 100644
--- a/devel/py-tzlocal/Makefile
+++ b/devel/py-tzlocal/Makefile
@@ -12,7 +12,7 @@ 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-ua_parser/Makefile b/devel/py-ua_parser/Makefile
index e0b56700b6d3..599be139de23 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR}
RUN_DEPENDS= ${LOCALBASE}/share/ua_parser/regexes.yaml:devel/ua_parser-core \
- ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${FLAVOR}
+ ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-unittest2/Makefile b/devel/py-unittest2/Makefile
index 6787d907958c..8c3b7d95600f 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}linecache2>0:devel/py-linecache2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}traceback2>0:devel/py-traceback2@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}linecache2>0:devel/py-linecache2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}traceback2>0:devel/py-traceback2@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-unpaddedbase64/Makefile b/devel/py-unpaddedbase64/Makefile
index 272ea4b43dc8..d055ccd2371f 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/devel/py-update_checker/Makefile b/devel/py-update_checker/Makefile
index a41835896204..6470dcd90929 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-urwidtrees/Makefile b/devel/py-urwidtrees/Makefile
index 96a8c7c36314..d49d8e7e1e10 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:devel/py-urwid@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:devel/py-urwid@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:devel/py-urwid@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= pazz
diff --git a/devel/py-user_agents/Makefile b/devel/py-user_agents/Makefile
index 8bf2c9565926..f5e82e73aeee 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ua_parser/__init__.py:devel/py-ua_parser@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-validators/Makefile b/devel/py-validators/Makefile
index 21d857e0030c..0ed201fac51e 100644
--- a/devel/py-validators/Makefile
+++ b/devel/py-validators/Makefile
@@ -12,8 +12,8 @@ COMMENT= Simple data validation in Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-vcrpy/Makefile b/devel/py-vcrpy/Makefile
index c159e3f7358d..2800c30071da 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-localserver>0:devel/py-pytest-localserver@${PY_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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR}
.endif
post-patch:
diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile
index 890fb354dceb..4320322768a1 100644
--- a/devel/py-virtualenv/Makefile
+++ b/devel/py-virtualenv/Makefile
@@ -10,12 +10,12 @@ COMMENT= Tool for creating isolated Python environments
LICENSE= MIT
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
+DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/devel/py-virtualenvwrapper/Makefile b/devel/py-virtualenvwrapper/Makefile
index c9810328b37d..c4b8cc30a9c4 100644
--- a/devel/py-virtualenvwrapper/Makefile
+++ b/devel/py-virtualenvwrapper/Makefile
@@ -14,15 +14,15 @@ COMMENT= Set of extensions to virtualenv
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>0:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}virtualenv-clone>0:devel/py-virtualenv-clone@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-bitbucket>=1.0:textproc/py-sphinxcontrib-bitbucket@${FLAVOR}
+DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-bitbucket>=1.0:textproc/py-sphinxcontrib-bitbucket@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-warlock/Makefile b/devel/py-warlock/Makefile
index 17d81a705afd..6a500f5dd5e6 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}jsonpatch>=0.10:devel/py-jsonpatch@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=0.7:devel/py-jsonschema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonpatch>=0.10:devel/py-jsonpatch@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-watchdog/Makefile b/devel/py-watchdog/Makefile
index 8005d6a46f2a..79920db6b527 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= ${PYTHON_PKGNAMEPREFIX}argh>=0.26.1:devel/py-argh@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argh>=0.26.1:devel/py-argh@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4.4:textproc/py-sphinx@${FLAVOR}
+DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4.4:textproc/py-sphinx@${PY_FLAVOR}
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
GH_ACCOUNT= gorakhargosh
diff --git a/devel/py-weblib/Makefile b/devel/py-weblib/Makefile
index 4c7286da3ccc..9be4e97a6b13 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytils>0:russian/py-pytils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile
index fac2d7400d2a..e14b49018d98 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@${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}
+SIGNATURE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dirspec>=13.05:devel/py-dirspec@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ed25519ll>=0.6_1:security/py-ed25519ll@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keyring>=1.3:security/py-keyring@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-widgetsnbextension/Makefile b/devel/py-widgetsnbextension/Makefile
index a7106573c3f2..f4a19f346f34 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notebook>=0:www/py-notebook@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-wsme/Makefile b/devel/py-wsme/Makefile
index e2824ff0cc41..171855ab1f41 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplegeneric>=0:devel/py-simplegeneric@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.12:net/py-netaddr@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/devel/py-xarray/Makefile b/devel/py-xarray/Makefile
index 33de4fe53340..13d86a6b1975 100644
--- a/devel/py-xarray/Makefile
+++ b/devel/py-xarray/Makefile
@@ -14,8 +14,8 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}pandas>=0.18.0:math/py-pandas@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.7.1:devel/py-pytest@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pandas>=0.18.0:math/py-pandas@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.7.1:devel/py-pytest@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
@@ -24,7 +24,7 @@ USES= python
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3000
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/devel/py-xattr/Makefile b/devel/py-xattr/Makefile
index c61d1d8b2e04..b1e84431e374 100644
--- a/devel/py-xattr/Makefile
+++ b/devel/py-xattr/Makefile
@@ -14,8 +14,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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-xcaplib/Makefile b/devel/py-xcaplib/Makefile
index 867844d169a5..7a32e0a1e9ad 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.2:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}application>=1.1.5:devel/py-application@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.2:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-xdis/Makefile b/devel/py-xdis/Makefile
index db065c1e88ec..7fece6c7ec25 100644
--- a/devel/py-xdis/Makefile
+++ b/devel/py-xdis/Makefile
@@ -13,10 +13,10 @@ COMMENT= Cross-Python bytecode Disassembler and Marshal routines
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/devel/py-xmltodict/Makefile b/devel/py-xmltodict/Makefile
index 7d7192340a76..1d0d44c9294e 100644
--- a/devel/py-xmltodict/Makefile
+++ b/devel/py-xmltodict/Makefile
@@ -13,7 +13,7 @@ COMMENT= XML parser that returns python dictionaries
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-xxhash/Makefile b/devel/py-xxhash/Makefile
index 607225cdde14..0ce69fc852a4 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>1:devel/py-nose@${PY_FLAVOR}
USES= python zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-yandex-money-sdk/Makefile b/devel/py-yandex-money-sdk/Makefile
index e080ea06f28e..9ae8c23d2e2a 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.4.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-z3c.autoinclude/Makefile b/devel/py-z3c.autoinclude/Makefile
index 4e96ea46af5f..aa19e4c83986 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zc.buildout>=0:devel/py-zc.buildout@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-z3c.batching/Makefile b/devel/py-z3c.batching/Makefile
index 6e587f80977d..1d04036f673c 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-z3c.caching/Makefile b/devel/py-z3c.caching/Makefile
index 51903ea31bc5..404864cb7109 100644
--- a/devel/py-z3c.caching/Makefile
+++ b/devel/py-z3c.caching/Makefile
@@ -13,12 +13,12 @@ COMMENT= Caching infrastructure for web apps
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-z3c.form/Makefile b/devel/py-z3c.form/Makefile
index e8367526178b..3f3913812af2 100644
--- a/devel/py-z3c.form/Makefile
+++ b/devel/py-z3c.form/Makefile
@@ -13,25 +13,25 @@ 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserresource>0:devel/py-zope.browserresource@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6.0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/devel/py-z3c.formwidget.query/Makefile b/devel/py-z3c.formwidget.query/Makefile
index b4e810f9decd..b923d6f0a524 100644
--- a/devel/py-z3c.formwidget.query/Makefile
+++ b/devel/py-z3c.formwidget.query/Makefile
@@ -13,11 +13,11 @@ 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/devel/py-z3c.zcmlhook/Makefile b/devel/py-z3c.zcmlhook/Makefile
index 2a8f6d63972d..78d31c3ab715 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zExceptions/Makefile b/devel/py-zExceptions/Makefile
index a322e0fb2608..e467890b5de0 100644
--- a/devel/py-zExceptions/Makefile
+++ b/devel/py-zExceptions/Makefile
@@ -13,9 +13,9 @@ COMMENT= Contains common exceptions used in Zope2
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zLOG/Makefile b/devel/py-zLOG/Makefile
index 45e3253e1a6b..3738210dbc18 100644
--- a/devel/py-zLOG/Makefile
+++ b/devel/py-zLOG/Makefile
@@ -14,7 +14,7 @@ COMMENT= General logging facility
LICENSE= ZPL21
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-zope.annotation/Makefile b/devel/py-zope.annotation/Makefile
index 34bd98e0bb41..3988ec6de2f4 100644
--- a/devel/py-zope.annotation/Makefile
+++ b/devel/py-zope.annotation/Makefile
@@ -13,11 +13,11 @@ COMMENT= Object annotation mechanism
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.applicationcontrol/Makefile b/devel/py-zope.app.applicationcontrol/Makefile
index 3adac2dd2b13..f33aa66ae781 100644
--- a/devel/py-zope.app.applicationcontrol/Makefile
+++ b/devel/py-zope.app.applicationcontrol/Makefile
@@ -13,14 +13,14 @@ COMMENT= Zope application control
LICENSE= ZPL21
-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}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:devel/py-zope.applicationcontrol@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:devel/py-zope.traversing@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.appsetup/Makefile b/devel/py-zope.app.appsetup/Makefile
index ccbe2de54996..537717b53f80 100644
--- a/devel/py-zope.app.appsetup/Makefile
+++ b/devel/py-zope.app.appsetup/Makefile
@@ -13,19 +13,19 @@ COMMENT= Zope app setup helper
LICENSE= ZPL21
-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}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=3.6.0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.basicskin/Makefile b/devel/py-zope.app.basicskin/Makefile
index bfbf91cabbb3..8017246ced49 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.broken/Makefile b/devel/py-zope.app.broken/Makefile
index 6db76d3f7005..b81ed09412b8 100644
--- a/devel/py-zope.app.broken/Makefile
+++ b/devel/py-zope.app.broken/Makefile
@@ -13,13 +13,13 @@ COMMENT= Zope Broken (ZODB) Object Support
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.broken>=0:devel/py-zope.broken@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.cache/Makefile b/devel/py-zope.app.cache/Makefile
index 7500298c6fce..75c11f416fc8 100644
--- a/devel/py-zope.app.cache/Makefile
+++ b/devel/py-zope.app.cache/Makefile
@@ -13,18 +13,18 @@ COMMENT= Zope Caching Framework
LICENSE= ZPL21
-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}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.component/Makefile b/devel/py-zope.app.component/Makefile
index 179b795c17f9..a494b3a62e3d 100644
--- a/devel/py-zope.app.component/Makefile
+++ b/devel/py-zope.app.component/Makefile
@@ -13,20 +13,20 @@ COMMENT= Local Zope Component Support
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12.0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.container/Makefile b/devel/py-zope.app.container/Makefile
index d12b9fe5e1f1..cebc376d0854 100644
--- a/devel/py-zope.app.container/Makefile
+++ b/devel/py-zope.app.container/Makefile
@@ -13,24 +13,24 @@ COMMENT= Zope Container
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:devel/py-zope.dublincore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.content/Makefile b/devel/py-zope.app.content/Makefile
index c84917d3833d..4e1017499baf 100644
--- a/devel/py-zope.app.content/Makefile
+++ b/devel/py-zope.app.content/Makefile
@@ -13,10 +13,10 @@ COMMENT= Zope Content Type
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.debug/Makefile b/devel/py-zope.app.debug/Makefile
index ad712c28927f..79c88028577a 100644
--- a/devel/py-zope.app.debug/Makefile
+++ b/devel/py-zope.app.debug/Makefile
@@ -13,9 +13,9 @@ COMMENT= Zope Debug Mode
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:devel/py-zope.app.appsetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.dependable/Makefile b/devel/py-zope.app.dependable/Makefile
index 902f1f0379a9..c2f72192550e 100644
--- a/devel/py-zope.app.dependable/Makefile
+++ b/devel/py-zope.app.dependable/Makefile
@@ -13,13 +13,13 @@ COMMENT= Simple Dependency API
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.error/Makefile b/devel/py-zope.app.error/Makefile
index edec60fdc939..ef1dc313ad20 100644
--- a/devel/py-zope.app.error/Makefile
+++ b/devel/py-zope.app.error/Makefile
@@ -13,10 +13,10 @@ COMMENT= Error reporting utility management UI for Zope3
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.exception/Makefile b/devel/py-zope.app.exception/Makefile
index 2b60bac7473a..a6c7d4e920c0 100644
--- a/devel/py-zope.app.exception/Makefile
+++ b/devel/py-zope.app.exception/Makefile
@@ -13,13 +13,13 @@ COMMENT= Zope 3 exception views
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:devel/py-zope.browserpage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.file/Makefile b/devel/py-zope.app.file/Makefile
index c6add7f884f2..785f596aa43f 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.publication>0:devel/py-zope.app.publication@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contenttype>0:devel/py-zope.contenttype@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.datetime>0:devel/py-zope.datetime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dublincore>0:devel/py-zope.dublincore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.exceptions>0:devel/py-zope.exceptions@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>0:devel/py-zope.filerepresentation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.size>0:devel/py-zope.size@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3@${PY_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 6198067e3fa4..abbe3861592a 100644
--- a/devel/py-zope.app.folder/Makefile
+++ b/devel/py-zope.app.folder/Makefile
@@ -13,9 +13,9 @@ COMMENT= Folder Content Type for Zope 3
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:devel/py-zope.app.content@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.form/Makefile b/devel/py-zope.app.form/Makefile
index c749180d36f8..0372166c73e2 100644
--- a/devel/py-zope.app.form/Makefile
+++ b/devel/py-zope.app.form/Makefile
@@ -13,21 +13,21 @@ COMMENT= The Original Zope 3 Form Framework
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0:devel/py-zope.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:devel/py-zope.browserpage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=3.5.1:security/py-zope.security@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.generations/Makefile b/devel/py-zope.app.generations/Makefile
index 48bbafe5a2ec..45d66068f75c 100644
--- a/devel/py-zope.app.generations/Makefile
+++ b/devel/py-zope.app.generations/Makefile
@@ -13,13 +13,13 @@ COMMENT= ZMI UI for zope.generations
LICENSE= ZPL21
-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}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.renderer>=0:devel/py-zope.app.renderer@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:devel/py-zope.applicationcontrol@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.generations>=0:devel/py-zope.generations@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.http/Makefile b/devel/py-zope.app.http/Makefile
index 876a80088e1d..c55c8273724d 100644
--- a/devel/py-zope.app.http/Makefile
+++ b/devel/py-zope.app.http/Makefile
@@ -13,10 +13,10 @@ COMMENT= HTTP Behavior for the Zope Publisher
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.pagetemplate/Makefile b/devel/py-zope.app.pagetemplate/Makefile
index 8442f32a01b0..21cd586b8cff 100644
--- a/devel/py-zope.app.pagetemplate/Makefile
+++ b/devel/py-zope.app.pagetemplate/Makefile
@@ -13,18 +13,18 @@ COMMENT= PageTemplate integration for Zope 3
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.12.0:devel/py-zope.browserpage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5.0:devel/py-zope.pagetemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.publication/Makefile b/devel/py-zope.app.publication/Makefile
index c9bea5962195..e92f6cef8591 100644
--- a/devel/py-zope.app.publication/Makefile
+++ b/devel/py-zope.app.publication/Makefile
@@ -13,15 +13,15 @@ COMMENT= Zope publication
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12.4:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:devel/py-transaction@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.publisher/Makefile b/devel/py-zope.app.publisher/Makefile
index 09a9370533c1..fc25f67635b1 100644
--- a/devel/py-zope.app.publisher/Makefile
+++ b/devel/py-zope.app.publisher/Makefile
@@ -13,19 +13,19 @@ COMMENT= Means for configuration of Zope 3 style views and resources
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:devel/py-zope.ptresource@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.renderer/Makefile b/devel/py-zope.app.renderer/Makefile
index a475fde29f74..32df353403ab 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.5:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.rotterdam/Makefile b/devel/py-zope.app.rotterdam/Makefile
index 5f96e2c64b89..522bb146dc78 100644
--- a/devel/py-zope.app.rotterdam/Makefile
+++ b/devel/py-zope.app.rotterdam/Makefile
@@ -13,18 +13,18 @@ COMMENT= Zope 3 ZMI Skin
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:devel/py-zope.app.basicskin@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.schema/Makefile b/devel/py-zope.app.schema/Makefile
index c11fea2d9e7d..54790a90b73f 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.testing/Makefile b/devel/py-zope.app.testing/Makefile
index 309bbd3dcedb..77a408868a2e 100644
--- a/devel/py-zope.app.testing/Makefile
+++ b/devel/py-zope.app.testing/Makefile
@@ -13,24 +13,24 @@ COMMENT= Zope Application Testing Support
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.11.0:devel/py-zope.app.appsetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.debug>=0:devel/py-zope.app.debug@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:devel/py-zope.app.dependable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.password>=0:security/py-zope.password@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:devel/py-zope.testbrowser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.zcmlfiles/Makefile b/devel/py-zope.app.zcmlfiles/Makefile
index c241cc740939..6d9e8b0d5fad 100644
--- a/devel/py-zope.app.zcmlfiles/Makefile
+++ b/devel/py-zope.app.zcmlfiles/Makefile
@@ -13,42 +13,42 @@ COMMENT= Zope application server ZCML files
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.applicationcontrol>=0:devel/py-zope.app.applicationcontrol@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:devel/py-zope.app.appsetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:devel/py-zope.app.basicskin@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.broken>=0:devel/py-zope.app.broken@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:devel/py-zope.app.content@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:devel/py-zope.app.dependable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.error>=0:devel/py-zope.app.error@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.exception>=0:devel/py-zope.app.exception@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.folder>=0:devel/py-zope.app.folder@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.generations>=0:devel/py-zope.app.generations@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.http>=0:devel/py-zope.app.http@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.i18n>=0:textproc/py-zope.app.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.locales>=3.6.0:textproc/py-zope.app.locales@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.principalannotation>=0:security/py-zope.app.principalannotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.rotterdam>=0:devel/py-zope.app.rotterdam@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.schema>=0:devel/py-zope.app.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:security/py-zope.app.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.wsgi>=0:www/py-zope.app.wsgi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.zopeappgenerations>=0:devel/py-zope.app.zopeappgenerations@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.app.zopeappgenerations/Makefile b/devel/py-zope.app.zopeappgenerations/Makefile
index 8637bf63313b..e833bc46d03a 100644
--- a/devel/py-zope.app.zopeappgenerations/Makefile
+++ b/devel/py-zope.app.zopeappgenerations/Makefile
@@ -13,12 +13,12 @@ COMMENT= Zope Application ZODB Update Generations
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=0:security/py-zope.app.authentication@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.generations>=0:devel/py-zope.generations@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.applicationcontrol/Makefile b/devel/py-zope.applicationcontrol/Makefile
index 36cc6966cd97..6f142f4add8e 100644
--- a/devel/py-zope.applicationcontrol/Makefile
+++ b/devel/py-zope.applicationcontrol/Makefile
@@ -13,11 +13,11 @@ COMMENT= Zope applicationcontrol
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:devel/py-zope.traversing@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.broken/Makefile b/devel/py-zope.broken/Makefile
index 2d1bb3596cb4..40e022d57748 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
USES= python zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.browser/Makefile b/devel/py-zope.browser/Makefile
index 6a08719e102e..e5d6b6a3ed13 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-zope.browsermenu/Makefile b/devel/py-zope.browsermenu/Makefile
index 3dde06d0267d..d747ce3a29c5 100644
--- a/devel/py-zope.browsermenu/Makefile
+++ b/devel/py-zope.browsermenu/Makefile
@@ -13,16 +13,16 @@ COMMENT= Browser menu implementation for Zope
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5:devel/py-zope.pagetemplate@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.browserpage/Makefile b/devel/py-zope.browserpage/Makefile
index 015295a047d5..638c274db573 100644
--- a/devel/py-zope.browserpage/Makefile
+++ b/devel/py-zope.browserpage/Makefile
@@ -12,16 +12,16 @@ COMMENT= ZCML directives for configuring browser views for Zope
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=3.8:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-zope.browserresource/Makefile b/devel/py-zope.browserresource/Makefile
index 359d0ac51c3f..fb54964702b8 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>3.7:devel/py-zope.traversing@${PY_FLAVOR}
USES= python zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.component/Makefile b/devel/py-zope.component/Makefile
index 0a478f122a66..612ef0d2960d 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.0:devel/py-zope.interface@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.0:devel/py-zope.interface@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-zope.componentvocabulary/Makefile b/devel/py-zope.componentvocabulary/Makefile
index d1574207af04..c0348adbf380 100644
--- a/devel/py-zope.componentvocabulary/Makefile
+++ b/devel/py-zope.componentvocabulary/Makefile
@@ -13,11 +13,11 @@ COMMENT= Zope Component vocabularies
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.configuration/Makefile b/devel/py-zope.configuration/Makefile
index 9c790e0478af..e45eb9321809 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.container/Makefile b/devel/py-zope.container/Makefile
index d1b8d78d11fe..4d68a9f068b4 100644
--- a/devel/py-zope.container/Makefile
+++ b/devel/py-zope.container/Makefile
@@ -13,22 +13,22 @@ COMMENT= Zope Container
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=3.5.4:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=3.5.2:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.broken>=0:devel/py-zope.broken@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.contentprovider/Makefile b/devel/py-zope.contentprovider/Makefile
index f2eb005da233..d3b02526abc2 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1dev:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.copy/Makefile b/devel/py-zope.copy/Makefile
index 27a9f52c93c7..f83f936c1998 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.copypastemove/Makefile b/devel/py-zope.copypastemove/Makefile
index 2d6dfae9cca7..1828eda5af77 100644
--- a/devel/py-zope.copypastemove/Makefile
+++ b/devel/py-zope.copypastemove/Makefile
@@ -13,15 +13,15 @@ COMMENT= Copy, Paste, and Move support for content components
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.copy>=0:devel/py-zope.copy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.deferredimport/Makefile b/devel/py-zope.deferredimport/Makefile
index 3d2ab50f3794..e8c21494dd26 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.dublincore/Makefile b/devel/py-zope.dublincore/Makefile
index 39b1d90bfbb5..5fc1031f2806 100644
--- a/devel/py-zope.dublincore/Makefile
+++ b/devel/py-zope.dublincore/Makefile
@@ -13,13 +13,13 @@ COMMENT= Zope Dublin Core implementation
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.error/Makefile b/devel/py-zope.error/Makefile
index 95160c90cf6b..a1a4d897ad76 100644
--- a/devel/py-zope.error/Makefile
+++ b/devel/py-zope.error/Makefile
@@ -13,10 +13,10 @@ COMMENT= Error reporting utility for Zope3
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.exceptions/Makefile b/devel/py-zope.exceptions/Makefile
index 7a01a72e5d63..859d4012bb1a 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.filerepresentation/Makefile b/devel/py-zope.filerepresentation/Makefile
index bcec837552ab..2fe987d79d7e 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.formlib/Makefile b/devel/py-zope.formlib/Makefile
index 41daace79bb4..fa8b0b37cc59 100644
--- a/devel/py-zope.formlib/Makefile
+++ b/devel/py-zope.formlib/Makefile
@@ -13,20 +13,20 @@ COMMENT= Form generation and validation library for Zope
LICENSE= ZPL21
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:devel/py-zope.browserpage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/devel/py-zope.generations/Makefile b/devel/py-zope.generations/Makefile
index 2fca597bb412..0281d76eee07 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.globalrequest/Makefile b/devel/py-zope.globalrequest/Makefile
index a66a07669edf..e865c57f0e0a 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-zope.i18n/Makefile b/devel/py-zope.i18n/Makefile
index e1f7761a2634..c2a6cd8fe1e8 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
USES= gettext python
USE_PYTHON= autoplist distutils
diff --git a/devel/py-zope.lifecycleevent/Makefile b/devel/py-zope.lifecycleevent/Makefile
index 251e3669fb9f..9fe7f693874a 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.location/Makefile b/devel/py-zope.location/Makefile
index 28a3ba9a9358..8db9a4b13a9b 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.proxy>3.3:net/py-zope.proxy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6:devel/py-zope.schema@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.minmax/Makefile b/devel/py-zope.minmax/Makefile
index 6a39072f4723..7425acdc2072 100644
--- a/devel/py-zope.minmax/Makefile
+++ b/devel/py-zope.minmax/Makefile
@@ -13,8 +13,8 @@ COMMENT= Homogeneous values favoring maximum or minimum
LICENSE= ZPL21
-RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.pagetemplate/Makefile b/devel/py-zope.pagetemplate/Makefile
index e35295821626..eadd13cbca2f 100644
--- a/devel/py-zope.pagetemplate/Makefile
+++ b/devel/py-zope.pagetemplate/Makefile
@@ -13,14 +13,14 @@ COMMENT= Zope Page Templates
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.processlifetime/Makefile b/devel/py-zope.processlifetime/Makefile
index dfa13b445640..c79995b6a9d3 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.ptresource/Makefile b/devel/py-zope.ptresource/Makefile
index 7c1eb014d0c9..b0743ea73736 100644
--- a/devel/py-zope.ptresource/Makefile
+++ b/devel/py-zope.ptresource/Makefile
@@ -13,11 +13,11 @@ COMMENT= Page template resource plugin for zope.browserresource
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.publisher/Makefile b/devel/py-zope.publisher/Makefile
index 4d2506ab3b5a..ce5b43730e69 100644
--- a/devel/py-zope.publisher/Makefile
+++ b/devel/py-zope.publisher/Makefile
@@ -13,17 +13,17 @@ 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=3.5:devel/py-zope.contenttype@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR}
USES= python zip
USE_PYTHON= autoplist distutils
diff --git a/devel/py-zope.ramcache/Makefile b/devel/py-zope.ramcache/Makefile
index d4607e4dd732..053758b1ec61 100644
--- a/devel/py-zope.ramcache/Makefile
+++ b/devel/py-zope.ramcache/Makefile
@@ -13,10 +13,10 @@ COMMENT= Zope RAM Cache
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.schema/Makefile b/devel/py-zope.schema/Makefile
index dea3aa88d73a..c24f2979c4a9 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.site/Makefile b/devel/py-zope.site/Makefile
index d435b626bf40..6d53512c05a9 100644
--- a/devel/py-zope.site/Makefile
+++ b/devel/py-zope.site/Makefile
@@ -13,14 +13,14 @@ COMMENT= Local registries for zope component architecture
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:devel/py-zope.location@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.size/Makefile b/devel/py-zope.size/Makefile
index 7670f4162054..e6c28f35dab5 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.tales/Makefile b/devel/py-zope.tales/Makefile
index f5638d2f4499..14aff21ad2c6 100644
--- a/devel/py-zope.tales/Makefile
+++ b/devel/py-zope.tales/Makefile
@@ -13,8 +13,8 @@ COMMENT= Zope Template Application Language Expression Syntax (TALES)
LICENSE= ZPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.testbrowser/Makefile b/devel/py-zope.testbrowser/Makefile
index 218a655b7355..174a105a329d 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mechanize>=0.2.0:www/py-mechanize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.testing/Makefile b/devel/py-zope.testing/Makefile
index 053bd2d819cc..53ab2e358e57 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.traversing/Makefile b/devel/py-zope.traversing/Makefile
index 46f28a67f108..92ea9e26b7e5 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:net/py-zope.proxy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:devel/py-zope.location@${PY_FLAVOR}
USES= python zip
USE_PYTHON= distutils autoplist
diff --git a/devel/py-zope.viewlet/Makefile b/devel/py-zope.viewlet/Makefile
index fcb6e6097498..aa40af676d25 100644
--- a/devel/py-zope.viewlet/Makefile
+++ b/devel/py-zope.viewlet/Makefile
@@ -13,17 +13,17 @@ COMMENT= Zope Viewlets
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:devel/py-zope.browserpage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/py_static_check/Makefile b/devel/py_static_check/Makefile
index c4e4d3193008..28b6fbca5c20 100644
--- a/devel/py_static_check/Makefile
+++ b/devel/py_static_check/Makefile
@@ -12,7 +12,7 @@ COMMENT= Statically check your python code
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile
index c57d7b0ede1a..931f8479898e 100644
--- a/devel/pygobject3-common/Makefile
+++ b/devel/pygobject3-common/Makefile
@@ -58,8 +58,8 @@ RUN_DEPENDS+= pygobject3-common>=0:devel/pygobject3-common
.if ${SLAVE_PORT} == python
USES+= python
USE_PYTHON= flavors
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${FLAVOR}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${FLAVOR}
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR}
.endif
post-install:
diff --git a/devel/pylint/Makefile b/devel/pylint/Makefile
index c6e5673b7a0c..a8d4a6ba764c 100644
--- a/devel/pylint/Makefile
+++ b/devel/pylint/Makefile
@@ -13,11 +13,11 @@ 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astroid>=1.6:devel/py-astroid@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astroid>=1.6:devel/py-astroid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}isort>=4.2.5:devel/py-isort@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mccabe>=0:devel/py-mccabe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= concurrent distutils py3kplist
@@ -28,12 +28,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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=0:devel/py-backports.functools_lru_cache@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser@${PY_FLAVOR}
.endif
.if ${PYTHON_REL} < 3400
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/devel/qbzr/Makefile b/devel/qbzr/Makefile
index 48b9fbd24945..9b983ee814e4 100644
--- a/devel/qbzr/Makefile
+++ b/devel/qbzr/Makefile
@@ -14,8 +14,8 @@ COMMENT= Qt interface for bzr
LICENSE= GPLv2
BUILD_DEPENDS= bzr:devel/bzr \
- ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${PY_FLAVOR}
RUN_DEPENDS= bzr:devel/bzr
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/devel/rbtools/Makefile b/devel/rbtools/Makefile
index 199ebb36b5a5..705a70d87d1a 100644
--- a/devel/rbtools/Makefile
+++ b/devel/rbtools/Makefile
@@ -12,9 +12,9 @@ COMMENT= Set of client tools to use with Review Board
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR}
ORIGNAME= RBTools
diff --git a/devel/renpy/Makefile b/devel/renpy/Makefile
index 946f3fddc7ad..451ce353682a 100644
--- a/devel/renpy/Makefile
+++ b/devel/renpy/Makefile
@@ -16,12 +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@${FLAVOR}
+BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}game_sdl2>0:devel/py-game_sdl2@${PY_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@${FLAVOR}
+RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}game_sdl2>=${PORTVERSION}:devel/py-game_sdl2@${PY_FLAVOR}
CONFLICTS_INSTALL?= ${PORTNAME}6-*
@@ -60,7 +60,7 @@ DIST_VARS= LICENSE+="ART20 PSFL" \
PORTDATA+="lib renpy.app renpy.exe renpy.sh"
EXAMPLES_VARS= PORTDATA+="the_question tutorial"
TKINTER_DESC= Install Tkinter to allow choosing Projects Directory
-TKINTER_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR}
+TKINTER_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
. for lic in FREETYPE LIBJPEG LIBPNG MSVCR90
DIST_VARS+= LICENSE+=${lic}
diff --git a/devel/runsnakerun/Makefile b/devel/runsnakerun/Makefile
index c24d977d5182..a6d2165d4189 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}meliae>0:devel/py-meliae@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}SquareMap>0:x11-toolkits/py-SquareMap@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}meliae>0:devel/py-meliae@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile
index 47eab929433f..f896a79d4057 100644
--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@@ -12,8 +12,8 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING.txt
RUN_DEPENDS= hg:devel/mercurial \
- ${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR}
OPTIONS_DEFINE= NAUTILUS NLS
NAUTILUS_DESC= Install TortoiseHG Nautilus extension
diff --git a/dns/dnsviz/Makefile b/dns/dnsviz/Makefile
index 621a5e4883d8..1628e8e34fb8 100644
--- a/dns/dnsviz/Makefile
+++ b/dns/dnsviz/Makefile
@@ -10,9 +10,9 @@ COMMENT= Analysis and visualization of DNS/DNSSEC behavior
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.1:graphics/py-pygraphviz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.24.0:security/py-m2crypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dnspython>=1.11.0:dns/py-dnspython@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils concurrent optsuffix
diff --git a/dns/py-cloudflare/Makefile b/dns/py-cloudflare/Makefile
index d58165a103b3..02f85550030e 100644
--- a/dns/py-cloudflare/Makefile
+++ b/dns/py-cloudflare/Makefile
@@ -12,10 +12,10 @@ COMMENT= wrapper for the Cloudflare v4 API
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}jsonlines>=0:devel/py-jsonlines@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonlines>=0:devel/py-jsonlines@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/dns/py-dns-lexicon/Makefile b/dns/py-dns-lexicon/Makefile
index a0b2b8ebf917..f320063b4783 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:devel/py-future@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tldextract>0:dns/py-tldextract@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tldextract>0:dns/py-tldextract@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/dns/py-dnspython/Makefile b/dns/py-dnspython/Makefile
index 0115d59f41e5..6d318199f7c9 100644
--- a/dns/py-dnspython/Makefile
+++ b/dns/py-dnspython/Makefile
@@ -19,7 +19,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@${FLAVOR}
+PYCRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_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 eec61e6d8dd9..586926900f54 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/dns/py-idna_ssl/Makefile b/dns/py-idna_ssl/Makefile
index 5e867d453783..8d883c2fab4e 100644
--- a/dns/py-idna_ssl/Makefile
+++ b/dns/py-idna_ssl/Makefile
@@ -14,11 +14,11 @@ COMMENT= Patch ssl.match_hostname for Unicode(idna) domains support
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=2.3:www/py-aiohttp@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=2.3:www/py-aiohttp@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist distutils
diff --git a/dns/py-namebench/Makefile b/dns/py-namebench/Makefile
index bac13ad2d016..bc1ad71b096d 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@${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}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.5.5:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}graphy>=1.0:graphics/py-graphy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.6.0:www/py-httplib2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.6:devel/py-simplejson@${PY_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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>=2.7.1:x11-toolkits/py-tkinter@${PY_FLAVOR}
.endif
MAKE_ENV+= NO_THIRD_PARTY=yes
diff --git a/dns/py-py3dns/Makefile b/dns/py-py3dns/Makefile
index 311cf4754ae5..994bb341d133 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist distutils
diff --git a/dns/py-tld/Makefile b/dns/py-tld/Makefile
index 0c929480def9..dd26f9e5185a 100644
--- a/dns/py-tld/Makefile
+++ b/dns/py-tld/Makefile
@@ -12,7 +12,7 @@ COMMENT= Extract the top level domain (TLD) from the URL given
LICENSE= MPL11 GPLv2 LGPL21
LICENSE_COMB= multi
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python shebangfix
diff --git a/dns/py-tldextract/Makefile b/dns/py-tldextract/Makefile
index b11e4c66a312..da3534b61596 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/dns/sshfp/Makefile b/dns/sshfp/Makefile
index 9d9985a5a4a4..c50e75b12cab 100644
--- a/dns/sshfp/Makefile
+++ b/dns/sshfp/Makefile
@@ -11,10 +11,10 @@ COMMENT= Generate SSHFP DNS records from knownhosts files or ssh-keyscan
LICENSE= GPLv2
-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} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipcalc>=0.6:net-mgmt/py-ipcalc@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/ldns.py:dns/py-ldns@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python shebangfix
USE_PYTHON= flavors concurrent optsuffix
diff --git a/editors/gwrite/Makefile b/editors/gwrite/Makefile
index 8de253deded4..7acc01013320 100644
--- a/editors/gwrite/Makefile
+++ b/editors/gwrite/Makefile
@@ -14,13 +14,13 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}jswebkit>=0:www/py-jswebkit@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:www/py-webkitgtk@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.15:devel/py-python-distutils-extra@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jswebkit>=0:www/py-jswebkit@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:www/py-webkitgtk@${PY_FLAVOR}
RUN_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme \
wvHtml:textproc/wv \
- ${PYTHON_PKGNAMEPREFIX}jswebkit>=0:www/py-jswebkit@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:www/py-webkitgtk@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}jswebkit>=0:www/py-jswebkit@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:www/py-webkitgtk@${PY_FLAVOR}
NO_ARCH= yes
USES= desktop-file-utils gettext-tools python:2.7
diff --git a/editors/leo/Makefile b/editors/leo/Makefile
index 00699cfe0316..d7f58647fe3c 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
silvercity>0:textproc/silvercity
USES= pyqt:4 python:2.7 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@${FLAVOR}
+PYENCHANT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant@${PY_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 a3251d4feb08..4821c89a1837 100644
--- a/editors/py-room/Makefile
+++ b/editors/py-room/Makefile
@@ -12,7 +12,7 @@ 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${PY_FLAVOR}
USES= gettext python:2.7
USE_PYTHON= distutils
diff --git a/emulators/dynagen/Makefile b/emulators/dynagen/Makefile
index 80003d9efecd..313b1059bbfd 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@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.4.0:devel/py-configobj@${PY_FLAVOR} \
dynamips:emulators/dynamips-community
PLIST_FILES= bin/dynagen "@sample etc/dynagen.ini.sample"
diff --git a/emulators/gns3/Makefile b/emulators/gns3/Makefile
index 58b4ff1e652b..938423145c22 100644
--- a/emulators/gns3/Makefile
+++ b/emulators/gns3/Makefile
@@ -14,9 +14,9 @@ COMMENT= Graphical Cisco network simulator
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-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} \
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network@${PY_FLAVOR} \
dynamips:emulators/dynamips-community \
dynagen:emulators/dynagen \
xdotool:x11/xdotool
diff --git a/emulators/py-nova/Makefile b/emulators/py-nova/Makefile
index 1b7856f73aeb..431f7fc7728b 100644
--- a/emulators/py-nova/Makefile
+++ b/emulators/py-nova/Makefile
@@ -15,65 +15,65 @@ LICENSE= APACHE20
BROKEN= depends on conflicting dependencies
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-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} \
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0:security/py-paramiko@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-neutronclient>=5.1.0:net/py-python-neutronclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}websockify>=0.8.0:devel/py-websockify@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.cache>=1.5.0:devel/py-oslo.cache@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.reports>=0.6.0:devel/py-oslo.reports@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.0.0:devel/py-oslo.rootwrap@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rfc3986>=0.2.2:www/py-rfc3986@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psutil121>=0:sysutils/py-psutil121@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}os-brick>=1.6.1:devel/py-os-brick@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}os-vif>=1.1.0:devel/py-os-vif@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}os-win>=0.2.3:devel/py-os-win@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}microversion-parse>=0.1.2:devel/py-microversion-parse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wsgi_intercept>=0.6.1:devel/py-wsgi_intercept@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}libvirt>=0:devel/py-libvirt@${PY_FLAVOR} \
e2fsprogs>=0:sysutils/e2fsprogs \
arping>=0:net/arping \
bash:shells/bash
diff --git a/finance/electrum/Makefile b/finance/electrum/Makefile
index 05cbea1f8971..7b542f53aea8 100644
--- a/finance/electrum/Makefile
+++ b/finance/electrum/Makefile
@@ -14,16 +14,16 @@ COMMENT= Easy to use Bitcoin client
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENCE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonrpclib-pelix>0:devel/py-jsonrpclib-pelix@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}protobuf>=2.6.0:devel/py-protobuf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyaes>0:security/py-pyaes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}qrcode>=5.1:textproc/py-qrcode@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${PY_FLAVOR}
CONFLICTS_INSTALL= electrum2-*
@@ -40,8 +40,8 @@ OPTIONS_DEFAULT=LEDGER TREZOR
LEDGER_DESC= Enable LEDGER Bitcoin hardware wallet support
TREZOR_DESC= Enable TREZOR Bitcoin hardware wallet support
-LEDGER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}btchip-python>0:security/py-btchip-python@${FLAVOR}
-TREZOR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}trezor>0:security/py-trezor@${FLAVOR}
+LEDGER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}btchip-python>0:security/py-btchip-python@${PY_FLAVOR}
+TREZOR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}trezor>0:security/py-trezor@${PY_FLAVOR}
LEDGER_PLIST_FILES= "@sample etc/devd/ledger_wallet.conf.sample"
TREZOR_PLIST_FILES= "@sample etc/devd/trezor_wallet.conf.sample"
diff --git a/finance/py-python-obelisk/Makefile b/finance/py-python-obelisk/Makefile
index b403022c987b..e0bebbfeac0c 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyzmq>=14.5.0:net/py-pyzmq@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyzmq>=14.5.0:net/py-pyzmq@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/finance/py-stripe/Makefile b/finance/py-stripe/Makefile
index 8e9155170d37..6283deff58ba 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.8.8:www/py-requests@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19:ftp/py-pycurl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/finance/py-vatnumber/Makefile b/finance/py-vatnumber/Makefile
index 94bdf14dc1a7..d61afb0bd3a2 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stdnum>=1.1:devel/py-stdnum@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/finance/sabernetdcs-client/Makefile b/finance/sabernetdcs-client/Makefile
index dda38d739f27..4a9a196af23c 100644
--- a/finance/sabernetdcs-client/Makefile
+++ b/finance/sabernetdcs-client/Makefile
@@ -15,7 +15,7 @@ COMMENT= SaberNet DCS - A labor data collection system
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyro>=0:devel/py-pyro@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyro>=0:devel/py-pyro@${PY_FLAVOR}
USE_GNOME= pygtk2
USE_PYTHON= distutils
diff --git a/finance/tryton28/Makefile b/finance/tryton28/Makefile
index fde0c1ce15e5..74a793fd1ac5 100644
--- a/finance/tryton28/Makefile
+++ b/finance/tryton28/Makefile
@@ -14,8 +14,8 @@ COMMENT= Tryton Application Platform (Gtk+ Client)
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>=2012:devel/py-pytz@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2012:devel/py-pytz@${PY_FLAVOR}
CONFLICTS= tryton-2.[46].*
diff --git a/finance/trytond28/Makefile b/finance/trytond28/Makefile
index 10ef912a99df..766d1d89c892 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@${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}
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/mx/__init__.py:lang/py-mx-base@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Genshi>0.5.1:textproc/py-genshi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}relatorio>=0.6.0:print/py-relatorio@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}polib>=0.7.0:devel/py-polib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFLICTS= trytond-2.[46].*
@@ -52,19 +52,19 @@ post-patch:
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MWEBDAV}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav@${PY_FLAVOR}
.endif
.if ${PORT_OPTIONS:MPYOPENSSL}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR}
.endif
.if ${PORT_OPTIONS:MPYDOT}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${PY_FLAVOR}
.endif
.if ${PORT_OPTIONS:MPYTZ}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR}
.endif
post-install:
diff --git a/finance/trytond28_account/Makefile b/finance/trytond28_account/Makefile
index fb3c59b46502..0f7804ed4611 100644
--- a/finance/trytond28_account/Makefile
+++ b/finance/trytond28_account/Makefile
@@ -15,7 +15,7 @@ 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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR}
CONFLICTS= trytond_account-2.[46].*
diff --git a/finance/trytond28_calendar/Makefile b/finance/trytond28_calendar/Makefile
index 1c55b2de732f..520ea578e4f4 100644
--- a/finance/trytond28_calendar/Makefile
+++ b/finance/trytond28_calendar/Makefile
@@ -14,10 +14,10 @@ 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@${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}
+ ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR}
CONFLICTS= trytond_calendar-2.[46].*
diff --git a/finance/trytond28_ldap_connection/Makefile b/finance/trytond28_ldap_connection/Makefile
index 81b5fb1bac42..2cb4d62cb341 100644
--- a/finance/trytond28_ldap_connection/Makefile
+++ b/finance/trytond28_ldap_connection/Makefile
@@ -15,7 +15,7 @@ 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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.10:net/py-ldap@${PY_FLAVOR}
CONFLICTS= trytond_ldap_connection-2.[46].*
diff --git a/finance/trytond28_party/Makefile b/finance/trytond28_party/Makefile
index 041199a66419..554e95d152df 100644
--- a/finance/trytond28_party/Makefile
+++ b/finance/trytond28_party/Makefile
@@ -15,7 +15,7 @@ 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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}vatnumber>=1.0.0:finance/py-vatnumber@${PY_FLAVOR}
CONFLICTS= trytond_party-2.[46].*
diff --git a/finance/trytond28_party_vcarddav/Makefile b/finance/trytond28_party_vcarddav/Makefile
index 37cc73cba703..b535af4880e5 100644
--- a/finance/trytond28_party_vcarddav/Makefile
+++ b/finance/trytond28_party_vcarddav/Makefile
@@ -15,8 +15,8 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav@${PY_FLAVOR}
CONFLICTS= trytond_party_vcarddav-2.[46].*
diff --git a/finance/trytond28_stock_forecast/Makefile b/finance/trytond28_stock_forecast/Makefile
index bbba00ca76fc..e8160ae15f3f 100644
--- a/finance/trytond28_stock_forecast/Makefile
+++ b/finance/trytond28_stock_forecast/Makefile
@@ -13,7 +13,7 @@ COMMENT= Tryton Application Platform (Stock Forecast Module)
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR} \
trytond28_stock>=2.8.2:finance/trytond28_stock
CONFLICTS= trytond_stock_forecast-2.[46].*
diff --git a/ftp/py-pyftpdlib/Makefile b/ftp/py-pyftpdlib/Makefile
index dfd757c0060c..25a17b3235c1 100644
--- a/ftp/py-pyftpdlib/Makefile
+++ b/ftp/py-pyftpdlib/Makefile
@@ -21,8 +21,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@${FLAVOR}
-OPENSSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR}
+SENDFILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysendfile>0:net/py-pysendfile@${PY_FLAVOR}
+OPENSSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
PORTEXAMPLES= *
diff --git a/ftp/py-sftp/Makefile b/ftp/py-sftp/Makefile
index 7e7609f863f2..7ff32e8cc9bd 100644
--- a/ftp/py-sftp/Makefile
+++ b/ftp/py-sftp/Makefile
@@ -12,7 +12,7 @@ COMMENT= Simple interface to SFTP
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.17:security/py-paramiko@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.17:security/py-paramiko@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/games/balazar/Makefile b/games/balazar/Makefile
index 872366060206..675537de2d52 100644
--- a/games/balazar/Makefile
+++ b/games/balazar/Makefile
@@ -15,12 +15,12 @@ LICENSE= GPLv2+
LIB_DEPENDS= libcal3d.so:graphics/cal3d \
libfreetype.so:print/freetype2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}soya3d>0: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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}soya3d>0:graphics/py-soya3d@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tofu>0:net/py-tofu@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cerealizer>0:security/py-cerealizer@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index 4b899cf352a8..4604e40123eb 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -10,7 +10,7 @@ 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext@${PY_FLAVOR}
USES= desktop-file-utils python:2.7 shared-mime-info
USE_GNOME= gconf2
diff --git a/games/hypatia_engine/Makefile b/games/hypatia_engine/Makefile
index d5ed0ef87e92..176548810f64 100644
--- a/games/hypatia_engine/Makefile
+++ b/games/hypatia_engine/Makefile
@@ -13,8 +13,8 @@ COMMENT= Game engine for 2D top-down, tile-based action RPGs
LICENSE= MIT
RUN_DEPENDS= ${PYGAME} \
- ${PYTHON_PKGNAMEPREFIX}pyganim>0:graphics/py-pyganim@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyganim>0:graphics/py-pyganim@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
${PY_ENUM34}
USES= python
diff --git a/games/poker-engine/Makefile b/games/poker-engine/Makefile
index b2a54a7d269b..d85e665247b1 100644
--- a/games/poker-engine/Makefile
+++ b/games/poker-engine/Makefile
@@ -14,13 +14,13 @@ LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/bin/rsync:net/rsync \
- ${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}
+ ${PYTHON_SITELIBDIR}/pokereval.py:games/py-poker-eval@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt@${PY_FLAVOR}
RUN_DEPENDS= ${LOCALBASE}/bin/rsync:net/rsync \
- ${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}
+ ${PYTHON_SITELIBDIR}/pokereval.py:games/py-poker-eval@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt@${PY_FLAVOR}
USES= gettext gmake pathfix pkgconfig python:2.7
USE_PYTHON= flavors
diff --git a/games/py-sgfsummary/Makefile b/games/py-sgfsummary/Makefile
index 9ccb08671351..dacde9381eaf 100644
--- a/games/py-sgfsummary/Makefile
+++ b/games/py-sgfsummary/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= SGF Summarizer
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sgflib.py:games/py-sgflib@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sgflib.py:games/py-sgflib@${PY_FLAVOR}
USES= python shebangfix tar:tgz
USE_PYTHON= flavors
diff --git a/games/pythonsudoku/Makefile b/games/pythonsudoku/Makefile
index 1405c333928b..4c6d01504adc 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1@${PY_FLAVOR}
USES= python:2.7 tar:bzip2
USE_GNOME= pygtk2
diff --git a/games/slune/Makefile b/games/slune/Makefile
index d40b07d643c6..191a852bea97 100644
--- a/games/slune/Makefile
+++ b/games/slune/Makefile
@@ -14,10 +14,10 @@ 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}soya3d>0:graphics/py-soya3d@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}py2play>0:net-p2p/py-py2play@${PY_FLAVOR}
USES= dos2unix gettext python:2.7 tar:bzip2
DOS2UNIX_GLOB= *.po *.mo
diff --git a/games/unknown-horizons/Makefile b/games/unknown-horizons/Makefile
index 0d84ffed3c3e..3e891f7b5258 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@${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}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/fife/__init__.py:games/py-fife@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR}
ONLY_FOR_ARCHS= i386 amd64
diff --git a/graphics/caffe/Makefile b/graphics/caffe/Makefile
index 06f7da93d425..20dde9a199de 100644
--- a/graphics/caffe/Makefile
+++ b/graphics/caffe/Makefile
@@ -29,12 +29,12 @@ 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@${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}
+ ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scikit-image>=0.12:graphics/py-scikit-image@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets@${PY_FLAVOR}
USE_LDCONFIG= yes
USES= gmake python:2.7 fortran compiler:c++11-lib pkgconfig
diff --git a/graphics/imgtops/Makefile b/graphics/imgtops/Makefile
index 93bc552b5435..8c100664f3ed 100644
--- a/graphics/imgtops/Makefile
+++ b/graphics/imgtops/Makefile
@@ -13,7 +13,7 @@ COMMENT= Create efficient Encapsulated Postscript files from images
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
USES= ghostscript:run python:2.7
USE_PYTHON= distutils
diff --git a/graphics/py-PyOpenGL/Makefile b/graphics/py-PyOpenGL/Makefile
index e15a8e9307f8..66e96eba67f0 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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_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@${FLAVOR}
-TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR}
+TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
+TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
post-patch:
@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile
index 94420721c58b..2d6c09f3ec27 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= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR}
USES= python:-3.4
USE_PYTHON= autoplist distutils
diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile
index 583f805c0e61..0e098b7e468d 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= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors@${PY_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= ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${FLAVOR}
+PDF_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_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 8e73f5a58639..2969be386f2b 100644
--- a/graphics/py-blockdiagcontrib-cisco/Makefile
+++ b/graphics/py-blockdiagcontrib-cisco/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Networking shapes for blockdiag designed by Cisco
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blockdiag>=0.8.0:graphics/py-blockdiag@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blockdiag>=0.8.0:graphics/py-blockdiag@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/graphics/py-cairocffi/Makefile b/graphics/py-cairocffi/Makefile
index 4d9ab0c1e484..0ff276fc530e 100644
--- a/graphics/py-cairocffi/Makefile
+++ b/graphics/py-cairocffi/Makefile
@@ -13,7 +13,7 @@ COMMENT= Cairo cffi-based cairo bindings for Python
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}
BUILD_DEPENDS= ${RUN_DEPENDS}
USES= python
diff --git a/graphics/py-cartopy/Makefile b/graphics/py-cartopy/Makefile
index 6366f7ba24c1..32010e583c15 100644
--- a/graphics/py-cartopy/Makefile
+++ b/graphics/py-cartopy/Makefile
@@ -20,9 +20,9 @@ BUILD_DEPENDS= geos>-3.3.3:graphics/geos \
LIB_DEPENDS= libgeos.so:graphics/geos \
libproj.so:graphics/proj
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}pyshp>=1.1.4:devel/py-pyshp@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Shapely>=1.5.6:devel/py-shapely@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pyshp>=1.1.4:devel/py-pyshp@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Shapely>=1.5.6:devel/py-shapely@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/py-six@${PY_FLAVOR}
USE_PYTHON= autoplist concurrent cython distutils
USES= python
diff --git a/graphics/py-gdal/Makefile b/graphics/py-gdal/Makefile
index 0451cd5ca8f1..4844e85c3322 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= ${PYTHON_PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy@${FLAVOR}
-NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy@${FLAVOR}
+NUMPY_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy@${PY_FLAVOR}
+NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy@${PY_FLAVOR}
NUMPY_USES= fortran
post-install:
diff --git a/graphics/py-gizeh/Makefile b/graphics/py-gizeh/Makefile
index 38192c384d65..2d28e6ae6247 100644
--- a/graphics/py-gizeh/Makefile
+++ b/graphics/py-gizeh/Makefile
@@ -13,7 +13,7 @@ COMMENT= Simple vector graphics in Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENCE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairocffi>0:graphics/py-cairocffi@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairocffi>0:graphics/py-cairocffi@${PY_FLAVOR} \
${PYNUMPY}
USES= python
diff --git a/graphics/py-glewpy/Makefile b/graphics/py-glewpy/Makefile
index 9f217bc7146a..0a2a8d089b23 100644
--- a/graphics/py-glewpy/Makefile
+++ b/graphics/py-glewpy/Makefile
@@ -16,7 +16,7 @@ PATCHFILES= glewpy-${PORTVERSION}-generatedsources.diff.bz2
MAINTAINER= acm@FreeBSD.org
COMMENT= Advanced OpenGL extensions to Python
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>=0.9.6.2:devel/pyrex@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>=0.9.6.2:devel/pyrex@${PY_FLAVOR}
USES= python:2.7
USE_GL= glew
diff --git a/graphics/py-graphviz/Makefile b/graphics/py-graphviz/Makefile
index 5885cece11ca..a9f5283749b6 100644
--- a/graphics/py-graphviz/Makefile
+++ b/graphics/py-graphviz/Makefile
@@ -14,8 +14,8 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= dot:graphics/graphviz
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR}
NO_ARCH= yes
USES= python zip
diff --git a/graphics/py-imageio/Makefile b/graphics/py-imageio/Makefile
index f1e1d83b8fbc..db23f4744516 100644
--- a/graphics/py-imageio/Makefile
+++ b/graphics/py-imageio/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libfreeimage.so:graphics/freeimage
RUN_DEPENDS= ffmpeg:multimedia/ffmpeg \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
${PYNUMPY}
USES= python
diff --git a/graphics/py-imgurpython/Makefile b/graphics/py-imgurpython/Makefile
index 13320932880e..c368cbad1565 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.7:www/py-requests@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/graphics/py-leather/Makefile b/graphics/py-leather/Makefile
index 5c35a25cb630..0b52154568dd 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/graphics/py-mcomix/Makefile b/graphics/py-mcomix/Makefile
index 07a362aa659d..7d077d8bdc82 100644
--- a/graphics/py-mcomix/Makefile
+++ b/graphics/py-mcomix/Makefile
@@ -14,7 +14,7 @@ COMMENT= GTK2 comic book viewer
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7 tar:bzip2
diff --git a/graphics/py-nwdiag/Makefile b/graphics/py-nwdiag/Makefile
index b9fead175ae2..b8ecc15fd609 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= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR}
USES= python:-3.4
USE_PYTHON= autoplist distutils
diff --git a/graphics/py-photocollage/Makefile b/graphics/py-photocollage/Makefile
index 7ae8490dc5f8..0b4b2945b8fa 100644
--- a/graphics/py-photocollage/Makefile
+++ b/graphics/py-photocollage/Makefile
@@ -12,9 +12,9 @@ COMMENT= Graphical tool to make photo collage posters
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>:devel/py-six@${PY_FLAVOR}
USES= gettext-tools python
USE_PYTHON= autoplist concurrent distutils
diff --git a/graphics/py-pillow/Makefile b/graphics/py-pillow/Makefile
index 15a68ead5b8f..9bc0165b3a13 100644
--- a/graphics/py-pillow/Makefile
+++ b/graphics/py-pillow/Makefile
@@ -14,8 +14,8 @@ LICENSE_NAME= Standard PIL License
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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
OPTIONS_DEFINE= FREETYPE JPEG JPEG2000 LCMS PNG TIFF TKINTER WEBP
OPTIONS_DEFAULT= FREETYPE JPEG JPEG2000 PNG TKINTER WEBP
@@ -47,8 +47,8 @@ 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@${FLAVOR}
-TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR}
+TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
+TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
TKINTER_VARS= PYDISTUTILS_BUILDARGS+="--include-dirs=${TCL_INCLUDEDIR}:${TK_INCLUDEDIR}"
WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
diff --git a/graphics/py-plotly/Makefile b/graphics/py-plotly/Makefile
index a130e0bf4d69..c8ff001b160d 100644
--- a/graphics/py-plotly/Makefile
+++ b/graphics/py-plotly/Makefile
@@ -12,10 +12,10 @@ COMMENT= Plotting library for collaborative, interactive, publication-quality gr
LICENSE= MIT
-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} \
- ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/graphics/py-pycha/Makefile b/graphics/py-pycha/Makefile
index 30e5565fadd3..500f8e271c81 100644
--- a/graphics/py-pycha/Makefile
+++ b/graphics/py-pycha/Makefile
@@ -20,6 +20,6 @@ NO_ARCH= yes
OPTIONS_DEFINE= CAIRO
OPTIONS_DEFAULT= CAIRO
-CAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${FLAVOR}
+CAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/graphics/py-pycollada/Makefile b/graphics/py-pycollada/Makefile
index 4669401e52a6..2f74ffcc686c 100644
--- a/graphics/py-pycollada/Makefile
+++ b/graphics/py-pycollada/Makefile
@@ -12,8 +12,8 @@ COMMENT= Python library for reading and writing collada documents
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil@${PY_FLAVOR}
NO_ARCH= yes
USES= python
@@ -22,6 +22,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@${FLAVOR}
+LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/graphics/py-pydot/Makefile b/graphics/py-pydot/Makefile
index 2cbfc8373ea5..be1c669ad578 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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.4:devel/py-pyparsing@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/graphics/py-pygal/Makefile b/graphics/py-pygal/Makefile
index b872bbafa570..9ce084b4bef9 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/graphics/py-pygraphviz/Makefile b/graphics/py-pygraphviz/Makefile
index c8a068cf40c7..c85899e75c05 100644
--- a/graphics/py-pygraphviz/Makefile
+++ b/graphics/py-pygraphviz/Makefile
@@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libcgraph.so:graphics/graphviz
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.10.1:devel/py-nose@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.10.1:devel/py-nose@${PY_FLAVOR}
USES= pkgconfig python
USE_PYTHON= autoplist concurrent distutils
diff --git a/graphics/py-sane/Makefile b/graphics/py-sane/Makefile
index e1b3a4cc3676..d29f0614b26d 100644
--- a/graphics/py-sane/Makefile
+++ b/graphics/py-sane/Makefile
@@ -14,7 +14,7 @@ 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
DIST_SUBDIR= python
USES= python:2.7
diff --git a/graphics/py-scikit-image/Makefile b/graphics/py-scikit-image/Makefile
index 9caad9594e44..1819afea60c6 100644
--- a/graphics/py-scikit-image/Makefile
+++ b/graphics/py-scikit-image/Makefile
@@ -14,17 +14,17 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= ${PYNUMPY} \
- ${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}six>=1.4:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${PY_FLAVOR}
RUN_DEPENDS= ${PYNUMPY} \
- ${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}
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets@${PY_FLAVOR}
USES= cpe python
USE_GITHUB= yes
diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile
index 062b127057ea..1a49525f7578 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= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR}
USES= python:-3.4
USE_PYTHON= autoplist distutils
diff --git a/graphics/py-sk1/Makefile b/graphics/py-sk1/Makefile
index 07812761aaa8..92d6c2547052 100644
--- a/graphics/py-sk1/Makefile
+++ b/graphics/py-sk1/Makefile
@@ -14,11 +14,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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycups>0:print/py-pycups@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR}
USES= desktop-file-utils python:2.7
USE_GITHUB= yes
diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile
index 59ac59a3db2b..63358e8246ea 100644
--- a/graphics/py-soya3d/Makefile
+++ b/graphics/py-soya3d/Makefile
@@ -14,13 +14,13 @@ DIST_SUBDIR= python
MAINTAINER= ports@FreeBSD.org
COMMENT= Very high level 3D engine for Python
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_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@${FLAVOR} \
- ${PYTHON_SITELIBDIR}/tofu/client.py:net/py-tofu@${FLAVOR} \
- ${PYTHON_SITELIBDIR}/cerealizer/__init__.py:security/py-cerealizer@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/editobj/editor.py:graphics/py-editobj@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/tofu/client.py:net/py-tofu@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/cerealizer/__init__.py:security/py-cerealizer@${PY_FLAVOR}
USES= gmake openal:al,alut python:2.7 tar:bzip2
USE_GL= glew glu
diff --git a/graphics/py-stltools/Makefile b/graphics/py-stltools/Makefile
index cf8a8f21b537..ac54a9a8de70 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@${FLAVOR}
+PYCAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>1.8:graphics/py-cairo@${PY_FLAVOR}
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/graphics/py-toyplot/Makefile b/graphics/py-toyplot/Makefile
index 379020bb754c..fa5b724eb018 100644
--- a/graphics/py-toyplot/Makefile
+++ b/graphics/py-toyplot/Makefile
@@ -12,11 +12,11 @@ COMMENT= Modern plotting toolkit supporting electronic publishing
LICENSE= BSD3CLAUSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.8:math/py-numpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}colormath>=2.1.1:math/py-colormath@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}multipledispatch>=0.4.7:devel/py-multipledispatch@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}png>=0.0.17:graphics/py-png@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}reportlab>=3.2.0:print/py-reportlab@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/graphics/py-traitsui/Makefile b/graphics/py-traitsui/Makefile
index ddbda011c654..c14ac8990848 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apptools>=4.3.0:devel/py-apptools@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/graphics/tilecache/Makefile b/graphics/tilecache/Makefile
index c04903d4c86a..677fa0bab2a9 100644
--- a/graphics/tilecache/Makefile
+++ b/graphics/tilecache/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python-based WMS-C/TMS server
LICENSE= BSD3CLAUSE MIT
LICENSE_COMB= multi
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup6>0:www/py-flup6@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup6>0:www/py-flup6@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste@${PY_FLAVOR}
USES= python:2.7 shebangfix
USE_PYTHON= distutils autoplist
diff --git a/graphics/uniconvertor/Makefile b/graphics/uniconvertor/Makefile
index 5b65270889d5..c7ffcd3211b5 100644
--- a/graphics/uniconvertor/Makefile
+++ b/graphics/uniconvertor/Makefile
@@ -15,7 +15,7 @@ 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sk1libs/__init__.py:graphics/sk1libs@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils
diff --git a/graphics/uniconvw/Makefile b/graphics/uniconvw/Makefile
index d3d32d7fe059..fbb80e3254b0 100644
--- a/graphics/uniconvw/Makefile
+++ b/graphics/uniconvw/Makefile
@@ -18,7 +18,7 @@ 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@${FLAVOR}
+ ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2@${PY_FLAVOR}
USES= desktop-file-utils python:2.7
USE_PYTHON= distutils
diff --git a/graphics/variety/Makefile b/graphics/variety/Makefile
index 6a585bfe0a54..e090299737db 100644
--- a/graphics/variety/Makefile
+++ b/graphics/variety/Makefile
@@ -14,18 +14,18 @@ COMMENT= Wallpaper changer
LICENSE= GPLv3
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.38:devel/py-python-distutils-extra@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.38:devel/py-python-distutils-extra@${PY_FLAVOR} \
intltool-update:textproc/intltool
-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}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} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cairo>=1.10.0:graphics/py-cairo@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.5.1:ftp/py-pycurl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1_1:devel/py-dbus@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}exiv2>=0.3.2_3:graphics/py-exiv2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9:www/py-httplib2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=2.6.0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1_1:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${PY_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/irc/py-fishcrypt/Makefile b/irc/py-fishcrypt/Makefile
index abdc2e103437..a6da3313500d 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 HexChat
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= fladd
diff --git a/irc/py-irc/Makefile b/irc/py-irc/Makefile
index a1e2c6931453..2a9099d2c5de 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jaraco.util>0:devel/py-jaraco.util@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
USES= python shebangfix
USE_PYTHON= distutils autoplist
diff --git a/irc/py-limnoria/Makefile b/irc/py-limnoria/Makefile
index 99917bb961c1..907ec95c401e 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_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@${FLAVOR}
-PROXY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${FLAVOR}
+ECDSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR}
+PROXY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${PY_FLAVOR}
-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}
+ENCODING_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR}
+GPG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-gnupg>=0:security/py-python-gnupg@${PY_FLAVOR}
+RSS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR}
+TIME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR}
-SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
-SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/japanese/py-tegaki-gtk/Makefile b/japanese/py-tegaki-gtk/Makefile
index fdb1d717771c..53f8b5609527 100644
--- a/japanese/py-tegaki-gtk/Makefile
+++ b/japanese/py-tegaki-gtk/Makefile
@@ -15,7 +15,7 @@ COMMENT= Tegaki PyGTK interface
LICENSE= GPLv2
LIB_DEPENDS= libzinnia.so:japanese/zinnia
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/tegaki/engine.py:japanese/py-tegaki@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/tegaki/engine.py:japanese/py-tegaki@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils
diff --git a/japanese/py-tegaki/Makefile b/japanese/py-tegaki/Makefile
index 6a180551357c..4582187e49e1 100644
--- a/japanese/py-tegaki/Makefile
+++ b/japanese/py-tegaki/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}/zinnia.py:japanese/py-zinnia@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/zinnia.py:japanese/py-zinnia@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils
diff --git a/japanese/tegaki-recognize/Makefile b/japanese/tegaki-recognize/Makefile
index 2b2815ed6851..2d6711bf5bdb 100644
--- a/japanese/tegaki-recognize/Makefile
+++ b/japanese/tegaki-recognize/Makefile
@@ -15,7 +15,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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/tegakigtk/recognizer.py:japanese/py-tegaki-gtk@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
diff --git a/lang/cdent/Makefile b/lang/cdent/Makefile
index be75222be23a..6be921d38931 100644
--- a/lang/cdent/Makefile
+++ b/lang/cdent/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= CHEESESHOP
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Portable Module Programming Language
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/lang/py-hy/Makefile b/lang/py-hy/Makefile
index ab874586992b..8bb8286b6356 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>0:devel/py-args@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}astor>0:devel/py-astor@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}clint>0:devel/py-clint@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rply>0:devel/py-rply@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/mail/courier-pythonfilter/Makefile b/mail/courier-pythonfilter/Makefile
index 0f499591b83c..449e776b30bc 100644
--- a/mail/courier-pythonfilter/Makefile
+++ b/mail/courier-pythonfilter/Makefile
@@ -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@${FLAVOR}
+CLAMAV_CLAMD_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyclamd.py:security/py-pyclamd@${PY_FLAVOR}
post-extract:
${MV} ${WRKSRC}/pythonfilter.conf ${WRKSRC}/pythonfilter.conf.sample
diff --git a/mail/isbg/Makefile b/mail/isbg/Makefile
index bc8896472a6d..a199c69cc027 100644
--- a/mail/isbg/Makefile
+++ b/mail/isbg/Makefile
@@ -12,7 +12,7 @@ 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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt@${PY_FLAVOR}
USE_GITHUB= yes
diff --git a/mail/mailpile/Makefile b/mail/mailpile/Makefile
index a4e30667fa5e..03e833b775d3 100644
--- a/mail/mailpile/Makefile
+++ b/mail/mailpile/Makefile
@@ -12,11 +12,11 @@ COMMENT= Locally hosted web-browser based mail client
LICENSE= AGPLv3+
LICENSE_FILE= ${WRKSRC}/AGPLv3.txt
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pgpdump>=0:security/py-pgpdump@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}spambayes>=0:mail/py-spambayes@${PY_FLAVOR}
PORTSCOUT= limit:^[1-9]
diff --git a/mail/postfix-policyd-spf-python/Makefile b/mail/postfix-policyd-spf-python/Makefile
index 5ade26386b3e..637a8d6158e2 100644
--- a/mail/postfix-policyd-spf-python/Makefile
+++ b/mail/postfix-policyd-spf-python/Makefile
@@ -14,8 +14,8 @@ COMMENT= Pure Python Postfix policy daemon for SPF checking
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}authres>0:mail/py-authres@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}authres>0:mail/py-authres@${PY_FLAVOR}
USES= python:3.3+
USE_PYTHON= autoplist distutils
diff --git a/mail/py-Products.MailHost/Makefile b/mail/py-Products.MailHost/Makefile
index fa79970f0cdc..2cdeeebdd930 100644
--- a/mail/py-Products.MailHost/Makefile
+++ b/mail/py-Products.MailHost/Makefile
@@ -13,14 +13,14 @@ COMMENT= Zope.sendmail integration for Zope 2
LICENSE= ZPL21
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>0:security/py-AccessControl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>0:devel/py-DocumentTemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Persistence>0:devel/py-Persistence@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>0:devel/py-zope.deferredimport@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.sendmail>0:mail/py-zope.sendmail@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/mail/py-alot/Makefile b/mail/py-alot/Makefile
index 38830ec0b050..fdc1a6c9b9ee 100644
--- a/mail/py-alot/Makefile
+++ b/mail/py-alot/Makefile
@@ -12,13 +12,13 @@ COMMENT= Terminal MUA using Notmuch mail
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notmuch>=0.13:mail/py-notmuch@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gpgme>0:security/py-gpgme@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}configobj>4.7.0:devel/py-configobj@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}python-magic>0:devel/py-python-magic@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>10.2.0:devel/py-twisted@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}urwidtrees>1.0:devel/py-urwidtrees@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notmuch>=0.13:mail/py-notmuch@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gpgme>0:security/py-gpgme@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configobj>4.7.0:devel/py-configobj@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-magic>0:devel/py-python-magic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>10.2.0:devel/py-twisted@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urwidtrees>1.0:devel/py-urwidtrees@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/mail/py-apolicy/Makefile b/mail/py-apolicy/Makefile
index f9d513f89ae9..bb7d1df04cfa 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyspf>=0:mail/py-pyspf@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipy>=0:net-mgmt/py-ipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyspf>=0:mail/py-pyspf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/mail/py-dkimpy/Makefile b/mail/py-dkimpy/Makefile
index c1668d3cc482..0d160e0096f1 100644
--- a/mail/py-dkimpy/Makefile
+++ b/mail/py-dkimpy/Makefile
@@ -12,9 +12,9 @@ COMMENT= Python library for DKIM email signing and verification
LICENSE= ZLIB
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}authres>=0:mail/py-authres@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pynacl>=0:security/py-pynacl@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}authres>=0:mail/py-authres@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pynacl>=0:security/py-pynacl@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist concurrent
diff --git a/mail/py-flask-mail/Makefile b/mail/py-flask-mail/Makefile
index a516ea40e541..a3b74ed74f61 100644
--- a/mail/py-flask-mail/Makefile
+++ b/mail/py-flask-mail/Makefile
@@ -12,8 +12,8 @@ COMMENT= Send SMTP email from a Flask web application
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}blinker>=0:devel/py-blinker@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}blinker>=0:devel/py-blinker@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/mail/py-flufl.bounce/Makefile b/mail/py-flufl.bounce/Makefile
index 4ad1b731d281..64effb46c7c6 100644
--- a/mail/py-flufl.bounce/Makefile
+++ b/mail/py-flufl.bounce/Makefile
@@ -11,8 +11,8 @@ COMMENT= API for detecting the original bouncing email addresses from a bounce m
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
USES= python:3.4+
USE_PYTHON= autoplist distutils
diff --git a/mail/py-fuglu/Makefile b/mail/py-fuglu/Makefile
index 9fd4bee2852b..1545fec7ba7b 100644
--- a/mail/py-fuglu/Makefile
+++ b/mail/py-fuglu/Makefile
@@ -13,7 +13,7 @@ COMMENT= Mail scanning daemon for Postfix written in Python
LICENSE= APACHE20
RUN_DEPENDS= postfix:mail/postfix \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
@@ -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@${FLAVOR}
+BEAUTIFULSOUP_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bs4/__init__.py:www/py-beautifulsoup@${PY_FLAVOR}
CLAMAV_RUN_DEPENDS= clamd:security/clamav
-DKIM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dkimpy>0:mail/py-dkimpy@${FLAVOR}
-MAGIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic@${FLAVOR}
+DKIM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dkimpy>0:mail/py-dkimpy@${PY_FLAVOR}
+MAGIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic@${PY_FLAVOR}
SPAMASSASSIN_RUN_DEPENDS= spamassassin>=0:mail/spamassassin
-SPF_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf@${FLAVOR}
-SQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0:databases/py-sqlalchemy10@${FLAVOR}
+SPF_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf@${PY_FLAVOR}
+SQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0:databases/py-sqlalchemy10@${PY_FLAVOR}
post-extract:
@${REINPLACE_CMD} -e "s|'/etc|'etc|g" ${WRKSRC}/setup.py
diff --git a/mail/py-ppolicy/Makefile b/mail/py-ppolicy/Makefile
index f70011828e5d..368003953a35 100644
--- a/mail/py-ppolicy/Makefile
+++ b/mail/py-ppolicy/Makefile
@@ -11,8 +11,8 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
@@ -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@${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}
+GEOIP_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/GeoIP.so:net/py-GeoIP@${PY_FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${PY_FLAVOR}
+LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${PY_FLAVOR}
post-install:
${INSTALL_DATA} ${WRKSRC}/ppolicy.conf ${STAGEDIR}${PREFIX}/etc
diff --git a/mail/py-premailer/Makefile b/mail/py-premailer/Makefile
index 4ae5764b6251..d16dd3ce8853 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/mail/py-pyspf/Makefile b/mail/py-pyspf/Makefile
index c9652b11e0dc..e7b70a2487f1 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}authres>=0:mail/py-authres@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}py3dns>=0:dns/py-py3dns@${PY_FLAVOR}
.else
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns@${PY_FLAVOR}
.endif
# Make the tests run as a module
diff --git a/mail/py-spambayes/Makefile b/mail/py-spambayes/Makefile
index d8c441d8d57b..655858ece655 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dns>=2.0:dns/py-dns@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lockfile>=0.2:devel/py-lockfile@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dns>=2.0:dns/py-dns@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lockfile>=0.2:devel/py-lockfile@${PY_FLAVOR}
USES= python:-2.7
USE_PYTHON= distutils autoplist
diff --git a/mail/py-zope.sendmail/Makefile b/mail/py-zope.sendmail/Makefile
index a92cd13790f5..38930b82cbe3 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/mail/pyzor/Makefile b/mail/pyzor/Makefile
index 98b7448e032e..950abe341970 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>=0:databases/py-gdbm@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/mail/rss2email3/Makefile b/mail/rss2email3/Makefile
index 94453845cf50..3caf75f86df6 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:textproc/py-html2text@${FLAVOR}
+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:3.3+
USE_GITHUB= yes
diff --git a/mail/svnmailer/Makefile b/mail/svnmailer/Makefile
index 8a4cfc3a7c6c..7d0c62ee2a91 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7 tar:bzip2
diff --git a/math/gracetmpl/Makefile b/math/gracetmpl/Makefile
index faa396465b59..989e7408b4a6 100644
--- a/math/gracetmpl/Makefile
+++ b/math/gracetmpl/Makefile
@@ -10,8 +10,8 @@ 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray@${PY_FLAVOR}
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
diff --git a/math/py-Diofant/Makefile b/math/py-Diofant/Makefile
index 6e53582889c1..9145452450d5 100644
--- a/math/py-Diofant/Makefile
+++ b/math/py-Diofant/Makefile
@@ -12,17 +12,17 @@ COMMENT= Python library for symbolic mathematics
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}isort>0:devel/py-isort@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}isort>0:devel/py-isort@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
# RUN_DEPENDS includes extra_reqs for convenience
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cachetools>0:devel/py-cachetools@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gmpy2>=2.0.8:math/py-gmpy2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>2.1.1:math/py-matplotlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mpmath>=0.19:math/py-mpmath@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyparsing>2.1.2:devel/py-pyparsing@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}strategies>=0.2.3:devel/py-strategies@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}theano>=0.9.0:math/py-theano@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cachetools>0:devel/py-cachetools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gmpy2>=2.0.8:math/py-gmpy2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>2.1.1:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mpmath>=0.19:math/py-mpmath@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>2.1.2:devel/py-pyparsing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}strategies>=0.2.3:devel/py-strategies@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}theano>=0.9.0:math/py-theano@${PY_FLAVOR} \
${PYNUMPY}
USES= python:3.5+
diff --git a/math/py-GridDataFormats/Makefile b/math/py-GridDataFormats/Makefile
index 83255b99ef29..fbffbb0373f6 100644
--- a/math/py-GridDataFormats/Makefile
+++ b/math/py-GridDataFormats/Makefile
@@ -12,7 +12,7 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/math/py-PyMetis/Makefile b/math/py-PyMetis/Makefile
index 33a6003c7575..15333fafa59e 100644
--- a/math/py-PyMetis/Makefile
+++ b/math/py-PyMetis/Makefile
@@ -12,8 +12,8 @@ COMMENT= Python wrapper for the Metis graph partititioning software
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= localbase python
USE_PYTHON= distutils autoplist
diff --git a/math/py-PyWavelets/Makefile b/math/py-PyWavelets/Makefile
index 4a0dccfc2150..b4947f7d8e68 100644
--- a/math/py-PyWavelets/Makefile
+++ b/math/py-PyWavelets/Makefile
@@ -14,9 +14,9 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR}
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR}
USE_GITHUB= yes
GH_PROJECT= pywt
diff --git a/math/py-Pyomo/Makefile b/math/py-Pyomo/Makefile
index 7f37eacb0854..4aaad989de08 100644
--- a/math/py-Pyomo/Makefile
+++ b/math/py-Pyomo/Makefile
@@ -12,9 +12,9 @@ COMMENT= Python Optimization Modeling Objects
LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}PyUtilib>=5.6.3:devel/py-PyUtilib@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/math/py-apgl/Makefile b/math/py-apgl/Makefile
index af95024dd968..cfe52a46f5ef 100644
--- a/math/py-apgl/Makefile
+++ b/math/py-apgl/Makefile
@@ -14,7 +14,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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}scipy>0.7.0:science/py-scipy@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/math/py-basemap/Makefile b/math/py-basemap/Makefile
index 5fbea7cab03e..6e75f13b59f8 100644
--- a/math/py-basemap/Makefile
+++ b/math/py-basemap/Makefile
@@ -15,7 +15,7 @@ LICENSE= GPLv2 LGPL21 MIT
LICENSE_COMB= multi
BUILD_DEPENDS= ${PYNUMPY}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
LIB_DEPENDS= libgeos.so:graphics/geos
USES= python:2.7
diff --git a/math/py-bitmath/Makefile b/math/py-bitmath/Makefile
index 9ab648b42a26..bfb057c84a3a 100644
--- a/math/py-bitmath/Makefile
+++ b/math/py-bitmath/Makefile
@@ -19,6 +19,6 @@ USE_PYTHON= autoplist distutils
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-4
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}progressbar231>0:misc/py-progressbar231@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}progressbar231>0:misc/py-progressbar231@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/math/py-bottleneck/Makefile b/math/py-bottleneck/Makefile
index f3b9b47efaa0..454074f9142b 100644
--- a/math/py-bottleneck/Makefile
+++ b/math/py-bottleneck/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/bottleneck/LICENSE
BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS= ${PYNUMPY}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent cython distutils
diff --git a/math/py-colormath/Makefile b/math/py-colormath/Makefile
index dd0c9f3aedad..70df1b3b6d66 100644
--- a/math/py-colormath/Makefile
+++ b/math/py-colormath/Makefile
@@ -13,8 +13,8 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}networkx>=1.9.1:math/py-networkx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}networkx>=1.9.1:math/py-networkx@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/math/py-cyipopt/Makefile b/math/py-cyipopt/Makefile
index b95aef21aceb..2aa935c137ab 100644
--- a/math/py-cyipopt/Makefile
+++ b/math/py-cyipopt/Makefile
@@ -12,12 +12,12 @@ COMMENT= Cython interface for the interior point optimizer IPOPT
LICENSE= EPL
BUILD_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
LIB_DEPENDS= libblas.so:math/blas \
libcoinmetis.so:math/ipopt \
liblapack.so:math/lapack
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
USES= fortran python pkgconfig # fortran because ipopt's pkg-config returns gcc libs
USE_GITHUB= yes
diff --git a/math/py-fastcluster/Makefile b/math/py-fastcluster/Makefile
index a77c31a5ae2a..1583aebd9c28 100644
--- a/math/py-fastcluster/Makefile
+++ b/math/py-fastcluster/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.txt
BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/math/py-fiat/Makefile b/math/py-fiat/Makefile
index fc44163f8fd5..c3b6c1663499 100644
--- a/math/py-fiat/Makefile
+++ b/math/py-fiat/Makefile
@@ -13,7 +13,7 @@ COMMENT= FInite element Automatic Tabulator
LICENSE= LGPL3
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scientific>=0:math/py-scientific@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scientific>=0:math/py-scientific@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/math/py-gato/Makefile b/math/py-gato/Makefile
index de3eefe50f2e..6571ca80d647 100644
--- a/math/py-gato/Makefile
+++ b/math/py-gato/Makefile
@@ -15,7 +15,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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
NO_ARCH= yes
PORTEXAMPLES= *
diff --git a/math/py-keras/Makefile b/math/py-keras/Makefile
index 02fcd9c501c7..ad3442b73345 100644
--- a/math/py-keras/Makefile
+++ b/math/py-keras/Makefile
@@ -12,10 +12,10 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.14:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}theano>=0.8.0:math/py-theano@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.14:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}theano>=0.8.0:math/py-theano@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/math/py-levmar/Makefile b/math/py-levmar/Makefile
index b7c713dcb27f..4894ba57daba 100644
--- a/math/py-levmar/Makefile
+++ b/math/py-levmar/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= ${PYNUMPY}
LIB_DEPENDS= libblas.so:math/blas \
liblapack.so:math/lapack
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
${PYNUMPY}
USES= python
diff --git a/math/py-luminol/Makefile b/math/py-luminol/Makefile
index 8252accaedd7..0af6a1449d56 100644
--- a/math/py-luminol/Makefile
+++ b/math/py-luminol/Makefile
@@ -13,8 +13,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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}numpy>=1.6.2,1:math/py-numpy@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}numpy>=1.6.2,1:math/py-numpy@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/math/py-mathdom/Makefile b/math/py-mathdom/Makefile
index 70d04a1ec2a1..3616ca1fbd32 100644
--- a/math/py-mathdom/Makefile
+++ b/math/py-mathdom/Makefile
@@ -14,7 +14,7 @@ COMMENT= Content MathML in Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
index 7c95fbe1c0b4..d42eeccafff6 100644
--- a/math/py-matplotlib/Makefile
+++ b/math/py-matplotlib/Makefile
@@ -22,12 +22,12 @@ 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@${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}
-py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>0:devel/py-backports.functools_lru_cache@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR}
+py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>0:devel/py-backports.functools_lru_cache@${PY_FLAVOR}
USES= compiler:c++11-lib gettext pkgconfig python shebangfix uniquefiles:dirs
USE_GITHUB= yes
@@ -62,8 +62,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@${FLAVOR}
-TKAGGBACKEND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR}
+TKAGGBACKEND_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
+TKAGGBACKEND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_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 a3bbfec49524..93e3dd3dd2fd 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gmpy.so:math/py-gmpy@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index 779041d18023..3ce0e1bcf799 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -14,10 +14,10 @@ COMMENT= Tools for complex networks
LICENSE= BSD3CLAUSE
-RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${FLAVOR}
+RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${PY_FLAVOR}
-# ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx@${FLAVOR} \
-# ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${FLAVOR}
+# ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx@${PY_FLAVOR} \
+# ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${PY_FLAVOR}
NO_ARCH= yes
USES= python shebangfix
@@ -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@${FLAVOR}
+NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy@${PY_FLAVOR}
SCIPY_DESC= Sparse matrix representation of graphs
-SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:science/py-scikit-sparse@${FLAVOR}
+SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:science/py-scikit-sparse@${PY_FLAVOR}
MPL_DESC= Flexible graph rendering
-MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:math/py-matplotlib@${FLAVOR}
+MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:math/py-matplotlib@${PY_FLAVOR}
GRAPHVIZ_DESC= Additional graph layout and rendering algorithms
-GRAPHVIZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz@${FLAVOR}
+GRAPHVIZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz@${PY_FLAVOR}
YAML_DESC= Reading and writing YAML files
-YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR}
+YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
PORTEXAMPLES= *
diff --git a/math/py-numexpr/Makefile b/math/py-numexpr/Makefile
index 112d1918ec6b..8e0659847d3a 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.7,1:math/py-numpy@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PYTHON= autoplist concurrent distutils
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 350032a838ce..4c99e6ec77df 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -42,7 +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@${FLAVOR}
+TESTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
.include <bsd.port.pre.mk>
diff --git a/math/py-pandas/Makefile b/math/py-pandas/Makefile
index 6994568c396d..1194f0e641ae 100644
--- a/math/py-pandas/Makefile
+++ b/math/py-pandas/Makefile
@@ -14,9 +14,9 @@ LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS:= ${BUILD_DEPENDS} \
- ${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}
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
OPTIONS_DEFINE= MPL SCIPY
OPTIONS_GROUP= ACCEL STORAGE HTML EXCEL
@@ -55,26 +55,26 @@ 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>=1.4.3:math/py-matplotlib@${FLAVOR}
-SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.14.0:science/py-scipy@${FLAVOR}
-BTLNCK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottleneck>=1.0.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.2.1:devel/py-tables@${FLAVOR}
+MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.3:math/py-matplotlib@${PY_FLAVOR}
+SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.14.0:science/py-scipy@${PY_FLAVOR}
+BTLNCK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottleneck>=1.0.0:math/py-bottleneck@${PY_FLAVOR}
+NUMEXPR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numexpr>=2.4.6:math/py-numexpr@${PY_FLAVOR}
+BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR}
+TABLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tables>=3.2.1:devel/py-tables@${PY_FLAVOR}
-LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR}
-HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup@${FLAVOR} \
- ${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.4.0:textproc/py-openpyxl@${FLAVOR}
-XLRD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>=0.9.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}
+LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
+HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}
+JINJA2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
+OPENPYXL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.4.0:textproc/py-openpyxl@${PY_FLAVOR}
+XLRD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>=0.9.0:textproc/py-xlrd@${PY_FLAVOR}
+XLWT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt@${PY_FLAVOR}
+XLSX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${PY_FLAVOR}
-ALCHEMY10_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR}
-ALCHEMY11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>0:databases/py-sqlalchemy11@${FLAVOR}
-ALCHEMY12_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>0:databases/py-sqlalchemy12@${FLAVOR}
+ALCHEMY10_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${PY_FLAVOR}
+ALCHEMY11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>0:databases/py-sqlalchemy11@${PY_FLAVOR}
+ALCHEMY12_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>0:databases/py-sqlalchemy12@${PY_FLAVOR}
OPENPYXL_IMPLIES= XLRD
diff --git a/math/py-patsy/Makefile b/math/py-patsy/Makefile
index 509b547383f3..148165550182 100644
--- a/math/py-patsy/Makefile
+++ b/math/py-patsy/Makefile
@@ -16,7 +16,7 @@ LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/math/py-plastex/Makefile b/math/py-plastex/Makefile
index 3ccfd5ef8306..cc4f421d3892 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= tiarno
diff --git a/math/py-pybloom/Makefile b/math/py-pybloom/Makefile
index 9d403d843f29..9ecff56ef657 100644
--- a/math/py-pybloom/Makefile
+++ b/math/py-pybloom/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Probabilistic data structure
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bitarray>0:devel/py-bitarray@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bitarray>0:devel/py-bitarray@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/math/py-pymc/Makefile b/math/py-pymc/Makefile
index e9ab79e86200..e0511f39fcf8 100644
--- a/math/py-pymc/Makefile
+++ b/math/py-pymc/Makefile
@@ -18,13 +18,13 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
LIB_DEPENDS= liblapack.so:math/lapack \
libblas.so:math/blas
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/math/py-pymc3/Makefile b/math/py-pymc3/Makefile
index a4c0c255f845..d41d66c042e8 100644
--- a/math/py-pymc3/Makefile
+++ b/math/py-pymc3/Makefile
@@ -12,14 +12,14 @@ COMMENT= Probabilistic programming in Python
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h5py>=2.7.0:science/py-h5py@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}joblib>=0.9:devel/py-joblib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pandas>=0.18.0:math/py-pandas@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}patsy>=0.4.0:math/py-patsy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}theano>=1.0.0:math/py-theano@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tqdm>=4.8.4:misc/py-tqdm@${FLAVOR}
-py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enum34>=1.1.6:devel/py-enum34@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h5py>=2.7.0:science/py-h5py@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}joblib>=0.9:devel/py-joblib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pandas>=0.18.0:math/py-pandas@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}patsy>=0.4.0:math/py-patsy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}theano>=1.0.0:math/py-theano@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tqdm>=4.8.4:misc/py-tqdm@${PY_FLAVOR}
+py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enum34>=1.1.6:devel/py-enum34@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/math/py-pyneqsys/Makefile b/math/py-pyneqsys/Makefile
index 04fa871594b7..acb6819b3023 100644
--- a/math/py-pyneqsys/Makefile
+++ b/math/py-pyneqsys/Makefile
@@ -12,11 +12,11 @@ COMMENT= Solver of symbolically defined systems of non-linear equations
LICENSE= BSD2CLAUSE
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}fastcache>0:devel/py-fastcache@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sym>=0.3.1:math/py-sym@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sympy>=1.1.1:math/py-sympy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}fastcache>0:devel/py-fastcache@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sym>=0.3.1:math/py-sym@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sympy>=1.1.1:math/py-sympy@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/math/py-pyodesys/Makefile b/math/py-pyodesys/Makefile
index 20c4400e0a36..67214ba17943 100644
--- a/math/py-pyodesys/Makefile
+++ b/math/py-pyodesys/Makefile
@@ -13,10 +13,10 @@ LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0.2:math/py-matplotlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sym>=0.3.0:math/py-sym@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sympy>=1.1.1:math/py-sympy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0.2:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sym>=0.3.0:math/py-sym@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sympy>=1.1.1:math/py-sympy@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/math/py-pysparse/Makefile b/math/py-pysparse/Makefile
index f90db4979538..c4eac0ab140e 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2,1:math/py-numpy@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2,1:math/py-numpy@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2,1:math/py-numpy@${PY_FLAVOR}
LIB_DEPENDS= liblapack.so:math/lapack \
libblas.so:math/blas \
libopenblas.so:math/openblas \
diff --git a/math/py-pysym/Makefile b/math/py-pysym/Makefile
index b7b7a8bd62f3..d2ce35e6bf90 100644
--- a/math/py-pysym/Makefile
+++ b/math/py-pysym/Makefile
@@ -12,7 +12,7 @@ COMMENT= Prototype package for symbolic manipulation
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
${PYNUMPY}
USES= python
diff --git a/math/py-scikit-umfpack/Makefile b/math/py-scikit-umfpack/Makefile
index 70c0bb477d9f..d5e3dff0d418 100644
--- a/math/py-scikit-umfpack/Makefile
+++ b/math/py-scikit-umfpack/Makefile
@@ -13,13 +13,13 @@ LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
swig3.0:devel/swig30
LIB_DEPENDS= libblas.so:math/blas \
libcblas.so:math/cblas \
libumfpack.so:math/suitesparse
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils cython autoplist
diff --git a/math/py-secp256k1/Makefile b/math/py-secp256k1/Makefile
index f0ff50201ede..6c3190350e33 100644
--- a/math/py-secp256k1/Makefile
+++ b/math/py-secp256k1/Makefile
@@ -12,8 +12,8 @@ COMMENT= FFI bindings to libsecp256k1
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.8.0:devel/py-cffi@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.11.1:devel/py-pytest-runner@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.8.0:devel/py-cffi@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.11.1:devel/py-pytest-runner@${PY_FLAVOR}
LIB_DEPENDS= libsecp256k1.so:math/secp256k1
USES= localbase python pkgconfig
diff --git a/math/py-statsmodels/Makefile b/math/py-statsmodels/Makefile
index 300f59398a52..1b53b6f2b4e0 100644
--- a/math/py-statsmodels/Makefile
+++ b/math/py-statsmodels/Makefile
@@ -13,9 +13,9 @@ COMMENT= Complement to SciPy for statistical computations
LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}pandas>=0.14:math/py-pandas@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}patsy>=0.4.0:math/py-patsy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.14:science/py-scipy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pandas>=0.14:math/py-pandas@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}patsy>=0.4.0:math/py-patsy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.14:science/py-scipy@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/math/py-sympy/Makefile b/math/py-sympy/Makefile
index e500125f5d1c..dab1718fc639 100644
--- a/math/py-sympy/Makefile
+++ b/math/py-sympy/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python Library For Symbolic Mathematics
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpmath>=0.19:math/py-mpmath@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpmath>=0.19:math/py-mpmath@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
@@ -22,7 +22,7 @@ NO_ARCH= yes
OPTIONS_DEFINE= PYGLET
PYGLET_DESC= Enable plotting support
-PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:graphics/py-pyglet@${FLAVOR}
+PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:graphics/py-pyglet@${PY_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 2dceda5d9475..e49e2993042b 100644
--- a/math/py-theano/Makefile
+++ b/math/py-theano/Makefile
@@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.8.0:science/py-scipy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.8.0:science/py-scipy@${PY_FLAVOR}
USES= compiler:openmp python
USE_PYTHON= concurrent distutils autoplist
diff --git a/math/py-yt/Makefile b/math/py-yt/Makefile
index a3c2a85bfde2..a9a454d35fe7 100644
--- a/math/py-yt/Makefile
+++ b/math/py-yt/Makefile
@@ -15,12 +15,12 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING.txt
BUILD_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
${PYNUMPY} \
- ${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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipython>=1.0:devel/ipython@${PY_FLAVOR}
LIB_DEPENDS= libembree.so:graphics/embree \
libomp.so:devel/openmp
diff --git a/misc/py-PyUserInput/Makefile b/misc/py-PyUserInput/Makefile
index 7bd1813ffc3f..39951a49ae21 100644
--- a/misc/py-PyUserInput/Makefile
+++ b/misc/py-PyUserInput/Makefile
@@ -11,7 +11,7 @@ COMMENT= Module for mouse and keyboard control
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/misc/py-cinder/Makefile b/misc/py-cinder/Makefile
index c7a1b4002b47..c9952b0a6eb2 100644
--- a/misc/py-cinder/Makefile
+++ b/misc/py-cinder/Makefile
@@ -13,65 +13,65 @@ COMMENT= OpenStack Storage Service (Cinder)
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${FLAVOR} \
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${PY_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} \
+ ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.7.5:www/py-httplib2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_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}
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.5.0:security/py-oauth2client@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.reports>=0.6.0:devel/py-oslo.reports@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.0.0:devel/py-oslo.rootwrap@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0:security/py-paramiko@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-barbicanclient>=4.0.0:net/py-python-barbicanclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=2.2.0:databases/py-python-swiftclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}taskflow>=1.26.0:devel/py-taskflow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rtslib-fb>=0:devel/py-rtslib-fb@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.vmware>=2.11.0:devel/py-oslo.vmware@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}os-brick>=1.6.1:devel/py-os-brick@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}os-win>=0.2.3:devel/py-os-win@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tooz>=1.28.0:devel/py-tooz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.4.1:www/py-google-api-python-client@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${PY_FLAVOR}
EXTRA_PATCHES= ${FILESDIR}/01-remotefs.patch:-p1 \
${FILESDIR}/02-nfs.patch:-p1
diff --git a/misc/py-crudini/Makefile b/misc/py-crudini/Makefile
index 43373151ed6e..19c9fe062467 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iniparse>=0.3.2:devel/py-iniparse@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/misc/py-fuzzy/Makefile b/misc/py-fuzzy/Makefile
index 20df25a6c654..15d71c7070f6 100644
--- a/misc/py-fuzzy/Makefile
+++ b/misc/py-fuzzy/Makefile
@@ -13,8 +13,8 @@ COMMENT= Fast Python phonetic algorithms
LICENSE= MIT ART20
LICENSE_COMB= multi
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils cython cython_run
diff --git a/misc/py-glance/Makefile b/misc/py-glance/Makefile
index ac00f743958a..bd4750ec194a 100644
--- a/misc/py-glance/Makefile
+++ b/misc/py-glance/Makefile
@@ -13,50 +13,50 @@ COMMENT= OpenStack Image Service
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-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}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.7.5:www/py-httplib2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}taskflow>=1.26.0:devel/py-taskflow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wsme>=0.8:devel/py-wsme@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}glance-store>=0.18.0:devel/py-glance-store@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}semantic_version>=2.3.1:devel/py-semantic_version@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cursive>=0.1.1:devel/py-cursive@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/misc/py-orange3-datafusion/Makefile b/misc/py-orange3-datafusion/Makefile
index 233ebe657b24..01c1ce657eba 100644
--- a/misc/py-orange3-datafusion/Makefile
+++ b/misc/py-orange3-datafusion/Makefile
@@ -13,7 +13,7 @@ COMMENT= Data fusion add-on for Orange3
LICENSE= GPLv3
RUN_DEPENDS= orange3>0:misc/orange3 \
- ${PYTHON_PKGNAMEPREFIX}scikit-fusion>0:misc/py-scikit-fusion@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}scikit-fusion>0:misc/py-scikit-fusion@${PY_FLAVOR}
USES= python:3.4+
USE_GITHUB= yes
diff --git a/misc/py-orange3-network/Makefile b/misc/py-orange3-network/Makefile
index 1c07046db6ef..75c1e5bf1a46 100644
--- a/misc/py-orange3-network/Makefile
+++ b/misc/py-orange3-network/Makefile
@@ -14,8 +14,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS= orange3>0:misc/orange3 \
${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyqtgraph>0:graphics/py-pyqtgraph@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyqtgraph>0:graphics/py-pyqtgraph@${PY_FLAVOR}
USES= python:3.4+
USE_GITHUB= yes
diff --git a/misc/py-orange3-timeseries/Makefile b/misc/py-orange3-timeseries/Makefile
index 59c7b33c5f14..fe23e3876945 100644
--- a/misc/py-orange3-timeseries/Makefile
+++ b/misc/py-orange3-timeseries/Makefile
@@ -13,10 +13,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= orange3>0:misc/orange3 \
${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pandas-datareader>0:math/py-pandas-datareader@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.17:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}statsmodels>=0.6.1>0:math/py-statsmodels@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pandas-datareader>0:math/py-pandas-datareader@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.17:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}statsmodels>=0.6.1>0:math/py-statsmodels@${PY_FLAVOR}
USES= python:3.4+
USE_GITHUB= yes
diff --git a/misc/py-osd/Makefile b/misc/py-osd/Makefile
index 8f01b6f0ecf1..3ebdefcd1bd6 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/misc/py-pexpect/Makefile b/misc/py-pexpect/Makefile
index e03b331bab2f..1f19c20815ba 100644
--- a/misc/py-pexpect/Makefile
+++ b/misc/py-pexpect/Makefile
@@ -12,7 +12,7 @@ COMMENT= Pure Python Expect-like module
LICENSE= ISCL
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ptyprocess>=0:sysutils/py-ptyprocess@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ptyprocess>=0:sysutils/py-ptyprocess@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/misc/py-progressbar2/Makefile b/misc/py-progressbar2/Makefile
index 3d0586cc611e..6ba37425e9d8 100644
--- a/misc/py-progressbar2/Makefile
+++ b/misc/py-progressbar2/Makefile
@@ -12,9 +12,9 @@ COMMENT= Text mode progressbar library for Python
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-utils>=2.3.0:misc/py-python-utils@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-utils>=2.3.0:misc/py-python-utils@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/misc/py-pyprind/Makefile b/misc/py-pyprind/Makefile
index c621d9aff6e3..ca699ebf2211 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}psutil>=3.2.0:sysutils/py-psutil@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psutil>=3.2.0:sysutils/py-psutil@${PY_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>=3.2.0:sysutils/py-psutil@${FLAVOR}
+PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=3.2.0:sysutils/py-psutil@${PY_FLAVOR}
do-test:
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
diff --git a/misc/py-python-utils/Makefile b/misc/py-python-utils/Makefile
index 5bc8324a1714..1d67a95b219f 100644
--- a/misc/py-python-utils/Makefile
+++ b/misc/py-python-utils/Makefile
@@ -12,8 +12,8 @@ COMMENT= Collection of small functions and classes
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/misc/py-scikit-fusion/Makefile b/misc/py-scikit-fusion/Makefile
index 1239b6182ee0..598ed2f1aef9 100644
--- a/misc/py-scikit-fusion/Makefile
+++ b/misc/py-scikit-fusion/Makefile
@@ -13,8 +13,8 @@ LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}joblib>=0.8.4:devel/py-joblib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.12.0:science/py-scipy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}joblib>=0.8.4:devel/py-joblib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.12.0:science/py-scipy@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/misc/py-serverfiles/Makefile b/misc/py-serverfiles/Makefile
index 6f5655a871d4..94c78996047e 100644
--- a/misc/py-serverfiles/Makefile
+++ b/misc/py-serverfiles/Makefile
@@ -11,7 +11,7 @@ COMMENT= Access files on a HTTP server and store them locally for reuse
LICENSE= GPLv3+
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/misc/py-soapy_power/Makefile b/misc/py-soapy_power/Makefile
index 5fd1d6096697..9fc67643b756 100644
--- a/misc/py-soapy_power/Makefile
+++ b/misc/py-soapy_power/Makefile
@@ -13,9 +13,9 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}pyFFTW>0:math/py-pyFFTW@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}SimpleSoapy>=1.5.0:misc/py-SimpleSoapy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}SimpleSpectral>0:science/py-SimpleSpectral@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pyFFTW>0:math/py-pyFFTW@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}SimpleSoapy>=1.5.0:misc/py-SimpleSoapy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}SimpleSpectral>0:science/py-SimpleSpectral@${PY_FLAVOR}
USES= python:3.4+
USE_PYTHON= distutils concurrent autoplist
diff --git a/misc/py-socli/Makefile b/misc/py-socli/Makefile
index 5b204408d1d6..49bfeb9c8825 100644
--- a/misc/py-socli/Makefile
+++ b/misc/py-socli/Makefile
@@ -12,11 +12,11 @@ COMMENT= Stack overflow command line interface
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stackexchange>=0:devel/py-stackexchange@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urwid>=0:devel/py-urwid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist concurrent distutils
diff --git a/misc/py-spdx-lookup/Makefile b/misc/py-spdx-lookup/Makefile
index 1a4e65e318a0..b9ea11fd5044 100644
--- a/misc/py-spdx-lookup/Makefile
+++ b/misc/py-spdx-lookup/Makefile
@@ -13,7 +13,7 @@ COMMENT= SPDX license list query tool
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}spdx>0:misc/py-spdx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}spdx>0:misc/py-spdx@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/misc/pylize/Makefile b/misc/pylize/Makefile
index 7dd456c04304..a2655fab391a 100644
--- a/misc/pylize/Makefile
+++ b/misc/pylize/Makefile
@@ -12,9 +12,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
MAINTAINER= dryice@dryice.name
COMMENT= Presentation generation tool
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/HTMLgen.py:www/py-HTMLgen@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
- ${PYTHON_SITELIBDIR}/em.py:textproc/py-empy@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/HTMLgen.py:www/py-HTMLgen@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/em.py:textproc/py-empy@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7 tar:bzip2
diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile
index 5207a6f31179..099026d40da6 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@${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}
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0_1:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/kaa/__init__.py:multimedia/py-kaa-base@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/kaa/imlib2/__init__.py:multimedia/py-kaa-imlib2@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/kaa/metadata/__init__.py:multimedia/py-kaa-metadata@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/Numeric/Numeric_headers/__init__.py:math/py-numeric@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
FREEVO_USER= freevo
FREEVO_GROUP= ${FREEVO_USER}
diff --git a/multimedia/gaupol/Makefile b/multimedia/gaupol/Makefile
index bac02baafa28..1b8d18b4c87a 100644
--- a/multimedia/gaupol/Makefile
+++ b/multimedia/gaupol/Makefile
@@ -13,8 +13,8 @@ LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= iso-codes>=0:misc/iso-codes \
- ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}enchant>=1.5.1:textproc/py-enchant@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}enchant>=1.5.1:textproc/py-enchant@${PY_FLAVOR}
USES= desktop-file-utils python:3.2+
USE_GITHUB= yes
diff --git a/multimedia/livestreamer/Makefile b/multimedia/livestreamer/Makefile
index 5e604467b1d0..ea661cb2d6f9 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@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
${PY_FUTURES} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}librtmp>=0:multimedia/py-librtmp@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}librtmp>=0:multimedia/py-librtmp@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile
index caa2f2ef9a63..dc526607cdd0 100644
--- a/multimedia/miro/Makefile
+++ b/multimedia/miro/Makefile
@@ -13,22 +13,22 @@ COMMENT= Video player to get internet TV broadcasts
LICENSE= GPLv2
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR} \
- ${PYTHON_SITELIBDIR}/webkit/__init__.py:www/py-webkitgtk@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/webkit/__init__.py:www/py-webkitgtk@${PY_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@${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} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/dbus/glib.py:devel/py-dbus@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:devel/py-notify@${PY_FLAVOR} \
${PYTHON_SITELIBDIR}/libtorrent.so:net-p2p/libtorrent-rasterbar-python \
- ${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}
+ ${PYTHON_SITELIBDIR}/webkit/webkit.so:www/py-webkitgtk@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/gtk-2.0/gconf.so:x11-toolkits/py-gnome2@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen@${PY_FLAVOR}
BUILD_WRKSRC= ${WRKSRC}/linux
INSTALL_WRKSRC= ${WRKSRC}/linux
diff --git a/multimedia/mps-youtube/Makefile b/multimedia/mps-youtube/Makefile
index 557d70c49ef1..6a60d9b328cf 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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pafy>=0.5.0:www/py-pafy@${PY_FLAVOR}
CONVERTER_DESC= Converter to MP3 and other formats
diff --git a/multimedia/openshot/Makefile b/multimedia/openshot/Makefile
index a1d026851408..6a11c1e1b1a6 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@${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} \
+ ${PYTHON_PKGNAMEPREFIX}goocanvas>=0:graphics/py-goocanvas@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mlt>=0:multimedia/py-mlt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_FLAVOR} \
scrollkeeper-install:textproc/rarian \
sox:audio/sox
diff --git a/multimedia/photofilmstrip/Makefile b/multimedia/photofilmstrip/Makefile
index 5a715ab06ccc..518c66c92cfd 100644
--- a/multimedia/photofilmstrip/Makefile
+++ b/multimedia/photofilmstrip/Makefile
@@ -14,7 +14,7 @@ COMMENT= Creates movies out of your pictures
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
RUN_DEPENDS= mencoder:multimedia/mencoder \
mplayer:multimedia/mplayer
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index c08a30e93068..b9eeab080356 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -16,8 +16,8 @@ COMMENT= Python bindings for gstreamer
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2@${PY_FLAVOR}
PORTSCOUT= limit:0\.10\..*
diff --git a/multimedia/py-guessit/Makefile b/multimedia/py-guessit/Makefile
index 0cf865f0b5cb..2ff665490351 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}rebulk>=0.9.0:devel/py-rebulk@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}babelfish>=0.5.5:devel/py-babelfish@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rebulk>=0.9.0:devel/py-rebulk@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/multimedia/py-kaa-base/Makefile b/multimedia/py-kaa-base/Makefile
index b931e671f12c..d77a62c43eeb 100644
--- a/multimedia/py-kaa-base/Makefile
+++ b/multimedia/py-kaa-base/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= fbsd@opal.com
COMMENT= Kaa Media Repository
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${FLAVOR} \
- ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/multimedia/py-kaa-imlib2/Makefile b/multimedia/py-kaa-imlib2/Makefile
index 36835e8878d2..d546d5772890 100644
--- a/multimedia/py-kaa-imlib2/Makefile
+++ b/multimedia/py-kaa-imlib2/Makefile
@@ -11,7 +11,7 @@ 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/kaa/__init__.py:multimedia/py-kaa-base@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
LIB_DEPENDS= libImlib2.so:graphics/imlib2
diff --git a/multimedia/py-kaa-metadata/Makefile b/multimedia/py-kaa-metadata/Makefile
index 62fc79d3a1cc..6fde5c3ca399 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}exiv2>0:graphics/py-exiv2@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kaa-base>0:multimedia/py-kaa-base@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}exiv2>0:graphics/py-exiv2@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/multimedia/py-librtmp/Makefile b/multimedia/py-librtmp/Makefile
index 202b8e308531..8dac1f4d4001 100644
--- a/multimedia/py-librtmp/Makefile
+++ b/multimedia/py-librtmp/Makefile
@@ -15,8 +15,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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi@${PY_FLAVOR}
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -27,7 +27,7 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3400
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch@${PY_FLAVOR}
.endif
post-install:
diff --git a/multimedia/py-moviepy/Makefile b/multimedia/py-moviepy/Makefile
index 8c0b9bf30214..854615182c6d 100644
--- a/multimedia/py-moviepy/Makefile
+++ b/multimedia/py-moviepy/Makefile
@@ -12,10 +12,10 @@ COMMENT= Video editing with Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENCE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.2:devel/py-decorator@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}imageio>=2.1.2:graphics/py-imageio@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.2:devel/py-decorator@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}imageio>=2.1.2:graphics/py-imageio@${PY_FLAVOR} \
${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}tqdm>=4.11.2:misc/py-tqdm@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}tqdm>=4.11.2:misc/py-tqdm@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/multimedia/py-openlp/Makefile b/multimedia/py-openlp/Makefile
index b7617ccecf74..1b727cf28c8a 100644
--- a/multimedia/py-openlp/Makefile
+++ b/multimedia/py-openlp/Makefile
@@ -12,17 +12,17 @@ COMMENT= Open Source Lyrics Projection
LICENSE= GPLv2
-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} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.6.1:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
unoconv:textproc/unoconv
USES= desktop-file-utils pyqt:4 python:2.7
diff --git a/multimedia/py-periscope/Makefile b/multimedia/py-periscope/Makefile
index 022b213d049c..f0d576287947 100644
--- a/multimedia/py-periscope/Makefile
+++ b/multimedia/py-periscope/Makefile
@@ -17,7 +17,7 @@ COMMENT= Subtitles searching module
LICENSE= LGPL3
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PYTHON= distutils autoplist
diff --git a/multimedia/py-pretty_midi/Makefile b/multimedia/py-pretty_midi/Makefile
index 74ce5c72d403..d2659bf7c61a 100644
--- a/multimedia/py-pretty_midi/Makefile
+++ b/multimedia/py-pretty_midi/Makefile
@@ -13,8 +13,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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}mido>=1.1.16:multimedia/py-mido@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/multimedia/py-soco/Makefile b/multimedia/py-soco/Makefile
index 3f56767d504e..783113a894e6 100644
--- a/multimedia/py-soco/Makefile
+++ b/multimedia/py-soco/Makefile
@@ -12,8 +12,8 @@ COMMENT= Python library to control Sonos speakers
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.rst
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}xmltodict>0:devel/py-xmltodict@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xmltodict>0:devel/py-xmltodict@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/multimedia/py-subliminal/Makefile b/multimedia/py-subliminal/Makefile
index 4bfa7bd96126..9ede07b281be 100644
--- a/multimedia/py-subliminal/Makefile
+++ b/multimedia/py-subliminal/Makefile
@@ -14,21 +14,21 @@ COMMENT= Python library to search and download subtitles
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.4.0:www/py-beautifulsoup@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}enzyme>=0.4.1:multimedia/py-enzyme@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.4.0:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}enzyme>=0.4.1:multimedia/py-enzyme@${PY_FLAVOR} \
${PY_FUTURES} \
- ${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}
+ ${PYTHON_PKGNAMEPREFIX}guessit>=2.1.0:multimedia/py-guessit@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>=4.0:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.0.0:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}chardet>=2.3.0:textproc/py-chardet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pysrt>=1.0.1:textproc/py-pysrt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}babelfish>=0.5.2:devel/py-babelfish@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.0:devel/py-dogpile.cache@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3:devel/py-appdirs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rarfile>=2.7:archivers/py-rarfile@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2012c:devel/py-pytz@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/multimedia/py-tvnamer/Makefile b/multimedia/py-tvnamer/Makefile
index 481299c66cdc..398bfe0f5893 100644
--- a/multimedia/py-tvnamer/Makefile
+++ b/multimedia/py-tvnamer/Makefile
@@ -12,8 +12,8 @@ COMMENT= Automatically names downloaded/recorded TV-episode
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tvdb_api>=1.5:www/py-tvdb_api@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tvdb_api>=1.5:www/py-tvdb_api@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile
index 6f07b94fc89d..56b5be708bad 100644
--- a/multimedia/quodlibet/Makefile
+++ b/multimedia/quodlibet/Makefile
@@ -13,9 +13,9 @@ COMMENT= GTK+-based audio player written in Python
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-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} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR} \
${LOCALBASE}/libexec/notification-daemon:deskutils/notification-daemon
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
libwebkit2gtk-4.0.so:www/webkit2-gtk3
@@ -51,10 +51,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@${FLAVOR}
-DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${FLAVOR}
+DBUS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
+DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
-REMOTE_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser@${FLAVOR}
-REMOTE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser@${FLAVOR}
+REMOTE_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser@${PY_FLAVOR}
+REMOTE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/multimedia/tovid/Makefile b/multimedia/tovid/Makefile
index 91343b13d5ef..e32af1cc1578 100644
--- a/multimedia/tovid/Makefile
+++ b/multimedia/tovid/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= mplayer:multimedia/mplayer \
normalize:audio/normalize \
lame:audio/lame \
gnubc>0:math/gnubc \
- ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
bash:shells/bash
USES= python:2.7 shebangfix
diff --git a/net-im/fugu/Makefile b/net-im/fugu/Makefile
index 9e02b9ad2ebf..97b1368e8972 100644
--- a/net-im/fugu/Makefile
+++ b/net-im/fugu/Makefile
@@ -12,7 +12,7 @@ COMMENT= Graphical client for the Gale instant messaging system
LICENSE= GPLv2
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw@${PY_FLAVOR}
USES= python:2.7 ssl
USE_PYTHON= distutils autoplist
diff --git a/net-im/papyon/Makefile b/net-im/papyon/Makefile
index 39996dea197b..a34bd5c754c5 100644
--- a/net-im/papyon/Makefile
+++ b/net-im/papyon/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Fork of pymsn to support the telepathy MSN connection manager
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
${PY_ENUM34} \
- ${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gstreamer>0:multimedia/py-gstreamer@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gstreamer>0:multimedia/py-gstreamer@${PY_FLAVOR} \
${PYTHON_SITELIBDIR}/farsight.so:net-im/farsight2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
${PY_ENUM34} \
- ${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gstreamer>0:multimedia/py-gstreamer@${FLAVOR} \
+ ${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gstreamer>0:multimedia/py-gstreamer@${PY_FLAVOR} \
${PYTHON_SITELIBDIR}/farsight.so:net-im/farsight2
USE_GNOME= pygobject
diff --git a/net-im/poezio/Makefile b/net-im/poezio/Makefile
index 4bbf09690ebe..c21bca40bd04 100644
--- a/net-im/poezio/Makefile
+++ b/net-im/poezio/Makefile
@@ -12,8 +12,8 @@ COMMENT= Console XMPP client
LICENSE= ZLIB
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython@${FLAVOR} \
- ${PYTHON_SITELIBDIR}/sleekxmpp/__init__.py:net-im/py-sleekxmpp@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/sleekxmpp/__init__.py:net-im/py-sleekxmpp@${PY_FLAVOR}
USES= tar:xz python:3.3+
USE_PYTHON= distutils autoplist optsuffix
diff --git a/net-im/proxy65/Makefile b/net-im/proxy65/Makefile
index f7dc0b520c74..c745d084fea1 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:security/py-openssl@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= mmatuska
diff --git a/net-im/py-fbmq/Makefile b/net-im/py-fbmq/Makefile
index 0cd376e6179c..a803dd6fa52e 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/net-im/py-jabberbot/Makefile b/net-im/py-jabberbot/Makefile
index 2d8d2dea50fe..0910bbd8b9f0 100644
--- a/net-im/py-jabberbot/Makefile
+++ b/net-im/py-jabberbot/Makefile
@@ -13,7 +13,7 @@ COMMENT= Simple Jabber Bot for Python
LICENSE= GPLv3
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xmpppy>0:net-im/py-xmpppy@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xmpppy>0:net-im/py-xmpppy@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/net-im/py-libturpial/Makefile b/net-im/py-libturpial/Makefile
index c4e5f42b1b31..c0272f4ee6fc 100644
--- a/net-im/py-libturpial/Makefile
+++ b/net-im/py-libturpial/Makefile
@@ -14,9 +14,9 @@ COMMENT= Twitter API
LICENSE= GPLv3
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.4.0:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauth>=1.0.1:net/py-oauth@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.2.0:www/py-requests@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile
index 1339359bafef..67c035d8e45e 100644
--- a/net-im/py-matrix-synapse/Makefile
+++ b/net-im/py-matrix-synapse/Makefile
@@ -14,40 +14,40 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}frozendict>=0.5:devel/py-frozendict@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.1.0:devel/py-unpaddedbase64@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.1.3:devel/py-canonicaljson@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}signedjson>=1.0.0:security/py-signedjson@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pynacl>=1.2.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>=0.3.0:devel/py-msgpack@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}phonenumbers>=8.2.0:devel/py-phonenumbers@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}prometheus-client>=0.2.0:net-mgmt/py-prometheus-client@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}frozendict>=0.5:devel/py-frozendict@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.1.0:devel/py-unpaddedbase64@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.1.3:devel/py-canonicaljson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}signedjson>=1.0.0:security/py-signedjson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pynacl>=1.2.1:security/py-pynacl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0:security/py-service_identity@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}daemonize>=2.4.2:devel/py-daemonize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.4:security/py-bcrypt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=3.1.1:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pydenticon>=0.2:devel/py-pydenticon@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ujson>=1.35:devel/py-ujson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}blist>=1.3.6:devel/py-blist@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pysaml2>=4.0.2:security/py-pysaml2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pymacaroons-pynacl>=0.9.3:security/py-pymacaroons-pynacl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3.0:devel/py-msgpack@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}phonenumbers>=8.2.0:devel/py-phonenumbers@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prometheus-client>=0.2.0:net-mgmt/py-prometheus-client@${PY_FLAVOR}
# Conditional requirements that aren't so conditional
-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}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}matrix-angular-sdk>=0.6.6:devel/py-matrix-angular-sdk@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_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@${FLAVOR} \
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.10.0:devel/py-simplejson@${PY_FLAVOR} \
${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${PY_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@${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}
+EMAIL_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bleach>=1.4.2:www/py-bleach@${PY_FLAVOR}
+LDAP_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}matrix-synapse-ldap3>=0.1:net/py-matrix-synapse-ldap3@${PY_FLAVOR}
+PGSQL_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
+SQLITE_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
post-patch:
@${REINPLACE_CMD} -e 's|msgpack-python|msgpack|' ${WRKSRC}/synapse/python_dependencies.py
diff --git a/net-im/py-nbxmpp/Makefile b/net-im/py-nbxmpp/Makefile
index 486bfd9984c6..2613946a5f9b 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/net-im/py-punjab/Makefile b/net-im/py-punjab/Makefile
index 5385c6cca882..243c1e307078 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_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 ef8d9a095657..8d8768081672 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_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@${FLAVOR}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${FLAVOR}
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/net-im/py-slackclient/Makefile b/net-im/py-slackclient/Makefile
index 7c6ceb23fee0..499eec1c50ae 100644
--- a/net-im/py-slackclient/Makefile
+++ b/net-im/py-slackclient/Makefile
@@ -11,12 +11,12 @@ COMMENT= Python client for Slack.com
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}websocket-client>=0.35:www/py-websocket-client@${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-mock>0:devel/py-pytest-mock@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}websocket-client>=0.35:www/py-websocket-client@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.11:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/net-im/py-sleekxmpp/Makefile b/net-im/py-sleekxmpp/Makefile
index 210bb5f2114c..af11d447c0b0 100644
--- a/net-im/py-sleekxmpp/Makefile
+++ b/net-im/py-sleekxmpp/Makefile
@@ -12,7 +12,7 @@ COMMENT= XMPP Library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0:devel/py-pyasn1-modules@${PY_FLAVOR}
diff --git a/net-im/py-telepot/Makefile b/net-im/py-telepot/Makefile
index b4f243440c33..3bb45ca13381 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR}
USES= python zip
USE_PYTHON= distutils autoplist
@@ -20,7 +20,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} >= 3500
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/net-im/py-unmessage/Makefile b/net-im/py-unmessage/Makefile
index e32e1be52622..0f7b0bb13baa 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@${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}
+ ${PYTHON_PKGNAMEPREFIX}opuslib>=1.1.0:audio/py-opuslib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyaudio>=0.2.10:audio/py-pyaudio@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyaxo>=0.7.3:security/py-pyaxo@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyperclip>=1.5.27:devel/py-pyperclip@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.0:security/py-txtorcon@${PY_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 a524559e20f8..3da648e41c8b 100644
--- a/net-im/py-xmpppy-irc/Makefile
+++ b/net-im/py-xmpppy-irc/Makefile
@@ -14,8 +14,8 @@ COMMENT= Xmpp to irc transport
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xmpp/__init__.py:net-im/py-xmpppy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}irc>0:irc/py-irc@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xmpp/__init__.py:net-im/py-xmpppy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}irc>0:irc/py-irc@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= flavors
diff --git a/net-im/py-xmpppy/Makefile b/net-im/py-xmpppy/Makefile
index 4197369cce2b..d6aba525c608 100644
--- a/net-im/py-xmpppy/Makefile
+++ b/net-im/py-xmpppy/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}rc1
MAINTAINER= python@FreeBSD.org
COMMENT= Python library that provides easy scripting with Jabber
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.7.1:dns/py-dnspython@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.7.1:dns/py-dnspython@${PY_FLAVOR}
USES= python:2.7 shebangfix
USE_PYTHON= autoplist distutils
diff --git a/net-im/toot/Makefile b/net-im/toot/Makefile
index 03abddd1cb12..81ade028c3fe 100644
--- a/net-im/toot/Makefile
+++ b/net-im/toot/Makefile
@@ -12,11 +12,11 @@ COMMENT= Interact with the Mastodon social network from the command line
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.0:www/py-beautifulsoup@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.0:www/py-beautifulsoup@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.4.0:devel/py-pytest-cov@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.0:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.0:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.4.0:devel/py-pytest-cov@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.0:devel/py-pytest@${PY_FLAVOR}
USES= python:3.3+
USE_PYTHON= autoplist distutils
diff --git a/net-im/turpial/Makefile b/net-im/turpial/Makefile
index b61e0f02ba49..18dc0af1df72 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.7:devel/py-setproctitle@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}libturpial>=1.7.0:net-im/py-libturpial@${PY_FLAVOR}
USES= pyqt:4 python:2.7
USE_PYQT= core_run gui_run network_run phonon_run webkit_run
diff --git a/net-mgmt/nagstamon/Makefile b/net-mgmt/nagstamon/Makefile
index 81a844ab6421..847ef4ea60c6 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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}keyring>=1.3:security/py-keyring@${PY_FLAVOR}
USES= cpe python:2.7
CPE_VENDOR= henri_wahl
diff --git a/net-mgmt/onionlauncher/Makefile b/net-mgmt/onionlauncher/Makefile
index 6577e86fac64..2785eaba3315 100644
--- a/net-mgmt/onionlauncher/Makefile
+++ b/net-mgmt/onionlauncher/Makefile
@@ -11,7 +11,7 @@ COMMENT= Launcher for Tor
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=0.18:security/py-stem@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=0.18:security/py-stem@${PY_FLAVOR} \
tor:security/tor
USE_GITHUB= yes
diff --git a/net-mgmt/py-adal/Makefile b/net-mgmt/py-adal/Makefile
index d07c7a6c3aff..e6ba676e153e 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>=1.1.0:security/py-cryptography@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1.0:devel/py-dateutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.1.0:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1.0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/net-mgmt/py-dnsdiag/Makefile b/net-mgmt/py-dnsdiag/Makefile
index 0d58f890fc9a..6b5574d1311c 100644
--- a/net-mgmt/py-dnsdiag/Makefile
+++ b/net-mgmt/py-dnsdiag/Makefile
@@ -12,8 +12,8 @@ COMMENT= DNS Diagnostics and measurement tools (ping, traceroute)
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cymruwhois>=1.6:net/py-cymruwhois@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cymruwhois>=1.6:net/py-cymruwhois@${PY_FLAVOR}
USES= python:3.3+
USE_PYTHON= autoplist distutils
diff --git a/net-mgmt/py-junos-eznc/Makefile b/net-mgmt/py-junos-eznc/Makefile
index 16e527669bd5..289cea44a877 100644
--- a/net-mgmt/py-junos-eznc/Makefile
+++ b/net-mgmt/py-junos-eznc/Makefile
@@ -11,15 +11,15 @@ COMMENT= Junos easy automation for non-programmers
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:devel/py-Jinja2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ncclient>=0.5.3:net-mgmt/py-ncclient@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}paramiko>=1.15.2:security/py-paramiko@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scp>=0.7.0:security/py-scp@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ncclient>=0.5.3:net-mgmt/py-ncclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}paramiko>=1.15.2:security/py-paramiko@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scp>=0.7.0:security/py-scp@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net-mgmt/py-msrest/Makefile b/net-mgmt/py-msrest/Makefile
index e54eeb588df8..acf74256ad2e 100644
--- a/net-mgmt/py-msrest/Makefile
+++ b/net-mgmt/py-msrest/Makefile
@@ -12,11 +12,11 @@ COMMENT= AutoRest swagger generator Python client runtime
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py-certifi@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py-certifi@${PY_FLAVOR} \
${PY_ENUM34} \
- ${PYTHON_PKGNAMEPREFIX}isodate>=0.6.0:devel/py-isodate@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.5.0:www/py-requests-oauthlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.14:www/py-requests@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}isodate>=0.6.0:devel/py-isodate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.5.0:www/py-requests-oauthlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.14:www/py-requests@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/net-mgmt/py-msrestazure/Makefile b/net-mgmt/py-msrestazure/Makefile
index a00808a9145f..ed44a2464a61 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}msrest>0:net-mgmt/py-msrest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}adal>0:net-mgmt/py-adal@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msrest>0:net-mgmt/py-msrest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}adal>0:net-mgmt/py-adal@${PY_FLAVOR}
USES= python zip
USE_PYTHON= autoplist distutils
diff --git a/net-mgmt/py-napalm/Makefile b/net-mgmt/py-napalm/Makefile
index 0615b196df23..1805224ce2a4 100644
--- a/net-mgmt/py-napalm/Makefile
+++ b/net-mgmt/py-napalm/Makefile
@@ -11,21 +11,21 @@ COMMENT= Net Automation and Progr. Abstraction Layer with Multivendor support
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}jtextfsm>0:textproc/py-jtextfsm@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}junos-eznc>=2.1.5:net-mgmt/py-junos-eznc@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}netmiko>=1.4.3:security/py-netmiko@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyeapi>0:net-mgmt/py-pyeapi@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyIOSXR>=0.51:net-mgmt/py-pyIOSXR@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pynxos>0:net-mgmt/py-pynxos@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scp>0:security/py-scp@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jtextfsm>0:textproc/py-jtextfsm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}junos-eznc>=2.1.5:net-mgmt/py-junos-eznc@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netmiko>=1.4.3:security/py-netmiko@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyeapi>0:net-mgmt/py-pyeapi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyIOSXR>=0.51:net-mgmt/py-pyIOSXR@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pynxos>0:net-mgmt/py-pynxos@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scp>0:security/py-scp@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/net-mgmt/py-ncclient/Makefile b/net-mgmt/py-ncclient/Makefile
index dd0fc18b0957..14a53728c09d 100644
--- a/net-mgmt/py-ncclient/Makefile
+++ b/net-mgmt/py-ncclient/Makefile
@@ -12,9 +12,9 @@ COMMENT= Python library for NETCONF clients
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.0:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}paramiko>=1.15.0:security/py-paramiko@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}paramiko>=1.15.0:security/py-paramiko@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net-mgmt/py-prometheus-client/Makefile b/net-mgmt/py-prometheus-client/Makefile
index 7e1fa9c3050b..3dc8ecc46e20 100644
--- a/net-mgmt/py-prometheus-client/Makefile
+++ b/net-mgmt/py-prometheus-client/Makefile
@@ -12,8 +12,8 @@ COMMENT= Official Python client for Prometheus
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=17.9.0:devel/py-twisted@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=17.9.0:devel/py-twisted@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=17.9.0:devel/py-twisted@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=17.9.0:devel/py-twisted@${PY_FLAVOR}
USES= python
diff --git a/net-mgmt/py-pyeapi/Makefile b/net-mgmt/py-pyeapi/Makefile
index 7ff5b15e2b31..456b65b19f5d 100644
--- a/net-mgmt/py-pyeapi/Makefile
+++ b/net-mgmt/py-pyeapi/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python client for Arista eAPI
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net-mgmt/py-pynsca/Makefile b/net-mgmt/py-pynsca/Makefile
index a7f9bf571c48..46ede96e5e1d 100644
--- a/net-mgmt/py-pynsca/Makefile
+++ b/net-mgmt/py-pynsca/Makefile
@@ -14,10 +14,10 @@ LICENSE= MPL11
OPTIONS_DEFINE= AES 3DES
AES_DESC= Provide AES encryption
-AES_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}mcrypt>=0:security/py-mcrypt@${FLAVOR}
+AES_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}mcrypt>=0:security/py-mcrypt@${PY_FLAVOR}
3DES_DESC= Provide 3DES encryption
-3DES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR}
+3DES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR}
OPTIONS_DEFAULT=AES 3DES
diff --git a/net-mgmt/py-pynxos/Makefile b/net-mgmt/py-pynxos/Makefile
index a0c2f9a40108..d594afbfd6e4 100644
--- a/net-mgmt/py-pynxos/Makefile
+++ b/net-mgmt/py-pynxos/Makefile
@@ -16,9 +16,9 @@ LICENSE_TEXT= This program is NOT in public domain.\
and THERE IS NO WARRANTY FOR THIS PROGRAM.
LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scp>0:security/py-scp@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scp>0:security/py-scp@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net-mgmt/py-pysmi/Makefile b/net-mgmt/py-pysmi/Makefile
index 2dfdb0b43f19..602574294480 100644
--- a/net-mgmt/py-pysmi/Makefile
+++ b/net-mgmt/py-pysmi/Makefile
@@ -13,9 +13,9 @@ COMMENT= SNMP/SMI MIB parsing in Python
LICENSE= BSD2CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snmp4>=0:net-mgmt/py-snmp4@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snmp4>=0:net-mgmt/py-snmp4@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/net-mgmt/py-pyzabbix/Makefile b/net-mgmt/py-pyzabbix/Makefile
index 1f087ab927ca..58fff77a17ec 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.0:www/py-requests@${PY_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 ba0a302b18b2..8509b0747fc3 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.3.2:net-mgmt/py-snmp4@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snmp4>=4.3.2:net-mgmt/py-snmp4@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net-mgmt/py-snmp4-mibs/Makefile b/net-mgmt/py-snmp4-mibs/Makefile
index d82fc532b9e4..b6cd895e78bf 100644
--- a/net-mgmt/py-snmp4-mibs/Makefile
+++ b/net-mgmt/py-snmp4-mibs/Makefile
@@ -14,7 +14,7 @@ COMMENT= Additional python MIB files for pysnmp4 and friends
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snmp4>=4.3.2:net-mgmt/py-snmp4@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snmp4>=4.3.2:net-mgmt/py-snmp4@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net-mgmt/py-snmp4/Makefile b/net-mgmt/py-snmp4/Makefile
index f4772d8a7709..2dd51a9abb88 100644
--- a/net-mgmt/py-snmp4/Makefile
+++ b/net-mgmt/py-snmp4/Makefile
@@ -14,8 +14,8 @@ COMMENT= SNMP framework for Python
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.2:devel/py-pyasn1@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.4.1:security/py-pycrypto@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.2:devel/py-pyasn1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.4.1:security/py-pycrypto@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/net-mgmt/tornova/Makefile b/net-mgmt/tornova/Makefile
index 7875b4f17932..be75c0dec5ce 100644
--- a/net-mgmt/tornova/Makefile
+++ b/net-mgmt/tornova/Makefile
@@ -12,7 +12,7 @@ COMMENT= Frontend for Tor
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=0.18:security/py-stem@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=0.18:security/py-stem@${PY_FLAVOR} \
tor:security/tor
USE_GITHUB= yes
diff --git a/net-p2p/deluge-cli/Makefile b/net-p2p/deluge-cli/Makefile
index 3120fdc843ff..4e48d4fc0385 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@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0.18:devel/py-xdg@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0:net-p2p/libtorrent-rasterbar-python@${PY_FLAVOR} \
- ${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}
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0.8:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:textproc/py-chardet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
USES= gettext python:-2.7
USE_PYTHON= autoplist distutils
diff --git a/net-p2p/py-transmissionrpc/Makefile b/net-p2p/py-transmissionrpc/Makefile
index edd22b7e1b4a..7a257d2e53c7 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/net-p2p/py-vertex/Makefile b/net-p2p/py-vertex/Makefile
index 818d2d78c72c..644d6a602ebc 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}epsilon>=0:devel/py-epsilon@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/net/cloud-init-azure/Makefile b/net/cloud-init-azure/Makefile
index a89027d8c282..2bf0818ce007 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_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}
+ ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR}
ETCDIR= ${PREFIX}/etc/cloud
diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile
index c3d2e910907e..130c8f35989c 100644
--- a/net/cloud-init/Makefile
+++ b/net/cloud-init/Makefile
@@ -16,17 +16,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@${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}
+ ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauth>0:net/py-oauth@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR}
ETCDIR= ${PREFIX}/etc/cloud
diff --git a/net/googlecl/Makefile b/net/googlecl/Makefile
index 6de572d5fedc..4899d360785b 100644
--- a/net/googlecl/Makefile
+++ b/net/googlecl/Makefile
@@ -12,9 +12,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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oauth2client>0:security/py-oauth2client@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauth2client>0:security/py-oauth2client@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/net/nsscache/Makefile b/net/nsscache/Makefile
index 635c73d4a4d0..2d959b8a200d 100644
--- a/net/nsscache/Makefile
+++ b/net/nsscache/Makefile
@@ -13,8 +13,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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/net/pdb/Makefile b/net/pdb/Makefile
index 5557bcd3a0ba..8a3804a7dfea 100644
--- a/net/pdb/Makefile
+++ b/net/pdb/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= gnn@FreeBSD.org
COMMENT= Packet Debugger
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pcs/__init__.py:net/py-pcs@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pcs/__init__.py:net/py-pcs@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils pythonprefix
diff --git a/net/py-GeoIP2/Makefile b/net/py-GeoIP2/Makefile
index b865d151022c..a8e3fd0cf3f4 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.4:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maxminddb>=1.1.0:net/py-maxminddb@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.4:www/py-requests@${PY_FLAVOR}
GH_ACCOUNT= maxmind
GH_PROJECT= GeoIP2-python
diff --git a/net/py-amqp/Makefile b/net/py-amqp/Makefile
index ffc098e556a0..e32004a3c74e 100644
--- a/net/py-amqp/Makefile
+++ b/net/py-amqp/Makefile
@@ -12,10 +12,10 @@ COMMENT= Low-level AMQP client for Python (fork of amqplib)
LICENSE= LGPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vine>0:devel/py-vine@${FLAVOR}
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vine>0:devel/py-vine@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index d98232b30752..e6c287fc65e0 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@${FLAVOR} \
- ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR}
LIB_DEPENDS= libavahi-client.so:net/avahi-app
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} \
- ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR}
MASTERDIR= ${.CURDIR}/../avahi-app
BUILD_WRKSRC= ${WRKSRC}/avahi-python
diff --git a/net/py-beanstalkc/Makefile b/net/py-beanstalkc/Makefile
index 1a51c62e5123..f4b3fd66508a 100644
--- a/net/py-beanstalkc/Makefile
+++ b/net/py-beanstalkc/Makefile
@@ -12,8 +12,8 @@ COMMENT= Simple beanstalkd client library for Python
LICENSE= APACHE20
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
@@ -22,7 +22,7 @@ OPTIONS_DEFINE= YAML
OPTIONS_DEFAULT= YAML
YAML_DESC= YAML response parsing support
-YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
+YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
diff --git a/net/py-cjdns/Makefile b/net/py-cjdns/Makefile
index 81d9b749c887..9a043c098319 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-cloudflare-scrape/Makefile b/net/py-cloudflare-scrape/Makefile
index a8cd1a80148b..645fc8310658 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyExecJS>=0:devel/py-PyExecJS@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net/py-coherence/Makefile b/net/py-coherence/Makefile
index 8ea7e8e01eea..0dd6cca6d6c1 100644
--- a/net/py-coherence/Makefile
+++ b/net/py-coherence/Makefile
@@ -13,10 +13,10 @@ 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.3:devel/py-configobj@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>8.2:devel/py-twisted@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Louie>0:devel/py-louie@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= coherence-project
diff --git a/net/py-ec2-cli-tools/Makefile b/net/py-ec2-cli-tools/Makefile
index ab82b2d9a88e..cc6e1c2eb413 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@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.0:devel/py-boto@${PY_FLAVOR} \
bash:shells/bash
USE_PYTHON= distutils autoplist
diff --git a/net/py-eventlet/Makefile b/net/py-eventlet/Makefile
index 76a9615602f8..714da074ee51 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@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3:devel/py-greenlet@${PY_FLAVOR} \
${PY_ENUM_COMPAT} \
${PY_ENUM34}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net/py-flask-xml-rpc/Makefile b/net/py-flask-xml-rpc/Makefile
index b10e05db1794..779e0d0036c2 100644
--- a/net/py-flask-xml-rpc/Makefile
+++ b/net/py-flask-xml-rpc/Makefile
@@ -11,8 +11,8 @@ COMMENT= Adds support for creating XML-RPC APIs to Flask
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/net/py-gntp/Makefile b/net/py-gntp/Makefile
index 4995c0c94e39..fba01d444428 100644
--- a/net/py-gntp/Makefile
+++ b/net/py-gntp/Makefile
@@ -23,7 +23,7 @@ USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${FLAVOR}
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
PYDISTUTILS_BUILD_TARGET+= build_sphinx
diff --git a/net/py-gspread/Makefile b/net/py-gspread/Makefile
index 43b579c4a6e6..388d0c6b5f69 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.2.1:www/py-requests@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/net/py-gspreadsheet/Makefile b/net/py-gspreadsheet/Makefile
index 4ce3574ea938..3eb2927c68b5 100644
--- a/net/py-gspreadsheet/Makefile
+++ b/net/py-gspreadsheet/Makefile
@@ -13,8 +13,8 @@ COMMENT= Wrapper around Google Spreadsheets to look like csv.DictReader
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>=2.0.14:devel/py-gdata@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>=2.0.14:devel/py-gdata@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/net/py-haproxyctl/Makefile b/net/py-haproxyctl/Makefile
index dd3ca195a2fe..32c8341c90ef 100644
--- a/net/py-haproxyctl/Makefile
+++ b/net/py-haproxyctl/Makefile
@@ -11,7 +11,7 @@ COMMENT= HAProxy control tool
LICENSE= GPLv3
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/net/py-impacket/Makefile b/net/py-impacket/Makefile
index 6bfeebb5a1d8..7042ece0d3e8 100644
--- a/net/py-impacket/Makefile
+++ b/net/py-impacket/Makefile
@@ -15,9 +15,9 @@ LICENSE= APACHE11 ZLIB
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pcapy>=0:net/py-pcapy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR}
USES= dos2unix python
USE_PYTHON= autoplist distutils
diff --git a/net/py-kombu/Makefile b/net/py-kombu/Makefile
index 503d2c00b63f..f2a2ba9c2913 100644
--- a/net/py-kombu/Makefile
+++ b/net/py-kombu/Makefile
@@ -12,8 +12,8 @@ COMMENT= AMQP messaging framework for Python
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amqp>=2.2.2:net/py-amqp@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:devel/py-anyjson@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amqp>=2.2.2:net/py-amqp@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:devel/py-anyjson@${PY_FLAVOR}
OPTIONS_DEFINE= BEANSTALK BOTO MONGODB REDIS SQLALCHEMY ZMQ
@@ -24,12 +24,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@${FLAVOR}
-BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=2.6.0:devel/py-boto@${FLAVOR}
+BEANSTALK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beanstalkc>0:net/py-beanstalkc@${PY_FLAVOR}
+BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=2.6.0:devel/py-boto@${PY_FLAVOR}
MONGODB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo@${PY_FLAVOR}
-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}
+REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR}
+SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${PY_FLAVOR}
+ZMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=13.1.0:net/py-pyzmq@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-ldap/Makefile b/net/py-ldap/Makefile
index e9cedd2498d7..8112c83683ce 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:devel/py-pyasn1-modules@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:devel/py-pyasn1-modules@${PY_FLAVOR}
CONFLICTS_INSTALL= py27-pyldap
USES= python
diff --git a/net/py-ldap3/Makefile b/net/py-ldap3/Makefile
index 18bb24926ad9..cce59229b09a 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/net/py-ldaptor/Makefile b/net/py-ldaptor/Makefile
index 1233c24bcc7c..6dff2dbd01d2 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
GITVERSION= aad8ded658b36337a08aeb7402b6b67eb8771bea
diff --git a/net/py-libcloud/Makefile b/net/py-libcloud/Makefile
index 76ce2338ccae..85a25d34c409 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/net/py-libfte/Makefile b/net/py-libfte/Makefile
index 372a74564d86..707b1c2f5b9c 100644
--- a/net/py-libfte/Makefile
+++ b/net/py-libfte/Makefile
@@ -12,7 +12,7 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= regex2dfa:textproc/regex2dfa \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${PY_FLAVOR}
LIB_DEPENDS= libgmp.so:math/gmp
USES= localbase python:2.7
diff --git a/net/py-magic-wormhole/Makefile b/net/py-magic-wormhole/Makefile
index 3800131ccd23..6434485bc8c4 100644
--- a/net/py-magic-wormhole/Makefile
+++ b/net/py-magic-wormhole/Makefile
@@ -10,17 +10,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@${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.8:security/py-spake2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tqdm>=4.13.0:misc/py-tqdm@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.3:security/py-txtorcon@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}autobahn>=0.14.1:www/py-autobahn@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hkdf>0:security/py-hkdf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}humanize>=0:devel/py-humanize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}idna>=0.6:dns/py-idna@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}spake2>=0.8:security/py-spake2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tqdm>=4.13.0:misc/py-tqdm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.3:security/py-txtorcon@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-matrix-synapse-ldap3/Makefile b/net/py-matrix-synapse-ldap3/Makefile
index 62f1e81cce18..3f2b27b32ffd 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap3>=0.9.5:net/py-ldap3@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-maxminddb/Makefile b/net/py-maxminddb/Makefile
index ebfc02117856..1c3ee63e615a 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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr@${PY_FLAVOR}
.endif
post-install:
diff --git a/net/py-msrplib/Makefile b/net/py-msrplib/Makefile
index dee2f10004db..1e2e703761b6 100644
--- a/net/py-msrplib/Makefile
+++ b/net/py-msrplib/Makefile
@@ -13,11 +13,11 @@ COMMENT= Python MSRP client library
LICENSE= LGPL20+
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}application>=1.2.8:devel/py-application@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}eventlib>=0:devel/py-eventlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gnutls>=3.0.0:security/py-gnutls@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}application>=1.2.8:devel/py-application@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}eventlib>=0:devel/py-eventlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gnutls>=3.0.0:security/py-gnutls@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/net/py-ndg_httpsclient/Makefile b/net/py-ndg_httpsclient/Makefile
index 4cc03df53029..899ceea289a8 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.4:devel/py-pyasn1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/net/py-netaddr/Makefile b/net/py-netaddr/Makefile
index 273a132c1818..23908e92471d 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/net/py-netif/Makefile b/net/py-netif/Makefile
index dbd548fce920..5da61c024abe 100644
--- a/net/py-netif/Makefile
+++ b/net/py-netif/Makefile
@@ -11,7 +11,7 @@ COMMENT= Python network configuration library for FreeBSD
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsd>0:devel/py-bsd@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsd>0:devel/py-bsd@${PY_FLAVOR} \
${PY_ENUM34}
USE_GITHUB= yes
diff --git a/net/py-netlib/Makefile b/net/py-netlib/Makefile
index e487391202f2..4bd54b47c05a 100644
--- a/net/py-netlib/Makefile
+++ b/net/py-netlib/Makefile
@@ -13,8 +13,8 @@ COMMENT= Collection of network utilities
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/net/py-nnpy/Makefile b/net/py-nnpy/Makefile
index 384540cfdd4a..48bac3904d80 100644
--- a/net/py-nnpy/Makefile
+++ b/net/py-nnpy/Makefile
@@ -13,7 +13,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libnanomsg.so:net/nanomsg
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/net/py-oauth2/Makefile b/net/py-oauth2/Makefile
index 4534b4e5f7ed..62db5178fde6 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2@${PY_FLAVOR}
TEST_DEPENDS:= ${RUN_DEPENDS} \
- ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
OPTIONS_DEFINE= TESTS
TESTS_DESC= Install test suite requirements
diff --git a/net/py-port-for/Makefile b/net/py-port-for/Makefile
index 8637878624b8..c866f8a529f9 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>=0.8:devel/py-mock@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=0.8:devel/py-mock@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/net/py-portend/Makefile b/net/py-portend/Makefile
index 929b9a9771ff..ddaba91e0487 100644
--- a/net/py-portend/Makefile
+++ b/net/py-portend/Makefile
@@ -12,8 +12,8 @@ COMMENT= Monitors TCP ports for bound or unbound states
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tempora>=1.8:devel/py-tempora@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tempora>=1.8:devel/py-tempora@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/net/py-pynsq/Makefile b/net/py-pynsq/Makefile
index 0dedcf5c17b3..dbee11164b2d 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-snappy>0:archivers/py-python-snappy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${PY_FLAVOR}
USES= python:-2.7
USE_GITHUB= yes
diff --git a/net/py-pyshark/Makefile b/net/py-pyshark/Makefile
index 80cced1def2a..62c415cd187b 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@${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}
+ ${PYTHON_PKGNAMEPREFIX}trollius>0:devel/py-trollius@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}logbook>0:devel/py-logbook@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}py>0:devel/py-py@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
USES= python zip
USE_PYTHON= autoplist distutils
diff --git a/net/py-pysmb/Makefile b/net/py-pysmb/Makefile
index a170aed04bd0..0aca36c8d7f8 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
diff --git a/net/py-python-barbicanclient/Makefile b/net/py-python-barbicanclient/Makefile
index e6f217c90eb6..902a2214c693 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-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}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cliff>=0:devel/py-cliff@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/net/py-python-ceilometerclient/Makefile b/net/py-python-ceilometerclient/Makefile
index 416c77358ffb..5388d15555cb 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-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}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.10.0:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.5.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.1.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/net/py-python-cinderclient/Makefile b/net/py-python-cinderclient/Makefile
index 6e7f7b44d475..472e767cadf6 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${PY_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 045c7aeeaba7..73653deb7501 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-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}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.14.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/net/py-python-glanceclient/Makefile b/net/py-python-glanceclient/Makefile
index 2f8b85e85327..976a8fb40817 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}warlock>=0:devel/py-warlock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_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 7126b10e325e..606b3de0d47b 100644
--- a/net/py-python-heatclient/Makefile
+++ b/net/py-python-heatclient/Makefile
@@ -13,21 +13,21 @@ COMMENT= OpenStack Orchestration API Client Library
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-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}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=3.2.0:databases/py-python-swiftclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/net/py-python-keystoneclient/Makefile b/net/py-python-keystoneclient/Makefile
index 79dc899773a7..e5b4eb6b88e6 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}positional>=1.0.1:devel/py-positional@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${PY_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 c9c8def0f85e..ba988ac4a04b 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}osc-lib>=1.0.2:devel/py-osc-lib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cliff>=0:devel/py-cliff@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}os-client-config>=0:devel/py-os-client-config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_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 994cf8eb22fe..5d4272c552e5 100644
--- a/net/py-python-novaclient/Makefile
+++ b/net/py-python-novaclient/Makefile
@@ -13,17 +13,17 @@ COMMENT= Client for the OpenStack Nova API
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}prettytable>=0.7.1:devel/py-prettytable@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=3.5.1:devel/py-simplejson@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0.7.1:devel/py-prettytable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=3.5.1:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
USES= python shebangfix
USE_PYTHON= autoplist concurrent distutils
diff --git a/net/py-python-openstackclient/Makefile b/net/py-python-openstackclient/Makefile
index 94d9f65b3003..3de0839713d6 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openstacksdk>=0.9.10:devel/py-openstacksdk@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=2.5.0:net/py-python-glanceclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-neutronclient>=0:net/py-python-neutronclient@${PY_FLAVOR}
USES= python shebangfix
USE_PYTHON= distutils autoplist noegginfo
diff --git a/net/py-pyvmomi/Makefile b/net/py-pyvmomi/Makefile
index aed8ac8cffe4..48675fb88c76 100644
--- a/net/py-pyvmomi/Makefile
+++ b/net/py-pyvmomi/Makefile
@@ -11,8 +11,8 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils concurrent optsuffix
diff --git a/net/py-pyzmq/Makefile b/net/py-pyzmq/Makefile
index 56ccbf4cfd48..283bff633d10 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>0:devel/py-asyncio@${PY_FLAVOR}
.endif
do-test:
diff --git a/net/py-rabbitpy/Makefile b/net/py-rabbitpy/Makefile
index 0c23bf83d403..999645d75ead 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pamqp>0:net/py-pamqp@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pamqp>0:net/py-pamqp@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pamqp>0:net/py-pamqp@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/net/py-rainbowstream/Makefile b/net/py-rainbowstream/Makefile
index ad8717db5f64..e786521c91dc 100644
--- a/net/py-rainbowstream/Makefile
+++ b/net/py-rainbowstream/Makefile
@@ -14,13 +14,13 @@ COMMENT= Smart and nice Twitter client on terminal
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.5.3:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyfiglet>0:misc/py-pyfiglet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twitter-tools>0:net/py-twitter-tools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${PY_FLAVOR}
# Actually 2.7,3.2-
USES= python:2.7
diff --git a/net/py-ripe.atlas.cousteau/Makefile b/net/py-ripe.atlas.cousteau/Makefile
index f90ff080006c..173e993c859b 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@${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:www/py-websocket-client@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}socketio-client>=0.6.5:net/py-socketio-client@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/net/py-ripe.atlas.sagan/Makefile b/net/py-ripe.atlas.sagan/Makefile
index d167e335dce6..dfa2b08212a6 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-ripe.atlas.tools/Makefile b/net/py-ripe.atlas.tools/Makefile
index 929c7512a929..b61ccf988e4c 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ripe.atlas.cousteau>=1.0.4:net/py-ripe.atlas.cousteau@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ripe.atlas.sagan>=1.1.4:net/py-ripe.atlas.sagan@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile
index ab6cf4ebfaaf..6bc9b74f7c4d 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/net/py-s3transfer/Makefile b/net/py-s3transfer/Makefile
index 3ddfa2bb79f9..c20432ac9139 100644
--- a/net/py-s3transfer/Makefile
+++ b/net/py-s3transfer/Makefile
@@ -12,10 +12,10 @@ 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@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.3.0:devel/py-botocore@${PY_FLAVOR} \
${PY_FUTURES}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.3:devel/py-nose@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.3:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${PY_FLAVOR}
#Actually -2.7,3.3-3.5
USES= python
diff --git a/net/py-shodan/Makefile b/net/py-shodan/Makefile
index 21c6685c36f0..c8df5fac4a1e 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click-plugins>=1.0.3:devel/py-click-plugins@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-smart_open/Makefile b/net/py-smart_open/Makefile
index b763cb501f08..57cd2f42fae3 100644
--- a/net/py-smart_open/Makefile
+++ b/net/py-smart_open/Makefile
@@ -13,12 +13,12 @@ COMMENT= Utils for streaming large files
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=2.32:devel/py-boto@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}boto3>=0:www/py-boto3@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}bz2file>=0:archivers/py-bz2file@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}responses>=0:devel/py-responses@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=2.32:devel/py-boto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}boto3>=0:www/py-boto3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bz2file>=0:archivers/py-bz2file@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}responses>=0:devel/py-responses@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile
index 77f0019432ec..573dc9a857c6 100644
--- a/net/py-soappy/Makefile
+++ b/net/py-soappy/Makefile
@@ -14,8 +14,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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}wstools>0:textproc/py-wstools@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wstools>0:textproc/py-wstools@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= autoplist distutils
diff --git a/net/py-socketio-client/Makefile b/net/py-socketio-client/Makefile
index a5716ba298fa..d8156ee346b0 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net/py-softlayer/Makefile b/net/py-softlayer/Makefile
index 59e0f867b658..97fb809dcc0d 100644
--- a/net/py-softlayer/Makefile
+++ b/net/py-softlayer/Makefile
@@ -14,13 +14,13 @@ COMMENT= SoftLayer API Python Client
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=5:devel/py-click@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}prettytable>=0.7.0:devel/py-prettytable@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=0.53:devel/py-prompt_toolkit@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pygments>=2.0.0:textproc/py-pygments@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}urllib3>=1.22:net/py-urllib3@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=5:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0.7.0:devel/py-prettytable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=0.53:devel/py-prompt_toolkit@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=2.0.0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urllib3>=1.22:net/py-urllib3@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/net/py-sshuttle/Makefile b/net/py-sshuttle/Makefile
index 9e6b2a682cab..f7ab103946d8 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/net/py-stomp.py/Makefile b/net/py-stomp.py/Makefile
index 541279b73c3f..73d4ac872cca 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest@${PY_FLAVOR}
OPTIONS_DEFINE= DOXYGEN
DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
diff --git a/net/py-terminado/Makefile b/net/py-terminado/Makefile
index 409dc8537e98..bb9d1332a34f 100644
--- a/net/py-terminado/Makefile
+++ b/net/py-terminado/Makefile
@@ -12,8 +12,8 @@ COMMENT= Terminals served to term.js using Tornado websockets
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tornado>=4:www/py-tornado@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>=4:www/py-tornado@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/net/py-tofu/Makefile b/net/py-tofu/Makefile
index 309742fe8765..d5194a723622 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
OPTIONS_DEFINE= EXAMPLES
diff --git a/net/py-tweepy/Makefile b/net/py-tweepy/Makefile
index a3fbd422fd58..49afffb1ea44 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4.1:www/py-requests-oauthlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.7.3:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vcrpy>=1.1.2:devel/py-vcrpy@${PY_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@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2@${PY_FLAVOR}
.endif
do-test:
diff --git a/net/py-twitter-tools/Makefile b/net/py-twitter-tools/Makefile
index b048408eddc6..93fc264d97a4 100644
--- a/net/py-twitter-tools/Makefile
+++ b/net/py-twitter-tools/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX= -tools
MAINTAINER= koobs@FreeBSD.org
COMMENT= Python API and command-line toolset for Twitter
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
diff --git a/net/py-txamqp/Makefile b/net/py-txamqp/Makefile
index 65318a90eb5c..9c59d733f731 100644
--- a/net/py-txamqp/Makefile
+++ b/net/py-txamqp/Makefile
@@ -14,8 +14,8 @@ COMMENT= Twisted Python library for the AMQP messaging protocol
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/net/py-upnp-inspector/Makefile b/net/py-upnp-inspector/Makefile
index 94a753be959d..775ca93e70c5 100644
--- a/net/py-upnp-inspector/Makefile
+++ b/net/py-upnp-inspector/Makefile
@@ -14,7 +14,7 @@ COMMENT= UPnP Device and Service analyzer
LICENSE= PD
LICENSE_FILE= ${WRKSRC}/LICENCE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Coherence>=0.6.4:net/py-coherence@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Coherence>=0.6.4:net/py-coherence@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils concurrent autoplist
diff --git a/net/py-urllib3/Makefile b/net/py-urllib3/Makefile
index 7d5d924ed25f..efc9a7282dbb 100644
--- a/net/py-urllib3/Makefile
+++ b/net/py-urllib3/Makefile
@@ -14,15 +14,15 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${PY_FLAVOR} \
${PY_IPADDRESS} \
- ${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}
+ ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.7:net/py-pysocks@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
+#TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tornado>=0:www/py-tornado@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
@@ -32,7 +32,7 @@ SUB_FILES= pkg-message
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3400
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/net/py-wmi-query/Makefile b/net/py-wmi-query/Makefile
index 86629b5929ed..6c0cd13dbd91 100644
--- a/net/py-wmi-query/Makefile
+++ b/net/py-wmi-query/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python scripts to get wmi data classes in a dict
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}impacket>=0:net/py-impacket@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}impacket>=0:net/py-impacket@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/net/py-wolframalpha/Makefile b/net/py-wolframalpha/Makefile
index 0cb65a4ea3f8..44fdf8372f5f 100644
--- a/net/py-wolframalpha/Makefile
+++ b/net/py-wolframalpha/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Python Client for Wolfram Alpha
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= autoplist distutils
diff --git a/net/py-zeroconf/Makefile b/net/py-zeroconf/Makefile
index eaf57723c6b6..cccd86f7452c 100644
--- a/net/py-zeroconf/Makefile
+++ b/net/py-zeroconf/Makefile
@@ -11,8 +11,8 @@ COMMENT= Pure python implementation of multicast DNS service discovery
LICENSE= LGPL21+
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.6:net/py-netifaces@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.6:net/py-netifaces@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/net/py-zope.proxy/Makefile b/net/py-zope.proxy/Makefile
index fe7ed222bc56..666cabf5572a 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:devel/py-zope.interface@${PY_FLAVOR}
USES= python zip
USE_PYTHON= distutils autoplist
diff --git a/net/pythondirector/Makefile b/net/pythondirector/Makefile
index 6e5c64151519..84c0ccaaf856 100644
--- a/net/pythondirector/Makefile
+++ b/net/pythondirector/Makefile
@@ -13,7 +13,7 @@ COMMENT= TCP load balancer written in Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/doc/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
diff --git a/net/s3ql/Makefile b/net/s3ql/Makefile
index 467e42cc7906..504f36df2206 100644
--- a/net/s3ql/Makefile
+++ b/net/s3ql/Makefile
@@ -11,12 +11,12 @@ 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/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} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apsw>=3.7:databases/py-apsw@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}llfuse>=0:devel/py-llfuse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dugong>=0:net/py-dugong@${PY_FLAVOR} \
psmisc>=0:sysutils/psmisc \
ca_root_nss>=0:security/ca_root_nss
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index 85ddf6a0d82e..b827acef0bf5 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -14,8 +14,8 @@ LICENSE= GPLv2
USE_GITHUB= yes
GH_ACCOUNT= secdev
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dnet.so:net/py-libdnet@${FLAVOR} \
- ${PYTHON_SITELIBDIR}/pcap.py:net/py-pcap@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dnet.so:net/py-libdnet@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/pcap.py:net/py-pcap@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
@@ -33,16 +33,16 @@ MANUF_DESC= wireshark's MANUF MAC database
MATPLOT_DESC= Install python matplotlibs
SOX_DESC= Support for VoIP
-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}
+PYX_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyx/__init__.py:graphics/py-PyX12@${PY_FLAVOR}
+PYCRYPTO_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Crypto/__init__.py:security/py-pycrypto@${PY_FLAVOR}
+PYGNUPLOT_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Gnuplot/__init__.py:math/py-gnuplot@${PY_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
QUESO_BASE_RUN_DEPENDS= ${LOCALBASE}/etc/queso.conf.sample:net/queso
NMAP_RUN_DEPENDS= ${LOCALBASE}/share/nmap/nmap-os-db:security/nmap
MANUF_RUN_DEPENDS= ${LOCALBASE}/share/wireshark/manuf:net/wireshark
-MATPLOT_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${FLAVOR}
+MATPLOT_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR}
SOX_RUN_DEPENDS= ${LOCALBASE}/bin/sox:audio/sox
post-patch:
diff --git a/net/sippy_b2bua/Makefile b/net/sippy_b2bua/Makefile
index f65853e1f73e..010d478e8d45 100644
--- a/net/sippy_b2bua/Makefile
+++ b/net/sippy_b2bua/Makefile
@@ -11,7 +11,7 @@ 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= distutils
diff --git a/net/splatd/Makefile b/net/splatd/Makefile
index a23dc6599253..c2d1ccc36946 100644
--- a/net/splatd/Makefile
+++ b/net/splatd/Makefile
@@ -13,11 +13,11 @@ COMMENT= Splat is the Scalable Periodic LDAP Attribute Transmogrifier
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>0:devel/py-zconfig@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>0:devel/py-zconfig@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>0:devel/py-zconfig@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>0:devel/py-zconfig@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils
diff --git a/net/tcpwatch/Makefile b/net/tcpwatch/Makefile
index e40a475d9115..b838935ca6c2 100644
--- a/net/tcpwatch/Makefile
+++ b/net/tcpwatch/Makefile
@@ -10,7 +10,7 @@ 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/net/turses/Makefile b/net/turses/Makefile
index de3e9a88beb5..325d595bb811 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.3.0:devel/py-urwid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tweepy>=3.1.0:net/py-tweepy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.14.3:devel/py-future@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${PY_FLAVOR}
.endif
do-test:
diff --git a/news/hellanzb/Makefile b/news/hellanzb/Makefile
index c17f62b78216..bae722f3bc71 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yenc>=0:news/py-yenc@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yenc>=0:news/py-yenc@${PY_FLAVOR} \
mac:audio/mac
USE_PYTHON= distutils
diff --git a/news/py-pynzb/Makefile b/news/py-pynzb/Makefile
index d85577767537..ef6f1f0fd233 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@${FLAVOR}
+LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.1:devel/py-lxml@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/news/rawdog/Makefile b/news/rawdog/Makefile
index 2c2c2715570c..06286aa5271f 100644
--- a/news/rawdog/Makefile
+++ b/news/rawdog/Makefile
@@ -12,7 +12,7 @@ COMMENT= Simple RSS aggregator
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils
diff --git a/ports-mgmt/py-pytoport/Makefile b/ports-mgmt/py-pytoport/Makefile
index f35ef8c735fb..981297a86c67 100644
--- a/ports-mgmt/py-pytoport/Makefile
+++ b/ports-mgmt/py-pytoport/Makefile
@@ -16,8 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
GH_ACCOUNT= freebsd
GH_PROJECT= pytoport
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}spdx-lookup>=0.3.0:misc/py-spdx-lookup@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}spdx-lookup>=0.3.0:misc/py-spdx-lookup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${PY_FLAVOR}
USES= python:3.3+
USE_GITHUB= yes
diff --git a/print/cloudprint/Makefile b/print/cloudprint/Makefile
index cf0be1b9b889..c8e2fac79390 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>=0:print/py-pycups@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}daemon>0:devel/py-daemon@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= armooo
diff --git a/print/dot2tex/Makefile b/print/dot2tex/Makefile
index 53dc8fb5a4c7..2eee0bea0235 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@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.4.8:devel/py-pyparsing@${PY_FLAVOR} \
dot:graphics/graphviz
NO_ARCH= yes
diff --git a/print/frescobaldi/Makefile b/print/frescobaldi/Makefile
index 20a20c345532..1e79437b42a7 100644
--- a/print/frescobaldi/Makefile
+++ b/print/frescobaldi/Makefile
@@ -13,8 +13,8 @@ COMMENT= Music score editor for lilypond
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly@${PY_FLAVOR}
USES= gettext kde:4 python:2.7 desktop-file-utils
USE_GITHUB= yes
diff --git a/print/pkpgcounter/Makefile b/print/pkpgcounter/Makefile
index 06a79e483518..f4c7a6083faf 100644
--- a/print/pkpgcounter/Makefile
+++ b/print/pkpgcounter/Makefile
@@ -10,7 +10,7 @@ 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
LICENSE= GPLv3
diff --git a/print/py-pollyreports/Makefile b/print/py-pollyreports/Makefile
index df689d1b17f8..e5f2308ab404 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@${FLAVOR}
+REPORTLAB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>=3.0:print/py-reportlab@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/print/py-relatorio/Makefile b/print/py-relatorio/Makefile
index 5d448d6ed5ec..a0a594ebb538 100644
--- a/print/py-relatorio/Makefile
+++ b/print/py-relatorio/Makefile
@@ -13,11 +13,11 @@ COMMENT= Templating library able to output odt and pdf files
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>=2.0:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}magic>=0:devel/py-magic@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pycha>=0.4.0:graphics/py-pycha@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}magic>=0:devel/py-magic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycha>=0.4.0:graphics/py-pycha@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 6c42b28eb632..37bc1629e7e4 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/print/py-stapler/Makefile b/print/py-stapler/Makefile
index c65d60dc7cc2..a429cb7f0ffc 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pdf2>=1.24:print/py-pdf2@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}more-itertools>=2.2:devel/py-more-itertools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pdf2>=1.24:print/py-pdf2@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/print/py-trml2pdf/Makefile b/print/py-trml2pdf/Makefile
index 30261c2ba8b0..31af0041e9fa 100644
--- a/print/py-trml2pdf/Makefile
+++ b/print/py-trml2pdf/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@caomhin.org
COMMENT= Tiny RML2PDF easily creates PDF documents
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1@${PY_FLAVOR}
NO_BUILD= yes
NO_ARCH= yes
diff --git a/print/ttfquery/Makefile b/print/ttfquery/Makefile
index 10a0349107ae..71d4a4de58f1 100644
--- a/print/ttfquery/Makefile
+++ b/print/ttfquery/Makefile
@@ -14,7 +14,7 @@ COMMENT= FontTools-based package for querying system fonts
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/license.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>0:print/py-fonttools@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>0:print/py-fonttools@${PY_FLAVOR} \
${PYNUMPY}
NO_ARCH= yes
diff --git a/science/brian/Makefile b/science/brian/Makefile
index e6d86414e4ce..335b55340e82 100644
--- a/science/brian/Makefile
+++ b/science/brian/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= science python
MAINTAINER= wen@FreeBSD.org
COMMENT= Clock-driven simulator for spiking neural networks
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.4.1,1:math/py-numpy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.7.0:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.90.1:math/py-matplotlib@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.4.1,1:math/py-numpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.7.0:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.90.1:math/py-matplotlib@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/science/psychopy/Makefile b/science/psychopy/Makefile
index ca311e684dd5..54dfbbf1e215 100644
--- a/science/psychopy/Makefile
+++ b/science/psychopy/Makefile
@@ -11,22 +11,22 @@ COMMENT= Psychophysics toolkit for Python
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}json_tricks>0:devel/py-json_tricks@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}openpyxl>0:textproc/py-openpyxl@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyglet>0:graphics/py-pyglet@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyosf>0:science/py-pyosf@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sounddevice>0:audio/py-sounddevice@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}SoundFile>0:audio/py-SoundFile@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}json_tricks>0:devel/py-json_tricks@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openpyxl>0:textproc/py-openpyxl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyglet>0:graphics/py-pyglet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyosf>0:science/py-pyosf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sounddevice>0:audio/py-sounddevice@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}SoundFile>0:audio/py-SoundFile@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd@${PY_FLAVOR} \
dejavu>0:x11-fonts/dejavu \
${PYGAME} \
${PYNUMPY}
@@ -51,7 +51,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@${FLAVOR}
+PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:graphics/py-pyglet@${PY_FLAVOR}
.include <bsd.port.options.mk>
diff --git a/science/py-MDAnalysis/Makefile b/science/py-MDAnalysis/Makefile
index 590c95e4389c..37270424d91b 100644
--- a/science/py-MDAnalysis/Makefile
+++ b/science/py-MDAnalysis/Makefile
@@ -14,16 +14,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}biopython>=1.59:biology/py-biopython@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}duecredit>0:textproc/py-duecredit@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}GridDataFormats>=0.4.0:math/py-GridDataFormats@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gsd>=1.4.0:science/py-gsd@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}joblib>0:devel/py-joblib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.1:math/py-matplotlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mmtf-python>=1.0.0:science/py-mmtf-python@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}networkx>=1.0:math/py-networkx@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}biopython>=1.59:biology/py-biopython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}duecredit>0:textproc/py-duecredit@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}GridDataFormats>=0.4.0:math/py-GridDataFormats@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gsd>=1.4.0:science/py-gsd@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}joblib>0:devel/py-joblib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.1:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mmtf-python>=1.0.0:science/py-mmtf-python@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}networkx>=1.0:math/py-networkx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/science/py-MDAnalysisTests/Makefile b/science/py-MDAnalysisTests/Makefile
index bc0f97ca4011..a8b0fec3bc1c 100644
--- a/science/py-MDAnalysisTests/Makefile
+++ b/science/py-MDAnalysisTests/Makefile
@@ -13,11 +13,11 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}MDAnalysis>0:science/py-MDAnalysis@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest>=3.1.2:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}psutil>=4.0.2:sysutils/py-psutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}MDAnalysis>0:science/py-MDAnalysis@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=3.1.2:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psutil>=4.0.2:sysutils/py-psutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/science/py-OpenFermion/Makefile b/science/py-OpenFermion/Makefile
index c0c984b7241c..82e2cc7182dd 100644
--- a/science/py-OpenFermion/Makefile
+++ b/science/py-OpenFermion/Makefile
@@ -12,13 +12,13 @@ COMMENT= Electronic structure package for quantum computers
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-py27_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cvxopt>0:math/py-cvxopt@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${FLAVOR} \
+py27_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cvxopt>0:math/py-cvxopt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0.18.0:science/py-scipy@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>0.18.0:science/py-scipy@${PY_FLAVOR} \
${PYNUMPY}
USES= python
diff --git a/science/py-cdo/Makefile b/science/py-cdo/Makefile
index cacd373ab097..b94ffc9354b4 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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/science/py-h5py/Makefile b/science/py-h5py/Makefile
index 3689d8cc9896..e25ba3eb4a7d 100644
--- a/science/py-h5py/Makefile
+++ b/science/py-h5py/Makefile
@@ -14,11 +14,11 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/licenses/license.txt
BUILD_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}pkgconfig>=0:devel/py-pkgconfig@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pkgconfig>=0:devel/py-pkgconfig@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
LIB_DEPENDS= libhdf5.so:science/hdf5
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent cython distutils
diff --git a/science/py-hcluster/Makefile b/science/py-hcluster/Makefile
index 57b725370250..e88096e7a5e7 100644
--- a/science/py-hcluster/Makefile
+++ b/science/py-hcluster/Makefile
@@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/science/py-mdp/Makefile b/science/py-mdp/Makefile
index 59fbe7497377..8379c824e7b7 100644
--- a/science/py-mdp/Makefile
+++ b/science/py-mdp/Makefile
@@ -27,7 +27,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@${FLAVOR}
-SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.5.2:science/py-scipy@${FLAVOR}
+PP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pp>0:devel/py-pp@${PY_FLAVOR}
+SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.5.2:science/py-scipy@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/science/py-mmtf-python/Makefile b/science/py-mmtf-python/Makefile
index 9b94837c92e3..7f6ed8e6c4ee 100644
--- a/science/py-mmtf-python/Makefile
+++ b/science/py-mmtf-python/Makefile
@@ -12,7 +12,7 @@ COMMENT= MMTF (Macromolecular Transmission Format) Python API
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/science/py-obspy/Makefile b/science/py-obspy/Makefile
index 25ed5e17c7d4..fb9adfe5d955 100644
--- a/science/py-obspy/Makefile
+++ b/science/py-obspy/Makefile
@@ -14,14 +14,14 @@ COMMENT= Python framework for seismological observatories
LICENSE= LGPL3
BUILD_DEPENDS= ${PYNUMPY} \
- ${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}
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.9.0:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.12.4:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1.0:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.2:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}suds>=0.4.0:net/py-suds@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= fortran python:2.7 shebangfix zip
diff --git a/science/py-openpiv/Makefile b/science/py-openpiv/Makefile
index 0e205bcc0d2d..4ee332a5ab24 100644
--- a/science/py-openpiv/Makefile
+++ b/science/py-openpiv/Makefile
@@ -14,11 +14,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS= ${PYNUMPY} \
${PY_FUTURE} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scikit-image>=0.12.0:graphics/py-scikit-image@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}progressbar2>=3.8.1:misc/py-progressbar2@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scikit-image>=0.12.0:graphics/py-scikit-image@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}progressbar2>=3.8.1:misc/py-progressbar2@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils cython cython_run
@@ -33,7 +33,7 @@ post-patch:
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3000
-PY_FUTURE= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${FLAVOR}
+PY_FUTURE= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR}
.else
PY_FUTURE=
.endif
diff --git a/science/py-paida/Makefile b/science/py-paida/Makefile
index fe44d778faf5..eae7b5d523a9 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
MAINTAINER= ports@FreeBSD.org
COMMENT= Pure Python scientific analysis package
diff --git a/science/py-pymatgen/Makefile b/science/py-pymatgen/Makefile
index 38efdacfb7ef..ed3f15e2e874 100644
--- a/science/py-pymatgen/Makefile
+++ b/science/py-pymatgen/Makefile
@@ -15,18 +15,18 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst
BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5:math/py-matplotlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}monty>=0.9.6:devel/py-monty@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}palettable>=2.1.1:misc/py-palettable@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pydispatcher>=2.0.5:devel/py-pydispatcher@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15.6:devel/py-ruamel.yaml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=1.0.1:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}spglib>=1.9.9.44:science/py-spglib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}monty>=0.9.6:devel/py-monty@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}palettable>=2.1.1:misc/py-palettable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pydispatcher>=2.0.5:devel/py-pydispatcher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15.6:devel/py-ruamel.yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=1.0.1:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}spglib>=1.9.9.44:science/py-spglib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/science/py-pymol/Makefile b/science/py-pymol/Makefile
index ee7bb7758ef0..e73bd59dd46b 100644
--- a/science/py-pymol/Makefile
+++ b/science/py-pymol/Makefile
@@ -21,8 +21,8 @@ BUILD_DEPENDS= ${PYNUMPY}
LIB_DEPENDS= libfreetype.so:print/freetype2 \
libpng.so:graphics/png \
libmsgpackc.so:devel/msgpack
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw@${PY_FLAVOR} \
${PYNUMPY}
USES= compiler:c++11-lang python:2.7 shebangfix tar:bz2
diff --git a/science/py-pyosf/Makefile b/science/py-pyosf/Makefile
index 621b3cb8e259..a5a70b8b14ea 100644
--- a/science/py-pyosf/Makefile
+++ b/science/py-pyosf/Makefile
@@ -11,8 +11,8 @@ COMMENT= Python lib for synching with OpenScienceFramework projects
LICENSE= MIT
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/science/py-pysal/Makefile b/science/py-pysal/Makefile
index 59256b333c8c..2226fc02c079 100644
--- a/science/py-pysal/Makefile
+++ b/science/py-pysal/Makefile
@@ -15,10 +15,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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.3,1:math/py-numpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/science/py-pyteomics/Makefile b/science/py-pyteomics/Makefile
index 5278fd58417b..0876e3df3344 100644
--- a/science/py-pyteomics/Makefile
+++ b/science/py-pyteomics/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python modules for proteomics data analysis
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
${PYNUMPY}
USES= python:2.7
diff --git a/science/py-scikit-fuzzy/Makefile b/science/py-scikit-fuzzy/Makefile
index e81215bdae0d..0c450dfeb6dd 100644
--- a/science/py-scikit-fuzzy/Makefile
+++ b/science/py-scikit-fuzzy/Makefile
@@ -15,8 +15,8 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}networkx>=1.9.0:math/py-networkx@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.9.0:science/py-scipy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}networkx>=1.9.0:math/py-networkx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.9.0:science/py-scipy@${PY_FLAVOR}
BUILD_DEPENDS= ${RUN_DEPENDS}
USES= python:2.7
diff --git a/science/py-scikit-learn/Makefile b/science/py-scikit-learn/Makefile
index c25f815aa9ac..29c19cbcd235 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@${FLAVOR}
+ ${PYTHON_SITELIBDIR}/scipy/version.py:science/py-scipy@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= fortran python
diff --git a/science/py-scikit-sparse/Makefile b/science/py-scikit-sparse/Makefile
index e86f4e1b94d5..7148a3edf9a0 100644
--- a/science/py-scikit-sparse/Makefile
+++ b/science/py-scikit-sparse/Makefile
@@ -14,7 +14,7 @@ COMMENT= Sparse matrix package
LICENSE= BSD2CLAUSE
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
BUILD_DEPENDS= ${RUN_DEPENDS}
LIB_DEPENDS= libumfpack.so:math/suitesparse
diff --git a/science/py-scimath/Makefile b/science/py-scimath/Makefile
index b4c54121c409..7ecb1aafbd59 100644
--- a/science/py-scimath/Makefile
+++ b/science/py-scimath/Makefile
@@ -14,8 +14,8 @@ COMMENT= Scientific and Mathematical calculations
LICENSE= BSD3CLAUSE LGPL3
LICENSE_COMB= dual
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=3.6.0:devel/py-traits@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=3.6.0:devel/py-traits@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/science/py-scoria/Makefile b/science/py-scoria/Makefile
index 8a464ab1a03a..b0882759a599 100644
--- a/science/py-scoria/Makefile
+++ b/science/py-scoria/Makefile
@@ -13,7 +13,7 @@ COMMENT= Lightweight molecule manipulation codebase
LICENSE= APACHE20
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/science/py-tensorflow/Makefile b/science/py-tensorflow/Makefile
index 7a6599463d11..9f6a4c0be3eb 100644
--- a/science/py-tensorflow/Makefile
+++ b/science/py-tensorflow/Makefile
@@ -17,19 +17,19 @@ BROKEN= fails to build
DEPRECATED= Broken for more than 6 months
EXPIRATION_DATE= 2018-06-06
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${PY_FLAVOR} \
bash:shells/bash
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.8:textproc/py-markdown@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bleach>=1.4.2:www/py-bleach@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html5lib>=0.9999999:www/py-html5lib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.2.0:devel/py-protobuf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}backports.weakref>=0:devel/py-backports.weakref@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11.10:www/py-werkzeug@${PY_FLAVOR}
USES= python:2.7 shebangfix
diff --git a/science/pybrain/Makefile b/science/pybrain/Makefile
index beb23e1f4f65..eaac33473698 100644
--- a/science/pybrain/Makefile
+++ b/science/pybrain/Makefile
@@ -11,7 +11,7 @@ COMMENT= PyBrain is the swiss army knife for neural networking
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.7.1:science/py-scipy@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.7.1:science/py-scipy@${PY_FLAVOR}
USE_GITHUB= yes
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 1041389aebfb..7d4f32703a58 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -84,8 +84,8 @@ TEST_USE= QT5=testlib_build
. if ${SLAVEPORT} == "python"
BUILD_DEPENDS+= swig3.0:devel/swig30 \
- ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
USES+= python
USE_PYTHON= py3kplist flavors
CONFIGURE_ENV+= SWIG=${LOCALBASE}/bin/swig3.0
diff --git a/security/kedpm/Makefile b/security/kedpm/Makefile
index e59edbc441ec..e693e0198189 100644
--- a/security/kedpm/Makefile
+++ b/security/kedpm/Makefile
@@ -12,7 +12,7 @@ COMMENT= Simple application for managing personal data
LICENSE= GPLv2+
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/security/nyx/Makefile b/security/nyx/Makefile
index 2575cb37eaf2..4729ad06be86 100644
--- a/security/nyx/Makefile
+++ b/security/nyx/Makefile
@@ -14,8 +14,8 @@ COMMENT= Command-line monitor for Tor
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=1.6.0:security/py-stem@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=1.6.0:security/py-stem@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/security/pwman3/Makefile b/security/pwman3/Makefile
index 3b7f2355c07d..9a47a41c9c6e 100644
--- a/security/pwman3/Makefile
+++ b/security/pwman3/Makefile
@@ -12,8 +12,8 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist concurrent optsuffix
diff --git a/security/py-AccessControl/Makefile b/security/py-AccessControl/Makefile
index 4e8ea41c74b4..9d7d373a80ea 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/security/py-Products.PlonePAS/Makefile b/security/py-Products.PlonePAS/Makefile
index 3e82dd2a9ce4..52650de4e4ab 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.protect>0:security/py-plone.protect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.i18n>0:www/py-plone.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deprecation>0:devel/py-zope.deprecation@${PY_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 a2142092062c..5190cd1bf9d7 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:devel/py-Products.PluginRegistry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/security/py-SecretStorage/Makefile b/security/py-SecretStorage/Makefile
index 99ec96a6bbe8..b6e069e27eef 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR}
NO_ARCH= yes
USES= python
@@ -24,7 +24,7 @@ USE_PYTHON= autoplist distutils
.if ${PYTHON_REL} > 3000
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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/security/py-YubiOTP/Makefile b/security/py-YubiOTP/Makefile
index 5f46fa0e850a..8b64e49ce588 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/security/py-artifacts/Makefile b/security/py-artifacts/Makefile
index ee153f6cca91..44062eeee9ae 100644
--- a/security/py-artifacts/Makefile
+++ b/security/py-artifacts/Makefile
@@ -15,8 +15,8 @@ COMMENT= ForensicArtifacts.com Artifact Repository
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
yapf:textproc/py-yapf
NO_ARCH= yes
diff --git a/security/py-asyncssh/Makefile b/security/py-asyncssh/Makefile
index d7437fc39648..406b41c3ff05 100644
--- a/security/py-asyncssh/Makefile
+++ b/security/py-asyncssh/Makefile
@@ -12,8 +12,8 @@ COMMENT= Python asnycio SSH protocol library
LICENSE= EPL
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR}
USES= python:3.4+
USE_PYTHON= autoplist concurrent distutils
diff --git a/security/py-backports.ssl_match_hostname/Makefile b/security/py-backports.ssl_match_hostname/Makefile
index 5ccbc15d8cac..b5498e4437ca 100644
--- a/security/py-backports.ssl_match_hostname/Makefile
+++ b/security/py-backports.ssl_match_hostname/Makefile
@@ -12,7 +12,7 @@ COMMENT= Backport of the ssl_match_hostname function from Python 3.5
LICENSE= PSFL
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports>0:devel/py-backports@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports>0:devel/py-backports@${PY_FLAVOR}
USES= python:-3.4
USE_PYTHON= autoplist distutils
diff --git a/security/py-bcrypt/Makefile b/security/py-bcrypt/Makefile
index 8c7dce26f9a0..09c1622ee0f1 100644
--- a/security/py-bcrypt/Makefile
+++ b/security/py-bcrypt/Makefile
@@ -14,8 +14,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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.1:devel/py-pytest@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.1:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/security/py-borg.localrole/Makefile b/security/py-borg.localrole/Makefile
index d7863a0de583..9bb4c5094aee 100644
--- a/security/py-borg.localrole/Makefile
+++ b/security/py-borg.localrole/Makefile
@@ -13,16 +13,16 @@ 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/security/py-btchip-python/Makefile b/security/py-btchip-python/Makefile
index ccffbabe54b9..5d5e3f614419 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mnemonic>=0:security/py-mnemonic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyscard>0:security/py-pyscard@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hidapi>=0:comms/py-hidapi@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/security/py-certbot-nginx/Makefile b/security/py-certbot-nginx/Makefile
index e81f4749b4f9..ce52e923637f 100644
--- a/security/py-certbot-nginx/Makefile
+++ b/security/py-certbot-nginx/Makefile
@@ -27,8 +27,8 @@ NO_ARCH= yes
OPTIONS_DEFINE= DOCS
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${FLAVOR}
+DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
post-patch:
@${REINPLACE_CMD} -e '/server_root=/ s|/etc/nginx|${LOCALBASE}&|' ${WRKSRC}/certbot_nginx/constants.py
diff --git a/security/py-cryptography/Makefile b/security/py-cryptography/Makefile
index b7b9665e3270..318f639d904a 100644
--- a/security/py-cryptography/Makefile
+++ b/security/py-cryptography/Makefile
@@ -15,14 +15,14 @@ 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@${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} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.7:devel/py-cffi@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}asn1crypto>=0.21.0:devel/py-asn1crypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cffi>=1.7:devel/py-cffi@${PY_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_PKGNAMEPREFIX}idna>=2.1:dns/py-idna@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.9.0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${PY_FLAVOR}
# Python 2.7, 3.4-3.6
USES= compiler:env python ssl
diff --git a/security/py-cybox/Makefile b/security/py-cybox/Makefile
index be666b11bfa8..756b7dc4a6eb 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mixbox>=1.0.2:security/py-mixbox@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= CybOXProject
diff --git a/security/py-docker-pycreds/Makefile b/security/py-docker-pycreds/Makefile
index a626c8377ff2..1daf3f67f9aa 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/security/py-fail2ban/Makefile b/security/py-fail2ban/Makefile
index 7be1b50f3a66..6c3c5b27d447 100644
--- a/security/py-fail2ban/Makefile
+++ b/security/py-fail2ban/Makefile
@@ -11,7 +11,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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
diff --git a/security/py-first-server/Makefile b/security/py-first-server/Makefile
index 7428861730a7..20182aa863d8 100644
--- a/security/py-first-server/Makefile
+++ b/security/py-first-server/Makefile
@@ -12,13 +12,13 @@ COMMENT= Function Identification and Recovery Signature Tool
LICENSE= GPLv2
-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}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.8:databases/py-mysqlclient@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}django>=1.11.4:www/py-django@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11.11:www/py-werkzeug@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.2:www/py-httplib2@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oauth2client>=3.0.0:security/py-oauth2client@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.5.3:www/py-google-api-python-client@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}capstone>=3.0.4:devel/py-capstone@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= vrtadmin
diff --git a/security/py-flask-httpauth/Makefile b/security/py-flask-httpauth/Makefile
index 132453ab5990..e3147971bf95 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/security/py-flask-kerberos/Makefile b/security/py-flask-kerberos/Makefile
index 23a3bc83fbd1..a0992d87d4da 100644
--- a/security/py-flask-kerberos/Makefile
+++ b/security/py-flask-kerberos/Makefile
@@ -12,8 +12,8 @@ COMMENT= GSSAPI Negotiate HTTP authentication for Flask routes
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}kerberos>1.1.1:security/py-kerberos@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}kerberos>1.1.1:security/py-kerberos@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/security/py-flask-saml/Makefile b/security/py-flask-saml/Makefile
index 0e4ddb37cd4f..1701b746b947 100644
--- a/security/py-flask-saml/Makefile
+++ b/security/py-flask-saml/Makefile
@@ -12,9 +12,9 @@ COMMENT= SAML authentication for Flask web apps
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0.8.0:www/py-flask@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}blinker>=1.1:devel/py-blinker@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pysaml2>4.0.0:security/py-pysaml2@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0.8.0:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}blinker>=1.1:devel/py-blinker@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pysaml2>4.0.0:security/py-pysaml2@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/security/py-gixy/Makefile b/security/py-gixy/Makefile
index fee437009374..d73a7934b597 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@${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}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.5:devel/py-pyparsing@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-property@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configargparse>=0.11.0:devel/py-configargparse@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}argparse>=1.4.0:devel/py-argparse@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/security/py-gnupg/Makefile b/security/py-gnupg/Makefile
index 02604df34b5e..c71dd0221a5d 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:sysutils/py-psutil@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/security/py-google-auth/Makefile b/security/py-google-auth/Makefile
index 3ee4ca005271..e4cf36a37b02 100644
--- a/security/py-google-auth/Makefile
+++ b/security/py-google-auth/Makefile
@@ -13,10 +13,10 @@ COMMENT= Google Authentication Library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cachetools>=2.0.0:devel/py-cachetools@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.2.1: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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cachetools>=2.0.0:devel/py-cachetools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.2.1:devel/py-pyasn1-modules@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rsa>=3.1.4:security/py-rsa@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/security/py-gpsoauth/Makefile b/security/py-gpsoauth/Makefile
index caf2de64853f..db755711fd51 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.4:security/py-pycryptodome@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= simon-weber
diff --git a/security/py-itsdangerous/Makefile b/security/py-itsdangerous/Makefile
index 3149ba0fdb35..dacd2c8981a6 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@${FLAVOR}
+JSON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:devel/py-simplejson@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/security/py-josepy/Makefile b/security/py-josepy/Makefile
index 728e503760a4..5ab638e35ae8 100644
--- a/security/py-josepy/Makefile
+++ b/security/py-josepy/Makefile
@@ -13,16 +13,16 @@ COMMENT= JOSE protocol implementation in Python
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0.8:security/py-cryptography@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=4.0:devel/py-coverage@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-cache>=1.0:devel/py-pytest-cache@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0.5:devel/py-pytest-flake8@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0.8:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=4.0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cache>=1.0:devel/py-pytest-cache@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0.5:devel/py-pytest-flake8@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/security/py-keyczar/Makefile b/security/py-keyczar/Makefile
index 17fcff1906cf..9c2043b06764 100644
--- a/security/py-keyczar/Makefile
+++ b/security/py-keyczar/Makefile
@@ -14,8 +14,8 @@ COMMENT= Toolkit for safe and simple cryptography
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:security/py-pycrypto@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile
index f119d64ce031..76517411d1c7 100644
--- a/security/py-keyring/Makefile
+++ b/security/py-keyring/Makefile
@@ -12,8 +12,8 @@ COMMENT= Store and access your passwords safely
LICENSE= PSFL
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.1:devel/py-setuptools_scm@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}entrypoints>=0.2.3:devel/py-entrypoints@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.1:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}entrypoints>=0.2.3:devel/py-entrypoints@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
@@ -25,8 +25,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@${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}
+DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
+KEYRINGS_ALT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyrings.alt>0:security/py-keyrings.alt@${PY_FLAVOR}
+SECRET_SERVICE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}SecretStorage>=1.0.0:security/py-SecretStorage@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/security/py-keyrings.alt/Makefile b/security/py-keyrings.alt/Makefile
index fb70b6ba0c33..769b31b5ad6e 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_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@${FLAVOR}
+ENCRYPTED_FILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto@${PY_FLAVOR}
GNOME_KEYRING_USE= GNOME=pygobject3
-KEYCZAR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyczar>=0.71c:security/py-keyczar@${FLAVOR}
-PYFS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fs>=0.5:devel/py-fs@${FLAVOR}
+KEYCZAR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyczar>=0.71c:security/py-keyczar@${PY_FLAVOR}
+PYFS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fs>=0.5:devel/py-fs@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/security/py-keystone/Makefile b/security/py-keystone/Makefile
index 3b617f8ca13a..206e7c8b6f3b 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-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>=0.4.0:devel/py-msgpack@${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}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}passlib>=1.6:security/py-passlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.cache>=1.5.0:devel/py-oslo.cache@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauthlib>=0.6:security/py-oauthlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pysaml2>=0:security/py-pysaml2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.2:devel/py-dogpile.cache@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycadf>=0:devel/py-pycadf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.4.0:devel/py-msgpack@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-editor>=0:devel/py-python-editor@${PY_FLAVOR}
NO_ARCH= yes
REINPLACE_ARGS= -i ''
diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index 28f5b37634f9..e6f32ac47f7e 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -32,7 +32,7 @@ post-install:
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/security/py-maec/Makefile b/security/py-maec/Makefile
index e9ae68db5e24..32dda861b60b 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.13:security/py-cybox@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mixbox>=0.0.13:security/py-mixbox@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/security/py-mixbox/Makefile b/security/py-mixbox/Makefile
index 7720f24b7073..f75657461431 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ordered-set>=0:devel/py-ordered-set@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ordered-set>=0:devel/py-ordered-set@${PY_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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}weakrefmethod>=1.0.3:devel/py-weakrefmethod@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/security/py-mnemonic/Makefile b/security/py-mnemonic/Makefile
index 486a271e2fbb..3bae7ec8842d 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/security/py-netmiko/Makefile b/security/py-netmiko/Makefile
index f4a2b051ddfa..287df62aea2a 100644
--- a/security/py-netmiko/Makefile
+++ b/security/py-netmiko/Makefile
@@ -12,11 +12,11 @@ COMMENT= Multi-vendor library to simplify SSH connections to network devices
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0.0:security/py-paramiko@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scp>=0.10.0:security/py-scp@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}textfsm>0:textproc/py-textfsm@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0.0:security/py-paramiko@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scp>=0.10.0:security/py-scp@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}textfsm>0:textproc/py-textfsm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/security/py-oauth2client/Makefile b/security/py-oauth2client/Makefile
index 19aba8024f56..54b21375bce6 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:www/py-httplib2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.5:devel/py-pyasn1-modules@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rsa>=3.1.4:security/py-rsa@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/security/py-oauthlib/Makefile b/security/py-oauthlib/Makefile
index a89180d433eb..bfa552266033 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@${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}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_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@${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}
+RSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR}
+SIGNALS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR}
+SIGNEDTOKEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt@${PY_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@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
.endif
do-test:
diff --git a/security/py-obfsproxy-tor/Makefile b/security/py-obfsproxy-tor/Makefile
index bd067aa067b2..cab60d656951 100644
--- a/security/py-obfsproxy-tor/Makefile
+++ b/security/py-obfsproxy-tor/Makefile
@@ -16,11 +16,11 @@ COMMENT= Pluggable transport proxy
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyptlib>=0.0.5:security/py-pyptlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/security/py-openssl/Makefile b/security/py-openssl/Makefile
index c346e3c55553..b68245a97612 100644
--- a/security/py-openssl/Makefile
+++ b/security/py-openssl/Makefile
@@ -15,8 +15,8 @@ COMMENT= Python interface to the OpenSSL library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.1.4:security/py-cryptography@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.1.4:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR}
OPTIONS_DEFINE= EXAMPLES
diff --git a/security/py-paramiko/Makefile b/security/py-paramiko/Makefile
index 37609e845dbc..2a91eaea22f5 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl@${PY_FLAVOR}
USES?= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/security/py-paramiko1/Makefile b/security/py-paramiko1/Makefile
index d6c209b12f90..107d6e684eb0 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/security/py-passlib/Makefile b/security/py-passlib/Makefile
index e03b5c65aaa7..9404b266767f 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.1:devel/py-nose@${PY_FLAVOR}
# Python 2.6,3.3-3.6
USES= python
diff --git a/security/py-plone.app.openid/Makefile b/security/py-plone.app.openid/Makefile
index c62885dc2a52..d05c1f714d6f 100644
--- a/security/py-plone.app.openid/Makefile
+++ b/security/py-plone.app.openid/Makefile
@@ -12,15 +12,15 @@ COMMENT= Plone OpenID authentication support
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.openid>=0:security/py-plone.openid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=2.0.10:security/py-Products.PlonePAS@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/security/py-plone.keyring/Makefile b/security/py-plone.keyring/Makefile
index 8cb6817a036e..b33cf8896195 100644
--- a/security/py-plone.keyring/Makefile
+++ b/security/py-plone.keyring/Makefile
@@ -12,10 +12,10 @@ COMMENT= Manage secrets
LICENSE= BSD3CLAUSE
-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}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/security/py-plone.openid/Makefile b/security/py-plone.openid/Makefile
index 044d18dc5d2b..cd5813d4abc2 100644
--- a/security/py-plone.openid/Makefile
+++ b/security/py-plone.openid/Makefile
@@ -13,11 +13,11 @@ COMMENT= OpenID authentication support for PAS
LICENSE= BSD3CLAUSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-openid>=0:security/py-python-openid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/security/py-plone.protect/Makefile b/security/py-plone.protect/Makefile
index 3f4baa1ebc79..5a4eb35fecb6 100644
--- a/security/py-plone.protect/Makefile
+++ b/security/py-plone.protect/Makefile
@@ -12,9 +12,9 @@ COMMENT= Security for browser forms
LICENSE= BSD3CLAUSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.keyring>1.0:security/py-plone.keyring@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/security/py-plone.session/Makefile b/security/py-plone.session/Makefile
index c8099110028f..a623abffc7b6 100644
--- a/security/py-plone.session/Makefile
+++ b/security/py-plone.session/Makefile
@@ -12,10 +12,10 @@ COMMENT= Session based authentication for Zope
LICENSE= BSD3CLAUSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/security/py-potr/Makefile b/security/py-potr/Makefile
index 4c6a87fa66ec..d614bd970bfe 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR}
USES= python zip
USE_PYTHON= autoplist distutils
diff --git a/security/py-pyaxo/Makefile b/security/py-pyaxo/Makefile
index 23a0756871d7..a7046c1a8ef2 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}passlib>=1.6.1:security/py-passlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/security/py-pycryptopp/Makefile b/security/py-pycryptopp/Makefile
index 845f2aef77e4..90d88a9be13e 100644
--- a/security/py-pycryptopp/Makefile
+++ b/security/py-pycryptopp/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python Wrappers for the Crypto++ Library
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}darcsver>0:devel/py-darcsver@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_darcs>0:devel/py-setuptools_darcs@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}darcsver>0:devel/py-darcsver@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools_darcs>0:devel/py-setuptools_darcs@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/security/py-pyelliptic/Makefile b/security/py-pyelliptic/Makefile
index de56101a3cd3..aa07dc3c0df0 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= yann2192
diff --git a/security/py-pymacaroons-pynacl/Makefile b/security/py-pymacaroons-pynacl/Makefile
index 007ea99d1dff..c42d3efdee8f 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/security/py-pynacl/Makefile b/security/py-pynacl/Makefile
index a1efd67bc3f2..b54a021c5a46 100644
--- a/security/py-pynacl/Makefile
+++ b/security/py-pynacl/Makefile
@@ -15,11 +15,11 @@ COMMENT= 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.1:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hypothesis>=1.11.4:devel/py-hypothesis@${PY_FLAVOR}
USES= python localbase
USE_PYTHON= autoplist distutils
diff --git a/security/py-pysaml2/Makefile b/security/py-pysaml2/Makefile
index 513e0991d29f..bdd4737b216a 100644
--- a/security/py-pysaml2/Makefile
+++ b/security/py-pysaml2/Makefile
@@ -14,21 +14,21 @@ COMMENT= Python implementation of SAML Version 2
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${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}future>0:devel/py-future@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${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}defusedxml>0:devel/py-defusedxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>1.0.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.who>0:devel/py-repoze.who@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
xmlsec1:security/xmlsec1
-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}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/security/py-python-social-auth/Makefile b/security/py-python-social-auth/Makefile
index 430f1a0e7260..dd54d2d78107 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@${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}
+RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}python-openid>=2.2:security/py-python-openid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.5.1:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauthlib>=0.3.8:security/py-oauthlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.1:www/py-requests-oauthlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt@${PY_FLAVOR}
DEPRECATED= Upstream Deprecated
EXPIRATION_DATE= 2018-08-01
diff --git a/security/py-python3-openid/Makefile b/security/py-python3-openid/Makefile
index 435c19ed8a10..a0922b23ceaf 100644
--- a/security/py-python3-openid/Makefile
+++ b/security/py-python3-openid/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python 3 port of the python-openid library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist distutils
diff --git a/security/py-pywinrm/Makefile b/security/py-pywinrm/Makefile
index f5ae49047e21..01e1fd8b0695 100644
--- a/security/py-pywinrm/Makefile
+++ b/security/py-pywinrm/Makefile
@@ -11,12 +11,12 @@ COMMENT= Python library for Windows Remote Management (WinRM)
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xmltodict>0:devel/py-xmltodict@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests_ntlm>=0.3.0:www/py-requests_ntlm@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests-kerberos>=0.10.0:security/py-requests-kerberos@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests-credssp>=0.0.1:security/py-requests-credssp@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xmltodict>0:devel/py-xmltodict@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests_ntlm>=0.3.0:www/py-requests_ntlm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-kerberos>=0.10.0:security/py-requests-kerberos@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-credssp>=0.0.1:security/py-requests-credssp@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/security/py-requests-credssp/Makefile b/security/py-requests-credssp/Makefile
index 1a22be432a17..1eb8fa738a95 100644
--- a/security/py-requests-credssp/Makefile
+++ b/security/py-requests-credssp/Makefile
@@ -11,9 +11,9 @@ COMMENT= Authentication handler for using CredSSP with Python Requests
LICENSE= ISCL
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ntlm-auth>=0:security/py-ntlm-auth@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ntlm-auth>=0:security/py-ntlm-auth@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/security/py-requests-kerberos/Makefile b/security/py-requests-kerberos/Makefile
index c3c111012128..2f408bb37f47 100644
--- a/security/py-requests-kerberos/Makefile
+++ b/security/py-requests-kerberos/Makefile
@@ -14,8 +14,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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}kerberos>1.1.1:security/py-kerberos@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>1.1.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}kerberos>1.1.1:security/py-kerberos@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/security/py-rsa/Makefile b/security/py-rsa/Makefile
index 583669441825..e607b61fce2e 100644
--- a/security/py-rsa/Makefile
+++ b/security/py-rsa/Makefile
@@ -13,8 +13,8 @@ COMMENT= Pure-Python RSA implementation
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:devel/py-pyasn1@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:devel/py-pyasn1@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils concurrent
diff --git a/security/py-scp/Makefile b/security/py-scp/Makefile
index 2de198f2f58e..34fe93036cfc 100644
--- a/security/py-scp/Makefile
+++ b/security/py-scp/Makefile
@@ -12,7 +12,7 @@ COMMENT= Scp module for paramiko
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/security/py-service_identity/Makefile b/security/py-service_identity/Makefile
index 79bac8ac5527..2c82b5c79cfe 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=15.2:devel/py-attrs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0.15:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.8:devel/py-pyasn1-modules@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}characteristic>=14.1:devel/py-characteristic@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/security/py-signedjson/Makefile b/security/py-signedjson/Makefile
index 59d652350fd3..ebc8b68725b7 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.0.1:devel/py-unpaddedbase64@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/security/py-ssh/Makefile b/security/py-ssh/Makefile
index 21f4812ed8a9..38d6fae7f5e0 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/security/py-sslstrip/Makefile b/security/py-sslstrip/Makefile
index 69766f7ee2e7..9ec696e2db03 100644
--- a/security/py-sslstrip/Makefile
+++ b/security/py-sslstrip/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= kitchetech@gmail.com
COMMENT= Python program for SSL stripping
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/security/py-stem/Makefile b/security/py-stem/Makefile
index 4e8a75281615..11518304d261 100644
--- a/security/py-stem/Makefile
+++ b/security/py-stem/Makefile
@@ -14,10 +14,10 @@ COMMENT= Python controller library for Tor
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyflakes>0:devel/py-pyflakes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist concurrent
diff --git a/security/py-stix/Makefile b/security/py-stix/Makefile
index d6b258bb837c..5797ed630a1b 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.13:security/py-cybox@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mixbox>=1.0.2:security/py-mixbox@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}maec>=4.1.0.13:security/py-maec@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= STIXProject
diff --git a/security/py-trezor/Makefile b/security/py-trezor/Makefile
index 43ffad900042..deae4f070a26 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mnemonic>=0:security/py-mnemonic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hidapi>=0:comms/py-hidapi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf@${PY_FLAVOR}
USES= python:3.3+ shebangfix
USE_PYTHON= autoplist concurrent distutils
diff --git a/security/py-tuf/Makefile b/security/py-tuf/Makefile
index 6bf56e47813d..eb612813e1ec 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl@${PY_FLAVOR}
# Actually 2.6-3.5
USES= python
diff --git a/security/py-txtorcon/Makefile b/security/py-txtorcon/Makefile
index c6f08ad91fca..961d4987e4ac 100644
--- a/security/py-txtorcon/Makefile
+++ b/security/py-txtorcon/Makefile
@@ -13,11 +13,11 @@ COMMENT= Twisted-based Tor controller client
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=15.5.0:devel/py-twisted@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=15.5.0:devel/py-twisted@${PY_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}
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.1:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}incremental>0:devel/py-incremental@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Automat>0:devel/py-Automat@${PY_FLAVOR}
USES= python shebangfix
USE_PYTHON= distutils autoplist concurrent
diff --git a/security/py-volatility/Makefile b/security/py-volatility/Makefile
index e8872f03ed70..d41e28894a19 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}distorm>=0:devel/py-distorm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 shebangfix zip
diff --git a/security/py-vulndb/Makefile b/security/py-vulndb/Makefile
index b58eae77e4bf..c6266fcf4001 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>=1.1:devel/py-setuptools-git@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/security/py-yubikey-manager/Makefile b/security/py-yubikey-manager/Makefile
index f5ecdb524059..53921af625c2 100644
--- a/security/py-yubikey-manager/Makefile
+++ b/security/py-yubikey-manager/Makefile
@@ -11,10 +11,10 @@ COMMENT= Python library and command line tool for configuring a YubiKey
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyscard>0:security/py-pyscard@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyscard>0:security/py-pyscard@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
pcsc-spy:devel/pcsc-lite \
${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/${OPSYS}/libccid.so:devel/libccid \
u2f-host:security/libu2f-host \
diff --git a/security/py-yubioath-desktop/Makefile b/security/py-yubioath-desktop/Makefile
index 25e4f852265b..66fae57eca9a 100644
--- a/security/py-yubioath-desktop/Makefile
+++ b/security/py-yubioath-desktop/Makefile
@@ -11,10 +11,10 @@ COMMENT= GUI for displaying OATH codes with a Yubikey
LICENSE= GPLv3
-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} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyscard>0:security/py-pyscard@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
+ pyside${PYTHON_PKGNAMESUFFIX}>0:devel/pyside@${PY_FLAVOR} \
pcsc-spy:devel/pcsc-lite \
${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/${OPSYS}/libccid.so:devel/libccid
diff --git a/security/py-zope.app.authentication/Makefile b/security/py-zope.app.authentication/Makefile
index 380619011fb8..3b467f4a4d40 100644
--- a/security/py-zope.app.authentication/Makefile
+++ b/security/py-zope.app.authentication/Makefile
@@ -13,25 +13,25 @@ COMMENT= Principals and groups management for the pluggable authentication
LICENSE= ZPL21
-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}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0.2:devel/py-zope.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.password>=3.5.1:security/py-zope.password@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.pluggableauth>=1.1:security/py-zope.pluggableauth@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/security/py-zope.app.localpermission/Makefile b/security/py-zope.app.localpermission/Makefile
index a89eed964655..0cf063ed819d 100644
--- a/security/py-zope.app.localpermission/Makefile
+++ b/security/py-zope.app.localpermission/Makefile
@@ -13,12 +13,12 @@ COMMENT= Local Persistent Permissions for zope.security
LICENSE= ZPL21
-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}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/security/py-zope.app.principalannotation/Makefile b/security/py-zope.app.principalannotation/Makefile
index 3560dd8b69ab..cec352142c45 100644
--- a/security/py-zope.app.principalannotation/Makefile
+++ b/security/py-zope.app.principalannotation/Makefile
@@ -13,10 +13,10 @@ COMMENT= Bootstrap subscriber and browser menu item for zope.principalannotation
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.11.0:devel/py-zope.app.appsetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.principalannotation>=0:security/py-zope.principalannotation@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/security/py-zope.app.security/Makefile b/security/py-zope.app.security/Makefile
index 59e63c7cc880..8fbd2730b589 100644
--- a/security/py-zope.app.security/Makefile
+++ b/security/py-zope.app.security/Makefile
@@ -13,18 +13,18 @@ COMMENT= ZMI Views For Zope3 Security Components
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.app.localpermission>=0:security/py-zope.app.localpermission@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.principalregistry>=0:security/py-zope.principalregistry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:security/py-zope.securitypolicy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.login>=0:security/py-zope.login@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/security/py-zope.app.securitypolicy/Makefile b/security/py-zope.app.securitypolicy/Makefile
index 213fc33597d6..9a1159d41f78 100644
--- a/security/py-zope.app.securitypolicy/Makefile
+++ b/security/py-zope.app.securitypolicy/Makefile
@@ -13,21 +13,21 @@ COMMENT= ZMI-based management views for zope.securitypolicy
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=3.8:security/py-zope.app.authentication@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:security/py-zope.app.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=3.4.2:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:security/py-zope.securitypolicy@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/security/py-zope.authentication/Makefile b/security/py-zope.authentication/Makefile
index ff8c81b81a04..5cf919cad618 100644
--- a/security/py-zope.authentication/Makefile
+++ b/security/py-zope.authentication/Makefile
@@ -13,12 +13,12 @@ COMMENT= Definition of authentication basics for the Zope Framework
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/security/py-zope.login/Makefile b/security/py-zope.login/Makefile
index ae0f107ada45..6800450f08c4 100644
--- a/security/py-zope.login/Makefile
+++ b/security/py-zope.login/Makefile
@@ -13,10 +13,10 @@ COMMENT= Login helpers for zope.publisher / authentication
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/security/py-zope.password/Makefile b/security/py-zope.password/Makefile
index 1b99a76402cd..e2ccfc627255 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/security/py-zope.pluggableauth/Makefile b/security/py-zope.pluggableauth/Makefile
index 77cf5136628b..3b637bd3acb0 100644
--- a/security/py-zope.pluggableauth/Makefile
+++ b/security/py-zope.pluggableauth/Makefile
@@ -13,20 +13,20 @@ COMMENT= Pluggable Authentication Utility
LICENSE= ZPL21
-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}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.password>=3.5.1:security/py-zope.password@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/security/py-zope.principalannotation/Makefile b/security/py-zope.principalannotation/Makefile
index 80415db2a181..a311e7185e93 100644
--- a/security/py-zope.principalannotation/Makefile
+++ b/security/py-zope.principalannotation/Makefile
@@ -13,13 +13,13 @@ COMMENT= Annotations for Zope Principals
LICENSE= ZPL21
-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}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/security/py-zope.principalregistry/Makefile b/security/py-zope.principalregistry/Makefile
index 6ebfed898791..957e15d2f074 100644
--- a/security/py-zope.principalregistry/Makefile
+++ b/security/py-zope.principalregistry/Makefile
@@ -13,11 +13,11 @@ COMMENT= Global principal registry component for Zope3
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.password>=0:security/py-zope.password@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/security/py-zope.security/Makefile b/security/py-zope.security/Makefile
index 38b20dc291c5..fd18f0ef4c58 100644
--- a/security/py-zope.security/Makefile
+++ b/security/py-zope.security/Makefile
@@ -14,15 +14,15 @@ COMMENT= Zope Security Framework
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:net/py-zope.proxy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/security/py-zope.securitypolicy/Makefile b/security/py-zope.securitypolicy/Makefile
index 46097153a138..06a0686b7a69 100644
--- a/security/py-zope.securitypolicy/Makefile
+++ b/security/py-zope.securitypolicy/Makefile
@@ -13,17 +13,17 @@ COMMENT= Default security policy for Zope3
LICENSE= ZPL21
-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}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:devel/py-zope.dublincore@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/security/py-zope.session/Makefile b/security/py-zope.session/Makefile
index b9958ae899cf..3356d93e446e 100644
--- a/security/py-zope.session/Makefile
+++ b/security/py-zope.session/Makefile
@@ -13,13 +13,13 @@ COMMENT= Client identification and sessions for Zope
LICENSE= ZPL21
-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}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.minmax>=0:devel/py-zope.minmax@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/security/umit/Makefile b/security/umit/Makefile
index 7a1c3f67b838..a4ca025cc0df 100644
--- a/security/umit/Makefile
+++ b/security/umit/Makefile
@@ -14,7 +14,7 @@ COMMENT= Nmap frontend developed with Python and PyGTK
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
${LOCALBASE}/bin/nmap:security/nmap
NO_ARCH= 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@${FLAVOR}
+DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/security/vinetto/Makefile b/security/vinetto/Makefile
index 74c9b8f1741c..d13c65b1c67b 100644
--- a/security/vinetto/Makefile
+++ b/security/vinetto/Makefile
@@ -14,7 +14,7 @@ COMMENT= Forensics tool to examine Thumbs.db files
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils concurrent optsuffix
diff --git a/security/w3af/Makefile b/security/w3af/Makefile
index c2269bae9518..9a92e3356fd1 100644
--- a/security/w3af/Makefile
+++ b/security/w3af/Makefile
@@ -12,41 +12,41 @@ COMMENT= Web Application Attack and Audit Framework
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/doc/GPL
-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} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}soappy>=0:net/py-soappy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}fpconst>0:math/py-fpconst@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nltk>0:textproc/py-nltk@${PY_FLAVOR} \
${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}pdf>0:print/py-pdf@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pdf>0:print/py-pdf@${PY_FLAVOR} \
scapy>0:net/scapy \
- ${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}wordnet>0:textproc/py-wordnet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyClamd>=0.2.2:security/py-pyclamd@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygithub>=1.21:devel/py-pygithub@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}GitPython>=0.3.2:devel/py-gitpython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pybloomfiltermmap>=0.3.11:devel/py-pybloomfiltermmap@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}esmre>=0.3.1:textproc/py-esmre@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}phply>=0.9.1:devel/py-phply@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}stopit>=1.1.0:devel/py-stopit@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}chardet>=2.1.1:textproc/py-chardet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tblib>=0.2.0:devel/py-tblib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pdfminer>=20140328:textproc/py-pdfminer@${PY_FLAVOR} \
${PY_FUTURES} \
- ${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>=0.4.4:devel/py-msgpack@${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}
+ ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.3.3:net/py-ndg_httpsclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:devel/py-pyasn1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0.3.2:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}guess-language>=0.2:textproc/py-guess-language@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cluster>=1.1.1b3:devel/py-cluster@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.4.4:devel/py-msgpack@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-ntlm>=1.0.1:net/py-python-ntlm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}halberd>=0.2.4:security/py-halberd@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}darts.util.lru>=0.5:devel/py-darts.util.lru@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.3:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vulndb>=0.0.17:security/py-vulndb@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.1:textproc/py-markdown@${PY_FLAVOR}
USES= gettext python:2.7 shebangfix
@@ -60,10 +60,10 @@ NO_BUILD= yes
OPTIONS_DEFINE= GUI DOCS
OPTIONS_SUB= yes
-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-06=0.6:x11/py-xdot06@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}webkitgtk>=1.1.8:www/py-webkitgtk@${FLAVOR}
+GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>0:graphics/py-pygraphviz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gtksourceview>=2.10.1:x11-toolkits/py-gtksourceview@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xdot-06=0.6:x11/py-xdot06@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webkitgtk>=1.1.8:www/py-webkitgtk@${PY_FLAVOR}
GUI_USE= GNOME=pygtk2
diff --git a/security/wapiti/Makefile b/security/wapiti/Makefile
index 54bd181f2386..5ce21c4a2e75 100644
--- a/security/wapiti/Makefile
+++ b/security/wapiti/Makefile
@@ -13,14 +13,14 @@ COMMENT= Wapiti is a vulnerability scanner for web applications
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tld>=0:dns/py-tld@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaswfp>=0:graphics/py-yaswfp@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tld>=0:dns/py-tld@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaswfp>=0:graphics/py-yaswfp@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
USES= python:3.4+
USE_PYTHON= distutils autoplist
diff --git a/security/yubikey-piv-manager/Makefile b/security/yubikey-piv-manager/Makefile
index 8f9290babaa7..88d602f84847 100644
--- a/security/yubikey-piv-manager/Makefile
+++ b/security/yubikey-piv-manager/Makefile
@@ -12,7 +12,7 @@ COMMENT= YubiKey PIV Manager
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:devel/pyside@${FLAVOR} \
+RUN_DEPENDS= pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:devel/pyside@${PY_FLAVOR} \
yubico-piv-tool:security/yubico-piv-tool
NO_ARCH= yes
diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
index 5348bf487290..2194742c1f04 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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
MASTERDIR= ${.CURDIR}/../nmap
PATCHDIR= ${.CURDIR}/files
diff --git a/shells/xonsh/Makefile b/shells/xonsh/Makefile
index 98524b92e87a..5f42c711afc7 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amalgamate>=0:devel/py-amalgamate@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/sysutils/azure-agent/Makefile b/sysutils/azure-agent/Makefile
index f6364d71dd09..db8cf7e65d72 100644
--- a/sysutils/azure-agent/Makefile
+++ b/sysutils/azure-agent/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS= sudo:security/sudo \
bash:shells/bash \
base64:converters/base64 \
dmidecode:sysutils/dmidecode \
- ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \
${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
NO_BUILD= yes
diff --git a/sysutils/bsdploy/Makefile b/sysutils/bsdploy/Makefile
index 841b181e182d..40a44dd10077 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyliblzma>0:archivers/py-pyliblzma@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ploy_ansible>=1.3.0:sysutils/py-ploy_ansible@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ploy_ezjail>=1.2.0:sysutils/py-ploy_ezjail@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ploy_fabric>=1.1.0:sysutils/py-ploy_fabric@${PY_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@${FLAVOR}
+EC2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy_ec2>0:sysutils/py-ploy_ec2@${PY_FLAVOR}
USES= python:-2.7 zip
USE_PYTHON= autoplist distutils
diff --git a/sysutils/catfish/Makefile b/sysutils/catfish/Makefile
index 04b91e57eb8c..1615b77674bb 100644
--- a/sysutils/catfish/Makefile
+++ b/sysutils/catfish/Makefile
@@ -12,8 +12,8 @@ COMMENT= GTK search utility
LICENSE= GPLv3
RUN_DEPENDS= \
- ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \
gksu:sysutils/gksu
BUILD_DEPENDS= ${RUN_DEPENDS}
diff --git a/sysutils/createrepo/Makefile b/sysutils/createrepo/Makefile
index 335ea0a092b9..2607c3492476 100644
--- a/sysutils/createrepo/Makefile
+++ b/sysutils/createrepo/Makefile
@@ -11,11 +11,11 @@ COMMENT= Utility to create and manage RPM metadata repositories
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/urlgrabber/__init__.py:www/py-urlgrabber@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/yum/__init__.py:sysutils/yum@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/deltarpm.py:sysutils/deltarpm@${PY_FLAVOR}
USES= gmake python:2.7 shebangfix
USE_PYTHON= flavors
diff --git a/sysutils/docker-compose/Makefile b/sysutils/docker-compose/Makefile
index e09610af1532..981e13bb515e 100644
--- a/sysutils/docker-compose/Makefile
+++ b/sysutils/docker-compose/Makefile
@@ -12,19 +12,19 @@ COMMENT= Define and run multi-container applications with Docker
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${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.7.0:sysutils/py-docker@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dockerpty>=0.4.1:devel/py-dockerpty@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-property@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docker>=2.7.0:sysutils/py-docker@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dockerpty>=0.4.1:devel/py-dockerpty@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt@${PY_FLAVOR} \
${PY_ENUM34} \
${PY_IPADDRESS} \
- ${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} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${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}texttable>=0.9.0:textproc/py-texttable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}websocket-client>=0.32.0:www/py-websocket-client@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
NO_ARCH= yes
USES= python
@@ -33,11 +33,11 @@ USE_PYTHON= distutils autoplist concurrent optsuffix
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname@${PY_FLAVOR}
.endif
.if ${PYTHON_REL} < 3200
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 33e00fe75bb5..5517711d2cae 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fasteners>=0:devel/py-fasteners@${PY_FLAVOR}
USES= python:2.7 shebangfix
USE_PYTHON= autoplist distutils
@@ -43,15 +43,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@${FLAVOR}
-GIO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject>0:devel/py-gobject@${FLAVOR} \
+GDOCS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata@${PY_FLAVOR}
+GIO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject>0:devel/py-gobject@${PY_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@${FLAVOR}
-PEXPECT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${FLAVOR}
-S3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.6b:devel/py-boto@${FLAVOR}
+PARAMIKO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:security/py-paramiko@${PY_FLAVOR}
+PEXPECT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}
+S3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.6b:devel/py-boto@${PY_FLAVOR}
post-patch:
.for f in cfbackend _cf_cloudfiles _cf_pyrax
diff --git a/sysutils/farbot/Makefile b/sysutils/farbot/Makefile
index 82ace2fb16b4..d92172ba690e 100644
--- a/sysutils/farbot/Makefile
+++ b/sysutils/farbot/Makefile
@@ -11,8 +11,8 @@ COMMENT= FreeBSD Automated Release Bot
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= threerings
diff --git a/sysutils/fusefs-gitfs/Makefile b/sysutils/fusefs-gitfs/Makefile
index aa7570fcab1b..19c67fa4dfe3 100644
--- a/sysutils/fusefs-gitfs/Makefile
+++ b/sysutils/fusefs-gitfs/Makefile
@@ -10,12 +10,12 @@ COMMENT= Version controlled file system
LICENSE= APACHE20
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomiclong>0:devel/py-atomiclong@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}fusepy>=2.0.2:devel/py-fusepy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygit2>=0.24.1:devel/py-pygit2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}raven>=5.27.0:devel/py-raven@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.1:devel/py-pytest@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= PressLabs
@@ -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@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR}
.else
post-patch: patch-py3k-mock
patch-py3k-mock:
diff --git a/sysutils/fusefs-wikipediafs/Makefile b/sysutils/fusefs-wikipediafs/Makefile
index a572f1dd69c1..916ec8be6b32 100644
--- a/sysutils/fusefs-wikipediafs/Makefile
+++ b/sysutils/fusefs-wikipediafs/Makefile
@@ -13,7 +13,7 @@ COMMENT= Mount mediawikis
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fusefs>=0.2:devel/py-fusefs@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fusefs>=0.2:devel/py-fusefs@${PY_FLAVOR}
USES= fuse python:2.7
USE_PYTHON= autoplist distutils
diff --git a/sysutils/hachoir-urwid/Makefile b/sysutils/hachoir-urwid/Makefile
index 33ed3b0dd0b5..13a478e86c24 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@${FLAVOR}
+ ${PYTHON_SITELIBDIR}/urwid/__init__.py:devel/py-urwid@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils
diff --git a/sysutils/jadm/Makefile b/sysutils/jadm/Makefile
index 9045e24c8dd5..56fdc3cf3061 100644
--- a/sysutils/jadm/Makefile
+++ b/sysutils/jadm/Makefile
@@ -12,13 +12,13 @@ COMMENT= FreeBSD jail framework with zfs, vnet and jail.conf support
LICENSE= BSD3CLAUSE
-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} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:net/py-netifaces@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate@${PY_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} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:net/py-netifaces@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate@${PY_FLAVOR} \
${PY_IPADDRESS}
USES= python
diff --git a/sysutils/mog/Makefile b/sysutils/mog/Makefile
index a98ee6746ffd..8c2f9d9be739 100644
--- a/sysutils/mog/Makefile
+++ b/sysutils/mog/Makefile
@@ -11,8 +11,8 @@ COMMENT= Different take on the UNIX tool cat
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mdv>0:devel/py-mdv@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mdv>0:devel/py-mdv@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/sysutils/ohmu/Makefile b/sysutils/ohmu/Makefile
index 31e7092509a3..4b19094d844b 100644
--- a/sysutils/ohmu/Makefile
+++ b/sysutils/ohmu/Makefile
@@ -11,8 +11,8 @@ COMMENT= Tool to view space usage in your terminal
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scandir>=1.3:sysutils/py-scandir@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scandir>=1.3:sysutils/py-scandir@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= paul-nechifor
diff --git a/sysutils/py-bcfg2/Makefile b/sysutils/py-bcfg2/Makefile
index faee92ecce71..735341b719a0 100644
--- a/sysutils/py-bcfg2/Makefile
+++ b/sysutils/py-bcfg2/Makefile
@@ -12,10 +12,10 @@ COMMENT= Configuration management system written in Python
LICENSE= BSD2CLAUSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}daemon>=0:devel/py-daemon@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gamin>=0:devel/py-gamin@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
OPTIONS_DEFINE= CHEETAH GENSHI
CHEETAH_DESC= Support Cheetah Templates
@@ -28,8 +28,8 @@ USE_RC_SUBR= bcfg2
SUB_LIST= PYTHON_CMD=${PYTHON_CMD}
PORTDOCS= COPYRIGHT README
-CHEETAH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=0:devel/py-cheetah@${FLAVOR}
-GENSHI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0:textproc/py-genshi@${FLAVOR}
+CHEETAH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=0:devel/py-cheetah@${PY_FLAVOR}
+GENSHI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0:textproc/py-genshi@${PY_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 f486470ceb99..4e678587bb48 100644
--- a/sysutils/py-cdmi/Makefile
+++ b/sysutils/py-cdmi/Makefile
@@ -12,8 +12,8 @@ COMMENT= CDMI on OpenStack Swift implementation
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}swift>0:databases/py-swift@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}webob>0:www/py-webob@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}swift>0:databases/py-swift@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>0:www/py-webob@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= osaddon
diff --git a/sysutils/py-consul/Makefile b/sysutils/py-consul/Makefile
index e792204e7aa0..f8aec34ab3b1 100644
--- a/sysutils/py-consul/Makefile
+++ b/sysutils/py-consul/Makefile
@@ -11,10 +11,10 @@ COMMENT= Python client for consul
LICENSE= MIT
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
USES= python:3.3+
diff --git a/sysutils/py-croniter/Makefile b/sysutils/py-croniter/Makefile
index 50b625bb35c4..ad4854a81970 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/sysutils/py-crontab/Makefile b/sysutils/py-crontab/Makefile
index 8fb20c13c1c0..e6b4d4fb4d39 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}croniter>0:sysutils/py-croniter@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}croniter>0:sysutils/py-croniter@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/sysutils/py-diffoscope/Makefile b/sysutils/py-diffoscope/Makefile
index 8c33516f43ff..f1773ea9135e 100644
--- a/sysutils/py-diffoscope/Makefile
+++ b/sysutils/py-diffoscope/Makefile
@@ -13,10 +13,10 @@ COMMENT= In-depth comparison of files, archives, and directories
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libarchive-c>=0:archivers/py-libarchive-c@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}python-magic>=0:devel/py-python-magic@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libarchive-c>=0:archivers/py-libarchive-c@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-magic>=0:devel/py-python-magic@${PY_FLAVOR} \
gdiff:textproc/diffutils
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
zipinfo:archivers/unzip \
isoinfo:sysutils/cdrkit \
rpm2cpio:archivers/rpm2cpio
diff --git a/sysutils/py-dlipower/Makefile b/sysutils/py-dlipower/Makefile
index 37beda186494..858eb83f0b62 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR}
USES= python shebangfix
SHEBANG_FILES= scripts/fence_dli
diff --git a/sysutils/py-docker/Makefile b/sysutils/py-docker/Makefile
index 79fe1c290d01..eb546416af06 100644
--- a/sysutils/py-docker/Makefile
+++ b/sysutils/py-docker/Makefile
@@ -12,12 +12,12 @@ COMMENT= Python library for the Docker Engine API
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR}
RUN_DEPENDS= ${PY_IPADDRESS} \
- ${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}
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docker-pycreds>0:security/py-docker-pycreds@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
@@ -27,7 +27,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_SUFFIX} < 35
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/sysutils/py-execnet/Makefile b/sysutils/py-execnet/Makefile
index c33a95e394d2..63b5721f9a63 100644
--- a/sysutils/py-execnet/Makefile
+++ b/sysutils/py-execnet/Makefile
@@ -13,8 +13,8 @@ COMMENT= Distributed Python deployment and communication
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.4:devel/py-apipkg@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.4:devel/py-apipkg@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/sysutils/py-ezjailremote/Makefile b/sysutils/py-ezjailremote/Makefile
index 37af97b322bc..8823ed47d85f 100644
--- a/sysutils/py-ezjailremote/Makefile
+++ b/sysutils/py-ezjailremote/Makefile
@@ -13,7 +13,7 @@ COMMENT= Remote control and convenience wrapper for ezjail
LICENSE= BSD2CLAUSE
RUN_DEPENDS= ezjail-admin:sysutils/ezjail \
- ${PYTHON_PKGNAMEPREFIX}fabric>0:devel/py-fabric@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}fabric>0:devel/py-fabric@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= tomster
diff --git a/sysutils/py-freenas.cli/Makefile b/sysutils/py-freenas.cli/Makefile
index 5f06aa96ced6..125516d27cdd 100644
--- a/sysutils/py-freenas.cli/Makefile
+++ b/sysutils/py-freenas.cli/Makefile
@@ -10,16 +10,16 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wg@FreeBSD.org
COMMENT= FreeNAS Command Line Interface
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}columnize>0:devel/py-columnize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}natural>0:devel/py-natural@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}texttable>0:textproc/py-texttable@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}freenas.dispatcher>0:devel/py-freenas.dispatcher@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/sysutils/py-glances/Makefile b/sysutils/py-glances/Makefile
index 25d314614f5d..68cd9fa43834 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=2.1.1:sysutils/py-psutil@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
OPTIONS_SUB= yes
diff --git a/sysutils/py-gmailfs-fuse/Makefile b/sysutils/py-gmailfs-fuse/Makefile
index e2945b4938a7..1f0887115e8b 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fusefs>=0.2:devel/py-fusefs@${PY_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 324b60c48575..162ad1e1eef9 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
google_oslogin_control:sysutils/google-compute-engine-oslogin \
sudo:security/sudo
diff --git a/sysutils/py-halite/Makefile b/sysutils/py-halite/Makefile
index 4b456ab573e8..45ccdf58ccc9 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}salt>=0.17.0:sysutils/py-salt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/sysutils/py-honcho/Makefile b/sysutils/py-honcho/Makefile
index 478454f75623..54fb53ebba57 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= nickstenning
diff --git a/sysutils/py-mqttwarn/Makefile b/sysutils/py-mqttwarn/Makefile
index e409f74a9048..6a373c5768d4 100644
--- a/sysutils/py-mqttwarn/Makefile
+++ b/sysutils/py-mqttwarn/Makefile
@@ -13,8 +13,8 @@ COMMENT= Subscribe to MQTT topics and notify pluggable services
LICENSE= EPL
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paho-mqtt>=0:net/py-paho-mqtt@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}supervisor>=0:sysutils/py-supervisor@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paho-mqtt>=0:net/py-paho-mqtt@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}supervisor>=0:sysutils/py-supervisor@${PY_FLAVOR}
USES= python:2.7 shebangfix
USE_PYTHON= flavors
diff --git a/sysutils/py-ploy/Makefile b/sysutils/py-ploy/Makefile
index f8092809bb34..a26e3d91703f 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/sysutils/py-ploy_ansible/Makefile b/sysutils/py-ploy_ansible/Makefile
index 192d94a5192d..f610d3bb5b12 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/py-setuptools@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}execnet>0:sysutils/py-execnet@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ansible1<2.0:sysutils/ansible1@${FLAVOR}
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}execnet>0:sysutils/py-execnet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ansible1<2.0:sysutils/ansible1@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog@${PY_FLAVOR}
USES= python:-2.7
USE_PYTHON= autoplist distutils
diff --git a/sysutils/py-ploy_ec2/Makefile b/sysutils/py-ploy_ec2/Makefile
index 81370ca9ae08..4b9effa9f4c2 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/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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}boto>=2.0:devel/py-boto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${PY_FLAVOR}
USES= python:-2.7
USE_PYTHON= autoplist distutils
diff --git a/sysutils/py-ploy_ezjail/Makefile b/sysutils/py-ploy_ezjail/Makefile
index 3019f97810c6..5fb2fe02d986 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/py-setuptools@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/sysutils/py-ploy_fabric/Makefile b/sysutils/py-ploy_fabric/Makefile
index dd65f7e7111d..da8846515f7e 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}fabric>=1.4.0,1:devel/py-fabric@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}fabric>=1.4.0,1:devel/py-fabric@${PY_FLAVOR}
USES= python:-2.7 zip
USE_PYTHON= autoplist distutils
diff --git a/sysutils/py-plumbum/Makefile b/sysutils/py-plumbum/Makefile
index c6e14412e39f..f68ee938fced 100644
--- a/sysutils/py-plumbum/Makefile
+++ b/sysutils/py-plumbum/Makefile
@@ -14,7 +14,7 @@ COMMENT= Shell combinators and more for Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/sysutils/py-psutil/Makefile b/sysutils/py-psutil/Makefile
index 2945bd838702..b500c573f364 100644
--- a/sysutils/py-psutil/Makefile
+++ b/sysutils/py-psutil/Makefile
@@ -27,7 +27,7 @@ post-install:
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3000
-TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index 14296b3de6cc..ada3db8bed17 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -14,16 +14,16 @@ COMMENT= Distributed remote execution and configuration management system
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe@${PY_FLAVOR} \
${PY_ENUM34} \
${PY_FUTURES} \
- ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tornado4>=4.2.1:www/py-tornado4@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado4>=4.2.1:www/py-tornado4@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
USES= cpe python
@@ -66,19 +66,19 @@ TCP_DESC= Install dependencies required for TCP transport
ZEROMQ_DESC= Install dependencies required for ZeroMQ transport
# AWS dependencies (Note: the devel/py-botocore port is updated very frequently)
-AWS_RUN_DEPENDS= ${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}
+AWS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${PY_FLAVOR}
-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}
+RAET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libnacl>=1.0.0:security/py-libnacl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ioflo>=1.1.7:devel/py-ioflo@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}raet>=0.6.0:net/py-raet@${PY_FLAVOR}
-TCP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR}
+TCP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${PY_FLAVOR}
-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}
+ZEROMQ_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR}
+ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${PY_FLAVOR}
post-patch:
.for file in conf/minion conf/master doc/man/salt-key.1 \
diff --git a/sysutils/py-shutilwhich/Makefile b/sysutils/py-shutilwhich/Makefile
index 901865e946a5..ece33045b9aa 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python:-3.3
USE_GITHUB= yes
diff --git a/sysutils/py-superlance/Makefile b/sysutils/py-superlance/Makefile
index 72236c4004df..384208c5525d 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/sysutils/py-supervisor/Makefile b/sysutils/py-supervisor/Makefile
index a32fe1bfa7f0..b63008b3fc5e 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0.5.0:devel/py-mock@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meld3>=0.6.5:www/py-meld3@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0.5.0:devel/py-mock@${PY_FLAVOR}
PORTDOCS= *.txt *.rst
diff --git a/sysutils/py-tmuxp/Makefile b/sysutils/py-tmuxp/Makefile
index 32f62b5d8295..45dee8352d28 100644
--- a/sysutils/py-tmuxp/Makefile
+++ b/sysutils/py-tmuxp/Makefile
@@ -13,10 +13,10 @@ COMMENT= Session manager for tmux
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.9:devel/py-colorama@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}kaptan>=0.5.7:devel/py-kaptan@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}libtmux>=0.7.7:devel/py-libtmux@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.9:devel/py-colorama@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}kaptan>=0.5.7:devel/py-kaptan@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}libtmux>=0.7.7:devel/py-libtmux@${PY_FLAVOR} \
tmux:sysutils/tmux
USES= python
diff --git a/sysutils/py-zdaemon/Makefile b/sysutils/py-zdaemon/Makefile
index 5d61965152aa..9fdce97c1da5 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>0:devel/py-zconfig@${PY_FLAVOR}
NO_ARCH= yes
USES= python zip
diff --git a/sysutils/yum/Makefile b/sysutils/yum/Makefile
index 93485b96f632..ef9f7336b456 100644
--- a/sysutils/yum/Makefile
+++ b/sysutils/yum/Makefile
@@ -17,10 +17,10 @@ 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@${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}
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iniparse>0:devel/py-iniparse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber@${PY_FLAVOR}
ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386
ONLY_FOR_ARCHS_REASON= linux is not available for ${ARCH}
diff --git a/textproc/archmage/Makefile b/textproc/archmage/Makefile
index 4bd22391a1e0..615eeadfb037 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@${FLAVOR}
+ ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${PY_FLAVOR}
NO_BUILD= yes
USES= cpe python:2.7 tar:bzip2
diff --git a/textproc/plover/Makefile b/textproc/plover/Makefile
index d2364b1754df..415298c1d37c 100644
--- a/textproc/plover/Makefile
+++ b/textproc/plover/Makefile
@@ -12,9 +12,9 @@ COMMENT= Open source solution for stenography
LICENSE= GPLv2
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-xlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}serial>=0:comms/py-serial@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils
diff --git a/textproc/pootle/Makefile b/textproc/pootle/Makefile
index c9a934616432..6b5a2f886524 100644
--- a/textproc/pootle/Makefile
+++ b/textproc/pootle/Makefile
@@ -17,16 +17,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN= Conflicting Django 1.8 / 1.11 dependencies, ancient version
RUN_DEPENDS= translate-toolkit>=1.11.0:textproc/translate-toolkit \
- ${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}
+ ${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cssmin>=0.1.4:www/py-cssmin@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.4:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-taggit>0.10:www/py-django-taggit@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-assets>=0.8:www/py-django-assets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-voting>=0.1:www/py-django-voting@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}argparse>=0:devel/py-argparse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}diff-match-patch>=0:textproc/py-diff-match-patch@${PY_FLAVOR}
# actually diff-match-patch is a dependency of translate-toolkit,
# but only this port uses it.
@@ -51,14 +51,14 @@ OPTIONS_DEFAULT=MEMCACHED MYSQL
MEMCACHED_DESC= Use memcached to improve performance
-LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap2>0:devel/py-ldap2@${FLAVOR}
+LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap2>0:devel/py-ldap2@${PY_FLAVOR}
MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached
-MEMCACHED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=1.45:databases/py-python-memcached@${FLAVOR}
+MEMCACHED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=1.45:databases/py-python-memcached@${PY_FLAVOR}
-MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${PY_FLAVOR}
-PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
SUBVERSION_RUN_DEPENDS= svn:devel/subversion
diff --git a/textproc/py-CommonMark/Makefile b/textproc/py-CommonMark/Makefile
index 0a669726e5f9..5abb95c026d2 100644
--- a/textproc/py-CommonMark/Makefile
+++ b/textproc/py-CommonMark/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python parser for the CommonMark Markdown spec
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/textproc/py-agate-dbf/Makefile b/textproc/py-agate-dbf/Makefile
index d8042836d24a..eed691224216 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dbfread>=2.0.5:textproc/py-dbfread@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dbfread>=2.0.5:textproc/py-dbfread@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-agate-excel/Makefile b/textproc/py-agate-excel/Makefile
index 204b15599450..04f5dbc3205a 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}xlrd>=0.9.4:textproc/py-xlrd@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.3.0:textproc/py-openpyxl@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xlrd>=0.9.4:textproc/py-xlrd@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.3.0:textproc/py-openpyxl@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-agate/Makefile b/textproc/py-agate/Makefile
index 0b9bbf57d40d..1842fa070350 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytimeparse>=1.1.5:devel/py-pytimeparse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=2.0:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}parsedatetime>=2.1:devel/py-parsedatetime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}isodate>=0.5.4:devel/py-isodate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-slugify>=1.2.1:textproc/py-python-slugify@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}leather>=0.3.2:graphics/py-leather@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-autopep8/Makefile b/textproc/py-autopep8/Makefile
index 06d4483e9b72..2fed3887d0fa 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.3:devel/py-pycodestyle@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/textproc/py-awesome-slugify/Makefile b/textproc/py-awesome-slugify/Makefile
index ee860ba6ccfa..30dad7e5b472 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.14:converters/py-unidecode@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.14:converters/py-unidecode@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-bibtexparser/Makefile b/textproc/py-bibtexparser/Makefile
index 1c1c0f926db3..d2ef79653be3 100644
--- a/textproc/py-bibtexparser/Makefile
+++ b/textproc/py-bibtexparser/Makefile
@@ -12,8 +12,8 @@ COMMENT= Bibtex parser
LICENSE= BSD3CLAUSE LGPL3
LICENSE_COMB= dual
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-chardet/Makefile b/textproc/py-chardet/Makefile
index 7d81ef84a311..cdae73de1bb7 100644
--- a/textproc/py-chardet/Makefile
+++ b/textproc/py-chardet/Makefile
@@ -13,9 +13,9 @@ 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/textproc/py-citeproc-py-styles/Makefile b/textproc/py-citeproc-py-styles/Makefile
index b12efbbcbc17..c8fea09931ce 100644
--- a/textproc/py-citeproc-py-styles/Makefile
+++ b/textproc/py-citeproc-py-styles/Makefile
@@ -12,9 +12,9 @@ COMMENT= Static resources package for citeproc-py
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.6.2:devel/py-pytest-runner@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.6.0:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.6.2:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.6.0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-citeproc-py/Makefile b/textproc/py-citeproc-py/Makefile
index 935ad61481e3..a5794b74ef72 100644
--- a/textproc/py-citeproc-py/Makefile
+++ b/textproc/py-citeproc-py/Makefile
@@ -12,8 +12,8 @@ COMMENT= Citation Style Language (CSL) processor for Python
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rnc2rng>=2.2:textproc/py-rnc2rng@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rnc2rng>=2.2:textproc/py-rnc2rng@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/textproc/py-cloud_sptheme/Makefile b/textproc/py-cloud_sptheme/Makefile
index 7ebb1ca2e9c6..b9321bd6f5f1 100644
--- a/textproc/py-cloud_sptheme/Makefile
+++ b/textproc/py-cloud_sptheme/Makefile
@@ -14,8 +14,8 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
# sphinx.util.fileutil was added in sphinx 1.5
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.5:textproc/py-sphinx@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.5:textproc/py-sphinx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/textproc/py-creole/Makefile b/textproc/py-creole/Makefile
index 5c3d2bcb7a0a..7eaaa9e51bca 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/docutils/__init__.py:textproc/py-docutils@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-csvkit/Makefile b/textproc/py-csvkit/Makefile
index b5b1bf90f062..8cfa078fe96c 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.4:textproc/py-agate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}agate-excel>=0.2.0:textproc/py-agate-excel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}agate-dbf>=0.2.0:textproc/py-agate-dbf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}agate-sql>=0.5.0:databases/py-agate-sql@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index 11c0da648343..44326fa13a07 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -22,7 +22,7 @@ USES= python
OPTIONS_DEFINE= PYGMENTS
PYGMENTS_DESC= Syntax highlighting
-PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR}
+PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR}
SCRIPTS= rst2html rst2latex rst2man rst2odt rst2odt_prepstyles \
rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html
diff --git a/textproc/py-duecredit/Makefile b/textproc/py-duecredit/Makefile
index 3014cbc38e10..5fe60a79292b 100644
--- a/textproc/py-duecredit/Makefile
+++ b/textproc/py-duecredit/Makefile
@@ -12,9 +12,9 @@ COMMENT= Embed scientific publication or other references in the original code
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}citeproc-py>=0.4:textproc/py-citeproc-py@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}citeproc-py>=0.4:textproc/py-citeproc-py@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/textproc/py-elasticsearch-async/Makefile b/textproc/py-elasticsearch-async/Makefile
index 6cd177f5f9c2..7bea8c6a197b 100644
--- a/textproc/py-elasticsearch-async/Makefile
+++ b/textproc/py-elasticsearch-async/Makefile
@@ -13,12 +13,12 @@ COMMENT= Python Elasticsearch Async Client
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=0:www/py-aiohttp@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}async_timeout>=0:devel/py-async_timeout@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}elasticsearch>=6.0.0:textproc/py-elasticsearch@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=0:www/py-aiohttp@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}async_timeout>=0:devel/py-async_timeout@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}elasticsearch>=6.0.0:textproc/py-elasticsearch@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-elasticsearch-dsl/Makefile b/textproc/py-elasticsearch-dsl/Makefile
index f18c588ef05c..94d5a6d73fcd 100644
--- a/textproc/py-elasticsearch-dsl/Makefile
+++ b/textproc/py-elasticsearch-dsl/Makefile
@@ -13,10 +13,10 @@ COMMENT= High level Python client for Elasticsearch
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}elasticsearch>=6.1.0:textproc/py-elasticsearch@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}elasticsearch>=6.1.0:textproc/py-elasticsearch@${PY_FLAVOR} \
${PY_IPADDRESS} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/textproc/py-elasticsearch/Makefile b/textproc/py-elasticsearch/Makefile
index b0ca3e8b973a..7ed352c7c03d 100644
--- a/textproc/py-elasticsearch/Makefile
+++ b/textproc/py-elasticsearch/Makefile
@@ -12,7 +12,7 @@ COMMENT= Official Python low-level client for Elasticsearch
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/textproc/py-elasticsearch5/Makefile b/textproc/py-elasticsearch5/Makefile
index 9aeba334509c..895e8f6c6120 100644
--- a/textproc/py-elasticsearch5/Makefile
+++ b/textproc/py-elasticsearch5/Makefile
@@ -13,7 +13,7 @@ COMMENT= Official Python low-level client for Elasticsearch
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.2:net/py-urllib3@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.2:net/py-urllib3@${PY_FLAVOR}
CONFLICTS= ${PYTHON_PKGNAMEPREFIX}elasticsearch-[0-9]*
diff --git a/textproc/py-genshi/Makefile b/textproc/py-genshi/Makefile
index 4fbd537b37cb..adcf78ce8d0e 100644
--- a/textproc/py-genshi/Makefile
+++ b/textproc/py-genshi/Makefile
@@ -20,6 +20,6 @@ BABEL_DESC= I18n support through the Babel plugin
USES= python
USE_PYTHON= distutils autoplist
-BABEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel@${FLAVOR}
+BABEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/textproc/py-gensim/Makefile b/textproc/py-gensim/Makefile
index b5d1c56f80c2..17c4cbf86c88 100644
--- a/textproc/py-gensim/Makefile
+++ b/textproc/py-gensim/Makefile
@@ -14,9 +14,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${PYNUMPY}
RUN_DEPENDS= ${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}scipy>=0.18.1:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.5.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}smart_open>=1.2.1:net/py-smart_open@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}scipy>=0.18.1:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.5.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}smart_open>=1.2.1:net/py-smart_open@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-humanfriendly/Makefile b/textproc/py-humanfriendly/Makefile
index e4fa2c13b0b4..80a8278854b5 100644
--- a/textproc/py-humanfriendly/Makefile
+++ b/textproc/py-humanfriendly/Makefile
@@ -19,7 +19,7 @@ USE_PYTHON= autoplist concurrent distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3300
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>0:devel/py-monotonic@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>0:devel/py-monotonic@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/textproc/py-m2r/Makefile b/textproc/py-m2r/Makefile
index eb5e86d98fc5..612a324be96d 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
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_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@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
.endif
do-test:
diff --git a/textproc/py-mako/Makefile b/textproc/py-mako/Makefile
index 40c9e7316913..7df11c7f4150 100644
--- a/textproc/py-mako/Makefile
+++ b/textproc/py-mako/Makefile
@@ -14,12 +14,12 @@ COMMENT= Super-fast templating language in Python
LICENSE= MIT
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile
index bfb2e653c88e..1024c110b0eb 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@${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}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytidylib>0:textproc/py-pytidylib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/textproc/py-mistune/Makefile b/textproc/py-mistune/Makefile
index 1bd5df3cf040..d92f7ddae3e1 100644
--- a/textproc/py-mistune/Makefile
+++ b/textproc/py-mistune/Makefile
@@ -14,7 +14,7 @@ COMMENT= Fastest markdown parser in pure Python
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-mkdocs-nature/Makefile b/textproc/py-mkdocs-nature/Makefile
index 5f5385efd3a3..c38aa1198097 100644
--- a/textproc/py-mkdocs-nature/Makefile
+++ b/textproc/py-mkdocs-nature/Makefile
@@ -11,7 +11,7 @@ COMMENT= MkDocs theme, a clone of the "greenish" Sphinx theme of the same name
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mkdocs>0:textproc/py-mkdocs@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mkdocs>0:textproc/py-mkdocs@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-mkdocs/Makefile b/textproc/py-mkdocs/Makefile
index 927b6f83b5c3..d4c7c6f43cab 100644
--- a/textproc/py-mkdocs/Makefile
+++ b/textproc/py-mkdocs/Makefile
@@ -12,13 +12,13 @@ COMMENT= Project documentation with Markdown
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.3:devel/py-click@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:devel/py-Jinja2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}livereload>=2.5.1:www/py-livereload@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}markdown>=2.3.1:textproc/py-markdown@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tornado>=5.0:www/py-tornado@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.3:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}livereload>=2.5.1:www/py-livereload@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown>=2.3.1:textproc/py-markdown@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>=5.0:www/py-tornado@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/textproc/py-nltk/Makefile b/textproc/py-nltk/Makefile
index c0eadb667c6e..a41c2b3dba54 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.09:devel/py-yaml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.09:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-numpydoc/Makefile b/textproc/py-numpydoc/Makefile
index 7bf67f3f5c65..f7e7bc50bfc4 100644
--- a/textproc/py-numpydoc/Makefile
+++ b/textproc/py-numpydoc/Makefile
@@ -13,9 +13,9 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-openpyxl/Makefile b/textproc/py-openpyxl/Makefile
index 9bb57a18334c..6e734fc2d7f8 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}et_xmlfile>=0:textproc/py-et_xmlfile@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jdcal>=0:devel/py-jdcal@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}et_xmlfile>=0:textproc/py-et_xmlfile@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/textproc/py-orange3-text/Makefile b/textproc/py-orange3-text/Makefile
index 0345a815bc58..955af9bb0da4 100644
--- a/textproc/py-orange3-text/Makefile
+++ b/textproc/py-orange3-text/Makefile
@@ -12,21 +12,21 @@ LICENSE= AGPLv3
RUN_DEPENDS= orange3>0:misc/orange3 \
${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}biopython>0:biology/py-biopython@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}docx2txt>=0.6:textproc/py-docx2txt@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gensim>=0.12.3:textproc/py-gensim@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}nltk>=3.0.5:textproc/py-nltk@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}odfpy>=1.3.5:devel/py-odfpy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pdfminer3k>0:textproc/py-pdfminer3k@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}simhash>0:math/py-simhash@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tweepy>0:net/py-tweepy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}validate_email>0:mail/py-validate_email@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}wikipedia>0:www/py-wikipedia@${FLAVOR}
-py34_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}typing>0:devel/py-typing@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}biopython>0:biology/py-biopython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docx2txt>=0.6:textproc/py-docx2txt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gensim>=0.12.3:textproc/py-gensim@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nltk>=3.0.5:textproc/py-nltk@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}odfpy>=1.3.5:devel/py-odfpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pdfminer3k>0:textproc/py-pdfminer3k@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simhash>0:math/py-simhash@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tweepy>0:net/py-tweepy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}validate_email>0:mail/py-validate_email@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wikipedia>0:www/py-wikipedia@${PY_FLAVOR}
+py34_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}typing>0:devel/py-typing@${PY_FLAVOR}
USES= python:3.4+
USE_GITHUB= yes
diff --git a/textproc/py-paragrep/Makefile b/textproc/py-paragrep/Makefile
index dca937aa4f63..310c50d8b76c 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grizzled>=0.8.1:devel/py-grizzled@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/textproc/py-parsel/Makefile b/textproc/py-parsel/Makefile
index bcc5dff25ed5..d9a910ce3217 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:www/py-cssselect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}w3lib>=1.8.0:www/py-w3lib@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-parsimonious/Makefile b/textproc/py-parsimonious/Makefile
index 257a106539c9..502599285063 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-parso/Makefile b/textproc/py-parso/Makefile
index 88906aafc372..56e77a2002a4 100644
--- a/textproc/py-parso/Makefile
+++ b/textproc/py-parso/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python Parser
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.7:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-cache>=0:devel/py-pytest-cache@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.7:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cache>=0:devel/py-pytest-cache@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-pdfminer3k/Makefile b/textproc/py-pdfminer3k/Makefile
index 67b923f5dee1..00a3a3d20576 100644
--- a/textproc/py-pdfminer3k/Makefile
+++ b/textproc/py-pdfminer3k/Makefile
@@ -10,7 +10,7 @@ COMMENT= PDF parser and analyzer
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${PY_FLAVOR}
USES= python:3.4+
USE_GITHUB= yes
diff --git a/textproc/py-pyes/Makefile b/textproc/py-pyes/Makefile
index 3209f6a8766e..845128cde580 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-pyhamcrest/Makefile b/textproc/py-pyhamcrest/Makefile
index b07c3d6bd4e8..a3e91d727a3a 100644
--- a/textproc/py-pyhamcrest/Makefile
+++ b/textproc/py-pyhamcrest/Makefile
@@ -13,7 +13,7 @@ COMMENT= Hamcrest matchers for Python
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
USES= python:2.7-3.4
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-pyhwp/Makefile b/textproc/py-pyhwp/Makefile
index d0d45325db13..bcb7ac99d760 100644
--- a/textproc/py-pyhwp/Makefile
+++ b/textproc/py-pyhwp/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= zi@FreeBSD.org
COMMENT= HWP Document Format v5 parser & processor
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}olefile>=0.40:devel/py-olefile@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hypua2jamo>0:textproc/py-hypua2jamo@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${PY_FLAVOR}
BUILD_DEPENDS:= ${RUN_DEPENDS}
USES= python:2.7 zip
diff --git a/textproc/py-pyscss/Makefile b/textproc/py-pyscss/Makefile
index 89036ae284d8..bdc6d863dec0 100644
--- a/textproc/py-pyscss/Makefile
+++ b/textproc/py-pyscss/Makefile
@@ -13,10 +13,10 @@ COMMENT= Compiler for SCSS flavor of the Sass language
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
${PY_ENUM34} ${PY_PATHLIB}
LIB_DEPENDS= libpcre.so:devel/pcre
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= Kronuz
diff --git a/textproc/py-pysrt/Makefile b/textproc/py-pysrt/Makefile
index 4482ae1e15dc..144003ac30dd 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-python-augeas/Makefile b/textproc/py-python-augeas/Makefile
index 88efdfe74bca..828bb607ffc1 100644
--- a/textproc/py-python-augeas/Makefile
+++ b/textproc/py-python-augeas/Makefile
@@ -12,7 +12,7 @@ COMMENT= Pure python bindings for Augeas
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${PY_FLAVOR}
LIB_DEPENDS= libaugeas.so:textproc/augeas
USES= python
diff --git a/textproc/py-python-docx/Makefile b/textproc/py-python-docx/Makefile
index 62e13767e6cd..ce097d2bac0d 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml@${PY_FLAVOR}
# Python3 ready
USES= python
diff --git a/textproc/py-python-slugify/Makefile b/textproc/py-python-slugify/Makefile
index 7a9f86015641..cf0b66732b9d 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.16:converters/py-unidecode@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-qrcode/Makefile b/textproc/py-qrcode/Makefile
index 4da8e2e087f1..539bc9b5e83b 100644
--- a/textproc/py-qrcode/Makefile
+++ b/textproc/py-qrcode/Makefile
@@ -13,8 +13,8 @@ COMMENT= QR Code image generator
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/textproc/py-rdflib/Makefile b/textproc/py-rdflib/Makefile
index edd9ed08bfb0..0f2a470341fc 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}isodate>=0:devel/py-isodate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sparqlwrapper>=1.5.2:textproc/py-sparqlwrapper@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-rnc2rng/Makefile b/textproc/py-rnc2rng/Makefile
index 5b074c9b94cf..604d7b93d313 100644
--- a/textproc/py-rnc2rng/Makefile
+++ b/textproc/py-rnc2rng/Makefile
@@ -11,7 +11,7 @@ COMMENT= RELAX NG Compact to regular syntax conversion library
LICENSE= PD
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rply>0:devel/py-rply@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rply>0:devel/py-rply@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/textproc/py-rstyoutube/Makefile b/textproc/py-rstyoutube/Makefile
index 5e718eaa75e5..239b4b0273c8 100644
--- a/textproc/py-rstyoutube/Makefile
+++ b/textproc/py-rstyoutube/Makefile
@@ -13,7 +13,7 @@ COMMENT= Embed YouTube videos in reStructuredText documents
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-scour/Makefile b/textproc/py-scour/Makefile
index 0ceba1b9cc25..fc6e1a659534 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-snowballstemmer/Makefile b/textproc/py-snowballstemmer/Makefile
index ce9c8c8b0fb9..e5aa55ba2a40 100644
--- a/textproc/py-snowballstemmer/Makefile
+++ b/textproc/py-snowballstemmer/Makefile
@@ -19,6 +19,6 @@ OPTIONS_DEFINE= PYSTEMMER
OPTIONS_DEFAULT=PYSTEMMER
PYSTEMMER_DESC= Use PyStemmer to accelerate
-PYSTEMMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pystemmer>0:textproc/py-pystemmer@${FLAVOR}
+PYSTEMMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pystemmer>0:textproc/py-pystemmer@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/textproc/py-sphinx-hieroglyph/Makefile b/textproc/py-sphinx-hieroglyph/Makefile
index db470971d03b..b4d659f30d99 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4:textproc/py-sphinx@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= nyergler
diff --git a/textproc/py-sphinx-intl/Makefile b/textproc/py-sphinx-intl/Makefile
index 705d62efc1b4..b654ab2d49c9 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= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}polib>=1.0.6:devel/py-polib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}polib>=1.0.6:devel/py-polib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile
index dda3159305a1..3627de47d3c3 100644
--- a/textproc/py-sphinx/Makefile
+++ b/textproc/py-sphinx/Makefile
@@ -17,25 +17,25 @@ COMMENT= Python documentation generator
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}sphinxcontrib-websupport>=1.0.1:textproc/py-sphinxcontrib-websupport@${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}requests>=2.18.1:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}imagesize>=0.7.1:graphics/py-imagesize@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-websupport>=1.0.1:textproc/py-sphinxcontrib-websupport@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0.1:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}alabaster>=0.7:textproc/py-alabaster@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.18.1:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}imagesize>=0.7.1:graphics/py-imagesize@${PY_FLAVOR} \
${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils concurrent
@@ -44,7 +44,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/textproc/py-sphinx_numfig/Makefile b/textproc/py-sphinx_numfig/Makefile
index 912e3ab50644..1b18ce1ae465 100644
--- a/textproc/py-sphinx_numfig/Makefile
+++ b/textproc/py-sphinx_numfig/Makefile
@@ -12,7 +12,7 @@ COMMENT= Autonumbering figures in Sphinx
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${PY_FLAVOR}
USES= python:2.7 tar:tgz
USE_PYTHON= flavors
diff --git a/textproc/py-sphinx_wikipedia/Makefile b/textproc/py-sphinx_wikipedia/Makefile
index 55be1d63eb5f..4eabf9b1e748 100644
--- a/textproc/py-sphinx_wikipedia/Makefile
+++ b/textproc/py-sphinx_wikipedia/Makefile
@@ -11,7 +11,7 @@ COMMENT= Sphinx extension which adds role to create links to Wikipedia articles
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${PY_FLAVOR}
USES= python
USE_PYTHON= flavors
diff --git a/textproc/py-sphinxcontrib-adadomain/Makefile b/textproc/py-sphinxcontrib-adadomain/Makefile
index 27cfd831cd90..e781e8210aa6 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= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-sphinxcontrib-bitbucket/Makefile b/textproc/py-sphinxcontrib-bitbucket/Makefile
index e6824d348fe1..0773c7387441 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= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-sphinxcontrib-fulltoc/Makefile b/textproc/py-sphinxcontrib-fulltoc/Makefile
index 8207ebb43226..ef5b390f7b2a 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= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-sphinxcontrib-httpdomain/Makefile b/textproc/py-sphinxcontrib-httpdomain/Makefile
index 3627a8f0fae7..9770075a1090 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= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-sphinxcontrib-programoutput/Makefile b/textproc/py-sphinxcontrib-programoutput/Makefile
index 5658ecf18b3a..701159c44877 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.5:textproc/py-sphinx@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-texttable/Makefile b/textproc/py-texttable/Makefile
index d2d10fe1e698..e756a89cb77a 100644
--- a/textproc/py-texttable/Makefile
+++ b/textproc/py-texttable/Makefile
@@ -13,11 +13,11 @@ COMMENT= Module for creating simple ASCII tables
LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/LICENSE
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cjkwrap>=0:textproc/py-cjkwrap@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cjkwrap>=0:textproc/py-cjkwrap@${PY_FLAVOR}
-CJKWRAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cjkwrap>=0:textproc/py-cjkwrap@${FLAVOR}
+CJKWRAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cjkwrap>=0:textproc/py-cjkwrap@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/textproc/py-toronado/Makefile b/textproc/py-toronado/Makefile
index d643b00c1f62..cabbd5c877bf 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR}
+RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-transifex-client/Makefile b/textproc/py-transifex-client/Makefile
index 1116c21d3edd..57cafb1c8f6a 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/textproc/py-wicked/Makefile b/textproc/py-wicked/Makefile
index 1763456f1632..331b6cc63429 100644
--- a/textproc/py-wicked/Makefile
+++ b/textproc/py-wicked/Makefile
@@ -12,10 +12,10 @@ COMMENT= Compact syntax for doing wiki-like content linking and creation
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-wstools/Makefile b/textproc/py-wstools/Makefile
index 6c9267e03868..dcf02b64d4b6 100644
--- a/textproc/py-wstools/Makefile
+++ b/textproc/py-wstools/Makefile
@@ -12,8 +12,8 @@ COMMENT= WSDL parsing services for Python
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/textproc/py-wtforms/Makefile b/textproc/py-wtforms/Makefile
index e418cd6aa691..c70cbf3c52dc 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pep8>0:devel/pep8@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
diff --git a/textproc/py-xlutils/Makefile b/textproc/py-xlutils/Makefile
index 4ab780ec0f2c..0d97e41b1ead 100644
--- a/textproc/py-xlutils/Makefile
+++ b/textproc/py-xlutils/Makefile
@@ -13,8 +13,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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}xlwt>=0.7.4:textproc/py-xlwt@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.2:textproc/py-xlrd@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xlwt>=0.7.4:textproc/py-xlwt@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/textproc/py-zope.app.i18n/Makefile b/textproc/py-zope.app.i18n/Makefile
index 6d3c0d9c288a..f22f89dd86f8 100644
--- a/textproc/py-zope.app.i18n/Makefile
+++ b/textproc/py-zope.app.i18n/Makefile
@@ -13,15 +13,15 @@ COMMENT= Persistent translation domains and message catalogs
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.9:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/textproc/py-zope.app.locales/Makefile b/textproc/py-zope.app.locales/Makefile
index ae7b8288a52e..105d91a5753c 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${PY_FLAVOR}
NO_ARCH= yes
USES= python:-2.7
diff --git a/textproc/py-zope.tal/Makefile b/textproc/py-zope.tal/Makefile
index a9fd882abbe0..e6a39aaafd4c 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
USES= python zip
USE_PYTHON= distutils autoplist
diff --git a/textproc/translate-toolkit/Makefile b/textproc/translate-toolkit/Makefile
index 29761d284a62..78fa5ac7cac4 100644
--- a/textproc/translate-toolkit/Makefile
+++ b/textproc/translate-toolkit/Makefile
@@ -11,16 +11,16 @@ COMMENT= Converts between many translation formats
LICENSE= GPLv2
-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} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject@${PY_FLAVOR} \
msghack:devel/gettext-msghack \
- ${PYTHON_PKGNAMEPREFIX}iniparse>=0:devel/py-iniparse@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}levenshtein>=0:devel/py-levenshtein@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iniparse>=0:devel/py-iniparse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}levenshtein>=0:devel/py-levenshtein@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
iso-codes>=1.3:misc/iso-codes \
bash:shells/bash \
- ${PYTHON_PKGNAMEPREFIX}utidylib>=0:www/py-utidylib@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}utidylib>=0:www/py-utidylib@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
# Can use psyco (on i386)
diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index cb5b6e8f881f..12c2cbf9d80a 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -11,9 +11,9 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.8:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist concurrent optsuffix
diff --git a/textproc/xsv/Makefile b/textproc/xsv/Makefile
index 61908468f8b1..a9445cb86a10 100644
--- a/textproc/xsv/Makefile
+++ b/textproc/xsv/Makefile
@@ -13,7 +13,7 @@ COMMENT= XML Schema Validator
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ltxml>0:textproc/py-ltxml@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ltxml>0:textproc/py-ltxml@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/www/butterfly/Makefile b/www/butterfly/Makefile
index b4647c1d9723..a644cd1702af 100644
--- a/www/butterfly/Makefile
+++ b/www/butterfly/Makefile
@@ -11,9 +11,9 @@ COMMENT= Web terminal based on websocket and tornado
LICENSE= GPLv3
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass@${PY_FLAVOR}
USES= python
# Can't use concurrent here, it changes ETCDIR, and breaks post-install.
diff --git a/www/calendarserver/Makefile b/www/calendarserver/Makefile
index c1d5f248574c..06ef669baf52 100644
--- a/www/calendarserver/Makefile
+++ b/www/calendarserver/Makefile
@@ -12,22 +12,22 @@ 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@${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}kerberos>=1.2.5:security/py-kerberos@${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.20170227:devel/py-twext@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0: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}
+ ${PYTHON_PKGNAMEPREFIX}calendar>=2.1:devel/py-calendar@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PyGreSQL>=5.0:databases/py-PyGreSQL@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}kerberos>=1.2.5:security/py-kerberos@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.6:databases/py-pg8000@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psutil>=4.3.0:sysutils/py-psutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2016.7:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.10:devel/py-setproctitle@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twext>=0.20170227:devel/py-twext@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xattr>=0.7.8:devel/py-xattr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.3:devel/py-zope.interface@${PY_FLAVOR}
PORTDOCS= *
PORTEXAMPLES= *
diff --git a/www/feedjack/Makefile b/www/feedjack/Makefile
index c65f99e01f3b..f82113666f9c 100644
--- a/www/feedjack/Makefile
+++ b/www/feedjack/Makefile
@@ -10,8 +10,8 @@ DISTNAME= Feedjack-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Feed aggregator written in Python using the Django framework
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${PY_FLAVOR}
DIST_SUBDIR= python
USES= python:2.7
diff --git a/www/geeknote/Makefile b/www/geeknote/Makefile
index bab024056bc6..5fb859288640 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}evernote>=1.17:www/py-evernote@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html2text>0:textproc/py-html2text@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown2>0:textproc/py-markdown2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift@${PY_FLAVOR}
USES= python:-2.7
USE_GITHUB= yes
diff --git a/www/jtoolkit/Makefile b/www/jtoolkit/Makefile
index 95323f2e495b..df10a05a6ce4 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kid>=0.9.5:devel/py-kid@${PY_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 1ef7dc2e65ac..b69a3c2b8fcb 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2:www/py-requests@${PY_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@${FLAVOR}
+GEOIP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}GeoIP>0:net/py-GeoIP@${PY_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@${FLAVOR}
+SQLITE3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
SYNTAX_DESC= HTML/CSS syntax check
SYNTAX_RUN_DEPENDS=\
- ${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.5:www/py-cssutils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}utidylib>=0.2:www/py-utidylib@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.5:www/py-cssutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}utidylib>=0.2:www/py-utidylib@${PY_FLAVOR}
.include <bsd.port.options.mk>
diff --git a/www/mitmproxy/Makefile b/www/mitmproxy/Makefile
index e89fbff14946..ee073d74a8c1 100644
--- a/www/mitmproxy/Makefile
+++ b/www/mitmproxy/Makefile
@@ -12,29 +12,29 @@ COMMENT= SSL-capable man-in-the-middle proxy
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.2:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}blinker>=1.4:devel/py-blinker@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}construct28>=2.8:devel/py-construct28@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1:www/py-cssutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html2text>=2016.1.8:textproc/py-html2text@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}passlib>=1.6.5:security/py-passlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.3:devel/py-pyparsing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.13.2:devel/py-ruamel.yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>=4.3:www/py-tornado@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urwid>=1.3.1:devel/py-urwid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}watchdog>=0.8.3:devel/py-watchdog@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}brotli>=0.5.1:archivers/py-brotli@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.5.4:devel/py-sortedcontainers@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyperclip>=1.5.22:devel/py-pyperclip@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hyperframe>=5.0.0:www/py-hyperframe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}kaitaistruct>=0.6:devel/py-kaitaistruct@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsbeautifier>=1.6.3:devel/py-jsbeautifier@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}h2>=3.0.0:www/py-h2@${PY_FLAVOR}
USES= python:3.5+
USE_PYTHON= distutils autoplist optsuffix
diff --git a/www/plone/Makefile b/www/plone/Makefile
index e82c287618e7..d8503c96785c 100644
--- a/www/plone/Makefile
+++ b/www/plone/Makefile
@@ -12,17 +12,17 @@ COMMENT= Plone Content Management System
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFPlacefulWorkflow>=0:devel/py-Products.CMFPlacefulWorkflow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFPlone>=0:www/py-Products.CMFPlone@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.caching>=0:www/py-plone.app.caching@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.dexterity>0:www/py-plone.app.dexterity@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.iterate>=0:www/py-plone.app.iterate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.openid>=0:security/py-plone.app.openid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.theming>0:www/py-plone.app.theming@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wicked>=0:textproc/py-wicked@${PY_FLAVOR}
OPTIONS_DEFINE= LDAP
-LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.ldap>=1.2.6:www/py-plone.app.ldap@${FLAVOR}
+LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.ldap>=1.2.6:www/py-plone.app.ldap@${PY_FLAVOR}
NO_ARCH= yes
USES= cpe python:2.7
diff --git a/www/py-MechanicalSoup/Makefile b/www/py-MechanicalSoup/Makefile
index 664fd5697e23..622f30dbc8fe 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.11:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-mock>=0:www/py-requests-mock@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-Products.CMFPlone/Makefile b/www/py-Products.CMFPlone/Makefile
index f98fe5bac5f5..9ad7a804e38a 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ATContentTypes>=2.1.3:devel/py-Products.ATContentTypes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFActionIcons>=0:devel/py-Products.CMFActionIcons@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:devel/py-Products.CMFCalendar@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ExtendedPathIndex>=0:devel/py-Products.ExtendedPathIndex@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ExternalEditor>=0:devel/py-Products.ExternalEditor@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.8.0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PasswordResetTool>=0:devel/py-Products.PasswordResetTool@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PlacelessTranslationService>=0:devel/py-Products.PlacelessTranslationService@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PloneLanguageTool>=0:devel/py-Products.PloneLanguageTool@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:devel/py-Products.PluginRegistry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>=0:devel/py-Products.ResourceRegistries@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.TinyMCE>=0:www/py-Products.TinyMCE@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>0:devel/py-archetypes.querywidget@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}borg.localrole>=0:security/py-borg.localrole@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.blob>=0:www/py-plone.app.blob@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.collection>0:www/py-plone.app.collection@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.content>=0:www/py-plone.app.content@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>0:www/py-plone.app.contentlisting@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.contentmenu>=1.1.6:www/py-plone.app.contentmenu@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.contentrules>=0:www/py-plone.app.contentrules@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.controlpanel>=0:www/py-plone.app.controlpanel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.customerize>=0:www/py-plone.app.customerize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.discussion>=0:www/py-plone.app.discussion@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.i18n>=0:www/py-plone.app.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.jquery>0:www/py-plone.app.jquery@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:www/py-plone.app.jquerytools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=1.1.7:www/py-plone.app.layout@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.linkintegrity>=1.0.3:www/py-plone.app.linkintegrity@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.locales>=0:www/py-plone.app.locales@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.redirector>=0:www/py-plone.app.redirector@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=0:www/py-plone.app.registry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.search>0:www/py-plone.app.search@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.upgrade>=0:www/py-plone.app.upgrade@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.users>=0:www/py-plone.app.users@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.uuid>=0:www/py-plone.app.uuid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.viewletmanager>=0:www/py-plone.app.viewletmanager@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.workflow>=0:www/py-plone.app.workflow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.browserlayer>=1.0rc4:www/py-plone.browserlayer@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.contentrules>=0:www/py-plone.contentrules@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.fieldsets>=0:www/py-plone.fieldsets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:www/py-plone.intelligenttext@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlet.collection>=0:www/py-plone.portlet.collection@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlet.static>=0:www/py-plone.portlet.static@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.protect>1.0:security/py-plone.protect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.theme>=0:www/py-plone.theme@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plonetheme.classic>=0:www/py-plonetheme.classic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plonetheme.sunburst>=0:www/py-plonetheme.sunburst@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.autoinclude>=0:devel/py-z3c.autoinclude@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.locales>=3.6.0:textproc/py-zope.app.locales@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-Products.PloneLDAP/Makefile b/www/py-Products.PloneLDAP/Makefile
index b74bf7590cfb..951ab8ac51af 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Products.LDAPMultiPlugins>=1.10:devel/py-Products.LDAPMultiPlugins@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:devel/py-Products.LDAPUserFolder@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>0:security/py-Products.PlonePAS@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.LDAPMultiPlugins>=1.10:devel/py-Products.LDAPMultiPlugins@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:devel/py-Products.LDAPUserFolder@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-Products.TinyMCE/Makefile b/www/py-Products.TinyMCE/Makefile
index 7b49fc331e33..746aad95abb1 100644
--- a/www/py-Products.TinyMCE/Makefile
+++ b/www/py-Products.TinyMCE/Makefile
@@ -13,14 +13,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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.imaging>=1.0.2:www/py-plone.app.imaging@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.outputfilters>=0:www/py-plone.outputfilters@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.caching>0:www/py-plone.caching@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>0:devel/py-Products.ResourceRegistries@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.content>0:devel/py-zope.app.content@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 shebangfix zip
diff --git a/www/py-WebError/Makefile b/www/py-WebError/Makefile
index bb92fc35805a..e447dd7a6f66 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.7:www/py-paste@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Tempita>=0.3:textproc/py-Tempita@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-WebTest/Makefile b/www/py-WebTest/Makefile
index d1ec2a0b4019..2cb38546e246 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob@${PY_FLAVOR}
USE_GITHUB= yes
diff --git a/www/py-aiohttp-wsgi/Makefile b/www/py-aiohttp-wsgi/Makefile
index 670af380dd51..2d3a6396a8e0 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR}
USES= python:3.4+
USE_PYTHON= autoplist distutils
diff --git a/www/py-aiohttp/Makefile b/www/py-aiohttp/Makefile
index 59242cf93ff8..c9602524ac7d 100644
--- a/www/py-aiohttp/Makefile
+++ b/www/py-aiohttp/Makefile
@@ -13,17 +13,17 @@ COMMENT= HTTP client/server for asyncio
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-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} \
- ${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}idna_ssl>0:dns/py-idna_ssl@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}async_generator>0:devel/py-async_generator@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gunicorn>0:www/py-gunicorn@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}multidict>0:www/py-multidict@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yarl>0:www/py-yarl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}async_timeout>0:devel/py-async_timeout@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}idna_ssl>0:dns/py-idna_ssl@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}async_generator>0:devel/py-async_generator@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gunicorn>0:www/py-gunicorn@${PY_FLAVOR}
USES= python:3.4+
USE_PYTHON= autoplist distutils cython
diff --git a/www/py-arxiv/Makefile b/www/py-arxiv/Makefile
index 246d25a08d50..4b50977b64a3 100644
--- a/www/py-arxiv/Makefile
+++ b/www/py-arxiv/Makefile
@@ -12,8 +12,8 @@ COMMENT= Python wrapper for the arXiv API
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-autobahn/Makefile b/www/py-autobahn/Makefile
index fc8a03883770..29531c45bdbd 100644
--- a/www/py-autobahn/Makefile
+++ b/www/py-autobahn/Makefile
@@ -14,11 +14,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@${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
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}txaio>=2.2.0:devel/py-txaio@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.7.2:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}trollius>0:devel/py-trollius@${PY_FLAVOR} # Not really a depends, but the test doesnt skip
USES= python
USE_GITHUB= yes
@@ -37,18 +37,18 @@ BACKENDS_DESC= Networking Backends
ACCELERATE_DESC= WebSocket and JSON Acceleration
SERIALIZATION_DESC= WAMPv2 Binary Serialization
-ACCELERATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wsaccel>=0.6.2:www/py-wsaccel@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ujson>=1.33:devel/py-ujson@${FLAVOR}
+ACCELERATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wsaccel>=0.6.2:www/py-wsaccel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ujson>=1.33:devel/py-ujson@${PY_FLAVOR}
-SERIALIZATION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0.4.0:devel/py-msgpack@${FLAVOR}
+SERIALIZATION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0.4.0:devel/py-msgpack@${PY_FLAVOR}
.include <bsd.port.pre.mk>
.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}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=12.1:devel/py-twisted@${PY_FLAVOR}
.elif ${FLAVOR} == python3 && ${PYTHON_REL} <= 3300
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>=3.4.3:devel/py-asyncio@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>=3.4.3:devel/py-asyncio@${PY_FLAVOR}
.endif
do-test:
diff --git a/www/py-aws-requests-auth/Makefile b/www/py-aws-requests-auth/Makefile
index 5e22b24c255d..9dfb3096c259 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.14.0:www/py-requests@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.14.0:www/py-requests@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/www/py-azure-storage/Makefile b/www/py-azure-storage/Makefile
index 046bc157bd43..b75b6ea8b813 100644
--- a/www/py-azure-storage/Makefile
+++ b/www/py-azure-storage/Makefile
@@ -11,10 +11,10 @@ COMMENT= Python Client for Azure Storage
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-common>0:www/py-azure-common@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-common>0:www/py-azure-common@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-beaker/Makefile b/www/py-beaker/Makefile
index 74ed407f0bd1..4788e0f7da85 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}funcsigs>=1.0.2:devel/py-funcsigs@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/www/py-bleach/Makefile b/www/py-bleach/Makefile
index 2a67cb6ba91e..12b6e5a4bc55 100644
--- a/www/py-bleach/Makefile
+++ b/www/py-bleach/Makefile
@@ -13,10 +13,10 @@ COMMENT= Easy whitelist-based HTML-sanitizing tool
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}html5lib>=0.99999999:www/py-html5lib@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0:devel/py-pytest-runner@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html5lib>=0.99999999:www/py-html5lib@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0:devel/py-pytest-runner@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-blogofile/Makefile b/www/py-blogofile/Makefile
index 314ab7f6d29a..1d8860229f2a 100644
--- a/www/py-blogofile/Makefile
+++ b/www/py-blogofile/Makefile
@@ -14,17 +14,17 @@ COMMENT= Static website compiler and blog engine
LICENSE= MIT
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}textile>0:www/py-textile@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/www/py-bokeh/Makefile b/www/py-bokeh/Makefile
index ded5f829eea3..f0aa399894b7 100644
--- a/www/py-bokeh/Makefile
+++ b/www/py-bokeh/Makefile
@@ -14,14 +14,14 @@ COMMENT= Interactive Web Plotting for Python
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-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} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \
${PY_FUTURES} \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${PY_FLAVOR} \
${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}tornado>=4.3:www/py-tornado@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}tornado>=4.3:www/py-tornado@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils concurrent
diff --git a/www/py-boto3/Makefile b/www/py-boto3/Makefile
index 45d14d78fdc3..52b699aae4e4 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.4.1:devel/py-botocore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1:devel/py-jmespath@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}s3transfer>=0.1.0:net/py-s3transfer@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_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 d635d1b0b347..52dc11af239b 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}beaker>0:www/py-beaker@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottle>0:www/py-bottle@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beaker>0:www/py-beaker@${PY_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@${FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
MONGODB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo@${PY_FLAVOR}
-SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR}
+SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${PY_FLAVOR}
.if ${PORT_OPTIONS:MEXAMPLES}
post-install:
diff --git a/www/py-branca/Makefile b/www/py-branca/Makefile
index ee4ba1423573..64532ad2fe04 100644
--- a/www/py-branca/Makefile
+++ b/www/py-branca/Makefile
@@ -13,7 +13,7 @@ COMMENT= Generate complex HTML+JS pages with Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-buku/Makefile b/www/py-buku/Makefile
index e48213ecdc3c..cf13bfd3ae65 100644
--- a/www/py-buku/Makefile
+++ b/www/py-buku/Makefile
@@ -12,11 +12,11 @@ COMMENT= Powerful command-line bookmark manager
LICENSE= GPLv3
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
USES= python:3.4+
USE_GITHUB= yes
diff --git a/www/py-cachecontrol/Makefile b/www/py-cachecontrol/Makefile
index 9babe0a1d1c3..eb733a0a9e17 100644
--- a/www/py-cachecontrol/Makefile
+++ b/www/py-cachecontrol/Makefile
@@ -13,10 +13,10 @@ COMMENT= Caching algorithms in httplib2 for use with requests session object
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lockfile>=0.9:devel/py-lockfile@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}redis>=2.10.5:databases/py-redis@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lockfile>=0.9:devel/py-lockfile@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}redis>=2.10.5:databases/py-redis@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-caldav/Makefile b/www/py-caldav/Makefile
index a2956fd9a8ed..daf6b854baab 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=3.6.0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/www/py-cheroot/Makefile b/www/py-cheroot/Makefile
index 98071ecce764..ccd21eb9a45e 100644
--- a/www/py-cheroot/Makefile
+++ b/www/py-cheroot/Makefile
@@ -13,9 +13,9 @@ COMMENT= Highly-optimized, pure-python HTTP server
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}more-itertools>=2.6:devel/py-more-itertools@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}more-itertools>=2.6:devel/py-more-itertools@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile
index f6d382ef7ca9..8c83d0f6cc7d 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:databases/py-sqlobject@${FLAVOR}
+EXAMPLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:databases/py-sqlobject@${PY_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 47f9bf0cb406..4676e742e65a 100644
--- a/www/py-collective.easytemplate/Makefile
+++ b/www/py-collective.easytemplate/Makefile
@@ -14,11 +14,11 @@ COMMENT= Dynamic HTML generation and scripting for Plone
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.3:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlet.static>=0:www/py-plone.portlet.static@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}collective.templateengines>=0.3:www/py-collective.templateengines@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= autoplist distutils
diff --git a/www/py-collective.templateengines/Makefile b/www/py-collective.templateengines/Makefile
index 07ae611f3892..7507e4bf1c13 100644
--- a/www/py-collective.templateengines/Makefile
+++ b/www/py-collective.templateengines/Makefile
@@ -14,7 +14,7 @@ COMMENT= Template engine abstraction layer for Python
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
diff --git a/www/py-cookies/Makefile b/www/py-cookies/Makefile
index 9516041c462a..4481e9a5a65e 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-ddgr/Makefile b/www/py-ddgr/Makefile
index e298416b3e0f..63efd9fc748f 100644
--- a/www/py-ddgr/Makefile
+++ b/www/py-ddgr/Makefile
@@ -12,7 +12,7 @@ COMMENT= Command line tool for performing DuckDuckGo web searches
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${PY_FLAVOR}
USES= python:3.3+ shebangfix
USE_GITHUB= yes
diff --git a/www/py-django-allauth/Makefile b/www/py-django-allauth/Makefile
index cf48ddfe1fd3..02b3c8a0ea83 100644
--- a/www/py-django-allauth/Makefile
+++ b/www/py-django-allauth/Makefile
@@ -12,9 +12,9 @@ COMMENT= User registration with social account authentication
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.11:www/py-django@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.0:www/py-requests-oauthlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.11:www/py-django@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.0:www/py-requests-oauthlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
NO_ARCH= yes
USES= python
@@ -23,9 +23,9 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3000
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}python-openid>=2.2.5:security/py-python-openid@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}python-openid>=2.2.5:security/py-python-openid@${PY_FLAVOR}
.else
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}python3-openid>=3.0.8:security/py-python3-openid@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}python3-openid>=3.0.8:security/py-python3-openid@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/www/py-django-appconf/Makefile b/www/py-django-appconf/Makefile
index 656f58b2406a..7f067c9cd607 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-appmedia/Makefile b/www/py-django-appmedia/Makefile
index 4108f92e28d4..b91fc5665f7c 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-assets/Makefile b/www/py-django-assets/Makefile
index d1b195b0f9bd..aa7064de9042 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}webassets>0:www/py-webassets@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webassets>0:www/py-webassets@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-babel/Makefile b/www/py-django-babel/Makefile
index e8dad0451046..475b56284d66 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Babel>=0:devel/py-babel@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=0:devel/py-babel@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/www/py-django-bitfield/Makefile b/www/py-django-bitfield/Makefile
index 709e9ad94ce7..952db4ff67a9 100644
--- a/www/py-django-bitfield/Makefile
+++ b/www/py-django-bitfield/Makefile
@@ -13,8 +13,8 @@ COMMENT= BitField in Django
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-bootstrap-form/Makefile b/www/py-django-bootstrap-form/Makefile
index db007c491d38..10e5a60cfc97 100644
--- a/www/py-django-bootstrap-form/Makefile
+++ b/www/py-django-bootstrap-form/Makefile
@@ -15,6 +15,6 @@ LICENSE= MIT
USES= python
USE_PYTHON= distutils autoplist
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.5:www/py-django@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.5:www/py-django@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/www/py-django-braces/Makefile b/www/py-django-braces/Makefile
index 1baae50a5d26..abfc0b0c3643 100644
--- a/www/py-django-braces/Makefile
+++ b/www/py-django-braces/Makefile
@@ -13,7 +13,7 @@ COMMENT= Reusable, generic mixins for Django
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.5:www/py-django111@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.5:www/py-django111@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-django-bulk-update/Makefile b/www/py-django-bulk-update/Makefile
index 6c3187432821..0eb631dba090 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}django>=1.11:www/py-django@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.11:www/py-django@${PY_FLAVOR}
NO_ARCH= yes
USES= python:-3.4
diff --git a/www/py-django-caching-app-plugins/Makefile b/www/py-django-caching-app-plugins/Makefile
index b9cb3b1994eb..9e62044d925a 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django111@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django111@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-contact-form/Makefile b/www/py-django-contact-form/Makefile
index 14698a39764e..f9649dd2aba0 100644
--- a/www/py-django-contact-form/Makefile
+++ b/www/py-django-contact-form/Makefile
@@ -13,8 +13,8 @@ COMMENT= Generic contact-form application for Django
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.11:www/py-django@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}akismet>=0:devel/py-akismet@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.11:www/py-django@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}akismet>=0:devel/py-akismet@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/www/py-django-contrib-comments/Makefile b/www/py-django-contrib-comments/Makefile
index 91f98b0564e9..84f391f7d9df 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-crispy-forms/Makefile b/www/py-django-crispy-forms/Makefile
index 484db009d630..aded8cc20910 100644
--- a/www/py-django-crispy-forms/Makefile
+++ b/www/py-django-crispy-forms/Makefile
@@ -13,7 +13,7 @@ COMMENT= Best way to have Django DRY forms
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-datetime-widget/Makefile b/www/py-django-datetime-widget/Makefile
index 88763cc72935..ae9ffe227506 100644
--- a/www/py-django-datetime-widget/Makefile
+++ b/www/py-django-datetime-widget/Makefile
@@ -14,8 +14,8 @@ COMMENT= Simple and clean widget for DateTimeField
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-django-debug-toolbar/Makefile b/www/py-django-debug-toolbar/Makefile
index cb8ff50e2523..d3260b385d31 100644
--- a/www/py-django-debug-toolbar/Makefile
+++ b/www/py-django-debug-toolbar/Makefile
@@ -13,8 +13,8 @@ COMMENT= Configurable set of panels to display debug information
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.0:databases/py-sqlparse@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.0:databases/py-sqlparse@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-django-evolution/Makefile b/www/py-django-evolution/Makefile
index 4d9e3c7689ad..40b99157c65c 100644
--- a/www/py-django-evolution/Makefile
+++ b/www/py-django-evolution/Makefile
@@ -13,7 +13,7 @@ COMMENT= Database schema evolution tool for the Django web framework
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django111@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django111@${PY_FLAVOR}
USE_GITHUB= yes
diff --git a/www/py-django-extensions/Makefile b/www/py-django-extensions/Makefile
index 8526e5384835..d65af2e635a3 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}django>=1.8:www/py-django@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.2:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.2:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
@@ -23,7 +23,7 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/www/py-django-guardian/Makefile b/www/py-django-guardian/Makefile
index 98d73864e11e..ab49d2066fbd 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-happenings/Makefile b/www/py-django-happenings/Makefile
index 2dcaf7d5d68d..051a11466ec8 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
CONFLICTS_INSTALL= py*-django-mptt
diff --git a/www/py-django-hijack/Makefile b/www/py-django-hijack/Makefile
index c0b0b9cb6ee2..2f931729bc9b 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_PKGNAMEPREFIX}django>=1.8:www/py-django@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-htmlmin/Makefile b/www/py-django-htmlmin/Makefile
index 49ef4aaf459c..256128a76d8c 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@${FLAVOR} \
- ${PYTHON_SITELIBDIR}/html5lib/html5parser.py:www/py-html5lib@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bs4/element.py:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/html5lib/html5parser.py:www/py-html5lib@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-js-asset/Makefile b/www/py-django-js-asset/Makefile
index 540ba8612782..55901f20e91d 100644
--- a/www/py-django-js-asset/Makefile
+++ b/www/py-django-js-asset/Makefile
@@ -12,7 +12,7 @@ COMMENT= Insert script tags with additional attributes for django.forms.Media
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-json-rpc/Makefile b/www/py-django-json-rpc/Makefile
index 210afa23d8c0..cb8471a8a3f9 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-django111@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django111@${PY_FLAVOR}
LICENSE= MIT
diff --git a/www/py-django-jsonfield2/Makefile b/www/py-django-jsonfield2/Makefile
index 2aac8a226f43..33bb3c89e297 100644
--- a/www/py-django-jsonfield2/Makefile
+++ b/www/py-django-jsonfield2/Makefile
@@ -12,7 +12,7 @@ COMMENT= Reusable Django field to store validated JSON in your model
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-keyedcache/Makefile b/www/py-django-keyedcache/Makefile
index 1f1695bf1535..a6b9efd987fe 100644
--- a/www/py-django-keyedcache/Makefile
+++ b/www/py-django-keyedcache/Makefile
@@ -16,7 +16,7 @@ LICENSE= BSD3CLAUSE
DEPRECATED= Project development abandoned
EXPIRATION_DATE=2018-08-01
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-livesettings/Makefile b/www/py-django-livesettings/Makefile
index 69e0a044fa6b..a0602c82bbec 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-mezzanine/Makefile b/www/py-django-mezzanine/Makefile
index 93dd5fc82783..7877227030bf 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-contrib-comments>0:www/py-django-contrib-comments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-mezzanine-filebrowser>=0.4.6:www/py-django-mezzanine-filebrowser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-mezzanine-grappelli>=0.4.5:www/py-django-mezzanine-grappelli@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bleach>=1.4:www/py-bleach@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.1.3:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4:www/py-requests-oauthlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.9.0:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pep8>=1.4.1:devel/pep8@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:devel/py-pyflakes@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:devel/py-pyflakes@${PY_FLAVOR}
USES= gettext python
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-django-model-utils/Makefile b/www/py-django-model-utils/Makefile
index 07eb59c8aab3..a13166d92835 100644
--- a/www/py-django-model-utils/Makefile
+++ b/www/py-django-model-utils/Makefile
@@ -13,7 +13,7 @@ COMMENT= Django model mixins and utilities
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-django-mptt/Makefile b/www/py-django-mptt/Makefile
index fa729240539a..3563f7a09fbb 100644
--- a/www/py-django-mptt/Makefile
+++ b/www/py-django-mptt/Makefile
@@ -13,7 +13,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-django111@${FLAVOR}\
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django111@${PY_FLAVOR}\
${PYTHON_PKGNAMEPREFIX}django-js-asset>0:www/py-django-js-asset@${PY_FLAVOR}
CONFLICTS_INSTALL=py*-django-happenings
diff --git a/www/py-django-netfields/Makefile b/www/py-django-netfields/Makefile
index a93e31b0492a..30e2394b3fd7 100644
--- a/www/py-django-netfields/Makefile
+++ b/www/py-django-netfields/Makefile
@@ -13,8 +13,8 @@ COMMENT= Django PostgreSQL netfields implementation
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${PY_FLAVOR} \
${PY_IPADDRESS}
USES= python
diff --git a/www/py-django-otp-yubikey/Makefile b/www/py-django-otp-yubikey/Makefile
index 8e5f1f288619..32e9c4f64d01 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}django-otp>0.4.0:www/py-django-otp@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}YubiOTP>=0.2.1:security/py-YubiOTP@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-otp>0.4.0:www/py-django-otp@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-overextends/Makefile b/www/py-django-overextends/Makefile
index 9f8dc2a8122a..3420a3858862 100644
--- a/www/py-django-overextends/Makefile
+++ b/www/py-django-overextends/Makefile
@@ -13,8 +13,8 @@ COMMENT= Django reusable app enabling circular template inheritance
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sphinx-me>=0.1.2:textproc/py-sphinx-me@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx-me>=0.1.2:textproc/py-sphinx-me@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/www/py-django-paging/Makefile b/www/py-django-paging/Makefile
index a284e54c36a1..f2a29cc47740 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile
index 5decfdd8ea70..2fb0390f3b6a 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.11:www/py-django@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}django-sortedm2m>=1.5.0:www/py-django-sortedm2m@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ExifRead>=2.1.2:graphics/py-exifread@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pillow>=4.3.0:graphics/py-pillow@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.11:www/py-django@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-sortedm2m>=1.5.0:www/py-django-sortedm2m@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ExifRead>=2.1.2:graphics/py-exifread@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=4.3.0:graphics/py-pillow@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-profiles/Makefile b/www/py-django-profiles/Makefile
index 652925005581..e857de24bcbc 100644
--- a/www/py-django-profiles/Makefile
+++ b/www/py-django-profiles/Makefile
@@ -15,7 +15,7 @@ COMMENT= User-profile application for Django
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${PY_FLAVOR}
WRKSRC= ${WRKDIR}/${PORTNAME}
USES= python
diff --git a/www/py-django-pyscss/Makefile b/www/py-django-pyscss/Makefile
index c05f0d6783e0..5bf549514e80 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyscss>=1.3.4:textproc/py-pyscss@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyscss>=1.3.4:textproc/py-pyscss@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/www/py-django-redis/Makefile b/www/py-django-redis/Makefile
index c4393b98175b..0ccdbe0ea379 100644
--- a/www/py-django-redis/Makefile
+++ b/www/py-django-redis/Makefile
@@ -13,12 +13,12 @@ COMMENT= Full featured Redis cache/session backend for Django
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}redis>=2.10.0:databases/py-redis@${FLAVOR}
-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>=0:devel/py-msgpack@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}redis>=2.10.0:databases/py-redis@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fakeredis>=0:databases/py-fakeredis@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-registration-defaults/Makefile b/www/py-django-registration-defaults/Makefile
index c102d6b6b2c7..913bd6008693 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-registration>=0:www/py-django-registration@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-registration-redux/Makefile b/www/py-django-registration-redux/Makefile
index 6563930f643b..ec6be445cd55 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}django>=1.11:www/py-django@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.11:www/py-django@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-registration/Makefile b/www/py-django-registration/Makefile
index b67a478e5b8c..cb9c19f716fe 100644
--- a/www/py-django-registration/Makefile
+++ b/www/py-django-registration/Makefile
@@ -13,8 +13,8 @@ COMMENT= User-registration application for Django
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}confusable_homoglyphs>=0:devel/py-confusable_homoglyphs@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}confusable_homoglyphs>=0:devel/py-confusable_homoglyphs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-signals-ahoy/Makefile b/www/py-django-signals-ahoy/Makefile
index 297afa7859f3..1c4b55fb11d4 100644
--- a/www/py-django-signals-ahoy/Makefile
+++ b/www/py-django-signals-ahoy/Makefile
@@ -17,7 +17,7 @@ LICENSE= BSD3CLAUSE
DEPRECATED= Project development unmaintained
EXPIRATION_DATE=2018-08-01
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-social-auth/Makefile b/www/py-django-social-auth/Makefile
index 6a81e5e7c2dc..9f0badfe6b6b 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}python-social-auth>=0:security/py-python-social-auth@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-social-auth>=0:security/py-python-social-auth@${PY_FLAVOR}
DEPRECATED= no support for new django
EXPIRATION_DATE= 2018-08-01
diff --git a/www/py-django-solo/Makefile b/www/py-django-solo/Makefile
index 2afd8deb2228..ce57cb036935 100644
--- a/www/py-django-solo/Makefile
+++ b/www/py-django-solo/Makefile
@@ -12,7 +12,7 @@ COMMENT= Helps working with singletons
LICENSE= CC-BY-3.0
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>1.6:www/py-django111@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>1.6:www/py-django111@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-sortedm2m/Makefile b/www/py-django-sortedm2m/Makefile
index de8e5952497c..c579c0326e60 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_PKGNAMEPREFIX}django>=1.8:www/py-django@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-star-ratings/Makefile b/www/py-django-star-ratings/Makefile
index 68ebdf21e15f..c49569f8d985 100644
--- a/www/py-django-star-ratings/Makefile
+++ b/www/py-django-star-ratings/Makefile
@@ -12,10 +12,10 @@ COMMENT= Django app to add star ratings to models
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}django-braces>=0:www/py-django-braces@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}django-model-utils>=0:www/py-django-model-utils@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}swapper>=0:www/py-swapper@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-braces>=0:www/py-django-braces@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-model-utils>=0:www/py-django-model-utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}swapper>=0:www/py-swapper@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-subdomains/Makefile b/www/py-django-subdomains/Makefile
index d85858b8ca85..352a94b2adac 100644
--- a/www/py-django-subdomains/Makefile
+++ b/www/py-django-subdomains/Makefile
@@ -13,7 +13,7 @@ COMMENT= Subdomains helpers for the Django framework
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-sudo/Makefile b/www/py-django-sudo/Makefile
index e390ac9d1cbd..a47e5bbc4e33 100644
--- a/www/py-django-sudo/Makefile
+++ b/www/py-django-sudo/Makefile
@@ -14,7 +14,7 @@ COMMENT= Sudo mode is an extra layer of security for Django
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-tables2/Makefile b/www/py-django-tables2/Makefile
index 77dbd38225e8..91682a370068 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}django111>=0:www/py-django111@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tablib>=0:textproc/py-tablib@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tablib>=0:textproc/py-tablib@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-tagging/Makefile b/www/py-django-tagging/Makefile
index c7660e8acdc6..979af0df0600 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_PKGNAMEPREFIX}django>=1.8:www/py-django@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.8:www/py-django@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-django-taggit/Makefile b/www/py-django-taggit/Makefile
index 86203e9024c4..da85b30220c3 100644
--- a/www/py-django-taggit/Makefile
+++ b/www/py-django-taggit/Makefile
@@ -11,8 +11,8 @@ COMMENT= Reusable Django application for simple tagging
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}isort>0:devel/py-isort@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}isort>0:devel/py-isort@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-django-tastypie/Makefile b/www/py-django-tastypie/Makefile
index 437a580ed744..06c97f07ef26 100644
--- a/www/py-django-tastypie/Makefile
+++ b/www/py-django-tastypie/Makefile
@@ -12,9 +12,9 @@ COMMENT= Create REST API for Django apps
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django111>0:www/py-django111@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-templatetag-sugar/Makefile b/www/py-django-templatetag-sugar/Makefile
index 09ec45e8d70c..b1c45466fad3 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-django-threaded-multihost/Makefile b/www/py-django-threaded-multihost/Makefile
index d8ce60b47cb8..f1656c558e4e 100644
--- a/www/py-django-threaded-multihost/Makefile
+++ b/www/py-django-threaded-multihost/Makefile
@@ -16,8 +16,8 @@ LICENSE= BSD3CLAUSE
DEPRECATED= Project development unmaintained
EXPIRATION_DATE=2018-08-01
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${PY_FLAVOR}
WRKSRC= ${WRKDIR}/${PORTNAME}
USES= python:2.7
diff --git a/www/py-django-tinymce/Makefile b/www/py-django-tinymce/Makefile
index 048d1f196f27..de214f78ab57 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
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-django-widget-tweaks/Makefile b/www/py-django-widget-tweaks/Makefile
index 7d55cc6e7dee..d7cd042bafad 100644
--- a/www/py-django-widget-tweaks/Makefile
+++ b/www/py-django-widget-tweaks/Makefile
@@ -13,7 +13,7 @@ COMMENT= Tweak form field rendering in templates, not in python-level form defin
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>1.2:www/py-django111@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>1.2:www/py-django111@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index aca7c9820cae..17d1fc431dbe 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -25,8 +25,8 @@ USE_PYTHON= flavors
CPE_VENDOR= djangoproject
-DJANGO18_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR}
-DJANGO111_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${FLAVOR}
-DJANGO20_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django20>=0:www/py-django20@${FLAVOR}
+DJANGO18_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${PY_FLAVOR}
+DJANGO111_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR}
+DJANGO20_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django20>=0:www/py-django20@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/www/py-django111/Makefile b/www/py-django111/Makefile
index 0185f86207a5..23b72f77e947 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
NO_ARCH= yes
USES= cpe python${PY_MYSQL} shebangfix
@@ -43,12 +43,12 @@ 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@${FLAVOR}
+HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
HTMLDOCS_IMPLIES= DOCS
-PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
-MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${PY_FLAVOR}
MYSQL_VARS= PY_MYSQL=:2.7
-SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
post-build-HTMLDOCS-on:
cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
diff --git a/www/py-django18/Makefile b/www/py-django18/Makefile
index 5e652ec256ec..bc5256539b99 100644
--- a/www/py-django18/Makefile
+++ b/www/py-django18/Makefile
@@ -21,7 +21,7 @@ EXPIRATION_DATE= 2018-08-01
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
NO_ARCH= yes
USES= cpe python${PY_MYSQL} shebangfix
@@ -47,13 +47,13 @@ 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@${FLAVOR}
+HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
HTMLDOCS_IMPLIES= DOCS
-PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
-MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${PY_FLAVOR}
MYSQL_VARS= PY_MYSQL=:2.7
-SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
-FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup6>0:www/py-flup6@${FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup6>0:www/py-flup6@${PY_FLAVOR}
post-build-HTMLDOCS-on:
cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
diff --git a/www/py-django20/Makefile b/www/py-django20/Makefile
index dc89d234aac7..32d9794c4f61 100644
--- a/www/py-django20/Makefile
+++ b/www/py-django20/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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
NO_ARCH= yes
USES= cpe python:3.4+ shebangfix
@@ -42,12 +42,12 @@ 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@${FLAVOR}
+HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
HTMLDOCS_IMPLIES= DOCS
-PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
-MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${PY_FLAVOR}
MYSQL_BROKEN= MySQLdb only supports Python 2.
-SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
post-build-HTMLDOCS-on:
cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
diff --git a/www/py-django_compressor/Makefile b/www/py-django_compressor/Makefile
index fce093a6a559..d656bfde072f 100644
--- a/www/py-django_compressor/Makefile
+++ b/www/py-django_compressor/Makefile
@@ -12,10 +12,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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}versiontools>=1.8.2:devel/py-versiontools@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-appconf>=0.4:www/py-django-appconf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rcssmin>=0:archivers/py-rcssmin@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rjsmin>=0:archivers/py-rjsmin@${PY_FLAVOR}
USES= python${PY_SLIMIT}
USE_PYTHON= autoplist distutils
@@ -27,10 +27,10 @@ LXML_DESC= Enable LxmlParser
HTML5LIB_DESC= Enable Html5LibParser
SLIMIT_DESC= Enable SlimIt JavaScript filter
-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}
+BEAUTIFULSOUP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR}
+LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
+HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}
+SLIMIT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}slimit>=0.8.1:www/py-slimit@${PY_FLAVOR}
SLIMIT_VARS= PY_SLIMIT=:2.7
.include <bsd.port.mk>
diff --git a/www/py-django_openstack_auth/Makefile b/www/py-django_openstack_auth/Makefile
index c1dbcddfddff..73a6a48c7b52 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-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}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.17.0:devel/py-keystoneauth1@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.17.0:devel/py-oslo.policy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/www/py-django_polymorphic/Makefile b/www/py-django_polymorphic/Makefile
index c4409549dc8c..8bead3ebc610 100644
--- a/www/py-django_polymorphic/Makefile
+++ b/www/py-django_polymorphic/Makefile
@@ -14,7 +14,7 @@ COMMENT= Seamless Polymorphic Inheritance for Django Models
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-djangotoolbox/Makefile b/www/py-djangotoolbox/Makefile
index 54fcdf3751b7..6b74a4378c08 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-dojango/Makefile b/www/py-dojango/Makefile
index f50d50d212ed..3a96a4d8fef7 100644
--- a/www/py-dojango/Makefile
+++ b/www/py-dojango/Makefile
@@ -11,7 +11,7 @@ COMMENT= Django application for building dojo
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6:www/py-django18@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6:www/py-django18@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-evernote/Makefile b/www/py-evernote/Makefile
index 8a2225161509..b8cb78d5379b 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauth2>0:net/py-oauth2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift@${PY_FLAVOR}
USES= python:-2.7
USE_PYTHON= autoplist distutils
diff --git a/www/py-falcon/Makefile b/www/py-falcon/Makefile
index 5ecf75b2180b..0a02aeff417c 100644
--- a/www/py-falcon/Makefile
+++ b/www/py-falcon/Makefile
@@ -12,9 +12,9 @@ COMMENT= High-performance Python framework for building cloud APIs
LICENSE= APACHE20
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}testtools>=0:devel/py-testtools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist cython
diff --git a/www/py-fedex/Makefile b/www/py-fedex/Makefile
index 56bcf7b632ad..38efad2fb73d 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}suds>=0:net/py-suds@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-feedgenerator/Makefile b/www/py-feedgenerator/Makefile
index f49d16919d06..30c23610e470 100644
--- a/www/py-feedgenerator/Makefile
+++ b/www/py-feedgenerator/Makefile
@@ -12,8 +12,8 @@ COMMENT= Standalone version of django.utils.feedgenerator
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-flask-admin/Makefile b/www/py-flask-admin/Makefile
index 3e08cf4cbf28..682e7de44dca 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}wtforms>0:textproc/py-wtforms@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wtforms>0:textproc/py-wtforms@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-api/Makefile b/www/py-flask-api/Makefile
index 110314ba97d9..6923765ce89e 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0.10.1:www/py-flask@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-flask-apscheduler/Makefile b/www/py-flask-apscheduler/Makefile
index f3f9b808dc00..d55a9599586f 100644
--- a/www/py-flask-apscheduler/Makefile
+++ b/www/py-flask-apscheduler/Makefile
@@ -13,9 +13,9 @@ COMMENT= APScheduler support for Flask
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}apscheduler>=3.2.0:devel/py-apscheduler@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.2:devel/py-dateutil@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}apscheduler>=3.2.0:devel/py-apscheduler@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.2:devel/py-dateutil@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-flask-assets/Makefile b/www/py-flask-assets/Makefile
index 59e1c7dc417f..ff9a62fa9e3c 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}webassets>=0:www/py-webassets@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webassets>=0:www/py-webassets@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-bootstrap/Makefile b/www/py-flask-bootstrap/Makefile
index 2506d639579e..cf6cce360be3 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-cache/Makefile b/www/py-flask-cache/Makefile
index 21bcc0977838..7c58676d76c2 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.8:www/py-flask@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-compress/Makefile b/www/py-flask-compress/Makefile
index bb94dd71d9dd..73e1bdb74fd5 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.11:www/py-flask@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-cors/Makefile b/www/py-flask-cors/Makefile
index a319f6667b7c..2e4149e4247a 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-flatpages/Makefile b/www/py-flask-flatpages/Makefile
index b0f531f1391d..fb5c86f8a696 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-login/Makefile b/www/py-flask-login/Makefile
index 0d622682632b..4113c4f54957 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-marshmallow/Makefile b/www/py-flask-marshmallow/Makefile
index b30ded368924..94eba75eb3e2 100644
--- a/www/py-flask-marshmallow/Makefile
+++ b/www/py-flask-marshmallow/Makefile
@@ -13,9 +13,9 @@ COMMENT= Marshmallow support for Flask
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}marshmallow>=2.0.0:devel/py-marshmallow@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}marshmallow>=2.0.0:devel/py-marshmallow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-flask-migrate/Makefile b/www/py-flask-migrate/Makefile
index 45b8f957aea9..1f31a4a53aa2 100644
--- a/www/py-flask-migrate/Makefile
+++ b/www/py-flask-migrate/Makefile
@@ -12,9 +12,9 @@ COMMENT= Database schema migrations for Flask applications
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}alembic>=0.8.4:databases/py-alembic@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}python-editor>=0:devel/py-python-editor@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}alembic>=0.8.4:databases/py-alembic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-editor>=0:devel/py-python-editor@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-moment/Makefile b/www/py-flask-moment/Makefile
index dac89777aac7..a35cf1a70165 100644
--- a/www/py-flask-moment/Makefile
+++ b/www/py-flask-moment/Makefile
@@ -12,7 +12,7 @@ COMMENT= Format dates and times in Flask templates using moment.js
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-oauthlib/Makefile b/www/py-flask-oauthlib/Makefile
index 964ae474eda4..36708253f8a4 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>0:www/py-requests-oauthlib@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>0:www/py-requests-oauthlib@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-flask-principal/Makefile b/www/py-flask-principal/Makefile
index 5094265b3da9..be7a0494b439 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}blinker>=0:devel/py-blinker@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}blinker>=0:devel/py-blinker@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-flask-restful/Makefile b/www/py-flask-restful/Makefile
index d53a8ce6ffbd..1134fb456a62 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aniso8601>0:devel/py-aniso8601@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-flask-restplus/Makefile b/www/py-flask-restplus/Makefile
index ae28a95b34ab..15cc877ea910 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.8:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}aniso8601>=0.82:devel/py-aniso8601@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_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@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
.endif
do-test:
diff --git a/www/py-flask-script/Makefile b/www/py-flask-script/Makefile
index 35c30e473a70..dffa4362f4d0 100644
--- a/www/py-flask-script/Makefile
+++ b/www/py-flask-script/Makefile
@@ -13,7 +13,7 @@ COMMENT= Scripting support for Flask
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-flask-socketio/Makefile b/www/py-flask-socketio/Makefile
index 0a4c72bf2df3..2a785a298f1a 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0:www/py-gevent-websocket@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-engineio>=1.0.0:devel/py-python-engineio@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-socketio>=1.5.0:devel/py-python-socketio@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-flask-sockets/Makefile b/www/py-flask-sockets/Makefile
index 5aa67db109e5..3047e6f523fb 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0:www/py-gevent-websocket@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0:www/py-gevent-websocket@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-flask-uploads/Makefile b/www/py-flask-uploads/Makefile
index 655c345de7c5..4c5a27fb31a8 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-flask-wtf/Makefile b/www/py-flask-wtf/Makefile
index db0d4fdcedfa..c17ead06e56f 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wtforms>0:textproc/py-wtforms@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Babel>0:devel/py-flask-babel@${PY_FLAVOR}
OPTIONS_DEFINE= TESTS
TESTS_DESC= Install test suite dependencies
diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile
index 7efb7e78e17f..3123a2bfca49 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11:www/py-werkzeug@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}itsdangerous>=0.24:security/py-itsdangerous@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/www/py-flexget/Makefile b/www/py-flexget/Makefile
index 81c8619bf528..00dd3638668c 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}sqlalchemy12>0:databases/py-sqlalchemy12@${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} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>0:databases/py-sqlalchemy12@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rpyc>0:devel/py-RPyC@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}apscheduler>=3.2.0:devel/py-apscheduler@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.0:devel/py-jsonschema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}path.py>=8.1.1:devel/py-path.py@${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.4:multimedia/py-guessit@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pynzb>0:news/py-pynzb@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zxcvbn>0:security/py-zxcvbn@${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}
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}guessit>=2.1.4:multimedia/py-guessit@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pynzb>0:news/py-pynzb@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zxcvbn>0:security/py-zxcvbn@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plumbum>=1.2:sysutils/py-plumbum@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}colorclass>=2.2.0:textproc/py-colorclass@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}feedparser>=5.2.1:textproc/py-feedparser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rss2gen>0:textproc/py-rss2gen@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}terminaltables>=3.1.0:textproc/py-terminaltables@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.7.0:www/py-cherrypy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask>=0.7:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Compress>=1.2.1:www/py-flask-compress@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Cors>=2.1.2:www/py-flask-cors@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Login>=0.4.0:www/py-flask-login@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-RESTful>=0.3.3:www/py-flask-restful@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}flask-restplus>=0.10.1:www/py-flask-restplus@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}html5lib>=0.11:www/py-html5lib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.8.0:www/py-requests@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vcrpy>0:devel/py-vcrpy@${PY_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@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/www/py-folium/Makefile b/www/py-folium/Makefile
index 64ae870e7a0f..683b9b78877e 100644
--- a/www/py-folium/Makefile
+++ b/www/py-folium/Makefile
@@ -13,11 +13,11 @@ COMMENT= Make beautiful maps with Leaflet.js & Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}branca>=0:www/py-branca@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}branca>=0:www/py-branca@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-formalchemy/Makefile b/www/py-formalchemy/Makefile
index 61fb4e49589b..3fb18787b781 100644
--- a/www/py-formalchemy/Makefile
+++ b/www/py-formalchemy/Makefile
@@ -13,12 +13,12 @@ COMMENT= Toolkit for creating HTML form elements
LICENSE= MIT
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0:textproc/py-MarkupSafe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.4.5:databases/py-sqlalchemy10@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Tempita>=0.4:textproc/py-Tempita@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:www/py-webhelpers@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.6.3:www/py-webob@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/www/py-frappe-bench/Makefile b/www/py-frappe-bench/Makefile
index 4a36163d95e2..dc6f65343db6 100644
--- a/www/py-frappe-bench/Makefile
+++ b/www/py-frappe-bench/Makefile
@@ -13,14 +13,14 @@ COMMENT= Frappe / ERPNext apps setup tool
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-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} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}honcho>0:sysutils/py-honcho@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}semantic_version>0:devel/py-semantic_version@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}GitPython>=1.0.1:devel/py-gitpython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
git:devel/git
USE_GITHUB= yes
diff --git a/www/py-frozen-flask/Makefile b/www/py-frozen-flask/Makefile
index 2703ac1e2eda..fe9feb969e53 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-funkload/Makefile b/www/py-funkload/Makefile
index 0550626f25a7..8965849b5f64 100644
--- a/www/py-funkload/Makefile
+++ b/www/py-funkload/Makefile
@@ -13,9 +13,9 @@ COMMENT= Functional and load web tester
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
${LOCALBASE}/bin/gnuplot:math/gnuplot \
- ${PYTHON_PKGNAMEPREFIX}webunit>=1.3.8:www/py-webunit@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webunit>=1.3.8:www/py-webunit@${PY_FLAVOR} \
tcpwatch.py:net/tcpwatch
USES= python:2.7
diff --git a/www/py-gandi.cli/Makefile b/www/py-gandi.cli/Makefile
index 403e7081b485..4c2a1fa776bc 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}click>=3.1:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy@${PY_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@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
.endif
do-test:
diff --git a/www/py-gevent-websocket/Makefile b/www/py-gevent-websocket/Makefile
index 9cff173f5d68..ca4e03f8b0d8 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-goobook/Makefile b/www/py-goobook/Makefile
index fcac41630952..5752f32b1430 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.4.12:security/py-oauth2client@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gdata>=2.0.18:devel/py-gdata@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.0:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:www/py-httplib2@${PY_FLAVOR}
NO_ARCH= yes
USES= python:-2.7
diff --git a/www/py-google-api-core/Makefile b/www/py-google-api-core/Makefile
index 4e8f5b7d3c15..d886c8e1f77a 100644
--- a/www/py-google-api-core/Makefile
+++ b/www/py-google-api-core/Makefile
@@ -14,13 +14,13 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PY_FUTURES} \
- ${PYTHON_PKGNAMEPREFIX}google-auth>=0.4.0:security/py-google-auth@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}googleapis-common-protos>=1.5.3:devel/py-googleapis-common-protos@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}grpcio>=1.8.2:devel/py-grpcio@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}protobuf>=3.0.0:devel/py-protobuf@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.18.0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}google-auth>=0.4.0:security/py-google-auth@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}googleapis-common-protos>=1.5.3:devel/py-googleapis-common-protos@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}grpcio>=1.8.2:devel/py-grpcio@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.0.0:devel/py-protobuf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.18.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-google-cloud-core/Makefile b/www/py-google-cloud-core/Makefile
index 7feb1e87b657..3a0f2fa92d39 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}googleapis-common-protos>0:devel/py-googleapis-common-protos@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}google-auth>0:security/py-google-auth@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_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 9454a305a60f..cbf551770c86 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google-cloud-core>0:www/py-google-cloud-core@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}google-auth>0:security/py-google-auth@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}google-resumable-media>0:www/py-google-resumable-media@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_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 5aff2ee61e91..026615a8f972 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/www/py-google/Makefile b/www/py-google/Makefile
index 205f9a431f19..07ec4f037335 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-graphite-api/Makefile b/www/py-graphite-api/Makefile
index 02058b6db88c..040d0dcbf85d 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@${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} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-Cache>=0.13.1:www/py-flask-cache@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.1.1:devel/py-tzlocal@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}structlog>=16.0.0:devel/py-structlog@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.0:devel/py-pyparsing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>3.1:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cairocffi>=0.7.2:graphics/py-cairocffi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gunicorn>=19.4.1:www/py-gunicorn@${PY_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 c8b461ce1378..bd24c2b30fbb 100644
--- a/www/py-graphite-web/Makefile
+++ b/www/py-graphite-web/Makefile
@@ -11,13 +11,13 @@ COMMENT= Enterprise scalable realtime graphing platform
LICENSE= APACHE20
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:graphics/py-cairo@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}carbon>=${PORTVERSION}:databases/py-carbon@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}django-tagging>=0.3.1:www/py-django-tagging@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}django>=1.4:www/py-django@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}scandir>=0:sysutils/py-scandir@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:graphics/py-cairo@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}carbon>=${PORTVERSION}:databases/py-carbon@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-tagging>=0.3.1:www/py-django-tagging@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django>=1.4:www/py-django@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}scandir>=0:sysutils/py-scandir@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_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 03779c69104a..f56aff37c383 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= kennethreitz
diff --git a/www/py-gunicorn/Makefile b/www/py-gunicorn/Makefile
index df86eda1d66b..1b9d0dee1b0d 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@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_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@${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}
+EVENTLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.7:net/py-eventlet@${PY_FLAVOR}
+GAIOHTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR}
+GEVENT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0.12.2:devel/py-gevent@${PY_FLAVOR}
+PROCTITLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR}
+TORNADO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>=2.2:www/py-tornado@${PY_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@${FLAVOR}
+TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
.endif
.if ${PYTHON_REL} > 3000 && ${PORT_OPTIONS:MGEVENT}
diff --git a/www/py-h2/Makefile b/www/py-h2/Makefile
index d77f3ea2ccfd..3b4c5d88721e 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}hpack>=2.3:www/py-hpack@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hyperframe>=5.0.0:www/py-hyperframe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}hpack>=2.3:www/py-hpack@${PY_FLAVOR}
USES?= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-horizon/Makefile b/www/py-horizon/Makefile
index a46b3ee890b2..51141a00051c 100644
--- a/www/py-horizon/Makefile
+++ b/www/py-horizon/Makefile
@@ -13,63 +13,63 @@ COMMENT= OpenStack Dashboard (Horizon)
LICENSE= APACHE20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-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}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Pint>=0.5:devel/py-Pint@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-babel>=0.5.1:www/py-django-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django_compressor>=2.0:www/py-django_compressor@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django_openstack_auth>=2.4.0:www/py-django_openstack_auth@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-pyscss>=2.0.2:www/py-django-pyscss@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyscss>=1.3.4:textproc/py-pyscss@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-ceilometerclient>=2.5.0:net/py-python-ceilometerclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-heatclient>=1.4.0:net/py-python-heatclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-neutronclient>=5.1.0:net/py-python-neutronclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=2.2.0:databases/py-python-swiftclient@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.1.0:devel/py-yaml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic>=1.0.0:devel/py-XStatic@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Angular>=1.3.7:devel/py-XStatic-Angular@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Bootstrap>=0.11.0.2:devel/py-XStatic-Angular-Bootstrap@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-FileUpload>=12.0.4.0:devel/py-XStatic-Angular-FileUpload@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Gettext>=2.1.0.2:devel/py-XStatic-Angular-Gettext@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-lrdragndrop>=1.0.2.2:devel/py-XStatic-Angular-lrdragndrop@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Schema-Form>=0.8.13.0:devel/py-XStatic-Angular-Schema-Form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Bootstrap-Datepicker>=1.3.1.0:devel/py-XStatic-Bootstrap-Datepicker@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Bootstrap-SCSS>=3:devel/py-XStatic-Bootstrap-SCSS@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-bootswatch>=3.3.5.3:devel/py-XStatic-bootswatch@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-D3>=3.1.6.2:devel/py-XStatic-D3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Hogan>=2.0.0.2:devel/py-XStatic-Hogan@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Font-Awesome>=4.3.0:devel/py-XStatic-Font-Awesome@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Jasmine>=2.1.2.0:devel/py-XStatic-Jasmine@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-jQuery>=1.7.2:devel/py-XStatic-jQuery@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-JQuery-Migrate>=1.2.1.1:devel/py-XStatic-JQuery-Migrate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-JQuery.quicksearch>=2.0.3.1:devel/py-XStatic-JQuery.quicksearch@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-JQuery.TableSorter>=2.14.5.1:devel/py-XStatic-JQuery.TableSorter@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-jquery-ui>=1.10.1:devel/py-XStatic-jquery-ui@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-JSEncrypt>=2.0.0.2:devel/py-XStatic-JSEncrypt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-mdi>=1.4.57.0:devel/py-XStatic-mdi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-objectpath>=1.2.1.0:devel/py-XStatic-objectpath@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Rickshaw>=1.5.0:devel/py-XStatic-Rickshaw@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-roboto-fontface>=0.4.3.2:devel/py-XStatic-roboto-fontface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-smart-table>=0:devel/py-XStatic-smart-table@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-Spin>=1.2.5.2:devel/py-XStatic-Spin@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-term.js>=0.0.4:devel/py-XStatic-term.js@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}XStatic-tv4>=1.2.7.0:devel/py-XStatic-tv4@${PY_FLAVOR}
EXTRA_PATCHES= ${FILESDIR}/01-django.patch:-p1 \
${FILESDIR}/02-fix-floating-ips.patch:-p1
diff --git a/www/py-html5-parser/Makefile b/www/py-html5-parser/Makefile
index bfba2d16bdff..92082189ec74 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.8.0:devel/py-lxml@${PY_FLAVOR}
USES= pkgconfig python
USE_PYTHON= autoplist distutils
diff --git a/www/py-html5lib/Makefile b/www/py-html5lib/Makefile
index 2635a5ea1381..6e2aeb974c56 100644
--- a/www/py-html5lib/Makefile
+++ b/www/py-html5lib/Makefile
@@ -13,8 +13,8 @@ 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}webencodings>0:converters/py-webencodings@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webencodings>0:converters/py-webencodings@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-httmock/Makefile b/www/py-httmock/Makefile
index a0d49f334fa2..79795f97873b 100644
--- a/www/py-httmock/Makefile
+++ b/www/py-httmock/Makefile
@@ -17,7 +17,7 @@ COMMENT= Mocking library for requests
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-httpie/Makefile b/www/py-httpie/Makefile
index df137c1b54b7..08af99b0a20e 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.11.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= jakubroztocil
diff --git a/www/py-hyper/Makefile b/www/py-hyper/Makefile
index 2370b3e687ae..da114de11c12 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-hyperlink/Makefile b/www/py-hyperlink/Makefile
index 3c9d2a9737da..82d9deda5896 100644
--- a/www/py-hyperlink/Makefile
+++ b/www/py-hyperlink/Makefile
@@ -13,7 +13,7 @@ COMMENT= Featureful, correct URL for Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-imdbpy/Makefile b/www/py-imdbpy/Makefile
index f55915994275..0d230172df99 100644
--- a/www/py-imdbpy/Makefile
+++ b/www/py-imdbpy/Makefile
@@ -14,7 +14,7 @@ COMMENT= Retrieve and manage the data of the IMDb movie database
LICENSE= GPLv2+
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
OPTIONS_RADIO= SQLALCHEMY
@@ -28,8 +28,8 @@ USE_PYTHON= autoplist concurrent distutils
SHEBANG_FILES= docs/goodies/download_applydiffs.py \
docs/goodies/reduce.sh
-SQLALCHEMY11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>=0:databases/py-sqlalchemy11@${FLAVOR}
-SQLALCHEMY12_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0:databases/py-sqlalchemy12@${FLAVOR}
+SQLALCHEMY11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>=0:databases/py-sqlalchemy11@${PY_FLAVOR}
+SQLALCHEMY12_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0:databases/py-sqlalchemy12@${PY_FLAVOR}
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}/
diff --git a/www/py-internetarchive/Makefile b/www/py-internetarchive/Makefile
index 69947f5641c4..3d88b7b84044 100644
--- a/www/py-internetarchive/Makefile
+++ b/www/py-internetarchive/Makefile
@@ -13,13 +13,13 @@ COMMENT= Python interface to archive.org
LICENSE= AGPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clint>=0.4.0:devel/py-clint@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.0:devel/py-docopt@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}jsonpatch>=0.4:devel/py-jsonpatch@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}schema>=0.4.0:devel/py-schema@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.0.0:devel/py-six@${FLAVOR}
-py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports.csv>0:devel/py-backports.csv@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clint>=0.4.0:devel/py-clint@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.0:devel/py-docopt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jsonpatch>=0.4:devel/py-jsonpatch@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}schema>=0.4.0:devel/py-schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.0.0:devel/py-six@${PY_FLAVOR}
+py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports.csv>0:devel/py-backports.csv@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/www/py-jsonfield/Makefile b/www/py-jsonfield/Makefile
index 3015896cee4e..6fc4d9091d20 100644
--- a/www/py-jsonfield/Makefile
+++ b/www/py-jsonfield/Makefile
@@ -14,7 +14,7 @@ COMMENT= Reusable JSONField model for Django to store validated JSON
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-kallithea/Makefile b/www/py-kallithea/Makefile
index 9797de941acc..1b776c0fa8f6 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@${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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.3.0:security/py-bcrypt@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}waitress>=0.8.8:www/py-waitress@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.0.8:www/py-webob@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}WebTest>=1.4.3:www/py-WebTest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pylons>=1.0:www/py-pylons@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beaker>=1.6.4:www/py-beaker@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:www/py-webhelpers@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.10:databases/py-sqlalchemy10@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>=0.9.0:textproc/py-mako@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=1.5:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:textproc/py-whoosh@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}celery>=2.2.5:devel/py-celery@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:textproc/py-markdown@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urlobject>=2.3.4:www/py-urlobject@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}routes>=1.13:www/py-routes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dulwich>=0.9.9:devel/dulwich@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.3.0:security/py-bcrypt@${PY_FLAVOR} \
mercurial>=2.9:devel/mercurial
USES= python:2.7 shebangfix
@@ -52,6 +52,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@${FLAVOR}
+LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap:net/py-ldap@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/www/py-lesscpy/Makefile b/www/py-lesscpy/Makefile
index 11dcbdc3fe25..9d651125a584 100644
--- a/www/py-lesscpy/Makefile
+++ b/www/py-lesscpy/Makefile
@@ -12,11 +12,11 @@ COMMENT= Python LESS compiler
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-libsass/Makefile b/www/py-libsass/Makefile
index 91aec51ee22c..aaada0bb62d5 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
LIB_DEPENDS= libsass.so:textproc/libsass
USES= localbase python
diff --git a/www/py-livereload/Makefile b/www/py-livereload/Makefile
index 6b62e51078f0..bc1fc9d4b97c 100644
--- a/www/py-livereload/Makefile
+++ b/www/py-livereload/Makefile
@@ -12,8 +12,8 @@ COMMENT= WSGI for web developers to watch changes in realtime
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent autoplist
diff --git a/www/py-mwoauth/Makefile b/www/py-mwoauth/Makefile
index 5b8425f686dc..1161afc6d0e6 100644
--- a/www/py-mwoauth/Makefile
+++ b/www/py-mwoauth/Makefile
@@ -12,11 +12,11 @@ COMMENT= Generic MediaWiki OAuth handshake helper
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyjwt>0:www/py-pyjwt@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>0:www/py-requests-oauthlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyjwt>0:www/py-pyjwt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>0:www/py-requests-oauthlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-nevow/Makefile b/www/py-nevow/Makefile
index c44e53af8c4b..50eca4b1d78d 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
USE_PYTHON= autoplist distutils
USES= gettext python
diff --git a/www/py-notebook/Makefile b/www/py-notebook/Makefile
index 51c5b5340477..e2da85caa75a 100644
--- a/www/py-notebook/Makefile
+++ b/www/py-notebook/Makefile
@@ -12,18 +12,18 @@ COMMENT= Web-based notebook environment for interactive computing
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING.md
-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>=5.2.0:devel/py-jupyter_client@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}jupyter_core>=4.4.0:devel/py-jupyter_core@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}nbconvert>=0:devel/py-nbconvert@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}nbformat>=0:devel/py-nbformat@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyzmq>=17:net/py-pyzmq@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}send2trash>=0:deskutils/py-send2trash@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}terminado>=0.8.1:net/py-terminado@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tornado>=4:www/py-tornado@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2.1:devel/py-traitlets@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jupyter_client>=5.2.0:devel/py-jupyter_client@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jupyter_core>=4.4.0:devel/py-jupyter_core@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nbconvert>=0:devel/py-nbconvert@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nbformat>=0:devel/py-nbformat@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyzmq>=17:net/py-pyzmq@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}send2trash>=0:deskutils/py-send2trash@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}terminado>=0.8.1:net/py-terminado@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tornado>=4:www/py-tornado@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2.1:devel/py-traitlets@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-paste/Makefile b/www/py-paste/Makefile
index 2f104133667f..aad06a2431c3 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-pastedeploy/Makefile b/www/py-pastedeploy/Makefile
index 95d88a0281e1..b9d536f6c643 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.6:www/py-paste@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/www/py-pastescript/Makefile b/www/py-pastescript/Makefile
index 669b7ad6bdc3..56f1fec18636 100644
--- a/www/py-pastescript/Makefile
+++ b/www/py-pastescript/Makefile
@@ -14,12 +14,12 @@ COMMENT= Pluggable command-line frontend
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/docs/license.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=0:devel/py-cheetah@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}flup6>=0:www/py-flup6@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Paste>=1.3:www/py-paste@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=0:www/py-pastedeploy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}wsgiutils>=0:devel/py-wsgiutils@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=0:devel/py-cheetah@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}flup6>=0:www/py-flup6@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Paste>=1.3:www/py-paste@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=0:www/py-pastedeploy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wsgiutils>=0:devel/py-wsgiutils@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/www/py-pelican/Makefile b/www/py-pelican/Makefile
index 94dc33b710bb..e45855f33230 100644
--- a/www/py-pelican/Makefile
+++ b/www/py-pelican/Makefile
@@ -12,15 +12,15 @@ COMMENT= Static site generator written in Python
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}feedgenerator>=1.6:www/py-feedgenerator@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}unidecode>0:converters/py-unidecode@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
NO_ARCH= yes
USES= python shebangfix
@@ -35,10 +35,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@${FLAVOR}
+MARKDOWN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR}
SYNTAX_DESC= Syntax Highlighting (via pygments)
-SYNTAX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.4:textproc/py-pygments@${FLAVOR}
+SYNTAX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.4:textproc/py-pygments@${PY_FLAVOR}
do-test:
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
diff --git a/www/py-planet/Makefile b/www/py-planet/Makefile
index 1023ca74f676..9314fadf6942 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests-futures>=0:www/py-requests-futures@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-futures>=0:www/py-requests-futures@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-plone.app.blob/Makefile b/www/py-plone.app.blob/Makefile
index ccae3c13f91a..ee062f7a4b51 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@${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}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=3.8.1:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.proxy>=3.4:net/py-zope.proxy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}archetypes.schemaextender>=1.6:devel/py-archetypes.schemaextender@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.imaging>1.0:www/py-plone.app.imaging@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.scale>=0:www/py-plone.scale@${PY_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 591b9f41b80f..26d0625ec1d5 100644
--- a/www/py-plone.app.caching/Makefile
+++ b/www/py-plone.app.caching/Makefile
@@ -12,26 +12,26 @@ COMMENT= Plone UI and default rules for plone.caching/z3c.caching
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.caching>=0:www/py-plone.caching@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.cachepurging>=0:www/py-plone.cachepurging@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.0:www/py-plone.app.registry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserresource>0:devel/py-zope.browserresource@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.registry>=1.0:www/py-plone.registry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.zcmlhook>=0:devel/py-z3c.zcmlhook@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.app.collection/Makefile b/www/py-plone.app.collection/Makefile
index fac4e9718064..ddc1642bae41 100644
--- a/www/py-plone.app.collection/Makefile
+++ b/www/py-plone.app.collection/Makefile
@@ -12,24 +12,24 @@ COMMENT= Tools for constructing navigation and site sections
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>=1.0.2:devel/py-archetypes.querywidget@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlet.collection>0:www/py-plone.portlet.collection@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.app.content/Makefile b/www/py-plone.app.content/Makefile
index 8eed43fe3396..629fd558febb 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.2.0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${PY_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 701bbebefbc4..016357485dd1 100644
--- a/www/py-plone.app.contentlisting/Makefile
+++ b/www/py-plone.app.contentlisting/Makefile
@@ -13,7 +13,7 @@ COMMENT= Listing of content for the Plone CMS
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-plone.app.contentmenu/Makefile b/www/py-plone.app.contentmenu/Makefile
index bfed3bc6e760..d4aba4b7a4bd 100644
--- a/www/py-plone.app.contentmenu/Makefile
+++ b/www/py-plone.app.contentmenu/Makefile
@@ -12,20 +12,20 @@ COMMENT= Plone's content menu implementation
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.content>=2.0:www/py-plone.app.content@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:devel/py-zope.browsermenu@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.app.contentrules/Makefile b/www/py-plone.app.contentrules/Makefile
index c930363ecc8b..a16e93007346 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.contentrules>=0:www/py-plone.contentrules@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.stringinterp>=0:www/py-plone.stringinterp@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.11.0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_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 48ef0b9f6d55..5b991b0f9a2e 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.workflow>=0:www/py-plone.app.workflow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.fieldsets>=0:www/py-plone.fieldsets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.cachedescriptors>=0:devel/py-zope.cachedescriptors@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_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 c31a8c469ea6..979d305ea3c9 100644
--- a/www/py-plone.app.customerize/Makefile
+++ b/www/py-plone.app.customerize/Makefile
@@ -12,15 +12,15 @@ COMMENT= Integrate five.customerize into Plone
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.browserlayer>=0:www/py-plone.browserlayer@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.app.dexterity/Makefile b/www/py-plone.app.dexterity/Makefile
index daded9c431e7..08177f331125 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.z3cform.datetimewidget>0:devel/py-collective.z3cform.datetimewidget@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.textfield>0:www/py-plone.app.textfield@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.behavior>0:www/py-plone.behavior@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.dexterity>0:www/py-plone.dexterity@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.formwidget.namedfile>0:www/py-plone.formwidget.namedfile@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.schemaeditor>0:www/py-plone.schemaeditor@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.content>0:www/py-plone.app.content@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.uuid>0:www/py-plone.app.uuid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>0:www/py-plone.app.z3cform@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.contentrules>0:www/py-plone.contentrules@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>0:www/py-plone.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.supermodel>0:www/py-plone.supermodel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form@${PY_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 35f99bdd44f5..ed78fa93ae0f 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.monkeypatcher>=0:devel/py-collective.monkeypatcher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=0:www/py-plone.app.registry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.uuid>=0:www/py-plone.app.uuid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0:www/py-plone.z3cform@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>=2.3.3:devel/py-z3c.form@${PY_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 8f2670180dab..3d75cf5b5a49 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.folder>0:www/py-plone.folder@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout@${PY_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 17d783805ae3..edee81128742 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0:devel/py-zope.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.app.imaging/Makefile b/www/py-plone.app.imaging/Makefile
index a3f791a894cc..6d34238402c2 100644
--- a/www/py-plone.app.imaging/Makefile
+++ b/www/py-plone.app.imaging/Makefile
@@ -12,9 +12,9 @@ COMMENT= User-configurable, blob-aware image scaling for Plone
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.scale>0:www/py-plone.scale@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.caching>0:devel/py-z3c.caching@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}five.globalrequest>0:devel/py-five.globalrequest@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-plone.app.iterate/Makefile b/www/py-plone.app.iterate/Makefile
index d2fcfc80861d..aa1e0cb62bbe 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFPlacefulWorkflow>=0:devel/py-Products.CMFPlacefulWorkflow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_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 bce6e8fe6140..247bc5684ad8 100644
--- a/www/py-plone.app.jquery/Makefile
+++ b/www/py-plone.app.jquery/Makefile
@@ -12,8 +12,8 @@ COMMENT= jQuery integration for Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.app.jquerytools/Makefile b/www/py-plone.app.jquerytools/Makefile
index 9e2b89fc5422..7602f4472cfe 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_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 54feb84dd095..6a23dfd0f17c 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.viewletmanager>=1.2:www/py-plone.app.viewletmanager@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.content>0:www/py-plone.app.content@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.registry>0:www/py-plone.registry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=1.2.2:devel/py-Products.CMFEditions@${PY_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 6ca86ed70e82..555ec0bcc2c8 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PloneLDAP>=1.0:www/py-Products.PloneLDAP@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${PY_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 483503d72d99..db4bf6ebe28a 100644
--- a/www/py-plone.app.linkintegrity/Makefile
+++ b/www/py-plone.app.linkintegrity/Makefile
@@ -12,7 +12,7 @@ COMMENT= Manage link integrity in Plone
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-plone.app.portlets/Makefile b/www/py-plone.app.portlets/Makefile
index 60dd3e720c9f..e88307fca49f 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>=1.1:www/py-plone.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.i18n>=0:www/py-plone.app.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=1.2:www/py-plone.app.layout@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_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 a4395d488cc2..2f5db354b24a 100644
--- a/www/py-plone.app.querystring/Makefile
+++ b/www/py-plone.app.querystring/Makefile
@@ -12,22 +12,22 @@ COMMENT= Tools to parse stored queries to actual results
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.1:www/py-plone.app.registry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.registry>0:www/py-plone.registry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:devel/py-zope.dottedname@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>0:devel/py-zope.globalrequest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.app.redirector/Makefile b/www/py-plone.app.redirector/Makefile
index 3168f4fecae4..1907c13452d6 100644
--- a/www/py-plone.app.redirector/Makefile
+++ b/www/py-plone.app.redirector/Makefile
@@ -12,7 +12,7 @@ COMMENT= Redirection tool
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.app.registry/Makefile b/www/py-plone.app.registry/Makefile
index 324774b68e11..c3e630817501 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.registry>=1.0:www/py-plone.registry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.supermodel>=1.1:www/py-plone.supermodel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.autoform>=1.0:www/py-plone.autoform@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${PY_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 bbbfd69574e6..7a7c9036ce4c 100644
--- a/www/py-plone.app.search/Makefile
+++ b/www/py-plone.app.search/Makefile
@@ -12,7 +12,7 @@ COMMENT= Search user interface for Plone CMS
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-plone.app.testing/Makefile b/www/py-plone.app.testing/Makefile
index db0f7cc4653d..506bfe1a4e52 100644
--- a/www/py-plone.app.testing/Makefile
+++ b/www/py-plone.app.testing/Makefile
@@ -12,15 +12,15 @@ COMMENT= Testing tools for Plone-the-application, based on plone.testing
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.testing>=0:www/py-plone.testing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip zope
diff --git a/www/py-plone.app.textfield/Makefile b/www/py-plone.app.textfield/Makefile
index d8de5c2cb583..0ae1ef0902e1 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=3.8.1:databases/zodb3@${PY_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 3dba49f508bc..a815e137dec3 100644
--- a/www/py-plone.app.theming/Makefile
+++ b/www/py-plone.app.theming/Makefile
@@ -13,18 +13,18 @@ COMMENT= Integrates the Diazo theming engine with Plone
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}diazo>=0:devel/py-diazo@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}roman>0:math/py-roman@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.4:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.0:www/py-plone.app.registry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.subrequest>=0:www/py-plone.subrequest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.transformchain>=0:www/py-plone.transformchain@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.resource>=1.0,1:www/py-plone.resource@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.resourceeditor>0:www/py-plone.resourceeditor@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:devel/py-repoze.xmliter@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-plone.app.upgrade/Makefile b/www/py-plone.app.upgrade/Makefile
index 79fd3ff2c225..2176c0cc2db6 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}borg.localrole>=0:security/py-borg.localrole@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.contentmigration>=0:devel/py-Products.contentmigration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>=0:devel/py-Products.ResourceRegistries@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.SecureMailHost>=0:mail/py-Products.SecureMailHost@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>=2.13.4:devel/py-Products.ZCatalog@${PY_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 227b5877dc69..850a1f29de90 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.controlpanel>=2.1:www/py-plone.app.controlpanel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>0:security/py-Products.PlonePAS@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_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 3ae3d0f0acd3..43fb6d9bb2c5 100644
--- a/www/py-plone.app.uuid/Makefile
+++ b/www/py-plone.app.uuid/Makefile
@@ -12,10 +12,10 @@ COMMENT= Plone integration for the basic plone.uuid package
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-plone.app.viewletmanager/Makefile b/www/py-plone.app.viewletmanager/Makefile
index 060032ae7fc8..69727f69fd2c 100644
--- a/www/py-plone.app.viewletmanager/Makefile
+++ b/www/py-plone.app.viewletmanager/Makefile
@@ -12,15 +12,15 @@ COMMENT= Configurable viewlet manager
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>0:www/py-plone.app.vocabularies@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.app.vocabularies/Makefile b/www/py-plone.app.vocabularies/Makefile
index c5e10270c820..642dae5a2b95 100644
--- a/www/py-plone.app.vocabularies/Makefile
+++ b/www/py-plone.app.vocabularies/Makefile
@@ -12,17 +12,17 @@ COMMENT= Collection of generally useful vocabularies
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>0:devel/py-zope.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.app.workflow/Makefile b/www/py-plone.app.workflow/Makefile
index aa2fd61b1fe8..b2e2f944402d 100644
--- a/www/py-plone.app.workflow/Makefile
+++ b/www/py-plone.app.workflow/Makefile
@@ -12,23 +12,23 @@ COMMENT= Workflow and security settings for Plone
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:devel/py-zope.dottedname@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>0:devel/py-Products.DCWorkflow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>0:devel/py-Products.statusmessages@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip zope
diff --git a/www/py-plone.app.z3cform/Makefile b/www/py-plone.app.z3cform/Makefile
index 3ab95453ea5c..35a75ce47c51 100644
--- a/www/py-plone.app.z3cform/Makefile
+++ b/www/py-plone.app.z3cform/Makefile
@@ -12,15 +12,15 @@ 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.z3cform.datetimewidget>=0.1:devel/py-collective.z3cform.datetimewidget@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0.5.11:www/py-plone.z3cform@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.protect>0:security/py-plone.protect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.formwidget.query>0:devel/py-z3c.formwidget.query@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip zope
diff --git a/www/py-plone.autoform/Makefile b/www/py-plone.autoform/Makefile
index 959670582126..8c13c9a10504 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.supermodel>=1.1:www/py-plone.supermodel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0:www/py-plone.z3cform@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.behavior/Makefile b/www/py-plone.behavior/Makefile
index fc817d73d4b3..a7c0b60b0e34 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>0:devel/py-zope.configuration@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.browserlayer/Makefile b/www/py-plone.browserlayer/Makefile
index 48dc012c6799..e7f5add00b57 100644
--- a/www/py-plone.browserlayer/Makefile
+++ b/www/py-plone.browserlayer/Makefile
@@ -12,11 +12,11 @@ COMMENT= Browser layer management for Zope 2 applications
LICENSE= GPLv2
-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} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4:devel/py-Products.GenericSetup@${PY_FLAVOR} \
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.cachepurging/Makefile b/www/py-plone.cachepurging/Makefile
index b8cff5f11c79..4c8d60093d46 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.caching>0:devel/py-z3c.caching@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.caching/Makefile b/www/py-plone.caching/Makefile
index e054ec0dd509..acad6f52b489 100644
--- a/www/py-plone.caching/Makefile
+++ b/www/py-plone.caching/Makefile
@@ -12,14 +12,14 @@ COMMENT= Zope 2 integration for z3c.caching
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}z3c.caching>=0:devel/py-z3c.caching@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.transformchain>=0:www/py-plone.transformchain@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-plone.contentrules/Makefile b/www/py-plone.contentrules/Makefile
index 4caabbe51c56..2308cf4bf5c4 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@${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}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.dexterity/Makefile b/www/py-plone.dexterity/Makefile
index 822d9f91b816..7ecc8f2b1767 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.alterego>0:www/py-plone.alterego@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.behavior>0:www/py-plone.behavior@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.folder>0:www/py-plone.folder@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.supermodel>0:www/py-plone.supermodel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.synchronize>0:www/py-plone.synchronize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.uuid>0:www/py-plone.uuid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>0:devel/py-Products.CMFDefault@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>0:devel/py-Products.CMFDynamicViewFTI@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>0:devel/py-Products.statusmessages@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browser>0:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:devel/py-zope.dottedname@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>0:devel/py-zope.filerepresentation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.size>0:devel/py-zope.size@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.fieldsets/Makefile b/www/py-plone.fieldsets/Makefile
index 9b363e4a4f19..89f9bc1f8205 100644
--- a/www/py-plone.fieldsets/Makefile
+++ b/www/py-plone.fieldsets/Makefile
@@ -12,11 +12,11 @@ COMMENT= Allows to group fields into different fieldsets
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.folder/Makefile b/www/py-plone.folder/Makefile
index 169a7f5e40a9..ac8a24b09f8d 100644
--- a/www/py-plone.folder/Makefile
+++ b/www/py-plone.folder/Makefile
@@ -12,14 +12,14 @@ COMMENT= BTree-based folder implementation with order support
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.BTreeFolder2>0:devel/py-Products.BTreeFolder2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>0:devel/py-Products.ZCatalog@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>0:devel/py-zope.container@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.formwidget.namedfile/Makefile b/www/py-plone.formwidget.namedfile/Makefile
index 33c1accdd0e4..ec97a3eff9be 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.i18n/Makefile b/www/py-plone.i18n/Makefile
index 992b628f1ac3..06c25387b326 100644
--- a/www/py-plone.i18n/Makefile
+++ b/www/py-plone.i18n/Makefile
@@ -12,11 +12,11 @@ COMMENT= Advanced i18n/l10n features
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.indexer/Makefile b/www/py-plone.indexer/Makefile
index 6773217be7f0..c689c6312fc7 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>0:devel/py-Products.ZCatalog@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.locking/Makefile b/www/py-plone.locking/Makefile
index 8195474fd9af..60229c672ebf 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.memoize/Makefile b/www/py-plone.memoize/Makefile
index ce3111c978a5..359cd63d0b39 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.namedfile/Makefile b/www/py-plone.namedfile/Makefile
index 3c3f51337e64..d3c9ee7754cf 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.copy>0:devel/py-zope.copy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.file>0:devel/py-zope.app.file@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.outputfilters/Makefile b/www/py-plone.outputfilters/Makefile
index 2bfdfb403d87..f5fc9992a39d 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${PY_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 591d7394705f..3a89409f2a4d 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${PY_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 660832e243c0..dcb5b64d9809 100644
--- a/www/py-plone.portlet.static/Makefile
+++ b/www/py-plone.portlet.static/Makefile
@@ -12,15 +12,15 @@ COMMENT= Simple static HTML portlet for Plone
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-plone.portlets/Makefile b/www/py-plone.portlets/Makefile
index 1119cbbd09e1..744ee91af3e5 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@${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}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.registry/Makefile b/www/py-plone.registry/Makefile
index 112aa4bf9b12..a01ce0178966 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@${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}
+RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.resource/Makefile b/www/py-plone.resource/Makefile
index 85afb47f4c89..52576e15e83c 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.caching>=0:devel/py-z3c.caching@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.caching>=0:www/py-plone.caching@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.resourceeditor/Makefile b/www/py-plone.resourceeditor/Makefile
index 5b751b28738f..c7cb9b689052 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.resource>0:www/py-plone.resource@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-plone.rfc822/Makefile b/www/py-plone.rfc822/Makefile
index 8158684d5c49..365f5b705129 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.scale/Makefile b/www/py-plone.scale/Makefile
index 001f7f02505c..063b66a8fcf3 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.schemaeditor/Makefile b/www/py-plone.schemaeditor/Makefile
index 15cb8677ff7f..3d9ccff9410f 100644
--- a/www/py-plone.schemaeditor/Makefile
+++ b/www/py-plone.schemaeditor/Makefile
@@ -12,15 +12,15 @@ COMMENT= Provides through-the-web editing of a zope schema/interface
LICENSE= BSD3CLAUSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.stringinterp/Makefile b/www/py-plone.stringinterp/Makefile
index 5f8d5ae0020c..a4a557607bf1 100644
--- a/www/py-plone.stringinterp/Makefile
+++ b/www/py-plone.stringinterp/Makefile
@@ -12,8 +12,8 @@ COMMENT= Adaptable string interpolation
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-plone.subrequest/Makefile b/www/py-plone.subrequest/Makefile
index 8dc4e9da363d..983e7b28fd49 100644
--- a/www/py-plone.subrequest/Makefile
+++ b/www/py-plone.subrequest/Makefile
@@ -12,8 +12,8 @@ COMMENT= Subrequests for Zope2
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:devel/py-zope.globalrequest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:devel/py-zope.globalrequest@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.supermodel/Makefile b/www/py-plone.supermodel/Makefile
index 84fdd90f90f7..4a6242d73a45 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.zcmlhook>=0:devel/py-z3c.zcmlhook@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.testing/Makefile b/www/py-plone.testing/Makefile
index 877ed82284ee..e1c02ba82419 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-plone.theme/Makefile b/www/py-plone.theme/Makefile
index f72cbaee08ab..b974cb3f3ff0 100644
--- a/www/py-plone.theme/Makefile
+++ b/www/py-plone.theme/Makefile
@@ -12,11 +12,11 @@ COMMENT= Tools for managing themes in CMF and Plone sites
LICENSE= GPLv2
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-plone.transformchain/Makefile b/www/py-plone.transformchain/Makefile
index 4c00d2a96a7b..3db61e01adf8 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zope
diff --git a/www/py-plone.uuid/Makefile b/www/py-plone.uuid/Makefile
index 4be645962650..a41ef95f6447 100644
--- a/www/py-plone.uuid/Makefile
+++ b/www/py-plone.uuid/Makefile
@@ -13,10 +13,10 @@ COMMENT= UUIDs for content items
LICENSE= BSD3CLAUSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip
diff --git a/www/py-plone.z3cform/Makefile b/www/py-plone.z3cform/Makefile
index d9eb24eb8ee4..bc4fb2f857a2 100644
--- a/www/py-plone.z3cform/Makefile
+++ b/www/py-plone.z3cform/Makefile
@@ -12,11 +12,11 @@ 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=3.4:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7 zip zope
diff --git a/www/py-praw/Makefile b/www/py-praw/Makefile
index a0250878c493..784e242381b2 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.9:devel/py-decorator@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}update_checker>=0.11:devel/py-update_checker@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR}
# TEST_DEPENDS to be ported
# betamax >=0.5.1
diff --git a/www/py-puppetboard/Makefile b/www/py-puppetboard/Makefile
index 3f5104f11704..41f1ede8f1af 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.9.4:www/py-flask-wtf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pypuppetdb>=0.1.1:databases/py-pypuppetdb@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.2.1:www/py-requests@${PY_FLAVOR}
CONFLICTS_INSTALL=puppetboard02-* puppetboard03-*
USE_GITHUB= yes
diff --git a/www/py-puppetboard02/Makefile b/www/py-puppetboard02/Makefile
index 6237f883836f..b43c6708bf02 100644
--- a/www/py-puppetboard02/Makefile
+++ b/www/py-puppetboard02/Makefile
@@ -15,11 +15,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
DEPRECATED= Consider switching to www/py-puppetboard03
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.9.4:www/py-flask-wtf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pypuppetdb03>=0.2.0:databases/py-pypuppetdb03@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.2.1:www/py-requests@${PY_FLAVOR}
CONFLICTS_INSTALL=puppetboard-* puppetboard03-*
USE_GITHUB= yes
diff --git a/www/py-puppetboard03/Makefile b/www/py-puppetboard03/Makefile
index dbabf8a8481f..664082522903 100644
--- a/www/py-puppetboard03/Makefile
+++ b/www/py-puppetboard03/Makefile
@@ -13,13 +13,13 @@ COMMENT= Web interface to PuppetDB
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}CommonMark>=0.7.2:textproc/py-CommonMark@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Flask>=0.12:www/py-flask@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.14.2:www/py-flask-wtf@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pypuppetdb03>=0.3.3:databases/py-pypuppetdb03@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.13.0:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}CommonMark>=0.7.2:textproc/py-CommonMark@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask>=0.12:www/py-flask@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.14.2:www/py-flask-wtf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pypuppetdb03>=0.3.3:databases/py-pypuppetdb03@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.13.0:www/py-requests@${PY_FLAVOR}
CONFLICTS_INSTALL=puppetboard-* puppetboard02-*
USE_GITHUB= yes
diff --git a/www/py-py-restclient/Makefile b/www/py-py-restclient/Makefile
index 0f0ee98b89be..3a318b27d2b1 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= ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-pyjwt/Makefile b/www/py-pyjwt/Makefile
index dbcc8bc9860d..47511ca8cca8 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_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@${FLAVOR}
+RSASSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/www/py-pylons/Makefile b/www/py-pylons/Makefile
index 7f0c5f1a3e43..c63cb8d97571 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}MarkupSafe>=0.15:textproc/py-MarkupSafe@${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}Tempita>=0.5.1:textproc/py-Tempita@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}WebError>=0.10.3:www/py-WebError@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}WebTest>=1.3.1:www/py-WebTest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}beaker>=1.5.4:www/py-beaker@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}decorator>=3.3.2:devel/py-decorator@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mako>=0.5.0:textproc/py-mako@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}routes>=1.12.3:www/py-routes@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.1:devel/py-simplejson@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:www/py-webhelpers@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}webob>=1.1.1:www/py-webob@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.2.1:devel/py-Jinja2@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.15:textproc/py-MarkupSafe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.5.1:www/py-paste@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.7.4.2:www/py-pastescript@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Tempita>=0.5.1:textproc/py-Tempita@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}WebError>=0.10.3:www/py-WebError@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}WebTest>=1.3.1:www/py-WebTest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beaker>=1.5.4:www/py-beaker@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>=3.3.2:devel/py-decorator@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>=0.5.0:textproc/py-mako@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}routes>=1.12.3:www/py-routes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.1:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:www/py-webhelpers@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.1.1:www/py-webob@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.2.1:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
NO_ARCH= yes
USES= python:2.7
diff --git a/www/py-pyocclient/Makefile b/www/py-pyocclient/Makefile
index 4ebe01332d1d..d083514aae1c 100644
--- a/www/py-pyocclient/Makefile
+++ b/www/py-pyocclient/Makefile
@@ -12,8 +12,8 @@ COMMENT= Python Owncloud client library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-pyquery/Makefile b/www/py-pyquery/Makefile
index 018b13eb827e..d85bdff8d571 100644
--- a/www/py-pyquery/Makefile
+++ b/www/py-pyquery/Makefile
@@ -13,12 +13,12 @@ COMMENT= Jquery-like library for python
LICENSE= BSD3CLAUSE
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:www/py-cssselect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:www/py-cssselect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob@${PY_FLAVOR}
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
@@ -28,7 +28,7 @@ USES= python:2.7 zip
USE_PYTHON= autoplist distutils
NO_ARCH= yes
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${FLAVOR}
+DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
post-install-DOCS-on:
diff --git a/www/py-pyramid/Makefile b/www/py-pyramid/Makefile
index 6cd527032119..69f3030793b6 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0.4:devel/py-repoze.lru@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}translationstring>=0.4:textproc/py-translationstring@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}venusian>=1.0,1:devel/py-venusian@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.3.1:www/py-webob@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=3.5.0:devel/py-zope.deprecation@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.8.0:devel/py-zope.interface@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}WebTest>=1.1:www/py-WebTest@${FLAVOR} \
-# ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.0:devel/py-zope.component@${FLAVOR}
+#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}WebTest>=1.1:www/py-WebTest@${PY_FLAVOR} \
+# ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.0:devel/py-zope.component@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-pyramid_rpc/Makefile b/www/py-pyramid_rpc/Makefile
index 48a57fa47300..37ec98067add 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@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyramid>=0:www/py-pyramid@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python
diff --git a/www/py-python-digitalocean/Makefile b/www/py-python-digitalocean/Makefile
index 374c104cebd2..ca02f0f579ec 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-python-dotenv/Makefile b/www/py-python-dotenv/Makefile
index 378f51fd0c49..37f06cadeb9d 100644
--- a/www/py-python-dotenv/Makefile
+++ b/www/py-python-dotenv/Makefile
@@ -13,7 +13,7 @@ COMMENT= Add .env support to your django/flask apps
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-pywikibot/Makefile b/www/py-pywikibot/Makefile
index 8f86c8938f68..baee64d73c23 100644
--- a/www/py-pywikibot/Makefile
+++ b/www/py-pywikibot/Makefile
@@ -12,7 +12,7 @@ COMMENT= Wikipedia bot for Python
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
USES= dos2unix python
USE_PYTHON= autoplist distutils
@@ -30,20 +30,20 @@ PILLOW_DESC= Support for image processing via pillow module
MWOAUTH_DESC= Support for MediaWiki OAuth handshake helper
HTML_DESC= Support for HTML/XML Parser for Python
-EVENTSTREAMS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sseclient>0:www/py-sseclient@${FLAVOR}
-ISBN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${FLAVOR}
-PYDOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pydot>0:graphics/py-pydot@${FLAVOR}
-GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google>0:www/py-google@${FLAVOR}
-IRC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}irc>0:irc/py-irc@${FLAVOR}
-MWPARSE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwparserfromhell>0:textproc/py-mwparserfromhell@${FLAVOR}
-PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR}
-MWOAUTH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwoauth>0:www/py-mwoauth@${FLAVOR}
-HTML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${FLAVOR}
+EVENTSTREAMS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sseclient>0:www/py-sseclient@${PY_FLAVOR}
+ISBN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR}
+PYDOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pydot>0:graphics/py-pydot@${PY_FLAVOR}
+GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google>0:www/py-google@${PY_FLAVOR}
+IRC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}irc>0:irc/py-irc@${PY_FLAVOR}
+MWPARSE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwparserfromhell>0:textproc/py-mwparserfromhell@${PY_FLAVOR}
+PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
+MWOAUTH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwoauth>0:www/py-mwoauth@${PY_FLAVOR}
+HTML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR}
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3000
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/www/py-qp/Makefile b/www/py-qp/Makefile
index 8029400ab6ab..bc6c7ec7b760 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}qpy>=1.7:www/py-qpy@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}durus>=0:devel/py-durus@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}qpy>=1.7:www/py-qpy@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/www/py-qt5-webkit/Makefile b/www/py-qt5-webkit/Makefile
index 442a13bdc275..52dd08007525 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gui>=${PYQT5_VERSION}:x11-toolkits/py-qt5-gui@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:devel/py-sip@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gui>=${PYQT5_VERSION}:x11-toolkits/py-qt5-gui@${PY_FLAVOR}
CONFIGURE_ARGS= --enable QtWebKit
PYQT_DIST= yes
diff --git a/www/py-rackspace-monitoring/Makefile b/www/py-rackspace-monitoring/Makefile
index eb4627b8d356..3c07bf762b22 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14:net/py-libcloud@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-requestbuilder/Makefile b/www/py-requestbuilder/Makefile
index 022391fbb1a8..2cd53f2a978d 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.4:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python:-2.7
USE_PYTHON= distutils autoplist
diff --git a/www/py-requests-cache/Makefile b/www/py-requests-cache/Makefile
index 9ac687642a96..f8eff20eb0fa 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.1.0:www/py-requests@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
# Python 2.6-3.5(+) 20171026
USES= python
diff --git a/www/py-requests-file/Makefile b/www/py-requests-file/Makefile
index a224699624c8..16ac2c8aced2 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/www/py-requests-futures/Makefile b/www/py-requests-futures/Makefile
index d000309f1c3b..3270babbb703 100644
--- a/www/py-requests-futures/Makefile
+++ b/www/py-requests-futures/Makefile
@@ -16,7 +16,7 @@ USES= python
USE_PYTHON= autoplist distutils
RUN_DEPENDS= ${PY_FUTURES} \
- ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/www/py-requests-mock/Makefile b/www/py-requests-mock/Makefile
index 116113ae8f94..f04d206d031f 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@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.1:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.1:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-requests-oauthlib/Makefile b/www/py-requests-oauthlib/Makefile
index fa1ad4104eca..49b2d346ad7a 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauthlib>=0.6.2:security/py-oauthlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-requests/Makefile b/www/py-requests/Makefile
index ed4dfc10f444..26e382558152 100644
--- a/www/py-requests/Makefile
+++ b/www/py-requests/Makefile
@@ -13,13 +13,13 @@ 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@${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.0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py-chardet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py-certifi@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR}
# Actually 2.6-2.7,3.3+
USES= python
diff --git a/www/py-requests_ntlm/Makefile b/www/py-requests_ntlm/Makefile
index feb1d0686659..3582e9e10992 100644
--- a/www/py-requests_ntlm/Makefile
+++ b/www/py-requests_ntlm/Makefile
@@ -12,9 +12,9 @@ COMMENT= HTTP NTLM authentication using the requests library
LICENSE= ISCL
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3:security/py-cryptography@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}ntlm-auth>=1.0.2:security/py-ntlm-auth@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3:security/py-cryptography@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ntlm-auth>=1.0.2:security/py-ntlm-auth@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-restclient/Makefile b/www/py-restclient/Makefile
index 685bfef7eee7..6fde02a53da3 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= ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-rhodecode/Makefile b/www/py-rhodecode/Makefile
index 8f6e262afbd5..283c15c7cf96 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@${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@${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}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} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylons>=1.0:www/py-pylons@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}waitress>=0.8.4:www/py-waitress@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.0.8:www/py-webob@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:www/py-webhelpers@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mako>=0.7.3:textproc/py-mako@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.10:databases/py-sqlalchemy10@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=1.5:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:textproc/py-whoosh@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.7:devel/dulwich@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:textproc/py-markdown@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.2:security/py-bcrypt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.5.2:devel/py-simplejson@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0:devel/py-repoze.lru@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}celery>=0:devel/py-celery@${PY_FLAVOR} \
mercurial>=2.6:devel/mercurial
USES= python:2.7
@@ -49,7 +49,7 @@ OPTIONS_DEFAULT= GIT
GIT_DESC= GIT support
-LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.6:net/py-ldap@${FLAVOR}
+LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.6:net/py-ldap@${PY_FLAVOR}
GIT_RUN_DEPENDS= git:devel/git
.include <bsd.port.mk>
diff --git a/www/py-rollbar/Makefile b/www/py-rollbar/Makefile
index 9df99021a792..9da1a3308e4b 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.5.7:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.5.7:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-routes/Makefile b/www/py-routes/Makefile
index 25a912aa96d3..c915d8c65eb8 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0.3:devel/py-repoze.lru@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0.3:devel/py-repoze.lru@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-scrapy/Makefile b/www/py-scrapy/Makefile
index 0be8a2306597..c055ef58ba30 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=15.5.0:devel/py-twisted@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}w3lib>=1.14.2:www/py-w3lib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:www/py-cssselect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}queuelib>=1.2.2:sysutils/py-queuelib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pydispatcher>=2.0.5:devel/py-pydispatcher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}service_identity>0:security/py-service_identity@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}parsel>=1.1:textproc/py-parsel@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils concurrent 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@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR}
.endif
.include <bsd.port.mk>
diff --git a/www/py-selector/Makefile b/www/py-selector/Makefile
index 1b9bde7876a5..af518f2ffe2e 100644
--- a/www/py-selector/Makefile
+++ b/www/py-selector/Makefile
@@ -13,7 +13,7 @@ COMMENT= WSGI request delegation (a.k.a. routing)
LICENSE= GPLv2 MIT
LICENSE_COMB= dual
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}resolver>=0:devel/py-resolver@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}resolver>=0:devel/py-resolver@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-slimit/Makefile b/www/py-slimit/Makefile
index c4c1703797e6..5e300b6da7f8 100644
--- a/www/py-slimit/Makefile
+++ b/www/py-slimit/Makefile
@@ -12,8 +12,8 @@ COMMENT= JavaScript minifier written in Python
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${PY_FLAVOR}
USES= python:2.7 zip
USE_PYTHON= distutils autoplist
@@ -23,7 +23,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} >= 3000
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
pre-build:
@cd ${WRKSRC} && 2to3-${PYTHON_VER} -w src
.endif
diff --git a/www/py-slumber/Makefile b/www/py-slumber/Makefile
index 4415937cc194..fec6ec622745 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@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
OPTIONS_DEFINE= YAML
YAML_DESC= YAML serializer support
-YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
+YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
diff --git a/www/py-sockjs-tornado/Makefile b/www/py-sockjs-tornado/Makefile
index 4c975be7958b..151856723303 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-splinter/Makefile b/www/py-splinter/Makefile
index 0cb7be244f0b..85c1da45af70 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}selenium>=2.47:www/py-selenium@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.4:devel/py-zope.testbrowser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/www/py-spyne/Makefile b/www/py-spyne/Makefile
index e79b8c714daa..e9ea18a96130 100644
--- a/www/py-spyne/Makefile
+++ b/www/py-spyne/Makefile
@@ -13,7 +13,7 @@ COMMENT= Transport and architecture agnostic RPC library
LICENSE= LGPL21
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR}
NO_ARCH= yes
USE_LOCALE= en_US.UTF-8
diff --git a/www/py-sseclient/Makefile b/www/py-sseclient/Makefile
index 328ecf74556e..1e045df50e36 100644
--- a/www/py-sseclient/Makefile
+++ b/www/py-sseclient/Makefile
@@ -11,8 +11,8 @@ COMMENT= Python client library for reading Server Sent Event streams
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-swapper/Makefile b/www/py-swapper/Makefile
index d87f626ca6f7..ef1179fec6d6 100644
--- a/www/py-swapper/Makefile
+++ b/www/py-swapper/Makefile
@@ -12,7 +12,7 @@ COMMENT= Unofficial Django swappable models API
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.6:www/py-django111@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.6:www/py-django111@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist concurrent distutils
diff --git a/www/py-textile/Makefile b/www/py-textile/Makefile
index 7dccadfc6138..bd88c4e17aaa 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-tornado/Makefile b/www/py-tornado/Makefile
index 8d83685523c2..2f7434755958 100644
--- a/www/py-tornado/Makefile
+++ b/www/py-tornado/Makefile
@@ -20,11 +20,11 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3400
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${PY_FLAVOR}
.endif
.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports_abc>=0.4:devel/py-backports_abc@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports_abc>=0.4:devel/py-backports_abc@${PY_FLAVOR}
.endif
post-build:
diff --git a/www/py-tornado4/Makefile b/www/py-tornado4/Makefile
index 98293fd98b7f..421e61cd5a71 100644
--- a/www/py-tornado4/Makefile
+++ b/www/py-tornado4/Makefile
@@ -21,12 +21,12 @@ USE_PYTHON= autoplist distutils
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3400
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR}
.endif
.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports_abc>=0.4:devel/py-backports_abc@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports_abc>=0.4:devel/py-backports_abc@${PY_FLAVOR}
.endif
post-build:
diff --git a/www/py-trello/Makefile b/www/py-trello/Makefile
index dea0b5dd94b8..c9c461a47d54 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.9.1:www/py-requests@${PY_FLAVOR}
USES= python:-2.7 zip
USE_PYTHON= autoplist distutils
diff --git a/www/py-treq/Makefile b/www/py-treq/Makefile
index 8bf6e264aaa3..a24ad2d6a1ec 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}incremental>=0:devel/py-incremental@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=16.4.0:devel/py-twisted@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:www/py-requests@${PY_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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}idna>=2.4:dns/py-idna@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}idna>=2.4:dns/py-idna@${PY_FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-turbogears2/Makefile b/www/py-turbogears2/Makefile
index 43cf8fa75648..6262853e68a8 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}crank>=0:devel/py-crank@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0:textproc/py-MarkupSafe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0:devel/py-repoze.lru@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-tvdb_api/Makefile b/www/py-tvdb_api/Makefile
index cc42ec2c5c9f..695df688472e 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests-cache>0:www/py-requests-cache@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests-cache>0:www/py-requests-cache@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist distutils
diff --git a/www/py-txrequests/Makefile b/www/py-txrequests/Makefile
index 4899e0dfb64d..b91415c12c48 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}twisted>=9.0.0:devel/py-twisted@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=9.0.0:devel/py-twisted@${PY_FLAVOR}
USES= python:-2.7
USE_PYTHON= autoplist distutils
diff --git a/www/py-urlgrabber/Makefile b/www/py-urlgrabber/Makefile
index bd171e1ba920..c51d25fdd019 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.0_1:ftp/py-pycurl@${PY_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 add8c217c413..c3c7fdae2f32 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-w3lib/Makefile b/www/py-w3lib/Makefile
index 41fee508609e..2c42e1d081b6 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-webhelpers/Makefile b/www/py-webhelpers/Makefile
index 69b3be6b3b00..96a34197dbe4 100644
--- a/www/py-webhelpers/Makefile
+++ b/www/py-webhelpers/Makefile
@@ -14,8 +14,8 @@ COMMENT= Python helper functions for writing templates in web applications
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}routes>=1.1:www/py-routes@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.11:textproc/py-MarkupSafe@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}routes>=1.1:www/py-routes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.11:textproc/py-MarkupSafe@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/www/py-webob/Makefile b/www/py-webob/Makefile
index e8907d7707f8..3d0c9c9857a4 100644
--- a/www/py-webob/Makefile
+++ b/www/py-webob/Makefile
@@ -12,12 +12,12 @@ COMMENT= WSGI request and response Python object
LICENSE= MIT
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylons-sphinx-themes>=0:textproc/py-pylons-sphinx-themes@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${FLAVOR}
+DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylons-sphinx-themes>=0:textproc/py-pylons-sphinx-themes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${PY_FLAVOR}
DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
diff --git a/www/py-websocket-client/Makefile b/www/py-websocket-client/Makefile
index c331da330c80..d30cde90b6fe 100644
--- a/www/py-websocket-client/Makefile
+++ b/www/py-websocket-client/Makefile
@@ -17,7 +17,7 @@ COMMENT= Websocket client for python
LICENSE= ISCL
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
@@ -25,7 +25,7 @@ USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/www/py-werkzeug/Makefile b/www/py-werkzeug/Makefile
index 7b1f1ce6c844..e51493ec70ec 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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl@${PY_FLAVOR}
OPTIONS_DEFINE= EXAMPLES WATCHDOG
WATCHDOG_DESC= Monitor filesystem events
-WATCHDOG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}watchdog>=0.8:devel/py-watchdog@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${FLAVOR}
+WATCHDOG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}watchdog>=0.8:devel/py-watchdog@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/www/py-wikipedia/Makefile b/www/py-wikipedia/Makefile
index 275986532558..62a5454ca0ee 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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.7:www/py-requests@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.7:www/py-requests@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/www/py-ws4py/Makefile b/www/py-ws4py/Makefile
index 51ad15a27a07..61af161539d5 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@${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}
+CHERRYPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2.2:www/py-cherrypy@${PY_FLAVOR}
+GEVENT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:devel/py-gevent@${PY_FLAVOR}
+TORNADO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>=3.1:www/py-tornado@${PY_FLAVOR}
# Do not install files which will not work
post-patch-CHERRYPY-off:
diff --git a/www/py-wsgidav/Makefile b/www/py-wsgidav/Makefile
index 59b7cefecbbe..fd5dcb0f9910 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@${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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cov-core>=0:devel/py-cov-core@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR}
NO_ARCH= yes
USES= python zip
diff --git a/www/py-yarl/Makefile b/www/py-yarl/Makefile
index 47f9403c42a2..b4d09294a286 100644
--- a/www/py-yarl/Makefile
+++ b/www/py-yarl/Makefile
@@ -12,10 +12,10 @@ COMMENT= Yet another URL library
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}multidict>=2.0:www/py-multidict@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}multidict>=2.0:www/py-multidict@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
USES= python:3.4+
USE_PYTHON= autoplist distutils cython
diff --git a/www/py-zope.app.wsgi/Makefile b/www/py-zope.app.wsgi/Makefile
index d6d2be293a15..ef17f5f66075 100644
--- a/www/py-zope.app.wsgi/Makefile
+++ b/www/py-zope.app.wsgi/Makefile
@@ -13,26 +13,26 @@ COMMENT= WSGI application for the zope.publisher
LICENSE= ZPL21
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.14:devel/py-zope.app.appsetup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:devel/py-zope.testbrowser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/www/pycarddav/Makefile b/www/pycarddav/Makefile
index 4a56fc2b48a0..e911b616e97f 100644
--- a/www/pycarddav/Makefile
+++ b/www/pycarddav/Makefile
@@ -14,12 +14,12 @@ COMMENT= Simple to use CardDAV CLI client
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vobject>0:deskutils/py-vobject@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}urwid>0:devel/py-urwid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= autoplist distutils
diff --git a/www/radicale/Makefile b/www/radicale/Makefile
index 5f9270e258f3..eaad0d48c0a7 100644
--- a/www/radicale/Makefile
+++ b/www/radicale/Makefile
@@ -14,7 +14,7 @@ COMMENT= Python based CalDAV/CardDAV server
LICENSE= GPLv3
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}passlib>=1.6.5:security/py-passlib@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}passlib>=1.6.5:security/py-passlib@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
@@ -30,8 +30,8 @@ SUB_LIST= PYTHON_CMD="${PYTHON_CMD}" \
OPTIONS_DEFINE= HTTP LDAP
HTTP_DESC= HTTP authentication support
-HTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests1>=0:www/py-requests1@${FLAVOR}
-LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=0:net/py-ldap@${FLAVOR}
+HTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests1>=0:www/py-requests1@${PY_FLAVOR}
+LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=0:net/py-ldap@${PY_FLAVOR}
post-patch:
@${REINPLACE_CMD} 's|~/.config/radicale|${DATADIR}|; s|/etc|${PREFIX}/etc|' ${WRKSRC}/config
diff --git a/www/radicale2/Makefile b/www/radicale2/Makefile
index 7f09b2ec6614..6bf145983304 100644
--- a/www/radicale2/Makefile
+++ b/www/radicale2/Makefile
@@ -13,14 +13,14 @@ COMMENT= Python based CalDAV/CardDAV server
LICENSE= GPLv3
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}passlib>=0:security/py-passlib@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject@${FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}isort>=0:devel/py-isort@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}passlib>=0:security/py-passlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}isort>=0:devel/py-isort@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
CONFLICTS= radicale-1.[0-9]*
diff --git a/www/roundup/Makefile b/www/roundup/Makefile
index 5bfeea6ed84f..59d6fcfd0c96 100644
--- a/www/roundup/Makefile
+++ b/www/roundup/Makefile
@@ -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@${FLAVOR}
-PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
-MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
+MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${PY_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 83db92fa754f..38ad707eae30 100644
--- a/www/rtv/Makefile
+++ b/www/rtv/Makefile
@@ -11,11 +11,11 @@ COMMENT= Commandline client for reddit
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}kitchen>=1.2.4:devel/py-kitchen@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.1:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.10:devel/py-decorator@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist concurrent optsuffix
@@ -28,7 +28,7 @@ NO_ARCH= yes
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 3600
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mailcap_fix>=0.1.3:devel/py-mailcap-fix@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mailcap_fix>=0.1.3:devel/py-mailcap-fix@${PY_FLAVOR}
.endif
.include <bsd.port.post.mk>
diff --git a/www/trac-OhlohWidgetsMacro/Makefile b/www/trac-OhlohWidgetsMacro/Makefile
index 7da5f8a081ad..765040a3be29 100644
--- a/www/trac-OhlohWidgetsMacro/Makefile
+++ b/www/trac-OhlohWidgetsMacro/Makefile
@@ -13,7 +13,7 @@ COMMENT= Trac macro to embed Ohloh widgets
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycerberus>=0.3:devel/py-pycerberus@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycerberus>=0.3:devel/py-pycerberus@${PY_FLAVOR} \
tracd:www/trac
USES= python:2.7
diff --git a/www/trac-TracGoogleAnalytics/Makefile b/www/trac-TracGoogleAnalytics/Makefile
index 096863e1862f..3e7fb173b0a2 100644
--- a/www/trac-TracGoogleAnalytics/Makefile
+++ b/www/trac-TracGoogleAnalytics/Makefile
@@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= tracd:www/trac \
- ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2.7
diff --git a/www/trac-devel/Makefile b/www/trac-devel/Makefile
index 20ada69f9690..a4e9d623bedf 100644
--- a/www/trac-devel/Makefile
+++ b/www/trac-devel/Makefile
@@ -16,12 +16,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING
CONFLICTS_INSTALL= trac
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR}
USES= python:-2.7 shebangfix
SHEBANG_FILES= trac/tests/functional/better_twill.py trac/tests/functional/tester.py \
@@ -45,12 +45,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@${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}
+DOCUTILS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${PY_FLAVOR}
+PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR}
+TZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${PY_FLAVOR}
post-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample-plugins
diff --git a/www/trac-ldapauthstore/Makefile b/www/trac-ldapauthstore/Makefile
index 85e926a6db08..00e32341e60f 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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${PY_FLAVOR}
NO_ARCH= yes
PORTSCOUT= ignore:1
diff --git a/www/trac-ticketimport/Makefile b/www/trac-ticketimport/Makefile
index f12e4b2b6f6c..2666cb73e72b 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@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.1:textproc/py-xlrd@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils autoplist
diff --git a/www/trac/Makefile b/www/trac/Makefile
index a1eb7e295bf1..35de954e1ee1 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -18,10 +18,10 @@ CONFLICTS_INSTALL= trac-devel
PORTSCOUT= limit:^1\.2\.[0-9]*
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${PY_FLAVOR}
USES= python:-2.7 shebangfix
SHEBANG_FILES= trac/tests/functional/better_twill.py trac/tests/functional/tester.py \
@@ -45,12 +45,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@${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}
+DOCUTILS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${PY_FLAVOR}
+PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR}
+TZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
+PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
+SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${PY_FLAVOR}
post-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample-plugins
diff --git a/www/web2ldap/Makefile b/www/web2ldap/Makefile
index 184abffbbd30..d8c0722bacad 100644
--- a/www/web2ldap/Makefile
+++ b/www/web2ldap/Makefile
@@ -12,12 +12,12 @@ COMMENT= Python-based WWW gateway to LDAP servers
LICENSE= APACHE20
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}asn1crypto>=0.22.0:devel/py-asn1crypto@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}ldap0>=0.0.60:net/py-ldap0@${PY_FLAVOR} \
${PYTHON_SITELIBDIR}/pyweblib/__init__.py:www/py-pyweblib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr@${PY_FLAVOR} \
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index a76dc0126b87..803fb2a5a180 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@${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}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=2.13.2:security/py-AccessControl@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MultiMapping>=0:devel/py-MultiMapping@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.OFSP>=2.13.2:devel/py-Products.OFSP@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>=0:devel/py-Products.ZCatalog@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ZCTextIndex>=0:devel/py-Products.ZCTextIndex@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${PY_FLAVOR} \
+ zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}ZopeUndo>=0:devel/py-ZopeUndo@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}initgroups>=0:devel/py-initgroups@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tempstorage>=0:devel/py-tempstorage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zdaemon>=0:sysutils/py-zdaemon@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zLOG>=0:devel/py-zLOG@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:devel/py-zope.ptresource@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.sendmail>=0:mail/py-zope.sendmail@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:devel/py-zope.sequencesort@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.tales>=3.5.0:devel/py-zope.tales@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=0:devel/py-zope.testbrowser@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.BTreeFolder2>=0:devel/py-Products.BTreeFolder2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.ExternalMethod>=0:devel/py-Products.ExternalMethod@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.MailHost>=0:mail/py-Products.MailHost@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.MIMETools>=0:devel/py-Products.MIMETools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.PythonScripts>=0:devel/py-Products.PythonScripts@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Products.StandardCacheManagers>=0:devel/py-Products.StandardCacheManagers@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}manuel>=0:devel/py-manuel@${PY_FLAVOR}
USES= python:-2.7
USE_PYTHON= autoplist distutils
diff --git a/x11-fonts/py-QtAwesome/Makefile b/x11-fonts/py-QtAwesome/Makefile
index 34983458fca0..ea4d9dde1eef 100644
--- a/x11-fonts/py-QtAwesome/Makefile
+++ b/x11-fonts/py-QtAwesome/Makefile
@@ -12,8 +12,8 @@ COMMENT= Iconic fonts in PyQt and PySide applications
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}QtPy>0:devel/py-QtPy@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}QtPy>0:devel/py-QtPy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
USES= python
USE_PYTHON= distutils autoplist
diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index 2e9961628650..ec518774a0e6 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= fmysh@iijmio-mail.jp
COMMENT= High-level compound graphics widgets for Python
LIB_DEPENDS= libBLT25.so:x11-toolkits/blt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
USES= dos2unix python shebangfix
USE_PYTHON= autoplist distutils
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 3df0f32bd18b..b59431346570 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -18,8 +18,8 @@ OPTIONS_DEFINE= EXAMPLES
OPTIONS_SUB= yes
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/ORBit.so:devel/py-orbit@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ORBit.so:devel/py-orbit@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/ORBit.so:devel/py-orbit@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ORBit.so:devel/py-orbit@${PY_FLAVOR}
USES= gettext gmake libtool:keepla pathfix pkgconfig python:2.7 tar:bzip2
USE_LDCONFIG= yes
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 6d684123d30b..10cc47f65d86 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -15,8 +15,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Set of Python bindings for GTK+
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR}
USES= gettext gmake libtool pathfix pkgconfig python:2.7 tar:bzip2
USE_GNOME= libglade2 pygobject
diff --git a/x11-toolkits/py-gtkglext/Makefile b/x11-toolkits/py-gtkglext/Makefile
index 246a3930868d..61c7df330133 100644
--- a/x11-toolkits/py-gtkglext/Makefile
+++ b/x11-toolkits/py-gtkglext/Makefile
@@ -12,9 +12,9 @@ DISTNAME= pygtkglext-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python binding for GtkGLExt
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL@${PY_FLAVOR}
LIB_DEPENDS= libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL@${PY_FLAVOR}
USES= gmake libtool pathfix pkgconfig python:2.7 tar:bzip2
USE_GNOME= pygtk2
diff --git a/x11-toolkits/py-gui/Makefile b/x11-toolkits/py-gui/Makefile
index 781a3c5e8b9a..1c8d8571b604 100644
--- a/x11-toolkits/py-gui/Makefile
+++ b/x11-toolkits/py-gui/Makefile
@@ -12,7 +12,7 @@ DISTNAME= PyGUI-${PORTVERSION}-1
MAINTAINER= python@FreeBSD.org
COMMENT= Cross-platform pythonic GUI API
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS EXAMPLES OPENGL
@@ -24,7 +24,7 @@ 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@${FLAVOR}
+OPENGL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext@${PY_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 1950b37e7809..e370c1367b7f 100644
--- a/x11-toolkits/py-kivy/Makefile
+++ b/x11-toolkits/py-kivy/Makefile
@@ -16,10 +16,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN= fails to build with cython 0.28
BUILD_DEPENDS= git:devel/git \
- ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR}
LIB_DEPENDS= libmtdev.so:devel/libmtdev
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${FLAVOR}
-TEST_DEPENDS= nosetests-${PYTHON_VER}:devel/py-nose@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR}
+TEST_DEPENDS= nosetests-${PYTHON_VER}:devel/py-nose@${PY_FLAVOR}
MAKE_ENV= KIVY_NO_CONFIG=yes KIVY_NO_FILELOG=yes USE_OPENGL_ES2=1 \
PYTHONPATH=${WRKSRC}
@@ -54,21 +54,21 @@ SPELLING_DESC= Spell checking support
TEXT_DESC= Text rendering support (compulsory)
WINDOW_DESC= Window support (compulsory)
-DOCS_BUILD_DEPENDS= sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${FLAVOR}
+DOCS_BUILD_DEPENDS= sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR}
ENCHANT_DESC= Spell checking support via Enchant
-ENCHANT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${FLAVOR}
+ENCHANT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${PY_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@${FLAVOR}
+GSTREAMER_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygst.py:multimedia/py-gstreamer@${PY_FLAVOR}
GSTREAMER_USES= gettext-runtime pkgconfig
GSTREAMER_USE= GNOME=glib20
-OPENCV_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cv2.so:graphics/py-opencv@${FLAVOR}
+OPENCV_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cv2.so:graphics/py-opencv@${PY_FLAVOR}
PIL_DESC= Text and window rendering support via Pillow
-PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR}
+PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
PYGAME_DESC= Window, text and image rendering support via PyGame
-PYGAME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${FLAVOR}
-PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>0:graphics/py-pyglet@${FLAVOR}
+PYGAME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR}
+PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>0:graphics/py-pyglet@${PY_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-tktreectrl/Makefile b/x11-toolkits/py-tktreectrl/Makefile
index 2db6eb4c243e..49658e0e7be8 100644
--- a/x11-toolkits/py-tktreectrl/Makefile
+++ b/x11-toolkits/py-tktreectrl/Makefile
@@ -15,8 +15,8 @@ LICENSE= PD
# x11-toolkits/tktreectrl does not provide libtreectrl.so
LIB_DEPENDS= libtreectrl.so.1:x11-toolkits/tktreectrl
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Pmw>=0:x11-toolkits/py-Pmw@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Pmw>=0:x11-toolkits/py-Pmw@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR}
USES= python tk:run zip
USE_PYTHON= autoplist distutils
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index df38ddd64c58..029b4d68b40d 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -13,7 +13,7 @@ PKGNAMESUFFIX= 28
MAINTAINER= python@FreeBSD.org
COMMENT= Python bindings for the wxWidgets/GTK GUI toolkit
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR}
WRKSRC_SUBDIR= wxPython
@@ -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@${FLAVOR} \
- ${PYTHON_SITELIBDIR}/wxversion.py:x11-toolkits/py-wxPython-common@${FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}wxPython28-common>0:x11-toolkits/py-wxPython28-common@${PY_FLAVOR} \
+ ${PYTHON_SITELIBDIR}/wxversion.py:x11-toolkits/py-wxPython-common@${PY_FLAVOR}
PYDISTUTILS_BUILDARGS+= \
NO_HEADERS=1 \
diff --git a/x11-toolkits/py-wxPython30/Makefile b/x11-toolkits/py-wxPython30/Makefile
index 820c3a17f9e2..5a396b894f1f 100644
--- a/x11-toolkits/py-wxPython30/Makefile
+++ b/x11-toolkits/py-wxPython30/Makefile
@@ -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@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wxPython-common>0:x11-toolkits/py-wxPython-common@${PY_FLAVOR}
USES+= gettext pkgconfig
USE_WX= 3.0
diff --git a/x11-toolkits/py-xlib/Makefile b/x11-toolkits/py-xlib/Makefile
index 70b20ddb3acb..174d1011bb40 100644
--- a/x11-toolkits/py-xlib/Makefile
+++ b/x11-toolkits/py-xlib/Makefile
@@ -12,9 +12,9 @@ COMMENT= X11 library for Python
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
-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}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
USES= python
diff --git a/x11-wm/compizconfig-python/Makefile b/x11-wm/compizconfig-python/Makefile
index a07ebdc8eb69..9c68d88e0d37 100644
--- a/x11-wm/compizconfig-python/Makefile
+++ b/x11-wm/compizconfig-python/Makefile
@@ -13,7 +13,7 @@ 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_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${PY_FLAVOR}
RUN_DEPENDS:= ${BUILD_DEPENDS}
GNU_CONFIGURE= yes
diff --git a/x11-wm/obapps/Makefile b/x11-wm/obapps/Makefile
index cd6509cd86a6..5be74fff412b 100644
--- a/x11-wm/obapps/Makefile
+++ b/x11-wm/obapps/Makefile
@@ -16,7 +16,7 @@ COMMENT= Graphical editor for Openbox application settings
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-xlib@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-xlib@${PY_FLAVOR}
USES= python:2.7
USE_PYTHON= distutils
diff --git a/x11-wm/plwm/Makefile b/x11-wm/plwm/Makefile
index 3f9751950b28..bf420c9479b7 100644
--- a/x11-wm/plwm/Makefile
+++ b/x11-wm/plwm/Makefile
@@ -13,8 +13,8 @@ COMMENT= Window manager construction kit
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib@${FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/x11-wm/qtile/Makefile b/x11-wm/qtile/Makefile
index 61caf22be1ba..923437184beb 100644
--- a/x11-wm/qtile/Makefile
+++ b/x11-wm/qtile/Makefile
@@ -13,8 +13,8 @@ COMMENT= Small, flexible, scriptable tiling window manager written in Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xpyb>0:x11/xpyb@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xpyb>0:x11/xpyb@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR}
USE_GITHUB= yes
GH_ACCOUNT= qtile
diff --git a/x11/arandr/Makefile b/x11/arandr/Makefile
index 7a4e4c1f504a..6ad0c3502ad2 100644
--- a/x11/arandr/Makefile
+++ b/x11/arandr/Makefile
@@ -12,9 +12,9 @@ COMMENT= Another XRandR GUI
LICENSE= GPLv3
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0.6:textproc/py-docutils@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0.6:textproc/py-docutils@${PY_FLAVOR}
RUN_DEPENDS= xrandr>0:x11/xrandr \
- ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2@${PY_FLAVOR}
OPTIONS_DEFINE= DOCS
diff --git a/x11/menulibre/Makefile b/x11/menulibre/Makefile
index e3c06a1a845d..e15736d5da03 100644
--- a/x11/menulibre/Makefile
+++ b/x11/menulibre/Makefile
@@ -11,11 +11,11 @@ COMMENT= Advanced menu editor
LICENSE= GPLv3
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.38:devel/py-python-distutils-extra@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil@${FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.38:devel/py-python-distutils-extra@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil@${PY_FLAVOR}
LIB_DEPENDS= libgnome-menu-3.so:x11/gnome-menus
RUN_DEPENDS= xdg-open:devel/xdg-utils \
- ${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil@${PY_FLAVOR}
USES= desktop-file-utils gettext gnome python:3.4+
USE_GNOME= intltool pygobject3
diff --git a/x11/py-pyvirtualdisplay/Makefile b/x11/py-pyvirtualdisplay/Makefile
index fbaae742dfd3..99d496a423c7 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@${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}
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess@${PY_FLAVOR}
NO_ARCH= yes
USE_PYTHON= autoplist distutils
diff --git a/x11/terminator/Makefile b/x11/terminator/Makefile
index 6dc0b4cb20ad..bf4c0b32a7b6 100644
--- a/x11/terminator/Makefile
+++ b/x11/terminator/Makefile
@@ -12,9 +12,9 @@ COMMENT= Multiple GNOME terminals in one window
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0:devel/py-notify@${FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0:devel/py-notify@${PY_FLAVOR} \
${PYTHON_SITELIBDIR}/keybinder/_keybinder.so:x11/keybinder \
- ${PYTHON_PKGNAMEPREFIX}vte>=0:x11-toolkits/py-vte@${FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}vte>=0:x11-toolkits/py-vte@${PY_FLAVOR}
USES= python:2.7
USE_GNOME= pygtk2 intltool
diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index a925b7ae840f..bc650aa75bbe 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -14,29 +14,29 @@ LICENSE= GPLv2
BROKEN= fails to build with cython 0.28
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2@${FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2@${PY_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@${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} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rencode>1:converters/py-rencode@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}xxhash>0:devel/py-xxhash@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pillow>=3.0:graphics/py-pillow@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=3.1.0:graphics/py-PyOpenGL@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}PyOpenGL-accelerate>=3.1.0:graphics/py-PyOpenGL-accelerate@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
ssh-askpass:security/openssh-askpass \
- ${PYTHON_PKGNAMEPREFIX}cryptography>1:security/py-cryptography@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}cryptography>1:security/py-cryptography@${PY_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@${FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gtkglext>1:x11-toolkits/py-gtkglext@${FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gtkglext>1:x11-toolkits/py-gtkglext@${PY_FLAVOR} \
${PYNUMPY}
USES= desktop-file-utils fortran gettext-runtime pkgconfig python:2.7 shared-mime-info shebangfix tar:xz
@@ -62,14 +62,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@${FLAVOR}
+AVAHI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}avahi>0:net/py-avahi@${PY_FLAVOR}
AVAHI_VARS= XPRA_OPTIONS+=mdns
AVCODEC_VARS= XPRA_OPTIONS+=dec_avcodec2
-CUPS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>1:print/py-pycups@${FLAVOR}
+CUPS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>1:print/py-pycups@${PY_FLAVOR}
CUPS_VARS= XPRA_OPTIONS+=printing
FFMPEG_VARS= XPRA_OPTIONS+=enc_ffmpeg
-GSTREAMER_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${FLAVOR}
-GSTREAMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${FLAVOR}
+GSTREAMER_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR}
+GSTREAMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${PY_FLAVOR}
GSTREAMER_USE= GSTREAMER1=flac,lame,mpg123,ogg,opus,vorbis,wavpack
GSTREAMER_VARS= XPRA_OPTIONS+=sound
HTML5_VARS= XPRA_OPTIONS+=html5
@@ -79,7 +79,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@${FLAVOR}
+WEBCAM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opencv>2:graphics/py-opencv@${PY_FLAVOR}
WEBCAM_VARS= XPRA_OPTIONS+=webcam
X264_LIB_DEPENDS= libx264.so:multimedia/libx264
X264_VARS= XPRA_OPTIONS+=enc_x264