Updated khard to 0.11.1.

Add ALTERNATIVES file.

v0.10.0: 2016.05.02
- New Action birthday: list birthdays, sorted by month and day
- option -p, --pretty was renamed to -p, --parsable: So, the pretty formatted email or
  phone number table is the default now. Please adapt the configuration files of potential email and
  phone applications (e.g.: mutt email -p %s)

v0.11.0: 2016.07.17
- Made khard python3 compatible (#59)
- Enhanced read and write support for vcard versions 3.0 and 4.0
- user input parser:
    - Improved robustness and error handling
    - Fixed org attribute parsing (#57)
    - Support for private vcard extensions (#51)
- New action birthdays (#64)
- New options:
    --display to display contacts by first or last name (#66)
    --search-in-source-files to speed up program initialization (#75)
    --skip-unparsable to skip unparsable vcard files (#75)
    --strict-search to narrow the contact search to the name field
- Added some aliases for program actions (#65)
- Removed davcontroler module due to the python3 incompatibility (script moved into the misc folder)
- Updated zsh completion function and khards example config file

v0.11.1: 2016.07.31
- Workaround for the photo attribute parsing issue of vobject library 0.9.2 (#80)
- setup.py: try to convert readme file into restructured text format (pypi requirement) and specify encoding explicitly (#83)

4 files changed, 22 insertions, 18 deletions

diff --git a/misc/khard/ALTERNATIVES b/misc/khard/ALTERNATIVES
new file mode 100644
index 00000000000..0953435f39d
--- /dev/null
+++ b/misc/khard/ALTERNATIVES
@@ -0,0 +1 @@
+bin/khard @PREFIX@/bin/khard-@PYVERSSUFFIX@
diff --git a/misc/khard/Makefile b/misc/khard/Makefile
index 4d2db51f506..8dc08ec3a5c 100644
--- a/misc/khard/Makefile
+++ b/misc/khard/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2016/07/15 13:39:33 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2016/08/27 15:50:47 wiz Exp $
 
-DISTNAME=		khard-0.9.0
-PKGREVISION=		2
+DISTNAME=		khard-0.11.1
 CATEGORIES=		misc net
 MASTER_SITES=		${MASTER_SITE_PYPI:=k/khard/}
 
@@ -16,13 +15,15 @@ DEPENDS+=		${PYPKGPREFIX}-vobject-[0-9]*:../../textproc/py-vobject
 DEPENDS+=		${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
 DEPENDS+=		${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # not yet ported as of 0.4.1
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # does not support python-2.x any longer
 
 INSTALLATION_DIRS=	share/examples/khard
 REPLACE_PYTHON+=	*/*.py
+PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/misc/khard/khard.conf.example ${DESTDIR}${PREFIX}/share/examples/khard
+	cd ${DESTDIR}${PREFIX}/bin && ${MV} khard khard-${PYVERSSUFFIX}
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/misc/khard/PLIST b/misc/khard/PLIST
index 1ec05bd70d3..d1947292ae1 100644
--- a/misc/khard/PLIST
+++ b/misc/khard/PLIST
@@ -1,21 +1,20 @@
-@comment $NetBSD: PLIST,v 1.3 2016/06/06 12:28:37 wiz Exp $
-bin/davcontroller
-bin/khard
+@comment $NetBSD: PLIST,v 1.4 2016/08/27 15:50:47 wiz Exp $
+bin/khard-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/davcontroller/__init__.py
-${PYSITELIB}/davcontroller/__init__.pyc
-${PYSITELIB}/davcontroller/__init__.pyo
-${PYSITELIB}/davcontroller/davcontroller.py
-${PYSITELIB}/davcontroller/davcontroller.pyc
-${PYSITELIB}/davcontroller/davcontroller.pyo
 ${PYSITELIB}/khard/__init__.py
 ${PYSITELIB}/khard/__init__.pyc
 ${PYSITELIB}/khard/__init__.pyo
+${PYSITELIB}/khard/__main__.py
+${PYSITELIB}/khard/__main__.pyc
+${PYSITELIB}/khard/__main__.pyo
+${PYSITELIB}/khard/actions.py
+${PYSITELIB}/khard/actions.pyc
+${PYSITELIB}/khard/actions.pyo
 ${PYSITELIB}/khard/address_book.py
 ${PYSITELIB}/khard/address_book.pyc
 ${PYSITELIB}/khard/address_book.pyo
@@ -31,6 +30,9 @@ ${PYSITELIB}/khard/helpers.pyo
 ${PYSITELIB}/khard/khard.py
 ${PYSITELIB}/khard/khard.pyc
 ${PYSITELIB}/khard/khard.pyo
+${PYSITELIB}/khard/object_type.py
+${PYSITELIB}/khard/object_type.pyc
+${PYSITELIB}/khard/object_type.pyo
 ${PYSITELIB}/khard/version.py
 ${PYSITELIB}/khard/version.pyc
 ${PYSITELIB}/khard/version.pyo
diff --git a/misc/khard/distinfo b/misc/khard/distinfo
index d7781bb6288..af139408b2b 100644
--- a/misc/khard/distinfo
+++ b/misc/khard/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2016/06/06 12:28:37 wiz Exp $
+$NetBSD: distinfo,v 1.5 2016/08/27 15:50:47 wiz Exp $
 
-SHA1 (khard-0.9.0.tar.gz) = d4470c90a1d3d9d958796d5f825398bf115cef2b
-RMD160 (khard-0.9.0.tar.gz) = 82045771fb461680c68b048846e9caeae013e8a3
-SHA512 (khard-0.9.0.tar.gz) = bb16da5355e2f4b632e55305f5e3a3d0ae440b3343548aa8665906706661a8380ec1e39ba2c1a1ee786d5b84e3f6e59d6bb8c86259867bd00aa4d0ebd612f385
-Size (khard-0.9.0.tar.gz) = 5050795 bytes
+SHA1 (khard-0.11.1.tar.gz) = d1895c55528e6b2fc97349e39deacb10df520929
+RMD160 (khard-0.11.1.tar.gz) = 6d1990077118a7c4fe661b08c30099b23897cc6c
+SHA512 (khard-0.11.1.tar.gz) = 9b26e4f6f785192331373da82b7b2b44d233d15ce198b5a83dc4b6185df64abebcc751ca98e5c2a1b9e198e656a60992faea734e12ce80ec5009ddc5b91e0171
+Size (khard-0.11.1.tar.gz) = 5059074 bytes