From cb8679141b9ed782fc211ac1e129921f772a2935 Mon Sep 17 00:00:00 2001
From: bket <bket@openbsd.org>
Date: Sun, 26 May 2019 17:17:13 +0000
Subject: [PATCH] Update to borgbackup-1.1.10.

Bugfix release. Noticeable change is that the latest supported
msgpack-python release is bundled. Changelog can be found at
https://github.com/borgbackup/borg/blob/1.1.10/docs/changes.rst#version-1110-2019-05-16

Switching to the bundled version of msgpack-python makes sense as the
version in ports is in need of an update: msgpack-python has been
renamed by its upstream, and borgbackup was seemingly the only port
unable to cope with this renaming, thus blocking an update.

OK kn@
---
 sysutils/borgbackup/Makefile  | 19 +++++++++++--------
 sysutils/borgbackup/distinfo  |  4 ++--
 sysutils/borgbackup/pkg/PLIST | 24 ++++++++++++++++++------
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/sysutils/borgbackup/Makefile b/sysutils/borgbackup/Makefile
index ed623d651e9..2a972eef736 100644
--- a/sysutils/borgbackup/Makefile
+++ b/sysutils/borgbackup/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.29 2019/05/15 12:04:41 kmos Exp $
+# $OpenBSD: Makefile,v 1.30 2019/05/26 17:17:13 bket Exp $
 
 COMMENT =		deduplicating backup program
 
-MODPY_EGG_VERSION =	1.1.9
+MODPY_EGG_VERSION =	1.1.10
 DISTNAME =		borgbackup-${MODPY_EGG_VERSION}
-REVISION =		0
 
 CATEGORIES =		sysutils
 
@@ -17,19 +16,23 @@ MODULES =		lang/python
 MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 MODPY_PYTEST =		Yes
-MODPY_PYTEST_ARGS =	--ignore lib*
+MODPY_PYTEST_ARGS =	--ignore lib* --ignore src/borg/testsuite/benchmark.py
 MODPY_VERSION =		${MODPY_DEFAULT_VERSION_3}
 
-WANTLIB +=		${MODPY_WANTLIB} b2 crypto lz4 pthread zstd
+WANTLIB +=		${COMPILER_LIBCXX} ${MODPY_WANTLIB} b2 crypto lz4 m zstd
+
+COMPILER =		base-clang ports-gcc base-gcc
 
 LIB_DEPENDS +=		${MODPY_LIB_DEPENDS} \
 			archivers/lz4 \
 			archivers/zstd \
 			security/libb2
 BUILD_DEPENDS +=	devel/py-setuptools_scm${MODPY_FLAVOR}
-RUN_DEPENDS +=		net/py-msgpack${MODPY_FLAVOR}
-TEST_DEPENDS +=		devel/py-test-benchmark${MODPY_FLAVOR} \
-			devel/py-test-xdist${MODPY_FLAVOR}
+
+# XXX pytest-benchmark is currently not picked up as plugin by pytest, as result
+# benchmarking fails during 'make test'. For now ignore benchmarking (see
+# MODPY_PYTEST_ARGS), and comment out py-test-benchmark as TDEP.
+#TEST_DEPENDS +=		devel/py-test-benchmark${MODPY_FLAVOR}
 
 TEST_ENV +=		PATH=${WRKINST}/usr/local/bin:${PATH} \
 			PYTHONPATH=${WRKSRC}/src
diff --git a/sysutils/borgbackup/distinfo b/sysutils/borgbackup/distinfo
index 04f78fd06e2..7553cef9856 100644
--- a/sysutils/borgbackup/distinfo
+++ b/sysutils/borgbackup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (borgbackup-1.1.9.tar.gz) = fQ/4TmTEvjXEOuLAR7tSGpTxWyeML+Y7Q5UMSDa0JXU=
-SIZE (borgbackup-1.1.9.tar.gz) = 3468259
+SHA256 (borgbackup-1.1.10.tar.gz) = 77QUFtJP8dE8eVLH9Or0Hvb8XhAANUIX21XNYskF594=
+SIZE (borgbackup-1.1.10.tar.gz) = 3610011
diff --git a/sysutils/borgbackup/pkg/PLIST b/sysutils/borgbackup/pkg/PLIST
index 1ebab44c118..48da68d9463 100644
--- a/sysutils/borgbackup/pkg/PLIST
+++ b/sysutils/borgbackup/pkg/PLIST
@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.9 2018/04/21 11:54:55 bket Exp $
+@comment $OpenBSD: PLIST,v 1.10 2019/05/26 17:17:13 bket Exp $
 bin/borg
 bin/borgfs
 lib/python${MODPY_VERSION}/site-packages/borg/
 lib/python${MODPY_VERSION}/site-packages/borg/__init__.py
 lib/python${MODPY_VERSION}/site-packages/borg/__main__.py
-lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
@@ -29,9 +29,21 @@ lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}xattr.${MODPY_PYC_
 lib/python${MODPY_VERSION}/site-packages/borg/_version.py
 lib/python${MODPY_VERSION}/site-packages/borg/algorithms/
 lib/python${MODPY_VERSION}/site-packages/borg/algorithms/__init__.py
-lib/python${MODPY_VERSION}/site-packages/borg/algorithms/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/borg/algorithms/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/borg/algorithms/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/borg/algorithms/checksums.so
+lib/python${MODPY_VERSION}/site-packages/borg/algorithms/msgpack/
+lib/python${MODPY_VERSION}/site-packages/borg/algorithms/msgpack/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/borg/algorithms/msgpack/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/borg/algorithms/msgpack/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/borg/algorithms/msgpack/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/borg/algorithms/msgpack/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/borg/algorithms/msgpack/${MODPY_PYCACHE}fallback.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/borg/algorithms/msgpack/_packer.so
+lib/python${MODPY_VERSION}/site-packages/borg/algorithms/msgpack/_unpacker.so
+lib/python${MODPY_VERSION}/site-packages/borg/algorithms/msgpack/_version.py
+lib/python${MODPY_VERSION}/site-packages/borg/algorithms/msgpack/exceptions.py
+lib/python${MODPY_VERSION}/site-packages/borg/algorithms/msgpack/fallback.py
 lib/python${MODPY_VERSION}/site-packages/borg/archive.py
 lib/python${MODPY_VERSION}/site-packages/borg/archiver.py
 lib/python${MODPY_VERSION}/site-packages/borg/cache.py
@@ -40,7 +52,7 @@ lib/python${MODPY_VERSION}/site-packages/borg/compress.so
 lib/python${MODPY_VERSION}/site-packages/borg/constants.py
 lib/python${MODPY_VERSION}/site-packages/borg/crypto/
 lib/python${MODPY_VERSION}/site-packages/borg/crypto/__init__.py
-lib/python${MODPY_VERSION}/site-packages/borg/crypto/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/borg/crypto/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/borg/crypto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/borg/crypto/${MODPY_PYCACHE}file_integrity.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/borg/crypto/${MODPY_PYCACHE}key.${MODPY_PYC_MAGIC_TAG}pyc
@@ -63,7 +75,7 @@ lib/python${MODPY_VERSION}/site-packages/borg/paperkey.html
 lib/python${MODPY_VERSION}/site-packages/borg/patterns.py
 lib/python${MODPY_VERSION}/site-packages/borg/platform/
 lib/python${MODPY_VERSION}/site-packages/borg/platform/__init__.py
-lib/python${MODPY_VERSION}/site-packages/borg/platform/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/borg/platform/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/borg/platform/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/borg/platform/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/borg/platform/base.py
@@ -74,7 +86,7 @@ lib/python${MODPY_VERSION}/site-packages/borg/selftest.py
 lib/python${MODPY_VERSION}/site-packages/borg/shellpattern.py
 lib/python${MODPY_VERSION}/site-packages/borg/testsuite/
 lib/python${MODPY_VERSION}/site-packages/borg/testsuite/__init__.py
-lib/python${MODPY_VERSION}/site-packages/borg/testsuite/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/borg/testsuite/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/borg/testsuite/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/borg/testsuite/${MODPY_PYCACHE}archive.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/borg/testsuite/${MODPY_PYCACHE}archiver.${MODPY_PYC_MAGIC_TAG}pyc