update to 0.9.4

changes:
-Language Coverage:
 -Add support for using the &&, || and ! operators with real
  constant values
 -Add support for passing -0.0 from the compiler to the run time
 -Add support for parsing pull devices that have two strengths specified
 -Allow multiple attribute instances
-bugfixes
pkgsrc change: clean up DESTDIR support

6 files changed, 57 insertions, 144 deletions

diff --git a/cad/verilog/Makefile b/cad/verilog/Makefile
index 7899add7d1d..8e2cc34d5d1 100644
--- a/cad/verilog/Makefile
+++ b/cad/verilog/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2010/02/01 02:19:35 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2011/04/13 14:19:29 drochner Exp $
 #
 
-DISTNAME=	verilog-0.8.7
-PKGREVISION=	1
+DISTNAME=	verilog-0.9.4
 CATEGORIES=	cad
-MASTER_SITES=	ftp://icarus.com/pub/eda/verilog/v0.8/
+MASTER_SITES=	ftp://icarus.com/pub/eda/verilog/v0.9/
 
 MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://icarus.com/eda/verilog/index.html
@@ -22,8 +21,6 @@ USE_TOOLS+=		gmake bison lex
 CONFIGURE_ARGS+=	--without-ipal
 TEST_TARGET=		check
 
-INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
diff --git a/cad/verilog/PLIST b/cad/verilog/PLIST
index b87158eefe9..1438b27266a 100644
--- a/cad/verilog/PLIST
+++ b/cad/verilog/PLIST
@@ -1,34 +1,37 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 17:35:57 joerg Exp $
-bin/iverilog-0.8
-bin/iverilog-vpi-0.8
-bin/vvp-0.8
-include/iverilog-0.8/_pli_types.h
-include/iverilog-0.8/acc_user.h
-include/iverilog-0.8/ivl_target.h
-include/iverilog-0.8/veriuser.h
-include/iverilog-0.8/vpi_user.h
-lib/ivl-0.8/cadpli.vpl
-lib/ivl-0.8/edif-s.conf
-lib/ivl-0.8/edif.conf
-lib/ivl-0.8/edif.tgt
-lib/ivl-0.8/fpga-s.conf
-lib/ivl-0.8/fpga.conf
-lib/ivl-0.8/fpga.tgt
-lib/ivl-0.8/ivl
-lib/ivl-0.8/ivlpp
-lib/ivl-0.8/null-s.conf
-lib/ivl-0.8/null.conf
-lib/ivl-0.8/null.tgt
-lib/ivl-0.8/system.sft
-lib/ivl-0.8/system.vpi
-lib/ivl-0.8/vvp-s.conf
-lib/ivl-0.8/vvp.conf
-lib/ivl-0.8/vvp.tgt
-lib/ivl-0.8/xnf-s.conf
-lib/ivl-0.8/xnf.conf
-lib/libveriuser-0.8.a
-lib/libvpi-0.8.a
-man/man1/iverilog-fpga-0.8.1
-man/man1/iverilog-vpi-0.8.1
-man/man1/iverilog-0.8.1
-man/man1/vvp-0.8.1
+@comment $NetBSD: PLIST,v 1.9 2011/04/13 14:19:29 drochner Exp $
+bin/iverilog
+bin/iverilog-vpi
+bin/vvp
+include/iverilog/_pli_types.h
+include/iverilog/acc_user.h
+include/iverilog/ivl_target.h
+include/iverilog/veriuser.h
+include/iverilog/vpi_user.h
+lib/ivl/cadpli.vpl
+lib/ivl/include/constants.vams
+lib/ivl/include/disciplines.vams
+lib/ivl/ivl
+lib/ivl/ivlpp
+lib/ivl/null-s.conf
+lib/ivl/null.conf
+lib/ivl/null.tgt
+lib/ivl/stub-s.conf
+lib/ivl/stub.conf
+lib/ivl/stub.tgt
+lib/ivl/system.sft
+lib/ivl/system.vpi
+lib/ivl/v2005_math.sft
+lib/ivl/v2005_math.vpi
+lib/ivl/va_math.sft
+lib/ivl/va_math.vpi
+lib/ivl/vhdl-s.conf
+lib/ivl/vhdl.conf
+lib/ivl/vhdl.tgt
+lib/ivl/vvp-s.conf
+lib/ivl/vvp.conf
+lib/ivl/vvp.tgt
+lib/libveriuser.a
+lib/libvpi.a
+man/man1/iverilog-vpi.1
+man/man1/iverilog.1
+man/man1/vvp.1
diff --git a/cad/verilog/distinfo b/cad/verilog/distinfo
index 1b7a2862c14..b52f3d4285f 100644
--- a/cad/verilog/distinfo
+++ b/cad/verilog/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.15 2010/02/01 02:19:35 joerg Exp $
+$NetBSD: distinfo,v 1.16 2011/04/13 14:19:29 drochner Exp $
 
-SHA1 (verilog-0.8.7.tar.gz) = 814f12a99463a637cb13e0d86755f762c5d90270
-RMD160 (verilog-0.8.7.tar.gz) = 63fb4f9e1e85157010d480e5d66513d6c9ac4326
-Size (verilog-0.8.7.tar.gz) = 1273972 bytes
-SHA1 (patch-aa) = c109856bb5ff121bf70856a5a13678e2c7b68f80
-SHA1 (patch-ab) = a24f627af270c848e84ecbfe63053daebb1ec37d
-SHA1 (patch-ad) = 334c20f008ca509e63553f36aaed70fe002c75cf
+SHA1 (verilog-0.9.4.tar.gz) = 3c249092400f5947d10cb2b9cf4dbe139d8d6c34
+RMD160 (verilog-0.9.4.tar.gz) = dd4f806d7e3840ef62c056bbee8338b56715e6bc
+Size (verilog-0.9.4.tar.gz) = 1200614 bytes
+SHA1 (patch-aa) = 7cc1c3b36dddc0c9c15220282bbcad9429b1a6bd
+SHA1 (patch-ad) = 32c7e4a0724f0a9a98663dfe3e32766a9aced4e7
diff --git a/cad/verilog/patches/patch-aa b/cad/verilog/patches/patch-aa
index 569f3162e14..306d67118a1 100644
--- a/cad/verilog/patches/patch-aa
+++ b/cad/verilog/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.11 2009/10/08 16:52:05 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.12 2011/04/13 14:19:29 drochner Exp $
 
-for auto_ptr.
-
---- elab_net.cc.orig	2008-12-10 03:21:48.000000000 +0000
-+++ elab_net.cc	2009-10-08 16:45:12.000000000 +0000
-@@ -30,4 +30,5 @@
- # include  <iostream>
+--- elab_net.cc.orig	2010-09-27 17:42:32.000000000 +0000
++++ elab_net.cc
+@@ -26,6 +26,7 @@
+ 
+ # include  <cstdlib>
  # include  <cstring>
 +# include  <memory>
+ # include  <iostream>
+ # include  "ivl_assert.h"
  
- /*
diff --git a/cad/verilog/patches/patch-ab b/cad/verilog/patches/patch-ab
deleted file mode 100644
index eed2d0e4991..00000000000
--- a/cad/verilog/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2010/02/01 02:19:35 joerg Exp $
-
---- tgt-vvp/Makefile.in.orig	2010-02-01 02:14:50.000000000 +0000
-+++ tgt-vvp/Makefile.in
-@@ -87,20 +87,20 @@ check: all
- install: all installdirs $(libdir)/ivl$(suffix)/vvp.tgt $(libdir)/ivl$(suffix)/vvp.conf $(libdir)/ivl$(suffix)/vvp-s.conf
- 
- $(libdir)/ivl$(suffix)/vvp.tgt: ./vvp.tgt
--	$(INSTALL_PROGRAM) ./vvp.tgt $(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt
-+	$(INSTALL_PROGRAM) ./vvp.tgt $(libdir)/ivl$(suffix)/vvp.tgt
- 
- $(libdir)/ivl$(suffix)/vvp.conf: vvp.conf
--	$(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf
-+	$(INSTALL_DATA) $< $(libdir)/ivl$(suffix)/vvp.conf
- 
- $(libdir)/ivl$(suffix)/vvp-s.conf: vvp-s.conf
--	$(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf
-+	$(INSTALL_DATA) $< $(libdir)/ivl$(suffix)/vvp-s.conf
- 
- 
- installdirs: ../mkinstalldirs
--	$(srcdir)/../mkinstalldirs $(DESTDIR)$(libdir)/ivl$(suffix)
-+	$(srcdir)/../mkinstalldirs $(libdir)/ivl$(suffix)
- 
- uninstall:
--	rm -f $(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt $(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf $(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf
-+	rm -f $(libdir)/ivl$(suffix)/vvp.tgt $(libdir)/ivl$(suffix)/vvp.conf $(libdir)/ivl$(suffix)/vvp-s.conf
- 
- 
- -include $(patsubst %.o, dep/%.d, $O)
diff --git a/cad/verilog/patches/patch-ad b/cad/verilog/patches/patch-ad
index 359bc71dd81..abfe216ac8a 100644
--- a/cad/verilog/patches/patch-ad
+++ b/cad/verilog/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.9 2010/02/01 02:19:35 joerg Exp $
+$NetBSD: patch-ad,v 1.10 2011/04/13 14:19:29 drochner Exp $
 
---- Makefile.in.orig	2008-12-10 03:21:48.000000000 +0000
+--- Makefile.in.orig	2010-09-27 17:42:32.000000000 +0000
 +++ Makefile.in
-@@ -176,8 +176,19 @@ dep:
+@@ -218,8 +218,19 @@ main.o: main.cc version_tag.h
  
  lexor.o: lexor.cc parse.h
  
@@ -23,59 +23,3 @@ $NetBSD: patch-ad,v 1.9 2010/02/01 02:19:35 joerg Exp $
  parse.cc parse.h: $(srcdir)/parse.y
  	$(YACC) --verbose -t -p VL -d -o parse.cc $(srcdir)/parse.y
  	mv parse.cc.h parse.h 2>/dev/null || mv parse.hh parse.h
-@@ -233,10 +244,10 @@ install: all installdirs $(libdir)/ivl$(
- 	    do (cd $$dir ; $(MAKE) $@); done
- 
- $(bindir)/iverilog-vpi$(suffix): ./iverilog-vpi
--	$(INSTALL_SCRIPT) ./iverilog-vpi $(DESTDIR)$(bindir)/iverilog-vpi$(suffix)
-+	$(INSTALL_SCRIPT) ./iverilog-vpi $(bindir)/iverilog-vpi$(suffix)
- 
- $(libdir)/ivl$(suffix)/ivl@EXEEXT@: ./ivl@EXEEXT@
--	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ $(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@
-+	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ $(libdir)/ivl$(suffix)/ivl@EXEEXT@
- 
- $(libdir)/ivl$(suffix)/xnf-s.conf: $(srcdir)/xnf-s.conf
- 	$(INSTALL_DATA) $(srcdir)/xnf-s.conf $(libdir)/ivl$(suffix)/xnf-s.conf
-@@ -260,15 +271,15 @@ $(includedir)/veriuser.h: $(srcdir)/veri
- 	$(INSTALL_DATA) $(srcdir)/veriuser.h $(includedir)/veriuser.h
- 
- $(mandir)/man1/iverilog-vpi$(suffix).1: $(srcdir)/iverilog-vpi.man
--	$(INSTALL_DATA) $(srcdir)/iverilog-vpi.man $(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1
-+	$(INSTALL_DATA) $(srcdir)/iverilog-vpi.man $(mandir)/man1/iverilog-vpi$(suffix).1
- 
- $(prefix)/iverilog-vpi$(suffix).pdf: iverilog-vpi.pdf
--	$(INSTALL_DATA) iverilog-vpi.pdf $(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf
-+	$(INSTALL_DATA) iverilog-vpi.pdf $(prefix)/iverilog-vpi$(suffix).pdf
- 
- 
- installdirs: mkinstalldirs
--	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/ivl$(suffix) \
--	    $(DESTDIR)$(libdir)/ivl$(suffix)/include $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1
-+	$(srcdir)/mkinstalldirs $(bindir) $(includedir) $(libdir)/ivl$(suffix) \
-+	    $(libdir)/ivl$(suffix)/include $(mandir) $(mandir)/man1
- 
- uninstall:
- 	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
-@@ -276,15 +287,15 @@ uninstall:
- 	for dir in vpi ivlpp driver; \
- 	    do (cd $$dir ; $(MAKE) $@); done
- 	for f in xnf.conf xnf-s.conf ivl@EXEEXT@; \
--	    do rm -f $(DESTDIR)$(libdir)/ivl$(suffix)/$$f; done
--	-rmdir $(DESTDIR)$(libdir)/ivl$(suffix)/include
--	-rmdir $(DESTDIR)$(libdir)/ivl$(suffix)
-+	    do rm -f $(libdir)/ivl$(suffix)/$$f; done
-+	-rmdir $(libdir)/ivl$(suffix)/include
-+	-rmdir $(libdir)/ivl$(suffix)
- 	for f in verilog$(suffix) iverilog-vpi$(suffix); \
--	    do rm -f $(DESTDIR)$(bindir)/$$f; done
-+	    do rm -f $(bindir)/$$f; done
- 	for f in ivl_target.h vpi_user.h _pli_types.h acc_user.h veriuser.h; \
--	    do rm -f $(DESTDIR)$(includedir)/$$f; done
--	-test X$(suffix) = X || rmdir $(DESTDIR)/$(includedir)
--	rm -f $(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1 $(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf
-+	    do rm -f $(includedir)/$$f; done
-+	-test X$(suffix) = X || rmdir /$(includedir)
-+	rm -f $(mandir)/man1/iverilog-vpi$(suffix).1 $(prefix)/iverilog-vpi$(suffix).pdf
- 
- 
- -include $(patsubst %.o, dep/%.d, $O)