- Update to 0.6.19

- Update maintainer address
- Convert to new options framework
- Fix COMMENT
- Remove shlib version from LIB_DEPENDS
- Remove extraneous comment

Changes:	http://www.nongnu.org/duplicity/CHANGELOG
Approved by:	flo, culot (mentors)

3 files changed, 20 insertions, 13 deletions

diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index a951976de892..f84a61191e47 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -6,24 +6,20 @@
 #
 
 PORTNAME=	duplicity
-PORTVERSION=	0.6.18
-PORTREVISION=	1
+PORTVERSION=	0.6.19
 CATEGORIES=	sysutils
 MASTER_SITES=	http://launchpad.net/duplicity/0.6-series/${PORTVERSION}/+download/
 
-MAINTAINER=	freebsd@beardz.net
-COMMENT=	Backup tool that uses rsync and GnuPG
+MAINTAINER=	jase@FreeBSD.org
+COMMENT=	Backup tool that uses librsync and GnuPG
 
-LIB_DEPENDS=	rsync.1:${PORTSDIR}/net/librsync
+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
 
-OPTIONS=	NLS "National Language Support" on
-
-# fetch claims "Moved temporarily" without this - why? (inspired by deskutils/gtg)
 FETCH_ARGS=	-pRr
 
 CONFLICTS=	duplicity-0.5.* duplicity-devel-[0-9]*
@@ -32,16 +28,18 @@ USE_PYTHON=	2.5+
 USE_PYDISTUTILS=yes
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	NLS DOCS
+
 .include "bsd.port.options.mk"
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 
 post-patch:
-	@${REINPLACE_CMD} -e '54,63d' \
+	@${REINPLACE_CMD} -e '54,62d' \
 		${WRKSRC}/setup.py
 .endif
 
@@ -56,7 +54,7 @@ DOCFILES=	COPYING \
 		CHANGELOG
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for file in ${DOCFILES}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo
index d57eea5b39f8..ec71c2e24285 100644
--- a/sysutils/duplicity/distinfo
+++ b/sysutils/duplicity/distinfo
@@ -1,2 +1,2 @@
-SHA256 (duplicity-0.6.18.tar.gz) = 56bc583be1031762dd94082cb30e09e1347167aaa88188f8d6d6c052ad8f90af
-SIZE (duplicity-0.6.18.tar.gz) = 1101351
+SHA256 (duplicity-0.6.19.tar.gz) = f16a388d1ac4f8daf2bf9ffc2b277422ca367a8e56b9cdb5de0cd36b95ea5731
+SIZE (duplicity-0.6.19.tar.gz) = 1131760
diff --git a/sysutils/duplicity/pkg-plist b/sysutils/duplicity/pkg-plist
index 47277615657a..18cbac44d91d 100644
--- a/sysutils/duplicity/pkg-plist
+++ b/sysutils/duplicity/pkg-plist
@@ -22,6 +22,12 @@ bin/rdiffdir
 %%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
@@ -121,6 +127,9 @@ bin/rdiffdir
 %%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