diff options
| -rw-r--r-- | databases/pgbarman/Makefile | 11 | ||||
| -rw-r--r-- | databases/pgbarman/distinfo | 6 | ||||
| -rw-r--r-- | databases/pgbarman/files/patch-barman_config.py | 4 | ||||
| -rw-r--r-- | databases/pgbarman/files/patch-doc_barman.5 | 60 |
4 files changed, 40 insertions, 41 deletions
diff --git a/databases/pgbarman/Makefile b/databases/pgbarman/Makefile index f7313f91b46a..0341e675ab7f 100644 --- a/databases/pgbarman/Makefile +++ b/databases/pgbarman/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= barman -DISTVERSION= 2.5 -PORTREVISION= 1 +DISTVERSION= 2.6 CATEGORIES= databases MASTER_SITES= SF/${PKGNAMEPREFIX}${PORTNAME}/${DISTVERSION} PKGNAMEPREFIX= pg @@ -21,15 +20,15 @@ RUN_DEPENDS= rsync:net/rsync \ ${PYTHON_PKGNAMEPREFIX}argh>=0.21.2:devel/py-argh@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete@${PY_FLAVOR} +USES= pgsql python +USE_PYTHON= autoplist distutils concurrent optsuffix + +WANT_PGSQL= client NO_ARCH= yes USERS= barman GROUPS= barman -USES= pgsql python -WANT_PGSQL= client -USE_PYTHON= autoplist distutils concurrent optsuffix - PORTDOCS= tutorial.pdf OPTIONS_DEFINE= DOCS diff --git a/databases/pgbarman/distinfo b/databases/pgbarman/distinfo index a636cc565623..a56feb150c70 100644 --- a/databases/pgbarman/distinfo +++ b/databases/pgbarman/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1540631448 -SHA256 (barman-2.5.tar.gz) = b270a87b9cf5fb6145ccb21b81f31a4d5f88b339f3906be56ab8261d4e623c43 -SIZE (barman-2.5.tar.gz) = 1002958 +TIMESTAMP = 1549406044 +SHA256 (barman-2.6.tar.gz) = 181586cf1186de73e740b39edd324aed09b766f466e9b496c375d9750bd51718 +SIZE (barman-2.6.tar.gz) = 1205731 SHA256 (tutorial.pdf) = 21acf6152b959c55b996fb6479c722d3f416eac3384479498a25911a3912a158 SIZE (tutorial.pdf) = 349394 diff --git a/databases/pgbarman/files/patch-barman_config.py b/databases/pgbarman/files/patch-barman_config.py index b3b791ebed9c..5b43eea955aa 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 2016-09-23 12:56:55 UTC +--- barman/config.py.orig 2019-01-31 16:56:08 UTC +++ barman/config.py -@@ -520,8 +520,8 @@ class Config(object): +@@ -566,8 +566,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 6a4030df37ae..fc90cc171c08 100644 --- a/databases/pgbarman/files/patch-doc_barman.5 +++ b/databases/pgbarman/files/patch-doc_barman.5 @@ -1,12 +1,12 @@ ---- doc/barman.5.orig 2016-09-26 15:32:17 UTC +--- doc/barman.5.orig 2019-01-31 16:56:08 UTC +++ doc/barman.5 -@@ -17,7 +17,7 @@ The system\-level Barman configuration f +@@ -17,7 +17,7 @@ The system\-level Barman configuration file is located .IP .nf \f[C] -/etc/barman.conf +%%PREFIX%%/etc/barman.conf - \f[] + \f[R] .fi .PP @@ -25,7 +25,7 @@ or @@ -15,44 +15,44 @@ \f[C] -/etc/barman/barman.conf +%%PREFIX%%/etc/barman/barman.conf - \f[] + \f[R] .fi .PP @@ -51,9 +51,9 @@ configurations. - 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 + If the value of \f[C]configuration_files_directory\f[R] is a directory, + Barman reads all files with \f[C].conf\f[R] extension that exist in that + folder. +-For example, if you set it to \f[C]/etc/barman.d\f[R], you can specify ++For example, if you set it to \f[C]%%PREFIX%%/etc/barman.d\f[R], 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. +-\f[C].conf\f[R] file inside the \f[C]/etc/barman.d\f[R] folder. ++\f[C].conf\f[R] file inside the \f[C]%%PREFIX%%/etc/barman.d\f[R] folder. .SH OPTIONS .TP .B active -@@ -608,7 +608,7 @@ Here is an example of configuration file +@@ -625,7 +625,7 @@ Here is an example of configuration file: \f[C] [barman] - ;\ Main\ directory --barman_home\ =\ /var/lib/barman -+barman_home\ =\ /var/barman + ; Main directory +-barman_home = /var/lib/barman ++barman_home = /var/barman - ;\ System\ user - barman_user\ =\ barman -@@ -628,13 +628,13 @@ reuse_backup\ =\ link - description\ =\ \ "Main\ PostgreSQL\ Database" + ; System user + barman_user = barman +@@ -645,13 +645,13 @@ reuse_backup = link + description = \[dq]Main PostgreSQL Database\[dq] - ;\ SSH\ options --ssh_command\ =\ ssh\ postgres\@pg -+ssh_command\ =\ ssh\ %%PGUSER%%\@pg + ; SSH options +-ssh_command = ssh postgres\[at]pg ++ssh_command = ssh %%PGUSER%%\[at]pg - ;\ PostgreSQL\ connection\ string --conninfo\ =\ host=pg\ user=postgres -+conninfo\ =\ host=pg\ user=%%PGUSER%%\ db=postgres + ; 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%% + ; 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 + ; Minimum number of required backups (redundancy) + minimum_redundancy = 1 |