update to 7.0; fix the patches; from MAINTAINER

emulators/spim/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2003/07/03 06:16:22 sturm Exp $
+# $OpenBSD: Makefile,v 1.5 2004/10/01 06:18:14 robert Exp $
 
 COMMENT=	"MIPS R2000/R3000 simulator"
 
 DISTNAME=	spim
-PKGNAME=	spim-6.5
+PKGNAME=	spim-7.0
 CATEGORIES=	emulators
 
 HOMEPAGE=	http://www.cs.wisc.edu/~larus/spim.html
@@ -28,12 +28,12 @@ ALL_TARGET=	spim xspim
 REGRESS_DEPENDS=::emulators/spim
 REGRESS_TARGET=	test
 
-DOCS=	spim.ps cycle.ps
+DOCS=	cycle.ps
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/spim
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/spim
-	${INSTALL_DATA} ${WRKSRC}/trap.handler ${PREFIX}/share/spim
+	${INSTALL_DATA} ${WRKSRC}/exceptions.s ${PREFIX}/share/spim
 	${INSTALL_PROGRAM} ${WRKSRC}/spim ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/xspim ${PREFIX}/bin
 	cd ${WRKSRC}/Documentation; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/spim

emulators/spim/distinfo

@@ -1,3 +1,3 @@
-MD5 (spim.tar.gz) = be9cf6ff2798e507736d05eb5c70914f
-RMD160 (spim.tar.gz) = 92ee3e9dcc3bc27e5d2e1068f8adf605acdf68bc
-SHA1 (spim.tar.gz) = 7ebae8a3fe1a523d92c3ba99cb197f094046229c
+MD5 (spim.tar.gz) = c93d8ef25cee2d8847f4f98d30c20889
+RMD160 (spim.tar.gz) = 8fdf2ce9e394a5b05f7d1573ad2b4098f4e71b49
+SHA1 (spim.tar.gz) = dc76770126a7df9df0bfb636197cad8119937d6a

emulators/spim/patches/patch-Imakefile

@@ -1,11 +1,12 @@
---- Imakefile.orig	Mon Jul 23 10:38:05 2001
-+++ Imakefile	Mon Jul 23 10:40:11 2001
+$OpenBSD: patch-Imakefile,v 1.2 2004/10/01 06:18:14 robert Exp $
+--- Imakefile.orig	Thu Jul  8 03:24:00 2004
++++ Imakefile	Wed Sep 29 11:41:36 2004
 @@ -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
@@ -13,11 +14,11 @@
  
  # Full path for the directory that will hold the man files:
 -MAN_DIR = /var/unsup/man
-+MAN_DIR = $(PREFIX)/man/man1
++MAN_DIR = $(PREFIX)/man
  
  
  # If you have flex, use it instead of lex.  If you use flex, define this
-@@ -255,9 +255,9 @@
+@@ -250,9 +250,9 @@ shar:
  	mv -f lex.yy.c.xx lex.yy.c
  
  depend::

emulators/spim/patches/patch-spim.man

@@ -1,8 +0,0 @@
---- spim.man.orig	Mon Jul 23 12:03:34 2001
-+++ spim.man	Mon Jul 23 12:03:38 2001
-@@ -1,5 +1,4 @@
- .\" $Header: /home/cvs/ports/emulators/spim/patches/Attic/patch-spim.man,v 1.1.1.1 2001/07/23 14:54:28 kevlo Exp $
--
- .TH spim 1
- .SH NAME
- spim \- A MIPS R2000/R3000 Simulator

emulators/spim/patches/patch-spim_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-spim_c,v 1.1 2004/10/01 06:18:14 robert Exp $
+--- spim.c.orig	Fri Oct  1 08:03:15 2004
++++ spim.c	Fri Oct  1 08:06:33 2004
+@@ -32,6 +32,7 @@
+ #include <ctype.h>
+ #include <setjmp.h>
+ #include <signal.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <sys/ioctl.h>
+ 

emulators/spim/patches/patch-spim_man

@@ -0,0 +1,9 @@
+$OpenBSD: patch-spim_man,v 1.1 2004/10/01 06:18:14 robert Exp $
+--- spim.man.orig	Thu Jul  8 03:24:24 2004
++++ spim.man	Wed Sep 29 11:38:37 2004
+@@ -1,5 +1,4 @@
+ .\" $Header: /home/cvs/ports/emulators/spim/patches/Attic/patch-spim_man,v 1.1 2004/10/01 06:18:14 robert Exp $
+-
+ .TH spim 1
+ .SH NAME
+ spim \- A MIPS32 Simulator

emulators/spim/pkg/PLIST

@@ -1,10 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 00:42:04 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/10/01 06:18:14 robert Exp $
 bin/spim
 bin/xspim
 @man man/man1/spim.1
 @man man/man1/xspim.1
 share/doc/spim/
 share/doc/spim/cycle.ps
-share/doc/spim/spim.ps
 share/spim/
-share/spim/trap.handler
+share/spim/exceptions.s