emulators/vice: update to 3.7

6 files changed, 136 insertions, 113 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 68173930f49d..3685cf7ba28b 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vice
-PORTVERSION=	3.6.1
-PORTREVISION=	2
+PORTVERSION=	3.7
+PORTREVISION=	0
 CATEGORIES=	emulators
 MASTER_SITES=	SF/vice-emu/releases
 
@@ -38,8 +38,9 @@ USE_XORG+=	xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes
 HAS_CONFIGURE=	yes
 MAKE_ENV+=	XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share
 CFLAGS+=	-fcommon
-CONFIGURE_ARGS+=	--enable-ipv6 \
-			--enable-external-ffmpeg \
+CONFIGURE_ARGS+=	--prefix=${PREFIX} \
+			--enable-ipv6 \
+			--enable-ffmpeg \
 			--enable-x64 \
 			--disable-realdevice \
 			--disable-pdf-docs \
@@ -58,11 +59,11 @@ SDLUI2_DESC=	use SDL2 user interface
 SDLSOUND_DESC=	build with SDL2 sound system support
 
 GTK3UI_USES=			desktop-file-utils
-GTK3UI_CONFIGURE_ENABLE=	native-gtk3ui desktop-files
+GTK3UI_CONFIGURE_ENABLE=	gtk3ui desktop-files
 GTK3UI_BUILD_DEPENDS=		bash:shells/bash
 SDLUI2_USES=			sdl
 SDLUI2_USE=			SDL=sdl2 SDL=image2
-SDLUI2_CONFIGURE_ENABLE=	sdlui2
+SDLUI2_CONFIGURE_ENABLE=	sdl2ui
 SDLSOUND_USES=			sdl
 SDLSOUND_USE=			SDL=sdl2
 SDLSOUND_CONFIGURE_ON=		--with-sdlsound
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index 02068bc49cd6..a8d5f7584149 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644228185
-SHA256 (vice-3.6.1.tar.gz) = 20df84c851aaf2f5000510927f6d31b32f269916d351465c366dc0afc9dc150c
-SIZE (vice-3.6.1.tar.gz) = 11454300
+TIMESTAMP = 1672003074
+SHA256 (vice-3.7.tar.gz) = 35a673c7ce236b4297a887f3eb8e8e29fd44b14eea21929268ca4adec42bd446
+SIZE (vice-3.7.tar.gz) = 13442624
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 56a625947856..954d429d193a 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-01-24 00:13:58 UTC
+--- src/arch/gtk3/data/unix/Makefile.in.orig	2022-12-24 19:45:17 UTC
 +++ src/arch/gtk3/data/unix/Makefile.in
-@@ -738,7 +738,7 @@ uninstall-am:
- @INSTALL_DESKTOP_FILES_TRUE@@UNIX_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_FALSE@		"SID_1024.svg"
+@@ -735,7 +735,7 @@ uninstall-am:
+ @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@		"SID_1024.svg"
  
- @INSTALL_DESKTOP_FILES_TRUE@@UNIX_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_FALSE@install-data-hook: $(VICE_DIR_FILE) $(VICE_DESKTOP_FILES)
--@INSTALL_DESKTOP_FILES_TRUE@@UNIX_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_FALSE@	$(XDG_DESKTOP_MENU) install "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)
-+@INSTALL_DESKTOP_FILES_TRUE@@UNIX_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_FALSE@	$(XDG_DESKTOP_MENU) install --mode system "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)
+ @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.
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
new file mode 100644
index 000000000000..c360674300c3
--- /dev/null
+++ b/emulators/vice/files/patch-src_arch_shared_iodrv_io-unix-access.c
@@ -0,0 +1,18 @@
+--- src/arch/shared/iodrv/io-unix-access.c.orig	2022-12-24 19:44:57 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>
diff --git a/emulators/vice/files/patch-src_iodrv_io-unix-access.c b/emulators/vice/files/patch-src_iodrv_io-unix-access.c
deleted file mode 100644
index e4cdf71a739d..000000000000
--- a/emulators/vice/files/patch-src_iodrv_io-unix-access.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/iodrv/io-unix-access.c.orig	2022-01-24 00:13:24 UTC
-+++ src/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>
-@@ -84,10 +93,12 @@
- #include "io-access.h"
- 
- #if defined(__linux) || defined(__FreeBSD__) || ((defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)))
-+#if !defined(__aarch64__) && !defined (__aarch64__)
- 
- #define IO_PORT_ACCESS
- 
- static int io_fd = -1;
-+#endif
- #endif
- 
- #if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index e9a08bfc2c81..25ef490effaf 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -24,18 +24,18 @@ bin/xvic
 %%GTK3UI%%share/applications/vice-org-vsid.desktop
 %%GTK3UI%%share/applications/vice-org-x64.desktop
 %%GTK3UI%%share/desktop-directories/vice-org-vice-org.directory
-%%DATADIR%%/C128/basic64
-%%DATADIR%%/C128/basichi
-%%DATADIR%%/C128/basiclo
+%%DATADIR%%/C128/basic64-901226-01.bin
+%%DATADIR%%/C128/basichi-318019-04.bin
+%%DATADIR%%/C128/basiclo-318018-04.bin
 %%DATADIR%%/C128/c64hq.vpl
 %%DATADIR%%/C128/c64s.vpl
 %%DATADIR%%/C128/ccs64.vpl
-%%DATADIR%%/C128/chargch
-%%DATADIR%%/C128/chargde
-%%DATADIR%%/C128/chargen
-%%DATADIR%%/C128/chargfr
-%%DATADIR%%/C128/chargno
-%%DATADIR%%/C128/chargse
+%%DATADIR%%/C128/chargen-315079-01.bin
+%%DATADIR%%/C128/chargen-325078-02.bin
+%%DATADIR%%/C128/chargen-325167-01.bin
+%%DATADIR%%/C128/chargen-325173-01D.bin
+%%DATADIR%%/C128/chargen-325181-01.bin
+%%DATADIR%%/C128/chargen-390059-01.bin
 %%DATADIR%%/C128/cjam.vpl
 %%DATADIR%%/C128/colodore.vpl
 %%DATADIR%%/C128/community-colors.vpl
@@ -46,18 +46,21 @@ bin/xvic
 %%GTK3UI%%%%DATADIR%%/C128/gtk3-hotkeys-mac.vhk
 %%GTK3UI%%%%DATADIR%%/C128/gtk3-hotkeys.vhk
 %%GTK3UI%%%%DATADIR%%/C128/gtk3_pos.vkm
+%%GTK3UI%%%%DATADIR%%/C128/gtk3_pos_de.vkm
+%%GTK3UI%%%%DATADIR%%/C128/gtk3_pos_se.vkm
 %%GTK3UI%%%%DATADIR%%/C128/gtk3_sym.vkm
 %%GTK3UI%%%%DATADIR%%/C128/gtk3_sym_de.vkm
 %%GTK3UI%%%%DATADIR%%/C128/gtk3_sym_fr.vkm
-%%DATADIR%%/C128/kernal
-%%DATADIR%%/C128/kernal64
-%%DATADIR%%/C128/kernalch
-%%DATADIR%%/C128/kernalde
+%%GTK3UI%%%%DATADIR%%/C128/gtk3_sym_se.vkm
+%%DATADIR%%/C128/kernal-315078-03.bin
+%%DATADIR%%/C128/kernal-318020-05.bin
+%%DATADIR%%/C128/kernal-318034-01.bin
+%%DATADIR%%/C128/kernal-325172-01.bin
+%%DATADIR%%/C128/kernal64-901227-03.bin
 %%DATADIR%%/C128/kernalfi
 %%DATADIR%%/C128/kernalfr
 %%DATADIR%%/C128/kernalit
 %%DATADIR%%/C128/kernalno
-%%DATADIR%%/C128/kernalse
 %%DATADIR%%/C128/pc64.vpl
 %%DATADIR%%/C128/palette.vpl
 %%DATADIR%%/C128/pepto-ntsc-sony.vpl
@@ -69,6 +72,7 @@ bin/xvic
 %%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
@@ -76,23 +80,24 @@ bin/xvic
 %%DATADIR%%/C128/vdc_comp.vpl
 %%DATADIR%%/C128/vdc_deft.vpl
 %%DATADIR%%/C128/vice.vpl
-%%DATADIR%%/C64/basic
+%%DATADIR%%/C64/basic-901226-01.bin
 %%DATADIR%%/C64/c64hq.vpl
 %%DATADIR%%/C64/c64mem.sym
 %%DATADIR%%/C64/c64s.vpl
 %%DATADIR%%/C64/ccs64.vpl
-%%DATADIR%%/C64/chargen
+%%DATADIR%%/C64/chargen-901225-01.bin
+%%DATADIR%%/C64/chargen-906143-02.bin
 %%DATADIR%%/C64/cjam.vpl
 %%DATADIR%%/C64/colodore.vpl
 %%DATADIR%%/C64/community-colors.vpl
 %%DATADIR%%/C64/deekay.vpl
 %%DATADIR%%/C64/default.vrs
-%%DATADIR%%/C64/edkernal
 %%DATADIR%%/C64/frodo.vpl
 %%DATADIR%%/C64/godot.vpl
-%%DATADIR%%/C64/gskernal
 %%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
@@ -102,6 +107,8 @@ bin/xvic
 %%GTK3UI%%%%DATADIR%%/C64/gtk3_pos_es.vkm
 %%GTK3UI%%%%DATADIR%%/C64/gtk3_pos_it.vkm
 %%GTK3UI%%%%DATADIR%%/C64/gtk3_pos_se.vkm
+%%GTK3UI%%%%DATADIR%%/C64/gtk3_pos_tr.vkm
+%%GTK3UI%%%%DATADIR%%/C64/gtk3_pos_uk.vkm
 %%GTK3UI%%%%DATADIR%%/C64/gtk3_sym.vkm
 %%GTK3UI%%%%DATADIR%%/C64/gtk3_sym_be.vkm
 %%GTK3UI%%%%DATADIR%%/C64/gtk3_sym_da.vkm
@@ -110,10 +117,16 @@ bin/xvic
 %%GTK3UI%%%%DATADIR%%/C64/gtk3_sym_it.vkm
 %%GTK3UI%%%%DATADIR%%/C64/gtk3_sym_nl.vkm
 %%GTK3UI%%%%DATADIR%%/C64/gtk3_sym_se.vkm
+%%GTK3UI%%%%DATADIR%%/C64/gtk3_sym_tr.vkm
+%%GTK3UI%%%%DATADIR%%/C64/gtk3_sym_uk.vkm
 %%GTK3UI%%%%DATADIR%%/C64/gtk3_the64_de.vkm
-%%DATADIR%%/C64/jpchrgen
-%%DATADIR%%/C64/jpkernal
-%%DATADIR%%/C64/kernal
+%%DATADIR%%/C64/kernal-251104-04.bin
+%%DATADIR%%/C64/kernal-390852-01.bin
+%%DATADIR%%/C64/kernal-901227-01.bin
+%%DATADIR%%/C64/kernal-901227-02.bin
+%%DATADIR%%/C64/kernal-901227-03.bin
+%%DATADIR%%/C64/kernal-901246-01.bin
+%%DATADIR%%/C64/kernal-906145-02.bin
 %%DATADIR%%/C64/palette.vpl
 %%DATADIR%%/C64/pc64.vpl
 %%DATADIR%%/C64/pepto-ntsc-sony.vpl
@@ -138,18 +151,20 @@ bin/xvic
 %%SDLUI2%%%%DATADIR%%/C64/sdl_pos_de.vkm
 %%SDLUI2%%%%DATADIR%%/C64/sdl_pos_fi.vkm
 %%SDLUI2%%%%DATADIR%%/C64/sdl_pos_no.vkm
+%%SDLUI2%%%%DATADIR%%/C64/sdl_pos_tr.vkm
+%%SDLUI2%%%%DATADIR%%/C64/sdl_pos_uk.vkm
 %%SDLUI2%%%%DATADIR%%/C64/sdl_sym.vkm
 %%SDLUI2%%%%DATADIR%%/C64/sdl_sym_da.vkm
 %%SDLUI2%%%%DATADIR%%/C64/sdl_sym_de.vkm
 %%SDLUI2%%%%DATADIR%%/C64/sdl_sym_fr.vkm
 %%SDLUI2%%%%DATADIR%%/C64/sdl_sym_it.vkm
 %%SDLUI2%%%%DATADIR%%/C64/sdl_sym_nl.vkm
-
-%%DATADIR%%/C64/sxkernal
+%%SDLUI2%%%%DATADIR%%/C64/sdl_sym_tr.vkm
+%%SDLUI2%%%%DATADIR%%/C64/sdl_sym_uk.vkm
 %%DATADIR%%/C64/vice.vpl
-%%DATADIR%%/C64DTV/basic
 %%DATADIR%%/C64DTV/c64mem.sym
-%%DATADIR%%/C64DTV/chargen
+%%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
@@ -162,6 +177,8 @@ bin/xvic
 %%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_pos_es.vkm
 %%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_pos_it.vkm
 %%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_pos_se.vkm
+%%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_pos_tr.vkm
+%%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_pos_uk.vkm
 %%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_sym.vkm
 %%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_sym_da.vkm
 %%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_sym_de.vkm
@@ -170,8 +187,10 @@ bin/xvic
 %%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_sym_it.vkm
 %%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_sym_nl.vkm
 %%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_sym_se.vkm
+%%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_sym_tr.vkm
+%%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_sym_uk.vkm
 %%GTK3UI%%%%DATADIR%%/C64DTV/gtk3_the64_de.vkm
-%%DATADIR%%/C64DTV/kernal
+%%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
@@ -184,22 +203,26 @@ bin/xvic
 %%SDLUI2%%%%DATADIR%%/C64DTV/sdl_pos_de.vkm
 %%SDLUI2%%%%DATADIR%%/C64DTV/sdl_pos_fi.vkm
 %%SDLUI2%%%%DATADIR%%/C64DTV/sdl_pos_no.vkm
+%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_pos_tr.vkm
+%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_pos_uk.vkm
 %%SDLUI2%%%%DATADIR%%/C64DTV/sdl_sym.vkm
 %%SDLUI2%%%%DATADIR%%/C64DTV/sdl_sym_da.vkm
 %%SDLUI2%%%%DATADIR%%/C64DTV/sdl_sym_de.vkm
 %%SDLUI2%%%%DATADIR%%/C64DTV/sdl_sym_fr.vkm
 %%SDLUI2%%%%DATADIR%%/C64DTV/sdl_sym_nl.vkm
+%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_sym_tr.vkm
+%%SDLUI2%%%%DATADIR%%/C64DTV/sdl_sym_uk.vkm
 %%DATADIR%%/C64DTV/spiff.vpl
 %%DATADIR%%/CBM-II/amber.vpl
-%%DATADIR%%/CBM-II/basic.128
-%%DATADIR%%/CBM-II/basic.256
-%%DATADIR%%/CBM-II/basic.500
+%%DATADIR%%/CBM-II/basic-901235+6-02.bin
+%%DATADIR%%/CBM-II/basic-901240+1-03.bin
+%%DATADIR%%/CBM-II/basic-901242+3-04a.bin
 %%DATADIR%%/CBM-II/c64hq.vpl
 %%DATADIR%%/CBM-II/c64s.vpl
 %%DATADIR%%/CBM-II/ccs64.vpl
-%%DATADIR%%/CBM-II/chargen.500
-%%DATADIR%%/CBM-II/chargen.600
-%%DATADIR%%/CBM-II/chargen.700
+%%DATADIR%%/CBM-II/chargen-901225-01.bin
+%%DATADIR%%/CBM-II/chargen-901232-01.bin
+%%DATADIR%%/CBM-II/chargen-901237-01.bin
 %%DATADIR%%/CBM-II/cjam.vpl
 %%DATADIR%%/CBM-II/colodore.vpl
 %%DATADIR%%/CBM-II/community-colors.vpl
@@ -212,8 +235,8 @@ bin/xvic
 %%GTK3UI%%%%DATADIR%%/CBM-II/gtk3_pos.vkm
 %%GTK3UI%%%%DATADIR%%/CBM-II/gtk3_sym.vkm
 %%GTK3UI%%%%DATADIR%%/CBM-II/gtk3_sym_de.vkm
-%%DATADIR%%/CBM-II/kernal
-%%DATADIR%%/CBM-II/kernal.500
+%%DATADIR%%/CBM-II/kernal-901234-02.bin
+%%DATADIR%%/CBM-II/kernal-901244-04a.bin
 %%DATADIR%%/CBM-II/palette.vpl
 %%DATADIR%%/CBM-II/pc64.vpl
 %%DATADIR%%/CBM-II/pepto-ntsc-sony.vpl
@@ -233,20 +256,20 @@ bin/xvic
 %%SDLUI2%%%%DATADIR%%/CBM-II/sdl_sym.vkm
 %%DATADIR%%/CBM-II/vice.vpl
 %%DATADIR%%/CBM-II/white.vpl
-%%DATADIR%%/DRIVES/d1541II
-%%DATADIR%%/DRIVES/d1571cr
-%%DATADIR%%/DRIVES/dos1001
-%%DATADIR%%/DRIVES/dos1540
-%%DATADIR%%/DRIVES/dos1541
-%%DATADIR%%/DRIVES/dos1551
-%%DATADIR%%/DRIVES/dos1570
-%%DATADIR%%/DRIVES/dos1571
-%%DATADIR%%/DRIVES/dos1581
-%%DATADIR%%/DRIVES/dos2031
-%%DATADIR%%/DRIVES/dos2040
-%%DATADIR%%/DRIVES/dos3040
-%%DATADIR%%/DRIVES/dos4040
-%%DATADIR%%/DRIVES/dos9000
+%%DATADIR%%/DRIVES/dos1001-901887+8-01.bin
+%%DATADIR%%/DRIVES/dos1540-325302+3-01.bin
+%%DATADIR%%/DRIVES/dos1541-325302-01+901229-05.bin
+%%DATADIR%%/DRIVES/dos1541ii-251968-03.bin
+%%DATADIR%%/DRIVES/dos1551-318008-01.bin
+%%DATADIR%%/DRIVES/dos1570-315090-01.bin
+%%DATADIR%%/DRIVES/dos1571-310654-05.bin
+%%DATADIR%%/DRIVES/dos1571cr-318047-01.bin
+%%DATADIR%%/DRIVES/dos1581-318045-02.bin
+%%DATADIR%%/DRIVES/dos2031-901484-03+05.bin
+%%DATADIR%%/DRIVES/dos2040-901468-06+07.bin
+%%DATADIR%%/DRIVES/dos3040-901468-11-13.bin
+%%DATADIR%%/DRIVES/dos4040-901468-14-16.bin
+%%DATADIR%%/DRIVES/dos9000-300516+7-revC.bin
 %%GTK3UI%%%%DATADIR%%/GLSL/bicubic-interlaced.frag
 %%GTK3UI%%%%DATADIR%%/GLSL/bicubic.frag
 %%GTK3UI%%%%DATADIR%%/GLSL/builtin-interlaced.frag
@@ -257,6 +280,7 @@ bin/xvic
 %%DATADIR%%/PET/basic-2.901465-01-02.bin
 %%DATADIR%%/PET/basic-4.901465-23-20-21.bin
 %%DATADIR%%/PET/characters.901640-01.bin
+%%DATADIR%%/PET/characters-1.901447-08.bin
 %%DATADIR%%/PET/characters-2.901447-10.bin
 %%DATADIR%%/PET/chargen.de
 %%DATADIR%%/PET/edit-1-n.901439-03.bin
@@ -318,10 +342,10 @@ bin/xvic
 %%DATADIR%%/PET/waterloo-e000.901897-01.bin
 %%DATADIR%%/PET/waterloo-f000.901898-05.bin
 %%DATADIR%%/PET/white.vpl
-%%DATADIR%%/PLUS4/3plus1hi
-%%DATADIR%%/PLUS4/3plus1lo
-%%DATADIR%%/PLUS4/basic
-%%DATADIR%%/PLUS4/c2lo.364
+%%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
@@ -334,10 +358,10 @@ bin/xvic
 %%GTK3UI%%%%DATADIR%%/PLUS4/gtk3_sym_de.vkm
 %%GTK3UI%%%%DATADIR%%/PLUS4/gtk3_sym_fr.vkm
 %%GTK3UI%%%%DATADIR%%/PLUS4/gtk3_sym_it.vkm
-%%DATADIR%%/PLUS4/kernal
-%%DATADIR%%/PLUS4/kernal.005
-%%DATADIR%%/PLUS4/kernal.232
-%%DATADIR%%/PLUS4/kernal.364
+%%DATADIR%%/PLUS4/kernal-318004-01.bin
+%%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
@@ -346,16 +370,17 @@ bin/xvic
 %%DATADIR%%/PLUS4/yape-ntsc.vpl
 %%DATADIR%%/PLUS4/yape-pal.vpl
 %%DATADIR%%/PRINTER/1520.vpl
-%%DATADIR%%/PRINTER/cbm1526
-%%DATADIR%%/PRINTER/mps801
-%%DATADIR%%/PRINTER/mps803
+%%DATADIR%%/PRINTER/cbm1526-325341-08.bin
+%%DATADIR%%/PRINTER/mps801.bin
+%%DATADIR%%/PRINTER/mps803.bin
 %%DATADIR%%/PRINTER/mps803.vpl
-%%DATADIR%%/PRINTER/nl10-cbm
+%%DATADIR%%/PRINTER/nl10.bin
 %%DATADIR%%/PRINTER/nl10.vpl
 %%DATADIR%%/SCPU64/c64hq.vpl
 %%DATADIR%%/SCPU64/c64s.vpl
 %%DATADIR%%/SCPU64/ccs64.vpl
-%%DATADIR%%/SCPU64/chargen
+%%DATADIR%%/SCPU64/chargen-901225-01.bin
+%%DATADIR%%/SCPU64/chargen-906143-02.bin
 %%DATADIR%%/SCPU64/cjam.vpl
 %%DATADIR%%/SCPU64/colodore.vpl
 %%DATADIR%%/SCPU64/community-colors.vpl
@@ -373,6 +398,8 @@ bin/xvic
 %%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_pos_es.vkm
 %%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_pos_it.vkm
 %%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_pos_se.vkm
+%%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_pos_tr.vkm
+%%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_pos_uk.vkm
 %%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_sym.vkm
 %%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_sym_da.vkm
 %%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_sym_de.vkm
@@ -381,8 +408,9 @@ bin/xvic
 %%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_sym_it.vkm
 %%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_sym_nl.vkm
 %%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_sym_se.vkm
+%%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_sym_tr.vkm
+%%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_sym_uk.vkm
 %%GTK3UI%%%%DATADIR%%/SCPU64/gtk3_the64_de.vkm
-%%DATADIR%%/SCPU64/jpchrgen
 %%DATADIR%%/SCPU64/palette.vpl
 %%DATADIR%%/SCPU64/pc64.vpl
 %%DATADIR%%/SCPU64/pepto-ntsc-sony.vpl
@@ -406,19 +434,24 @@ bin/xvic
 %%SDLUI2%%%%DATADIR%%/SCPU64/sdl_pos_de.vkm
 %%SDLUI2%%%%DATADIR%%/SCPU64/sdl_pos_fi.vkm
 %%SDLUI2%%%%DATADIR%%/SCPU64/sdl_pos_no.vkm
+%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_pos_tr.vkm
+%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_pos_uk.vkm
 %%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym.vkm
 %%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_da.vkm
 %%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_de.vkm
 %%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_fr.vkm
 %%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_nl.vkm
+%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_tr.vkm
+%%SDLUI2%%%%DATADIR%%/SCPU64/sdl_sym_uk.vkm
 %%DATADIR%%/SCPU64/vice.vpl
 %%DATADIR%%/VIC20/PALette.vpl
-%%DATADIR%%/VIC20/basic
-%%DATADIR%%/VIC20/chargen
-%%DATADIR%%/VIC20/chargen-jp
+%%DATADIR%%/VIC20/basic-901486-01.bin
+%%DATADIR%%/VIC20/chargen-901460-02.bin
+%%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
@@ -426,7 +459,9 @@ bin/xvic
 %%GTK3UI%%%%DATADIR%%/VIC20/gtk3_sym_de.vkm
 %%GTK3UI%%%%DATADIR%%/VIC20/gtk3_sym_fr.vkm
 %%GTK3UI%%%%DATADIR%%/VIC20/gtk3_sym_it.vkm
-%%DATADIR%%/VIC20/kernal
+%%DATADIR%%/VIC20/kernal.901486-02.bin
+%%DATADIR%%/VIC20/kernal.901486-06.bin
+%%DATADIR%%/VIC20/kernal.901486-07.bin
 %%DATADIR%%/VIC20/mike-ntsc.vpl
 %%DATADIR%%/VIC20/mike-pal.vpl
 %%SDLUI2%%%%DATADIR%%/VIC20/sdl-hotkeys.vhk
@@ -523,7 +558,7 @@ bin/xvic
 %%GTK3UI%%%%DATADIR%%/common/gtk3-hotkeys-snapshot.vhk
 %%GTK3UI%%%%DATADIR%%/common/vice.gresource
 %%DATADIR%%/common/vice-logo-black.svg
-%%PORTDOCS%%%%DOCSDIR%%/Android-Howto.txt
+%%DATADIR%%/common/PET_1024.svg
 %%PORTDOCS%%%%DOCSDIR%%/CIA-README.txt
 %%PORTDOCS%%%%DOCSDIR%%/Documentation-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/Doxygen-Howto.txt