Attachment #198857 for bug #232885

Lines 1-7 Link Here

(-)Makefile (-2 / +8 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= retro12	3	PORTNAME= retro12
4	DISTVERSION= 2018.4.20	4	DISTVERSION= 2018.8
5	CATEGORIES= lang	5	CATEGORIES= lang
6	MASTER_SITES= https://forthworks.com/retro/r/	6	MASTER_SITES= https://forthworks.com/retro/r/
7	DISTNAME= ${PORTNAME:tu}-${DISTVERSION}	7	DISTNAME= ${PORTNAME:tu}-${DISTVERSION}
Lines 30-36 Link Here
30	bin/listener \	30	bin/listener \
31	bin/muri \	31	bin/muri \
32	bin/repl \	32	bin/repl \
33	bin/ri \	33	bin/ri12 \
34	bin/rre \	34	bin/rre \
35	bin/unu	35	bin/unu
36		36
Lines 50-53 Link Here
50	INSTALL_TARGET= install-strip	50	INSTALL_TARGET= install-strip
51	TEST_TARGET= test	51	TEST_TARGET= test
52		52
		53	REINPLACE_ARGS= -i ""
		54
		55	SHEBANG_FILES+= ${WRKSRC}/example/Atua*
		56
		57	post-install:
		58	${REINPLACE_CMD} -e 's\|/usr/bin/rre\|${LOCALBASE}/rre\|' ${STAGEDIR}${PREFIX}/share/examples/retro12/example/Atua*
53	.include <bsd.port.mk>	59	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1524275523	1	TIMESTAMP = 1541075447
2	SHA256 (RETRO12-2018.4.20.tar.gz) = 431e03ce575553df326eca33e483d279b13b83209d737fec90ee3f2a77a6bc17	2	SHA256 (RETRO12-2018.8.tar.gz) = 9458f3c82d8e6fa54148b210420e4314e886c3020b3cb0392e801f308d5fe5a5
3	SIZE (RETRO12-2018.4.20.tar.gz) = 216832	3	SIZE (RETRO12-2018.8.tar.gz) = 538215




--- Makefile.orig	2018-11-01 14:31:57 UTC
+++ Makefile
@@ -16,7 +16,7 @@ clean:
 	rm -f bin/muri
 	rm -f bin/RETRO12.html
 	rm -f bin/repl
-	rm -f bin/ri
+	rm -f bin/ri*
 	rm -f bin/rre
 	rm -f bin/unu
 
@@ -28,7 +28,7 @@ install: build install-data install-docs
 	install -c -m 755 bin/listener $(DESTDIR)$(PREFIX)/bin/listener
 	install -c -m 755 bin/muri $(DESTDIR)$(PREFIX)/bin/muri
 	install -c -m 755 bin/repl $(DESTDIR)$(PREFIX)/bin/repl
-	install -c -m 755 bin/ri $(DESTDIR)$(PREFIX)/bin/ri
+	install -c -m 755 bin/ri12 $(DESTDIR)$(PREFIX)/bin/ri12
 	install -c -m 755 bin/rre $(DESTDIR)$(PREFIX)/bin/rre
 	install -c -m 755 bin/unu $(DESTDIR)$(PREFIX)/bin/unu
 
@@ -40,7 +40,7 @@ install-strip: build install-data instal
 	install -c -m 755 bin/listener $(DESTDIR)$(PREFIX)/bin/listener
 	install -c -m 755 -s bin/muri $(DESTDIR)$(PREFIX)/bin/muri
 	install -c -m 755 -s bin/repl $(DESTDIR)$(PREFIX)/bin/repl
-	install -c -m 755 -s bin/ri $(DESTDIR)$(PREFIX)/bin/ri
+	install -c -m 755 -s bin/ri12 $(DESTDIR)$(PREFIX)/bin/ri12
 	install -c -m 755 -s bin/rre $(DESTDIR)$(PREFIX)/bin/rre
 	install -c -m 755 -s bin/unu $(DESTDIR)$(PREFIX)/bin/unu
 
@@ -76,7 +76,7 @@ js: bin/RETRO12.html
 
 repl: bin/repl
 
-ri: bin/ri
+ri: bin/ri12
 
 update: bin/unu literate/Unu.md literate/Muri.md
 	./bin/unu literate/Unu.md >tools/unu.c
@@ -103,7 +103,7 @@ bin/repl: interfaces/repl.c interfaces/i
 	cd interfaces && $(CC) $(CFLAGS) $(LDFLAGS) -o ../bin/repl repl.c
 
 bin/ri: interfaces/ri.c interfaces/image.c
-	cd interfaces && $(CC) $(CFLAGS) $(LDFLAGS) -o ../bin/ri $(LIBCURSES) ri.c
+	cd interfaces && $(CC) $(CFLAGS) $(LDFLAGS) -o ../bin/ri12 $(LIBCURSES) ri.c
 
 bin/rre: bin/embedimage bin/extend interfaces/image.c interfaces/rre.c interfaces/rre.forth
 	cp ngaImage cleanImage

Return to bug 232885

Line 0 Link Here

(-)files/patch-Makefile (+47 lines)
	1	--- Makefile.orig 2018-11-01 14:31:57 UTC
	2	+++ Makefile
	3	@@ -16,7 +16,7 @@ clean:
	4	rm -f bin/muri
	5	rm -f bin/RETRO12.html
	6	rm -f bin/repl
	7	- rm -f bin/ri
	8	+ rm -f bin/ri*
	9	rm -f bin/rre
	10	rm -f bin/unu
	11
	12	@@ -28,7 +28,7 @@ install: build install-data install-docs
	13	install -c -m 755 bin/listener $(DESTDIR)$(PREFIX)/bin/listener
	14	install -c -m 755 bin/muri $(DESTDIR)$(PREFIX)/bin/muri
	15	install -c -m 755 bin/repl $(DESTDIR)$(PREFIX)/bin/repl
	16	- install -c -m 755 bin/ri $(DESTDIR)$(PREFIX)/bin/ri
	17	+ install -c -m 755 bin/ri12 $(DESTDIR)$(PREFIX)/bin/ri12
	18	install -c -m 755 bin/rre $(DESTDIR)$(PREFIX)/bin/rre
	19	install -c -m 755 bin/unu $(DESTDIR)$(PREFIX)/bin/unu
	20
	21	@@ -40,7 +40,7 @@ install-strip: build install-data instal
	22	install -c -m 755 bin/listener $(DESTDIR)$(PREFIX)/bin/listener
	23	install -c -m 755 -s bin/muri $(DESTDIR)$(PREFIX)/bin/muri
	24	install -c -m 755 -s bin/repl $(DESTDIR)$(PREFIX)/bin/repl
	25	- install -c -m 755 -s bin/ri $(DESTDIR)$(PREFIX)/bin/ri
	26	+ install -c -m 755 -s bin/ri12 $(DESTDIR)$(PREFIX)/bin/ri12
	27	install -c -m 755 -s bin/rre $(DESTDIR)$(PREFIX)/bin/rre
	28	install -c -m 755 -s bin/unu $(DESTDIR)$(PREFIX)/bin/unu
	29
	30	@@ -76,7 +76,7 @@ js: bin/RETRO12.html
	31
	32	repl: bin/repl
	33
	34	-ri: bin/ri
	35	+ri: bin/ri12
	36
	37	update: bin/unu literate/Unu.md literate/Muri.md
	38	./bin/unu literate/Unu.md >tools/unu.c
	39	@@ -103,7 +103,7 @@ bin/repl: interfaces/repl.c interfaces/i
	40	cd interfaces && $(CC) $(CFLAGS) $(LDFLAGS) -o ../bin/repl repl.c
	41
	42	bin/ri: interfaces/ri.c interfaces/image.c
	43	- cd interfaces && $(CC) $(CFLAGS) $(LDFLAGS) -o ../bin/ri $(LIBCURSES) ri.c
	44	+ cd interfaces && $(CC) $(CFLAGS) $(LDFLAGS) -o ../bin/ri12 $(LIBCURSES) ri.c
	45
	46	bin/rre: bin/embedimage bin/extend interfaces/image.c interfaces/rre.c interfaces/rre.forth
	47	cp ngaImage cleanImage