6 files changed, 32 insertions, 88 deletions

diff --git a/cad/irsim/Makefile b/cad/irsim/Makefile
index b6a1de9b9f21..3cf9d7bb81fc 100644
--- a/cad/irsim/Makefile
+++ b/cad/irsim/Makefile
@@ -3,17 +3,16 @@
 # Date created:         18 Dec 1994
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.5 1996/11/15 23:30:55 obrien Exp $
+# $Id: Makefile,v 1.6 1996/11/18 13:57:06 asami Exp $
 #
 
-DISTNAME=       irsim-9.2
+DISTNAME=       irsim-9.4.1
 CATEGORIES=	cad
-MASTER_SITES=	ftp://gatekeeper.dec.com/pub/DEC/WRL/projects/magic/6.4/
+MASTER_SITES=	ftp://gatekeeper.dec.com/pub/DEC/WRL/projects/magic/6.5/
 EXTRACT_SUFX=   .tar.Z
 
 MAINTAINER=	swallace@FreeBSD.org
 
-WRKSRC=		${.CURDIR}/work/irsim
 MAN1=		irsim.1
 MAN3=		irsim-analyzer.3
 MAN5=		netchange.5
diff --git a/cad/irsim/distinfo b/cad/irsim/distinfo
index 5de8b375d062..fdd0e3792fba 100644
--- a/cad/irsim/distinfo
+++ b/cad/irsim/distinfo
@@ -1 +1 @@
-MD5 (irsim-9.2.tar.Z) = 691342514168dd14e59aae85ca4f912b
+MD5 (irsim-9.4.1.tar.Z) = 1a890eae0ee1608949eccb1cccc88c26
diff --git a/cad/irsim/files/Makefile b/cad/irsim/files/Makefile
index 586b1bc6f533..d127d428fcf0 100644
--- a/cad/irsim/files/Makefile
+++ b/cad/irsim/files/Makefile
@@ -1,4 +1,4 @@
-CFLAGS = -USYS_V -UNO_SIGIO -DULTRIX_VERSION=4 -O2 -m486
+CFLAGS = -O2 -USYS_V -UNO_SIGIO -DPOWER_EST -DUSER_SUBCKT -I${X11BASE}/include -L${X11BASE}/lib
 
 all:
 	@(cd src/utils; make)
@@ -15,5 +15,20 @@ install:
 	install -c -o bin -g bin -m 444 man/irsim.1 ${PREFIX}/man/man1
 	install -c -o bin -g bin -m 444 man/irsim-analyzer.3 ${PREFIX}/man/man3
 	install -c -o bin -g bin -m 444 man/netchange.5 ${PREFIX}/man/man5
-	install -c -o bin -g bin -m 444 calibrate/scmos1_6um.prm ${PREFIX}/lib
-	install -c -o bin -g bin -m 444 calibrate/scmos2um.prm ${PREFIX}/lib
+
+	mkdir -p -m 555 ${PREFIX}/lib/irsim
+	install -c -o bin -g bin -m 444 calibrate_hspice/scmos100.prm ${PREFIX}/lib/irsim
+	install -c -o bin -g bin -m 444 calibrate_hspice/scmos30.prm ${PREFIX}/lib/irsim
+	install -c -o bin -g bin -m 444 calibrate_hspice/scmos35.prm ${PREFIX}/lib/irsim
+	install -c -o bin -g bin -m 444 calibrate_hspice/scmos60.prm ${PREFIX}/lib/irsim
+	install -c -o bin -g bin -m 444 calibrate_hspice/scmos50_3v.prm ${PREFIX}/lib/irsim
+	install -c -o bin -g bin -m 444 calibrate_hspice/scmos50_5v.prm ${PREFIX}/lib/irsim
+	install -c -o bin -g bin -m 444 calibrate_spice3/scmos1_6um.prm ${PREFIX}/lib/irsim
+	install -c -o bin -g bin -m 444 calibrate_spice3/scmos2um.prm ${PREFIX}/lib/irsim
+
+clean:
+	cd src/utils; make clean 
+	cd src/irsim; make clean 
+	cd src/ana11; make clean 
+	cd src/fsim; make clean 
+
diff --git a/cad/irsim/files/patch-aa b/cad/irsim/files/patch-aa
deleted file mode 100644
index e54496b59109..000000000000
--- a/cad/irsim/files/patch-aa
+++ /dev/null
@@ -1,75 +0,0 @@
-*** src/irsim/fio.c.orig	Fri Jan 15 11:45:14 1993
---- src/irsim/fio.c	Sun Dec 18 13:58:41 1994
-***************
-*** 15,21 ****
---- 15,23 ----
-  #include <stdio.h>
-  #include <defs.h>
-  
-+ #ifndef __FreeBSD__  /* clearerr defined as macro in stdio.h */
-  extern	void	clearerr();
-+ #endif
-  
-  
-  /*
-*** src/utils/Export/export.c.orig	Sun Dec 23 01:15:04 1990
---- src/utils/Export/export.c	Sun Dec 18 13:52:22 1994
-***************
-*** 36,41 ****
---- 36,42 ----
-      extern  String mktemp();
-      String  outfname;
-      char    syscmd[ 512 ];
-+     char    name[18];
-      FILE    *tmp;
-      int r;
-      int i;
-***************
-*** 46,53 ****
-      signal( SIGINT, abnorm );
-      signal( SIGQUIT, abnorm );
-  
-!     tmpname = mktemp( "/tmp/exportXXXXXX" );
-!     fout = fopen( tmpname, "w", stdout );
-      if( fout == NULL )
-  	Crash( "can't write %s", tmpname );
-      
---- 47,55 ----
-      signal( SIGINT, abnorm );
-      signal( SIGQUIT, abnorm );
-  
-!     strcpy( name, "/tmp/exportXXXXXX" );
-!     tmpname = mktemp( name );
-!     fout = fopen( tmpname, "w" );
-      if( fout == NULL )
-  	Crash( "can't write %s", tmpname );
-      
-*** src/irsim/gentbl.c.orig	Fri Jan 15 11:45:14 1993
---- src/irsim/gentbl.c	Sun Dec 18 18:56:39 1994
-***************
-*** 188,191 ****
---- 188,192 ----
-  		  }
-  	  }
-      fprintf( out, "\n};\n" );
-+     return 0;
-    }
-*** src/ana11/Makefile.ORIG	Fri Jan 15 20:47:47 1993
---- src/ana11/Makefile	Sun Jan 22 13:57:51 1995
-***************
-*** 19,25 ****
-  
-  LIBS =
-  
-! CDIRS =	-I../include
-  
-  CSW =	-O
-  
---- 19,25 ----
-  
-  LIBS =
-  
-! CDIRS =	-I../include -I${X11BASE}/include
-  
-  CSW =	-O
-  
diff --git a/cad/irsim/pkg-descr b/cad/irsim/pkg-descr
index c1a63feb88b7..d880f3bdd5d4 100644
--- a/cad/irsim/pkg-descr
+++ b/cad/irsim/pkg-descr
@@ -1,6 +1,4 @@
-IRSIM version 9.2
-
-Irsim is an event-driven logic-level simulator for MOS circuits
+IRSIM is an event-driven logic-level simulator for MOS circuits.
 
 To run irsim, users should set CAD_HOME to the base installation directory
 where magic was installed, e.g. /usr/local.  Alternatively, the system
diff --git a/cad/irsim/pkg-plist b/cad/irsim/pkg-plist
index 7edb4aaf4f48..7b25fcaeb0bf 100644
--- a/cad/irsim/pkg-plist
+++ b/cad/irsim/pkg-plist
@@ -5,5 +5,12 @@ bin/inet2sim
 man/man1/irsim.1.gz
 man/man3/irsim-analyzer.3.gz
 man/man5/netchange.5.gz
-lib/scmos1_6um.prm
-lib/scmos2um.prm
+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
+@dirrm lib/irsim