diff --git a/databases/pgbarman/Makefile b/databases/pgbarman/Makefile
index e16893f87406..e3d2cd9e3f0e 100644
--- a/databases/pgbarman/Makefile
+++ b/databases/pgbarman/Makefile
@@ -1,64 +1,60 @@
 PORTNAME=		barman
 DISTVERSIONPREFIX=	release/
-DISTVERSION=		3.2.0
+DISTVERSION=		3.3.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
 
 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=		pgsql python:3.7+
 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 <bsd.port.pre.mk>
 
-.if ${PGSQL_VER:M9\.[12345]}
 PGUSER=		pgsql
-.else
-PGUSER=		postgres
-.endif
 
 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 <bsd.port.post.mk>
diff --git a/databases/pgbarman/distinfo b/databases/pgbarman/distinfo
index 0c69038ac307..2a99e24d9486 100644
--- a/databases/pgbarman/distinfo
+++ b/databases/pgbarman/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1666370815
-SHA256 (barman-3.2.0-manual.pdf) = d747ca348da54d495420b47ab276298c72c3f46e1639cce1cd26dc330c3ea045
-SIZE (barman-3.2.0-manual.pdf) = 1358013
-SHA256 (EnterpriseDB-barman-release-3.2.0_GH0.tar.gz) = c4208393bc1f64c418244031a1f7521492f47352631b726e0cf905191863cc1c
-SIZE (EnterpriseDB-barman-release-3.2.0_GH0.tar.gz) = 1463937
+TIMESTAMP = 1671129236
+SHA256 (barman-3.3.0-manual.pdf) = cc17d3774c11842ace4b51d1708b307d7ba6b90d3375d54254746d5d84e7b623
+SIZE (barman-3.3.0-manual.pdf) = 1355644
+SHA256 (EnterpriseDB-barman-release-3.3.0_GH0.tar.gz) = 17bfd9e656678b6cff8eb76754b548f97fa23a096f6d646eb4cbb5d6775b10c7
+SIZE (EnterpriseDB-barman-release-3.3.0_GH0.tar.gz) = 1472187