4 files changed, 37 insertions, 20 deletions

diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 3804c981e809..f3d3a576c2a4 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	duplicity
-PORTVERSION=	0.5.03
+PORTVERSION=	0.5.06
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -26,7 +26,12 @@ USE_PYDISTUTILS=yes
 
 MAN1=		duplicity.1 rdiffdir.1
 
-DOCFILES=	CHANGELOG COPYING README
+DOCFILES=	CHANGELOG \
+		COPYING \
+		CVS-README \
+		LOG-README \
+		README \
+		tarfile-LICENSE
 
 .include <bsd.port.pre.mk>
 
@@ -37,8 +42,6 @@ RUN_DEPENDS+=	${PEXPECT_DEP}
 .endif
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/duplicity.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/rdiffdir.1 ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for file in ${DOCFILES}
diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo
index 7e7cf4d6a8a4..d8c270042e14 100644
--- a/sysutils/duplicity/distinfo
+++ b/sysutils/duplicity/distinfo
@@ -1,3 +1,3 @@
-MD5 (duplicity-0.5.03.tar.gz) = 80273525ae47e8075078a855cf4a134e
-SHA256 (duplicity-0.5.03.tar.gz) = d6e3929dc515b72916bfe7cadb25cbe7b383b9f699353bed65c16029ea1cda81
-SIZE (duplicity-0.5.03.tar.gz) = 146490
+MD5 (duplicity-0.5.06.tar.gz) = 7363d8f1be770e0296c78badbffaa4b4
+SHA256 (duplicity-0.5.06.tar.gz) = 19670f05b8ba26847e10fc25f47c4b0752291351a20418faca656c601ec7510a
+SIZE (duplicity-0.5.06.tar.gz) = 179810
diff --git a/sysutils/duplicity/files/patch-setup.py b/sysutils/duplicity/files/patch-setup.py
index ee0e5c6e6cdb..51f954da734b 100644
--- a/sysutils/duplicity/files/patch-setup.py
+++ b/sysutils/duplicity/files/patch-setup.py
@@ -1,8 +1,8 @@
---- setup.py.orig	2008-09-21 17:21:44.000000000 +0300
-+++ setup.py	2008-09-28 22:24:48.000000000 +0300
-@@ -21,6 +21,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 
+ incdir_list = libdir_list = None
  
 +LOCALBASE = os.environ.get("LOCALBASE", "/usr/local")
 +incdir_list = ['%s/include' % LOCALBASE]
@@ -11,14 +11,21 @@
  if os.name == 'posix':
      LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '')
      args = sys.argv[:]
-@@ -48,9 +52,6 @@
-                                include_dirs=incdir_list,
-                                library_dirs=libdir_list,
-                                libraries=["rsync"])],
--      scripts = ['rdiffdir', 'duplicity'],
--      data_files = [('share/man/man1', ['duplicity.1', 'rdiffdir.1']),
--                    ('share/doc/duplicity-%s' % version_string,
--                     ['COPYING', 'README', 'CHANGELOG'])])
-+      scripts = ['rdiffdir', 'duplicity'])
+@@ -23,16 +27,9 @@
+         incdir_list = [os.path.join(LIBRSYNC_DIR, 'include')]
+         libdir_list = [os.path.join(LIBRSYNC_DIR, 'lib')]
  
+-data_files = [('share/man/man1',
++data_files = [('man/man1',
+                ['duplicity.1',
+                 'rdiffdir.1']),
+-              ('share/doc/duplicity-%s' % version_string,
+-               ['COPYING',
+-                'CVS-README',
+-                'LOG-README',
+-                'README',
+-                'tarfile-LICENSE',
+-                'CHANGELOG']),
+               ]
  
+ assert os.path.exists("po"), "Missing 'po' directory."
diff --git a/sysutils/duplicity/pkg-plist b/sysutils/duplicity/pkg-plist
index 22ef63eb11da..639803c43f58 100644
--- a/sysutils/duplicity/pkg-plist
+++ b/sysutils/duplicity/pkg-plist
@@ -85,6 +85,9 @@ bin/rdiffdir
 %%PYTHON_SITELIBDIR%%/duplicity/patchdir.py
 %%PYTHON_SITELIBDIR%%/duplicity/patchdir.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/patchdir.pyo
+%%PYTHON_SITELIBDIR%%/duplicity/pexpect.py
+%%PYTHON_SITELIBDIR%%/duplicity/pexpect.pyc
+%%PYTHON_SITELIBDIR%%/duplicity/pexpect.pyo
 %%PYTHON_SITELIBDIR%%/duplicity/path.py
 %%PYTHON_SITELIBDIR%%/duplicity/path.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/path.pyo
@@ -116,5 +119,9 @@ bin/rdiffdir
 @dirrm %%PYTHON_SITELIBDIR%%/duplicity
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CVS-README
+%%PORTDOCS%%%%DOCSDIR%%/LOG-README
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/tarfile-LICENSE
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+share/locale/io/LC_MESSAGES/duplicity.mo