4 files changed, 73 insertions, 14 deletions

diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile
index 43c297106591..a768ce0e511f 100644
--- a/devel/cvs2svn/Makefile
+++ b/devel/cvs2svn/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	cvs2svn
-PORTVERSION=	2.2.0
+PORTVERSION=	2.3.0
 CATEGORIES=	devel
-MASTER_SITES=	http://cvs2svn.tigris.org/files/documents/1462/44372/
+MASTER_SITES=	http://cvs2svn.tigris.org/files/documents/1462/46528/
 
 MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	CVS to Subversion Repository Converter
@@ -15,16 +15,19 @@ COMMENT=	CVS to Subversion Repository Converter
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+MAKE_JOBS_SAFE=	yes
+
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	yes
 
 OPTIONS=	SUBVERSION "Build with subversion support" on \
-		GIT "Build with git support" off
+		GIT "Build with git support" off \
+		BAZAAR "Build with Bazaar support" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_SUBVERSION) && defined(WITHOUT_GIT)
-IGNORE=	choose at least subversion, git or both
+.if defined(WITHOUT_SUBVERSION) && defined(WITHOUT_GIT) && defined(WITHOUT_BAZAAR)
+IGNORE=	choose at least one or more options from subversion, git or bazaar
 .endif
 
 .if defined(WITH_SUBVERSION)
@@ -33,11 +36,20 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/py-subversion
 
 .if defined(WITH_GIT)
 RUN_DEPENDS+=	${LOCALBASE}/bin/git:${PORTSDIR}/devel/git
+.endif
 
-MAKE_JOBS_SAFE=  yes
+.if defined(WITH_BAZAAR)
+RUN_DEPENDS+=	${LOCALBASE}/bin/bzr:${PORTSDIR}/devel/bazaar-ng
 .endif
 
-MAN1=		cvs2svn.1
+MAN1=		cvs2svn.1 \
+		cvs2git.1 \
+		cvs2bzr.1
+
+PORTDOCS=	design-notes.txt making-releases.txt revision-reader.txt \
+		  symbol-notes.txt cvs2bzr.html cvs2git.html cvs2svn.html \
+		  faq.html features.html index.html issue_tracker.html \
+		  project_license.html project_tools.html
 
 # 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
@@ -52,7 +64,33 @@ do-extract:
 		fi; \
 	done
 
+post-build:
+		cd ${WRKSRC} && make man
+
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/cvs2svn.1 ${PREFIX}/man/man1/
+	@${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)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/design-notes.txt ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/doc/making-releases.txt ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/doc/revision-reader.txt ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/doc/symbol-notes.txt ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/www/cvs2bzr.html ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/www/cvs2git.html ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/www/cvs2svn.html ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/www/faq.html ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/www/features.html ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/www/index.html ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/www/issue_tracker.html ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/www/project_license.html ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/www/project_tools.html ${DOCSDIR}/
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/cvs2bzr-example.options ${EXAMPLESDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/cvs2git-example.options ${EXAMPLESDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/cvs2hg-example.options ${EXAMPLESDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/cvs2svn-example.options ${EXAMPLESDIR}/
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/cvs2svn/distinfo b/devel/cvs2svn/distinfo
index 577d34b397cd..b2239242939f 100644
--- a/devel/cvs2svn/distinfo
+++ b/devel/cvs2svn/distinfo
@@ -1,3 +1,3 @@
-MD5 (cvs2svn-2.2.0.tar.gz) = 466b757fdef5378a46bba4ceefd047a4
-SHA256 (cvs2svn-2.2.0.tar.gz) = 372c57cfea369637cd49fd9d685d1ebaa2e84a9cf4ad301fcc63f9cb42161bea
-SIZE (cvs2svn-2.2.0.tar.gz) = 411531
+MD5 (cvs2svn-2.3.0.tar.gz) = 6c412baec974f3ff64b9145944682a15
+SHA256 (cvs2svn-2.3.0.tar.gz) = d9d835e0c7df48966fbadf51527c25ebf1343b25179e3802f4637d4b96ba363e
+SIZE (cvs2svn-2.3.0.tar.gz) = 479373
diff --git a/devel/cvs2svn/pkg-descr b/devel/cvs2svn/pkg-descr
index edf0189db3e6..e326f210c9fc 100644
--- a/devel/cvs2svn/pkg-descr
+++ b/devel/cvs2svn/pkg-descr
@@ -1,5 +1,7 @@
-cvs2svn is a Python script that converts a CVS repository to a
-Subversion or Git repository.  It is designed for one-time conversions,
-not for repeated synchronizations between CVS and Subversion/Git.
+cvs2svn is a Python script can be used to migrate a CVS 
+repository to a Subversion, Git or Bazaar repository.
+
+It is designed for one-time conversions, not for repeated
+synchronizations between CVS and Subversion/Git/Bazaar.
 
 WWW: http://cvs2svn.tigris.org/
diff --git a/devel/cvs2svn/pkg-plist b/devel/cvs2svn/pkg-plist
index e8d224b60229..d99b0b7398d9 100644
--- a/devel/cvs2svn/pkg-plist
+++ b/devel/cvs2svn/pkg-plist
@@ -1,4 +1,10 @@
+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/apple_single_filter.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/apple_single_filter.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/apple_single_filter.pyo
@@ -8,6 +14,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_run_options.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/bzr_run_options.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/bzr_run_options.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/changeset.pyo
@@ -77,6 +86,9 @@ bin/cvs2svn
 %%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_run_options.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/git_run_options.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/git_run_options.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/key_generator.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/key_generator.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/key_generator.pyo
@@ -86,6 +98,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/man_writer.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/man_writer.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/man_writer.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/metadata.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/metadata.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/metadata.pyo
@@ -164,6 +179,9 @@ bin/cvs2svn
 %%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_run_options.py
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_run_options.pyc
+%%PYTHON_SITELIBDIR%%/cvs2svn_lib/svn_run_options.pyo
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbol.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbol.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_lib/symbol.pyo
@@ -209,5 +227,6 @@ bin/cvs2svn
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/__init__.py
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/__init__.pyo
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse
 @dirrm %%PYTHON_SITELIBDIR%%/cvs2svn_lib