Update to 1.30

Changelog:
1.30: 2015-04-02
    Tagged branchlets are created for any CVS tag not matching a gitspace commit.
    Many portability fixes for *BSD.

1.29: 2014-12-17
    A significant improvement in the correctness of vendor-branch handling.
    More speed improvements.

1.28: 2014-12-08
    Fix for buggy emission of lines ending in @.
    More speedups, and dramatic reduction in working-set size.

1.27: 2014-11-27
    The bug that produced "unnumbered head" warnings has been fixed.

1.26: 2014-11-05
    cvscompare changed to cvsconvert, a validating wrapper script.
    The rules for keyword expansion have changed yet again.

1.25: 2014-11-03
    Simplify and fully document -k; it now requires an argument.
    In normal (non-promiscuous) mode, paths containing CVSROOT are ignored.
    There is a new wrapper script, 'cvscompare', for sanity-checking conversions.
    A HOWTO on reporting bugs has been added to the distribution.

1.24: 2014-10-30
    Bugfix release: a late change to I/O buffering in 1.23 was faulty.

1.23: 2014-10-29
    New -l option for redirecting logs during long conversions.
    More speedups and working-set reductions.
    Incremental dumping can now be done in fast mode.

1.22: 2014-10-21
    New --embed-id and --expand options by Robert deBath.

1.21: 2014-10-19
    When incremental dumping, suppress tags associated with old commits.
    Performance improved by x8; see also the new -F and -C options.
    New -a optio to dump a list of author IDs found in a repo.

1.20: 2014-10-08
    Files not ending with ,v are now ignored unless the new -P option is on.
    New -t option for parallelizing analysis on multicore systems.

1.19: 2014-10-04
    Dramatic speedups in some bottleneck functions.

1.18: 2014-10-02
    A bug in the regression tests was fixed by slowing down calls to CVS.

1.17: 2014-09-11
    Some changes to reduce working-set size. More internals documentation.

1.16: 2014-09-04
    Added an internals tour to the documentation. Polished some comments.
    Prevented a possible buffer overrun.  Fixed broken -R option.

1.15: 2014-09-02
    Fixed a nasty order-instability bug that was confounding testing.
    Add a fatal error check for when revision numbers in input get too long.
    A significant speed improvement by tuning one of the sort algorithms.

1.14: 2014-08-12
    Fixed several issues near ignore conversions.

1.13: 2014-08-11
    Allow ()<> in symbol names.
    Fix a minor memory leak.
    Make cvssync a bit more liberal about SourceForge hostnames.
    In cvssync, leading /cvsroot can be omitted on Sourceforge paths.
    In cvssync, leading /sources can be omitted on Savannah paths.

1.12: 2014-06-26
    Allow []! in symbol names.
    Python in the test suite now runs under 2.6.

1.11: 2014-06-06
    Teach cvssync about sourceware.org.

5 files changed, 56 insertions, 47 deletions

diff --git a/devel/cvs-fast-export/Makefile b/devel/cvs-fast-export/Makefile
index 1029808a92d..90f05e655dc 100644
--- a/devel/cvs-fast-export/Makefile
+++ b/devel/cvs-fast-export/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2014/05/17 16:10:42 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2015/04/16 23:05:06 ryoon Exp $
 #
 
-DISTNAME=	cvs-fast-export-1.10
-PKGREVISION=	1
+DISTNAME=	cvs-fast-export-1.30
 CATEGORIES=	devel
 MASTER_SITES=	http://www.catb.org/~esr/cvs-fast-export/
 
@@ -11,10 +10,10 @@ 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+=	flex yacc
+USE_TOOLS+=	flex gmake yacc
 BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
 
-REPLACE_PYTHON+=	cvssync
+REPLACE_PYTHON+=	cvsconvert cvssync
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvs-fast-export/PLIST b/devel/cvs-fast-export/PLIST
index 32b39947f33..509233a1bff 100644
--- a/devel/cvs-fast-export/PLIST
+++ b/devel/cvs-fast-export/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2014/03/10 19:47:34 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/04/16 23:05:06 ryoon Exp $
 bin/cvs-fast-export
+bin/cvsconvert
 bin/cvssync
 man/man1/cvs-fast-export.1
+man/man1/cvsconvert.1
 man/man1/cvssync.1
diff --git a/devel/cvs-fast-export/distinfo b/devel/cvs-fast-export/distinfo
index f57b1a0aeb2..782c77c203e 100644
--- a/devel/cvs-fast-export/distinfo
+++ b/devel/cvs-fast-export/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2014/04/04 20:20:42 ryoon Exp $
+$NetBSD: distinfo,v 1.7 2015/04/16 23:05:06 ryoon Exp $
 
-SHA1 (cvs-fast-export-1.10.tar.gz) = 6346acb029ec371ef59cf49712a8e888e55fc363
-RMD160 (cvs-fast-export-1.10.tar.gz) = 2e68c64ce89bd745a6496e8f81607c9f08fe5eff
-Size (cvs-fast-export-1.10.tar.gz) = 102589 bytes
-SHA1 (patch-Makefile) = efc14b3e194f8e0749b41bf888913d2781b546c0
-SHA1 (patch-lex.l) = f28661386041b3ef8308bf3da4323f61a73ff515
+SHA1 (cvs-fast-export-1.30.tar.gz) = 63a39e0cf1a7c4823326b6178c650f2b3400eae8
+RMD160 (cvs-fast-export-1.30.tar.gz) = 56dd5ccc0e0c9b08d469b496fe2dd817e205d2ac
+Size (cvs-fast-export-1.30.tar.gz) = 359519 bytes
+SHA1 (patch-Makefile) = b279525576c4b5f087f152454d9c0dd96f19d45f
+SHA1 (patch-lex.l) = b266670431711088f6d86b258304b37b0f91e744
diff --git a/devel/cvs-fast-export/patches/patch-Makefile b/devel/cvs-fast-export/patches/patch-Makefile
index 9e60f6187f2..e7ee3581c75 100644
--- a/devel/cvs-fast-export/patches/patch-Makefile
+++ b/devel/cvs-fast-export/patches/patch-Makefile
@@ -1,47 +1,55 @@
-$NetBSD: patch-Makefile,v 1.6 2014/04/04 20:20:42 ryoon Exp $
+$NetBSD: patch-Makefile,v 1.7 2015/04/16 23:05:07 ryoon Exp $
 
 * Add "all" target.
 * Use ${PREFIX} variable.
 * Install man pages in ${PREFIX}/${PKGMANDIR}, not ${PREFIX}/share/man.
 
---- Makefile.orig	2014-03-28 09:49:47.000000000 +0000
+--- Makefile.orig	2015-04-02 12:54:25.000000000 +0000
 +++ Makefile
-@@ -6,12 +6,12 @@
- 
- VERSION=1.10
+@@ -9,11 +9,12 @@
+ VERSION=1.30
  
+ .PATH: $(.PARSEDIR)
 -prefix?=/usr/local
 +prefix?=$(PREFIX)
  target=$(DESTDIR)$(prefix)
+ parsedir:=$(.PARSEDIR)
+ srcdir=$(dir $(abspath $(firstword $(MAKEFILE_LIST))))$(parsedir)
+ VPATH=$(srcdir)
++mandir=$(PKGMANDIR)
  
  INSTALL = install
- YACC = bison -y
--LEX = flex
-+mandir=$(PKGMANDIR)
  
- GCC_WARNINGS1=-Wall -Wpointer-arith -Wstrict-prototypes
- GCC_WARNINGS2=-Wmissing-prototypes -Wmissing-declarations
-@@ -38,6 +38,8 @@ OBJS=gram.o lex.o rbtree.o main.o cvsuti
- 	revlist.o atom.o revcvs.o generate.o export.o \
- 	nodehash.o tags.o authormap.o graph.o utils.o
+@@ -31,7 +32,7 @@ CFLAGS += -pthread
+ CPPFLAGS += -DTHREADS
  
-+all: cvs-fast-export cvs-fast-export.1
-+
- cvs-fast-export: $(OBJS)
- 	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $@ 
+ # Optimizing for speed. Comment this out for distribution builds
+-CFLAGS += -march=native
++#CFLAGS += -march=native
+ 
+ # To enable debugging of the Yacc grammar, uncomment the following line
+ #CPPFLAGS += -DYYDEBUG=1
+@@ -89,6 +90,8 @@ dump.o export.o graph.o main.o merge.o r
  
-@@ -77,11 +79,11 @@ check: cvs-fast-export
+ BISON ?= bison
  
- install: cvs-fast-export man
++all: cvs-fast-export cvs-fast-export.1
++
+ gram.h gram.c: gram.y
+ 	$(BISON)  $(YFLAGS) --defines=gram.h --output-file=gram.c $(srcdir)/gram.y
+ lex.h lex.c: lex.l
+@@ -129,10 +132,10 @@ install-bin: cvs-fast-export cvssync cvs
  	$(INSTALL) -d "$(target)/bin"
+ 	$(INSTALL) $^ "$(target)/bin"
+ install-man: man
 -	$(INSTALL) -d "$(target)/share/man/man1"
-+	$(INSTALL) -d "$(target)/$(mandir)/man1"
- 	$(INSTALL) cvs-fast-export "$(target)/bin"
- 	$(INSTALL) cvssync "$(target)/bin"
 -	$(INSTALL) -m 644 cvs-fast-export.1 "$(target)/share/man/man1"
 -	$(INSTALL) -m 644 cvssync.1 "$(target)/share/man/man1"
-+	$(INSTALL) -m 644 cvs-fast-export.1 "$(target)/$(mandir)/man1"
-+	$(INSTALL) -m 644 cvssync.1 "$(target)/$(mandir)/man1"
+-	$(INSTALL) -m 644 cvsconvert.1 "$(target)/share/man/man1"
++	$(INSTALL) -d "$(target)/${PKGMANDIR}/man1"
++	$(INSTALL) -m 644 cvs-fast-export.1 "$(target)/${PKGMANDIR}/man1"
++	$(INSTALL) -m 644 cvssync.1 "$(target)/${PKGMANDIR}/man1"
++	$(INSTALL) -m 644 cvsconvert.1 "$(target)/${PKGMANDIR}/man1"
  
  PROFILE_REPO = ~/software/groff-conversion/groff-mirror/groff
  gmon.out: cvs-fast-export
diff --git a/devel/cvs-fast-export/patches/patch-lex.l b/devel/cvs-fast-export/patches/patch-lex.l
index 6d3dd44d9ce..cedb2be66b7 100644
--- a/devel/cvs-fast-export/patches/patch-lex.l
+++ b/devel/cvs-fast-export/patches/patch-lex.l
@@ -1,14 +1,14 @@
-$NetBSD: patch-lex.l,v 1.1 2014/02/26 10:29:27 wiedi Exp $
+$NetBSD: patch-lex.l,v 1.2 2015/04/16 23:05:07 ryoon Exp $
 
 'struct tm' has no member named 'tm_zone' on SunOS
---- lex.l.orig	2013-05-22 00:56:11.000000000 +0000
+--- lex.l.orig	2015-01-18 10:11:55.000000000 +0000
 +++ lex.l
-@@ -188,7 +188,7 @@ lex_date (cvs_number *n)
- 	tm.tm_min = n->n[4];
- 	tm.tm_sec = n->n[5];
- 	tm.tm_isdst = 0;
--	#ifndef __CYGWIN__
-+	#if !defined(__CYGWIN__) && !defined(__sun)
- 	tm.tm_zone = 0;
- 	#endif
- 	d = mktime (&tm);
+@@ -313,7 +313,7 @@ lex_date(const cvs_number* const n, yysc
+     tm.tm_min = n->n[4];
+     tm.tm_sec = n->n[5];
+     tm.tm_isdst = 0;
+-#ifndef __CYGWIN__
++#if !defined(__CYGWIN__) && !defined(__sun)
+     tm.tm_zone = 0;
+ #endif
+     d = mktime(&tm);