Date: Sun, 23 Aug 2009 15:21:01 +0200 (CEST) From: olli hauer <ohauer@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ohauer@gmx.de Subject: ports/138099: [patch] port devel/cvs2svn update to version 2.3.0 Message-ID: <20090823132101.CEE4C26145@u18-124.dsl.vianetworks.de> Resent-Message-ID: <200908231330.n7NDU6Ux000202@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 138099 >Category: ports >Synopsis: [patch] port devel/cvs2svn update to version 2.3.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Aug 23 13:30:06 UTC 2009 >Closed-Date: >Last-Modified: >Originator: olli hauer <ohauer@gmx.de> >Release: FreeBSD 7.2-RELEASE-p3 i386 >Organization: >Environment: >Description: Version 2.3.0 (22 August 2009) ------------------------------ New features: * Add a "cvs2git" script for starting conversions to git (or Mercurial). * Add a "cvs2bzr" script for starting conversions to Bazaar. * Generate manual pages automatically via new --man option. * Allow --mime-types and --auto-props options to be specified more than once. * Support author transforms when converting to Subversion. * Allow unlabeled branches to be renamed using SymbolTransforms. Bugs fixed: * cvs2git with non-inline blobs: a revision after a delete could be empty. * Fix timezone handling under Windows (which does not respect TZ variable). * Do path comparisions platform-independently in symbol transform classes. * Fix https://bugs.launchpad.net/pld-linux/+bug/385920 Improvements and output changes: * Output error message if a revision's deltatext is missing. * Improve contrib/verify-cvs2svn.py (used for testing conversion accuracy). Miscellaneous: * Add an IgnoreSymbolTransform class, for ignoring symbols matching a regexp. * Remove some DeprecationWarnings when running under newer Python versions. Additional install - cvs2(bzr|git|hg|svn)-example.options to ${EXAMPLESDIR} - files from doc and www to ${DOCSDIR} >How-To-Repeat: >Fix: --- patch_cvs2svn-2.3.0.txt begins here --- --- Makefile +++ Makefile @@ -5,9 +5,9 @@ # $FreeBSD: ports/devel/cvs2svn/Makefile,v 1.24 2009/05/16 06:27:43 pgollucci Exp $ 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 @@ -19,12 +19,13 @@ 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) @@ -37,7 +38,18 @@ MAKE_JOBS_SAFE= yes .endif -MAN1= cvs2svn.1 +.if defined(WITH_BAZAAR) +RUN_DEPENDS+= ${LOCALBASE}/bin/bzr:${PORTSDIR}/devel/bazaar-ng +.endif + +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 @@ 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> --- distinfo +++ 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 --- pkg-plist +++ pkg-plist @@ -1,4 +1,10 @@ +bin/cvs2bzr +bin/cvs2git bin/cvs2svn +%%PORTDOCS%%%%EXAMPLESDIR%%/cvs2bzr-example.options +%%PORTDOCS%%%%EXAMPLESDIR%%/cvs2git-example.options +%%PORTDOCS%%%%EXAMPLESDIR%%/cvs2hg-example.options +%%PORTDOCS%%%%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 @@ %%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 @@ %%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 @@ %%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 @@ %%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 @@ %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/__init__.py %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/__init__.pyc %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/__init__.pyo +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% @dirrm %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse @dirrm %%PYTHON_SITELIBDIR%%/cvs2svn_lib --- pkg-descr +++ 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/ --- patch_cvs2svn-2.3.0.txt ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090823132101.CEE4C26145>