summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/py-barman/Makefile10
-rw-r--r--databases/py-barman/PLIST8
-rw-r--r--databases/py-barman/distinfo12
-rw-r--r--databases/py-barman/patches/patch-barman_utils.py3
4 files changed, 21 insertions, 12 deletions
diff --git a/databases/py-barman/Makefile b/databases/py-barman/Makefile
index f23da9cdebb..d4d27d82641 100644
--- a/databases/py-barman/Makefile
+++ b/databases/py-barman/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2017/02/20 17:00:35 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/08/14 14:47:55 adam Exp $
-DISTNAME= barman-1.6.1
+DISTNAME= barman-2.4
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= databases python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pgbarman/}
+MASTER_SITES= ${MASTER_SITE_PYPI:=b/barman/}
MAINTAINER= filip@joyent.com
HOMEPAGE= http://www.pgbarman.org/
@@ -12,12 +12,14 @@ LICENSE= gnu-gpl-v3
DEPENDS+= ${PYPKGPREFIX}-argcomplete-[0-9]*:../../devel/py-argcomplete
DEPENDS+= ${PYPKGPREFIX}-argh>=0.21.2:../../devel/py-argh
-DEPENDS+= ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2
DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
+DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2.4.2:../../databases/py-psycopg2
DEPENDS+= rsync-[0-9]*:../../net/rsync
USE_LANGUAGES= # none
+PYTHON_SELF_CONFLICT= yes
+
CONF_FILES+= share/examples/barman/barman.conf \
${PKG_SYSCONFDIR}/barman.conf
INSTALLATION_DIRS+= share/examples/barman
diff --git a/databases/py-barman/PLIST b/databases/py-barman/PLIST
index b9c99992ba5..ae6d766008f 100644
--- a/databases/py-barman/PLIST
+++ b/databases/py-barman/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/03/04 16:55:45 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/08/14 14:47:55 adam Exp $
bin/barman
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -26,9 +26,15 @@ ${PYSITELIB}/barman/compression.pyo
${PYSITELIB}/barman/config.py
${PYSITELIB}/barman/config.pyc
${PYSITELIB}/barman/config.pyo
+${PYSITELIB}/barman/copy_controller.py
+${PYSITELIB}/barman/copy_controller.pyc
+${PYSITELIB}/barman/copy_controller.pyo
${PYSITELIB}/barman/diagnose.py
${PYSITELIB}/barman/diagnose.pyc
${PYSITELIB}/barman/diagnose.pyo
+${PYSITELIB}/barman/exceptions.py
+${PYSITELIB}/barman/exceptions.pyc
+${PYSITELIB}/barman/exceptions.pyo
${PYSITELIB}/barman/fs.py
${PYSITELIB}/barman/fs.pyc
${PYSITELIB}/barman/fs.pyo
diff --git a/databases/py-barman/distinfo b/databases/py-barman/distinfo
index 6da1b6d123f..8d0a831affe 100644
--- a/databases/py-barman/distinfo
+++ b/databases/py-barman/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2016/06/06 14:56:16 fhajny Exp $
+$NetBSD: distinfo,v 1.9 2018/08/14 14:47:55 adam Exp $
-SHA1 (barman-1.6.1.tar.gz) = 2b09600edc95c0a048fbe17369f3f3d5d8fa9bae
-RMD160 (barman-1.6.1.tar.gz) = 134a653269af28fcb1d6e337e828a8bd49d9a4e2
-SHA512 (barman-1.6.1.tar.gz) = 621a328a61c7676b0d6e0b09666feb2f16fa88e05f17157a873c3323f160de0ca4aaf1b9920134d9ddb560d468afebe5705c7dc3063396e1b201a82a752a3bc2
-Size (barman-1.6.1.tar.gz) = 189826 bytes
-SHA1 (patch-barman_utils.py) = 725e8d6b4531dbfcb1e75d25059fc4af5744d49d
+SHA1 (barman-2.4.tar.gz) = 5e9155175bca31362aca26e90d605574a404e66c
+RMD160 (barman-2.4.tar.gz) = df28084c5122d8ea654c3773af0202658ad6ec3b
+SHA512 (barman-2.4.tar.gz) = ef316de7cae7f41d95894892b260e1cc67f62866c6feaf03acd96391ab07d9eb27ea7fd6cb472743cbd56658dde24718ac0892ba2280706098f4bdd14b5674d1
+Size (barman-2.4.tar.gz) = 997651 bytes
+SHA1 (patch-barman_utils.py) = 0f93835a814bdd41c999dcebb34719312a74bd94
diff --git a/databases/py-barman/patches/patch-barman_utils.py b/databases/py-barman/patches/patch-barman_utils.py
index 4214fc23bba..c5ee25b8379 100644
--- a/databases/py-barman/patches/patch-barman_utils.py
+++ b/databases/py-barman/patches/patch-barman_utils.py
@@ -1,6 +1,7 @@
-$NetBSD: patch-barman_utils.py,v 1.2 2016/03/04 16:55:45 fhajny Exp $
+$NetBSD: patch-barman_utils.py,v 1.3 2018/08/14 14:47:55 adam Exp $
Make portable for non-glibc platforms too.
+
--- barman/utils.py.orig 2016-02-22 08:01:31.000000000 +0000
+++ barman/utils.py
@@ -253,7 +253,7 @@ def fsync_dir(dir_path):