aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormva <mva@FreeBSD.org>2015-01-03 16:41:20 +0800
committermva <mva@FreeBSD.org>2015-01-03 16:41:20 +0800
commit8df7661d5fb781595b7bae0a37d82a730b97d4dd (patch)
tree5de250878ab793a0857c0738238f861a73b7258c
parent131245273c2e9f6f5f2c911f4120bf95df49012b (diff)
downloadfreebsd-ports-gnome-8df7661d5fb781595b7bae0a37d82a730b97d4dd.tar.gz
freebsd-ports-gnome-8df7661d5fb781595b7bae0a37d82a730b97d4dd.tar.zst
freebsd-ports-gnome-8df7661d5fb781595b7bae0a37d82a730b97d4dd.zip
- Convert USE_PYTHON to new USES in www/
With hat: python@
-rw-r--r--www/anyremote2html/Makefile2
-rw-r--r--www/aws/Makefile3
-rw-r--r--www/clearsilver/Makefile2
-rw-r--r--www/cocoon/Makefile2
-rw-r--r--www/download-gemist/Makefile2
-rw-r--r--www/feedjack/Makefile5
-rw-r--r--www/gaeo/Makefile6
-rw-r--r--www/gaeutilities/Makefile2
-rw-r--r--www/google-sitemapgen/Makefile4
-rw-r--r--www/httpie/Makefile5
-rw-r--r--www/imgsizer/Makefile2
-rw-r--r--www/jetty/Makefile2
-rw-r--r--www/jtoolkit/Makefile4
-rw-r--r--www/linkchecker/Makefile5
-rw-r--r--www/ljdump/Makefile2
-rw-r--r--www/mitmproxy/Makefile5
-rw-r--r--www/mkapachepw/Makefile2
-rw-r--r--www/mod_python33/Makefile3
-rw-r--r--www/mod_python35/Makefile3
-rw-r--r--www/mod_spdy/Makefile3
-rw-r--r--www/mod_wsgi3/Makefile2
-rw-r--r--www/moinmoin/Makefile4
-rw-r--r--www/monast/Makefile2
-rw-r--r--www/planet/Makefile3
-rw-r--r--www/plone/Makefile6
-rw-r--r--www/py-Products.CMFPlone/Makefile5
-rw-r--r--www/py-Products.PloneLDAP/Makefile5
-rw-r--r--www/py-Products.TinyMCE/Makefile6
-rw-r--r--www/py-albatross/Makefile4
-rw-r--r--www/py-cherrypy/Makefile5
-rw-r--r--www/py-cssselect/Makefile5
-rw-r--r--www/py-django-dpaste/Makefile7
-rw-r--r--www/py-django-evolution/Makefile5
-rw-r--r--www/py-django-extensions/Makefile5
-rw-r--r--www/py-django-haystack/Makefile5
-rw-r--r--www/py-django-json-rpc/Makefile6
-rw-r--r--www/py-django-keyedcache/Makefile5
-rw-r--r--www/py-django-ldapdb/Makefile5
-rw-r--r--www/py-django-livesettings/Makefile5
-rw-r--r--www/py-django-mezzanine-filebrowser/Makefile7
-rw-r--r--www/py-django-mezzanine-grappelli/Makefile7
-rw-r--r--www/py-django-mezzanine/Makefile6
-rw-r--r--www/py-django-mptt/Makefile6
-rw-r--r--www/py-django-openid-auth/Makefile4
-rw-r--r--www/py-django-pipeline/Makefile5
-rw-r--r--www/py-django-pipeline12/Makefile4
-rw-r--r--www/py-django-piston/Makefile5
-rw-r--r--www/py-django-profiles/Makefile4
-rw-r--r--www/py-django-redis/Makefile5
-rw-r--r--www/py-django-registration-defaults/Makefile5
-rw-r--r--www/py-django-registration/Makefile6
-rw-r--r--www/py-django-reversion/Makefile4
-rw-r--r--www/py-django-sekizai/Makefile5
-rw-r--r--www/py-django-signals-ahoy/Makefile5
-rw-r--r--www/py-django-simple-captcha/Makefile5
-rw-r--r--www/py-django-storages/Makefile6
-rw-r--r--www/py-django-subdomains/Makefile5
-rw-r--r--www/py-django-tables2/Makefile5
-rw-r--r--www/py-django-tagging/Makefile5
-rw-r--r--www/py-django-tastypie/Makefile5
-rw-r--r--www/py-django-threaded-multihost/Makefile5
-rw-r--r--www/py-django-tinymce/Makefile5
-rw-r--r--www/py-djangotoolbox/Makefile5
-rw-r--r--www/py-dojango/Makefile5
-rw-r--r--www/py-dotcloud.cli/Makefile5
-rw-r--r--www/py-dtflickr/Makefile6
-rw-r--r--www/py-falcon/Makefile5
-rw-r--r--www/py-fcgi/Makefile2
-rw-r--r--www/py-fedex/Makefile5
-rw-r--r--www/py-feedfinder/Makefile5
-rw-r--r--www/py-feedgenerator/Makefile5
-rw-r--r--www/py-flup/Makefile5
-rw-r--r--www/py-formalchemy/Makefile5
-rw-r--r--www/py-frozen-flask/Makefile5
-rw-r--r--www/py-funkload/Makefile5
-rw-r--r--www/py-google-api-python-client/Makefile4
-rw-r--r--www/py-graphite-web/Makefile2
-rw-r--r--www/py-gunicorn/Makefile7
-rw-r--r--www/py-imdbpy/Makefile5
-rw-r--r--www/py-jonpy/Makefile5
-rw-r--r--www/py-jswebkit/Makefile6
-rw-r--r--www/py-mechanize/Makefile5
-rw-r--r--www/py-meld/Makefile2
-rw-r--r--www/py-meld3/Makefile5
-rw-r--r--www/py-mt/Makefile2
-rw-r--r--www/py-nevow/Makefile6
-rw-r--r--www/py-openssl-proxy/Makefile5
-rw-r--r--www/py-paste/Makefile5
-rw-r--r--www/py-pastedeploy/Makefile5
-rw-r--r--www/py-pastescript/Makefile5
-rw-r--r--www/py-plone.alterego/Makefile6
-rw-r--r--www/py-plone.app.blob/Makefile6
-rw-r--r--www/py-plone.app.caching/Makefile6
-rw-r--r--www/py-plone.app.collection/Makefile6
-rw-r--r--www/py-plone.app.content/Makefile6
-rw-r--r--www/py-plone.app.contentlisting/Makefile6
-rw-r--r--www/py-plone.app.contentmenu/Makefile6
-rw-r--r--www/py-plone.app.contentrules/Makefile6
-rw-r--r--www/py-plone.app.controlpanel/Makefile6
-rw-r--r--www/py-plone.app.customerize/Makefile6
-rw-r--r--www/py-plone.app.dexterity/Makefile6
-rw-r--r--www/py-plone.app.discussion/Makefile6
-rw-r--r--www/py-plone.app.folder/Makefile6
-rw-r--r--www/py-plone.app.form/Makefile6
-rw-r--r--www/py-plone.app.i18n/Makefile6
-rw-r--r--www/py-plone.app.imaging/Makefile6
-rw-r--r--www/py-plone.app.iterate/Makefile6
-rw-r--r--www/py-plone.app.jquery/Makefile5
-rw-r--r--www/py-plone.app.jquerytools/Makefile6
-rw-r--r--www/py-plone.app.layout/Makefile6
-rw-r--r--www/py-plone.app.ldap/Makefile6
-rw-r--r--www/py-plone.app.linkintegrity/Makefile6
-rw-r--r--www/py-plone.app.locales/Makefile6
-rw-r--r--www/py-plone.app.portlets/Makefile6
-rw-r--r--www/py-plone.app.querystring/Makefile6
-rw-r--r--www/py-plone.app.redirector/Makefile6
-rw-r--r--www/py-plone.app.registry/Makefile6
-rw-r--r--www/py-plone.app.search/Makefile6
-rw-r--r--www/py-plone.app.testing/Makefile6
-rw-r--r--www/py-plone.app.textfield/Makefile6
-rw-r--r--www/py-plone.app.theming/Makefile6
-rw-r--r--www/py-plone.app.upgrade/Makefile6
-rw-r--r--www/py-plone.app.users/Makefile6
-rw-r--r--www/py-plone.app.uuid/Makefile6
-rw-r--r--www/py-plone.app.viewletmanager/Makefile6
-rw-r--r--www/py-plone.app.vocabularies/Makefile6
-rw-r--r--www/py-plone.app.workflow/Makefile6
-rw-r--r--www/py-plone.app.z3cform/Makefile6
-rw-r--r--www/py-plone.autoform/Makefile6
-rw-r--r--www/py-plone.batching/Makefile6
-rw-r--r--www/py-plone.behavior/Makefile6
-rw-r--r--www/py-plone.browserlayer/Makefile6
-rw-r--r--www/py-plone.cachepurging/Makefile6
-rw-r--r--www/py-plone.caching/Makefile6
-rw-r--r--www/py-plone.contentrules/Makefile6
-rw-r--r--www/py-plone.dexterity/Makefile6
-rw-r--r--www/py-plone.fieldsets/Makefile6
-rw-r--r--www/py-plone.folder/Makefile6
-rw-r--r--www/py-plone.formwidget.namedfile/Makefile6
-rw-r--r--www/py-plone.i18n/Makefile6
-rw-r--r--www/py-plone.indexer/Makefile6
-rw-r--r--www/py-plone.intelligenttext/Makefile6
-rw-r--r--www/py-plone.locking/Makefile6
-rw-r--r--www/py-plone.memoize/Makefile6
-rw-r--r--www/py-plone.namedfile/Makefile6
-rw-r--r--www/py-plone.outputfilters/Makefile6
-rw-r--r--www/py-plone.portlet.collection/Makefile6
-rw-r--r--www/py-plone.portlet.static/Makefile6
-rw-r--r--www/py-plone.portlets/Makefile6
-rw-r--r--www/py-plone.registry/Makefile6
-rw-r--r--www/py-plone.resource/Makefile6
-rw-r--r--www/py-plone.resourceeditor/Makefile6
-rw-r--r--www/py-plone.rfc822/Makefile6
-rw-r--r--www/py-plone.scale/Makefile6
-rw-r--r--www/py-plone.schemaeditor/Makefile6
-rw-r--r--www/py-plone.stringinterp/Makefile6
-rw-r--r--www/py-plone.subrequest/Makefile6
-rw-r--r--www/py-plone.supermodel/Makefile6
-rw-r--r--www/py-plone.synchronize/Makefile6
-rw-r--r--www/py-plone.testing/Makefile6
-rw-r--r--www/py-plone.theme/Makefile6
-rw-r--r--www/py-plone.transformchain/Makefile6
-rw-r--r--www/py-plone.uuid/Makefile6
-rw-r--r--www/py-plone.z3cform/Makefile6
-rw-r--r--www/py-plonetheme.classic/Makefile6
-rw-r--r--www/py-plonetheme.sunburst/Makefile6
-rw-r--r--www/py-poster/Makefile5
-rw-r--r--www/py-postmarkup/Makefile5
-rw-r--r--www/py-praw/Makefile7
-rw-r--r--www/py-prewikka/Makefile4
-rw-r--r--www/py-py-restclient/Makefile5
-rw-r--r--www/py-pylons/Makefile5
-rw-r--r--www/py-pyquery/Makefile7
-rw-r--r--www/py-pyramid_rpc/Makefile5
-rw-r--r--www/py-pysearch/Makefile4
-rw-r--r--www/py-pywebdav/Makefile5
-rw-r--r--www/py-rackspace-monitoring/Makefile5
-rw-r--r--www/py-recaptcha/Makefile5
-rw-r--r--www/py-requestbuilder/Makefile5
-rw-r--r--www/py-requests-oauth-hook/Makefile5
-rw-r--r--www/py-requests1/Makefile5
-rw-r--r--www/py-restclient/Makefile5
-rw-r--r--www/py-rhodecode/Makefile5
-rw-r--r--www/py-routes/Makefile6
-rw-r--r--www/py-scgi/Makefile5
-rw-r--r--www/py-scrapy/Makefile1
-rw-r--r--www/py-scriptaculous/Makefile6
-rw-r--r--www/py-slimit/Makefile6
-rw-r--r--www/py-slimmer/Makefile5
-rw-r--r--www/py-slumber/Makefile5
-rw-r--r--www/py-splinter/Makefile5
-rw-r--r--www/py-surl/Makefile5
-rw-r--r--www/py-textile/Makefile5
-rw-r--r--www/py-tgwebservices/Makefile6
-rw-r--r--www/py-tmdb3/Makefile6
-rw-r--r--www/py-tornado/Makefile5
-rw-r--r--www/py-turbogears/Makefile6
-rw-r--r--www/py-turbogears2/Makefile5
-rw-r--r--www/py-tvdb_api/Makefile5
-rw-r--r--www/py-twistedWeb/Makefile6
-rw-r--r--www/py-uliweb/Makefile6
-rw-r--r--www/py-urlgrabber/Makefile4
-rw-r--r--www/py-utidy/Makefile6
-rw-r--r--www/py-webhelpers/Makefile5
-rw-r--r--www/py-webkitgtk/Makefile3
-rw-r--r--www/py-webob/Makefile7
-rw-r--r--www/py-webunit/Makefile5
-rw-r--r--www/py-webware-component/Makefile2
-rw-r--r--www/py-webware/Makefile2
-rw-r--r--www/py-werkzeug/Makefile5
-rw-r--r--www/py-wikitools/Makefile5
-rw-r--r--www/py-wsgiauth/Makefile5
-rw-r--r--www/py-zope.app.wsgi/Makefile5
-rw-r--r--www/pyblosxom/Makefile4
-rw-r--r--www/pyjamas/Makefile6
-rw-r--r--www/pylot/Makefile3
-rw-r--r--www/radicale/Makefile15
-rw-r--r--www/reviewboard/Makefile4
-rw-r--r--www/roundup/Makefile5
-rw-r--r--www/session2/Makefile4
-rw-r--r--www/trac-OhlohWidgetsMacro/Makefile5
-rw-r--r--www/trac-TracGoogleAnalytics/Makefile5
-rw-r--r--www/trac-accountmanager/Makefile6
-rw-r--r--www/trac-advancedticketworkflow/Makefile5
-rw-r--r--www/trac-attachmentpolicy/Makefile6
-rw-r--r--www/trac-autocomplete/Makefile6
-rw-r--r--www/trac-batchmodify/Makefile6
-rw-r--r--www/trac-bzr/Makefile6
-rw-r--r--www/trac-ccselector/Makefile5
-rw-r--r--www/trac-childtickets/Makefile6
-rw-r--r--www/trac-customfieldadmin/Makefile6
-rw-r--r--www/trac-datefield/Makefile6
-rw-r--r--www/trac-defaultcc/Makefile6
-rw-r--r--www/trac-discussion/Makefile5
-rw-r--r--www/trac-down/Makefile5
-rw-r--r--www/trac-downloads/Makefile5
-rw-r--r--www/trac-email2trac/Makefile2
-rw-r--r--www/trac-estimator/Makefile5
-rw-r--r--www/trac-fivestarvote/Makefile5
-rw-r--r--www/trac-fullblog/Makefile5
-rw-r--r--www/trac-fullblognotification/Makefile5
-rw-r--r--www/trac-gantt/Makefile5
-rw-r--r--www/trac-graphviz/Makefile4
-rw-r--r--www/trac-iniadmin/Makefile5
-rw-r--r--www/trac-keywords/Makefile10
-rw-r--r--www/trac-keywordsecretticket/Makefile5
-rw-r--r--www/trac-mastertickets/Makefile5
-rw-r--r--www/trac-math/Makefile5
-rw-r--r--www/trac-mercurial/Makefile5
-rw-r--r--www/trac-navadd/Makefile7
-rw-r--r--www/trac-permredirect/Makefile6
-rw-r--r--www/trac-privatetickets/Makefile5
-rw-r--r--www/trac-pydotorgtheme/Makefile7
-rw-r--r--www/trac-robotstxt/Makefile5
-rw-r--r--www/trac-scrumburndown/Makefile5
-rw-r--r--www/trac-spam-filter/Makefile5
-rw-r--r--www/trac-subtickets/Makefile5
-rw-r--r--www/trac-tags/Makefile6
-rw-r--r--www/trac-themeengine/Makefile6
-rw-r--r--www/trac-ticketimport/Makefile5
-rw-r--r--www/trac-tickettemplate/Makefile6
-rw-r--r--www/trac-timingandestimation/Makefile5
-rw-r--r--www/trac-tocmacro/Makefile5
-rw-r--r--www/trac-tracdragdrop/Makefile6
-rw-r--r--www/trac-tweakui/Makefile6
-rw-r--r--www/trac-vote/Makefile5
-rw-r--r--www/trac-watchlist/Makefile6
-rw-r--r--www/trac-wikigoodies/Makefile5
-rw-r--r--www/trac-wikinotification/Makefile5
-rw-r--r--www/trac-wikitemplates/Makefile5
-rw-r--r--www/trac-wikitopdf/Makefile7
-rw-r--r--www/trac-wysiwyg/Makefile6
-rw-r--r--www/trac-xmlrpc/Makefile6
-rw-r--r--www/trac/Makefile6
-rw-r--r--www/trytond28_google_maps/Makefile5
-rw-r--r--www/trytond_google_maps/Makefile5
-rw-r--r--www/twill/Makefile5
-rw-r--r--www/uwsgitop/Makefile4
-rw-r--r--www/uzbl/Makefile3
-rw-r--r--www/waccess/Makefile2
-rw-r--r--www/wadcomblog/Makefile4
-rw-r--r--www/webcheck/Makefile2
-rw-r--r--www/webgrind/Makefile2
-rw-r--r--www/webpy/Makefile4
-rw-r--r--www/woof/Makefile2
-rw-r--r--www/zope213/Makefile6
286 files changed, 555 insertions, 921 deletions
diff --git a/www/anyremote2html/Makefile b/www/anyremote2html/Makefile
index 6d3c53988d81..ac4c6692ea4f 100644
--- a/www/anyremote2html/Makefile
+++ b/www/anyremote2html/Makefile
@@ -12,7 +12,7 @@ COMMENT= Web interface for anyRemote
RUN_DEPENDS= anyremote:${PORTSDIR}/comms/anyremote
GNU_CONFIGURE= yes
-USE_PYTHON_RUN= yes
+USES= python:run
PORTDOCS= ChangeLog README COPYING AUTHORS
diff --git a/www/aws/Makefile b/www/aws/Makefile
index c43da3864b0e..10b4c15dec75 100644
--- a/www/aws/Makefile
+++ b/www/aws/Makefile
@@ -21,10 +21,9 @@ BUILD_DEPENDS= gprbuild:${PORTSDIR}/devel/gprbuild \
RUN_DEPENDS= templates_parser>11:${PORTSDIR}/textproc/templates_parser \
xmlada>=4.4:${PORTSDIR}/textproc/xmlada
-USE_PYTHON= yes
GNU_CONFIGURE= yes
NO_MTREE= yes
-USES= ada gmake tar:bzip2
+USES= ada gmake python tar:bzip2
DOTBUILD= release
LINK_SSL= --
LINK_TLS= --
diff --git a/www/clearsilver/Makefile b/www/clearsilver/Makefile
index 591bf7d0f4f8..5978a29f35d5 100644
--- a/www/clearsilver/Makefile
+++ b/www/clearsilver/Makefile
@@ -17,7 +17,7 @@ CONFIGURE_ARGS= --disable-apache --disable-perl --disable-ruby \
.if defined(WITH_PYTHON)
CONFIGURE_ARGS+= --with-python=${PYTHON_CMD}
-USE_PYTHON= yes
+USES+= python
PLIST_SUB+= PYTHON=""
PKGNAMESUFFIX= -python
.else
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index bfcd0e380ec6..88ec62a44f98 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -14,7 +14,7 @@ COMMENT= XML Web Development Framework
USE_RC_SUBR= ${PORTNAME}
USE_JAVA= yes
JAVA_VERSION= 1.6
-USE_PYTHON= yes
+USES= python
MAKE_ENV= JAVA_HOME=${JAVA_HOME}
WRKSRC= ${WRKDIR}/${PDISTNAME}
APP_NAME?= ${PORTNAME}
diff --git a/www/download-gemist/Makefile b/www/download-gemist/Makefile
index d8b7da4b0895..0ba2432fcd00 100644
--- a/www/download-gemist/Makefile
+++ b/www/download-gemist/Makefile
@@ -11,7 +11,7 @@ COMMENT= Download videos from the Dutch uitzending gemist site
LICENSE= MIT
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
PLIST_FILES= bin/download-gemist \
diff --git a/www/feedjack/Makefile b/www/feedjack/Makefile
index 898c3109751f..ef3e18b42413 100644
--- a/www/feedjack/Makefile
+++ b/www/feedjack/Makefile
@@ -14,8 +14,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedpars
django-admin.py:${PORTSDIR}/www/py-django
DIST_SUBDIR= python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/gaeo/Makefile b/www/gaeo/Makefile
index 79c78d3768d9..f547a1e5fd8a 100644
--- a/www/gaeo/Makefile
+++ b/www/gaeo/Makefile
@@ -16,10 +16,8 @@ RUN_DEPENDS= google-appengine>=1.1.0:${PORTSDIR}/www/google-appengine \
PROJECTHOST= google-app-engine-oil
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
PORTDOCS= LICENSE NOTICE README.TXT CHANGELOG
diff --git a/www/gaeutilities/Makefile b/www/gaeutilities/Makefile
index cd5f841d91bc..5788bf528bb9 100644
--- a/www/gaeutilities/Makefile
+++ b/www/gaeutilities/Makefile
@@ -13,7 +13,7 @@ COMMENT= Utility classes to make working with Google App Engine easier
RUN_DEPENDS= google-appengine>=1.2.4_1:${PORTSDIR}/www/google-appengine
-USE_PYTHON= 2 # same as www/google-appengine
+USES= python:2 # same as www/google-appengine
WRKSRC= ${WRKDIR}/joerussbowman-gaeutilities-ea3f7e1
diff --git a/www/google-sitemapgen/Makefile b/www/google-sitemapgen/Makefile
index dad6006f1a21..bb917492579d 100644
--- a/www/google-sitemapgen/Makefile
+++ b/www/google-sitemapgen/Makefile
@@ -14,8 +14,8 @@ PROJECTHOST= sitemap-generators
NO_WRKSUBDIR=
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= sitemap_gen
.include <bsd.port.mk>
diff --git a/www/httpie/Makefile b/www/httpie/Makefile
index 2b030304e872..a2cb14c74d1b 100644
--- a/www/httpie/Makefile
+++ b/www/httpie/Makefile
@@ -19,8 +19,7 @@ USE_GITHUB= yes
GH_ACCOUNT= jakubroztocil
GH_COMMIT= 43cc3e7
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/imgsizer/Makefile b/www/imgsizer/Makefile
index ae275be2e6a0..ebf54bb75746 100644
--- a/www/imgsizer/Makefile
+++ b/www/imgsizer/Makefile
@@ -15,7 +15,7 @@ LICENSE= BSD4CLAUSE
RUN_DEPENDS= rdjpgcom:${PORTSDIR}/graphics/jpeg \
identify:${PORTSDIR}/graphics/ImageMagick
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
PLIST_FILES= bin/${PORTNAME} man/man1/imgsizer.1.gz
diff --git a/www/jetty/Makefile b/www/jetty/Makefile
index a36665fe2d42..4ce8e2fca1a2 100644
--- a/www/jetty/Makefile
+++ b/www/jetty/Makefile
@@ -16,7 +16,7 @@ JDVDATE= v20140411
USE_RC_SUBR= ${PORTNAME}
USE_JAVA= yes
JAVA_VERSION= 1.6+
-USE_PYTHON= yes
+USES= python
PKGMESSAGE= ${WRKDIR}/pkg-message
PLIST_SUB+= RUNASUSER=${RUNASUSER} GROUP=${GROUP}
diff --git a/www/jtoolkit/Makefile b/www/jtoolkit/Makefile
index eeaffc460a0b..f706e4f74266 100644
--- a/www/jtoolkit/Makefile
+++ b/www/jtoolkit/Makefile
@@ -14,8 +14,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kid>=0.9.5:${PORTSDIR}/devel/py-kid
# Has optional dependencies on database engines
# Can optionally use py-lucene (on i386)
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
+USES= python:2
+USE_PYTHON= distutils
PYSETUP= ${PORTNAME}Setup.py
.include <bsd.port.mk>
diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile
index 72219c5cb118..13765db92bb3 100644
--- a/www/linkchecker/Makefile
+++ b/www/linkchecker/Makefile
@@ -17,9 +17,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:${PORTSDIR}/dns/py-dnspython \
WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
INSTALLS_ICONS= yes
OPTIONS_DEFINE= CLAMAV EXAMPLES GEOIP GTK2 LOGIN NLS QT4 \
diff --git a/www/ljdump/Makefile b/www/ljdump/Makefile
index aaeff0612f7d..d9a191f16f68 100644
--- a/www/ljdump/Makefile
+++ b/www/ljdump/Makefile
@@ -12,7 +12,7 @@ COMMENT= Tool to download LiveJournal entries and comments
PORTSCOUT= skipv:1.5.1 # 1.5.1 is identical to 1.5 + our patches
NO_BUILD= yes
-USE_PYTHON_RUN= yes
+USES= python:run
PLIST_FILES= bin/ljdump etc/ljdump.config.sample
diff --git a/www/mitmproxy/Makefile b/www/mitmproxy/Makefile
index c5c2dc74df27..c49d05245058 100644
--- a/www/mitmproxy/Makefile
+++ b/www/mitmproxy/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asn1>0:${PORTSDIR}/devel/py-asn1 \
${PYTHON_PKGNAMEPREFIX}pillow>=2.3.0:${PORTSDIR}/graphics/py-pillow \
${PYTHON_PKGNAMEPREFIX}urwid>0:${PORTSDIR}/devel/py-urwid
-PYDISTUTILS_AUTOPLIST= yes
-USE_PYDISTUTILS=yes
-USE_PYTHON= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/mkapachepw/Makefile b/www/mkapachepw/Makefile
index 1219c4af4108..d0ac4c95ae84 100644
--- a/www/mkapachepw/Makefile
+++ b/www/mkapachepw/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.tundraware.com/Software/mkapachepw/
MAINTAINER= mkapachepw@tundraware.com
COMMENT= Group & Password Management Tool For Apache
-USE_PYTHON= yes
+USES= python
OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
diff --git a/www/mod_python33/Makefile b/www/mod_python33/Makefile
index 6c0119046b98..eaa53fbaf135 100644
--- a/www/mod_python33/Makefile
+++ b/www/mod_python33/Makefile
@@ -19,8 +19,7 @@ LICENSE= APACHE20
CONFLICTS_INSTALL= ap2[24]-mod_python3[^3]*
USE_APACHE= 22
-USE_PYTHON= yes
-USES= tar:tgz
+USES= python tar:tgz
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-apxs="${APXS}" \
diff --git a/www/mod_python35/Makefile b/www/mod_python35/Makefile
index 8cdb3cafe8c3..461bf06d31a4 100644
--- a/www/mod_python35/Makefile
+++ b/www/mod_python35/Makefile
@@ -20,8 +20,7 @@ LICENSE= APACHE20
CONFLICTS_INSTALL= ap2[24]-mod_python3[^5]*
USE_APACHE= 22+
-USE_PYTHON= yes
-USES= tar:tgz
+USES= python tar:tgz
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-apxs="${APXS}" \
diff --git a/www/mod_spdy/Makefile b/www/mod_spdy/Makefile
index f3c7ca73de26..6f0b09fb61e0 100644
--- a/www/mod_spdy/Makefile
+++ b/www/mod_spdy/Makefile
@@ -26,8 +26,7 @@ BUILD_DEPENDS= python:${PORTSDIR}/lang/python \
ONLY_FOR_ARCHS= amd64 i386
USE_OPENSSL= yes
USE_APACHE= 22
-USE_PYTHON= 2
-USES= gmake tar:xz
+USES= gmake python:2 tar:xz
REINPLACE_ARGS= -i ""
WRKSRC= ${WRKDIR}/${PORTNAME}_source_${PORTVERSION}/mod_spdy/src
diff --git a/www/mod_wsgi3/Makefile b/www/mod_wsgi3/Makefile
index 7ba716283637..fed4fc4c0283 100644
--- a/www/mod_wsgi3/Makefile
+++ b/www/mod_wsgi3/Makefile
@@ -18,7 +18,7 @@ CONFLICTS_INSTALL=${PKGNAMEPREFIX}mod_wsgi2.* mod_wsgi2.* \
PROJECTHOST= modwsgi
USE_APACHE= 22+
-USE_PYTHON= yes
+USES= python
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}"
diff --git a/www/moinmoin/Makefile b/www/moinmoin/Makefile
index 7889b3c95d64..a245fd33527d 100644
--- a/www/moinmoin/Makefile
+++ b/www/moinmoin/Makefile
@@ -13,8 +13,8 @@ COMMENT= Python clone of WikiWiki
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/docs/licenses/COPYING
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= moin
PLIST_SUB+= PYTHON_SITELIB=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||} \
diff --git a/www/monast/Makefile b/www/monast/Makefile
index 3b03d7a7d6ce..7c9f42b50054 100644
--- a/www/monast/Makefile
+++ b/www/monast/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/monast/MonAst%20for%20Asterisk%201.4_1.6/1.4
MAINTAINER= ports@FreeBSD.org
COMMENT= Monitoring and an operator panel interface for AsteriskTM
-USE_PYTHON= yes
+USES= python
USE_RC_SUBR= monast
NO_BUILD= YES
diff --git a/www/planet/Makefile b/www/planet/Makefile
index 414e4e960b9a..05ed69c273a9 100644
--- a/www/planet/Makefile
+++ b/www/planet/Makefile
@@ -12,9 +12,8 @@ COMMENT= Planet is a flexible feed aggregator - and more!
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/Tidy/Tidy.py:${PORTSDIR}/devel/py-mx-experimental \
${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb
-USES= tar:bzip2
+USES= python tar:bzip2
NO_BUILD= yes
-USE_PYTHON= yes
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/www/plone/Makefile b/www/plone/Makefile
index 18e66b843cc8..a23aef9e525b 100644
--- a/www/plone/Makefile
+++ b/www/plone/Makefile
@@ -25,9 +25,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFPlacefulWorkflow>=0:${PORTSDIR}/
OPTIONS_DEFINE= LDAP
LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.ldap>=1.2.6:${PORTSDIR}/www/py-plone.app.ldap
-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/www/py-Products.CMFPlone/Makefile b/www/py-Products.CMFPlone/Makefile
index cf29ad174fca..726bbe69fd5a 100644
--- a/www/py-Products.CMFPlone/Makefile
+++ b/www/py-Products.CMFPlone/Makefile
@@ -116,8 +116,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisit
${PYTHON_PKGNAMEPREFIX}zope.tales>=0:${PORTSDIR}/devel/py-zope.tales \
${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
+USES= python:2 zip
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/www/py-Products.PloneLDAP/Makefile b/www/py-Products.PloneLDAP/Makefile
index 7bb316f85bf7..393b5e0434ea 100644
--- a/www/py-Products.PloneLDAP/Makefile
+++ b/www/py-Products.PloneLDAP/Makefile
@@ -17,8 +17,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.LDAPMultiPlugins>=1.10:${PORTSDIR}/devel/py-Products.LDAPMultiPlugins \
${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:${PORTSDIR}/devel/py-Products.LDAPUserFolder
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-Products.TinyMCE/Makefile b/www/py-Products.TinyMCE/Makefile
index 602e3e647bd7..2a661147c628 100644
--- a/www/py-Products.TinyMCE/Makefile
+++ b/www/py-Products.TinyMCE/Makefile
@@ -22,9 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.imaging>=1.0.2:${PORTSDIR}/www/py-
${PYTHON_PKGNAMEPREFIX}zope.app.content>0:${PORTSDIR}/devel/py-zope.app.content \
${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.schema
-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/www/py-albatross/Makefile b/www/py-albatross/Makefile
index 8f6a11155f9a..3f1c93145497 100644
--- a/www/py-albatross/Makefile
+++ b/www/py-albatross/Makefile
@@ -14,8 +14,8 @@ COMMENT= Python toolkit for developing highly stateful web applications
LICENSE= BSD3CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS
diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile
index a9942592a593..0504b4053ecb 100644
--- a/www/py-cherrypy/Makefile
+++ b/www/py-cherrypy/Makefile
@@ -21,10 +21,9 @@ EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
OPTIONS_DEFINE= EXAMPLES
PORTEXAMPLES= *
-PYDISTUTILS_AUTOPLIST= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.options.mk>
diff --git a/www/py-cssselect/Makefile b/www/py-cssselect/Makefile
index b3c2127c06e5..11d6d7ead512 100644
--- a/www/py-cssselect/Makefile
+++ b/www/py-cssselect/Makefile
@@ -16,9 +16,8 @@ LICENSE= BSD3CLAUSE
OPTIONS_DEFINE= DOCS
OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.options.mk>
diff --git a/www/py-django-dpaste/Makefile b/www/py-django-dpaste/Makefile
index fd64e9648cd6..dfdcca04c0cd 100644
--- a/www/py-django-dpaste/Makefile
+++ b/www/py-django-dpaste/Makefile
@@ -25,10 +25,9 @@ TESTS_DESC= Include tox for test suite
MIGRATIONS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}south>=0.8.2:${PORTSDIR}/databases/py-south
TESTS_BUILD_DEPENDS= ${TEST_DEPENDS}
-USE_GITHUB= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USE_GITHUB= yes
+USES= python
+USE_PYTHON= distutils autoplist
GH_ACCOUNT= bartTC
GH_COMMIT= 590645f
diff --git a/www/py-django-evolution/Makefile b/www/py-django-evolution/Makefile
index ae143f578940..f0022cf875ba 100644
--- a/www/py-django-evolution/Makefile
+++ b/www/py-django-evolution/Makefile
@@ -16,9 +16,8 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django14>=1.1.1:${PORTSDIR}/www/py-django14
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-extract:
${RM} -r ${WRKSRC}/tests
diff --git a/www/py-django-extensions/Makefile b/www/py-django-extensions/Makefile
index 71ee9675f434..bceef8bd1656 100644
--- a/www/py-django-extensions/Makefile
+++ b/www/py-django-extensions/Makefile
@@ -15,8 +15,7 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django \
${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-haystack/Makefile b/www/py-django-haystack/Makefile
index a28a3943d56c..1e0c8a4a7e3c 100644
--- a/www/py-django-haystack/Makefile
+++ b/www/py-django-haystack/Makefile
@@ -15,8 +15,7 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.3:${PORTSDIR}/www/py-django
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-json-rpc/Makefile b/www/py-django-json-rpc/Makefile
index 8bf8cbad798e..8c685709418e 100644
--- a/www/py-django-json-rpc/Makefile
+++ b/www/py-django-json-rpc/Makefile
@@ -15,9 +15,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-
LICENSE= MIT
-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/www/py-django-keyedcache/Makefile b/www/py-django-keyedcache/Makefile
index aab16e85cb24..4746539e0a8d 100644
--- a/www/py-django-keyedcache/Makefile
+++ b/www/py-django-keyedcache/Makefile
@@ -14,8 +14,7 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-ldapdb/Makefile b/www/py-django-ldapdb/Makefile
index c94e6d2bd3d9..52ae7f85e823 100644
--- a/www/py-django-ldapdb/Makefile
+++ b/www/py-django-ldapdb/Makefile
@@ -15,8 +15,7 @@ LICENSE= BSD2CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.6.0:${PORTSDIR}/www/py-django \
${PYTHON_PKGNAMEPREFIX}ldap2>=2.0:${PORTSDIR}/net/py-ldap2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-livesettings/Makefile b/www/py-django-livesettings/Makefile
index f80b1b50aa24..5bdc0e30f524 100644
--- a/www/py-django-livesettings/Makefile
+++ b/www/py-django-livesettings/Makefile
@@ -16,9 +16,8 @@ LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:${PORTSDIR}/devel/py-setuptools_hg
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
post-patch:
@${FIND} ${WRKSRC} -type f -name "*.orig" -delete
diff --git a/www/py-django-mezzanine-filebrowser/Makefile b/www/py-django-mezzanine-filebrowser/Makefile
index c702ccc65487..1d3c6e7dccd9 100644
--- a/www/py-django-mezzanine-filebrowser/Makefile
+++ b/www/py-django-mezzanine-filebrowser/Makefile
@@ -12,10 +12,7 @@ DISTNAME= filebrowser_safe-${PORTVERSION}
MAINTAINER= koobs@FreeBSD.org
COMMENT= Fork of django-filebrowser for Mezzanine CMS
-USE_PYTHON= yes
-USES= gettext
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-PYDISTUTILS_PKGNAME= filebrowser_safe
+USES= gettext python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-mezzanine-grappelli/Makefile b/www/py-django-mezzanine-grappelli/Makefile
index e8216a92072a..7a12b8456429 100644
--- a/www/py-django-mezzanine-grappelli/Makefile
+++ b/www/py-django-mezzanine-grappelli/Makefile
@@ -12,10 +12,7 @@ DISTNAME= grappelli_safe-${PORTVERSION}
MAINTAINER= koobs@FreeBSD.org
COMMENT= Fork of django-grappelli for Mezzanine CMS
-USE_PYTHON= yes
-USES= gettext
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-PYDISTUTILS_PKGNAME= grappelli_safe
+USES= gettext python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-mezzanine/Makefile b/www/py-django-mezzanine/Makefile
index 0ab3f5f59749..87a0155c124b 100644
--- a/www/py-django-mezzanine/Makefile
+++ b/www/py-django-mezzanine/Makefile
@@ -22,10 +22,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.4:${PORTSDIR}/www/py-django \
${PYTHON_PKGNAMEPREFIX}django-mezzanine-filebrowser>=0.2.27:${PORTSDIR}/www/py-django-mezzanine-filebrowser \
${PYTHON_PKGNAMEPREFIX}django-mezzanine-grappelli>=0.2.21:${PORTSDIR}/www/py-django-mezzanine-grappelli
-USES= gettext
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= gettext python:2
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
diff --git a/www/py-django-mptt/Makefile b/www/py-django-mptt/Makefile
index 8affe0f5a55e..70b642e746ff 100644
--- a/www/py-django-mptt/Makefile
+++ b/www/py-django-mptt/Makefile
@@ -18,9 +18,7 @@ USE_GITHUB= yes
GH_ACCOUNT= django-mptt
GH_COMMIT= cc92ea6
-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/www/py-django-openid-auth/Makefile b/www/py-django-openid-auth/Makefile
index 97d8f5b34e23..51ef36761c70 100644
--- a/www/py-django-openid-auth/Makefile
+++ b/www/py-django-openid-auth/Makefile
@@ -16,8 +16,8 @@ LICENSE= BSD2CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.3.1:${PORTSDIR}/www/py-django \
${PYTHON_PKGNAMEPREFIX}openid>=2.2.5:${PORTSDIR}/security/py-openid
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
NO_WRKSUBDIR= yes
diff --git a/www/py-django-pipeline/Makefile b/www/py-django-pipeline/Makefile
index 1072a1760e32..1de2c961c449 100644
--- a/www/py-django-pipeline/Makefile
+++ b/www/py-django-pipeline/Makefile
@@ -12,8 +12,7 @@ COMMENT= Asset (css/js) packaging library for Django
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django14>0:${PORTSDIR}/www/py-django14
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-pipeline12/Makefile b/www/py-django-pipeline12/Makefile
index 0e60b47774ef..b8a24ef4ddc0 100644
--- a/www/py-django-pipeline12/Makefile
+++ b/www/py-django-pipeline12/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django14>0:${PORTSDIR}/www/py-django14
CONFLICTS= py[23][0-9]-django-pipeline-[0-9]*
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
+USES= python:2
+USE_PYTHON= distutils
.include <bsd.port.mk>
diff --git a/www/py-django-piston/Makefile b/www/py-django-piston/Makefile
index 0fbadb3879ac..bfd672c9d62a 100644
--- a/www/py-django-piston/Makefile
+++ b/www/py-django-piston/Makefile
@@ -12,8 +12,7 @@ COMMENT= Piston is a Django mini-framework creating APIs
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-profiles/Makefile b/www/py-django-profiles/Makefile
index 06a5d56cf8cb..89ec8c72dc93 100644
--- a/www/py-django-profiles/Makefile
+++ b/www/py-django-profiles/Makefile
@@ -17,8 +17,8 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
OPTIONS_DEFINE= DOCS
diff --git a/www/py-django-redis/Makefile b/www/py-django-redis/Makefile
index b97edbc55a67..4dca265b776b 100644
--- a/www/py-django-redis/Makefile
+++ b/www/py-django-redis/Makefile
@@ -14,8 +14,7 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.3:${PORTSDIR}/www/py-django \
${PYTHON_PKGNAMEPREFIX}redis>=2.9.0:${PORTSDIR}/databases/py-redis
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-registration-defaults/Makefile b/www/py-django-registration-defaults/Makefile
index ede5f76e2d1b..20e6c904b7dd 100644
--- a/www/py-django-registration-defaults/Makefile
+++ b/www/py-django-registration-defaults/Makefile
@@ -14,8 +14,7 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-registration>=0:${PORTSDIR}/www/py-django-registration
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-registration/Makefile b/www/py-django-registration/Makefile
index b5725b65a375..15a22862f6a9 100644
--- a/www/py-django-registration/Makefile
+++ b/www/py-django-registration/Makefile
@@ -15,10 +15,8 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.4:${PORTSDIR}/www/py-django
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= gettext
+USES= gettext python
+USE_PYTHON= distutils autoplist
CONFLICTS_INSTALL= pootle-*
diff --git a/www/py-django-reversion/Makefile b/www/py-django-reversion/Makefile
index b34bb75c3329..c2b367ed6c94 100644
--- a/www/py-django-reversion/Makefile
+++ b/www/py-django-reversion/Makefile
@@ -14,8 +14,8 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=0:${PORTSDIR}/www/py-django
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/www/py-django-sekizai/Makefile b/www/py-django-sekizai/Makefile
index 883897d8e5bb..109df8573dbd 100644
--- a/www/py-django-sekizai/Makefile
+++ b/www/py-django-sekizai/Makefile
@@ -14,8 +14,7 @@ COMMENT= Block templating system for Django
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django \
${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.1:${PORTSDIR}/www/py-django-classy-tags
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-signals-ahoy/Makefile b/www/py-django-signals-ahoy/Makefile
index 10c06b7527f1..b6594315fe59 100644
--- a/www/py-django-signals-ahoy/Makefile
+++ b/www/py-django-signals-ahoy/Makefile
@@ -14,9 +14,8 @@ COMMENT= Extended set of signals for use by Django apps
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-extract:
${RM} -r ${WRKSRC}/tests
diff --git a/www/py-django-simple-captcha/Makefile b/www/py-django-simple-captcha/Makefile
index d6d233e30006..28a0b56ed9af 100644
--- a/www/py-django-simple-captcha/Makefile
+++ b/www/py-django-simple-captcha/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.3:${PORTSDIR}/www/py-django \
${PYTHON_PKGNAMEPREFIX}pillow>=2.0.0:${PORTSDIR}/graphics/py-pillow \
${PYTHON_PKGNAMEPREFIX}six>=1.2.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/www/py-django-storages/Makefile b/www/py-django-storages/Makefile
index 159b917eada3..59fadd2d83d4 100644
--- a/www/py-django-storages/Makefile
+++ b/www/py-django-storages/Makefile
@@ -11,9 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Generic storages for Django
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-subdomains/Makefile b/www/py-django-subdomains/Makefile
index ebdf0fd14da9..956173b8ec96 100644
--- a/www/py-django-subdomains/Makefile
+++ b/www/py-django-subdomains/Makefile
@@ -12,8 +12,7 @@ COMMENT= Subdomains helpers for the Django framework
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-tables2/Makefile b/www/py-django-tables2/Makefile
index 1a900ffa312f..2757aad4627c 100644
--- a/www/py-django-tables2/Makefile
+++ b/www/py-django-tables2/Makefile
@@ -15,8 +15,7 @@ LICENSE= BSD2CLAUSE
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django \
${PYTHON_PKGNAMEPREFIX}six>=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/www/py-django-tagging/Makefile b/www/py-django-tagging/Makefile
index 5dcd2a7afaab..f8ba81e8bda8 100644
--- a/www/py-django-tagging/Makefile
+++ b/www/py-django-tagging/Makefile
@@ -15,9 +15,8 @@ LICENSE_COMB= multi
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/www/py-django-tastypie/Makefile b/www/py-django-tastypie/Makefile
index 1bb05461bb1c..db27511cca7a 100644
--- a/www/py-django-tastypie/Makefile
+++ b/www/py-django-tastypie/Makefile
@@ -17,8 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:${PORTSDIR}/devel/py-mime
RUN_DEPENDS:= ${BUILD_DEPENDS} \
${PYTHON_PKGNAMEPREFIX}django>=1.5:${PORTSDIR}/www/py-django
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-threaded-multihost/Makefile b/www/py-django-threaded-multihost/Makefile
index 070b8e048f5d..686c98f7e206 100644
--- a/www/py-django-threaded-multihost/Makefile
+++ b/www/py-django-threaded-multihost/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-
LICENSE= BSD3CLAUSE
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-django-tinymce/Makefile b/www/py-django-tinymce/Makefile
index 3db9bffbb048..df2f0e5e2f1e 100644
--- a/www/py-django-tinymce/Makefile
+++ b/www/py-django-tinymce/Makefile
@@ -14,8 +14,7 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-djangotoolbox/Makefile b/www/py-djangotoolbox/Makefile
index d664b0353b6e..f99f50c0c766 100644
--- a/www/py-djangotoolbox/Makefile
+++ b/www/py-djangotoolbox/Makefile
@@ -14,8 +14,7 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-dojango/Makefile b/www/py-dojango/Makefile
index e6a4fbc1d9ec..860cdadc98d1 100644
--- a/www/py-dojango/Makefile
+++ b/www/py-dojango/Makefile
@@ -10,9 +10,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= jpaetzel@FreeBSD.org
COMMENT= Django application for building dojo
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.6:${PORTSDIR}/www/py-django
diff --git a/www/py-dotcloud.cli/Makefile b/www/py-dotcloud.cli/Makefile
index 8f86af7eb1f4..38133c5f4666 100644
--- a/www/py-dotcloud.cli/Makefile
+++ b/www/py-dotcloud.cli/Makefile
@@ -10,8 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= dotCloud command-line interface client
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-dtflickr/Makefile b/www/py-dtflickr/Makefile
index bbd695b74cf9..dd8fb1d94db6 100644
--- a/www/py-dtflickr/Makefile
+++ b/www/py-dtflickr/Makefile
@@ -15,9 +15,7 @@ COMMENT= Spiffy Flickr API library using JSON
LICENSE= APACHE20
-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/www/py-falcon/Makefile b/www/py-falcon/Makefile
index 6fdcf11237f2..e0ef0dd8098c 100644
--- a/www/py-falcon/Makefile
+++ b/www/py-falcon/Makefile
@@ -17,8 +17,7 @@ BUILD_DEPENDS= cython>=0.11.2:${PORTSDIR}/lang/cython
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}testtools>=0:${PORTSDIR}/devel/py-testtools \
${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/www/py-fcgi/Makefile b/www/py-fcgi/Makefile
index 4f19b489faaa..ad1fcccbc26b 100644
--- a/www/py-fcgi/Makefile
+++ b/www/py-fcgi/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY= #
MAINTAINER= ports@FreeBSD.org
COMMENT= Python FastCGI interface library
-USE_PYTHON= yes
+USES= python
NO_WRKSUBDIR= yes
post-extract:
diff --git a/www/py-fedex/Makefile b/www/py-fedex/Makefile
index 5eb8867ed53f..6c2a73806f84 100644
--- a/www/py-fedex/Makefile
+++ b/www/py-fedex/Makefile
@@ -15,8 +15,7 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}suds>=0:${PORTSDIR}/net/py-suds
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-feedfinder/Makefile b/www/py-feedfinder/Makefile
index 0b8cdb8765e3..caf2b568c03f 100644
--- a/www/py-feedfinder/Makefile
+++ b/www/py-feedfinder/Makefile
@@ -10,8 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Ultra-liberal feed finder
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-feedgenerator/Makefile b/www/py-feedgenerator/Makefile
index 7b7dc182a22d..b5cc05bccb7e 100644
--- a/www/py-feedgenerator/Makefile
+++ b/www/py-feedgenerator/Makefile
@@ -16,9 +16,8 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
-PYDISTUTILS_AUTOPLIST= yes
-USE_PYDISTUTILS= yes
-USE_PYTHON= yes
+USES= python
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
diff --git a/www/py-flup/Makefile b/www/py-flup/Makefile
index 8da206934138..fcb54837ca44 100644
--- a/www/py-flup/Makefile
+++ b/www/py-flup/Makefile
@@ -12,8 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Random assortment of WSGI servers, middleware
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-formalchemy/Makefile b/www/py-formalchemy/Makefile
index 0c4a85490264..60e6243eb1a6 100644
--- a/www/py-formalchemy/Makefile
+++ b/www/py-formalchemy/Makefile
@@ -19,8 +19,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.4.5:${PORTSDIR}/databases/
${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:${PORTSDIR}/www/py-webhelpers
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/www/py-frozen-flask/Makefile b/www/py-frozen-flask/Makefile
index b84d5d312244..0c453d95e506 100644
--- a/www/py-frozen-flask/Makefile
+++ b/www/py-frozen-flask/Makefile
@@ -14,8 +14,7 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:${PORTSDIR}/www/py-flask
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-funkload/Makefile b/www/py-funkload/Makefile
index e51a20f6ff90..057b0aab6084 100644
--- a/www/py-funkload/Makefile
+++ b/www/py-funkload/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/docutils/__init__.py:${PORTSDIR}/textproc/py-d
${PYXML} \
tcpwatch.py:${PORTSDIR}/net/tcpwatch
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-google-api-python-client/Makefile b/www/py-google-api-python-client/Makefile
index f8343571d20c..e0e112d3a54d 100644
--- a/www/py-google-api-python-client/Makefile
+++ b/www/py-google-api-python-client/Makefile
@@ -17,8 +17,8 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gflags>=1.4:${PORTSDIR}/devel/py-gflags \
${PKGNAMEPREFIX}httplib2>=0.6.0:${PORTSDIR}/www/py-httplib2 \
${PKGNAMEPREFIX}oauth2>=1.5.167:${PORTSDIR}/net/py-oauth2
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
+USES= python:2
+USE_PYTHON= distutils
# bypass infrastructure bug
OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
diff --git a/www/py-graphite-web/Makefile b/www/py-graphite-web/Makefile
index 0e7964617a92..dc683425e7d7 100644
--- a/www/py-graphite-web/Makefile
+++ b/www/py-graphite-web/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:${PORTSDIR}/graphics/py-cairo
xorg-fonts-truetype>=0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype
FETCH_ARGS= -o ${DISTNAME}${EXTRACT_SUFX}
-USE_PYTHON= 2
+USES= python:2
USE_PYTHON= distutils
SUB_FILES= pkg-message
SUB_LIST+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} WWWOWN=${WWWOWN} \
diff --git a/www/py-gunicorn/Makefile b/www/py-gunicorn/Makefile
index bf9f62817e17..180df33f64d9 100644
--- a/www/py-gunicorn/Makefile
+++ b/www/py-gunicorn/Makefile
@@ -30,10 +30,9 @@ TORNADO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>=2.2:${PORTSDIR}/www/py-torn
SETPROC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setproctitle>0:${PORTSDIR}/devel/py-setproctitle
TESTS_BUILD_DEPENDS= ${TEST_DEPENDS}
-USE_GITHUB= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USE_GITHUB= yes
+USES= python
+USE_PYTHON= distutils autoplist
GH_ACCOUNT= benoitc
GH_COMMIT= 24fe380
diff --git a/www/py-imdbpy/Makefile b/www/py-imdbpy/Makefile
index e3289012c13b..5158498e79f8 100644
--- a/www/py-imdbpy/Makefile
+++ b/www/py-imdbpy/Makefile
@@ -21,9 +21,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
OPTIONS_DEFINE= DOCS
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/www/py-jonpy/Makefile b/www/py-jonpy/Makefile
index f312ad0e645f..d7fc815dab38 100644
--- a/www/py-jonpy/Makefile
+++ b/www/py-jonpy/Makefile
@@ -13,9 +13,8 @@ COMMENT= Python FastCGI interface library
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
PORTDOCS= *
PORTEXAMPLES= *
diff --git a/www/py-jswebkit/Makefile b/www/py-jswebkit/Makefile
index 6a4fb9a47bc4..8b94cad0ed4d 100644
--- a/www/py-jswebkit/Makefile
+++ b/www/py-jswebkit/Makefile
@@ -17,9 +17,7 @@ BUILD_DEPENDS= cython:${PORTSDIR}/lang/cython
LIB_DEPENDS= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= pkgconfig
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= pkgconfig python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-mechanize/Makefile b/www/py-mechanize/Makefile
index 223097c7d2f1..3e5b4b0121b0 100644
--- a/www/py-mechanize/Makefile
+++ b/www/py-mechanize/Makefile
@@ -12,8 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Stateful programmatic web browsing in Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-meld/Makefile b/www/py-meld/Makefile
index fc991d3ec30b..f4cbbd996c00 100644
--- a/www/py-meld/Makefile
+++ b/www/py-meld/Makefile
@@ -15,7 +15,7 @@ COMMENT= System for manipulating HTML using a Pythonic object model
LICENSE= MIT
-USE_PYTHON= 2
+USES= python:2
PLIST_FILES= %%PYTHON_SITELIBDIR%%/PyMeld.py \
%%PYTHON_SITELIBDIR%%/PyMeld.pyc \
diff --git a/www/py-meld3/Makefile b/www/py-meld3/Makefile
index 3201f5061d40..4eea0da0c650 100644
--- a/www/py-meld3/Makefile
+++ b/www/py-meld3/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= tn@0x746e.org.ua
COMMENT= HTML/XML templating system for Python
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-mt/Makefile b/www/py-mt/Makefile
index 49748f491a5d..2dd699be97a4 100644
--- a/www/py-mt/Makefile
+++ b/www/py-mt/Makefile
@@ -11,7 +11,7 @@ DISTNAME= PyMT-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python module which provides Movable Type XML-RPC connectivity
-USE_PYTHON= 2
+USES= python:2
NO_BUILD= yes
PLIST_FILES= %%PYTHON_SITELIBDIR%%/PyMT.py
diff --git a/www/py-nevow/Makefile b/www/py-nevow/Makefile
index 57200d43ddba..d714af8c671b 100644
--- a/www/py-nevow/Makefile
+++ b/www/py-nevow/Makefile
@@ -13,10 +13,8 @@ EXTRACT_SUFX= .tar.gz?format=raw
MAINTAINER= nivit@FreeBSD.org
COMMENT= Web application templating system, based on the Twisted Woven
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= gettext twisted:web
+USE_PYTHON= distutils autoplist
+USES= gettext python twisted:web
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKSRC}/pkg-message
diff --git a/www/py-openssl-proxy/Makefile b/www/py-openssl-proxy/Makefile
index 4687c228c23d..867080612257 100644
--- a/www/py-openssl-proxy/Makefile
+++ b/www/py-openssl-proxy/Makefile
@@ -13,8 +13,7 @@ COMMENT= HTTPS proxy support
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-paste/Makefile b/www/py-paste/Makefile
index d121653f7714..a1e2a63cf61d 100644
--- a/www/py-paste/Makefile
+++ b/www/py-paste/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Tools for using a Web Server Gateway Interface stack
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-pastedeploy/Makefile b/www/py-pastedeploy/Makefile
index c8136d0f8ace..5af1df61ebe2 100644
--- a/www/py-pastedeploy/Makefile
+++ b/www/py-pastedeploy/Makefile
@@ -14,8 +14,7 @@ COMMENT= Load, configure, and compose WSGI applications and servers
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.6:${PORTSDIR}/www/py-paste
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/www/py-pastescript/Makefile b/www/py-pastescript/Makefile
index 95ab8d0361f4..b5c29f9c61c4 100644
--- a/www/py-pastescript/Makefile
+++ b/www/py-pastescript/Makefile
@@ -18,9 +18,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.0.1:${PORTSDIR}/devel/py-cheeta
${PYTHON_PKGNAMEPREFIX}wsgiutils>0:${PORTSDIR}/devel/py-wsgiutils
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-extract:
${RM} -r ${WRKSRC}/tests
diff --git a/www/py-plone.alterego/Makefile b/www/py-plone.alterego/Makefile
index d0fa87e81358..e8f845b0c723 100644
--- a/www/py-plone.alterego/Makefile
+++ b/www/py-plone.alterego/Makefile
@@ -13,9 +13,7 @@ COMMENT= Low level support for dynamic modules
LICENSE= LGPL20
-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/www/py-plone.app.blob/Makefile b/www/py-plone.app.blob/Makefile
index 1c82e0166c70..cf8b2a3c9a92 100644
--- a/www/py-plone.app.blob/Makefile
+++ b/www/py-plone.app.blob/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=3.8.1:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}plone.app.imaging>1.0:${PORTSDIR}/www/py-plone.app.imaging \
${PYTHON_PKGNAMEPREFIX}plone.scale>=0:${PORTSDIR}/www/py-plone.scale
-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/www/py-plone.app.caching/Makefile b/www/py-plone.app.caching/Makefile
index 51298a06679d..e42086f8d57a 100644
--- a/www/py-plone.app.caching/Makefile
+++ b/www/py-plone.app.caching/Makefile
@@ -34,9 +34,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
${PYTHON_PKGNAMEPREFIX}z3c.form>=0:${PORTSDIR}/devel/py-z3c.form \
${PYTHON_PKGNAMEPREFIX}z3c.zcmlhook>=0:${PORTSDIR}/devel/py-z3c.zcmlhook
-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/www/py-plone.app.collection/Makefile b/www/py-plone.app.collection/Makefile
index c83a80959151..e56ed2212d5c 100644
--- a/www/py-plone.app.collection/Makefile
+++ b/www/py-plone.app.collection/Makefile
@@ -32,9 +32,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>=1.0.2:${PORTSDIR}/de
${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= zope zip
+USES= python zope zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-plone.app.content/Makefile b/www/py-plone.app.content/Makefile
index 8813999d4769..ebccf7c644e7 100644
--- a/www/py-plone.app.content/Makefile
+++ b/www/py-plone.app.content/Makefile
@@ -30,9 +30,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.me
${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.2.0:${PORTSDIR}/devel/py-Products.CMFCore \
${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:${PORTSDIR}/devel/py-Products.CMFDefault
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= zope zip
+USES= python:2 zope zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-plone.app.contentlisting/Makefile b/www/py-plone.app.contentlisting/Makefile
index fe93f8d78146..62ae978b9ba7 100644
--- a/www/py-plone.app.contentlisting/Makefile
+++ b/www/py-plone.app.contentlisting/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/www/py-plone.app.contentmenu/Makefile b/www/py-plone.app.contentmenu/Makefile
index 6f01512d6d11..a27667ffb638 100644
--- a/www/py-plone.app.contentmenu/Makefile
+++ b/www/py-plone.app.contentmenu/Makefile
@@ -28,9 +28,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:${PORTSDIR}/www/py-plone.lo
${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:${PORTSDIR}/devel/py-Products.CMFDynamicViewFTI
-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/www/py-plone.app.contentrules/Makefile b/www/py-plone.app.contentrules/Makefile
index e2aea21cdad6..c9885f6975d0 100644
--- a/www/py-plone.app.contentrules/Makefile
+++ b/www/py-plone.app.contentrules/Makefile
@@ -40,9 +40,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:${PORTSDIR}/devel/py-five.fo
${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:${PORTSDIR}/devel/py-Products.statusmessages \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= zope zip
+USES= python:2 zope zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-plone.app.controlpanel/Makefile b/www/py-plone.app.controlpanel/Makefile
index 56df1102a940..13631eda3afe 100644
--- a/www/py-plone.app.controlpanel/Makefile
+++ b/www/py-plone.app.controlpanel/Makefile
@@ -40,9 +40,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:${PORTSDIR}/www/py-plone.a
${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:${PORTSDIR}/devel/py-Products.statusmessages \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= zope zip
+USES= python:2 zope zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-plone.app.customerize/Makefile b/www/py-plone.app.customerize/Makefile
index 5417ab5bdf6b..069dda5c1e77 100644
--- a/www/py-plone.app.customerize/Makefile
+++ b/www/py-plone.app.customerize/Makefile
@@ -23,10 +23,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.customerize>=0:${PORTSDIR}/devel/py-fiv
${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
#USES= zope
.include <bsd.port.mk>
diff --git a/www/py-plone.app.dexterity/Makefile b/www/py-plone.app.dexterity/Makefile
index d286388b3791..68aabe2cb573 100644
--- a/www/py-plone.app.dexterity/Makefile
+++ b/www/py-plone.app.dexterity/Makefile
@@ -40,9 +40,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.z3cform.datetimewidget>0:${PORTSD
${PYTHON_PKGNAMEPREFIX}zope.publisher>0:${PORTSDIR}/devel/py-zope.publisher \
${PYTHON_PKGNAMEPREFIX}z3c.form>0:${PORTSDIR}/devel/py-z3c.form
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= zope zip
+USES= python:2 zope zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-plone.app.discussion/Makefile b/www/py-plone.app.discussion/Makefile
index 2b579932bcad..59b5fd390095 100644
--- a/www/py-plone.app.discussion/Makefile
+++ b/www/py-plone.app.discussion/Makefile
@@ -31,9 +31,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.monkeypatcher>=0:${PORTSDIR}/deve
${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
${PYTHON_PKGNAMEPREFIX}z3c.form>=2.3.3:${PORTSDIR}/devel/py-z3c.form
-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/www/py-plone.app.folder/Makefile b/www/py-plone.app.folder/Makefile
index 44b15e1bcc24..b605fcffe4f2 100644
--- a/www/py-plone.app.folder/Makefile
+++ b/www/py-plone.app.folder/Makefile
@@ -15,9 +15,7 @@ LICENSE= GPLv2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.folder>=0:${PORTSDIR}/www/py-plone.folder
-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/www/py-plone.app.form/Makefile b/www/py-plone.app.form/Makefile
index cda48a87b2c6..680d99916cba 100644
--- a/www/py-plone.app.form/Makefile
+++ b/www/py-plone.app.form/Makefile
@@ -31,9 +31,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:${PORTSDIR}/devel/py-five.fo
${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= zope zip
+USES= python:2 zope zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-plone.app.i18n/Makefile b/www/py-plone.app.i18n/Makefile
index 30b042fd1fc4..f92c5c34e202 100644
--- a/www/py-plone.app.i18n/Makefile
+++ b/www/py-plone.app.i18n/Makefile
@@ -13,9 +13,7 @@ COMMENT= Plone specific i18n extensions
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/www/py-plone.app.imaging/Makefile b/www/py-plone.app.imaging/Makefile
index 01387fbbfd92..a411c57c9dc3 100644
--- a/www/py-plone.app.imaging/Makefile
+++ b/www/py-plone.app.imaging/Makefile
@@ -15,9 +15,7 @@ LICENSE= GPLv2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.scale>=0:${PORTSDIR}/www/py-plone.scale
-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/www/py-plone.app.iterate/Makefile b/www/py-plone.app.iterate/Makefile
index 36e5c37389f6..64de05956853 100644
--- a/www/py-plone.app.iterate/Makefile
+++ b/www/py-plone.app.iterate/Makefile
@@ -33,9 +33,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:${PORTSDIR}/www/py-plone.lo
${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:${PORTSDIR}/devel/py-Products.statusmessages \
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/www/py-plone.app.jquery/Makefile b/www/py-plone.app.jquery/Makefile
index 882d3b69ee7e..6c9945c91008 100644
--- a/www/py-plone.app.jquery/Makefile
+++ b/www/py-plone.app.jquery/Makefile
@@ -16,8 +16,7 @@ LICENSE= GPLv2
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/www/py-plone.app.jquerytools/Makefile b/www/py-plone.app.jquerytools/Makefile
index 0a89ab3724da..7f028d0f67aa 100644
--- a/www/py-plone.app.jquerytools/Makefile
+++ b/www/py-plone.app.jquerytools/Makefile
@@ -17,9 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=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= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= zope zip
+USES= python:2 zope zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-plone.app.layout/Makefile b/www/py-plone.app.layout/Makefile
index e0ade1216ec2..95f17a8a8a16 100644
--- a/www/py-plone.app.layout/Makefile
+++ b/www/py-plone.app.layout/Makefile
@@ -34,9 +34,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.viewletmanager>=1.2:${PORTSDIR}/ww
${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:${PORTSDIR}/devel/py-Products.CMFDynamicViewFTI \
${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=1.2.2:${PORTSDIR}/devel/py-Products.CMFEditions
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= zope zip
+USES= python:2 zope zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-plone.app.ldap/Makefile b/www/py-plone.app.ldap/Makefile
index 99a476cd7269..6d371ccdc655 100644
--- a/www/py-plone.app.ldap/Makefile
+++ b/www/py-plone.app.ldap/Makefile
@@ -17,9 +17,7 @@ LICENSE= GPLv2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:${PORTSDIR}/devel/py-Products.CMFCore \
${PYTHON_PKGNAMEPREFIX}Products.PloneLDAP>=1.0:${PORTSDIR}/www/py-Products.PloneLDAP
-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/www/py-plone.app.linkintegrity/Makefile b/www/py-plone.app.linkintegrity/Makefile
index 71a30dc0c581..ca80cd8bc5bb 100644
--- a/www/py-plone.app.linkintegrity/Makefile
+++ b/www/py-plone.app.linkintegrity/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/www/py-plone.app.locales/Makefile b/www/py-plone.app.locales/Makefile
index 16dcfc1a3482..2f07e547cb44 100644
--- a/www/py-plone.app.locales/Makefile
+++ b/www/py-plone.app.locales/Makefile
@@ -13,9 +13,7 @@ COMMENT= Translation files for Plone
LICENSE= GPLv2
-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/www/py-plone.app.portlets/Makefile b/www/py-plone.app.portlets/Makefile
index 6b7cac06ebb9..12654ddc6380 100644
--- a/www/py-plone.app.portlets/Makefile
+++ b/www/py-plone.app.portlets/Makefile
@@ -47,9 +47,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:${PORTSDIR}/devel/py-five.fo
${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
${PYTHON_PKGNAMEPREFIX}feedparser>=0:${PORTSDIR}/textproc/py-feedparser
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= zope zip
+USES= python:2 zope zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-plone.app.querystring/Makefile b/www/py-plone.app.querystring/Makefile
index 025d7e65148e..1b566cb09121 100644
--- a/www/py-plone.app.querystring/Makefile
+++ b/www/py-plone.app.querystring/Makefile
@@ -29,9 +29,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
${PYTHON_PKGNAMEPREFIX}zope.publisher>0:${PORTSDIR}/devel/py-zope.publisher \
${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.schema
-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/www/py-plone.app.redirector/Makefile b/www/py-plone.app.redirector/Makefile
index 48bc7dd26ed8..ae2ee697af98 100644
--- a/www/py-plone.app.redirector/Makefile
+++ b/www/py-plone.app.redirector/Makefile
@@ -15,9 +15,7 @@ LICENSE= GPLv2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize
-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/www/py-plone.app.registry/Makefile b/www/py-plone.app.registry/Makefile
index 8ffbd667d2f3..b236ba14941e 100644
--- a/www/py-plone.app.registry/Makefile
+++ b/www/py-plone.app.registry/Makefile
@@ -26,9 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.registry>=1.0:${PORTSDIR}/www/py-plone
${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= zope zip
+USES= python:2 zope zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-plone.app.search/Makefile b/www/py-plone.app.search/Makefile
index ea37a5ab072f..3092c3c37a9c 100644
--- a/www/py-plone.app.search/Makefile
+++ b/www/py-plone.app.search/Makefile
@@ -15,9 +15,7 @@ LICENSE= GPLv2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:${PORTSDIR}/www/py-plone.app.contentlisting
-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/www/py-plone.app.testing/Makefile b/www/py-plone.app.testing/Makefile
index cf210a911dc5..20c41eae34fc 100644
--- a/www/py-plone.app.testing/Makefile
+++ b/www/py-plone.app.testing/Makefile
@@ -23,9 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-z
${PYTHON_PKGNAMEPREFIX}plone.testing>=0:${PORTSDIR}/www/py-plone.testing \
${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
-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/www/py-plone.app.textfield/Makefile b/www/py-plone.app.textfield/Makefile
index ddbd44b16653..49cdd10921a8 100644
--- a/www/py-plone.app.textfield/Makefile
+++ b/www/py-plone.app.textfield/Makefile
@@ -18,9 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.sche
${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
zodb${PYTHON_PKGNAMESUFFIX}>=3.8.1:${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/www/py-plone.app.theming/Makefile b/www/py-plone.app.theming/Makefile
index 7129d5f12a6f..d98b78def110 100644
--- a/www/py-plone.app.theming/Makefile
+++ b/www/py-plone.app.theming/Makefile
@@ -27,9 +27,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}diazo>=0:${PORTSDIR}/devel/py-diazo \
${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:${PORTSDIR}/devel/py-five.globalrequest \
${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/www/py-plone.app.upgrade/Makefile b/www/py-plone.app.upgrade/Makefile
index 25cf800da00c..c0ad4966fb80 100644
--- a/www/py-plone.app.upgrade/Makefile
+++ b/www/py-plone.app.upgrade/Makefile
@@ -48,9 +48,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}borg.localrole>=0:${PORTSDIR}/security/py-bo
${PYTHON_PKGNAMEPREFIX}Products.SecureMailHost>=0:${PORTSDIR}/mail/py-Products.SecureMailHost \
${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>=2.13.4:${PORTSDIR}/devel/py-Products.ZCatalog
-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/www/py-plone.app.users/Makefile b/www/py-plone.app.users/Makefile
index c6512dfcf39f..261de596623d 100644
--- a/www/py-plone.app.users/Makefile
+++ b/www/py-plone.app.users/Makefile
@@ -29,10 +29,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:${PORTSDIR}/devel/py-five.fo
${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:${PORTSDIR}/devel/py-Products.statusmessages \
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
#USES= zope
.include <bsd.port.mk>
diff --git a/www/py-plone.app.uuid/Makefile b/www/py-plone.app.uuid/Makefile
index b6859c197ef8..0b292d4e838e 100644
--- a/www/py-plone.app.uuid/Makefile
+++ b/www/py-plone.app.uuid/Makefile
@@ -18,9 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:${PORTSDIR}/www/py-plone.uuid
${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
${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/www/py-plone.app.viewletmanager/Makefile b/www/py-plone.app.viewletmanager/Makefile
index aa3a3ca31ba8..83f027ec2b08 100644
--- a/www/py-plone.app.viewletmanager/Makefile
+++ b/www/py-plone.app.viewletmanager/Makefile
@@ -23,10 +23,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>0:${PORTSDIR}/www/py-plone.app.vocabularies
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
#USES= zope
.include <bsd.port.mk>
diff --git a/www/py-plone.app.vocabularies/Makefile b/www/py-plone.app.vocabularies/Makefile
index 1ab4a2cee9f5..eccf8caca423 100644
--- a/www/py-plone.app.vocabularies/Makefile
+++ b/www/py-plone.app.vocabularies/Makefile
@@ -24,9 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.br
${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-USES= zope
+USES= python zope
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-plone.app.workflow/Makefile b/www/py-plone.app.workflow/Makefile
index c0d8f6283495..a2421b228f0e 100644
--- a/www/py-plone.app.workflow/Makefile
+++ b/www/py-plone.app.workflow/Makefile
@@ -29,9 +29,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:${PORTSDIR}/www/py-plone.mem
${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:${PORTSDIR}/devel/py-Products.GenericSetup \
${PYTHON_PKGNAMEPREFIX}Products.statusmessages>0:${PORTSDIR}/devel/py-Products.statusmessages
-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/www/py-plone.app.z3cform/Makefile b/www/py-plone.app.z3cform/Makefile
index d916442e21ee..a23aea5d0fdd 100644
--- a/www/py-plone.app.z3cform/Makefile
+++ b/www/py-plone.app.z3cform/Makefile
@@ -22,9 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.z3cform.datetimewidget>=0.1:${POR
${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}zope.traversing>0:${PORTSDIR}/devel/py-zope.traversing
-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/www/py-plone.autoform/Makefile b/www/py-plone.autoform/Makefile
index edcd51c0819c..3786d6303d6d 100644
--- a/www/py-plone.autoform/Makefile
+++ b/www/py-plone.autoform/Makefile
@@ -21,9 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0:${PORTSDIR}/www/py-plone.z3cform \
${PYTHON_PKGNAMEPREFIX}z3c.form>=0:${PORTSDIR}/devel/py-z3c.form
-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/www/py-plone.batching/Makefile b/www/py-plone.batching/Makefile
index e8a5d6ac5d2e..f5dcd47ad42a 100644
--- a/www/py-plone.batching/Makefile
+++ b/www/py-plone.batching/Makefile
@@ -13,9 +13,7 @@ COMMENT= Batching facilities used in Plone
LICENSE= GPLv2
-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/www/py-plone.behavior/Makefile b/www/py-plone.behavior/Makefile
index 6ac5c6353e24..32f9257d2d56 100644
--- a/www/py-plone.behavior/Makefile
+++ b/www/py-plone.behavior/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.c
${PYTHON_PKGNAMEPREFIX}zope.annotation>0:${PORTSDIR}/devel/py-zope.annotation \
${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/www/py-plone.browserlayer/Makefile b/www/py-plone.browserlayer/Makefile
index f1ba5552069b..64dded2871bf 100644
--- a/www/py-plone.browserlayer/Makefile
+++ b/www/py-plone.browserlayer/Makefile
@@ -19,10 +19,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4:${PORTSDIR}/devel/py-Products.GenericSetup \
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
#USES= zope
.include <bsd.port.mk>
diff --git a/www/py-plone.cachepurging/Makefile b/www/py-plone.cachepurging/Makefile
index 3c9556fa6d06..8bdda7e495a7 100644
--- a/www/py-plone.cachepurging/Makefile
+++ b/www/py-plone.cachepurging/Makefile
@@ -22,10 +22,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:${PORTSDIR}/devel/py-f
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${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
#USES= zope
.include <bsd.port.mk>
diff --git a/www/py-plone.caching/Makefile b/www/py-plone.caching/Makefile
index 3d63b2a15380..d8a651055dc2 100644
--- a/www/py-plone.caching/Makefile
+++ b/www/py-plone.caching/Makefile
@@ -22,10 +22,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}z3c.caching>=0:${PORTSDIR}/devel/py-z3c.cach
${PYTHON_PKGNAMEPREFIX}plone.transformchain>=0:${PORTSDIR}/www/py-plone.transformchain \
${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:${PORTSDIR}/devel/py-five.globalrequest
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
#USES= zope
.include <bsd.port.mk>
diff --git a/www/py-plone.contentrules/Makefile b/www/py-plone.contentrules/Makefile
index a4288ab7403b..2b200947923f 100644
--- a/www/py-plone.contentrules/Makefile
+++ b/www/py-plone.contentrules/Makefile
@@ -25,9 +25,7 @@ RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
${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/www/py-plone.dexterity/Makefile b/www/py-plone.dexterity/Makefile
index c971ba437ec1..d16e2485ff82 100644
--- a/www/py-plone.dexterity/Makefile
+++ b/www/py-plone.dexterity/Makefile
@@ -42,9 +42,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.alterego>0:${PORTSDIR}/www/py-plone.al
${PYTHON_PKGNAMEPREFIX}zope.size>0:${PORTSDIR}/devel/py-zope.size \
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/www/py-plone.fieldsets/Makefile b/www/py-plone.fieldsets/Makefile
index ef71235fe720..1c47e880a09c 100644
--- a/www/py-plone.fieldsets/Makefile
+++ b/www/py-plone.fieldsets/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:${PORTSDIR}/devel/py-five.fo
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
-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/www/py-plone.folder/Makefile b/www/py-plone.folder/Makefile
index a21df612e9c1..c36bcd5e0fa4 100644
--- a/www/py-plone.folder/Makefile
+++ b/www/py-plone.folder/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:${PORTSDIR}/www/py-plone.mem
${PYTHON_PKGNAMEPREFIX}zope.annotation>0:${PORTSDIR}/devel/py-zope.annotation \
${PYTHON_PKGNAMEPREFIX}zope.container>0:${PORTSDIR}/devel/py-zope.container
-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/www/py-plone.formwidget.namedfile/Makefile b/www/py-plone.formwidget.namedfile/Makefile
index ea735071c3a3..122c4179f814 100644
--- a/www/py-plone.formwidget.namedfile/Makefile
+++ b/www/py-plone.formwidget.namedfile/Makefile
@@ -17,9 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:${PORTSDIR}/www/py-plone.n
${PYTHON_PKGNAMEPREFIX}z3c.form>0:${PORTSDIR}/devel/py-z3c.form \
${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:${PORTSDIR}/www/py-plone.z3cform
-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/www/py-plone.i18n/Makefile b/www/py-plone.i18n/Makefile
index 3d1bcbd65f50..fa98237462d9 100644
--- a/www/py-plone.i18n/Makefile
+++ b/www/py-plone.i18n/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
${PYTHON_PKGNAMEPREFIX}unidecode>=0:${PORTSDIR}/converters/py-unidecode
-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/www/py-plone.indexer/Makefile b/www/py-plone.indexer/Makefile
index 6f4de6e525fa..9b60e67db745 100644
--- a/www/py-plone.indexer/Makefile
+++ b/www/py-plone.indexer/Makefile
@@ -17,9 +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}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore
-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/www/py-plone.intelligenttext/Makefile b/www/py-plone.intelligenttext/Makefile
index 7d12267c3ff7..883d921d9383 100644
--- a/www/py-plone.intelligenttext/Makefile
+++ b/www/py-plone.intelligenttext/Makefile
@@ -13,9 +13,7 @@ COMMENT= Transforms from text/x-web-intelligent to text/html
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/www/py-plone.locking/Makefile b/www/py-plone.locking/Makefile
index 1010b53174dc..e56865bfc574 100644
--- a/www/py-plone.locking/Makefile
+++ b/www/py-plone.locking/Makefile
@@ -24,10 +24,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
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
#USES= zope
.include <bsd.port.mk>
diff --git a/www/py-plone.memoize/Makefile b/www/py-plone.memoize/Makefile
index b5c589f22142..eee92f49fe57 100644
--- a/www/py-plone.memoize/Makefile
+++ b/www/py-plone.memoize/Makefile
@@ -18,9 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:${PORTSDIR}/devel/py-zope.ramcache
-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/www/py-plone.namedfile/Makefile b/www/py-plone.namedfile/Makefile
index 32741d3ff97f..b590b439ecb6 100644
--- a/www/py-plone.namedfile/Makefile
+++ b/www/py-plone.namedfile/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}zope.traversing>0:${PORTSDIR}/devel/py-zope.traversing \
${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:${PORTSDIR}/www/py-plone.rfc822
-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/www/py-plone.outputfilters/Makefile b/www/py-plone.outputfilters/Makefile
index e8f338acd23e..08993bbb47a9 100644
--- a/www/py-plone.outputfilters/Makefile
+++ b/www/py-plone.outputfilters/Makefile
@@ -18,9 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Pro
${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:${PORTSDIR}/devel/py-Products.MimetypesRegistry \
${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:${PORTSDIR}/devel/py-Products.PortalTransforms
-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/www/py-plone.portlet.collection/Makefile b/www/py-plone.portlet.collection/Makefile
index 4b5ee45053b3..7f1e2d5ce214 100644
--- a/www/py-plone.portlet.collection/Makefile
+++ b/www/py-plone.portlet.collection/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.me
${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:${PORTSDIR}/www/py-plone.app.vocabularies \
${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:${PORTSDIR}/www/py-plone.app.form
-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/www/py-plone.portlet.static/Makefile b/www/py-plone.portlet.static/Makefile
index 94c38408d48c..213d8678ea34 100644
--- a/www/py-plone.portlet.static/Makefile
+++ b/www/py-plone.portlet.static/Makefile
@@ -23,10 +23,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:${PORTSDIR}/www/py-plone.p
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
#USES= zope
.include <bsd.port.mk>
diff --git a/www/py-plone.portlets/Makefile b/www/py-plone.portlets/Makefile
index 6b2b268e0c05..2cb926530584 100644
--- a/www/py-plone.portlets/Makefile
+++ b/www/py-plone.portlets/Makefile
@@ -24,9 +24,7 @@ RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site
-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/www/py-plone.registry/Makefile b/www/py-plone.registry/Makefile
index 2ccab652cf66..ddfb8790b092 100644
--- a/www/py-plone.registry/Makefile
+++ b/www/py-plone.registry/Makefile
@@ -21,9 +21,7 @@ RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
${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/www/py-plone.resource/Makefile b/www/py-plone.resource/Makefile
index 9ca50cef8806..044ccd9a3e65 100644
--- a/www/py-plone.resource/Makefile
+++ b/www/py-plone.resource/Makefile
@@ -25,9 +25,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
${PYTHON_PKGNAMEPREFIX}plone.caching>=0:${PORTSDIR}/www/py-plone.caching
-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/www/py-plone.resourceeditor/Makefile b/www/py-plone.resourceeditor/Makefile
index 5fab862ac6b5..238dd6810bd9 100644
--- a/www/py-plone.resourceeditor/Makefile
+++ b/www/py-plone.resourceeditor/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.i
${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.schema \
${PYTHON_PKGNAMEPREFIX}plone.resource>0:${PORTSDIR}/www/py-plone.resource
-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/www/py-plone.rfc822/Makefile b/www/py-plone.rfc822/Makefile
index d39f8db4a1e5..e2f05d52e73e 100644
--- a/www/py-plone.rfc822/Makefile
+++ b/www/py-plone.rfc822/Makefile
@@ -18,9 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.schema>0:${PORTSDIR}/devel/py-zope.sche
${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil
-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/www/py-plone.scale/Makefile b/www/py-plone.scale/Makefile
index 7dbb87d5e4fd..6d499678552a 100644
--- a/www/py-plone.scale/Makefile
+++ b/www/py-plone.scale/Makefile
@@ -18,9 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence
-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/www/py-plone.schemaeditor/Makefile b/www/py-plone.schemaeditor/Makefile
index 246ea2684d5f..fc084bf85b25 100644
--- a/www/py-plone.schemaeditor/Makefile
+++ b/www/py-plone.schemaeditor/Makefile
@@ -23,9 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.c
${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:${PORTSDIR}/www/py-plone.z3cform \
${PYTHON_PKGNAMEPREFIX}plone.autoform>0:${PORTSDIR}/www/py-plone.autoform
-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/www/py-plone.stringinterp/Makefile b/www/py-plone.stringinterp/Makefile
index 62e44cc0500a..74d8137c354c 100644
--- a/www/py-plone.stringinterp/Makefile
+++ b/www/py-plone.stringinterp/Makefile
@@ -16,9 +16,7 @@ LICENSE= GPLv2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n
-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/www/py-plone.subrequest/Makefile b/www/py-plone.subrequest/Makefile
index e0ee79868ebb..9a04d8d036c5 100644
--- a/www/py-plone.subrequest/Makefile
+++ b/www/py-plone.subrequest/Makefile
@@ -16,9 +16,7 @@ LICENSE= GPLv2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:${PORTSDIR}/devel/py-five.globalrequest \
${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:${PORTSDIR}/devel/py-zope.globalrequest
-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/www/py-plone.supermodel/Makefile b/www/py-plone.supermodel/Makefile
index 804744272251..64a1818655a9 100644
--- a/www/py-plone.supermodel/Makefile
+++ b/www/py-plone.supermodel/Makefile
@@ -21,9 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}z3c.zcmlhook>=0:${PORTSDIR}/devel/py-z3c.zcmlhook \
${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/www/py-plone.synchronize/Makefile b/www/py-plone.synchronize/Makefile
index 1f8a251787b6..aa24c3beb984 100644
--- a/www/py-plone.synchronize/Makefile
+++ b/www/py-plone.synchronize/Makefile
@@ -13,9 +13,7 @@ COMMENT= Simple decorators to support synchronized methods
LICENSE= BSD3CLAUSE
-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/www/py-plone.testing/Makefile b/www/py-plone.testing/Makefile
index 66484246b780..cdef3ddc00d1 100644
--- a/www/py-plone.testing/Makefile
+++ b/www/py-plone.testing/Makefile
@@ -16,9 +16,7 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
${PYTHON_PKGNAMEPREFIX}unittest2>=0:${PORTSDIR}/devel/py-unittest2
-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/www/py-plone.theme/Makefile b/www/py-plone.theme/Makefile
index 602cd2f9304f..352fde136c84 100644
--- a/www/py-plone.theme/Makefile
+++ b/www/py-plone.theme/Makefile
@@ -20,10 +20,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:${PORTSDIR}/devel/py-Products.CMFDefault \
${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
#USES= zope
.include <bsd.port.mk>
diff --git a/www/py-plone.transformchain/Makefile b/www/py-plone.transformchain/Makefile
index 40ac1469507e..cab2982d4056 100644
--- a/www/py-plone.transformchain/Makefile
+++ b/www/py-plone.transformchain/Makefile
@@ -17,9 +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.schema>=0:${PORTSDIR}/devel/py-zope.schema
-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/www/py-plone.uuid/Makefile b/www/py-plone.uuid/Makefile
index 2d8b11daccc4..f5863740ec6c 100644
--- a/www/py-plone.uuid/Makefile
+++ b/www/py-plone.uuid/Makefile
@@ -18,9 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:${PORTSDIR}/devel/py-zop
${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
${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/www/py-plone.z3cform/Makefile b/www/py-plone.z3cform/Makefile
index 684992f3e305..249628898d88 100644
--- a/www/py-plone.z3cform/Makefile
+++ b/www/py-plone.z3cform/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.batching>0:${PORTSDIR}/www/py-plone.ba
${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:${PORTSDIR}/devel/py-zope.browserpage \
${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component
-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/www/py-plonetheme.classic/Makefile b/www/py-plonetheme.classic/Makefile
index b314118915e1..c2daaf2cb3b8 100644
--- a/www/py-plonetheme.classic/Makefile
+++ b/www/py-plonetheme.classic/Makefile
@@ -13,9 +13,7 @@ COMMENT= Classic Plone 3 default theme
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/www/py-plonetheme.sunburst/Makefile b/www/py-plonetheme.sunburst/Makefile
index 70fbafe51d0d..b7e702275640 100644
--- a/www/py-plonetheme.sunburst/Makefile
+++ b/www/py-plonetheme.sunburst/Makefile
@@ -13,9 +13,7 @@ COMMENT= Default theme for Plone 4
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/www/py-poster/Makefile b/www/py-poster/Makefile
index acf1839605ba..2e8518b5e27a 100644
--- a/www/py-poster/Makefile
+++ b/www/py-poster/Makefile
@@ -12,9 +12,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Streaming HTTP uploads and multipart/form-data encoding
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-extract:
${RM} -r ${WRKSRC}/tests
diff --git a/www/py-postmarkup/Makefile b/www/py-postmarkup/Makefile
index 0120f66e03e4..e795a18553b2 100644
--- a/www/py-postmarkup/Makefile
+++ b/www/py-postmarkup/Makefile
@@ -13,8 +13,7 @@ COMMENT= Library to parse the BBcode written in Python
LICENSE= BSD3CLAUSE
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-praw/Makefile b/www/py-praw/Makefile
index 5a7a66df7a3e..846b50b0c4db 100644
--- a/www/py-praw/Makefile
+++ b/www/py-praw/Makefile
@@ -16,10 +16,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests1>=1.2.0:${PORTSDIR}/www/py-requests
${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
TEST_DEPENDS:= ${RUN_DEPENDS}
-USE_GITHUB= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USE_GITHUB= yes
+USES= python
+USE_PYTHON= distutils autoplist
GH_ACCOUNT= praw-dev
GH_TAGNAME= v${DISTVERSION}
diff --git a/www/py-prewikka/Makefile b/www/py-prewikka/Makefile
index a97353be25c8..0c307d00094d 100644
--- a/www/py-prewikka/Makefile
+++ b/www/py-prewikka/Makefile
@@ -15,8 +15,8 @@ BUILD_DEPENDS= cheetah-compile:${PORTSDIR}/devel/py-cheetah
LIB_DEPENDS= libprelude.so:${PORTSDIR}/security/libprelude \
libpreludedb.so:${PORTSDIR}/security/libpreludedb
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
+USES= python:2
+USE_PYTHON= distutils
OPTIONS_DEFINE= NLS
diff --git a/www/py-py-restclient/Makefile b/www/py-py-restclient/Makefile
index 9a9fc7649159..da0154c6da02 100644
--- a/www/py-py-restclient/Makefile
+++ b/www/py-py-restclient/Makefile
@@ -13,9 +13,8 @@ COMMENT= Python REST Client
RUN_DEPENDS= ${PKGNAMEPREFIX}httplib2>=0:${PORTSDIR}/www/py-httplib2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-extract:
${RM} -r ${WRKSRC}/tests
diff --git a/www/py-pylons/Makefile b/www/py-pylons/Makefile
index bb40b2be91f2..3abdcbc48aa7 100644
--- a/www/py-pylons/Makefile
+++ b/www/py-pylons/Makefile
@@ -29,8 +29,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:${PORTSDIR}/www/py-paste \
${PYTHON_PKGNAMEPREFIX}Genshi>=0.4.4:${PORTSDIR}/textproc/py-genshi
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/www/py-pyquery/Makefile b/www/py-pyquery/Makefile
index 778dd807aaaf..1204bd2dc818 100644
--- a/www/py-pyquery/Makefile
+++ b/www/py-pyquery/Makefile
@@ -24,11 +24,8 @@ DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
OPTIONS_DEFINE= DOCS
-PYDISTUTILS_AUTOPLIST= yes
-
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-USES= zip
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.options.mk>
diff --git a/www/py-pyramid_rpc/Makefile b/www/py-pyramid_rpc/Makefile
index 5ad6cad5fc56..86157e92e3f2 100644
--- a/www/py-pyramid_rpc/Makefile
+++ b/www/py-pyramid_rpc/Makefile
@@ -13,8 +13,7 @@ COMMENT= RPC support for the Pyramid web framework
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyramid>=0:${PORTSDIR}/www/py-pyramid
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/www/py-pysearch/Makefile b/www/py-pysearch/Makefile
index d63c5f8dcc4c..d4082af01fca 100644
--- a/www/py-pysearch/Makefile
+++ b/www/py-pysearch/Makefile
@@ -11,8 +11,8 @@ DISTNAME= pYsearch-${PORTVERSION}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Yahoo Search Web Services SDK for Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= pYsearch
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/www/py-pywebdav/Makefile b/www/py-pywebdav/Makefile
index 0f267e974705..544c1411c432 100644
--- a/www/py-pywebdav/Makefile
+++ b/www/py-pywebdav/Makefile
@@ -13,8 +13,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wen@FreeBSD.org
COMMENT= WebDAV Library and Server for Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-rackspace-monitoring/Makefile b/www/py-rackspace-monitoring/Makefile
index d8f6841533be..52d8c5ad62ab 100644
--- a/www/py-rackspace-monitoring/Makefile
+++ b/www/py-rackspace-monitoring/Makefile
@@ -15,9 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14:${PORTSDIR}/net/py-libcloud
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
diff --git a/www/py-recaptcha/Makefile b/www/py-recaptcha/Makefile
index ce19401a1301..ff8f7e8088f2 100644
--- a/www/py-recaptcha/Makefile
+++ b/www/py-recaptcha/Makefile
@@ -13,8 +13,7 @@ DISTNAME= ${PORTNAME}-client-${PORTVERSION}
MAINTAINER= philip@FreeBSD.org
COMMENT= Plugin for reCAPTCHA and reCAPTCHA Mailhide
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-requestbuilder/Makefile b/www/py-requestbuilder/Makefile
index f77644ea558c..b705d3ee0e3d 100644
--- a/www/py-requestbuilder/Makefile
+++ b/www/py-requestbuilder/Makefile
@@ -15,8 +15,7 @@ LICENSE= ISCL
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.0:${PORTSDIR}/www/py-requests \
${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
-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/www/py-requests-oauth-hook/Makefile b/www/py-requests-oauth-hook/Makefile
index 4fbfb6e5ba76..79ec9413c2c6 100644
--- a/www/py-requests-oauth-hook/Makefile
+++ b/www/py-requests-oauth-hook/Makefile
@@ -16,9 +16,8 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests1>0:${PORTSDIR}/www/py-requests1 \
${PYTHON_PKGNAMEPREFIX}oauth2>0:${PORTSDIR}/net/py-oauth2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-extract:
${RM} -r ${WRKSRC}/tests
diff --git a/www/py-requests1/Makefile b/www/py-requests1/Makefile
index 88c3b1c995f8..c67a892f4afe 100644
--- a/www/py-requests1/Makefile
+++ b/www/py-requests1/Makefile
@@ -13,9 +13,8 @@ COMMENT= HTTP library written in Python for human beings (Version 1.x)
LICENSE= ISCL
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
CONFLICTS_INSTALL= py*-requests-*
diff --git a/www/py-restclient/Makefile b/www/py-restclient/Makefile
index 72ad0f29b98a..2b83331f4183 100644
--- a/www/py-restclient/Makefile
+++ b/www/py-restclient/Makefile
@@ -15,9 +15,8 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PKGNAMEPREFIX}httplib2>=0:${PORTSDIR}/www/py-httplib2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-patch:
${REINPLACE_CMD} -e 's,install_requires.*,,' ${WRKSRC}/setup.py
diff --git a/www/py-rhodecode/Makefile b/www/py-rhodecode/Makefile
index c21608dc2792..66bd37c42d9e 100644
--- a/www/py-rhodecode/Makefile
+++ b/www/py-rhodecode/Makefile
@@ -38,9 +38,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylons>=1.0:${PORTSDIR}/www/py-pylons \
${PYTHON_PKGNAMEPREFIX}celery>=0:${PORTSDIR}/devel/py-celery \
mercurial>=2.6:${PORTSDIR}/devel/mercurial
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
USE_RC_SUBR= rhodecode
SUB_FILES= pkg-message
diff --git a/www/py-routes/Makefile b/www/py-routes/Makefile
index 364e20d6b45a..f91913cc556d 100644
--- a/www/py-routes/Makefile
+++ b/www/py-routes/Makefile
@@ -13,9 +13,7 @@ COMMENT= Routing package for Python that matches URLs to dicts and vice versa
LICENSE= MIT
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-PYDISTUTILS_PKGNAME= Routes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-scgi/Makefile b/www/py-scgi/Makefile
index 062fce0ceb72..8e08f83a09fb 100644
--- a/www/py-scgi/Makefile
+++ b/www/py-scgi/Makefile
@@ -14,8 +14,7 @@ COMMENT= Python server implementation of the Simple Common Gateway Protocol
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/www/py-scrapy/Makefile b/www/py-scrapy/Makefile
index cbd6499c85a7..2ba73c186543 100644
--- a/www/py-scrapy/Makefile
+++ b/www/py-scrapy/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.0:${PORTSDIR}/devel/py-lxml \
${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:${PORTSDIR}/www/py-cssselect \
${PYTHON_PKGNAMEPREFIX}queuelib>=1.2.2:${PORTSDIR}/sysutils/py-queuelib
-USE_PYTHON= 2
USES= python:2 twisted:run,web
USE_PYTHON= distutils autoplist
diff --git a/www/py-scriptaculous/Makefile b/www/py-scriptaculous/Makefile
index dc6bcc7578fe..aa2b218186d8 100644
--- a/www/py-scriptaculous/Makefile
+++ b/www/py-scriptaculous/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
PYDISTUTILS_PKGNAME= Scriptaculous
# Use the same version of www/py-turbogears
-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/www/py-slimit/Makefile b/www/py-slimit/Makefile
index 25361b55f6ea..c6db278b0cfe 100644
--- a/www/py-slimit/Makefile
+++ b/www/py-slimit/Makefile
@@ -14,10 +14,8 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:${PORTSDIR}/devel/py-ply
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:${PORTSDIR}/devel/py-ply
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
# Maintainer: Reminder to keep testing python 3.x compatibility.
.include <bsd.port.pre.mk>
diff --git a/www/py-slimmer/Makefile b/www/py-slimmer/Makefile
index 640de0a56fa5..4bc0f5719f33 100644
--- a/www/py-slimmer/Makefile
+++ b/www/py-slimmer/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= corsmith@gmail.com
COMMENT= Whitespace optimizer for CSS, HTML and XHTML output
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-slumber/Makefile b/www/py-slumber/Makefile
index ea5144ba105e..440e106c0de9 100644
--- a/www/py-slumber/Makefile
+++ b/www/py-slumber/Makefile
@@ -27,9 +27,8 @@ GH_ACCOUNT= dstufft
GH_COMMIT= 85b17b9
GH_TAGNAME= v${DISTVERSION}
-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/www/py-splinter/Makefile b/www/py-splinter/Makefile
index 90f9f5ded0cb..a9801cc8a5e7 100644
--- a/www/py-splinter/Makefile
+++ b/www/py-splinter/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}selenium>=2.39:${PORTSDIR}/www/py-selenium \
${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
${PYTHON_PKGNAMEPREFIX}cssselect>0:${PORTSDIR}/www/py-cssselect
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-surl/Makefile b/www/py-surl/Makefile
index 4a50634fb83a..3bc819c68697 100644
--- a/www/py-surl/Makefile
+++ b/www/py-surl/Makefile
@@ -13,9 +13,8 @@ COMMENT= URL shortening command line application
LICENSE= GPLv3
-USES= tar:bzip2
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
+USES= python:2 tar:bzip2
+USE_PYTHON= distutils
post-patch:
@${REINPLACE_CMD} -e 's,share/man/man1,${PREFIX}/man/man1,g' \
diff --git a/www/py-textile/Makefile b/www/py-textile/Makefile
index dc522bc84d41..b072629244a3 100644
--- a/www/py-textile/Makefile
+++ b/www/py-textile/Makefile
@@ -15,8 +15,7 @@ LICENSE= BSD2CLAUSE
PROJECTHOST= pytextile
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-tgwebservices/Makefile b/www/py-tgwebservices/Makefile
index 99974bc70d55..96b2d1a62b31 100644
--- a/www/py-tgwebservices/Makefile
+++ b/www/py-tgwebservices/Makefile
@@ -16,9 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}TurboGears>=1.1.2:${PORTSDIR}/www/py-turbo
${PYTHON_PKGNAMEPREFIX}Genshi>=0.3.6:${PORTSDIR}/textproc/py-genshi
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_PKGNAME= TGWebServices
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-tmdb3/Makefile b/www/py-tmdb3/Makefile
index 9a3931386048..6a5b48baa795 100644
--- a/www/py-tmdb3/Makefile
+++ b/www/py-tmdb3/Makefile
@@ -10,9 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wg@FreeBSD.org
COMMENT= TheMovieDB.org APIv3 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/www/py-tornado/Makefile b/www/py-tornado/Makefile
index 2aa193eec9fb..34bd437ecb12 100644
--- a/www/py-tornado/Makefile
+++ b/www/py-tornado/Makefile
@@ -14,9 +14,8 @@ LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>0:${PORTSDIR}/security/py-certify
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
diff --git a/www/py-turbogears/Makefile b/www/py-turbogears/Makefile
index 7fe430813bf2..a125f0207664 100644
--- a/www/py-turbogears/Makefile
+++ b/www/py-turbogears/Makefile
@@ -24,10 +24,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.1.2:${PORTSDIR}/www/py-cherrypy
${PYTHON_PKGNAMEPREFIX}Genshi>=0.4.4:${PORTSDIR}/textproc/py-genshi \
${PYTHON_PKGNAMEPREFIX}TGScheduler>0:${PORTSDIR}/devel/py-TGScheduler
-USES= gettext
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= gettext python:2
+USE_PYTHON= distutils autoplist
OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
OPTIONS_DEFINE= ELIXIR NOSE SQLOBJECT SQLALCHEMY
diff --git a/www/py-turbogears2/Makefile b/www/py-turbogears2/Makefile
index 6325234ae475..a7dac9ee6237 100644
--- a/www/py-turbogears2/Makefile
+++ b/www/py-turbogears2/Makefile
@@ -30,8 +30,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0.9.4:${PORTSDIR}/devel/py-Tos
${PYTHON_PKGNAMEPREFIX}mako>=0:${PORTSDIR}/textproc/py-mako \
${PYTHON_PKGNAMEPREFIX}Babel>=0.9.4:${PORTSDIR}/devel/py-babel
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-tvdb_api/Makefile b/www/py-tvdb_api/Makefile
index 832738786c06..0788e06eaccb 100644
--- a/www/py-tvdb_api/Makefile
+++ b/www/py-tvdb_api/Makefile
@@ -10,8 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= API interface to TheTVDB.com
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-twistedWeb/Makefile b/www/py-twistedWeb/Makefile
index 819b604f831d..da2db2baae53 100644
--- a/www/py-twistedWeb/Makefile
+++ b/www/py-twistedWeb/Makefile
@@ -14,9 +14,7 @@ COMMENT= HTTP protocol implementation together with clients and servers
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/www/py-uliweb/Makefile b/www/py-uliweb/Makefile
index 61bca3ee6b48..7ad3b7035bca 100644
--- a/www/py-uliweb/Makefile
+++ b/www/py-uliweb/Makefile
@@ -13,9 +13,7 @@ COMMENT= Easy python web framework
LICENSE= BSD2CLAUSE
-USES= dos2unix
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= dos2unix python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-urlgrabber/Makefile b/www/py-urlgrabber/Makefile
index d1c67669c452..65e8f6f39915 100644
--- a/www/py-urlgrabber/Makefile
+++ b/www/py-urlgrabber/Makefile
@@ -16,8 +16,8 @@ LICENSE= LGPL21
BUILD_DEPENDS= ${PKGNAMEPREFIX}curl>=7.19.0_1:${PORTSDIR}/ftp/py-curl
RUN_DEPENDS= ${PKGNAMEPREFIX}curl>=7.19.0_1:${PORTSDIR}/ftp/py-curl
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
REINPLACE_ARGS= -i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},'
DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
diff --git a/www/py-utidy/Makefile b/www/py-utidy/Makefile
index 04f8c0bb36b5..87bbb276ee7c 100644
--- a/www/py-utidy/Makefile
+++ b/www/py-utidy/Makefile
@@ -16,10 +16,8 @@ COMMENT= Python interface to tidy-lib
# XXX Better depend on tidy or tidy-devel???
LIB_DEPENDS= libtidy.so:${PORTSDIR}/www/tidy-lib
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
post-patch:
@${REINPLACE_CMD} \
diff --git a/www/py-webhelpers/Makefile b/www/py-webhelpers/Makefile
index 7fa3ed10f259..708a58b38c0f 100644
--- a/www/py-webhelpers/Makefile
+++ b/www/py-webhelpers/Makefile
@@ -16,8 +16,7 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}routes>=1.1:${PORTSDIR}/www/py-routes \
${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.11:${PORTSDIR}/textproc/py-MarkupSafe
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-webkitgtk/Makefile b/www/py-webkitgtk/Makefile
index 08a0804009fc..d616db14dec2 100644
--- a/www/py-webkitgtk/Makefile
+++ b/www/py-webkitgtk/Makefile
@@ -19,8 +19,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
GNU_CONFIGURE= yes
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool pathfix pkgconfig python tar:bzip2
USE_GNOME= glib20 libxslt pygtk2
-USE_PYTHON= yes
.include <bsd.port.mk>
diff --git a/www/py-webob/Makefile b/www/py-webob/Makefile
index 4d23d90b5338..919a8e45fade 100644
--- a/www/py-webob/Makefile
+++ b/www/py-webob/Makefile
@@ -19,15 +19,12 @@ OPTIONS_DEFINE= DOCS TESTS
PORTDOCS= *
-PYDISTUTILS_AUTOPLIST= yes
-PYDISTUTILS_PKGVERSION= ${DISTVERSION}
+USES= python
+USE_PYTHON= distutils autoplist
TESTS_BUILD_DEPENDS= nosetests:${PORTSDIR}/devel/py-nose
TESTS_DESC= Run tests with Nose
-USE_PYDISTUTILS= yes
-USE_PYTHON= yes
-
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
diff --git a/www/py-webunit/Makefile b/www/py-webunit/Makefile
index 2ed46646e96d..73e71c643da3 100644
--- a/www/py-webunit/Makefile
+++ b/www/py-webunit/Makefile
@@ -11,9 +11,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lwhsu@FreeBSD.org
COMMENT= Unit test your websites with code that acts like a web browser
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/www/py-webware-component/Makefile b/www/py-webware-component/Makefile
index c4d5a6ee1439..8833c8c92d11 100644
--- a/www/py-webware-component/Makefile
+++ b/www/py-webware-component/Makefile
@@ -13,7 +13,7 @@ COMMENT= Webware servlet component extension
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webware>0:${PORTSDIR}/www/py-webware
-USE_PYTHON= 2
+USES= python:2
do-build:
@${ECHO_MSG} -n ">> Compiling ..."
diff --git a/www/py-webware/Makefile b/www/py-webware/Makefile
index c2cc092544d6..72602e96e07e 100644
--- a/www/py-webware/Makefile
+++ b/www/py-webware/Makefile
@@ -13,7 +13,7 @@ COMMENT= Versatile web application server written in Python
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mx-base>0:${PORTSDIR}/lang/py-mx-base
-USE_PYTHON= 2
+USES= python:2
NO_BUILD= yes
WEBWARE_USER?= webkit
diff --git a/www/py-werkzeug/Makefile b/www/py-werkzeug/Makefile
index 034c4367661d..7e6c0d162441 100644
--- a/www/py-werkzeug/Makefile
+++ b/www/py-werkzeug/Makefile
@@ -15,9 +15,8 @@ LICENSE= BSD3CLAUSE
OPTIONS_DEFINE= EXAMPLES
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
EXAMPLESDIR= ${PREFIX}/share/examples/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
PORTEXAMPLES= *
diff --git a/www/py-wikitools/Makefile b/www/py-wikitools/Makefile
index e9b6b2bcf607..1851e251f138 100644
--- a/www/py-wikitools/Makefile
+++ b/www/py-wikitools/Makefile
@@ -13,9 +13,8 @@ COMMENT= Python package for interacting with a MediaWiki wiki
PROJECTHOST= python-${PORTNAME}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
diff --git a/www/py-wsgiauth/Makefile b/www/py-wsgiauth/Makefile
index 4623fd064f35..1f0f24761612 100644
--- a/www/py-wsgiauth/Makefile
+++ b/www/py-wsgiauth/Makefile
@@ -12,8 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= bamby@sippysoft.com
COMMENT= WSGI authentication middleware
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/py-zope.app.wsgi/Makefile b/www/py-zope.app.wsgi/Makefile
index cd118db551c0..ef15dc08c6c9 100644
--- a/www/py-zope.app.wsgi/Makefile
+++ b/www/py-zope.app.wsgi/Makefile
@@ -34,8 +34,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}WebTest>=0:${PORTSDIR}/www/py-WebTest \
${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
${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/www/pyblosxom/Makefile b/www/pyblosxom/Makefile
index fbffb0a5cc9f..499108d8ad3a 100644
--- a/www/pyblosxom/Makefile
+++ b/www/pyblosxom/Makefile
@@ -11,8 +11,8 @@ COMMENT= Lightweight weblog system
LICENSE= MIT
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
+USES= python:2
+USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS
diff --git a/www/pyjamas/Makefile b/www/pyjamas/Makefile
index b50c74c6f647..65459f079363 100644
--- a/www/pyjamas/Makefile
+++ b/www/pyjamas/Makefile
@@ -11,11 +11,9 @@ DISTNAME= Pyjamas-${PORTVERSION}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Port of Google Web Toolkit to Python
-USE_PYTHON= yes
# install/require some libraries in sys.prefix
-USE_PYTHON_PREFIX= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist pythonprefix
REINPLACE_ARGS= -i '' -e 's,../../bin,${PREFIX}/bin,'
diff --git a/www/pylot/Makefile b/www/pylot/Makefile
index 220912e0becb..aea5cb3181f4 100644
--- a/www/pylot/Makefile
+++ b/www/pylot/Makefile
@@ -25,8 +25,7 @@ NO_BUILD= yes
SUB_FILES= ${PORTNAME}
SUB_LIST= PYTHON_CMD=${PYTHON_CMD}
-USES= zip
-USE_PYTHON= yes
+USES= python zip
do-install:
@${MKDIR} ${STAGEDIR}${DATADIR} && cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
diff --git a/www/radicale/Makefile b/www/radicale/Makefile
index ca32802df755..b28bf37c119e 100644
--- a/www/radicale/Makefile
+++ b/www/radicale/Makefile
@@ -14,8 +14,7 @@ COMMENT= Python based CalDAV/CardDAV server
LICENSE= GPLv3
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= Radicale
USERS= radicale
@@ -28,14 +27,18 @@ HTTP_DESC= HTTP authentication support
.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MLDAP}
+USES+= python:2
+.else
+USES+= python
+.endif
+
.if ${PORT_OPTIONS:MHTTP}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}requests1>=0:${PORTSDIR}/www/py-requests1
-USE_PYTHON= 2
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}requests1>=0:${PORTSDIR}/www/py-requests1
.endif
.if ${PORT_OPTIONS:MLDAP}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ldap2>=0:${PORTSDIR}/net/py-ldap2
-USE_PYTHON= 2
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ldap2>=0:${PORTSDIR}/net/py-ldap2
.endif
post-patch:
diff --git a/www/reviewboard/Makefile b/www/reviewboard/Makefile
index 2ca2d7ffbc14..f2660f71e018 100644
--- a/www/reviewboard/Makefile
+++ b/www/reviewboard/Makefile
@@ -36,8 +36,8 @@ BUILD_DEPENDS= python:${PORTSDIR}/lang/python \
${PYTHON_PKGNAMEPREFIX}jsmin>0:${PORTSDIR}/devel/py-jsmin \
uglifyjs:${PORTSDIR}/www/uglifyjs
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
+USES= python:2
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= ReviewBoard
# avoid leftover /root/.subversion
MAKE_ENV+= HOME=${WRKDIR}
diff --git a/www/roundup/Makefile b/www/roundup/Makefile
index d1795c2cf287..eb6f70e837ae 100644
--- a/www/roundup/Makefile
+++ b/www/roundup/Makefile
@@ -11,9 +11,8 @@ COMMENT= Issue-Tracking System for Knowledge Workers
LICENSE= PSFL
-USES= gettext
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= gettext python
+USE_PYTHON= distutils
OPTIONS_DEFINE= SQLITE PGSQL MYSQL NLS
OPTIONS_DEFAULT=SQLITE NLS
diff --git a/www/session2/Makefile b/www/session2/Makefile
index 92d670ed66a8..17bfbf24d306 100644
--- a/www/session2/Makefile
+++ b/www/session2/Makefile
@@ -12,8 +12,8 @@ DISTNAME= session2-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Quixote session manager with persistence support
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
+USES= python:2
+USE_PYTHON= distutils
PYDISTUTILS_PKGVERSION= 0.6
OPTIONS_DEFINE= MYSQL PGSQL DOCS
diff --git a/www/trac-OhlohWidgetsMacro/Makefile b/www/trac-OhlohWidgetsMacro/Makefile
index 6b30acce13ab..978a9423c329 100644
--- a/www/trac-OhlohWidgetsMacro/Makefile
+++ b/www/trac-OhlohWidgetsMacro/Makefile
@@ -16,8 +16,7 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycerberus>=0.3:${PORTSDIR}/devel/py-pycerberus \
tracd:${PORTSDIR}/www/trac
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/trac-TracGoogleAnalytics/Makefile b/www/trac-TracGoogleAnalytics/Makefile
index ba769edd78e6..fbfb62e36984 100644
--- a/www/trac-TracGoogleAnalytics/Makefile
+++ b/www/trac-TracGoogleAnalytics/Makefile
@@ -17,9 +17,8 @@ BUILD_DEPENDS= tracd:${PORTSDIR}/www/trac \
${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:${PORTSDIR}/textproc/py-genshi
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include "${.CURDIR}/../../www/trac/plugin.mk"
.include <bsd.port.mk>
diff --git a/www/trac-accountmanager/Makefile b/www/trac-accountmanager/Makefile
index e80c1a285392..c3841c02a57d 100644
--- a/www/trac-accountmanager/Makefile
+++ b/www/trac-accountmanager/Makefile
@@ -18,10 +18,8 @@ RUN_DEPENDS= tracd:${PORTSDIR}/www/trac
FETCH_BEFORE_ARGS= -o ${DISTFILES}
REV= 12583
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/accountmanagerplugin/trunk
# --- trac.ini
diff --git a/www/trac-advancedticketworkflow/Makefile b/www/trac-advancedticketworkflow/Makefile
index cd07d6e79113..9f80245d0541 100644
--- a/www/trac-advancedticketworkflow/Makefile
+++ b/www/trac-advancedticketworkflow/Makefile
@@ -15,9 +15,8 @@ COMMENT= Advanced Ticket Workflow Plugin for Trac
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include "${.CURDIR}/../../www/trac/plugin.mk"
.include <bsd.port.mk>
diff --git a/www/trac-attachmentpolicy/Makefile b/www/trac-attachmentpolicy/Makefile
index 13aeb29ff4c8..8d383958a394 100644
--- a/www/trac-attachmentpolicy/Makefile
+++ b/www/trac-attachmentpolicy/Makefile
@@ -20,10 +20,8 @@ SVN_REV= 12775
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.12
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
FETCH_BEFORE_ARGS= -o ${DISTFILES}
diff --git a/www/trac-autocomplete/Makefile b/www/trac-autocomplete/Makefile
index 527ab28496e5..d793d2d4db48 100644
--- a/www/trac-autocomplete/Makefile
+++ b/www/trac-autocomplete/Makefile
@@ -14,10 +14,8 @@ COMMENT= Plugin for autocompletion of user names in ticket fields
RUN_DEPENDS+= trac>=0.11:${PORTSDIR}/www/trac
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/autocompleteusersplugin/0.11
REL= 8451
diff --git a/www/trac-batchmodify/Makefile b/www/trac-batchmodify/Makefile
index adb77ef5d592..d1e9df7e03f8 100644
--- a/www/trac-batchmodify/Makefile
+++ b/www/trac-batchmodify/Makefile
@@ -15,11 +15,9 @@ COMMENT= Enables users to modify several tickets together at once
RUN_DEPENDS+= trac>=0.12:${PORTSDIR}/www/trac
-USES= zip
+USES= python:2 zip
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.12/trunk
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/trac-bzr/Makefile b/www/trac-bzr/Makefile
index fba94d65f568..cb4d3f5d07e8 100644
--- a/www/trac-bzr/Makefile
+++ b/www/trac-bzr/Makefile
@@ -17,10 +17,8 @@ LICENSE= GPLv2
RUN_DEPENDS= tracd:${PORTSDIR}/www/trac \
bzr:${PORTSDIR}/devel/bzr
-USES= tar:bzip2
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 tar:bzip2
+USE_PYTHON= distutils autoplist
post-patch:
${REINPLACE_CMD} -e 's|tag_date = 1||' ${WRKSRC}/setup.cfg
diff --git a/www/trac-ccselector/Makefile b/www/trac-ccselector/Makefile
index 99dcd8f19eaf..b8d99b1587fb 100644
--- a/www/trac-ccselector/Makefile
+++ b/www/trac-ccselector/Makefile
@@ -17,8 +17,7 @@ COMMENT= Visually edit the Trac ticket CC field
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/trac-childtickets/Makefile b/www/trac-childtickets/Makefile
index 0917f2cde1a0..adfb045c259a 100644
--- a/www/trac-childtickets/Makefile
+++ b/www/trac-childtickets/Makefile
@@ -15,13 +15,11 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS+= trac>=0.12:${PORTSDIR}/www/trac
-USES= zip
+USES= python:2 zip
WRKSRC= ${WRKDIR}/childticketsplugin/0.12
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USE_PYTHON= distutils autoplist
SUB_FILES= pkg-message
diff --git a/www/trac-customfieldadmin/Makefile b/www/trac-customfieldadmin/Makefile
index a61c02961194..ab5aaa189c94 100644
--- a/www/trac-customfieldadmin/Makefile
+++ b/www/trac-customfieldadmin/Makefile
@@ -16,11 +16,9 @@ COMMENT= Web interface to administer Trac ticket custom fields
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
-USES= zip
+USES= python:2 zip
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/trac-datefield/Makefile b/www/trac-datefield/Makefile
index 2320ffdcf0c3..8c2a439b2615 100644
--- a/www/trac-datefield/Makefile
+++ b/www/trac-datefield/Makefile
@@ -14,10 +14,8 @@ COMMENT= Plugin for creating date fields
RUN_DEPENDS+= trac>=0.11:${PORTSDIR}/www/trac
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/datefieldplugin/0.11
REL= 7267
diff --git a/www/trac-defaultcc/Makefile b/www/trac-defaultcc/Makefile
index efd62a46c12a..f20ad76778e1 100644
--- a/www/trac-defaultcc/Makefile
+++ b/www/trac-defaultcc/Makefile
@@ -14,11 +14,9 @@ COMMENT= Plugin that adds default CC value for tickets
RUN_DEPENDS+= trac>=0.11:${PORTSDIR}/www/trac
-USES= zip
+USES= python:2 zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/trunk
REL= 10605
diff --git a/www/trac-discussion/Makefile b/www/trac-discussion/Makefile
index 86f6ec2c5fc5..588f7c1b65ea 100644
--- a/www/trac-discussion/Makefile
+++ b/www/trac-discussion/Makefile
@@ -14,9 +14,8 @@ COMMENT= Discussion forum plugin for Trac
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac \
trac-TracSpamFilter>=0.2.1:${PORTSDIR}/www/trac-spam-filter
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
# Maintainter targets below this point
diff --git a/www/trac-down/Makefile b/www/trac-down/Makefile
index b20eedb48202..44a9ec113048 100644
--- a/www/trac-down/Makefile
+++ b/www/trac-down/Makefile
@@ -14,9 +14,8 @@ COMMENT= Trac plugin for listing released downloads
RUN_DEPENDS= tracd:${PORTSDIR}/www/trac
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include "${.CURDIR}/../../www/trac/plugin.mk"
.include <bsd.port.mk>
diff --git a/www/trac-downloads/Makefile b/www/trac-downloads/Makefile
index 6dfa79d7ff6c..68971deff761 100644
--- a/www/trac-downloads/Makefile
+++ b/www/trac-downloads/Makefile
@@ -19,9 +19,8 @@ TRAC_VERSION= 0.12
PLUGIN_VERSION= 0.3
SVN_REV= 10047
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.if defined(BOOTSTRAP)
do-fetch:
diff --git a/www/trac-email2trac/Makefile b/www/trac-email2trac/Makefile
index a17fe73a25dd..9144420be582 100644
--- a/www/trac-email2trac/Makefile
+++ b/www/trac-email2trac/Makefile
@@ -23,7 +23,7 @@ TRACUSER?= ${WWWOWN}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-trac-user=${TRACUSER} --with-mta-user=${MTAUSER}
-USE_PYTHON= 2
+USES= python:2
PORTDOCS= AUTHORS ChangeLog INSTALL README
diff --git a/www/trac-estimator/Makefile b/www/trac-estimator/Makefile
index b26f9ae41cfb..36a0bf075cca 100644
--- a/www/trac-estimator/Makefile
+++ b/www/trac-estimator/Makefile
@@ -15,8 +15,7 @@ COMMENT= Produce detailed range-based estimations for Trac tickets
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/trac-fivestarvote/Makefile b/www/trac-fivestarvote/Makefile
index 740984dfd846..7982019b1505 100644
--- a/www/trac-fivestarvote/Makefile
+++ b/www/trac-fivestarvote/Makefile
@@ -13,9 +13,8 @@ COMMENT= Five star plugin for voting on Trac resources
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
# Maintainter targets below this point
diff --git a/www/trac-fullblog/Makefile b/www/trac-fullblog/Makefile
index 2c23ebc2eda4..40ffb3f2af8e 100644
--- a/www/trac-fullblog/Makefile
+++ b/www/trac-fullblog/Makefile
@@ -16,9 +16,8 @@ COMMENT= Plugin that provides a project Blog
RUN_DEPENDS+= htmldoc:${PORTSDIR}/textproc/htmldoc \
tracd:${PORTSDIR}/www/trac
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.if defined(BOOTSTRAP)
do-fetch:
diff --git a/www/trac-fullblognotification/Makefile b/www/trac-fullblognotification/Makefile
index a28290b1c67a..bbf899ef2982 100644
--- a/www/trac-fullblognotification/Makefile
+++ b/www/trac-fullblognotification/Makefile
@@ -15,9 +15,8 @@ COMMENT= Plugin that provides a project Blog
RUN_DEPENDS+= trac-fullblog>=0.1.1:${PORTSDIR}/www/trac-fullblog
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.if defined(BOOTSTRAP)
do-fetch:
diff --git a/www/trac-gantt/Makefile b/www/trac-gantt/Makefile
index c1e73a9d0403..9375c49627bf 100644
--- a/www/trac-gantt/Makefile
+++ b/www/trac-gantt/Makefile
@@ -14,9 +14,8 @@ COMMENT= Plugin to creates Gantt charts for trac
RUN_DEPENDS+= trac>=0.11:${PORTSDIR}/www/trac
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS
diff --git a/www/trac-graphviz/Makefile b/www/trac-graphviz/Makefile
index a341d4829dbc..7cc97139fafb 100644
--- a/www/trac-graphviz/Makefile
+++ b/www/trac-graphviz/Makefile
@@ -18,8 +18,8 @@ RUN_DEPENDS+= urwfonts>0:${PORTSDIR}/x11-fonts/urwfonts \
dot:${PORTSDIR}/graphics/graphviz \
tracd:${PORTSDIR}/www/trac
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
+USES= python:2
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= graphviz
WRKSRC= ${WRKDIR}/${PORTNAME}plugin
diff --git a/www/trac-iniadmin/Makefile b/www/trac-iniadmin/Makefile
index bb21a408e21e..280b56267ea5 100644
--- a/www/trac-iniadmin/Makefile
+++ b/www/trac-iniadmin/Makefile
@@ -15,9 +15,8 @@ COMMENT= Edit all trac.ini option via the WebAdminPlugin
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include "${.CURDIR}/../../www/trac/plugin.mk"
.include <bsd.port.mk>
diff --git a/www/trac-keywords/Makefile b/www/trac-keywords/Makefile
index c266888dc0a0..2dc4f9d21c56 100644
--- a/www/trac-keywords/Makefile
+++ b/www/trac-keywords/Makefile
@@ -14,12 +14,10 @@ COMMENT= Plugin for using pre-configured keywords
RUN_DEPENDS+= trac>=0.11:${PORTSDIR}/www/trac
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-WRKSRC= ${WRKDIR}/trackeywordsplugin/0.11
-REL= 7273
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
+WRKSRC= ${WRKDIR}/trackeywordsplugin/0.11
+REL= 7273
post-extract:
# Fix misplaced Genshi template: https://trac-hacks.org/ticket/6104
diff --git a/www/trac-keywordsecretticket/Makefile b/www/trac-keywordsecretticket/Makefile
index 70050e20cbd5..3978e38bc156 100644
--- a/www/trac-keywordsecretticket/Makefile
+++ b/www/trac-keywordsecretticket/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
WRKSRC= ${WRKDIR}/KKBOX-trac-keyword-secret-ticket-plugin-${GITVERSION}
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/trac-mastertickets/Makefile b/www/trac-mastertickets/Makefile
index 600eee355ea9..6d413bb93875 100644
--- a/www/trac-mastertickets/Makefile
+++ b/www/trac-mastertickets/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS+= trac>=0.12:${PORTSDIR}/www/trac
WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/trac-math/Makefile b/www/trac-math/Makefile
index fab5b7d01138..60427367c7bc 100644
--- a/www/trac-math/Makefile
+++ b/www/trac-math/Makefile
@@ -17,9 +17,8 @@ USE_TEX= latex
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
post-install:
${CAT} ${PKGMESSAGE}
diff --git a/www/trac-mercurial/Makefile b/www/trac-mercurial/Makefile
index 8ebc71c3d2c5..8051ed4c93a7 100644
--- a/www/trac-mercurial/Makefile
+++ b/www/trac-mercurial/Makefile
@@ -16,8 +16,7 @@ LICENSE= GPLv2
RUN_DEPENDS= hg:${PORTSDIR}/devel/mercurial \
tracd:${PORTSDIR}/www/trac
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/trac-navadd/Makefile b/www/trac-navadd/Makefile
index dada12bb7f71..b5852dff490f 100644
--- a/www/trac-navadd/Makefile
+++ b/www/trac-navadd/Makefile
@@ -14,10 +14,9 @@ COMMENT= Plugin for adding navigation items into Trac navigation bars
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}plugin
+USES= python:2
+USE_PYTHON= distutils autoplist
+WRKSRC= ${WRKDIR}/${PORTNAME}plugin
.include "${.CURDIR}/../../www/trac/plugin.mk"
.include <bsd.port.mk>
diff --git a/www/trac-permredirect/Makefile b/www/trac-permredirect/Makefile
index 6c0efb021dfb..ead478419958 100644
--- a/www/trac-permredirect/Makefile
+++ b/www/trac-permredirect/Makefile
@@ -17,10 +17,8 @@ RUN_DEPENDS= tracd:${PORTSDIR}/www/trac
FETCH_BEFORE_ARGS= -o ${DISTFILES}
REV= 13353
-USES= zip:infozip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip:infozip
+USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/tags/${PORTVERSION}
.include "${.CURDIR}/../../www/trac/plugin.mk"
diff --git a/www/trac-privatetickets/Makefile b/www/trac-privatetickets/Makefile
index 5a4e16050d1b..ea74a94467df 100644
--- a/www/trac-privatetickets/Makefile
+++ b/www/trac-privatetickets/Makefile
@@ -14,9 +14,8 @@ COMMENT= Modified ticket security for Trac
RUN_DEPENDS= tracd:${PORTSDIR}/www/trac
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include "${.CURDIR}/../../www/trac/plugin.mk"
.include <bsd.port.mk>
diff --git a/www/trac-pydotorgtheme/Makefile b/www/trac-pydotorgtheme/Makefile
index 012e13366eb2..37b6737a9da2 100644
--- a/www/trac-pydotorgtheme/Makefile
+++ b/www/trac-pydotorgtheme/Makefile
@@ -14,10 +14,9 @@ COMMENT= Theme that emulates the look of python.org
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac \
trac-themeengine>=2.0:${PORTSDIR}/www/trac-themeengine
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}
+USES= python:2
+USE_PYTHON= distutils autoplist
+WRKSRC= ${WRKDIR}/${PORTNAME}
.include "${.CURDIR}/../../www/trac/plugin.mk"
.include <bsd.port.mk>
diff --git a/www/trac-robotstxt/Makefile b/www/trac-robotstxt/Makefile
index cd396cf67e75..e0cd4f0e6c08 100644
--- a/www/trac-robotstxt/Makefile
+++ b/www/trac-robotstxt/Makefile
@@ -14,9 +14,8 @@ COMMENT= Allows simple management of a robots.txt
RUN_DEPENDS= tracd:${PORTSDIR}/www/trac
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include "${.CURDIR}/../../www/trac/plugin.mk"
.include <bsd.port.mk>
diff --git a/www/trac-scrumburndown/Makefile b/www/trac-scrumburndown/Makefile
index adb34363b8f6..cc2a7bd66df1 100644
--- a/www/trac-scrumburndown/Makefile
+++ b/www/trac-scrumburndown/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac \
trac-timingandestimation>=0:${PORTSDIR}/www/trac-timingandestimation
WRKSRC= ${WRKDIR}/${PORTNAME}plugin
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/trac-spam-filter/Makefile b/www/trac-spam-filter/Makefile
index 9ddcaf432bf5..4eb66c1a22d9 100644
--- a/www/trac-spam-filter/Makefile
+++ b/www/trac-spam-filter/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS= tracd:${PORTSDIR}/www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}dev
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include "${.CURDIR}/../../www/trac/plugin.mk"
.include <bsd.port.mk>
diff --git a/www/trac-subtickets/Makefile b/www/trac-subtickets/Makefile
index 0d94c0dd13f7..8550c97d2a76 100644
--- a/www/trac-subtickets/Makefile
+++ b/www/trac-subtickets/Makefile
@@ -21,9 +21,8 @@ GITVERSION= a0fc153
GITDATE= 20130328
WRKSRC= ${WRKDIR}/itota-trac-${PORTNAME}-plugin-${GITVERSION}
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include "${.CURDIR}/../../www/trac/plugin.mk"
.include <bsd.port.mk>
diff --git a/www/trac-tags/Makefile b/www/trac-tags/Makefile
index ddeeac5aabac..b2717643a8df 100644
--- a/www/trac-tags/Makefile
+++ b/www/trac-tags/Makefile
@@ -15,10 +15,8 @@ COMMENT= Generic tags frontend for trac
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
-USES= tar:bzip2
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 tar:bzip2
+USE_PYTHON= distutils autoplist
.include "${.CURDIR}/../../www/trac/plugin.mk"
.include <bsd.port.pre.mk>
diff --git a/www/trac-themeengine/Makefile b/www/trac-themeengine/Makefile
index 52321d77af5e..42b37182d248 100644
--- a/www/trac-themeengine/Makefile
+++ b/www/trac-themeengine/Makefile
@@ -15,10 +15,8 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
-USES= tar:bzip2
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 tar:bzip2
+USE_PYTHON= distutils autoplist
.include "${.CURDIR}/../../www/trac/plugin.mk"
.include <bsd.port.mk>
diff --git a/www/trac-ticketimport/Makefile b/www/trac-ticketimport/Makefile
index 1bc8a536abe1..0b2cfd133971 100644
--- a/www/trac-ticketimport/Makefile
+++ b/www/trac-ticketimport/Makefile
@@ -14,9 +14,8 @@ COMMENT= Import or update tickets from a CSV file or Excel file
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac \
${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.1:${PORTSDIR}/textproc/py-xlrd
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
# Maintainter targets below this point
diff --git a/www/trac-tickettemplate/Makefile b/www/trac-tickettemplate/Makefile
index 6d66ceebdaa8..60385716fbee 100644
--- a/www/trac-tickettemplate/Makefile
+++ b/www/trac-tickettemplate/Makefile
@@ -14,10 +14,8 @@ COMMENT= Plugin for making ticket templates
RUN_DEPENDS+= trac>=0.11:${PORTSDIR}/www/trac
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/trac${PORTNAME}plugin/0.11
REL= 10605
diff --git a/www/trac-timingandestimation/Makefile b/www/trac-timingandestimation/Makefile
index b366644abb14..8136deb242a6 100644
--- a/www/trac-timingandestimation/Makefile
+++ b/www/trac-timingandestimation/Makefile
@@ -17,8 +17,7 @@ COMMENT= Add estimation and time tracking functionality to Trac
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/branches/trac0.12-Permissions
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/trac-tocmacro/Makefile b/www/trac-tocmacro/Makefile
index e0d4d1f64a5f..46b4675b6f22 100644
--- a/www/trac-tocmacro/Makefile
+++ b/www/trac-tocmacro/Makefile
@@ -14,8 +14,7 @@ COMMENT= Table of contents macro
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/trac-tracdragdrop/Makefile b/www/trac-tracdragdrop/Makefile
index 7977732956c6..561c0b1abfb9 100644
--- a/www/trac-tracdragdrop/Makefile
+++ b/www/trac-tracdragdrop/Makefile
@@ -20,10 +20,8 @@ SVN_REV= 12822
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.12
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
FETCH_BEFORE_ARGS= -o ${DISTFILES}
diff --git a/www/trac-tweakui/Makefile b/www/trac-tweakui/Makefile
index 1eae3937ac22..953145d40a33 100644
--- a/www/trac-tweakui/Makefile
+++ b/www/trac-tweakui/Makefile
@@ -15,7 +15,7 @@ COMMENT= Easily tweak Trac pages with JavaScript expressions
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
-USES= dos2unix zip
+USES= dos2unix python zip
DOS2UNIX_REGEX= .*\.(css|html|js|py|txt)$
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
@@ -24,9 +24,7 @@ PORTEXAMPLES= *
SUB_FILES= pkg-message
WRKSRC= ${WRKDIR}/trac${PORTNAME}plugin/0.11
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USE_PYTHON= distutils autoplist
post-install:
cd ${WRKSRC}/tractweakui/htdocs && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
diff --git a/www/trac-vote/Makefile b/www/trac-vote/Makefile
index 4f037eefc9d3..adee47a7c49c 100644
--- a/www/trac-vote/Makefile
+++ b/www/trac-vote/Makefile
@@ -13,9 +13,8 @@ COMMENT= Plugin for voting on Trac resources
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
# Maintainter targets below this point
diff --git a/www/trac-watchlist/Makefile b/www/trac-watchlist/Makefile
index da3cf9d4ab60..6d18f155cae3 100644
--- a/www/trac-watchlist/Makefile
+++ b/www/trac-watchlist/Makefile
@@ -20,10 +20,8 @@ SVN_REV= 11526
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.12
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
FETCH_BEFORE_ARGS= -o ${DISTFILES}
diff --git a/www/trac-wikigoodies/Makefile b/www/trac-wikigoodies/Makefile
index 2979d76424a1..70d9f1556734 100644
--- a/www/trac-wikigoodies/Makefile
+++ b/www/trac-wikigoodies/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS= tracd:${PORTSDIR}/www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include "${.CURDIR}/../../www/trac/plugin.mk"
.include <bsd.port.mk>
diff --git a/www/trac-wikinotification/Makefile b/www/trac-wikinotification/Makefile
index 8c883e360550..6565ce9a7bb0 100644
--- a/www/trac-wikinotification/Makefile
+++ b/www/trac-wikinotification/Makefile
@@ -16,8 +16,7 @@ COMMENT= Allow email notifications on wiki page changes
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/trac-wikitemplates/Makefile b/www/trac-wikitemplates/Makefile
index c3fe9b4ba200..688884fa0bcf 100644
--- a/www/trac-wikitemplates/Makefile
+++ b/www/trac-wikitemplates/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
# ${PYTHON_SITELIBDIR}/TracCtxtnavAdd-2.0-py${PYTHON_VER}.egg:${PORTSDIR}/www/trac-ctxtnavadd
WRKSRC= ${WRKDIR}/${PORTNAME}plugin
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/trac-wikitopdf/Makefile b/www/trac-wikitopdf/Makefile
index 97decc3b9f8b..c10c54c71b46 100644
--- a/www/trac-wikitopdf/Makefile
+++ b/www/trac-wikitopdf/Makefile
@@ -15,10 +15,9 @@ COMMENT= Plugin to generate PDF documents from the Wiki
RUN_DEPENDS+= htmldoc:${PORTSDIR}/textproc/htmldoc \
tracd:${PORTSDIR}/www/trac
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}plugin
+USES= python:2
+USE_PYTHON= distutils autoplist
+WRKSRC= ${WRKDIR}/${PORTNAME}plugin
.include "${.CURDIR}/../../www/trac/plugin.mk"
.include <bsd.port.mk>
diff --git a/www/trac-wysiwyg/Makefile b/www/trac-wysiwyg/Makefile
index 4c0625fbfec6..ff732e37e9a2 100644
--- a/www/trac-wysiwyg/Makefile
+++ b/www/trac-wysiwyg/Makefile
@@ -15,10 +15,8 @@ COMMENT= WYSIWYG editor for Trac wiki
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
-USES= tar:bzip2
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 tar:bzip2
+USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
diff --git a/www/trac-xmlrpc/Makefile b/www/trac-xmlrpc/Makefile
index c83c63e1a6e6..5a96e6f3a17c 100644
--- a/www/trac-xmlrpc/Makefile
+++ b/www/trac-xmlrpc/Makefile
@@ -21,9 +21,7 @@ RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
WRKSRC= ${WRKDIR}/${PORTNAME}plugin/trunk
FETCH_BEFORE_ARGS= -o ${DISTFILES}
-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/www/trac/Makefile b/www/trac/Makefile
index 9ec724e4e136..000d15e35ed0 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -41,15 +41,13 @@ PORTEXAMPLES= *
PORTDATA= *
MAKE_ENV= HOME=/dev/null
-USES= shebangfix
+USES= python:2 shebangfix
SHEBANG_FILES= contrib/cgi-bin/trac.fcgi contrib/cgi-bin/trac.cgi \
trac/tests/functional/better_twill.py trac/tests/functional/tester.py \
trac/tests/functional/testenv.py trac/tests/functional/compat.py \
trac/tests/functional/__init__.py contrib/emailfilter.py \
contrib/checkwiki.py contrib/htpasswd.py
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USE_PYTHON= distutils autoplist
USE_RC_SUBR= tracd
SUB_LIST+= PYTHON_CMD=${PYTHON_CMD}
diff --git a/www/trytond28_google_maps/Makefile b/www/trytond28_google_maps/Makefile
index 9fba5a4dafda..2c9db3db2342 100644
--- a/www/trytond28_google_maps/Makefile
+++ b/www/trytond28_google_maps/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= trytond28_party>=2.8.0:${PORTSDIR}/finance/trytond28_party
CONFLICTS= trytond_google_maps-2.[46].*
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/trytond_google_maps/Makefile b/www/trytond_google_maps/Makefile
index 294c7eabae56..37343635769c 100644
--- a/www/trytond_google_maps/Makefile
+++ b/www/trytond_google_maps/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= trytond>=2.4.0:${PORTSDIR}/finance/trytond \
CONFLICTS= trytond28_google_maps-2.8.*
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/www/twill/Makefile b/www/twill/Makefile
index effa6e5804d2..49f53fa7d941 100644
--- a/www/twill/Makefile
+++ b/www/twill/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES= http://darcs.idyll.org/~t/projects/
MAINTAINER= jun-g@daemonfreaks.com
COMMENT= Simple scripting language for Web browsing
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/www/uwsgitop/Makefile b/www/uwsgitop/Makefile
index 400c8f61d3a6..96ceee83961e 100644
--- a/www/uwsgitop/Makefile
+++ b/www/uwsgitop/Makefile
@@ -10,8 +10,8 @@ MASTER_SITE_SUBDIR=source/u/${PORTNAME}
MAINTAINER= demon@FreeBSD.org
COMMENT= uWSGI top-like app
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/www/uzbl/Makefile b/www/uzbl/Makefile
index d4afa356fe1a..0ca53e3fabbc 100644
--- a/www/uzbl/Makefile
+++ b/www/uzbl/Makefile
@@ -17,10 +17,9 @@ LIB_DEPENDS= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
RUN_DEPENDS= socat:${PORTSDIR}/net/socat \
dmenu:${PORTSDIR}/x11/dmenu
-USES= gmake pkgconfig
+USES= gmake pkgconfig python:2
USE_GNOME= gtk20 pygtk2
USE_LDCONFIG= yes
-USE_PYTHON= 2
GITDATE= 2012.05.14
GITVERSION= 228bc38
diff --git a/www/waccess/Makefile b/www/waccess/Makefile
index 447d91b2729f..f922526b8094 100644
--- a/www/waccess/Makefile
+++ b/www/waccess/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.tundraware.com/Software/waccess/
MAINTAINER= tundra@tundraware.com
COMMENT= Quick-N-Dirty Web Access Log Analyzer
-USE_PYTHON= yes
+USES= python
OPTIONS_DEFINE= DOCS
diff --git a/www/wadcomblog/Makefile b/www/wadcomblog/Makefile
index 580c33c96643..e91d9542218f 100644
--- a/www/wadcomblog/Makefile
+++ b/www/wadcomblog/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES= http://laffaye.free.fr/distfiles/ \
MAINTAINER= jlaffaye@FreeBSD.org
COMMENT= Simple open-source static blog engine written in Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
OPTIONS_DEFINE= DOCS EXAMPLES
.include <bsd.port.options.mk>
diff --git a/www/webcheck/Makefile b/www/webcheck/Makefile
index 9308d0ea462d..4d2ce767989e 100644
--- a/www/webcheck/Makefile
+++ b/www/webcheck/Makefile
@@ -10,7 +10,7 @@ EXTRACT_SUFX= .tar.gz
MAINTAINER= reed@reedmedia.net
COMMENT= View structure of a web site, get a list of problems like broken links
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
# what about fancytooltips?
diff --git a/www/webgrind/Makefile b/www/webgrind/Makefile
index 47f5eeafc5a8..3d69dd80bab8 100644
--- a/www/webgrind/Makefile
+++ b/www/webgrind/Makefile
@@ -26,7 +26,7 @@ NO_BUILD= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MCALLGRAPH}
-USE_PYTHON= yes
+USES+= python
RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz
.endif
diff --git a/www/webpy/Makefile b/www/webpy/Makefile
index 1366fc9086f7..dd3f218d67d3 100644
--- a/www/webpy/Makefile
+++ b/www/webpy/Makefile
@@ -11,8 +11,8 @@ DISTNAME= web.py-${PORTVERSION}
MAINTAINER= wen@FreeBSD.org
COMMENT= Web Framework For Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= web.py
.include <bsd.port.mk>
diff --git a/www/woof/Makefile b/www/woof/Makefile
index 4b25f1bc3e72..169bdec7f9f7 100644
--- a/www/woof/Makefile
+++ b/www/woof/Makefile
@@ -14,7 +14,7 @@ COMMENT= Web Offer One File, an ad-hoc single file webserver
LICENSE= GPLv2
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
PLIST_FILES= bin/woof
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index 70995eb64154..edc37b80dfbd 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -79,10 +79,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=2.13.2:${PORTSDIR}/security/p
${PYTHON_PKGNAMEPREFIX}Products.StandardCacheManagers>=0:${PORTSDIR}/devel/py-Products.StandardCacheManagers \
${PYTHON_PKGNAMEPREFIX}manuel>=0:${PORTSDIR}/devel/py-manuel
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
PKGMESSAGE= ${WRKDIR}/pkg-message
SUB_FILES= instance-message package-pkg-message pkg-message