Update to 9.4c. Changes:

Dinotrace is now distributed under GPL v3 (previously GPL 2).

Fix signal radix being lost when trace is reread.
Fix core dump when verilog trace has single timestamp.
Fix core dump when no hostname in /etc/hosts.
Fix message trashing stack and make cppcheck clean.

5 files changed, 21 insertions, 47 deletions

diff --git a/cad/dinotrace-mode/Makefile b/cad/dinotrace-mode/Makefile
index a9530ecebd5..b8eb83f37c1 100644
--- a/cad/dinotrace-mode/Makefile
+++ b/cad/dinotrace-mode/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.12 2013/02/17 19:17:55 dholland Exp $
+# $NetBSD: Makefile,v 1.13 2013/06/01 14:05:13 shattered Exp $
 #
 
-DISTNAME=	dinotrace-9.3c
-PKGNAME=	${EMACS_PKGNAME_PREFIX}dinotrace-mode-9.3c
-PKGREVISION=	2
+DISTNAME=	dinotrace-9.4c
+PKGNAME=	${EMACS_PKGNAME_PREFIX}dinotrace-mode-9.4c
 CATEGORIES=	cad editors
-MASTER_SITES=	http://www.veripool.com/ftp/
+MASTER_SITES=	http://www.veripool.org/ftp/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dmcmahill@NetBSD.org
-HOMEPAGE=	http://www.veripool.com/dinotrace/
+HOMEPAGE=	http://www.veripool.org/dinotrace/
 COMMENT=	Emacs major mode for dinotrace
 
+LICENSE=	gnu-gpl-v3
+
 DEPENDS+=	${EMACS_PKGNAME_PREFIX}verilog-mode>=3.13:../../cad/verilog-mode
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/cad/dinotrace-mode/distinfo b/cad/dinotrace-mode/distinfo
index 4f961f96aa8..685b2f4067e 100644
--- a/cad/dinotrace-mode/distinfo
+++ b/cad/dinotrace-mode/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2007/03/02 02:46:15 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2013/06/01 14:05:13 shattered Exp $
 
-SHA1 (dinotrace-9.3c.tgz) = ed37f7fde4f69d42ee3904d363b35fd1be0a44bc
-RMD160 (dinotrace-9.3c.tgz) = 545d60ef99e7e878cc9380fef805deca6ad77cce
-Size (dinotrace-9.3c.tgz) = 521395 bytes
+SHA1 (dinotrace-9.4c.tgz) = f7c2dd5c33119e267512a7534dc0633aa9cbc3bb
+RMD160 (dinotrace-9.4c.tgz) = e5a104b29a90a5e3d1475201fc219fcd6ffcb1b5
+Size (dinotrace-9.4c.tgz) = 785793 bytes
diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index bdcfa5a7f87..954a5e4d83f 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.45 2013/05/31 12:39:39 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2013/06/01 14:05:13 shattered Exp $
 #
 
-DISTNAME=	dinotrace-9.3c
-PKGREVISION=	3
+DISTNAME=	dinotrace-9.4c
 CATEGORIES=	cad
-MASTER_SITES=	http://www.veripool.com/ftp/
+MASTER_SITES=	http://www.veripool.org/ftp/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dmcmahill@NetBSD.org
-HOMEPAGE=	http://www.veripool.com/dinotrace/
+HOMEPAGE=	http://www.veripool.org/dinotrace/
 COMMENT=	Tool for viewing the output of digital simulators
 
+LICENSE=	gnu-gpl-v3
+
 GNU_CONFIGURE=		YES
 INFO_FILES=		YES
 USE_TOOLS+=		gmake perl
diff --git a/cad/dinotrace/distinfo b/cad/dinotrace/distinfo
index 4f6c400f7bd..e9f15faa053 100644
--- a/cad/dinotrace/distinfo
+++ b/cad/dinotrace/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.13 2009/07/08 15:26:49 joerg Exp $
+$NetBSD: distinfo,v 1.14 2013/06/01 14:05:13 shattered Exp $
 
-SHA1 (dinotrace-9.3c.tgz) = ed37f7fde4f69d42ee3904d363b35fd1be0a44bc
-RMD160 (dinotrace-9.3c.tgz) = 545d60ef99e7e878cc9380fef805deca6ad77cce
-Size (dinotrace-9.3c.tgz) = 521395 bytes
+SHA1 (dinotrace-9.4c.tgz) = f7c2dd5c33119e267512a7534dc0633aa9cbc3bb
+RMD160 (dinotrace-9.4c.tgz) = e5a104b29a90a5e3d1475201fc219fcd6ffcb1b5
+Size (dinotrace-9.4c.tgz) = 785793 bytes
 SHA1 (patch-aa) = abe6d33f6788b6aaf418c0cc68bbd10dee44294b
-SHA1 (patch-ab) = dc03d89769f987c55a3436fd3f665729ce4d0995
diff --git a/cad/dinotrace/patches/patch-ab b/cad/dinotrace/patches/patch-ab
deleted file mode 100644
index ac1fb3398cd..00000000000
--- a/cad/dinotrace/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2009/07/08 15:26:49 joerg Exp $
-
---- Makefile.in.orig	2009-07-08 17:24:49.000000000 +0200
-+++ Makefile.in
-@@ -156,11 +156,11 @@ dinotrace.dvi: dinotrace.texi
- 	$(TEXI2DVI) $(srcdir)/dinotrace.texi
- 
- installdirs:
--	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir)
-+	$(SHELL) ${srcdir}/mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(infodir)
- 
- install: all info installdirs install-info
- 	for p in dinotrace; do \
--	  $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
-+	  $(INSTALL_PROGRAM) $$p ${DESTDIR}$(bindir)/$$p; \
- 	done
- 	@echo ""
- 	@echo "*** Lisp files not installed, you may want to"
-@@ -171,7 +171,7 @@ install: all info installdirs install-in
- # Don't cd, to avoid breaking install-sh references.
- install-info: info installdirs
- 	for i in *.info*; do \
--	  $(INSTALL_DATA) $$i $(infodir)/$$i; \
-+	  $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; \
- 	done
- 
- uninstall: