On Wed 09/08/2017 21:28, Björn Ketelaars wrote:
> On Tue 08/08/2017 11:53, Giovanni Bechis wrote:
> > On 08/08/17 11:41, Stuart Henderson wrote:
> > > On 2017/08/08 08:54, Giovanni Bechis wrote:
> > >> On 08/06/17 15:46, Björn Ketelaars wrote:
> > >>> Please find enclosed a diff for bringing sysutils/borgbackup to the
> > >>> latest
> > >>> version, which fixes a couple of bugs. Changelog can be found at
> > >>> https://github.com/borgbackup/borg/blob/1.0.11/docs/changes.rst#version-1011-2017-07-21
> > >>>
> > >>> Upstream has made some changes to setup.py with as result that some
> > >>> source
> > >>> files (*.c and *.pyx) are installed as well. For now I prefer following
> > >>> upstream, and make these files part of the final port. Any other
> > >>> opinions?
> > >>>
> > >> I do not like it that much, I would prefer to remove them before
> > >> installing.
> > >
> > > I'd generally prefer to follow upstream for this too..
> > >
> > ok then
> >
> > >> Other than that all regression tests are failing, backup is working, I
> > >> have not tested sysutils/borgmatic, do you ?
> > >
> > > Seems ok here .. I'm using the updated diff below which adds RUN_DEPENDS
> > > to BUILD_DEPENDS, which might be important.
> > >
> > make test fails iff borgbackup is installed, even with the old version
>
> I am able to reproduce the issue; when borgbackup is installed make test will
> fail. Workaround is to uninstall borgbackup before running make test.
>
> As my py.test-fu is limited I Googled a bit. Conclusion is that this is an
> actual feature of py.test [0]. Solution would be to use a virtualenv
> environment [1]. This is exactly what upstream does.
>
> My proposal is to print a message when someone does make test. OK?
>
> [0]
> https://stackoverflow.com/questions/12582503/py-test-test-discovery-failure-when-tests-in-different-directories-are-called
> [1]
> https://docs.pytest.org/en/latest/goodpractices.html#choosing-a-test-layout-import-rules
>
OK?
diff --git sysutils/borgbackup/Makefile sysutils/borgbackup/Makefile
index bb4f9e4ac66..9f67246e49b 100644
--- sysutils/borgbackup/Makefile
+++ sysutils/borgbackup/Makefile
@@ -2,7 +2,7 @@
COMMENT = deduplicating backup program
-MODPY_EGG_VERSION = 1.0.10
+MODPY_EGG_VERSION = 1.0.11
DISTNAME = borgbackup-${MODPY_EGG_VERSION}
MODPY_PI = Yes
@@ -17,11 +17,15 @@ PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
-WANTLIB += ${MODPY_WANTLIB} crypto pthread lz4
-LIB_DEPENDS = ${MODPY_LIB_DEPENDS} archivers/lz4
-BUILD_DEPENDS += devel/py-setuptools_scm${MODPY_FLAVOR} \
+WANTLIB += ${MODPY_WANTLIB} crypto lz4 pthread
+
+LIB_DEPENDS += ${MODPY_LIB_DEPENDS} archivers/lz4
+
+BUILD_DEPENDS += ${RUN_DEPENDS} \
+ devel/py-setuptools_scm${MODPY_FLAVOR} \
textproc/py-sphinx${MODPY_FLAVOR}
+
RUN_DEPENDS += net/py-msgpack${MODPY_FLAVOR}
TEST_DEPENDS += ${RUN_DEPENDS} \
@@ -40,6 +44,7 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/docs/_build/man/borg.1
${PREFIX}/man/man1/borg.1
do-test: fake
+ @printf "\n*** NOTE: borgbackup fails all tests when it is already
installed ***\n\n"
cd ${WRKSRC}; \
PATH=${WRKINST}/usr/local/bin:${PATH} \
PYTHONPATH=${WRKSRC} \
diff --git sysutils/borgbackup/distinfo sysutils/borgbackup/distinfo
index d59ca0edbae..efa07b0453b 100644
--- sysutils/borgbackup/distinfo
+++ sysutils/borgbackup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (borgbackup-1.0.10.tar.gz) =
l48o8USSQAUhnamJsbQ2oysnNaNMbQ3BW7ChzP+tWek=
-SIZE (borgbackup-1.0.10.tar.gz) = 563363
+SHA256 (borgbackup-1.0.11.tar.gz) =
/G79LRlFRiVTLg3vrJDNjoc3Zl4QrlntsVNW7lqZ0pE=
+SIZE (borgbackup-1.0.11.tar.gz) = 603381
diff --git sysutils/borgbackup/pkg/PLIST sysutils/borgbackup/pkg/PLIST
index 7a7484318f0..005571f11f4 100644
--- sysutils/borgbackup/pkg/PLIST
+++ sysutils/borgbackup/pkg/PLIST
@@ -23,14 +23,24 @@
lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}repository.${MODPY
lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}shellpattern.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}upgrader.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borg/${MODPY_PYCACHE}xattr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/borg/_chunker.c
+lib/python${MODPY_VERSION}/site-packages/borg/_hashindex.c
lib/python${MODPY_VERSION}/site-packages/borg/_version.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
+lib/python${MODPY_VERSION}/site-packages/borg/chunker.c
+lib/python${MODPY_VERSION}/site-packages/borg/chunker.pyx
lib/python${MODPY_VERSION}/site-packages/borg/chunker.so
+lib/python${MODPY_VERSION}/site-packages/borg/compress.c
+lib/python${MODPY_VERSION}/site-packages/borg/compress.pyx
lib/python${MODPY_VERSION}/site-packages/borg/compress.so
+lib/python${MODPY_VERSION}/site-packages/borg/crypto.c
+lib/python${MODPY_VERSION}/site-packages/borg/crypto.pyx
lib/python${MODPY_VERSION}/site-packages/borg/crypto.so
lib/python${MODPY_VERSION}/site-packages/borg/fuse.py
+lib/python${MODPY_VERSION}/site-packages/borg/hashindex.c
+lib/python${MODPY_VERSION}/site-packages/borg/hashindex.pyx
lib/python${MODPY_VERSION}/site-packages/borg/hashindex.so
lib/python${MODPY_VERSION}/site-packages/borg/helpers.py
lib/python${MODPY_VERSION}/site-packages/borg/key.py
@@ -40,6 +50,12 @@ 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/platform_darwin.c
+lib/python${MODPY_VERSION}/site-packages/borg/platform_darwin.pyx
+lib/python${MODPY_VERSION}/site-packages/borg/platform_freebsd.c
+lib/python${MODPY_VERSION}/site-packages/borg/platform_freebsd.pyx
+lib/python${MODPY_VERSION}/site-packages/borg/platform_linux.c
+lib/python${MODPY_VERSION}/site-packages/borg/platform_linux.pyx
lib/python${MODPY_VERSION}/site-packages/borg/remote.py
lib/python${MODPY_VERSION}/site-packages/borg/repository.py
lib/python${MODPY_VERSION}/site-packages/borg/shellpattern.py
@@ -66,6 +82,7 @@
lib/python${MODPY_VERSION}/site-packages/borg/testsuite/${MODPY_PYCACHE}upgrader
lib/python${MODPY_VERSION}/site-packages/borg/testsuite/${MODPY_PYCACHE}xattr.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/borg/testsuite/archive.py
lib/python${MODPY_VERSION}/site-packages/borg/testsuite/archiver.py
+lib/python${MODPY_VERSION}/site-packages/borg/testsuite/attic.tar.gz
lib/python${MODPY_VERSION}/site-packages/borg/testsuite/benchmark.py
lib/python${MODPY_VERSION}/site-packages/borg/testsuite/chunker.py
lib/python${MODPY_VERSION}/site-packages/borg/testsuite/compress.py
