3 files changed, 11 insertions, 18 deletions

diff --git a/sysutils/duplicity-devel/Makefile b/sysutils/duplicity-devel/Makefile
index 1e7994b483f9..38f1b97ef594 100644
--- a/sysutils/duplicity-devel/Makefile
+++ b/sysutils/duplicity-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	duplicity
-PORTVERSION=	0.5.09
+PORTVERSION=	0.5.12
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,11 +15,7 @@ MAINTAINER=	vd@FreeBSD.org
 COMMENT=	Untrusted backup using rsync algorithm
 
 LIB_DEPENDS=	rsync.1:${PORTSDIR}/net/librsync
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
-		${PYTHON_SITELIBDIR}/GnuPGInterface.py:${PORTSDIR}/security/py-gnupg
-
-PEXPECT_DIR=	misc/py-pexpect
-OPTIONS=	PEXPECT "Depend on ${PEXPECT_DIR}, needed for ssh backend" On
+RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=yes
@@ -35,12 +31,6 @@ DOCFILES=	CHANGELOG \
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_PEXPECT)
-PEXPECT_DEP=	${PYTHON_SITELIBDIR}/pexpect.py:${PORTSDIR}/${PEXPECT_DIR}
-BUILD_DEPENDS+=	${PEXPECT_DEP}
-RUN_DEPENDS+=	${PEXPECT_DEP}
-.endif
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/sysutils/duplicity-devel/distinfo b/sysutils/duplicity-devel/distinfo
index 24e6b3749842..936042a7a37c 100644
--- a/sysutils/duplicity-devel/distinfo
+++ b/sysutils/duplicity-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (duplicity-0.5.09.tar.gz) = b48c390825fba8ddc15bef4400f8e4f1
-SHA256 (duplicity-0.5.09.tar.gz) = 881bcc88467065693fe5c711d2848f21f7013c10fa04e0f2043292cf2d9b14ac
-SIZE (duplicity-0.5.09.tar.gz) = 182395
+MD5 (duplicity-0.5.12.tar.gz) = 38cb42fc0299ae0c8e029bd381aa4452
+SHA256 (duplicity-0.5.12.tar.gz) = 57e859ef729425ba5416b0b648bab1c7fe54e10a2df83a0a067be462f9f84b8b
+SIZE (duplicity-0.5.12.tar.gz) = 191413
diff --git a/sysutils/duplicity-devel/pkg-plist b/sysutils/duplicity-devel/pkg-plist
index 5eaac6fc3ce9..ee159a910a4f 100644
--- a/sysutils/duplicity-devel/pkg-plist
+++ b/sysutils/duplicity-devel/pkg-plist
@@ -1,5 +1,8 @@
 bin/duplicity
 bin/rdiffdir
+%%PYTHON_SITELIBDIR%%/duplicity/GnuPGInterface.py
+%%PYTHON_SITELIBDIR%%/duplicity/GnuPGInterface.pyc
+%%PYTHON_SITELIBDIR%%/duplicity/GnuPGInterface.pyo
 %%PYTHON_SITELIBDIR%%/duplicity/__init__.py
 %%PYTHON_SITELIBDIR%%/duplicity/__init__.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/__init__.pyo
@@ -85,12 +88,12 @@ 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
+%%PYTHON_SITELIBDIR%%/duplicity/pexpect.py
+%%PYTHON_SITELIBDIR%%/duplicity/pexpect.pyc
+%%PYTHON_SITELIBDIR%%/duplicity/pexpect.pyo
 %%PYTHON_SITELIBDIR%%/duplicity/robust.py
 %%PYTHON_SITELIBDIR%%/duplicity/robust.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/robust.pyo