From 59672e97832d981b58f74cbb69c6d5958f95aa11 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 22 Mar 2012 06:43:19 +0000
Subject: [PATCH] Update to duplicity-0.6.18.

from Gonzalo L. R.
ok jim@ (maintainer)
---
 sysutils/duplicity/Makefile                    |  7 ++++---
 sysutils/duplicity/distinfo                    | 10 +++++-----
 sysutils/duplicity/patches/patch-bin_duplicity |  8 ++++----
 sysutils/duplicity/pkg/PLIST                   |  4 +---
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 7b3a5246f89..090474e8fe2 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.18 2012/02/19 17:49:53 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2012/03/22 06:43:19 ajacoutot Exp $
 
 COMMENT =	encrypted backup using rsync algorithm
 
-MODPY_EGG_VERSION = 0.6.17
+MODPY_EGG_VERSION = 0.6.18
 DISTNAME =	duplicity-${MODPY_EGG_VERSION}
 
 CATEGORIES =	sysutils
@@ -21,15 +21,16 @@ PERMIT_DISTFILES_FTP =	Yes
 MODULES =	lang/python
 
 WANTLIB +=	rsync ${MODPY_WANTLIB}
+
 LIB_DEPENDS +=	net/librsync \
 		${MODPY_LIB_DEPENDS}
+
 RUN_DEPENDS +=	net/py-boto \
 		net/ncftp \
 		security/py-gnupg
 
 MAKE_ENV +=	LIBRSYNC_DIR=${LOCALBASE}
 
-USE_GROFF =	Yes
 NO_REGRESS =	Yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo
index d979b923045..e6b4b615df5 100644
--- a/sysutils/duplicity/distinfo
+++ b/sysutils/duplicity/distinfo
@@ -1,5 +1,5 @@
-MD5 (duplicity-0.6.17.tar.gz) = NkI6tOO5qpDFxE2fqT+6Dw==
-RMD160 (duplicity-0.6.17.tar.gz) = 6Iu4M/ftIfC3QsrtnChALCsGAaU=
-SHA1 (duplicity-0.6.17.tar.gz) = zuj0eT87KZBEe7JskTEgKTCt8JY=
-SHA256 (duplicity-0.6.17.tar.gz) = iR5WBhqxUSfmfJO5tGJ2CwVetIY2wXe1ZACSXQp3pFg=
-SIZE (duplicity-0.6.17.tar.gz) = 1119945
+MD5 (duplicity-0.6.18.tar.gz) = ZrXmTeQ+CdPD/5iQ+vneBw==
+RMD160 (duplicity-0.6.18.tar.gz) = +QcFNYhX5A+29CfjzJbU+Btrm6I=
+SHA1 (duplicity-0.6.18.tar.gz) = bNl0V+L0OvPMJw4vFuiJGIDcRKY=
+SHA256 (duplicity-0.6.18.tar.gz) = VrxYO+EDF2LdlAgssw4J4TRxZ6qogYj41tbAUq2PkK8=
+SIZE (duplicity-0.6.18.tar.gz) = 1101351
diff --git a/sysutils/duplicity/patches/patch-bin_duplicity b/sysutils/duplicity/patches/patch-bin_duplicity
index 6d380436116..0e81ec7d987 100644
--- a/sysutils/duplicity/patches/patch-bin_duplicity
+++ b/sysutils/duplicity/patches/patch-bin_duplicity
@@ -1,7 +1,7 @@
-$OpenBSD: patch-bin_duplicity,v 1.1 2012/02/19 17:49:53 ajacoutot Exp $
---- bin/duplicity.orig	Fri Nov 25 20:20:20 2011
-+++ bin/duplicity	Thu Feb 16 14:07:10 2012
-@@ -1128,9 +1128,12 @@ def check_resources(action):
+$OpenBSD: patch-bin_duplicity,v 1.2 2012/03/22 06:43:19 ajacoutot Exp $
+--- bin/duplicity.orig	Wed Feb 29 16:24:05 2012
++++ bin/duplicity	Tue Mar 20 07:05:26 2012
+@@ -1129,9 +1129,12 @@ def check_resources(action):
                             log.ErrorCode.get_ulimit_failed)
          maxopen = min([l for l in (soft, hard) if l > -1])
          if maxopen < 1024:
diff --git a/sysutils/duplicity/pkg/PLIST b/sysutils/duplicity/pkg/PLIST
index 2c0b9ec5074..a462d5d7e4f 100644
--- a/sysutils/duplicity/pkg/PLIST
+++ b/sysutils/duplicity/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2012/02/19 17:49:53 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.8 2012/03/22 06:43:19 ajacoutot Exp $
 bin/duplicity
 bin/rdiffdir
 lib/python${MODPY_VERSION}/site-packages/duplicity/
@@ -85,8 +85,6 @@ lib/python${MODPY_VERSION}/site-packages/duplicity/patchdir.py
 lib/python${MODPY_VERSION}/site-packages/duplicity/patchdir.pyc
 lib/python${MODPY_VERSION}/site-packages/duplicity/path.py
 lib/python${MODPY_VERSION}/site-packages/duplicity/path.pyc
-lib/python${MODPY_VERSION}/site-packages/duplicity/pexpect.py
-lib/python${MODPY_VERSION}/site-packages/duplicity/pexpect.pyc
 lib/python${MODPY_VERSION}/site-packages/duplicity/robust.py
 lib/python${MODPY_VERSION}/site-packages/duplicity/robust.pyc
 lib/python${MODPY_VERSION}/site-packages/duplicity/selection.py