Evan Silberman <evan@jklol.net> wrote:
> some tweaks to the Makefile patch. I'll try to upstream the addition of
> -Wno-overlength-strings.
> 
> --Evan

bump

diff /usr/ports
path + /usr/ports
commit - 989cc6643fabbc1a138ee76724e901f3f0756aff
blob - 230f62aebf3ada7b4c935ef2b699784418957ef6
file + graphics/decker/Makefile
--- graphics/decker/Makefile
+++ graphics/decker/Makefile
@@ -1,6 +1,6 @@
 COMMENT =		multimedia platform inspired by HyperCard
 
-DIST_TUPLE =		github JohnEarnest Decker v1.53 .
+DIST_TUPLE =		github JohnEarnest Decker v1.59 .
 REVISION =		0
 PKGNAME =		${DISTNAME:L}
 
@@ -26,7 +26,8 @@ RUN_DEPENDS =		devel/xdg-utils \
 
 ALL_TARGET =		decker lilt docs
 
-MAKE_FLAGS =		COMPILER="${CC}"
+MAKE_FLAGS =		COMPILER="${CC}" \
+			V=1
 
 do-install:
 .for bin in decker lilt
commit - 989cc6643fabbc1a138ee76724e901f3f0756aff
blob - 77d38d8ff0d0b5e19f3b4afab4814e30c893d643
file + graphics/decker/distinfo
--- graphics/decker/distinfo
+++ graphics/decker/distinfo
@@ -1,2 +1,2 @@
-SHA256 (JohnEarnest-Decker-v1.53.tar.gz) = sJXvZbW0pUlqQzwVqlfZ02IcTv6NVPjjyqr6rNDPXdI=
-SIZE (JohnEarnest-Decker-v1.53.tar.gz) = 1707163
+SHA256 (JohnEarnest-Decker-v1.59.tar.gz) = 36MAiBDrZNdnrbLNtzzPGh5USA50msL4KrneIcSjIyA=
+SIZE (JohnEarnest-Decker-v1.59.tar.gz) = 1840498
commit - 989cc6643fabbc1a138ee76724e901f3f0756aff
blob - f640cfecc7e816715df0b00704c33d9c301adb4b
file + graphics/decker/patches/patch-Makefile
--- graphics/decker/patches/patch-Makefile
+++ graphics/decker/patches/patch-Makefile
@@ -1,11 +1,13 @@
  - drop -O2 and respect CFLAGS
  - make building verbose
  - allow implicit-const-int-float-conversion
+ - allow overlength string literals
+ - make docs dependency on lilt interpreter explicit
  
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -34,10 +34,10 @@ endif
+@@ -36,10 +36,12 @@ endif
  ifeq ($(UNAME),OpenBSD)
  	OPEN=xdg-open
  	COMPILER=clang
@@ -15,33 +17,12 @@ Index: Makefile
  	FLAGS:=$(FLAGS) -Wno-misleading-indentation -Wno-unknown-warning-option
 -	FLAGS:=$(FLAGS) -lm
 +	FLAGS:=$(FLAGS) -lm -Wno-implicit-const-int-float-conversion
++	# -Wno-overlength-strings works around a standards limitation which in practice is still portable.
++	FLAGS:=$(FLAGS) -Wno-overlength-strings
  endif
- ifneq ("$(EXTRA_FLAGS)","")
- 	FLAGS:=$(FLAGS) $(EXTRA_FLAGS)
-@@ -47,16 +47,16 @@ endif
- # FLAGS:=$(FLAGS) -DDANGER_ZONE
- 
- resources:
--	@chmod +x ./scripts/resources.sh
--	@./scripts/resources.sh examples/decks/tour.deck
-+	chmod +x ./scripts/resources.sh
-+	./scripts/resources.sh examples/decks/tour.deck
- 
- lilt: resources
--	@mkdir -p c/build
--	@$(COMPILER) ./c/lilt.c -o ./c/build/lilt $(FLAGS) -DVERSION="\"$(VERSION)\""
-+	mkdir -p c/build
-+	$(COMPILER) ./c/lilt.c -o ./c/build/lilt $(FLAGS) -DVERSION="\"$(VERSION)\""
- 
- decker: resources
--	@mkdir -p c/build
--	@$(COMPILER) ./c/decker.c -o ./c/build/decker $(SDL) $(FLAGS) -DVERSION="\"$(VERSION)\""
-+	mkdir -p c/build
-+	$(COMPILER) ./c/decker.c -o ./c/build/decker $(SDL) $(FLAGS) -DVERSION="\"$(VERSION)\""
- 
- clean:
- 	@rm -rf ./c/build/
-@@ -64,21 +64,21 @@ clean:
+ ifeq ($(UNAME),NetBSD)
+ 	# Required packages: bash, gmake, SDL2, SDL2_image, xdg-tools
+@@ -80,21 +82,21 @@ clean:
  	@rm -f docs/*.html
  
  install:
@@ -74,3 +55,12 @@ Index: Makefile
  
  run: lilt
  	@./c/build/lilt
+@@ -132,7 +134,7 @@ runweb: web-decker
+ 	$(OPEN) js/build/decker.html
+ 
+ .PHONY: docs
+-docs:
++docs: lilt
+ 	@./c/build/lilt scripts/lildoc.lil docs/lil.md         docs/lil.html
+ 	@./c/build/lilt scripts/lildoc.lil docs/lilt.md        docs/lilt.html
+ 	@./c/build/lilt scripts/lildoc.lil docs/decker.md      docs/decker.html
commit - 989cc6643fabbc1a138ee76724e901f3f0756aff
blob - 391a454fe248eb29f021dfa298ecd03a0711d312
file + graphics/decker/patches/patch-scripts_test_interpreter_sh
--- graphics/decker/patches/patch-scripts_test_interpreter_sh
+++ graphics/decker/patches/patch-scripts_test_interpreter_sh
@@ -14,7 +14,7 @@ Index: scripts/test_interpreter.sh
  }
 @@ -32,7 +32,7 @@ negative_test() {
  	rm -rf temp.err
- 	$INTERPRETER "$1" temp.ch8 >> temp.out 2>> temp.err
+ 	$INTERPRETER "$1" >> temp.out 2>> temp.err
  	ec=$?
 -	if ! diff -q --strip-trailing-cr temp.err $2; then
 +	if ! diff -q temp.err $2; then
commit - 989cc6643fabbc1a138ee76724e901f3f0756aff
blob - 15c026b19efb1836b2130ac1883d7537c0da346c
file + graphics/decker/pkg/PLIST
--- graphics/decker/pkg/PLIST
+++ graphics/decker/pkg/PLIST
@@ -53,11 +53,10 @@ share/examples/decker/color.deck
 share/examples/decker/cylon.deck
 share/examples/decker/dialog.deck
 share/examples/decker/draggable.deck
-share/examples/decker/dungeonfont.deck
 share/examples/decker/ease.deck
 share/examples/decker/enchilada.deck
 share/examples/decker/fastlife.lil
-share/examples/decker/fontedit.deck
+share/examples/decker/fonts.deck
 share/examples/decker/forbidden.deck
 share/examples/decker/gif.lil
 share/examples/decker/graphpad.deck