4 files changed, 50 insertions, 14 deletions

diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 3d70f2b262ea..9b6cc7fc7d0c 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	duplicity
-PORTVERSION=	0.6.21
+PORTVERSION=	0.6.22
 CATEGORIES=	sysutils
 MASTER_SITES=	http://launchpad.net/duplicity/0.6-series/${PORTVERSION}/+download/
 
@@ -20,14 +20,16 @@ USE_PYTHON=	2.5+
 USE_PYDISTUTILS=yes
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	NLS DOCS SSH FTP FTPS S3 GDOCS CLOUDFILES
+OPTIONS_DEFINE=	NLS DOCS SSH FTP FTPS S3 GDOCS CLOUDFILES GIO U1
 OPTIONS_DEFAULT=SSH FTP FTPS S3
 CLOUDFILES_DESC=Install CloudFiles backend
 FTP_DESC=	Install FTP backend
 FTPS_DESC=	Install FTPS backend
 GDOCS_DESC=	Install Google Docs backend
+GIO_DESC=	Install GIO backend
 S3_DESC=	Install Amazon S3 backend
 SSH_DESC=	Install SSH/SCP/SFTP backend
+U1_DESC=	Install Ubuntu One backend
 
 .include "bsd.port.options.mk"
 
@@ -80,6 +82,22 @@ PLIST_SUB+=	CLOUDFILES=""
 PLIST_SUB+=	CLOUDFILES="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MGIO}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gobject>0:${PORTSDIR}/devel/py-gobject \
+		dbus>0:${PORTSDIR}/devel/dbus
+PLIST_SUB+=	GIO=""
+.else
+PLIST_SUB+=	GIO="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MU1}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2 \
+		${PYTHON_PKGNAMEPREFIX}oauthlib>0:${PORTSDIR}/security/py-oauthlib
+PLIST_SUB+=	U1=""
+.else
+PLIST_SUB+=	U1="@comment "
+.endif
+
 post-patch:
 .if empty(PORT_OPTIONS:MNLS)
 	@${REINPLACE_CMD} -e '54,62d' \
@@ -103,6 +121,12 @@ post-patch:
 .if empty(PORT_OPTIONS:MCLOUDFILES)
 	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/cloudfilesbackend.py
 .endif
+.if empty(PORT_OPTIONS:MGIO)
+	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/giobackend.py
+.endif
+.if empty(PORT_OPTIONS:MU1)
+	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/u1backend.py
+.endif
 
 MAN1=		duplicity.1 rdiffdir.1
 
diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo
index ecb97019915f..9b12f4767a63 100644
--- a/sysutils/duplicity/distinfo
+++ b/sysutils/duplicity/distinfo
@@ -1,2 +1,2 @@
-SHA256 (duplicity-0.6.21.tar.gz) = a3628aa6c151fbc1a3014f0db7812d7234e04bba0a45ce1255e7450bdfeff706
-SIZE (duplicity-0.6.21.tar.gz) = 1235340
+SHA256 (duplicity-0.6.22.tar.gz) = 6f489b0445681f0697488f3d4097b4c56a7fe8a5fea5fadd2e431724039c5a12
+SIZE (duplicity-0.6.22.tar.gz) = 1257082
diff --git a/sysutils/duplicity/pkg-message b/sysutils/duplicity/pkg-message
index f35026d2747d..59db7023049d 100644
--- a/sysutils/duplicity/pkg-message
+++ b/sysutils/duplicity/pkg-message
@@ -3,10 +3,10 @@
 * require manual installation of their respective dependencies because  *
 * they are not yet available in the ports tree:                         *
 *                                                                       *
-*   - The GIO backend.                                                  *
-*   - The HSI backend.                                                  *
-*   - The tahoe backend for Tahoe-LAFS.                                 *
-*   - The U1 backend for Ubuntu One cloud storage                       *
+*   - The Dropbox backend                                               *
+*   - The HSI backend                                                   *
+*   - The swift backend for OpenStack Object Storage                    *
+*   - The tahoe backend for Tahoe-LAFS                                  *
 *                                                                       *
 * Please refer to upstream duplicity documentation for information on   *
 * the use of these backends.                                            *
diff --git a/sysutils/duplicity/pkg-plist b/sysutils/duplicity/pkg-plist
index 59b850a0edc1..1074f65c7683 100644
--- a/sysutils/duplicity/pkg-plist
+++ b/sysutils/duplicity/pkg-plist
@@ -31,6 +31,9 @@ bin/rdiffdir
 %%CLOUDFILES%%%%PYTHON_SITELIBDIR%%/duplicity/backends/cloudfilesbackend.py
 %%CLOUDFILES%%%%PYTHON_SITELIBDIR%%/duplicity/backends/cloudfilesbackend.pyc
 %%CLOUDFILES%%%%PYTHON_SITELIBDIR%%/duplicity/backends/cloudfilesbackend.pyo
+%%PYTHON_SITELIBDIR%%/duplicity/backends/dpbxbackend.py
+%%PYTHON_SITELIBDIR%%/duplicity/backends/dpbxbackend.pyc
+%%PYTHON_SITELIBDIR%%/duplicity/backends/dpbxbackend.pyo
 %%FTP%%%%PYTHON_SITELIBDIR%%/duplicity/backends/ftpbackend.py
 %%FTP%%%%PYTHON_SITELIBDIR%%/duplicity/backends/ftpbackend.pyc
 %%FTP%%%%PYTHON_SITELIBDIR%%/duplicity/backends/ftpbackend.pyo
@@ -40,9 +43,9 @@ bin/rdiffdir
 %%GDOCS%%%%PYTHON_SITELIBDIR%%/duplicity/backends/gdocsbackend.py
 %%GDOCS%%%%PYTHON_SITELIBDIR%%/duplicity/backends/gdocsbackend.pyc
 %%GDOCS%%%%PYTHON_SITELIBDIR%%/duplicity/backends/gdocsbackend.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/giobackend.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/giobackend.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/giobackend.pyo
+%%GIO%%%%PYTHON_SITELIBDIR%%/duplicity/backends/giobackend.py
+%%GIO%%%%PYTHON_SITELIBDIR%%/duplicity/backends/giobackend.pyc
+%%GIO%%%%PYTHON_SITELIBDIR%%/duplicity/backends/giobackend.pyo
 %%PYTHON_SITELIBDIR%%/duplicity/backends/hsibackend.py
 %%PYTHON_SITELIBDIR%%/duplicity/backends/hsibackend.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/backends/hsibackend.pyo
@@ -52,18 +55,24 @@ bin/rdiffdir
 %%PYTHON_SITELIBDIR%%/duplicity/backends/localbackend.py
 %%PYTHON_SITELIBDIR%%/duplicity/backends/localbackend.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/backends/localbackend.pyo
+%%PYTHON_SITELIBDIR%%/duplicity/backends/megabackend.py
+%%PYTHON_SITELIBDIR%%/duplicity/backends/megabackend.pyc
+%%PYTHON_SITELIBDIR%%/duplicity/backends/megabackend.pyo
 %%PYTHON_SITELIBDIR%%/duplicity/backends/rsyncbackend.py
 %%PYTHON_SITELIBDIR%%/duplicity/backends/rsyncbackend.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/backends/rsyncbackend.pyo
 %%SSH%%%%PYTHON_SITELIBDIR%%/duplicity/backends/sshbackend.py
 %%SSH%%%%PYTHON_SITELIBDIR%%/duplicity/backends/sshbackend.pyc
 %%SSH%%%%PYTHON_SITELIBDIR%%/duplicity/backends/sshbackend.pyo
+%%PYTHON_SITELIBDIR%%/duplicity/backends/swiftbackend.py
+%%PYTHON_SITELIBDIR%%/duplicity/backends/swiftbackend.pyc
+%%PYTHON_SITELIBDIR%%/duplicity/backends/swiftbackend.pyo
 %%PYTHON_SITELIBDIR%%/duplicity/backends/tahoebackend.py
 %%PYTHON_SITELIBDIR%%/duplicity/backends/tahoebackend.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/backends/tahoebackend.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/u1backend.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/u1backend.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/u1backend.pyo
+%%U1%%%%PYTHON_SITELIBDIR%%/duplicity/backends/u1backend.py
+%%U1%%%%PYTHON_SITELIBDIR%%/duplicity/backends/u1backend.pyc
+%%U1%%%%PYTHON_SITELIBDIR%%/duplicity/backends/u1backend.pyo
 %%PYTHON_SITELIBDIR%%/duplicity/backends/webdavbackend.py
 %%PYTHON_SITELIBDIR%%/duplicity/backends/webdavbackend.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/backends/webdavbackend.pyo
@@ -133,6 +142,9 @@ bin/rdiffdir
 %%PYTHON_SITELIBDIR%%/duplicity/pexpect.py
 %%PYTHON_SITELIBDIR%%/duplicity/pexpect.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/pexpect.pyo
+%%PYTHON_SITELIBDIR%%/duplicity/progress.py
+%%PYTHON_SITELIBDIR%%/duplicity/progress.pyc
+%%PYTHON_SITELIBDIR%%/duplicity/progress.pyo
 %%PYTHON_SITELIBDIR%%/duplicity/robust.py
 %%PYTHON_SITELIBDIR%%/duplicity/robust.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/robust.pyo