ports/152744: sysutils/duplicity updated to 0.6.11

[Vlad V. Teterya]

>Number:         152744
>Category:       ports
>Synopsis:       sysutils/duplicity updated to 0.6.11
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 01 14:20:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Vlad V. Teterya <vlad at vlad.uz.ua>
>Release:        FreeBSD 8.1-RELEASE-p1 amd64
>Organization:
Server Labs
>Environment:
System: FreeBSD beta 8.1-RELEASE-p1 FreeBSD 8.1-RELEASE-p1 #0: Fri Oct 1 03:34:37 EEST 2010 root at beta:/usr/obj/usr/src/sys/BETA amd64


>Description:
- update to 0.6.11 (fixed s3 issue)
- add WITHOUT_NLS switch

Note: sysUtils/duplicity-devel must be updated to new development branch 0.7
MAINTAINER in Cc

Please close my previous PR - ports/152717

>How-To-Repeat:
>Fix:


--- duplicity-0.6.11.patch begins here ---
diff -ruN duplicity.old/Makefile duplicity/Makefile
--- duplicity.old/Makefile	2010-11-30 21:58:30.000000000 +0200
+++ duplicity/Makefile	2010-12-01 16:01:06.000000000 +0200
@@ -2,14 +2,13 @@
 # Date created:				Wed Jun 11 19:53:46 CEST 2003
 # Whom:					Gerhard Häring <gh at ghaering.de>
 #
-# $FreeBSD: ports/sysutils/duplicity/Makefile,v 1.33 2010/05/31 02:00:58 ade Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	duplicity
-PORTVERSION=	0.5.20
-PORTREVISION=	1
+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 at infidyne.com
 COMMENT=	Untrusted backup using rsync algorithm
@@ -26,7 +25,19 @@
 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 -ruN duplicity.old/distinfo duplicity/distinfo
--- duplicity.old/distinfo	2010-11-30 21:58:30.000000000 +0200
+++ duplicity/distinfo	2010-11-30 21:59:55.000000000 +0200
@@ -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 -ruN duplicity.old/files/patch-setup.py duplicity/files/patch-setup.py
--- duplicity.old/files/patch-setup.py	2010-11-30 21:58:30.000000000 +0200
+++ duplicity/files/patch-setup.py	2010-11-30 21:59:55.000000000 +0200
@@ -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 -ruN duplicity.old/pkg-plist duplicity/pkg-plist
--- duplicity.old/pkg-plist	2010-11-30 21:58:30.000000000 +0200
+++ duplicity/pkg-plist	2010-12-01 14:53:11.000000000 +0200
@@ -25,6 +25,9 @@
 %%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 @@
 @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
- at dirrmtry share/locale/io/LC_MESSAGES
- at 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
--- duplicity-0.6.11.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: