4 files changed, 60 insertions, 31 deletions

diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile
index 30f237147bdb..63e55278f669 100644
--- a/devel/cvs2svn/Makefile
+++ b/devel/cvs2svn/Makefile
@@ -5,9 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	cvs2svn
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1.0
 CATEGORIES=	devel
-MASTER_SITES=	http://cvs2svn.tigris.org/files/documents/1462/39919/ \
+MASTER_SITES=	http://cvs2svn.tigris.org/files/documents/1462/41596/ \
+		http://cvs2svn.tigris.org/files/documents/1462/39919/ \
 		ftp://ftp.rewt.org.uk/pub/distfiles/ \
 		http://gentoo.nedlinux.nl/distfiles/ \
 		${MASTER_SITE_LOCAL}
@@ -18,6 +19,7 @@ COMMENT=	CVS to Subversion Repository Converter
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm
 RUN_DEPENDS=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion \
+		${LOCALBASE}/bin/git:${PORTSDIR}/devel/git \
 		${BUILD_DEPENDS}
 
 DISABLE_SIZE=	yes
diff --git a/devel/cvs2svn/distinfo b/devel/cvs2svn/distinfo
index 6f0807ca1c11..02f53bd880bc 100644
--- a/devel/cvs2svn/distinfo
+++ b/devel/cvs2svn/distinfo
@@ -1,3 +1,3 @@
-MD5 (cvs2svn-2.0.1.tar.gz) = 98c010de53adb19de6f039aa733b5bbe
-SHA256 (cvs2svn-2.0.1.tar.gz) = 323c16ba865106856f82cf8d278741735e433e6a56b00207b75408fb7ef7ebdd
-SIZE (cvs2svn-2.0.1.tar.gz) = 344924
+MD5 (cvs2svn-2.1.0.tar.gz) = df6d42c94f99aeedffa8c438dbb7ac3d
+SHA256 (cvs2svn-2.1.0.tar.gz) = b698b8aa138d3d8af07067f47068e9279871f4edbe2864ed056cf8a5a274ed54
+SIZE (cvs2svn-2.1.0.tar.gz) = 389401
diff --git a/devel/cvs2svn/pkg-descr b/devel/cvs2svn/pkg-descr
index c5a0a363b9aa..edf0189db3e6 100644
--- a/devel/cvs2svn/pkg-descr
+++ b/devel/cvs2svn/pkg-descr
@@ -1,5 +1,5 @@
 cvs2svn is a Python script that converts a CVS repository to a
-Subversion repository. It is designed for one-time conversions, not
-for repeated synchronizations between CVS and Subversion.
+Subversion or Git repository.  It is designed for one-time conversions,
+not for repeated synchronizations between CVS and Subversion/Git.
 
 WWW: http://cvs2svn.tigris.org/
diff --git a/devel/cvs2svn/pkg-plist b/devel/cvs2svn/pkg-plist
index 412d19e3e946..c9a2deb20d10 100644
--- a/devel/cvs2svn/pkg-plist
+++ b/devel/cvs2svn/pkg-plist
@@ -1,7 +1,10 @@
 bin/cvs2svn
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/__init__.py
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/apple_single_filter.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/apple_single_filter.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/apple_single_filter.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/artifact.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/artifact.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/artifact.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/artifact_manager.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/artifact_manager.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/artifact_manager.pyo
@@ -23,12 +26,12 @@ bin/cvs2svn
 %%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/check_dependencies_pass.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/check_dependencies_pass.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/check_dependencies_pass.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/collect_data.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/collect_data.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/collect_data.pyo
@@ -56,12 +59,27 @@ bin/cvs2svn
 %%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_revision_manager.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_revision_manager.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_revision_manager.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/fulltext_revision_recorder.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/fulltext_revision_recorder.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/fulltext_revision_recorder.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/git_output_option.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/git_output_option.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/git_output_option.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/git_revision_recorder.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/git_revision_recorder.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/git_revision_recorder.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/key_generator.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/key_generator.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/key_generator.pyo
@@ -71,6 +89,9 @@ bin/cvs2svn
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/main.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/main.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/main.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/metadata.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/metadata.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/metadata.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/metadata_database.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/metadata_database.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/metadata_database.pyo
@@ -80,12 +101,12 @@ bin/cvs2svn
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/output_option.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/output_option.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/output_option.pyo
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/pass_manager.py
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/pass_manager.pyc
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/pass_manager.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/passes.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/passes.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/passes.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/pass_manager.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/pass_manager.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/pass_manager.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/persistence_manager.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/persistence_manager.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/persistence_manager.pyo
@@ -98,6 +119,9 @@ 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_revision_manager.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/rcs_revision_manager.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/rcs_revision_manager.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/rcs_stream.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/rcs_stream.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/rcs_stream.pyo
@@ -107,15 +131,9 @@ bin/cvs2svn
 %%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/revision_manager.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/revision_manager.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/revision_manager.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/run_options.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/run_options.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/run_options.pyo
@@ -140,6 +158,9 @@ bin/cvs2svn
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_commit_item.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_commit_item.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_commit_item.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_output_option.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_output_option.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_output_option.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_repository_mirror.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_repository_mirror.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_repository_mirror.pyo
@@ -152,9 +173,6 @@ bin/cvs2svn
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbol_database.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbol_database.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbol_database.pyo
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbol_filling_guide.py
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbol_filling_guide.pyc
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbol_filling_guide.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbol_statistics.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbol_statistics.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbol_statistics.pyo
@@ -170,9 +188,9 @@ bin/cvs2svn
 %%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_lib/__init__.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/__init__.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/common.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/common.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/common.pyo
@@ -182,8 +200,17 @@ bin/cvs2svn
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/default.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/default.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/default.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/parse_rcs_file.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/parse_rcs_file.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/parse_rcs_file.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/run-tests.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/run-tests.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/run-tests.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/texttools.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/texttools.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/texttools.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/__init__.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/__init__.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/__init__.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse
 @dirrm %%PYTHON_SITELIBDIR%%/cvs2svn_lib