- Convert ports of irc/ and lang/ to new USES=python

Approved by:	portmgr (implicit)

21 files changed, 34 insertions, 46 deletions

diff --git a/lang/cdent/Makefile b/lang/cdent/Makefile
index 65930822597c..aa962722af0a 100644
--- a/lang/cdent/Makefile
+++ b/lang/cdent/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Portable Module Programming Language
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/yaml/__init__.py:${PORTSDIR}/devel/py-yaml
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/lang/clang-cheri/Makefile b/lang/clang-cheri/Makefile
index 63a24ea6d45c..50ac3e67e829 100644
--- a/lang/clang-cheri/Makefile
+++ b/lang/clang-cheri/Makefile
@@ -10,9 +10,8 @@ MASTER_SITE_SUBDIR=	brooks
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and C++ compiler with CHERI CPU support
 
-USES=		cmake:outsource compiler:c++11-lib ninja perl5 shebangfix \
-		tar:bzip2
-USE_PYTHON=	yes
+USES=		cmake:outsource compiler:c++11-lib ninja perl5 python \
+		shebangfix tar:bzip2
 
 BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13
 
diff --git a/lang/clang32/Makefile b/lang/clang32/Makefile
index 49ee5f77d021..54f990ab81d5 100644
--- a/lang/clang32/Makefile
+++ b/lang/clang32/Makefile
@@ -32,9 +32,8 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_PREFIX=	${LLVM_PREFIX}
-USES=		gmake perl5
+USES=		gmake perl5 python:build
 USE_LDCONFIG=	yes
-USE_PYTHON_BUILD=	yes
 
 MAKE_ARGS=	CLANG_TBLGEN=${WRKSRC}/${RELTYPE}/bin/clang-tblgen \
 		LLVMIncDir=${LLVM_PREFIX}/include \
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index 26829de2311f..efbbe8d248ee 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 
 CONFLICTS_BUILD=spidermonkey17-1.7.*
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig shebangfix tar:xz
-USE_PYTHON_BUILD=2
+USES=		gettext gmake libtool:keepla pathfix pkgconfig python:2,build \
+		shebangfix tar:xz
 USE_GNOME=	cairo glib20 gnomeprefix introspection:build intlhack
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/lang/io/Makefile.addons b/lang/io/Makefile.addons
index a94777b54041..fe6ad01af40d 100644
--- a/lang/io/Makefile.addons
+++ b/lang/io/Makefile.addons
@@ -201,7 +201,7 @@ USE_PGSQL=	yes
 # Python
 #
 .if ${PORT_OPTIONS:MPython}
-USE_PYTHON=	yes
+USES+=		python
 .endif
 
 #
diff --git a/lang/kroc/Makefile b/lang/kroc/Makefile
index 6b8dbbb41bd8..654558f3336c 100644
--- a/lang/kroc/Makefile
+++ b/lang/kroc/Makefile
@@ -22,12 +22,11 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 ONLY_FOR_ARCHS=	i386
 
-USES=		pathfix pkgconfig tar:bzip2
+USES=		pathfix pkgconfig python tar:bzip2
 PATHFIX_MAKEFILEIN=	Makefile.am
 USE_LDCONFIG=	yes
 USE_GL=		yes
 USE_MYSQL=	yes
-USE_PYTHON=	yes
 USE_SDL=	sdl sound
 USE_GNOME=	libxslt
 USE_AUTOTOOLS=	autoconf:env automake:env
diff --git a/lang/py-clojure/Makefile b/lang/py-clojure/Makefile
index a83d977e5db2..a2b1a0e858cc 100644
--- a/lang/py-clojure/Makefile
+++ b/lang/py-clojure/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Implementation of Clojure in Python
 
 LICENSE=	EPL
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/lang/py-mx-base/Makefile b/lang/py-mx-base/Makefile
index ecd692200a06..1cd22a4e93aa 100644
--- a/lang/py-mx-base/Makefile
+++ b/lang/py-mx-base/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	egenix-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	eGenix mx-Extension Series for Python
 
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
+USES=		python:2
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	egenix-mx-base
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}-nspkg.pth
 
diff --git a/lang/py-prolog/Makefile b/lang/py-prolog/Makefile
index dc09011d4417..eb82d86fb1c7 100644
--- a/lang/py-prolog/Makefile
+++ b/lang/py-prolog/Makefile
@@ -15,9 +15,8 @@ COMMENT=	Python extension embedding SWI-Prolog
 BUILD_DEPENDS=	swipl:${PORTSDIR}/lang/swi-pl
 RUN_DEPENDS=	swipl:${PORTSDIR}/lang/swi-pl
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.pre.mk>
 
diff --git a/lang/pypy-devel/Makefile b/lang/pypy-devel/Makefile
index 9d8f0535c88d..dcba01486760 100644
--- a/lang/pypy-devel/Makefile
+++ b/lang/pypy-devel/Makefile
@@ -69,7 +69,7 @@ PYTHON_CMD?=	${LOCALBASE}/bin/pypy
 .elif ${PORT_OPTIONS:MPYPY_MINMEM}
 PYTHON_CMD?=	"${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300"
 .else
-USE_PYTHON_BUILD=	2
+USES+=		python:2,build
 .endif
 
 # List of PyPy instances
diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile
index dfd9d02b54a5..494f6c7cccc9 100644
--- a/lang/pypy/Makefile
+++ b/lang/pypy/Makefile
@@ -70,7 +70,7 @@ PYTHON_CMD?=	${LOCALBASE}/bin/pypy
 .elif ${PORT_OPTIONS:MPYPY_MINMEM}
 PYTHON_CMD?=	"${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300"
 .else
-USE_PYTHON_BUILD=	2
+USES+=		python:2,build
 .endif
 
 # List of PyPy instances
diff --git a/lang/pypy3-devel/Makefile b/lang/pypy3-devel/Makefile
index 586d8b45947e..6fbcd1584b26 100644
--- a/lang/pypy3-devel/Makefile
+++ b/lang/pypy3-devel/Makefile
@@ -70,7 +70,7 @@ PYTHON_CMD?=	${LOCALBASE}/bin/pypy
 .elif ${PORT_OPTIONS:MPYPY_MINMEM}
 PYTHON_CMD?=	"${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300"
 .else
-USE_PYTHON_BUILD=	2
+USES+=		python:2,build
 .endif
 
 # List of PyPy instances
diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile
index ecf1fadb032b..4de64b1434cb 100644
--- a/lang/python-doc-html/Makefile
+++ b/lang/python-doc-html/Makefile
@@ -16,8 +16,7 @@ COMMENT=	Documentation for the Python programming language
 PORTSCOUT=	ignore:1
 
 NO_BUILD=	yes
-USES=			tar:bzip2
-USE_PYTHON_BUILD=	yes
+USES=		python:build tar:bzip2
 
 DOCSDIR=	${PREFIX}/share/doc/${PYTHON_VERSION}
 PLIST=		${WRKDIR}/pkg-plist.${DOCFORMAT}
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 30357ebf55fd..4f0bd347fa08 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -13,8 +13,8 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	The "meta-port" for the default version of Python interpreter
 
-USE_PYTHON_RUN=	yes
-NO_BUILD=	yes
+USES=			python:run
+NO_BUILD=		yes
 PYTHON_NO_DEPENDS=	yes
 
 PLIST_FILES=	bin/2to3 \
diff --git a/lang/python2/Makefile b/lang/python2/Makefile
index 6b0e31e0d1b0..421647306d18 100644
--- a/lang/python2/Makefile
+++ b/lang/python2/Makefile
@@ -11,9 +11,9 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	The "meta-port" for version 2 of the Python interpreter
 
-USE_PYTHON_RUN=	yes
-PYTHON_VERSION=	${PYTHON2_DEFAULT_VERSION}
-NO_BUILD=	yes
+USES=			python:run
+PYTHON_VERSION=		${PYTHON2_DEFAULT_VERSION}
+NO_BUILD=		yes
 PYTHON_NO_DEPENDS=	yes
 
 PLIST_FILES=	bin/2to3-${PYTHON_MAJOR_VER} \
diff --git a/lang/python3/Makefile b/lang/python3/Makefile
index f5e0b35f9685..e6f74b55720a 100644
--- a/lang/python3/Makefile
+++ b/lang/python3/Makefile
@@ -11,9 +11,9 @@ EXTRACT_ONLY=
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	The "meta-port" for version 3 of the Python interpreter
 
-USE_PYTHON_RUN=	yes
-PYTHON_VERSION=	${PYTHON3_DEFAULT_VERSION}
-NO_BUILD=	yes
+USES=			python:run
+PYTHON_VERSION=		${PYTHON3_DEFAULT_VERSION}
+NO_BUILD=		yes
 PYTHON_NO_DEPENDS=	yes
 
 PLIST_FILES=	bin/2to3-${PYTHON_MAJOR_VER} \
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index ad68dea2ec7f..73e8337af073 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -27,14 +27,12 @@ RUST_SOURCE=	${DISTNAME}${EXTRACT_SUFX}
 RUST_BOOT=	rust-stage0-${RUST_BOOT_SIG}.tar.bz2
 RUST_BOOT_SIG=	2014-06-21-db9af1d-freebsd-x86_64-ef2bd0fc0b0efa2bd6f5c1eaa60a2ec8df533254
 
-USES=		gmake perl5
+USES=		gmake perl5 python:2
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-valgrind --disable-docs \
 		--enable-clang --mandir=${MANPREFIX}/man
 USE_LDCONFIG=	yes
 USE_PERL5=	build
-USE_PYTHON=	yes
-USE_PYTHON_BUILD=	2
 MAKE_ARGS=	ARCH=x86_64
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
diff --git a/lang/spidermonkey170/Makefile b/lang/spidermonkey170/Makefile
index 1019605ef70d..800f551df08e 100644
--- a/lang/spidermonkey170/Makefile
+++ b/lang/spidermonkey170/Makefile
@@ -18,10 +18,9 @@ LIB_DEPENDS=		libnspr4.so:${PORTSDIR}/devel/nspr
 CONFLICTS=		njs-[0-9]*
 
 GNU_CONFIGURE=		yes
-USES=			gmake pathfix perl5
+USES=			gmake pathfix perl5 python:2,build
 USE_PERL5=		build
 USE_LDCONFIG=		yes
-USE_PYTHON_BUILD=	2
 
 WRKSRC=			${WRKDIR}/mozjs${PORTVERSION}/js/src
 
diff --git a/lang/spidermonkey185/Makefile b/lang/spidermonkey185/Makefile
index 1d9d9f259226..35d20f50222b 100644
--- a/lang/spidermonkey185/Makefile
+++ b/lang/spidermonkey185/Makefile
@@ -18,11 +18,10 @@ LIB_DEPENDS=		libnspr4.so:${PORTSDIR}/devel/nspr
 
 CONFLICTS=		njs-[0-9]*
 
-USES=			gmake pathfix perl5 pkgconfig
+USES=			gmake pathfix perl5 pkgconfig python:2,build
 GNU_CONFIGURE=		yes
 USE_LDCONFIG=		yes
 USE_PERL5=		build
-USE_PYTHON_BUILD=	2
 
 WRKSRC=			${WRKDIR}/js-${PORTVERSION}/js/src
 
diff --git a/lang/spidermonkey24/Makefile b/lang/spidermonkey24/Makefile
index 3fb481a53c2b..6f1093713b6d 100644
--- a/lang/spidermonkey24/Makefile
+++ b/lang/spidermonkey24/Makefile
@@ -18,10 +18,10 @@ LIB_DEPENDS=		libnspr4.so:${PORTSDIR}/devel/nspr
 CONFLICTS=		njs-[0-9]*
 
 GNU_CONFIGURE=		yes
-USES=			compiler:c11 gmake pathfix perl5 readline tar:bzip2
+USES=			compiler:c11 gmake pathfix perl5 python:2,build \
+			readline tar:bzip2
 USE_PERL5=		build
 USE_LDCONFIG=		yes
-USE_PYTHON_BUILD=	2
 
 WRKSRC=			${WRKDIR}/mozjs-${PORTVERSION}/js/src
 
diff --git a/lang/tinypy/Makefile b/lang/tinypy/Makefile
index bc44ed8d0e08..ae5a52e8b5e0 100644
--- a/lang/tinypy/Makefile
+++ b/lang/tinypy/Makefile
@@ -13,11 +13,10 @@ LICENSE=	MIT PSFL
 LICENSE_COMB=	multi
 LICENSE_FILE=	LICENSE.txt
 
-USE_PYTHON_BUILD=	yes
-USE_PYDISTUTILS=	yes
+USES=		python:build
+USE_PYTHON=	distutils noegginfo
 
 PYDISTUTILS_BUILD_TARGET=	linux
-PYDISTUTILS_NOEGGINFO=		yes
 
 PLIST_FILES=	bin/tinypy