On Sun 05/11/2017 00:50, Jeremie Courreges-Anglas wrote:
>
> Hi,
>
> Minor tweaks for borgbackup. lang/python/3.6 now provides a python3
> symlink, so the patch shouldn't be needed.
>
> ok?
Makefile needs some attention as well. See diff below.
--
Björn Ketelaars
GPG key: 0x4F0E5F21
diff --git sysutils/borgbackup/Makefile sysutils/borgbackup/Makefile
index e7210a25829..399887932c7 100644
--- sysutils/borgbackup/Makefile
+++ sysutils/borgbackup/Makefile
@@ -35,9 +35,6 @@ TEST_DEPENDS += ${RUN_DEPENDS} \
MODPY_SETUPTOOLS = Yes
-post-patch:
- ${SUBST_CMD} ${WRKSRC}/src/borg/testsuite/archiver.py
-
post-build:
${MODPY_CMD} build_ext --inplace
cd ${WRKSRC}/docs; env PYTHONPATH=${WRKSRC} \
@@ -45,7 +42,6 @@ post-build:
post-install:
${INSTALL_MAN} ${WRKSRC}/docs/_build/man/borg.1
${PREFIX}/man/man1/borg.1
- rm
${PREFIX}/lib/python${MODPY_VERSION}/site-packages/borg/testsuite/archiver.py.beforesubst
do-test: fake
cd ${WRKSRC}; \
diff --git sysutils/borgbackup/patches/patch-src_borg__endian_h
sysutils/borgbackup/patches/patch-src_borg__endian_h
index ad7acf235eb..86a2d38b011 100644
--- sysutils/borgbackup/patches/patch-src_borg__endian_h
+++ sysutils/borgbackup/patches/patch-src_borg__endian_h
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_borg__endian_h,v 1.1 2017/11/04 12:29:38 jasper Exp $
-__builtin_bswap32 unavailable at least on sparc6
+__builtin_bswap32 unavailable at least on sparc64
Index: src/borg/_endian.h
--- src/borg/_endian.h.orig
diff --git sysutils/borgbackup/patches/patch-src_borg_testsuite_archiver_py
sysutils/borgbackup/patches/patch-src_borg_testsuite_archiver_py
deleted file mode 100644
index 274f2c64c99..00000000000
--- sysutils/borgbackup/patches/patch-src_borg_testsuite_archiver_py
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_borg_testsuite_archiver_py,v 1.1 2017/11/04 12:29:38
jasper Exp $
-
-Index: src/borg/testsuite/archiver.py
---- src/borg/testsuite/archiver.py.orig
-+++ src/borg/testsuite/archiver.py
-@@ -2452,7 +2452,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
- def test_with_lock(self):
- self.cmd('init', '--encryption=repokey', self.repository_location)
- lock_path = os.path.join(self.repository_path, 'lock.exclusive')
-- cmd = 'python3', '-c', 'import os, sys; sys.exit(42 if
os.path.exists("%s") else 23)' % lock_path
-+ cmd = 'python${MODPY_VERSION}', '-c', 'import os, sys; sys.exit(42 if
os.path.exists("%s") else 23)' % lock_path
- self.cmd('with-lock', self.repository_location, *cmd, fork=True,
exit_code=42)
-
- def test_recreate_list_output(self):
