CVS commit: pkgsrc/time/khal

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Apr 14 20:32:06 UTC 2018

Modified Files:
        pkgsrc/time/khal: Makefile PLIST

Log Message:
khal: update to 0.9.8nb1.

Build and install the man page.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/time/khal/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/time/khal/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/time/khal/Makefile
diff -u pkgsrc/time/khal/Makefile:1.23 pkgsrc/time/khal/Makefile:1.24
--- pkgsrc/time/khal/Makefile:1.23      Thu Oct  5 22:39:05 2017
+++ pkgsrc/time/khal/Makefile   Sat Apr 14 20:32:06 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2017/10/05 22:39:05 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2018/04/14 20:32:06 wiz Exp $
 
 DISTNAME=              khal-0.9.8
+PKGREVISION=           1
 CATEGORIES=            time net
 MASTER_SITES=          ${MASTER_SITE_PYPI:=k/khal/}
 
@@ -24,27 +25,26 @@ DEPENDS+=           ${PYPKGPREFIX}-vdirsyncer>=0.
 DEPENDS+=              ${PYPKGPREFIX}-xdg>=0.17:../../devel/py-xdg
 # not needed, but recommended, so let's just depend on it
 DEPENDS+=              ${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle
-# for the man page, needs khal installed though, see
-# https://github.com/pimutils/khal/issues/598
-#USE_TOOLS+=           gmake
-#BUILD_DEPENDS+=               ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
-#BUILD_DEPENDS+=               ${PYPKGPREFIX}-sphinxcontrib-newsfeed-[0-9]*:../../textproc/py-sphinxcontrib-newsfeed
+# for the man page
+USE_TOOLS+=            gmake
+BUILD_DEPENDS+=                ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+BUILD_DEPENDS+=                ${PYPKGPREFIX}-sphinxcontrib-newsfeed-[0-9]*:../../textproc/py-sphinxcontrib-newsfeed
 # TEST_DEPENDS
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-freezegun-[0-9]*:../../devel/py-freezegun
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # not supported as of 0.8.0
 
-INSTALLATION_DIRS=     share/doc/khal
+INSTALLATION_DIRS=     share/doc/khal ${PKGMANDIR}/man1
 REPLACE_PYTHON+=       khal/*/*.py
 REPLACE_PYTHON+=       khal/*.py
 
-# man page generation, see above
-#post-build:
-#      cd ${WRKSRC}/doc && gmake SPHINXBUILD=sphinx-build${PYVERSSUFFIX} man
+post-build:
+       cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} PYTHONPATH=${WRKSRC} ${GMAKE} man SPHINXBUILD=sphinx-build${PYVERSSUFFIX}
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/khal.conf.sample ${DESTDIR}${PREFIX}/share/doc/khal
+       ${INSTALL_MAN} ${WRKSRC}/doc/build/man/khal.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 do-test:
        cd ${WRKSRC} && py.test-${PYVERSSUFFIX} tests

Index: pkgsrc/time/khal/PLIST
diff -u pkgsrc/time/khal/PLIST:1.9 pkgsrc/time/khal/PLIST:1.10
--- pkgsrc/time/khal/PLIST:1.9  Tue Apr  4 13:10:58 2017
+++ pkgsrc/time/khal/PLIST      Sat Apr 14 20:32:06 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2017/04/04 13:10:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2018/04/14 20:32:06 wiz Exp $
 bin/ikhal
 bin/khal
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
@@ -93,4 +93,5 @@ ${PYSITELIB}/khal/utils.pyo
 ${PYSITELIB}/khal/version.py
 ${PYSITELIB}/khal/version.pyc
 ${PYSITELIB}/khal/version.pyo
+man/man1/khal.1
 share/doc/khal/khal.conf.sample