Attachment #103112 for bug #142980

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

Lines 7-13 Link Here

(-)emulators/spim/Makefile (-1 / +1 lines)
7	#	7	#
8		8
9	PORTNAME= spim	9	PORTNAME= spim
10	PORTVERSION= 7.5	10	PORTVERSION= 8.0
11	CATEGORIES= emulators	11	CATEGORIES= emulators
12	MASTER_SITES= http://pages.cs.wisc.edu/~larus/SPIM/	12	MASTER_SITES= http://pages.cs.wisc.edu/~larus/SPIM/
13		13

Lines 1-3 Link Here

(-)emulators/spim/distinfo (-3 / +3 lines)
1	MD5 (spim-7.5.tar.gz) = 8a704860dad1ff5efa1ca4e3f2ed22d8	1	MD5 (spim-8.0.tar.gz) = 146558e8256f2b7577fb825fdc76a04f
2	SHA256 (spim-7.5.tar.gz) = 28b572a15a402f315a61df3d9f581cb83a90fcbc297c9d095a36fbecbf69ecb7	2	SHA256 (spim-8.0.tar.gz) = 6f205776cb9fa112729507008843b289012190ed3131cbd426c610a58387ee4b
3	SIZE (spim-7.5.tar.gz) = 359664	3	SIZE (spim-8.0.tar.gz) = 355204




--- spim/Makefile.orig	2010-01-09 14:22:57.000000000 +0900
+++ spim/Makefile	2010-01-17 01:44:59.000000000 +0900
@@ -66,13 +66,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/spim
+EXCEPTION_DIR = ${PREFIX}/share/spim
 
 # Full path for the directory that will hold the man files:
-MAN_DIR = /usr/local/man/en
+MAN_DIR = ${MANPREFIX}/man/man1
 
 
 # If you have flex, use it instead of lex.  If you use flex, define this
@@ -104,12 +104,12 @@
 
 DEFINES = $(ENDIAN) $(MEM_SIZES) -DDEFAULT_EXCEPTION_HANDLER="\"$(EXCEPTION_DIR)/exceptions.s\"" -DSPIM_VERSION="\"`cat ../VERSION`\""
 

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

 
 
 force:	configuration
@@ -211,7 +211,7 @@
 y.tab.h: y.tab.c
 
 y.tab.c: $(CPU_DIR)/parser.y




--- xspim/Imakefile.orig	2010-01-09 14:22:58.000000000 +0900
+++ xspim/Imakefile	2010-01-17 01:47:48.000000000 +0900
@@ -43,13 +43,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/spim
+EXCEPTION_DIR = ${PREFIX}/share/spim
 
 # Full path for the directory that will hold the man files:
-MAN_DIR = /usr/local/man/en
+MAN_DIR = ${MANPREFIX}/man/man1
 
 
 # If you have flex, use it instead of lex.  If you use flex, define this
@@ -101,7 +101,7 @@
 DEPLIBS = XawClientDepLibs
 LOCALLIBS = XawClientLibs
 

 
 INCLUDES = -I. -I$(CPU_DIR)
 
@@ -123,7 +123,7 @@
 	./Configure
 
 INSTALLFLAGS = -D
 InstallProgram(xspim,$(BIN_DIR))
-InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR)/exceptions.s)
+#InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR)/exceptions.s)

Return to bug 142980

Lines 1-23 Link Here

(-)emulators/spim/files/patch-spim_Makefile (-9 / +9 lines)
1	--- spim/Makefile.orig 2009-01-02 04:51:25.000000000 +0900	1	--- spim/Makefile.orig 2010-01-09 14:22:57.000000000 +0900
2	+++ spim/Makefile 2009-01-21 03:38:23.000000000 +0900	2	+++ spim/Makefile 2010-01-17 01:44:59.000000000 +0900
3	@@ -54,13 +54,13 @@	3	@@ -66,13 +66,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/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:	10	# Full path for the directory that will hold the exception handler:
11	-EXCEPTION_DIR = /usr/lib/spim	11	-EXCEPTION_DIR = /usr/local/lib/spim
12	+EXCEPTION_DIR = ${PREFIX}/share/spim	12	+EXCEPTION_DIR = ${PREFIX}/share/spim
13		13
14	# Full path for the directory that will hold the man files:	14	# Full path for the directory that will hold the man files:
15	-MAN_DIR = /usr/share/man/en	15	-MAN_DIR = /usr/local/man/en
16	+MAN_DIR = ${MANPREFIX}/man/man1	16	+MAN_DIR = ${MANPREFIX}/man/man1
17		17
18		18
19	# 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
20	@@ -92,12 +92,12 @@	20	@@ -104,12 +104,12 @@
21		21
22	DEFINES = $(ENDIAN) $(MEM_SIZES) -DDEFAULT_EXCEPTION_HANDLER="\"$(EXCEPTION_DIR)/exceptions.s\"" -DSPIM_VERSION="\"`cat ../VERSION`\""	22	DEFINES = $(ENDIAN) $(MEM_SIZES) -DDEFAULT_EXCEPTION_HANDLER="\"$(EXCEPTION_DIR)/exceptions.s\"" -DSPIM_VERSION="\"`cat ../VERSION`\""
23		23
Lines 34-40 Link Here
34		34
35	# 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.
36		36
37	@@ -110,10 +110,10 @@	37	@@ -122,10 +122,10 @@
38		38
39		39
40	spim: force	40	spim: force
Lines 47-53 Link Here
47		47
48		48
49	force: configuration	49	force: configuration
50	@@ -196,7 +196,7 @@	50	@@ -211,7 +211,7 @@
51	y.tab.h: y.tab.c	51	y.tab.h: y.tab.c
52		52
53	y.tab.c: $(CPU_DIR)/parser.y	53	y.tab.c: $(CPU_DIR)/parser.y

Lines 1-23 Link Here

(-)emulators/spim/files/patch-xspim_Imakefile (-9 / +9 lines)
1	--- xspim/Imakefile.orig 2009-01-02 04:51:26.000000000 +0900	1	--- xspim/Imakefile.orig 2010-01-09 14:22:58.000000000 +0900
2	+++ xspim/Imakefile 2009-01-21 03:18:12.000000000 +0900	2	+++ xspim/Imakefile 2010-01-17 01:47:48.000000000 +0900
3	@@ -33,13 +33,13 @@	3	@@ -43,13 +43,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/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:	10	# Full path for the directory that will hold the exception handler:
11	-EXCEPTION_DIR = /usr/lib/spim	11	-EXCEPTION_DIR = /usr/local/lib/spim
12	+EXCEPTION_DIR = ${PREFIX}/share/spim	12	+EXCEPTION_DIR = ${PREFIX}/share/spim
13		13
14	# Full path for the directory that will hold the man files:	14	# Full path for the directory that will hold the man files:
15	-MAN_DIR = /usr/share/man/en	15	-MAN_DIR = /usr/local/man/en
16	+MAN_DIR = ${MANPREFIX}/man/man1	16	+MAN_DIR = ${MANPREFIX}/man/man1
17		17
18		18
19	# 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
20	@@ -91,7 +91,7 @@	20	@@ -101,7 +101,7 @@
21	DEPLIBS = XawClientDepLibs	21	DEPLIBS = XawClientDepLibs
22	LOCALLIBS = XawClientLibs	22	LOCALLIBS = XawClientLibs
23		23
Lines 26-34 Link Here
26		26
27	INCLUDES = -I. -I$(CPU_DIR)	27	INCLUDES = -I. -I$(CPU_DIR)
28		28
29	@@ -114,7 +114,7 @@	29	@@ -123,7 +123,7 @@
		30	./Configure
30		31
31	INSTALLFLAGS = -D
32	InstallProgram(xspim,$(BIN_DIR))	32	InstallProgram(xspim,$(BIN_DIR))
33	-InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR)/exceptions.s)	33	-InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR)/exceptions.s)
34	+#InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR)/exceptions.s)	34	+#InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR)/exceptions.s)