Add cvs-fast-export version 0.3.

This program analyzes a collection of RCS files in a CVS
repository (or outside of one) and, when possible, emits an
equivalent history in the form of a fast-import stream. Not all
possible histories can be rendered this way; the program tries to
emit useful warnings when it can't. The program can also produce
a visualization of the resulting commit DAG in the DOT format
handled by the graphviz suite.

6 files changed, 87 insertions, 0 deletions

diff --git a/devel/cvs-fast-export/DESCR b/devel/cvs-fast-export/DESCR
new file mode 100644
index 00000000000..cd6b623f8f7
--- /dev/null
+++ b/devel/cvs-fast-export/DESCR
@@ -0,0 +1,7 @@
+This program analyzes a collection of RCS files in a CVS
+repository (or outside of one) and, when possible, emits an
+equivalent history in the form of a fast-import stream. Not all
+possible histories can be rendered this way; the program tries to
+emit useful warnings when it can't. The program can also produce
+a visualization of the resulting commit DAG in the DOT format
+handled by the graphviz suite.
diff --git a/devel/cvs-fast-export/Makefile b/devel/cvs-fast-export/Makefile
new file mode 100644
index 00000000000..c236893a0d2
--- /dev/null
+++ b/devel/cvs-fast-export/Makefile
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2013/04/20 09:40:49 apb Exp $
+#
+
+DISTNAME=	cvs-fast-export-0.3
+CATEGORIES=	devel
+MASTER_SITES=	http://www.catb.org/~esr/cvs-fast-export/
+
+MAINTAINER=	apb@NetBSD.org
+HOMEPAGE=	http://www.catb.org/~esr/cvs-fast-export/
+COMMENT=	Export an RCS or CVS history as a fast-import stream
+LICENSE=	gnu-gpl-v2
+
+USE_TOOLS+=	lex yacc
+BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvs-fast-export/PLIST b/devel/cvs-fast-export/PLIST
new file mode 100644
index 00000000000..d91ab8b0f4a
--- /dev/null
+++ b/devel/cvs-fast-export/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2013/04/20 09:40:49 apb Exp $
+bin/cvs-fast-export
+man/man1/cvs-fast-export.1
diff --git a/devel/cvs-fast-export/distinfo b/devel/cvs-fast-export/distinfo
new file mode 100644
index 00000000000..fdd556645dc
--- /dev/null
+++ b/devel/cvs-fast-export/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2013/04/20 09:40:49 apb Exp $
+
+SHA1 (cvs-fast-export-0.3.tar.gz) = 03da5312869f5889461172a2246055ba3d6be9d4
+RMD160 (cvs-fast-export-0.3.tar.gz) = 31af843e66bfe57d5256ef80a79138be66f97701
+Size (cvs-fast-export-0.3.tar.gz) = 45418 bytes
+SHA1 (patch-Makefile) = 262d99114bbce916e665f3263b80983ed5ae1cdd
+SHA1 (patch-main.c) = 521d6a11d87d880c2f4baac1ec51e861ce4aa9ab
diff --git a/devel/cvs-fast-export/patches/patch-Makefile b/devel/cvs-fast-export/patches/patch-Makefile
new file mode 100644
index 00000000000..f122559fb21
--- /dev/null
+++ b/devel/cvs-fast-export/patches/patch-Makefile
@@ -0,0 +1,34 @@
+$NetBSD: patch-Makefile,v 1.1 2013/04/20 09:40:49 apb Exp $
+
+* Add "all" target.
+* Use ${PREFIX} variable.
+* Install man pages in ${PREFIX}/${PKGMANDIR}, not ${PREFIX}/share/man.
+
+--- Makefile.orig	2013-01-16 16:23:51.000000000 +0000
++++ Makefile
+@@ -2,9 +2,12 @@
+ #
+ # Build requirements: A C compiler, yacc, lex, and asciidoc.
+ 
++all: cvs-fast-export cvs-fast-export.1
++
+ INSTALL = install
+-prefix?=/usr/local
++prefix=$(PREFIX)
+ target=$(DESTDIR)$(prefix)
++mandir=$(PKGMANDIR)
+ 
+ VERSION=0.3
+ 
+@@ -47,9 +50,9 @@ clean:
+ 
+ install: cvs-fast-export.1 all
+ 	$(INSTALL) -d "$(target)/bin"
+-	$(INSTALL) -d "$(target)/share/man/man1"
++	$(INSTALL) -d "$(target)/$(mandir)/man1"
+ 	$(INSTALL) cvs-fast-export "$(target)/bin"
+-	$(INSTALL) -m 644 cvs-fast-export.1 "$(target)/share/man/man1"
++	$(INSTALL) -m 644 cvs-fast-export.1 "$(target)/$(mandir)/man1"
+ 
+ cppcheck:
+ 	cppcheck --template gcc --enable=all -UUNUSED --suppress=unusedStructMember *.[ch]
diff --git a/devel/cvs-fast-export/patches/patch-main.c b/devel/cvs-fast-export/patches/patch-main.c
new file mode 100644
index 00000000000..ebd1fd84243
--- /dev/null
+++ b/devel/cvs-fast-export/patches/patch-main.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-main.c,v 1.1 2013/04/20 09:40:49 apb Exp $
+
+Fix parsing of "-k" and "--reposurgeon" command line options.
+Patch has been sent upstream, in email dated 25 Mar 2013.
+
+--- main.c.orig	2013-01-14 00:17:55.000000000 +0000
++++ main.c
+@@ -410,10 +410,10 @@ main (int argc, char **argv)
+ 	    { "commit-time-window", 1, 0, 'w' },
+ 	    { "author-map",         1, 0, 'A' },
+ 	    { "revision-map",       1, 0, 'R' },
+-	    { "reposurgeon",        1, 0, 'r' },
++	    { "reposurgeon",        0, 0, 'r' },
+             { "graph",              0, 0, 'g' },
+ 	};
+-	int c = getopt_long(argc, argv, "+hVw:grvA:R:T", options, NULL);
++	int c = getopt_long(argc, argv, "+hkVw:grvA:R:T", options, NULL);
+ 	if (c < 0)
+ 	    break;
+ 	switch (c) {