Index: branches/2020Q2/devel/py-twisted/Makefile
===================================================================
--- branches/2020Q2/devel/py-twisted/Makefile	(revision 533126)
+++ branches/2020Q2/devel/py-twisted/Makefile	(revision 533127)
@@ -1,37 +1,56 @@
 # Created by: Johann Visagie <wjv@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	twisted
-PORTVERSION=	18.9.0
-PORTREVISION=	1
+PORTVERSION=	20.3.0
 CATEGORIES=	devel net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Twisted-${PORTVERSION}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Asynchronous networking framework written in Python
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}constantly>=15.1:devel/py-constantly@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}attrs>17.4.0:devel/py-attrs@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}incremental>=16.10.1:devel/py-incremental@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>19.2.0:devel/py-attrs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Automat>=0.3.0:devel/py-Automat@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}constantly>=15.1:devel/py-constantly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hyperlink>=17.1.1:www/py-hyperlink@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}incremental>=16.10.1:devel/py-incremental@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyHamcrest>=1.9.0:textproc/py-pyhamcrest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=4.4.0:devel/py-zope.interface@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Automat>=0.3.0:devel/py-Automat@${PY_FLAVOR}
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=4.4.2:devel/py-zope.interface@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}service_identity>0:security/py-service_identity@${PY_FLAVOR}
 
 USES=		python tar:bzip2
 USE_PYTHON=	autoplist concurrent distutils
+
+OPTIONS_DEFINE=	CONCH HTTP2 SERIAL TLS
+OPTIONS_DEFAULT=	CONCH HTTP2 SERIAL TLS
+
+CONCH_DESC=	Conch secure shell SSH
+SERIAL_DESC=	Serial port extension
+
+CONCH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}bcrypt>=3.0.0:security/py-bcrypt@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}cryptography>=2.5:security/py-cryptography@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR}
+
+HTTP2_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}h2>=3.0:www/py-h2@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}priority>=1.1.0:www/py-priority@${PY_FLAVOR}
+
+SERIAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}serial>=3.0:comms/py-serial@${PY_FLAVOR}
+
+TLS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}idna>=0.6:dns/py-idna@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}service_identity>=18.1.0:security/py-service_identity@${PY_FLAVOR}
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/ -name '*.so' -exec ${STRIP_CMD} {} +
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m twisted.trial -e twisted
 
 .include <bsd.port.mk>
Index: branches/2020Q2/devel/py-twisted/distinfo
===================================================================
--- branches/2020Q2/devel/py-twisted/distinfo	(revision 533126)
+++ branches/2020Q2/devel/py-twisted/distinfo	(revision 533127)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553221383
-SHA256 (Twisted-18.9.0.tar.bz2) = 294be2c6bf84ae776df2fc98e7af7d6537e1c5e60a46d33c3ce2a197677da395
-SIZE (Twisted-18.9.0.tar.bz2) = 3088398
+TIMESTAMP = 1584923087
+SHA256 (Twisted-20.3.0.tar.bz2) = d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10
+SIZE (Twisted-20.3.0.tar.bz2) = 3127793
Index: branches/2020Q2
===================================================================
--- branches/2020Q2	(revision 533126)
+++ branches/2020Q2	(revision 533127)

Property changes on: branches/2020Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r533065