6 files changed, 35 insertions, 13 deletions
diff --git a/cad/verilog-current/Makefile b/cad/verilog-current/Makefile
index 91a0b68399b..182db4e55d2 100644
--- a/cad/verilog-current/Makefile
+++ b/cad/verilog-current/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2000/04/09 23:11:49 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2000/04/30 18:15:17 dmcmahill Exp $
 #
 
-DISTNAME=	verilog-20000409
-PKGNAME=	verilog-current-20000409
+DISTNAME=	verilog-20000428
+PKGNAME=	verilog-current-20000428
 CATEGORIES=	cad
 MASTER_SITES=	ftp://icarus.com/pub/eda/verilog/snapshots/
 
diff --git a/cad/verilog-current/files/md5 b/cad/verilog-current/files/md5
index f1c1e531537..07ffa27fb7a 100644
--- a/cad/verilog-current/files/md5
+++ b/cad/verilog-current/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/04/09 23:11:50 dmcmahill Exp $
+$NetBSD: md5,v 1.4 2000/04/30 18:15:17 dmcmahill Exp $
 
-MD5 (verilog-20000409.tar.gz) = 7b2fc0db2afb7953e133dc6f928a538c
+MD5 (verilog-20000428.tar.gz) = a43a130fe53f77bd8e91b836a8ba3e3d
diff --git a/cad/verilog-current/files/patch-sum b/cad/verilog-current/files/patch-sum
index b5a0eb74787..eab95908629 100644
--- a/cad/verilog-current/files/patch-sum
+++ b/cad/verilog-current/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.3 2000/03/25 21:09:16 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.4 2000/04/30 18:15:18 dmcmahill Exp $
 
-MD5 (patch-ad) = 1c410a390d7fd9b9db96b933926b30ee
+MD5 (patch-aa) = 1eb49a0f38e5077d5cd5a04b3d3d825c
+MD5 (patch-ad) = 5778da75ea461b43c731c4b6c05584d2
 MD5 (patch-ae) = 44921f529c17458cd3ba34d35dc0da77
diff --git a/cad/verilog-current/patches/patch-aa b/cad/verilog-current/patches/patch-aa
new file mode 100644
index 00000000000..73d3545d731
--- /dev/null
+++ b/cad/verilog-current/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2000/04/30 18:15:18 dmcmahill Exp $
+
+--- iverilog.c.orig	Fri Apr 28 21:20:14 2000
++++ iverilog.c	Sat Apr 29 08:38:20 2000
+@@ -125,6 +125,6 @@
+       }
+ 
+-      sprintf(tmp, "g++ -O -rdynamic -fno-exceptions -o %s -I%s "
+-	      "-L%s %s.cc -lvvm -ldl", opath, base, base, opath);
++      sprintf(tmp, "%s -O -Wl,--export-dynamic -fno-exceptions -o %s -I%s "
++	      "-L%s %s.cc -lvvm %s", CXX, opath, IVL_INC, IVL_LIB, opath, DLLIB);
+ 
+       if (verbose_flag)
diff --git a/cad/verilog-current/patches/patch-ad b/cad/verilog-current/patches/patch-ad
index 77c1159fc4b..80b6e5fe941 100644
--- a/cad/verilog-current/patches/patch-ad
+++ b/cad/verilog-current/patches/patch-ad
@@ -1,11 +1,18 @@
-$NetBSD: patch-ad,v 1.3 2000/03/25 21:09:16 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.4 2000/04/30 18:15:18 dmcmahill Exp $
 
 don't use -O2 on parse.cc because of compiler bugs on sparc and pmax
 (maybe others).
 
---- Makefile.in.orig	Thu Mar 16 14:03:03 2000
-+++ Makefile.in	Sat Mar 25 15:10:16 2000
-@@ -112,4 +112,6 @@
+--- Makefile.in.orig	Fri Apr 28 12:50:53 2000
++++ Makefile.in	Sat Apr 29 08:39:00 2000
+@@ -104,5 +104,5 @@
+ 
+ iverilog: iverilog.c
+-	$(CC) $(CPPFLAGS) -o iverilog -DIVL_ROOT='"@libdir@/ivl"' iverilog.c
++	$(CC) $(CPPFLAGS) -o iverilog -DCXX='"@CXX@"' -DIVL_ROOT='"@libdir@/ivl"' -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' iverilog.c
+ 
+ %.o dep/%.d: %.cc
+@@ -115,4 +115,6 @@
  
  parse.o dep/parse.d: parse.cc
 +	$(CXX) -MD -c -I. $(CPPFLAGS)  $<
diff --git a/cad/verilog-current/pkg/PLIST b/cad/verilog-current/pkg/PLIST
index d9bc50b8243..9b3198c9155 100644
--- a/cad/verilog-current/pkg/PLIST
+++ b/cad/verilog-current/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2000/03/25 21:09:16 dmcmahill Exp $
-bin/gverilog
+@comment $NetBSD: PLIST,v 1.3 2000/04/30 18:15:18 dmcmahill Exp $
+bin/iverilog
 bin/verilog
 include/vpi_priv.h
 include/vpi_user.h
@@ -14,5 +14,6 @@ lib/libvvm.a
 lib/ivl/ivl
 lib/ivl/ivlpp
 lib/ivl/system.vpi
+man/man1/iverilog.1
 man/man1/verilog.1
 @dirrm lib/ivl