On Thu, Jan 04, 2018 at 10:25:28PM +0100, Björn Ketelaars wrote:
> Now that archivers/zstd provides libzstd, and libb2 is in ports it seems like
> a good idea to replace the bundled copies in borgbackup by those in ports.
>
> No regressions found using 'make test'. Also tested by making, and restoring
> a backup.
>
> Comments/OKs?
>
> --
> Björn Ketelaars
> GPG key: 0x4F0E5F21
>
>
> diff --git sysutils/borgbackup/Makefile sysutils/borgbackup/Makefile
> index e941957b50d..70a4fa75257 100644
> --- sysutils/borgbackup/Makefile
> +++ sysutils/borgbackup/Makefile
> @@ -4,6 +4,7 @@ COMMENT = deduplicating backup program
>
> MODPY_EGG_VERSION = 1.1.4
> DISTNAME = borgbackup-${MODPY_EGG_VERSION}
> +REVISION = 0
>
> CATEGORIES = sysutils
>
> @@ -17,9 +18,12 @@ MODPY_PI = Yes
> MODPY_SETUPTOOLS = Yes
> MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>
> -WANTLIB += ${MODPY_WANTLIB} crypto lz4 pthread
> +WANTLIB += ${MODPY_WANTLIB} b2 crypto lz4 pthread zstd
>
> -LIB_DEPENDS += ${MODPY_LIB_DEPENDS} archivers/lz4
> +LIB_DEPENDS += ${MODPY_LIB_DEPENDS} \
> + archivers/lz4 \
> + archivers/zstd \
> + security/libb2
> BUILD_DEPENDS += ${RUN_DEPENDS} \
> devel/py-setuptools_scm${MODPY_FLAVOR} \
> textproc/py-sphinx_guzzle_theme${MODPY_FLAVOR}
>
Looks good to me:
$ make build
===> Building for borgbackup-1.1.4p0
Detected and preferring liblz4 over bundled LZ4
Detected and preferring libb2 over bundled BLAKE2
Detected and preferring libzstd over bundled ZSTD
[...]
Works here, too. Sorry for possibly delaying this with my zstd test
failures.
You can build it with SEPARATE_BUILD=Yes.
