aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Seaman <matthew@FreeBSD.org>2024-01-21 15:01:12 +0000
committerMatthew Seaman <matthew@FreeBSD.org>2024-01-21 15:03:40 +0000
commit2f364c65c96a1f2a48f48e29d7c135a16c4c3c2b (patch)
tree068322e232f9a203d35ad6f6df419e0b0dafe254
parent40bee3cbc85f61c6c0f3c088a4cdaae611b8deea (diff)
downloadports-2f364c65c96a1f2a48f48e29d7c135a16c4c3c2b.tar.gz
ports-2f364c65c96a1f2a48f48e29d7c135a16c4c3c2b.zip
databases/pgbarman: clean up manpages
Delete files/patch-setup.py, thus restoring the upstream default of installing into .../share/man Regenerate patches.
-rw-r--r--databases/pgbarman/Makefile1
-rw-r--r--databases/pgbarman/files/patch-barman_config.py4
-rw-r--r--databases/pgbarman/files/patch-doc_barman.58
-rw-r--r--databases/pgbarman/files/patch-doc_barman.conf4
-rw-r--r--databases/pgbarman/files/patch-setup.py20
5 files changed, 9 insertions, 28 deletions
diff --git a/databases/pgbarman/Makefile b/databases/pgbarman/Makefile
index 27e7ddb610dd..3e5477578825 100644
--- a/databases/pgbarman/Makefile
+++ b/databases/pgbarman/Makefile
@@ -1,6 +1,7 @@
PORTNAME= barman
DISTVERSIONPREFIX= release/
DISTVERSION= 3.9.0
+PORTREVISION= 1
CATEGORIES= databases
PKGNAMEPREFIX= pg
PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX}
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,6 +1,6 @@
---- 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",
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,4 +1,4 @@
---- 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
@@ -18,7 +18,7 @@
\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.
@@ -30,7 +30,7 @@
.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
@@ -39,7 +39,7 @@
;\ 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
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,6 +1,6 @@
---- 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
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": [