Index: head/databases/pgbarman/Makefile
===================================================================
--- head/databases/pgbarman/Makefile	(revision 501790)
+++ head/databases/pgbarman/Makefile	(revision 501791)
@@ -1,62 +1,61 @@
 # Created by: Matthew Seaman
 # $FreeBSD$
 
 PORTNAME=	barman
-DISTVERSION=	2.7
-PORTREVISION=	1
+DISTVERSION=	2.8
 CATEGORIES=	databases
 MASTER_SITES=	SF/${PKGNAMEPREFIX}${PORTNAME}/${DISTVERSION}
 PKGNAMEPREFIX=	pg
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} tutorial.pdf
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Backup and recovery manager for PostgreSQL
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	rsync:net/rsync						\
 		${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR}	\
 		${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
 
 PORTDOCS=	tutorial.pdf
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if ${PGSQL_VER:M9\.[12345]}
 PGUSER=		pgsql
 .else
 PGUSER=		postgres
 .endif
 
 post-extract:
 	${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 <bsd.port.post.mk>
Index: head/databases/pgbarman/distinfo
===================================================================
--- head/databases/pgbarman/distinfo	(revision 501790)
+++ head/databases/pgbarman/distinfo	(revision 501791)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1553240083
-SHA256 (barman-2.7.tar.gz) = 716781e53b2f2c0b0910272cfde5d3ad2a3107b1adb03bc9bdeee2a23119a90f
-SIZE (barman-2.7.tar.gz) = 1200873
+TIMESTAMP = 1557999706
+SHA256 (barman-2.8.tar.gz) = 235b6ee4d054fb6fb1d0aabf6199af5725ccd63ec97ef5d1bcb608cc888c13e2
+SIZE (barman-2.8.tar.gz) = 1212546
 SHA256 (tutorial.pdf) = 21acf6152b959c55b996fb6479c722d3f416eac3384479498a25911a3912a158
 SIZE (tutorial.pdf) = 349394
Index: head/databases/pgbarman/files/patch-doc_barman.5
===================================================================
--- head/databases/pgbarman/files/patch-doc_barman.5	(revision 501790)
+++ head/databases/pgbarman/files/patch-doc_barman.5	(revision 501791)
@@ -1,58 +1,58 @@
---- doc/barman.5.orig	2019-01-31 16:56:08 UTC
+--- doc/barman.5.orig	2019-05-14 16:37:28 UTC
 +++ doc/barman.5
-@@ -17,7 +17,7 @@ The system\-level Barman configuration file is located
+@@ -17,7 +17,7 @@ The system-level Barman configuration file is located 
  .IP
  .nf
  \f[C]
 -/etc/barman.conf
 +%%PREFIX%%/etc/barman.conf
  \f[R]
  .fi
  .PP
 @@ -25,7 +25,7 @@ or
  .IP
  .nf
  \f[C]
 -/etc/barman/barman.conf
 +%%PREFIX%%/etc/barman/barman.conf
  \f[R]
  .fi
  .PP
 @@ -51,9 +51,9 @@ configurations.
  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[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
-@@ -625,7 +625,7 @@ Here is an example of configuration file:
+@@ -623,7 +623,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
-@@ -645,13 +645,13 @@ reuse_backup = link
+@@ -643,13 +643,13 @@ reuse_backup = link
  description =  \[dq]Main PostgreSQL Database\[dq]
  
  ; 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%%
  
  ; 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
Index: head/databases/pgbarman/files/patch-setup.py
===================================================================
--- head/databases/pgbarman/files/patch-setup.py	(revision 501790)
+++ head/databases/pgbarman/files/patch-setup.py	(revision 501791)
@@ -1,13 +1,17 @@
---- setup.py.orig	2016-09-23 15:43:57 UTC
+--- setup.py.orig	2019-05-14 16:37:28 UTC
 +++ setup.py
-@@ -69,8 +69,8 @@ setup(
-     packages=['barman', ],
-     scripts=['bin/barman', ],
+@@ -71,10 +71,10 @@ setup(
+     url='http://www.pgbarman.org/',
+     packages=find_packages(exclude=["tests"]),
      data_files=[
--        ('share/man/man1', ['doc/barman.1']),
+-        ('share/man/man1', ['doc/barman.1',
+-                            'doc/barman-wal-archive.1',
+-                            'doc/barman-wal-restore.1']),
 -        ('share/man/man5', ['doc/barman.5']),
-+        ('man/man1', ['doc/barman.1']),
++        ('man/man1', ['doc/barman.1',
++                      'doc/barman-wal-archive.1',
++                      'doc/barman-wal-restore.1']),
 +        ('man/man5', ['doc/barman.5']),
      ],
-     license='GPL-3.0',
-     description=__doc__.split("\n")[0],
+     entry_points={
+         'console_scripts': [