Update to version 0.6.16, released October 15, 2011.

Too many changes since 0.6.13 to list, see:
1. /usr/local/share/doc/duplicity/CHANGELOG, or
2. http://www.nongnu.org/duplicity/CHANGELOG

For the port, the version upgrade and maintainer change are from the PR.
Thanks to the former maintainer for his past hard work, and confirming
the change.

Additionally, add some cleanups of my own:
1. More accurate comment
2. Make NLS an OPTION
3. Minor simplification to the Makefile logic

PR:		ports/162507
Submitted by:	Jase Thew <freebsd@beardz.net>
Feature safe:	yes

3 files changed, 66 insertions, 10 deletions

diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 3b4274981c5a..c0ec414d9297 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -6,18 +6,20 @@
 #
 
 PORTNAME=	duplicity
-PORTVERSION=	0.6.13
+PORTVERSION=	0.6.16
 CATEGORIES=	sysutils
 MASTER_SITES=	http://launchpad.net/duplicity/0.6-series/${PORTVERSION}/+download/
 
-MAINTAINER=	peter.schuller@infidyne.com
-COMMENT=	Untrusted backup using rsync algorithm
+MAINTAINER=	freebsd@beardz.net
+COMMENT=	Backup tool that uses rsync and GnuPG
 
 LIB_DEPENDS=	rsync.1:${PORTSDIR}/net/librsync
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
 		ncftp>=3.2.2:${PORTSDIR}/ftp/ncftp3 \
 		lftp>=3.7.15:${PORTSDIR}/ftp/lftp
 
+OPTIONS=	NLS "National Language Support" on
+
 # fetch claims "Moved temporarily" without this - why? (inspired by deskutils/gtg)
 FETCH_ARGS=	-pRr
 
@@ -27,14 +29,14 @@ USE_PYTHON=	2.4+
 USE_PYDISTUTILS=yes
 USE_LDCONFIG=	yes
 
+.include "bsd.port.options.mk"
+
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
-.endif
 
-.if defined(WITHOUT_NLS)
 post-patch:
 	@${REINPLACE_CMD} -e '54,63d' \
 		${WRKSRC}/setup.py
@@ -49,8 +51,6 @@ DOCFILES=	CHANGELOG \
 		README \
 		tarfile-LICENSE
 
-.include <bsd.port.pre.mk>
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -59,4 +59,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo
index c24cdfb47499..bc5a0742577a 100644
--- a/sysutils/duplicity/distinfo
+++ b/sysutils/duplicity/distinfo
@@ -1,2 +1,2 @@
-SHA256 (duplicity-0.6.13.tar.gz) = 381aa8d7a07541d81457c3eac0ab5b37f05272023e3af04cbebab831732ff41f
-SIZE (duplicity-0.6.13.tar.gz) = 296955
+SHA256 (duplicity-0.6.16.tar.gz) = 488c5de5ff0495409e2d92ee07e42a4daf336e2bc1dc934c3cd862ae4f41c358
+SIZE (duplicity-0.6.16.tar.gz) = 524358
diff --git a/sysutils/duplicity/pkg-plist b/sysutils/duplicity/pkg-plist
index 2f6a8aa867db..12e839da620c 100644
--- a/sysutils/duplicity/pkg-plist
+++ b/sysutils/duplicity/pkg-plist
@@ -28,6 +28,9 @@ bin/rdiffdir
 %%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
 %%PYTHON_SITELIBDIR%%/duplicity/backends/giobackend.py
 %%PYTHON_SITELIBDIR%%/duplicity/backends/giobackend.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/backends/giobackend.pyo
@@ -49,6 +52,9 @@ bin/rdiffdir
 %%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
 %%PYTHON_SITELIBDIR%%/duplicity/backends/webdavbackend.py
 %%PYTHON_SITELIBDIR%%/duplicity/backends/webdavbackend.pyc
 %%PYTHON_SITELIBDIR%%/duplicity/backends/webdavbackend.pyo
@@ -140,11 +146,61 @@ bin/rdiffdir
 %%PORTDOCS%%%%DOCSDIR%%/tarfile-LICENSE
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%NLS%%share/locale/bg/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/de/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/el/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/duplicity.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/duplicity.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/duplicity.mo
 %%NLS%%share/locale/es/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/he/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/id/LC_MESSAGES/duplicity.mo
 %%NLS%%share/locale/io/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/it/LC_MESSAGES/duplicity.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/duplicity.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/duplicity.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/duplicity.mo
+%%NLS%%@dirrmtry share/locale/bg/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/bg
+%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de
+%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/el
+%%NLS%%@dirrmtry share/locale/eo/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/eo
+%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/es
+%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fr
+%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id
 %%NLS%%@dirrmtry share/locale/io/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/io
+%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/it
+%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt
+%%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/oc
+%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pl
+%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt_BR
+%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru
+%%NLS%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sl
+%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sv
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_CN