Am Sun, Jan 03, 2021 at 07:48:50AM +0100 schrieb Bjorn Ketelaars:
> On Sat 26/12/2020 06:44, Bjorn Ketelaars wrote:
> > A newer version of borgbackup is available - 1.1.15 -, which is a
> > maintenance release. List of changes can be found at
> > https://github.com/borgbackup/borg/blob/1.1.15/docs/changes.rst.
> >
> > Changes to the port:
> > - Switch to xxhash from ports instead of using the bundled version
> > - Install shell completions
> > - No need to have ${MODPY_LIB_DEPENDS} in LIB_DEPENDS as borgbackup does
> > not link against libpython. Same for ${MODPY_WANTLIB} in WANTLIB
> >
> > Testing:
> > - Run tested on amd64: creating a snapshot and extracting some file from
> > it
> > - 'make test' runs successful
> >
> > Comments/OK?
Tested on two amd64 machines with create, check, list, extract and
delete.
Works fine.
>
> Ping!
>
>
> Diff enclosed for your convenience.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/borgbackup/Makefile,v
> retrieving revision 1.36
> diff -u -p -r1.36 Makefile
> --- Makefile 7 Oct 2020 18:28:08 -0000 1.36
> +++ Makefile 25 Dec 2020 18:37:58 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT = deduplicating backup program
>
> -MODPY_EGG_VERSION = 1.1.14
> +MODPY_EGG_VERSION = 1.1.15
> DISTNAME = borgbackup-${MODPY_EGG_VERSION}
>
> CATEGORIES = sysutils
> @@ -21,14 +21,14 @@ MODPY_PYTEST = Yes
> MODPY_PYTEST_ARGS = --ignore lib* --ignore src/borg/testsuite/benchmark.py
> MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>
> -WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} b2 crypto lz4 m zstd
> +WANTLIB += ${COMPILER_LIBCXX} b2 crypto lz4 m xxhash zstd
>
> COMPILER = base-clang ports-gcc base-gcc
>
> -LIB_DEPENDS += ${MODPY_LIB_DEPENDS} \
> - archivers/lz4 \
> +LIB_DEPENDS += archivers/lz4 \
> archivers/zstd \
> - security/libb2
> + security/libb2 \
> + sysutils/xxhash
> BUILD_DEPENDS += devel/py-setuptools_scm${MODPY_FLAVOR}
>
> # XXX pytest-benchmark is currently not picked up as plugin by pytest, as
> result
> @@ -42,6 +42,18 @@ PORTHOME = ${WRKDIR}
>
> post-install:
> ${INSTALL_MAN} ${WRKSRC}/docs/man/*.1 ${PREFIX}/man/man1/
> +
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions/
> + ${INSTALL_DATA} ${WRKSRC}/scripts/shell_completions/bash/borg \
> + ${PREFIX}/share/bash-completion/completions/
> +
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/fish/completions/
> + ${INSTALL_DATA} ${WRKSRC}/scripts/shell_completions/fish/borg.fish \
> + ${PREFIX}/share/fish/completions/
> +
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions/
> + ${INSTALL_DATA} ${WRKSRC}/scripts/shell_completions/zsh/_borg \
> + ${PREFIX}/share/zsh/site-functions/
>
> pre-test:
> ${MODPY_CMD} build_ext --inplace
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/borgbackup/distinfo,v
> retrieving revision 1.22
> diff -u -p -r1.22 distinfo
> --- distinfo 7 Oct 2020 18:28:08 -0000 1.22
> +++ distinfo 25 Dec 2020 18:37:58 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (borgbackup-1.1.14.tar.gz) =
> fbsHR8yUhnP2lc1t4oSvIV+BD+0usqYV7ybdx8aR7bo=
> -SIZE (borgbackup-1.1.14.tar.gz) = 3769460
> +SHA256 (borgbackup-1.1.15.tar.gz) =
> Scue7Zi44yrjuXvq7flM3/RveWRFBD8ZI/0Pzn7Twrw=
> +SIZE (borgbackup-1.1.15.tar.gz) = 3777355
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/borgbackup/pkg/PLIST,v
> retrieving revision 1.11
> diff -u -p -r1.11 PLIST
> --- pkg/PLIST 8 Mar 2020 14:52:29 -0000 1.11
> +++ pkg/PLIST 25 Dec 2020 18:37:58 -0000
> @@ -185,3 +185,12 @@ lib/python${MODPY_VERSION}/site-packages
> @man man/man1/borg-with-lock.1
> @man man/man1/borg.1
> @man man/man1/borgfs.1
> +share/bash-completion/
> +share/bash-completion/completions/
> +share/bash-completion/completions/borg
> +share/fish/
> +share/fish/completions/
> +share/fish/completions/borg.fish
> +share/zsh/
> +share/zsh/site-functions/
> +share/zsh/site-functions/_borg
>
