diff --git a/databases/pgbarman/Makefile b/databases/pgbarman/Makefile index 85b020d82f69..660ef3111f65 100644 --- a/databases/pgbarman/Makefile +++ b/databases/pgbarman/Makefile @@ -1,47 +1,49 @@ PORTNAME= barman DISTVERSIONPREFIX= release/ -DISTVERSION= 3.19.1 +DISTVERSION= 3.20.0 CATEGORIES= databases PKGNAMEPREFIX= pg PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} MAINTAINER= matthew@FreeBSD.org COMMENT= Backup and recovery manager for PostgreSQL WWW= https://pgbarman.org/ LICENSE= GPLv3 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}uv-build>=0.11.17,<0.13:devel/py-uv-build@${PY_FLAVOR} + RUN_DEPENDS= rsync:net/rsync \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.4.2:databases/py-psycopg2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete@${PY_FLAVOR} -USES= python -USE_PYTHON= autoplist distutils +USES= python:3.12+ +USE_PYTHON= pep517 autoplist USE_GITHUB= yes GH_ACCOUNT= EnterpriseDB WANT_PGSQL= client NO_ARCH= yes USERS= barman GROUPS= barman .include -post-patch: -.for f in barman/config.py \ +pre-build: +.for f in src/barman/config.py \ docs/barman.conf \ docs/_build/man/barman-config-update.1 \ docs/_build/man/barman.1 \ docs/_build/man/barman.5 ${SED} -i -e "s@%%PREFIX%%@${PREFIX}@" ${WRKSRC}/${f} .endfor post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/docs/barman.conf \ ${STAGEDIR}${ETCDIR}/barman.conf.sample .include diff --git a/databases/pgbarman/distinfo b/databases/pgbarman/distinfo index cf2351821f2e..8c932343085a 100644 --- a/databases/pgbarman/distinfo +++ b/databases/pgbarman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1779952607 -SHA256 (EnterpriseDB-barman-release-3.19.1_GH0.tar.gz) = 4a6cb1b7d4d1771a8f14010134187fe0481b07bcad30a79a91a6332b02b0d320 -SIZE (EnterpriseDB-barman-release-3.19.1_GH0.tar.gz) = 2140487 +TIMESTAMP = 1787991383 +SHA256 (EnterpriseDB-barman-release-3.20.0_GH0.tar.gz) = 212778c6282810216e4fdd25bcda79040dc52e42299f79008b57dac9a3c35ab2 +SIZE (EnterpriseDB-barman-release-3.20.0_GH0.tar.gz) = 2256031 diff --git a/databases/pgbarman/files/patch-barman_config.py b/databases/pgbarman/files/patch-src_barman_config.py similarity index 82% rename from databases/pgbarman/files/patch-barman_config.py rename to databases/pgbarman/files/patch-src_barman_config.py index 17257efbd841..7c3e5c965add 100644 --- a/databases/pgbarman/files/patch-barman_config.py +++ b/databases/pgbarman/files/patch-src_barman_config.py @@ -1,22 +1,22 @@ ---- barman/config.py.orig 2026-01-07 14:55:50 UTC -+++ barman/config.py -@@ -1379,15 +1379,15 @@ class Config(object): +--- src/barman/config.py.orig 2026-08-29 10:00:11 UTC ++++ src/barman/config.py +@@ -1464,15 +1464,15 @@ class Config(object): class Config(object): """This class represents the barman configuration. - Default configuration files are /etc/barman.conf, - /etc/barman/barman.conf + Default configuration files are %%PREFIX%%/etc/barman.conf, + %%PREFIX%%/etc/barman/barman.conf and ~/.barman.conf for a per-user configuration """ CONFIG_FILES = [ "~/.barman.conf", - "/etc/barman.conf", - "/etc/barman/barman.conf", + "%%PREFIX%%/etc/barman.conf", + "%%PREFIX%%/etc/barman/barman.conf", ] _QUOTE_RE = re.compile(r"""^(["'])(.*)\1$""")