Skip to content

Commit

Permalink
Upgrade to 1.40.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
kim committed Jan 29, 2017
1 parent 5dd9563 commit ec47c7d
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 39 deletions.
4 changes: 2 additions & 2 deletions devel/cvs-fast-export/Makefile
Original file line number Diff line number Diff line change
@@ -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/

Expand Down
13 changes: 6 additions & 7 deletions devel/cvs-fast-export/distinfo
Original file line number Diff line number Diff line change
@@ -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
33 changes: 17 additions & 16 deletions devel/cvs-fast-export/patches/patch-Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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

Expand All @@ -38,18 +39,18 @@ $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
- $(INSTALL) -d "$(target)/share/man/man1"
- $(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
14 changes: 0 additions & 14 deletions devel/cvs-fast-export/patches/patch-lex.l

This file was deleted.

0 comments on commit ec47c7d

Please sign in to comment.