Attachment #87283 for bug #123871

View | Details | Raw Unified | Return to bug 123871
Collapse All | Expand All




#

PORTNAME=	spim
PORTVERSION=	7.3
PORTREVISION=	3
CATEGORIES=	emulators
MASTER_SITES=	http://pages.cs.wisc.edu/~larus/SPIM/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	MIPS32 Simulator

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(WITHOUT_GUI)
USE_XORG=	x11 xaw
BUILD_DEPENDS+=			imake:${PORTSDIR}/devel/imake
PLIST_FILES+=	bin/xspim
MAN1+=		xspim.1
.endif

post-build:
.if !defined(WITHOUT_GUI)
	@(cd ${WRKSRC}/xspim && ${XMKMF} && \
		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE})
		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
.if defined(WITH_GUI)
	cd ${WRKSRC}/xspim && ${XMKMF} && \
		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
.endif

do-install:
	${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
	${INSTALL_MAN} ${WRKSRC}/Documentation/xspim.man ${PREFIX}/man/man1/xspim.1
.endif

post-install:
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/Documentation/TeX/cycle.ps ${DOCSDIR}

Lines 1-3 Link Here

(-)emulators/spim/distinfo (-3 / +3 lines)
1	MD5 (spim-7.2.1.tar.gz) = 0fe5696659364d38660f5610ef380ad0	1	MD5 (spim-7.3.tar.gz) = 52002170982d157fd89d445b481bd223
2	SHA256 (spim-7.2.1.tar.gz) = 347771fc7f91ba12092b22374ddb377f13c588e6d0d1a0cdacea8bbb76f347fb	2	SHA256 (spim-7.3.tar.gz) = d7de06135c519108055a90abe77ced4e36dec4f7f27ce1a2fca0059f86cdf35d
3	SIZE (spim-7.2.1.tar.gz) = 534388	3	SIZE (spim-7.3.tar.gz) = 347226




--- 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 @@
 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/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/man/mann
+MAN_DIR = ${PREFIX}/man/man1
 
 
 # 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_DIR)/exceptions.s\"" -DSPIM_VERSION="\"`cat ../VERSION`\""
 
-CC = gcc
-CFLAGS = -I. -I$(CPU_DIR) $(DEFINES) -g -Wall

 
 # lex.yy.c is usually compiled with -O to speed it up.
 
@@ -110,10 +110,10 @@
 
 
 spim:   force

 
 
 force:	configuration
@@ -196,7 +196,7 @@
 
 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




--- 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/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
@@ -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))
-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
 

Lines 12-17 Link Here

(-)emulators/spim/pkg-descr (-1 / +1 lines)
12	target machine for compilers courses, lower division assembly language	12	target machine for compilers courses, lower division assembly language
13	programming, microprocessor design courses, etc...	13	programming, microprocessor design courses, etc...
14		14
15	WWW: http://www.cs.wisc.edu/~larus/SPIM/	15	WWW: http://pages.cs.wisc.edu/~larus/spim.html
16		16
17	-- David O'Brien (obrien@cs.ucdavis.edu)	17	-- David O'Brien (obrien@cs.ucdavis.edu)

Return to bug 123871

Lines 7-61 Link Here

(-)emulators/spim/Makefile (-25 / +19 lines)
7	#	7	#
8		8
9	PORTNAME= spim	9	PORTNAME= spim
10	PORTVERSION= 7.2.1	10	PORTVERSION= 7.3
11	PORTREVISION= 3
12	CATEGORIES= emulators	11	CATEGORIES= emulators
13	MASTER_SITES= http://www.cs.wisc.edu/~larus/SPIM/	12	MASTER_SITES= http://pages.cs.wisc.edu/~larus/SPIM/
14		13
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
16	COMMENT= MIPS32 Simulator	15	COMMENT= MIPS32 Simulator
17		16
18	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	17	OPTIONS= GUI "Graphical user interface" on
		18
		19	BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}
		20	INSTALL_WRKSRC= ${WRKSRC}/${PORTNAME}
19		21
		22	ALL_TARGET= ${PORTNAME}
20	MAN1= spim.1	23	MAN1= spim.1
21		24
22	PORTDOCS= cycle.ps.gz spim.ps.gz SPIM.html	25	PORTDOCS= cycle.ps.gz spim.ps.gz SPIM.html
23	PLIST_FILES= bin/spim %%DATADIR%%/exceptions.s	26	PLIST_FILES= bin/spim %%DATADIR%%/exceptions.s
24	PLIST_DIRS= %%DATADIR%%	27	PLIST_DIRS= %%DATADIR%%
25		28
26	OPTIONS= GUI "Graphical user interface" on
27
28	.include <bsd.port.pre.mk>	29	.include <bsd.port.pre.mk>
29		30
30	.if defined(WITH_GUI)	31	.if !defined(WITHOUT_GUI)
31	USE_XORG= x11 xaw	32	USE_XORG= x11 xaw
32	BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake	33	BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake
33	PLIST_FILES+= bin/xspim	34	PLIST_FILES+= bin/xspim
34	MAN1+= xspim.1	35	MAN1+= xspim.1
35	.endif	36	.endif
36		37
37	do-configure:	38	post-build:
38		39	.if !defined(WITHOUT_GUI)
39	do-build:	40	@(cd ${WRKSRC}/xspim && ${XMKMF} && \
40	cd ${WRKSRC}/spim && \	41	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE})
41	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
42	.if defined(WITH_GUI)
43	cd ${WRKSRC}/xspim && ${XMKMF} && \
44	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
45	.endif	42	.endif
46		43
47	do-install:	44	do-install:
48	cd ${WRKSRC}/spim && \	45	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/spim ${PREFIX}/bin/spim
49	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \	46	${INSTALL_MAN} ${WRKSRC}/Documentation/spim.man ${MANPREFIX}/man/man1/spim.1
50	${INSTALL_TARGET}	47	${MKDIR} ${DATADIR}
51	.if defined(WITH_GUI)	48	${INSTALL_DATA} ${WRKSRC}/CPU/exceptions.s ${DATADIR}/exceptions.s
52	cd ${WRKSRC}/xspim && \	49	.if !defined(WITHOUT_GUI)
53	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \	50	${INSTALL_PROGRAM} ${WRKSRC}/xspim/xspim ${PREFIX}/bin/xspim
54	${INSTALL_TARGET}	51	${INSTALL_MAN} ${WRKSRC}/Documentation/xspim.man ${MANPREFIX}/man/man1/xspim.1
55	${INSTALL_MAN} ${WRKSRC}/Documentation/xspim.man ${PREFIX}/man/man1/xspim.1
56	.endif	52	.endif
57
58	post-install:
59	.if !defined(NOPORTDOCS)	53	.if !defined(NOPORTDOCS)
60	@${MKDIR} ${DOCSDIR}	54	@${MKDIR} ${DOCSDIR}
61	${INSTALL_DATA} ${WRKSRC}/Documentation/TeX/cycle.ps ${DOCSDIR}	55	${INSTALL_DATA} ${WRKSRC}/Documentation/TeX/cycle.ps ${DOCSDIR}

Lines 1-28 Link Here

(-)emulators/spim/files/patch-spim_Makefile (-29 / +14 lines)
1	--- spim/Makefile.orig Mon Aug 29 02:28:14 2005	1	--- spim/Makefile.orig 2006-08-29 11:23:19.000000000 +0900
2	+++ spim/Makefile Mon Jul 17 14:46:59 2006	2	+++ spim/Makefile 2008-04-23 01:36:01.000000000 +0900
3	@@ -46,16 +46,16 @@	3	@@ -54,13 +54,13 @@
4	VPATH = src:$(CPU_DIR)
5		4
6	# Full path for directory that will hold the exception handler file:
7	-EXCEPTION_DIR = ../CPU
8	+EXCEPTION_DIR = ${PREFIX}/share/spim
9
10	# Path of directory that contains SPIM tests:
11	TEST_DIR = ../Tests
12		5
13	# Full path for the directory that will hold the executable files:	6	# Full path for the directory that will hold the executable files:
14	-BIN_DIR = /usr/unsup/bin	7	-BIN_DIR = /usr/local/bin
15	+BIN_DIR = ${PREFIX}/bin	8	+BIN_DIR = ${PREFIX}/bin
16		9
		10	# Full path for the directory that will hold the exception handler:
		11	-EXCEPTION_DIR = /usr/local/lib
		12	+EXCEPTION_DIR = ${PREFIX}/share/spim
		13
17	# Full path for the directory that will hold the man files:	14	# Full path for the directory that will hold the man files:
18	-MAN_DIR = /usr/unsup/man	15	-MAN_DIR = /usr/man/mann
19	+MAN_DIR = ${PREFIX}/man/man1	16	+MAN_DIR = ${PREFIX}/man/man1
20		17
21		18
22	# Full path for the exception handler file:	19	# If you have flex, use it instead of lex. If you use flex, define this
23	@@ -90,12 +90,12 @@	20	@@ -92,12 +92,12 @@
24		21
25	DEFINES = $(ENDIAN) $(MEM_SIZES) -DDEFAULT_EXCEPTION_HANDLER=$(EXCEPTION_PATH) -DSPIM_VERSION="\"`cat ../VERSION`\""	22	DEFINES = $(ENDIAN) $(MEM_SIZES) -DDEFAULT_EXCEPTION_HANDLER="\"$(EXCEPTION_DIR)/exceptions.s\"" -DSPIM_VERSION="\"`cat ../VERSION`\""
26		23
27	-CC = gcc	24	-CC = gcc
28	-CFLAGS = -I. -I$(CPU_DIR) $(DEFINES) -g -Wall	25	-CFLAGS = -I. -I$(CPU_DIR) $(DEFINES) -g -Wall
Lines 37-43 Link Here
37		34
38	# lex.yy.c is usually compiled with -O to speed it up.	35	# lex.yy.c is usually compiled with -O to speed it up.
39		36
40	@@ -108,10 +108,10 @@	37	@@ -110,10 +110,10 @@
41		38
42		39
43	spim: force	40	spim: force
Lines 50-68 Link Here
50		47
51		48
52	force: configuration	49	force: configuration
53	@@ -176,8 +176,9 @@	50	@@ -196,7 +196,7 @@
54
55	install: spim
56	install -c -s spim $(BIN_DIR)
57	- install -c -m 0444 exceptions.s $(EXCEPTION_DIR)
58	- install -c -m 0444 spim.man $(MAN_DIR)
59	+ mkdir -p $(EXCEPTION_DIR)
60	+ install -c -m 0444 $(CPU_DIR)/exceptions.s $(EXCEPTION_DIR)
61	+ install -c -m 0444 ../Documentation/spim.man $(MAN_DIR)/spim.1
62
63	very-clean: clean
64	rm -f configuration
65	@@ -195,7 +196,7 @@
66	y.tab.h: y.tab.c	51	y.tab.h: y.tab.c
67		52
68	y.tab.c: $(CPU_DIR)/parser.y	53	y.tab.c: $(CPU_DIR)/parser.y

Lines 1-32 Link Here

(-)emulators/spim/files/patch-xspim_Imakefile (-18 / +23 lines)
1	--- xspim/Imakefile.orig Mon Aug 29 02:28:15 2005	1	--- xspim/Imakefile.orig 2006-08-29 11:23:19.000000000 +0900
2	+++ xspim/Imakefile Mon Jul 17 14:24:25 2006	2	+++ xspim/Imakefile 2008-04-23 00:58:19.000000000 +0900
3	@@ -33,15 +33,15 @@	3	@@ -33,13 +33,13 @@
4	#	4	#
5		5
6	# Full path for the directory that will hold the executable files:	6	# Full path for the directory that will hold the executable files:
7	-BIN_DIR = /usr/local/bin	7	-BIN_DIR = /usr/local/bin
8	+BIN_DIR = ${PREFIX}/bin	8	+BIN_DIR = ${PREFIX}/bin
9		9
		10	# Full path for the directory that will hold the exception handler:
		11	-EXCEPTION_DIR = /usr/local/lib
		12	+EXCEPTION_DIR = ${PREFIX}/share/spim
		13
10	# Full path for the directory that will hold the man files:	14	# Full path for the directory that will hold the man files:
11	-MAN_DIR = /usr/local/share/man1	15	-MAN_DIR = /usr/man/mann
12	+MAN_DIR = ${PREFIX}/share/man1	16	+MAN_DIR = ${PREFIX}/man/man1
13		17
14	# Full path for the exception handler file:
15	-#EXCEPTION_PATH = /usr/local/lib/exceptions.s
16	+EXCEPTION_PATH = ${PREFIX}/share/spim/exceptions.s
17	# Use this path for testing:
18	-EXCEPTION_PATH = $(CPU_DIR)/exceptions.s
19	+#EXCEPTION_PATH = $(CPU_DIR)/exceptions.s
20		18
21	# If you have flex, use it instead of lex. If you use flex, define this	19	# If you have flex, use it instead of lex. If you use flex, define this
22	# variable and set LEXFLAGS.	20	@@ -91,7 +91,7 @@
23	@@ -119,9 +119,6 @@	21	DEPLIBS = XawClientDepLibs
24	NormalProgramTarget(xspim_sub,$(XOBJS),$(DEPLIBS),$(LOCALLIBS),$(SYSLIBS))	22	LOCALLIBS = XawClientLibs
		23
		24	-CDEBUGFLAGS = -g
		25	+#CDEBUGFLAGS = -g
		26
		27	INCLUDES = -I. -I$(CPU_DIR)
		28
		29	@@ -113,7 +113,7 @@
		30	./Configure
25		31
26	InstallProgram(xspim,$(BIN_DIR))	32	InstallProgram(xspim,$(BIN_DIR))
27	-InstallManPage(xspim,$(MAN_DIR))	33	-InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR))
28	-InstallNonExec($(EXCEPTION_DIR)/exceptions.s,$(EXCEPTION_PATH))	34	+#InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR))
29	-	35	#InstallManPage($(DOC_DIR)/xspim,$(MAN_DIR))
30		36
31	y.tab.h: y.tab.c
32		37