New USES=twisted, to replace the old USE_TWISTED knob.

twisted can be configured with the arguments run or build to replace
the previous USE_TWISTED_RUN and USE_TWISTED_BUILD knobs. The twisted
components can be added as comma-separated arguments. If you previously
wrote
    USE_TWISTED=        yes
    USE_TWISTED=        conch names
    USE_TWISTED_RUN=    yes
you now would write
    USES=       twisted
    USES=       twisted:conch,names
    USES=       twisted:run

28 files changed, 126 insertions, 118 deletions

diff --git a/CHANGES b/CHANGES
index ba396af..f1f4481 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,23 @@ in the release notes and/or placed into UPDATING.
 
 All ports committers are allowed to commit to this file.
 
+20131208:
+AUTHOR: mva@FreeBSD.org
+
+  New USES=twisted, to replace the old USE_TWISTED knob.
+
+  twisted can be configured with the arguments run or build to replace
+  the previous USE_TWISTED_RUN and USE_TWISTED_BUILD knobs. The twisted
+  components can be added as comma-separated arguments. If you previously
+  wrote
+    USE_TWISTED=	yes
+    USE_TWISTED=	conch names
+    USE_TWISTED_RUN=	yes
+  you now would write
+    USES=	twisted
+    USES=	twisted:conch,names
+    USES=	twisted:run
+  
 20131119:
 AUTHOR: kwm@FreeBSD.org
 
diff --git a/Mk/Uses/twisted.mk b/Mk/Uses/twisted.mk
new file mode 100644
index 0000000..701d195
--- /dev/null
+++ b/Mk/Uses/twisted.mk
@@ -0,0 +1,83 @@
+# $FreeBSD$
+#
+# Provide support for Twisted-related ports
+#
+# MAINTAINER: python@FreeBSD.org
+#
+# Feature:		twisted
+# Usage:		USES=	twisted:build,run,compA,compB,...
+# Valid ARGS:
+#				build	Adds twisted and any additional component as build
+#						dependency to the port
+#				run		Adds twisted and any additional component as build
+#						dependency to the port
+#				comp	Adds the specified twisted component to as build or
+#						run dependency to the ports
+#
+# If the build and run arguments are omitted, twisted or any specified
+# component will be added as build AND run dependency.
+#
+# The current supported components are:
+#
+#	conch flow lore mail names news runner web web2 words
+#
+.if !defined(_INCLUDE_USES_TWISTED_MK)
+_INCLUDE_USES_TWISTED_MK=	yes
+
+.if !defined(twisted_ARGS)
+twisted_ARGS=	build,run
+.endif
+
+_TWISTED_ARGS=	${twisted_ARGS:S/,/ /g}
+
+.if ${_TWISTED_ARGS:Mbuild}
+_TWISTED_BUILD_DEP=	yes
+_TWISTED_ARGS:=		${_TWISTED_ARGS:Nbuild}
+.endif
+.if ${_TWISTED_ARGS:Mrun}
+_TWISTED_RUN_DEP=	yes
+_TWISTED_ARGS:=		${_TWISTED_ARGS:Nrun}
+.endif
+
+.if !defined(_TWISTED_BUILD_DEP) && !defined(_TWISTED_RUN_DEP)
+# The port only seems to specify components, but neither run or build.
+# Assume them to be build and run dependencies.
+_TWISTED_BUILD_DEP=	yes
+_TWISTED_RUN_DEP=	yes
+.endif
+
+.if defined(_TWISTED_BUILD_DEP)
+BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore
+.endif
+.if defined(_TWISTED_RUN_DEP)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore
+.endif
+
+_TWISTED_COMPONENTS=	conch flow lore mail names news runner web web2 words
+
+conch_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/conch/__init__.py:${PORTSDIR}/security/py-twistedConch
+flow_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/flow/__init__.py:${PORTSDIR}/devel/py-twistedFlow
+lore_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/lore/__init__.py:${PORTSDIR}/textproc/py-twistedLore
+mail_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/mail/__init__.py:${PORTSDIR}/mail/py-twistedMail
+names_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/names/__init__.py:${PORTSDIR}/dns/py-twistedNames
+news_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/news/__init__.py:${PORTSDIR}/news/py-twistedNews
+pair_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/pair/__init__.py:${PORTSDIR}/net/py-twistedPair
+runner_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/runner/__init__.py:${PORTSDIR}/devel/py-twistedRunner
+web2_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/web2/__init__.py:${PORTSDIR}/www/py-twistedWeb2
+web_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/web/__init__.py:${PORTSDIR}/www/py-twistedWeb
+words_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/words/__init__.py:${PORTSDIR}/net-im/py-twistedWords
+
+
+.for component in ${_TWISTED_ARGS}
+.  if ${_TWISTED_COMPONENTS:M${component}}==""
+IGNORE=	cannot install unknown twisted component ${component}
+.  endif
+.  if defined(_TWISTED_BUILD_DEP)
+BUILD_DEPENDS+=	${${component}_DEPENDS}
+.  endif
+.  if defined(_TWISTED_RUN_DEP)
+RUN_DEPENDS+=	${${component}_DEPENDS}
+.  endif
+.endfor
+
+.endif # !defined(_INCLUDE_USES_TWISTED_MK)
diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk
index 4016dfa..1031b09 100644
--- a/Mk/bsd.python.mk
+++ b/Mk/bsd.python.mk
@@ -192,19 +192,6 @@ Python_Include_MAINTAINER=	python@FreeBSD.org
 #
 # PYEASYINSTALL_CMD - Full file path to easy_install command.
 #					  default: ${LOCALBASE}/bin/easy_install-${PYTHON_VER}
-#
-# USE_TWISTED		- If this option is just yes then build and run
-#					  the dependence to twistedCore is added. Alternatively
-#					  here can be listed specific components of twisted
-#					  framework, available components are: conch, lore,
-#					  mail, names, news, runner, web, web2 and words.
-#					  Note that core component is required for any of
-#					  this optional components.
-#
-# USE_TWISTED_BUILD	- Same as previous but add only build dependency.
-#
-# USE_TWISTED_RUN	- Same as USE_TWISTED but add only run dependency.
-#
 
 _PYTHON_PORTBRANCH=		2.7
 _PYTHON_ALLBRANCHES=	2.7 2.6 3.3 3.2 3.1	# preferred first
@@ -620,80 +607,9 @@ PLIST_SUB+=		PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \
 				PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \
 				PYTHON_VERSION=${PYTHON_VERSION}
 
-# Twisted specific routines
-.if defined(USE_TWISTED) || defined(USE_TWISTED_BUILD) || defined(USE_TWISTED_RUN)
-
-.if defined(USE_TWISTED_BUILD) && defined(USE_TWISTED_RUN)
-. if ${USE_TWISTED_BUILD} != ${USE_TWISTED_RUN}
-IGNORE=	: USE_TWISTED_BUILD and USE_TWISTED_RUN must have equal values
-. endif
-.endif
-
-.if defined(USE_TWISTED)
-TWISTED_BUILD_DEP=	yes
-TWISTED_RUN_DEP=	yes
-.else
-. if defined(USE_TWISTED_BUILD)
-TWISTED_BUILD_DEP=	yes
-USE_TWISTED=		${USE_TWISTED_BUILD}
-. endif
-. if defined(USE_TWISTED_RUN)
-TWISTED_RUN_DEP=	yes
-USE_TWISTED=		${USE_TWISTED_RUN}
-. endif
-.endif
-
-.if ${USE_TWISTED} == "20" || ${USE_TWISTED} == "yes"
-USE_TWISTED_VER=	${USE_TWISTED}
-. if defined(TWISTED_BUILD_DEP)
-BUILD_DEPENDS+=		${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore
-. endif
-. if defined(TWISTED_RUN_DEP)
-RUN_DEPENDS+=		${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore
-. endif
-.else
-USE_TWISTED_VER=	20
-# Checking for twisted components
-_TWISTED_COMPONENTS?=	conch lore mail names news runner web web2 words
-
-# XXX Should be here other dependencies types?
-conch_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/conch/__init__.py:${PORTSDIR}/security/py-twistedConch
-lore_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/lore/__init__.py:${PORTSDIR}/textproc/py-twistedLore
-mail_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/mail/__init__.py:${PORTSDIR}/mail/py-twistedMail
-names_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/names/__init__.py:${PORTSDIR}/dns/py-twistedNames
-news_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/news/__init__.py:${PORTSDIR}/news/py-twistedNews
-pair_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/pair/__init__.py:${PORTSDIR}/net/py-twistedPair
-runner_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/runner/__init__.py:${PORTSDIR}/devel/py-twistedRunner
-web2_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/web2/__init__.py:${PORTSDIR}/www/py-twistedWeb2
-web_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/web/__init__.py:${PORTSDIR}/www/py-twistedWeb
-words_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/words/__init__.py:${PORTSDIR}/net-im/py-twistedWords
-
-.for component in ${_TWISTED_COMPONENTS}
-_COMP_TEST=	${USE_TWISTED:M${component}}
-. if ${_COMP_TEST:S/${component}//}!=${_COMP_TEST:S/  / /g}
-.  if defined(TWISTED_BUILD_DEP)
-BUILD_DEPENDS+=	${${component}_DEPENDS}
-.  endif
-.  if defined(TWISTED_RUN_DEP)
-RUN_DEPENDS+=	${${component}_DEPENDS}
-.  endif
-. endif
-.endfor
-
-# Implicit dependency from core
-.if defined(TWISTED_BUILD_DEP)
-BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore
-.endif
-.if defined(TWISTED_RUN_DEP)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore
-.endif
-
-.endif
-
-.endif # defined(USE_TWISTED)
-
 # XXX Hm, should I export some of the variables above to *_ENV?
 
+
 # If multiple Python versions are installed and cmake is used, it might
 # happen that a cmake-enabled port using find_package(PythonLibs) and
 # find_package(PythonInterp) detects different Python versions.
diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile
index a7e5712..5763c4d 100644
--- a/databases/py-carbon/Makefile
+++ b/databases/py-carbon/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:${PORTSDIR}/net/py-txamqp \
 
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=	yes
-USE_TWISTED_RUN=	yes
+USES=		twisted:run
 FETCH_ARGS=	-o ${DISTNAME}${EXTRACT_SUFX}
 USE_RC_SUBR=	carbon
 
diff --git a/deskutils/narval/Makefile b/deskutils/narval/Makefile
index 62fc07a..9fe50f4 100644
--- a/deskutils/narval/Makefile
+++ b/deskutils/narval/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xmlrpclib.py:${PORTSDIR}/net/py-xmlrpclib \
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-USE_TWISTED=	yes
+USES=		twisted
 USE_GNOME=	pygtk2
 
 NO_STAGE=	yes
diff --git a/devel/buildbot-slave/Makefile b/devel/buildbot-slave/Makefile
index dfeb41f..b8e11e1 100644
--- a/devel/buildbot-slave/Makefile
+++ b/devel/buildbot-slave/Makefile
@@ -18,7 +18,7 @@ TEST_DEPENDS:=	${RUN_DEPENDS} \
 PROJECTHOST=		buildbot
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	easy_install
-USE_TWISTED_RUN=	runner
+USES=			twisted:run,runner
 
 MAKE_ENV+=		NO_INSTALL_REQS=1
 
diff --git a/devel/buildbot/Makefile b/devel/buildbot/Makefile
index 8d814a0..a32c950 100644
--- a/devel/buildbot/Makefile
+++ b/devel/buildbot/Makefile
@@ -26,7 +26,7 @@ TEST_DEPENDS:=	${RUN_DEPENDS} \
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	easy_install
-USE_TWISTED_RUN=	conch mail web words
+USES=			twisted:run,conch,mail,web,words
 
 MAKE_ENV+=		NO_INSTALL_REQS=1
 
diff --git a/devel/py-epsilon/Makefile b/devel/py-epsilon/Makefile
index b49eb6c..70e7177 100644
--- a/devel/py-epsilon/Makefile
+++ b/devel/py-epsilon/Makefile
@@ -16,10 +16,10 @@ LICENSE=	MIT
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-openssl
 
 CONFLICTS=	brlcad-[0-9]*
+USES=		twisted
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Epsilon
-USE_TWISTED=	yes
 NO_BUILD=	yes
 
 NO_STAGE=	yes
diff --git a/devel/py-testoob/Makefile b/devel/py-testoob/Makefile
index 628a7ab..f10625d 100644
--- a/devel/py-testoob/Makefile
+++ b/devel/py-testoob/Makefile
@@ -29,7 +29,7 @@ NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MTWISTED}
-USE_TWISTED=	yes
+USES+=		twisted
 .endif
 
 .if ${PORT_OPTIONS:MHTML}
diff --git a/games/balazar/Makefile b/games/balazar/Makefile
index 8db0f50..275d87c 100644
--- a/games/balazar/Makefile
+++ b/games/balazar/Makefile
@@ -22,10 +22,9 @@ RUN_DEPENDS=	soya_editor:${PORTSDIR}/graphics/py-soya3d \
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-USE_TWISTED=	yes
 USE_GL=		glew
 USE_SDL=	sdl mixer
-USES=		gettext
+USES=		gettext twisted
 
 PYDISTUTILS_PKGNAME=	Balazar
 PYDISTUTILS_EGGINFODIR=	${PREFIX}/share
diff --git a/games/balazarbrothers/Makefile b/games/balazarbrothers/Makefile
index 9707edd..ad12c97 100644
--- a/games/balazarbrothers/Makefile
+++ b/games/balazarbrothers/Makefile
@@ -19,10 +19,9 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cerealizer/__init__.py:${PORTSDIR}/security/py
 		${PYTHON_SITELIBDIR}/ogg/__init__.py:${PORTSDIR}/audio/py-vorbis
 
 USE_BZIP2=	yes
-USES=		gettext
+USES=		gettext twisted
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
-USE_TWISTED=	yes
 USE_GL=		glew
 USE_GMAKE=	yes
 
diff --git a/games/galaxymage/Makefile b/games/galaxymage/Makefile
index 6fc663b..2fb4724 100644
--- a/games/galaxymage/Makefile
+++ b/games/galaxymage/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Numeric/_numpy.so:${PORTSDIR}/math/py-numeric
 		${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
 
 USE_PYTHON=	yes
-USE_TWISTED=	yes
-USES=		gettext
+USES=		gettext twisted
 NO_BUILD=	yes
 
 NO_STAGE=	yes
diff --git a/games/kajongg/Makefile b/games/kajongg/Makefile
index c5988b4..52ce7e4 100644
--- a/games/kajongg/Makefile
+++ b/games/kajongg/Makefile
@@ -13,12 +13,11 @@ COMMENT=	${${PORTNAME}_DESC}
 
 CONFLICTS_INSTALL=	kdegames-4.[0-6].*
 
-USES=		cmake:outsource
+USES=		cmake:outsource twisted:run
 USE_KDE4=	kdehier kdelibs kdeprefix pykde4 automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 USE_PYTHON=	yes
 USE_SQLITE=	3
-USE_TWISTED_RUN=	yes
 USE_XZ=		yes
 CMAKE_ARGS=	-DINSTALL_KAJONGG:BOOL=TRUE
 
diff --git a/mail/py-apolicy/Makefile b/mail/py-apolicy/Makefile
index 72b39af..063b930 100644
--- a/mail/py-apolicy/Makefile
+++ b/mail/py-apolicy/Makefile
@@ -16,9 +16,9 @@ COMMENT=	An ACL system for Postfix, as a policy daemon
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/spf.py:${PORTSDIR}/mail/py-spf \
 		${PYTHON_SITELIBDIR}/IPy.py:${PORTSDIR}/net-mgmt/py-ipy
 
+USES=		twisted
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=yes
-USE_TWISTED=	yes
 NO_BUILD=	yes
 USE_RC_SUBR=	apolicyd
 
diff --git a/mail/py-ppolicy/Makefile b/mail/py-ppolicy/Makefile
index 6e42ee6..433bb4d 100644
--- a/mail/py-ppolicy/Makefile
+++ b/mail/py-ppolicy/Makefile
@@ -13,9 +13,9 @@ COMMENT=	PPolicy is tool for extending Postfix checking capabilities
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython
 
+USES=		twisted
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=yes
-USE_TWISTED=	yes
 NO_BUILD=	yes
 USE_RC_SUBR=	ppolicyd
 DOCSDIR?=	${PREFIX}/share/doc/py-${PORTNAME}
diff --git a/net-im/py-punjab/Makefile b/net-im/py-punjab/Makefile
index 10ecea0..5076685 100644
--- a/net-im/py-punjab/Makefile
+++ b/net-im/py-punjab/Makefile
@@ -13,7 +13,7 @@ COMMENT=	HTTP XMPP client interface
 
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=yes
-USE_TWISTED=	words web conch names
+USES=		twisted:words,web,conch,names
 
 PORTDOCS=	README.txt INSTALL.txt PKG-INFO
 
diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile
index c04153a..0761ef9 100644
--- a/net-p2p/deluge/Makefile
+++ b/net-p2p/deluge/Makefile
@@ -25,10 +25,9 @@ PLIST_SUB+=	PYTHON_VER=${PYTHON_VER}
 
 USE_XZ=		yes
 WANT_GNOME=	yes
-USES=		gettext
+USES=		gettext twisted:run,web
 USE_OPENSSL=	yes
 USE_PYTHON=	-2.7
-USE_TWISTED_RUN=	web
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_BUILD_TARGET=	build bdist_egg
 
diff --git a/net-p2p/py-vertex/Makefile b/net-p2p/py-vertex/Makefile
index ceff82c..e9f91b8 100644
--- a/net-p2p/py-vertex/Makefile
+++ b/net-p2p/py-vertex/Makefile
@@ -21,7 +21,7 @@ LICENSE=	BSD
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Vertex
-USE_TWISTED=	yes
+USES=		twisted
 
 NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/net/kippo/Makefile b/net/kippo/Makefile
index ffd0a5f..a8b88d4 100644
--- a/net/kippo/Makefile
+++ b/net/kippo/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypt
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PYTHON=	2.5+
-USE_TWISTED_RUN=	conch web
+USES=		twisted:run,conch,web
 NO_BUILD=	yes
 
 USE_RC_SUBR=	kippo
diff --git a/net/kojoney/Makefile b/net/kojoney/Makefile
index 86f89f9..d302452 100644
--- a/net/kojoney/Makefile
+++ b/net/kojoney/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0_1:${PORTSDIR}/devel/py
 WRKSRC=		${WRKDIR}/kojoney
 
 USE_PYTHON=	2.5+
-USE_TWISTED=	conch
 USE_OPENSSL=	yes
-USES=		perl5
+USES=		perl5 twisted:conch
 USE_PERL5=	run
 
 NO_STAGE=	yes
diff --git a/net/py-ldaptor/Makefile b/net/py-ldaptor/Makefile
index 8d577ec..d983575 100644
--- a/net/py-ldaptor/Makefile
+++ b/net/py-ldaptor/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyparsing.py:${PORTSDIR}/devel/py-parsing \
 
 GITVERSION=	aad8ded658b36337a08aeb7402b6b67eb8771bea
 
-USES=		gettext
+USES=		gettext twisted
 USE_PYTHON=	yes
-USE_TWISTED=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGVERSION=	0.0.0
 PYDISTUTILS_PKGNAME=	ldaptor
diff --git a/net/py-tofu/Makefile b/net/py-tofu/Makefile
index 0b457dc..2282c1d 100644
--- a/net/py-tofu/Makefile
+++ b/net/py-tofu/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Practical high-level network game engine
 DIST_SUBDIR=	python
 USE_BZIP2=	yes
 USE_PYTHON=	yes
-USE_TWISTED=	yes
+USES=		twisted
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Tofu
 WRKSRC=		${WRKDIR}/Tofu-${PORTVERSION}
diff --git a/net/py-txamqp/Makefile b/net/py-txamqp/Makefile
index 5b298d6..58390a0 100644
--- a/net/py-txamqp/Makefile
+++ b/net/py-txamqp/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}thrift>0:${PORTSDIR}/devel/py-thrift
 
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
-USE_TWISTED=	yes
+USES=		twisted
 
 WRKSRC=		${WRKDIR}/python-${PORTNAME}-${PORTVERSION}
 
diff --git a/net/sippy_b2bua/Makefile b/net/sippy_b2bua/Makefile
index cb9ae73..7989366 100644
--- a/net/sippy_b2bua/Makefile
+++ b/net/sippy_b2bua/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	SIP Back-to-back user agent (B2BUA) server with Radius support
 
 USE_PYTHON=		yes
-USE_TWISTED=	yes
+USES=		twisted
 USE_PYDISTUTILS=	yes
 NO_STAGE=	yes
 PYDISTUTILS_PKGNAME=	sippy
diff --git a/news/hellanzb/Makefile b/news/hellanzb/Makefile
index 1d13ed7..e9e215f 100644
--- a/news/hellanzb/Makefile
+++ b/news/hellanzb/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	par2:${PORTSDIR}/archivers/par2cmdline \
 
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=yes
-USE_TWISTED_RUN=	web
+USES=		twisted:run,web
 PORTDOCS=	CHANGELOG CREDITS README
 
 NO_STAGE=	yes
diff --git a/security/obfsproxy/Makefile b/security/obfsproxy/Makefile
index fb7ecfa..a9616cf 100644
--- a/security/obfsproxy/Makefile
+++ b/security/obfsproxy/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyptlib>=0.0.5:${PORTSDIR}/security/py-pyptl
 		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:${PORTSDIR}/security/py-pycrypto
 
 USE_PYTHON=	yes
-USE_TWISTED=	yes
+USES=		twisted
 USE_PYDISTUTILS=easy_install
 SUB_FILES=	pkg-message
 PYDISTUTILS_PKGNAME=obfsproxy
diff --git a/www/py-nevow/Makefile b/www/py-nevow/Makefile
index 7e06404..00c424a 100644
--- a/www/py-nevow/Makefile
+++ b/www/py-nevow/Makefile
@@ -15,8 +15,7 @@ COMMENT=	A web application templating system, based on the Twisted Woven
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
-USE_TWISTED=	web
-USES=		gettext
+USES=		gettext twisted:web
 PYDISTUTILS_PKGNAME=	Nevow
 
 SUB_FILES=	pkg-message
diff --git a/www/py-scrapy/Makefile b/www/py-scrapy/Makefile
index 8f17dce..94cf99c 100644
--- a/www/py-scrapy/Makefile
+++ b/www/py-scrapy/Makefile
@@ -17,8 +17,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.0:${PORTSDIR}/devel/py-lxml \
 		${PYTHON_PKGNAMEPREFIX}w3lib>=1.2:${PORTSDIR}/www/py-w3lib
 
 USE_PYTHON=	-2.7
+USES=		twisted:run
 USE_PYDISTUTILS=easy_install
-USE_TWISTED_RUN=yes
 
 OPTIONS_DEFINE=	SSL
 OPTIONS_DEFAULT=SSL