Upgrade to v7.2.1.

Upstream changes from the previous ported version include:

 - bug fixes and documentation cleanups

The port now offers a 'GUI' knob that controls whether the X GUI
interface is built.

Take maintainership.

8 files changed, 170 insertions, 99 deletions

diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index 8ac669a3b73b..98befb88539a 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -7,33 +7,54 @@
 #
 
 PORTNAME=	spim
-PORTVERSION=	7.0
+PORTVERSION=	7.2.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.cs.wisc.edu/~larus/SPIM/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jkoshy@FreeBSD.org
 COMMENT=	MIPS R2000 Simulator
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_XLIB=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_SCRIPT=	Configure
-MAKEFILE=	Makefile.std
-ALL_TARGET=	spim xspim
-MAN1=		spim.1 xspim.1
-
-PORTDOCS=	cycle.ps.gz
-PLIST_FILES=	bin/spim bin/xspim %%DATADIR%%/exceptions.s
+MAN1=		spim.1
+
+PORTDOCS=	cycle.ps.gz spim.ps.gz SPIM.html
+PLIST_FILES=	bin/spim %%DATADIR%%/exceptions.s
 PLIST_DIRS=	%%DATADIR%%
 
-post-build:
+OPTIONS=	GUI "Graphical user interface" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GUI)
+USE_XLIB=	yes
+BUILD_DEPENDS+=			imake:${X_IMAKE_PORT}
+PLIST_FILES+=	bin/xspim
+MAN1+=		xspim.1
+.endif
+
+do-configure:
+
+do-build:
+	cd ${WRKSRC}/spim && ${MAKE}
+.if defined(WITH_GUI)
+	cd ${WRKSRC}/xspim && ${XMKMF} && ${MAKE}
+.endif
+
+do-install:
+	cd ${WRKSRC}/spim && ${MAKE} ${INSTALL_TARGET}
+.if defined(WITH_GUI)
+	cd ${WRKSRC}/xspim && ${MAKE} ${INSTALL_TARGET}
+	${INSTALL_MAN} ${WRKSRC}/Documentation/xspim.man ${PREFIX}/man/man1/xspim.1
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Documentation/cycle.ps ${DOCSDIR}
-	${GZIP_CMD} ${DOCSDIR}/cycle.ps
+	${INSTALL_DATA} ${WRKSRC}/Documentation/TeX/cycle.ps ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/Documentation/TeX/spim.ps ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/Documentation/SPIM.html ${DOCSDIR}
+	${GZIP_CMD} ${DOCSDIR}/cycle.ps ${DOCSDIR}/spim.ps
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/emulators/spim/distinfo b/emulators/spim/distinfo
index 4b2666540e83..c5ffe1adb178 100644
--- a/emulators/spim/distinfo
+++ b/emulators/spim/distinfo
@@ -1,3 +1,3 @@
-MD5 (spim-7.0.tar.gz) = b163deae4727e5db9d3f234bb89fa915
-SHA256 (spim-7.0.tar.gz) = f8ab69cbc6281225b40d2838ce8c46f61bd87a898cb31a3fd4287f4d094e3864
-SIZE (spim-7.0.tar.gz) = 305477
+MD5 (spim-7.2.1.tar.gz) = 0fe5696659364d38660f5610ef380ad0
+SHA256 (spim-7.2.1.tar.gz) = 347771fc7f91ba12092b22374ddb377f13c588e6d0d1a0cdacea8bbb76f347fb
+SIZE (spim-7.2.1.tar.gz) = 534388
diff --git a/emulators/spim/files/patch-aa b/emulators/spim/files/patch-aa
deleted file mode 100644
index 50dbcae0ee76..000000000000
--- a/emulators/spim/files/patch-aa
+++ /dev/null
@@ -1,81 +0,0 @@
---- Makefile.std.orig	Mon Aug 23 00:58:00 2004
-+++ Makefile.std	Thu Dec 30 01:35:28 2004
-@@ -46,21 +46,21 @@
- 
- 
- # Full path for directory containing X11 include files:
--X_INCLUDE_DIR=/usr/X11/include
-+X_INCLUDE_DIR=${X11BASE}/include
- 
- 
- # Location of X11 root directory.
--TOPDIR = /usr/X11
-+TOPDIR = ${X11BASE}
- 
- 
- # 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 = /usr/unsup/man
-+MAN_DIR = ${PREFIX}/man/man1
- 
- 
- # Full path for the exception handler file:
-@@ -93,8 +93,8 @@
- 
- DEFINES = $(ENDIAN) $(MEM_SIZES) -DDEFAULT_EXCEPTION_HANDLER=$(EXCEPTION_PATH) -DSPIM_VERSION="\"`cat VERSION`\""
- 
--CC = cc
--CFLAGS = $(DEFINES)
-+CC ?= cc
-+CFLAGS += $(DEFINES) $(IFLAGS)
- IFLAGS = -I$(X_INCLUDE_DIR)
- YFLAGS = -d
- YCFLAGS =
-@@ -120,18 +120,18 @@
- 
- spim:   force
- 	@touch .spim-made
--	make -f Makefile.std spim2
-+	$(MAKE) -f Makefile.std spim2
- 
- spim2:	$(OBJS) spim.o
--	$(CC) -g $(OBJS) spim.o $(LDFLAGS) -o spim -lm
-+	$(CC) $(OBJS) spim.o $(LDFLAGS) -o spim -lm
- 
- 
- xspim:  force
- 	@touch .spim-made
--	make -f Makefile.std xspim2
-+	$(MAKE) -f Makefile.std xspim2
- 
- xspim2:	$(OBJS) $(XOBJS) xspim.o
--	$(CC) -g $(OBJS) $(XOBJS) xspim.o $(LDFLAGS) $(XLDFLAGS) -o xspim -lm
-+	$(CC) $(OBJS) $(XOBJS) xspim.o $(LDFLAGS) $(XLDFLAGS) -o xspim -lm
- 
- force:	configuration
- 
-@@ -192,11 +192,12 @@
- 	  spim.tar.* spim.aux spim.log spim.dvi spim.shar*
- 
- install: spim xspim
--	install -c -s  spim $(BIN_DIR)
--	install -c -s  xspim $(BIN_DIR)
--	install -c -m 0444 exceptions.s $(EXCEPTION_DIR)
--	install -c -m 0444 spim.man $(MAN_DIR)
--	install -c -m 0444 xspim.man $(MAN_DIR)
-+	-mkdir -p $(BIN_DIR) $(EXCEPTION_DIR) $(MAN_DIR)
-+	${BSD_INSTALL_PROGRAM} spim $(BIN_DIR)
-+	${BSD_INSTALL_PROGRAM} xspim $(BIN_DIR)
-+	${BSD_INSTALL_DATA} exceptions.s $(EXCEPTION_DIR)
-+	${BSD_INSTALL_MAN} spim.man $(MAN_DIR)/spim.1
-+	${BSD_INSTALL_MAN} xspim.man $(MAN_DIR)/xspim.1
- 
- very-clean: clean
- 	rm -f y.tab.h y.tab.c lex.yy.c spim.tar* Documentation/spim.ps
diff --git a/emulators/spim/files/patch-spim_Configure b/emulators/spim/files/patch-spim_Configure
new file mode 100644
index 000000000000..a3c0da7ac0a7
--- /dev/null
+++ b/emulators/spim/files/patch-spim_Configure
@@ -0,0 +1,8 @@
+--- ./spim/Configure.orig	Mon Aug 29 02:28:14 2005
++++ ./spim/Configure	Mon Jul 17 09:08:49 2006
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ #
+ # Shell script to configure SPIM.
+ #
diff --git a/emulators/spim/files/patch-spim_Makefile b/emulators/spim/files/patch-spim_Makefile
new file mode 100644
index 000000000000..e9aa25f973bd
--- /dev/null
+++ b/emulators/spim/files/patch-spim_Makefile
@@ -0,0 +1,73 @@
+--- spim/Makefile.orig	Mon Aug 29 02:28:14 2005
++++ spim/Makefile	Mon Jul 17 14:46:59 2006
+@@ -46,16 +46,16 @@
+ VPATH = src:$(CPU_DIR)
+ 
+ # 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:
+@@ -90,12 +90,12 @@
+ 
+ DEFINES = $(ENDIAN) $(MEM_SIZES) -DDEFAULT_EXCEPTION_HANDLER=$(EXCEPTION_PATH) -DSPIM_VERSION="\"`cat ../VERSION`\""
+ 
+-CC = gcc
+-CFLAGS = -I. -I$(CPU_DIR) $(DEFINES) -g -Wall
+-YFLAGS = -d --file-prefix=y
++CC? = gcc
++CFLAGS += -I. -I$(CPU_DIR) $(DEFINES) -Wall
++YFLAGS = -d
+ YCFLAGS =
+ LDFLAGS = -lm
+-CSH = bash
++CSH = csh
+ 
+ # lex.yy.c is usually compiled with -O to speed it up.
+ 
+@@ -108,10 +108,10 @@
+ 
+ 
+ spim:   force
+-	make -f Makefile spim2
++	$(MAKE) -f Makefile spim2
+ 
+ spim2:	$(OBJS) spim.o
+-	$(CC) -g $(OBJS) spim.o $(LDFLAGS) -o spim -lm
++	$(CC) $(OBJS) spim.o $(LDFLAGS) -o spim -lm
+ 
+ 
+ force:	configuration
+@@ -176,8 +176,9 @@
+ 
+ install: spim
+ 	install -c -s  spim $(BIN_DIR)
+-	install -c -m 0444 exceptions.s $(EXCEPTION_DIR)
+-	install -c -m 0444 spim.man $(MAN_DIR)
++	mkdir -p $(EXCEPTION_DIR)
++	install -c -m 0444 $(CPU_DIR)/exceptions.s $(EXCEPTION_DIR)
++	install -c -m 0444 ../Documentation/spim.man $(MAN_DIR)/spim.1
+ 
+ very-clean: clean
+ 	rm -f configuration
+@@ -195,7 +196,7 @@
+ y.tab.h: y.tab.c
+ 
+ y.tab.c: $(CPU_DIR)/parser.y
+-	bison $(YFLAGS) $(CPU_DIR)/parser.y
++	yacc $(YFLAGS) $(CPU_DIR)/parser.y
+ 
+ y.tab.o: y.tab.c
+ 	$(CC) $(CFLAGS) $(YCFLAGS) -c y.tab.c
diff --git a/emulators/spim/files/patch-spim_spim.c b/emulators/spim/files/patch-spim_spim.c
new file mode 100644
index 000000000000..d62ec5f78590
--- /dev/null
+++ b/emulators/spim/files/patch-spim_spim.c
@@ -0,0 +1,10 @@
+--- ./spim/spim.c.orig	Mon Jul 17 09:26:54 2006
++++ ./spim/spim.c	Mon Jul 17 09:27:13 2006
+@@ -32,6 +32,7 @@
+ #include <ctype.h>
+ #include <setjmp.h>
+ #include <signal.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
+ 
diff --git a/emulators/spim/files/patch-xspim_Configure b/emulators/spim/files/patch-xspim_Configure
new file mode 100644
index 000000000000..d9a80c1f9a12
--- /dev/null
+++ b/emulators/spim/files/patch-xspim_Configure
@@ -0,0 +1,8 @@
+--- ./xspim/Configure.orig	Mon Aug 29 02:28:15 2005
++++ ./xspim/Configure	Mon Jul 17 09:32:01 2006
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ #
+ # Shell script to configure SPIM.
+ #
diff --git a/emulators/spim/files/patch-xspim_Imakefile b/emulators/spim/files/patch-xspim_Imakefile
new file mode 100644
index 000000000000..ccceba07d3a5
--- /dev/null
+++ b/emulators/spim/files/patch-xspim_Imakefile
@@ -0,0 +1,32 @@
+--- xspim/Imakefile.orig	Mon Aug 29 02:28:15 2005
++++ xspim/Imakefile	Mon Jul 17 14:24:25 2006
+@@ -33,15 +33,15 @@
+ #
+ 
+ # 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 man files:
+-MAN_DIR = /usr/local/share/man1
++MAN_DIR = ${PREFIX}/share/man1
+ 
+ # Full path for the exception handler file:
+-#EXCEPTION_PATH = /usr/local/lib/exceptions.s
++EXCEPTION_PATH = ${PREFIX}/share/spim/exceptions.s
+ # Use this path for testing:
+-EXCEPTION_PATH = $(CPU_DIR)/exceptions.s
++#EXCEPTION_PATH = $(CPU_DIR)/exceptions.s
+ 
+ # If you have flex, use it instead of lex.  If you use flex, define this
+ # variable and set LEXFLAGS.
+@@ -119,9 +119,6 @@
+ 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
+