Update spim to 7.1.

Changes since 6.5 includes
* Upgraded simulator to MIPS32, Version 1 architecture (except details of
  FPU and memory).
* Exceptions and interrupts reimplemented, to make them closer to the
  actual hardware.
* Memory mapped IO console reimplemented to make it work properly.
* Implemented timer in CPU.
* Improved implementation of delayed load instructions.
as well as many minor changes.

Fixes PR pkg/30227 reported from Michai Ramakers.

5 files changed, 63 insertions, 22 deletions

diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index 35ca97ccb69..09b5ee26c77 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2005/07/15 18:27:49 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/07/17 21:38:45 kristerw Exp $
 
 DISTNAME=		spim
-PKGNAME=		spim-6.5
+PKGNAME=		spim-7.1
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.cs.wisc.edu/~larus/SPIM/ \
 			ftp://ftp.cs.wisc.edu/pub/spim/
@@ -10,6 +10,10 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.cs.wisc.edu/~larus/spim.html
 COMMENT=		MIPS R2000 Simulator
 
+RESTRICTED=		"selling is not allowed"
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+
 DIST_SUBDIR=		${PKGNAME}
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
@@ -32,10 +36,11 @@ post-install:
 	@${ECHO} "Installing spim/xspim documentation"
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/spim \
 		&& ${CHMOD} a+rx ${PREFIX}/share/doc/spim
-	${INSTALL_DATA} ${WRKSRC}/Documentation/spim.ps \
+	${INSTALL_DATA} ${WRKSRC}/Documentation/spim.tex \
+		${PREFIX}/share/doc/spim
+	${INSTALL_DATA} ${WRKSRC}/Documentation/*.id \
 		${PREFIX}/share/doc/spim
 	${INSTALL_DATA} ${WRKSRC}/Documentation/cycle.ps \
 		${PREFIX}/share/doc/spim
-	${GZIP_CMD} ${PREFIX}/share/doc/spim/*.ps
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/spim/PLIST b/emulators/spim/PLIST
index 87882a30671..96902578082 100644
--- a/emulators/spim/PLIST
+++ b/emulators/spim/PLIST
@@ -1,8 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:26 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/07/17 21:38:45 kristerw Exp $
 bin/spim
 bin/xspim
-share/doc/spim/spim.ps.gz
-share/doc/spim/cycle.ps.gz
-share/spim/trap.handler
-@dirrm share/doc/spim
+share/doc/spim/cause_reg.id
+share/doc/spim/cycle.ps
+share/doc/spim/io_reg.id
+share/doc/spim/mem.id
+share/doc/spim/mips.id
+share/doc/spim/spim.tex
+share/doc/spim/stack-frame.id
+share/doc/spim/status_reg.id
+share/doc/spim/xinterface.id
+share/spim/exceptions.s
 @dirrm share/spim
+@dirrm share/doc/spim
diff --git a/emulators/spim/distinfo b/emulators/spim/distinfo
index d4b35864180..4aa85fa7b00 100644
--- a/emulators/spim/distinfo
+++ b/emulators/spim/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 18:49:20 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/07/17 21:38:45 kristerw Exp $
 
-SHA1 (spim-6.5/spim.tar.gz) = 7ebae8a3fe1a523d92c3ba99cb197f094046229c
-RMD160 (spim-6.5/spim.tar.gz) = 92ee3e9dcc3bc27e5d2e1068f8adf605acdf68bc
-Size (spim-6.5/spim.tar.gz) = 444075 bytes
-SHA1 (patch-aa) = cf4ee2fd60cf7d2864ba06398b612515591a7dcb
+SHA1 (spim-7.1/spim.tar.gz) = 3e0399e4c2e007aecbd2532b9d8f3f63b7035ff9
+RMD160 (spim-7.1/spim.tar.gz) = 175f63d95011a20087ab135de54b03fccc98286d
+Size (spim-7.1/spim.tar.gz) = 307599 bytes
+SHA1 (patch-aa) = 6c2ed827f757d3bb92d202d694e631c96750183a
+SHA1 (patch-ab) = 5e1cf699e926f434d6f6aba8f55df7ad7da44fdb
diff --git a/emulators/spim/patches/patch-aa b/emulators/spim/patches/patch-aa
index 7624e390169..dc0d72db3e5 100644
--- a/emulators/spim/patches/patch-aa
+++ b/emulators/spim/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.3 1999/07/17 19:24:50 deberg Exp $
+$NetBSD: patch-aa,v 1.4 2005/07/17 21:38:45 kristerw Exp $
 
---- Imakefile.BAK	Sat Jul 17 14:59:04 1999
-+++ Imakefile	Sat Jul 17 14:59:15 1999
+--- Imakefile.orig	2005-07-17 23:05:04.000000000 +0200
++++ Imakefile	2005-07-17 23:06:37.000000000 +0200
 @@ -44,13 +44,13 @@
  #
  
- # Full path for directory that will hold the trap handler file:
--TRAP_DIR = .
-+TRAP_DIR = $(PREFIX)/share/spim
+ # Full path for directory that will hold the exception handler file:
+-EXCEPTION_DIR = .
++EXCEPTION_DIR = $(PREFIX)/share/spim
  
  # Full path for the directory that will hold the executable files:
 -BIN_DIR = /usr/unsup/bin
-+BIN_DIR = $(PREFIX)/bin
++BIN_DIR =  $(PREFIX)/bin
  
  # Full path for the directory that will hold the man files:
 -MAN_DIR = /var/unsup/man
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.3 1999/07/17 19:24:50 deberg Exp $
  
  
  # If you have flex, use it instead of lex.  If you use flex, define this
-@@ -252,7 +252,7 @@
+@@ -250,7 +250,7 @@
  	mv -f lex.yy.c.xx lex.yy.c
  
  depend::
diff --git a/emulators/spim/patches/patch-ab b/emulators/spim/patches/patch-ab
new file mode 100644
index 00000000000..62f7274167e
--- /dev/null
+++ b/emulators/spim/patches/patch-ab
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.1 2005/07/17 21:38:45 kristerw Exp $
+
+--- Configure.orig	2005-07-17 23:11:53.000000000 +0200
++++ Configure	2005-07-17 23:13:20.000000000 +0200
+@@ -150,14 +150,15 @@
+ 
+ 
+ echo
+-echo Checking for /usr/include/termios.h
+-if [ -f /usr/include/termios.h ]; then
+-  echo "-DUSE_TERMIOS" >> configuration
+-  echo "Yes, it is there"
+-else
+-  # No termios
+-  echo "No, it is not there"
+-fi;
++# The pkg uses unportable termios.h stuff, so disable it.
++#echo Checking for /usr/include/termios.h
++#if [ -f /usr/include/termios.h ]; then
++#  echo "-DUSE_TERMIOS" >> configuration
++#  echo "Yes, it is there"
++#else
++#  # No termios
++#  echo "No, it is not there"
++#fi;
+ 
+ 
+ if [ -f /usr/lib/libc.dylib ]; then