4 files changed, 22 insertions, 23 deletions

diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index f5770b31cb43..3a9ecc84d6b3 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	spim
-PORTVERSION=	7.3
-PORTREVISION=	1
+PORTVERSION=	7.4
 CATEGORIES=	emulators
 MASTER_SITES=	http://pages.cs.wisc.edu/~larus/SPIM/
 
@@ -21,8 +20,8 @@ BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
 INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}
 
 ALL_TARGET=	${PORTNAME}
-MAN1=		spim.1
 
+MAN1=		spim.1
 PORTDOCS=	cycle.ps.gz spim.ps.gz SPIM.html
 PLIST_FILES=	bin/spim %%DATADIR%%/exceptions.s
 PLIST_DIRS=	%%DATADIR%%
diff --git a/emulators/spim/distinfo b/emulators/spim/distinfo
index 13aa55b54d96..40155d524bfd 100644
--- a/emulators/spim/distinfo
+++ b/emulators/spim/distinfo
@@ -1,3 +1,3 @@
-MD5 (spim-7.3.tar.gz) = 52002170982d157fd89d445b481bd223
-SHA256 (spim-7.3.tar.gz) = d7de06135c519108055a90abe77ced4e36dec4f7f27ce1a2fca0059f86cdf35d
-SIZE (spim-7.3.tar.gz) = 347226
+MD5 (spim-7.4.tar.gz) = 4aae83509d47a5a98d37db5b469cbe9e
+SHA256 (spim-7.4.tar.gz) = abb79a708bc5afaa2f02beea18fb8ad1071264ee1fde75d1e0c439c9c60f19af
+SIZE (spim-7.4.tar.gz) = 358993
diff --git a/emulators/spim/files/patch-spim_Makefile b/emulators/spim/files/patch-spim_Makefile
index 349e07f8532d..ee004b0714cc 100644
--- a/emulators/spim/files/patch-spim_Makefile
+++ b/emulators/spim/files/patch-spim_Makefile
@@ -1,19 +1,19 @@
---- spim/Makefile.orig	2006-08-29 11:23:19.000000000 +0900
-+++ spim/Makefile	2008-04-23 01:36:01.000000000 +0900
+--- spim/Makefile.orig	2009-01-02 04:51:25.000000000 +0900
++++ spim/Makefile	2009-01-21 03:38:23.000000000 +0900
 @@ -54,13 +54,13 @@
  
  
  # Full path for the directory that will hold the executable files:
--BIN_DIR = /usr/local/bin
+-BIN_DIR = /usr/bin
 +BIN_DIR = ${PREFIX}/bin
  
  # Full path for the directory that will hold the exception handler:
--EXCEPTION_DIR = /usr/local/lib
+-EXCEPTION_DIR = /usr/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/share/man/en
++MAN_DIR = ${MANPREFIX}/man/man1
  
  
  # If you have flex, use it instead of lex.  If you use flex, define this
@@ -24,7 +24,7 @@
 -CC = gcc
 -CFLAGS = -I. -I$(CPU_DIR) $(DEFINES) -g -Wall
 -YFLAGS = -d --file-prefix=y
-+CC? = gcc
++CC ?= gcc
 +CFLAGS += -I. -I$(CPU_DIR) $(DEFINES) -Wall
 +YFLAGS = -d
  YCFLAGS =
diff --git a/emulators/spim/files/patch-xspim_Imakefile b/emulators/spim/files/patch-xspim_Imakefile
index 12b58e283392..a1c3503fabe5 100644
--- a/emulators/spim/files/patch-xspim_Imakefile
+++ b/emulators/spim/files/patch-xspim_Imakefile
@@ -1,19 +1,19 @@
---- xspim/Imakefile.orig	2006-08-29 11:23:19.000000000 +0900
-+++ xspim/Imakefile	2008-04-23 00:58:19.000000000 +0900
+--- xspim/Imakefile.orig	2009-01-02 04:51:26.000000000 +0900
++++ xspim/Imakefile	2009-01-21 03:18:12.000000000 +0900
 @@ -33,13 +33,13 @@
  #
  
  # Full path for the directory that will hold the executable files:
--BIN_DIR = /usr/local/bin
+-BIN_DIR = /usr/bin
 +BIN_DIR = ${PREFIX}/bin
  
  # Full path for the directory that will hold the exception handler:
--EXCEPTION_DIR = /usr/local/lib
+-EXCEPTION_DIR = /usr/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/share/man/en
++MAN_DIR = ${MANPREFIX}/man/man1
  
  
  # If you have flex, use it instead of lex.  If you use flex, define this
@@ -26,12 +26,12 @@
  
  INCLUDES = -I. -I$(CPU_DIR)
  
-@@ -113,7 +113,7 @@
- 	./Configure
+@@ -114,7 +114,7 @@
  
+ INSTALLFLAGS = -D
  InstallProgram(xspim,$(BIN_DIR))
--InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR))
-+#InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR))
+-InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR)/exceptions.s)
++#InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR)/exceptions.s)
  #InstallManPage($(DOC_DIR)/xspim,$(MAN_DIR))