git: 44ab4511ce32 - main - devel/z88dk: update the port to version 2.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Wed, 16 Nov 2022 19:49:00 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=44ab4511ce32e990b5f579474aadee2adab956ad

commit 44ab4511ce32e990b5f579474aadee2adab956ad
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2022-11-16 19:47:20 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2022-11-16 19:47:20 +0000

    devel/z88dk: update the port to version 2.2
    
    Reported by:    portscout
---
 devel/z88dk/Makefile                              |  30 ++--
 devel/z88dk/distinfo                              |   6 +-
 devel/z88dk/files/patch-Makefile                  |  12 +-
 devel/z88dk/files/patch-src_sccz80_Makefile       |   4 +-
 devel/z88dk/files/patch-src_ticks_Makefile        |   6 +-
 devel/z88dk/files/patch-src_ticks_hook__io.c      |  11 --
 devel/z88dk/files/patch-src_z80asm_Makefile       |  15 --
 devel/z88dk/files/patch-support_graphics_z80svg.c |  11 --
 devel/z88dk/pkg-plist                             | 162 +++++++++++++++-------
 9 files changed, 141 insertions(+), 116 deletions(-)

diff --git a/devel/z88dk/Makefile b/devel/z88dk/Makefile
index f278cb0dc01c..4ae9788f0f93 100644
--- a/devel/z88dk/Makefile
+++ b/devel/z88dk/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	z88dk
-PORTVERSION=	2.1
-PORTREVISION=	3
+PORTVERSION=	2.2
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/v${PORTVERSION}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -12,6 +11,13 @@ WWW=		https://z88dk.org/site/
 LICENSE=	ClArtistic
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	dos2unix:converters/unix2dos \
+		p5-CPU-Z80-Assembler>=0:devel/p5-CPU-Z80-Assembler \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-Modern-Perl>=0:lang/p5-Modern-Perl \
+		p5-Path-Tiny>=0:devel/p5-Path-Tiny \
+		p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny \
+		ragel:devel/ragel re2c:devel/re2c
 TEST_DEPENDS=	dos2unix:converters/unix2dos \
 		p5-CPU-Z80-Assembler>=0:devel/p5-CPU-Z80-Assembler \
 		p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
@@ -35,7 +41,7 @@ USES=		gmake gnome perl5 shebangfix tar:tgz
 USE_GNOME=	libxml2
 USE_PERL5=	run
 MAKE_ENV=	ZCCCFG=${WRKSRC}/lib/config Q= MALLOC_CONF=junk:false
-SHEBANG_FILES=	src/z80asm/asmpp.pl
+SHEBANG_FILES=	src/z80asm/asmpp.pl src/z80asm/asmstyle.pl
 TEST_TARGET=	testsuite test
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -43,20 +49,10 @@ MAKE_JOBS_UNSAFE=	../../z80asm: No such file or directory
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,"gcc,"${CC},' \
-		${WRKSRC}/src/z80asm/lib/t/array.t \
-		${WRKSRC}/src/z80asm/lib/t/class.t \
-		${WRKSRC}/src/z80asm/lib/t/classhash.t \
-		${WRKSRC}/src/z80asm/lib/t/classlist.t \
-		${WRKSRC}/src/z80asm/lib/t/list.t \
-		${WRKSRC}/src/z80asm/lib/t/srcfile.t \
-		${WRKSRC}/src/z80asm/lib/t/strhash.t \
-		${WRKSRC}/src/z80asm/t/test_utils.pl
+		${WRKSRC}/src/z80asm/parse_ragel.pl
+	@${REINPLACE_CMD} -e 's,dos2unix -q,dos2unix,' \
+		${WRKSRC}/src/z80asm/Makefile
 	@${REINPLACE_CMD} -e 's,"make,"${MAKE_CMD},' \
-		${WRKSRC}/src/z80asm/t/TestZ80asm.pm \
-		${WRKSRC}/src/z80asm/t/objfile.t \
-		${WRKSRC}/src/z80asm/t/test_enigma.t \
-		${WRKSRC}/src/z80asm/t/test_utils.pl \
-		${WRKSRC}/src/z80asm/t/testlib.pl \
 		${WRKSRC}/src/zobjcopy/t/test.t
 	@${REINPLACE_CMD} -e '/\/bin\//s,bash,sh,' \
 		${WRKSRC}/src/common/t/run_tests.sh
diff --git a/devel/z88dk/distinfo b/devel/z88dk/distinfo
index b0ec9ecf0191..7a0bc545bf9c 100644
--- a/devel/z88dk/distinfo
+++ b/devel/z88dk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612696851
-SHA256 (z88dk-src-2.1.tgz) = f3579ee59b4af552721173165af38223b115ccb67179e79d2f3c0ae64338dc7c
-SIZE (z88dk-src-2.1.tgz) = 36360121
+TIMESTAMP = 1658570905
+SHA256 (z88dk-src-2.2.tgz) = 942aef3f5c55209a76925c8df681271e8340cf6623bedcb5a2933d4024657a41
+SIZE (z88dk-src-2.2.tgz) = 37030507
diff --git a/devel/z88dk/files/patch-Makefile b/devel/z88dk/files/patch-Makefile
index e84a339b2188..92f1243c2af4 100644
--- a/devel/z88dk/files/patch-Makefile
+++ b/devel/z88dk/files/patch-Makefile
@@ -21,7 +21,7 @@
  
  ALL_EXT = bin/zsdcc$(EXESUFFIX)
  
-@@ -171,33 +171,35 @@ bin/z88dk-lib$(EXESUFFIX): src/config.h
+@@ -171,34 +171,36 @@ bin/z88dk-lib$(EXESUFFIX): src/config.h
  
  
  libs: $(BINS)
@@ -41,6 +41,7 @@
 -	$(MAKE) -C src/zcc PREFIX=$(DESTDIR) install
 -	$(MAKE) -C src/zpragma PREFIX=$(DESTDIR) install
 -	$(MAKE) -C src/zx7 PREFIX=$(DESTDIR) install
+-	$(MAKE) -C src/zx0 PREFIX=$(DESTDIR) install
 -	$(MAKE) -C src/z80nm PREFIX=$(DESTDIR) install
 -	$(MAKE) -C src/zobjcopy PREFIX=$(DESTDIR) install
 -	$(MAKE) -C src/ticks PREFIX=$(DESTDIR) install
@@ -48,8 +49,8 @@
 -	$(MAKE) -C support/graphics PREFIX=$(DESTDIR) install
 -	$(MAKE) -C support/basck PREFIX=$(DESTDIR) install
 -	$(MAKE) -C support/pv1000 PREFIX=$(DESTDIR) install
--	if [ -f bin/zsdcpp$(EXESUFFIX) ]; then cp bin/zsdcpp$(EXESUFFIX) $(DESTDIR)/bin/; fi
--	if [ -f bin/zsdcc$(EXESUFFIX) ]; then cp bin/zsdcc$(EXESUFFIX) $(DESTDIR)/bin/; fi
+-	if [ -f bin/z88dk-zsdcpp$(EXESUFFIX) ]; then cp bin/z88dk-zsdcpp$(EXESUFFIX) $(DESTDIR)/bin/; fi
+-	if [ -f bin/z88dk-zsdcc$(EXESUFFIX) ]; then cp bin/z88dk-zsdcc$(EXESUFFIX) $(DESTDIR)/bin/; fi
 -	cp -r include $(prefix_share)/
 -	cp -r lib $(prefix_share)/
 -	cp -r libsrc $(prefix_share)/
@@ -65,6 +66,7 @@
 +	$(MAKE) -C src/zcc PREFIX=$(DESTDIR)$(PREFIX) install
 +	$(MAKE) -C src/zpragma PREFIX=$(DESTDIR)$(PREFIX) install
 +	$(MAKE) -C src/zx7 PREFIX=$(DESTDIR)$(PREFIX) install
++	$(MAKE) -C src/zx0 PREFIX=$(DESTDIR)$(PREFIX) install
 +	$(MAKE) -C src/z80nm PREFIX=$(DESTDIR)$(PREFIX) install
 +	$(MAKE) -C src/zobjcopy PREFIX=$(DESTDIR)$(PREFIX) install
 +	$(MAKE) -C src/ticks PREFIX=$(DESTDIR)$(PREFIX) install
@@ -72,8 +74,8 @@
 +	$(MAKE) -C support/graphics PREFIX=$(DESTDIR)$(PREFIX) install
 +	$(MAKE) -C support/basck PREFIX=$(DESTDIR)$(PREFIX) install
 +	$(MAKE) -C support/pv1000 PREFIX=$(DESTDIR)$(PREFIX) install
-+	if [ -f bin/zsdcpp$(EXESUFFIX) ]; then cp bin/zsdcpp$(EXESUFFIX) $(DESTDIR)$(PREFIX)/bin/; fi
-+	if [ -f bin/zsdcc$(EXESUFFIX) ]; then cp bin/zsdcc$(EXESUFFIX) $(DESTDIR)$(PREFIX)/bin/; fi
++	if [ -f bin/z88dk-zsdcpp$(EXESUFFIX) ]; then cp bin/z88dk-zsdcpp$(EXESUFFIX) $(DESTDIR)$(PREFIX)/bin/; fi
++	if [ -f bin/z88dk-zsdcc$(EXESUFFIX) ]; then cp bin/z88dk-zsdcc$(EXESUFFIX) $(DESTDIR)$(PREFIX)/bin/; fi
 +	# XXX: perform installation in the port's Makefile (bogus permissions,
 +	# huge and useless(?) _DEVELOPMENT collection)
 +	#cp -r include $(DESTDIR)$(prefix_share)/
diff --git a/devel/z88dk/files/patch-src_sccz80_Makefile b/devel/z88dk/files/patch-src_sccz80_Makefile
index dea5c8adea5c..638d22e5f978 100644
--- a/devel/z88dk/files/patch-src_sccz80_Makefile
+++ b/devel/z88dk/files/patch-src_sccz80_Makefile
@@ -4,8 +4,8 @@
  	$(CC) $(LDFLAGS) -o sccz80$(EXESUFFIX) $(OBJS) -lm
  
  install: sccz80$(EXESUFFIX)
--	$(INSTALL) -m 755 sccz80$(EXESUFFIX) $(PREFIX)/bin/sccz80$(EXESUFFIX)
-+	$(BSD_INSTALL_PROGRAM) sccz80$(EXESUFFIX) $(PREFIX)/bin/sccz80$(EXESUFFIX)
+-	$(INSTALL) -m 755 sccz80$(EXESUFFIX) $(PREFIX)/bin/z88dk-sccz80$(EXESUFFIX)
++	$(BSD_INSTALL_PROGRAM) sccz80$(EXESUFFIX) $(PREFIX)/bin/z88dk-sccz80$(EXESUFFIX)
  
  clean :
  	$(RM) *.o *~ core sccz80$(EXESUFFIX)
diff --git a/devel/z88dk/files/patch-src_ticks_Makefile b/devel/z88dk/files/patch-src_ticks_Makefile
index f11ca4ed87c8..d5915b1e5aac 100644
--- a/devel/z88dk/files/patch-src_ticks_Makefile
+++ b/devel/z88dk/files/patch-src_ticks_Makefile
@@ -1,13 +1,15 @@
 --- src/ticks/Makefile.orig	2021-01-19 03:00:18 UTC
 +++ src/ticks/Makefile
-@@ -29,8 +29,8 @@ z88dk-dis$(EXESUFFIX):	$(DISOBJS)
+@@ -29,9 +29,9 @@ z88dk-dis$(EXESUFFIX):	$(DISOBJS)
  	$(CC) -o $@ $(CFLAGS) $(DISOBJS)
  
- install: z88dk-ticks$(EXESUFFIX) z88dk-dis$(EXESUFFIX)
+ install: z88dk-ticks$(EXESUFFIX) z88dk-dis$(EXESUFFIX) z88dk-gdb$(EXESUFFIX)
 -	$(INSTALL) z88dk-ticks$(EXESUFFIX) $(PREFIX)/bin/z88dk-ticks$(EXESUFFIX)
 -	$(INSTALL) z88dk-dis$(EXESUFFIX) $(PREFIX)/bin/z88dk-dis$(EXESUFFIX)
+-	$(INSTALL) z88dk-gdb$(EXESUFFIX) $(PREFIX)/bin/z88dk-gdb$(EXESUFFIX)
 +	$(BSD_INSTALL_PROGRAM) z88dk-ticks$(EXESUFFIX) $(PREFIX)/bin/z88dk-ticks$(EXESUFFIX)
 +	$(BSD_INSTALL_PROGRAM) z88dk-dis$(EXESUFFIX) $(PREFIX)/bin/z88dk-dis$(EXESUFFIX)
++	$(BSD_INSTALL_PROGRAM) z88dk-gdb$(EXESUFFIX) $(PREFIX)/bin/z88dk-gdb$(EXESUFFIX)
  
  clean:
  	$(RM) z88dk-ticks$(EXESUFFIX) $(OBJS) core
diff --git a/devel/z88dk/files/patch-src_ticks_hook__io.c b/devel/z88dk/files/patch-src_ticks_hook__io.c
deleted file mode 100644
index bf9f4a4250be..000000000000
--- a/devel/z88dk/files/patch-src_ticks_hook__io.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ticks/hook_io.c.orig	2018-04-26 07:38:01 UTC
-+++ src/ticks/hook_io.c
-@@ -10,6 +10,8 @@
- #ifdef WIN32
- #include        <io.h>
- #include        <sys/stat.h>
-+#elif defined(__FreeBSD__)
-+#include        <sys/stat.h>
- #else
- #include        <unistd.h>
- #endif
diff --git a/devel/z88dk/files/patch-src_z80asm_Makefile b/devel/z88dk/files/patch-src_z80asm_Makefile
deleted file mode 100644
index 70a8c08b3f77..000000000000
--- a/devel/z88dk/files/patch-src_z80asm_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/z80asm/Makefile.orig	2020-09-24 03:00:09 UTC
-+++ src/z80asm/Makefile
-@@ -122,9 +122,9 @@ clean::
- # install
- #------------------------------------------------------------------------------
- install: $(TARGET) z80asm_lib
--	$(INSTALL) $(TARGET)     $(PREFIX)/bin/$(TARGET)
--	$(INSTALL) $(TARGET)     $(PREFIX)/bin/z88dk-$(TARGET)
--	$(INSTALL) asmpp.pl      $(PREFIX)/bin/asmpp.pl
-+	$(BSD_INSTALL_PROGRAM) $(TARGET) $(PREFIX)/bin/$(TARGET)
-+	$(BSD_INSTALL_PROGRAM) $(TARGET) $(PREFIX)/bin/z88dk-$(TARGET)
-+	$(BSD_INSTALL_SCRIPT) asmpp.pl $(PREFIX)/bin/asmpp.pl
- 	$(MAKE) -C dev/z80asm_lib install PREFIX=$(PREFIX_SHARE)
- 
- #------------------------------------------------------------------------------
diff --git a/devel/z88dk/files/patch-support_graphics_z80svg.c b/devel/z88dk/files/patch-support_graphics_z80svg.c
deleted file mode 100644
index e70d8c4bc535..000000000000
--- a/devel/z88dk/files/patch-support_graphics_z80svg.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- support/graphics/z80svg.c.orig	2018-04-26 07:38:01 UTC
-+++ support/graphics/z80svg.c
-@@ -22,7 +22,7 @@
- #include <ctype.h>
- #include <string.h>
- #include <math.h>
--#include <libxml2/libxml/parser.h>
-+#include <libxml/parser.h>
- 
- #include "../../include/gfxprofile.h"
- //#include "gfxprofile.h"
diff --git a/devel/z88dk/pkg-plist b/devel/z88dk/pkg-plist
index 53b9d4e0f627..b6d73e6df392 100644
--- a/devel/z88dk/pkg-plist
+++ b/devel/z88dk/pkg-plist
@@ -1,13 +1,16 @@
-bin/asmpp.pl
-bin/sccz80
 bin/z80asm
 bin/z88dk-appmake
+bin/z88dk-asmpp
+bin/z88dk-asmstyle
 bin/z88dk-basck
 bin/z88dk-copt
 bin/z88dk-dis
+bin/z88dk-dzx0
 bin/z88dk-dzx7
 bin/z88dk-font2pv1000
+bin/z88dk-gdb
 bin/z88dk-lib
+bin/z88dk-sccz80
 bin/z88dk-ticks
 bin/z88dk-ucpp
 bin/z88dk-z80asm
@@ -16,6 +19,7 @@ bin/z88dk-z80svg
 bin/z88dk-zcpp
 bin/z88dk-zobjcopy
 bin/z88dk-zpragma
+bin/z88dk-zx0
 bin/z88dk-zx7
 bin/zcc
 %%DATADIR%%/include/X11/X.h
@@ -47,11 +51,10 @@ bin/zcc
 %%DATADIR%%/include/algorithm.h
 %%DATADIR%%/include/alloc.h
 %%DATADIR%%/include/alloc/balloc.h
-%%DATADIR%%/include/alloc/malloc.h
 %%DATADIR%%/include/alloc/obstack.h
-%%DATADIR%%/include/application.h
 %%DATADIR%%/include/arch.h
 %%DATADIR%%/include/arch/g800.h
+%%DATADIR%%/include/arch/gal.h
 %%DATADIR%%/include/arch/gb/cgb.h
 %%DATADIR%%/include/arch/gb/console.h
 %%DATADIR%%/include/arch/gb/drawing.h
@@ -63,6 +66,7 @@ bin/zcc
 %%DATADIR%%/include/arch/msx.h
 %%DATADIR%%/include/arch/msx/asm.h
 %%DATADIR%%/include/arch/multi8.h
+%%DATADIR%%/include/arch/mz.h
 %%DATADIR%%/include/arch/oz.h
 %%DATADIR%%/include/arch/oz700/ozfont.h
 %%DATADIR%%/include/arch/oz700/ozgfx.h
@@ -91,12 +95,39 @@ bin/zcc
 %%DATADIR%%/include/arch/s1mp3/drivers/watchdog.h
 %%DATADIR%%/include/arch/s1mp3/fonts.h
 %%DATADIR%%/include/arch/s1mp3/s1sdk.h
+%%DATADIR%%/include/arch/sam.h
 %%DATADIR%%/include/arch/sms/PSGlib.h
 %%DATADIR%%/include/arch/test.h
+%%DATADIR%%/include/arch/ts2068/sprites/sp1.h
+%%DATADIR%%/include/arch/ts2068/ts2068.h
 %%DATADIR%%/include/arch/vector06c.h
 %%DATADIR%%/include/arch/z80.h
+%%DATADIR%%/include/arch/z88/application.h
+%%DATADIR%%/include/arch/z88/dor.h
+%%DATADIR%%/include/arch/z88/oz/command0.h
+%%DATADIR%%/include/arch/z88/oz/command1.h
+%%DATADIR%%/include/arch/z88/oz/command2.h
+%%DATADIR%%/include/arch/z88/oz/command3.h
+%%DATADIR%%/include/arch/z88/oz/command4.h
+%%DATADIR%%/include/arch/z88/oz/command5.h
+%%DATADIR%%/include/arch/z88/oz/command6.h
+%%DATADIR%%/include/arch/z88/oz/command7.h
+%%DATADIR%%/include/arch/z88/oz/help0.h
+%%DATADIR%%/include/arch/z88/oz/help1.h
+%%DATADIR%%/include/arch/z88/oz/help2.h
+%%DATADIR%%/include/arch/z88/oz/help3.h
+%%DATADIR%%/include/arch/z88/oz/help4.h
+%%DATADIR%%/include/arch/z88/oz/help5.h
+%%DATADIR%%/include/arch/z88/oz/help6.h
+%%DATADIR%%/include/arch/z88/oz/help7.h
+%%DATADIR%%/include/arch/z88/package.h
+%%DATADIR%%/include/arch/z88/z88.h
 %%DATADIR%%/include/arch/zx/.placeholder
 %%DATADIR%%/include/arch/zx/esxdos.h
+%%DATADIR%%/include/arch/zx/spectrum.h
+%%DATADIR%%/include/arch/zx/sprites/sp1.h
+%%DATADIR%%/include/arch/zx/zx_input.h
+%%DATADIR%%/include/arch/zx81/sprites/sp1.h
 %%DATADIR%%/include/arch/zxn.h
 %%DATADIR%%/include/arch/zxn/.placeholder
 %%DATADIR%%/include/arch/zxn/esxdos.h
@@ -111,6 +142,9 @@ bin/zcc
 %%DATADIR%%/include/c128/sid.h
 %%DATADIR%%/include/c128/vdc.h
 %%DATADIR%%/include/compress/aplib.h
+%%DATADIR%%/include/compress/zx0.h
+%%DATADIR%%/include/compress/zx1.h
+%%DATADIR%%/include/compress/zx2.h
 %%DATADIR%%/include/compress/zx7.h
 %%DATADIR%%/include/conio.h
 %%DATADIR%%/include/cpc.h
@@ -119,12 +153,12 @@ bin/zcc
 %%DATADIR%%/include/curses.h
 %%DATADIR%%/include/debug.h
 %%DATADIR%%/include/dirent.h
-%%DATADIR%%/include/dor.h
 %%DATADIR%%/include/dos.h
 %%DATADIR%%/include/endian.h
 %%DATADIR%%/include/enterprise.h
 %%DATADIR%%/include/errno.h
 %%DATADIR%%/include/fcntl.h
+%%DATADIR%%/include/features.h
 %%DATADIR%%/include/float.h
 %%DATADIR%%/include/flos.h
 %%DATADIR%%/include/font/font.h
@@ -177,26 +211,10 @@ bin/zcc
 %%DATADIR%%/include/net/zsockerrs.h
 %%DATADIR%%/include/newbrain.h
 %%DATADIR%%/include/osca.h
-%%DATADIR%%/include/oz/command0.h
-%%DATADIR%%/include/oz/command1.h
-%%DATADIR%%/include/oz/command2.h
-%%DATADIR%%/include/oz/command3.h
-%%DATADIR%%/include/oz/command4.h
-%%DATADIR%%/include/oz/command5.h
-%%DATADIR%%/include/oz/command6.h
-%%DATADIR%%/include/oz/command7.h
-%%DATADIR%%/include/oz/help0.h
-%%DATADIR%%/include/oz/help1.h
-%%DATADIR%%/include/oz/help2.h
-%%DATADIR%%/include/oz/help3.h
-%%DATADIR%%/include/oz/help4.h
-%%DATADIR%%/include/oz/help5.h
-%%DATADIR%%/include/oz/help6.h
-%%DATADIR%%/include/oz/help7.h
-%%DATADIR%%/include/package.h
 %%DATADIR%%/include/pc.h
 %%DATADIR%%/include/psg.h
 %%DATADIR%%/include/psg/PSGlib.h
+%%DATADIR%%/include/psg/etracker.h
 %%DATADIR%%/include/psg/vt2.h
 %%DATADIR%%/include/psg/wyz.h
 %%DATADIR%%/include/pwd.h
@@ -223,9 +241,6 @@ bin/zcc
 %%DATADIR%%/include/sms.h
 %%DATADIR%%/include/sos.h
 %%DATADIR%%/include/sound.h
-%%DATADIR%%/include/spectrum.h
-%%DATADIR%%/include/sprites/readme.txt
-%%DATADIR%%/include/sprites/sp1.h
 %%DATADIR%%/include/stdarg.h
 %%DATADIR%%/include/stdbool.h
 %%DATADIR%%/include/stddef.h
@@ -234,12 +249,14 @@ bin/zcc
 %%DATADIR%%/include/stdlib.h
 %%DATADIR%%/include/string.h
 %%DATADIR%%/include/strings.h
+%%DATADIR%%/include/stropts.h
 %%DATADIR%%/include/sys/compiler.h
 %%DATADIR%%/include/sys/ioctl.h
 %%DATADIR%%/include/sys/stat.h
 %%DATADIR%%/include/sys/time.h
 %%DATADIR%%/include/sys/types.h
 %%DATADIR%%/include/termcap.h
+%%DATADIR%%/include/tgi.h
 %%DATADIR%%/include/threading/preempt.h
 %%DATADIR%%/include/threading/semaphore.h
 %%DATADIR%%/include/ti.h
@@ -251,13 +268,11 @@ bin/zcc
 %%DATADIR%%/include/tiki100.h
 %%DATADIR%%/include/time.h
 %%DATADIR%%/include/trsdos.h
-%%DATADIR%%/include/ts2068.h
 %%DATADIR%%/include/tvc.h
 %%DATADIR%%/include/unistd.h
 %%DATADIR%%/include/vz.h
 %%DATADIR%%/include/windows.h
 %%DATADIR%%/include/x1.h
-%%DATADIR%%/include/z88.h
 %%DATADIR%%/include/zx81.h
 %%DATADIR%%/include/zx81lowgfx.h
 %%DATADIR%%/include/zxbeta.h
@@ -276,6 +291,7 @@ bin/zcc
 %%DATADIR%%/lib/clibs/6128_math.lib
 %%DATADIR%%/lib/clibs/664_math.lib
 %%DATADIR%%/lib/clibs/8080_crt0.lib
+%%DATADIR%%/lib/clibs/8080_opt.lib
 %%DATADIR%%/lib/clibs/8085_opt.lib
 %%DATADIR%%/lib/clibs/README
 %%DATADIR%%/lib/clibs/abc800_clib.lib
@@ -285,6 +301,7 @@ bin/zcc
 %%DATADIR%%/lib/clibs/alphatro_clib.lib
 %%DATADIR%%/lib/clibs/altair8800_clib.lib
 %%DATADIR%%/lib/clibs/am9511.lib
+%%DATADIR%%/lib/clibs/am9511_8085.lib
 %%DATADIR%%/lib/clibs/am9511_ixiy.lib
 %%DATADIR%%/lib/clibs/aquarius_clib.lib
 %%DATADIR%%/lib/clibs/attache.lib
@@ -294,6 +311,8 @@ bin/zcc
 %%DATADIR%%/lib/clibs/bee_clib.lib
 %%DATADIR%%/lib/clibs/bic.lib
 %%DATADIR%%/lib/clibs/bit90.lib
+%%DATADIR%%/lib/clibs/bondwell.lib
+%%DATADIR%%/lib/clibs/bondwell2.lib
 %%DATADIR%%/lib/clibs/c128ansi_clib.lib
 %%DATADIR%%/lib/clibs/c128cpm.lib
 %%DATADIR%%/lib/clibs/c7420_clib.lib
@@ -347,7 +366,6 @@ bin/zcc
 %%DATADIR%%/lib/clibs/gfx81mt64.lib
 %%DATADIR%%/lib/clibs/gfx81phrg.lib
 %%DATADIR%%/lib/clibs/gfx81udg.lib
-%%DATADIR%%/lib/clibs/gfx9001krt.lib
 %%DATADIR%%/lib/clibs/gfxace.lib
 %%DATADIR%%/lib/clibs/gfxaceudg.lib
 %%DATADIR%%/lib/clibs/gfxaq48.lib
@@ -358,14 +376,14 @@ bin/zcc
 %%DATADIR%%/lib/clibs/gfxeg2000.lib
 %%DATADIR%%/lib/clibs/gfxep.lib
 %%DATADIR%%/lib/clibs/gfxephr.lib
+%%DATADIR%%/lib/clibs/gfxgsx.lib
+%%DATADIR%%/lib/clibs/gfxhrg1.lib
 %%DATADIR%%/lib/clibs/gfxkp.lib
 %%DATADIR%%/lib/clibs/gfxkp83.lib
 %%DATADIR%%/lib/clibs/gfxlambda.lib
 %%DATADIR%%/lib/clibs/gfxnc100.lib
 %%DATADIR%%/lib/clibs/gfxnc200.lib
 %%DATADIR%%/lib/clibs/gfxosborne1.lib
-%%DATADIR%%/lib/clibs/gfxpc88.lib
-%%DATADIR%%/lib/clibs/gfxpc88hr200.lib
 %%DATADIR%%/lib/clibs/gfxtrs80.lib
 %%DATADIR%%/lib/clibs/gfxvdm.lib
 %%DATADIR%%/lib/clibs/gfxvio.lib
@@ -373,6 +391,8 @@ bin/zcc
 %%DATADIR%%/lib/clibs/gfxzcn.lib
 %%DATADIR%%/lib/clibs/gl6000_clib.lib
 %%DATADIR%%/lib/clibs/gl_clib.lib
+%%DATADIR%%/lib/clibs/grafyx4.lib
+%%DATADIR%%/lib/clibs/grafyx4_3.lib
 %%DATADIR%%/lib/clibs/hemc_clib.lib
 %%DATADIR%%/lib/clibs/hgmc_clib.lib
 %%DATADIR%%/lib/clibs/homelab2_clib.lib
@@ -401,11 +421,13 @@ bin/zcc
 %%DATADIR%%/lib/clibs/math48_iy.lib
 %%DATADIR%%/lib/clibs/mbf32.lib
 %%DATADIR%%/lib/clibs/mbf32_8080.lib
+%%DATADIR%%/lib/clibs/mbf32_8085.lib
 %%DATADIR%%/lib/clibs/mbf32_gbz80.lib
 %%DATADIR%%/lib/clibs/mbf32_iy.lib
 %%DATADIR%%/lib/clibs/mbf64.lib
 %%DATADIR%%/lib/clibs/mbf64_iy.lib
 %%DATADIR%%/lib/clibs/mc1000_clib.lib
+%%DATADIR%%/lib/clibs/micro8085_clib.lib
 %%DATADIR%%/lib/clibs/microbee.lib
 %%DATADIR%%/lib/clibs/mikro80_clib.lib
 %%DATADIR%%/lib/clibs/mlambda.lib
@@ -437,7 +459,9 @@ bin/zcc
 %%DATADIR%%/lib/clibs/pasopia7_clib.lib
 %%DATADIR%%/lib/clibs/pc6001_clib.lib
 %%DATADIR%%/lib/clibs/pc88_clib.lib
+%%DATADIR%%/lib/clibs/pcw.lib
 %%DATADIR%%/lib/clibs/pencil2_clib.lib
+%%DATADIR%%/lib/clibs/pk8000_clib.lib
 %%DATADIR%%/lib/clibs/pmd85_clib.lib
 %%DATADIR%%/lib/clibs/pps_clib.lib
 %%DATADIR%%/lib/clibs/preempt.lib
@@ -447,6 +471,8 @@ bin/zcc
 %%DATADIR%%/lib/clibs/px4.lib
 %%DATADIR%%/lib/clibs/px8.lib
 %%DATADIR%%/lib/clibs/r2k_crt0.lib
+%%DATADIR%%/lib/clibs/radio86_clib.lib
+%%DATADIR%%/lib/clibs/rc2014-8085_clib.lib
 %%DATADIR%%/lib/clibs/rc700.lib
 %%DATADIR%%/lib/clibs/rcmx000_clib.lib
 %%DATADIR%%/lib/clibs/rex_clib.lib
@@ -458,9 +484,14 @@ bin/zcc
 %%DATADIR%%/lib/clibs/s1mp3_clib.lib
 %%DATADIR%%/lib/clibs/sam_clib.lib
 %%DATADIR%%/lib/clibs/sc3000_clib.lib
+%%DATADIR%%/lib/clibs/smc777_clib.lib
 %%DATADIR%%/lib/clibs/smc777_cpm.lib
 %%DATADIR%%/lib/clibs/sms_clib.lib
+%%DATADIR%%/lib/clibs/sol20_clib.lib
 %%DATADIR%%/lib/clibs/sos_clib.lib
+%%DATADIR%%/lib/clibs/sp1-ts2068.lib
+%%DATADIR%%/lib/clibs/sp1-zx81hr.lib
+%%DATADIR%%/lib/clibs/sp1.lib
 %%DATADIR%%/lib/clibs/spc1000_clib.lib
 %%DATADIR%%/lib/clibs/special_clib.lib
 %%DATADIR%%/lib/clibs/srr_clib.lib
@@ -484,6 +515,7 @@ bin/zcc
 %%DATADIR%%/lib/clibs/trsdos.lib
 %%DATADIR%%/lib/clibs/ts2068_clib.lib
 %%DATADIR%%/lib/clibs/tvc_clib.lib
+%%DATADIR%%/lib/clibs/tvc_romgfx.lib
 %%DATADIR%%/lib/clibs/vector06c_clib.lib
 %%DATADIR%%/lib/clibs/vg5k_clib.lib
 %%DATADIR%%/lib/clibs/vz_clib.lib
@@ -547,6 +579,7 @@ bin/zcc
 %%DATADIR%%/lib/config/m100.cfg
 %%DATADIR%%/lib/config/m5.cfg
 %%DATADIR%%/lib/config/mc1000.cfg
+%%DATADIR%%/lib/config/micro8085.cfg
 %%DATADIR%%/lib/config/mikro80.cfg
 %%DATADIR%%/lib/config/msx.cfg
 %%DATADIR%%/lib/config/mtx.cfg
@@ -566,11 +599,13 @@ bin/zcc
 %%DATADIR%%/lib/config/pc6001.cfg
 %%DATADIR%%/lib/config/pc88.cfg
 %%DATADIR%%/lib/config/pencil2.cfg
+%%DATADIR%%/lib/config/pk8000.cfg
 %%DATADIR%%/lib/config/pmd85.cfg
 %%DATADIR%%/lib/config/pps.cfg
 %%DATADIR%%/lib/config/primo.cfg
 %%DATADIR%%/lib/config/pv1000.cfg
 %%DATADIR%%/lib/config/pv2000.cfg
+%%DATADIR%%/lib/config/radio86.cfg
 %%DATADIR%%/lib/config/rc2014.cfg
 %%DATADIR%%/lib/config/rcmx000.cfg
 %%DATADIR%%/lib/config/rex.cfg
@@ -579,7 +614,9 @@ bin/zcc
 %%DATADIR%%/lib/config/sam.cfg
 %%DATADIR%%/lib/config/sc3000.cfg
 %%DATADIR%%/lib/config/scz180.cfg
+%%DATADIR%%/lib/config/smc777.cfg
 %%DATADIR%%/lib/config/sms.cfg
+%%DATADIR%%/lib/config/sol20.cfg
 %%DATADIR%%/lib/config/sos.cfg
 %%DATADIR%%/lib/config/spc1000.cfg
 %%DATADIR%%/lib/config/special.cfg
@@ -598,7 +635,6 @@ bin/zcc
 %%DATADIR%%/lib/config/tvc.cfg
 %%DATADIR%%/lib/config/vector06c.cfg
 %%DATADIR%%/lib/config/vg5k.cfg
-%%DATADIR%%/lib/config/vgl.cfg
 %%DATADIR%%/lib/config/vz.cfg
 %%DATADIR%%/lib/config/x07.cfg
 %%DATADIR%%/lib/config/x1.cfg
@@ -614,12 +650,17 @@ bin/zcc
 %%DATADIR%%/lib/config/zx81.cfg
 %%DATADIR%%/lib/config/zxn.cfg
 %%DATADIR%%/lib/crt/classic/crt_command_line.asm
+%%DATADIR%%/lib/crt/classic/crt_cpm_fcntl.asm
 %%DATADIR%%/lib/crt/classic/crt_init_amalloc.asm
 %%DATADIR%%/lib/crt/classic/crt_init_atexit.asm
 %%DATADIR%%/lib/crt/classic/crt_init_sp.asm
 %%DATADIR%%/lib/crt/classic/crt_rules.inc
 %%DATADIR%%/lib/crt/classic/crt_runtime_selection.asm
 %%DATADIR%%/lib/crt/classic/crt_section.asm
+%%DATADIR%%/lib/crt/classic/crt_section_bss.inc
+%%DATADIR%%/lib/crt/classic/crt_section_code.inc
+%%DATADIR%%/lib/crt/classic/crt_section_data.inc
+%%DATADIR%%/lib/crt/classic/crt_section_rodata.inc
 %%DATADIR%%/lib/crt/classic/crt_section_standard.asm
 %%DATADIR%%/lib/crt/classic/crt_z80_rsts.asm
 %%DATADIR%%/lib/crt/classic/tms9918/interrupt.asm
@@ -637,8 +678,13 @@ bin/zcc
 %%DATADIR%%/lib/target/bee/classic/bee_crt0.asm
 %%DATADIR%%/lib/target/c128/classic/c128_crt0.asm
 %%DATADIR%%/lib/target/c7420/classic/c7420_crt0.asm
+%%DATADIR%%/lib/target/coleco/classic/adam_bootstrap.asm
+%%DATADIR%%/lib/target/coleco/classic/allram.asm
 %%DATADIR%%/lib/target/coleco/classic/coleco_crt0.asm
+%%DATADIR%%/lib/target/coleco/classic/rom.asm
+%%DATADIR%%/lib/target/coleco/def/eos.def
 %%DATADIR%%/lib/target/cpc/classic/cpc_crt0.asm
+%%DATADIR%%/lib/target/cpc/classic/loader.asm
 %%DATADIR%%/lib/target/cpc/def/amstrad_userf.def
 %%DATADIR%%/lib/target/cpc/def/cpcfirm.def
 %%DATADIR%%/lib/target/cpc/def/cpcfp.def
@@ -696,6 +742,8 @@ bin/zcc
 %%DATADIR%%/lib/target/mc1000/classic/mc1000_crt0.asm
 %%DATADIR%%/lib/target/mc1000/def/maths_mbf.def
 %%DATADIR%%/lib/target/mc1000/def/mc1000.def
+%%DATADIR%%/lib/target/micro8085/classic/micro8085_crt0.asm
+%%DATADIR%%/lib/target/micro8085/def/micro8085.def
 %%DATADIR%%/lib/target/mikro80/classic/mikro80_crt0.asm
 %%DATADIR%%/lib/target/mikro80/def/mikro80.def
 %%DATADIR%%/lib/target/msx/classic/megarom.asm
@@ -739,11 +787,15 @@ bin/zcc
 %%DATADIR%%/lib/target/pasopia7/def/pasopia7.def
 %%DATADIR%%/lib/target/pc6001/classic/pc6001_crt0.asm
 %%DATADIR%%/lib/target/pc6001/def/pc6001.def
+%%DATADIR%%/lib/target/pc88/classic/allram.asm
 %%DATADIR%%/lib/target/pc88/classic/bootstrap.asm
+%%DATADIR%%/lib/target/pc88/classic/monitor.asm
 %%DATADIR%%/lib/target/pc88/classic/pc88_crt0.asm
 %%DATADIR%%/lib/target/pc88/def/n88basic.def
 %%DATADIR%%/lib/target/pc88/def/n88bios.def
+%%DATADIR%%/lib/target/pc88/def/pc88.def
 %%DATADIR%%/lib/target/pencil2/classic/pencil2_crt0.asm
+%%DATADIR%%/lib/target/pk8000/classic/pk8000_crt0.asm
 %%DATADIR%%/lib/target/pmd85/classic/bootstrap.asm
 %%DATADIR%%/lib/target/pmd85/classic/pmd85_crt0.asm
 %%DATADIR%%/lib/target/pps/classic/pps_crt0.asm
@@ -755,6 +807,8 @@ bin/zcc
 %%DATADIR%%/lib/target/pv1000/classic/pv1000_crt0.asm
 %%DATADIR%%/lib/target/pv2000/classic/pv2000_crt0.asm
 %%DATADIR%%/lib/target/px8/def/px8_subcpu.def
+%%DATADIR%%/lib/target/radio86/classic/radio86_crt0.asm
+%%DATADIR%%/lib/target/radio86/def/monitor.def
 %%DATADIR%%/lib/target/rcmx000/classic/rcmx000_boot.asm
 %%DATADIR%%/lib/target/rcmx000/classic/rcmx000_crt0.asm
 %%DATADIR%%/lib/target/rcmx000/classic/rcmx000_flash.asm
@@ -762,12 +816,22 @@ bin/zcc
 %%DATADIR%%/lib/target/rex/classic/rex_crt0.asm
 %%DATADIR%%/lib/target/rx78/classic/rx78_crt0.asm
 %%DATADIR%%/lib/target/s1mp3/classic/s1mp3_crt0.asm
+%%DATADIR%%/lib/target/sam/classic/allram.asm
+%%DATADIR%%/lib/target/sam/classic/basic.asm
+%%DATADIR%%/lib/target/sam/classic/highram.asm
 %%DATADIR%%/lib/target/sam/classic/sam_crt0.asm
+%%DATADIR%%/lib/target/sam/classic/sam_switchmode.inc
+%%DATADIR%%/lib/target/sam/classic/samdos2.bin
 %%DATADIR%%/lib/target/sam/def/fp.def
+%%DATADIR%%/lib/target/sam/def/hooks.def
+%%DATADIR%%/lib/target/sam/def/sam.def
 %%DATADIR%%/lib/target/sc3000/classic/ram.asm
 %%DATADIR%%/lib/target/sc3000/classic/rom.asm
 %%DATADIR%%/lib/target/sc3000/classic/sc3000_crt0.asm
+%%DATADIR%%/lib/target/smc777/classic/bootstrap.asm
+%%DATADIR%%/lib/target/smc777/classic/smc777_crt0.asm
 %%DATADIR%%/lib/target/sms/classic/sms_crt0.asm
+%%DATADIR%%/lib/target/sol20/classic/sol20_crt0.asm
 %%DATADIR%%/lib/target/sos/classic/sos_crt0.asm
 %%DATADIR%%/lib/target/spc1000/classic/spc1000_crt0.asm
 %%DATADIR%%/lib/target/spc1000/def/spc1000.def
@@ -831,6 +895,7 @@ bin/zcc
 %%DATADIR%%/lib/target/z88/classic/z88a_crt0.asm
 %%DATADIR%%/lib/target/z88/classic/z88b_crt0.asm
 %%DATADIR%%/lib/target/z88/classic/z88d_crt0.asm
+%%DATADIR%%/lib/target/z88/classic/z88s5_crt0.asm
 %%DATADIR%%/lib/target/z88/classic/z88s_crt0.asm
 %%DATADIR%%/lib/target/z88/coptrules.z88
 %%DATADIR%%/lib/target/z88/def/alarm.def
@@ -883,27 +948,8 @@ bin/zcc
 %%DATADIR%%/lib/target/zxn/classic/memory_map.asm
 %%DATADIR%%/lib/target/zxn/classic/ram_crt0.asm
 %%DATADIR%%/lib/target/zxn/classic/zxn_crt0.asm
-%%DATADIR%%/lib/vgl_crt0.asm
-%%DATADIR%%/lib/vgl_crt0.opt
-%%DATADIR%%/lib/yaz180_rules.1
 %%DATADIR%%/lib/z180_rules.1
 %%DATADIR%%/lib/z80_crt0.hdr
-%%DATADIR%%/lib/z80asm-8080-.lib
-%%DATADIR%%/lib/z80asm-8080-ixiy.lib
-%%DATADIR%%/lib/z80asm-8085-.lib
-%%DATADIR%%/lib/z80asm-8085-ixiy.lib
-%%DATADIR%%/lib/z80asm-gbz80-.lib
-%%DATADIR%%/lib/z80asm-gbz80-ixiy.lib
-%%DATADIR%%/lib/z80asm-r2k-.lib
-%%DATADIR%%/lib/z80asm-r2k-ixiy.lib
-%%DATADIR%%/lib/z80asm-r3k-.lib
-%%DATADIR%%/lib/z80asm-r3k-ixiy.lib
-%%DATADIR%%/lib/z80asm-z180-.lib
-%%DATADIR%%/lib/z80asm-z180-ixiy.lib
-%%DATADIR%%/lib/z80asm-z80-.lib
-%%DATADIR%%/lib/z80asm-z80-ixiy.lib
-%%DATADIR%%/lib/z80asm-z80n-.lib
-%%DATADIR%%/lib/z80asm-z80n-ixiy.lib
 %%DATADIR%%/lib/z80n_rules.1
 %%DATADIR%%/lib/z80n_rules.2
 %%DATADIR%%/lib/z80n_rules.old.2
@@ -913,4 +959,20 @@ bin/zcc
 %%DATADIR%%/lib/z80rules.8
 %%DATADIR%%/lib/z80rules.9
 %%DATADIR%%/lib/z80rules.frame
+%%DATADIR%%/lib/z88dk-z80asm-8080-.lib
+%%DATADIR%%/lib/z88dk-z80asm-8080-ixiy.lib
+%%DATADIR%%/lib/z88dk-z80asm-8085-.lib
+%%DATADIR%%/lib/z88dk-z80asm-8085-ixiy.lib
+%%DATADIR%%/lib/z88dk-z80asm-gbz80-.lib
+%%DATADIR%%/lib/z88dk-z80asm-gbz80-ixiy.lib
+%%DATADIR%%/lib/z88dk-z80asm-r2ka-.lib
+%%DATADIR%%/lib/z88dk-z80asm-r2ka-ixiy.lib
+%%DATADIR%%/lib/z88dk-z80asm-r3k-.lib
+%%DATADIR%%/lib/z88dk-z80asm-r3k-ixiy.lib
+%%DATADIR%%/lib/z88dk-z80asm-z180-.lib
+%%DATADIR%%/lib/z88dk-z80asm-z180-ixiy.lib
+%%DATADIR%%/lib/z88dk-z80asm-z80-.lib
+%%DATADIR%%/lib/z88dk-z80asm-z80-ixiy.lib
+%%DATADIR%%/lib/z88dk-z80asm-z80n-.lib
+%%DATADIR%%/lib/z88dk-z80asm-z80n-ixiy.lib
 %%DATADIR%%/lib/zxr_crt0.asm