update to spim 7.2.1

This commit is contained in:
kevlo 2005-10-13 09:06:54 +00:00
parent c997e6d13b
commit 7455beb56b
10 changed files with 106 additions and 103 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.7 2005/01/31 06:18:23 kevlo Exp $
# $OpenBSD: Makefile,v 1.8 2005/10/13 09:06:54 kevlo Exp $
COMMENT= "MIPS R2000/R3000 simulator"
DISTNAME= spim
PKGNAME= spim-7.1
PKGNAME= spim-7.2.1
CATEGORIES= emulators
HOMEPAGE= http://www.cs.wisc.edu/~larus/spim.html
@ -19,26 +19,24 @@ WANTLIB= ICE SM X11 Xaw Xext Xmu Xp Xpm Xt c m
MASTER_SITES= http://www.cs.wisc.edu/~larus/SPIM/
CONFIGURE_STYLE= gnu imake
CONFIGURE_SCRIPT= Configure
BUILD_DEPENDS= :bison-*:devel/bison
XMKMF= xmkmf
WRKDIST= ${WRKDIR}/${PKGNAME}
ALL_TARGET= spim xspim
FAKE_FLAGS= PREFIX="${PREFIX}"
REGRESS_DEPENDS=::emulators/spim
REGRESS_TARGET= test
DOCS= cycle.ps
do-build:
(cd ${WRKSRC}/spim; ./Configure && ${MAKE})
(cd ${WRKSRC}/xspim; ${XMKMF} && ${MAKE})
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/spim
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/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
${INSTALL_MAN} ${WRKSRC}/spim.man ${PREFIX}/man/man1/spim.1
${INSTALL_MAN} ${WRKSRC}/xspim.man ${PREFIX}/man/man1/xspim.1
${INSTALL_PROGRAM} ${WRKSRC}/spim/spim ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/xspim/xspim ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/CPU/exceptions.s ${PREFIX}/share/spim
${INSTALL_MAN} ${WRKSRC}/Documentation/spim.man ${PREFIX}/man/man1/spim.1
${INSTALL_MAN} ${WRKSRC}/Documentation/xspim.man ${PREFIX}/man/man1/xspim.1
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
MD5 (spim.tar.gz) = 24546da54bca92d96bf2ea284e81d6eb
RMD160 (spim.tar.gz) = 175f63d95011a20087ab135de54b03fccc98286d
SHA1 (spim.tar.gz) = 3e0399e4c2e007aecbd2532b9d8f3f63b7035ff9
SIZE (spim.tar.gz) = 307599
MD5 (spim.tar.gz) = 0fe5696659364d38660f5610ef380ad0
RMD160 (spim.tar.gz) = fa3f57d80ddfc6870f83f4d90d038c30fa79fb74
SHA1 (spim.tar.gz) = 22bcf17df10bbe28b3ee93256763ac7167523aba
SIZE (spim.tar.gz) = 534388

View File

@ -0,0 +1,9 @@
$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: /home/cvs/ports/emulators/spim/patches/Attic/patch-Documentation_spim_man,v 1.1 2005/10/13 09:06:54 kevlo Exp $
-
.TH spim 1
.SH NAME
spim \- A MIPS32 Simulator

View File

@ -1,32 +0,0 @@
$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 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
# Full path for the directory that will hold the man files:
-MAN_DIR = /var/unsup/man
+MAN_DIR = $(PREFIX)/man
# If you have flex, use it instead of lex. If you use flex, define this
@@ -250,9 +250,9 @@ shar:
mv -f lex.yy.c.xx lex.yy.c
depend::
- makedepend -w10 *.c
+ makedepend -w10 -I$(X11BASE)/include *.c
-#
+#
# DO NOT DELETE THIS LINE -- make depend depends on it.
buttons.o: spim.h

View File

@ -0,0 +1,9 @@
$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
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
#
# Shell script to configure SPIM.
#

View File

@ -0,0 +1,46 @@
$OpenBSD: patch-spim_Makefile,v 1.1 2005/10/13 09:06:54 kevlo Exp $
--- spim/Makefile.orig Sun Aug 28 20:58:14 2005
+++ spim/Makefile Thu Oct 13 17:00:45 2005
@@ -45,17 +45,19 @@
CPU_DIR = ../CPU
VPATH = src:$(CPU_DIR)
+PREFIX = /usr/local
+
# Full path for directory that will hold the exception handler file:
-EXCEPTION_DIR = ../CPU
+EXCEPTION_DIR = $(PREFIX)/share/spim
# Path of directory that contains SPIM tests:
TEST_DIR = ../Tests
# Full path for the directory that will hold the executable files:
-BIN_DIR = /usr/unsup/bin
+BIN_DIR = $(PREFIX)/bin
# Full path for the directory that will hold the man files:
-MAN_DIR = /usr/unsup/man
+MAN_DIR = $(PREFIX)/man/man1
# Full path for the exception handler file:
@@ -95,7 +97,7 @@ CFLAGS = -I. -I$(CPU_DIR) $(DEFINES) -g
YFLAGS = -d --file-prefix=y
YCFLAGS =
LDFLAGS = -lm
-CSH = bash
+CSH = sh
# lex.yy.c is usually compiled with -O to speed it up.
@@ -175,9 +177,7 @@ clean:
rm -f spim spim.exe *.o TAGS test.out lex.yy.c y.tab.c y.tab.h y.output
install: spim
- install -c -s spim $(BIN_DIR)
- install -c -m 0444 exceptions.s $(EXCEPTION_DIR)
- install -c -m 0444 spim.man $(MAN_DIR)
+ install -c -m 0444 ../Documentation/spim.man $(MAN_DIR)/spim.1
very-clean: clean
rm -f configuration

View File

@ -1,39 +0,0 @@
$OpenBSD: patch-spim_c,v 1.2 2005/01/31 06:18:23 kevlo Exp $
--- spim.c.orig Mon Jan 3 00:03:50 2005
+++ spim.c Mon Jan 31 13:40:55 2005
@@ -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>
@@ -1016,7 +1017,8 @@ console_to_program ()
#ifdef USE_TERMIOS
struct termios params;
- ioctl (console_in.i, TCGETA, (char *) &saved_console_state);
+ tcgetattr(console_in.i, &saved_console_state);
+
params = saved_console_state;
params.c_iflag &= ~(ISTRIP|IUCLC|INLCR|ICRNL|IGNCR|IXON|IXOFF|IXANY|INPCK|BRKINT|PARMRK);
@@ -1027,7 +1029,7 @@ console_to_program ()
params.c_lflag = 0;
params.c_cc[VMIN] = 1;
params.c_cc[VTIME] = 1;
- ioctl ((int)console_in.i, TCSETA, (char *) &params);
+ tcsetattr(console_in.i, TCSANOW, &params);
#else
int flags;
ioctl ((int) console_in.i, TIOCGETP, (char *) &saved_console_state);
@@ -1048,7 +1050,7 @@ console_to_spim ()
{
if (mapped_io && console_state_saved)
#ifdef USE_TERMIOS
- ioctl ((int) console_in.i, TCSETA, (char *) &saved_console_state);
+ tcsetattr(console_in.i, TCSANOW, &saved_console_state);
#else
ioctl ((int) console_in.i, TIOCSETP, (char *) &saved_console_state);
#endif

View File

@ -1,9 +0,0 @@
$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

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-xspim_Imakefile,v 1.1 2005/10/13 09:06:54 kevlo Exp $
--- xspim/Imakefile.orig Sun Aug 28 20:58:15 2005
+++ xspim/Imakefile Thu Oct 13 17:05:28 2005
@@ -41,7 +41,8 @@ MAN_DIR = /usr/local/share/man1
# Full path for the exception handler file:
#EXCEPTION_PATH = /usr/local/lib/exceptions.s
# Use this path for testing:
-EXCEPTION_PATH = $(CPU_DIR)/exceptions.s
+PREFIX = /usr/local
+EXCEPTION_PATH = $(PREFIX)/share/spim/exceptions.s
# If you have flex, use it instead of lex. If you use flex, define this
# variable and set LEXFLAGS.
@@ -119,9 +120,6 @@ configuration:
NormalProgramTarget(xspim_sub,$(XOBJS),$(DEPLIBS),$(LOCALLIBS),$(SYSLIBS))
InstallProgram(xspim,$(BIN_DIR))
-InstallManPage(xspim,$(MAN_DIR))
-InstallNonExec($(EXCEPTION_DIR)/exceptions.s,$(EXCEPTION_PATH))
-
y.tab.h: y.tab.c

View File

@ -1,9 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2004/10/01 06:18:14 robert Exp $
@comment $OpenBSD: PLIST,v 1.4 2005/10/13 09:06:55 kevlo Exp $
bin/spim
bin/xspim
@man man/man1/spim.1
@man man/man1/xspim.1
share/doc/spim/
share/doc/spim/cycle.ps
share/spim/
share/spim/exceptions.s