Index: deskutils/py-khal/Makefile
===================================================================
--- deskutils/py-khal/Makefile
+++ deskutils/py-khal/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	khal
-PORTVERSION=	0.7.1
+DISTVERSION=	0.9.8
 CATEGORIES=	deskutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,23 +13,33 @@
 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}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} \
-		${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} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>1.12.0:devel/py-setuptools_scm@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click-log>=0.2.0:devel/py-click-log@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}configobj>=0:devel/py-configobj@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}icalendar>=3.11.7:devel/py-icalendar@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pkginfo>0:sysutils/py-pkginfo@${FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}urwid>=0:devel/py-urwid@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0:deskutils/py-vdirsyncer@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}freezegun>=0:devel/py-freezegun@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \
 
 USES=		python:3.4+
 USE_PYTHON=	autoplist distutils
 
+NO_ARCH=	yes
+
+OPTIONS_DEFINE=	SETPROCTITLE
+
+SETPROCTITLE_DESC=	Set the process title
+SETPROCTITLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setproctitle>=0:devel/py-setproctitle@${FLAVOR}
+
 PLIST_FILES=	share/zsh/site-functions/__khal
 
 post-install:
@@ -37,4 +47,7 @@
 	${INSTALL_DATA} ${WRKSRC}/misc/__khal \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions
 
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+
 .include <bsd.port.mk>
Index: deskutils/py-khal/distinfo
===================================================================
--- deskutils/py-khal/distinfo
+++ deskutils/py-khal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476625563
-SHA256 (khal-0.7.1.tar.gz) = a932eb65bcdc0fb5a18e1d8547672a160ee3d55253aaee2bd3a23b876d438065
-SIZE (khal-0.7.1.tar.gz) = 109898
+TIMESTAMP = 1508824223
+SHA256 (khal-0.9.8.tar.gz) = fe049e1ed3238461c108f7ef4abba09f46130f77f0e2b80418529f6dfb1b9dae
+SIZE (khal-0.9.8.tar.gz) = 173717
Index: deskutils/py-khal/files/patch-setup.cfg
===================================================================
--- /dev/null
+++ deskutils/py-khal/files/patch-setup.cfg
@@ -0,0 +1,9 @@
+--- setup.cfg.orig	2017-10-05 21:20:27 UTC
++++ setup.cfg
+@@ -1,4 +1,2 @@
+-[egg_info]
+-tag_build = 
+-tag_date = 0
+-
++[aliases]
++test=pytest
Index: deskutils/py-khal/files/patch-setup.py
===================================================================
--- /dev/null
+++ deskutils/py-khal/files/patch-setup.py
@@ -1,11 +1,62 @@
---- 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(
-     },
+@@ -1,9 +1,10 @@
+ #!/usr/bin/env python3
+-from setuptools import setup
+ import sys
+ 
+-if sys.version_info < (3, 3):
+-    errstr = "khal only supports python version 3.3+. Please Upgrade.\n"
++from setuptools import setup
++
++if sys.version_info < (3, 4):
++    errstr = "khal only supports python version 3.4+. Please Upgrade.\n"
+     sys.stderr.write("#" * len(errstr) + '\n')
+     sys.stderr.write(errstr)
+     sys.stderr.write("#" * len(errstr) + '\n')
+@@ -11,7 +12,8 @@ if sys.version_info < (3, 3):
+ 
+ requirements = [
+     'click>=3.2',
+-    'icalendar',
++    'click_log>=0.2.0',
++    'icalendar>=3.11.7',
+     'urwid',
+     'pyxdg',
+     'pytz',
+@@ -23,11 +25,14 @@ requirements = [
+ ]
+ 
+ test_requirements = [
+-    'freezegun'
++    'pytest',
++    'freezegun',
++    'vdirsyncer',
+ ]
+ 
+ extra_requirements = {
+     'proctitle': ['setproctitle'],
++    ':python_version < "3.5"': 'typing',
+ }
+ 
+ setup(
+@@ -52,7 +57,10 @@ setup(
      install_requires=requirements,
      extras_require=extra_requirements,
--    setup_requires=['setuptools_scm'],  # not needed when using packages from PyPI
--    use_scm_version={'write_to': 'khal/version.py'},
+     tests_require=test_requirements,
+-    setup_requires=['setuptools_scm != 1.12.0'],  # not needed when using packages from PyPI
++    setup_requires=[
++        'setuptools_scm != 1.12.0',  # not needed when using packages from PyPI
++        'pytest-runner',
++    ],
+     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",
+@@ -61,7 +69,6 @@ setup(
+         "Environment :: Console :: Curses",
+         "Intended Audience :: End Users/Desktop",
+         "Operating System :: POSIX",
+-        "Programming Language :: Python :: 3.3",
+         "Programming Language :: Python :: 3.4",
+         "Programming Language :: Python :: 3.5",
+         "Programming Language :: Python :: 3.6",