Index: head/devel/py-astroid/Makefile
===================================================================
--- head/devel/py-astroid/Makefile	(revision 479549)
+++ head/devel/py-astroid/Makefile	(revision 479550)
@@ -1,31 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	astroid
-PORTVERSION=	1.6.5
+PORTVERSION=	2.0.4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Abstract syntax tree for Python with inference support
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
-RUN_DEPENDS=	${PY_ENUM34} \
-		${PYTHON_PKGNAMEPREFIX}lazy-object-proxy>=0:devel/py-lazy-object-proxy@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lazy-object-proxy>=0:devel/py-lazy-object-proxy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wrapt>=0:devel/py-wrapt@${PY_FLAVOR}
 
+USES=		python:3.4+
+USE_PYTHON=	autoplist distutils
+
 NO_ARCH=	yes
-USE_PYTHON=	autoplist concurrent distutils
-USES=		python
 
 .include <bsd.port.pre.mk>
 
-.if ${PYTHON_REL} < 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=0:devel/py-backports.functools_lru_cache@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch@${PY_FLAVOR}
+.if ${PYTHON_REL} < 3500
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${PY_FLAVOR}
+.endif
+
+.if ${PYTHON_REL} < 3700
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typed-ast>=0:devel/py-typed-ast@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/devel/py-astroid/distinfo
===================================================================
--- head/devel/py-astroid/distinfo	(revision 479549)
+++ head/devel/py-astroid/distinfo	(revision 479550)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529610606
-SHA256 (astroid-1.6.5.tar.gz) = fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a
-SIZE (astroid-1.6.5.tar.gz) = 255688
+TIMESTAMP = 1536687977
+SHA256 (astroid-2.0.4.tar.gz) = c7013d119ec95eb626f7a2011f0b63d0c9a095df9ad06d8507b37084eada1a8d
+SIZE (astroid-2.0.4.tar.gz) = 273871