diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile
index 6c335103a2e6..d9a9a4e7899a 100644
--- a/devel/cvs2svn/Makefile
+++ b/devel/cvs2svn/Makefile
@@ -1,17 +1,13 @@
-# New ports collection makefile for:	cvs2svn
-# Date created:		1 May 2004
-# Whom:			Hye-Shik Chang
-#
+# Created by: Hye-Shik Chang
 # $FreeBSD$
 
 PORTNAME=	cvs2svn
-PORTVERSION=	2.3.0
-PORTREVISION=	4
+PORTVERSION=	2.4.0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.sourcehosting.net/freebsd/distfiles/ \
-		LOCAL/glarkin
+MASTER_SITES=	http://cvs2svn.tigris.org/files/documents/1462/49237/ \
+		LOCAL/ohauer
 
-MAINTAINER=	glarkin@FreeBSD.org
+MAINTAINER=	ohauer@FreeBSD.org
 COMMENT=	CVS to Subversion Repository Converter
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm
@@ -22,25 +18,25 @@ MAKE_JOBS_SAFE=	yes
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	yes
 
-OPTIONS=	SUBVERSION "Build with subversion support" on \
-		GIT "Build with git support" off \
-		BAZAAR "Build with Bazaar support" off
+OPTIONS_MULTI=		SCM
+OPTIONS_MULTI_SCM=	SUBVERSION GIT BAZAAR
+OPTIONS_DEFAULT=	SUBVERSION
 
-.include <bsd.port.pre.mk>
+SUBVERSION_DESC=	Build with subversion support
+GIT_DESC= 		Build with git support
+BAZAAR_DESC= 		Build with Bazaar support
 
-.if defined(WITHOUT_SUBVERSION) && defined(WITHOUT_GIT) && defined(WITHOUT_BAZAAR)
-IGNORE=	choose at least one or more options from subversion, git or bazaar
-.endif
+.include <bsd.port.options.mk>
 
-.if defined(WITH_SUBVERSION)
+.if ${PORT_OPTIONS:MSUBVERSION}
 RUN_DEPENDS+=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/py-subversion
 .endif
 
-.if defined(WITH_GIT)
+.if ${PORT_OPTIONS:MGIT}
 RUN_DEPENDS+=	${LOCALBASE}/bin/git:${PORTSDIR}/devel/git
 .endif
 
-.if defined(WITH_BAZAAR)
+.if ${PORT_OPTIONS:MBAZAAR}
 RUN_DEPENDS+=	${LOCALBASE}/bin/bzr:${PORTSDIR}/devel/bzr
 .endif
 
@@ -73,7 +69,7 @@ post-install:
 	@${INSTALL_MAN} ${WRKSRC}/cvs2svn.1 ${PREFIX}/man/man1/
 	@${INSTALL_MAN} ${WRKSRC}/cvs2git.1 ${PREFIX}/man/man1/
 	@${INSTALL_MAN} ${WRKSRC}/cvs2bzr.1 ${PREFIX}/man/man1/
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/design-notes.txt ${DOCSDIR}/
 	@${INSTALL_DATA} ${WRKSRC}/doc/making-releases.txt ${DOCSDIR}/
@@ -95,4 +91,4 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/cvs2svn-example.options ${EXAMPLESDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/cvs2svn/distinfo b/devel/cvs2svn/distinfo
index 2de06fdb1927..56331256b51e 100644
--- a/devel/cvs2svn/distinfo
+++ b/devel/cvs2svn/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cvs2svn-2.3.0.tar.gz) = d9d835e0c7df48966fbadf51527c25ebf1343b25179e3802f4637d4b96ba363e
-SIZE (cvs2svn-2.3.0.tar.gz) = 479373
+SHA256 (cvs2svn-2.4.0.tar.gz) = a6677fc3e7b4374020185c61c998209d691de0c1b01b53e59341057459f6f116
+SIZE (cvs2svn-2.4.0.tar.gz) = 514891
diff --git a/devel/cvs2svn/pkg-plist b/devel/cvs2svn/pkg-plist
index d99b0b7398d9..f840b2ff09a9 100644
--- a/devel/cvs2svn/pkg-plist
+++ b/devel/cvs2svn/pkg-plist
@@ -1,10 +1,12 @@
 bin/cvs2bzr
 bin/cvs2git
 bin/cvs2svn
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cvs2bzr-example.options
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cvs2git-example.options
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cvs2hg-example.options
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cvs2svn-example.options
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/__init__.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/abstract_rcs_revision_manager.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/abstract_rcs_revision_manager.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/abstract_rcs_revision_manager.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
@@ -14,6 +16,9 @@ bin/cvs2svn
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/artifact_manager.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/artifact_manager.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/artifact_manager.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/bzr_output_option.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/bzr_output_option.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/bzr_output_option.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/bzr_run_options.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/bzr_run_options.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/bzr_run_options.pyo
@@ -32,12 +37,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/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/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
@@ -50,12 +55,6 @@ 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_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
@@ -65,33 +64,51 @@ 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_path.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_path.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_path.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_path_database.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_path_database.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/cvs_path_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/dvcs_common.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/dvcs_common.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/dvcs_common.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/external_blob_generator.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/external_blob_generator.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/external_blob_generator.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/generate_blobs.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/generate_blobs.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/generate_blobs.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/git_revision_collector.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/git_revision_collector.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/git_revision_collector.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/git_run_options.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/git_run_options.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/git_run_options.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/hg_run_options.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/hg_run_options.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/hg_run_options.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/indexed_database.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/indexed_database.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/indexed_database.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/keyword_expander.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/keyword_expander.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/keyword_expander.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/log.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/log.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/log.pyo
@@ -113,12 +130,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/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/passes.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/passes.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/passes.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/persistence_manager.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/persistence_manager.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/persistence_manager.pyo
@@ -137,15 +154,18 @@ bin/cvs2svn
 %%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/rcsparser.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/rcsparser.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/rcsparser.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/repository_mirror.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/repository_mirror.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/repository_mirror.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/repository_walker.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/repository_walker.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/repository_walker.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/revision_manager.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/revision_manager.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/revision_manager.pyo
@@ -155,30 +175,30 @@ bin/cvs2svn
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/serializer.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/serializer.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/serializer.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/sort.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/sort.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/sort.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/stats_keeper.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/stats_keeper.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/stats_keeper.pyo
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/stdout_delegate.py
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/stdout_delegate.pyc
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/stdout_delegate.pyo
 %%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
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_dump.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_dump.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_dump.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_revision_range.py
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_revision_range.pyc
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_revision_range.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_repository_delegate.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_repository_delegate.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_repository_delegate.pyo
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_revision_range.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_revision_range.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_revision_range.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_run_options.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_run_options.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_run_options.pyo
@@ -203,9 +223,9 @@ bin/cvs2svn
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/version.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/version.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/version.pyo
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/__init__.py
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cvs2svn_lib/__init__.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
@@ -224,9 +244,10 @@ bin/cvs2svn
 %%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
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cvs2bzr-example.options
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cvs2git-example.options
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cvs2hg-example.options
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cvs2svn-example.options
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse
 @dirrm %%PYTHON_SITELIBDIR%%/cvs2svn_lib