Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 8 Dec 2013 12:04:08 +0000 (UTC)
From:      Marcus von Appen <mva@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r335877 - in head: . Mk Mk/Uses databases/py-carbon deskutils/narval devel/buildbot devel/buildbot-slave devel/py-epsilon devel/py-testoob games/balazar games/balazarbrothers games/gala...
Message-ID:  <201312081204.rB8C48bH049458@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mva
Date: Sun Dec  8 12:04:07 2013
New Revision: 335877
URL: http://svnweb.freebsd.org/changeset/ports/335877

Log:
  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

Added:
  head/Mk/Uses/twisted.mk   (contents, props changed)
Modified:
  head/CHANGES
  head/Mk/bsd.python.mk
  head/databases/py-carbon/Makefile
  head/deskutils/narval/Makefile
  head/devel/buildbot-slave/Makefile
  head/devel/buildbot/Makefile
  head/devel/py-epsilon/Makefile
  head/devel/py-testoob/Makefile
  head/games/balazar/Makefile
  head/games/balazarbrothers/Makefile
  head/games/galaxymage/Makefile
  head/games/kajongg/Makefile
  head/mail/py-apolicy/Makefile
  head/mail/py-ppolicy/Makefile
  head/net-im/py-punjab/Makefile
  head/net-p2p/deluge/Makefile
  head/net-p2p/py-vertex/Makefile
  head/net/kippo/Makefile
  head/net/kojoney/Makefile
  head/net/py-ldaptor/Makefile
  head/net/py-tofu/Makefile
  head/net/py-txamqp/Makefile
  head/net/sippy_b2bua/Makefile
  head/news/hellanzb/Makefile
  head/security/obfsproxy/Makefile
  head/www/py-nevow/Makefile
  head/www/py-scrapy/Makefile

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/CHANGES	Sun Dec  8 12:04:07 2013	(r335877)
@@ -10,6 +10,23 @@ in the release notes and/or placed into 
 
 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
 

Added: head/Mk/Uses/twisted.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Mk/Uses/twisted.mk	Sun Dec  8 12:04:07 2013	(r335877)
@@ -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)

Modified: head/Mk/bsd.python.mk
==============================================================================
--- head/Mk/bsd.python.mk	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/Mk/bsd.python.mk	Sun Dec  8 12:04:07 2013	(r335877)
@@ -192,19 +192,6 @@ Python_Include_MAINTAINER=	python@FreeBS
 #
 # 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=${PYTHONP
 				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.

Modified: head/databases/py-carbon/Makefile
==============================================================================
--- head/databases/py-carbon/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/databases/py-carbon/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}txam
 
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=	yes
-USE_TWISTED_RUN=	yes
+USES=		twisted:run
 FETCH_ARGS=	-o ${DISTNAME}${EXTRACT_SUFX}
 USE_RC_SUBR=	carbon
 

Modified: head/deskutils/narval/Makefile
==============================================================================
--- head/deskutils/narval/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/deskutils/narval/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xmlrpc
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-USE_TWISTED=	yes
+USES=		twisted
 USE_GNOME=	pygtk2
 
 NO_STAGE=	yes

Modified: head/devel/buildbot-slave/Makefile
==============================================================================
--- head/devel/buildbot-slave/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/devel/buildbot-slave/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -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
 

Modified: head/devel/buildbot/Makefile
==============================================================================
--- head/devel/buildbot/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/devel/buildbot/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -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
 

Modified: head/devel/py-epsilon/Makefile
==============================================================================
--- head/devel/py-epsilon/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/devel/py-epsilon/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -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

Modified: head/devel/py-testoob/Makefile
==============================================================================
--- head/devel/py-testoob/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/devel/py-testoob/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -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}

Modified: head/games/balazar/Makefile
==============================================================================
--- head/games/balazar/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/games/balazar/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -22,10 +22,9 @@ RUN_DEPENDS=	soya_editor:${PORTSDIR}/gra
 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

Modified: head/games/balazarbrothers/Makefile
==============================================================================
--- head/games/balazarbrothers/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/games/balazarbrothers/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -19,10 +19,9 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cereal
 		${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
 

Modified: head/games/galaxymage/Makefile
==============================================================================
--- head/games/galaxymage/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/games/galaxymage/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -15,8 +15,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Numeri
 		${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

Modified: head/games/kajongg/Makefile
==============================================================================
--- head/games/kajongg/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/games/kajongg/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -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
 

Modified: head/mail/py-apolicy/Makefile
==============================================================================
--- head/mail/py-apolicy/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/mail/py-apolicy/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -16,9 +16,9 @@ COMMENT=	An ACL system for Postfix, as a
 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
 

Modified: head/mail/py-ppolicy/Makefile
==============================================================================
--- head/mail/py-ppolicy/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/mail/py-ppolicy/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -13,9 +13,9 @@ COMMENT=	PPolicy is tool for extending P
 
 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}

Modified: head/net-im/py-punjab/Makefile
==============================================================================
--- head/net-im/py-punjab/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/net-im/py-punjab/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -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
 

Modified: head/net-p2p/deluge/Makefile
==============================================================================
--- head/net-p2p/deluge/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/net-p2p/deluge/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -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
 

Modified: head/net-p2p/py-vertex/Makefile
==============================================================================
--- head/net-p2p/py-vertex/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/net-p2p/py-vertex/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -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>

Modified: head/net/kippo/Makefile
==============================================================================
--- head/net/kippo/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/net/kippo/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py
 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

Modified: head/net/kojoney/Makefile
==============================================================================
--- head/net/kojoney/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/net/kojoney/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -16,9 +16,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope
 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

Modified: head/net/py-ldaptor/Makefile
==============================================================================
--- head/net/py-ldaptor/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/net/py-ldaptor/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -16,9 +16,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pypars
 
 GITVERSION=	aad8ded658b36337a08aeb7402b6b67eb8771bea
 
-USES=		gettext
+USES=		gettext twisted
 USE_PYTHON=	yes
-USE_TWISTED=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGVERSION=	0.0.0
 PYDISTUTILS_PKGNAME=	ldaptor

Modified: head/net/py-tofu/Makefile
==============================================================================
--- head/net/py-tofu/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/net/py-tofu/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -14,7 +14,7 @@ COMMENT=	Practical high-level network ga
 DIST_SUBDIR=	python
 USE_BZIP2=	yes
 USE_PYTHON=	yes
-USE_TWISTED=	yes
+USES=		twisted
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Tofu
 WRKSRC=		${WRKDIR}/Tofu-${PORTVERSION}

Modified: head/net/py-txamqp/Makefile
==============================================================================
--- head/net/py-txamqp/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/net/py-txamqp/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}thri
 
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
-USE_TWISTED=	yes
+USES=		twisted
 
 WRKSRC=		${WRKDIR}/python-${PORTNAME}-${PORTVERSION}
 

Modified: head/net/sippy_b2bua/Makefile
==============================================================================
--- head/net/sippy_b2bua/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/net/sippy_b2bua/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -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

Modified: head/news/hellanzb/Makefile
==============================================================================
--- head/news/hellanzb/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/news/hellanzb/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -20,7 +20,7 @@ RUN_DEPENDS=	par2:${PORTSDIR}/archivers/
 
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=yes
-USE_TWISTED_RUN=	web
+USES=		twisted:run,web
 PORTDOCS=	CHANGELOG CREDITS README
 
 NO_STAGE=	yes

Modified: head/security/obfsproxy/Makefile
==============================================================================
--- head/security/obfsproxy/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/security/obfsproxy/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pypt
 		${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

Modified: head/www/py-nevow/Makefile
==============================================================================
--- head/www/py-nevow/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/www/py-nevow/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -15,8 +15,7 @@ COMMENT=	A web application templating sy
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
-USE_TWISTED=	web
-USES=		gettext
+USES=		gettext twisted:web
 PYDISTUTILS_PKGNAME=	Nevow
 
 SUB_FILES=	pkg-message

Modified: head/www/py-scrapy/Makefile
==============================================================================
--- head/www/py-scrapy/Makefile	Sun Dec  8 11:21:07 2013	(r335876)
+++ head/www/py-scrapy/Makefile	Sun Dec  8 12:04:07 2013	(r335877)
@@ -17,8 +17,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312081204.rB8C48bH049458>