- Convert ports of math/ to new USES=python

Approved by:	portmgr (implicit)

50 files changed, 96 insertions, 142 deletions

diff --git a/math/aspcud/Makefile b/math/aspcud/Makefile
index 96ad3027cdaa..2bea62db5b72 100644
--- a/math/aspcud/Makefile
+++ b/math/aspcud/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS=	gringo:${PORTSDIR}/math/gringo \
 				clasp:${PORTSDIR}/math/clasp \
 				bash:${PORTSDIR}/shells/bash
 
-USE_PYTHON_RUN=	yes
-USES=	compiler:c++11-lang cmake:outsource
+USES=	compiler:c++11-lang cmake:outsource python:run
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man
 
diff --git a/math/biggles/Makefile b/math/biggles/Makefile
index c8b84c95ae54..517de044833c 100644
--- a/math/biggles/Makefile
+++ b/math/biggles/Makefile
@@ -16,8 +16,7 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libplot.so:${PORTSDIR}/graphics/plotutils
 
-USES=		gmake
-USE_PYTHON=	2
+USES=		gmake python:2
 MAKE_ARGS=	CC="${CC}" \
 		CFLAGS="${CFLAGS} -fPIC" \
 		LIBPLOT_CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/math/clarence/Makefile b/math/clarence/Makefile
index b7ce17daba64..d2ed6f167468 100644
--- a/math/clarence/Makefile
+++ b/math/clarence/Makefile
@@ -11,9 +11,8 @@ MASTER_SITES=	http://www.sourcefiles.org/Productivity_Tools/Calculators/ \
 MAINTAINER=	psh@iki.fi
 COMMENT=	Programmer's calculator
 
-USES=		shebangfix
+USES=		python shebangfix
 USE_GNOME=	pygtk2
-USE_PYTHON=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/clarence man/man1/clarence.1.gz
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index ae270fcdd894..c0ce7a031d93 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -26,9 +26,8 @@ LIB_DEPENDS=	libarpack.so:${PORTSDIR}/math/arpack			\
 		libportaudio.so:${PORTSDIR}/audio/portaudio		\
 		libumfpack.so:${PORTSDIR}/math/suitesparse
 
-USES=		cmake:outsource dos2unix fortran pkgconfig
+USES=		cmake:outsource dos2unix fortran pkgconfig python:build
 USE_GL=		yes
-USE_PYTHON_BUILD=	yes
 USE_QT4=	gui network opengl svg webkit xml			\
 		moc_build qmake_build rcc_build uic_build
 CMAKE_ARGS=	-DCMAKE_LIBRARY_PATH:STRING="${LOCALBASE}/llvm33/lib"	\
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 5930ea0e3d46..1e9c7ff703bc 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -21,9 +21,8 @@ LIB_DEPENDS=	libgoffice-0.10.so:${PORTSDIR}/devel/goffice010 \
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
-		shebangfix tar:xz
+		python:2 shebangfix tar:xz
 USE_GNOME=	gnomehier gnomeprefix intlhack libgsf pygobject3
-USE_PYTHON=	2
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
diff --git a/math/hfst/Makefile b/math/hfst/Makefile
index 302c79f44733..f36703a019f9 100644
--- a/math/hfst/Makefile
+++ b/math/hfst/Makefile
@@ -11,10 +11,9 @@ MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	A toolkit for for processing natural language morphologies
 
-USES=		pkgconfig shebangfix libtool
+USES=		pkgconfig shebangfix libtool python:2
 USE_GNOME=	glib20 libxml2
 USE_GCC=	yes
-USE_PYTHON=	2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-readline --with-unicode-handler=glib --enable-proc --enable-tagger --enable-xfst --enable-shuffle --enable-traverse
 SHEBANG_FILES=	tools/src/hfst-tagger/src/hfst_tagger_compute_data_statistics.py
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 608626e35493..a7b274874c28 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -52,7 +52,7 @@ SVERSION=		4
 TEST_TARGET=		lapack_testing
 .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
 S=			${PYTHON_CMD}
-USE_PYTHON_BUILD=	yes
+USES+=			python:build
 .else
 S=			\#
 .endif
diff --git a/math/lybniz/Makefile b/math/lybniz/Makefile
index 845df3fe4032..43157058a2a1 100644
--- a/math/lybniz/Makefile
+++ b/math/lybniz/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Mathematical function graph plotter
 
 LICENSE=	BSD3CLAUSE
 
-USE_PYTHON=	yes
+USES=		python
+USE_PYTHON=	distutils
 USE_GNOME=	pygtk2 gnomehier
-USE_PYDISTUTILS=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g'\
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 535d6798c44e..ab9348a0f06a 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS=	${LOCALBASE}/bin/${LISPPORT} \
 		${LOCALBASE}/bin/gnuplot:${PORTSDIR}/math/gnuplot \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 
-USES=			gmake makeinfo perl5 tk:84+
+USES=			gmake makeinfo perl5 python:build tk:84+
 USE_PERL5=		build
-USE_PYTHON_BUILD=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--with-posix-shell=${LOCALBASE}/bin/bash \
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 58e7fcd23597..f19b52529cbf 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -72,7 +72,7 @@ PLIST_SUB+=	LUA="@comment "
 BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13 \
 		${PYNUMPY}
 RUN_DEPENDS+=	${PYNUMPY}
-USE_PYTHON=	yes
+USES+=		python
 PLIST_SUB+=	PYTHON=""
 CONFIGURE_ENV+=	PYTHON_VERSION="${PYTHON_VERSION}"
 .else
diff --git a/math/py-apgl/Makefile b/math/py-apgl/Makefile
index b59becf59eb7..4a1564422dec 100644
--- a/math/py-apgl/Makefile
+++ b/math/py-apgl/Makefile
@@ -17,8 +17,7 @@ BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0.7.0:${PORTSDIR}/science/py-scipy
 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/math/py-basemap-data/Makefile b/math/py-basemap-data/Makefile
index 745b2c73cfc6..b4f46024be01 100644
--- a/math/py-basemap-data/Makefile
+++ b/math/py-basemap-data/Makefile
@@ -11,9 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	mainland@apeiron.net
 COMMENT=	Map data for py-basemap
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 DATADIR=	${PREFIX}/share/py-${PORTNAME}
 MAKE_ENV=	BASEMAP_DATA_PATH=${DATADIR}
diff --git a/math/py-basemap/Makefile b/math/py-basemap/Makefile
index db5e679dcf7a..22e0f3677269 100644
--- a/math/py-basemap/Makefile
+++ b/math/py-basemap/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Plots data on map projections with continental and political boundaries
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/matplotlib/:${PORTSDIR}/math/py-matplotlib
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 DATADIR=	${PREFIX}/share/py-${PORTNAME}-data
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/math/py-bitvector/Makefile b/math/py-bitvector/Makefile
index 82be6717dd48..edded3b5b992 100644
--- a/math/py-bitvector/Makefile
+++ b/math/py-bitvector/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Pure-Python memory-efficient packed representation for bit arrays
 
 LICENSE=	PSFL
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	BitVector
 
 PORTDOCS=	README BitVector-${PORTVERSION}.html
diff --git a/math/py-bottleneck/Makefile b/math/py-bottleneck/Makefile
index b8a6c2910482..48f281f0d9ef 100644
--- a/math/py-bottleneck/Makefile
+++ b/math/py-bottleneck/Makefile
@@ -19,9 +19,8 @@ BUILD_DEPENDS=	${PYNUMPY} \
 RUN_DEPENDS=	${PYNUMPY}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	DOCS
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/math/py-fastcluster/Makefile b/math/py-fastcluster/Makefile
index ab62de0ca102..fba98983c025 100644
--- a/math/py-fastcluster/Makefile
+++ b/math/py-fastcluster/Makefile
@@ -22,9 +22,8 @@ PORTDOCS=	CITATION.txt \
 		NEWS.txt \
 		README.txt
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/math/py-ffc/Makefile b/math/py-ffc/Makefile
index 3bfe8dbb34df..728f8d11d3e8 100644
--- a/math/py-ffc/Makefile
+++ b/math/py-ffc/Makefile
@@ -12,8 +12,8 @@ COMMENT=	C++ code generator for multilinear forms
 
 LICENSE=	LGPL3
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
+USES=		python:2
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	FFC
 
 MMVERSION=	1.2
diff --git a/math/py-fiat/Makefile b/math/py-fiat/Makefile
index 7948eda0f362..faaec41bbd01 100644
--- a/math/py-fiat/Makefile
+++ b/math/py-fiat/Makefile
@@ -17,9 +17,8 @@ LICENSE=	LGPL3
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scientific>=0:${PORTSDIR}/math/py-scientific
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 MMVERSION=	1.1
 
diff --git a/math/py-fpconst/Makefile b/math/py-fpconst/Makefile
index 9a97393e7c2b..208e69f0033e 100644
--- a/math/py-fpconst/Makefile
+++ b/math/py-fpconst/Makefile
@@ -1,17 +1,16 @@
 # Created by: Rui Lopes <rui@ruilopes.com>
 # $FreeBSD$
 
-PORTNAME=		fpconst
-PORTVERSION=		0.7.2
-CATEGORIES=		math python
-MASTER_SITES=		CHEESESHOP
-PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
+PORTNAME=	fpconst
+PORTVERSION=	0.7.2
+CATEGORIES=	math python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		Utilities for handling IEEE 754 floating point special values
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Utilities for handling IEEE 754 floating point special values
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/math/py-gato/Makefile b/math/py-gato/Makefile
index b93620c15c00..426ec7476cf1 100644
--- a/math/py-gato/Makefile
+++ b/math/py-gato/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinte
 
 WRKSRC=		${WRKDIR}/Gato
 
-USE_PYTHON=	yes
+USES=		python
 
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}
 
diff --git a/math/py-gmpy/Makefile b/math/py-gmpy/Makefile
index 7b88e934bef8..cf00f16d7bda 100644
--- a/math/py-gmpy/Makefile
+++ b/math/py-gmpy/Makefile
@@ -13,10 +13,8 @@ COMMENT=	Python Extension that Wraps the GMP Library
 
 LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
 
-USES=		zip
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python zip
+USE_PYTHON=	distutils autoplist
 
 post-extract:
 	${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \
diff --git a/math/py-gnuplot/Makefile b/math/py-gnuplot/Makefile
index fdbc5032d107..ad8e973e5c5b 100644
--- a/math/py-gnuplot/Makefile
+++ b/math/py-gnuplot/Makefile
@@ -16,9 +16,8 @@ BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
 		${PYNUMPY}
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	*
 
diff --git a/math/py-graphillion/Makefile b/math/py-graphillion/Makefile
index bd0a2fee1055..1072eefec55f 100644
--- a/math/py-graphillion/Makefile
+++ b/math/py-graphillion/Makefile
@@ -12,11 +12,9 @@ COMMENT=	Fast, lightweight graphset operation library in Python
 
 LICENSE=	MIT
 
-USE_GITHUB=		yes
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
-
+USES=		python
+USE_PYTHON=	distutils autoplist
+USE_GITHUB=	yes
 GH_ACCOUNT=	takemaru
 GH_TAGNAME=	v${PORTVERSION}
 GH_COMMIT=	2c77c8d
diff --git a/math/py-gsl/Makefile b/math/py-gsl/Makefile
index 06240c5fa89a..f49ae56489ee 100644
--- a/math/py-gsl/Makefile
+++ b/math/py-gsl/Makefile
@@ -17,8 +17,7 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy/core/include/numpy/arrayobject.h:${POR
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numpy/__init__.py:${PORTSDIR}/math/py-numpy
 LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/math/py-igraph/Makefile b/math/py-igraph/Makefile
index e53884601a1f..7cab9b0cbc00 100644
--- a/math/py-igraph/Makefile
+++ b/math/py-igraph/Makefile
@@ -14,9 +14,8 @@ COMMENT=	High performance graph data structures and algorithms
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libigraph.so:${PORTSDIR}/math/igraph
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 USE_GNOME=	libxml2
 
 .include <bsd.port.mk>
diff --git a/math/py-mathdom/Makefile b/math/py-mathdom/Makefile
index cb0ae405ab52..0e7ad64028ad 100644
--- a/math/py-mathdom/Makefile
+++ b/math/py-mathdom/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Content MathML in Python
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/math/py-mpmath/Makefile b/math/py-mpmath/Makefile
index 468e737a63b0..da7753a05bb5 100644
--- a/math/py-mpmath/Makefile
+++ b/math/py-mpmath/Makefile
@@ -14,8 +14,7 @@ LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gmpy.so:${PORTSDIR}/math/py-gmpy
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/math/py-munkres/Makefile b/math/py-munkres/Makefile
index d5f319786f9f..7e0ec7c3def3 100644
--- a/math/py-munkres/Makefile
+++ b/math/py-munkres/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Python implementation of the munkres algorithm
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/munkres.py \
 		%%PYTHON_SITELIBDIR%%/munkres.pyc \
diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index 590836f3c674..916aeb363dc2 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Tools for complex networks
 
 LICENSE=	BSD3CLAUSE
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python shebangfix
+USE_PYTHON=	distutils autoplist
 
 PLIST_SUB+=	PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER}
 
@@ -23,8 +22,6 @@ OPTIONS_DEFINE=	EXAMPLES
 EXAMPLESDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 PORTEXAMPLES=	*
 
-USES=	shebangfix
-
 .include <bsd.port.options.mk>
 
 post-install:
diff --git a/math/py-numarray/Makefile b/math/py-numarray/Makefile
index bb6993938a2d..63b506eecf3c 100644
--- a/math/py-numarray/Makefile
+++ b/math/py-numarray/Makefile
@@ -10,9 +10,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Numeric array manipulation extension module for Python
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index 3551d2efb35d..acb85370f086 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -15,9 +15,8 @@ EXTRACT_ONLY=	Numeric-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Numeric Extension to Python
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 WRKSRC=		${WRKDIR}/Numeric-${PORTVERSION}
 
diff --git a/math/py-nzmath/Makefile b/math/py-nzmath/Makefile
index 83eacb8b4938..59e319eb1419 100644
--- a/math/py-nzmath/Makefile
+++ b/math/py-nzmath/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	NZMATH-${PORTVERSION}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Number theory oriented calculation system
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	NZMATH
 
 OPTIONS_DEFINE=	DOCS
diff --git a/math/py-patsy/Makefile b/math/py-patsy/Makefile
index 2546e57989e8..870c6bd469cb 100644
--- a/math/py-patsy/Makefile
+++ b/math/py-patsy/Makefile
@@ -16,9 +16,8 @@ LICENSE=	BSD
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	API-reference.rst \
 		R-comparison.rst \
diff --git a/math/py-plastex/Makefile b/math/py-plastex/Makefile
index b6632205534f..0342bfda9aef 100644
--- a/math/py-plastex/Makefile
+++ b/math/py-plastex/Makefile
@@ -12,8 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	LaTeX Document Processing Framework
 
 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/math/py-probstat/Makefile b/math/py-probstat/Makefile
index ee2a2b6b0bac..35bca4919e4e 100644
--- a/math/py-probstat/Makefile
+++ b/math/py-probstat/Makefile
@@ -12,8 +12,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Probability And Statistics Utils for Python
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/math/py-pybloom/Makefile b/math/py-pybloom/Makefile
index 8b2c92d1b1de..10254ae2317b 100644
--- a/math/py-pybloom/Makefile
+++ b/math/py-pybloom/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Probabilistic data structure
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bitarray>0:${PORTSDIR}/devel/py-bitarray
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/math/py-roman/Makefile b/math/py-roman/Makefile
index 7d0887671ef3..b06f9adc4585 100644
--- a/math/py-roman/Makefile
+++ b/math/py-roman/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Integer to Roman numerals converter
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/math/py-scientific/Makefile b/math/py-scientific/Makefile
index 610a73b822c0..1d7aeeb35a29 100644
--- a/math/py-scientific/Makefile
+++ b/math/py-scientific/Makefile
@@ -16,9 +16,8 @@ BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
 RUN_DEPENDS=	${PYNUMPY}
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/math/py-statsmodels/Makefile b/math/py-statsmodels/Makefile
index e3d304bdb540..6b4a77c61c9e 100644
--- a/math/py-statsmodels/Makefile
+++ b/math/py-statsmodels/Makefile
@@ -28,11 +28,9 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils py3kplist noegginfo
 PLIST_SUB=	PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO}
-PYTHON_P3K_PLIST_HACK=	yes
-PYDISTUTILS_NOEGGINFO=	yes
 PORTDOCS=	* .buildinfo
 PORTEXAMPLES=	*
 
diff --git a/math/py-svgmath/Makefile b/math/py-svgmath/Makefile
index fcf0578db344..fd62d9934b97 100644
--- a/math/py-svgmath/Makefile
+++ b/math/py-svgmath/Makefile
@@ -11,9 +11,7 @@ DISTNAME=	SVGMath-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MathML to SVG Converter in Python
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	SVGMath
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/math/py-symeig/Makefile b/math/py-symeig/Makefile
index 7dbe81da833b..256031c88ffb 100644
--- a/math/py-symeig/Makefile
+++ b/math/py-symeig/Makefile
@@ -19,10 +19,8 @@ RUN_DEPENDS+=	${PYNUMPY}
 LATEST_LINK=	py-${PORTNAME}
 OPTIONSFILE=	${PORT_DBDIR}/py-numpy/options
 
-USES=		fortran
-USE_PYTHON=	2
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		fortran python:2
+USE_PYTHON=	distutils autoplist
 
 LDFLAGS+=	-shared
 
diff --git a/math/py-sympy/Makefile b/math/py-sympy/Makefile
index 102a17e8969d..5ce11abfc741 100644
--- a/math/py-sympy/Makefile
+++ b/math/py-sympy/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Python Library For Symbolic Mathematics
 
 LICENSE=	BSD
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	PYGLET
 PYGLET_DESC=	Enable plotting support
diff --git a/math/py-ufl/Makefile b/math/py-ufl/Makefile
index b84edd4e1006..959831f01402 100644
--- a/math/py-ufl/Makefile
+++ b/math/py-ufl/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Unified Form Language for finite element discretizations
 
 LICENSE=	LGPL3
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 MMVERSION=	1.2
 
diff --git a/math/py-viper/Makefile b/math/py-viper/Makefile
index 1438b06ea0b8..7cebb2985f86 100644
--- a/math/py-viper/Makefile
+++ b/math/py-viper/Makefile
@@ -12,9 +12,8 @@ COMMENT=	Minimalistic scientific plotter and visualization module
 
 LICENSE=	LGPL3
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python:2
+USE_PYTHON=	distutils autoplist
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|data_files=\[(join("share", "man", "man1"),|data_files=\[(join("man", "man1"),|' \
diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index c0ff554dd6fa..b7d393bf49a5 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -39,7 +39,7 @@ STRIP_FILES=	bin/qtiplot share/qtiplot/fitPlugins/*.so.1.0.0
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	yes
+USES+=		python
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
 PLIST_SUB+=	PYTHON=""
diff --git a/math/rpy/Makefile b/math/rpy/Makefile
index 46c2665507ca..d8e44fd1c8a0 100644
--- a/math/rpy/Makefile
+++ b/math/rpy/Makefile
@@ -18,9 +18,8 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
 		R:${PORTSDIR}/math/R
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 LDFLAGS+=	-L${LOCALBASE}/lib/R/modules -L${LOCALBASE}/lib/R/lib
 
 post-patch:
diff --git a/math/rpy2/Makefile b/math/rpy2/Makefile
index 5e67d0688df9..e61002153f1a 100644
--- a/math/rpy2/Makefile
+++ b/math/rpy2/Makefile
@@ -17,10 +17,8 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
 		R:${PORTSDIR}/math/R
 
-USES=		readline
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python readline
+USE_PYTHON=	distutils autoplist
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py
diff --git a/math/saga/Makefile b/math/saga/Makefile
index 0c59ab6c0f02..a9c53144aa8f 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -32,10 +32,9 @@ CFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -lopencv_contrib
 # Python no option any more, because it can't be turned off completely
-USE_PYTHON=	2
 USE_LDCONFIG=	yes
 USE_WX=		3.0+
-USES=		compiler:gcc-c++11-lib iconv:wchar_t dos2unix libtool
+USES=		compiler:gcc-c++11-lib iconv:wchar_t dos2unix libtool python:2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WX_UNICODE=	yes
 
diff --git a/math/ufc/Makefile b/math/ufc/Makefile
index 5afd59d2b571..38bf94508512 100644
--- a/math/ufc/Makefile
+++ b/math/ufc/Makefile
@@ -15,8 +15,8 @@ LIB_DEPENDS=	libboost_math_c99.so:${PORTSDIR}/devel/boost-libs
 
 # LICENSE=	public domain
 
-USES=		cmake
-USE_PYTHON=	2
+USES=		cmake python:2
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	ufc
 
 CMAKE_ARGS+=	-DUFC_PKGCONFIG_DIR=${PREFIX}/libdata/pkgconfig
diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index 00418022cc9b..db091dfc40c7 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -144,7 +144,8 @@ IGNORE=		python wrapping does not stage properly
 IGNORE=		python wrapping requires shared libraries.\
 		Run make config again and enable the SHARED option
 .endif
-USE_PYTHON=	yes
+USES+=		python
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	VTK
 # INSTALLS_EGGINFO support has been removed
 # INSTALLS_EGGINFO=	yes