12 files changed, 96 insertions, 126 deletions

diff --git a/sysutils/duplicity-devel/Makefile b/sysutils/duplicity-devel/Makefile
index 7b13cd5792ee..4ee16dd54920 100644
--- a/sysutils/duplicity-devel/Makefile
+++ b/sysutils/duplicity-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	duplicity
-PORTVERSION=	0.4.3
+PORTVERSION=	0.4.7
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/duplicity-devel/distinfo b/sysutils/duplicity-devel/distinfo
index 8a26be302690..145d16471d73 100644
--- a/sysutils/duplicity-devel/distinfo
+++ b/sysutils/duplicity-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (duplicity-0.4.3.tar.gz) = fc615a1bf173fb55c36c502d252583f8
-SHA256 (duplicity-0.4.3.tar.gz) = 67b03ccc51fcc3bc339835149466e609ddb05a9f54963515b163fe44da0e690c
-SIZE (duplicity-0.4.3.tar.gz) = 104581
+MD5 (duplicity-0.4.7.tar.gz) = c997bc7bac179f889bd0370fbc0ec2d7
+SHA256 (duplicity-0.4.7.tar.gz) = 5ab6705b4c02645b6fafd6d58a5dd93e8bc3757652e47f36a6d5ed33c3184a3f
+SIZE (duplicity-0.4.7.tar.gz) = 121864
diff --git a/sysutils/duplicity-devel/files/patch-setup.py b/sysutils/duplicity-devel/files/patch-setup.py
index 2484a45dd4ee..cab00af6f406 100644
--- a/sysutils/duplicity-devel/files/patch-setup.py
+++ b/sysutils/duplicity-devel/files/patch-setup.py
@@ -1,38 +1,22 @@
-*** /tmp/duplicity-0.4.0/setup.py	Sat Nov 30 23:41:29 2002
---- setup.py	Wed Jun 11 20:31:32 2003
-***************
-*** 9,14 ****
---- 9,18 ----
-  	print "Sorry, duplicity requires version 2.2 or later of python"
-  	sys.exit(1)
-  
-+ LOCALBASE = os.environ.get("LOCALBASE", "/usr/local")
-+ include_dirs = ['%s/include' % LOCALBASE]
-+ library_dirs = ['%s/lib/' % LOCALBASE]
-+ 
-  setup(name="duplicity",
-  	  version=version_string,
-  	  description="Untrusted backup using rsync algorithm",
-***************
-*** 19,28 ****
-  	  package_dir = {"duplicity": "src"},
-  	  ext_modules = [Extension("duplicity._librsync",
-  							   ["_librsyncmodule.c"],
-! 							   libraries=["rsync"])],
-! 	  scripts = ['rdiffdir', 'duplicity'],
-! 	  data_files = [('share/man/man1', ['duplicity.1', 'rdiffdir.1']),
-! 					('share/doc/duplicity-%s' % version_string,
-! 					 ['COPYING', 'README', 'CHANGELOG'])])
-  
-  
---- 23,32 ----
-  	  package_dir = {"duplicity": "src"},
-  	  ext_modules = [Extension("duplicity._librsync",
-  							   ["_librsyncmodule.c"],
-! 							   libraries=["rsync"],
-!                                                            include_dirs=include_dirs,
-!                                                            library_dirs=library_dirs)],
-! 	  scripts = ['rdiffdir', 'duplicity']
-! )
-  
-  
+--- setup.py.orig	Wed Nov 28 19:09:07 2007
++++ setup.py	Thu Nov 29 20:00:05 2007
+@@ -21,6 +21,10 @@
+ 
+ incdir_list = libdir_list = None 
+ 
++LOCALBASE = os.environ.get("LOCALBASE", "/usr/local")
++incdir_list = ['%s/include' % LOCALBASE]
++libdir_list = ['%s/lib/' % LOCALBASE]
++
+ if os.name == 'posix':
+ 	LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '')
+ 	args = sys.argv[:]
+@@ -49,7 +53,7 @@
+ 							   libraries=["rsync"])],
+ 	  scripts = ['rdiffdir', 'duplicity'],
+ 	  data_files = [('share/man/man1', ['duplicity.1', 'rdiffdir.1']),
+-					('share/doc/duplicity-%s' % version_string,
++					('share/doc/duplicity',
+ 					 ['COPYING', 'README', 'CHANGELOG'])])
+ 
+ 
diff --git a/sysutils/duplicity-devel/pkg-plist b/sysutils/duplicity-devel/pkg-plist
index 3813da993a09..3a72c35bc45c 100644
--- a/sysutils/duplicity-devel/pkg-plist
+++ b/sysutils/duplicity-devel/pkg-plist
@@ -67,6 +67,12 @@ bin/rdiffdir
 %%PYTHON_SITELIBDIR%%/duplicity/tarfile.py
 %%PYTHON_SITELIBDIR%%/duplicity/tarfile.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/tarfile.pyo
+%%PYTHON_SITELIBDIR%%/duplicity/tempdir.py
+%%PYTHON_SITELIBDIR%%/duplicity/tempdir.pyc
+%%PYTHON_SITELIBDIR%%/duplicity/tempdir.pyo
+%%PYTHON_SITELIBDIR%%/duplicity/urlparse_2_5.py
+%%PYTHON_SITELIBDIR%%/duplicity/urlparse_2_5.pyc
+%%PYTHON_SITELIBDIR%%/duplicity/urlparse_2_5.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/duplicity
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 7b13cd5792ee..4ee16dd54920 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	duplicity
-PORTVERSION=	0.4.3
+PORTVERSION=	0.4.7
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo
index 8a26be302690..145d16471d73 100644
--- a/sysutils/duplicity/distinfo
+++ b/sysutils/duplicity/distinfo
@@ -1,3 +1,3 @@
-MD5 (duplicity-0.4.3.tar.gz) = fc615a1bf173fb55c36c502d252583f8
-SHA256 (duplicity-0.4.3.tar.gz) = 67b03ccc51fcc3bc339835149466e609ddb05a9f54963515b163fe44da0e690c
-SIZE (duplicity-0.4.3.tar.gz) = 104581
+MD5 (duplicity-0.4.7.tar.gz) = c997bc7bac179f889bd0370fbc0ec2d7
+SHA256 (duplicity-0.4.7.tar.gz) = 5ab6705b4c02645b6fafd6d58a5dd93e8bc3757652e47f36a6d5ed33c3184a3f
+SIZE (duplicity-0.4.7.tar.gz) = 121864
diff --git a/sysutils/duplicity/files/patch-setup.py b/sysutils/duplicity/files/patch-setup.py
index 2484a45dd4ee..cab00af6f406 100644
--- a/sysutils/duplicity/files/patch-setup.py
+++ b/sysutils/duplicity/files/patch-setup.py
@@ -1,38 +1,22 @@
-*** /tmp/duplicity-0.4.0/setup.py	Sat Nov 30 23:41:29 2002
---- setup.py	Wed Jun 11 20:31:32 2003
-***************
-*** 9,14 ****
---- 9,18 ----
-  	print "Sorry, duplicity requires version 2.2 or later of python"
-  	sys.exit(1)
-  
-+ LOCALBASE = os.environ.get("LOCALBASE", "/usr/local")
-+ include_dirs = ['%s/include' % LOCALBASE]
-+ library_dirs = ['%s/lib/' % LOCALBASE]
-+ 
-  setup(name="duplicity",
-  	  version=version_string,
-  	  description="Untrusted backup using rsync algorithm",
-***************
-*** 19,28 ****
-  	  package_dir = {"duplicity": "src"},
-  	  ext_modules = [Extension("duplicity._librsync",
-  							   ["_librsyncmodule.c"],
-! 							   libraries=["rsync"])],
-! 	  scripts = ['rdiffdir', 'duplicity'],
-! 	  data_files = [('share/man/man1', ['duplicity.1', 'rdiffdir.1']),
-! 					('share/doc/duplicity-%s' % version_string,
-! 					 ['COPYING', 'README', 'CHANGELOG'])])
-  
-  
---- 23,32 ----
-  	  package_dir = {"duplicity": "src"},
-  	  ext_modules = [Extension("duplicity._librsync",
-  							   ["_librsyncmodule.c"],
-! 							   libraries=["rsync"],
-!                                                            include_dirs=include_dirs,
-!                                                            library_dirs=library_dirs)],
-! 	  scripts = ['rdiffdir', 'duplicity']
-! )
-  
-  
+--- setup.py.orig	Wed Nov 28 19:09:07 2007
++++ setup.py	Thu Nov 29 20:00:05 2007
+@@ -21,6 +21,10 @@
+ 
+ incdir_list = libdir_list = None 
+ 
++LOCALBASE = os.environ.get("LOCALBASE", "/usr/local")
++incdir_list = ['%s/include' % LOCALBASE]
++libdir_list = ['%s/lib/' % LOCALBASE]
++
+ if os.name == 'posix':
+ 	LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '')
+ 	args = sys.argv[:]
+@@ -49,7 +53,7 @@
+ 							   libraries=["rsync"])],
+ 	  scripts = ['rdiffdir', 'duplicity'],
+ 	  data_files = [('share/man/man1', ['duplicity.1', 'rdiffdir.1']),
+-					('share/doc/duplicity-%s' % version_string,
++					('share/doc/duplicity',
+ 					 ['COPYING', 'README', 'CHANGELOG'])])
+ 
+ 
diff --git a/sysutils/duplicity/pkg-plist b/sysutils/duplicity/pkg-plist
index 3813da993a09..3a72c35bc45c 100644
--- a/sysutils/duplicity/pkg-plist
+++ b/sysutils/duplicity/pkg-plist
@@ -67,6 +67,12 @@ bin/rdiffdir
 %%PYTHON_SITELIBDIR%%/duplicity/tarfile.py
 %%PYTHON_SITELIBDIR%%/duplicity/tarfile.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/tarfile.pyo
+%%PYTHON_SITELIBDIR%%/duplicity/tempdir.py
+%%PYTHON_SITELIBDIR%%/duplicity/tempdir.pyc
+%%PYTHON_SITELIBDIR%%/duplicity/tempdir.pyo
+%%PYTHON_SITELIBDIR%%/duplicity/urlparse_2_5.py
+%%PYTHON_SITELIBDIR%%/duplicity/urlparse_2_5.pyc
+%%PYTHON_SITELIBDIR%%/duplicity/urlparse_2_5.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/duplicity
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
diff --git a/sysutils/duplicity05/Makefile b/sysutils/duplicity05/Makefile
index 7b13cd5792ee..4ee16dd54920 100644
--- a/sysutils/duplicity05/Makefile
+++ b/sysutils/duplicity05/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	duplicity
-PORTVERSION=	0.4.3
+PORTVERSION=	0.4.7
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/duplicity05/distinfo b/sysutils/duplicity05/distinfo
index 8a26be302690..145d16471d73 100644
--- a/sysutils/duplicity05/distinfo
+++ b/sysutils/duplicity05/distinfo
@@ -1,3 +1,3 @@
-MD5 (duplicity-0.4.3.tar.gz) = fc615a1bf173fb55c36c502d252583f8
-SHA256 (duplicity-0.4.3.tar.gz) = 67b03ccc51fcc3bc339835149466e609ddb05a9f54963515b163fe44da0e690c
-SIZE (duplicity-0.4.3.tar.gz) = 104581
+MD5 (duplicity-0.4.7.tar.gz) = c997bc7bac179f889bd0370fbc0ec2d7
+SHA256 (duplicity-0.4.7.tar.gz) = 5ab6705b4c02645b6fafd6d58a5dd93e8bc3757652e47f36a6d5ed33c3184a3f
+SIZE (duplicity-0.4.7.tar.gz) = 121864
diff --git a/sysutils/duplicity05/files/patch-setup.py b/sysutils/duplicity05/files/patch-setup.py
index 2484a45dd4ee..cab00af6f406 100644
--- a/sysutils/duplicity05/files/patch-setup.py
+++ b/sysutils/duplicity05/files/patch-setup.py
@@ -1,38 +1,22 @@
-*** /tmp/duplicity-0.4.0/setup.py	Sat Nov 30 23:41:29 2002
---- setup.py	Wed Jun 11 20:31:32 2003
-***************
-*** 9,14 ****
---- 9,18 ----
-  	print "Sorry, duplicity requires version 2.2 or later of python"
-  	sys.exit(1)
-  
-+ LOCALBASE = os.environ.get("LOCALBASE", "/usr/local")
-+ include_dirs = ['%s/include' % LOCALBASE]
-+ library_dirs = ['%s/lib/' % LOCALBASE]
-+ 
-  setup(name="duplicity",
-  	  version=version_string,
-  	  description="Untrusted backup using rsync algorithm",
-***************
-*** 19,28 ****
-  	  package_dir = {"duplicity": "src"},
-  	  ext_modules = [Extension("duplicity._librsync",
-  							   ["_librsyncmodule.c"],
-! 							   libraries=["rsync"])],
-! 	  scripts = ['rdiffdir', 'duplicity'],
-! 	  data_files = [('share/man/man1', ['duplicity.1', 'rdiffdir.1']),
-! 					('share/doc/duplicity-%s' % version_string,
-! 					 ['COPYING', 'README', 'CHANGELOG'])])
-  
-  
---- 23,32 ----
-  	  package_dir = {"duplicity": "src"},
-  	  ext_modules = [Extension("duplicity._librsync",
-  							   ["_librsyncmodule.c"],
-! 							   libraries=["rsync"],
-!                                                            include_dirs=include_dirs,
-!                                                            library_dirs=library_dirs)],
-! 	  scripts = ['rdiffdir', 'duplicity']
-! )
-  
-  
+--- setup.py.orig	Wed Nov 28 19:09:07 2007
++++ setup.py	Thu Nov 29 20:00:05 2007
+@@ -21,6 +21,10 @@
+ 
+ incdir_list = libdir_list = None 
+ 
++LOCALBASE = os.environ.get("LOCALBASE", "/usr/local")
++incdir_list = ['%s/include' % LOCALBASE]
++libdir_list = ['%s/lib/' % LOCALBASE]
++
+ if os.name == 'posix':
+ 	LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '')
+ 	args = sys.argv[:]
+@@ -49,7 +53,7 @@
+ 							   libraries=["rsync"])],
+ 	  scripts = ['rdiffdir', 'duplicity'],
+ 	  data_files = [('share/man/man1', ['duplicity.1', 'rdiffdir.1']),
+-					('share/doc/duplicity-%s' % version_string,
++					('share/doc/duplicity',
+ 					 ['COPYING', 'README', 'CHANGELOG'])])
+ 
+ 
diff --git a/sysutils/duplicity05/pkg-plist b/sysutils/duplicity05/pkg-plist
index 3813da993a09..3a72c35bc45c 100644
--- a/sysutils/duplicity05/pkg-plist
+++ b/sysutils/duplicity05/pkg-plist
@@ -67,6 +67,12 @@ bin/rdiffdir
 %%PYTHON_SITELIBDIR%%/duplicity/tarfile.py
 %%PYTHON_SITELIBDIR%%/duplicity/tarfile.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/tarfile.pyo
+%%PYTHON_SITELIBDIR%%/duplicity/tempdir.py
+%%PYTHON_SITELIBDIR%%/duplicity/tempdir.pyc
+%%PYTHON_SITELIBDIR%%/duplicity/tempdir.pyo
+%%PYTHON_SITELIBDIR%%/duplicity/urlparse_2_5.py
+%%PYTHON_SITELIBDIR%%/duplicity/urlparse_2_5.pyc
+%%PYTHON_SITELIBDIR%%/duplicity/urlparse_2_5.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/duplicity
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/COPYING