8 files changed, 1 insertions, 253 deletions

diff --git a/MOVED b/MOVED
index cd988afb7955..e42373016733 100644
--- a/MOVED
+++ b/MOVED
@@ -3008,3 +3008,4 @@ graphics/librsvg||2011-11-09|Has expired: unmaintained and not used anymore
 www/p5-Catalyst-Log-Log4perl||2011-11-09|Has expired: Use Log::Log4perl::Catalyst (devel/p5-Log-Log4perl) instead.
 lang/open-cobol-devel||2011-11-09|Has expired: No activity since 2007
 databases/py-axiom||2011-11-11|Has expired: Distfile missing, runtime broken. Use databases/py-sqlobject instead
+sysutils/duplicity-devel||2011-11-12|Much older than current version, use sysutils/duplicity instead
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 6a76e3e8d227..0884e6e3c099 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -182,7 +182,6 @@
     SUBDIR += dump9660
     SUBDIR += dupfind
     SUBDIR += duplicity
-    SUBDIR += duplicity-devel
     SUBDIR += duplicity05
     SUBDIR += duply
     SUBDIR += dupmerge
diff --git a/sysutils/duplicity-devel/Makefile b/sysutils/duplicity-devel/Makefile
deleted file mode 100644
index 527a039720b4..000000000000
--- a/sysutils/duplicity-devel/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# New ports collection makefile for:	duplicity-devel
-# Date created:				Fri Jul 10 23:12:20 CEST 2009
-# Whom:					Peter Schuller <peter.schuller@infidyne.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	duplicity
-PORTVERSION=	0.6.10
-PORTREVISION=	1
-CATEGORIES=	sysutils
-MASTER_SITES=	http://launchpad.net/duplicity/0.6-series/${PORTVERSION}/+download/
-PKGNAMESUFFIX=	-devel
-
-MAINTAINER=	peter.schuller@infidyne.com
-COMMENT=	Untrusted backup using rsync algorithm (development/unstable version)
-
-LIB_DEPENDS=	rsync.1:${PORTSDIR}/net/librsync
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
-		ncftp>=3.2.2:${PORTSDIR}/ftp/ncftp3
-
-# fetch claims "Moved temporarily" without this - why? (inspired by deskutils/gtg)
-FETCH_ARGS=	-pRr
-
-CONFLICTS=	duplicity-[0-9]*
-
-IGNORE=		is older than the stable release; please use sysutils/duplicity
-
-USE_PYTHON=	2.4+
-USE_PYDISTUTILS=yes
-USE_GETTEXT=	yes
-USE_LDCONFIG=	yes
-
-MAN1=		duplicity.1 rdiffdir.1
-
-DOCFILES=	CHANGELOG \
-		COPYING \
-		REPO-README \
-		LOG-README \
-		README \
-		tarfile-LICENSE
-
-.include <bsd.port.pre.mk>
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for file in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/duplicity-devel/distinfo b/sysutils/duplicity-devel/distinfo
deleted file mode 100644
index b3cf6211b34e..000000000000
--- a/sysutils/duplicity-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (duplicity-0.6.10.tar.gz) = 5c7d38e58f866705e293bbf06aef973e32f196b0fa4f633433a0ae72d8b23284
-SIZE (duplicity-0.6.10.tar.gz) = 291633
diff --git a/sysutils/duplicity-devel/files/patch-setup.py b/sysutils/duplicity-devel/files/patch-setup.py
deleted file mode 100644
index 3ae420dd6a41..000000000000
--- a/sysutils/duplicity-devel/files/patch-setup.py
+++ /dev/null
@@ -1,31 +0,0 @@
---- setup.py.orig	2009-01-09 16:05:11.000000000 +0200
-+++ setup.py	2009-01-10 16:06:40.000000000 +0200
-@@ -12,6 +12,10 @@
- 
- incdir_list = libdir_list = None
- 
-+LOCALBASE = os.environ.get("LOCALBASE", "/usr/local")
-+incdir_list = ['%s/include' % LOCALBASE]
-+libdir_list = ['%s/lib/' % LOCALBASE]
-+
- if os.name == 'posix':
-     LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '')
-     args = sys.argv[:]
-@@ -23,16 +27,9 @@
-         incdir_list = [os.path.join(LIBRSYNC_DIR, 'include')]
-         libdir_list = [os.path.join(LIBRSYNC_DIR, 'lib')]
- 
--data_files = [('share/man/man1',
-+data_files = [('man/man1',
-                ['duplicity.1',
-                 'rdiffdir.1']),
--              ('share/doc/duplicity-%s' % version_string,
--               ['COPYING',
--                'REPO-README',
--                'LOG-README',
--                'README',
--                'tarfile-LICENSE',
--                'CHANGELOG']),
-               ]
- 
- assert os.path.exists("po"), "Missing 'po' directory."
diff --git a/sysutils/duplicity-devel/pkg-descr b/sysutils/duplicity-devel/pkg-descr
deleted file mode 100644
index 0699603e77f3..000000000000
--- a/sysutils/duplicity-devel/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Duplicity backs directories by producing encrypted tar-format volumes and
-uploading them to a remote or local file server. Because duplicity uses
-librsync, the incremental archives are space efficient and only record the
-parts of files that have changed since the last backup. Because duplicity
-uses GnuPG to encrypt and/or sign these archives, they will be safe from
-spying and/or modification by the server.
-
-WWW: http://www.nongnu.org/duplicity/
diff --git a/sysutils/duplicity-devel/pkg-message b/sysutils/duplicity-devel/pkg-message
deleted file mode 100644
index 206c71847721..000000000000
--- a/sysutils/duplicity-devel/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
-*************************************************************************
-* The following two backends are supported by duplicity itself,         *
-* 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 tahoe backend for Tahoe-LAFS.                                 *
-*                                                                       *
-* Please refer to upstream duplicity documentation for information on   *
-* the use of these backends.                                            *
-*************************************************************************
diff --git a/sysutils/duplicity-devel/pkg-plist b/sysutils/duplicity-devel/pkg-plist
deleted file mode 100644
index cc2140893a6c..000000000000
--- a/sysutils/duplicity-devel/pkg-plist
+++ /dev/null
@@ -1,147 +0,0 @@
-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
-%%PYTHON_SITELIBDIR%%/duplicity/_librsync.so
-%%PYTHON_SITELIBDIR%%/duplicity/asyncscheduler.py
-%%PYTHON_SITELIBDIR%%/duplicity/asyncscheduler.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/asyncscheduler.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backend.py
-%%PYTHON_SITELIBDIR%%/duplicity/backend.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backend.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/__init__.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/__init__.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/__init__.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/giobackend.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/giobackend.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/giobackend.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/hsibackend.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/hsibackend.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/hsibackend.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/imapbackend.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/imapbackend.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/imapbackend.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/localbackend.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/localbackend.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/localbackend.pyo
-%%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
-%%PYTHON_SITELIBDIR%%/duplicity/backends/tahoebackend.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/tahoebackend.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/tahoebackend.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/backends/webdavbackend.py
-%%PYTHON_SITELIBDIR%%/duplicity/backends/webdavbackend.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/backends/webdavbackend.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/collections.py
-%%PYTHON_SITELIBDIR%%/duplicity/collections.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/collections.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/commandline.py
-%%PYTHON_SITELIBDIR%%/duplicity/commandline.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/commandline.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/diffdir.py
-%%PYTHON_SITELIBDIR%%/duplicity/diffdir.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/diffdir.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/dup_temp.py
-%%PYTHON_SITELIBDIR%%/duplicity/dup_temp.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/dup_temp.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/dup_threading.py
-%%PYTHON_SITELIBDIR%%/duplicity/dup_threading.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/dup_threading.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/dup_time.py
-%%PYTHON_SITELIBDIR%%/duplicity/dup_time.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/dup_time.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/errors.py
-%%PYTHON_SITELIBDIR%%/duplicity/errors.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/errors.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/file_naming.py
-%%PYTHON_SITELIBDIR%%/duplicity/file_naming.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/file_naming.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/globals.py
-%%PYTHON_SITELIBDIR%%/duplicity/globals.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/globals.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/gpg.py
-%%PYTHON_SITELIBDIR%%/duplicity/gpg.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/gpg.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/lazy.py
-%%PYTHON_SITELIBDIR%%/duplicity/lazy.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/lazy.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/librsync.py
-%%PYTHON_SITELIBDIR%%/duplicity/librsync.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/librsync.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/log.py
-%%PYTHON_SITELIBDIR%%/duplicity/log.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/log.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/manifest.py
-%%PYTHON_SITELIBDIR%%/duplicity/manifest.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/manifest.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/misc.py
-%%PYTHON_SITELIBDIR%%/duplicity/misc.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/misc.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/patchdir.py
-%%PYTHON_SITELIBDIR%%/duplicity/patchdir.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/patchdir.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
-%%PYTHON_SITELIBDIR%%/duplicity/selection.py
-%%PYTHON_SITELIBDIR%%/duplicity/selection.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/selection.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/static.py
-%%PYTHON_SITELIBDIR%%/duplicity/static.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/static.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/statistics.py
-%%PYTHON_SITELIBDIR%%/duplicity/statistics.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/statistics.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/tarfile.py
-%%PYTHON_SITELIBDIR%%/duplicity/tarfile.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/tarfile.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/tempdir.py
-%%PYTHON_SITELIBDIR%%/duplicity/tempdir.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/tempdir.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/urlparse_2_5.py
-%%PYTHON_SITELIBDIR%%/duplicity/urlparse_2_5.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/urlparse_2_5.pyo
-%%PYTHON_SITELIBDIR%%/duplicity/util.py
-%%PYTHON_SITELIBDIR%%/duplicity/util.pyc
-%%PYTHON_SITELIBDIR%%/duplicity/util.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/duplicity/backends
-@dirrm %%PYTHON_SITELIBDIR%%/duplicity
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/LOG-README
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/REPO-README
-%%PORTDOCS%%%%DOCSDIR%%/tarfile-LICENSE
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-share/locale/bg/LC_MESSAGES/duplicity.mo
-share/locale/en_GB/LC_MESSAGES/duplicity.mo
-share/locale/es/LC_MESSAGES/duplicity.mo
-share/locale/eo/LC_MESSAGES/duplicity.mo
-share/locale/io/LC_MESSAGES/duplicity.mo
-share/locale/pt/LC_MESSAGES/duplicity.mo
-share/locale/zh_CN/LC_MESSAGES/duplicity.mo
-@dirrmtry share/locale/io/LC_MESSAGES
-@dirrmtry share/locale/io