svn commit: r333935 - head/devel/py-twisted

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Fri Nov 15 20:54:08 2013
New Revision: 333935
URL: http://svnweb.freebsd.org/changeset/ports/333935

Log:
  - Update to 13.2.0
  - Convert to new options helper
  
  Changes:	http://twistedmatrix.com/trac/browser/tags/releases/twisted-13.2.0/NEWS

Modified:
  head/devel/py-twisted/Makefile

Modified: head/devel/py-twisted/Makefile
==============================================================================
--- head/devel/py-twisted/Makefile	Fri Nov 15 20:54:04 2013	(r333934)
+++ head/devel/py-twisted/Makefile	Fri Nov 15 20:54:08 2013	(r333935)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	twisted
-PORTVERSION=	13.1.0
+PORTVERSION=	13.2.0
 CATEGORIES=	devel net python
 MASTER_SITES=	# empty
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,9 +16,12 @@ LICENSE=	MIT
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedCore>=${PORTVERSION}:${PORTSDIR}/devel/py-twistedCore
 
 NO_BUILD=	yes
+NO_STAGE=	yes
 USE_PYTHON=	-2.7
 PYDISTUTILS_NOEGGINFO=	yes
 
+# Bypass infrastructure bug
+OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 OPTIONS_DEFINE=	CONCH LORE MAIL NAMES NEWS PAIR RUNNER WEB WORDS
 OPTIONS_DEFAULT=CONCH LORE MAIL NAMES NEWS PAIR RUNNER WEB WORDS
 CONCH_DESC=	SSH and SFTP protocol
@@ -30,50 +33,17 @@ PAIR_DESC=	Twisted Pair can do low level
 RUNNER_DESC=	Process management
 WEB_DESC=	HTTP protocol
 WORDS_DESC=	Chat and Instant Messaging
+CONCH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedConch>=${PORTVERSION}:${PORTSDIR}/security/py-twistedConch
+LORE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedLore>=${PORTVERSION}:${PORTSDIR}/textproc/py-twistedLore
+MAIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedMail>=${PORTVERSION}:${PORTSDIR}/mail/py-twistedMail
+NAMES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedNames>=${PORTVERSION}:${PORTSDIR}/dns/py-twistedNames
+NEWS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedNews>=${PORTVERSION}:${PORTSDIR}/news/py-twistedNews
+PAIR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedPair>=${PORTVERSION}:${PORTSDIR}/net/py-twistedPair
+RUNNER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedRunner>=${PORTVERSION}:${PORTSDIR}/devel/py-twistedRunner
+WEB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedWeb>=${PORTVERSION}:${PORTSDIR}/www/py-twistedWeb
+WORDS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedWords>=${PORTVERSION}:${PORTSDIR}/net-im/py-twistedWords
 
-# Bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
-
-NO_STAGE=	yes
 do-install:
 	@${DO_NADA}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCONCH}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}twistedConch>=${PORTVERSION}:${PORTSDIR}/security/py-twistedConch
-.endif
-
-.if ${PORT_OPTIONS:MLORE}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}twistedLore>=${PORTVERSION}:${PORTSDIR}/textproc/py-twistedLore
-.endif
-
-.if ${PORT_OPTIONS:MMAIL}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}twistedMail>=${PORTVERSION}:${PORTSDIR}/mail/py-twistedMail
-.endif
-
-.if ${PORT_OPTIONS:MNAMES}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}twistedNames>=${PORTVERSION}:${PORTSDIR}/dns/py-twistedNames
-.endif
-
-.if ${PORT_OPTIONS:MNEWS}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}twistedNews>=${PORTVERSION}:${PORTSDIR}/news/py-twistedNews
-.endif
-
-.if ${PORT_OPTIONS:MPAIR}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}twistedPair>=${PORTVERSION}:${PORTSDIR}/net/py-twistedPair
-.endif
-
-.if ${PORT_OPTIONS:MRUNNER}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}twistedRunner>=${PORTVERSION}:${PORTSDIR}/devel/py-twistedRunner
-.endif
-
-.if ${PORT_OPTIONS:MWEB}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}twistedWeb>=${PORTVERSION}:${PORTSDIR}/www/py-twistedWeb
-.endif
-
-.if ${PORT_OPTIONS:MWORDS}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}twistedWords>=${PORTVERSION}:${PORTSDIR}/net-im/py-twistedWords
-.endif
-
 .include <bsd.port.mk>