[45397] trunk/dports/emulators/spim
blb at macports.org
blb at macports.org
Thu Jan 15 00:20:56 PST 2009
Revision: 45397
http://trac.macports.org/changeset/45397
Author: blb at macports.org
Date: 2009-01-15 00:20:55 -0800 (Thu, 15 Jan 2009)
Log Message:
-----------
emulators/spim - version update to 7.4, fixes tickets #15441 and #15454;
thanks to Steve Checkoway for the majority of work
Modified Paths:
--------------
trunk/dports/emulators/spim/Portfile
Added Paths:
-----------
trunk/dports/emulators/spim/files/patch-spim_Makefile.diff
trunk/dports/emulators/spim/files/patch-xspim_Imakefile.diff
Removed Paths:
-------------
trunk/dports/emulators/spim/files/patch-Configure
trunk/dports/emulators/spim/files/patch-Makefile
trunk/dports/emulators/spim/files/patch-spim.c
Modified: trunk/dports/emulators/spim/Portfile
===================================================================
--- trunk/dports/emulators/spim/Portfile 2009-01-15 08:15:38 UTC (rev 45396)
+++ trunk/dports/emulators/spim/Portfile 2009-01-15 08:20:55 UTC (rev 45397)
@@ -2,7 +2,7 @@
PortSystem 1.0
name spim
-version 7.1
+version 7.4
categories emulators devel lang x11
maintainers nomaintainer
description an assembly language MIPS R2000/R3000 simulator
@@ -19,27 +19,43 @@
evolved considerably since then (in particular the 64 bit extensions), which \
means that SPIM will not run programs compiled for recent MIPS or SGI \
processors.
-homepage http://www.cs.wisc.edu/~larus/spim.html
+homepage http://pages.cs.wisc.edu/~larus/spim.html
platforms darwin
-master_sites http://www.cs.wisc.edu/~larus/SPIM/
-distname ${name}-${version}
-checksums md5 24546da54bca92d96bf2ea284e81d6eb
+master_sites http://pages.cs.wisc.edu/~larus/SPIM
+distname ${name}
+dist_subdir ${name}/${version}
+checksums md5 5251ec442ef364ed8dede5dbda86fb47 \
+ sha1 e929fc5c2e258818a2325b1378740b3dd68dd5b6 \
+ rmd160 6fbce1b50fb669ec068ac7000b88a899d447dec0
-depends_lib lib:libX11.6:XFree86
+depends_lib lib:libXaw:xorg-libXaw lib:libXp.6:xorg-libXp
+depends_build port:rman port:flex port:bison bin:xmkmf:imake
+
worksrcdir ${name}-${version}
-patchfiles patch-Configure patch-Makefile patch-spim.c
-post-patch {
- reinplace s|__PREFIX__|${prefix}| ${worksrcpath}/Makefile
+patchfiles patch-spim_Makefile.diff patch-xspim_Imakefile.diff
+
+configure {
+ system "cd ${worksrcpath}/spim && ./Configure"
+ system "cd ${worksrcpath}/xspim && xmkmf && ./Configure"
}
+post-configure {
+ reinplace {s|$(DESTDIR)$(MAN_DIR)/$(DOC_DIR)/xspim.$(MANSUFFIX)|$(DESTDIR)$(MAN_DIR)/xspim.$(MANSUFFIX)|} ${worksrcpath}/xspim/Makefile
+}
-configure.cmd ./Configure
+build {
+ system "cd ${worksrcpath}/spim && make prefix=${prefix} spim"
+ system "cd ${worksrcpath}/xspim && make prefix=${prefix} xspim"
+}
-build.target spim xspim
+test {
+ system "cd ${worksrcpath}/spim && make test"
+}
-pre-destroot {
- xinstall -d ${destroot}${prefix}/share/spim
+destroot {
+ system "cd ${worksrcpath}/spim && make DESTDIR=${destroot} prefix=${prefix} install install-man"
+ system "cd ${worksrcpath}/xspim && make DESTDIR=${destroot} prefix=${prefix} install install.man"
}
-destroot.target install install.man
+
Deleted: trunk/dports/emulators/spim/files/patch-Configure
===================================================================
--- trunk/dports/emulators/spim/files/patch-Configure 2009-01-15 08:15:38 UTC (rev 45396)
+++ trunk/dports/emulators/spim/files/patch-Configure 2009-01-15 08:20:55 UTC (rev 45397)
@@ -1,20 +0,0 @@
---- Configure.orig 2005-06-01 01:09:40.000000000 -0400
-+++ Configure 2005-06-01 01:09:47.000000000 -0400
-@@ -149,17 +149,6 @@
- fi;
-
-
--echo
--echo Checking for /usr/include/termios.h
--if [ -f /usr/include/termios.h ]; then
-- echo "-DUSE_TERMIOS" >> configuration
-- echo "Yes, it is there"
--else
-- # No termios
-- echo "No, it is not there"
--fi;
--
--
- if [ -f /usr/lib/libc.dylib ]; then
- # Darwin headers restricted if _POSIX_SOURCE
- echo "-U_POSIX_SOURCE" >> configuration
Deleted: trunk/dports/emulators/spim/files/patch-Makefile
===================================================================
--- trunk/dports/emulators/spim/files/patch-Makefile 2009-01-15 08:15:38 UTC (rev 45396)
+++ trunk/dports/emulators/spim/files/patch-Makefile 2009-01-15 08:20:55 UTC (rev 45397)
@@ -1,77 +0,0 @@
---- Makefile.orig 2005-01-02 19:03:48.000000000 -0500
-+++ Makefile 2005-06-01 01:30:01.000000000 -0400
-@@ -93,7 +93,7 @@
-
- XMISCDIR = /s/xmisc-1.0
-
-- XPMROOT = /s/xpm-3.4k
-+ XPMROOT = /usr/X11R6
-
- XPMLIBDIR = $(XPMROOT)/lib
- XPMBINDIR = $(XPMROOT)/bin
-@@ -139,8 +139,8 @@
- IMAKESRC = $(CONFIGSRC)/imake
- DEPENDSRC = $(CONFIGSRC)/util
-
-- INCROOT = /s/XFree86-4.2.1/@sys/include
-- USRLIBDIR = /s/XFree86-4.2.1/@sys/lib
-+ INCROOT = /usr/X11R6/include
-+ USRLIBDIR = /usr/X11R6/lib
- VARDIR = /var
- VARLIBDIR = $(VARDIR)/lib
- SYSTEMUSRLIBDIR = /usr/lib
-@@ -182,8 +182,8 @@
- RAWCPP = /usr/ccs/lib/cpp -undef $(STD_CPP_OPTIONS)
- PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES)
-
-- MKDIRHIER = sinstall mkdir -p
-- INSTALL = sinstall /usr/ucb/install
-+ MKDIRHIER = mkdir -p
-+ INSTALL = /usr/bin/install
-
- INSTALLFLAGS = -c
- LD = /usr/ccs/bin/ld
-@@ -241,7 +241,7 @@
- STD_DEFINES = -Dsun -Dsparc -DSVR4 -D__EXTENSIONS__ $(PROJECT_DEFINES)
- EXTRA_LOAD_FLAGS =
- EXTRA_LDOPTIONS =
-- EXTRA_LIBRARIES = -lsocket -lnsl
-+ EXTRA_LIBRARIES =
- TAGS = ctags
-
- PARALLELMFLAGS =
-@@ -372,7 +372,7 @@
-
- CONFDIR = $(VARDIR)
-
-- DOCDIR = $(LIBDIR)/doc
-+ DOCDIR = __PREFIX__/share/spim/doc
- DOCHTMLDIR = $(DOCDIR)/html
- DOCPSDIR = $(DOCDIR)/PostScript
- FONTDIR = $(LIBDIR)/fonts
-@@ -902,7 +902,7 @@
- MRESOURCESRC = $(MLIBSRC)/Mrm
- UILSRC = $(MCLIENTSRC)/uil
-
-- MPROJECTROOT = /s/motif-2.1.10
-+ MPROJECTROOT = /usr/X11R6
-
- UIL = uil
- DEPUIL = $(BINDIR)/uil
-@@ -1011,13 +1011,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__/share/man
-
- # If you have flex, use it instead of lex. If you use flex, define this
- # variable and set LEXFLAGS.
Deleted: trunk/dports/emulators/spim/files/patch-spim.c
===================================================================
--- trunk/dports/emulators/spim/files/patch-spim.c 2009-01-15 08:15:38 UTC (rev 45396)
+++ trunk/dports/emulators/spim/files/patch-spim.c 2009-01-15 08:20:55 UTC (rev 45397)
@@ -1,11 +0,0 @@
---- spim.c.orig 2005-06-01 01:02:42.000000000 -0400
-+++ spim.c 2005-06-01 01:02:51.000000000 -0400
-@@ -111,7 +111,7 @@
-
- /* Non-zero => load standard exception handler */
- static int load_exception_handler = 1;
--static char *exception_file_name = DEFAULT_EXCEPTION_HANDLER;
-+char *exception_file_name = DEFAULT_EXCEPTION_HANDLER;
- static int console_state_saved;
- #ifdef USE_TERMIOS
- static struct termios saved_console_state;
Added: trunk/dports/emulators/spim/files/patch-spim_Makefile.diff
===================================================================
--- trunk/dports/emulators/spim/files/patch-spim_Makefile.diff (rev 0)
+++ trunk/dports/emulators/spim/files/patch-spim_Makefile.diff 2009-01-15 08:20:55 UTC (rev 45397)
@@ -0,0 +1,41 @@
+--- spim/Makefile.orig 2009-01-14 22:29:50.000000000 -0800
++++ spim/Makefile 2009-01-14 23:24:24.000000000 -0800
+@@ -51,16 +51,16 @@
+ # Path of directory that contains documentation:
+ DOC_DIR = ../Documentation
+
+-
++prefix = /usr/local
+
+ # Full path for the directory that will hold the executable files:
+-BIN_DIR = /usr/bin
++BIN_DIR = $(prefix)/bin
+
+ # Full path for the directory that will hold the exception handler:
+-EXCEPTION_DIR = /usr/lib/spim
++EXCEPTION_DIR = $(prefix)/share/spim
+
+ # Full path for the directory that will hold the man files:
+-MAN_DIR = /usr/share/man/en
++MAN_DIR = $(prefix)/share/man/man1
+
+
+ # If you have flex, use it instead of lex. If you use flex, define this
+@@ -174,11 +174,14 @@
+ rm -f spim spim.exe *.o TAGS test.out lex.yy.c y.tab.c y.tab.h y.output
+
+ install: spim
+- install -D spim $(BIN_DIR)
+- install -D -m 0444 $(CPU_DIR)/exceptions.s $(EXCEPTION_DIR)
++ install -d $(DESTDIR)$(BIN_DIR)
++ install -m 0755 spim $(DESTDIR)$(BIN_DIR)/spim
++ install -d $(DESTDIR)$(EXCEPTION_DIR)
++ install -m 0644 $(CPU_DIR)/exceptions.s $(DESTDIR)$(EXCEPTION_DIR)/exceptions.
+
+ install-man:
+- install -D -m 0444 $(DOC_DIR)/spim.man $(MAN_DIR)
++ install -d $(DESTDIR)$(MAN_DIR)
++ install -m 0644 $(DOC_DIR)/spim.man $(DESTDIR)$(MAN_DIR)/spim.1
+
+ very-clean: clean
+ rm -f configuration
Added: trunk/dports/emulators/spim/files/patch-xspim_Imakefile.diff
===================================================================
--- trunk/dports/emulators/spim/files/patch-xspim_Imakefile.diff (rev 0)
+++ trunk/dports/emulators/spim/files/patch-xspim_Imakefile.diff 2009-01-15 08:20:55 UTC (rev 45397)
@@ -0,0 +1,31 @@
+--- xspim/Imakefile.orig 2009-01-01 12:51:26.000000000 -0700
++++ xspim/Imakefile 2009-01-15 00:50:44.000000000 -0700
+@@ -32,14 +32,16 @@
+ # is compiled and installed:
+ #
+
++prefix = /usr/local
++
+ # Full path for the directory that will hold the executable files:
+-BIN_DIR = /usr/bin
++BIN_DIR = $(prefix)/bin
+
+ # Full path for the directory that will hold the exception handler:
+-EXCEPTION_DIR = /usr/lib/spim
++EXCEPTION_DIR = $(prefix)/share/spim
+
+ # Full path for the directory that will hold the man files:
+-MAN_DIR = /usr/share/man/en
++MAN_DIR = $(prefix)/share/man/man1
+
+
+ # If you have flex, use it instead of lex. If you use flex, define this
+@@ -112,7 +114,7 @@
+ configuration:
+ ./Configure
+
+-INSTALLFLAGS = -D
++#INSTALLFLAGS = -D
+ InstallProgram(xspim,$(BIN_DIR))
+ InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR)/exceptions.s)
+ #InstallManPage($(DOC_DIR)/xspim,$(MAN_DIR))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090115/cfe0a946/attachment.html>
More information about the macports-changes
mailing list