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