Please find enclosed a diff for bringing sysutils/borgbackup to the latest
version (1.0.10). Changelog can be found at
https://github.com/borgbackup/borg/blob/1.0.10/docs/changes.rst#version-1010-2017-02-13
OK?
--
Björn Ketelaars
GPG key: 0x4F0E5F21
diff --git sysutils/borgbackup/Makefile sysutils/borgbackup/Makefile
index eab90f3a9fe..caf6976afb3 100644
--- sysutils/borgbackup/Makefile
+++ sysutils/borgbackup/Makefile
@@ -2,9 +2,8 @@
COMMENT = deduplicating backup program
-MODPY_EGG_VERSION = 1.0.9
+MODPY_EGG_VERSION = 1.0.10
DISTNAME = borgbackup-${MODPY_EGG_VERSION}
-REVISION = 0
MODPY_PI = Yes
@@ -27,7 +26,8 @@ RUN_DEPENDS += net/py-msgpack${MODPY_FLAVOR}
TEST_DEPENDS += ${RUN_DEPENDS} \
devel/py-test${MODPY_FLAVOR} \
- devel/py-test-benchmark${MODPY_FLAVOR}
+ devel/py-test-benchmark${MODPY_FLAVOR} \
+ devel/py-test-xdist${MODPY_FLAVOR}
MODPY_SETUPTOOLS = Yes
diff --git sysutils/borgbackup/distinfo sysutils/borgbackup/distinfo
index 539e3495195..d59ca0edbae 100644
--- sysutils/borgbackup/distinfo
+++ sysutils/borgbackup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (borgbackup-1.0.9.tar.gz) = NYYIQOBCnUuzrMi53TOqWZakL7K2eIE6mCsyGn26PLI=
-SIZE (borgbackup-1.0.9.tar.gz) = 541796
+SHA256 (borgbackup-1.0.10.tar.gz) =
l48o8USSQAUhnamJsbQ2oysnNaNMbQ3BW7ChzP+tWek=
+SIZE (borgbackup-1.0.10.tar.gz) = 563363
diff --git sysutils/borgbackup/patches/patch-borg__hashindex_c
sysutils/borgbackup/patches/patch-borg__hashindex_c
index 6644a8d9ed6..50fce5238e8 100644
--- sysutils/borgbackup/patches/patch-borg__hashindex_c
+++ sysutils/borgbackup/patches/patch-borg__hashindex_c
@@ -2,8 +2,8 @@ $OpenBSD: patch-borg__hashindex_c,v 1.1 2016/05/19 20:30:16 jca
Exp $
__builtin_bswap32 unavailable at least on sparc64
---- borg/_hashindex.c.orig Fri Apr 15 02:05:17 2016
-+++ borg/_hashindex.c Wed May 18 21:47:45 2016
+--- borg/_hashindex.c.orig Mon Feb 13 04:55:35 2017
++++ borg/_hashindex.c Mon Feb 13 12:43:39 2017
@@ -7,6 +7,7 @@
#include <sys/stat.h>
#include <fcntl.h>
@@ -12,14 +12,14 @@ __builtin_bswap32 unavailable at least on sparc64
#if defined (__SVR4) && defined (__sun)
#include <sys/isa_defs.h>
-@@ -14,8 +15,8 @@
+@@ -25,8 +26,8 @@
+ #endif
- #if (defined(BYTE_ORDER)&&(BYTE_ORDER == BIG_ENDIAN)) || \
- (defined(_BIG_ENDIAN)&&defined(__SVR4)&&defined(__sun))
+ #if BORG_BIG_ENDIAN
-#define _le32toh(x) __builtin_bswap32(x)
-#define _htole32(x) __builtin_bswap32(x)
+#define _le32toh(x) letoh32(x)
+#define _htole32(x) htole32(x)
- #elif (defined(BYTE_ORDER)&&(BYTE_ORDER == LITTLE_ENDIAN)) || \
- (defined(_LITTLE_ENDIAN)&&defined(__SVR4)&&defined(__sun))
+ #else
#define _le32toh(x) (x)
+ #define _htole32(x) (x)
diff --git sysutils/borgbackup/pkg/PLIST sysutils/borgbackup/pkg/PLIST
index 14a4ea63124..dc4c325c876 100644
--- sysutils/borgbackup/pkg/PLIST
+++ sysutils/borgbackup/pkg/PLIST
@@ -38,6 +38,7 @@ lib/python${MODPY_VERSION}/site-packages/borg/keymanager.py
lib/python${MODPY_VERSION}/site-packages/borg/locking.py
lib/python${MODPY_VERSION}/site-packages/borg/logger.py
lib/python${MODPY_VERSION}/site-packages/borg/lrucache.py
+lib/python${MODPY_VERSION}/site-packages/borg/paperkey.html
lib/python${MODPY_VERSION}/site-packages/borg/platform.py
lib/python${MODPY_VERSION}/site-packages/borg/remote.py
lib/python${MODPY_VERSION}/site-packages/borg/repository.py
