Update to 1.7.0. From the changelog:

- Do a better job at drawing the merge lines by selecting the shortest
  path from the revision boxes. An analysis is now done whether the
  source and destinations should be on the left or right side.
- Fix the left_right case for merge lines to display correctly.
- Fix a +/-1 error on the merge lines to account for both rounding
  errors and the shadow of the revision boxes.
- Add configuration option 'merge_on_tag' to force the left_right case
  to display merge lines on the tags instead of on the top/bottom sides.
  This also solves imagemap overlaps where multiple sources or
  destinations would be displayed at the same position.
- Fix the imagemap function to record the correct position of the merges.
- Use automake
- Streamline the package with patches from the Fedora RPMS
- Imagemap bugfix

4 files changed, 12 insertions, 34 deletions

diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index e7f35dcdfdb..e47a311efe3 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.49 2018/03/12 11:16:15 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2018/08/28 10:20:36 schmonz Exp $
 #
 
-DISTNAME=	cvsgraph-1.6.1
-PKGREVISION=	15
+DISTNAME=	cvsgraph-1.7.0
 CATEGORIES=	devel scm
-MASTER_SITES=	http://www.akhphd.au.dk/~bertho/cvsgraph/release/
+MASTER_SITES=	${HOMEPAGE}release/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.akhphd.au.dk/~bertho/cvsgraph/
 COMMENT=	Graphically represents CVS/RCS branches and file revisions
+LICENSE=	gnu-gpl-v2
 
 MAKE_JOBS_SAFE=	no
 
@@ -40,7 +40,7 @@ do-install:
 
 	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${DOCDIR}
 
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/cvsgraph.conf ${DESTDIR}${EGDIR}
diff --git a/devel/cvsgraph/PLIST b/devel/cvsgraph/PLIST
index 7f96635a40f..bb07bb31be2 100644
--- a/devel/cvsgraph/PLIST
+++ b/devel/cvsgraph/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:48:39 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/08/28 10:20:36 schmonz Exp $
 bin/cvsgraph
 man/man1/cvsgraph.1
 man/man5/cvsgraph.conf.5
-share/doc/${PKGBASE}/LICENSE
+share/doc/${PKGBASE}/COPYING
 share/doc/${PKGBASE}/README
 share/examples/${PKGBASE}/cvsgraph.conf
diff --git a/devel/cvsgraph/distinfo b/devel/cvsgraph/distinfo
index 8c4dee25400..f1784dc32ba 100644
--- a/devel/cvsgraph/distinfo
+++ b/devel/cvsgraph/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 03:27:21 agc Exp $
+$NetBSD: distinfo,v 1.9 2018/08/28 10:20:36 schmonz Exp $
 
-SHA1 (cvsgraph-1.6.1.tar.gz) = ca5011537e22d6399eeb4d44c9ba0830e0f240a6
-RMD160 (cvsgraph-1.6.1.tar.gz) = b4fa44c6d41a28d8e2e8d1f505dc117d0f59d286
-SHA512 (cvsgraph-1.6.1.tar.gz) = 6548d43784cd6e2e85777e0158371c6332f96f72fc8d1827dcece8aa54d77139021586e468155ec003d371eaa7095cd57a5004a1ed76bc55db325c3899105e6b
-Size (cvsgraph-1.6.1.tar.gz) = 114337 bytes
-SHA1 (patch-aa) = c2020ce2578856f20b47e81e996ce3020f6a4a1a
+SHA1 (cvsgraph-1.7.0.tar.gz) = 952c35381ba8db39d05f1a4e504e9bc8e43a7beb
+RMD160 (cvsgraph-1.7.0.tar.gz) = d7eafcd921b9157277d0beed5d14c33dfd0f25a3
+SHA512 (cvsgraph-1.7.0.tar.gz) = b2a5bec073e7fbba2a2b1975bb4583c8fa87d29a985b7bcedcaf556c744b822ea5ff65b5ca3c4bd6da6bb6697f5e023a7ce35cf5084f2d59fdd15297790e7aab
+Size (cvsgraph-1.7.0.tar.gz) = 202678 bytes
diff --git a/devel/cvsgraph/patches/patch-aa b/devel/cvsgraph/patches/patch-aa
deleted file mode 100644
index 2583a5f141a..00000000000
--- a/devel/cvsgraph/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/08/10 15:10:50 adrianp Exp $
-
---- Makefile.in.orig	Fri Aug  6 18:30:24 2004
-+++ Makefile.in	Fri Aug  6 18:31:18 2004
-@@ -10,6 +10,7 @@
- 
- LIBS	= @LIBS@
- CFLAGS	= @CFLAGS@ -DETCDIR=\"$(ETCDIR)\" -DINTTYPE="@INTTYPE@"
-+LDFLAGS	= @LDFLAGS@
- YACCFLAGS= -t
- LEXFLAGS= @LEXFLAGS@ -d #-b
- 
-@@ -34,7 +35,7 @@
- all: $(TARGET)
- 
- $(TARGET): $(COBJS) $(GENOBJS)
--	$(CC) $(CFLAGS) -o $(TARGET) $(COBJS) $(GENOBJS) $(LIBS)
-+	$(CC) $(CFLAGS) ${LDFLAGS} -o $(TARGET) $(COBJS) $(GENOBJS) $(LIBS)
- 
- cvsgraph.o: cvsgraph.c config.h cvsgraph.h utils.h readconf.h rcs.h
- utils.o: utils.c utils.h readconf.h