--- Makefile	(revision 457447)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	khal
-PORTVERSION=	0.7.1
+PORTVERSION=	0.9.8
 CATEGORIES=	deskutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,10 +13,8 @@ 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		py36-khal-0.7.1 depends on package: py36-vdirsyncer<0.13 - not found
-
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}icalendar>=3.8.2:devel/py-icalendar@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}icalendar>=3.11.7:devel/py-icalendar@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:devel/py-urwid@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2014.10,1:devel/py-pytz@${FLAVOR} \
@@ -23,7 +21,8 @@ 
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.3:devel/py-dateutil@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}vdirsyncer<0.13:deskutils/py-vdirsyncer@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}vdirsyncer>0:deskutils/py-vdirsyncer@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}atomicwrites>0.1.7:devel/py-atomicwrites@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pkginfo>0:sysutils/py-pkginfo@${FLAVOR}
 
--- distinfo	(revision 457447)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1476625563
-SHA256 (khal-0.7.1.tar.gz) = a932eb65bcdc0fb5a18e1d8547672a160ee3d55253aaee2bd3a23b876d438065
-SIZE (khal-0.7.1.tar.gz) = 109898
+TIMESTAMP = 1514635818
+SHA256 (khal-0.9.8.tar.gz) = fe049e1ed3238461c108f7ef4abba09f46130f77f0e2b80418529f6dfb1b9dae
+SIZE (khal-0.9.8.tar.gz) = 173717
--- files/patch-setup.py	(revision 457447)
+++ files/patch-setup.py	(working copy)
@@ -1,11 +1,11 @@ 
---- setup.py.orig	2016-01-05 12:53:52 UTC
+--- setup.py.orig	2017-10-05 21:19:29 UTC
 +++ setup.py
-@@ -40,8 +40,6 @@ setup(
-     },
+@@ -52,8 +52,6 @@ setup(
      install_requires=requirements,
      extras_require=extra_requirements,
--    setup_requires=['setuptools_scm'],  # not needed when using packages from PyPI
+     tests_require=test_requirements,
+-    setup_requires=['setuptools_scm != 1.12.0'],  # not needed when using packages from PyPI
 -    use_scm_version={'write_to': 'khal/version.py'},
+     zip_safe=False,  # because of configobj loading the .spec file
      classifiers=[
          "Development Status :: 4 - Beta",
-         "License :: OSI Approved :: MIT License",