aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus von Appen <mva@FreeBSD.org>2014-10-20 16:04:12 +0000
committerMarcus von Appen <mva@FreeBSD.org>2014-10-20 16:04:12 +0000
commit89e07f4a18111a1fde92e57751221f851705f6b8 (patch)
treee54c7ece9300bb20cc6b5b9ea0b6b8aab3453440
parent7fd0d93a89aedf3ae8004c878caa5e2ff358e78b (diff)
downloadports-89e07f4a18111a1fde92e57751221f851705f6b8.tar.gz
ports-89e07f4a18111a1fde92e57751221f851705f6b8.zip
Notes
-rw-r--r--devel/aap/Makefile3
-rw-r--r--devel/alf/Makefile3
-rw-r--r--devel/anjuta/Makefile3
-rw-r--r--devel/antlr/Makefile2
-rw-r--r--devel/apr2/Makefile3
-rw-r--r--devel/avro-cpp/Makefile3
-rw-r--r--devel/awscli/Makefile5
-rw-r--r--devel/bicyclerepair/Makefile4
-rw-r--r--devel/boaconstructor/Makefile3
-rw-r--r--devel/boost-python-libs/Makefile2
-rw-r--r--devel/buildbot-slave/Makefile6
-rw-r--r--devel/buildbot/Makefile6
-rw-r--r--devel/bzr-builder/Makefile5
-rw-r--r--devel/bzr-colo/Makefile5
-rw-r--r--devel/bzr-explorer/Makefile6
-rw-r--r--devel/bzr-externals/Makefile5
-rw-r--r--devel/bzr-fastimport/Makefile5
-rw-r--r--devel/bzr-git/Makefile7
-rw-r--r--devel/bzr-gtk/Makefile6
-rw-r--r--devel/bzr-loom/Makefile5
-rw-r--r--devel/bzr-pipeline/Makefile7
-rw-r--r--devel/bzr-rewrite/Makefile5
-rw-r--r--devel/bzr-scmproj/Makefile5
-rw-r--r--devel/bzr-stats/Makefile5
-rw-r--r--devel/bzr-svn/Makefile5
-rw-r--r--devel/bzr-upload/Makefile5
-rw-r--r--devel/bzr/Makefile5
-rw-r--r--devel/bzrtools/Makefile6
-rw-r--r--devel/cask/Makefile2
-rw-r--r--devel/coccinelle/Makefile3
-rw-r--r--devel/cppcheck/Makefile4
-rw-r--r--devel/cut/Makefile3
-rw-r--r--devel/cvs-syncmail/Makefile3
-rw-r--r--devel/cx_Freeze/Makefile4
-rw-r--r--devel/d-feet/Makefile5
-rw-r--r--devel/dee/Makefile3
-rw-r--r--devel/deheader/Makefile2
-rw-r--r--devel/diffuse/Makefile3
-rw-r--r--devel/dissy/Makefile4
-rw-r--r--devel/distorm/Makefile4
-rw-r--r--devel/ditrack/Makefile4
-rw-r--r--devel/dreampie/Makefile5
-rw-r--r--devel/drpython/Makefile6
-rw-r--r--devel/dulwich/Makefile5
-rw-r--r--devel/epydoc/Makefile4
-rw-r--r--devel/euca2ools/Makefile5
-rw-r--r--devel/evolution-gconf-tools/Makefile2
-rw-r--r--devel/fb303/Makefile3
-rw-r--r--devel/fnorb/Makefile6
-rw-r--r--devel/gaphor/Makefile9
-rw-r--r--devel/gazpacho/Makefile5
-rw-r--r--devel/gdb/Makefile5
-rw-r--r--devel/gearmand-devel/Makefile3
-rw-r--r--devel/gettext-lint/Makefile3
-rw-r--r--devel/gettext-msghack/Makefile3
-rw-r--r--devel/git-review/Makefile2
-rw-r--r--devel/git/Makefile2
-rw-r--r--devel/glade3/Makefile2
-rw-r--r--devel/gnatcoll/Makefile2
-rw-r--r--devel/gnatpython/Makefile7
-rw-r--r--devel/google-styleguide/Makefile2
-rw-r--r--devel/googletest/Makefile3
-rw-r--r--devel/gps/Makefile3
-rw-r--r--devel/hachoir-core/Makefile4
-rw-r--r--devel/hachoir-parser/Makefile4
-rw-r--r--devel/hachoir-regex/Makefile4
-rw-r--r--devel/hg-git/Makefile5
-rw-r--r--devel/hgreviewboard/Makefile2
-rw-r--r--devel/hgsvn/Makefile6
-rw-r--r--devel/hgview/Makefile5
-rw-r--r--devel/jep/Makefile3
-rw-r--r--devel/libewf/Makefile3
-rw-r--r--devel/libftdi1/Makefile2
-rw-r--r--devel/libglade2/Makefile2
-rw-r--r--devel/libhid/Makefile3
-rw-r--r--devel/libmpsse/Makefile3
-rw-r--r--devel/libopencm3/Makefile3
-rw-r--r--devel/libopensync/Makefile3
-rw-r--r--devel/libpeas/Makefile3
-rw-r--r--devel/libredblack/Makefile2
-rw-r--r--devel/libsoup/Makefile3
-rw-r--r--devel/libvirt-glib/Makefile3
-rw-r--r--devel/libvshadow/Makefile3
-rw-r--r--devel/llvm32/Makefile4
-rw-r--r--devel/ncc/Makefile2
-rw-r--r--devel/ninja-ide/Makefile5
-rw-r--r--devel/nxt-python/Makefile5
-rw-r--r--devel/omniNotify/Makefile3
-rw-r--r--devel/open-usp-tukubai/Makefile3
-rw-r--r--devel/pep8/Makefile5
-rw-r--r--devel/phpsh/Makefile6
-rw-r--r--devel/py-Acquisition/Makefile6
-rw-r--r--devel/py-AddOns/Makefile6
-rw-r--r--devel/py-Breve/Makefile5
-rw-r--r--devel/py-BytecodeAssembler/Makefile6
-rw-r--r--devel/py-DateTime/Makefile6
-rw-r--r--devel/py-DocumentTemplate/Makefile6
-rw-r--r--devel/py-EnthoughtBase/Makefile5
-rw-r--r--devel/py-ExtensionClass/Makefile6
-rw-r--r--devel/py-InlineEgg/Makefile6
-rw-r--r--devel/py-Jinja/Makefile5
-rw-r--r--devel/py-Jinja2/Makefile5
-rw-r--r--devel/py-Missing/Makefile6
-rw-r--r--devel/py-MultiMapping/Makefile6
-rw-r--r--devel/py-PEAK-Rules/Makefile5
-rw-r--r--devel/py-Persistence/Makefile6
-rw-r--r--devel/py-Products.ATContentTypes/Makefile5
-rw-r--r--devel/py-Products.ATReferenceBrowserWidget/Makefile6
-rw-r--r--devel/py-Products.Archetypes/Makefile5
-rw-r--r--devel/py-Products.BTreeFolder2/Makefile6
-rw-r--r--devel/py-Products.CMFActionIcons/Makefile5
-rw-r--r--devel/py-Products.CMFCalendar/Makefile4
-rw-r--r--devel/py-Products.CMFCore/Makefile6
-rw-r--r--devel/py-Products.CMFDefault/Makefile4
-rw-r--r--devel/py-Products.CMFDiffTool/Makefile7
-rw-r--r--devel/py-Products.CMFDynamicViewFTI/Makefile7
-rw-r--r--devel/py-Products.CMFEditions/Makefile5
-rw-r--r--devel/py-Products.CMFFormController/Makefile6
-rw-r--r--devel/py-Products.CMFPlacefulWorkflow/Makefile5
-rw-r--r--devel/py-Products.CMFQuickInstallerTool/Makefile5
-rw-r--r--devel/py-Products.CMFTestCase/Makefile6
-rw-r--r--devel/py-Products.CMFUid/Makefile6
-rw-r--r--devel/py-Products.DCWorkflow/Makefile5
-rw-r--r--devel/py-Products.ExtendedPathIndex/Makefile6
-rw-r--r--devel/py-Products.ExternalEditor/Makefile6
-rw-r--r--devel/py-Products.ExternalMethod/Makefile6
-rw-r--r--devel/py-Products.GenericSetup/Makefile6
-rw-r--r--devel/py-Products.LDAPMultiPlugins/Makefile5
-rw-r--r--devel/py-Products.LDAPUserFolder/Makefile5
-rw-r--r--devel/py-Products.MIMETools/Makefile6
-rw-r--r--devel/py-Products.Marshall/Makefile6
-rw-r--r--devel/py-Products.MimetypesRegistry/Makefile6
-rw-r--r--devel/py-Products.OFSP/Makefile6
-rw-r--r--devel/py-Products.PasswordResetTool/Makefile5
-rw-r--r--devel/py-Products.PlacelessTranslationService/Makefile6
-rw-r--r--devel/py-Products.PloneLanguageTool/Makefile5
-rw-r--r--devel/py-Products.PloneTestCase/Makefile6
-rw-r--r--devel/py-Products.PluginRegistry/Makefile6
-rw-r--r--devel/py-Products.PortalTransforms/Makefile6
-rw-r--r--devel/py-Products.PythonScripts/Makefile6
-rw-r--r--devel/py-Products.ResourceRegistries/Makefile6
-rw-r--r--devel/py-Products.StandardCacheManagers/Makefile6
-rw-r--r--devel/py-Products.ZCTextIndex/Makefile6
-rw-r--r--devel/py-Products.ZCatalog/Makefile6
-rw-r--r--devel/py-Products.ZSQLMethods/Makefile6
-rw-r--r--devel/py-Products.ZopeVersionControl/Makefile7
-rw-r--r--devel/py-Products.contentmigration/Makefile6
-rw-r--r--devel/py-Products.statusmessages/Makefile6
-rw-r--r--devel/py-Products.validation/Makefile6
-rw-r--r--devel/py-RPyC/Makefile5
-rw-r--r--devel/py-Record/Makefile6
-rw-r--r--devel/py-ScriptTest/Makefile5
-rw-r--r--devel/py-SymbolType/Makefile6
-rw-r--r--devel/py-TGScheduler/Makefile5
-rw-r--r--devel/py-ToscaWidgets/Makefile5
-rw-r--r--devel/py-TurboJinja/Makefile6
-rw-r--r--devel/py-ZopeUndo/Makefile6
-rw-r--r--devel/py-akismet/Makefile5
-rw-r--r--devel/py-anonfunc/Makefile5
-rw-r--r--devel/py-anyjson/Makefile5
-rw-r--r--devel/py-application/Makefile6
-rw-r--r--devel/py-archetypes.querywidget/Makefile6
-rw-r--r--devel/py-archetypes.referencebrowserwidget/Makefile6
-rw-r--r--devel/py-archetypes.schemaextender/Makefile6
-rw-r--r--devel/py-argh/Makefile5
-rw-r--r--devel/py-argparse/Makefile5
-rw-r--r--devel/py-args/Makefile6
-rw-r--r--devel/py-asn1-modules/Makefile8
-rw-r--r--devel/py-asn1/Makefile5
-rw-r--r--devel/py-aspects/Makefile5
-rw-r--r--devel/py-aspyct/Makefile5
-rw-r--r--devel/py-async/Makefile5
-rw-r--r--devel/py-asyncio/Makefile5
-rw-r--r--devel/py-avro/Makefile5
-rw-r--r--devel/py-babel/Makefile5
-rw-r--r--devel/py-babelfish/Makefile5
-rw-r--r--devel/py-bcdoc/Makefile5
-rw-r--r--devel/py-billiard/Makefile5
-rw-r--r--devel/py-bison/Makefile6
-rw-r--r--devel/py-bitarray/Makefile5
-rw-r--r--devel/py-bitstring/Makefile6
-rw-r--r--devel/py-blessings/Makefile5
-rw-r--r--devel/py-blinker/Makefile5
-rw-r--r--devel/py-bluelet/Makefile4
-rw-r--r--devel/py-botocore/Makefile5
-rw-r--r--devel/py-capstone/Makefile5
-rw-r--r--devel/py-cfgparse/Makefile8
-rw-r--r--devel/py-checkmanifest/Makefile6
-rw-r--r--devel/py-cheetah/Makefile5
-rw-r--r--devel/py-ciphon/Makefile4
-rw-r--r--devel/py-circuits/Makefile5
-rw-r--r--devel/py-cjson/Makefile2
-rw-r--r--devel/py-cld/Makefile5
-rw-r--r--devel/py-click/Makefile5
-rw-r--r--devel/py-clint/Makefile6
-rw-r--r--devel/py-clonedigger/Makefile5
-rw-r--r--devel/py-cmdln/Makefile5
-rw-r--r--devel/py-collective.monkeypatcher/Makefile6
-rw-r--r--devel/py-collective.z3cform.datetimewidget/Makefile6
-rw-r--r--devel/py-colorama/Makefile5
-rw-r--r--devel/py-conditional/Makefile6
-rw-r--r--devel/py-configobj/Makefile6
-rw-r--r--devel/py-configparser/Makefile5
-rw-r--r--devel/py-construct/Makefile5
-rw-r--r--devel/py-country/Makefile6
-rw-r--r--devel/py-coverage/Makefile5
-rw-r--r--devel/py-crcmod/Makefile5
-rw-r--r--devel/py-ctags/Makefile5
-rw-r--r--devel/py-cxx/Makefile5
-rw-r--r--devel/py-d2to1/Makefile5
-rw-r--r--devel/py-dal/Makefile5
-rw-r--r--devel/py-darcsver/Makefile5
-rw-r--r--devel/py-decorator/Makefile5
-rw-r--r--devel/py-defusedxml/Makefile5
-rw-r--r--devel/py-deliciousapi/Makefile5
-rw-r--r--devel/py-demjson/Makefile5
-rw-r--r--devel/py-dexml/Makefile5
-rw-r--r--devel/py-dialog/Makefile5
-rw-r--r--devel/py-diazo/Makefile6
-rw-r--r--devel/py-dirspec/Makefile5
-rw-r--r--devel/py-dogpile.cache/Makefile5
-rw-r--r--devel/py-dogpile.core/Makefile5
-rw-r--r--devel/py-doit/Makefile5
-rw-r--r--devel/py-durus/Makefile6
-rw-r--r--devel/py-eggtestinfo/Makefile5
-rw-r--r--devel/py-enum34/Makefile5
-rw-r--r--devel/py-epsilon/Makefile6
-rw-r--r--devel/py-event/Makefile5
-rw-r--r--devel/py-experimental.cssselect/Makefile6
-rw-r--r--devel/py-extras/Makefile4
-rw-r--r--devel/py-extremes/Makefile6
-rw-r--r--devel/py-ezpyinline/Makefile5
-rw-r--r--devel/py-fabric/Makefile5
-rw-r--r--devel/py-fam/Makefile6
-rw-r--r--devel/py-fastimport/Makefile5
-rw-r--r--devel/py-fileutils/Makefile6
-rw-r--r--devel/py-five.customerize/Makefile6
-rw-r--r--devel/py-five.formlib/Makefile6
-rw-r--r--devel/py-five.globalrequest/Makefile6
-rw-r--r--devel/py-five.localsitemanager/Makefile7
-rw-r--r--devel/py-flask-babel/Makefile6
-rw-r--r--devel/py-flexmock/Makefile5
-rw-r--r--devel/py-foolscap/Makefile5
-rw-r--r--devel/py-fortran/Makefile5
-rw-r--r--devel/py-freebsd/Makefile5
-rw-r--r--devel/py-fs/Makefile5
-rw-r--r--devel/py-fsm/Makefile4
-rw-r--r--devel/py-fudge/Makefile5
-rw-r--r--devel/py-funcparserlib/Makefile5
-rw-r--r--devel/py-fusefs/Makefile6
-rw-r--r--devel/py-futures/Makefile5
-rw-r--r--devel/py-gamin/Makefile3
-rw-r--r--devel/py-gearman/Makefile5
-rw-r--r--devel/py-generate/Makefile7
-rw-r--r--devel/py-geojson/Makefile5
-rw-r--r--devel/py-geotypes/Makefile5
-rw-r--r--devel/py-gflags/Makefile4
-rw-r--r--devel/py-gitdb/Makefile5
-rw-r--r--devel/py-gitosis/Makefile6
-rw-r--r--devel/py-glob2/Makefile5
-rw-r--r--devel/py-gobject/Makefile3
-rw-r--r--devel/py-grab/Makefile5
-rw-r--r--devel/py-grizzled/Makefile5
-rw-r--r--devel/py-grouch/Makefile5
-rw-r--r--devel/py-gyp-devel/Makefile5
-rw-r--r--devel/py-hashring/Makefile5
-rw-r--r--devel/py-hghooks/Makefile5
-rw-r--r--devel/py-hgtools/Makefile6
-rw-r--r--devel/py-humanize/Makefile5
-rw-r--r--devel/py-ice/Makefile2
-rw-r--r--devel/py-icu/Makefile5
-rw-r--r--devel/py-iniparse/Makefile5
-rw-r--r--devel/py-initgroups/Makefile6
-rw-r--r--devel/py-instant/Makefile4
-rw-r--r--devel/py-interface/Makefile4
-rw-r--r--devel/py-ipaddr/Makefile5
-rw-r--r--devel/py-ipdb/Makefile6
-rw-r--r--devel/py-iso8601/Makefile5
-rw-r--r--devel/py-iterpipes/Makefile5
-rw-r--r--devel/py-jaraco.timing/Makefile6
-rw-r--r--devel/py-jcc/Makefile4
-rw-r--r--devel/py-jellyfish/Makefile5
-rw-r--r--devel/py-jira/Makefile5
-rw-r--r--devel/py-jmespath/Makefile5
-rw-r--r--devel/py-jsmin/Makefile5
-rw-r--r--devel/py-json-py/Makefile3
-rw-r--r--devel/py-jsonlib/Makefile5
-rw-r--r--devel/py-jsonlib2/Makefile5
-rw-r--r--devel/py-jsonrpclib/Makefile5
-rw-r--r--devel/py-kazoo/Makefile7
-rw-r--r--devel/py-kid/Makefile5
-rw-r--r--devel/py-kjbuckets/Makefile7
-rw-r--r--devel/py-kqueue/Makefile9
-rw-r--r--devel/py-lazy/Makefile6
-rw-r--r--devel/py-levenshtein/Makefile6
-rw-r--r--devel/py-liblarch/Makefile5
-rw-r--r--devel/py-libvirt/Makefile7
-rw-r--r--devel/py-ll-core/Makefile6
-rw-r--r--devel/py-lock_file/Makefile5
-rw-r--r--devel/py-log4py/Makefile4
-rw-r--r--devel/py-logan/Makefile5
-rw-r--r--devel/py-magic/Makefile5
-rw-r--r--devel/py-meliae/Makefile5
-rw-r--r--devel/py-memoryprofiler/Makefile5
-rw-r--r--devel/py-mercurialserver/Makefile5
-rw-r--r--devel/py-mez_xml/Makefile5
-rw-r--r--devel/py-mimeparse/Makefile5
-rw-r--r--devel/py-minimongo/Makefile5
-rw-r--r--devel/py-mock/Makefile5
-rw-r--r--devel/py-mongokit/Makefile5
-rw-r--r--devel/py-more-itertools/Makefile5
-rw-r--r--devel/py-mox/Makefile5
-rw-r--r--devel/py-msgpack/Makefile5
-rw-r--r--devel/py-mwlib.ext/Makefile6
-rw-r--r--devel/py-mwlib.rl/Makefile6
-rw-r--r--devel/py-mx-experimental/Makefile4
-rw-r--r--devel/py-mygpoclient/Makefile5
-rw-r--r--devel/py-ncurses/Makefile5
-rw-r--r--devel/py-notifier/Makefile4
-rw-r--r--devel/py-notify/Makefile3
-rw-r--r--devel/py-odfpy/Makefile5
-rw-r--r--devel/py-omnijson/Makefile5
-rw-r--r--devel/py-optik/Makefile5
-rw-r--r--devel/py-orbit/Makefile3
-rw-r--r--devel/py-ordereddict/Makefile5
-rw-r--r--devel/py-pathtools/Makefile6
-rw-r--r--devel/py-period/Makefile2
-rw-r--r--devel/py-phabricator/Makefile5
-rw-r--r--devel/py-phpserialize/Makefile5
-rw-r--r--devel/py-pika/Makefile5
-rw-r--r--devel/py-pip/Makefile6
-rw-r--r--devel/py-plan/Makefile5
-rw-r--r--devel/py-plex/Makefile5
-rw-r--r--devel/py-posix_ipc/Makefile5
-rw-r--r--devel/py-pp/Makefile5
-rw-r--r--devel/py-pqueue/Makefile6
-rw-r--r--devel/py-prettytable/Makefile6
-rw-r--r--devel/py-prioritized_methods/Makefile5
-rw-r--r--devel/py-protocols-devel/Makefile6
-rw-r--r--devel/py-protocols/Makefile5
-rw-r--r--devel/py-ptrace/Makefile5
-rw-r--r--devel/py-px/Makefile6
-rw-r--r--devel/py-pycalendar/Makefile5
-rw-r--r--devel/py-pycallgraph/Makefile4
-rw-r--r--devel/py-pycerberus/Makefile5
-rw-r--r--devel/py-pycparser/Makefile5
-rw-r--r--devel/py-pyechonest/Makefile4
-rw-r--r--devel/py-pyev/Makefile5
-rw-r--r--devel/py-pyflakes/Makefile5
-rw-r--r--devel/py-pygithub/Makefile5
-rw-r--r--devel/py-pygpx/Makefile5
-rw-r--r--devel/py-pyke/Makefile5
-rw-r--r--devel/py-pympler/Makefile5
-rw-r--r--devel/py-pyro/Makefile6
-rw-r--r--devel/py-pyshapelib/Makefile5
-rw-r--r--devel/py-pytemplate/Makefile4
-rw-r--r--devel/py-pytest-runner/Makefile6
-rw-r--r--devel/py-pythonbrew/Makefile5
-rw-r--r--devel/py-pytz/Makefile2
-rw-r--r--devel/py-pyutil/Makefile6
-rw-r--r--devel/py-pyxml2obj/Makefile5
-rw-r--r--devel/py-qpid/Makefile5
-rw-r--r--devel/py-qserve/Makefile6
-rw-r--r--devel/py-qt4-core/Makefile2
-rw-r--r--devel/py-rauth/Makefile5
-rw-r--r--devel/py-repl/Makefile5
-rw-r--r--devel/py-repoze.lru/Makefile5
-rw-r--r--devel/py-repoze.tm2/Makefile5
-rw-r--r--devel/py-repoze.what-pylons/Makefile5
-rw-r--r--devel/py-repoze.what/Makefile5
-rw-r--r--devel/py-repoze.who-friendlyform/Makefile6
-rw-r--r--devel/py-repoze.who-testutil/Makefile5
-rw-r--r--devel/py-repoze.who/Makefile5
-rw-r--r--devel/py-repoze.xmliter/Makefile6
-rw-r--r--devel/py-resolver/Makefile5
-rw-r--r--devel/py-resourcepackage/Makefile5
-rw-r--r--devel/py-rlcompleter2/Makefile5
-rw-r--r--devel/py-robotframework-pabot/Makefile5
-rw-r--r--devel/py-rope/Makefile5
-rw-r--r--devel/py-rose/Makefile5
-rw-r--r--devel/py-roxlib/Makefile3
-rw-r--r--devel/py-ruledispatch/Makefile7
-rw-r--r--devel/py-sanetime/Makefile5
-rw-r--r--devel/py-setproctitle/Makefile5
-rw-r--r--devel/py-setuptools-git/Makefile5
-rw-r--r--devel/py-setuptools_darcs/Makefile5
-rw-r--r--devel/py-setuptools_hg/Makefile5
-rw-r--r--devel/py-simpleparse/Makefile5
-rw-r--r--devel/py-simpletal/Makefile5
-rw-r--r--devel/py-simpy/Makefile4
-rw-r--r--devel/py-singledispatch/Makefile5
-rw-r--r--devel/py-smmap/Makefile5
-rw-r--r--devel/py-snack/Makefile5
-rw-r--r--devel/py-snackwich/Makefile5
-rw-r--r--devel/py-spark/Makefile2
-rw-r--r--devel/py-sqlcc/Makefile4
-rw-r--r--devel/py-statgrab/Makefile6
-rw-r--r--devel/py-stevedore/Makefile5
-rw-r--r--devel/py-stsci.distutils/Makefile5
-rw-r--r--devel/py-subversion/Makefile2
-rw-r--r--devel/py-subvertpy/Makefile5
-rw-r--r--devel/py-sysctl/Makefile5
-rw-r--r--devel/py-tapi/Makefile5
-rw-r--r--devel/py-tconfpy/Makefile5
-rw-r--r--devel/py-tempstorage/Makefile6
-rw-r--r--devel/py-termcolor/Makefile5
-rw-r--r--devel/py-testgears/Makefile5
-rw-r--r--devel/py-testoob/Makefile6
-rw-r--r--devel/py-testtools/Makefile4
-rw-r--r--devel/py-tgMochiKit/Makefile5
-rw-r--r--devel/py-thrift/Makefile5
-rw-r--r--devel/py-timelib/Makefile6
-rw-r--r--devel/py-tox/Makefile5
-rw-r--r--devel/py-trace2html/Makefile5
-rw-r--r--devel/py-traits/Makefile5
-rw-r--r--devel/py-transaction/Makefile6
-rw-r--r--devel/py-trollius/Makefile5
-rw-r--r--devel/py-turbocheetah/Makefile5
-rw-r--r--devel/py-turbojson/Makefile5
-rw-r--r--devel/py-turbokid/Makefile5
-rw-r--r--devel/py-tvrage/Makefile4
-rw-r--r--devel/py-tw.forms/Makefile5
-rw-r--r--devel/py-twisted/Makefile2
-rw-r--r--devel/py-twistedCore/Makefile6
-rw-r--r--devel/py-twistedRunner/Makefile6
-rw-r--r--devel/py-tzlocal/Makefile6
-rw-r--r--devel/py-ua_parser/Makefile5
-rw-r--r--devel/py-ujson/Makefile6
-rw-r--r--devel/py-uncompyle2/Makefile4
-rw-r--r--devel/py-unipath/Makefile5
-rw-r--r--devel/py-unittest2/Makefile6
-rw-r--r--devel/py-urlimport/Makefile5
-rw-r--r--devel/py-urwid/Makefile5
-rw-r--r--devel/py-usb/Makefile5
-rw-r--r--devel/py-user_agents/Makefile5
-rw-r--r--devel/py-utils/Makefile6
-rw-r--r--devel/py-venusian/Makefile5
-rw-r--r--devel/py-versiontools/Makefile5
-rw-r--r--devel/py-virtualenv-clone/Makefile5
-rw-r--r--devel/py-virtualenv/Makefile5
-rw-r--r--devel/py-virtualenvwrapper/Makefile5
-rw-r--r--devel/py-watchdog/Makefile7
-rw-r--r--devel/py-wheel/Makefile5
-rw-r--r--devel/py-wsgi_xmlrpc/Makefile5
-rw-r--r--devel/py-wsgitools/Makefile5
-rw-r--r--devel/py-wsgiutils/Makefile5
-rw-r--r--devel/py-xattr/Makefile5
-rw-r--r--devel/py-xdg/Makefile5
-rw-r--r--devel/py-xerox/Makefile6
-rw-r--r--devel/py-xmltodict/Makefile5
-rw-r--r--devel/py-xoltar-toolkit/Makefile2
-rw-r--r--devel/py-yaml/Makefile5
-rw-r--r--devel/py-yappi/Makefile5
-rw-r--r--devel/py-yapps2/Makefile5
-rw-r--r--devel/py-ydbf/Makefile6
-rw-r--r--devel/py-yum-metadata-parser/Makefile6
-rw-r--r--devel/py-yunomi/Makefile5
-rw-r--r--devel/py-z3c.autoinclude/Makefile6
-rw-r--r--devel/py-z3c.batching/Makefile5
-rw-r--r--devel/py-z3c.caching/Makefile5
-rw-r--r--devel/py-z3c.form/Makefile6
-rw-r--r--devel/py-z3c.formwidget.query/Makefile6
-rw-r--r--devel/py-z3c.zcmlhook/Makefile5
-rw-r--r--devel/py-zExceptions/Makefile6
-rw-r--r--devel/py-zLOG/Makefile5
-rw-r--r--devel/py-zc.buildout/Makefile5
-rw-r--r--devel/py-zclockfile/Makefile6
-rw-r--r--devel/py-zconfig/Makefile5
-rw-r--r--devel/py-zope.annotation/Makefile5
-rw-r--r--devel/py-zope.app.applicationcontrol/Makefile5
-rw-r--r--devel/py-zope.app.appsetup/Makefile5
-rw-r--r--devel/py-zope.app.basicskin/Makefile5
-rw-r--r--devel/py-zope.app.broken/Makefile5
-rw-r--r--devel/py-zope.app.cache/Makefile6
-rw-r--r--devel/py-zope.app.component/Makefile5
-rw-r--r--devel/py-zope.app.container/Makefile6
-rw-r--r--devel/py-zope.app.content/Makefile5
-rw-r--r--devel/py-zope.app.debug/Makefile5
-rw-r--r--devel/py-zope.app.dependable/Makefile6
-rw-r--r--devel/py-zope.app.error/Makefile5
-rw-r--r--devel/py-zope.app.exception/Makefile5
-rw-r--r--devel/py-zope.app.folder/Makefile5
-rw-r--r--devel/py-zope.app.form/Makefile5
-rw-r--r--devel/py-zope.app.generations/Makefile5
-rw-r--r--devel/py-zope.app.http/Makefile5
-rw-r--r--devel/py-zope.app.pagetemplate/Makefile5
-rw-r--r--devel/py-zope.app.publication/Makefile5
-rw-r--r--devel/py-zope.app.publisher/Makefile6
-rw-r--r--devel/py-zope.app.renderer/Makefile5
-rw-r--r--devel/py-zope.app.rotterdam/Makefile5
-rw-r--r--devel/py-zope.app.schema/Makefile5
-rw-r--r--devel/py-zope.app.testing/Makefile5
-rw-r--r--devel/py-zope.app.zcmlfiles/Makefile5
-rw-r--r--devel/py-zope.app.zopeappgenerations/Makefile5
-rw-r--r--devel/py-zope.applicationcontrol/Makefile5
-rw-r--r--devel/py-zope.broken/Makefile6
-rw-r--r--devel/py-zope.browser/Makefile6
-rw-r--r--devel/py-zope.browsermenu/Makefile6
-rw-r--r--devel/py-zope.browserpage/Makefile5
-rw-r--r--devel/py-zope.browserresource/Makefile6
-rw-r--r--devel/py-zope.cachedescriptors/Makefile6
-rw-r--r--devel/py-zope.component/Makefile5
-rw-r--r--devel/py-zope.componentvocabulary/Makefile5
-rw-r--r--devel/py-zope.configuration/Makefile5
-rw-r--r--devel/py-zope.container/Makefile6
-rw-r--r--devel/py-zope.contentprovider/Makefile5
-rw-r--r--devel/py-zope.contenttype/Makefile6
-rw-r--r--devel/py-zope.copy/Makefile5
-rw-r--r--devel/py-zope.copypastemove/Makefile5
-rw-r--r--devel/py-zope.datetime/Makefile5
-rw-r--r--devel/py-zope.deferredimport/Makefile5
-rw-r--r--devel/py-zope.deprecation/Makefile5
-rw-r--r--devel/py-zope.dottedname/Makefile5
-rw-r--r--devel/py-zope.dublincore/Makefile6
-rw-r--r--devel/py-zope.error/Makefile5
-rw-r--r--devel/py-zope.event/Makefile5
-rw-r--r--devel/py-zope.exceptions/Makefile5
-rw-r--r--devel/py-zope.filerepresentation/Makefile5
-rw-r--r--devel/py-zope.formlib/Makefile6
-rw-r--r--devel/py-zope.generations/Makefile5
-rw-r--r--devel/py-zope.globalrequest/Makefile6
-rw-r--r--devel/py-zope.i18n/Makefile6
-rw-r--r--devel/py-zope.interface/Makefile5
-rw-r--r--devel/py-zope.lifecycleevent/Makefile5
-rw-r--r--devel/py-zope.location/Makefile5
-rw-r--r--devel/py-zope.pagetemplate/Makefile6
-rw-r--r--devel/py-zope.processlifetime/Makefile5
-rw-r--r--devel/py-zope.ptresource/Makefile5
-rw-r--r--devel/py-zope.publisher/Makefile5
-rw-r--r--devel/py-zope.ramcache/Makefile6
-rw-r--r--devel/py-zope.schema/Makefile5
-rw-r--r--devel/py-zope.sequencesort/Makefile5
-rw-r--r--devel/py-zope.site/Makefile5
-rw-r--r--devel/py-zope.size/Makefile5
-rw-r--r--devel/py-zope.tales/Makefile5
-rw-r--r--devel/py-zope.testbrowser/Makefile6
-rw-r--r--devel/py-zope.testing/Makefile5
-rw-r--r--devel/py-zope.traversing/Makefile6
-rw-r--r--devel/py-zope.viewlet/Makefile5
-rw-r--r--devel/py3-xdg/Makefile5
-rw-r--r--devel/py_static_check/Makefile5
-rw-r--r--devel/pycount/Makefile3
-rw-r--r--devel/pygobject3-common/Makefile6
-rw-r--r--devel/pyobfuscate/Makefile5
-rw-r--r--devel/pypersrc/Makefile3
-rw-r--r--devel/pyside-tools/Makefile3
-rw-r--r--devel/pyside/Makefile3
-rw-r--r--devel/pyst/Makefile4
-rw-r--r--devel/pysvn/Makefile5
-rw-r--r--devel/pythontidy/Makefile2
-rw-r--r--devel/qbzr/Makefile6
-rw-r--r--devel/rbtools/Makefile5
-rw-r--r--devel/ros/Makefile3
-rw-r--r--devel/rubygem-mkrf/Makefile2
-rw-r--r--devel/runsnakerun/Makefile5
-rw-r--r--devel/scons/Makefile5
-rw-r--r--devel/sedsed/Makefile2
-rw-r--r--devel/shiboken/Makefile3
-rw-r--r--devel/tailor/Makefile4
-rw-r--r--devel/talloc/Makefile4
-rw-r--r--devel/tevent/Makefile4
-rw-r--r--devel/trac-bitten/Makefile5
-rw-r--r--devel/udis86/Makefile2
-rw-r--r--devel/wxGlade/Makefile2
564 files changed, 1073 insertions, 1720 deletions
diff --git a/devel/aap/Makefile b/devel/aap/Makefile
index f17fcd02f46a..fb20d9d10d93 100644
--- a/devel/aap/Makefile
+++ b/devel/aap/Makefile
@@ -16,8 +16,7 @@ OPTIONS_DEFINE= DOCS
NO_WRKSUBDIR= yes
NO_BUILD= yes
-USES= zip
-USE_PYTHON= yes
+USES= python zip
PLIST_SUB= PORTVERSION="${PORTVERSION}"
.include <bsd.port.options.mk>
diff --git a/devel/alf/Makefile b/devel/alf/Makefile
index 242f8685b3f4..afcaef3897d8 100644
--- a/devel/alf/Makefile
+++ b/devel/alf/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES= SF/largefiles/largefiles/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Abstract Large File
-USES= libtool
-USE_PYTHON= yes
+USES= libtool python
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 0da6539789f3..3675dc73e369 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -31,11 +31,10 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
CONFLICTS= anjuta-3.[0-9]*
USES= desktop-file-utils gmake gettext libtool pathfix \
- perl5 pkgconfig shared-mime-info shebangfix tar:bzip2
+ perl5 pkgconfig python shared-mime-info shebangfix tar:bzip2
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
-USE_PYTHON= yes
USE_GNOME= gnomeprefix vte gtksourceview2 libgda4
USE_CSTD= gnu89
GNU_CONFIGURE= yes
diff --git a/devel/antlr/Makefile b/devel/antlr/Makefile
index 38a87e977ed3..21ccdf448324 100644
--- a/devel/antlr/Makefile
+++ b/devel/antlr/Makefile
@@ -38,7 +38,7 @@ OPTIONS_SUB= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON= yes
+USES+= python
PORTDOCS+= python-runtime.html
ANTLR_PYTHON= ${WRKSRC}/lib/python
.endif
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index ca92df0f4463..d7c0888e0c1c 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -19,10 +19,9 @@ NO_PACKAGE= yes
SNAPDATE= 20140626144503
-USES= tar:xz iconv perl5 pathfix libtool
+USES= tar:xz iconv perl5 pathfix libtool python:2,build
USE_AUTOTOOLS= automake:env autoconf:env libtoolize:env
USE_PERL5= build
-USE_PYTHON_BUILD= 2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/avro-cpp/Makefile b/devel/avro-cpp/Makefile
index fe00a14b7ba1..77fc416697df 100644
--- a/devel/avro-cpp/Makefile
+++ b/devel/avro-cpp/Makefile
@@ -16,9 +16,8 @@ COMMENT= Data serialization system for C++
LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs
-USES= cmake
+USES= cmake python:build
USE_LDCONFIG= yes
-USE_PYTHON_BUILD= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/lang/c++
diff --git a/devel/awscli/Makefile b/devel/awscli/Makefile
index 856d3b383a0d..5db6aa729f38 100644
--- a/devel/awscli/Makefile
+++ b/devel/awscli/Makefile
@@ -19,9 +19,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcdoc>=0.12.0:${PORTSDIR}/devel/py-bcdoc \
${PYTHON_PKGNAMEPREFIX}rsa>=3.1.2:${PORTSDIR}/security/py-rsa \
${PYTHON_PKGNAMEPREFIX}six>=1.1.0:${PORTSDIR}/devel/py-six
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
diff --git a/devel/bicyclerepair/Makefile b/devel/bicyclerepair/Makefile
index e2ce990b5070..54f66509e454 100644
--- a/devel/bicyclerepair/Makefile
+++ b/devel/bicyclerepair/Makefile
@@ -10,8 +10,8 @@ PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX}
MAINTAINER= mwm@mired.org
COMMENT= Python refactoring tool
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS
diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index 1a24429a9c1c..94ff079786e8 100644
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@@ -14,8 +14,7 @@ COMMENT= Cross platform RAD GUI Building IDE for wxPython
WRKSRC= ${WRKDIR}/boa-constructor-${PORTVERSION}
-USES= dos2unix gettext zip
-USE_PYTHON= yes
+USES= dos2unix gettext python zip
USE_WX= 3.0+
WX_COMPS= python
DATADIR= ${PREFIX}/share/Boa
diff --git a/devel/boost-python-libs/Makefile b/devel/boost-python-libs/Makefile
index 9d8feb212991..cbd4aca4d00b 100644
--- a/devel/boost-python-libs/Makefile
+++ b/devel/boost-python-libs/Makefile
@@ -4,7 +4,7 @@
PORTNAME= boost-python-libs
COMMENT= Framework for interfacing Python and C++
-USE_PYTHON= yes
+USES+= python
OPTIONS_DEFINE= VERBOSE_BUILD DEBUG OPTIMIZED_CFLAGS
VERBOSE_BUILD_DESC= Show compiler messages
diff --git a/devel/buildbot-slave/Makefile b/devel/buildbot-slave/Makefile
index 6dd5acb848af..649039c6818b 100644
--- a/devel/buildbot-slave/Makefile
+++ b/devel/buildbot-slave/Makefile
@@ -21,10 +21,8 @@ TESTS_DESC= Install py-mock for test suite
TESTS_BUILD_DEPENDS= ${TEST_DEPENDS}
-USES= twisted:run,runner
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python twisted:run,runner
+USE_PYTHON= distutils autoplist
MAKE_ENV+= NO_INSTALL_REQS=1
diff --git a/devel/buildbot/Makefile b/devel/buildbot/Makefile
index 48cb59a88ea1..527e05a8d207 100644
--- a/devel/buildbot/Makefile
+++ b/devel/buildbot/Makefile
@@ -28,10 +28,8 @@ OPTIONS_DEFINE= TESTS
TESTS_DESC= Install py-mock for test suite
TESTS_BUILD_DEPENDS= ${TEST_DEPENDS}
-USES= twisted:run,conch,mail,web,words
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python twisted:run,conch,mail,web,words
+USE_PYTHON= distutils autoplist
MAKE_ENV+= NO_INSTALL_REQS=1
diff --git a/devel/bzr-builder/Makefile b/devel/bzr-builder/Makefile
index ce01e3282a85..0f9ab86a4c23 100644
--- a/devel/bzr-builder/Makefile
+++ b/devel/bzr-builder/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= bzr:${PORTSDIR}/devel/bzr
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-colo/Makefile b/devel/bzr-colo/Makefile
index 07fe280d756f..e93d54942779 100644
--- a/devel/bzr-colo/Makefile
+++ b/devel/bzr-colo/Makefile
@@ -17,8 +17,7 @@ BUILD_DEPENDS= bzr:${PORTSDIR}/devel/bzr
RUN_DEPENDS= bzr:${PORTSDIR}/devel/bzr
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-explorer/Makefile b/devel/bzr-explorer/Makefile
index b9d58e774689..4f3b7db42547 100644
--- a/devel/bzr-explorer/Makefile
+++ b/devel/bzr-explorer/Makefile
@@ -16,9 +16,7 @@ BUILD_DEPENDS= bzr:${PORTSDIR}/devel/bzr
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bzrlib/plugins/qbzr/__init__.py:${PORTSDIR}/devel/qbzr \
bzr:${PORTSDIR}/devel/bzr
-USES= gettext
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= gettext python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-externals/Makefile b/devel/bzr-externals/Makefile
index 39b1c63d25e9..3895af8e85fd 100644
--- a/devel/bzr-externals/Makefile
+++ b/devel/bzr-externals/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= bzr:${PORTSDIR}/devel/bzr
WRKSRC= ${WRKDIR}/externals
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-fastimport/Makefile b/devel/bzr-fastimport/Makefile
index 4de8a2984e0b..b8940ced5214 100644
--- a/devel/bzr-fastimport/Makefile
+++ b/devel/bzr-fastimport/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= bzr:${PORTSDIR}/devel/bzr \
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-git/Makefile b/devel/bzr-git/Makefile
index 9b6a102902ce..8371d449c65b 100644
--- a/devel/bzr-git/Makefile
+++ b/devel/bzr-git/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS= bzr:${PORTSDIR}/devel/bzr \
${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.0:${PORTSDIR}/devel/dulwich \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-gtk/Makefile b/devel/bzr-gtk/Makefile
index 74f4a6e7ed7c..7809be1059ab 100644
--- a/devel/bzr-gtk/Makefile
+++ b/devel/bzr-gtk/Makefile
@@ -18,11 +18,9 @@ RUN_DEPENDS= bzr:${PORTSDIR}/devel/bzr \
${PYTHON_PKGNAMEPREFIX}cairo>=0:${PORTSDIR}/graphics/py-cairo
-USES= desktop-file-utils
-USE_PYTHON= yes
+USES= desktop-file-utils python
+USE_PYTHON= distutils autoplist
USE_GNOME= pygtk2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
INSTALLS_ICONS= yes
OPTIONS_DEFINE= GTKSOURCE
diff --git a/devel/bzr-loom/Makefile b/devel/bzr-loom/Makefile
index fe2f174db97d..a734d5db51cc 100644
--- a/devel/bzr-loom/Makefile
+++ b/devel/bzr-loom/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= bzr:${PORTSDIR}/devel/bzr
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-pipeline/Makefile b/devel/bzr-pipeline/Makefile
index 92cd68df6fb4..3baa5ffb1a12 100644
--- a/devel/bzr-pipeline/Makefile
+++ b/devel/bzr-pipeline/Makefile
@@ -16,9 +16,8 @@ LICENSE= GPLv2
BUILD_DEPENDS= bzr:${PORTSDIR}/devel/bzr
RUN_DEPENDS= bzr:${PORTSDIR}/devel/bzr
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}
+USES= python
+USE_PYTHON= distutils autoplist
+WRKSRC= ${WRKDIR}/${PORTNAME}
.include <bsd.port.mk>
diff --git a/devel/bzr-rewrite/Makefile b/devel/bzr-rewrite/Makefile
index 3c6ee9ed04f8..88c2d5b39d31 100644
--- a/devel/bzr-rewrite/Makefile
+++ b/devel/bzr-rewrite/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= bzr:${PORTSDIR}/devel/bzr
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-scmproj/Makefile b/devel/bzr-scmproj/Makefile
index fc03d3dc3348..c3714100aaed 100644
--- a/devel/bzr-scmproj/Makefile
+++ b/devel/bzr-scmproj/Makefile
@@ -16,8 +16,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= bzr:${PORTSDIR}/devel/bzr
RUN_DEPENDS= bzr:${PORTSDIR}/devel/bzr
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-stats/Makefile b/devel/bzr-stats/Makefile
index cc68176c514d..5064dc09d1d8 100644
--- a/devel/bzr-stats/Makefile
+++ b/devel/bzr-stats/Makefile
@@ -18,8 +18,7 @@ LICENSE= GPLv2
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-svn/Makefile b/devel/bzr-svn/Makefile
index a7f46c93e28f..4a2f28615540 100644
--- a/devel/bzr-svn/Makefile
+++ b/devel/bzr-svn/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/subvertpy/__init__.py:${PORTSDIR}/devel/py-su
bzr:${PORTSDIR}/devel/bzr
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr-upload/Makefile b/devel/bzr-upload/Makefile
index 805764206212..ac21eaf5f081 100644
--- a/devel/bzr-upload/Makefile
+++ b/devel/bzr-upload/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 6c0e8dcda673..dd4c5c47dc5e 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -18,10 +18,9 @@ SFTP_DESC= Paramiko for SFTP support
CA_BUNDLE_DESC= Include CA bundle for SSL cert validation
OPTIONS_DEFAULT= SFTP CA_BUNDLE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= bzr
-USES= gettext
+USES= gettext python
MAKE_ENV= BZR_LOG=/dev/null
.include <bsd.port.options.mk>
diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile
index c416ad0e63f5..772f203f0767 100644
--- a/devel/bzrtools/Makefile
+++ b/devel/bzrtools/Makefile
@@ -18,9 +18,9 @@ OPTIONS_DEFINE= GRAPHVIZ RSYNC
GRAPHVIZ_DESC= graphviz for graph-ancestry
RSYNC_DESC= rsync for rspush
-WRKSRC= ${WRKDIR}/bzrtools
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+WRKSRC= ${WRKDIR}/bzrtools
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= BzrTools
GRAPHVIZ_RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz
diff --git a/devel/cask/Makefile b/devel/cask/Makefile
index 8aebb0d83f88..e97c423297dd 100644
--- a/devel/cask/Makefile
+++ b/devel/cask/Makefile
@@ -18,7 +18,7 @@ GH_COMMIT= 3c0ca37
GH_PROJECT= cask
USE_EMACS= yes
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile
index 07bd3c25c302..639cccc97b3f 100644
--- a/devel/coccinelle/Makefile
+++ b/devel/coccinelle/Makefile
@@ -13,10 +13,9 @@ LICENSE= GPLv2
LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
-USES= gmake perl5 pkgconfig:build tar:tgz
+USES= gmake perl5 pkgconfig:build python tar:tgz
GNU_CONFIGURE= yes
USE_PERL5= build
-USE_PYTHON= yes
USE_OCAML= 3.0+
MAKE_ARGS+= PYTHON_VERSION=${PYTHON_VER}
CONFIGURE_ENV+= PYVER=${PYTHON_VER} PYTHON=${PYTHON_CMD}
diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index d2c3520befc2..b97f60aa6ce3 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -45,8 +45,8 @@ post-install:
.endif
.if ${PORT_OPTIONS:MMATCHCOMPILER}
-MAKE_ENV+= SRCDIR=build
-USE_PYTHON_BUILD= 2
+MAKE_ENV+= SRCDIR=build
+USES+= python:2,build
.endif
.if ${PORT_OPTIONS:MRULES}
diff --git a/devel/cut/Makefile b/devel/cut/Makefile
index 9806e8c4de19..0fd8b7ad70d4 100644
--- a/devel/cut/Makefile
+++ b/devel/cut/Makefile
@@ -9,9 +9,8 @@ MASTER_SITES= http://www.falvotech.com/content/cut/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Unit Testing Framework for C, C++, and Objective-C
-USES= shebangfix
+USES= python:run shebangfix
SHEBANG_FILES= *.py
-USE_PYTHON_RUN= yes
ALL_TARGET= build
do-install:
diff --git a/devel/cvs-syncmail/Makefile b/devel/cvs-syncmail/Makefile
index d4e9d6513556..6637938bf7a3 100644
--- a/devel/cvs-syncmail/Makefile
+++ b/devel/cvs-syncmail/Makefile
@@ -11,11 +11,10 @@ EXTRACT_SUFX=
MAINTAINER= ports@FreeBSD.org
COMMENT= CVS notification tool
-USES= shebangfix
+USES= python shebangfix
SHEBANG_FILES= ${DISTNAME}
NO_BUILD= yes
NO_WRKSUBDIR= yes
-USE_PYTHON= yes
PLIST_FILES= bin/${DISTNAME}
diff --git a/devel/cx_Freeze/Makefile b/devel/cx_Freeze/Makefile
index 43779f1547cc..1df3a79b536a 100644
--- a/devel/cx_Freeze/Makefile
+++ b/devel/cx_Freeze/Makefile
@@ -10,7 +10,7 @@ MAINTAINER= araujo@FreeBSD.org
COMMENT= The cx_Freeze is a set of utilities for freezing Python scripts
USE_GCC= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/devel/d-feet/Makefile b/devel/d-feet/Makefile
index 5b9a718a29ed..d91cd094b7a6 100644
--- a/devel/d-feet/Makefile
+++ b/devel/d-feet/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= \
${PYTHON_SITELIBDIR}/gtk-2.0/gtk/_gtk.so:${PORTSDIR}/x11-toolkits/py-gtk2 \
${PYTHON_SITELIBDIR}/dbus/bus.py:${PORTSDIR}/devel/py-dbus
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/dee/Makefile b/devel/dee/Makefile
index c213daebaa91..92d92699d619 100644
--- a/devel/dee/Makefile
+++ b/devel/dee/Makefile
@@ -15,10 +15,9 @@ LICENSE= GPLv3
BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen
LIB_DEPENDS= libicutu.so:${PORTSDIR}/devel/icu
-USES= gmake pkgconfig pathfix libtool
+USES= gmake libtool pkgconfig pathfix python
GNU_CONFIGURE= yes
USE_GNOME= glib20 introspection:build
-USE_PYTHON= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-gtk-doc-html \
diff --git a/devel/deheader/Makefile b/devel/deheader/Makefile
index ce6bf39ac212..e62e991f637c 100644
--- a/devel/deheader/Makefile
+++ b/devel/deheader/Makefile
@@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
NO_BUILD= yes
-USE_PYTHON= yes
+USES= python
PLIST_FILES= bin/deheader man/man1/deheader.1.gz
diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index 12b34d3b3b12..af1be2625fd1 100644
--- a/devel/diffuse/Makefile
+++ b/devel/diffuse/Makefile
@@ -14,8 +14,7 @@ LICENSE_COMB= dual
NO_BUILD= yes
-USES= tar:bzip2
-USE_PYTHON= 2
+USES= python:2 tar:bzip2
USE_GNOME= pygtk2
CONFLICTS_INSTALL= tinker-[0-9]*
diff --git a/devel/dissy/Makefile b/devel/dissy/Makefile
index a48fb255affc..29c6852e47c6 100644
--- a/devel/dissy/Makefile
+++ b/devel/dissy/Makefile
@@ -16,8 +16,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>0:${PORTSDIR}/x11-toolkits/py-gtk2 \
${PYTHON_PKGNAMEPREFIX}webkitgtk>0:${PORTSDIR}/www/py-webkitgtk
LIB_DEPENDS= librsvg-2.so:${PORTSDIR}/graphics/librsvg2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PORTDOCS= COPYING ChangeLog README UPGRADE
diff --git a/devel/distorm/Makefile b/devel/distorm/Makefile
index 318c00883fe6..529a485398bd 100644
--- a/devel/distorm/Makefile
+++ b/devel/distorm/Makefile
@@ -25,9 +25,9 @@ LICENSE= GPLv3
USES= dos2unix tar:xz
.if defined(PYTHON_SLAVEPORT)
-USE_PYTHON= 2
+USES+= python:2
+USE_PYTHON= distutils
-USE_PYDISTUTILS= yes
PYDISTUTILS_PKGNAME= distorm3
PYDISTUTILS_PKGVERSION= 3
diff --git a/devel/ditrack/Makefile b/devel/ditrack/Makefile
index 7efa5e53a856..c5e0ded91ace 100644
--- a/devel/ditrack/Makefile
+++ b/devel/ditrack/Makefile
@@ -16,8 +16,8 @@ RUN_DEPENDS= svn:${PORTSDIR}/devel/subversion
WRKSRC= ${WRKDIR}/DITrack-${PORTVERSION}
NO_BUILD= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= DITrack
OPTIONS_DEFINE= DOCS
diff --git a/devel/dreampie/Makefile b/devel/dreampie/Makefile
index abf0aa113888..688ba1398499 100644
--- a/devel/dreampie/Makefile
+++ b/devel/dreampie/Makefile
@@ -12,9 +12,8 @@ COMMENT= Python shell which is designed to be reliable and fun
LICENSE= GPLv3
USE_GNOME= pygtk2 pygtksourceview
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
pre-patch:
@${REINPLACE_CMD} -e "s|share/man/man1|man/man1|" ${WRKSRC}/setup.py
diff --git a/devel/drpython/Makefile b/devel/drpython/Makefile
index 5871f15f64ef..bb99eaeb60fd 100644
--- a/devel/drpython/Makefile
+++ b/devel/drpython/Makefile
@@ -20,10 +20,8 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
NO_ARCH= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
USE_WX= 3.0+
WX_COMPS= python:lib
diff --git a/devel/dulwich/Makefile b/devel/dulwich/Makefile
index ccc5a41aa4e3..e259792ea9ff 100644
--- a/devel/dulwich/Makefile
+++ b/devel/dulwich/Makefile
@@ -18,9 +18,8 @@ PORTDOCS= AUTHORS HACKING NEWS README.md file-format.txt \
repo.txt tag.txt
PORTEXAMPLES= clone.py config.py diff.py latest_change.py
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/devel/epydoc/Makefile b/devel/epydoc/Makefile
index dbda89d988cd..7c831882c926 100644
--- a/devel/epydoc/Makefile
+++ b/devel/epydoc/Makefile
@@ -11,8 +11,8 @@ COMMENT= Python API documentation generation tool
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS UTF8
diff --git a/devel/euca2ools/Makefile b/devel/euca2ools/Makefile
index 7f2c6dcf0970..59b1b67afed2 100644
--- a/devel/euca2ools/Makefile
+++ b/devel/euca2ools/Makefile
@@ -22,8 +22,7 @@ GH_ACCOUNT= eucalyptus
GH_TAGNAME= v${PORTVERSION}
GH_COMMIT= 79c7d3f
-USE_PYTHON= -2.7
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2.7
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/evolution-gconf-tools/Makefile b/devel/evolution-gconf-tools/Makefile
index 4645f775814d..13bfc7c1139f 100644
--- a/devel/evolution-gconf-tools/Makefile
+++ b/devel/evolution-gconf-tools/Makefile
@@ -14,7 +14,7 @@ COMMENT= Scripts to make it easier to work with Evolution's configuration
RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution
GNU_CONFIGURE= yes
-USE_PYTHON= yes
+USES= python
USE_GNOME= gnomeprefix
post-patch:
diff --git a/devel/fb303/Makefile b/devel/fb303/Makefile
index 37c593383db3..c8c17618ddde 100644
--- a/devel/fb303/Makefile
+++ b/devel/fb303/Makefile
@@ -22,9 +22,8 @@ AUTOMAKE_ARGS= -a
CONFIGURE_ARGS= PY_PREFIX="${PREFIX}"
USE_AUTOTOOLS= autoconf autoheader:env aclocal automake
-USES= gmake perl5 compiler
+USES= compiler gmake perl5 python
USE_PERL5= run
-USE_PYTHON= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/contrib/fb303
PLIST_SUB+= PORTVERSION="${PORTVERSION}" PYTHON_VER="${PYTHON_VER}"
diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index 36713d21780d..efeff2c91524 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -12,10 +12,10 @@ COMMENT= CORBA 2.0 ORB written in Python
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils noegginfo
+
PYDISTUTILS_INSTALLNOSINGLE= yes
-PYDISTUTILS_NOEGGINFO= yes
PYDISTUTILS_SETUP= ${PYSETUP}
PLIST_SUB= PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO}
diff --git a/devel/gaphor/Makefile b/devel/gaphor/Makefile
index 79addebfca5c..4cf9b7feb63f 100644
--- a/devel/gaphor/Makefile
+++ b/devel/gaphor/Makefile
@@ -23,11 +23,10 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.10.4:${PORTSDIR}/devel/py-nose
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>0:${PORTSDIR}/devel/py-decorator \
${PYTHON_PKGNAMEPREFIX}zope.component>3.4.0:${PORTSDIR}/devel/py-zope.component
-USE_GNOME= pygtk2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-INSTALLS_ICONS= yes
+USE_GNOME= pygtk2
+USES= python
+USE_PYTHON= distutils autoplist
+INSTALLS_ICONS= yes
PLIST_SUB= DOCKING_EGG="${DOCKING_EGG}" GAPHAS_EGG="${GAPHAS_EGG}"
diff --git a/devel/gazpacho/Makefile b/devel/gazpacho/Makefile
index 106d4d080944..7b55aeb108df 100644
--- a/devel/gazpacho/Makefile
+++ b/devel/gazpacho/Makefile
@@ -16,9 +16,8 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/kiwi-i18n:${PORTSDIR}/x11-toolkits/py-kiwi
NO_BUILD= yes
USE_GNOME= pygtk2
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-USES= gettext
+USE_PYTHON= distutils
+USES= gettext python
DOCS= AUTHORS ChangeLog CONTRIBUTORS COPYING README NEWS
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 0b9db4fb8a7a..6a7bd2ea284e 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -56,6 +56,7 @@ EXPAT_CONFIGURE_OFF= --without-expat
EXPAT_LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
PYTHON_CONFIGURE_ON= --with-python=${PYTHON_CMD}
PYTHON_CONFIGURE_OFF= --without-python
+PYTHON_USES= python:2
PORT_READLINE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-gdb-tui-tui-io.c
PORT_READLINE_USES= readline:port
TUI_CONFIGURE_ENABLE= tui
@@ -66,10 +67,6 @@ TUI_CONFIGURE_ENABLE= tui
EXCLUDE+= readline
.endif
-.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON= 2
-.endif
-
.if ${PORT_OPTIONS:MTHREADS}
EXTRA_PATCHES+= ${FILESDIR}/extrapatch-gdb-configure.tgt \
${FILESDIR}/extrapatch-gdb-Makefile.in
diff --git a/devel/gearmand-devel/Makefile b/devel/gearmand-devel/Makefile
index 65f33fc814a2..fd0c0dc38da1 100644
--- a/devel/gearmand-devel/Makefile
+++ b/devel/gearmand-devel/Makefile
@@ -24,9 +24,8 @@ GROUPS= gearmand
USE_PERL5= build
GNU_CONFIGURE= yes
-USES= pathfix perl5 gmake gperf libtool execinfo
+USES= pathfix perl5 gmake gperf libtool execinfo python:build
USE_LDCONFIG= yes
-USE_PYTHON_BUILD=yes
USE_RC_SUBR= gearmand
SUB_LIST+= USERS=${USERS} GROUPS=${GROUPS}
diff --git a/devel/gettext-lint/Makefile b/devel/gettext-lint/Makefile
index c5d2a8040884..da3753c88d1e 100644
--- a/devel/gettext-lint/Makefile
+++ b/devel/gettext-lint/Makefile
@@ -15,9 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
NO_BUILD= yes
-USES= gettext:run shebangfix
+USES= gettext:run python:run shebangfix
SHEBANG_FILES= src/POFileEquiv.in src/POFileGlossary.in
-USE_PYTHON_RUN= yes
post-patch:
.for i in POFileChecker POFileClean POFileConsistency POFileEquiv POFileFill \
diff --git a/devel/gettext-msghack/Makefile b/devel/gettext-msghack/Makefile
index 62842b2f9bde..315409419da2 100644
--- a/devel/gettext-msghack/Makefile
+++ b/devel/gettext-msghack/Makefile
@@ -12,8 +12,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Alter gettext po files in special ways
NO_BUILD= yes
-USES= tar:bzip2
-USE_PYTHON= yes
+USES= python tar:bzip2
PLIST_FILES= bin/${PORTNAME}
post-patch:
diff --git a/devel/git-review/Makefile b/devel/git-review/Makefile
index d9cc5573e264..3b249eddefe1 100644
--- a/devel/git-review/Makefile
+++ b/devel/git-review/Makefile
@@ -13,7 +13,7 @@ LICENSE= APACHE20
RUN_DEPENDS= git:${PORTSDIR}/devel/git
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
PLIST_FILES= bin/git-review \
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 3a76e760f131..352840405a78 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -65,7 +65,7 @@ ALL_TARGET= all strip
.endif
.if ${PORT_OPTIONS:MP4} || ${PORT_OPTIONS:MCONTRIB}
-USE_PYTHON= yes
+USES+= python
PLIST_SUB+= PYTHON_VER=${PYTHON_VER} PYTHON=""
CONFIGURE_ARGS+= --with-python=${PYTHON_CMD}
.else
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 2b9f8a809676..5d7c208dd722 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -44,7 +44,7 @@ PLIST_SUB+= GNOME:="@comment "
.endif
.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON= yes
+USES+= python
USE_GNOME+= pygtk2
PLIST_SUB+= PYTHON:=""
CONFIGURE_ARGS+=--enable-python
diff --git a/devel/gnatcoll/Makefile b/devel/gnatcoll/Makefile
index 53edac038818..e0e05237feed 100644
--- a/devel/gnatcoll/Makefile
+++ b/devel/gnatcoll/Makefile
@@ -75,7 +75,7 @@ CONFIGURE_ARGS+= --without-iconv
.if ${PORT_OPTIONS:MPYTHON}
CONFIGURE_ARGS+= --with-python=${PREFIX} \
--enable-pygobject
-USE_PYTHON= yes
+USES+= python
USE_GNOME= pygobject3
PYCOMPILE= ${PREFIX}/lib/${PYTHON_VERSION}/compileall.py
.else
diff --git a/devel/gnatpython/Makefile b/devel/gnatpython/Makefile
index 6b351102e8d9..b6f679935947 100644
--- a/devel/gnatpython/Makefile
+++ b/devel/gnatpython/Makefile
@@ -13,12 +13,9 @@ COMMENT= Python package used in Ada testsuites
LICENSE= GPLv3
SNAPSHOT= 20140205
-USES= tar:bzip2
+USES= python tar:bzip2
+USE_PYTHON= distutils autoplist
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-PYDISTUTILS_PKGVERSION= 1.2
NO_LICENSES_INSTALL= yes
.include <bsd.port.mk>
diff --git a/devel/google-styleguide/Makefile b/devel/google-styleguide/Makefile
index e56ccf453e13..4922d48233b6 100644
--- a/devel/google-styleguide/Makefile
+++ b/devel/google-styleguide/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
MAINTAINER= leeym@FreeBSD.org
COMMENT= Tool to assist with Google style guide compliance
-USE_PYTHON?= yes
+USES= python
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/devel/googletest/Makefile b/devel/googletest/Makefile
index 62abdeeda0cf..7fc19d29dadf 100644
--- a/devel/googletest/Makefile
+++ b/devel/googletest/Makefile
@@ -13,10 +13,9 @@ COMMENT= Framework for writing C++ tests on a variety of platforms
LICENSE= BSD3CLAUSE
-USES= shebangfix libtool
+USES= libtool python:2,build shebangfix
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_PYTHON_BUILD= 2
python_OLD_CMD= /usr/bin/env python
python_CMD= /usr/bin/env python2
diff --git a/devel/gps/Makefile b/devel/gps/Makefile
index da4f0182d327..af53959cd116 100644
--- a/devel/gps/Makefile
+++ b/devel/gps/Makefile
@@ -21,10 +21,9 @@ LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \
libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3
GNU_CONFIGURE= yes
-USES= ada gmake perl5 pkgconfig tar:bzip2
+USES= ada gmake perl5 pkgconfig python tar:bzip2
USE_PERL5= build
USE_GNOME= glib20
-USE_PYTHON= yes
USE_GNOME= pygobject3
PYCOMPILE= ${PREFIX}/lib/${PYTHON_VERSION}/compileall.py
AWKREVDATE= '/Last Changed Date/ {print "\"s|unknown date|" $$4 "|\""}'
diff --git a/devel/hachoir-core/Makefile b/devel/hachoir-core/Makefile
index 2868576b3af7..a89c4fe74cab 100644
--- a/devel/hachoir-core/Makefile
+++ b/devel/hachoir-core/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= CHEESESHOP
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Hachoir core parser
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USE= python
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/devel/hachoir-parser/Makefile b/devel/hachoir-parser/Makefile
index 36c584c0cf82..e2ec19dce883 100644
--- a/devel/hachoir-parser/Makefile
+++ b/devel/hachoir-parser/Makefile
@@ -12,7 +12,7 @@ COMMENT= Parsers of most common file formats
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/hachoir_core/__init__.py:${PORTSDIR}/devel/hachoir-core
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/hachoir_core/__init__.py:${PORTSDIR}/devel/hachoir-core
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/devel/hachoir-regex/Makefile b/devel/hachoir-regex/Makefile
index e4a6b162ffdf..8b8d633a830d 100644
--- a/devel/hachoir-regex/Makefile
+++ b/devel/hachoir-regex/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= CHEESESHOP
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Regular expression manipulation library
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile
index 13ba9a333103..ee956a308321 100644
--- a/devel/hg-git/Makefile
+++ b/devel/hg-git/Makefile
@@ -17,9 +17,8 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}dulwich>=*:${PORTSDIR}/devel/dulwich \
PORTDOCS= README.md
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS
diff --git a/devel/hgreviewboard/Makefile b/devel/hgreviewboard/Makefile
index f3fa4b0c7c9d..41bdd5f08f13 100644
--- a/devel/hgreviewboard/Makefile
+++ b/devel/hgreviewboard/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= hg:${PORTSDIR}/devel/mercurial \
rbt:${PORTSDIR}/devel/rbtools
WRKSRC= ${WRKDIR}/ccaughie-hgreviewboard-e461a0baf62d
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
diff --git a/devel/hgsvn/Makefile b/devel/hgsvn/Makefile
index 3d7d2088c1e6..4c32cdd29d7d 100644
--- a/devel/hgsvn/Makefile
+++ b/devel/hgsvn/Makefile
@@ -15,10 +15,8 @@ LICENSE= GPLv3
RUN_DEPENDS= svn:${PORTSDIR}/devel/subversion \
hg:${PORTSDIR}/devel/mercurial
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
PLIST_SUB= VERSION=${PORTVERSION} PYVER=${PYTHON_VERSION:S/python//}
.include <bsd.port.mk>
diff --git a/devel/hgview/Makefile b/devel/hgview/Makefile
index 3e77446919ed..242d589cf8c5 100644
--- a/devel/hgview/Makefile
+++ b/devel/hgview/Makefile
@@ -20,9 +20,8 @@ BUILD_DEPENDS= hg:${PORTSDIR}/devel/mercurial \
xmlto:${PORTSDIR}/textproc/xmlto \
asciidoc:${PORTSDIR}/textproc/asciidoc
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-USES= gmake
+USE_PYTHON= distutils
+USES= gmake python
PORTDOCS= *
OPTIONS_DEFINE= DOCS
diff --git a/devel/jep/Makefile b/devel/jep/Makefile
index 5d8b04d8010e..bd43ce8a2feb 100644
--- a/devel/jep/Makefile
+++ b/devel/jep/Makefile
@@ -16,10 +16,9 @@ MAKE_ENV= JAVA_HOME=${JAVA_HOME}
CONFIGURE_ARGS= --prefix=${PREFIX} --exec-prefix=${PREFIX}
USE_JAVA= yes
JAVA_VERSION= 1.6+
-USE_PYTHON= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= libtool
+USES= libtool python
# Necessary, since the configure script does the LIBS and
# LDFLAGS detection wrong
LDFLAGS= -L${LOCALBASE}/lib
diff --git a/devel/libewf/Makefile b/devel/libewf/Makefile
index 546b16af18f8..0836509fedb4 100644
--- a/devel/libewf/Makefile
+++ b/devel/libewf/Makefile
@@ -15,10 +15,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
-USES= fuse gettext iconv libtool:keepla pathfix pkgconfig
+USES= fuse gettext iconv libtool:keepla pathfix pkgconfig python:2
USE_LDCONFIG= yes
USE_OPENSSL= yes
-USE_PYTHON= 2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-python --with-libintl-prefix=${LOCALBASE} --with-libuuid=${LOCALBASE} ${ICONV_CONFIGURE_ARG} --with-libsmdev=no
diff --git a/devel/libftdi1/Makefile b/devel/libftdi1/Makefile
index e5855a947a89..3a9aced3b91d 100644
--- a/devel/libftdi1/Makefile
+++ b/devel/libftdi1/Makefile
@@ -39,7 +39,7 @@ CMAKE_ARGS+= -DEXAMPLES:BOOL=false
.endif
.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON= 2
+USES+= python:2
CMAKE_ARGS+= -DPYTHON_BINDINGS:BOOL=true
BUILD_DEPENDS+= swig2.0:${PORTSDIR}/devel/swig20
.else
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index b5304ab81668..4095b2dbc923 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -39,7 +39,7 @@ OPTIONS_DEFAULT=PYTHON
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON= 2
+USES+= python:2
PLIST_SUB+= PYTHON=""
.else
PLIST_SUB+= PYTHON="@comment "
diff --git a/devel/libhid/Makefile b/devel/libhid/Makefile
index c97b0f5a335e..6367d1ed6384 100644
--- a/devel/libhid/Makefile
+++ b/devel/libhid/Makefile
@@ -17,9 +17,8 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt \
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-doxygen --disable-werror
INSTALL_TARGET= install-strip
-USES= gmake libtool pathfix
+USES= gmake libtool pathfix python
USE_LDCONFIG= yes
-USE_PYTHON= yes
EXTRA_PATCHES= ${FILESDIR}/extra-patch-usb
diff --git a/devel/libmpsse/Makefile b/devel/libmpsse/Makefile
index 36ed745e4109..6f8280464098 100644
--- a/devel/libmpsse/Makefile
+++ b/devel/libmpsse/Makefile
@@ -13,10 +13,9 @@ LICENSE= GPLv2
BUILD_DEPENDS= swig2.0:${PORTSDIR}/devel/swig20
LIB_DEPENDS= libftdi.so:${PORTSDIR}/devel/libftdi
-USES= gmake pkgconfig
+USES= gmake pkgconfig python:2
USE_AUTOTOOLS= autoconf
USE_LDCONFIG= yes
-USE_PYTHON= 2
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include -fPIC
LDFLAGS+= -L${LOCALBASE}/lib -lftdi
diff --git a/devel/libopencm3/Makefile b/devel/libopencm3/Makefile
index 988e833048ca..ca448dd38a23 100644
--- a/devel/libopencm3/Makefile
+++ b/devel/libopencm3/Makefile
@@ -16,8 +16,7 @@ GH_ACCOUNT= libopencm3
GH_TAGNAME= ${GH_COMMIT}
GH_COMMIT= c01f9ee
-USES= gmake
-USE_PYTHON_BUILD= 2
+USES= gmake python:2,build
TOOLCHAIN_FULL_VERSION?=4_8-2014q2-20140609
TOOLCHAIN_PORT_VERSION?=4.8.20140609
diff --git a/devel/libopensync/Makefile b/devel/libopensync/Makefile
index 7d4d7c0e8d39..4dcc6dfb7839 100644
--- a/devel/libopensync/Makefile
+++ b/devel/libopensync/Makefile
@@ -16,10 +16,9 @@ LIB_DEPENDS= libexslt.so:${PORTSDIR}/textproc/libxslt
CONFLICTS= libopensync-0.22*
USE_SQLITE= 3
-USES= cmake pkgconfig tar:bzip2
+USES= cmake pkgconfig python tar:bzip2
CMAKE_ARGS+= -Wno-dev
USE_GNOME= glib20 libxml2
-USE_PYTHON= yes
USE_LDCONFIG= yes
CMAKE_ARGS+= -DPYTHON_INCLUDE_PATH:PATH=${PYTHON_INCLUDEDIR}
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 8e903b299425..5c80bfc9c27f 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -14,9 +14,8 @@ COMMENT= Next evolution of the Gedit plugins engine
BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala
-USE_PYTHON= 2
USE_LDCONFIG= yes
-USES= gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES= gettext gmake libtool:keepla pathfix pkgconfig python:2 tar:xz
USE_GNOME= gtk30 intlhack introspection:build
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
diff --git a/devel/libredblack/Makefile b/devel/libredblack/Makefile
index aa839e34b07c..d7c9ba3bfe7e 100644
--- a/devel/libredblack/Makefile
+++ b/devel/libredblack/Makefile
@@ -20,7 +20,7 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS+= --without-rbgen
PLIST_SUB+= PYTHON="@comment "
.else
-USE_PYTHON= yes
+USES+= python
CONFIGURE_ARGS+= --with-python=${PYTHON_CMD}
PLIST_SUB+= PYTHON=""
.endif
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 740323affb1c..ede2f2b04a80 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -20,12 +20,11 @@ USES= tar:xz
.if !defined(REFERENCE_PORT)
-USES+= gettext gmake libtool:keepla pathfix pkgconfig
+USES+= gettext gmake libtool:keepla pathfix pkgconfig python:2,build
USE_GNOME= gnomehier glib20 libxml2 referencehack intltool
USE_SQLITE= 3
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_PYTHON_BUILD= 2
CONFIGURE_ARGS= --disable-more-warnings
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/devel/libvirt-glib/Makefile b/devel/libvirt-glib/Makefile
index 722d1c0f362f..00de50951f5e 100644
--- a/devel/libvirt-glib/Makefile
+++ b/devel/libvirt-glib/Makefile
@@ -14,10 +14,9 @@ LIB_DEPENDS= libvirt.so:${PORTSDIR}/devel/libvirt
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-introspection
-USES= gmake libtool pathfix pkgconfig
+USES= gmake libtool pathfix pkgconfig python:2
USE_LDCONFIG= yes
USE_GNOME= intlhack introspection
-USE_PYTHON= 2
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -fstack-protector
LIBS+= -L${LOCALBASE}/lib
diff --git a/devel/libvshadow/Makefile b/devel/libvshadow/Makefile
index 098c1a1feab7..00c52a58cc1b 100644
--- a/devel/libvshadow/Makefile
+++ b/devel/libvshadow/Makefile
@@ -14,8 +14,7 @@ COMMENT= Library to support the Volume Service Snapshot (VSS) format
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= fuse gettext iconv libtool pathfix pkgconfig
-USE_PYTHON= 2
+USES= fuse gettext iconv libtool pathfix pkgconfig python:2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/llvm32/Makefile b/devel/llvm32/Makefile
index de7152ec1c42..bdf560096b9e 100644
--- a/devel/llvm32/Makefile
+++ b/devel/llvm32/Makefile
@@ -120,10 +120,10 @@ CONFIGURE_ARGS+= --disable-docs
.if ${PORT_OPTIONS:MLIT}
MAN1SRCS+= lit.1
-USE_PYTHON= 2
+USES+= python:2
LIT_COMMANDS= lit llvm-lit FileCheck
.else
-USE_PYTHON_BUILD= 2
+USES+= python:2,build
.endif
.if ${PORT_OPTIONS:MLTOPLUGIN}
diff --git a/devel/ncc/Makefile b/devel/ncc/Makefile
index 9d2fb079c566..f021b080af8b 100644
--- a/devel/ncc/Makefile
+++ b/devel/ncc/Makefile
@@ -12,7 +12,7 @@ COMMENT= Program analysis tool and call-graph navigator
ALL_TARGET= # empty
MAKE_ARGS+= CC="${CXX}" LCFLAGS="${CFLAGS}"
-USE_PYTHON_RUN= yes
+USES= python:run
CFLAGS+= -DNOGNU='\"${PREFIX}/include/ncc/nognu\"' -fpermissive
PLIST_FILES= bin/ncc bin/nccnav bin/nccnavi bin/ncc-gengraph.py \
diff --git a/devel/ninja-ide/Makefile b/devel/ninja-ide/Makefile
index 6cd1bf87b656..bbcace7e8d88 100644
--- a/devel/ninja-ide/Makefile
+++ b/devel/ninja-ide/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt4-declarative>=4.10.2:${PORTSDIR}/devel/py
${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5,1:${PORTSDIR}/net/py-qt4-network \
${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.8.5:${PORTSDIR}/www/py-qt4-webkit
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
USE_GITHUB= yes
GH_ACCOUNT= ninja-ide
diff --git a/devel/nxt-python/Makefile b/devel/nxt-python/Makefile
index 665f0c9213b7..eb6a32000823 100644
--- a/devel/nxt-python/Makefile
+++ b/devel/nxt-python/Makefile
@@ -14,8 +14,7 @@ LICENSE= GPLv3
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}usb>=0:${PORTSDIR}/devel/py-usb
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/omniNotify/Makefile b/devel/omniNotify/Makefile
index 72380ac5cf5e..3db0fbde74b0 100644
--- a/devel/omniNotify/Makefile
+++ b/devel/omniNotify/Makefile
@@ -26,8 +26,7 @@ BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
OMNIORB_WRKSRC= `cd ${PORTSDIR}/devel/omniORB && ${MAKE} -V WRKSRC`
-USES= gmake
-USE_PYTHON= yes
+USES= gmake python
GNU_CONFIGURE= yes
MAKEFILE= GNUmakefile
USE_LDCONFIG= yes
diff --git a/devel/open-usp-tukubai/Makefile b/devel/open-usp-tukubai/Makefile
index e94f2e4e8e20..3358785a0c13 100644
--- a/devel/open-usp-tukubai/Makefile
+++ b/devel/open-usp-tukubai/Makefile
@@ -9,8 +9,7 @@ MASTER_SITES= https://uec.usp-lab.com/TUKUBAI/DOWNLOAD/
MAINTAINER= daichi@FreeBSD.org
COMMENT= Open usp Tukubai is OSS version of Tukubai commands set
-USES= gmake tar:bzip2
-USE_PYTHON= yes
+USES= gmake python tar:bzip2
NO_BUILD= yes
MAKE_ENV+= STAGEDIR=${STAGEDIR}
diff --git a/devel/pep8/Makefile b/devel/pep8/Makefile
index cefdba863db9..2d000eba3f09 100644
--- a/devel/pep8/Makefile
+++ b/devel/pep8/Makefile
@@ -12,9 +12,8 @@ COMMENT= Python style guide checker
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
regression-test: extract
@(cd ${WRKSRC}; ${PYTHON_CMD} ${PORTNAME}.py \
diff --git a/devel/phpsh/Makefile b/devel/phpsh/Makefile
index e432bb000d6b..1e39097b0b91 100644
--- a/devel/phpsh/Makefile
+++ b/devel/phpsh/Makefile
@@ -15,10 +15,8 @@ COMMENT= Interactive shell for PHP
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= tar:bzip2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python tar:bzip2
+USE_PYTHON= distutils autoplist
USE_PHP= pcre posix tokenizer
WANT_PHP_CLI= yes
diff --git a/devel/py-Acquisition/Makefile b/devel/py-Acquisition/Makefile
index b0885fa13f47..f06b6cd2911a 100644
--- a/devel/py-Acquisition/Makefile
+++ b/devel/py-Acquisition/Makefile
@@ -16,9 +16,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.0:${PORTSDIR}/devel/py-ExtensionClass \
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-AddOns/Makefile b/devel/py-AddOns/Makefile
index 72d46616d1af..337a9d71004d 100644
--- a/devel/py-AddOns/Makefile
+++ b/devel/py-AddOns/Makefile
@@ -15,9 +15,7 @@ COMMENT= Dynamically extend other objects with AddOns
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:${PORTSDIR}/devel/py-decoratortools
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Breve/Makefile b/devel/py-Breve/Makefile
index b08e30dd32f6..fc25318e259e 100644
--- a/devel/py-Breve/Makefile
+++ b/devel/py-Breve/Makefile
@@ -12,8 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Python s-expression style template engine
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST=yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-BytecodeAssembler/Makefile b/devel/py-BytecodeAssembler/Makefile
index ddd92370036e..e0e30207ec9a 100644
--- a/devel/py-BytecodeAssembler/Makefile
+++ b/devel/py-BytecodeAssembler/Makefile
@@ -15,9 +15,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:${PORTSDIR}/devel/py-d
${PYTHON_PKGNAMEPREFIX}SymbolType>0:${PORTSDIR}/devel/py-SymbolType
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-DateTime/Makefile b/devel/py-DateTime/Makefile
index c57fec715743..d91a42dfec44 100644
--- a/devel/py-DateTime/Makefile
+++ b/devel/py-DateTime/Makefile
@@ -17,9 +17,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-DocumentTemplate/Makefile b/devel/py-DocumentTemplate/Makefile
index 6b522176ce09..f2079b1ba6d2 100644
--- a/devel/py-DocumentTemplate/Makefile
+++ b/devel/py-DocumentTemplate/Makefile
@@ -21,9 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-Acc
${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:${PORTSDIR}/devel/py-zope.sequencesort \
${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:${PORTSDIR}/textproc/py-zope.structuredtext
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-EnthoughtBase/Makefile b/devel/py-EnthoughtBase/Makefile
index 709cb7d36295..4ebfa0769de3 100644
--- a/devel/py-EnthoughtBase/Makefile
+++ b/devel/py-EnthoughtBase/Makefile
@@ -12,8 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Core Packages for the Enthought Tool Suite
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-ExtensionClass/Makefile b/devel/py-ExtensionClass/Makefile
index 1211a3452650..dc2fe232cc9b 100644
--- a/devel/py-ExtensionClass/Makefile
+++ b/devel/py-ExtensionClass/Makefile
@@ -13,9 +13,7 @@ COMMENT= Metaclass for subclassable extension types
LICENSE= ZPL21
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-InlineEgg/Makefile b/devel/py-InlineEgg/Makefile
index 058ed9f5dc71..68f3af9db2f1 100644
--- a/devel/py-InlineEgg/Makefile
+++ b/devel/py-InlineEgg/Makefile
@@ -12,12 +12,10 @@ MAINTAINER= sbz@FreeBSD.org
COMMENT= Python module for writing inline assembler programs
FETCH_BEFORE_ARGS=-o ${DISTFILES}
-USES= dos2unix shebangfix
+USES= dos2unix python shebangfix
SHEBANG_FILES= examples/*.py
python_CMD= ${PYTHON_CMD}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USE_PYTHON= distutils autoplist
PORTDOCS= InlineEgg.html Changelog README
PORTEXAMPLES= *
diff --git a/devel/py-Jinja/Makefile b/devel/py-Jinja/Makefile
index 4eef5d9835b1..f5a77fc70c89 100644
--- a/devel/py-Jinja/Makefile
+++ b/devel/py-Jinja/Makefile
@@ -14,9 +14,8 @@ COMMENT= Fast and easy to use stand-alone template engine
LICENSE= BSD3CLAUSE
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
PORTDOCS= *
diff --git a/devel/py-Jinja2/Makefile b/devel/py-Jinja2/Makefile
index 555871eecce9..cfa6b2ddeb2a 100644
--- a/devel/py-Jinja2/Makefile
+++ b/devel/py-Jinja2/Makefile
@@ -17,10 +17,9 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:${PORTSDIR}/textproc/py-MarkupSafe
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:${PORTSDIR}/textproc/py-MarkupSafe
-USE_PYTHON= yes
+USES= python
.if empty(PKGNAMESUFFIX)
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USE_PYTHON= distutils autoplist
.endif
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/devel/py-Missing/Makefile b/devel/py-Missing/Makefile
index ca94ad910925..afbc1f5f51c9 100644
--- a/devel/py-Missing/Makefile
+++ b/devel/py-Missing/Makefile
@@ -15,9 +15,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-MultiMapping/Makefile b/devel/py-MultiMapping/Makefile
index 6c0c2b9cbe33..18918de373fa 100644
--- a/devel/py-MultiMapping/Makefile
+++ b/devel/py-MultiMapping/Makefile
@@ -15,9 +15,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-PEAK-Rules/Makefile b/devel/py-PEAK-Rules/Makefile
index 1cc7cdf9b522..f1af7eeee2d9 100644
--- a/devel/py-PEAK-Rules/Makefile
+++ b/devel/py-PEAK-Rules/Makefile
@@ -17,8 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Extremes>=1.1.1:${PORTSDIR}/devel/py-extre
${PYTHON_PKGNAMEPREFIX}BytecodeAssembler>0:${PORTSDIR}/devel/py-BytecodeAssembler
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Persistence/Makefile b/devel/py-Persistence/Makefile
index 9374bc7f14fd..edfe4ddc0c0a 100644
--- a/devel/py-Persistence/Makefile
+++ b/devel/py-Persistence/Makefile
@@ -16,9 +16,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.ATContentTypes/Makefile b/devel/py-Products.ATContentTypes/Makefile
index ccc068cca6c1..93f9c124350d 100644
--- a/devel/py-Products.ATContentTypes/Makefile
+++ b/devel/py-Products.ATContentTypes/Makefile
@@ -39,8 +39,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:${PORTS
${PYTHON_PKGNAMEPREFIX}zconfig>=0:${PORTSDIR}/devel/py-zconfig \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-USES= zope zip
+USE_PYTHON= distutils
+USES= python:2 zope zip
.include <bsd.port.mk>
diff --git a/devel/py-Products.ATReferenceBrowserWidget/Makefile b/devel/py-Products.ATReferenceBrowserWidget/Makefile
index ac2737797dfc..f55caf4f631d 100644
--- a/devel/py-Products.ATReferenceBrowserWidget/Makefile
+++ b/devel/py-Products.ATReferenceBrowserWidget/Makefile
@@ -16,9 +16,7 @@ LICENSE= GPLv2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:${PORTSDIR}/devel/py-archetypes.referencebrowserwidget \
${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:${PORTSDIR}/devel/py-zope.deprecation
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.Archetypes/Makefile b/devel/py-Products.Archetypes/Makefile
index e16845db0be0..136e70be1991 100644
--- a/devel/py-Products.Archetypes/Makefile
+++ b/devel/py-Products.Archetypes/Makefile
@@ -50,8 +50,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:${PORTSDIR}/devel/py-Products.ZSQLMethods
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-USES= zope zip
+USE_PYTHON= distutils
+USES= python:2 zope zip
.include <bsd.port.mk>
diff --git a/devel/py-Products.BTreeFolder2/Makefile b/devel/py-Products.BTreeFolder2/Makefile
index 5dea44b9ad24..e12c1b705097 100644
--- a/devel/py-Products.BTreeFolder2/Makefile
+++ b/devel/py-Products.BTreeFolder2/Makefile
@@ -21,9 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-Acc
${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.CMFActionIcons/Makefile b/devel/py-Products.CMFActionIcons/Makefile
index a7519c4b470c..d76142ad2131 100644
--- a/devel/py-Products.CMFActionIcons/Makefile
+++ b/devel/py-Products.CMFActionIcons/Makefile
@@ -17,8 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtest
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.CMFCalendar/Makefile b/devel/py-Products.CMFCalendar/Makefile
index b9ec5e07350d..0331d915bea6 100644
--- a/devel/py-Products.CMFCalendar/Makefile
+++ b/devel/py-Products.CMFCalendar/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Pro
${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:${PORTSDIR}/devel/py-Products.CMFDefault \
${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
+USES= python:2
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/devel/py-Products.CMFCore/Makefile b/devel/py-Products.CMFCore/Makefile
index eb248f7af87c..88b7bc074b2c 100644
--- a/devel/py-Products.CMFCore/Makefile
+++ b/devel/py-Products.CMFCore/Makefile
@@ -19,8 +19,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:${PORTSDIR}/devel/p
${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:${PORTSDIR}/devel/py-Products.ZSQLMethods \
${PYTHON_PKGNAMEPREFIX}zope.app.publication>0:${PORTSDIR}/devel/py-zope.app.publication
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-#USES= zope # cyclic dependency
+#USES= zope # cyclic dependency
+USES= python:2
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/devel/py-Products.CMFDefault/Makefile b/devel/py-Products.CMFDefault/Makefile
index f0f3c565b866..afc3e3c8ed6b 100644
--- a/devel/py-Products.CMFDefault/Makefile
+++ b/devel/py-Products.CMFDefault/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=1.0.2:${PORTSDIR}/devel/py-fiv
${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/devel/py-Products.CMFDiffTool/Makefile b/devel/py-Products.CMFDiffTool/Makefile
index 7650ada7200c..8364f763dca5 100644
--- a/devel/py-Products.CMFDiffTool/Makefile
+++ b/devel/py-Products.CMFDiffTool/Makefile
@@ -18,10 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-#USES= zope
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.CMFDynamicViewFTI/Makefile b/devel/py-Products.CMFDynamicViewFTI/Makefile
index ac083c07feba..c8330d4b89c3 100644
--- a/devel/py-Products.CMFDynamicViewFTI/Makefile
+++ b/devel/py-Products.CMFDynamicViewFTI/Makefile
@@ -21,10 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-#USES= zope
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.CMFEditions/Makefile b/devel/py-Products.CMFEditions/Makefile
index c4496af5ca02..cfbc3a5e6696 100644
--- a/devel/py-Products.CMFEditions/Makefile
+++ b/devel/py-Products.CMFEditions/Makefile
@@ -27,8 +27,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.copy>0:${PORTSDIR}/devel/py-zope.copy \
${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-USES= zope zip
+USE_PYTHON= distutils
+USES= python zope zip
.include <bsd.port.mk>
diff --git a/devel/py-Products.CMFFormController/Makefile b/devel/py-Products.CMFFormController/Makefile
index aeb5c8dc20c3..5894f84c5371 100644
--- a/devel/py-Products.CMFFormController/Makefile
+++ b/devel/py-Products.CMFFormController/Makefile
@@ -21,9 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.CMFPlacefulWorkflow/Makefile b/devel/py-Products.CMFPlacefulWorkflow/Makefile
index 13632b3c2cc3..e095e686c23c 100644
--- a/devel/py-Products.CMFPlacefulWorkflow/Makefile
+++ b/devel/py-Products.CMFPlacefulWorkflow/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
${PYTHON_PKGNAMEPREFIX}Products.PloneTestCase>=0:${PORTSDIR}/devel/py-Products.PloneTestCase
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python zip
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/devel/py-Products.CMFQuickInstallerTool/Makefile b/devel/py-Products.CMFQuickInstallerTool/Makefile
index 5edb64deaa0c..357dfd63bbf6 100644
--- a/devel/py-Products.CMFQuickInstallerTool/Makefile
+++ b/devel/py-Products.CMFQuickInstallerTool/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.CMFTestCase/Makefile b/devel/py-Products.CMFTestCase/Makefile
index 52529626c052..7426a1346992 100644
--- a/devel/py-Products.CMFTestCase/Makefile
+++ b/devel/py-Products.CMFTestCase/Makefile
@@ -24,9 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.CMFUid/Makefile b/devel/py-Products.CMFUid/Makefile
index 5d07ea7f48ed..a914d2dcef5e 100644
--- a/devel/py-Products.CMFUid/Makefile
+++ b/devel/py-Products.CMFUid/Makefile
@@ -17,9 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtest
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-#USES= zope
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.DCWorkflow/Makefile b/devel/py-Products.DCWorkflow/Makefile
index 4380fab0439f..79c15b7d7386 100644
--- a/devel/py-Products.DCWorkflow/Makefile
+++ b/devel/py-Products.DCWorkflow/Makefile
@@ -17,8 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtest
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.ExtendedPathIndex/Makefile b/devel/py-Products.ExtendedPathIndex/Makefile
index e1420b727fc0..da82c5f71007 100644
--- a/devel/py-Products.ExtendedPathIndex/Makefile
+++ b/devel/py-Products.ExtendedPathIndex/Makefile
@@ -17,9 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>0:${PORTSDIR}/security/py-Acce
${PYTHON_PKGNAMEPREFIX}transaction>0:${PORTSDIR}/devel/py-transaction \
zodb${PYTHON_PKGNAMESUFFIX}>0:${PORTSDIR}/databases/zodb3
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= zope zip
+USES= python zope zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.ExternalEditor/Makefile b/devel/py-Products.ExternalEditor/Makefile
index 9885a5238e73..bd1875dadeda 100644
--- a/devel/py-Products.ExternalEditor/Makefile
+++ b/devel/py-Products.ExternalEditor/Makefile
@@ -13,9 +13,7 @@ COMMENT= Zope external editor
LICENSE= ZPL21
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.ExternalMethod/Makefile b/devel/py-Products.ExternalMethod/Makefile
index 3e75663a7e10..4b93bd31ffc9 100644
--- a/devel/py-Products.ExternalMethod/Makefile
+++ b/devel/py-Products.ExternalMethod/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-Acc
${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.GenericSetup/Makefile b/devel/py-Products.GenericSetup/Makefile
index 6b2e87c3df93..f4b9e0646037 100644
--- a/devel/py-Products.GenericSetup/Makefile
+++ b/devel/py-Products.GenericSetup/Makefile
@@ -17,9 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtest
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:${PORTSDIR}/devel/py-five.localsitemanager \
${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:${PORTSDIR}/devel/py-zope.formlib
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= zope
+USE_PYTHON= distutils autoplist
+USES= python:2 zope
.include <bsd.port.mk>
diff --git a/devel/py-Products.LDAPMultiPlugins/Makefile b/devel/py-Products.LDAPMultiPlugins/Makefile
index 3eaf118362e1..f5bcdfdc4294 100644
--- a/devel/py-Products.LDAPMultiPlugins/Makefile
+++ b/devel/py-Products.LDAPMultiPlugins/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap2>=2.0.6:${PORTSDIR}/net/py-ldap2 \
${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:${PORTSDIR}/devel/py-Products.LDAPUserFolder \
${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=1.4.0:${PORTSDIR}/security/py-Products.PluggableAuthService
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.LDAPUserFolder/Makefile b/devel/py-Products.LDAPUserFolder/Makefile
index e602989fcbbe..ecb513fbcc05 100644
--- a/devel/py-Products.LDAPUserFolder/Makefile
+++ b/devel/py-Products.LDAPUserFolder/Makefile
@@ -20,9 +20,8 @@ OPTIONS_DEFINE= POSIXGROUP_PATCH
POSIXGROUP_PATCH_DESC= Use posixGroup for group membership
OPTIONS_DEFAULT= POSIXGROUP_PATCH
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-#USES= zope
+USE_PYTHON= distutils
+USES= python:2
.include <bsd.port.options.mk>
diff --git a/devel/py-Products.MIMETools/Makefile b/devel/py-Products.MIMETools/Makefile
index 3fa992db64c7..d928dbbde578 100644
--- a/devel/py-Products.MIMETools/Makefile
+++ b/devel/py-Products.MIMETools/Makefile
@@ -15,9 +15,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:${PORTSDIR}/devel/py-DocumentTemplate
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.Marshall/Makefile b/devel/py-Products.Marshall/Makefile
index 08468ee2c072..bcc9cf7dc469 100644
--- a/devel/py-Products.Marshall/Makefile
+++ b/devel/py-Products.Marshall/Makefile
@@ -23,9 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transact
${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.MimetypesRegistry/Makefile b/devel/py-Products.MimetypesRegistry/Makefile
index fa7c51b80498..a59396d6d47f 100644
--- a/devel/py-Products.MimetypesRegistry/Makefile
+++ b/devel/py-Products.MimetypesRegistry/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:${PORTSDIR}/devel/py-zop
${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.OFSP/Makefile b/devel/py-Products.OFSP/Makefile
index 7f853621ef54..d576659ede54 100644
--- a/devel/py-Products.OFSP/Makefile
+++ b/devel/py-Products.OFSP/Makefile
@@ -16,9 +16,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.PasswordResetTool/Makefile b/devel/py-Products.PasswordResetTool/Makefile
index e1a2917f0882..98d3b892a771 100644
--- a/devel/py-Products.PasswordResetTool/Makefile
+++ b/devel/py-Products.PasswordResetTool/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.me
${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-USES= zope zip
+USE_PYTHON= distutils
+USES= python zope zip
.include <bsd.port.mk>
diff --git a/devel/py-Products.PlacelessTranslationService/Makefile b/devel/py-Products.PlacelessTranslationService/Makefile
index 54ead532430b..e893d625eb0d 100644
--- a/devel/py-Products.PlacelessTranslationService/Makefile
+++ b/devel/py-Products.PlacelessTranslationService/Makefile
@@ -26,9 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gettext>=0.6:${PORTSDIR}/textproc/py-gettext
${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.PloneLanguageTool/Makefile b/devel/py-Products.PloneLanguageTool/Makefile
index 148a98a291db..6c9a040585af 100644
--- a/devel/py-Products.PloneLanguageTool/Makefile
+++ b/devel/py-Products.PloneLanguageTool/Makefile
@@ -13,8 +13,7 @@ COMMENT= Allows to set the available languages in Plone site
LICENSE= GPLv2
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python zip
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/devel/py-Products.PloneTestCase/Makefile b/devel/py-Products.PloneTestCase/Makefile
index 5d330832db83..1b43b06f7cac 100644
--- a/devel/py-Products.PloneTestCase/Makefile
+++ b/devel/py-Products.PloneTestCase/Makefile
@@ -23,9 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= zope zip
+USE_PYTHON= distutils autoplist
+USES= python:2 zope zip
.include <bsd.port.mk>
diff --git a/devel/py-Products.PluginRegistry/Makefile b/devel/py-Products.PluginRegistry/Makefile
index 6ae7d8666632..c0f7dd1d1258 100644
--- a/devel/py-Products.PluginRegistry/Makefile
+++ b/devel/py-Products.PluginRegistry/Makefile
@@ -16,9 +16,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-#USES= zope
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.PortalTransforms/Makefile b/devel/py-Products.PortalTransforms/Makefile
index 4de0a6582a3a..1b87d8199083 100644
--- a/devel/py-Products.PortalTransforms/Makefile
+++ b/devel/py-Products.PortalTransforms/Makefile
@@ -23,9 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:${PORTSDIR}/www/py-
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}markdown>=1.7:${PORTSDIR}/textproc/py-markdown
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.PythonScripts/Makefile b/devel/py-Products.PythonScripts/Makefile
index feb424b1b829..87b291037bb8 100644
--- a/devel/py-Products.PythonScripts/Makefile
+++ b/devel/py-Products.PythonScripts/Makefile
@@ -20,9 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-Acc
${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:${PORTSDIR}/security/py-RestrictedPython \
${PYTHON_PKGNAMEPREFIX}zExceptions>=0:${PORTSDIR}/devel/py-zExceptions
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.ResourceRegistries/Makefile b/devel/py-Products.ResourceRegistries/Makefile
index 4bfaa152b614..66e81e414ff7 100644
--- a/devel/py-Products.ResourceRegistries/Makefile
+++ b/devel/py-Products.ResourceRegistries/Makefile
@@ -23,9 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}plone.app.registry>0:${PORTSDIR}/www/py-plone.app.registry
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= zope zip
+USE_PYTHON= distutils autoplist
+USES= python:2 zope zip
.include <bsd.port.mk>
diff --git a/devel/py-Products.StandardCacheManagers/Makefile b/devel/py-Products.StandardCacheManagers/Makefile
index 1d98fbdf351b..46336f64698b 100644
--- a/devel/py-Products.StandardCacheManagers/Makefile
+++ b/devel/py-Products.StandardCacheManagers/Makefile
@@ -17,9 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-Acc
${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.ZCTextIndex/Makefile b/devel/py-Products.ZCTextIndex/Makefile
index db86cb8e7265..2efc8e6bec7c 100644
--- a/devel/py-Products.ZCTextIndex/Makefile
+++ b/devel/py-Products.ZCTextIndex/Makefile
@@ -20,9 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-Acc
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.ZCatalog/Makefile b/devel/py-Products.ZCatalog/Makefile
index c242d0403aed..31c083333383 100644
--- a/devel/py-Products.ZCatalog/Makefile
+++ b/devel/py-Products.ZCatalog/Makefile
@@ -29,9 +29,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-Acc
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.ZSQLMethods/Makefile b/devel/py-Products.ZSQLMethods/Makefile
index 5a72bfdcd7fc..0ac487e766a1 100644
--- a/devel/py-Products.ZSQLMethods/Makefile
+++ b/devel/py-Products.ZSQLMethods/Makefile
@@ -23,9 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisit
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.ZopeVersionControl/Makefile b/devel/py-Products.ZopeVersionControl/Makefile
index 56b7a91f739a..155375651230 100644
--- a/devel/py-Products.ZopeVersionControl/Makefile
+++ b/devel/py-Products.ZopeVersionControl/Makefile
@@ -19,10 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-#USES= zope
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.contentmigration/Makefile b/devel/py-Products.contentmigration/Makefile
index f2c1388c2b9b..2447ec5f6366 100644
--- a/devel/py-Products.contentmigration/Makefile
+++ b/devel/py-Products.contentmigration/Makefile
@@ -13,9 +13,7 @@ COMMENT= Generic content migration framework for Plone
LICENSE= LGPL20
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.statusmessages/Makefile b/devel/py-Products.statusmessages/Makefile
index 1a859b24b4db..6cad3478a443 100644
--- a/devel/py-Products.statusmessages/Makefile
+++ b/devel/py-Products.statusmessages/Makefile
@@ -17,9 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Products.validation/Makefile b/devel/py-Products.validation/Makefile
index 4be18ee44789..366d287bb735 100644
--- a/devel/py-Products.validation/Makefile
+++ b/devel/py-Products.validation/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n
${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-RPyC/Makefile b/devel/py-RPyC/Makefile
index 0968b3260d57..ecbbe158cb34 100644
--- a/devel/py-RPyC/Makefile
+++ b/devel/py-RPyC/Makefile
@@ -18,8 +18,7 @@ OPTIONS_DEFAULT=PLUMBUM
PLUMBUM_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plumbum>0:${PORTSDIR}/sysutils/py-plumbum
PLUMBUM_DESC= Required for features like rpyc_classic.py and zero deploy
-USE_PYTHON= -3.3
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:-3.3
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-Record/Makefile b/devel/py-Record/Makefile
index b2f2ad2f5ed2..58f45f5f3cb2 100644
--- a/devel/py-Record/Makefile
+++ b/devel/py-Record/Makefile
@@ -15,9 +15,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-ScriptTest/Makefile b/devel/py-ScriptTest/Makefile
index 67e72cdb65d0..5ce8b32881f5 100644
--- a/devel/py-ScriptTest/Makefile
+++ b/devel/py-ScriptTest/Makefile
@@ -13,8 +13,7 @@ COMMENT= Helper to test command-line scripts
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-SymbolType/Makefile b/devel/py-SymbolType/Makefile
index 167f4e308705..66b4adf22570 100644
--- a/devel/py-SymbolType/Makefile
+++ b/devel/py-SymbolType/Makefile
@@ -12,9 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wenheping@gmail.com
COMMENT= Simple Symbol Type for Python
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-TGScheduler/Makefile b/devel/py-TGScheduler/Makefile
index 468102359618..9ba9ed0e72f0 100644
--- a/devel/py-TGScheduler/Makefile
+++ b/devel/py-TGScheduler/Makefile
@@ -14,9 +14,8 @@ COMMENT= Turbogears Scheduler
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-patch:
@${REINPLACE_CMD} -e 's,<2.0dev,!=2.0,g' ${WRKSRC}/setup.py
diff --git a/devel/py-ToscaWidgets/Makefile b/devel/py-ToscaWidgets/Makefile
index 9289dd3d8515..37f2f9ad312c 100644
--- a/devel/py-ToscaWidgets/Makefile
+++ b/devel/py-ToscaWidgets/Makefile
@@ -15,8 +15,7 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=0:${PORTSDIR}/www/py-webob
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-TurboJinja/Makefile b/devel/py-TurboJinja/Makefile
index 1a2b15cdfb23..96376aabe999 100644
--- a/devel/py-TurboJinja/Makefile
+++ b/devel/py-TurboJinja/Makefile
@@ -17,9 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}TurboGears>=1.1.2:${PORTSDIR}/www/py-turbo
RUN_DEPENDS:= ${BUILD_DEPENDS}
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja>=0.9:${PORTSDIR}/devel/py-Jinja
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-ZopeUndo/Makefile b/devel/py-ZopeUndo/Makefile
index 8e839f0944ca..7eaf1df4d470 100644
--- a/devel/py-ZopeUndo/Makefile
+++ b/devel/py-ZopeUndo/Makefile
@@ -13,9 +13,7 @@ COMMENT= ZODB undo support for Zope2
LICENSE= ZPL21
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-akismet/Makefile b/devel/py-akismet/Makefile
index 5d8d038f49fc..ffa610e8b29f 100644
--- a/devel/py-akismet/Makefile
+++ b/devel/py-akismet/Makefile
@@ -14,9 +14,8 @@ COMMENT= Python interface to the Akismet API
LICENSE= BSD
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python zip
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= akismet
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/devel/py-anonfunc/Makefile b/devel/py-anonfunc/Makefile
index 1b609b7a4cb5..f8c8a86d9725 100644
--- a/devel/py-anonfunc/Makefile
+++ b/devel/py-anonfunc/Makefile
@@ -12,9 +12,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python module that provides easy anonymous function
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-patch:
@${REINPLACE_CMD} \
diff --git a/devel/py-anyjson/Makefile b/devel/py-anyjson/Makefile
index 6b9e32566a75..b7084aaef0ab 100644
--- a/devel/py-anyjson/Makefile
+++ b/devel/py-anyjson/Makefile
@@ -13,8 +13,7 @@ COMMENT= JSON library wrapper for Python
LICENSE= BSD
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-application/Makefile b/devel/py-application/Makefile
index 332ec6490b3f..97e4421dc157 100644
--- a/devel/py-application/Makefile
+++ b/devel/py-application/Makefile
@@ -12,9 +12,7 @@ DISTNAME= python-${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@grosbein.net
COMMENT= Basic building blocks for python applications
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
-PYDISTUTILS_PKGNAME=python_${PORTNAME}
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-archetypes.querywidget/Makefile b/devel/py-archetypes.querywidget/Makefile
index 67414798682d..8e02fd79e0cd 100644
--- a/devel/py-archetypes.querywidget/Makefile
+++ b/devel/py-archetypes.querywidget/Makefile
@@ -16,9 +16,7 @@ LICENSE= GPLv2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.querystring>=1.0.3:${PORTSDIR}/www/py-plone.app.querystring \
${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:${PORTSDIR}/www/py-plone.app.jquerytools
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-archetypes.referencebrowserwidget/Makefile b/devel/py-archetypes.referencebrowserwidget/Makefile
index 156eb5b95b04..a28118fbc8e3 100644
--- a/devel/py-archetypes.referencebrowserwidget/Makefile
+++ b/devel/py-archetypes.referencebrowserwidget/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:${PORTSDIR}/www/py-plone.app.form \
${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=1.1:${PORTSDIR}/www/py-plone.app.jquerytools
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-archetypes.schemaextender/Makefile b/devel/py-archetypes.schemaextender/Makefile
index 6b3b20079dec..f8f717a0ae33 100644
--- a/devel/py-archetypes.schemaextender/Makefile
+++ b/devel/py-archetypes.schemaextender/Makefile
@@ -15,9 +15,7 @@ LICENSE= GPLv2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:${PORTSDIR}/www/py-plone.uuid
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-argh/Makefile b/devel/py-argh/Makefile
index f7621c4f4def..33f55b46a153 100644
--- a/devel/py-argh/Makefile
+++ b/devel/py-argh/Makefile
@@ -12,8 +12,7 @@ COMMENT= Simple (Python) argparse wrapper
LICENSE= LGPL3
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-argparse/Makefile b/devel/py-argparse/Makefile
index f83feeeb2d66..c4c7d7ad2864 100644
--- a/devel/py-argparse/Makefile
+++ b/devel/py-argparse/Makefile
@@ -13,8 +13,7 @@ COMMENT= Optparse-inspired command-line parsing library
LICENSE= PSFL
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-args/Makefile b/devel/py-args/Makefile
index a564614e91c3..013513ee807d 100644
--- a/devel/py-args/Makefile
+++ b/devel/py-args/Makefile
@@ -13,9 +13,7 @@ COMMENT= Command arguments for humans
LICENSE= BSD2CLAUSE
-PYDISTUTILS_AUTOPLIST= yes
-
-USE_PYDISTUTILS= yes
-USE_PYTHON= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-asn1-modules/Makefile b/devel/py-asn1-modules/Makefile
index 6ca4e911a1f4..4fb3ec6fd26d 100644
--- a/devel/py-asn1-modules/Makefile
+++ b/devel/py-asn1-modules/Makefile
@@ -15,11 +15,9 @@ LICENSE= BSD2CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asn1>=0.1.4:${PORTSDIR}/devel/py-asn1
-USES= shebangfix
-SHEBANG_FILES= tools/*.py
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python shebangfix
+SHEBANG_FILES= tools/*.py
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
PORTDOCS= CHANGES README
diff --git a/devel/py-asn1/Makefile b/devel/py-asn1/Makefile
index 6667c39c2956..c5b8c0e1c190 100644
--- a/devel/py-asn1/Makefile
+++ b/devel/py-asn1/Makefile
@@ -14,9 +14,8 @@ COMMENT= ASN.1 toolkit for Python
LICENSE= BSD2CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
diff --git a/devel/py-aspects/Makefile b/devel/py-aspects/Makefile
index 41791e57343a..b5f23f74331f 100644
--- a/devel/py-aspects/Makefile
+++ b/devel/py-aspects/Makefile
@@ -14,9 +14,8 @@ COMMENT= Lightweight aspect oriented programming library for Python
LICENSE= LGPL21
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
SUB_FILES= pkg-message
diff --git a/devel/py-aspyct/Makefile b/devel/py-aspyct/Makefile
index f31a7d5a9c9c..d2ee30e335ef 100644
--- a/devel/py-aspyct/Makefile
+++ b/devel/py-aspyct/Makefile
@@ -13,8 +13,7 @@ COMMENT= Python library including an aspect-oriented programming (AOP) engine
LICENSE= LGPL3
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-async/Makefile b/devel/py-async/Makefile
index e933a0b1109d..ae00cbabbee1 100644
--- a/devel/py-async/Makefile
+++ b/devel/py-async/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Framework to process interdependent tasks in a pool of workers
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-asyncio/Makefile b/devel/py-asyncio/Makefile
index 3b58c46460e3..6cfaa219b6ea 100644
--- a/devel/py-asyncio/Makefile
+++ b/devel/py-asyncio/Makefile
@@ -13,9 +13,8 @@ COMMENT= Reference implementation of PEP 3156 (Asynchronous IO)
LICENSE= APACHE20
-USE_PYTHON= 3.3+
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:3.3+
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && ${MAKE} test
diff --git a/devel/py-avro/Makefile b/devel/py-avro/Makefile
index 12ab0a8351f1..95a8e8a51b03 100644
--- a/devel/py-avro/Makefile
+++ b/devel/py-avro/Makefile
@@ -14,9 +14,8 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= vg@FreeBSD.org
COMMENT= Data serialization system for python
-USE_PYDISTUTILS= yes
-USE_PYTHON= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/${DISTNAME}/lang/py
diff --git a/devel/py-babel/Makefile b/devel/py-babel/Makefile
index 2f33952babba..97e6e06ddf69 100644
--- a/devel/py-babel/Makefile
+++ b/devel/py-babel/Makefile
@@ -15,9 +15,8 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
PORTDOCS= docs/*
diff --git a/devel/py-babelfish/Makefile b/devel/py-babelfish/Makefile
index 7545668baa6c..774fb5140144 100644
--- a/devel/py-babelfish/Makefile
+++ b/devel/py-babelfish/Makefile
@@ -12,8 +12,7 @@ COMMENT= Module to work with countries and languages
LICENSE= BSD3CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-bcdoc/Makefile b/devel/py-bcdoc/Makefile
index 328fa9974dac..c28013c4c3cc 100644
--- a/devel/py-bcdoc/Makefile
+++ b/devel/py-bcdoc/Makefile
@@ -15,8 +15,7 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:${PORTSDIR}/textproc/py-docutils \
${PYTHON_PKGNAMEPREFIX}six>=1.1.0:${PORTSDIR}/devel/py-six
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-billiard/Makefile b/devel/py-billiard/Makefile
index 04808ee4e997..4007a604d4d2 100644
--- a/devel/py-billiard/Makefile
+++ b/devel/py-billiard/Makefile
@@ -12,8 +12,7 @@ COMMENT= Python multiprocessing fork with improvements and bugfixes
LICENSE= BSD3CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-bison/Makefile b/devel/py-bison/Makefile
index 0a53a232654d..f14ee1d01abb 100644
--- a/devel/py-bison/Makefile
+++ b/devel/py-bison/Makefile
@@ -18,10 +18,8 @@ BUILD_DEPENDS= pyrex>=0.9.6.2:${PORTSDIR}/devel/pyrex
OPTIONS_DEFINE= DOCS EXAMPLES
-USES= bison:both
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= bison:both python
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/devel/py-bitarray/Makefile b/devel/py-bitarray/Makefile
index 3b143d7a0057..961003df4f04 100644
--- a/devel/py-bitarray/Makefile
+++ b/devel/py-bitarray/Makefile
@@ -13,9 +13,8 @@ COMMENT= Efficient arrays of booleans
LICENSE= PSFL
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/devel/py-bitstring/Makefile b/devel/py-bitstring/Makefile
index 74e2135abe17..859a4cbe39d2 100644
--- a/devel/py-bitstring/Makefile
+++ b/devel/py-bitstring/Makefile
@@ -12,10 +12,8 @@ COMMENT= Simple construction, analysis, and modification of binary data
LICENSE= MIT
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
PORTDOCS= PKG-INFO README.txt release_notes.txt
diff --git a/devel/py-blessings/Makefile b/devel/py-blessings/Makefile
index c567a671edc1..8213308ab628 100644
--- a/devel/py-blessings/Makefile
+++ b/devel/py-blessings/Makefile
@@ -11,8 +11,7 @@ COMMENT= Thin wrapper around terminal coloring, styling, and positioning
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-blinker/Makefile b/devel/py-blinker/Makefile
index 17fc33dfcbad..3d9395e61e64 100644
--- a/devel/py-blinker/Makefile
+++ b/devel/py-blinker/Makefile
@@ -14,9 +14,8 @@ LICENSE= MIT
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && nosetests
diff --git a/devel/py-bluelet/Makefile b/devel/py-bluelet/Makefile
index e93619b7210c..7bca1d262a11 100644
--- a/devel/py-bluelet/Makefile
+++ b/devel/py-bluelet/Makefile
@@ -12,8 +12,8 @@ COMMENT= Pure-Python asynchronous I/O using coroutines
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PLIST_FILES= %%PYTHON_SITELIBDIR%%/bluelet.py \
%%PYTHON_SITELIBDIR%%/bluelet.pyc \
diff --git a/devel/py-botocore/Makefile b/devel/py-botocore/Makefile
index 1b71034773f7..e34f0a0c39f6 100644
--- a/devel/py-botocore/Makefile
+++ b/devel/py-botocore/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil
${PYTHON_PKGNAMEPREFIX}jmespath>=0.4.1:${PORTSDIR}/devel/py-jmespath \
${PYTHON_PKGNAMEPREFIX}six>=1.1.0:${PORTSDIR}/devel/py-six
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-capstone/Makefile b/devel/py-capstone/Makefile
index 93d47f661d1a..078d6e0ee039 100644
--- a/devel/py-capstone/Makefile
+++ b/devel/py-capstone/Makefile
@@ -15,8 +15,7 @@ LICENSE= BSD3CLAUSE
LIB_DEPENDS= libcapstone.so:${PORTSDIR}/devel/capstone
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-cfgparse/Makefile b/devel/py-cfgparse/Makefile
index e5f746053842..29e2f040100a 100644
--- a/devel/py-cfgparse/Makefile
+++ b/devel/py-cfgparse/Makefile
@@ -10,11 +10,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= jdferrell3@yahoo.com
COMMENT= Python module for parsing configuration files
-USES= dos2unix zip
-DOS2UNIX_FILES= cfgparse.py
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= dos2unix python zip
+DOS2UNIX_FILES= cfgparse.py
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
PORTDOCS= *
diff --git a/devel/py-checkmanifest/Makefile b/devel/py-checkmanifest/Makefile
index 5f1d1c4849a0..cf8967d8dd23 100644
--- a/devel/py-checkmanifest/Makefile
+++ b/devel/py-checkmanifest/Makefile
@@ -15,10 +15,8 @@ LICENSE= MIT
OPTIONS_DEFINE= DOCS
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-PYTHON_CONCURRENT_INSTALL= yes
+USES= python
+USE_PYTHON= distutils autoplist concurrent
PORTDOCS= README.rst \
CHANGES.rst
diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile
index 9d6aba776d61..fa83dcd308e1 100644
--- a/devel/py-cheetah/Makefile
+++ b/devel/py-cheetah/Makefile
@@ -14,8 +14,7 @@ COMMENT= HTML template engine for Python
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:${PORTSDIR}/textproc/py-markdown
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-ciphon/Makefile b/devel/py-ciphon/Makefile
index 6b0fa911c0cb..06059cdc6fe3 100644
--- a/devel/py-ciphon/Makefile
+++ b/devel/py-ciphon/Makefile
@@ -12,8 +12,8 @@ COMMENT= Module for python that adds cpan-like functionality
LICENSE= BSD2CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
post-install:
@${MV} -f ${STAGEDIR}${PREFIX}/bin/ciphon.py ${STAGEDIR}${PREFIX}/bin/ciphon
diff --git a/devel/py-circuits/Makefile b/devel/py-circuits/Makefile
index 449f34ed19a1..f2457085480d 100644
--- a/devel/py-circuits/Makefile
+++ b/devel/py-circuits/Makefile
@@ -15,9 +15,8 @@ LICENSE= MIT
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
diff --git a/devel/py-cjson/Makefile b/devel/py-cjson/Makefile
index 4fb3333f0087..10171386df96 100644
--- a/devel/py-cjson/Makefile
+++ b/devel/py-cjson/Makefile
@@ -13,7 +13,7 @@ COMMENT= Fast JSON encoder/decoder for Python
LICENSE= LGPL20
-USES= python
+USES= python
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-cld/Makefile b/devel/py-cld/Makefile
index 6eeb4f788fc4..e6d7098357f9 100644
--- a/devel/py-cld/Makefile
+++ b/devel/py-cld/Makefile
@@ -16,9 +16,8 @@ LICENSE= BSD
LIB_DEPENDS= libcld.so:${PORTSDIR}/devel/cld
-USES= pkgconfig
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= pkgconfig python
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= chromium_compact_language_detector
PLIST_FILES= %%PYTHON_SITELIBDIR%%/cld.so
diff --git a/devel/py-click/Makefile b/devel/py-click/Makefile
index c154903d3b29..8d90d7beaa81 100644
--- a/devel/py-click/Makefile
+++ b/devel/py-click/Makefile
@@ -12,8 +12,7 @@ COMMENT= Python package for creating command line interfaces
LICENSE= BSD3CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-clint/Makefile b/devel/py-clint/Makefile
index 848ecc697836..17b4c257f8d8 100644
--- a/devel/py-clint/Makefile
+++ b/devel/py-clint/Makefile
@@ -15,9 +15,7 @@ LICENSE= ISCL
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:${PORTSDIR}/devel/py-args
-PYDISTUTILS_AUTOPLIST= yes
-
-USE_PYDISTUTILS= yes
-USE_PYTHON= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-clonedigger/Makefile b/devel/py-clonedigger/Makefile
index 8f99290529d1..1e8ce5e6d74b 100644
--- a/devel/py-clonedigger/Makefile
+++ b/devel/py-clonedigger/Makefile
@@ -14,8 +14,7 @@ COMMENT= Detect similar code in Python and Java programs
LICENSE= GPLv2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-cmdln/Makefile b/devel/py-cmdln/Makefile
index 9e0bce661d5a..b4f199173d2f 100644
--- a/devel/py-cmdln/Makefile
+++ b/devel/py-cmdln/Makefile
@@ -13,9 +13,8 @@ COMMENT= Python module for easily building good multi-command scripts
LICENSE= MIT
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
+USES= python:2 zip
+USE_PYTHON= distutils
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/devel/py-collective.monkeypatcher/Makefile b/devel/py-collective.monkeypatcher/Makefile
index 587aa7da1049..863483e375bf 100644
--- a/devel/py-collective.monkeypatcher/Makefile
+++ b/devel/py-collective.monkeypatcher/Makefile
@@ -13,9 +13,7 @@ COMMENT= Applying monkey patches on startup using ZCML configuration
LICENSE= BSD
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-collective.z3cform.datetimewidget/Makefile b/devel/py-collective.z3cform.datetimewidget/Makefile
index 8667363dc6e3..90e4b5ef19d3 100644
--- a/devel/py-collective.z3cform.datetimewidget/Makefile
+++ b/devel/py-collective.z3cform.datetimewidget/Makefile
@@ -17,9 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n
${PYTHON_PKGNAMEPREFIX}z3c.form>=0:${PORTSDIR}/devel/py-z3c.form \
${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:${PORTSDIR}/devel/py-zope.deprecation
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-colorama/Makefile b/devel/py-colorama/Makefile
index 1250546f2063..90639f659799 100644
--- a/devel/py-colorama/Makefile
+++ b/devel/py-colorama/Makefile
@@ -12,8 +12,7 @@ COMMENT= Cross-platform API to print colored terminal text from Python apps
LICENSE= BSD
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-conditional/Makefile b/devel/py-conditional/Makefile
index d1b029125a70..72088e1521e5 100644
--- a/devel/py-conditional/Makefile
+++ b/devel/py-conditional/Makefile
@@ -11,9 +11,7 @@ COMMENT= Conditionally enter a context manager
LICENSE= BSD2CLAUSE
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-configobj/Makefile b/devel/py-configobj/Makefile
index a4fc644fc4e3..ca68b694cfdf 100644
--- a/devel/py-configobj/Makefile
+++ b/devel/py-configobj/Makefile
@@ -13,9 +13,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Simple but powerful config file reader and writer
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-configparser/Makefile b/devel/py-configparser/Makefile
index ebe22a3cbc6a..58ec683baf4c 100644
--- a/devel/py-configparser/Makefile
+++ b/devel/py-configparser/Makefile
@@ -11,8 +11,7 @@ COMMENT= INI style configuration file parser
LICENSE= MIT
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-construct/Makefile b/devel/py-construct/Makefile
index 9ffda30d1d91..c3aff2cc18d9 100644
--- a/devel/py-construct/Makefile
+++ b/devel/py-construct/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= p.florczyk@adminworkshop.pl
COMMENT= Python module for parsing and building of data structures
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-country/Makefile b/devel/py-country/Makefile
index 228e45bc636a..5cd653a9d19d 100644
--- a/devel/py-country/Makefile
+++ b/devel/py-country/Makefile
@@ -12,9 +12,7 @@ DISTNAME= pycountry-${PORTVERSION}
MAINTAINER= demon@FreeBSD.org
COMMENT= Python API for ISO country, subdivision, language and currency
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-coverage/Makefile b/devel/py-coverage/Makefile
index 24cf3ff6caaa..651c63a830bd 100644
--- a/devel/py-coverage/Makefile
+++ b/devel/py-coverage/Makefile
@@ -13,8 +13,7 @@ COMMENT= Code coverage measurement for Python
LICENSE= BSD
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-crcmod/Makefile b/devel/py-crcmod/Makefile
index f52a7b034430..3a75fc96dbe7 100644
--- a/devel/py-crcmod/Makefile
+++ b/devel/py-crcmod/Makefile
@@ -14,9 +14,8 @@ COMMENT= Module for Cyclic Redundancy Check (CRC) calculations
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
PORTDOCS= *
diff --git a/devel/py-ctags/Makefile b/devel/py-ctags/Makefile
index 9d9da88a787c..8d864604fea9 100644
--- a/devel/py-ctags/Makefile
+++ b/devel/py-ctags/Makefile
@@ -12,8 +12,7 @@ DISTNAME= python-ctags-${PORTVERSION}
MAINTAINER= ahkdiep@gmail.com
COMMENT= Python bindings for ctags index file
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-cxx/Makefile b/devel/py-cxx/Makefile
index 8a09438e7b1c..73403c097e31 100644
--- a/devel/py-cxx/Makefile
+++ b/devel/py-cxx/Makefile
@@ -11,9 +11,8 @@ DISTNAME= pycxx-${PORTVERSION}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Make it easier to extend Python with C++
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-USE_PYTHON_PREFIX= yes
+USES= python
+USE_PYTHON= distutils pythonprefix
PYDISTUTILS_PKGNAME= CXX
PYDISTUTILS_PKGVERSION= 5.3
diff --git a/devel/py-d2to1/Makefile b/devel/py-d2to1/Makefile
index f5566f5b88a2..d357610be734 100644
--- a/devel/py-d2to1/Makefile
+++ b/devel/py-d2to1/Makefile
@@ -12,8 +12,7 @@ COMMENT= Distutils2-like setup.cfg files with setuptools setup.py
LICENSE= BSD3CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-dal/Makefile b/devel/py-dal/Makefile
index 60eeec6b20f4..75f782b14510 100644
--- a/devel/py-dal/Makefile
+++ b/devel/py-dal/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= bamby@sippysoft.com
COMMENT= Database abstraction layer for Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-darcsver/Makefile b/devel/py-darcsver/Makefile
index ac43da5f24bc..5d8ccca64d7b 100644
--- a/devel/py-darcsver/Makefile
+++ b/devel/py-darcsver/Makefile
@@ -11,9 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Generate a version number from darcs history
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-patch:
@${REINPLACE_CMD} -e 's#(doc_loc, data_fnames)##g' ${WRKSRC}/setup.py
diff --git a/devel/py-decorator/Makefile b/devel/py-decorator/Makefile
index 8d42c5a1d7ef..9013f656d2f5 100644
--- a/devel/py-decorator/Makefile
+++ b/devel/py-decorator/Makefile
@@ -13,8 +13,7 @@ COMMENT= Better living through Python with decorators
LICENSE= BSD
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-defusedxml/Makefile b/devel/py-defusedxml/Makefile
index a62dbf3a4a56..b98dc273b699 100644
--- a/devel/py-defusedxml/Makefile
+++ b/devel/py-defusedxml/Makefile
@@ -12,9 +12,8 @@ COMMENT= XML bomb protection for Python stdlib modules
LICENSE= PSFL
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
PORTDOCS= *
DOCS_FILES= CHANGES.txt README.txt
diff --git a/devel/py-deliciousapi/Makefile b/devel/py-deliciousapi/Makefile
index 9e0eda7f110d..165a27e2fbb8 100644
--- a/devel/py-deliciousapi/Makefile
+++ b/devel/py-deliciousapi/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifuls
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-demjson/Makefile b/devel/py-demjson/Makefile
index eb509fd56740..5b0c542ebe71 100644
--- a/devel/py-demjson/Makefile
+++ b/devel/py-demjson/Makefile
@@ -14,9 +14,8 @@ COMMENT= Encoder, Decoder and Lint/Validator for JSON
LICENSE= LGPL3
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/jsonlint ${STAGEDIR}${PREFIX}/bin
diff --git a/devel/py-dexml/Makefile b/devel/py-dexml/Makefile
index eb6224c3c8ee..8a80acdcca98 100644
--- a/devel/py-dexml/Makefile
+++ b/devel/py-dexml/Makefile
@@ -13,8 +13,7 @@ COMMENT= Dead-simple Object-XML mapper for Python
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-dialog/Makefile b/devel/py-dialog/Makefile
index 8b0785ceeb35..eeabbfd0ad47 100644
--- a/devel/py-dialog/Makefile
+++ b/devel/py-dialog/Makefile
@@ -16,9 +16,8 @@ LICENSE= LGPL20
RUN_DEPENDS= cdialog:${PORTSDIR}/devel/cdialog
-USES= tar:bzip2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python tar:bzip2
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= pythondialog
EXAMPLESDIR= ${PREFIX}/share/examples/py-dialog
diff --git a/devel/py-diazo/Makefile b/devel/py-diazo/Makefile
index e4a6f30cd7a4..204cc812b38b 100644
--- a/devel/py-diazo/Makefile
+++ b/devel/py-diazo/Makefile
@@ -16,9 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:${PORTSDIR}/devel/py-repoze.xmliter \
${PYTHON_PKGNAMEPREFIX}webob>=0:${PORTSDIR}/www/py-webob
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-dirspec/Makefile b/devel/py-dirspec/Makefile
index 6bbfcbd8ea50..fbe69048dfc5 100644
--- a/devel/py-dirspec/Makefile
+++ b/devel/py-dirspec/Makefile
@@ -14,8 +14,7 @@ COMMENT= XDG Base and User directories implementation
LICENSE= GPLv3
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-dogpile.cache/Makefile b/devel/py-dogpile.cache/Makefile
index 16ed6d676207..f46ce9a08678 100644
--- a/devel/py-dogpile.cache/Makefile
+++ b/devel/py-dogpile.cache/Makefile
@@ -15,8 +15,7 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dogpile.core>0:${PORTSDIR}/devel/py-dogpile.core \
${PYTHON_PKGNAMEPREFIX}gdbm>0:${PORTSDIR}/databases/py-gdbm
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-dogpile.core/Makefile b/devel/py-dogpile.core/Makefile
index 1741ab8f7d3f..414f834fecbb 100644
--- a/devel/py-dogpile.core/Makefile
+++ b/devel/py-dogpile.core/Makefile
@@ -13,8 +13,7 @@ COMMENT= Component of a larger caching solution
LICENSE= BSD
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-doit/Makefile b/devel/py-doit/Makefile
index e88d7f871062..27af43546085 100644
--- a/devel/py-doit/Makefile
+++ b/devel/py-doit/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
diff --git a/devel/py-durus/Makefile b/devel/py-durus/Makefile
index 7053a9d7bbb2..bd154559fe55 100644
--- a/devel/py-durus/Makefile
+++ b/devel/py-durus/Makefile
@@ -15,10 +15,8 @@ COMMENT= Persistent object storage system for Python
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-PYDISTUTILS_PKGNAME= Durus
+USES= python
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS
diff --git a/devel/py-eggtestinfo/Makefile b/devel/py-eggtestinfo/Makefile
index 81709aa7f8a1..21da1e6664c7 100644
--- a/devel/py-eggtestinfo/Makefile
+++ b/devel/py-eggtestinfo/Makefile
@@ -12,8 +12,7 @@ COMMENT= Setuptools plugin that adds test information to .egg-info
LICENSE= ZPL21
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-enum34/Makefile b/devel/py-enum34/Makefile
index da4b09eacce0..0d28dd6991ad 100644
--- a/devel/py-enum34/Makefile
+++ b/devel/py-enum34/Makefile
@@ -12,9 +12,8 @@ COMMENT= Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7
LICENSE= BSD3CLAUSE
-USE_PYTHON= 2.7-3.3
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2.7-3.3
+USE_PYTHON= distutils autoplist
PORTDOCS= *
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/devel/py-epsilon/Makefile b/devel/py-epsilon/Makefile
index 3a9de52c4da1..e1c929990d7b 100644
--- a/devel/py-epsilon/Makefile
+++ b/devel/py-epsilon/Makefile
@@ -16,9 +16,7 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-openssl
CONFLICTS= brlcad-[0-9]*
-USES= twisted
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python twisted
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-event/Makefile b/devel/py-event/Makefile
index 07b358d847f1..64d30442de5d 100644
--- a/devel/py-event/Makefile
+++ b/devel/py-event/Makefile
@@ -15,8 +15,7 @@ COMMENT= Python bindings for libevent
LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2
PROJECTHOST= pyevent
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-experimental.cssselect/Makefile b/devel/py-experimental.cssselect/Makefile
index 9d5be3a77d78..193002d59481 100644
--- a/devel/py-experimental.cssselect/Makefile
+++ b/devel/py-experimental.cssselect/Makefile
@@ -12,9 +12,7 @@ COMMENT= Experimental version of lxml.cssselect
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-extras/Makefile b/devel/py-extras/Makefile
index 140e058240ee..1f17db7283b7 100644
--- a/devel/py-extras/Makefile
+++ b/devel/py-extras/Makefile
@@ -11,7 +11,7 @@ COMMENT= Useful extra bits for Python
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/devel/py-extremes/Makefile b/devel/py-extremes/Makefile
index 9c10c31e57aa..a345acd86662 100644
--- a/devel/py-extremes/Makefile
+++ b/devel/py-extremes/Makefile
@@ -12,9 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Production-quality 'Min' and 'Max' objects (adapted from PEP 326)
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-ezpyinline/Makefile b/devel/py-ezpyinline/Makefile
index cb4d07a0904a..81ddce6fdf9e 100644
--- a/devel/py-ezpyinline/Makefile
+++ b/devel/py-ezpyinline/Makefile
@@ -11,8 +11,7 @@ DIST_SUBDIR= python
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Easy embedded Inline C for Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-fabric/Makefile b/devel/py-fabric/Makefile
index 3d9c1ff5d30d..1c0a0ba3a819 100644
--- a/devel/py-fabric/Makefile
+++ b/devel/py-fabric/Makefile
@@ -26,9 +26,8 @@ TESTS_DESC= Install nose for test suite
TESTS_BUILD_DEPENDS= ${TEST_DEPENDS}
-USE_PYTHON= -2.7
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2.7
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
diff --git a/devel/py-fam/Makefile b/devel/py-fam/Makefile
index 7d8a0fb2cfbc..531aadb618b7 100644
--- a/devel/py-fam/Makefile
+++ b/devel/py-fam/Makefile
@@ -12,10 +12,8 @@ DISTNAME= python-fam-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python Interface to the File Alteration Monitor
-USES= fam
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python fam
+USE_PYTHON= distutils autoplist
pre-patch:
${INSTALL_DATA} ${FILESDIR}/setup.py ${WRKSRC}
diff --git a/devel/py-fastimport/Makefile b/devel/py-fastimport/Makefile
index c2515ef5bd0e..32088f1ae18f 100644
--- a/devel/py-fastimport/Makefile
+++ b/devel/py-fastimport/Makefile
@@ -14,8 +14,7 @@ COMMENT= Fastimport parser in Python
LICENSE= GPLv2
WRKSRC= ${WRKDIR}/python-${PORTNAME}-${PORTVERSION}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-fileutils/Makefile b/devel/py-fileutils/Makefile
index b32ae3871833..caed486cef78 100644
--- a/devel/py-fileutils/Makefile
+++ b/devel/py-fileutils/Makefile
@@ -11,9 +11,7 @@ DISTNAME= FileUtils-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= File I/O related functions and classes
-USES= tar:bzip2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python tar:bzip2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-five.customerize/Makefile b/devel/py-five.customerize/Makefile
index 628902849d72..13d43a02a9de 100644
--- a/devel/py-five.customerize/Makefile
+++ b/devel/py-five.customerize/Makefile
@@ -29,9 +29,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:${PORTSDIR}/www/py-plone.p
${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= zope zip
+USE_PYTHON= distutils autoplist
+USES= python:2 zope zip
.include <bsd.port.mk>
diff --git a/devel/py-five.formlib/Makefile b/devel/py-five.formlib/Makefile
index 092fb4adf19f..d49ca86c9d49 100644
--- a/devel/py-five.formlib/Makefile
+++ b/devel/py-five.formlib/Makefile
@@ -27,9 +27,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transact
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-five.globalrequest/Makefile b/devel/py-five.globalrequest/Makefile
index a27015b56b6f..9a5d679a8b95 100644
--- a/devel/py-five.globalrequest/Makefile
+++ b/devel/py-five.globalrequest/Makefile
@@ -15,9 +15,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:${PORTSDIR}/devel/py-zope.globalrequest
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-#USES= zope
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-five.localsitemanager/Makefile b/devel/py-five.localsitemanager/Makefile
index d8a221713099..b69fd9b4db16 100644
--- a/devel/py-five.localsitemanager/Makefile
+++ b/devel/py-five.localsitemanager/Makefile
@@ -23,10 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisit
${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-#USES= zope
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-flask-babel/Makefile b/devel/py-flask-babel/Makefile
index 782c9bc4f388..0a355a46629f 100644
--- a/devel/py-flask-babel/Makefile
+++ b/devel/py-flask-babel/Makefile
@@ -13,10 +13,10 @@ COMMENT= Adds i18n/l10n support to Flask applications
LICENSE= BSD
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:${PORTSDIR}/www/py-flask \
- ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel \
- ${PYTHON_PKGNAMEPREFIX}speaklater>=1.3:${PORTSDIR}/devel/py-speaklater
+ ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel \
+ ${PYTHON_PKGNAMEPREFIX}speaklater>=1.3:${PORTSDIR}/devel/py-speaklater
-USES= python
+USES= python
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-flexmock/Makefile b/devel/py-flexmock/Makefile
index 21ebeca01ca1..f0f672c2cd96 100644
--- a/devel/py-flexmock/Makefile
+++ b/devel/py-flexmock/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= clsung@FreeBSD.org
COMMENT= Flexmock is a mock/stub/spy library for Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-foolscap/Makefile b/devel/py-foolscap/Makefile
index 9839265bf748..b24d69f6e35c 100644
--- a/devel/py-foolscap/Makefile
+++ b/devel/py-foolscap/Makefile
@@ -18,8 +18,7 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore \
${PYTHON_PKGNAMEPREFIX}openssl>=0.13:${PORTSDIR}/security/py-openssl
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-fortran/Makefile b/devel/py-fortran/Makefile
index 0712d0bec3e2..1ada9ec7bb0d 100644
--- a/devel/py-fortran/Makefile
+++ b/devel/py-fortran/Makefile
@@ -14,8 +14,7 @@ COMMENT= Creating extensions to the Python language with Fortran routines
RUN_DEPENDS= ${PYNUMERIC}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-freebsd/Makefile b/devel/py-freebsd/Makefile
index 0397953f7b6f..70c5b1cd68fe 100644
--- a/devel/py-freebsd/Makefile
+++ b/devel/py-freebsd/Makefile
@@ -14,9 +14,8 @@ DISTNAME= py-freebsd-${PORTVERSION}
MAINTAINER= python@FreeBSD.org
COMMENT= Python interface to FreeBSD-specific system libraries
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
diff --git a/devel/py-fs/Makefile b/devel/py-fs/Makefile
index 4cc5cc9e3f88..d1e297e688d1 100644
--- a/devel/py-fs/Makefile
+++ b/devel/py-fs/Makefile
@@ -13,8 +13,7 @@ COMMENT= Python filesystem abstraction
LICENSE= BSD
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-fsm/Makefile b/devel/py-fsm/Makefile
index d49234446e12..c16205f1c5a9 100644
--- a/devel/py-fsm/Makefile
+++ b/devel/py-fsm/Makefile
@@ -15,8 +15,8 @@ LICENSE= BSD
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}graphviz>=1.0:${PORTSDIR}/graphics/py-graphviz
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_EGGINFO= python_${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg-info
.include <bsd.port.mk>
diff --git a/devel/py-fudge/Makefile b/devel/py-fudge/Makefile
index d79cd03112fd..aaa8fbc72181 100644
--- a/devel/py-fudge/Makefile
+++ b/devel/py-fudge/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= yhchan@csie.nctu.edu.tw
COMMENT= Fudge is a Python module for using fake objects to test real ones
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-funcparserlib/Makefile b/devel/py-funcparserlib/Makefile
index c695e4308be2..0caa5c50f30e 100644
--- a/devel/py-funcparserlib/Makefile
+++ b/devel/py-funcparserlib/Makefile
@@ -13,9 +13,8 @@ COMMENT= Recursive descent parsing library based on functional combinators
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
PORTDOCS= README doc
DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME}
diff --git a/devel/py-fusefs/Makefile b/devel/py-fusefs/Makefile
index 73421a42ad2c..87071f0db706 100644
--- a/devel/py-fusefs/Makefile
+++ b/devel/py-fusefs/Makefile
@@ -11,10 +11,8 @@ DISTNAME= fuse-python-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= FUSE Python bindings
-USES= fuse pkgconfig iconv
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= fuse pkgconfig python iconv
+USE_PYTHON= distutils autoplist
PORTDOCS= AUTHORS Changelog FAQ INSTALL README.1st README.historic \
README.new_fusepy_api
diff --git a/devel/py-futures/Makefile b/devel/py-futures/Makefile
index 1dc0c3a9b949..88a15b896e92 100644
--- a/devel/py-futures/Makefile
+++ b/devel/py-futures/Makefile
@@ -12,8 +12,7 @@ COMMENT= Backport of the concurrent.futures package from Python 3.2
LICENSE= BSD2CLAUSE
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-gamin/Makefile b/devel/py-gamin/Makefile
index 9b459d7f9164..eeec5065d34f 100644
--- a/devel/py-gamin/Makefile
+++ b/devel/py-gamin/Makefile
@@ -16,8 +16,7 @@ PLIST= ${.CURDIR}/pkg-plist
GAMIN_SLAVE= yes
-USES= fam:gamin
-USE_PYTHON= yes
+USES= fam:gamin python
CONFIGURE_ARGS= --with-python=${PYTHON_CMD} \
--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc
diff --git a/devel/py-gearman/Makefile b/devel/py-gearman/Makefile
index 016c1db1d115..db2168c4a42a 100644
--- a/devel/py-gearman/Makefile
+++ b/devel/py-gearman/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Gearman Library for Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-generate/Makefile b/devel/py-generate/Makefile
index 6793782845b4..c6de06ccdc5a 100644
--- a/devel/py-generate/Makefile
+++ b/devel/py-generate/Makefile
@@ -12,10 +12,7 @@ DISTNAME= generate-${PORTVERSION}
MAINTAINER= darcy@druid.net
COMMENT= Python module to implement generate
-USES= gmake tar:tgz
-
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= gmake python tar:tgz
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-geojson/Makefile b/devel/py-geojson/Makefile
index 4473e2a4d9a1..7f8bc3c07943 100644
--- a/devel/py-geojson/Makefile
+++ b/devel/py-geojson/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>1.9:${PORTSDIR}/devel/py-simplejs
PORTDOCS= LICENSE.rst CHANGELOG.rst README.rst
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS
diff --git a/devel/py-geotypes/Makefile b/devel/py-geotypes/Makefile
index 7bf3c4a424a3..c257cc6d9fad 100644
--- a/devel/py-geotypes/Makefile
+++ b/devel/py-geotypes/Makefile
@@ -14,9 +14,8 @@ COMMENT= Python Interface to Support PostGIS
LICENSE= LGPL21
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python zip
+USE_PYTHON= distutils
PYTHON_PKGNAMEPREFIX= yes
PYDISTUTILS_EGGINFO= GeoTypes-0.7.0-py${PYTHON_VER}.egg-info
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/py-gflags/Makefile b/devel/py-gflags/Makefile
index f42cfbe86283..587ed0db8a2f 100644
--- a/devel/py-gflags/Makefile
+++ b/devel/py-gflags/Makefile
@@ -14,8 +14,8 @@ COMMENT= Commandline flags module for Python
LICENSE= BSD3CLAUSE
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
+USES= python:2
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= python_gflags
PROJECTHOST= python-gflags
diff --git a/devel/py-gitdb/Makefile b/devel/py-gitdb/Makefile
index 9758cfae4c53..336afe1672b8 100644
--- a/devel/py-gitdb/Makefile
+++ b/devel/py-gitdb/Makefile
@@ -16,8 +16,7 @@ LICENSE= BSD
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}async>=0.6.1:${PORTSDIR}/devel/py-async \
${PYTHON_PKGNAMEPREFIX}smmap>=0.8.0:${PORTSDIR}/devel/py-smmap
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-gitosis/Makefile b/devel/py-gitosis/Makefile
index bb4f3f663b52..d9c485ae824a 100644
--- a/devel/py-gitosis/Makefile
+++ b/devel/py-gitosis/Makefile
@@ -16,10 +16,8 @@ LICENSE= GPLv2
RUN_DEPENDS= git:${PORTSDIR}/devel/git
-USES= tar:bzip2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python tar:bzip2
+USE_PYTHON= distutils autoplist
USERS= git
GROUPS= ${USERS}
diff --git a/devel/py-glob2/Makefile b/devel/py-glob2/Makefile
index 88956eace535..a281bab42d1c 100644
--- a/devel/py-glob2/Makefile
+++ b/devel/py-glob2/Makefile
@@ -13,8 +13,7 @@ COMMENT= Glob that captures patterns and supports recursive wildcards
LICENSE= BSD
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index a2c54a852a61..7ba8be7ee817 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -21,9 +21,8 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py
LIB_DEPENDS+= libffi.so:${PORTSDIR}/devel/libffi
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
-USES= gmake libtool pathfix pkgconfig tar:xz
+USES= gmake libtool pathfix pkgconfig python:2 tar:xz
USE_GNOME= glib20 introspection:build,run
-USE_PYTHON= 2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-docs --disable-introspection --with-ffi
diff --git a/devel/py-grab/Makefile b/devel/py-grab/Makefile
index 10f7e36f5a3f..f2d113904cad 100644
--- a/devel/py-grab/Makefile
+++ b/devel/py-grab/Makefile
@@ -16,8 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
${PYTHON_PKGNAMEPREFIX}curl>0:${PORTSDIR}/ftp/py-curl
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-grizzled/Makefile b/devel/py-grizzled/Makefile
index c3531f5a099e..00c83cfaad92 100644
--- a/devel/py-grizzled/Makefile
+++ b/devel/py-grizzled/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= The Grizzled Python Utility Library
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-grouch/Makefile b/devel/py-grouch/Makefile
index 5bce9e0dff7e..a596fcd186a1 100644
--- a/devel/py-grouch/Makefile
+++ b/devel/py-grouch/Makefile
@@ -12,9 +12,8 @@ DISTNAME= Grouch-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= System for describing and enforcing a Python object schema
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
PORTDOCS= *
PORTEXAMPLES= *
diff --git a/devel/py-gyp-devel/Makefile b/devel/py-gyp-devel/Makefile
index c46e29c22cec..1e0bcd47baf9 100644
--- a/devel/py-gyp-devel/Makefile
+++ b/devel/py-gyp-devel/Makefile
@@ -11,9 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= daichi@FreeBSD.org
COMMENT= Generate Your Projects
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
diff --git a/devel/py-hashring/Makefile b/devel/py-hashring/Makefile
index d386cc97c0a5..945b9c42203e 100644
--- a/devel/py-hashring/Makefile
+++ b/devel/py-hashring/Makefile
@@ -13,8 +13,7 @@ COMMENT= Implementation of consistent hashing in Python
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}memcached>=0:${PORTSDIR}/databases/py-memcached
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-hghooks/Makefile b/devel/py-hghooks/Makefile
index 0e297f15ac6b..8cae11c37eae 100644
--- a/devel/py-hghooks/Makefile
+++ b/devel/py-hghooks/Makefile
@@ -13,8 +13,7 @@ COMMENT= Set of Mercurial hooks
LICENSE= LGPL3
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-hgtools/Makefile b/devel/py-hgtools/Makefile
index dc7147981f16..cb122b57c64f 100644
--- a/devel/py-hgtools/Makefile
+++ b/devel/py-hgtools/Makefile
@@ -12,9 +12,7 @@ COMMENT= Classes and setuptools plugin for Mercurial repositories
LICENSE= GPLv2
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-humanize/Makefile b/devel/py-humanize/Makefile
index 5230ececa71a..5d758caa933b 100644
--- a/devel/py-humanize/Makefile
+++ b/devel/py-humanize/Makefile
@@ -12,8 +12,7 @@ COMMENT= Various common humanization utilities
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile
index 84f3df9f25fa..4c932a1bbb6a 100644
--- a/devel/py-ice/Makefile
+++ b/devel/py-ice/Makefile
@@ -13,7 +13,7 @@ BUILD_DEPENDS= mcpp:${PORTSDIR}/devel/mcpp \
slice2py:${PORTSDIR}/devel/ice
LIB_DEPENDS= libIce.so.${LIB_VRS}:${PORTSDIR}/devel/ice
-USE_PYTHON= yes
+USES= python
SLAVE_PORT= yes
MASTERDIR= ${.CURDIR}/../ice
PLIST= ${.CURDIR}/pkg-plist
diff --git a/devel/py-icu/Makefile b/devel/py-icu/Makefile
index b81d90a14b7e..ba15c801b7c6 100644
--- a/devel/py-icu/Makefile
+++ b/devel/py-icu/Makefile
@@ -12,9 +12,8 @@ DISTNAME= PyICU-${PORTVERSION}
MAINTAINER= bland@FreeBSD.org
COMMENT= Python extension wrapping IBM's ICU C++ API
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
MAKE_ENV+= \
PYICU_INCLUDES="${PREFIX}/include" \
diff --git a/devel/py-iniparse/Makefile b/devel/py-iniparse/Makefile
index 66471471b0d2..a9cd47a55f5e 100644
--- a/devel/py-iniparse/Makefile
+++ b/devel/py-iniparse/Makefile
@@ -12,9 +12,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Better INI parser for Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
PORTDOCS= Changelog README
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/devel/py-initgroups/Makefile b/devel/py-initgroups/Makefile
index f9655b839c67..5b05129e4735 100644
--- a/devel/py-initgroups/Makefile
+++ b/devel/py-initgroups/Makefile
@@ -13,9 +13,7 @@ COMMENT= Convenience uid/gid helper function used in Zope2
LICENSE= ZPL21
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-instant/Makefile b/devel/py-instant/Makefile
index ce1fca0b6586..7dd9e9c94c75 100644
--- a/devel/py-instant/Makefile
+++ b/devel/py-instant/Makefile
@@ -14,8 +14,8 @@ LICENSE= LGPL3
RUN_DEPENDS= swig2.0:${PORTSDIR}/devel/swig20
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
+USES= python:2
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= instant
MMVERSION= 1.2
diff --git a/devel/py-interface/Makefile b/devel/py-interface/Makefile
index 18f9bdf34f79..3ec09c817750 100644
--- a/devel/py-interface/Makefile
+++ b/devel/py-interface/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python implementation of an Erlang node
LICENSE= GPLv2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutilss
PYDISTUTILS_PKGNAME= py_${PORTNAME}
DOCSDIR= ${PREFIX}/share/doc/py_${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py_${PORTNAME}
diff --git a/devel/py-ipaddr/Makefile b/devel/py-ipaddr/Makefile
index 9dc87304dba7..15ea0500d510 100644
--- a/devel/py-ipaddr/Makefile
+++ b/devel/py-ipaddr/Makefile
@@ -12,8 +12,7 @@ MAINTAINER= mopsfelder@gmail.com
COMMENT= Google open source IPv4/IPv6 manipulation library in Python
PROJECTHOST= ipaddr-py
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-ipdb/Makefile b/devel/py-ipdb/Makefile
index 1262930e2b5f..5637b10d4312 100644
--- a/devel/py-ipdb/Makefile
+++ b/devel/py-ipdb/Makefile
@@ -14,9 +14,7 @@ LICENSE= GPLv2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0.10:${PORTSDIR}/devel/ipython
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-iso8601/Makefile b/devel/py-iso8601/Makefile
index be94a249ecee..222b89c34854 100644
--- a/devel/py-iso8601/Makefile
+++ b/devel/py-iso8601/Makefile
@@ -20,9 +20,8 @@ OPTIONS_DEFINE= TESTS
TESTS_DESC= Install tools to run test suite
TESTS_BUILD_DEPENDS= ${TEST_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
regression-test: extract
@cd ${WRKSRC} && py.test
diff --git a/devel/py-iterpipes/Makefile b/devel/py-iterpipes/Makefile
index 641e2b2b29a5..338848c5cf7e 100644
--- a/devel/py-iterpipes/Makefile
+++ b/devel/py-iterpipes/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= sbz@FreeBSD.org
COMMENT= Library for running shell pipelines using shell-like syntax
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-jaraco.timing/Makefile b/devel/py-jaraco.timing/Makefile
index d336badcef9a..a20b1ffa6fa3 100644
--- a/devel/py-jaraco.timing/Makefile
+++ b/devel/py-jaraco.timing/Makefile
@@ -13,9 +13,7 @@ COMMENT= Routines pertinent to the fourth dimension
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:${PORTSDIR}/devel/py-hgtools \
${PYTHON_PKGNAMEPREFIX}pytest-runner>0:${PORTSDIR}/devel/py-pytest-runner
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-jcc/Makefile b/devel/py-jcc/Makefile
index 6773ab3345b9..ca34615ed819 100644
--- a/devel/py-jcc/Makefile
+++ b/devel/py-jcc/Makefile
@@ -14,8 +14,8 @@ COMMENT= C++ code generator for calling Java from C++/Python
LICENSE= APACHE20
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= JCC
USE_JAVA= yes
JAVA_VERSION= 1.6+
diff --git a/devel/py-jellyfish/Makefile b/devel/py-jellyfish/Makefile
index 2a1d5cdf6e4d..f20e96ef5826 100644
--- a/devel/py-jellyfish/Makefile
+++ b/devel/py-jellyfish/Makefile
@@ -11,8 +11,7 @@ COMMENT= Library for doing approximate and phonetic matching of strings
LICENSE= BSD3CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-jira/Makefile b/devel/py-jira/Makefile
index 8eec7f1641ca..0955f3fa737a 100644
--- a/devel/py-jira/Makefile
+++ b/devel/py-jira/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests1>=1.0.0:${PORTSDIR}/www/py-requests
${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto \
${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2:${PORTSDIR}/textproc/py-sphinx
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-jmespath/Makefile b/devel/py-jmespath/Makefile
index b1936af350e0..83b4a1917746 100644
--- a/devel/py-jmespath/Makefile
+++ b/devel/py-jmespath/Makefile
@@ -14,8 +14,7 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:${PORTSDIR}/devel/py-ply
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-jsmin/Makefile b/devel/py-jsmin/Makefile
index 4a789b2c7f4a..78716279a5d5 100644
--- a/devel/py-jsmin/Makefile
+++ b/devel/py-jsmin/Makefile
@@ -13,9 +13,8 @@ COMMENT= JavaScript minifier written in Python
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
PORTDOCS= PKG-INFO
diff --git a/devel/py-json-py/Makefile b/devel/py-json-py/Makefile
index 5a4bc41275a7..5ea58db43d4e 100644
--- a/devel/py-json-py/Makefile
+++ b/devel/py-json-py/Makefile
@@ -16,8 +16,7 @@ LICENSE= LGPL20
NO_WRKSUBDIR= yes
-USES= zip
-USE_PYTHON= yes
+USES= python zip
do-build:
# compile python files
diff --git a/devel/py-jsonlib/Makefile b/devel/py-jsonlib/Makefile
index 4d522968ccb6..6e2b78139442 100644
--- a/devel/py-jsonlib/Makefile
+++ b/devel/py-jsonlib/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= JSON Serializer/Deserializer for Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-jsonlib2/Makefile b/devel/py-jsonlib2/Makefile
index ff881590af70..692a92544695 100644
--- a/devel/py-jsonlib2/Makefile
+++ b/devel/py-jsonlib2/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= JSON Serializer/Deserializer for Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-jsonrpclib/Makefile b/devel/py-jsonrpclib/Makefile
index 9c072bb9521a..3b617a64c763 100644
--- a/devel/py-jsonrpclib/Makefile
+++ b/devel/py-jsonrpclib/Makefile
@@ -13,9 +13,8 @@ COMMENT= Implements the JSON-RPC 2.0 proposed specification in pure Python
LICENSE= APACHE20
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options
OPTIONS_DEFINE= CJSON
diff --git a/devel/py-kazoo/Makefile b/devel/py-kazoo/Makefile
index 58db163b5824..4dadce1f7f04 100644
--- a/devel/py-kazoo/Makefile
+++ b/devel/py-kazoo/Makefile
@@ -15,10 +15,7 @@ LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:${PORTSDIR}/devel/py-gevent
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= gmake zip
-
+USES= gmake python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-kid/Makefile b/devel/py-kid/Makefile
index 446d034f13f4..a03de29d42b6 100644
--- a/devel/py-kid/Makefile
+++ b/devel/py-kid/Makefile
@@ -12,9 +12,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Simple template language for XML based written in Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/devel/py-kjbuckets/Makefile b/devel/py-kjbuckets/Makefile
index 97bf581c3e4d..eb0598e565cc 100644
--- a/devel/py-kjbuckets/Makefile
+++ b/devel/py-kjbuckets/Makefile
@@ -12,10 +12,9 @@ DISTNAME= gadfly-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Graph and set datatypes for Python (C extension)
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-WRKSRC= ${WRKDIR}/${DISTNAME}/kjbuckets
+USES= python
+USE_PYTHON= distutils autoplist
+WRKSRC= ${WRKDIR}/${DISTNAME}/kjbuckets
PORTDOCS= *
PORTEXAMPLES= *
diff --git a/devel/py-kqueue/Makefile b/devel/py-kqueue/Makefile
index 8c8ab8f683a4..d6ee6a16957e 100644
--- a/devel/py-kqueue/Makefile
+++ b/devel/py-kqueue/Makefile
@@ -13,11 +13,10 @@ EXTRACT_SUFX= .tbz
MAINTAINER= ports2@dclg.ca
COMMENT= Python interface to kqueue(2) and kevent(2) system calls
-USES= tar:bzip2
-USE_PYTHON= yes
-FILES= kqsyscallmodule.so KQueue.py KQueue.pyc
-PLIST_FILES= ${FILES:S+^+%%PYTHON_SITELIBDIR%%/+g}
-MAKE_ENV= MAINCC=${CC}
+USES= python tar:bzip2
+FILES= kqsyscallmodule.so KQueue.py KQueue.pyc
+PLIST_FILES= ${FILES:S+^+%%PYTHON_SITELIBDIR%%/+g}
+MAKE_ENV= MAINCC=${CC}
.include <bsd.port.pre.mk>
diff --git a/devel/py-lazy/Makefile b/devel/py-lazy/Makefile
index ea287b302230..b2e251d1c220 100644
--- a/devel/py-lazy/Makefile
+++ b/devel/py-lazy/Makefile
@@ -10,10 +10,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= koobs@FreeBSD.org
COMMENT= Lazy attributes for Python objects
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
diff --git a/devel/py-levenshtein/Makefile b/devel/py-levenshtein/Makefile
index 21521039e0ec..1441c113097e 100644
--- a/devel/py-levenshtein/Makefile
+++ b/devel/py-levenshtein/Makefile
@@ -15,10 +15,8 @@ COMMENT= Python extension computing string distances and similarities
LICENSE= GPLv2
PLIST_FILES= %%PYTHON_SITELIBDIR%%/Levenshtein.so
-USES= tar:bzip2
-USE_PYTHON= yes
-USE_PYTHON_PREFIX= yes
-USE_PYDISTUTILS= yes
+USES= python tar:bzip2
+USE_PYTHON= distutils pythonprefix
PYDISTUTILS_PKGNAME= python-Levenshtein
PROJECTHOST= py${PORTNAME}
diff --git a/devel/py-liblarch/Makefile b/devel/py-liblarch/Makefile
index 18165e399df3..294eff4c9408 100644
--- a/devel/py-liblarch/Makefile
+++ b/devel/py-liblarch/Makefile
@@ -12,9 +12,8 @@ LICENSE= LGPL3
USE_GITHUB= yes
USE_GNOME= pygobject
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
GH_ACCOUNT= ${PORTNAME}
GH_TAGNAME= v${PORTVERSION}
diff --git a/devel/py-libvirt/Makefile b/devel/py-libvirt/Makefile
index 427233f4f236..5911e45a78fe 100644
--- a/devel/py-libvirt/Makefile
+++ b/devel/py-libvirt/Makefile
@@ -17,12 +17,9 @@ LICENSE= GPLv2
LIB_DEPENDS= libvirt.so:${PORTSDIR}/devel/libvirt
-USES= pkgconfig shebangfix
+USES= pkgconfig python shebangfix
SHEBANG_FILES= generator.py sanitytest.py setup.py
-
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USE_PYTHON= distutils autoplist
post-patch:
@${REINPLACE_CMD} -e 's|"python"|"${PYTHON_CMD}"|g' \
diff --git a/devel/py-ll-core/Makefile b/devel/py-ll-core/Makefile
index c3420f83ffe7..3cb019b9562c 100644
--- a/devel/py-ll-core/Makefile
+++ b/devel/py-ll-core/Makefile
@@ -12,9 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Utility functions and classes used by the other LivingLogic packages
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-lock_file/Makefile b/devel/py-lock_file/Makefile
index 2d3bce391f5e..e88e47a54c34 100644
--- a/devel/py-lock_file/Makefile
+++ b/devel/py-lock_file/Makefile
@@ -12,8 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= martin@horcicka.eu
COMMENT= Lock file manipulation
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-log4py/Makefile b/devel/py-log4py/Makefile
index 46db688e3656..d749b6214370 100644
--- a/devel/py-log4py/Makefile
+++ b/devel/py-log4py/Makefile
@@ -12,8 +12,8 @@ COMMENT= Python logging module
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS
diff --git a/devel/py-logan/Makefile b/devel/py-logan/Makefile
index 1dcac4f18171..4a862723f38d 100644
--- a/devel/py-logan/Makefile
+++ b/devel/py-logan/Makefile
@@ -17,9 +17,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django \
${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:${PORTSDIR}/devel/py-nose \
${PYTHON_PKGNAMEPREFIX}unittest2:${PORTSDIR}/devel/py-unittest2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
PORTDOCS= README.rst
DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
diff --git a/devel/py-magic/Makefile b/devel/py-magic/Makefile
index c9607bb04b53..1e15f3d478fa 100644
--- a/devel/py-magic/Makefile
+++ b/devel/py-magic/Makefile
@@ -13,9 +13,8 @@ DISTNAME= file-${PORTVERSION}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Python module for determining file type
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/file-${PORTVERSION}/python
diff --git a/devel/py-meliae/Makefile b/devel/py-meliae/Makefile
index f45b59258bd2..f795e2231173 100644
--- a/devel/py-meliae/Makefile
+++ b/devel/py-meliae/Makefile
@@ -15,9 +15,8 @@ LICENSE= GPLv3
BUILD_DEPENDS= cython>0:${PORTSDIR}/lang/cython
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
regression-test: extract
(cd ${WRKSRC}; ${MAKE} check)
diff --git a/devel/py-memoryprofiler/Makefile b/devel/py-memoryprofiler/Makefile
index 37c3ddebb8cd..24cc034b72cf 100644
--- a/devel/py-memoryprofiler/Makefile
+++ b/devel/py-memoryprofiler/Makefile
@@ -19,8 +19,7 @@ PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>1.0.0:${PORTSDIR}/sysutils/py-
OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-mercurialserver/Makefile b/devel/py-mercurialserver/Makefile
index b4817279d659..008181a85f2e 100644
--- a/devel/py-mercurialserver/Makefile
+++ b/devel/py-mercurialserver/Makefile
@@ -29,9 +29,8 @@ SUB_LIST= PORTNAME=${PORTNAME} \
HGUSER=${HGUSER}
PKGMESSAGE= ${WRKDIR}/pkg-message
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
HGSVCONF_FILES= access.conf \
remote-hgrc.d/access.rc \
diff --git a/devel/py-mez_xml/Makefile b/devel/py-mez_xml/Makefile
index 84df05a47d17..7a4b17312819 100644
--- a/devel/py-mez_xml/Makefile
+++ b/devel/py-mez_xml/Makefile
@@ -10,8 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple template engine for Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-mimeparse/Makefile b/devel/py-mimeparse/Makefile
index c21d021d6935..10ff0fd452c9 100644
--- a/devel/py-mimeparse/Makefile
+++ b/devel/py-mimeparse/Makefile
@@ -11,9 +11,8 @@ DISTNAME= python-${PORTNAME}-${PORTVERSION}
MAINTAINER= wg@FreeBSD.org
COMMENT= Basic functions for handling mime-types in Python
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
PYDISTUTILS_EGGINFO= python_mimeparse-${PORTVERSION}-py${PYTHON_VER}.egg-info
.include <bsd.port.mk>
diff --git a/devel/py-minimongo/Makefile b/devel/py-minimongo/Makefile
index d03c90e594d2..5eee5bfef688 100644
--- a/devel/py-minimongo/Makefile
+++ b/devel/py-minimongo/Makefile
@@ -14,8 +14,7 @@ COMMENT= Minimal database Model management for MongoDB
RUN_DEPENDS= pymongo>=1.9:${PORTSDIR}/databases/pymongo
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-mock/Makefile b/devel/py-mock/Makefile
index 877d67a5c8c9..672c4c14bd0e 100644
--- a/devel/py-mock/Makefile
+++ b/devel/py-mock/Makefile
@@ -16,9 +16,8 @@ LICENSE= BSD2CLAUSE
OPTIONS_DEFINE= TESTS
TESTS_DESC= Install tox for running unit tests
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
TESTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:${PORTSDIR}/devel/py-tox
diff --git a/devel/py-mongokit/Makefile b/devel/py-mongokit/Makefile
index 3fe74c292264..89d23e867997 100644
--- a/devel/py-mongokit/Makefile
+++ b/devel/py-mongokit/Makefile
@@ -13,8 +13,7 @@ COMMENT= Python ORM-like layer on top of pymongo
RUN_DEPENDS= pymongo>=2.0.1:${PORTSDIR}/databases/pymongo
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-more-itertools/Makefile b/devel/py-more-itertools/Makefile
index 3eed742d0ca9..c42f8ac97e59 100644
--- a/devel/py-more-itertools/Makefile
+++ b/devel/py-more-itertools/Makefile
@@ -12,8 +12,7 @@ COMMENT= More routines for operating on iterables, beyond itertools
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-mox/Makefile b/devel/py-mox/Makefile
index 0a9a69abdbc2..14fc7a7a0cca 100644
--- a/devel/py-mox/Makefile
+++ b/devel/py-mox/Makefile
@@ -12,8 +12,7 @@ MAINTAINER= clsung@FreeBSD.org
COMMENT= Mock object framework for Python
PROJECTHOST= pymox
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-msgpack/Makefile b/devel/py-msgpack/Makefile
index cb6da5634e0a..441bc3e43c09 100644
--- a/devel/py-msgpack/Makefile
+++ b/devel/py-msgpack/Makefile
@@ -13,8 +13,7 @@ COMMENT= MessagePack (de)serializer for Python
LICENSE= APACHE20
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-mwlib.ext/Makefile b/devel/py-mwlib.ext/Makefile
index ac22d91ab677..08dd2be09703 100644
--- a/devel/py-mwlib.ext/Makefile
+++ b/devel/py-mwlib.ext/Makefile
@@ -11,9 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Provide Dependencies for mwlib
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-mwlib.rl/Makefile b/devel/py-mwlib.rl/Makefile
index 481ca95772c2..b81ead664332 100644
--- a/devel/py-mwlib.rl/Makefile
+++ b/devel/py-mwlib.rl/Makefile
@@ -20,9 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/texvc:${PORTSDIR}/print/texvc \
${PYTHON_PKGNAMEPREFIX}pygments>=1.0:${PORTSDIR}/textproc/py-pygments
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-mx-experimental/Makefile b/devel/py-mx-experimental/Makefile
index d6ecbf8e8949..cf67d9f19159 100644
--- a/devel/py-mx-experimental/Makefile
+++ b/devel/py-mx-experimental/Makefile
@@ -15,8 +15,8 @@ COMMENT= The eGenix mx Extensions - EXPERIMENTAL Package
BUILD_DEPENDS= ${LOCALBASE}/include/gmp.h:${PORTSDIR}/math/gmp
#RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:${PORTSDIR}/lang/py-mx-base
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= egenix-mx-experimental
post-patch:
diff --git a/devel/py-mygpoclient/Makefile b/devel/py-mygpoclient/Makefile
index c6e65ebde8a6..c8b0fc205b06 100644
--- a/devel/py-mygpoclient/Makefile
+++ b/devel/py-mygpoclient/Makefile
@@ -12,8 +12,7 @@ COMMENT= gpodder.net API client library for Python
LICENSE= GPLv3
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-ncurses/Makefile b/devel/py-ncurses/Makefile
index c574b04bff5d..a8265a35e652 100644
--- a/devel/py-ncurses/Makefile
+++ b/devel/py-ncurses/Makefile
@@ -12,9 +12,8 @@ DISTNAME= pyncurses-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Ncurses binding for Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
diff --git a/devel/py-notifier/Makefile b/devel/py-notifier/Makefile
index aee17ecf4775..9fa674533243 100644
--- a/devel/py-notifier/Makefile
+++ b/devel/py-notifier/Makefile
@@ -13,8 +13,8 @@ COMMENT= Generic notifier/event scheduler abstraction
LICENSE= LGPL20
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= pynotifier
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/devel/py-notify/Makefile b/devel/py-notify/Makefile
index a6967f284a15..58f232cbd324 100644
--- a/devel/py-notify/Makefile
+++ b/devel/py-notify/Makefile
@@ -15,10 +15,9 @@ OPTIONS_DEFINE= DOCS
LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify
-USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2
USE_GNOME= pygtk2
INSTALL_TARGET= install-strip
-USE_PYTHON= 2
GNU_CONFIGURE= yes
DOCS= AUTHORS COPYING ChangeLog NEWS
diff --git a/devel/py-odfpy/Makefile b/devel/py-odfpy/Makefile
index 6472d03b1e89..755ec4ca92ef 100644
--- a/devel/py-odfpy/Makefile
+++ b/devel/py-odfpy/Makefile
@@ -12,8 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Python API and Tools to Manipulate OpenDocument Files
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-omnijson/Makefile b/devel/py-omnijson/Makefile
index 963bd136462a..0d98aa0a3657 100644
--- a/devel/py-omnijson/Makefile
+++ b/devel/py-omnijson/Makefile
@@ -25,9 +25,8 @@ GH_ACCOUNT= kennethreitz
GH_TAGNAME= v${PORTVERSION}
GH_COMMIT= 2235005
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest
diff --git a/devel/py-optik/Makefile b/devel/py-optik/Makefile
index 8ce90bc54629..d85b98b62710 100644
--- a/devel/py-optik/Makefile
+++ b/devel/py-optik/Makefile
@@ -10,9 +10,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Command-line parsing library for Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile
index 5516bd4fc969..05fc088eedf0 100644
--- a/devel/py-orbit/Makefile
+++ b/devel/py-orbit/Makefile
@@ -17,9 +17,8 @@ COMMENT= Python bindings for ORBit2
CONFLICTS= py*-omniorb-[0-9]*
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool pathfix pkgconfig python tar:bzip2
USE_GNOME= orbit2
-USE_PYTHON= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
diff --git a/devel/py-ordereddict/Makefile b/devel/py-ordereddict/Makefile
index b656113a59ea..2fb48abb593b 100644
--- a/devel/py-ordereddict/Makefile
+++ b/devel/py-ordereddict/Makefile
@@ -14,8 +14,7 @@ COMMENT= Drop-in substitute for Py2.7's new collections
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USE_PYTHON= 2 # for graphics/py-blockdiag
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 # for graphics/py-blocking
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-pathtools/Makefile b/devel/py-pathtools/Makefile
index cde8ff69d77d..c5a47098fd9f 100644
--- a/devel/py-pathtools/Makefile
+++ b/devel/py-pathtools/Makefile
@@ -14,10 +14,8 @@ LICENSE= MIT
OPTIONS_DEFINE= DOCS
-PYDISTUTILS_AUTOPLIST= yes
-
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.options.mk>
diff --git a/devel/py-period/Makefile b/devel/py-period/Makefile
index 3c7b4fc013ed..34d64ab7c384 100644
--- a/devel/py-period/Makefile
+++ b/devel/py-period/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Basic time period checking library
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
OPTIONS_DEFINE= DOCS
diff --git a/devel/py-phabricator/Makefile b/devel/py-phabricator/Makefile
index 7599cd67005a..3604f0e9f6ba 100644
--- a/devel/py-phabricator/Makefile
+++ b/devel/py-phabricator/Makefile
@@ -12,9 +12,8 @@ COMMENT= Phabricator API Bindings
LICENSE= APACHE20
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= PYTEST
PYTEST_DESC= Install Python test dependency
diff --git a/devel/py-phpserialize/Makefile b/devel/py-phpserialize/Makefile
index 3846f9db2699..0818d8d4fa7b 100644
--- a/devel/py-phpserialize/Makefile
+++ b/devel/py-phpserialize/Makefile
@@ -15,9 +15,8 @@ COMMENT= Python implementation of PHP's native serialize() and unserialize()
WRKSRC= ${WRKDIR}/v${PORTVERSION}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-extract:
${SED} -e 's|%%PORTVERSION%%|${PORTVERSION}|g' ${FILESDIR}/setup.py \
diff --git a/devel/py-pika/Makefile b/devel/py-pika/Makefile
index e1db70fb6bd0..f27e258901ce 100644
--- a/devel/py-pika/Makefile
+++ b/devel/py-pika/Makefile
@@ -10,8 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= clsung@FreeBSD.org
COMMENT= Python AMQP Client Library
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile
index cd75619244ff..dfe74454c2a5 100644
--- a/devel/py-pip/Makefile
+++ b/devel/py-pip/Makefile
@@ -19,11 +19,9 @@ GH_COMMIT= 437fb31
OPTIONS_DEFINE= DOCS
-USES= shebangfix
+USES= python shebangfix
USE_GITHUB= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USE_PYTHON= distutils autoplist
# This port installs the following file in shared dirs
# PLIST_FILES= bin/pip
diff --git a/devel/py-plan/Makefile b/devel/py-plan/Makefile
index 6f18414544fe..0b5f56aa5c9c 100644
--- a/devel/py-plan/Makefile
+++ b/devel/py-plan/Makefile
@@ -14,8 +14,7 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=2.1:${PORTSDIR}/devel/py-click
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-plex/Makefile b/devel/py-plex/Makefile
index e5c0217102e1..75c259205882 100644
--- a/devel/py-plex/Makefile
+++ b/devel/py-plex/Makefile
@@ -11,9 +11,8 @@ DISTNAME= Plex-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Lexical Analysis Module for Python
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
NO_WRKSUBDIR= yes
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/devel/py-posix_ipc/Makefile b/devel/py-posix_ipc/Makefile
index 6a31b36411dc..813595d2bff2 100644
--- a/devel/py-posix_ipc/Makefile
+++ b/devel/py-posix_ipc/Makefile
@@ -12,8 +12,7 @@ COMMENT= POSIX IPC primitives for Python
LICENSE= BSD3CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-pp/Makefile b/devel/py-pp/Makefile
index 325091b297ab..616faf79e935 100644
--- a/devel/py-pp/Makefile
+++ b/devel/py-pp/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Parallel python execution server
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-pqueue/Makefile b/devel/py-pqueue/Makefile
index 882f069efa16..43a360a0474b 100644
--- a/devel/py-pqueue/Makefile
+++ b/devel/py-pqueue/Makefile
@@ -11,10 +11,8 @@ DISTNAME= PQueue-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Fibonacci-Heap based Priority-Queue Extension for Python
-USES= tar:bzip2
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python tar:bzip2
+USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/PQueue
diff --git a/devel/py-prettytable/Makefile b/devel/py-prettytable/Makefile
index 7323e77beee2..d789e8adddec 100644
--- a/devel/py-prettytable/Makefile
+++ b/devel/py-prettytable/Makefile
@@ -12,9 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= novel@FreeBSD.org
COMMENT= Library for displaying tabular data in an ASCII table format
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
-
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-prioritized_methods/Makefile b/devel/py-prioritized_methods/Makefile
index 024c1edd2fb5..a2df0afa8d44 100644
--- a/devel/py-prioritized_methods/Makefile
+++ b/devel/py-prioritized_methods/Makefile
@@ -14,8 +14,7 @@ COMMENT= Extension to PEAK-Rules to prioritize methods
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0.5:${PORTSDIR}/devel/py-PEAK-Rules
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-protocols-devel/Makefile b/devel/py-protocols-devel/Makefile
index 6b4642efcb5e..2a5d2e11d5df 100644
--- a/devel/py-protocols-devel/Makefile
+++ b/devel/py-protocols-devel/Makefile
@@ -14,9 +14,7 @@ COMMENT= Protocol Definition, Declaration, and Adaptation for Python
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:${PORTSDIR}/devel/py-decoratortools
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-protocols/Makefile b/devel/py-protocols/Makefile
index da5dfe14c71e..515761744e17 100644
--- a/devel/py-protocols/Makefile
+++ b/devel/py-protocols/Makefile
@@ -13,9 +13,8 @@ DISTNAME= PyProtocols-${PORTVERSION}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Python module extending the PEP 246 adapt() function
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-patch:
@${RM} -rf ${WRKSRC}/setuptools
diff --git a/devel/py-ptrace/Makefile b/devel/py-ptrace/Makefile
index f358ba091afb..504305e38f72 100644
--- a/devel/py-ptrace/Makefile
+++ b/devel/py-ptrace/Makefile
@@ -15,9 +15,8 @@ LICENSE= GPLv2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}distorm>0:${PORTSDIR}/devel/py-distorm
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/devel/py-px/Makefile b/devel/py-px/Makefile
index c0a94749e568..c948b6b329e0 100644
--- a/devel/py-px/Makefile
+++ b/devel/py-px/Makefile
@@ -15,10 +15,8 @@ COMMENT= Perforce p4 wrapper and Python Perforce interface
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
PORTDOCS= BUGS.txt README.txt TODO.txt
diff --git a/devel/py-pycalendar/Makefile b/devel/py-pycalendar/Makefile
index ddf61dde1168..5208194522dd 100644
--- a/devel/py-pycalendar/Makefile
+++ b/devel/py-pycalendar/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= roland@micite.net
COMMENT= iCalendar and vCard module for python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-pycallgraph/Makefile b/devel/py-pycallgraph/Makefile
index b4abcd2f6e15..36262345aaed 100644
--- a/devel/py-pycallgraph/Makefile
+++ b/devel/py-pycallgraph/Makefile
@@ -16,8 +16,8 @@ LICENSE= GPLv2
RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/devel/py-pycerberus/Makefile b/devel/py-pycerberus/Makefile
index 4d824c799c47..0c38e47bb29d 100644
--- a/devel/py-pycerberus/Makefile
+++ b/devel/py-pycerberus/Makefile
@@ -13,8 +13,7 @@ COMMENT= Highly flexible, no magic input validation library
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-pycparser/Makefile b/devel/py-pycparser/Makefile
index 2a2071a39ba2..8ab809775f4f 100644
--- a/devel/py-pycparser/Makefile
+++ b/devel/py-pycparser/Makefile
@@ -12,8 +12,7 @@ COMMENT= C parser in Python
LICENSE= BSD3CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-pyechonest/Makefile b/devel/py-pyechonest/Makefile
index 6cf68fe46252..dc4717e22b55 100644
--- a/devel/py-pyechonest/Makefile
+++ b/devel/py-pyechonest/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python interface to The Echo Nest APIs
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/devel/py-pyev/Makefile b/devel/py-pyev/Makefile
index 6150799a532f..741965ea0f68 100644
--- a/devel/py-pyev/Makefile
+++ b/devel/py-pyev/Makefile
@@ -15,9 +15,8 @@ LICENSE= GPLv3
LIB_DEPENDS= libev.so:${PORTSDIR}/devel/libev
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=yes
+USES= python
+USE_PYTHON= distutils autoplist
PYDISTUTILS_PKGVERSION=${PORTVERSION}${DISTVERSIONSUFFIX}
CFLAGS+= -I${PREFIX}/include
diff --git a/devel/py-pyflakes/Makefile b/devel/py-pyflakes/Makefile
index 28c5eb317c30..c324f0f19dde 100644
--- a/devel/py-pyflakes/Makefile
+++ b/devel/py-pyflakes/Makefile
@@ -12,9 +12,8 @@ COMMENT= Program to analyze Python programs and detect various errors
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
diff --git a/devel/py-pygithub/Makefile b/devel/py-pygithub/Makefile
index 3053a7d81fbc..696abe2167c4 100644
--- a/devel/py-pygithub/Makefile
+++ b/devel/py-pygithub/Makefile
@@ -13,9 +13,8 @@ COMMENT= Python library implementing the full GitHub API v3
LICENSE= LGPL3
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
diff --git a/devel/py-pygpx/Makefile b/devel/py-pygpx/Makefile
index 0117ad0a1162..8375c3ee7e92 100644
--- a/devel/py-pygpx/Makefile
+++ b/devel/py-pygpx/Makefile
@@ -14,8 +14,7 @@ COMMENT= Python Module For Parsing GPS Exchange Format (GPX) File
PLIST_SUB= GPX_INFO=${PYDISTUTILS_EGGINFO}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-pyke/Makefile b/devel/py-pyke/Makefile
index bc8ca3847817..2b7f2503d426 100644
--- a/devel/py-pyke/Makefile
+++ b/devel/py-pyke/Makefile
@@ -14,9 +14,8 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=2.3:${PORTSDIR}/devel/py-ply
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python zip
+USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS
diff --git a/devel/py-pympler/Makefile b/devel/py-pympler/Makefile
index 73b2f3b2d96f..7525f27007da 100644
--- a/devel/py-pympler/Makefile
+++ b/devel/py-pympler/Makefile
@@ -12,9 +12,8 @@ COMMENT= Measure, monitor and analyze the memory behavior of Python objects
LICENSE= APACHE20
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-patch:
@${REINPLACE_CMD} -e 's,%%STAGEDIR%%,${STAGEDIR},g' ${WRKSRC}/setup.py
diff --git a/devel/py-pyro/Makefile b/devel/py-pyro/Makefile
index f13275352dc7..196c9879e478 100644
--- a/devel/py-pyro/Makefile
+++ b/devel/py-pyro/Makefile
@@ -15,10 +15,8 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}serpent>=1.6:${PORTSDIR}/devel/py-serpent
-USES= dos2unix
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= dos2unix python
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
EXAMPLESDIR= ${PREFIX}/share/examples/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
diff --git a/devel/py-pyshapelib/Makefile b/devel/py-pyshapelib/Makefile
index 98b4990a24f1..82c565168b88 100644
--- a/devel/py-pyshapelib/Makefile
+++ b/devel/py-pyshapelib/Makefile
@@ -14,9 +14,8 @@ COMMENT= Python bindings for Shapelib
LICENSE= LGPL20
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-
+USES= python
+USE_PYTHON= distutils
SHAPELIB= shapelib-1.2.10
USE_LDCONFIG= yes
diff --git a/devel/py-pytemplate/Makefile b/devel/py-pytemplate/Makefile
index a8c74447a349..f056f5c298ad 100644
--- a/devel/py-pytemplate/Makefile
+++ b/devel/py-pytemplate/Makefile
@@ -13,8 +13,8 @@ COMMENT= Pytemplate gives python developers a starting framework
LICENSE= GPLv3
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
+USES= python:2
+USE_PYTHON= distutils
EXAMPLESDIR= ${PREFIX}/share/examples/py-pytemplate
diff --git a/devel/py-pytest-runner/Makefile b/devel/py-pytest-runner/Makefile
index 4be93c04a5ae..73f741de5c10 100644
--- a/devel/py-pytest-runner/Makefile
+++ b/devel/py-pytest-runner/Makefile
@@ -12,9 +12,7 @@ COMMENT= Test support for pytest runner in setup.py
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>=0:${PORTSDIR}/devel/py-hgtools
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-pythonbrew/Makefile b/devel/py-pythonbrew/Makefile
index ede6acbd85f3..915e63041a76 100644
--- a/devel/py-pythonbrew/Makefile
+++ b/devel/py-pythonbrew/Makefile
@@ -13,8 +13,7 @@ COMMENT= Python Environment manager
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-pytz/Makefile b/devel/py-pytz/Makefile
index 3890af53fe33..01f9f52469d8 100644
--- a/devel/py-pytz/Makefile
+++ b/devel/py-pytz/Makefile
@@ -13,7 +13,7 @@ COMMENT= World Timezone Definitions for Python
LICENSE= MIT
-USES= tar:bzip2
+USES= python tar:bzip2
USE_PYTHON= autoplist distutils
post-patch:
diff --git a/devel/py-pyutil/Makefile b/devel/py-pyutil/Makefile
index 823545f16881..5a019c3f883c 100644
--- a/devel/py-pyutil/Makefile
+++ b/devel/py-pyutil/Makefile
@@ -15,9 +15,9 @@ LICENSE= GPLv2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.1:${PORTSDIR}/devel/py-simplejson \
${PYTHON_PKGNAMEPREFIX}zbase32>=1.1.0:${PORTSDIR}/converters/zbase32
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
+
post-extract:
@${FIND} ${WRKSRC} -type f -name "*.py~" -delete
diff --git a/devel/py-pyxml2obj/Makefile b/devel/py-pyxml2obj/Makefile
index 84cfa1d5b3c6..fdba35ef456c 100644
--- a/devel/py-pyxml2obj/Makefile
+++ b/devel/py-pyxml2obj/Makefile
@@ -12,8 +12,7 @@ COMMENT= Simple way to convert xml to python object and vice versa
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-qpid/Makefile b/devel/py-qpid/Makefile
index fccfa840f862..7b88024f44b6 100644
--- a/devel/py-qpid/Makefile
+++ b/devel/py-qpid/Makefile
@@ -14,8 +14,7 @@ COMMENT= Python library for qpid, a connection-oriented messaging API
LICENSE= APACHE20
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-qserve/Makefile b/devel/py-qserve/Makefile
index 137bf0ef20a6..1261ed09b657 100644
--- a/devel/py-qserve/Makefile
+++ b/devel/py-qserve/Makefile
@@ -11,9 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Job queue server
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile
index 7a9e2d0939d5..623a44279b00 100644
--- a/devel/py-qt4-core/Makefile
+++ b/devel/py-qt4-core/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFIGURE_ARGS= --enable QtCore
PYQT4_DIST= yes
-PYTHON_PY3K_PLIST_HACK= yes
+USE_PYTHON+= py3kplist
USE_QT4= corelib qmake_build moc_build
OPTIONS_DEFINE= API DEBUG
diff --git a/devel/py-rauth/Makefile b/devel/py-rauth/Makefile
index ce4f9e646d46..77bceece83e8 100644
--- a/devel/py-rauth/Makefile
+++ b/devel/py-rauth/Makefile
@@ -26,9 +26,8 @@ USE_GITHUB= yes
GH_ACCOUNT= litl
GH_COMMIT= b6d92ca
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.options.mk>
diff --git a/devel/py-repl/Makefile b/devel/py-repl/Makefile
index 7cc728d8c826..831e5f1c2719 100644
--- a/devel/py-repl/Makefile
+++ b/devel/py-repl/Makefile
@@ -15,8 +15,7 @@ COMMENT= Replacement for readline and interactive environment for Python
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-repoze.lru/Makefile b/devel/py-repoze.lru/Makefile
index 3791b1c885fd..7d4aaeba9773 100644
--- a/devel/py-repoze.lru/Makefile
+++ b/devel/py-repoze.lru/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= clsung@FreeBSD.org
COMMENT= Tiny LRU cache implementation and decorator
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-repoze.tm2/Makefile b/devel/py-repoze.tm2/Makefile
index 0998a33794aa..be9676773b17 100644
--- a/devel/py-repoze.tm2/Makefile
+++ b/devel/py-repoze.tm2/Makefile
@@ -14,8 +14,7 @@ COMMENT= Zope-like transaction manager via WSGI middleware
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=1.0.0:${PORTSDIR}/devel/py-transaction
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-repoze.what-pylons/Makefile b/devel/py-repoze.what-pylons/Makefile
index 1896f65f3ea2..9bd9dccb4fce 100644
--- a/devel/py-repoze.what-pylons/Makefile
+++ b/devel/py-repoze.what-pylons/Makefile
@@ -16,8 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylons>=0.9.7:${PORTSDIR}/www/py-pylons \
${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:${PORTSDIR}/devel/py-zope.interface
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-repoze.what/Makefile b/devel/py-repoze.what/Makefile
index 2324037b24e4..5fcc63f6700a 100644
--- a/devel/py-repoze.what/Makefile
+++ b/devel/py-repoze.what/Makefile
@@ -15,8 +15,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:${PORTSDIR}/www/py-paste \
${PYTHON_PKGNAMEPREFIX}repoze.who-testutil>=0:${PORTSDIR}/devel/py-repoze.who-testutil
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-repoze.who-friendlyform/Makefile b/devel/py-repoze.who-friendlyform/Makefile
index ae265154eb5a..64ea1eec8a0c 100644
--- a/devel/py-repoze.who-friendlyform/Makefile
+++ b/devel/py-repoze.who-friendlyform/Makefile
@@ -17,9 +17,7 @@ RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}coverage>=0:${PORTSDIR}/devel/py-coverage \
${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose \
${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:${PORTSDIR}/devel/py-repoze.who
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_PKGNAME= repoze.who-friendlyform
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-repoze.who-testutil/Makefile b/devel/py-repoze.who-testutil/Makefile
index 390db5d01038..21b37d952dac 100644
--- a/devel/py-repoze.who-testutil/Makefile
+++ b/devel/py-repoze.who-testutil/Makefile
@@ -16,8 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:${PORTSDIR}/devel/py-re
${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.3:${PORTSDIR}/www/py-pastedeploy
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-repoze.who/Makefile b/devel/py-repoze.who/Makefile
index 39bc8610aa86..dfa8405e8c5a 100644
--- a/devel/py-repoze.who/Makefile
+++ b/devel/py-repoze.who/Makefile
@@ -17,8 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=0:${PORTSDIR}/www/py-webob \
${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:${PORTSDIR}/devel/py-zope.interface
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-repoze.xmliter/Makefile b/devel/py-repoze.xmliter/Makefile
index ea51dca04744..a0d7acc48d1a 100644
--- a/devel/py-repoze.xmliter/Makefile
+++ b/devel/py-repoze.xmliter/Makefile
@@ -14,9 +14,7 @@ LICENSE= BSD
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.1:${PORTSDIR}/devel/py-lxml
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-resolver/Makefile b/devel/py-resolver/Makefile
index 1eb01dc32e05..3d620936901b 100644
--- a/devel/py-resolver/Makefile
+++ b/devel/py-resolver/Makefile
@@ -13,9 +13,8 @@ COMMENT= Resolve specially formatted statements to Python objects
LICENSE= LGPL21
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-patch:
@${REINPLACE_CMD} 's/license="LGPL",/license="LGPL", zip_safe=False,/' \
diff --git a/devel/py-resourcepackage/Makefile b/devel/py-resourcepackage/Makefile
index 4848f805d0a2..1c90dbc0ceb7 100644
--- a/devel/py-resourcepackage/Makefile
+++ b/devel/py-resourcepackage/Makefile
@@ -11,8 +11,7 @@ DISTNAME= ResourcePackage-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Automated resource-as-package embedding mechanism
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-rlcompleter2/Makefile b/devel/py-rlcompleter2/Makefile
index 859cff9ef79b..2980f38b7787 100644
--- a/devel/py-rlcompleter2/Makefile
+++ b/devel/py-rlcompleter2/Makefile
@@ -12,8 +12,7 @@ COMMENT= Python module for readline interactive completion
LICENSE= MIT
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-robotframework-pabot/Makefile b/devel/py-robotframework-pabot/Makefile
index 52f8c793416e..2c1d029cc4c2 100644
--- a/devel/py-robotframework-pabot/Makefile
+++ b/devel/py-robotframework-pabot/Makefile
@@ -14,8 +14,7 @@ LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:${PORTSDIR}/devel/py-robotframework
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-rope/Makefile b/devel/py-rope/Makefile
index a045599a6c91..d8155597fcce 100644
--- a/devel/py-rope/Makefile
+++ b/devel/py-rope/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= jjachuf@gmail.com
COMMENT= Rope is a python refactoring library
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-rose/Makefile b/devel/py-rose/Makefile
index 8fb6f0074cf7..db061369b11a 100644
--- a/devel/py-rose/Makefile
+++ b/devel/py-rose/Makefile
@@ -13,8 +13,7 @@ COMMENT= Small library for keeping your version up-to-date easily everywhere
LICENSE= BSD
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-roxlib/Makefile b/devel/py-roxlib/Makefile
index d9861c5bbe48..dfbbd9a4bdc5 100644
--- a/devel/py-roxlib/Makefile
+++ b/devel/py-roxlib/Makefile
@@ -11,8 +11,7 @@ DISTNAME= rox-lib2-${PORTVERSION}
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Python libraries for ROX
-USES= tar:bzip2
-USE_PYTHON= yes
+USES= python tar:bzip2
RUN_DEPENDS= ${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
diff --git a/devel/py-ruledispatch/Makefile b/devel/py-ruledispatch/Makefile
index ad7255b31733..3c78d6343626 100644
--- a/devel/py-ruledispatch/Makefile
+++ b/devel/py-ruledispatch/Makefile
@@ -19,11 +19,8 @@ LICENSE_COMB= dual
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Extremes>=1.1:${PORTSDIR}/devel/py-extremes \
${PYTHON_PKGNAMEPREFIX}PyProtocols>=1.0.a0.r2302:${PORTSDIR}/devel/py-protocols-devel
-PYDISTUTILS_AUTOPLIST= yes
-PYDISTUTILS_PKGVERSION= 0.5a1.dev_r2717
-
-USE_PYDISTUTILS= yes
-USE_PYTHON= yes
+USES= python
+USE_PYTHON= distutils autoplist
# to have a platform/release indipendent directory (necessary for strip cmd)
pre-build:
diff --git a/devel/py-sanetime/Makefile b/devel/py-sanetime/Makefile
index 374f5bf0cb1b..b07db677ea6b 100644
--- a/devel/py-sanetime/Makefile
+++ b/devel/py-sanetime/Makefile
@@ -20,9 +20,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unittest2:${PORTSDIR}/devel/py-unittest2
OPTIONS_DEFINE= TESTS
TESTS_DESC= Include tools for unit tests
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
TESTS_BUILD_DEPENDS= ${TEST_DEPENDS}
diff --git a/devel/py-setproctitle/Makefile b/devel/py-setproctitle/Makefile
index 3f7373dc6b93..36e304faa07d 100644
--- a/devel/py-setproctitle/Makefile
+++ b/devel/py-setproctitle/Makefile
@@ -12,9 +12,8 @@ COMMENT= Allow customization of the process title
LICENSE= BSD3CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
PORTDOCS= COPYRIGHT HISTORY.rst README.rst
diff --git a/devel/py-setuptools-git/Makefile b/devel/py-setuptools-git/Makefile
index 24eac7ea2d28..11721f44f31f 100644
--- a/devel/py-setuptools-git/Makefile
+++ b/devel/py-setuptools-git/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= miwi@FreeBSD.org
COMMENT= Setuptools plugin for git
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-setuptools_darcs/Makefile b/devel/py-setuptools_darcs/Makefile
index 82426b911052..1ab0ec40e00d 100644
--- a/devel/py-setuptools_darcs/Makefile
+++ b/devel/py-setuptools_darcs/Makefile
@@ -13,8 +13,7 @@ COMMENT= Setuptools plugin for darcs
BUILD_DEPENDS= darcsver:${PORTSDIR}/devel/py-darcsver
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-setuptools_hg/Makefile b/devel/py-setuptools_hg/Makefile
index adf084cf8a64..e4f7ffc4a109 100644
--- a/devel/py-setuptools_hg/Makefile
+++ b/devel/py-setuptools_hg/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= miwi@FreeBSD.org
COMMENT= Setuptools plugin for hg
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-simpleparse/Makefile b/devel/py-simpleparse/Makefile
index f69ed9df43c2..fca4a8b54e40 100644
--- a/devel/py-simpleparse/Makefile
+++ b/devel/py-simpleparse/Makefile
@@ -13,8 +13,7 @@ COMMENT= Python EBNF parser generator for use with mx.TextTools
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mx-base>0:${PORTSDIR}/lang/py-mx-base
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-simpletal/Makefile b/devel/py-simpletal/Makefile
index 6895155000a0..ec36c23fad84 100644
--- a/devel/py-simpletal/Makefile
+++ b/devel/py-simpletal/Makefile
@@ -15,8 +15,7 @@ COMMENT= Stand alone TAL Python implementation to power HTML & XML templates
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-simpy/Makefile b/devel/py-simpy/Makefile
index 0d6513ee31da..37ee126d5055 100644
--- a/devel/py-simpy/Makefile
+++ b/devel/py-simpy/Makefile
@@ -16,8 +16,8 @@ COMMENT= Simulation in Python
LICENSE= LGPL21
NO_ARCH= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= SimPy
OPTIONS_DEFINE= TKINTER DOCS
diff --git a/devel/py-singledispatch/Makefile b/devel/py-singledispatch/Makefile
index bad1d035a7bc..3df646bae172 100644
--- a/devel/py-singledispatch/Makefile
+++ b/devel/py-singledispatch/Makefile
@@ -12,8 +12,7 @@ COMMENT= Provides single-dispatch generic functions
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-smmap/Makefile b/devel/py-smmap/Makefile
index 410b672771dd..8d468214c113 100644
--- a/devel/py-smmap/Makefile
+++ b/devel/py-smmap/Makefile
@@ -12,8 +12,7 @@ COMMENT= Pure python sliding memory map manager
LICENSE= BSD
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-snack/Makefile b/devel/py-snack/Makefile
index e8027a48f167..0243d329c839 100644
--- a/devel/py-snack/Makefile
+++ b/devel/py-snack/Makefile
@@ -21,9 +21,8 @@ OPTIONS_DEFINE= EXAMPLES
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-nls
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
PYSETUP= ${WRKDIR}/setup.py
SUB_FILES= setup.py
diff --git a/devel/py-snackwich/Makefile b/devel/py-snackwich/Makefile
index ac5907f3cdad..f95832e2c8a4 100644
--- a/devel/py-snackwich/Makefile
+++ b/devel/py-snackwich/Makefile
@@ -15,8 +15,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snack>0:${PORTSDIR}/devel/py-snack
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-spark/Makefile b/devel/py-spark/Makefile
index d6c1837f073f..e064e3b34630 100644
--- a/devel/py-spark/Makefile
+++ b/devel/py-spark/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Scanning, Parsing, and Rewriting Kit
-USE_PYTHON= 2
+USES= python:2
NO_BUILD= yes
OPTIONS_DEFINE= DOCS
diff --git a/devel/py-sqlcc/Makefile b/devel/py-sqlcc/Makefile
index 121fd8eba66d..ce9b61377eef 100644
--- a/devel/py-sqlcc/Makefile
+++ b/devel/py-sqlcc/Makefile
@@ -14,7 +14,7 @@ LICENSE= BSD
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pythk>=0:${PORTSDIR}/devel/pythk
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/devel/py-statgrab/Makefile b/devel/py-statgrab/Makefile
index 52fd82809a8d..5550095d0584 100644
--- a/devel/py-statgrab/Makefile
+++ b/devel/py-statgrab/Makefile
@@ -15,9 +15,7 @@ COMMENT= Set of Python bindings for libstatgrab
LIB_DEPENDS= libstatgrab.so:${PORTSDIR}/devel/libstatgrab
-USES= pkgconfig
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= pkgconfig python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-stevedore/Makefile b/devel/py-stevedore/Makefile
index 9f08d9ccd390..dc320bf61755 100644
--- a/devel/py-stevedore/Makefile
+++ b/devel/py-stevedore/Makefile
@@ -23,9 +23,8 @@ OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
TOX_CMD= ${LOCALBASE}/bin/tox
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.options.mk>
diff --git a/devel/py-stsci.distutils/Makefile b/devel/py-stsci.distutils/Makefile
index 93710ec76ac4..7ce846e5d65d 100644
--- a/devel/py-stsci.distutils/Makefile
+++ b/devel/py-stsci.distutils/Makefile
@@ -14,8 +14,7 @@ LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}d2to1>0:${PORTSDIR}/devel/py-d2to1
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index 7d43e0801dfd..5bdaed77467d 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../devel/subversion
.endif
PKGDIR= ${.CURDIR}
-USE_PYTHON= yes
+USES+= python
SVN_BUILD_BINDINGS= yes
SVN_BUILD_ADDONS= yes
diff --git a/devel/py-subvertpy/Makefile b/devel/py-subvertpy/Makefile
index b1814122f24b..fa87d3e672b1 100644
--- a/devel/py-subvertpy/Makefile
+++ b/devel/py-subvertpy/Makefile
@@ -17,9 +17,8 @@ LICENSE= GPLv2
BUILD_DEPENDS+= svn:${PORTSDIR}/devel/subversion
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
MAKE_ENV= HOME=/dev/null
.include <bsd.port.mk>
diff --git a/devel/py-sysctl/Makefile b/devel/py-sysctl/Makefile
index 22dc163b2bde..598ffd10f8b9 100644
--- a/devel/py-sysctl/Makefile
+++ b/devel/py-sysctl/Makefile
@@ -12,8 +12,7 @@ COMMENT= Wrapper for the sysctl system functions
LICENSE= BSD2CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-tapi/Makefile b/devel/py-tapi/Makefile
index 38617f3a740a..ef9d0abe92db 100644
--- a/devel/py-tapi/Makefile
+++ b/devel/py-tapi/Makefile
@@ -13,8 +13,7 @@ COMMENT= Framework for testing APIs
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-tconfpy/Makefile b/devel/py-tconfpy/Makefile
index 49f54dd6e894..436f7262ffa3 100644
--- a/devel/py-tconfpy/Makefile
+++ b/devel/py-tconfpy/Makefile
@@ -11,9 +11,8 @@ DISTNAME= py-${PORTNAME}-${PORTVERSION}
MAINTAINER= tconfpy@tundraware.com
COMMENT= Python Configuration File Parser
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS
diff --git a/devel/py-tempstorage/Makefile b/devel/py-tempstorage/Makefile
index 1701f462a77b..012b60aaa966 100644
--- a/devel/py-tempstorage/Makefile
+++ b/devel/py-tempstorage/Makefile
@@ -16,9 +16,7 @@ LICENSE= ZPL21
RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=3.9.0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.testing>0:${PORTSDIR}/devel/py-zope.testing
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-termcolor/Makefile b/devel/py-termcolor/Makefile
index b4a787aed461..84d8eef371c0 100644
--- a/devel/py-termcolor/Makefile
+++ b/devel/py-termcolor/Makefile
@@ -13,8 +13,7 @@ COMMENT= ANSII Color formatting for output in terminal
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-testgears/Makefile b/devel/py-testgears/Makefile
index 889650bef652..a4faffa3bb04 100644
--- a/devel/py-testgears/Makefile
+++ b/devel/py-testgears/Makefile
@@ -12,8 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Python module to run tests written as simple functions
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST=yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-testoob/Makefile b/devel/py-testoob/Makefile
index a54edddce1fb..006b0d9aeee9 100644
--- a/devel/py-testoob/Makefile
+++ b/devel/py-testoob/Makefile
@@ -15,10 +15,8 @@ COMMENT= Testoob is an advanced unit testing framework for PyUnit
OPTIONS_DEFINE= TWISTED
TWISTED_DESC= enable running in threads
-USES= tar:bzip2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python tar:bzip2
+USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
diff --git a/devel/py-testtools/Makefile b/devel/py-testtools/Makefile
index c05943733cbe..efb2f7d8753b 100644
--- a/devel/py-testtools/Makefile
+++ b/devel/py-testtools/Makefile
@@ -16,7 +16,7 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}extras>=0.0.3:${PORTSDIR}/devel/py-extras
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/devel/py-tgMochiKit/Makefile b/devel/py-tgMochiKit/Makefile
index 0efc21b86f5e..da688be60d31 100644
--- a/devel/py-tgMochiKit/Makefile
+++ b/devel/py-tgMochiKit/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= MochiKit packaged as TurboGears widgets
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-thrift/Makefile b/devel/py-thrift/Makefile
index 9a84b1e90c4b..679a1f4e26c5 100644
--- a/devel/py-thrift/Makefile
+++ b/devel/py-thrift/Makefile
@@ -13,9 +13,8 @@ COMMENT= Python interface to Thrift
DISTINFO_FILE= ${PORTSDIR}/devel/thrift/distinfo
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/${DISTNAME}/lib/py
diff --git a/devel/py-timelib/Makefile b/devel/py-timelib/Makefile
index 2e2617f065ec..e0e808ad9635 100644
--- a/devel/py-timelib/Makefile
+++ b/devel/py-timelib/Makefile
@@ -11,9 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= Parse English textual date descriptions
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-tox/Makefile b/devel/py-tox/Makefile
index 3375f87a5351..419470e20093 100644
--- a/devel/py-tox/Makefile
+++ b/devel/py-tox/Makefile
@@ -16,9 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.11.2:${PORTSDIR}/devel/py-virtualenv \
${PYTHON_PKGNAMEPREFIX}pylib>=1.4.17:${PORTSDIR}/devel/py-pylib
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= PYTEST
PYTEST_DESC= Include the pytest test runner
diff --git a/devel/py-trace2html/Makefile b/devel/py-trace2html/Makefile
index db7bbd696509..21cc35fc068c 100644
--- a/devel/py-trace2html/Makefile
+++ b/devel/py-trace2html/Makefile
@@ -13,8 +13,7 @@ COMMENT= HTML coverage report generator for trace.py
LICENSE= GPLv2
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-traits/Makefile b/devel/py-traits/Makefile
index 71f489a06a87..a20fcbe43be7 100644
--- a/devel/py-traits/Makefile
+++ b/devel/py-traits/Makefile
@@ -18,9 +18,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}EnthoughtBase>=3.0.1:${PORTSDIR}/devel/py-
${PYNUMPY}
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/devel/py-transaction/Makefile b/devel/py-transaction/Makefile
index bb9daee11196..d16469d3b211 100644
--- a/devel/py-transaction/Makefile
+++ b/devel/py-transaction/Makefile
@@ -14,9 +14,7 @@ COMMENT= Transaction management for Python
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:${PORTSDIR}/devel/py-zope.interface
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-trollius/Makefile b/devel/py-trollius/Makefile
index 4c6fd089062f..50ba06a8f48f 100644
--- a/devel/py-trollius/Makefile
+++ b/devel/py-trollius/Makefile
@@ -14,8 +14,7 @@ LICENSE= MIT
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>0:${PORTSDIR}/devel/py-futures
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-turbocheetah/Makefile b/devel/py-turbocheetah/Makefile
index b11608667e67..eea6658b798e 100644
--- a/devel/py-turbocheetah/Makefile
+++ b/devel/py-turbocheetah/Makefile
@@ -15,9 +15,8 @@ COMMENT= TurboGears plugin to support use of Cheetah templates
RUN_DEPENDS= cheetah:${PORTSDIR}/devel/py-cheetah
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
diff --git a/devel/py-turbojson/Makefile b/devel/py-turbojson/Makefile
index 2f2a2897c1d8..6f646d082480 100644
--- a/devel/py-turbojson/Makefile
+++ b/devel/py-turbojson/Makefile
@@ -20,8 +20,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:${PORTSDIR}/devel/py-sim
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:${PORTSDIR}/devel/py-simplejson \
${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0:${PORTSDIR}/devel/py-PEAK-Rules
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-turbokid/Makefile b/devel/py-turbokid/Makefile
index 1fe613157958..9e922b6c14df 100644
--- a/devel/py-turbokid/Makefile
+++ b/devel/py-turbokid/Makefile
@@ -14,8 +14,7 @@ COMMENT= Python template plugin that supports Kid templates
RUN_DEPENDS= kid:${PORTSDIR}/devel/py-kid
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-tvrage/Makefile b/devel/py-tvrage/Makefile
index 5bd0be538593..0059a29fea46 100644
--- a/devel/py-tvrage/Makefile
+++ b/devel/py-tvrage/Makefile
@@ -18,8 +18,8 @@ GH_COMMIT= c8e9781
GH_TAGNAME= ${PORTVERSION}
GH_PROJECT= python-${PORTNAME}
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
+USES= python:2
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= python_${PORTNAME}
.include <bsd.port.mk>
diff --git a/devel/py-tw.forms/Makefile b/devel/py-tw.forms/Makefile
index 7ac3fb3b589a..0a0ec528ed2e 100644
--- a/devel/py-tw.forms/Makefile
+++ b/devel/py-tw.forms/Makefile
@@ -16,8 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:${PORTSDIR}/devel/py-Tosca
RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:${PORTSDIR}/devel/py-ToscaWidgets \
${PYTHON_PKGNAMEPREFIX}formencode>=0:${PORTSDIR}/www/py-formencode
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index 1d8c5674713e..f472cbc506dd 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -16,7 +16,7 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twistedCore>=${PORTVERSION}:${PORTSDIR}/devel/py-twistedCore
NO_BUILD= yes
-USE_PYTHON= 2
+USES= python:2
# Bypass infrastructure bug
OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
diff --git a/devel/py-twistedCore/Makefile b/devel/py-twistedCore/Makefile
index 634c4825e939..f30dafa1c50c 100644
--- a/devel/py-twistedCore/Makefile
+++ b/devel/py-twistedCore/Makefile
@@ -22,9 +22,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
# Twisted, but the user should feel free to install x11-toolits/py-gnome
# separately if desired.
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= tar:bzip2
+USES= python:2 tar:bzip2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-twistedRunner/Makefile b/devel/py-twistedRunner/Makefile
index cbe1096ceb4c..e965469d3eb2 100644
--- a/devel/py-twistedRunner/Makefile
+++ b/devel/py-twistedRunner/Makefile
@@ -14,9 +14,7 @@ COMMENT= Runner has process management, including an inetd replacement
LICENSE= MIT
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= tar:bzip2 twisted
+USE_PYTHON= distutils autoplist
+USES= python:2 tar:bzip2 twisted
.include <bsd.port.mk>
diff --git a/devel/py-tzlocal/Makefile b/devel/py-tzlocal/Makefile
index 7eccf63bf469..a296b80c6c3c 100644
--- a/devel/py-tzlocal/Makefile
+++ b/devel/py-tzlocal/Makefile
@@ -17,10 +17,8 @@ OPTIONS_DEFINE= TEST
OPTIONS_DEFAULT= TEST
TEST_DESC= Run test suite
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.options.mk>
diff --git a/devel/py-ua_parser/Makefile b/devel/py-ua_parser/Makefile
index a88a405ce42e..295cdf59bdd9 100644
--- a/devel/py-ua_parser/Makefile
+++ b/devel/py-ua_parser/Makefile
@@ -15,8 +15,7 @@ LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/__init__.py:${PORTSDIR}/devel/py-yaml
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-ujson/Makefile b/devel/py-ujson/Makefile
index 7e38c92f4411..5e7ca59232bb 100644
--- a/devel/py-ujson/Makefile
+++ b/devel/py-ujson/Makefile
@@ -12,9 +12,7 @@ COMMENT= Ultra fast JSON encoder and decoder for Python
LICENSE= BSD
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-uncompyle2/Makefile b/devel/py-uncompyle2/Makefile
index d490d863ead7..8532e0b8522f 100644
--- a/devel/py-uncompyle2/Makefile
+++ b/devel/py-uncompyle2/Makefile
@@ -12,8 +12,8 @@ MAINTAINER= mi@aldan.algebra.com
COMMENT= Decompiler for Python's .pyc and .pyo files
HASH= 3956a5a
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
+USES= python:2
+USE_PYTHON= distutils
REINPLACE_ARGS= -i ""
pre-patch:
diff --git a/devel/py-unipath/Makefile b/devel/py-unipath/Makefile
index 2413cbbadee0..757f4080ec82 100644
--- a/devel/py-unipath/Makefile
+++ b/devel/py-unipath/Makefile
@@ -12,8 +12,7 @@ COMMENT= Object-oriented alternative to os/os.path/shutil
LICENSE= PSFL
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-unittest2/Makefile b/devel/py-unittest2/Makefile
index 322acab8df0b..f62571332e92 100644
--- a/devel/py-unittest2/Makefile
+++ b/devel/py-unittest2/Makefile
@@ -12,9 +12,7 @@ COMMENT= Unittest features for Python 2.7 backported to Python 2.3+
LICENSE= BSD3CLAUSE
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-urlimport/Makefile b/devel/py-urlimport/Makefile
index d64cde83447b..85d2465b344f 100644
--- a/devel/py-urlimport/Makefile
+++ b/devel/py-urlimport/Makefile
@@ -14,9 +14,8 @@ COMMENT= Python script for importing modules/packages over the net
NO_WRKSUBDIR= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
do-extract:
${MKDIR} ${WRKDIR}
diff --git a/devel/py-urwid/Makefile b/devel/py-urwid/Makefile
index 2da6e30c46b3..2bcda12b66d3 100644
--- a/devel/py-urwid/Makefile
+++ b/devel/py-urwid/Makefile
@@ -16,9 +16,8 @@ LICENSE= LGPL21
OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
OPTIONS_DEFINE= EXAMPLES
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
PORTEXAMPLES= bigtext.py \
browse.py \
diff --git a/devel/py-usb/Makefile b/devel/py-usb/Makefile
index e5a7a7047850..f06a9330e8c2 100644
--- a/devel/py-usb/Makefile
+++ b/devel/py-usb/Makefile
@@ -10,9 +10,8 @@ COMMENT= Python wrapper around libusb
LICENSE= BSD3CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
USE_GITHUB= yes
GH_ACCOUNT= walac
diff --git a/devel/py-user_agents/Makefile b/devel/py-user_agents/Makefile
index b201de748000..a731dfc5495d 100644
--- a/devel/py-user_agents/Makefile
+++ b/devel/py-user_agents/Makefile
@@ -13,8 +13,7 @@ COMMENT= Python library to identify devices using User-Agent string
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ua_parser/__init__.py:${PORTSDIR}/devel/py-ua_parser
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-utils/Makefile b/devel/py-utils/Makefile
index ba9668af51b5..732848c2732b 100644
--- a/devel/py-utils/Makefile
+++ b/devel/py-utils/Makefile
@@ -11,10 +11,8 @@ DISTNAME= pythonutils-${PORTVERSION}
MAINTAINER= daniel@netwalk.org
COMMENT= General utility modules that simplify common programming in Python
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
PORTDOCS= *
diff --git a/devel/py-venusian/Makefile b/devel/py-venusian/Makefile
index 2ff6f1665a90..d994a8a73266 100644
--- a/devel/py-venusian/Makefile
+++ b/devel/py-venusian/Makefile
@@ -12,8 +12,7 @@ COMMENT= Python library for deferring decorator actions
LICENSE= BSD4CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-versiontools/Makefile b/devel/py-versiontools/Makefile
index 2a78ee41a09a..65bbb52be701 100644
--- a/devel/py-versiontools/Makefile
+++ b/devel/py-versiontools/Makefile
@@ -10,8 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= rm@FreeBSD.org
COMMENT= Smart replacement for plain tuple used in __version__
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-virtualenv-clone/Makefile b/devel/py-virtualenv-clone/Makefile
index 099e4be0fd2a..933203162b39 100644
--- a/devel/py-virtualenv-clone/Makefile
+++ b/devel/py-virtualenv-clone/Makefile
@@ -12,8 +12,7 @@ MAINTAINER= nivit@FreeBSD.org
COMMENT= Python virtualenv cloning script
# Python3 ready
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile
index 0ea84a934594..93f375021142 100644
--- a/devel/py-virtualenv/Makefile
+++ b/devel/py-virtualenv/Makefile
@@ -19,9 +19,8 @@ OPTIONS_DEFINE= DOCS
DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.options.mk>
diff --git a/devel/py-virtualenvwrapper/Makefile b/devel/py-virtualenvwrapper/Makefile
index d41b3a866c48..3f22848d7e71 100644
--- a/devel/py-virtualenvwrapper/Makefile
+++ b/devel/py-virtualenvwrapper/Makefile
@@ -22,9 +22,8 @@ OPTIONS_DEFINE= DOCS
DOCS_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx \
${PYTHON_PKGNAMEPREFIX}sphinxcontrib-bitbucket>=1.0:${PORTSDIR}/textproc/py-sphinxcontrib-bitbucket
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
diff --git a/devel/py-watchdog/Makefile b/devel/py-watchdog/Makefile
index 8c7920cb13ff..6012b1f3b387 100644
--- a/devel/py-watchdog/Makefile
+++ b/devel/py-watchdog/Makefile
@@ -27,11 +27,10 @@ OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
OPTIONS_DEFINE= DOCS
PORTDOCS= *
-PYDISTUTILS_AUTOPLIST= yes
-USE_GITHUB= yes
-USE_PYDISTUTILS= yes
-USE_PYTHON= yes
+USE_GITHUB= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.options.mk>
diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile
index b90acf513d4d..ab2452d226ec 100644
--- a/devel/py-wheel/Makefile
+++ b/devel/py-wheel/Makefile
@@ -18,14 +18,13 @@ OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
PIP_DESC= Use pip to install wheels
PIP_RUN_DEPENDS= pip:${PORTSDIR}/devel/py-pip
-PYDISTUTILS_AUTOPLIST= yes
SIGNATURE_DESC= Enable digital signature of wheels
SIGNATURE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dirspec>=13.05:${PORTSDIR}/devel/py-dirspec \
${PYTHON_PKGNAMEPREFIX}keyring>=1.3:${PORTSDIR}/security/py-keyring \
${PYTHON_PKGNAMEPREFIX}xdg>=0.25:${PORTSDIR}/devel/py-xdg
-USE_PYDISTUTILS= yes
-USE_PYTHON= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-wsgi_xmlrpc/Makefile b/devel/py-wsgi_xmlrpc/Makefile
index a345281913c3..7a188d92f5c5 100644
--- a/devel/py-wsgi_xmlrpc/Makefile
+++ b/devel/py-wsgi_xmlrpc/Makefile
@@ -14,8 +14,7 @@ COMMENT= WSGI application for a simple XMLRPC method dispatching
LICENSE= APACHE20
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST=yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-wsgitools/Makefile b/devel/py-wsgitools/Makefile
index a51553a5ed65..32087344f36a 100644
--- a/devel/py-wsgitools/Makefile
+++ b/devel/py-wsgitools/Makefile
@@ -13,8 +13,7 @@ COMMENT= Useful middlewares and filters for wsgi as well as scgi servers
LICENSE= GPLv2 # or higher
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-wsgiutils/Makefile b/devel/py-wsgiutils/Makefile
index 48e738fd363b..e491c3dae367 100644
--- a/devel/py-wsgiutils/Makefile
+++ b/devel/py-wsgiutils/Makefile
@@ -12,8 +12,7 @@ DISTNAME= WSGIUtils-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Utility libraries for development of simple WSGI programs
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-xattr/Makefile b/devel/py-xattr/Makefile
index 410f8074efed..02dfbcce26ff 100644
--- a/devel/py-xattr/Makefile
+++ b/devel/py-xattr/Makefile
@@ -14,8 +14,7 @@ COMMENT= Python wrapper for extended filesystem attributes
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-xdg/Makefile b/devel/py-xdg/Makefile
index 609364e50321..57a36810f9b7 100644
--- a/devel/py-xdg/Makefile
+++ b/devel/py-xdg/Makefile
@@ -14,9 +14,8 @@ COMMENT= Python 2 library to access freedesktop.org standards
LICENSE= LGPL20
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/devel/py-xerox/Makefile b/devel/py-xerox/Makefile
index 8bff1d9ee987..9dec02e6f66e 100644
--- a/devel/py-xerox/Makefile
+++ b/devel/py-xerox/Makefile
@@ -13,9 +13,7 @@ COMMENT= Simple copy and paste in Python
LICENSE= MIT
-PYDISTUTILS_AUTOPLIST= yes
-
-USE_PYDISTUTILS= yes
-USE_PYTHON= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-xmltodict/Makefile b/devel/py-xmltodict/Makefile
index ae0ab322fe64..c4cda3db6c55 100644
--- a/devel/py-xmltodict/Makefile
+++ b/devel/py-xmltodict/Makefile
@@ -14,9 +14,8 @@ LICENSE= MIT
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose:${PORTSDIR}/devel/py-nose
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && nosetests
diff --git a/devel/py-xoltar-toolkit/Makefile b/devel/py-xoltar-toolkit/Makefile
index 9c7b20fac05d..d29d04aeb512 100644
--- a/devel/py-xoltar-toolkit/Makefile
+++ b/devel/py-xoltar-toolkit/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-01jun01
MAINTAINER= ports@FreeBSD.org
COMMENT= Functional programming, lazy expressions, and thread pools for Python
-USE_PYTHON= 2
+USES= python:2
NO_WRKSUBDIR= yes
OPTIONS_DEFINE= DOCS
diff --git a/devel/py-yaml/Makefile b/devel/py-yaml/Makefile
index 9907f506abca..ddd3fec319e4 100644
--- a/devel/py-yaml/Makefile
+++ b/devel/py-yaml/Makefile
@@ -16,9 +16,8 @@ LICENSE= MIT
OPTIONS_DEFINE= LIBYAML EXAMPLES
LIBYAML_DESC= Use textproc/libyaml for faster parsing
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/devel/py-yappi/Makefile b/devel/py-yappi/Makefile
index 37d7b8625164..3de62e735da2 100644
--- a/devel/py-yappi/Makefile
+++ b/devel/py-yappi/Makefile
@@ -15,9 +15,8 @@ LICENSE= MIT
OPTIONS_DEFINE= DOCS
PORTDOCS= *
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/py-yapps2/Makefile b/devel/py-yapps2/Makefile
index 8e284db2b7b2..b484e30121d0 100644
--- a/devel/py-yapps2/Makefile
+++ b/devel/py-yapps2/Makefile
@@ -14,8 +14,7 @@ COMMENT= Easy-to-use parser generator that generates Python code
PORTSCOUT= skipv:2-2.1.1-17.1
WRKSRC= ${WRKDIR}/Yapps-${PORTVERSION}
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-ydbf/Makefile b/devel/py-ydbf/Makefile
index 9ebd57ceddb7..f40f18430e04 100644
--- a/devel/py-ydbf/Makefile
+++ b/devel/py-ydbf/Makefile
@@ -14,9 +14,7 @@ COMMENT= Yelded DBF reader/writer for Python
LICENSE= GPLv2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-PYDISTUTILS_PKGVERSION= 0.0.1dev_20080514
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-yum-metadata-parser/Makefile b/devel/py-yum-metadata-parser/Makefile
index 83e24d8d7b7a..4eb7cb122b57 100644
--- a/devel/py-yum-metadata-parser/Makefile
+++ b/devel/py-yum-metadata-parser/Makefile
@@ -15,9 +15,7 @@ LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 \
libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
libglib-2.0.so:${PORTSDIR}/devel/glib20
-USES= pkgconfig
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= pkgconfig python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-yunomi/Makefile b/devel/py-yunomi/Makefile
index 9d83bab22405..cea37696afb6 100644
--- a/devel/py-yunomi/Makefile
+++ b/devel/py-yunomi/Makefile
@@ -16,9 +16,8 @@ LICENSE= MIT
PORTDOCS= README.rst \
HISTORY.rst
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS
diff --git a/devel/py-z3c.autoinclude/Makefile b/devel/py-z3c.autoinclude/Makefile
index 73a3b61c8644..6819d6070076 100644
--- a/devel/py-z3c.autoinclude/Makefile
+++ b/devel/py-z3c.autoinclude/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
${PYTHON_PKGNAMEPREFIX}zc.buildout>=0:${PORTSDIR}/devel/py-zc.buildout
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-z3c.batching/Makefile b/devel/py-z3c.batching/Makefile
index 466757731c62..045c4aa12bb6 100644
--- a/devel/py-z3c.batching/Makefile
+++ b/devel/py-z3c.batching/Makefile
@@ -16,8 +16,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-z3c.caching/Makefile b/devel/py-z3c.caching/Makefile
index b5e1bd4e9ec3..d0b24f907f6d 100644
--- a/devel/py-z3c.caching/Makefile
+++ b/devel/py-z3c.caching/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:${PORTSDIR}/devel/py-zope.browserpage \
${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-z3c.form/Makefile b/devel/py-z3c.form/Makefile
index 9d463c4593ce..0b29135038c6 100644
--- a/devel/py-z3c.form/Makefile
+++ b/devel/py-z3c.form/Makefile
@@ -33,9 +33,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
${PYTHON_PKGNAMEPREFIX}zope.site>0:${PORTSDIR}/devel/py-zope.site \
${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-z3c.formwidget.query/Makefile b/devel/py-z3c.formwidget.query/Makefile
index 8d5d98d05f68..abc5d10f1ee1 100644
--- a/devel/py-z3c.formwidget.query/Makefile
+++ b/devel/py-z3c.formwidget.query/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:${PORTSDIR}/devel/py-z3c.form \
${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-z3c.zcmlhook/Makefile b/devel/py-z3c.zcmlhook/Makefile
index de97b88ab15a..9a55d461aa23 100644
--- a/devel/py-z3c.zcmlhook/Makefile
+++ b/devel/py-z3c.zcmlhook/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zExceptions/Makefile b/devel/py-zExceptions/Makefile
index bb9c6b528fb1..501eba1b21ab 100644
--- a/devel/py-zExceptions/Makefile
+++ b/devel/py-zExceptions/Makefile
@@ -17,9 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zLOG/Makefile b/devel/py-zLOG/Makefile
index 47ce05f574f0..4d2d957aa6b0 100644
--- a/devel/py-zLOG/Makefile
+++ b/devel/py-zLOG/Makefile
@@ -15,8 +15,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>=0:${PORTSDIR}/devel/py-zconfig
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zc.buildout/Makefile b/devel/py-zc.buildout/Makefile
index e3c4c53b9d93..fb8ea55d8387 100644
--- a/devel/py-zc.buildout/Makefile
+++ b/devel/py-zc.buildout/Makefile
@@ -12,8 +12,7 @@ COMMENT= System for managing development buildouts
LICENSE= ZPL21
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zclockfile/Makefile b/devel/py-zclockfile/Makefile
index 52b83c485b54..51a4165649d2 100644
--- a/devel/py-zclockfile/Makefile
+++ b/devel/py-zclockfile/Makefile
@@ -13,9 +13,7 @@ DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Basic inter-process locks
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zconfig/Makefile b/devel/py-zconfig/Makefile
index a8aa47042cd9..ac415e84e387 100644
--- a/devel/py-zconfig/Makefile
+++ b/devel/py-zconfig/Makefile
@@ -15,8 +15,7 @@ COMMENT= General use python configuration library
LICENSE= ZPL21
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.annotation/Makefile b/devel/py-zope.annotation/Makefile
index 27d3ade917e8..78a20a8d155d 100644
--- a/devel/py-zope.annotation/Makefile
+++ b/devel/py-zope.annotation/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:${PORTSDIR}/net/py-zope.proxy \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.applicationcontrol/Makefile b/devel/py-zope.app.applicationcontrol/Makefile
index 32e3168472f7..4690757b2e54 100644
--- a/devel/py-zope.app.applicationcontrol/Makefile
+++ b/devel/py-zope.app.applicationcontrol/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.size>=0:${PORTSDIR}/devel/py-zope.size \
${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:${PORTSDIR}/devel/py-zope.traversing
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.appsetup/Makefile b/devel/py-zope.app.appsetup/Makefile
index 25935e9243f0..57f5a739d7a7 100644
--- a/devel/py-zope.app.appsetup/Makefile
+++ b/devel/py-zope.app.appsetup/Makefile
@@ -27,8 +27,7 @@ RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.basicskin/Makefile b/devel/py-zope.app.basicskin/Makefile
index 9772f87e9f2e..1dcf999692d7 100644
--- a/devel/py-zope.app.basicskin/Makefile
+++ b/devel/py-zope.app.basicskin/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.broken/Makefile b/devel/py-zope.app.broken/Makefile
index c7211cc393f9..c6b12bab45c6 100644
--- a/devel/py-zope.app.broken/Makefile
+++ b/devel/py-zope.app.broken/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.cache/Makefile b/devel/py-zope.app.cache/Makefile
index e9acf276577c..fd6135cb3c52 100644
--- a/devel/py-zope.app.cache/Makefile
+++ b/devel/py-zope.app.cache/Makefile
@@ -26,9 +26,7 @@ RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.component/Makefile b/devel/py-zope.app.component/Makefile
index cf5659bce2e9..0e03164c396f 100644
--- a/devel/py-zope.app.component/Makefile
+++ b/devel/py-zope.app.component/Makefile
@@ -28,8 +28,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site
${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:${PORTSDIR}/devel/py-zope.componentvocabulary
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.container/Makefile b/devel/py-zope.app.container/Makefile
index dfab05791d36..13695f66b300 100644
--- a/devel/py-zope.app.container/Makefile
+++ b/devel/py-zope.app.container/Makefile
@@ -32,9 +32,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.br
${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:${PORTSDIR}/devel/py-zope.app.publisher
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.content/Makefile b/devel/py-zope.app.content/Makefile
index f0924456c6ee..3f864e0402ab 100644
--- a/devel/py-zope.app.content/Makefile
+++ b/devel/py-zope.app.content/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:${PORTSDIR}/deve
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.debug/Makefile b/devel/py-zope.app.debug/Makefile
index 1abdb7191b9e..b8e6fc8b5264 100644
--- a/devel/py-zope.app.debug/Makefile
+++ b/devel/py-zope.app.debug/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:${PORTSDIR}/devel/py-zope.app.appsetup \
${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:${PORTSDIR}/devel/py-zope.app.publication
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.dependable/Makefile b/devel/py-zope.app.dependable/Makefile
index 8dbf6b285036..3cf61e60e26e 100644
--- a/devel/py-zope.app.dependable/Makefile
+++ b/devel/py-zope.app.dependable/Makefile
@@ -21,9 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.error/Makefile b/devel/py-zope.app.error/Makefile
index 0945f630e7c3..b9b344d03dd1 100644
--- a/devel/py-zope.app.error/Makefile
+++ b/devel/py-zope.app.error/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.exception/Makefile b/devel/py-zope.app.exception/Makefile
index 915ae3cc3d49..c13e09308789 100644
--- a/devel/py-zope.app.exception/Makefile
+++ b/devel/py-zope.app.exception/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.folder/Makefile b/devel/py-zope.app.folder/Makefile
index ffe3d0ed565c..488b6d55a46c 100644
--- a/devel/py-zope.app.folder/Makefile
+++ b/devel/py-zope.app.folder/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:${PORTSDIR}/devel/py-zope.app.content
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.form/Makefile b/devel/py-zope.app.form/Makefile
index 12859af00440..dbfdd2244169 100644
--- a/devel/py-zope.app.form/Makefile
+++ b/devel/py-zope.app.form/Makefile
@@ -29,8 +29,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transact
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
${PYTHON_PKGNAMEPREFIX}zope.security>=3.5.1:${PORTSDIR}/security/py-zope.security
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.generations/Makefile b/devel/py-zope.app.generations/Makefile
index a2853a1be923..b8e13cf132de 100644
--- a/devel/py-zope.app.generations/Makefile
+++ b/devel/py-zope.app.generations/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.http/Makefile b/devel/py-zope.app.http/Makefile
index 0328ad55b29b..ccd44dadace2 100644
--- a/devel/py-zope.app.http/Makefile
+++ b/devel/py-zope.app.http/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:${PORTSDIR}/devel/py-zope.filerepresentation
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.pagetemplate/Makefile b/devel/py-zope.app.pagetemplate/Makefile
index 95f83e536633..93079e796027 100644
--- a/devel/py-zope.app.pagetemplate/Makefile
+++ b/devel/py-zope.app.pagetemplate/Makefile
@@ -26,8 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.12.0:${PORTSDIR}/devel/p
${PYTHON_PKGNAMEPREFIX}zope.tales>=0:${PORTSDIR}/devel/py-zope.tales \
${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.publication/Makefile b/devel/py-zope.app.publication/Makefile
index 9111da243096..eed93c45b44a 100644
--- a/devel/py-zope.app.publication/Makefile
+++ b/devel/py-zope.app.publication/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:${PORTSDIR}/devel/py-zope.traversing \
${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:${PORTSDIR}/devel/py-transaction
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.publisher/Makefile b/devel/py-zope.app.publisher/Makefile
index 931b0cf42c67..65e308b2f988 100644
--- a/devel/py-zope.app.publisher/Makefile
+++ b/devel/py-zope.app.publisher/Makefile
@@ -27,9 +27,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:${PORTSDIR}/devel/py-zop
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:${PORTSDIR}/devel/py-zope.componentvocabulary
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.renderer/Makefile b/devel/py-zope.app.renderer/Makefile
index f5ef79c36e24..f641082e7f0f 100644
--- a/devel/py-zope.app.renderer/Makefile
+++ b/devel/py-zope.app.renderer/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.5:${PORTSDIR}/textproc/py-docuti
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:${PORTSDIR}/textproc/py-zope.structuredtext
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.rotterdam/Makefile b/devel/py-zope.app.rotterdam/Makefile
index 93a4a53c0d98..3bde5279b3fd 100644
--- a/devel/py-zope.app.rotterdam/Makefile
+++ b/devel/py-zope.app.rotterdam/Makefile
@@ -26,8 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:${PORTSDIR}/devel/py-z
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.schema/Makefile b/devel/py-zope.app.schema/Makefile
index 6dee30f0288c..ae6af56a82b5 100644
--- a/devel/py-zope.app.schema/Makefile
+++ b/devel/py-zope.app.schema/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.testing/Makefile b/devel/py-zope.app.testing/Makefile
index 9a21789a70a6..bdea14b5cde9 100644
--- a/devel/py-zope.app.testing/Makefile
+++ b/devel/py-zope.app.testing/Makefile
@@ -32,8 +32,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:${PORTSDIR}/devel/py-zope.testbrowser \
${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.zcmlfiles/Makefile b/devel/py-zope.app.zcmlfiles/Makefile
index cb8ca4650aa0..d780e4ff9d31 100644
--- a/devel/py-zope.app.zcmlfiles/Makefile
+++ b/devel/py-zope.app.zcmlfiles/Makefile
@@ -50,8 +50,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}zope.app.wsgi>=0:${PORTSDIR}/www/py-zope.app.wsgi \
${PYTHON_PKGNAMEPREFIX}zope.app.zopeappgenerations>=0:${PORTSDIR}/devel/py-zope.app.zopeappgenerations
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.app.zopeappgenerations/Makefile b/devel/py-zope.app.zopeappgenerations/Makefile
index 1fcbb9af0d9b..64a1927a11dd 100644
--- a/devel/py-zope.app.zopeappgenerations/Makefile
+++ b/devel/py-zope.app.zopeappgenerations/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:${PORTSDIR}/devel/py-zope.dublincore \
${PYTHON_PKGNAMEPREFIX}zope.generations>=0:${PORTSDIR}/devel/py-zope.generations
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.applicationcontrol/Makefile b/devel/py-zope.applicationcontrol/Makefile
index 1541e4aa3aaa..fc6a499b1881 100644
--- a/devel/py-zope.applicationcontrol/Makefile
+++ b/devel/py-zope.applicationcontrol/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:${PORTSDIR}/devel/py-zope.traversing
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.broken/Makefile b/devel/py-zope.broken/Makefile
index 737c1cf18b27..7d840d3e2dfc 100644
--- a/devel/py-zope.broken/Makefile
+++ b/devel/py-zope.broken/Makefile
@@ -15,9 +15,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.browser/Makefile b/devel/py-zope.browser/Makefile
index 51b7386757d7..8aa2af853661 100644
--- a/devel/py-zope.browser/Makefile
+++ b/devel/py-zope.browser/Makefile
@@ -15,9 +15,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.browsermenu/Makefile b/devel/py-zope.browsermenu/Makefile
index f04f367bc98d..33859ea2f8da 100644
--- a/devel/py-zope.browsermenu/Makefile
+++ b/devel/py-zope.browsermenu/Makefile
@@ -24,9 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.br
${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:${PORTSDIR}/devel/py-zope.traversing \
${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5:${PORTSDIR}/devel/py-zope.pagetemplate
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.browserpage/Makefile b/devel/py-zope.browserpage/Makefile
index 771990601fce..a7e22c5e8bfd 100644
--- a/devel/py-zope.browserpage/Makefile
+++ b/devel/py-zope.browserpage/Makefile
@@ -24,8 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:${PORTSDIR}/devel/py-zo
${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:${PORTSDIR}/devel/py-zope.traversing \
${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:${PORTSDIR}/devel/py-zope.browsermenu
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.browserresource/Makefile b/devel/py-zope.browserresource/Makefile
index 6b3d6fcb79c6..421fe7656ef6 100644
--- a/devel/py-zope.browserresource/Makefile
+++ b/devel/py-zope.browserresource/Makefile
@@ -24,9 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:${PORTSDIR}/devel/py-z
${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:${PORTSDIR}/devel/py-zope.publisher \
${PYTHON_PKGNAMEPREFIX}zope.traversing>3.7:${PORTSDIR}/devel/py-zope.traversing
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.cachedescriptors/Makefile b/devel/py-zope.cachedescriptors/Makefile
index 2171dd1d3e53..3d6a17793b39 100644
--- a/devel/py-zope.cachedescriptors/Makefile
+++ b/devel/py-zope.cachedescriptors/Makefile
@@ -13,9 +13,7 @@ COMMENT= Method and property caching decorators
LICENSE= ZPL21
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.component/Makefile b/devel/py-zope.component/Makefile
index 879dac8e825f..b05392a8a879 100644
--- a/devel/py-zope.component/Makefile
+++ b/devel/py-zope.component/Makefile
@@ -17,8 +17,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.8.0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.componentvocabulary/Makefile b/devel/py-zope.componentvocabulary/Makefile
index 6d1a119ed80a..dcd593f4d334 100644
--- a/devel/py-zope.componentvocabulary/Makefile
+++ b/devel/py-zope.componentvocabulary/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.configuration/Makefile b/devel/py-zope.configuration/Makefile
index 21f82a015f48..a5d77cbe0b67 100644
--- a/devel/py-zope.configuration/Makefile
+++ b/devel/py-zope.configuration/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.container/Makefile b/devel/py-zope.container/Makefile
index cb39f2de36fc..5afcee511614 100644
--- a/devel/py-zope.container/Makefile
+++ b/devel/py-zope.container/Makefile
@@ -30,9 +30,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.contentprovider/Makefile b/devel/py-zope.contentprovider/Makefile
index 82a78f06d79e..88984e1a0e84 100644
--- a/devel/py-zope.contentprovider/Makefile
+++ b/devel/py-zope.contentprovider/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:${PORTSDIR}/devel/py-z
${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1dev:${PORTSDIR}/devel/py-zope.schema \
${PYTHON_PKGNAMEPREFIX}zope.tales>=0:${PORTSDIR}/devel/py-zope.tales
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.contenttype/Makefile b/devel/py-zope.contenttype/Makefile
index 410f0a257641..b451095be7ce 100644
--- a/devel/py-zope.contenttype/Makefile
+++ b/devel/py-zope.contenttype/Makefile
@@ -13,9 +13,7 @@ COMMENT= Zope contenttype
LICENSE= ZPL21
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.copy/Makefile b/devel/py-zope.copy/Makefile
index 9e8a88b1250a..6c8565a91b7a 100644
--- a/devel/py-zope.copy/Makefile
+++ b/devel/py-zope.copy/Makefile
@@ -15,8 +15,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.copypastemove/Makefile b/devel/py-zope.copypastemove/Makefile
index 0f86fc8cb39d..c1e9b45c54fe 100644
--- a/devel/py-zope.copypastemove/Makefile
+++ b/devel/py-zope.copypastemove/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.datetime/Makefile b/devel/py-zope.datetime/Makefile
index fd8d3011aa89..bf1bb15931f6 100644
--- a/devel/py-zope.datetime/Makefile
+++ b/devel/py-zope.datetime/Makefile
@@ -13,8 +13,7 @@ COMMENT= Commonly used date and time related utility functions
LICENSE= ZPL21
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.deferredimport/Makefile b/devel/py-zope.deferredimport/Makefile
index 7b553294e090..cccb6a7c3e75 100644
--- a/devel/py-zope.deferredimport/Makefile
+++ b/devel/py-zope.deferredimport/Makefile
@@ -15,8 +15,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:${PORTSDIR}/net/py-zope.proxy
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.deprecation/Makefile b/devel/py-zope.deprecation/Makefile
index 920356d36638..f9ec4d3695f5 100644
--- a/devel/py-zope.deprecation/Makefile
+++ b/devel/py-zope.deprecation/Makefile
@@ -12,8 +12,7 @@ DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Zope 3 Deprecation Infrastructure
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.dottedname/Makefile b/devel/py-zope.dottedname/Makefile
index 2f3fffb00434..1ad4336d5e86 100644
--- a/devel/py-zope.dottedname/Makefile
+++ b/devel/py-zope.dottedname/Makefile
@@ -13,8 +13,7 @@ COMMENT= Resolver for Python dotted names
LICENSE= ZPL21
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.dublincore/Makefile b/devel/py-zope.dublincore/Makefile
index cd9dbeeb3202..f6e682c0fef6 100644
--- a/devel/py-zope.dublincore/Makefile
+++ b/devel/py-zope.dublincore/Makefile
@@ -21,9 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-#USES= zope
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.error/Makefile b/devel/py-zope.error/Makefile
index 66ea83633325..7c0afcb49144 100644
--- a/devel/py-zope.error/Makefile
+++ b/devel/py-zope.error/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.event/Makefile b/devel/py-zope.event/Makefile
index cfb4db3d17ac..6ad9fce35184 100644
--- a/devel/py-zope.event/Makefile
+++ b/devel/py-zope.event/Makefile
@@ -14,8 +14,7 @@ COMMENT= Very basic event publishing system
LICENSE= ZPL21
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.exceptions/Makefile b/devel/py-zope.exceptions/Makefile
index dff82b045ba8..90722ad99a40 100644
--- a/devel/py-zope.exceptions/Makefile
+++ b/devel/py-zope.exceptions/Makefile
@@ -16,8 +16,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.filerepresentation/Makefile b/devel/py-zope.filerepresentation/Makefile
index 7c8d1f5e5844..22dccef354f3 100644
--- a/devel/py-zope.filerepresentation/Makefile
+++ b/devel/py-zope.filerepresentation/Makefile
@@ -16,8 +16,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.formlib/Makefile b/devel/py-zope.formlib/Makefile
index 90965794bdb1..ce1a546876fa 100644
--- a/devel/py-zope.formlib/Makefile
+++ b/devel/py-zope.formlib/Makefile
@@ -28,9 +28,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:${PORTSDIR}/devel/py-zope.datetime
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.generations/Makefile b/devel/py-zope.generations/Makefile
index 4b7e2529d1fe..fe529d49fff5 100644
--- a/devel/py-zope.generations/Makefile
+++ b/devel/py-zope.generations/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transact
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.globalrequest/Makefile b/devel/py-zope.globalrequest/Makefile
index 94a831f6689f..239cdc1d4f3a 100644
--- a/devel/py-zope.globalrequest/Makefile
+++ b/devel/py-zope.globalrequest/Makefile
@@ -21,9 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.te
${PYTHON_PKGNAMEPREFIX}zope.app.zcmlfiles>=0:${PORTSDIR}/devel/py-zope.app.zcmlfiles \
${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=0:${PORTSDIR}/devel/py-zope.testbrowser
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.i18n/Makefile b/devel/py-zope.i18n/Makefile
index 62be2a398ef1..f21846425e49 100644
--- a/devel/py-zope.i18n/Makefile
+++ b/devel/py-zope.i18n/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.even
${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
-USES= gettext
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= gettext python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.interface/Makefile b/devel/py-zope.interface/Makefile
index 31bcf4e90a34..e658265e8a0d 100644
--- a/devel/py-zope.interface/Makefile
+++ b/devel/py-zope.interface/Makefile
@@ -14,8 +14,7 @@ COMMENT= Interfaces for Python
LICENSE= ZPL21
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.lifecycleevent/Makefile b/devel/py-zope.lifecycleevent/Makefile
index 9d2b8f39eccd..eba20820681c 100644
--- a/devel/py-zope.lifecycleevent/Makefile
+++ b/devel/py-zope.lifecycleevent/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.location/Makefile b/devel/py-zope.location/Makefile
index 048fedbe3b29..9892814a7a00 100644
--- a/devel/py-zope.location/Makefile
+++ b/devel/py-zope.location/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:${PORTSDIR}/devel/py-zop
${PYTHON_PKGNAMEPREFIX}zope.proxy>3.3:${PORTSDIR}/net/py-zope.proxy \
${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6:${PORTSDIR}/devel/py-zope.schema
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.pagetemplate/Makefile b/devel/py-zope.pagetemplate/Makefile
index d6c0d4f7f901..86c5c00d4e31 100644
--- a/devel/py-zope.pagetemplate/Makefile
+++ b/devel/py-zope.pagetemplate/Makefile
@@ -22,9 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.processlifetime/Makefile b/devel/py-zope.processlifetime/Makefile
index b0fc0fa3d057..bc9d7128f0d9 100644
--- a/devel/py-zope.processlifetime/Makefile
+++ b/devel/py-zope.processlifetime/Makefile
@@ -15,8 +15,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.ptresource/Makefile b/devel/py-zope.ptresource/Makefile
index 3164cbab92e8..55c2a49d063b 100644
--- a/devel/py-zope.ptresource/Makefile
+++ b/devel/py-zope.ptresource/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:${PORTSDIR}/devel/py
${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.publisher/Makefile b/devel/py-zope.publisher/Makefile
index d2f87a07abdc..04c8c4803b78 100644
--- a/devel/py-zope.publisher/Makefile
+++ b/devel/py-zope.publisher/Makefile
@@ -25,8 +25,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.ramcache/Makefile b/devel/py-zope.ramcache/Makefile
index d7832e991f10..23242e5ad376 100644
--- a/devel/py-zope.ramcache/Makefile
+++ b/devel/py-zope.ramcache/Makefile
@@ -18,9 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.schema/Makefile b/devel/py-zope.schema/Makefile
index 2b69ff278980..28b1aee514c9 100644
--- a/devel/py-zope.schema/Makefile
+++ b/devel/py-zope.schema/Makefile
@@ -16,8 +16,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.sequencesort/Makefile b/devel/py-zope.sequencesort/Makefile
index 85565c2689dc..38bc9a4b4cde 100644
--- a/devel/py-zope.sequencesort/Makefile
+++ b/devel/py-zope.sequencesort/Makefile
@@ -13,8 +13,7 @@ COMMENT= Very Advanced Sequence Sorting
LICENSE= ZPL21
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.site/Makefile b/devel/py-zope.site/Makefile
index 30952dbb97e8..dd5ed8504b87 100644
--- a/devel/py-zope.site/Makefile
+++ b/devel/py-zope.site/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:${PORTSDIR}/devel/py-zope.location
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.size/Makefile b/devel/py-zope.size/Makefile
index beff6cf5f7c4..36a06d00f2c7 100644
--- a/devel/py-zope.size/Makefile
+++ b/devel/py-zope.size/Makefile
@@ -16,8 +16,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.tales/Makefile b/devel/py-zope.tales/Makefile
index 134b7a45bf65..0bd588537aef 100644
--- a/devel/py-zope.tales/Makefile
+++ b/devel/py-zope.tales/Makefile
@@ -16,8 +16,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:${PORTSDIR}/textproc/py-zope.tal \
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.testbrowser/Makefile b/devel/py-zope.testbrowser/Makefile
index c7e8f8c67cc8..8027fd70a67f 100644
--- a/devel/py-zope.testbrowser/Makefile
+++ b/devel/py-zope.testbrowser/Makefile
@@ -18,9 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mechanize>=0.2.0:${PORTSDIR}/www/py-mechaniz
${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
${PYTHON_PKGNAMEPREFIX}WebTest>=0:${PORTSDIR}/www/py-WebTest
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.testing/Makefile b/devel/py-zope.testing/Makefile
index ce4e4211a791..53e92a822b6f 100644
--- a/devel/py-zope.testing/Makefile
+++ b/devel/py-zope.testing/Makefile
@@ -17,8 +17,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.traversing/Makefile b/devel/py-zope.traversing/Makefile
index 008afd729511..b64819be6bf7 100644
--- a/devel/py-zope.traversing/Makefile
+++ b/devel/py-zope.traversing/Makefile
@@ -21,9 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:${PORTSDIR}/devel/py-zope.location
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py-zope.viewlet/Makefile b/devel/py-zope.viewlet/Makefile
index ac72e3f5df30..f7f82831f182 100644
--- a/devel/py-zope.viewlet/Makefile
+++ b/devel/py-zope.viewlet/Makefile
@@ -25,8 +25,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:${PORTSDIR}/devel/p
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/py3-xdg/Makefile b/devel/py3-xdg/Makefile
index 6cf661aacb78..c32e77072739 100644
--- a/devel/py3-xdg/Makefile
+++ b/devel/py3-xdg/Makefile
@@ -14,9 +14,8 @@ COMMENT= Python 3 library to access freedesktop.org standards
LICENSE= LGPL20
-USE_PYTHON= 3
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:3
+USE_PYTHON= distutils autoplist
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/devel/py_static_check/Makefile b/devel/py_static_check/Makefile
index 19d26b92ce54..45bfaaf80e64 100644
--- a/devel/py_static_check/Makefile
+++ b/devel/py_static_check/Makefile
@@ -15,8 +15,7 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:${PORTSDIR}/devel/py-pyflakes
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/pycount/Makefile b/devel/pycount/Makefile
index 1d37c11b3e8f..3fb0efce1b1c 100644
--- a/devel/pycount/Makefile
+++ b/devel/pycount/Makefile
@@ -14,8 +14,7 @@ DIST_SUBDIR= python
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Initial effort to Python code metrics
-USES= dos2unix
-USE_PYTHON= yes
+USES= dos2unix python
NO_BUILD= yes
PLIST_FILES= bin/${PORTNAME}
diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile
index a89456eff627..bbbb800bed5a 100644
--- a/devel/pygobject3-common/Makefile
+++ b/devel/pygobject3-common/Makefile
@@ -33,7 +33,7 @@ PLIST_SUB= ARCH=${ARCH} UNAME_R=${UNAME_R} VERSION=${PORTVERSION} \
.if ${SLAVE_PORT} == no
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
-USE_PYTHON_BUILD= 2
+USES+= python:2,build
USE_GNOME= glib20:build introspection:build
NO_BUILD= yes
@@ -49,13 +49,13 @@ LIB_DEPENDS+= libffi.so:${PORTSDIR}/devel/libffi
RUN_DEPENDS+= pygobject3-common>=0:${PORTSDIR}/devel/pygobject3-common
.if ${SLAVE_PORT} == python2
-USE_PYTHON= 2
+USES+= python:2
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
.endif
.if ${SLAVE_PORT} == python3
-USE_PYTHON= 3
+USES+= python:3
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:${PORTSDIR}/graphics/py3-cairo
RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:${PORTSDIR}/graphics/py3-cairo
PLIST_SUB+= PYTVER=${PYTHON_VER:S/.//}
diff --git a/devel/pyobfuscate/Makefile b/devel/pyobfuscate/Makefile
index 4f62a713a146..10a16da0c6f7 100644
--- a/devel/pyobfuscate/Makefile
+++ b/devel/pyobfuscate/Makefile
@@ -12,9 +12,8 @@ MASTER_SITE_SUBDIR= arved
MAINTAINER= ports@FreeBSD.org
COMMENT= Python source code obfuscator
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-patch:
@${REINPLACE_CMD} -e "s,'/usr/bin','${PREFIX}/bin'," ${WRKSRC}/setup.py
diff --git a/devel/pypersrc/Makefile b/devel/pypersrc/Makefile
index c5d4a95e5f80..d22171cc128e 100644
--- a/devel/pypersrc/Makefile
+++ b/devel/pypersrc/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= gmake tar:bzip2
-USE_PYTHON= yes
+USES= gmake python:2 tar:bzip2
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= configure.sh
MAKE_ENV= CXX_FLAGS="${CXXFLAGS}"
diff --git a/devel/pyside-tools/Makefile b/devel/pyside-tools/Makefile
index e76d00877679..4d13b6f03aa1 100644
--- a/devel/pyside-tools/Makefile
+++ b/devel/pyside-tools/Makefile
@@ -24,8 +24,7 @@ USE_QT4= moc_build qmake_build rcc_build uic_build
REINPLACE_ARGS= -i.bak -e 's+/usr/bin/env python+&${PYTHON_VER}+' \
${WRKSRC}/pyside-uic ${WRKSRC}/pysideuic/icon_cache.py
-USES= cmake tar:bzip2
-USE_PYTHON= 2
+USES= cmake python:2 tar:bzip2
post-patch:
${REINPLACE_CMD}
diff --git a/devel/pyside/Makefile b/devel/pyside/Makefile
index d0ef4a134d8b..86b7c85b50aa 100644
--- a/devel/pyside/Makefile
+++ b/devel/pyside/Makefile
@@ -29,9 +29,8 @@ USE_QT4= declarative designer gui help qmake_build \
PLIST_SUB= PORTVERSION=${PORTVERSION} \
PYTHON_VERSION=${PYTHON_VERSION}
-USES= cmake tar:bzip2
+USES= cmake python:2 tar:bzip2
USE_LDCONFIG= yes
-USE_PYTHON= 2
.include <bsd.port.pre.mk>
diff --git a/devel/pyst/Makefile b/devel/pyst/Makefile
index fde8c88f60bf..969559477c61 100644
--- a/devel/pyst/Makefile
+++ b/devel/pyst/Makefile
@@ -12,8 +12,8 @@ COMMENT= Python interface to allow Asterisk programming
LICENSE= LGPL21 PSFL
LICENSE_COMB= dual
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
+USES= python:2
+USE_PYTHON= distutils
PORTDOCS= README README.html ChangeLog
diff --git a/devel/pysvn/Makefile b/devel/pysvn/Makefile
index 448b14b035ce..fd4609bfb54e 100644
--- a/devel/pysvn/Makefile
+++ b/devel/pysvn/Makefile
@@ -15,9 +15,8 @@ LIB_DEPENDS= libsvn_client-1.so:${PORTSDIR}/devel/subversion \
libneon.so:${PORTSDIR}/www/neon29
# Python3 ready
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_NOEGGINFO= yes
+USES= python
+USE_PYTHON= distutils noegginfo
PYDISTUTILS_CONFIGURE_TARGET= configure
PYDISTUTILS_CONFIGUREARGS= --apr-inc-dir=${LOCALBASE}/include/apr-1 \
--svn-root-dir=${LOCALBASE}
diff --git a/devel/pythontidy/Makefile b/devel/pythontidy/Makefile
index 94921ca0635c..8e11c547f6ce 100644
--- a/devel/pythontidy/Makefile
+++ b/devel/pythontidy/Makefile
@@ -15,7 +15,7 @@ COMMENT= Cleans up, regularizes, and reformats the text of Python scripts
LICENSE= GPLv2
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
PLIST_FILES= bin/pythontidy
diff --git a/devel/qbzr/Makefile b/devel/qbzr/Makefile
index d498f33c0b3e..86603810f1c7 100644
--- a/devel/qbzr/Makefile
+++ b/devel/qbzr/Makefile
@@ -21,11 +21,9 @@ RUN_DEPENDS= bzr:${PORTSDIR}/devel/bzr
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USE_PYTHON= distutils autoplist
USE_QT4= # empty
-USES= gettext
+USES= gettext python
INSTALLS_ICONS= yes
.include <bsd.port.mk>
diff --git a/devel/rbtools/Makefile b/devel/rbtools/Makefile
index 3b6f3cdd180a..1614779ef798 100644
--- a/devel/rbtools/Makefile
+++ b/devel/rbtools/Makefile
@@ -13,8 +13,7 @@ LICENSE= MIT
ORIGNAME= RBTools
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/ros/Makefile b/devel/ros/Makefile
index 4b272cb7eceb..444e1666f926 100644
--- a/devel/ros/Makefile
+++ b/devel/ros/Makefile
@@ -30,9 +30,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/__init__.py:${PORTSDIR}/devel/py-yaml \
gmake:${PORTSDIR}/devel/gmake \
sudo:${PORTSDIR}/security/sudo \
wget:${PORTSDIR}/ftp/wget
-USE_PYTHON= 2
USE_LDCONFIG= yes
-USES= pkgconfig shebangfix tar:bzip2
+USES= pkgconfig python:2 shebangfix tar:bzip2
SHEBANG_FILES= core/mk/make_pydev_project.py
# rosmake does its own threading
diff --git a/devel/rubygem-mkrf/Makefile b/devel/rubygem-mkrf/Makefile
index 9e3fae3f0091..11d5f9d24466 100644
--- a/devel/rubygem-mkrf/Makefile
+++ b/devel/rubygem-mkrf/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES= RG
MAINTAINER= ruby@FreeBSD.org
COMMENT= Replacement to mkmf generates Rakefiles to build C Extensions
+USES= python
USE_RUBY= yes
-USE_PYTHON= yes
USE_RUBYGEMS= yes
USE_RAKE= yes
RUBYGEM_AUTOPLIST= yes
diff --git a/devel/runsnakerun/Makefile b/devel/runsnakerun/Makefile
index 636bbe3aee99..5627538c0075 100644
--- a/devel/runsnakerun/Makefile
+++ b/devel/runsnakerun/Makefile
@@ -16,8 +16,7 @@ LICENSE= BSD2CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}SquareMap>0:${PORTSDIR}/x11-toolkits/py-SquareMap \
${PYTHON_PKGNAMEPREFIX}meliae>0:${PORTSDIR}/devel/py-meliae
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/devel/scons/Makefile b/devel/scons/Makefile
index d032d993ca01..228646dc5e0a 100644
--- a/devel/scons/Makefile
+++ b/devel/scons/Makefile
@@ -14,9 +14,8 @@ LICENSE= MIT
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
PLIST_SUB+= SCONS_VER=${PORTVERSION}
diff --git a/devel/sedsed/Makefile b/devel/sedsed/Makefile
index 7fb47a08d29e..8fedbef6423a 100644
--- a/devel/sedsed/Makefile
+++ b/devel/sedsed/Makefile
@@ -18,7 +18,7 @@ EXTRACT_AFTER_ARGS= ${WRKDIR}
NO_WRKSUBDIR= yes
NO_BUILD= yes
-USE_PYTHON= yes
+USES= python
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/bin/sedsed
diff --git a/devel/shiboken/Makefile b/devel/shiboken/Makefile
index 3e918ebc8a92..df746ff02f18 100644
--- a/devel/shiboken/Makefile
+++ b/devel/shiboken/Makefile
@@ -21,9 +21,8 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} \
USE_QT4= corelib qmake_build qtestlib moc_build network \
uic_build rcc_build xml xmlpatterns
-USES= cmake tar:bzip2
+USES= cmake python tar:bzip2
USE_LDCONFIG= yes
-USE_PYTHON= yes
ALL_TARGET= all
diff --git a/devel/tailor/Makefile b/devel/tailor/Makefile
index 958b1689678d..f90f51f99fe8 100644
--- a/devel/tailor/Makefile
+++ b/devel/tailor/Makefile
@@ -12,8 +12,8 @@ COMMENT= Migrates changesets between version control systems
RUN_DEPENDS= ${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS
post-install:
diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
index 24eff74ea499..18d215456a04 100644
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -16,7 +16,6 @@ LICENSE= LGPL3
CONFLICTS= samba33-3.*
USES= compiler pkgconfig
-USE_PYTHON_BUILD= 2
USE_LDCONFIG= yes
WAF_TOOL= buildtools/bin/waf
CONFIGURE_LOG= bin/config.log
@@ -38,8 +37,9 @@ MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
.if defined(NO_PYTHON)
CONFIGURE_ARGS+= --disable-python
+USES+= python:2,build
.else
-USE_PYTHON_RUN= yes
+USES+= python:2
PLIST_FILES+= include/pytalloc.h \
lib/libpytalloc-util.so \
lib/libpytalloc-util.so.2 \
diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
index 1f35e1505e28..930aac7b50f9 100644
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -16,7 +16,6 @@ LICENSE= LGPL3
CONFLICTS=
USES= compiler pkgconfig
-USE_PYTHON_BUILD= 2
USE_LDCONFIG= yes
WAF_TOOL= buildtools/bin/waf
CONFIGURE_LOG= bin/config.log
@@ -38,8 +37,9 @@ MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
.if defined(NO_PYTHON)
CONFIGURE_ARGS+= --disable-python
+USES+= python:2,build
.else
-USE_PYTHON_RUN= yes
+USES+= python:2
PLIST_FILES+= %%PYTHON_SITELIBDIR%%/_tevent.so \
%%PYTHON_SITELIBDIR%%/tevent.py \
%%PYTHON_SITELIBDIR%%/tevent.pyc \
diff --git a/devel/trac-bitten/Makefile b/devel/trac-bitten/Makefile
index 307d72791494..e376178809f9 100644
--- a/devel/trac-bitten/Makefile
+++ b/devel/trac-bitten/Makefile
@@ -30,9 +30,8 @@ OPTIONS_DEFAULT= BITTEN_MASTER
BITTEN_MASTER_RUN_DEPENDS= tracd:${PORTSDIR}/www/trac
NO_BUILD= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} TOUCH=${TOUCH} CHOWN=${CHOWN} \
RM=${RM:Q} USERS=${USERS}
SUB_FILES+= pkg-message
diff --git a/devel/udis86/Makefile b/devel/udis86/Makefile
index 41f8b25ca562..48d0ec87b335 100644
--- a/devel/udis86/Makefile
+++ b/devel/udis86/Makefile
@@ -41,7 +41,7 @@ post-patch:
.if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
BUILD_DEPENDS+= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
CONFIGURE_ENV+= PYTHON="${PYTHON_CMD}" YASM="${LOCALBASE}/bin/yasm"
-USE_PYTHON_BUILD= yes
+USES+= python:build
check regression-test test: build
@cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check
diff --git a/devel/wxGlade/Makefile b/devel/wxGlade/Makefile
index 38e4e8b10230..984da7c06fbc 100644
--- a/devel/wxGlade/Makefile
+++ b/devel/wxGlade/Makefile
@@ -14,7 +14,7 @@ COMMENT= GUI builder for wxPython/wxWidgets written in Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/license.txt
-USE_PYTHON= yes
+USES= python
USE_WX= 3.0+
WX_COMPS= python