4 files changed, 29 insertions, 28 deletions

diff --git a/deskutils/py-khal/Makefile b/deskutils/py-khal/Makefile
index a0f8740710fc..a8d8d30c0963 100644
--- a/deskutils/py-khal/Makefile
+++ b/deskutils/py-khal/Makefile
@@ -2,34 +2,41 @@
 # $FreeBSD$
 
 PORTNAME=	khal
-PORTVERSION=	0.7.1
+DISTVERSION=	0.9.8
 CATEGORIES=	deskutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	che@bein.link
+MAINTAINER=	lbdm@privacychain.ch
 COMMENT=	CalDAV-based calendar
 
 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}
+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}
 
 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:
diff --git a/deskutils/py-khal/distinfo b/deskutils/py-khal/distinfo
index 513d0f783e99..c4f4d2b28353 100644
--- a/deskutils/py-khal/distinfo
+++ b/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
diff --git a/deskutils/py-khal/files/patch-setup.py b/deskutils/py-khal/files/patch-setup.py
deleted file mode 100644
index cdd51af772b5..000000000000
--- a/deskutils/py-khal/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2016-01-05 12:53:52 UTC
-+++ setup.py
-@@ -40,8 +40,6 @@ 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'},
-     classifiers=[
-         "Development Status :: 4 - Beta",
-         "License :: OSI Approved :: MIT License",
diff --git a/deskutils/py-khal/pkg-message b/deskutils/py-khal/pkg-message
new file mode 100644
index 000000000000..f432bfb09de8
--- /dev/null
+++ b/deskutils/py-khal/pkg-message
@@ -0,0 +1,5 @@
+####################################################################
+
+Khal needs LANG to be set to a UTF-8 locale (e.g. en_US.UTF-8) to run.
+
+####################################################################