aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--textproc/archmage/Makefile6
-rw-r--r--textproc/cdiff/Makefile5
-rw-r--r--textproc/chm2pdf/Makefile4
-rw-r--r--textproc/coccigrep/Makefile5
-rw-r--r--textproc/codespell/Makefile3
-rw-r--r--textproc/doclifter/Makefile2
-rw-r--r--textproc/ecromedos/Makefile2
-rw-r--r--textproc/gnome-doc-utils/Makefile3
-rw-r--r--textproc/ibus-el/Makefile2
-rw-r--r--textproc/ibus-table/Makefile3
-rw-r--r--textproc/ibus/Makefile3
-rw-r--r--textproc/libextractor/Makefile3
-rw-r--r--textproc/loook/Makefile3
-rw-r--r--textproc/makefaq/Makefile2
-rw-r--r--textproc/nltk/Makefile5
-rw-r--r--textproc/plover/Makefile4
-rw-r--r--textproc/py-Chameleon/Makefile5
-rw-r--r--textproc/py-asciinema/Makefile5
-rw-r--r--textproc/py-asv/Makefile2
-rw-r--r--textproc/py-bugzillatools/Makefile5
-rw-r--r--textproc/py-charade/Makefile5
-rw-r--r--textproc/py-chardet/Makefile5
-rw-r--r--textproc/py-cloud_sptheme/Makefile5
-rw-r--r--textproc/py-creole/Makefile5
-rw-r--r--textproc/py-dsv/Makefile5
-rw-r--r--textproc/py-elasticsearch-py/Makefile5
-rw-r--r--textproc/py-elib.intl/Makefile5
-rw-r--r--textproc/py-empy/Makefile5
-rw-r--r--textproc/py-enchant/Makefile5
-rw-r--r--textproc/py-errorhandler/Makefile5
-rw-r--r--textproc/py-excelerator/Makefile6
-rw-r--r--textproc/py-feedparser/Makefile6
-rw-r--r--textproc/py-genshi-devel/Makefile5
-rw-r--r--textproc/py-genshi/Makefile5
-rw-r--r--textproc/py-gettext/Makefile6
-rw-r--r--textproc/py-hyperestraier-python/Makefile4
-rw-r--r--textproc/py-jaxml/Makefile5
-rw-r--r--textproc/py-junit-xml/Makefile5
-rw-r--r--textproc/py-libtre/Makefile6
-rw-r--r--textproc/py-libxml2/Makefile2
-rw-r--r--textproc/py-libxslt/Makefile2
-rw-r--r--textproc/py-ltxml/Makefile5
-rw-r--r--textproc/py-mako/Makefile6
-rw-r--r--textproc/py-markdown/Makefile6
-rw-r--r--textproc/py-markdown2/Makefile6
-rw-r--r--textproc/py-paragrep/Makefile5
-rw-r--r--textproc/py-pdfminer/Makefile5
-rw-r--r--textproc/py-pss/Makefile5
-rw-r--r--textproc/py-pyctpp2/Makefile5
-rw-r--r--textproc/py-pygments/Makefile5
-rw-r--r--textproc/py-pyscss/Makefile5
-rw-r--r--textproc/py-pysrt/Makefile5
-rw-r--r--textproc/py-pystache/Makefile5
-rw-r--r--textproc/py-pytidylib/Makefile5
-rw-r--r--textproc/py-pyx12/Makefile5
-rw-r--r--textproc/py-rdflib/Makefile5
-rw-r--r--textproc/py-reverend/Makefile5
-rw-r--r--textproc/py-rss2gen/Makefile5
-rw-r--r--textproc/py-rxp/Makefile5
-rw-r--r--textproc/py-sgrep/Makefile5
-rw-r--r--textproc/py-sphinx_rtd_theme/Makefile5
-rw-r--r--textproc/py-sphinxcontrib-adadomain/Makefile5
-rw-r--r--textproc/py-sphinxcontrib-bitbucket/Makefile5
-rw-r--r--textproc/py-sphinxcontrib-httpdomain/Makefile5
-rw-r--r--textproc/py-stripogram/Makefile5
-rw-r--r--textproc/py-syck/Makefile5
-rw-r--r--textproc/py-texttable/Makefile4
-rw-r--r--textproc/py-trans/Makefile6
-rw-r--r--textproc/py-transifex-client/Makefile7
-rw-r--r--textproc/py-translationstring/Makefile5
-rw-r--r--textproc/py-tvgrab/Makefile7
-rw-r--r--textproc/py-twistedLore/Makefile6
-rw-r--r--textproc/py-wicked/Makefile6
-rw-r--r--textproc/py-wordnet/Makefile5
-rw-r--r--textproc/py-wtforms/Makefile6
-rw-r--r--textproc/py-xlrd/Makefile5
-rw-r--r--textproc/py-xlutils/Makefile5
-rw-r--r--textproc/py-xlwriter/Makefile6
-rw-r--r--textproc/py-xlwt/Makefile5
-rw-r--r--textproc/py-xml/Makefile27
-rw-r--r--textproc/py-xmltools/Makefile4
-rw-r--r--textproc/py-xmltv/Makefile4
-rw-r--r--textproc/py-zope.app.i18n/Makefile5
-rw-r--r--textproc/py-zope.app.locales/Makefile5
-rw-r--r--textproc/py-zope.i18nmessageid/Makefile5
-rw-r--r--textproc/py-zope.structuredtext/Makefile5
-rw-r--r--textproc/py-zope.tal/Makefile6
-rw-r--r--textproc/py-zpt/Makefile5
-rw-r--r--textproc/py2html/Makefile5
-rw-r--r--textproc/py3-libxml2/Makefile3
-rw-r--r--textproc/pychm/Makefile4
-rw-r--r--textproc/pystemmer/Makefile5
-rw-r--r--textproc/queequeg/Makefile2
-rw-r--r--textproc/rubygem-albino/Makefile2
-rw-r--r--textproc/rubygem-colorator/Makefile2
-rw-r--r--textproc/rubygem-cssmin/Makefile2
-rw-r--r--textproc/rubygem-jsmin/Makefile2
-rw-r--r--textproc/silvercity/Makefile5
-rw-r--r--textproc/txt2tags/Makefile2
-rw-r--r--textproc/unoconv/Makefile2
-rw-r--r--textproc/xml2rfc/Makefile5
-rw-r--r--textproc/yould/Makefile5
-rw-r--r--textproc/zorba/Makefile2
103 files changed, 197 insertions, 292 deletions
diff --git a/textproc/archmage/Makefile b/textproc/archmage/Makefile
index 8b02020d55ab..e0e5d321b483 100644
--- a/textproc/archmage/Makefile
+++ b/textproc/archmage/Makefile
@@ -17,10 +17,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/chm/chm.py:${PORTSDIR}/textproc/pychm \
${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32
NO_BUILD= yes
-USES= tar:bzip2
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 tar:bzip2
+USE_PYTHON= distutils autoplist
PLIST_FILES= man/man1/archmage.1.gz
diff --git a/textproc/cdiff/Makefile b/textproc/cdiff/Makefile
index a4917274f154..4f56ed905356 100644
--- a/textproc/cdiff/Makefile
+++ b/textproc/cdiff/Makefile
@@ -18,9 +18,8 @@ GH_ACCOUNT= ymattw
GH_TAGNAME= ${GH_COMMIT}
GH_COMMIT= 67c9831
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS
diff --git a/textproc/chm2pdf/Makefile b/textproc/chm2pdf/Makefile
index ea632995f9e5..8ca3a8816d93 100644
--- a/textproc/chm2pdf/Makefile
+++ b/textproc/chm2pdf/Makefile
@@ -15,8 +15,8 @@ LICENSE= GPLv2
RUN_DEPENDS= htmldoc:${PORTSDIR}/textproc/htmldoc \
${PYTHON_SITELIBDIR}/chm/chm.py:${PORTSDIR}/textproc/pychm
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_PKGVERSION= 0.9
PLIST_FILES= bin/chm2pdf
diff --git a/textproc/coccigrep/Makefile b/textproc/coccigrep/Makefile
index f927f3d6d9f9..e763a5b06938 100644
--- a/textproc/coccigrep/Makefile
+++ b/textproc/coccigrep/Makefile
@@ -17,9 +17,8 @@ GH_ACCOUNT= regit
GH_TAGNAME= v${PORTVERSION}
GH_COMMIT= d4eb23e
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
PLIST_FILES= man/man1/coccigrep.1.gz \
${DATADIR_REL}/cocci-grep.el \
diff --git a/textproc/codespell/Makefile b/textproc/codespell/Makefile
index b921efc9d8e2..bac9ff9579ed 100644
--- a/textproc/codespell/Makefile
+++ b/textproc/codespell/Makefile
@@ -12,8 +12,7 @@ COMMENT= Source code spelling checker
LICENSE= GPLv2
-USE_PYTHON= 3
-USES= tar:xz
+USES= python:3 tar:xz
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/textproc/doclifter/Makefile b/textproc/doclifter/Makefile
index a1af41bd70cd..e2a72f754db0 100644
--- a/textproc/doclifter/Makefile
+++ b/textproc/doclifter/Makefile
@@ -11,7 +11,7 @@ COMMENT= Translates documents written in troff macros to DocBook
RUN_DEPENDS+= python2:${PORTSDIR}/lang/python2
-USE_PYTHON= 2
+USES= python:2
NO_BUILD= yes
PLIST_FILES= bin/doclifter \
diff --git a/textproc/ecromedos/Makefile b/textproc/ecromedos/Makefile
index afbcdccc9818..74dfde5fd846 100644
--- a/textproc/ecromedos/Makefile
+++ b/textproc/ecromedos/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick \
${PYTHON_SITELIBDIR}/libxslt.py:${PORTSDIR}/textproc/py-libxslt
NO_BUILD= yes
-USE_PYTHON= yes
+USES= python
USE_TEX= latex
USE_GNOME= libxml2 libxslt
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 7d507e013e86..7ae6e325a7d2 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -17,9 +17,8 @@ RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \
${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
${LOCALBASE}/share/xml/docbook/4.3:${PORTSDIR}/textproc/docbook-xml
-USES= gettext-tools:build,run gmake pathfix pkgconfig tar:xz
+USES= gettext-tools:build,run gmake pathfix pkgconfig python:2 tar:xz
USE_GNOME= gnomehier libxslt intlhack
-USE_PYTHON= 2
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-omf-dir=${PREFIX}/share/omf
diff --git a/textproc/ibus-el/Makefile b/textproc/ibus-el/Makefile
index 928d961d6680..ec07e19e961f 100644
--- a/textproc/ibus-el/Makefile
+++ b/textproc/ibus-el/Makefile
@@ -14,8 +14,8 @@ COMMENT= IBus client for GNU Emacs
RUN_DEPENDS= ibus-daemon:${PORTSDIR}/textproc/ibus \
${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
+USES= python:run
USE_EMACS= yes
-USE_PYTHON_RUN= yes
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/doc/COPYING
diff --git a/textproc/ibus-table/Makefile b/textproc/ibus-table/Makefile
index d6f8303d69b1..ee94382cb565 100644
--- a/textproc/ibus-table/Makefile
+++ b/textproc/ibus-table/Makefile
@@ -14,9 +14,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
LIB_DEPENDS= libibus-1.0.so:${PORTSDIR}/textproc/ibus
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-USE_PYTHON= yes
USE_GNOME= pygtk2
-USES= gmake pkgconfig
+USES= gmake pkgconfig python
GNU_CONFIGURE= yes
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 9febff39ce46..b9cf94f3d545 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -22,9 +22,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:${PORTSDIR}/devel/py-dbus \
setxkbmap:${PORTSDIR}/x11/setxkbmap
LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-USES= compiler gmake libtool pathfix pkgconfig
+USES= compiler gmake libtool pathfix pkgconfig python
USE_GNOME= pygobject3
-USE_PYTHON= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 17a0f63d193e..71db8f6f7584 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -13,9 +13,8 @@ LICENSE= GPLv3 # (or later)
LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl
-USES= iconv gettext libtool makeinfo pathfix pkgconfig
+USES= iconv gettext libtool makeinfo pathfix pkgconfig python
USE_GNOME= gtk20
-USE_PYTHON= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gtk-version=2 \
--with-ltdl=${LOCALBASE}
diff --git a/textproc/loook/Makefile b/textproc/loook/Makefile
index c5f9d7aec80f..a02d76875bcd 100644
--- a/textproc/loook/Makefile
+++ b/textproc/loook/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkint
WRKSRC= ${WRKDIR}
-USES= zip
-USE_PYTHON= 2
+USES= python:2 zip
NO_BUILD= yes
PLIST_FILES= bin/${PORTNAME}
diff --git a/textproc/makefaq/Makefile b/textproc/makefaq/Makefile
index 04901208519e..cb00abdd519c 100644
--- a/textproc/makefaq/Makefile
+++ b/textproc/makefaq/Makefile
@@ -10,7 +10,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Makefaq is a Python program that creates a (FAQ)
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
PLIST_FILES= bin/makefaq.py man/man1/makefaq.1.gz
diff --git a/textproc/nltk/Makefile b/textproc/nltk/Makefile
index e010ca56b9a2..73b2d881b94c 100644
--- a/textproc/nltk/Makefile
+++ b/textproc/nltk/Makefile
@@ -15,8 +15,7 @@ LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkinter \
${PYTHON_PKGNAMEPREFIX}yaml>=3.09:${PORTSDIR}/devel/py-yaml
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/plover/Makefile b/textproc/plover/Makefile
index 15721e6c059c..6c246b59c452 100644
--- a/textproc/plover/Makefile
+++ b/textproc/plover/Makefile
@@ -16,8 +16,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>=0:${PORTSDIR}/x11-toolkits/py-xlib \
${PYTHON_PKGNAMEPREFIX}serial>=0:${PORTSDIR}/comms/py-serial \
${PYTHON_PKGNAMEPREFIX}lockfile>=0:${PORTSDIR}/devel/py-lockfile
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
USE_WX= 2.8
WX_COMPS= wx
WX_UNICODE= yes
diff --git a/textproc/py-Chameleon/Makefile b/textproc/py-Chameleon/Makefile
index d5ebd52791a8..77c54c2aa228 100644
--- a/textproc/py-Chameleon/Makefile
+++ b/textproc/py-Chameleon/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python HTML/XML template language compiler
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-asciinema/Makefile b/textproc/py-asciinema/Makefile
index cfc3e9338b08..65b957115126 100644
--- a/textproc/py-asciinema/Makefile
+++ b/textproc/py-asciinema/Makefile
@@ -12,8 +12,7 @@ COMMENT= Tool for recording and sharing terminal sessions
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:${PORTSDIR}/www/py-requests
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-asv/Makefile b/textproc/py-asv/Makefile
index e4b0fa0520e3..350d2f31e1c5 100644
--- a/textproc/py-asv/Makefile
+++ b/textproc/py-asv/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Extensible Python module to parse simple text file formats like CSV
-USE_PYTHON= yes
+USES= python
PORTDOCS= INSTALL README THANKS
PORTEXAMPLES= asv_example.py example_data.csv
diff --git a/textproc/py-bugzillatools/Makefile b/textproc/py-bugzillatools/Makefile
index 01e5733fe6a7..9d01d8a72a61 100644
--- a/textproc/py-bugzillatools/Makefile
+++ b/textproc/py-bugzillatools/Makefile
@@ -10,8 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= swills@FreeBSD.org
COMMENT= Tool for interacting with the Bugzilla bug tracking system
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-charade/Makefile b/textproc/py-charade/Makefile
index 0d15358fa2d4..5ee2a14c33e4 100644
--- a/textproc/py-charade/Makefile
+++ b/textproc/py-charade/Makefile
@@ -13,8 +13,7 @@ COMMENT= Universal encoding detector for python 2 and 3
LICENSE= LGPL3
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-chardet/Makefile b/textproc/py-chardet/Makefile
index 1a39682a9c23..de2a46501ef8 100644
--- a/textproc/py-chardet/Makefile
+++ b/textproc/py-chardet/Makefile
@@ -12,9 +12,8 @@ COMMENT= Character encoding auto-detection in Python
LICENSE= LGPL21
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
PORTDOCS= *
diff --git a/textproc/py-cloud_sptheme/Makefile b/textproc/py-cloud_sptheme/Makefile
index f10cda12a5f7..52bb710e32b2 100644
--- a/textproc/py-cloud_sptheme/Makefile
+++ b/textproc/py-cloud_sptheme/Makefile
@@ -16,9 +16,8 @@ LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
PYDISTUTILS_BUILDARGS= build_sphinx -E
PORTDOCS= *
diff --git a/textproc/py-creole/Makefile b/textproc/py-creole/Makefile
index 915d1eed241f..c136e4d8d8ee 100644
--- a/textproc/py-creole/Makefile
+++ b/textproc/py-creole/Makefile
@@ -16,9 +16,8 @@ LICENSE= GPLv3
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/docutils/__init__.py:${PORTSDIR}/textproc/py-docutils
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
diff --git a/textproc/py-dsv/Makefile b/textproc/py-dsv/Makefile
index 57cc5133cacc..ef088642bfb2 100644
--- a/textproc/py-dsv/Makefile
+++ b/textproc/py-dsv/Makefile
@@ -11,9 +11,8 @@ DISTNAME= ${PORTNAME:tu}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python module to parse or write delimeter-separated (e.g. CSV) files
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
DSV_BASEDIR= ${PYTHONPREFIX_SITELIBDIR}/DSV
OPTIONS_DEFINE= DOCS
diff --git a/textproc/py-elasticsearch-py/Makefile b/textproc/py-elasticsearch-py/Makefile
index 7000aacb235c..a63f2ad1ae68 100644
--- a/textproc/py-elasticsearch-py/Makefile
+++ b/textproc/py-elasticsearch-py/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.2:${PORTSDIR}/net/py-urllib3
USE_GITHUB= yes
GH_ACCOUNT= elasticsearch
GH_COMMIT= 9bd4303
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-elib.intl/Makefile b/textproc/py-elib.intl/Makefile
index 66dd78e6ecd9..f4e7fc15496d 100644
--- a/textproc/py-elib.intl/Makefile
+++ b/textproc/py-elib.intl/Makefile
@@ -16,8 +16,7 @@ GH_TAGNAME= ${GH_COMMIT}
GH_COMMIT= d09997c
USE_GITHUB= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-empy/Makefile b/textproc/py-empy/Makefile
index cbe8d22428bc..be9912759edb 100644
--- a/textproc/py-empy/Makefile
+++ b/textproc/py-empy/Makefile
@@ -10,8 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Powerful and robust 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/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index a627142ec52c..047295d75d40 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -14,9 +14,8 @@ COMMENT= Spellchecking library for Python based on the Enchant library
LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
USE_WX= 3.0+
WX_COMPS= python:run
diff --git a/textproc/py-errorhandler/Makefile b/textproc/py-errorhandler/Makefile
index 6bd78c8d82fe..28576375b5d2 100644
--- a/textproc/py-errorhandler/Makefile
+++ b/textproc/py-errorhandler/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= dikshie@sfc.wide.ad.jp
COMMENT= Logging framework handler that tracks when messages above a certain level have been logged
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-excelerator/Makefile b/textproc/py-excelerator/Makefile
index 3b2924b0dd7a..d5de91d11559 100644
--- a/textproc/py-excelerator/Makefile
+++ b/textproc/py-excelerator/Makefile
@@ -12,10 +12,8 @@ DISTNAME= pyexcelerator-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python library for generating Excel 97/2000/XP/2003 files
-USES= zip
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 zip
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/py-excelerator
EXAMPLESDIR= ${PREFIX}/share/examples/py-excelerator
diff --git a/textproc/py-feedparser/Makefile b/textproc/py-feedparser/Makefile
index c071c77250ea..b958b8bc78d6 100644
--- a/textproc/py-feedparser/Makefile
+++ b/textproc/py-feedparser/Makefile
@@ -13,10 +13,8 @@ COMMENT= Universal feed parser written in Python
LICENSE= MIT
-USES= tar:bzip2
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python tar:bzip2
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS
diff --git a/textproc/py-genshi-devel/Makefile b/textproc/py-genshi-devel/Makefile
index 63c52e2503d6..0690d787edc7 100644
--- a/textproc/py-genshi-devel/Makefile
+++ b/textproc/py-genshi-devel/Makefile
@@ -12,9 +12,8 @@ PKGNAMESUFFIX= -devel
MAINTAINER= alexey@renatasystems.org
COMMENT= Python toolkit for stream-based generation of output for the web
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/genshi
CONFLICTS= py-genshi-[0-9]*
diff --git a/textproc/py-genshi/Makefile b/textproc/py-genshi/Makefile
index 018aa826d995..76e135302e07 100644
--- a/textproc/py-genshi/Makefile
+++ b/textproc/py-genshi/Makefile
@@ -18,9 +18,8 @@ OPTIONS_DEFINE= BABEL
OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options
BABEL_DESC= I18n support through the Babel plugin
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.options.mk>
diff --git a/textproc/py-gettext/Makefile b/textproc/py-gettext/Makefile
index 21e074b1ccb7..499a950eed37 100644
--- a/textproc/py-gettext/Makefile
+++ b/textproc/py-gettext/Makefile
@@ -13,10 +13,8 @@ COMMENT= Python Gettext po to mo file compiler
LICENSE= BSD
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.pre.mk>
diff --git a/textproc/py-hyperestraier-python/Makefile b/textproc/py-hyperestraier-python/Makefile
index 0216530bfe0f..61528f0f3cdb 100644
--- a/textproc/py-hyperestraier-python/Makefile
+++ b/textproc/py-hyperestraier-python/Makefile
@@ -13,8 +13,8 @@ MAINTAINER= jun-g@daemonfreaks.com
COMMENT= Pure Python HyperEstraier library
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
+USES= python
+USE_PYTHON= distutils
PORTEXAMPLES= example.py asyn_example.py
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}${PKGNAMESUFFIX}
diff --git a/textproc/py-jaxml/Makefile b/textproc/py-jaxml/Makefile
index 2a1e7993b1a9..3e80f89f92a6 100644
--- a/textproc/py-jaxml/Makefile
+++ b/textproc/py-jaxml/Makefile
@@ -12,8 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python module to generate XML easily
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-junit-xml/Makefile b/textproc/py-junit-xml/Makefile
index 9e2e280fc53b..47b43f581ce2 100644
--- a/textproc/py-junit-xml/Makefile
+++ b/textproc/py-junit-xml/Makefile
@@ -12,8 +12,7 @@ COMMENT= Creates JUnit XML documents used by tools such as Jenkins
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/textproc/py-libtre/Makefile b/textproc/py-libtre/Makefile
index 20379595c108..438c278ae65f 100644
--- a/textproc/py-libtre/Makefile
+++ b/textproc/py-libtre/Makefile
@@ -17,10 +17,8 @@ LIB_DEPENDS= libtre.so:${PORTSDIR}/textproc/libtre
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= tar:bzip2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python tar:bzip2
+USE_PYTHON= distutils autoplist
BUILD_WRKSRC= ${WRKSRC}/python
INSTALL_WRKSRC= ${WRKSRC}/python
diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
index 43b850c71622..e716d2a71bcd 100644
--- a/textproc/py-libxml2/Makefile
+++ b/textproc/py-libxml2/Makefile
@@ -17,7 +17,7 @@ PLIST= ${.CURDIR}/pkg-plist
USE_GNOME+= libxml2
USES+= python:2
-USE_PYDISTUTILS=yes
+USE_PYTHON= distutils
PYDISTUTILS_EGGINFO= libxml2_python-${PORTVERSION}-py${PYTHON_VER}.egg-info
CPPFLAGS+= `${PYTHON_VERSION}-config --cflags`
diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile
index 0efcb830a779..ddd49f20175c 100644
--- a/textproc/py-libxslt/Makefile
+++ b/textproc/py-libxslt/Makefile
@@ -14,7 +14,7 @@ DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
USE_GNOME= libxslt
-USE_PYTHON= yes
+USES+= python
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--with-python=${PYTHON_CMD}
diff --git a/textproc/py-ltxml/Makefile b/textproc/py-ltxml/Makefile
index 5834072d9877..f73ed2c50a51 100644
--- a/textproc/py-ltxml/Makefile
+++ b/textproc/py-ltxml/Makefile
@@ -15,9 +15,8 @@ COMMENT= Python bindings to the LT XML toolkit
BUILD_DEPENDS= ${LOCALBASE}/include/ltxml12/lt-safe.h:${PORTSDIR}/textproc/ltxml
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
USE_LDCONFIG= yes
DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/textproc/py-mako/Makefile b/textproc/py-mako/Makefile
index f134ff914409..c4cfc154f85d 100644
--- a/textproc/py-mako/Makefile
+++ b/textproc/py-mako/Makefile
@@ -18,9 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beaker>=1.1:${PORTSDIR}/www/py-beaker \
${PYTHON_PKGNAMEPREFIX}Babel>0:${PORTSDIR}/devel/py-babel
RUN_DEPENDS+= ${BUILD_DEPENDS}
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
-PYDISTUTILS_PKGNAME= Mako
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile
index f7ed111078ad..f1c2927ab903 100644
--- a/textproc/py-markdown/Makefile
+++ b/textproc/py-markdown/Makefile
@@ -17,10 +17,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md
TEST_DEPENDS= nosetests:${PORTSDIR}/devel/py-nose \
${PYTHON_PKGNAMEPREFIX}pytidylib:${PORTSDIR}/textproc/py-pytidylib
-USES= dos2unix
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= dos2unix python
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && nosetests
diff --git a/textproc/py-markdown2/Makefile b/textproc/py-markdown2/Makefile
index 5810b2a959fb..00a07e3fa88f 100644
--- a/textproc/py-markdown2/Makefile
+++ b/textproc/py-markdown2/Makefile
@@ -12,9 +12,7 @@ COMMENT= Fast and complete Python implementation of Markdown
LICENSE= MIT
-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/textproc/py-paragrep/Makefile b/textproc/py-paragrep/Makefile
index 2c5f8d02be25..a9b6e6f225a9 100644
--- a/textproc/py-paragrep/Makefile
+++ b/textproc/py-paragrep/Makefile
@@ -16,9 +16,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grizzled>=0.8.1:${PORTSDIR}/devel/py-grizz
RUN_DEPENDS:= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/bmc-${PORTNAME}-e7d5553
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=yes
+USES= python
+USE_PYTHON= distutils autoplist
post-patch:
@${REINPLACE_CMD} -e "s|'man'|'man/man1'|g" ${WRKSRC}/setup.py
diff --git a/textproc/py-pdfminer/Makefile b/textproc/py-pdfminer/Makefile
index b1e3a71cea88..bc798cc4b1c2 100644
--- a/textproc/py-pdfminer/Makefile
+++ b/textproc/py-pdfminer/Makefile
@@ -12,8 +12,7 @@ COMMENT= PDF parser and analyzer
LICENSE= MIT
-USE_PYTHON= 2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-pss/Makefile b/textproc/py-pss/Makefile
index fa1f49ce884f..7e4807afb5ae 100644
--- a/textproc/py-pss/Makefile
+++ b/textproc/py-pss/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for grepping through source code
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-pyctpp2/Makefile b/textproc/py-pyctpp2/Makefile
index 7671d6c94d8e..6ba34091527f 100644
--- a/textproc/py-pyctpp2/Makefile
+++ b/textproc/py-pyctpp2/Makefile
@@ -16,8 +16,7 @@ LICENSE= MIT
LIB_DEPENDS= libctpp2.so:${PORTSDIR}/textproc/ctpp2
# Python3 ready
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile
index e7c83ba70fb4..c30d9c10f097 100644
--- a/textproc/py-pygments/Makefile
+++ b/textproc/py-pygments/Makefile
@@ -14,9 +14,8 @@ COMMENT= Syntax highlighter written in Python
LICENSE= BSD2CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS
diff --git a/textproc/py-pyscss/Makefile b/textproc/py-pyscss/Makefile
index 3f1007e4db80..c136b22ff62c 100644
--- a/textproc/py-pyscss/Makefile
+++ b/textproc/py-pyscss/Makefile
@@ -24,9 +24,8 @@ GH_TAGNAME= v${PORTVERSION}
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && py.test
diff --git a/textproc/py-pysrt/Makefile b/textproc/py-pysrt/Makefile
index 528694cc4d7d..6808466e8bfc 100644
--- a/textproc/py-pysrt/Makefile
+++ b/textproc/py-pysrt/Makefile
@@ -14,8 +14,7 @@ LICENSE= GPLv3
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:${PORTSDIR}/textproc/py-chardet
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-pystache/Makefile b/textproc/py-pystache/Makefile
index b6e6e306d549..16ee82b4e878 100644
--- a/textproc/py-pystache/Makefile
+++ b/textproc/py-pystache/Makefile
@@ -14,8 +14,7 @@ COMMENT= Logic-less templates for Python
LICENSE= MIT
# Python3 ready
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-pytidylib/Makefile b/textproc/py-pytidylib/Makefile
index e4d6934481a2..d0b85df1366d 100644
--- a/textproc/py-pytidylib/Makefile
+++ b/textproc/py-pytidylib/Makefile
@@ -16,9 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libtidy.so:${PORTSDIR}/www/tidy-lib
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
regression-test: build
@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest
diff --git a/textproc/py-pyx12/Makefile b/textproc/py-pyx12/Makefile
index 12b8538551ae..049934c5739c 100644
--- a/textproc/py-pyx12/Makefile
+++ b/textproc/py-pyx12/Makefile
@@ -12,8 +12,7 @@ COMMENT= Validate and convert HIPAA X12 documents
LICENSE= BSD3CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-rdflib/Makefile b/textproc/py-rdflib/Makefile
index bfd95c7e8439..277f5cc3ea29 100644
--- a/textproc/py-rdflib/Makefile
+++ b/textproc/py-rdflib/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}isodate>=0:${PORTSDIR}/devel/py-isodate \
${PYTHON_PKGNAMEPREFIX}sparqlwrapper>=1.5.2:${PORTSDIR}/textproc/py-sparqlwrapper \
${PYTHON_PKGNAMEPREFIX}html5lib>0:${PORTSDIR}/www/py-html5lib
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-reverend/Makefile b/textproc/py-reverend/Makefile
index 12d622ad7954..ef34cf160c0b 100644
--- a/textproc/py-reverend/Makefile
+++ b/textproc/py-reverend/Makefile
@@ -11,9 +11,8 @@ DISTNAME= Reverend-${PORTVERSION}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Simple Bayesian classifier written in Python
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_PKGNAME= Reverend
+USES= python
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= EXAMPLES
EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/textproc/py-rss2gen/Makefile b/textproc/py-rss2gen/Makefile
index e73d6b1c8514..a9c7b55841b5 100644
--- a/textproc/py-rss2gen/Makefile
+++ b/textproc/py-rss2gen/Makefile
@@ -11,8 +11,7 @@ DISTNAME= PyRSS2Gen-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python library for generating RSS 2.0 feeds
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-rxp/Makefile b/textproc/py-rxp/Makefile
index 0204d9d5c732..a0737bfe44fd 100644
--- a/textproc/py-rxp/Makefile
+++ b/textproc/py-rxp/Makefile
@@ -14,9 +14,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Fast validating XML parser for Python
NO_WRKSUBDIR= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
DOCSDIR= ${PREFIX}/share/doc/py-rxp
EXAMPLESDIR= ${PREFIX}/share/examples/py-rxp
diff --git a/textproc/py-sgrep/Makefile b/textproc/py-sgrep/Makefile
index 62d75b0971ea..d3a460336d14 100644
--- a/textproc/py-sgrep/Makefile
+++ b/textproc/py-sgrep/Makefile
@@ -16,9 +16,8 @@ COMMENT= Python wrappers for Sgrep
SGREP_VER= 1.94a
WRKSRC= ${WRKDIR}/sgrep-${SGREP_VER}
GNU_CONFIGURE= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-extract:
@${TAR} -zxf ${DISTDIR}/pysgrep-${PORTVERSION}.tar.gz -C ${WRKSRC}
diff --git a/textproc/py-sphinx_rtd_theme/Makefile b/textproc/py-sphinx_rtd_theme/Makefile
index 5b9c9722459e..e7378d094d0f 100644
--- a/textproc/py-sphinx_rtd_theme/Makefile
+++ b/textproc/py-sphinx_rtd_theme/Makefile
@@ -13,8 +13,7 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1:${PORTSDIR}/textproc/py-sphinx
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-sphinxcontrib-adadomain/Makefile b/textproc/py-sphinxcontrib-adadomain/Makefile
index 2f2e5f2453a2..6d10e49bcd30 100644
--- a/textproc/py-sphinxcontrib-adadomain/Makefile
+++ b/textproc/py-sphinxcontrib-adadomain/Makefile
@@ -16,8 +16,7 @@ LICENSE= BSD2CLAUSE
RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-sphinxcontrib-bitbucket/Makefile b/textproc/py-sphinxcontrib-bitbucket/Makefile
index 04ccb1e88ce9..f1585dc4c3cc 100644
--- a/textproc/py-sphinxcontrib-bitbucket/Makefile
+++ b/textproc/py-sphinxcontrib-bitbucket/Makefile
@@ -13,8 +13,7 @@ COMMENT= Sphinx/BitBucket integration
RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-sphinxcontrib-httpdomain/Makefile b/textproc/py-sphinxcontrib-httpdomain/Makefile
index 13fe4a38317b..b886d1b5c762 100644
--- a/textproc/py-sphinxcontrib-httpdomain/Makefile
+++ b/textproc/py-sphinxcontrib-httpdomain/Makefile
@@ -12,8 +12,7 @@ COMMENT= Sphinx domain for HTTP APIs
RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-stripogram/Makefile b/textproc/py-stripogram/Makefile
index 44fae96b6d66..e2fc37d4c16b 100644
--- a/textproc/py-stripogram/Makefile
+++ b/textproc/py-stripogram/Makefile
@@ -14,8 +14,7 @@ COMMENT= Converting HTML to Plain Text and stripping specified tags from HTML
WRKSRC= ${WRKDIR}/stripogram
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-syck/Makefile b/textproc/py-syck/Makefile
index b26b27eb2406..d21fe3c85885 100644
--- a/textproc/py-syck/Makefile
+++ b/textproc/py-syck/Makefile
@@ -14,9 +14,8 @@ COMMENT= Python binding for Syck, a YAML parser and emitter
BUILD_DEPENDS= ${LOCALBASE}/lib/libsyck.a:${PORTSDIR}/textproc/syck
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-patch:
@${REINPLACE_CMD} -e 's|#include|include|g ; s|#library_dirs|library_dirs|g ; \
diff --git a/textproc/py-texttable/Makefile b/textproc/py-texttable/Makefile
index 26b81705fdf1..5464b0369044 100644
--- a/textproc/py-texttable/Makefile
+++ b/textproc/py-texttable/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Module for creating simple ASCII tables
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PLIST_FILES= %%PYTHON_SITELIBDIR%%/texttable.py \
%%PYTHON_SITELIBDIR%%/texttable.pyc \
diff --git a/textproc/py-trans/Makefile b/textproc/py-trans/Makefile
index 87a361a53fbd..2d09d299f5c7 100644
--- a/textproc/py-trans/Makefile
+++ b/textproc/py-trans/Makefile
@@ -11,9 +11,7 @@ COMMENT= Module for performing transliteration
LICENSE= BSD
-USES= tar:bzip2
-USE_PYDISTUTILS=yes
-USE_PYTHON= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python tar:bzip2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-transifex-client/Makefile b/textproc/py-transifex-client/Makefile
index 482321d616e4..28a46814fcc8 100644
--- a/textproc/py-transifex-client/Makefile
+++ b/textproc/py-transifex-client/Makefile
@@ -13,10 +13,9 @@ LICENSE= GPLv2
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
-USE_GITHUB= yes
-USE_PYTHON= -2.7
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USE_GITHUB= yes
+USES= python:-2.7
+USE_PYTHON= distutils autoplist
GH_ACCOUNT= transifex
GH_COMMIT= 84c9dcc
diff --git a/textproc/py-translationstring/Makefile b/textproc/py-translationstring/Makefile
index 629a3f47909e..7c2162b790fc 100644
--- a/textproc/py-translationstring/Makefile
+++ b/textproc/py-translationstring/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Utility library for i18n relied on by various Repoze packages
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-tvgrab/Makefile b/textproc/py-tvgrab/Makefile
index eec82a5fe0d6..43cab8e469c9 100644
--- a/textproc/py-tvgrab/Makefile
+++ b/textproc/py-tvgrab/Makefile
@@ -14,10 +14,9 @@ COMMENT= Library to write grabbers of tv scheduling collections
EXTRACT_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:${PORTSDIR}/devel/py-dateutil:extract
-USES= tar:bzip2
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2 tar:bzip2
+USE_PYTHON= distutils autoplist
+
PORTDOCS= README
diff --git a/textproc/py-twistedLore/Makefile b/textproc/py-twistedLore/Makefile
index 156d8f355e45..c6c30c6996a4 100644
--- a/textproc/py-twistedLore/Makefile
+++ b/textproc/py-twistedLore/Makefile
@@ -14,9 +14,7 @@ COMMENT= Documentation generator with HTML and LaTeX support
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/textproc/py-wicked/Makefile b/textproc/py-wicked/Makefile
index 5e7c8f653b22..6fb73526a26f 100644
--- a/textproc/py-wicked/Makefile
+++ b/textproc/py-wicked/Makefile
@@ -18,9 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.
${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-wordnet/Makefile b/textproc/py-wordnet/Makefile
index 3da1d1e4b5b5..4c0c8eb1f8a4 100644
--- a/textproc/py-wordnet/Makefile
+++ b/textproc/py-wordnet/Makefile
@@ -16,9 +16,8 @@ DISTFILES= pywordnet-${PORTVERSION}.tar.gz:pywn \
MAINTAINER= ports@FreeBSD.org
COMMENT= Python Interface to WordNet
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/py${PORTNAME}-${PORTVERSION}
PLIST_SUB= WNDATA=${WORDNETDATA}
diff --git a/textproc/py-wtforms/Makefile b/textproc/py-wtforms/Makefile
index 0401f7ecb395..e7bb05d80d30 100644
--- a/textproc/py-wtforms/Makefile
+++ b/textproc/py-wtforms/Makefile
@@ -13,9 +13,7 @@ COMMENT= Forms validation and rendering library for Python web development
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/textproc/py-xlrd/Makefile b/textproc/py-xlrd/Makefile
index 58d0b40de491..e82297e37c24 100644
--- a/textproc/py-xlrd/Makefile
+++ b/textproc/py-xlrd/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= dikshie@sfc.wide.ad.jp
COMMENT= Reading data and formatting information from Excel files
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-xlutils/Makefile b/textproc/py-xlutils/Makefile
index 824285aca329..7122c554a7fd 100644
--- a/textproc/py-xlutils/Makefile
+++ b/textproc/py-xlutils/Makefile
@@ -16,8 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.2:${PORTSDIR}/textproc/py-xlrd
${PYTHON_PKGNAMEPREFIX}xlwt>=0.7.4:${PORTSDIR}/textproc/py-xlwt
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python:2
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-xlwriter/Makefile b/textproc/py-xlwriter/Makefile
index bb1e0f9d7e9d..ce94ca3fa56f 100644
--- a/textproc/py-xlwriter/Makefile
+++ b/textproc/py-xlwriter/Makefile
@@ -11,10 +11,8 @@ DISTNAME= pyXLWriter-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python library for generating Excel-compatible spreadsheets
-USES= zip
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python zip
+USE_PYTHON= distutils autoplist
PORTEXAMPLES= *
diff --git a/textproc/py-xlwt/Makefile b/textproc/py-xlwt/Makefile
index 8cd25b1a0c98..d6104c4c63c5 100644
--- a/textproc/py-xlwt/Makefile
+++ b/textproc/py-xlwt/Makefile
@@ -12,8 +12,7 @@ COMMENT= Writing data and formatting information from Excel files
LICENSE= BSD4CLAUSE
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index a30f18084076..476216e128a7 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -1,20 +1,19 @@
# Created by: nectar@FreeBSD.org
# $FreeBSD$
-PORTNAME= xml
-PORTVERSION= 0.8.4
-PORTREVISION= 2
-CATEGORIES= textproc python
-MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= PyXML-${PORTVERSION}
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Python XML library enhancements
-
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+PORTNAME= xml
+PORTVERSION= 0.8.4
+PORTREVISION= 2
+CATEGORIES= textproc python
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DISTNAME= PyXML-${PORTVERSION}
+
+MAINTAINER= ports@FreeBSD.org
+COMMENT= Python XML library enhancements
+
+USES= python
+USE_PYTHON= distutils autoplist
OPTIONS_DEFINE= DOCS XSLT XPATH
OPTIONS_DEFAULT=XPATH
diff --git a/textproc/py-xmltools/Makefile b/textproc/py-xmltools/Makefile
index bb0ddb51c035..8f695d8d54a2 100644
--- a/textproc/py-xmltools/Makefile
+++ b/textproc/py-xmltools/Makefile
@@ -14,8 +14,8 @@ COMMENT= High level XML tools for Python
RUN_DEPENDS= ${PYXML}
USE_GNOME= pygtk2
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
post-patch:
${REINPLACE_CMD} 's/from.*import.*nested_scopes//' ${WRKSRC}/setup.py
diff --git a/textproc/py-xmltv/Makefile b/textproc/py-xmltv/Makefile
index 7bee9b813d8c..9f8eaba81024 100644
--- a/textproc/py-xmltv/Makefile
+++ b/textproc/py-xmltv/Makefile
@@ -14,8 +14,8 @@ COMMENT= Python module that provides access to XMLTV TV listings
LICENSE= LGPL21
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= python-xmltv
PROJECTHOST= python-xmltv
OPTIONS_DEFINE= DOCS
diff --git a/textproc/py-zope.app.i18n/Makefile b/textproc/py-zope.app.i18n/Makefile
index 74d6003940f7..363429629299 100644
--- a/textproc/py-zope.app.i18n/Makefile
+++ b/textproc/py-zope.app.i18n/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.9:${PORTSDIR}/devel/py-zop
${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-zope.app.locales/Makefile b/textproc/py-zope.app.locales/Makefile
index 918069165a69..c13045569d93 100644
--- a/textproc/py-zope.app.locales/Makefile
+++ b/textproc/py-zope.app.locales/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n
${PYTHON_PKGNAMEPREFIX}zope.app.applicationcontrol>=0:${PORTSDIR}/devel/py-zope.app.applicationcontrol \
${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:${PORTSDIR}/devel/py-zope.app.appsetup
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-zope.i18nmessageid/Makefile b/textproc/py-zope.i18nmessageid/Makefile
index adfda2445f1a..b198b0beb29a 100644
--- a/textproc/py-zope.i18nmessageid/Makefile
+++ b/textproc/py-zope.i18nmessageid/Makefile
@@ -12,8 +12,7 @@ DIST_SUBDIR= zope
MAINTAINER= zope@FreeBSD.org
COMMENT= Message Identifiers for internationalization
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-zope.structuredtext/Makefile b/textproc/py-zope.structuredtext/Makefile
index 9609c296f127..87f43f3a2bfb 100644
--- a/textproc/py-zope.structuredtext/Makefile
+++ b/textproc/py-zope.structuredtext/Makefile
@@ -13,8 +13,7 @@ COMMENT= StructuredText parser
LICENSE= ZPL21
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-zope.tal/Makefile b/textproc/py-zope.tal/Makefile
index 846c098a0ffd..1232116ec407 100644
--- a/textproc/py-zope.tal/Makefile
+++ b/textproc/py-zope.tal/Makefile
@@ -16,9 +16,7 @@ LICENSE= ZPL21
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
-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/textproc/py-zpt/Makefile b/textproc/py-zpt/Makefile
index d4b01f8b4148..8958b95c4083 100644
--- a/textproc/py-zpt/Makefile
+++ b/textproc/py-zpt/Makefile
@@ -12,9 +12,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Zope-less version of Zope Page Templates
-USE_PYTHON= yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
WRKSRC= ${WRKDIR}/ZopePageTemplates
.include <bsd.port.mk>
diff --git a/textproc/py2html/Makefile b/textproc/py2html/Makefile
index 634d37630a4e..00a8c4d74fbd 100644
--- a/textproc/py2html/Makefile
+++ b/textproc/py2html/Makefile
@@ -11,9 +11,8 @@ PKGNAMESUFFIX= -${PYTHON_PKGNAMEPREFIX:S/-//}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python Highlighter for HTML
-USES= shebangfix
-USE_PYTHON= 2
-USE_PYDISTUTILS= yes
+USES= python:2 shebangfix
+USE_PYTHON= distutils autoplist
python_OLD_CMD= /usr/bin/env python
python_CMD= ${PYTHON_CMD}
diff --git a/textproc/py3-libxml2/Makefile b/textproc/py3-libxml2/Makefile
index b311dfef377e..775a3f7e36d5 100644
--- a/textproc/py3-libxml2/Makefile
+++ b/textproc/py3-libxml2/Makefile
@@ -17,8 +17,7 @@ PLIST= ${.CURDIR}/pkg-plist
USE_GNOME+= libxml2
USES= python:3
-USE_PYDISTUTILS=yes
-#USE_PYTHON= distutils:3
+USE_PYTHON= distutils
PYDISTUTILS_EGGINFO= libxml2_python-${PORTVERSION}-py${PYTHON_VER}.egg-info
PLIST_SUB+= PYTVER=${PYTHON_VER:S/.//}
diff --git a/textproc/pychm/Makefile b/textproc/pychm/Makefile
index f2dc09c3b96d..7395723dfef3 100644
--- a/textproc/pychm/Makefile
+++ b/textproc/pychm/Makefile
@@ -12,8 +12,8 @@ COMMENT= Bindings for CHMLIB library
LIB_DEPENDS= libchm.so:${PORTSDIR}/misc/chmlib
NO_BUILD= yes
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= python
+USE_PYTHON= distutils
.include <bsd.port.pre.mk>
diff --git a/textproc/pystemmer/Makefile b/textproc/pystemmer/Makefile
index 972055771fc1..adca609c70b8 100644
--- a/textproc/pystemmer/Makefile
+++ b/textproc/pystemmer/Makefile
@@ -12,8 +12,7 @@ DISTNAME= PyStemmer-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Snowball Stemming Algorithms for Information Retrieval
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/queequeg/Makefile b/textproc/queequeg/Makefile
index 95cce66b9e8f..55b807ec8001 100644
--- a/textproc/queequeg/Makefile
+++ b/textproc/queequeg/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS= python:${PORTSDIR}/lang/python \
RUN_DEPENDS= python:${PORTSDIR}/lang/python \
${PYTHON_SITELIBDIR}/cdbmodule.so:${PORTSDIR}/databases/py-cdb
-USE_PYTHON= 2
+USES= python:2
MAKE_ARGS= dict WORDNETDICT="${LOCALBASE}/share/WordNet"
PORTDOCS= address.png index-e.html index.html
diff --git a/textproc/rubygem-albino/Makefile b/textproc/rubygem-albino/Makefile
index 0a0f4a07bed7..97b5a24b6c78 100644
--- a/textproc/rubygem-albino/Makefile
+++ b/textproc/rubygem-albino/Makefile
@@ -12,8 +12,8 @@ COMMENT= Ruby wrapper for pygmentize
RUN_DEPENDS= rubygem-posix-spawn>=0.3.6:${PORTSDIR}/devel/rubygem-posix-spawn \
${PYTHON_PKGNAMEPREFIX}pygments>=0.8:${PORTSDIR}/textproc/py-pygments
+USES= python
USE_RUBY= yes
-USE_PYTHON= yes
USE_RUBYGEMS= yes
RUBYGEM_AUTOPLIST= yes
diff --git a/textproc/rubygem-colorator/Makefile b/textproc/rubygem-colorator/Makefile
index 16f70003ec14..0550f20c45d2 100644
--- a/textproc/rubygem-colorator/Makefile
+++ b/textproc/rubygem-colorator/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES= RG
MAINTAINER= ruby@FreeBSD.org
COMMENT= Colorize your text in a terminal with a simple API
+USES= python
USE_RUBY= yes
-USE_PYTHON= yes
USE_RUBYGEMS= yes
RUBYGEM_AUTOPLIST= yes
diff --git a/textproc/rubygem-cssmin/Makefile b/textproc/rubygem-cssmin/Makefile
index 33e5997bc1e9..9a2dee6efd77 100644
--- a/textproc/rubygem-cssmin/Makefile
+++ b/textproc/rubygem-cssmin/Makefile
@@ -8,8 +8,8 @@ MASTER_SITES= RG
MAINTAINER= ruby@FreeBSD.org
COMMENT= Ruby library for minifying CSS. Inspired by cssmin.js and YUI Compressor
+USES= python
USE_RUBY= yes
-USE_PYTHON= yes
USE_RUBYGEMS= yes
RUBYGEM_AUTOPLIST= yes
diff --git a/textproc/rubygem-jsmin/Makefile b/textproc/rubygem-jsmin/Makefile
index 68f728351777..164884974a9b 100644
--- a/textproc/rubygem-jsmin/Makefile
+++ b/textproc/rubygem-jsmin/Makefile
@@ -8,8 +8,8 @@ MASTER_SITES= RG
MAINTAINER= ruby@FreeBSD.org
COMMENT= Ruby implementation of Douglas Crockford's JSMin JavaScript minifier
+USES= python
USE_RUBY= yes
-USE_PYTHON= yes
USE_RUBYGEMS= yes
RUBYGEM_AUTOPLIST= yes
diff --git a/textproc/silvercity/Makefile b/textproc/silvercity/Makefile
index e33f3ca93253..14672f4acb44 100644
--- a/textproc/silvercity/Makefile
+++ b/textproc/silvercity/Makefile
@@ -10,9 +10,8 @@ DISTNAME= SilverCity-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Lexing package for over 20 programming and markup languages
-USES= dos2unix
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
+USES= dos2unix python
+USE_PYTHON= distutils
PYDISTUTILS_PKGNAME= SilverCity
.include <bsd.port.mk>
diff --git a/textproc/txt2tags/Makefile b/textproc/txt2tags/Makefile
index 2f6997a8efbd..1d712445bffd 100644
--- a/textproc/txt2tags/Makefile
+++ b/textproc/txt2tags/Makefile
@@ -10,7 +10,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Convert simply formatted text into markup (e.g., HTML)
-USE_PYTHON= 2
+USES= python:2
NO_BUILD= yes
PORTDOCS= ChangeLog README userguide.pdf
diff --git a/textproc/unoconv/Makefile b/textproc/unoconv/Makefile
index 312b6aaf60f7..cc3d469e2036 100644
--- a/textproc/unoconv/Makefile
+++ b/textproc/unoconv/Makefile
@@ -18,7 +18,7 @@ LICENSE= GPLv2
RUN_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
-USE_PYTHON= yes
+USES= python
NO_BUILD= yes
PORTDOCS= *
diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index b9231c0f66cd..2f787017ead7 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -14,9 +14,8 @@ LICENSE= BSD3CLAUSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.8:${PORTSDIR}/devel/py-lxml
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/textproc/yould/Makefile b/textproc/yould/Makefile
index 8a511a61a3cf..540a719e0a94 100644
--- a/textproc/yould/Makefile
+++ b/textproc/yould/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES= CHEESESHOP/source/y/${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Pronounceable word generator
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_AUTOPLIST= yes
+USES= python
+USE_PYTHON= distutils autoplist
PORTDOCS= NEWS.txt README.txt
post-install:
diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
index eb59c3329300..922784efdc7d 100644
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -59,7 +59,7 @@ PLIST_SUB+= WITH_PHP="@comment "
.endif
.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON= yes
+USES+= python
WITH_SWIG= yes
CMAKE_ARGS+= -DWITH_PYTHON:BOOL=true \
-DPYTHON_SWIG_INSTALL_DIR:FILEPATH=${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}