15 files changed, 111 insertions, 317 deletions

diff --git a/cad/irsim/Makefile b/cad/irsim/Makefile
index 48e19d48137b..e1c4286b9c3c 100644
--- a/cad/irsim/Makefile
+++ b/cad/irsim/Makefile
@@ -6,28 +6,60 @@
 #
 
 PORTNAME=	irsim
-PORTVERSION=	9.5
-PORTREVISION=	1
+PORTVERSION=	9.7.38
+PORTREVISION=	0
 CATEGORIES=	cad
-MASTER_SITES=	http://mos.stanford.edu/group/magic/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	http://opencircuitdesign.com/irsim/archive/
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An event-driven logic-level simulator for MOS circuis
 
 USE_XLIB=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_WRKSRC=	${WRKSRC}/scripts/
+
+CFLAGS+=	-I${X11BASE}/include
+LDFLAGS+=	-L${X11BASE}/lib
+CONFIGURE_ENV+=	PIC_CFLAGS="-fpic" LDFLAGS="${LDFLAGS}"
+
+OPTIONS=	SCHEME	"Enable built-in Scheme interpreter" on \
+		TCL	"Enable built-in  Tcl interpreter" off
+
 MAN1=		irsim.1
 MAN3=		irsim-analyzer.3
 MAN5=		netchange.5
 
+TK_VER=		8.4
+
 .include <bsd.port.pre.mk>
 
-# othewise patch will complain
-post-extract:
-	@${FIND} ${WRKSRC} -name RCS | ${XARGS} ${RM} -rf
+.if defined(WITH_TCL) && !defined(WITHOUT_SCHEME)
+IGNORE=		you should select only one interpreter
+.elif !defined(WITH_TCL) && defined(WITHOUT_SCHEME)
+IGNORE=		you should select at least one interpreter
+.endif
+
+.if defined(WITH_TCL)
+LIB_DEPENDS+=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
+CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
+			--with-tk=${LOCALBASE}/lib/tk${TK_VER} \
+			--with-tcllibs=${LOCALBASE}/lib/ \
+			--with-tklibs=${LOCALBASE}/lib/ \
+			--with-tclincls=${LOCALBASE}/include/tcl${TK_VER} \
+			--with-tkincls=${LOCALBASE}/include/tk${TK_VER} \
+			--with-interpreter=tcl
+PLIST_SUB+=	TCL=""
+.else
+PLIST_SUB+=	TCL="@comment "
+.endif
 
-post-patch:
-	@${EGREP} -lr '^#endif[^$$]' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
-		's|\(^#.*endif\).*|\1|g'
+.if !defined(WITHOUT_SCHEME)
+CONFIGURE_ARGS+=	--with-interpreter=scheme
+PLIST_SUB+=	SCHEME=""
+.else
+PLIST_SUB+=	SCHEME="@comment "
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/cad/irsim/distinfo b/cad/irsim/distinfo
index 9acc4de05968..5a406859e005 100644
--- a/cad/irsim/distinfo
+++ b/cad/irsim/distinfo
@@ -1,3 +1,3 @@
-MD5 (irsim-9.5.tar.Z) = 5b77e05ed5c2f3a6d92554609107b2f2
-SHA256 (irsim-9.5.tar.Z) = e09772b7f321e0b7b885601a1315f5701a7c1f1c44b9ca88d109037b71be4692
-SIZE (irsim-9.5.tar.Z) = 623811
+MD5 (irsim-9.7.38.tgz) = 12118c68f75e22a242fd7c39602adc9f
+SHA256 (irsim-9.7.38.tgz) = 890a07c66751543c0fa7e6f082b9a0f27fea43aa74eb76640db56a3c1737f431
+SIZE (irsim-9.7.38.tgz) = 438012
diff --git a/cad/irsim/files/patch-aa b/cad/irsim/files/patch-aa
deleted file mode 100644
index 806f7c2ddf18..000000000000
--- a/cad/irsim/files/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/irsim/Makefile.orig	Sat Nov 29 07:39:19 1997
-+++ src/irsim/Makefile	Sat Nov 29 07:43:19 1997
-@@ -82,11 +82,11 @@
- 	@echo '$$(SRCS) gentbl.c genspktbl.c : ' >> MAKEFILE
- 	@echo '	co $$@' >> MAKEFILE
- 	@echo 'stables.c : gentbl'  >> MAKEFILE
--	@echo '	-gentbl' >> MAKEFILE
-+	@echo '	-./gentbl' >> MAKEFILE
- 	@echo 'gentbl : gentbl.c' >> MAKEFILE
- 	@echo '	$$(CC) $$(CFLAGS) -o gentbl gentbl.c' >> MAKEFILE
- 	@echo 'spiketbl.c : genspktbl' >> MAKEFILE
--	@echo '	genspktbl spiketbl.c' >> MAKEFILE
-+	@echo '	./genspktbl spiketbl.c' >> MAKEFILE
- 	@echo 'genspktbl : genspktbl.c' >> MAKEFILE
- 	@echo '	$$(CC) -o genspktbl genspktbl.c -lm' >> MAKEFILE
- 	@/bin/csh ../utils/CO $(SRCS)
diff --git a/cad/irsim/files/patch-ab b/cad/irsim/files/patch-ab
deleted file mode 100644
index 836d8e8f8799..000000000000
--- a/cad/irsim/files/patch-ab
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/ana11/textwind.c.orig	Tue Sep 10 00:19:44 1996
-+++ src/ana11/textwind.c	Tue Dec  9 19:00:52 2003
-@@ -19,7 +19,7 @@
- #include <xfuncs.h>
- #define bcopy(x,y,z) memcpy((y),(x),(z))
- #else
--#include <varargs.h>
-+#include <stdarg.h>
- #endif  /* OS2 */
- #include "ana.h"
- #include "ana_glob.h"
-@@ -94,24 +94,13 @@
- 
- 
- /* VARARGS */
--#ifndef OS2
--public void PRINTF( va_alist )
--  va_dcl
--#else
--public void PRINTF()
--#endif  /* OS2 */
-+public void PRINTF( char *format, ... )
-   {
-     va_list  args;
--    char     *format;
-     char     *s;
-     int      len;
- 
--#ifdef OS2
-     va_start( args, format);
--#else
--    va_start( args );
--#endif  /* OS2 */
--    format = va_arg( args, char * );
- 
-     if( *format == '\n' )
-       {
diff --git a/cad/irsim/files/patch-ac b/cad/irsim/files/patch-ac
deleted file mode 100644
index 175419295d2c..000000000000
--- a/cad/irsim/files/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/ana11/Makefile.orig	Tue Dec  9 18:41:42 2003
-+++ src/ana11/Makefile	Tue Dec  9 18:42:45 2003
-@@ -34,6 +34,9 @@
- $(EXPORTS): $(SRCS)
- 	@echo making $(EXPORTS)
- 	@../utils/export $(SRCS) $(EXPORTS)
-+	grep -v PRINTF $(EXPORTS) > $(EXPORTS).tmp
-+	echo "extern void PRINTF(char *format, ... );" >> $(EXPORTS).tmp
-+	mv $(EXPORTS).tmp $(EXPORTS)
- 
- $(SRCS) :
- 	co $@
diff --git a/cad/irsim/files/patch-ad b/cad/irsim/files/patch-ad
deleted file mode 100644
index 29cf96c5e3bd..000000000000
--- a/cad/irsim/files/patch-ad
+++ /dev/null
@@ -1,80 +0,0 @@
---- src/irsim/netupdate.c.orig	Tue Dec  9 18:47:10 2003
-+++ src/irsim/netupdate.c	Tue Dec  9 18:50:09 2003
-@@ -42,7 +42,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <time.h>
--#endif  /* OS2 */
-+#endif
- #include <math.h>    /* **mdg** */
- #include "defs.h"
- #include "net.h"
-@@ -52,7 +52,7 @@
- #ifndef OS2
- extern	char	*ctime();
- extern	long	time();
--#endif  /* OS2 */
-+#endif
- 
- /******** ALIAS MANAGMENT ******/
- 
-@@ -182,7 +182,7 @@
- private	tptr	ch_tran;		/* list of changed transistors */
- private	nptr	new_GND, new_VDD;
- private	int	chg_VDD, chg_GND;
--private	void	nu_error();
-+private	void	nu_error(char *fmt, ... );
- 
- 
- 	/* value stored in tflags, indicating how transistor changed */
-@@ -1366,7 +1366,7 @@
-     struct Trans  dummyt;
- #ifndef OS2
-     extern char   *getenv();
--#endif  /* OS2 */
-+#endif
- 
-     ch_tran = dummyt.scache.t = dummyt.dcache.t = &dummyt;
-     ch_nlist = NULL;
-@@ -1426,37 +1426,28 @@
-   }
- 
- #ifndef OS2
--#include <varargs.h>
-+#include <stdarg.h>
- #else
- #include <stdarg.h>
--#endif  /* OS2 */
-+#endif
- 
- /* VARARGS */
- #ifndef OS2
--private void nu_error( va_alist )
--  va_dcl
-+private void nu_error( char *fmt, ... )
- #else
- private void nu_error( fmt)
-     char *fmt;
--#endif  /* OS2 */
-+#endif
-   {
-     va_list  args;
--#ifdef OS2
-     char     *errstr = "| error";
--#else
--    char     *fmt, *errstr = "| error";
--#endif  /* OS2 */
-     FILE     *fp;
- 
-     if( nu_logf != NULL )	fp = nu_logf;
-     else if( logfile != NULL )	fp = logfile;
-     else			fp = stderr, errstr ++;
- 
--#ifndef OS2
--    va_start( args );
--#else
-     va_start(args, fmt);
--#endif  /* OS2 */
-     fmt = va_arg( args, char * );
-     (void) fprintf( fp, "%s:%s, line %d: ", errstr, nu_fname, lineno );
-     (void) vfprintf( fp, fmt, args );
diff --git a/cad/irsim/files/patch-ae b/cad/irsim/files/patch-ae
deleted file mode 100644
index 831031e03508..000000000000
--- a/cad/irsim/files/patch-ae
+++ /dev/null
@@ -1,65 +0,0 @@
---- src/irsim/prints.c.orig	Tue Dec  9 18:54:57 2003
-+++ src/irsim/prints.c	Tue Dec  9 18:55:15 2003
-@@ -21,7 +21,7 @@
- #include <stdlib.h>
- #include <stdarg.h>
- #else
--#include <varargs.h>
-+#include <stdarg.h>
- #endif  /* OS2 */
- #include "defs.h"
- 
-@@ -50,25 +50,15 @@
- 
- 
- /* VARARGS */
--#ifndef OS2
--public void lprintf( va_alist )
--  va_dcl
--#else
- public void lprintf(FILE *max, ... )
--#endif  /* OS2 */
-   {
-     va_list  args;
-     char     *fmt;
-     FILE     *fp;
-     char     buff[ 300 ];
- 
--#ifndef OS2
--    va_start( args );
--    fp = va_arg( args, FILE * );
--#else
-     va_start(args, max);
-     fp = (FILE *)max;
--#endif  /* OS2 */
-     fmt = va_arg( args, char * );
-     (void) vsprintf( buff, fmt, args );
-     va_end( args );
-@@ -84,12 +74,7 @@
- 
- 
- /* VARARGS */
--#ifndef OS2
--public void error( va_alist )
--  va_dcl
--#else
- public void error(int max, ...)
--#endif  /* OS2 */
-   {
-     va_list  args;
-     char     *filename;
-@@ -97,14 +82,9 @@
-     char     *fmt;
-     char     buf1[ 100 ], buf2[ 200 ];
- 
--#ifndef OS2
--    va_start( args );
--    filename = va_arg( args, char * );
--#else
-     filename = (char *)max;
-     max = 12;
-     va_start(args, max);
--#endif  /* OS2 */
-     lineno = va_arg( args, int );
-     fmt = va_arg( args, char * );
-     (void) sprintf( buf1, "(%s,%d): ", filename, lineno );
diff --git a/cad/irsim/files/patch-b b/cad/irsim/files/patch-b
deleted file mode 100644
index 3af7d0982a1f..000000000000
--- a/cad/irsim/files/patch-b
+++ /dev/null
@@ -1,22 +0,0 @@
-*** src/irsim/fio.c.orig	Tue Sep 10 19:06:20 1996
---- src/irsim/fio.c	Thu Dec  5 18:43:16 1996
-***************
-*** 46,52 ****
-      register char  *buff = bp;
-      register int  c;
-  
--     contline = 0;
-      while( --len > 0 )
-        {
-        again :
---- 46,51 ----
-***************
-*** 74,80 ****
-          } else {
-            if((c == '\\') && (*bp != '|')){
-               c = getc(fp); 
-- 	     contline++;
-               if( isatty( (int) fileno( fp ) ) ) {
-  		printf("cont>"); 
-  		fflush(stdout);
---- 73,78 ----
diff --git a/cad/irsim/files/patch-scripts_configure b/cad/irsim/files/patch-scripts_configure
new file mode 100644
index 000000000000..658cf0d73b47
--- /dev/null
+++ b/cad/irsim/files/patch-scripts_configure
@@ -0,0 +1,24 @@
+--- scripts/configure.orig	Tue Oct 24 21:09:50 2006
++++ scripts/configure	Sun Dec  3 02:20:09 2006
+@@ -8180,8 +8180,9 @@
+ fi
+ 
+ if test $usingTcl ; then
++	echo "=============>$target"
+   case $target in
+-    *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*)
++    *-sunos4*|*-*-netbsd|NetBSD-*|*-*-freebsd*|OpenBSD-*)
+       TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
+       TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+       ;;
+@@ -10258,9 +10259,8 @@
+ 
+     *-freebsd*)
+       # Not available on all versions:  check for include file.
+-      SHLIB_CFLAGS="-fpic"
++      SHLIB_CFLAGS=${PIC_CFLAGS}
+       LDDL_FLAGS="-shared ${LIB_SPECS}"
+-      CFLAGS="${CFLAGS} -l/usr/X11R6/include"
+       ;;
+ 
+     *-netbsd*|*-openbsd*)
diff --git a/cad/irsim/files/patch-src-irsim-rsim.c b/cad/irsim/files/patch-src-irsim-rsim.c
deleted file mode 100644
index a038e10bb954..000000000000
--- a/cad/irsim/files/patch-src-irsim-rsim.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/irsim/rsim.c.orig	Sun Oct  8 13:23:58 2006
-+++ src/irsim/rsim.c	Sun Oct  8 13:24:44 2006
-@@ -130,6 +130,8 @@
- 
- private	char	not_in_stop[] = "Can't do that while stoped, try \"C\"\n";
- 
-+private int clockit();
-+private int undefseq();
- 
- /* 
-  * Parse line into tokens, filling up targv and WildCard, and setting 'targc'
-@@ -1299,7 +1301,7 @@
- 
- 
- /* assert a bit vector */
--private int doAssert()
-+int doAssert()
-   {
-     char      *mask, *value, *name;
-     Find1Arg  f;
diff --git a/cad/irsim/files/patch-src-irsim-subckt.c b/cad/irsim/files/patch-src-irsim-subckt.c
deleted file mode 100644
index 55cd77035787..000000000000
--- a/cad/irsim/files/patch-src-irsim-subckt.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/irsim/subckt.c.orig	Sun Oct  8 13:20:09 2006
-+++ src/irsim/subckt.c	Sun Oct  8 13:20:30 2006
-@@ -24,6 +24,7 @@
- 
- extern	userSubCircuit	subs[];
- 
-+private int HashSub();
- 
- private int subs_cmp(a, b)
- SubCircuit *a;
diff --git a/cad/irsim/files/patch-src-other-h2a-h2a.c b/cad/irsim/files/patch-src-other-h2a-h2a.c
deleted file mode 100644
index 5f5a0dc9edbe..000000000000
--- a/cad/irsim/files/patch-src-other-h2a-h2a.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/other/h2a/h2a.c.orig	Sun Oct  8 13:26:06 2006
-+++ src/other/h2a/h2a.c	Sun Oct  8 13:26:09 2006
-@@ -32,6 +32,7 @@
- public	void	make_stacks( n ) nptr n;		{}
- public	void	pStackedTxtors()			{}
- 
-+private Usage();
- 
- private	char   *sim_file = NULL;
- private	char   *hist_file = NULL;
diff --git a/cad/irsim/files/patch-src-other-h2a-sort.c b/cad/irsim/files/patch-src-other-h2a-sort.c
deleted file mode 100644
index f9e5a6844bff..000000000000
--- a/cad/irsim/files/patch-src-other-h2a-sort.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/other/h2a/sort.c.orig	Sun Oct  8 13:27:07 2006
-+++ src/other/h2a/sort.c	Sun Oct  8 13:27:10 2006
-@@ -17,6 +17,7 @@
- static	phist	*dataBuff;
- static	phist	*dataBuff1;
- 
-+static BucketSort();
- 
- /*
-  * Sort the edge array pointed to by 'lineBuff'.  Return a pointer to a
diff --git a/cad/irsim/files/patch-src-other-inet2sim-inet2sim.c b/cad/irsim/files/patch-src-other-inet2sim-inet2sim.c
deleted file mode 100644
index f9adca4cee12..000000000000
--- a/cad/irsim/files/patch-src-other-inet2sim-inet2sim.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/other/inet2sim/inet2sim.c.orig	Sun Oct  8 13:27:47 2006
-+++ src/other/inet2sim/inet2sim.c	Sun Oct  8 13:28:02 2006
-@@ -22,6 +22,7 @@
- private	char	*inet_file = NULL;
- private	void	sort_node_names();
- 
-+private Usage();
- 
- main( argc, argv )
-   int   argc;
diff --git a/cad/irsim/pkg-plist b/cad/irsim/pkg-plist
index 8a75825df191..1f1ad444e1af 100644
--- a/cad/irsim/pkg-plist
+++ b/cad/irsim/pkg-plist
@@ -1,13 +1,43 @@
 bin/irsim
-bin/ifsim
-bin/h2a
-bin/inet2sim
-lib/irsim/scmos1_6um.prm
-lib/irsim/scmos2um.prm
-lib/irsim/scmos100.prm
-lib/irsim/scmos30.prm
-lib/irsim/scmos35.prm
-lib/irsim/scmos50_3v.prm
-lib/irsim/scmos50_5v.prm
-lib/irsim/scmos60.prm
+%%SCHEME%%bin/gentbl
+%%SCHEME%%bin/genspktbl
+lib/irsim/doc/irsim-analyzer.doc
+lib/irsim/doc/irsim.doc
+lib/irsim/doc/netchange.doc
+lib/irsim/doc/powerEst.doc
+lib/irsim/prm/amiabn.80.n99z.5.prm
+lib/irsim/prm/amic5.30.n98s.3.3.prm
+lib/irsim/prm/amicwl.50.n97l.5.prm
+lib/irsim/prm/hpcmos10.20.n98v.3.3.prm
+lib/irsim/prm/hpcmos14.30.n9ae.3.3.prm
+lib/irsim/prm/hpcmos26.40.n88x.5.prm
+lib/irsim/prm/orbit.60.n96e.5.prm
+lib/irsim/prm/scmos100.prm
+lib/irsim/prm/scmos1_6um.prm
+lib/irsim/prm/scmos2um.prm
+lib/irsim/prm/scmos30.prm
+lib/irsim/prm/scmos35.prm
+lib/irsim/prm/scmos50_3v.prm
+lib/irsim/prm/scmos50_5v.prm
+lib/irsim/prm/scmos60.prm
+lib/irsim/prm/tsmc18.10.nxxx.1.8.prm
+lib/irsim/prm/tsmc25.15.n99y.2.5.prm
+lib/irsim/prm/tsmc35.20.n98t.3.3.prm
+lib/irsim/prm/tsmc35p.20.n98tp.3.3.prm
+%%TCL%%lib/irsim/tcl/bitmaps/center.xbm
+%%TCL%%lib/irsim/tcl/bitmaps/left.xbm
+%%TCL%%lib/irsim/tcl/bitmaps/lleft.xbm
+%%TCL%%lib/irsim/tcl/bitmaps/right.xbm
+%%TCL%%lib/irsim/tcl/bitmaps/rright.xbm
+%%TCL%%lib/irsim/tcl/console.tcl
+%%TCL%%lib/irsim/tcl/cver.tcl
+%%TCL%%lib/irsim/tcl/irsim.tcl
+%%TCL%%lib/irsim/tcl/irsimexec
+%%TCL%%lib/irsim/tcl/random.so
+%%TCL%%lib/irsim/tcl/tclirsim.so
+%%TCL%%lib/irsim/tcl/tkcon.tcl
+%%TCL%%@dirrm lib/irsim/tcl/bitmaps
+%%TCL%%@dirrm lib/irsim/tcl
+@dirrm lib/irsim/prm
+@dirrm lib/irsim/doc
 @dirrm lib/irsim