Hi,
I corrected my diff.
Azwaw OUSADOU
2012/4/6, Stuart Henderson s...@spacehopper.org:
On 2012/04/04 19:14, Azwaw OUSADOU wrote:
Here is the update to version 8.2 of spim. I Have not response from
maintener.
test.asm it's a simple MIPS code for test spim.
Have fun,
Azwaw OUSADOU
Your diff is difficult to apply, please send a cvs diff instead.
The easiest way to copy your modified files across is probably to
do something like this:-
rsync -avC --delete /usr/ports/mystuff/emulators/spim/
/usr/ports/emulators/spim/
diff -urN emulators/spim/Makefile mystuff/emulators/spim/Makefile
--- emulators/spim/Makefile Tue Nov 16 00:22:08 2010
+++ mystuff/emulators/spim/Makefile Wed Nov 23 18:29:59 2011
@@ -2,8 +2,7 @@
COMMENT= MIPS R2000/R3000 simulator
-DISTNAME= spim-7.3
-REVISION= 2
+DISTNAME= spim-8.0
CATEGORIES= emulators
HOMEPAGE= http://www.cs.wisc.edu/~larus/spim.html
@@ -16,8 +15,7 @@
PERMIT_DISTFILES_CDROM= may not sell
PERMIT_DISTFILES_FTP= may not bundle with commercial product
-WANTLIB= ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c m \
- pthread-stubs xcb
+WANTLIB= ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c m
MASTER_SITES= http://www.cs.wisc.edu/~larus/SPIM/
diff -urN emulators/spim/distinfo mystuff/emulators/spim/distinfo
--- emulators/spim/distinfo Thu Apr 5 17:38:09 2007
+++ mystuff/emulators/spim/distinfo Mon Nov 21 19:27:22 2011
@@ -1,5 +1,5 @@
-MD5 (spim-7.3.tar.gz) = UgAhcJgtFX/YnURbSBvSIw==
-RMD160 (spim-7.3.tar.gz) = +HEWggdV/3YIeIm70POeqsvOIBo=
-SHA1 (spim-7.3.tar.gz) = Ywt168k2UJPhs9DJjKBST3cthkc=
-SHA256 (spim-7.3.tar.gz) = 194GE1xRkQgFWpCr53ztTjbexPfyfOGi/KAFn4bN810=
-SIZE (spim-7.3.tar.gz) = 347226
+MD5 (spim-8.0.tar.gz) = FGVY6CVvK3V3+4Jf3HagTw==
+RMD160 (spim-8.0.tar.gz) = Ep5hpu4vM4q+Lq+xdawW/A69IMc=
+SHA1 (spim-8.0.tar.gz) = l5uR4Ky3kjEFk9Mapl5JzM7HMDY=
+SHA256 (spim-8.0.tar.gz) = byBXdsufoRJylQcAiEOyiQEhkO0xMcvUJsYQpYOH7ks=
+SIZE (spim-8.0.tar.gz) = 355204
diff -urN emulators/spim/patches/patch-Documentation_spim_man mystuff/emulators/spim/patches/patch-Documentation_spim_man
--- emulators/spim/patches/patch-Documentation_spim_man Thu Oct 13 11:06:54 2005
+++ mystuff/emulators/spim/patches/patch-Documentation_spim_man Thu Jan 1 01:00:00 1970
@@ -1,9 +0,0 @@
-$OpenBSD: patch-Documentation_spim_man,v 1.1 2005/10/13 09:06:54 kevlo Exp $
Documentation/spim.man.orig Thu Oct 13 15:34:18 2005
-+++ Documentation/spim.man Thu Oct 13 15:34:21 2005
-@@ -1,5 +1,4 @@
- .\ $Header: /cvs/ports/emulators/spim/patches/patch-Documentation_spim_man,v 1.1 2005/10/13 09:06:54 kevlo Exp $
--
- .TH spim 1
- .SH NAME
- spim \- A MIPS32 Simulator
diff -urN emulators/spim/patches/patch-spim_Configure mystuff/emulators/spim/patches/patch-spim_Configure
--- emulators/spim/patches/patch-spim_Configure Thu Oct 13 11:06:54 2005
+++ mystuff/emulators/spim/patches/patch-spim_Configure Wed Nov 23 18:20:37 2011
@@ -1,6 +1,6 @@
-$OpenBSD: patch-spim_Configure,v 1.1 2005/10/13 09:06:54 kevlo Exp $
spim/Configure.orig Thu Oct 13 15:18:37 2005
-+++ spim/Configure Thu Oct 13 15:18:54 2005
+$OpenBSD$
+--- spim/Configure.orig Wed Nov 23 18:20:17 2011
spim/Configure Wed Nov 23 18:20:32 2011
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
diff -urN emulators/spim/patches/patch-spim_Makefile mystuff/emulators/spim/patches/patch-spim_Makefile
--- emulators/spim/patches/patch-spim_Makefile Thu Nov 9 08:01:47 2006
+++ mystuff/emulators/spim/patches/patch-spim_Makefile Wed Nov 23 18:26:36 2011
@@ -1,7 +1,7 @@
-$OpenBSD: patch-spim_Makefile,v 1.2 2006/11/09 07:01:47 kevlo Exp $
spim/Makefile.orig Tue Aug 29 02:23:19 2006
-+++ spim/Makefile Thu Nov 9 12:08:01 2006
-@@ -45,6 +45,8 @@
+$OpenBSD$
+--- spim/Makefile.orig Wed Nov 23 18:24:13 2011
spim/Makefile Wed Nov 23 18:26:30 2011
+@@ -57,6 +57,8 @@
CPU_DIR = ../CPU
VPATH = src:$(CPU_DIR)
@@ -10,20 +10,24 @@
# Path of directory that contains SPIM tests:
TEST_DIR = ../Tests
-@@ -57,10 +59,10 @@ DOC_DIR = ../Documentation
- BIN_DIR = /usr/local/bin
+@@ -66,13 +68,13 @@ DOC_DIR = ../Documentation
+
+ # Full path for the directory that will hold the executable files:
+-BIN_DIR = /usr/local/bin
++BIN_DIR = ${PREFIX}/bin
+
# Full path for the directory that will hold the exception handler:
--EXCEPTION_DIR = /usr/local/lib
-+EXCEPTION_DIR = $(PREFIX)/share/spim
+-EXCEPTION_DIR = /usr/local/lib/spim
++EXCEPTION_DIR = ${PREFIX}/share/spim
# Full path for the directory that will hold the man files:
--MAN_DIR = /usr/man/mann
-+MAN_DIR = $(PREFIX)/man/man1
+-MAN_DIR = /usr/local/man/en
++MAN_DIR = ${PREFIX}/man/man1
# If you have flex, use it instead of lex. If you use flex, define this
-@@ -97,7 +99,7 @@ CFLAGS = -I. -I$(CPU_DIR) $(DEFINES) -g
+@@ -109,7 +111,7 @@ CFLAGS = -I. -I$(CPU_DIR) $(DEFINES) -g -Wall
YFLAGS = -d --file-prefix=y
YCFLAGS =
LDFLAGS = -lm
@@ -32,12 +36,3 @@
# lex.yy.c is usually compiled with -O to speed it up.
-@@ -174,8 +176,6 @@ clean:
- rm -f
