From ec47c7d9bdc28bb3899de6da82e45fe0f08a472d Mon Sep 17 00:00:00 2001 From: kim Date: Sun, 29 Jan 2017 12:19:08 +0000 Subject: [PATCH] Upgrade to 1.40. 1.40: 2016-09-07 Add warnings about stock CVS vs. the MirOS patched version. 1.39: 2016-09-06 Fix GitLab issue #8: Exporting with commitids does not coalesce changesets. 1.38: 2016-02-28 All Python code in the suite is 2 & 3 polyglot and 8-bit clean. 1.37: 2016-01-29 New -c option for when you can't trust commit-IDs. Port patch for Sun systems. 1.36: 2015-12-22 Avoid a core dump in another pathological case. 1.35: 2015-11-23 Properly handle CVS masters with nonempty access lists. Bail out gracefully on pathological masters with no revisions. 1.34: 2015-09-25 Another Python compatibility fix. Fix inconsistent license header in revdir.c. --- devel/cvs-fast-export/Makefile | 4 +-- devel/cvs-fast-export/distinfo | 13 ++++---- devel/cvs-fast-export/patches/patch-Makefile | 33 ++++++++++---------- devel/cvs-fast-export/patches/patch-lex.l | 14 --------- 4 files changed, 25 insertions(+), 39 deletions(-) delete mode 100644 devel/cvs-fast-export/patches/patch-lex.l diff --git a/devel/cvs-fast-export/Makefile b/devel/cvs-fast-export/Makefile index c259120c379e1..89423c3eb0025 100644 --- a/devel/cvs-fast-export/Makefile +++ b/devel/cvs-fast-export/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2015/12/14 01:12:08 wiedi Exp $ +# $NetBSD: Makefile,v 1.12 2017/01/29 12:19:08 kim Exp $ -DISTNAME= cvs-fast-export-1.33 +DISTNAME= cvs-fast-export-1.40 CATEGORIES= devel MASTER_SITES= http://www.catb.org/~esr/cvs-fast-export/ diff --git a/devel/cvs-fast-export/distinfo b/devel/cvs-fast-export/distinfo index 023a3d36662a8..15b6779986036 100644 --- a/devel/cvs-fast-export/distinfo +++ b/devel/cvs-fast-export/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 03:27:21 agc Exp $ +$NetBSD: distinfo,v 1.11 2017/01/29 12:19:08 kim Exp $ -SHA1 (cvs-fast-export-1.33.tar.gz) = 597d764e4c662d026d930407f45d3bc0f5edadfc -RMD160 (cvs-fast-export-1.33.tar.gz) = 7993851464ab168d31632ed7525e98b55bdc3883 -SHA512 (cvs-fast-export-1.33.tar.gz) = b1b6e3b2fdea4e55469770a3a67aba59eebee73deda03655461e354773c9518fe05afa2253eb5656d496220907f9819e20beefee46d550a6275c6193a2797bff -Size (cvs-fast-export-1.33.tar.gz) = 369144 bytes -SHA1 (patch-Makefile) = 2098247b7de10f99ce7305fd11ed5ea504b8b408 -SHA1 (patch-lex.l) = b266670431711088f6d86b258304b37b0f91e744 +SHA1 (cvs-fast-export-1.40.tar.gz) = 1afaef7935e27e563bf5dff6e51b967620cde649 +RMD160 (cvs-fast-export-1.40.tar.gz) = 373b61d8dd7caf87431bb5e362e3adbed92b1255 +SHA512 (cvs-fast-export-1.40.tar.gz) = bc89286ebce7d8086f889df83c15a998329d1253db91cc086f25b8d3bc11868058e11e8e055f5e8584f8cdccce6ff85fa2b1298777336fb74ce8822ab9f2196f +Size (cvs-fast-export-1.40.tar.gz) = 414259 bytes +SHA1 (patch-Makefile) = de01ed457a22d5d6aae3abff0a97af2b07b1da1d diff --git a/devel/cvs-fast-export/patches/patch-Makefile b/devel/cvs-fast-export/patches/patch-Makefile index 1106aaf8d492d..5ddc7871c609b 100644 --- a/devel/cvs-fast-export/patches/patch-Makefile +++ b/devel/cvs-fast-export/patches/patch-Makefile @@ -1,13 +1,14 @@ -$NetBSD: patch-Makefile,v 1.9 2015/09/16 16:17:18 wiz Exp $ +$NetBSD: patch-Makefile,v 1.10 2017/01/29 12:19:08 kim Exp $ -* Add "all" target. * Use ${PREFIX} variable. +* Comment out "-march=native" +* Add "all" target. * Install man pages in ${PREFIX}/${PKGMANDIR}, not ${PREFIX}/share/man. ---- Makefile.orig 2015-08-30 20:07:13.000000000 +0000 -+++ Makefile +--- Makefile.orig 2016-09-08 01:16:05.000000000 +0000 ++++ Makefile 2017-01-24 02:22:09.000000000 +0000 @@ -17,11 +17,12 @@ - VERSION=1.33 + VERSION=1.40 .PATH: $(.PARSEDIR) -prefix?=/usr/local @@ -19,8 +20,8 @@ $NetBSD: patch-Makefile,v 1.9 2015/09/16 16:17:18 wiz Exp $ +mandir=$(PKGMANDIR) INSTALL = install - -@@ -39,7 +40,7 @@ CFLAGS += -pthread + TAR = tar +@@ -40,7 +41,7 @@ CPPFLAGS += -DTHREADS # Optimizing for speed. Comment this out for distribution builds @@ -29,7 +30,7 @@ $NetBSD: patch-Makefile,v 1.9 2015/09/16 16:17:18 wiz Exp $ # To enable debugging of the Yacc grammar, uncomment the following line #CPPFLAGS += -DYYDEBUG=1 -@@ -97,6 +98,8 @@ dump.o export.o graph.o main.o merge.o r +@@ -100,6 +101,8 @@ BISON ?= bison @@ -38,7 +39,7 @@ $NetBSD: patch-Makefile,v 1.9 2015/09/16 16:17:18 wiz Exp $ gram.h gram.c: gram.y $(BISON) $(YFLAGS) --defines=gram.h --output-file=gram.c $(srcdir)/gram.y lex.h lex.c: lex.l -@@ -137,10 +140,10 @@ install-bin: cvs-fast-export cvssync cvs +@@ -143,10 +146,10 @@ $(INSTALL) -d "$(target)/bin" $(INSTALL) $^ "$(target)/bin" install-man: man @@ -46,10 +47,10 @@ $NetBSD: patch-Makefile,v 1.9 2015/09/16 16:17:18 wiz Exp $ - $(INSTALL) -m 644 cvs-fast-export.1 "$(target)/share/man/man1" - $(INSTALL) -m 644 cvssync.1 "$(target)/share/man/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 ++ $(INSTALL) -d "$(target)/$(mandir)/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)/$(mandir)/man1" + uninstall: uninstall-man uninstall-bin + uninstall-man: + cd $(target)/share/man/man1/ && rm -f cvs-fast-export.1 cvssync.1 cvsconvert.1 diff --git a/devel/cvs-fast-export/patches/patch-lex.l b/devel/cvs-fast-export/patches/patch-lex.l deleted file mode 100644 index cedb2be66b7c5..0000000000000 --- a/devel/cvs-fast-export/patches/patch-lex.l +++ /dev/null @@ -1,14 +0,0 @@ -$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 2015-01-18 10:11:55.000000000 +0000 -+++ lex.l -@@ -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);