From arnej@mail.imf.unit.no  Mon Feb  3 02:50:58 1997
Received: from romberg.imf.unit.no (0@romberg.imf.unit.no [129.241.15.150])
          by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id CAA22550
          for <FreeBSD-gnats-submit@freebsd.org>; Mon, 3 Feb 1997 02:50:57 -0800 (PST)
Received: from frida.imf.unit.no (frida.imf.unit.no [129.241.15.136]) by romberg.imf.unit.no (8.8.3/8.7.3) with ESMTP id LAA12879 for <FreeBSD-gnats-submit@freebsd.org>; Mon, 3 Feb 1997 11:50:48 +0100 (MET)
Received: (from arnej@localhost)
          by frida.imf.unit.no (8.8.4/8.8.4)
	  id LAA22314; Mon, 3 Feb 1997 11:50:45 +0100 (CET)
Message-Id: <199702031050.LAA22314@frida.imf.unit.no>
Date: Mon, 3 Feb 1997 11:50:45 +0100 (CET)
From: Arne Henrik Juul <arnej@imf.unit.no>
Reply-To: arnej@imf.unit.no
To: FreeBSD-gnats-submit@freebsd.org
Subject: emulators/spim update for 5.9
X-Send-Pr-Version: 3.2

>Number:         2643
>Category:       ports
>Synopsis:       emulators/spim update for 5.9
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    obrien
>State:          closed
>Quarter:
>Keywords:
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb  3 03:00:02 PST 1997
>Closed-Date:    Fri Feb 14 05:33:26 PST 1997
>Last-Modified:  Fri Feb 14 05:34:06 PST 1997
>Originator:     Arne Henrik Juul
>Release:        FreeBSD 2.2-GAMMA i386
>Organization:
Norwegian University of Technology and Science
>Environment:

	Using the current ports tree.

>Description:

	spim doesn't build; checksum fails because spim.tar.gz is
	now version 5.9 (was 5.8).

>How-To-Repeat:

	cd /usr/ports/emulators/spim; make clean;
	rm /usr/ports/distfiles/spim.tar.gz;
	make

>Fix:
	
	Apply this patch to update to spim5.9.
	Note that I'm not a regular spim user, but the only
	real change is the spim version.

Index: ports/emulators/spim/Makefile
===================================================================
RCS file: /usr/cvs/ports/emulators/spim/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	1996/11/12 02:16:56	1.2
+++ Makefile	1997/02/03 10:32:17
@@ -7,8 +7,8 @@
 # $Id: Makefile,v 1.2 1996/11/12 02:16:56 obrien Exp $
 #
 
-DISTNAME=	spim
-PKGNAME=	spim-5.8
+DISTNAME=	spim5.9
+PKGNAME=	spim-5.9
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/pub/spim/
 
Index: ports/emulators/spim/files/md5
===================================================================
RCS file: /usr/cvs/ports/emulators/spim/files/md5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 md5
--- md5	1996/10/30 01:58:56	1.1.1.1
+++ md5	1997/02/03 10:19:20
@@ -1 +1 @@
-MD5 (spim.tar.gz) = 20c8fc70ebc522a1a9655ab691fee826
+MD5 (spim5.9.tar.gz) = 4e706ff0a93ef64cabab4b5fc79059c3
Index: ports/emulators/spim/patches/patch-01
===================================================================
RCS file: /usr/cvs/ports/emulators/spim/patches/patch-01,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-01
--- patch-01	1996/10/30 01:58:56	1.1.1.1
+++ patch-01	1997/02/03 10:28:28
@@ -1,10 +1,11 @@
---- Imakefile.orig	Tue Oct 10 10:20:07 1995
-+++ Imakefile	Tue Oct 29 17:19:52 1996
+diff -ru Imakefile.orig Imakefile
+--- Imakefile.orig	Fri Sep 20 22:44:50 1996
++++ Imakefile	Mon Feb  3 11:26:40 1997
 @@ -57,13 +57,13 @@
  #
  
  # Full path for directory that will hold the trap handler file:
--TRAP_DIR = /usr/unsup/lib
+-TRAP_DIR = .
 +TRAP_DIR = $(PREFIX)/share/spim
  
  # Full path for the directory that will hold the executable files:
@@ -17,7 +18,7 @@
  
  
  # If you have flex, use it instead of lex.  If you use flex, define this
-@@ -163,8 +163,8 @@
+@@ -164,8 +164,8 @@
  NormalProgramTarget(cl-spim_sub,$(CLOBJS),,,)
  NormalProgramTarget(cl-xspim_sub,$(XCLOBJS),$(DEPLIBS),$(LOCALLIBS),$(SYSLIBS))
  
@@ -28,7 +29,7 @@
  InstallManPage(spim,$(MAN_DIR))
  InstallManPage(xspim,$(MAN_DIR))
  InstallNonExec(trap.handler,$(TRAP_DIR))
-@@ -290,7 +290,7 @@
+@@ -291,7 +291,7 @@
  	mv -f lex.yy.c.xx lex.yy.c
  
  depend::
Index: ports/emulators/spim/patches/patch-03
===================================================================
RCS file: /usr/cvs/ports/emulators/spim/patches/patch-03,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-03
--- patch-03	1996/10/30 01:58:56	1.1.1.1
+++ patch-03	1997/02/03 10:31:35
@@ -1,14 +1,6 @@
---- cl-except.c.orig	Fri Aug 25 07:13:05 1995
-+++ cl-except.c	Tue Oct 29 00:37:44 1996
-@@ -46,6 +46,7 @@
- /* Exported Variables: */
- 
- mem_addr breakpoint_reinsert; /* !0 -> reinsert break at this address */
-+spim_proc proc;                  /* spim's signal tracking structure */
- 
- 
- /* Imported Variables: */
-@@ -67,14 +68,14 @@
+--- cl-except.c.orig	Thu Jan 30 23:35:19 1997
++++ cl-except.c	Thu Jan 30 23:35:40 1997
+@@ -67,14 +67,14 @@
  #ifdef __STDC__
  static void intercept_signals (int sig, int code, struct sigcontext *scp);
  static mem_addr compute_branch_target (instruction *inst);
@@ -25,7 +17,7 @@
  static int issig ();
  static int psig ();
  static void sendsig ();
-@@ -266,7 +267,7 @@
+@@ -266,7 +266,7 @@
  
        else if (retval == 0)
  	/* bad system call --> turn into a signal */
@@ -34,7 +26,7 @@
  
        retval = !retval;	 	/* retval == 1 -> syscall ok;
  				 * retval == 0 -> syscall bad */
-@@ -286,7 +287,7 @@
+@@ -286,7 +286,7 @@
      case IBUS_EXCPT:
      case DBUS_EXCPT:
      case CPU_EXCPT:
@@ -43,7 +35,7 @@
        break;
  
  
-@@ -456,7 +457,7 @@
+@@ -456,7 +456,7 @@
    }
    else if (spim_related_sig & (1 << sig))
      cycle_steps = 0;
@@ -52,7 +44,7 @@
  }
  
  
-@@ -466,10 +467,10 @@
+@@ -466,10 +466,10 @@
  
  #ifdef __STDC__
  static void
@@ -65,3 +57,13 @@
    int sig;
  #endif
  {
+--- xspim.c.orig	Fri Jan 31 00:32:54 1997
++++ xspim.c	Fri Jan 31 00:32:21 1997
+@@ -58,6 +58,7 @@
+ #include "cl-except.h"
+ #include "cl-tlb.h"
+ #include "cl-cycle.h"
++spim_proc proc;				/* spim's signal tracking structure */
+ #endif
+ 
+ 
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->obrien 
Responsible-Changed-By: obrien 
Responsible-Changed-When: Wed Feb 5 03:22:10 PST 1997 
Responsible-Changed-Why:  
I'm maintainer. 
State-Changed-From-To: open->closed 
State-Changed-By: obrien 
State-Changed-When: Fri Feb 14 05:33:26 PST 1997 
State-Changed-Why:  
Update to port commited. 
>Unformatted:
