svn commit: r371288 - in head: irc/kvirc irc/py-fishcrypt irc/py-gozerbot irc/py-irc irc/py-supybot irc/py-supybot-plugins irc/qwebirc irc/weechat-devel irc/xchat irc/znc lang/cdent lang/clang-cher...

Mon Oct 20 17:52:25 UTC 2014

Author: mva
Date: Mon Oct 20 17:52:16 2014
New Revision: 371288
URL: https://svnweb.freebsd.org/changeset/ports/371288
QAT: https://qat.redports.org/buildarchive/r371288/

Log:
  - Convert ports of irc/ and lang/ to new USES=python
  
  Approved by:	portmgr (implicit)

Modified:
  head/irc/kvirc/Makefile
  head/irc/py-fishcrypt/Makefile
  head/irc/py-gozerbot/Makefile
  head/irc/py-irc/Makefile
  head/irc/py-supybot-plugins/Makefile
  head/irc/py-supybot/Makefile
  head/irc/qwebirc/Makefile
  head/irc/weechat-devel/Makefile
  head/irc/xchat/Makefile
  head/irc/znc/Makefile
  head/lang/cdent/Makefile
  head/lang/clang-cheri/Makefile
  head/lang/clang32/Makefile
  head/lang/gjs/Makefile
  head/lang/io/Makefile.addons
  head/lang/kroc/Makefile
  head/lang/py-clojure/Makefile
  head/lang/py-mx-base/Makefile
  head/lang/py-prolog/Makefile
  head/lang/pypy-devel/Makefile
  head/lang/pypy/Makefile
  head/lang/pypy3-devel/Makefile
  head/lang/python-doc-html/Makefile
  head/lang/python/Makefile
  head/lang/python2/Makefile
  head/lang/python3/Makefile
  head/lang/rust/Makefile
  head/lang/spidermonkey170/Makefile
  head/lang/spidermonkey185/Makefile
  head/lang/spidermonkey24/Makefile
  head/lang/tinypy/Makefile

Modified: head/irc/kvirc/Makefile
==============================================================================

--- head/irc/kvirc/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/irc/kvirc/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -87,7 +87,7 @@ CMAKE_ARGS+=	-DWANT_GSM=no
 
 #scripting support
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	yes
+USES+=		python
 PLIST_SUB+=	PYTHON=""
 .else
 CMAKE_ARGS+=	-DWANT_PYTHON=no

Modified: head/irc/py-fishcrypt/Makefile
==============================================================================
--- head/irc/py-fishcrypt/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/irc/py-fishcrypt/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -17,8 +17,7 @@ GH_PROJECT=	py-fishcrypt
 GH_TAGNAME=	${GH_COMMIT}
 GH_COMMIT= 	c001c75
 
-USES=		dos2unix
-USE_PYTHON_RUN=	yes
+USES=		dos2unix python:run
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message

Modified: head/irc/py-gozerbot/Makefile
==============================================================================
--- head/irc/py-gozerbot/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/irc/py-gozerbot/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	sten at blinkenlights.nl
 COMMENT=	Gozerbot - A modular Python IRC and Jabber bot
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-SUB_FILES=		pkg-message
+USES=		python
+USE_PYTHON=	distutils
+SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	XMPP MYSQL DOCS
 XMPP_DESC=	Jabber functions

Modified: head/irc/py-irc/Makefile
==============================================================================
--- head/irc/py-irc/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/irc/py-irc/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -17,10 +17,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:${PORTSDIR}/devel/py-hgtools \
 		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:${PORTSDIR}/devel/py-pytest-runner
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
-USES=		zip
+USES=		python zip
+USE_PYTHON=	distutils autoplist
 
 PORTEXAMPLES=	irccat.py irccat2.py servermap.py testbot.py \
 		dccreceive.py dccsend.py ssl-cat.py

Modified: head/irc/py-supybot-plugins/Makefile
==============================================================================
--- head/irc/py-supybot-plugins/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/irc/py-supybot-plugins/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -14,8 +14,7 @@ COMMENT=	Official plugin pack for Supybo
 
 RUN_DEPENDS=	supybot:${PORTSDIR}/irc/py-supybot
 
-USE_PYTHON=	yes
-USES=	tar:bzip2
+USES=		python tar:bzip2
 
 post-extract:
 # Delete, because it now included in irc/py-supybot

Modified: head/irc/py-supybot/Makefile
==============================================================================
--- head/irc/py-supybot/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/irc/py-supybot/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -11,9 +11,8 @@ DISTNAME=	Supybot-${PORTVERSION}
 MAINTAINER=	dhn at FreeBSD.org
 COMMENT=	Supybot - A Superb Python IRC bot
 
-USES=	tar:bzip2
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=		python tar:bzip2
+USE_PYTHON=	distutils
 PYDISTUTILS_PKGVERSION=	0.83.1+darcs
 PYDISTUTILS_EGGINFO=	supybot-${PORTVERSION}-py${PYTHON_VER}.egg-info
 

Modified: head/irc/qwebirc/Makefile
==============================================================================
--- head/irc/qwebirc/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/irc/qwebirc/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -12,10 +12,9 @@ EXTRACT_SUFX=	.gz
 MAINTAINER=	tabmow at freenode.net
 COMMENT=	Fast, easy to use, free, and open source web IRC client
 
-USES=		twisted:run,conch,mail,names,web,words
+USES=		python twisted:run,conch,mail,names,web,words
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
-USE_PYTHON=	yes
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
 do-install:

Modified: head/irc/weechat-devel/Makefile
==============================================================================
--- head/irc/weechat-devel/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/irc/weechat-devel/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -75,7 +75,7 @@ PLIST_SUB+=	ASPELL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	2
+USES+=		python:2
 CMAKE_ARGS+=	-DBSD_PYTHON_CMD=${PYTHON_CMD} \
 		-DBSD_PYTHON_VER=${PYTHON_VERSION}
 PLIST_SUB+=	PYTHON=""

Modified: head/irc/xchat/Makefile
==============================================================================
--- head/irc/xchat/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/irc/xchat/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -70,7 +70,7 @@ PLIST_SUB+=	PERL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	yes
+USES+=		python
 CONFIGURE_ARGS+=--enable-python
 PLIST_SUB+=	PYTHON=""
 .else

Modified: head/irc/znc/Makefile
==============================================================================
--- head/irc/znc/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/irc/znc/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -38,7 +38,7 @@ PERL_CONFIGURE_ON=	--enable-swig
 PERL_USES=	perl5
 PYTHON_BUILD_DEPENDS=	swig>=2.0.11:${PORTSDIR}/devel/swig20
 PYTHON_CONFIGURE_ON=	--enable-python=python-${PYTHON_VER} --enable-swig
-PYTHON_USES=	perl5
+PYTHON_USES=	perl5 python:3
 OPENSSL_CONFIGURE_OFF=	--disable-openssl
 TCL_CONFIGURE_ENABLE=	tcl
 
@@ -59,7 +59,6 @@ CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=		3
 USE_PERL5+=		build
 .endif
 

Modified: head/lang/cdent/Makefile
==============================================================================
--- head/lang/cdent/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/cdent/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -12,8 +12,7 @@ COMMENT=	Portable Module Programming Lan
 
 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>

Modified: head/lang/clang-cheri/Makefile
==============================================================================
--- head/lang/clang-cheri/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/clang-cheri/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -10,9 +10,8 @@ MASTER_SITE_SUBDIR=	brooks
 MAINTAINER=	brooks at 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
 

Modified: head/lang/clang32/Makefile
==============================================================================
--- head/lang/clang32/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/clang32/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -32,9 +32,8 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 
 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 \

Modified: head/lang/gjs/Makefile
==============================================================================
--- head/lang/gjs/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/gjs/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -17,8 +17,8 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDI
 
 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

Modified: head/lang/io/Makefile.addons
==============================================================================
--- head/lang/io/Makefile.addons	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/io/Makefile.addons	Mon Oct 20 17:52:16 2014	(r371288)
@@ -201,7 +201,7 @@ USE_PGSQL=	yes
 # Python
 #
 .if ${PORT_OPTIONS:MPython}
-USE_PYTHON=	yes
+USES+=		python
 .endif
 
 #

Modified: head/lang/kroc/Makefile
==============================================================================
--- head/lang/kroc/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/kroc/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -22,12 +22,11 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bas
 
 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

Modified: head/lang/py-clojure/Makefile
==============================================================================
--- head/lang/py-clojure/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/py-clojure/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -13,8 +13,7 @@ COMMENT=	Implementation of Clojure in Py
 
 LICENSE=	EPL
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>

Modified: head/lang/py-mx-base/Makefile
==============================================================================
--- head/lang/py-mx-base/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/py-mx-base/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -11,8 +11,8 @@ DISTNAME=	egenix-${PORTNAME}-${PORTVERSI
 MAINTAINER=	5u623l20 at 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
 

Modified: head/lang/py-prolog/Makefile
==============================================================================
--- head/lang/py-prolog/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/py-prolog/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -15,9 +15,8 @@ COMMENT=	Python extension embedding SWI-
 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>
 

Modified: head/lang/pypy-devel/Makefile
==============================================================================
--- head/lang/pypy-devel/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/pypy-devel/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -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

Modified: head/lang/pypy/Makefile
==============================================================================
--- head/lang/pypy/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/pypy/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -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

Modified: head/lang/pypy3-devel/Makefile
==============================================================================
--- head/lang/pypy3-devel/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/pypy3-devel/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -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

Modified: head/lang/python-doc-html/Makefile
==============================================================================
--- head/lang/python-doc-html/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/python-doc-html/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -16,8 +16,7 @@ COMMENT=	Documentation for the Python pr
 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}

Modified: head/lang/python/Makefile
==============================================================================
--- head/lang/python/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/python/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -13,8 +13,8 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	python at 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 \

Modified: head/lang/python2/Makefile
==============================================================================
--- head/lang/python2/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/python2/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -11,9 +11,9 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	python at 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} \

Modified: head/lang/python3/Makefile
==============================================================================
--- head/lang/python3/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/python3/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -11,9 +11,9 @@ EXTRACT_ONLY=
 MAINTAINER=	python at 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} \

Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/rust/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -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)

Modified: head/lang/spidermonkey170/Makefile
==============================================================================
--- head/lang/spidermonkey170/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/spidermonkey170/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -18,10 +18,9 @@ LIB_DEPENDS=		libnspr4.so:${PORTSDIR}/de
 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
 

Modified: head/lang/spidermonkey185/Makefile
==============================================================================
--- head/lang/spidermonkey185/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/spidermonkey185/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -18,11 +18,10 @@ LIB_DEPENDS=		libnspr4.so:${PORTSDIR}/de
 
 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
 

Modified: head/lang/spidermonkey24/Makefile
==============================================================================
--- head/lang/spidermonkey24/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/spidermonkey24/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -18,10 +18,10 @@ LIB_DEPENDS=		libnspr4.so:${PORTSDIR}/de
 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
 

Modified: head/lang/tinypy/Makefile
==============================================================================
--- head/lang/tinypy/Makefile	Mon Oct 20 17:36:02 2014	(r371287)
+++ head/lang/tinypy/Makefile	Mon Oct 20 17:52:16 2014	(r371288)
@@ -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
 
