sync w/ base pkg

5 files changed, 29 insertions, 21 deletions

diff --git a/cad/MyHDL-gplcver/Makefile b/cad/MyHDL-gplcver/Makefile
index bc492677379..fa5e4266ad7 100644
--- a/cad/MyHDL-gplcver/Makefile
+++ b/cad/MyHDL-gplcver/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2008/03/03 01:50:26 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2011/04/13 16:14:10 drochner Exp $
 #
 
-DISTNAME=	myhdl-0.5.1
-PKGNAME=	MyHDL-gplcver-0.5.1
+DISTNAME=	myhdl-0.7
+PKGNAME=	MyHDL-gplcver-0.7
 CATEGORIES=	cad python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=myhdl/}
 
@@ -20,5 +20,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/cosimulation/cver/myhdl_vpi.so \
 		${DESTDIR}${PREFIX}/lib/gplcver
 
+# XXX would require Python dependency
+#do-test:
+#	(cd ${WRKSRC}/cosimulation/cver/test && ${PYTHONBIN} test_all.py)
+
 .include "../../cad/gplcver/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/MyHDL-gplcver/distinfo b/cad/MyHDL-gplcver/distinfo
index c4e2e9bf3d5..c1542faebd0 100644
--- a/cad/MyHDL-gplcver/distinfo
+++ b/cad/MyHDL-gplcver/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/05/04 16:58:05 drochner Exp $
+$NetBSD: distinfo,v 1.3 2011/04/13 16:14:10 drochner Exp $
 
-SHA1 (myhdl-0.5.1.tar.gz) = 4c98248be79ebb1a2c5de78aefd6c55c0675e47d
-RMD160 (myhdl-0.5.1.tar.gz) = 9802663d82c86098694d34783b7352e6f5435b20
-Size (myhdl-0.5.1.tar.gz) = 768479 bytes
-SHA1 (patch-aa) = e63d26084019989579a9bc799e35e16e9bd75b76
+SHA1 (myhdl-0.7.tar.gz) = 4382444230297593f0a08ba8178c542b4ce1f19b
+RMD160 (myhdl-0.7.tar.gz) = c525b21a86c9204ec7cf659709bc0e8fb2c7450b
+Size (myhdl-0.7.tar.gz) = 241770 bytes
+SHA1 (patch-aa) = 7ed6848aa47394cf714cc9521b1a7e4e456c80a9
diff --git a/cad/MyHDL-gplcver/patches/patch-aa b/cad/MyHDL-gplcver/patches/patch-aa
index 6d0b09a3002..1839423f2ad 100644
--- a/cad/MyHDL-gplcver/patches/patch-aa
+++ b/cad/MyHDL-gplcver/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2006/05/04 16:58:05 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2011/04/13 16:14:10 drochner Exp $
 
---- cosimulation/cver/makefile.lnx.orig	2006-04-27 12:25:40.000000000 +0200
+--- cosimulation/cver/makefile.lnx.orig	2010-10-14 17:58:48.000000000 +0000
 +++ cosimulation/cver/makefile.lnx
 @@ -2,7 +2,7 @@
  WARNS=-Wall
  
  # change this path to point to the pli include files directory for cver
--INCS=-I$(HOME)/tools/gplcver-2.11a.src/pli_incs
+-INCS=-I$(HOME)/Tools/gplcver-2.12a.src/pli_incs
 +INCS=-I$(LOCALBASE)/lib/gplcver/pli_incs
+ 
  # maybe want -O<something> and/or -g
- CFLAGS= -fPIC -Wall -g $(INCS)
- LFLAGS= -G -shared -export-dynamic
+ # -fno-stack-protector apparently needed with newer gcc's
diff --git a/cad/MyHDL-iverilog/Makefile b/cad/MyHDL-iverilog/Makefile
index 1b89b0cd81f..4ddd817601d 100644
--- a/cad/MyHDL-iverilog/Makefile
+++ b/cad/MyHDL-iverilog/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/04/01 17:26:06 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2011/04/13 16:14:10 drochner Exp $
 #
 
-DISTNAME=	myhdl-0.5.1
-PKGNAME=	MyHDL-iverilog-0.5.1
+DISTNAME=	myhdl-0.7
+PKGNAME=	MyHDL-iverilog-0.7
 CATEGORIES=	cad python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=myhdl/}
 
@@ -19,5 +19,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/cosimulation/icarus/myhdl.vpi \
 		${DESTDIR}${PREFIX}/lib/ivl
 
-.include "../../cad/verilog-current/buildlink3.mk"
+# XXX would require Python dependency
+#do-test:
+#	(cd ${WRKSRC}/cosimulation/icarus/test && ${PYTHONBIN} test_all.py)
+
+.include "../../cad/verilog/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/MyHDL-iverilog/distinfo b/cad/MyHDL-iverilog/distinfo
index 29fca64f078..90a23cda52e 100644
--- a/cad/MyHDL-iverilog/distinfo
+++ b/cad/MyHDL-iverilog/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2006/05/04 16:58:05 drochner Exp $
+$NetBSD: distinfo,v 1.3 2011/04/13 16:14:10 drochner Exp $
 
-SHA1 (myhdl-0.5.1.tar.gz) = 4c98248be79ebb1a2c5de78aefd6c55c0675e47d
-RMD160 (myhdl-0.5.1.tar.gz) = 9802663d82c86098694d34783b7352e6f5435b20
-Size (myhdl-0.5.1.tar.gz) = 768479 bytes
+SHA1 (myhdl-0.7.tar.gz) = 4382444230297593f0a08ba8178c542b4ce1f19b
+RMD160 (myhdl-0.7.tar.gz) = c525b21a86c9204ec7cf659709bc0e8fb2c7450b
+Size (myhdl-0.7.tar.gz) = 241770 bytes