pkgsrc changes:

  - updating from 2.1.1 to 2.2.0
  - adding destdir support

Upstream changes:
Version 2.2.0 (23 November 2008)
--------------------------------

 New features:
 * cvs2git: Omit fixup branch if a tag can be copied from an existing revision.
 * cvs2git: Add option to set the maximum number of merge sources per commit.
 * Allow arbitrary SVN directories to be created when a project is created.
 * Allow vendor branches to be excluded, grafting child symbols to trunk.
 * By default, omit trivial import branches from conversion.
   - Add --keep-trivial-imports option to get old behavior.
 * By default, don't include .cvsignore files in output (except as svn:ignore).
   - Add option --keep-cvsignore to get the old behavior.
 * Allow the user to specify the form of cvs2svn-generated log messages.
 * Allow file contents to be written inline in git-fast-import streams.
 * --create-option: allow arbitrary options to be passed to "svnadmin create".
 * Improve handling of auto-props file:
   - Discard extraneous spaces where they don't make sense.
   - Warn if parts of the file might be commented out unintentionally.
   - Warn if the user appears to be trying to quote a property value.

 Bugs fixed:
 * Fix issue #81: Remove svn:ignore property when .cvsignore is deleted.
 * Fix svn dumpfile conformance:
   - Don't include a leading '/' for Node-path.
   - Include the Node-kind field when copying nodes.
 * Make symlink test create symlinks explicitly, to avoid packaging problems.
 * Accept symbol references to revision numbers that end with ".0".

 Improvements and output changes:
 * When -v, log reasons for symbol conversion choices (tag/branch/exclude).
 * Log preferred parent determinations at verbose (rather than debug) level.
 * Log symbol transformations at verbose (rather than warn) level.
 * Log statistics about all symbol transformations at normal level.
 * cvs2git: Generate lightweight rather than annotated tags.
 * contrib/destroy_repository.py:
   - Allow symbols, files, and directories to be renamed.
   - Allow CVSROOT directory contents to be erased.
   - Specify what aspects of a repo to destroy via command-line options.

 Miscellaneous:
 * cvs2svn now requires Python version 2.4 or later.

3 files changed, 21 insertions, 23 deletions

diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile
index e0fc4d3c01c..5eceee8f9ea 100644
--- a/devel/cvs2svn/Makefile
+++ b/devel/cvs2svn/Makefile
@@ -1,23 +1,24 @@
-# $NetBSD: Makefile,v 1.23 2008/09/06 20:54:32 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/07 17:16:47 sno Exp $
 
-DISTNAME=	cvs2svn-2.1.1
-PKGREVISION=	1
+DISTNAME=	cvs2svn-2.2.0
 CATEGORIES=	devel scm
-MASTER_SITES=	http://cvs2svn.tigris.org/files/documents/1462/42521/
+MASTER_SITES=	http://cvs2svn.tigris.org/files/documents/1462/44372/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cvs2svn.tigris.org/
 COMMENT=	Converts a CVS repository to a Subversion repository
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	subversion-base-[0-9]*:../../devel/subversion-base
 
 CONFLICTS+=	py*-subversion<1.0.1
 
 PYDISTUTILSPKG=			yes
 PYTHON_PATCH_SCRIPTS=		run-tests.py cvs2svn_rcsparse/run-tests.py \
-	cvs2svn_rcsparse/parse_rcs_file.py
-USE_TOOLS+=			gtar
-EXTRACT_USING=			gtar
+				cvs2svn_rcsparse/parse_rcs_file.py
+#USE_TOOLS+=			gtar
+#EXTRACT_USING=			gtar
 
 # XXX cvs2svn depends on sort(1) with '-T' option. A dependency and a patch
 # to resort on GNU sort from coreutils may be required.
@@ -27,9 +28,9 @@ INSTALLATION_DIRS+=	share/examples/cvs2svn
 
 post-install:
 	cd ${WRKSRC}/www && \
-	${INSTALL_DATA} *.html ${PREFIX}/share/doc/cvs2svn
+	${INSTALL_DATA} *.html ${DESTDIR}${PREFIX}/share/doc/cvs2svn
 	cd ${WRKSRC} && \
-	${INSTALL_DATA} cvs2svn-example.options ${PREFIX}/share/examples/cvs2svn
+	${INSTALL_DATA} cvs2svn-example.options ${DESTDIR}${PREFIX}/share/examples/cvs2svn
 
 do-test:
 	cd ${WRKSRC} && ./run-tests.py
diff --git a/devel/cvs2svn/PLIST b/devel/cvs2svn/PLIST
index 4f01eb68078..c192a406c49 100644
--- a/devel/cvs2svn/PLIST
+++ b/devel/cvs2svn/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 17:48:39 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/07/07 17:16:47 sno Exp $
 bin/cvs2svn
 ${PYSITELIB}/cvs2svn_lib/__init__.py
 ${PYSITELIB}/cvs2svn_lib/__init__.pyc
@@ -12,9 +12,6 @@ ${PYSITELIB}/cvs2svn_lib/artifact.pyo
 ${PYSITELIB}/cvs2svn_lib/artifact_manager.py
 ${PYSITELIB}/cvs2svn_lib/artifact_manager.pyc
 ${PYSITELIB}/cvs2svn_lib/artifact_manager.pyo
-${PYSITELIB}/cvs2svn_lib/boolean.py
-${PYSITELIB}/cvs2svn_lib/boolean.pyc
-${PYSITELIB}/cvs2svn_lib/boolean.pyo
 ${PYSITELIB}/cvs2svn_lib/changeset.py
 ${PYSITELIB}/cvs2svn_lib/changeset.pyc
 ${PYSITELIB}/cvs2svn_lib/changeset.pyo
@@ -135,6 +132,9 @@ ${PYSITELIB}/cvs2svn_lib/record_table.pyo
 ${PYSITELIB}/cvs2svn_lib/repository_delegate.py
 ${PYSITELIB}/cvs2svn_lib/repository_delegate.pyc
 ${PYSITELIB}/cvs2svn_lib/repository_delegate.pyo
+${PYSITELIB}/cvs2svn_lib/repository_mirror.py
+${PYSITELIB}/cvs2svn_lib/repository_mirror.pyc
+${PYSITELIB}/cvs2svn_lib/repository_mirror.pyo
 ${PYSITELIB}/cvs2svn_lib/revision_manager.py
 ${PYSITELIB}/cvs2svn_lib/revision_manager.pyc
 ${PYSITELIB}/cvs2svn_lib/revision_manager.pyo
@@ -144,9 +144,6 @@ ${PYSITELIB}/cvs2svn_lib/run_options.pyo
 ${PYSITELIB}/cvs2svn_lib/serializer.py
 ${PYSITELIB}/cvs2svn_lib/serializer.pyc
 ${PYSITELIB}/cvs2svn_lib/serializer.pyo
-${PYSITELIB}/cvs2svn_lib/set_support.py
-${PYSITELIB}/cvs2svn_lib/set_support.pyc
-${PYSITELIB}/cvs2svn_lib/set_support.pyo
 ${PYSITELIB}/cvs2svn_lib/stats_keeper.py
 ${PYSITELIB}/cvs2svn_lib/stats_keeper.pyc
 ${PYSITELIB}/cvs2svn_lib/stats_keeper.pyo
@@ -165,9 +162,9 @@ ${PYSITELIB}/cvs2svn_lib/svn_commit_item.pyo
 ${PYSITELIB}/cvs2svn_lib/svn_output_option.py
 ${PYSITELIB}/cvs2svn_lib/svn_output_option.pyc
 ${PYSITELIB}/cvs2svn_lib/svn_output_option.pyo
-${PYSITELIB}/cvs2svn_lib/svn_repository_mirror.py
-${PYSITELIB}/cvs2svn_lib/svn_repository_mirror.pyc
-${PYSITELIB}/cvs2svn_lib/svn_repository_mirror.pyo
+${PYSITELIB}/cvs2svn_lib/svn_repository_delegate.py
+${PYSITELIB}/cvs2svn_lib/svn_repository_delegate.pyc
+${PYSITELIB}/cvs2svn_lib/svn_repository_delegate.pyo
 ${PYSITELIB}/cvs2svn_lib/svn_revision_range.py
 ${PYSITELIB}/cvs2svn_lib/svn_revision_range.pyc
 ${PYSITELIB}/cvs2svn_lib/svn_revision_range.pyo
diff --git a/devel/cvs2svn/distinfo b/devel/cvs2svn/distinfo
index c34a49fa3cd..1d502b3120e 100644
--- a/devel/cvs2svn/distinfo
+++ b/devel/cvs2svn/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2008/08/24 17:02:24 tonnerre Exp $
+$NetBSD: distinfo,v 1.12 2009/07/07 17:16:47 sno Exp $
 
-SHA1 (cvs2svn-2.1.1.tar.gz) = e26bfcc59bb18159718bce7cbc01ad1c9bfa52e9
-RMD160 (cvs2svn-2.1.1.tar.gz) = a13171a2b53e4b8030e1bd5dabf305cac027a436
-Size (cvs2svn-2.1.1.tar.gz) = 389645 bytes
+SHA1 (cvs2svn-2.2.0.tar.gz) = 88be25a4d2f2b75be0b89f94357fd52a7dd1fbe9
+RMD160 (cvs2svn-2.2.0.tar.gz) = 25a6713516ef6bd13c7ed2f7f52427fba2572866
+Size (cvs2svn-2.2.0.tar.gz) = 411531 bytes