3 files changed, 105 insertions, 37 deletions

diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index f84a61191e47..43ae4acf52f0 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	duplicity
 PORTVERSION=	0.6.19
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://launchpad.net/duplicity/0.6-series/${PORTVERSION}/+download/
 
@@ -14,11 +15,7 @@ MAINTAINER=	jase@FreeBSD.org
 COMMENT=	Backup tool that uses librsync and GnuPG
 
 LIB_DEPENDS=	rsync:${PORTSDIR}/net/librsync
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
-		ncftp>=3.2.2:${PORTSDIR}/ftp/ncftp3 \
-		lftp>=3.7.15:${PORTSDIR}/ftp/lftp \
-		${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:${PORTSDIR}/security/py-paramiko \
-		${PYTHON_PKGNAMEPREFIX}boto>=1.6b:${PORTSDIR}/devel/py-boto
+RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 
 FETCH_ARGS=	-pRr
 
@@ -28,7 +25,14 @@ USE_PYTHON=	2.5+
 USE_PYDISTUTILS=yes
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	NLS DOCS
+OPTIONS_DEFINE=	NLS DOCS SSH FTP FTPS S3 GDOCS CLOUDFILES
+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
+S3_DESC=	Install Amazon S3 backend
+SSH_DESC=	Install SSH/SCP/SFTP backend
 
 .include "bsd.port.options.mk"
 
@@ -37,11 +41,73 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MSSH}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:${PORTSDIR}/security/py-paramiko
+PLIST_SUB+=	SSH=""
+.else
+PLIST_SUB+=	SSH="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MFTP}
+RUN_DEPENDS+=	ncftp>=3.2.2:${PORTSDIR}/ftp/ncftp3
+PLIST_SUB+=	FTP=""
+.else
+PLIST_SUB+=	FTP="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MFTPS}
+RUN_DEPENDS+=	lftp>=3.7.15:${PORTSDIR}/ftp/lftp
+PLIST_SUB+=	FTPS=""
+.else
+PLIST_SUB+=	FTPS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MS3}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}boto>=1.6b:${PORTSDIR}/devel/py-boto
+PLIST_SUB+=	S3=""
+.else
+PLIST_SUB+=	S3="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MGDOCS}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gdata>0:${PORTSDIR}/devel/py-gdata
+PLIST_SUB+=	GDOCS=""
+.else
+PLIST_SUB+=	GDOCS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MCLOUDFILES}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cloudfiles>0:${PORTSDIR}/net/py-cloudfiles
+PLIST_SUB+=	CLOUDFILES=""
+.else
+PLIST_SUB+=	CLOUDFILES="@comment "
+.endif
 
 post-patch:
+.if empty(PORT_OPTIONS:MNLS)
 	@${REINPLACE_CMD} -e '54,62d' \
 		${WRKSRC}/setup.py
 .endif
+.if empty(PORT_OPTIONS:MSSH)
+	@${FIND} ${WRKSRC}/${PORTNAME}/backends -type f -depth 1 -name '*ssh*' -delete
+.endif
+.if empty(PORT_OPTIONS:MFTP)
+	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/ftpbackend.py
+.endif
+.if empty(PORT_OPTIONS:MFTPS)
+	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/ftpsbackend.py
+.endif
+.if empty(PORT_OPTIONS:MS3)
+	@${FIND} ${WRKSRC}/${PORTNAME}/backends -type f -depth 1 -name '*boto*' -delete
+.endif
+.if empty(PORT_OPTIONS:MGDOCS)
+	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/gdocsbackend.py
+.endif
+.if empty(PORT_OPTIONS:MCLOUDFILES)
+	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/cloudfilesbackend.py
+.endif
 
 MAN1=		duplicity.1 rdiffdir.1
 
diff --git a/sysutils/duplicity/pkg-message b/sysutils/duplicity/pkg-message
index 206c71847721..45c8cfdc68be 100644
--- a/sysutils/duplicity/pkg-message
+++ b/sysutils/duplicity/pkg-message
@@ -3,8 +3,10 @@
 * but will require manual installation of their respective dependencies *
 * because they are not yet available in the ports tree:                 *
 *                                                                       *
-*   - The CloudFiles backend (for RackSpace's CloudFiles).              *
+*   - The GIO backend.                                                  *
+*   - The HSI backend.                                                  *
 *   - The tahoe backend for Tahoe-LAFS.                                 *
+*   - The U1 backend for Ubuntu One cloud storage                       *
 *                                                                       *
 * 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 18cbac44d91d..e3ab66c6db96 100644
--- a/sysutils/duplicity/pkg-plist
+++ b/sysutils/duplicity/pkg-plist
@@ -16,33 +16,33 @@ bin/rdiffdir
 %%PYTHON_SITELIBDIR%%/duplicity/backends/__init__.py
 %%PYTHON_SITELIBDIR%%/duplicity/backends/__init__.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/backends/__init__.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/_boto_multi.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/_boto_multi.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/_boto_multi.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/_boto_single.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/_boto_single.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/_boto_single.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/_ssh_paramiko.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/_ssh_paramiko.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/_ssh_paramiko.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/_ssh_pexpect.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/_ssh_pexpect.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/_ssh_pexpect.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/botobackend.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/botobackend.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/botobackend.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/cloudfilesbackend.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/cloudfilesbackend.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/cloudfilesbackend.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/ftpbackend.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/ftpbackend.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/ftpbackend.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/ftpsbackend.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/ftpsbackend.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/ftpsbackend.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/gdocsbackend.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/gdocsbackend.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/gdocsbackend.pyo
+%%S3%%%%PYTHON_SITELIBDIR%%/duplicity/backends/_boto_multi.py
+%%S3%%%%PYTHON_SITELIBDIR%%/duplicity/backends/_boto_multi.pyc
+%%S3%%%%PYTHON_SITELIBDIR%%/duplicity/backends/_boto_multi.pyo
+%%S3%%%%PYTHON_SITELIBDIR%%/duplicity/backends/_boto_single.py
+%%S3%%%%PYTHON_SITELIBDIR%%/duplicity/backends/_boto_single.pyc
+%%S3%%%%PYTHON_SITELIBDIR%%/duplicity/backends/_boto_single.pyo
+%%SSH%%%%PYTHON_SITELIBDIR%%/duplicity/backends/_ssh_paramiko.py
+%%SSH%%%%PYTHON_SITELIBDIR%%/duplicity/backends/_ssh_paramiko.pyc
+%%SSH%%%%PYTHON_SITELIBDIR%%/duplicity/backends/_ssh_paramiko.pyo
+%%SSH%%%%PYTHON_SITELIBDIR%%/duplicity/backends/_ssh_pexpect.py
+%%SSH%%%%PYTHON_SITELIBDIR%%/duplicity/backends/_ssh_pexpect.pyc
+%%SSH%%%%PYTHON_SITELIBDIR%%/duplicity/backends/_ssh_pexpect.pyo
+%%S3%%%%PYTHON_SITELIBDIR%%/duplicity/backends/botobackend.py
+%%S3%%%%PYTHON_SITELIBDIR%%/duplicity/backends/botobackend.pyc
+%%S3%%%%PYTHON_SITELIBDIR%%/duplicity/backends/botobackend.pyo
+%%CLOUDFILES%%%%PYTHON_SITELIBDIR%%/duplicity/backends/cloudfilesbackend.py
+%%CLOUDFILES%%%%PYTHON_SITELIBDIR%%/duplicity/backends/cloudfilesbackend.pyc
+%%CLOUDFILES%%%%PYTHON_SITELIBDIR%%/duplicity/backends/cloudfilesbackend.pyo
+%%FTP%%%%PYTHON_SITELIBDIR%%/duplicity/backends/ftpbackend.py
+%%FTP%%%%PYTHON_SITELIBDIR%%/duplicity/backends/ftpbackend.pyc
+%%FTP%%%%PYTHON_SITELIBDIR%%/duplicity/backends/ftpbackend.pyo
+%%FTPS%%%%PYTHON_SITELIBDIR%%/duplicity/backends/ftpsbackend.py
+%%FTPS%%%%PYTHON_SITELIBDIR%%/duplicity/backends/ftpsbackend.pyc
+%%FTPS%%%%PYTHON_SITELIBDIR%%/duplicity/backends/ftpsbackend.pyo
+%%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
@@ -58,9 +58,9 @@ bin/rdiffdir
 %%PYTHON_SITELIBDIR%%/duplicity/backends/rsyncbackend.py
 %%PYTHON_SITELIBDIR%%/duplicity/backends/rsyncbackend.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/backends/rsyncbackend.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/sshbackend.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/sshbackend.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/sshbackend.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/tahoebackend.py
 %%PYTHON_SITELIBDIR%%/duplicity/backends/tahoebackend.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/backends/tahoebackend.pyo