FreeBSD Bugzilla – Attachment 87283 Details for
Bug 123871
Update port: emulators/spim to 7.3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 7.63 KB, created by
tkato432
on 2008-05-21 18:10:03 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
tkato432
Created:
2008-05-21 18:10:03 UTC
Size:
7.63 KB
patch
obsolete
>diff -urN /usr/ports/emulators/spim/Makefile emulators/spim/Makefile >--- /usr/ports/emulators/spim/Makefile 2008-04-20 10:13:57.000000000 +0900 >+++ emulators/spim/Makefile 2008-04-23 01:37:17.000000000 +0900 >@@ -7,55 +7,49 @@ > # > > PORTNAME= spim >-PORTVERSION= 7.2.1 >-PORTREVISION= 3 >+PORTVERSION= 7.3 > CATEGORIES= emulators >-MASTER_SITES= http://www.cs.wisc.edu/~larus/SPIM/ >+MASTER_SITES= http://pages.cs.wisc.edu/~larus/SPIM/ > > MAINTAINER= ports@FreeBSD.org > COMMENT= MIPS32 Simulator > >-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} >+OPTIONS= GUI "Graphical user interface" on >+ >+BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} >+INSTALL_WRKSRC= ${WRKSRC}/${PORTNAME} > >+ALL_TARGET= ${PORTNAME} > MAN1= spim.1 > > PORTDOCS= cycle.ps.gz spim.ps.gz SPIM.html > PLIST_FILES= bin/spim %%DATADIR%%/exceptions.s > PLIST_DIRS= %%DATADIR%% > >-OPTIONS= GUI "Graphical user interface" on >- > .include <bsd.port.pre.mk> > >-.if defined(WITH_GUI) >+.if !defined(WITHOUT_GUI) > USE_XORG= x11 xaw > BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake > PLIST_FILES+= bin/xspim > MAN1+= xspim.1 > .endif > >-do-configure: >- >-do-build: >- cd ${WRKSRC}/spim && \ >- ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} >-.if defined(WITH_GUI) >- cd ${WRKSRC}/xspim && ${XMKMF} && \ >- ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} >+post-build: >+.if !defined(WITHOUT_GUI) >+ @(cd ${WRKSRC}/xspim && ${XMKMF} && \ >+ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}) > .endif > > do-install: >- cd ${WRKSRC}/spim && \ >- ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ >- ${INSTALL_TARGET} >-.if defined(WITH_GUI) >- cd ${WRKSRC}/xspim && \ >- ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ >- ${INSTALL_TARGET} >- ${INSTALL_MAN} ${WRKSRC}/Documentation/xspim.man ${PREFIX}/man/man1/xspim.1 >+ ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/spim ${PREFIX}/bin/spim >+ ${INSTALL_MAN} ${WRKSRC}/Documentation/spim.man ${MANPREFIX}/man/man1/spim.1 >+ ${MKDIR} ${DATADIR} >+ ${INSTALL_DATA} ${WRKSRC}/CPU/exceptions.s ${DATADIR}/exceptions.s >+.if !defined(WITHOUT_GUI) >+ ${INSTALL_PROGRAM} ${WRKSRC}/xspim/xspim ${PREFIX}/bin/xspim >+ ${INSTALL_MAN} ${WRKSRC}/Documentation/xspim.man ${MANPREFIX}/man/man1/xspim.1 > .endif >- >-post-install: > .if !defined(NOPORTDOCS) > @${MKDIR} ${DOCSDIR} > ${INSTALL_DATA} ${WRKSRC}/Documentation/TeX/cycle.ps ${DOCSDIR} >diff -urN /usr/ports/emulators/spim/distinfo emulators/spim/distinfo >--- /usr/ports/emulators/spim/distinfo 2006-07-18 13:25:09.000000000 +0900 >+++ emulators/spim/distinfo 2008-04-22 03:53:30.000000000 +0900 >@@ -1,3 +1,3 @@ >-MD5 (spim-7.2.1.tar.gz) = 0fe5696659364d38660f5610ef380ad0 >-SHA256 (spim-7.2.1.tar.gz) = 347771fc7f91ba12092b22374ddb377f13c588e6d0d1a0cdacea8bbb76f347fb >-SIZE (spim-7.2.1.tar.gz) = 534388 >+MD5 (spim-7.3.tar.gz) = 52002170982d157fd89d445b481bd223 >+SHA256 (spim-7.3.tar.gz) = d7de06135c519108055a90abe77ced4e36dec4f7f27ce1a2fca0059f86cdf35d >+SIZE (spim-7.3.tar.gz) = 347226 >diff -urN /usr/ports/emulators/spim/files/patch-spim_Makefile emulators/spim/files/patch-spim_Makefile >--- /usr/ports/emulators/spim/files/patch-spim_Makefile 2006-07-17 19:12:07.000000000 +0900 >+++ emulators/spim/files/patch-spim_Makefile 2008-04-23 01:36:19.000000000 +0900 >@@ -1,28 +1,25 @@ >---- 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) >+--- spim/Makefile.orig 2006-08-29 11:23:19.000000000 +0900 >++++ spim/Makefile 2008-04-23 01:36:01.000000000 +0900 >+@@ -54,13 +54,13 @@ > >- # 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 = /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 >+ > # Full path for the directory that will hold the man files: >--MAN_DIR = /usr/unsup/man >+-MAN_DIR = /usr/man/mann > +MAN_DIR = ${PREFIX}/man/man1 > > >- # Full path for the exception handler file: >-@@ -90,12 +90,12 @@ >+ # If you have flex, use it instead of lex. If you use flex, define this >+@@ -92,12 +92,12 @@ > >- DEFINES = $(ENDIAN) $(MEM_SIZES) -DDEFAULT_EXCEPTION_HANDLER=$(EXCEPTION_PATH) -DSPIM_VERSION="\"`cat ../VERSION`\"" >+ DEFINES = $(ENDIAN) $(MEM_SIZES) -DDEFAULT_EXCEPTION_HANDLER="\"$(EXCEPTION_DIR)/exceptions.s\"" -DSPIM_VERSION="\"`cat ../VERSION`\"" > > -CC = gcc > -CFLAGS = -I. -I$(CPU_DIR) $(DEFINES) -g -Wall >@@ -37,7 +34,7 @@ > > # lex.yy.c is usually compiled with -O to speed it up. > >-@@ -108,10 +108,10 @@ >+@@ -110,10 +110,10 @@ > > > spim: force >@@ -50,19 +47,7 @@ > > > 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 @@ >+@@ -196,7 +196,7 @@ > y.tab.h: y.tab.c > > y.tab.c: $(CPU_DIR)/parser.y >diff -urN /usr/ports/emulators/spim/files/patch-xspim_Imakefile emulators/spim/files/patch-xspim_Imakefile >--- /usr/ports/emulators/spim/files/patch-xspim_Imakefile 2006-07-17 19:12:07.000000000 +0900 >+++ emulators/spim/files/patch-xspim_Imakefile 2008-04-23 01:06:59.000000000 +0900 >@@ -1,32 +1,37 @@ >---- xspim/Imakefile.orig Mon Aug 29 02:28:15 2005 >-+++ xspim/Imakefile Mon Jul 17 14:24:25 2006 >-@@ -33,15 +33,15 @@ >+--- xspim/Imakefile.orig 2006-08-29 11:23:19.000000000 +0900 >++++ xspim/Imakefile 2008-04-23 00:58:19.000000000 +0900 >+@@ -33,13 +33,13 @@ > # > > # 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 >+ > # Full path for the directory that will hold the man files: >--MAN_DIR = /usr/local/share/man1 >-+MAN_DIR = ${PREFIX}/share/man1 >+-MAN_DIR = /usr/man/mann >++MAN_DIR = ${PREFIX}/man/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)) >+@@ -91,7 +91,7 @@ >+ DEPLIBS = XawClientDepLibs >+ LOCALLIBS = XawClientLibs >+ >+-CDEBUGFLAGS = -g >++#CDEBUGFLAGS = -g >+ >+ INCLUDES = -I. -I$(CPU_DIR) >+ >+@@ -113,7 +113,7 @@ >+ ./Configure > > InstallProgram(xspim,$(BIN_DIR)) >--InstallManPage(xspim,$(MAN_DIR)) >--InstallNonExec($(EXCEPTION_DIR)/exceptions.s,$(EXCEPTION_PATH)) >-- >+-InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR)) >++#InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR)) >+ #InstallManPage($(DOC_DIR)/xspim,$(MAN_DIR)) > >- y.tab.h: y.tab.c > >diff -urN /usr/ports/emulators/spim/pkg-descr emulators/spim/pkg-descr >--- /usr/ports/emulators/spim/pkg-descr 2006-07-18 13:25:09.000000000 +0900 >+++ emulators/spim/pkg-descr 2008-04-22 03:52:12.000000000 +0900 >@@ -12,6 +12,6 @@ > target machine for compilers courses, lower division assembly language > programming, microprocessor design courses, etc... > >-WWW: http://www.cs.wisc.edu/~larus/SPIM/ >+WWW: http://pages.cs.wisc.edu/~larus/spim.html > > -- David O'Brien (obrien@cs.ucdavis.edu)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 123871
: 87283