3 files changed, 71 insertions, 36 deletions

diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile
index 9c052fb8a652..30f237147bdb 100644
--- a/devel/cvs2svn/Makefile
+++ b/devel/cvs2svn/Makefile
@@ -5,9 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	cvs2svn
-PORTVERSION=	1.5.0
+PORTVERSION=	2.0.1
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.rewt.org.uk/pub/distfiles/ \
+MASTER_SITES=	http://cvs2svn.tigris.org/files/documents/1462/39919/ \
+		ftp://ftp.rewt.org.uk/pub/distfiles/ \
 		http://gentoo.nedlinux.nl/distfiles/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jkoshy
@@ -16,7 +17,7 @@ MAINTAINER=	joe@joeholden.co.uk
 COMMENT=	CVS to Subversion Repository Converter
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm
-RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion \
+RUN_DEPENDS=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion \
 		${BUILD_DEPENDS}
 
 DISABLE_SIZE=	yes
@@ -26,6 +27,19 @@ USE_PYDISTUTILS=	yes
 
 MAN1=		cvs2svn.1
 
+# The only thing different in this target vs. the one found in bsd.port.mk
+# is that the extract command exit code is ignored.  tar exits with status
+# 1 because the distfile contains a symlink that points nowhere.
+do-extract:
+	@${RM} -rf ${WRKDIR}
+	@${MKDIR} ${WRKDIR}
+	@-for file in ${EXTRACT_ONLY}; do \
+		if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
+		then \
+			exit 1; \
+		fi; \
+	done
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/cvs2svn.1 ${PREFIX}/man/man1/
 
diff --git a/devel/cvs2svn/distinfo b/devel/cvs2svn/distinfo
index 411ac2a62bb6..6f0807ca1c11 100644
--- a/devel/cvs2svn/distinfo
+++ b/devel/cvs2svn/distinfo
@@ -1,3 +1,3 @@
-MD5 (cvs2svn-1.5.0.tar.gz) = dc5bf68303498542cfa061f7ae79d9dd
-SHA256 (cvs2svn-1.5.0.tar.gz) = 12c282757043b8ffc98443175cbac218119e92ccc73e942da447659efaf23274
-SIZE (cvs2svn-1.5.0.tar.gz) = 266057
+MD5 (cvs2svn-2.0.1.tar.gz) = 98c010de53adb19de6f039aa733b5bbe
+SHA256 (cvs2svn-2.0.1.tar.gz) = 323c16ba865106856f82cf8d278741735e433e6a56b00207b75408fb7ef7ebdd
+SIZE (cvs2svn-2.0.1.tar.gz) = 344924
diff --git a/devel/cvs2svn/pkg-plist b/devel/cvs2svn/pkg-plist
index ec4f2253bddf..412d19e3e946 100644
--- a/devel/cvs2svn/pkg-plist
+++ b/devel/cvs2svn/pkg-plist
@@ -8,6 +8,27 @@ bin/cvs2svn
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/boolean.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/boolean.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/boolean.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset_database.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset_database.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset_database.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset_graph.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset_graph.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset_graph.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset_graph_link.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset_graph_link.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset_graph_link.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset_graph_node.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset_graph_node.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset_graph_node.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/check_dependencies_pass.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/check_dependencies_pass.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/check_dependencies_pass.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/checkout_internal.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/checkout_internal.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/checkout_internal.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/collect_data.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/collect_data.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/collect_data.pyo
@@ -20,51 +41,36 @@ bin/cvs2svn
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/context.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/context.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/context.pyo
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_commit.py
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_commit.pyc
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_commit.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_file.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_file.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_file.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_file_database.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_file_database.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_file_database.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_file_items.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_file_items.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_file_items.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_item.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_item.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_item.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_item_database.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_item_database.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_item_database.pyo
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_repository.py
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_repository.pyc
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_repository.pyo
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_revision_aggregator.py
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_revision_aggregator.pyc
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_revision_aggregator.pyo
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_revision_resynchronizer.py
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_revision_resynchronizer.pyc
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_revision_resynchronizer.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/database.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/database.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/database.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/dumpfile_delegate.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/dumpfile_delegate.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/dumpfile_delegate.pyo
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/fill_source.py
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/fill_source.pyc
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/fill_source.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/key_generator.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/key_generator.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/key_generator.pyo
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/last_symbolic_name_database.py
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/last_symbolic_name_database.pyc
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/last_symbolic_name_database.pyo
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/line_of_development.py
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/line_of_development.pyc
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/line_of_development.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/log.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/log.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/log.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/main.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/main.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/main.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/metadata_database.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/metadata_database.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/metadata_database.pyo
@@ -83,9 +89,6 @@ bin/cvs2svn
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/persistence_manager.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/persistence_manager.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/persistence_manager.pyo
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/primed_pickle.py
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/primed_pickle.pyc
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/primed_pickle.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/process.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/process.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/process.pyo
@@ -95,15 +98,30 @@ bin/cvs2svn
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/property_setters.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/property_setters.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/property_setters.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/rcs_stream.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/rcs_stream.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/rcs_stream.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/record_table.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/record_table.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/record_table.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/repository_delegate.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/repository_delegate.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/repository_delegate.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/revision_excluder.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/revision_excluder.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/revision_excluder.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/revision_reader.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/revision_reader.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/revision_reader.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/revision_recorder.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/revision_recorder.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/revision_recorder.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/run_options.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/run_options.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/run_options.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/serializer.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/serializer.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/serializer.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/set_support.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/set_support.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/set_support.pyo
@@ -116,6 +134,9 @@ bin/cvs2svn
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_commit.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_commit.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_commit.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_commit_creator.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_commit_creator.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_commit_creator.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_commit_item.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_commit_item.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_commit_item.pyo
@@ -143,18 +164,18 @@ bin/cvs2svn
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbol_transform.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbol_transform.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbol_transform.pyo
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbolings_reader.py
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbolings_reader.pyc
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbolings_reader.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/time_range.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/time_range.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/time_range.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/version.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/version.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/version.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/__init__.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/__init__.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/common.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/common.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/common.pyo
-%%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/compat.py
-%%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/compat.pyc
-%%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/compat.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/debug.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/debug.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/debug.pyo