git: a9b19d5ce75e - main - emulators/vice: update to 3.8

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dirk Meyer <dinoex_at_FreeBSD.org>
Date: Mon, 26 Feb 2024 17:31:16 UTC
The branch main has been updated by dinoex:

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

commit a9b19d5ce75e36fb8f90ccb2474756fd40b1221d
Author:     Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2024-02-26 17:31:04 +0000
Commit:     Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2024-02-26 17:31:04 +0000

    emulators/vice: update to 3.8
    
    new option ETHERNET
    add html docs
---
 emulators/vice/Makefile                            |  32 ++-
 emulators/vice/distinfo                            |   6 +-
 .../patch-src_arch_gtk3_data_unix_Makefile.in      |  10 +-
 .../patch-src_arch_gtk3_joystickdrv_joystick_bsd.c |  11 --
 .../patch-src_arch_shared_iodrv_io-unix-access.c   |  41 ----
 emulators/vice/pkg-plist                           | 218 +++++++++++++++------
 6 files changed, 186 insertions(+), 132 deletions(-)

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 063f80ed8499..42f5f48cfc24 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vice
-PORTVERSION=	3.7.1
-PORTREVISION=	7
+PORTVERSION=	3.8
+PORTREVISION=	0
 CATEGORIES=	emulators
 MASTER_SITES=	SF/vice-emu/releases
 
@@ -29,9 +29,8 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libfreetype.so:print/freetype2 \
 		libpcre2-8.so:devel/pcre2 \
 		libgnutls.so:security/gnutls \
-		libharfbuzz.so:print/harfbuzz
-
-BROKEN_FreeBSD_aarch64=		undeclared function 'inb'
+		libharfbuzz.so:print/harfbuzz \
+		libcurl.so:ftp/curl
 
 USES=		compiler:c++11-lang pkgconfig perl5 localbase:ldflags \
 		gmake iconv:wchar_t jpeg readline gettext xorg
@@ -41,6 +40,8 @@ HAS_CONFIGURE=	yes
 MAKE_ENV+=	XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share
 CFLAGS+=	-fcommon
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
+			--with-lame \
+			--with-portaudio \
 			--enable-ipv6 \
 			--enable-x64 \
 			--disable-realdevice \
@@ -48,17 +49,20 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--localedir="${LOCALBASE}/share/locale" \
 			--disable-dependency-tracking \
 			DOS2UNIX=true
+TXTFILES=	CIA-README.txt iec-bus.txt \
+		readmes/Readme-SDL.txt readmes/Readme-SDL2.txt
 
-OPTIONS_DEFINE=	SDLSOUND ALSA PULSEAUDIO FFMPEG DOCS
+OPTIONS_DEFINE=	SDLSOUND ALSA PULSEAUDIO FFMPEG ETHERNET DOCS
 OPTIONS_SINGLE=	GUI
 OPTIONS_SINGLE_GUI=	GTK3UI SDLUI2
-OPTIONS_DEFAULT?=	GTK3UI SDLSOUND ALSA
+OPTIONS_DEFAULT?=	GTK3UI SDLSOUND ALSA ETHERNET
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 GTK3UI_DESC=	use GTK3 user interface
 SDLUI2_DESC=	use SDL2 user interface
 SDLSOUND_DESC=	build with SDL2 sound system support
 FFMPEG_CONFIGURE_ENABLE=	ffmpeg
+ETHERNET_DESC=	Network capture/injection support
 
 GTK3UI_USES=			desktop-file-utils
 GTK3UI_CONFIGURE_ENABLE=	gtk3ui desktop-files
@@ -73,6 +77,10 @@ ALSA_CONFIGURE_OFF=		--without-alsa
 ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
 PULSEAUDIO_CONFIGURE_OFF=	--without-pulse
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
+#ETHERNET_LIB_DEPENDS=		libpcap.so:net/libpcap # conflict with base
+ETHERNET_BUILD_DEPENDS=		${LOCALBASE}/include/pcap.h:net/libpcap
+ETHERNET_RUN_DEPENDS=		${LOCALBASE}/include/pcap.h:net/libpcap
+ETHERNET_CONFIGURE_ENABLE=	ethernet
 
 .include <bsd.port.options.mk>
 
@@ -100,4 +108,14 @@ pre-configure:
 pre-install-GTK3UI-on:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/desktop-directories
 
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${TXTFILES}
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}/
+.endfor
+	cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html/ "-name *\.html -or -name *\.css  -or -name *\.txt"
+	cd ${WRKSRC}/doc/html/fonts && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html/fonts/
+	cd ${WRKSRC}/doc/html/images && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html/images/
+	${INSTALL_DATA} ${WRKSRC}/doc/vice.texi ${STAGEDIR}${DOCSDIR}/html/
+
 .include <bsd.port.mk>
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index 3f6bed273d11..86e76bd512e0 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1675259238
-SHA256 (vice-3.7.1.tar.gz) = 7e3811e6024db0698bfbc321bb324572446b8853d01b4073f09865957b0cab98
-SIZE (vice-3.7.1.tar.gz) = 13444946
+TIMESTAMP = 1703538775
+SHA256 (vice-3.8.tar.gz) = 1d7dc4d0f2bbcc2a871bb954ff4a5df63048dea9c16f5f1e9bc8260fa41a1004
+SIZE (vice-3.8.tar.gz) = 13564021
diff --git a/emulators/vice/files/patch-src_arch_gtk3_data_unix_Makefile.in b/emulators/vice/files/patch-src_arch_gtk3_data_unix_Makefile.in
index 954d429d193a..451734fa448f 100644
--- a/emulators/vice/files/patch-src_arch_gtk3_data_unix_Makefile.in
+++ b/emulators/vice/files/patch-src_arch_gtk3_data_unix_Makefile.in
@@ -1,11 +1,11 @@
---- src/arch/gtk3/data/unix/Makefile.in.orig	2022-12-24 19:45:17 UTC
+--- src/arch/gtk3/data/unix/Makefile.in.orig	2023-12-24 17:42:17 UTC
 +++ src/arch/gtk3/data/unix/Makefile.in
-@@ -735,7 +735,7 @@ uninstall-am:
+@@ -732,7 +732,7 @@ uninstall-am:
  @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@		"SID_1024.svg"
  
  @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@install-data-hook: $(VICE_DIR_FILE) $(VICE_DESKTOP_FILES)
 -@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@	$(XDG_DESKTOP_MENU) install "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)
 +@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@	$(XDG_DESKTOP_MENU) install --mode system "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)
- 
- # Seems GNU disapproves of this, but it works to uninstall the .desktop/.directory
- # files.
+ @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@	$(XDG_DESKTOP_MENU) forceupdate
+ @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@	@echo " "
+ @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@	@echo "* Remember that for desktop updates to show up, you may have to log off and on,"
diff --git a/emulators/vice/files/patch-src_arch_gtk3_joystickdrv_joystick_bsd.c b/emulators/vice/files/patch-src_arch_gtk3_joystickdrv_joystick_bsd.c
deleted file mode 100644
index 19dbd78b8738..000000000000
--- a/emulators/vice/files/patch-src_arch_gtk3_joystickdrv_joystick_bsd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/arch/gtk3/joystickdrv/joystick_bsd.c.orig	2022-12-27 23:56:56 UTC
-+++ src/arch/gtk3/joystickdrv/joystick_bsd.c
-@@ -203,7 +203,7 @@ static void usb_joystick(int jp, void* priv)
-     }
-     if (ret != -1 && errno != EAGAIN) {
-         /* XXX */
--        log_warning("strange read return: %zd/%d", ret, errno);
-+        log_warning(bsd_joystick_log, "strange read return: %zd/%d", ret, errno);
-         return;
-     }
-     if (!val) {
diff --git a/emulators/vice/files/patch-src_arch_shared_iodrv_io-unix-access.c b/emulators/vice/files/patch-src_arch_shared_iodrv_io-unix-access.c
deleted file mode 100644
index c77d704d0ec5..000000000000
--- a/emulators/vice/files/patch-src_arch_shared_iodrv_io-unix-access.c
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/arch/shared/iodrv/io-unix-access.c.orig	2022-12-27 23:56:56 UTC
-+++ src/arch/shared/iodrv/io-unix-access.c
-@@ -26,6 +26,15 @@
- 
- #include "vice.h"
- 
-+#if defined(__FreeBSD__)
-+#include <sys/types.h>
-+#if defined(__ppc__)
-+#include <machine/pio.h>
-+#else
-+#include <machine/iodev.h>
-+#endif
-+#endif
-+
- #ifdef UNIX_COMPILE
- 
- #include <fcntl.h>
-@@ -121,8 +130,12 @@ static uint8_t device_io_inb(uint16_t addr)
- #ifdef HAVE_INBV
-     return inbv(addr);
- #else
-+#ifdef HAVE_INB
-     return inb(addr);
-+#else
-+    return 0;
- #endif
-+#endif
- }
- 
- static void device_io_outb(uint16_t addr, uint8_t val)
-@@ -130,7 +143,9 @@ static void device_io_outb(uint16_t addr, uint8_t val)
- #ifdef HAVE_OUTBV
-     outbv(addr, val);
- #else
-+#ifdef HAVE_OUTB
-     outb(addr, val);
-+#endif
- #endif
- }
- #endif
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index 25ef490effaf..d47d1f8243ea 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -33,6 +33,7 @@ bin/xvic
 %%DATADIR%%/C128/chargen-315079-01.bin
 %%DATADIR%%/C128/chargen-325078-02.bin
 %%DATADIR%%/C128/chargen-325167-01.bin
+%%DATADIR%%/C128/chargen-325167-02.bin
 %%DATADIR%%/C128/chargen-325173-01D.bin
 %%DATADIR%%/C128/chargen-325181-01.bin
 %%DATADIR%%/C128/chargen-390059-01.bin
@@ -43,8 +44,8 @@ bin/xvic
 %%DATADIR%%/C128/default.vrs
 %%DATADIR%%/C128/frodo.vpl
 %%DATADIR%%/C128/godot.vpl
-%%GTK3UI%%%%DATADIR%%/C128/gtk3-hotkeys-mac.vhk
-%%GTK3UI%%%%DATADIR%%/C128/gtk3-hotkeys.vhk
+%%GTK3UI%%%%DATADIR%%/C128/gtk3_keyrahv3.vkm
+%%GTK3UI%%%%DATADIR%%/C128/gtk3_keyrahv3_de.vkm
 %%GTK3UI%%%%DATADIR%%/C128/gtk3_pos.vkm
 %%GTK3UI%%%%DATADIR%%/C128/gtk3_pos_de.vkm
 %%GTK3UI%%%%DATADIR%%/C128/gtk3_pos_se.vkm
@@ -56,6 +57,8 @@ bin/xvic
 %%DATADIR%%/C128/kernal-318020-05.bin
 %%DATADIR%%/C128/kernal-318034-01.bin
 %%DATADIR%%/C128/kernal-325172-01.bin
+%%DATADIR%%/C128/kernal64-325179-01.bin
+%%DATADIR%%/C128/kernal64-325182-01.bin
 %%DATADIR%%/C128/kernal64-901227-03.bin
 %%DATADIR%%/C128/kernalfi
 %%DATADIR%%/C128/kernalfr
@@ -63,6 +66,12 @@ bin/xvic
 %%DATADIR%%/C128/kernalno
 %%DATADIR%%/C128/pc64.vpl
 %%DATADIR%%/C128/palette.vpl
+%%DATADIR%%/C128/palette_6569R1_v1r.vpl
+%%DATADIR%%/C128/palette_6569R5_v1r.vpl
+%%DATADIR%%/C128/palette_8565R2_v1r.vpl
+%%DATADIR%%/C128/palette_C64_amber.vpl
+%%DATADIR%%/C128/palette_C64_cyan.vpl
+%%DATADIR%%/C128/palette_C64_green.vpl
 %%DATADIR%%/C128/pepto-ntsc-sony.vpl
 %%DATADIR%%/C128/pepto-ntsc.vpl
 %%DATADIR%%/C128/pepto-pal.vpl
@@ -70,15 +79,16 @@ bin/xvic
 %%DATADIR%%/C128/pixcen.vpl
 %%DATADIR%%/C128/ptoing.vpl
 %%DATADIR%%/C128/rgb.vpl
-%%SDLUI2%%%%DATADIR%%/C128/sdl-hotkeys.vhk
 %%SDLUI2%%%%DATADIR%%/C128/sdl_pos.vkm
 %%SDLUI2%%%%DATADIR%%/C128/sdl_pos_de.vkm
 %%SDLUI2%%%%DATADIR%%/C128/sdl_sym.vkm
 %%SDLUI2%%%%DATADIR%%/C128/sdl_sym_de.vkm
 %%SDLUI2%%%%DATADIR%%/C128/sdl_sym_fr.vkm
 %%SDLUI2%%%%DATADIR%%/C128/sdl_v128.vkm
+%%DATADIR%%/C128/the64.vpl
 %%DATADIR%%/C128/vdc_comp.vpl
 %%DATADIR%%/C128/vdc_deft.vpl
+%%DATADIR%%/C128/vdc_scart.vpl
 %%DATADIR%%/C128/vice.vpl
 %%DATADIR%%/C64/basic-901226-01.bin
 %%DATADIR%%/C64/c64hq.vpl
@@ -94,11 +104,6 @@ bin/xvic
 %%DATADIR%%/C64/default.vrs
 %%DATADIR%%/C64/frodo.vpl
 %%DATADIR%%/C64/godot.vpl
-%%GTK3UI%%%%DATADIR%%/C64/gtk3-hotkeys-mac.vhk
-%%GTK3UI%%%%DATADIR%%/C64/gtk3-hotkeys.vhk
-%%GTK3UI%%%%DATADIR%%/C64/gtk3-vsid-hotkeys-mac.vhk
-%%GTK3UI%%%%DATADIR%%/C64/gtk3-vsid-hotkeys.vhk
-%%GTK3UI%%%%DATADIR%%/C64/gtk3-winvice-legacy.vhk
 %%GTK3UI%%%%DATADIR%%/C64/gtk3_keyrah.vkm
 %%GTK3UI%%%%DATADIR%%/C64/gtk3_keyrah_de.vkm
 %%GTK3UI%%%%DATADIR%%/C64/gtk3_pos.vkm
@@ -128,6 +133,12 @@ bin/xvic
 %%DATADIR%%/C64/kernal-901246-01.bin
 %%DATADIR%%/C64/kernal-906145-02.bin
 %%DATADIR%%/C64/palette.vpl
+%%DATADIR%%/C64/palette_6569R1_v1r.vpl
+%%DATADIR%%/C64/palette_6569R5_v1r.vpl
+%%DATADIR%%/C64/palette_8565R2_v1r.vpl
+%%DATADIR%%/C64/palette_C64_amber.vpl
+%%DATADIR%%/C64/palette_C64_cyan.vpl
+%%DATADIR%%/C64/palette_C64_green.vpl
 %%DATADIR%%/C64/pc64.vpl
 %%DATADIR%%/C64/pepto-ntsc-sony.vpl
 %%DATADIR%%/C64/pepto-ntsc.vpl
@@ -136,8 +147,6 @@ bin/xvic
 %%DATADIR%%/C64/pixcen.vpl
 %%DATADIR%%/C64/ptoing.vpl
 %%DATADIR%%/C64/rgb.vpl
-%%SDLUI2%%%%DATADIR%%/C64/sdl-hotkeys-vsid.vhk
-%%SDLUI2%%%%DATADIR%%/C64/sdl-hotkeys.vhk
 %%SDLUI2%%%%DATADIR%%/C64/sdl_joymap_thec64.vjm
 %%SDLUI2%%%%DATADIR%%/C64/sdl_joymap_ps3.vjm
 %%SDLUI2%%%%DATADIR%%/C64/sdl_keyrah.vkm
@@ -161,14 +170,13 @@ bin/xvic
 %%SDLUI2%%%%DATADIR%%/C64/sdl_sym_nl.vkm
 %%SDLUI2%%%%DATADIR%%/C64/sdl_sym_tr.vkm
 %%SDLUI2%%%%DATADIR%%/C64/sdl_sym_uk.vkm
+%%DATADIR%%/C64/the64.vpl
 %%DATADIR%%/C64/vice.vpl
 %%DATADIR%%/C64DTV/c64mem.sym
 %%DATADIR%%/C64DTV/basic-901226-01.bin
 %%DATADIR%%/C64DTV/chargen-901225-01.bin
 %%DATADIR%%/C64DTV/default.vrs
 %%DATADIR%%/C64DTV/dtvrom.bin
-%%GTK3UI%%%%DATADIR%%/C64DTV/gtk3-hotkeys-mac.vhk
-%%GTK3UI%%%%DATADIR%%/C64DTV/gtk3-hotkeys.vhk
 %%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_keyrah.vkm
 %%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_keyrah_de.vkm
 %%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_pos.vkm
@@ -191,7 +199,6 @@ bin/xvic
 %%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_sym_uk.vkm
 %%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_the64_de.vkm
 %%DATADIR%%/C64DTV/kernal-901227-03.bin
-%%SDLUI2%%%%DATADIR%%/C64DTV/sdl-hotkeys.vhk
 %%SDLUI2%%%%DATADIR%%/C64DTV/sdl_keyrah.vkm
 %%SDLUI2%%%%DATADIR%%/C64DTV/sdl_keyrah_combian.vkm
 %%SDLUI2%%%%DATADIR%%/C64DTV/sdl_keyrah_de.vkm
@@ -230,14 +237,19 @@ bin/xvic
 %%DATADIR%%/CBM-II/frodo.vpl
 %%DATADIR%%/CBM-II/godot.vpl
 %%DATADIR%%/CBM-II/green.vpl
-%%GTK3UI%%%%DATADIR%%/CBM-II/gtk3-hotkeys-mac.vhk
-%%GTK3UI%%%%DATADIR%%/CBM-II/gtk3-hotkeys.vhk
 %%GTK3UI%%%%DATADIR%%/CBM-II/gtk3_pos.vkm
+%%GTK3UI%%%%DATADIR%%/CBM-II/gtk3_pos_de.vkm
 %%GTK3UI%%%%DATADIR%%/CBM-II/gtk3_sym.vkm
 %%GTK3UI%%%%DATADIR%%/CBM-II/gtk3_sym_de.vkm
 %%DATADIR%%/CBM-II/kernal-901234-02.bin
 %%DATADIR%%/CBM-II/kernal-901244-04a.bin
 %%DATADIR%%/CBM-II/palette.vpl
+%%DATADIR%%/CBM-II/palette_6569R1_v1r.vpl
+%%DATADIR%%/CBM-II/palette_6569R5_v1r.vpl
+%%DATADIR%%/CBM-II/palette_8565R2_v1r.vpl
+%%DATADIR%%/CBM-II/palette_C64_amber.vpl
+%%DATADIR%%/CBM-II/palette_C64_cyan.vpl
+%%DATADIR%%/CBM-II/palette_C64_green.vpl
 %%DATADIR%%/CBM-II/pc64.vpl
 %%DATADIR%%/CBM-II/pepto-ntsc-sony.vpl
 %%DATADIR%%/CBM-II/pepto-ntsc.vpl
@@ -251,9 +263,9 @@ bin/xvic
 %%DATADIR%%/CBM-II/rom256h.vrs
 %%DATADIR%%/CBM-II/rom256l.vrs
 %%DATADIR%%/CBM-II/rom500.vrs
-%%SDLUI2%%%%DATADIR%%/CBM-II/sdl-hotkeys.vhk
 %%SDLUI2%%%%DATADIR%%/CBM-II/sdl_pos.vkm
 %%SDLUI2%%%%DATADIR%%/CBM-II/sdl_sym.vkm
+%%DATADIR%%/CBM-II/the64.vpl
 %%DATADIR%%/CBM-II/vice.vpl
 %%DATADIR%%/CBM-II/white.vpl
 %%DATADIR%%/DRIVES/dos1001-901887+8-01.bin
@@ -275,6 +287,7 @@ bin/xvic
 %%GTK3UI%%%%DATADIR%%/GLSL/builtin-interlaced.frag
 %%GTK3UI%%%%DATADIR%%/GLSL/builtin.frag
 %%GTK3UI%%%%DATADIR%%/GLSL/viewport.vert
+%%DATADIR%%/PET/2001-blueish.vpl
 %%DATADIR%%/PET/amber.vpl
 %%DATADIR%%/PET/basic-1.901439-09-05-02-06.bin
 %%DATADIR%%/PET/basic-2.901465-01-02.bin
@@ -295,8 +308,6 @@ bin/xvic
 %%DATADIR%%/PET/edit-4-80-b-60Hz.901474-03.bin
 %%DATADIR%%/PET/edit-4-b-noCRTC.901474-02.bin
 %%DATADIR%%/PET/green.vpl
-%%GTK3UI%%%%DATADIR%%/PET/gtk3-hotkeys-mac.vhk
-%%GTK3UI%%%%DATADIR%%/PET/gtk3-hotkeys.vhk
 %%GTK3UI%%%%DATADIR%%/PET/gtk3_bude_pos.vkm
 %%GTK3UI%%%%DATADIR%%/PET/gtk3_bude_pos_de.vkm
 %%GTK3UI%%%%DATADIR%%/PET/gtk3_bude_sym.vkm
@@ -324,7 +335,6 @@ bin/xvic
 %%DATADIR%%/PET/rom4b80.vrs
 %%DATADIR%%/PET/rom4g40.vrs
 %%DATADIR%%/PET/romsuperpet.vrs
-%%SDLUI2%%%%DATADIR%%/PET/sdl-hotkeys.vhk
 %%SDLUI2%%%%DATADIR%%/PET/sdl_buuk_pos.vkm
 %%SDLUI2%%%%DATADIR%%/PET/sdl_buuk_pos_de.vkm
 %%SDLUI2%%%%DATADIR%%/PET/sdl_buuk_sym.vkm
@@ -342,17 +352,20 @@ bin/xvic
 %%DATADIR%%/PET/waterloo-e000.901897-01.bin
 %%DATADIR%%/PET/waterloo-f000.901898-05.bin
 %%DATADIR%%/PET/white.vpl
+%%DATADIR%%/PLUS4/ITU-R_BT2020.vpl
+%%DATADIR%%/PLUS4/ITU-R_BT601_CRT.vpl
+%%DATADIR%%/PLUS4/ITU-R_BT709_HDTV.vpl
 %%DATADIR%%/PLUS4/3plus1-317053-01.bin
 %%DATADIR%%/PLUS4/3plus1-317054-01.bin
 %%DATADIR%%/PLUS4/basic-318006-01.bin
 %%DATADIR%%/PLUS4/c2lo-364.bin
 %%DATADIR%%/PLUS4/colodore_ted.vpl
 %%DATADIR%%/PLUS4/default.vrs
-%%GTK3UI%%%%DATADIR%%/PLUS4/gtk3-hotkeys-mac.vhk
-%%GTK3UI%%%%DATADIR%%/PLUS4/gtk3-hotkeys.vhk
 %%GTK3UI%%%%DATADIR%%/PLUS4/gtk3_c116_pos_it.vkm
 %%GTK3UI%%%%DATADIR%%/PLUS4/gtk3_c16_pos_it.vkm
 %%GTK3UI%%%%DATADIR%%/PLUS4/gtk3_pos.vkm
+%%GTK3UI%%%%DATADIR%%/PLUS4/gtk3_pos_de.vkm
+%%GTK3UI%%%%DATADIR%%/PLUS4/gtk3_pos_es.vkm
 %%GTK3UI%%%%DATADIR%%/PLUS4/gtk3_pos_it.vkm
 %%GTK3UI%%%%DATADIR%%/PLUS4/gtk3_sym.vkm
 %%GTK3UI%%%%DATADIR%%/PLUS4/gtk3_sym_de.vkm
@@ -362,18 +375,21 @@ bin/xvic
 %%DATADIR%%/PLUS4/kernal-318004-05.bin
 %%DATADIR%%/PLUS4/kernal-318005-05.bin
 %%DATADIR%%/PLUS4/kernal-364.bin
-%%SDLUI2%%%%DATADIR%%/PLUS4/sdl-hotkeys.vhk
 %%SDLUI2%%%%DATADIR%%/PLUS4/sdl_pos.vkm
 %%SDLUI2%%%%DATADIR%%/PLUS4/sdl_pos_fr.vkm
 %%SDLUI2%%%%DATADIR%%/PLUS4/sdl_sym.vkm
 %%SDLUI2%%%%DATADIR%%/PLUS4/sdl_sym_de.vkm
 %%DATADIR%%/PLUS4/yape-ntsc.vpl
 %%DATADIR%%/PLUS4/yape-pal.vpl
+%%DATADIR%%/PRINTER/2022-901472-04.bin
+%%DATADIR%%/PRINTER/3022-901472-06.bin
+%%DATADIR%%/PRINTER/4023-325360-02.bin
+%%DATADIR%%/PRINTER/8023-325320-02.bin
 %%DATADIR%%/PRINTER/1520.vpl
 %%DATADIR%%/PRINTER/cbm1526-325341-08.bin
 %%DATADIR%%/PRINTER/mps801.bin
-%%DATADIR%%/PRINTER/mps803.bin
 %%DATADIR%%/PRINTER/mps803.vpl
+%%DATADIR%%/PRINTER/mps803-D7811G-111-U32053A.bin
 %%DATADIR%%/PRINTER/nl10.bin
 %%DATADIR%%/PRINTER/nl10.vpl
 %%DATADIR%%/SCPU64/c64hq.vpl
@@ -388,8 +404,6 @@ bin/xvic
 %%DATADIR%%/SCPU64/default.vrs
 %%DATADIR%%/SCPU64/frodo.vpl
 %%DATADIR%%/SCPU64/godot.vpl
-%%GTK3UI%%%%DATADIR%%/SCPU64/gtk3-hotkeys-mac.vhk
-%%GTK3UI%%%%DATADIR%%/SCPU64/gtk3-hotkeys.vhk
 %%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_keyrah.vkm
 %%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_keyrah_de.vkm
 %%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_pos.vkm
@@ -412,6 +426,12 @@ bin/xvic
 %%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_sym_uk.vkm
 %%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_the64_de.vkm
 %%DATADIR%%/SCPU64/palette.vpl
+%%DATADIR%%/SCPU64/palette_6569R1_v1r.vpl
+%%DATADIR%%/SCPU64/palette_6569R5_v1r.vpl
+%%DATADIR%%/SCPU64/palette_8565R2_v1r.vpl
+%%DATADIR%%/SCPU64/palette_C64_amber.vpl
+%%DATADIR%%/SCPU64/palette_C64_cyan.vpl
+%%DATADIR%%/SCPU64/palette_C64_green.vpl
 %%DATADIR%%/SCPU64/pc64.vpl
 %%DATADIR%%/SCPU64/pepto-ntsc-sony.vpl
 %%DATADIR%%/SCPU64/pepto-ntsc.vpl
@@ -422,7 +442,6 @@ bin/xvic
 %%DATADIR%%/SCPU64/rgb.vpl
 %%DATADIR%%/SCPU64/scpu64
 %%DATADIR%%/SCPU64/scpu64mem.sym
-%%SDLUI2%%%%DATADIR%%/SCPU64/sdl-hotkeys.vhk
 %%SDLUI2%%%%DATADIR%%/SCPU64/sdl_keyrah.vkm
 %%SDLUI2%%%%DATADIR%%/SCPU64/sdl_keyrah_combian.vkm
 %%SDLUI2%%%%DATADIR%%/SCPU64/sdl_keyrah_de.vkm
@@ -443,6 +462,7 @@ bin/xvic
 %%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_nl.vkm
 %%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_tr.vkm
 %%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_uk.vkm
+%%DATADIR%%/SCPU64/the64.vpl
 %%DATADIR%%/SCPU64/vice.vpl
 %%DATADIR%%/VIC20/PALette.vpl
 %%DATADIR%%/VIC20/basic-901486-01.bin
@@ -450,8 +470,6 @@ bin/xvic
 %%DATADIR%%/VIC20/chargen-901460-03.bin
 %%DATADIR%%/VIC20/colodore_vic.vpl
 %%DATADIR%%/VIC20/default.vrs
-%%GTK3UI%%%%DATADIR%%/VIC20/gtk3-hotkeys.vhk
-%%GTK3UI%%%%DATADIR%%/VIC20/gtk3-hotkeys-mac.vhk
 %%GTK3UI%%%%DATADIR%%/VIC20/gtk3_pos.vkm
 %%GTK3UI%%%%DATADIR%%/VIC20/gtk3_pos_de.vkm
 %%GTK3UI%%%%DATADIR%%/VIC20/gtk3_pos_it.vkm
@@ -464,7 +482,6 @@ bin/xvic
 %%DATADIR%%/VIC20/kernal.901486-07.bin
 %%DATADIR%%/VIC20/mike-ntsc.vpl
 %%DATADIR%%/VIC20/mike-pal.vpl
-%%SDLUI2%%%%DATADIR%%/VIC20/sdl-hotkeys.vhk
 %%SDLUI2%%%%DATADIR%%/VIC20/sdl_pos.vkm
 %%SDLUI2%%%%DATADIR%%/VIC20/sdl_pos_fr.vkm
 %%SDLUI2%%%%DATADIR%%/VIC20/sdl_pos_fi.vkm
@@ -538,46 +555,117 @@ bin/xvic
 %%DATADIR%%/common/VIC20_48.png
 %%DATADIR%%/common/VIC20_64.png
 %%DATADIR%%/common/icon1024x1024.png
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-cartridge-mac.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-cartridge.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-datasette1-mac.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-datasette1.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-datasette2-mac.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-datasette2.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-debug-mac.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-debug.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-drive-mac.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-drive.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-fliplist-mac.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-fliplist.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-help-mac.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-help.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-settings-mac.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-settings.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-snapshot-mac.vhk
-%%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-snapshot.vhk
 %%GTK3UI%%%%DATADIR%%/common/vice.gresource
 %%DATADIR%%/common/vice-logo-black.svg
 %%DATADIR%%/common/PET_1024.svg
+%%GTK3UI%%%%DATADIR%%/hotkeys/hotkeys-cartridge.vhk
+%%GTK3UI%%%%DATADIR%%/hotkeys/hotkeys-datasette.vhk
+%%GTK3UI%%%%DATADIR%%/hotkeys/hotkeys-debug.vhk
+%%GTK3UI%%%%DATADIR%%/hotkeys/hotkeys-drive.vhk
+%%GTK3UI%%%%DATADIR%%/hotkeys/hotkeys-fliplist.vhk
+%%GTK3UI%%%%DATADIR%%/hotkeys/hotkeys-help.vhk
+%%GTK3UI%%%%DATADIR%%/hotkeys/hotkeys-settings.vhk
+%%GTK3UI%%%%DATADIR%%/hotkeys/hotkeys-snapshot.vhk
+%%GTK3UI%%%%DATADIR%%/hotkeys/hotkeys-vsid.vhk
+%%GTK3UI%%%%DATADIR%%/hotkeys/hotkeys-winvice-legacy.vhk
+%%GTK3UI%%%%DATADIR%%/hotkeys/hotkeys.vhk
 %%PORTDOCS%%%%DOCSDIR%%/CIA-README.txt
-%%PORTDOCS%%%%DOCSDIR%%/Documentation-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/Doxygen-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/FreeBSD-GTK3-Howto.txt
-%%GTK3UI%%%%PORTDOCS%%%%DOCSDIR%%/GTK3-Fedora-cross-build-setup.md
-%%GTK3UI%%%%PORTDOCS%%%%DOCSDIR%%/GTK3-cross-build-setup.md
-%%GTK3UI%%%%PORTDOCS%%%%DOCSDIR%%/GTK3-debian-frankenvice.md
-%%PORTDOCS%%%%DOCSDIR%%/Linux-GTK3-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/NetBSD-GTK3-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/NetBSD-howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/OpenBSD-GTK3-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/Readme-SDL.txt
 %%PORTDOCS%%%%DOCSDIR%%/Readme-SDL2.txt
-%%PORTDOCS%%%%DOCSDIR%%/Release-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/SDL-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/Windows-MinGW-GTK3-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/coding-guidelines.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/amigaos.html
+%%PORTDOCS%%%%DOCSDIR%%/html/android.html
+%%PORTDOCS%%%%DOCSDIR%%/html/beos.html
+%%PORTDOCS%%%%DOCSDIR%%/html/darwin.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/Lato-Bold.eot
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/Lato-Bold.ttf
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/Lato-Bold.woff
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/Lato-Bold.woff2
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/Lato-BoldItalic.eot
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/Lato-BoldItalic.ttf
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/Lato-BoldItalic.woff
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/Lato-BoldItalic.woff2
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/Lato-Italic.eot
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/Lato-Italic.ttf
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/Lato-Italic.woff
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/Lato-Italic.woff2
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/Lato-Regular.eot
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/Lato-Regular.ttf
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/Lato-Regular.woff
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/Lato-Regular.woff2
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts/OFL.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/images/CIPS2008.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/c116-layout.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/c128-layout.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/c16-layout.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/c64-layout.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/cbm2-layout.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/new.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pet-business-uk-layout.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pet-chiclet-layout.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pet-graphical-layout.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/plus4-layout.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-c128-positional-keymap-de.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-c128-positional-keymap-us.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-c128-symbolic-keymap-de.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-c128-symbolic-keymap-us.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-c64-positional-keymap-de.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-c64-positional-keymap-us.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-c64-symbolic-keymap-de.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-c64-symbolic-keymap-us.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-cbm2-positional-keymap-de.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-cbm2-positional-keymap-us.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-cbm2-symbolic-keymap-de.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-cbm2-symbolic-keymap-us.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-logo-black.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-logo.svg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-pet-business-uk-positional-keymap-de.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-pet-business-uk-positional-keymap-us.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-pet-business-uk-symbolic-keymap-de.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-pet-business-uk-symbolic-keymap-us.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-pet-graphical-positional-keymap-de.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-pet-graphical-positional-keymap-us.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-pet-graphical-symbolic-keymap-de.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-pet-graphical-symbolic-keymap-us.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-plus4-positional-keymap-de.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-plus4-positional-keymap-us.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-plus4-symbolic-keymap-de.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/vice-plus4-symbolic-keymap-us.png
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/latofonts.css
+%%PORTDOCS%%%%DOCSDIR%%/html/macosx.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nsosrh.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qnx.html
+%%PORTDOCS%%%%DOCSDIR%%/html/robots.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/sco.html
+%%PORTDOCS%%%%DOCSDIR%%/html/solaris.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sortix.html
+%%PORTDOCS%%%%DOCSDIR%%/html/unix.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice.css
+%%PORTDOCS%%%%DOCSDIR%%/html/vice.texi
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_10.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_11.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_12.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_13.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_14.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_15.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_16.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_17.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_18.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_19.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_20.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_21.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_22.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_23.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_9.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_foot.html
+%%PORTDOCS%%%%DOCSDIR%%/html/vice_toc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/windows.html
 %%PORTDOCS%%%%DOCSDIR%%/iec-bus.txt
-%%GTK3UI%%%%PORTDOCS%%%%DOCSDIR%%/macOS-Distribution-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/macOS-Howto.txt
-%%GTK3UI%%%%PORTDOCS%%%%DOCSDIR%%/macOS-Xcode-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/vice.texi