Update to 0.6.11, add WITHOUT_NLS switch and

update CONFLICTS.

PR:		ports/152744
Submitted by:	Vlad V. Teterya <vlad@vlad.uz.ua>
Approved by:	maintainer

4 files changed, 34 insertions, 18 deletions

diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index ce91d735cfc3..de7d604d6a72 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	duplicity
-PORTVERSION=	0.5.20
-PORTREVISION=	2
+PORTVERSION=	0.6.11
 CATEGORIES=	sysutils
-MASTER_SITES=	http://code.launchpad.net/duplicity/0.5-series/${PORTVERSION}/+download/
+MASTER_SITES=	http://launchpad.net/duplicity/0.6-series/${PORTVERSION}/+download/
 
 MAINTAINER=	peter.schuller@infidyne.com
 COMMENT=	Untrusted backup using rsync algorithm
@@ -21,12 +20,24 @@ RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
 # fetch claims "Moved temporarily" without this - why? (inspired by deskutils/gtg)
 FETCH_ARGS=	-pRr
 
-CONFLICTS=	duplicity-devel-[0-9]*
+CONFLICTS=	duplicity-0.5.* duplicity-devel-[0-9]*
 
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=yes
 USE_LDCONFIG=	yes
+
+.if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+.if defined(WITHOUT_NLS)
+post-patch:
+	@${REINPLACE_CMD} -e '54,63d' \
+		${WRKSRC}/setup.py
+.endif
 
 MAN1=		duplicity.1 rdiffdir.1
 
diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo
index 813add317a32..9df135d19514 100644
--- a/sysutils/duplicity/distinfo
+++ b/sysutils/duplicity/distinfo
@@ -1,3 +1,2 @@
-MD5 (duplicity-0.5.20.tar.gz) = 90ff195d27127c5e1fad7bd384990ef6
-SHA256 (duplicity-0.5.20.tar.gz) = 91028bbd1bd9aa08063a91954df1d566c934be9185f4a20e150d52ec23c818f6
-SIZE (duplicity-0.5.20.tar.gz) = 217742
+SHA256 (duplicity-0.6.11.tar.gz) = 802a3c21f3950af523c63727177a822b100ccf9238e6dc5ed222dc9bcbb34613
+SIZE (duplicity-0.6.11.tar.gz) = 294745
diff --git a/sysutils/duplicity/files/patch-setup.py b/sysutils/duplicity/files/patch-setup.py
index 3d30bb209e08..3ae420dd6a41 100644
--- a/sysutils/duplicity/files/patch-setup.py
+++ b/sysutils/duplicity/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2009-09-05 20:36:52.972675012 +0200
-+++ setup.py	2009-09-05 20:36:55.996611410 +0200
-@@ -31,6 +31,10 @@
+--- setup.py.orig	2009-01-09 16:05:11.000000000 +0200
++++ setup.py	2009-01-10 16:06:40.000000000 +0200
+@@ -12,6 +12,10 @@
  
  incdir_list = libdir_list = None
  
@@ -11,7 +11,7 @@
  if os.name == 'posix':
      LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '')
      args = sys.argv[:]
-@@ -42,16 +46,9 @@
+@@ -23,16 +27,9 @@
          incdir_list = [os.path.join(LIBRSYNC_DIR, 'include')]
          libdir_list = [os.path.join(LIBRSYNC_DIR, 'lib')]
  
diff --git a/sysutils/duplicity/pkg-plist b/sysutils/duplicity/pkg-plist
index 3b3a1fc7df91..0ca110be8657 100644
--- a/sysutils/duplicity/pkg-plist
+++ b/sysutils/duplicity/pkg-plist
@@ -25,6 +25,9 @@ bin/rdiffdir
 %%PYTHON_SITELIBDIR%%/duplicity/backends/ftpbackend.py
 %%PYTHON_SITELIBDIR%%/duplicity/backends/ftpbackend.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/backends/ftpbackend.pyo
+%%PYTHON_SITELIBDIR%%/duplicity/backends/giobackend.py
+%%PYTHON_SITELIBDIR%%/duplicity/backends/giobackend.pyc
+%%PYTHON_SITELIBDIR%%/duplicity/backends/giobackend.pyo
 %%PYTHON_SITELIBDIR%%/duplicity/backends/hsibackend.py
 %%PYTHON_SITELIBDIR%%/duplicity/backends/hsibackend.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/backends/hsibackend.pyo
@@ -128,14 +131,17 @@ bin/rdiffdir
 @dirrm %%PYTHON_SITELIBDIR%%/duplicity
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/REPO-README
 %%PORTDOCS%%%%DOCSDIR%%/LOG-README
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/REPO-README
 %%PORTDOCS%%%%DOCSDIR%%/tarfile-LICENSE
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-share/locale/en_GB/LC_MESSAGES/duplicity.mo
-share/locale/eo/LC_MESSAGES/duplicity.mo
-share/locale/io/LC_MESSAGES/duplicity.mo
-share/locale/zh_CN/LC_MESSAGES/duplicity.mo
-@dirrmtry share/locale/io/LC_MESSAGES
-@dirrmtry share/locale/io
+%%NLS%%share/locale/bg/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/es/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/io/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/duplicity.mo
+%%NLS%%@dirrmtry share/locale/io/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/io