Index: head/deskutils/gcalcli/Makefile
===================================================================
--- head/deskutils/gcalcli/Makefile
+++ head/deskutils/gcalcli/Makefile
@@ -2,55 +2,36 @@
 # $FreeBSD$
 
 PORTNAME=	gcalcli
-PORTVERSION=	3.4.0
+PORTVERSION=	4.0.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	deskutils python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@thelanman.net
 COMMENT=	Google Calendar Command Line Interface
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}gdata>=0:devel/py-gdata@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}google-api-python-client>=0:www/py-google-api-python-client@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.4:www/py-google-api-python-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-gflags>=0:devel/py-python-gflags@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}oauth2client>0:security/py-oauth2client@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}parsedatetime>=0:devel/py-parsedatetime@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oauth2client>0:security/py-oauth2client@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
-USES=		python:-2.7 shebangfix
-USE_GITHUB=	yes
-SHEBANG_FILES=	gcalcli
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
 
+USE_GITHUB=	yes
 GH_ACCOUNT=	insanum
 
-OPTIONS_DEFINE=		DOCS FUZZYDATES ICS_VCAL SIMPLEJSON
+NO_ARCH=	yes
+
+OPTIONS_DEFINE=		ICS_VCAL
 OPTIONS_DEFAULT=	ICS_VCAL
 
 ICS_VCAL_DESC=		Enable importing of ics/vcal files
-SIMPLEJSON_DESC=	Use simplejson for url shortening
-FUZZYDATES_DESC=	Use parsedatetime for fuzzy date parsing
-
 ICS_VCAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject@${PY_FLAVOR}
-SIMPLEJSON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR}
-FUZZYDATES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}parsedatetime>=0:devel/py-parsedatetime@${PY_FLAVOR}
-
-NO_BUILD=	yes
-NO_ARCH=	yes
-
-PORTDOCS=	README.md gcalcli_?.png
-PLIST_FILES=	bin/gcalcli
-
-pre-install:
-	@${REINPLACE_CMD} -e '197s|run|run_flow|' \
-		-e '676s|run|run_flow|' ${WRKSRC}/gcalcli
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
-do-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}/${DOCSDIR}
-	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/deskutils/gcalcli/distinfo
===================================================================
--- head/deskutils/gcalcli/distinfo
+++ head/deskutils/gcalcli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534035958
-SHA256 (insanum-gcalcli-v3.4.0_GH0.tar.gz) = 1297f7082b4d33ac6d5ea3edfc11bdd329b8a6f28926aeda412806d45b7afdd1
-SIZE (insanum-gcalcli-v3.4.0_GH0.tar.gz) = 1675456
+TIMESTAMP = 1551729455
+SHA256 (insanum-gcalcli-v4.0.4_GH0.tar.gz) = 0ad3a3446e1ac1c5228ea3a2705a292b99f6cb3222fae4a12a004f92ce31037f
+SIZE (insanum-gcalcli-v4.0.4_GH0.tar.gz) = 1699589