Attachment 192693 Details for Bug 227665 – Patch updating lang/retro12 to 2018.4.20

[patch] Patch updating lang/retro12 to 2018.4.20

retro12_2018.4.20.diff (text/plain), 4.35 KB, created by Mateusz Piotrowski on 2018-04-21 02:32:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mateusz Piotrowski

Created: 2018-04-21 02:32:40 UTC

Size: 4.35 KB

patch

obsolete

>diff --git lang/retro12/Makefile lang/retro12/Makefile
>index 04caa7ff70ff..c125bd4e8109 100644
>--- lang/retro12/Makefile
>+++ lang/retro12/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	retro12
>-DISTVERSION=	2018.1
>+DISTVERSION=	2018.4.20
> CATEGORIES=	lang
> MASTER_SITES=	https://forthworks.com/retro/r/
> DISTNAME=	${PORTNAME:tu}-${DISTVERSION}
>@@ -12,19 +12,34 @@ COMMENT=	Clean, elegant, and pragmatic dialect of Forth
> LICENSE=	ISCL
> LICENSE_FILE=	${WRKSRC}/LICENSE.md
> 
>+# Conflicting files: bin/listener bin/repl bin/ri
>+CONFLICTS_INSTALL=	audio/listener mail/nmh japanese/mh lang/ruby
>+
>+USES=	ncurses
>+
>+MAKE_ENV=	DATADIR=${DATADIR} \
>+		DESTDIR=${DESTDIR} \
>+		DOCSDIR=${DOCSDIR} \
>+		EXAMPLESDIR=${EXAMPLESDIR} \
>+		PREFIX=${PREFIX}
>+OPTIONS_DEFINE=	DOCS EXAMPLES
>+
> PLIST_FILES=	bin/embedimage \
> 		bin/extend \
>+		bin/injectimage-js \
> 		bin/listener \
> 		bin/muri \
> 		bin/repl \
>+		bin/ri \
> 		bin/rre \
> 		bin/unu
>-PORTDATA=	glossary.forth \
>+
>+PORTDATA=	RETRO12.html \
>+		glossary.forth \
> 		ngaImage \
>+		tests \
> 		words.tsv
> 
>-OPTIONS_DEFINE=	DOCS EXAMPLES
>-
> PORTDOCS=	doc \
> 		literate \
> 		README.md \
>@@ -32,21 +47,7 @@ PORTDOCS=	doc \
> 
> PORTEXAMPLES=	example
> 
>-do-build:
>-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build.sh
>-
>-do-install:
>-.for f in embedimage extend muri repl rre unu
>-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
>-.endfor
>-	${INSTALL_SCRIPT} ${WRKSRC}/bin/listener ${STAGEDIR}${PREFIX}/bin/listener
>-	cd ${WRKSRC} && \
>-		${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}
>-
>-do-install-DOCS-on:
>-	cd ${WRKSRC} &&	${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}
>-
>-do-install-EXAMPLES-on:
>-	cd ${WRKSRC} &&	${COPYTREE_SHARE} "${PORTEXAMPLES}" ${STAGEDIR}${EXAMPLESDIR}
>+INSTALL_TARGET=	install-strip
>+TEST_TARGET=	test
> 
> .include <bsd.port.mk>
>diff --git lang/retro12/distinfo lang/retro12/distinfo
>index 7ba890d509b6..0857408eaeac 100644
>--- lang/retro12/distinfo
>+++ lang/retro12/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1517182308
>-SHA256 (RETRO12-2018.1.tar.gz) = 00d2ecdf586ea183ff58a7586f66fa9b1906c25fff0d70fa8591ac7c50508937
>-SIZE (RETRO12-2018.1.tar.gz) = 177247
>+TIMESTAMP = 1524275523
>+SHA256 (RETRO12-2018.4.20.tar.gz) = 431e03ce575553df326eca33e483d279b13b83209d737fec90ee3f2a77a6bc17
>+SIZE (RETRO12-2018.4.20.tar.gz) = 216832
>diff --git lang/retro12/files/patch-build.sh lang/retro12/files/patch-build.sh
>deleted file mode 100644
>index b11d93dc2f93..000000000000
>--- lang/retro12/files/patch-build.sh
>+++ /dev/null
>@@ -1,48 +0,0 @@
>---- build.sh.orig	2018-01-17 13:10:18 UTC
>-+++ build.sh
>-@@ -7,14 +7,14 @@ rm -f bin/extend
>- rm -f bin/muri
>- 
>- cd tools
>--cc -O3 -c embedimage.c -o embedimage.o
>--cc -O3 -c extend.c -o extend.o
>--cc -O3 -c unu.c -o unu.o
>--cc -O3 -c muri.c -o muri.o
>--cc unu.o        -lm -o unu
>--cc muri.o       -lm -o muri
>--cc embedimage.o -lm -o embedimage
>--cc extend.o     -lm -o extend
>-+$CC $CFLAGS -c embedimage.c -o embedimage.o
>-+$CC $CFLAGS -c extend.c -o extend.o
>-+$CC $CFLAGS -c unu.c -o unu.o
>-+$CC $CFLAGS -c muri.c -o muri.o
>-+$CC $LDFLAGS unu.o        -lm -o unu
>-+$CC $LDFLAGS muri.o       -lm -o muri
>-+$CC $LDFLAGS embedimage.o -lm -o embedimage
>-+$CC $LDFLAGS extend.o     -lm -o extend
>- mv embedimage ../bin
>- mv extend ../bin
>- mv unu ../bin
>-@@ -45,16 +45,16 @@ cd interfaces
>- ../bin/extend rre.forth
>- ../bin/embedimage >image.c
>- rm ngaImage
>--cc -O3 -c rre.c -o rre.o
>--cc -O3 -c repl.c -o repl.o
>--cc rre.o -lm -o rre
>--cc repl.o -o repl
>-+$CC $CFLAGS -c rre.c -o rre.o
>-+$CC $CFLAGS -c repl.c -o repl.o
>-+$CC $LDFLAGS rre.o -lm -o rre
>-+$CC $LDFLAGS repl.o -o repl
>- mv rre ../bin
>- mv repl ../bin
>- rm *.o
>- cd ..
>- 
>- echo "Update Glossary"
>--cat words.tsv | sort >/tmp/words
>--mv /tmp/words words.tsv
>-+cat words.tsv | sort >words.tmp
>-+mv words.tmp words.tsv
>- ./bin/rre glossary.forth export glossary >doc/Glossary.txt
>diff --git lang/retro12/pkg-descr lang/retro12/pkg-descr
>index 54a5b192f616..25d3e4259a9d 100644
>--- lang/retro12/pkg-descr
>+++ lang/retro12/pkg-descr
>@@ -2,7 +2,7 @@ RETRO is a clean, elegant, and pragmatic dialect of Forth. It provides
> a simple alternative for those willing to make a break from legacy
> systems.
> 
>-The language draws influences from many sources including traditional 
>+The language draws influences from many sources including traditional
> Forth systems, cmForth, colorForth, Factor, and Parable. It was
> designed to be easy to grasp and adapt to specific uses.
>

Flags:

0mp: maintainer-approval+

Actions: View | Diff

Attachments on bug 227665: 192693