diff --git a/databases/pgbarman/Makefile b/databases/pgbarman/Makefile index 27e7ddb610dd..3e5477578825 100644 --- a/databases/pgbarman/Makefile +++ b/databases/pgbarman/Makefile @@ -1,60 +1,61 @@ PORTNAME= barman DISTVERSIONPREFIX= release/ DISTVERSION= 3.9.0 +PORTREVISION= 1 CATEGORIES= databases PKGNAMEPREFIX= pg PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} MAINTAINER= matthew@FreeBSD.org COMMENT= Backup and recovery manager for PostgreSQL WWW= https://pgbarman.org/ LICENSE= GPLv3 RUN_DEPENDS= rsync:net/rsync \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.4.2:databases/py-psycopg2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils USE_GITHUB= yes GH_ACCOUNT= EnterpriseDB WANT_PGSQL= client NO_ARCH= yes USERS= barman GROUPS= barman OPTIONS_DEFINE= DOCS DOCS_DESC= Install PDF manual DOCS_VARS= PORTDOCS=barman-${DISTVERSION}-manual.pdf \ MASTER_SITES+=https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/release%2F${DISTVERSION}/:docs \ DISTFILES+=barman-${DISTVERSION}-manual.pdf:docs \ EXTRACT_ONLY=${DISTNAME}${EXTRACT_SUFX} .include PGUSER= pgsql post-extract-DOCS-on: ${CP} ${DISTDIR}/${PORTDOCS} ${WRKDIR}/ post-patch: ${SED} -i -e "s@%%PREFIX%%@${PREFIX}@" ${WRKSRC}/barman/config.py ${SED} -i -e "s@%%PREFIX%%@${PREFIX}@" ${WRKSRC}/doc/barman.conf ${SED} -i -e "s@%%PGUSER%%@${PGUSER}@" ${WRKSRC}/doc/barman.5 post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/doc/barman.conf \ ${STAGEDIR}${ETCDIR}/barman.conf.sample post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include diff --git a/databases/pgbarman/files/patch-barman_config.py b/databases/pgbarman/files/patch-barman_config.py index 3d22d892e578..f5ff6b265be0 100644 --- a/databases/pgbarman/files/patch-barman_config.py +++ b/databases/pgbarman/files/patch-barman_config.py @@ -1,13 +1,13 @@ ---- barman/config.py.orig 2021-12-01 11:09:36 UTC +--- barman/config.py.orig 2023-10-03 12:56:33 UTC +++ barman/config.py -@@ -661,8 +661,8 @@ class Config(object): +@@ -802,8 +802,8 @@ class Config(object): 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$""") diff --git a/databases/pgbarman/files/patch-doc_barman.5 b/databases/pgbarman/files/patch-doc_barman.5 index abaa27b7fbed..2f63c46013e8 100644 --- a/databases/pgbarman/files/patch-doc_barman.5 +++ b/databases/pgbarman/files/patch-doc_barman.5 @@ -1,58 +1,58 @@ ---- doc/barman.5.orig 2021-12-01 11:09:36 UTC +--- doc/barman.5.orig 2023-10-03 12:56:33 UTC +++ doc/barman.5 @@ -17,7 +17,7 @@ The system\-level Barman configuration file is located .IP .nf \f[C] -/etc/barman.conf +%%PREFIX%%/etc/barman.conf \f[] .fi .PP @@ -25,7 +25,7 @@ or .IP .nf \f[C] -/etc/barman/barman.conf +%%PREFIX%%/etc/barman/barman.conf \f[] .fi .PP -@@ -51,9 +51,9 @@ configurations. +@@ -51,9 +51,9 @@ that folder. If the value of \f[C]configuration_files_directory\f[] is a directory, Barman reads all files with \f[C]\&.conf\f[] extension that exist in that folder. -For example, if you set it to \f[C]/etc/barman.d\f[], you can specify +For example, if you set it to \f[C]%%PREFIX%%/etc/barman.d\f[], you can specify your PostgreSQL servers placing each section in a separate -\f[C]\&.conf\f[] file inside the \f[C]/etc/barman.d\f[] folder. +\f[C]\&.conf\f[] file inside the \f[C]%%PREFIX%%/etc/barman.d\f[] folder. .SH OPTIONS .TP .B active -@@ -851,7 +851,7 @@ Here is an example of configuration file: +@@ -1082,7 +1082,7 @@ Here is an example of configuration file: \f[C] [barman] ;\ Main\ directory -barman_home\ =\ /var/lib/barman +barman_home\ =\ /var/barman ;\ System\ user barman_user\ =\ barman -@@ -871,13 +871,13 @@ reuse_backup\ =\ link +@@ -1102,13 +1102,13 @@ description\ =\ \ "Main\ PostgreSQL\ Database" description\ =\ \ "Main\ PostgreSQL\ Database" ;\ SSH\ options -ssh_command\ =\ ssh\ postgres\@pg +ssh_command\ =\ ssh\ %%PGUSER%%\@pg ;\ PostgreSQL\ connection\ string -conninfo\ =\ host=pg\ user=postgres +conninfo\ =\ host=pg\ user=%%PGUSER%% ;\ PostgreSQL\ streaming\ connection\ string -streaming_conninfo\ =\ host=pg\ user=postgres +streaming_conninfo\ =\ host=pg\ user=%%PGUSER%% ;\ Minimum\ number\ of\ required\ backups\ (redundancy) minimum_redundancy\ =\ 1 diff --git a/databases/pgbarman/files/patch-doc_barman.conf b/databases/pgbarman/files/patch-doc_barman.conf index bc97a103b353..b2993aff915d 100644 --- a/databases/pgbarman/files/patch-doc_barman.conf +++ b/databases/pgbarman/files/patch-doc_barman.conf @@ -1,17 +1,17 @@ ---- doc/barman.conf.orig 2016-09-23 12:56:55 UTC +--- doc/barman.conf.orig 2023-10-03 12:56:33 UTC +++ doc/barman.conf -@@ -8,11 +8,11 @@ +@@ -8,11 +8,11 @@ barman_user = barman barman_user = barman ; Directory of configuration files. Place your sections in separate files with .conf extension -; For example place the 'main' server section in /etc/barman.d/main.conf -configuration_files_directory = /etc/barman.d +; For example place the 'main' server section in %%PREFIX%%/etc/barman.d/main.conf +configuration_files_directory = %%PREFIX%%/etc/barman.d ; Main directory -barman_home = /var/lib/barman +barman_home = /var/barman ; Locks directory - default: %(barman_home)s ;barman_lock_directory = /var/run/barman diff --git a/databases/pgbarman/files/patch-setup.py b/databases/pgbarman/files/patch-setup.py deleted file mode 100644 index 4c4266d4ee38..000000000000 --- a/databases/pgbarman/files/patch-setup.py +++ /dev/null @@ -1,20 +0,0 @@ ---- setup.py.orig 2021-12-01 11:09:36 UTC -+++ setup.py -@@ -61,7 +61,7 @@ setup( - packages=find_packages(exclude=["tests"]), - data_files=[ - ( -- "share/man/man1", -+ "man/man1", - [ - "doc/barman.1", - "doc/barman-cloud-backup.1", -@@ -73,7 +73,7 @@ setup( - "doc/barman-wal-restore.1", - ], - ), -- ("share/man/man5", ["doc/barman.5"]), -+ ("man/man5", ["doc/barman.5"]), - ], - entry_points={ - "console_scripts": [