Diff below brings borgbackup to 1.1.10, which is a 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 to msgpack by its upstream, and borgbackup was seemingly the
only port unable to cope with this renaming, thus blocking an update.
Changes to the port:
- Remove py-msgpack as RDEP. See above;
- Remove py-test-xdist as TDEP. Although tests can be run parallel, they
are not. As such there is no need for it;
- 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;
- Set COMPILER as this is required for building the bundled
msgpack-python;
- Sync WANTLIB.
Testing:
- 'make test' runs successfully on amd64;
- Run tested on several hosts (all amd64): listing and creating
snapshots, pruning old snapshots, and extracting files from a snaphot.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/borgbackup/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile 15 May 2019 12:04:41 -0000 1.29
+++ Makefile 19 May 2019 05:47:48 -0000
@@ -2,9 +2,8 @@
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
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/borgbackup/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo 11 Feb 2019 11:58:31 -0000 1.18
+++ distinfo 19 May 2019 05:47:48 -0000
@@ -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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/borgbackup/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 21 Apr 2018 11:54:55 -0000 1.9
+++ pkg/PLIST 19 May 2019 05:47:48 -0000
@@ -32,6 +32,18 @@ lib/python${MODPY_VERSION}/site-packages
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
+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
