5 files changed, 38 insertions, 25 deletions

diff --git a/cad/iverilog/Makefile b/cad/iverilog/Makefile
index f7f12ac69438..717d67ed97c8 100644
--- a/cad/iverilog/Makefile
+++ b/cad/iverilog/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	iverilog
-PORTVERSION=	0.8.7
+PORTVERSION=	0.9.1
 PORTREVISION=	0
 CATEGORIES=	cad
 MASTER_SITES=	ftp://icarus.com/pub/eda/verilog/v${PORTVERSION:C,\.[0-9]$,,}/ \
@@ -22,8 +22,8 @@ USE_BISON=	build
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget
 
-CONFIGURE_ARGS=	--disable-suffix
+CONFIGURE_ARGS=	--disable-suffix --without-valgrind
 
-MAN1=		iverilog-vpi.1 iverilog.1 vvp.1 iverilog-fpga.1
+MAN1=		iverilog-vpi.1 iverilog.1 vvp.1
 
 .include <bsd.port.mk>
diff --git a/cad/iverilog/distinfo b/cad/iverilog/distinfo
index e2481e68f301..c1d5daa8af97 100644
--- a/cad/iverilog/distinfo
+++ b/cad/iverilog/distinfo
@@ -1,3 +1,3 @@
-MD5 (verilog-0.8.7.tar.gz) = af5d9f842e0f482c1b5206365258c5a0
-SHA256 (verilog-0.8.7.tar.gz) = 0312407e883991eababb3aa0a08db4625091b71f0826ea917deddba2493768a3
-SIZE (verilog-0.8.7.tar.gz) = 1273972
+MD5 (verilog-0.9.1.tar.gz) = 91e8f40d995bf5ded7b847fcc02a98bf
+SHA256 (verilog-0.9.1.tar.gz) = 3fdb95b921a07762ac14376ef802343b707566735b4d1eb2768bc08d955985ea
+SIZE (verilog-0.9.1.tar.gz) = 1113403
diff --git a/cad/iverilog/files/patch-Makefile.in b/cad/iverilog/files/patch-Makefile.in
deleted file mode 100644
index 45bec2a5cbd7..000000000000
--- a/cad/iverilog/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2009-01-24 00:57:58.000000000 +0300
-+++ Makefile.in	2009-01-24 00:58:10.000000000 +0300
-@@ -268,7 +268,7 @@
- 
- installdirs: mkinstalldirs
- 	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/ivl$(suffix) \
--	    $(DESTDIR)$(libdir)/ivl$(suffix)/include $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1
-+	    $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1
- 
- uninstall:
- 	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
diff --git a/cad/iverilog/files/patch-configure b/cad/iverilog/files/patch-configure
new file mode 100644
index 000000000000..dce217b9ed23
--- /dev/null
+++ b/cad/iverilog/files/patch-configure
@@ -0,0 +1,19 @@
+--- configure.orig	2009-03-21 02:18:34.000000000 +0300
++++ configure	2009-06-09 16:26:55.000000000 +0400
+@@ -6409,15 +6409,10 @@
+ 
+ # valgrind checks
+ 
+-# Check whether --with-valgrind was given.
+-if test "${with_valgrind+set}" = set; then
+-  withval=$with_valgrind;
+-else
+   check_valgrind=yes
+-fi
+ 
+ 
+-if test "x$check_valgrind" == xyes; then
++if test "x$check_valgrind" = "xyes"; then
+   { echo "$as_me:$LINENO: Not using valgrind hooks" >&5
+ echo "$as_me: Not using valgrind hooks" >&6;}
+ else
diff --git a/cad/iverilog/pkg-plist b/cad/iverilog/pkg-plist
index cd90b77f436b..bfa88b259637 100644
--- a/cad/iverilog/pkg-plist
+++ b/cad/iverilog/pkg-plist
@@ -7,25 +7,30 @@ include/iverilog/ivl_target.h
 include/iverilog/veriuser.h
 include/iverilog/vpi_user.h
 lib/ivl/cadpli.vpl
-lib/ivl/edif-s.conf
-lib/ivl/edif.conf
-lib/ivl/edif.tgt
-lib/ivl/fpga-s.conf
-lib/ivl/fpga.conf
-lib/ivl/fpga.tgt
+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/ivl/xnf-s.conf
-lib/ivl/xnf.conf
 lib/libveriuser.a
 lib/libvpi.a
+@dirrm lib/ivl/include
 @dirrm lib/ivl
 @dirrm include/iverilog