CVS commit: pkgsrc/emulators/vice

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators/vice
From: "Olaf Seibert" <rhialto%netbsd.org@localhost>
Date: Sat, 31 Dec 2022 18:30:01 +0000

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sat Dec 31 18:30:00 UTC 2022

Modified Files:
        pkgsrc/emulators/vice: Makefile PLIST distinfo options.mk
        pkgsrc/emulators/vice/patches: patch-configure
            patch-src_arch_gtk3_data_unix_Makefile.in
Added Files:
        pkgsrc/emulators/vice/patches: patch-src_arch_gtk3_actions-help.c
Removed Files:
        pkgsrc/emulators/vice/patches: patch-src_arch_gtk3_uicommands.c

Log Message:
emulators/vice: updated to 3.7.1

Small extract from the release notes:

- Added Debian packages of development builds of the SDL2 and Gtk3 UIs and the
  headless build (amd64 only).

  You can find bleeding edge development builds on github:

  https://github.com/VICE-Team/svn-mirror/releases

- Renamed all included ROM files to use a more elaborate naming scheme, for
  example as in "kernal-901227-01.bin".

- CRT emulation improvements:
  - uses measured (different) color coordinates for odd/even lines when possible
  - added option for U-only delay line (1084 style)

- More realistic handling of the case when two paddles are selected at the same
  time.

- Keyboard handling was rewritten / fixed
  - The case when two host keys are mapped to different CBM keys with different
    modifiers is handled differently (correctly) now, so some old keymap(s) may
    expose detail errors as a result - please report them!
  - Fixed Shiftlock/Capslock mapping
  - All extra keys that are not in the regular matrix are handled in generic
    code now.
    - used by C128 40/80 and CAPS keys, Restore
    - extra keys can operate in "non locking" mode

- More realistic behaviour of the virtual drive
  - always return 'files scratched' (instead of 'file not found'), even if the
    file does not exist

- More realistic behaviour when mounting images:
  - When attaching a d64 image to a 1571 drive, create an 'unformatted' image for
    the second side.
  - Create empty tracks for non existing tracks also when mounting gcr images

- SID fixes:
  - use a few more bits for better accuracy when calculating the 8580 filter
    DAC values.
  - fix filter ringing/self oscillating with 6581 and 8580

- CIA fixes:
  - Improved the CIA shift register.
  - Fix the case when pb changes value after changing the control bits for
    pb/pb7 output. Fixes the turn disk space detection of the 'Love' demo.

- Add SPT (Stupid Pet Tricks) userport joystick adapter emulation.

- Fixed use of SO_REUSEPORT on server sockets - this allowed multiple VICE
  instances to bind to the same port, with an indeterminant one receiving each
  incoming connection. Now uses SO_REUSEADDR instead, which allows use of a
  port that remains in the TIME_WAIT state after a previous process closed,
  but does not allow use of a port that is still in active use.

- Add DragonFly BSD support.

- Remove Android support.

and much more, for the full list see the included NEWS file.


To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 pkgsrc/emulators/vice/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/emulators/vice/PLIST
cvs rdiff -u -r1.53 -r1.54 pkgsrc/emulators/vice/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/emulators/vice/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/vice/patches/patch-configure
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_actions-help.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_data_unix_Makefile.in
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_uicommands.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/vice/Makefile
diff -u pkgsrc/emulators/vice/Makefile:1.170 pkgsrc/emulators/vice/Makefile:1.171
--- pkgsrc/emulators/vice/Makefile:1.170        Tue Sep 27 20:58:23 2022
+++ pkgsrc/emulators/vice/Makefile      Sat Dec 31 18:30:00 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.170 2022/09/27 20:58:23 wiz Exp $
+# $NetBSD: Makefile,v 1.171 2022/12/31 18:30:00 rhialto Exp $
 
-DISTNAME=      vice-3.6.1
-PKGREVISION=   7
+DISTNAME=      vice-3.7.1
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=vice-emu/}
 
@@ -22,9 +21,9 @@ USE_TOOLS+=           bash gmake pkg-config perl 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-ethernet
 CONFIGURE_ARGS+=       --enable-lame
+CONFIGURE_ARGS+=       --with-fastsid
 CONFIGURE_ARGS+=       --with-flac
 CONFIGURE_ARGS+=       --with-gif
-CONFIGURE_ARGS+=       --with-jpeg
 CONFIGURE_ARGS+=       --with-mpg123
 CONFIGURE_ARGS+=       --with-png
 CONFIGURE_ARGS+=       --with-vorbis
@@ -59,7 +58,8 @@ post-install:
        ${RM} -f ${DESTDIR}${PREFIX}/share/applications/mimeinfo.cache
        cd ${DESTDIR}${PREFIX} && ${MV} etc/xdg/menus/applications-merged/vice-org-vice-org.menu share/vice/ || :
        cd ${DESTDIR}${PREFIX} && ${RMDIR} -r etc || :
-       cd ${WRKSRC}/doc/html && ${CP} -r fonts vice_*.html *.css COPYING \
+       cd ${WRKSRC}/doc/html && ${CP} -r fonts images vice_*.html *.css \
+               COPYING \
                ${DESTDIR}${PREFIX}/share/doc/vice/html/
 
 .include "options.mk"
@@ -71,6 +71,5 @@ post-install:
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/vice/PLIST
diff -u pkgsrc/emulators/vice/PLIST:1.33 pkgsrc/emulators/vice/PLIST:1.34
--- pkgsrc/emulators/vice/PLIST:1.33    Thu Jan 27 18:23:39 2022
+++ pkgsrc/emulators/vice/PLIST Sat Dec 31 18:30:00 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2022/01/27 18:23:39 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.34 2022/12/31 18:30:00 rhialto Exp $
 bin/c1541
 bin/cartconv
 bin/petcat
@@ -25,7 +25,6 @@ ${PLIST.desktop}share/applications/vice-
 ${PLIST.desktop}share/applications/vice-org-xscpu64.desktop
 ${PLIST.desktop}share/applications/vice-org-xvic.desktop
 ${PLIST.desktop}share/desktop-directories/vice-org-vice-org.directory
-share/doc/vice/Android-Howto.txt
 share/doc/vice/CIA-README.txt
 share/doc/vice/Documentation-Howto.txt
 share/doc/vice/Doxygen-Howto.txt
@@ -61,6 +60,52 @@ share/doc/vice/html/fonts/Lato-Regular.t
 share/doc/vice/html/fonts/Lato-Regular.woff
 share/doc/vice/html/fonts/Lato-Regular.woff2
 share/doc/vice/html/fonts/OFL.txt
+share/doc/vice/html/images/CIPS2008.png
+share/doc/vice/html/images/c128-layout-small.png
+share/doc/vice/html/images/c128-layout.png
+share/doc/vice/html/images/c64-layout-small.png
+share/doc/vice/html/images/c64-layout.png
+share/doc/vice/html/images/new.gif
+share/doc/vice/html/images/pet-business-uk-layout-small.png
+share/doc/vice/html/images/pet-business-uk-layout.png
+share/doc/vice/html/images/pet-chiclet-layout-small.png
+share/doc/vice/html/images/pet-chiclet-layout.png
+share/doc/vice/html/images/pet-graphical-layout-small.png
+share/doc/vice/html/images/pet-graphical-layout.png
+share/doc/vice/html/images/vice-c128-positional-keymap-de-small.png
+share/doc/vice/html/images/vice-c128-positional-keymap-de.png
+share/doc/vice/html/images/vice-c128-positional-keymap-us-small.png
+share/doc/vice/html/images/vice-c128-positional-keymap-us.png
+share/doc/vice/html/images/vice-c128-symbolic-keymap-de-small.png
+share/doc/vice/html/images/vice-c128-symbolic-keymap-de.png
+share/doc/vice/html/images/vice-c128-symbolic-keymap-us-small.png
+share/doc/vice/html/images/vice-c128-symbolic-keymap-us.png
+share/doc/vice/html/images/vice-c64-positional-keymap-de-small.png
+share/doc/vice/html/images/vice-c64-positional-keymap-de.png
+share/doc/vice/html/images/vice-c64-positional-keymap-us-small.png
+share/doc/vice/html/images/vice-c64-positional-keymap-us.png
+share/doc/vice/html/images/vice-c64-symbolic-keymap-de-small.png
+share/doc/vice/html/images/vice-c64-symbolic-keymap-de.png
+share/doc/vice/html/images/vice-c64-symbolic-keymap-us-small.png
+share/doc/vice/html/images/vice-c64-symbolic-keymap-us.png
+share/doc/vice/html/images/vice-logo-black.png
+share/doc/vice/html/images/vice-logo.svg
+share/doc/vice/html/images/vice-pet-business-uk-positional-keymap-de-small.png
+share/doc/vice/html/images/vice-pet-business-uk-positional-keymap-de.png
+share/doc/vice/html/images/vice-pet-business-uk-positional-keymap-us-small.png
+share/doc/vice/html/images/vice-pet-business-uk-positional-keymap-us.png
+share/doc/vice/html/images/vice-pet-business-uk-symbolic-keymap-de-small.png
+share/doc/vice/html/images/vice-pet-business-uk-symbolic-keymap-de.png
+share/doc/vice/html/images/vice-pet-business-uk-symbolic-keymap-us-small.png
+share/doc/vice/html/images/vice-pet-business-uk-symbolic-keymap-us.png
+share/doc/vice/html/images/vice-pet-graphical-positional-keymap-de-small.png
+share/doc/vice/html/images/vice-pet-graphical-positional-keymap-de.png
+share/doc/vice/html/images/vice-pet-graphical-positional-keymap-us-small.png
+share/doc/vice/html/images/vice-pet-graphical-positional-keymap-us.png
+share/doc/vice/html/images/vice-pet-graphical-symbolic-keymap-de-small.png
+share/doc/vice/html/images/vice-pet-graphical-symbolic-keymap-de.png
+share/doc/vice/html/images/vice-pet-graphical-symbolic-keymap-us-small.png
+share/doc/vice/html/images/vice-pet-graphical-symbolic-keymap-us.png
 share/doc/vice/html/latofonts.css
 share/doc/vice/html/vice.css
 share/doc/vice/html/vice_1.html
@@ -93,18 +138,18 @@ share/doc/vice/macOS-Distribution-Howto.
 share/doc/vice/macOS-Howto.txt
 share/doc/vice/macOS-Xcode-Howto.txt
 share/doc/vice/vice.texi
-share/vice/C128/basic64
-share/vice/C128/basichi
-share/vice/C128/basiclo
+share/vice/C128/basic64-901226-01.bin
+share/vice/C128/basichi-318019-04.bin
+share/vice/C128/basiclo-318018-04.bin
 share/vice/C128/c64hq.vpl
 share/vice/C128/c64s.vpl
 share/vice/C128/ccs64.vpl
-share/vice/C128/chargch
-share/vice/C128/chargde
-share/vice/C128/chargen
-share/vice/C128/chargfr
-share/vice/C128/chargno
-share/vice/C128/chargse
+share/vice/C128/chargen-315079-01.bin
+share/vice/C128/chargen-325078-02.bin
+share/vice/C128/chargen-325167-01.bin
+share/vice/C128/chargen-325173-01D.bin
+share/vice/C128/chargen-325181-01.bin
+share/vice/C128/chargen-390059-01.bin
 share/vice/C128/cjam.vpl
 share/vice/C128/colodore.vpl
 share/vice/C128/community-colors.vpl
@@ -112,21 +157,24 @@ share/vice/C128/deekay.vpl
 share/vice/C128/default.vrs
 share/vice/C128/frodo.vpl
 share/vice/C128/godot.vpl
-${PLIST.gh}share/vice/C128/gtk3-hotkeys-mac.vhk
-${PLIST.gh}share/vice/C128/gtk3-hotkeys.vhk
-${PLIST.gh}share/vice/C128/gtk3_pos.vkm
-${PLIST.gh}share/vice/C128/gtk3_sym.vkm
-${PLIST.gh}share/vice/C128/gtk3_sym_de.vkm
-${PLIST.gh}share/vice/C128/gtk3_sym_fr.vkm
-share/vice/C128/kernal
-share/vice/C128/kernal64
-share/vice/C128/kernalch
-share/vice/C128/kernalde
+${PLIST.gtk}share/vice/C128/gtk3-hotkeys-mac.vhk
+${PLIST.gtk}share/vice/C128/gtk3-hotkeys.vhk
+${PLIST.gtk}share/vice/C128/gtk3_pos.vkm
+${PLIST.gtk}share/vice/C128/gtk3_pos_de.vkm
+${PLIST.gtk}share/vice/C128/gtk3_pos_se.vkm
+${PLIST.gtk}share/vice/C128/gtk3_sym.vkm
+${PLIST.gtk}share/vice/C128/gtk3_sym_de.vkm
+${PLIST.gtk}share/vice/C128/gtk3_sym_fr.vkm
+${PLIST.gtk}share/vice/C128/gtk3_sym_se.vkm
+share/vice/C128/kernal-315078-03.bin
+share/vice/C128/kernal-318020-05.bin
+share/vice/C128/kernal-318034-01.bin
+share/vice/C128/kernal-325172-01.bin
+share/vice/C128/kernal64-901227-03.bin
 share/vice/C128/kernalfi
 share/vice/C128/kernalfr
 share/vice/C128/kernalit
 share/vice/C128/kernalno
-share/vice/C128/kernalse
 share/vice/C128/palette.vpl
 share/vice/C128/pc64.vpl
 share/vice/C128/pepto-ntsc-sony.vpl
@@ -138,6 +186,7 @@ share/vice/C128/ptoing.vpl
 share/vice/C128/rgb.vpl
 ${PLIST.sdl}share/vice/C128/sdl-hotkeys.vhk
 ${PLIST.sdl}share/vice/C128/sdl_pos.vkm
+${PLIST.sdl}share/vice/C128/sdl_pos_de.vkm
 ${PLIST.sdl}share/vice/C128/sdl_sym.vkm
 ${PLIST.sdl}share/vice/C128/sdl_sym_de.vkm
 ${PLIST.sdl}share/vice/C128/sdl_sym_fr.vkm
@@ -145,44 +194,53 @@ ${PLIST.sdl}share/vice/C128/sdl_v128.vkm
 share/vice/C128/vdc_comp.vpl
 share/vice/C128/vdc_deft.vpl
 share/vice/C128/vice.vpl
-share/vice/C64/basic
+share/vice/C64/basic-901226-01.bin
 share/vice/C64/c64hq.vpl
 share/vice/C64/c64mem.sym
 share/vice/C64/c64s.vpl
 share/vice/C64/ccs64.vpl
-share/vice/C64/chargen
+share/vice/C64/chargen-901225-01.bin
+share/vice/C64/chargen-906143-02.bin
 share/vice/C64/cjam.vpl
 share/vice/C64/colodore.vpl
 share/vice/C64/community-colors.vpl
 share/vice/C64/deekay.vpl
 share/vice/C64/default.vrs
-share/vice/C64/edkernal
 share/vice/C64/frodo.vpl
 share/vice/C64/godot.vpl
-share/vice/C64/gskernal
-${PLIST.gh}share/vice/C64/gtk3-hotkeys-mac.vhk
-${PLIST.gh}share/vice/C64/gtk3-hotkeys.vhk
-${PLIST.gh}share/vice/C64/gtk3-winvice-legacy.vhk
-${PLIST.gh}share/vice/C64/gtk3_keyrah.vkm
-${PLIST.gh}share/vice/C64/gtk3_keyrah_de.vkm
-${PLIST.gh}share/vice/C64/gtk3_pos.vkm
-${PLIST.gh}share/vice/C64/gtk3_pos_bmc64.vkm
-${PLIST.gh}share/vice/C64/gtk3_pos_de.vkm
-${PLIST.gh}share/vice/C64/gtk3_pos_es.vkm
-${PLIST.gh}share/vice/C64/gtk3_pos_it.vkm
-${PLIST.gh}share/vice/C64/gtk3_pos_se.vkm
-${PLIST.gh}share/vice/C64/gtk3_sym.vkm
-${PLIST.gh}share/vice/C64/gtk3_sym_be.vkm
-${PLIST.gh}share/vice/C64/gtk3_sym_da.vkm
-${PLIST.gh}share/vice/C64/gtk3_sym_de.vkm
-${PLIST.gh}share/vice/C64/gtk3_sym_fr.vkm
-${PLIST.gh}share/vice/C64/gtk3_sym_it.vkm
-${PLIST.gh}share/vice/C64/gtk3_sym_nl.vkm
-${PLIST.gh}share/vice/C64/gtk3_sym_se.vkm
-${PLIST.gh}share/vice/C64/gtk3_the64_de.vkm
-share/vice/C64/jpchrgen
-share/vice/C64/jpkernal
-share/vice/C64/kernal
+${PLIST.gtk}share/vice/C64/gtk3-hotkeys-mac.vhk
+${PLIST.gtk}share/vice/C64/gtk3-hotkeys.vhk
+${PLIST.gtk}share/vice/C64/gtk3-vsid-hotkeys-mac.vhk
+${PLIST.gtk}share/vice/C64/gtk3-vsid-hotkeys.vhk
+${PLIST.gtk}share/vice/C64/gtk3-winvice-legacy.vhk
+${PLIST.gtk}share/vice/C64/gtk3_keyrah.vkm
+${PLIST.gtk}share/vice/C64/gtk3_keyrah_de.vkm
+${PLIST.gtk}share/vice/C64/gtk3_pos.vkm
+${PLIST.gtk}share/vice/C64/gtk3_pos_bmc64.vkm
+${PLIST.gtk}share/vice/C64/gtk3_pos_de.vkm
+${PLIST.gtk}share/vice/C64/gtk3_pos_es.vkm
+${PLIST.gtk}share/vice/C64/gtk3_pos_it.vkm
+${PLIST.gtk}share/vice/C64/gtk3_pos_se.vkm
+${PLIST.gtk}share/vice/C64/gtk3_pos_tr.vkm
+${PLIST.gtk}share/vice/C64/gtk3_pos_uk.vkm
+${PLIST.gtk}share/vice/C64/gtk3_sym.vkm
+${PLIST.gtk}share/vice/C64/gtk3_sym_be.vkm
+${PLIST.gtk}share/vice/C64/gtk3_sym_da.vkm
+${PLIST.gtk}share/vice/C64/gtk3_sym_de.vkm
+${PLIST.gtk}share/vice/C64/gtk3_sym_fr.vkm
+${PLIST.gtk}share/vice/C64/gtk3_sym_it.vkm
+${PLIST.gtk}share/vice/C64/gtk3_sym_nl.vkm
+${PLIST.gtk}share/vice/C64/gtk3_sym_se.vkm
+${PLIST.gtk}share/vice/C64/gtk3_sym_tr.vkm
+${PLIST.gtk}share/vice/C64/gtk3_sym_uk.vkm
+${PLIST.gtk}share/vice/C64/gtk3_the64_de.vkm
+share/vice/C64/kernal-251104-04.bin
+share/vice/C64/kernal-390852-01.bin
+share/vice/C64/kernal-901227-01.bin
+share/vice/C64/kernal-901227-02.bin
+share/vice/C64/kernal-901227-03.bin
+share/vice/C64/kernal-901246-01.bin
+share/vice/C64/kernal-906145-02.bin
 share/vice/C64/palette.vpl
 share/vice/C64/pc64.vpl
 share/vice/C64/pepto-ntsc-sony.vpl
@@ -207,39 +265,46 @@ ${PLIST.sdl}share/vice/C64/sdl_pos_da.vk
 ${PLIST.sdl}share/vice/C64/sdl_pos_de.vkm
 ${PLIST.sdl}share/vice/C64/sdl_pos_fi.vkm
 ${PLIST.sdl}share/vice/C64/sdl_pos_no.vkm
+${PLIST.sdl}share/vice/C64/sdl_pos_tr.vkm
+${PLIST.sdl}share/vice/C64/sdl_pos_uk.vkm
 ${PLIST.sdl}share/vice/C64/sdl_sym.vkm
 ${PLIST.sdl}share/vice/C64/sdl_sym_da.vkm
 ${PLIST.sdl}share/vice/C64/sdl_sym_de.vkm
 ${PLIST.sdl}share/vice/C64/sdl_sym_fr.vkm
 ${PLIST.sdl}share/vice/C64/sdl_sym_it.vkm
 ${PLIST.sdl}share/vice/C64/sdl_sym_nl.vkm
-share/vice/C64/sxkernal
+${PLIST.sdl}share/vice/C64/sdl_sym_tr.vkm
+${PLIST.sdl}share/vice/C64/sdl_sym_uk.vkm
 share/vice/C64/vice.vpl
-share/vice/C64DTV/basic
+share/vice/C64DTV/basic-901226-01.bin
 share/vice/C64DTV/c64mem.sym
-share/vice/C64DTV/chargen
+share/vice/C64DTV/chargen-901225-01.bin
 share/vice/C64DTV/default.vrs
 share/vice/C64DTV/dtvrom.bin
-${PLIST.gh}share/vice/C64DTV/gtk3-hotkeys-mac.vhk
-${PLIST.gh}share/vice/C64DTV/gtk3-hotkeys.vhk
-${PLIST.gh}share/vice/C64DTV/gtk3_keyrah.vkm
-${PLIST.gh}share/vice/C64DTV/gtk3_keyrah_de.vkm
-${PLIST.gh}share/vice/C64DTV/gtk3_pos.vkm
-${PLIST.gh}share/vice/C64DTV/gtk3_pos_bmc64.vkm
-${PLIST.gh}share/vice/C64DTV/gtk3_pos_de.vkm
-${PLIST.gh}share/vice/C64DTV/gtk3_pos_es.vkm
-${PLIST.gh}share/vice/C64DTV/gtk3_pos_it.vkm
-${PLIST.gh}share/vice/C64DTV/gtk3_pos_se.vkm
-${PLIST.gh}share/vice/C64DTV/gtk3_sym.vkm
-${PLIST.gh}share/vice/C64DTV/gtk3_sym_be.vkm
-${PLIST.gh}share/vice/C64DTV/gtk3_sym_da.vkm
-${PLIST.gh}share/vice/C64DTV/gtk3_sym_de.vkm
-${PLIST.gh}share/vice/C64DTV/gtk3_sym_fr.vkm
-${PLIST.gh}share/vice/C64DTV/gtk3_sym_it.vkm
-${PLIST.gh}share/vice/C64DTV/gtk3_sym_nl.vkm
-${PLIST.gh}share/vice/C64DTV/gtk3_sym_se.vkm
-${PLIST.gh}share/vice/C64DTV/gtk3_the64_de.vkm
-share/vice/C64DTV/kernal
+${PLIST.gtk}share/vice/C64DTV/gtk3-hotkeys-mac.vhk
+${PLIST.gtk}share/vice/C64DTV/gtk3-hotkeys.vhk
+${PLIST.gtk}share/vice/C64DTV/gtk3_keyrah.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_keyrah_de.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_pos.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_pos_bmc64.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_pos_de.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_pos_es.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_pos_it.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_pos_se.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_pos_tr.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_pos_uk.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_sym.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_sym_be.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_sym_da.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_sym_de.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_sym_fr.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_sym_it.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_sym_nl.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_sym_se.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_sym_tr.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_sym_uk.vkm
+${PLIST.gtk}share/vice/C64DTV/gtk3_the64_de.vkm
+share/vice/C64DTV/kernal-901227-03.bin
 ${PLIST.sdl}share/vice/C64DTV/sdl-hotkeys.vhk
 ${PLIST.sdl}share/vice/C64DTV/sdl_keyrah.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_keyrah_combian.vkm
@@ -252,22 +317,26 @@ ${PLIST.sdl}share/vice/C64DTV/sdl_pos_da
 ${PLIST.sdl}share/vice/C64DTV/sdl_pos_de.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_pos_fi.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_pos_no.vkm
+${PLIST.sdl}share/vice/C64DTV/sdl_pos_tr.vkm
+${PLIST.sdl}share/vice/C64DTV/sdl_pos_uk.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_sym.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_sym_da.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_sym_de.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_sym_fr.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_sym_nl.vkm
+${PLIST.sdl}share/vice/C64DTV/sdl_sym_tr.vkm
+${PLIST.sdl}share/vice/C64DTV/sdl_sym_uk.vkm
 share/vice/C64DTV/spiff.vpl
 share/vice/CBM-II/amber.vpl
-share/vice/CBM-II/basic.128
-share/vice/CBM-II/basic.256
-share/vice/CBM-II/basic.500
+share/vice/CBM-II/basic-901235+6-02.bin
+share/vice/CBM-II/basic-901240+1-03.bin
+share/vice/CBM-II/basic-901242+3-04a.bin
 share/vice/CBM-II/c64hq.vpl
 share/vice/CBM-II/c64s.vpl
 share/vice/CBM-II/ccs64.vpl
-share/vice/CBM-II/chargen.500
-share/vice/CBM-II/chargen.600
-share/vice/CBM-II/chargen.700
+share/vice/CBM-II/chargen-901225-01.bin
+share/vice/CBM-II/chargen-901232-01.bin
+share/vice/CBM-II/chargen-901237-01.bin
 share/vice/CBM-II/cjam.vpl
 share/vice/CBM-II/colodore.vpl
 share/vice/CBM-II/community-colors.vpl
@@ -275,13 +344,13 @@ share/vice/CBM-II/deekay.vpl
 share/vice/CBM-II/frodo.vpl
 share/vice/CBM-II/godot.vpl
 share/vice/CBM-II/green.vpl
-${PLIST.gh}share/vice/CBM-II/gtk3-hotkeys-mac.vhk
-${PLIST.gh}share/vice/CBM-II/gtk3-hotkeys.vhk
-${PLIST.gh}share/vice/CBM-II/gtk3_pos.vkm
-${PLIST.gh}share/vice/CBM-II/gtk3_sym.vkm
-${PLIST.gh}share/vice/CBM-II/gtk3_sym_de.vkm
-share/vice/CBM-II/kernal
-share/vice/CBM-II/kernal.500
+${PLIST.gtk}share/vice/CBM-II/gtk3-hotkeys-mac.vhk
+${PLIST.gtk}share/vice/CBM-II/gtk3-hotkeys.vhk
+${PLIST.gtk}share/vice/CBM-II/gtk3_pos.vkm
+${PLIST.gtk}share/vice/CBM-II/gtk3_sym.vkm
+${PLIST.gtk}share/vice/CBM-II/gtk3_sym_de.vkm
+share/vice/CBM-II/kernal-901234-02.bin
+share/vice/CBM-II/kernal-901244-04a.bin
 share/vice/CBM-II/palette.vpl
 share/vice/CBM-II/pc64.vpl
 share/vice/CBM-II/pepto-ntsc-sony.vpl
@@ -301,20 +370,20 @@ ${PLIST.sdl}share/vice/CBM-II/sdl_pos.vk
 ${PLIST.sdl}share/vice/CBM-II/sdl_sym.vkm
 share/vice/CBM-II/vice.vpl
 share/vice/CBM-II/white.vpl
-share/vice/DRIVES/d1541II
-share/vice/DRIVES/d1571cr
-share/vice/DRIVES/dos1001
-share/vice/DRIVES/dos1540
-share/vice/DRIVES/dos1541
-share/vice/DRIVES/dos1551
-share/vice/DRIVES/dos1570
-share/vice/DRIVES/dos1571
-share/vice/DRIVES/dos1581
-share/vice/DRIVES/dos2031
-share/vice/DRIVES/dos2040
-share/vice/DRIVES/dos3040
-share/vice/DRIVES/dos4040
-share/vice/DRIVES/dos9000
+share/vice/DRIVES/dos1001-901887+8-01.bin
+share/vice/DRIVES/dos1540-325302+3-01.bin
+share/vice/DRIVES/dos1541-325302-01+901229-05.bin
+share/vice/DRIVES/dos1541ii-251968-03.bin
+share/vice/DRIVES/dos1551-318008-01.bin
+share/vice/DRIVES/dos1570-315090-01.bin
+share/vice/DRIVES/dos1571-310654-05.bin
+share/vice/DRIVES/dos1571cr-318047-01.bin
+share/vice/DRIVES/dos1581-318045-02.bin
+share/vice/DRIVES/dos2031-901484-03+05.bin
+share/vice/DRIVES/dos2040-901468-06+07.bin
+share/vice/DRIVES/dos3040-901468-11-13.bin
+share/vice/DRIVES/dos4040-901468-14-16.bin
+share/vice/DRIVES/dos9000-300516+7-revC.bin
 share/vice/GLSL/bicubic-interlaced.frag
 share/vice/GLSL/bicubic.frag
 share/vice/GLSL/builtin-interlaced.frag
@@ -324,6 +393,7 @@ share/vice/PET/amber.vpl
 share/vice/PET/basic-1.901439-09-05-02-06.bin
 share/vice/PET/basic-2.901465-01-02.bin
 share/vice/PET/basic-4.901465-23-20-21.bin
+share/vice/PET/characters-1.901447-08.bin
 share/vice/PET/characters-2.901447-10.bin
 share/vice/PET/characters.901640-01.bin
 share/vice/PET/chargen.de
@@ -339,22 +409,22 @@ share/vice/PET/edit-4-80-b-50Hz.901474-0
 share/vice/PET/edit-4-80-b-60Hz.901474-03.bin
 share/vice/PET/edit-4-b-noCRTC.901474-02.bin
 share/vice/PET/green.vpl
-${PLIST.gh}share/vice/PET/gtk3-hotkeys-mac.vhk
-${PLIST.gh}share/vice/PET/gtk3-hotkeys.vhk
-${PLIST.gh}share/vice/PET/gtk3_bude_pos.vkm
-${PLIST.gh}share/vice/PET/gtk3_bude_pos_de.vkm
-${PLIST.gh}share/vice/PET/gtk3_bude_sym.vkm
-${PLIST.gh}share/vice/PET/gtk3_bude_sym_de.vkm
-${PLIST.gh}share/vice/PET/gtk3_buuk_pos.vkm
-${PLIST.gh}share/vice/PET/gtk3_buuk_pos_de.vkm
-${PLIST.gh}share/vice/PET/gtk3_buuk_sym.vkm
-${PLIST.gh}share/vice/PET/gtk3_buuk_sym_de.vkm
-${PLIST.gh}share/vice/PET/gtk3_grus_pos.vkm
-${PLIST.gh}share/vice/PET/gtk3_grus_pos_de.vkm
-${PLIST.gh}share/vice/PET/gtk3_grus_sym.vkm
-${PLIST.gh}share/vice/PET/gtk3_grus_sym_de.vkm
-${PLIST.gh}share/vice/PET/gtk3_pos.vkm
-${PLIST.gh}share/vice/PET/gtk3_sym.vkm
+${PLIST.gtk}share/vice/PET/gtk3-hotkeys-mac.vhk
+${PLIST.gtk}share/vice/PET/gtk3-hotkeys.vhk
+${PLIST.gtk}share/vice/PET/gtk3_bude_pos.vkm
+${PLIST.gtk}share/vice/PET/gtk3_bude_pos_de.vkm
+${PLIST.gtk}share/vice/PET/gtk3_bude_sym.vkm
+${PLIST.gtk}share/vice/PET/gtk3_bude_sym_de.vkm
+${PLIST.gtk}share/vice/PET/gtk3_buuk_pos.vkm
+${PLIST.gtk}share/vice/PET/gtk3_buuk_pos_de.vkm
+${PLIST.gtk}share/vice/PET/gtk3_buuk_sym.vkm
+${PLIST.gtk}share/vice/PET/gtk3_buuk_sym_de.vkm
+${PLIST.gtk}share/vice/PET/gtk3_grus_pos.vkm
+${PLIST.gtk}share/vice/PET/gtk3_grus_pos_de.vkm
+${PLIST.gtk}share/vice/PET/gtk3_grus_sym.vkm
+${PLIST.gtk}share/vice/PET/gtk3_grus_sym_de.vkm
+${PLIST.gtk}share/vice/PET/gtk3_pos.vkm
+${PLIST.gtk}share/vice/PET/gtk3_sym.vkm
 share/vice/PET/hre-9000.324992-02.bin
 share/vice/PET/hre-a000.324993-02.bin
 share/vice/PET/hre.vrs
@@ -386,26 +456,26 @@ share/vice/PET/waterloo-d000.901898-04.b
 share/vice/PET/waterloo-e000.901897-01.bin
 share/vice/PET/waterloo-f000.901898-05.bin
 share/vice/PET/white.vpl
-share/vice/PLUS4/3plus1hi
-share/vice/PLUS4/3plus1lo
-share/vice/PLUS4/basic
-share/vice/PLUS4/c2lo.364
+share/vice/PLUS4/3plus1-317053-01.bin
+share/vice/PLUS4/3plus1-317054-01.bin
+share/vice/PLUS4/basic-318006-01.bin
+share/vice/PLUS4/c2lo-364.bin
 share/vice/PLUS4/colodore_ted.vpl
 share/vice/PLUS4/default.vrs
-${PLIST.gh}share/vice/PLUS4/gtk3-hotkeys-mac.vhk
-${PLIST.gh}share/vice/PLUS4/gtk3-hotkeys.vhk
-${PLIST.gh}share/vice/PLUS4/gtk3_c116_pos_it.vkm
-${PLIST.gh}share/vice/PLUS4/gtk3_c16_pos_it.vkm
-${PLIST.gh}share/vice/PLUS4/gtk3_pos.vkm
-${PLIST.gh}share/vice/PLUS4/gtk3_pos_it.vkm
-${PLIST.gh}share/vice/PLUS4/gtk3_sym.vkm
-${PLIST.gh}share/vice/PLUS4/gtk3_sym_de.vkm
-${PLIST.gh}share/vice/PLUS4/gtk3_sym_fr.vkm
-${PLIST.gh}share/vice/PLUS4/gtk3_sym_it.vkm
-share/vice/PLUS4/kernal
-share/vice/PLUS4/kernal.005
-share/vice/PLUS4/kernal.232
-share/vice/PLUS4/kernal.364
+${PLIST.gtk}share/vice/PLUS4/gtk3-hotkeys-mac.vhk
+${PLIST.gtk}share/vice/PLUS4/gtk3-hotkeys.vhk
+${PLIST.gtk}share/vice/PLUS4/gtk3_c116_pos_it.vkm
+${PLIST.gtk}share/vice/PLUS4/gtk3_c16_pos_it.vkm
+${PLIST.gtk}share/vice/PLUS4/gtk3_pos.vkm
+${PLIST.gtk}share/vice/PLUS4/gtk3_pos_it.vkm
+${PLIST.gtk}share/vice/PLUS4/gtk3_sym.vkm
+${PLIST.gtk}share/vice/PLUS4/gtk3_sym_de.vkm
+${PLIST.gtk}share/vice/PLUS4/gtk3_sym_fr.vkm
+${PLIST.gtk}share/vice/PLUS4/gtk3_sym_it.vkm
+share/vice/PLUS4/kernal-318004-01.bin
+share/vice/PLUS4/kernal-318004-05.bin
+share/vice/PLUS4/kernal-318005-05.bin
+share/vice/PLUS4/kernal-364.bin
 ${PLIST.sdl}share/vice/PLUS4/sdl-hotkeys.vhk
 ${PLIST.sdl}share/vice/PLUS4/sdl_pos.vkm
 ${PLIST.sdl}share/vice/PLUS4/sdl_pos_fr.vkm
@@ -414,16 +484,17 @@ ${PLIST.sdl}share/vice/PLUS4/sdl_sym_de.
 share/vice/PLUS4/yape-ntsc.vpl
 share/vice/PLUS4/yape-pal.vpl
 share/vice/PRINTER/1520.vpl
-share/vice/PRINTER/cbm1526
-share/vice/PRINTER/mps801
-share/vice/PRINTER/mps803
+share/vice/PRINTER/cbm1526-325341-08.bin
+share/vice/PRINTER/mps801.bin
+share/vice/PRINTER/mps803.bin
 share/vice/PRINTER/mps803.vpl
-share/vice/PRINTER/nl10-cbm
+share/vice/PRINTER/nl10.bin
 share/vice/PRINTER/nl10.vpl
 share/vice/SCPU64/c64hq.vpl
 share/vice/SCPU64/c64s.vpl
 share/vice/SCPU64/ccs64.vpl
-share/vice/SCPU64/chargen
+share/vice/SCPU64/chargen-901225-01.bin
+share/vice/SCPU64/chargen-906143-02.bin
 share/vice/SCPU64/cjam.vpl
 share/vice/SCPU64/colodore.vpl
 share/vice/SCPU64/community-colors.vpl
@@ -431,26 +502,29 @@ share/vice/SCPU64/deekay.vpl
 share/vice/SCPU64/default.vrs
 share/vice/SCPU64/frodo.vpl
 share/vice/SCPU64/godot.vpl
-${PLIST.gh}share/vice/SCPU64/gtk3-hotkeys-mac.vhk
-${PLIST.gh}share/vice/SCPU64/gtk3-hotkeys.vhk
-${PLIST.gh}share/vice/SCPU64/gtk3_keyrah.vkm
-${PLIST.gh}share/vice/SCPU64/gtk3_keyrah_de.vkm
-${PLIST.gh}share/vice/SCPU64/gtk3_pos.vkm
-${PLIST.gh}share/vice/SCPU64/gtk3_pos_bmc64.vkm
-${PLIST.gh}share/vice/SCPU64/gtk3_pos_de.vkm
-${PLIST.gh}share/vice/SCPU64/gtk3_pos_es.vkm
-${PLIST.gh}share/vice/SCPU64/gtk3_pos_it.vkm
-${PLIST.gh}share/vice/SCPU64/gtk3_pos_se.vkm
-${PLIST.gh}share/vice/SCPU64/gtk3_sym.vkm
-${PLIST.gh}share/vice/SCPU64/gtk3_sym_be.vkm
-${PLIST.gh}share/vice/SCPU64/gtk3_sym_da.vkm
-${PLIST.gh}share/vice/SCPU64/gtk3_sym_de.vkm
-${PLIST.gh}share/vice/SCPU64/gtk3_sym_fr.vkm
-${PLIST.gh}share/vice/SCPU64/gtk3_sym_it.vkm
-${PLIST.gh}share/vice/SCPU64/gtk3_sym_nl.vkm
-${PLIST.gh}share/vice/SCPU64/gtk3_sym_se.vkm
-${PLIST.gh}share/vice/SCPU64/gtk3_the64_de.vkm
-share/vice/SCPU64/jpchrgen
+${PLIST.gtk}share/vice/SCPU64/gtk3-hotkeys-mac.vhk
+${PLIST.gtk}share/vice/SCPU64/gtk3-hotkeys.vhk
+${PLIST.gtk}share/vice/SCPU64/gtk3_keyrah.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_keyrah_de.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_pos.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_pos_bmc64.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_pos_de.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_pos_es.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_pos_it.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_pos_se.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_pos_tr.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_pos_uk.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_sym.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_sym_be.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_sym_da.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_sym_de.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_sym_fr.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_sym_it.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_sym_nl.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_sym_se.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_sym_tr.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_sym_uk.vkm
+${PLIST.gtk}share/vice/SCPU64/gtk3_the64_de.vkm
 share/vice/SCPU64/palette.vpl
 share/vice/SCPU64/pc64.vpl
 share/vice/SCPU64/pepto-ntsc-sony.vpl
@@ -474,27 +548,34 @@ ${PLIST.sdl}share/vice/SCPU64/sdl_pos_da
 ${PLIST.sdl}share/vice/SCPU64/sdl_pos_de.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_pos_fi.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_pos_no.vkm
+${PLIST.sdl}share/vice/SCPU64/sdl_pos_tr.vkm
+${PLIST.sdl}share/vice/SCPU64/sdl_pos_uk.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_sym.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_sym_da.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_sym_de.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_sym_fr.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_sym_nl.vkm
+${PLIST.sdl}share/vice/SCPU64/sdl_sym_tr.vkm
+${PLIST.sdl}share/vice/SCPU64/sdl_sym_uk.vkm
 share/vice/SCPU64/vice.vpl
 share/vice/VIC20/PALette.vpl
-share/vice/VIC20/basic
-share/vice/VIC20/chargen
-share/vice/VIC20/chargen-jp
+share/vice/VIC20/basic-901486-01.bin
+share/vice/VIC20/chargen-901460-02.bin
+share/vice/VIC20/chargen-901460-03.bin
 share/vice/VIC20/colodore_vic.vpl
 share/vice/VIC20/default.vrs
-${PLIST.gh}share/vice/VIC20/gtk3-hotkeys.vhk
-${PLIST.gh}share/vice/VIC20/gtk3_pos.vkm
-${PLIST.gh}share/vice/VIC20/gtk3_pos_de.vkm
-${PLIST.gh}share/vice/VIC20/gtk3_pos_it.vkm
-${PLIST.gh}share/vice/VIC20/gtk3_sym.vkm
-${PLIST.gh}share/vice/VIC20/gtk3_sym_de.vkm
-${PLIST.gh}share/vice/VIC20/gtk3_sym_fr.vkm
-${PLIST.gh}share/vice/VIC20/gtk3_sym_it.vkm
-share/vice/VIC20/kernal
+${PLIST.gtk}share/vice/VIC20/gtk3-hotkeys-mac.vhk
+${PLIST.gtk}share/vice/VIC20/gtk3-hotkeys.vhk
+${PLIST.gtk}share/vice/VIC20/gtk3_pos.vkm
+${PLIST.gtk}share/vice/VIC20/gtk3_pos_de.vkm
+${PLIST.gtk}share/vice/VIC20/gtk3_pos_it.vkm
+${PLIST.gtk}share/vice/VIC20/gtk3_sym.vkm
+${PLIST.gtk}share/vice/VIC20/gtk3_sym_de.vkm
+${PLIST.gtk}share/vice/VIC20/gtk3_sym_fr.vkm
+${PLIST.gtk}share/vice/VIC20/gtk3_sym_it.vkm
+share/vice/VIC20/kernal.901486-02.bin
+share/vice/VIC20/kernal.901486-06.bin
+share/vice/VIC20/kernal.901486-07.bin
 share/vice/VIC20/mike-ntsc.vpl
 share/vice/VIC20/mike-pal.vpl
 ${PLIST.sdl}share/vice/VIC20/sdl-hotkeys.vhk
@@ -535,6 +616,7 @@ share/vice/common/DTV_32.png
 share/vice/common/DTV_48.png
 share/vice/common/DTV_64.png
 share/vice/common/Icon-128%2x.png@localhost
+share/vice/common/PET_1024.svg
 share/vice/common/PET_16.png
 share/vice/common/PET_24.png
 share/vice/common/PET_256.png
@@ -570,25 +652,26 @@ share/vice/common/VIC20_256.png
 share/vice/common/VIC20_32.png
 share/vice/common/VIC20_48.png
 share/vice/common/VIC20_64.png
-share/vice/common/gtk3-hotkeys-cartridge-mac.vhk
-share/vice/common/gtk3-hotkeys-cartridge.vhk
-share/vice/common/gtk3-hotkeys-datasette1-mac.vhk
-share/vice/common/gtk3-hotkeys-datasette1.vhk
-share/vice/common/gtk3-hotkeys-datasette2-mac.vhk
-share/vice/common/gtk3-hotkeys-datasette2.vhk
-share/vice/common/gtk3-hotkeys-debug-mac.vhk
-share/vice/common/gtk3-hotkeys-debug.vhk
-share/vice/common/gtk3-hotkeys-drive-mac.vhk
-share/vice/common/gtk3-hotkeys-drive.vhk
-share/vice/common/gtk3-hotkeys-fliplist-mac.vhk
-share/vice/common/gtk3-hotkeys-fliplist.vhk
-share/vice/common/gtk3-hotkeys-help-mac.vhk
-share/vice/common/gtk3-hotkeys-help.vhk
-share/vice/common/gtk3-hotkeys-settings-mac.vhk
-share/vice/common/gtk3-hotkeys-settings.vhk
-share/vice/common/gtk3-hotkeys-snapshot-mac.vhk
-share/vice/common/gtk3-hotkeys-snapshot.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-cartridge-mac.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-cartridge.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-datasette1-mac.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-datasette1.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-datasette2-mac.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-datasette2.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-debug-mac.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-debug.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-drive-mac.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-drive.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-fliplist-mac.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-fliplist.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-help-mac.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-help.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-settings-mac.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-settings.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-snapshot-mac.vhk
+${PLIST.gtk}share/vice/common/gtk3-hotkeys-snapshot.vhk
 share/vice/common/icon1024x1024.png
 share/vice/common/vice-logo-black.svg
 ${PLIST.gtk}share/vice/common/vice.gresource
 ${PLIST.desktop}share/vice/vice-org-vice-org.menu
+${PLIST.gtk}@pkgdir etc/xdg/menus/applications-merged

Index: pkgsrc/emulators/vice/distinfo
diff -u pkgsrc/emulators/vice/distinfo:1.53 pkgsrc/emulators/vice/distinfo:1.54
--- pkgsrc/emulators/vice/distinfo:1.53 Thu Jan 27 18:23:39 2022
+++ pkgsrc/emulators/vice/distinfo      Sat Dec 31 18:30:00 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.53 2022/01/27 18:23:39 rhialto Exp $
+$NetBSD: distinfo,v 1.54 2022/12/31 18:30:00 rhialto Exp $
 
-BLAKE2s (vice-3.6.1.tar.gz) = f635f6bd63abc033b1b2d21a603b717bb422fe31a3d5599112e33876fede77ba
-SHA512 (vice-3.6.1.tar.gz) = 9aeb1c84dc71976d12a9907d60c637ec4cc938aad103340b70a13906bbf2bebab579edc78221c7fba47f0750be3f9ded947200b42fcfc8a9169fb4bb9f288cb7
-Size (vice-3.6.1.tar.gz) = 11454300 bytes
-SHA1 (patch-configure) = 29dc9191d3caca6c6f5c5aef7ae714b73beaa0b0
-SHA1 (patch-src_arch_gtk3_data_unix_Makefile.in) = e22566e8566bf750f8c1618fe00f582acc18cfda
-SHA1 (patch-src_arch_gtk3_uicommands.c) = c1f9cba6e647abf300d89f1f49b05755327a1aa5
+BLAKE2s (vice-3.7.1.tar.gz) = 68829aa834902e6914cb09ec95732e14251dfa468f14dc79e67923ed2791060c
+SHA512 (vice-3.7.1.tar.gz) = 80f81dd4d163cc5030eee2908b274bce4f3f21a3adb6d01559f4695d58b27ebc7b7570d8896718dfe74b2f2e4983ed3f9c4919b6e81934063d344b543b081f30
+Size (vice-3.7.1.tar.gz) = 13444946 bytes
+SHA1 (patch-configure) = afa9b0022985c5828dea1496e84117c4866e8d3a
+SHA1 (patch-src_arch_gtk3_actions-help.c) = 136fa108e999dbb98362a2e80a5389710f60290e
+SHA1 (patch-src_arch_gtk3_data_unix_Makefile.in) = 40ec2748090222fe95b54ea2266e48fc07363bd3

Index: pkgsrc/emulators/vice/options.mk
diff -u pkgsrc/emulators/vice/options.mk:1.15 pkgsrc/emulators/vice/options.mk:1.16
--- pkgsrc/emulators/vice/options.mk:1.15       Thu Jan 27 18:23:39 2022
+++ pkgsrc/emulators/vice/options.mk    Sat Dec 31 18:30:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2022/01/27 18:23:39 rhialto Exp $
+# $NetBSD: options.mk,v 1.16 2022/12/31 18:30:00 rhialto Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.vice
 PKG_SUPPORTED_OPTIONS=         ffmpeg vice-x64 vice-cpuhistory pulseaudio alsa
@@ -8,12 +8,11 @@ PKG_SUGGESTED_OPTIONS=                gtk3 ffmpeg
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   gtk sdl x64 desktop gh
+PLIST_VARS+=   gtk sdl x64 desktop
 
 .if !empty(PKG_OPTIONS:Mgtk3)
-CONFIGURE_ARGS+=       --enable-native-gtk3ui
+CONFIGURE_ARGS+=       --enable-gtk3ui
 PLIST.gtk=             yes
-PLIST.gh=              yes     # gtk-or-headless
 TOOL_DEPENDS+=         glib2-tools>=2.56:../../devel/glib2-tools
 
 CONFIGURE_ARGS+=       --enable-desktop-files
@@ -44,14 +43,14 @@ BUILD_DEFS+=        PKG_SYSCONFBASE
 .endif
 
 .if !empty(PKG_OPTIONS:Msdl)
-CONFIGURE_ARGS+=       --enable-sdlui
+CONFIGURE_ARGS+=       --enable-sdl1ui
 PLIST.sdl=             yes
 .  include "../../devel/SDL/buildlink3.mk"
 .  include "../../graphics/SDL_image/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Msdl2)
-CONFIGURE_ARGS+=       --enable-sdlui2
+CONFIGURE_ARGS+=       --enable-sdl2ui
 PLIST.sdl=             yes
 .  include "../../devel/SDL2/buildlink3.mk"
 .  include "../../graphics/SDL2_image/buildlink3.mk"
@@ -59,14 +58,13 @@ PLIST.sdl=          yes
 
 .if !empty(PKG_OPTIONS:Mvice-headless)
 CONFIGURE_ARGS+=       --enable-headlessui
-PLIST.gh=              yes     # gtk-or-headless
 .endif
 
 # If desired, ffmpeg and lame can be build-time-only dependencies,
 # since they are loaded dynamically only.
 .if !empty(PKG_OPTIONS:Mffmpeg)
 #BUILDLINK_DEPMETHOD.ffmpeg?=  build
-CONFIGURE_ARGS+=       --enable-external-ffmpeg
+CONFIGURE_ARGS+=       --enable-ffmpeg
 .  include "../../multimedia/ffmpeg4/buildlink3.mk"
 .endif
 

Index: pkgsrc/emulators/vice/patches/patch-configure
diff -u pkgsrc/emulators/vice/patches/patch-configure:1.5 pkgsrc/emulators/vice/patches/patch-configure:1.6
--- pkgsrc/emulators/vice/patches/patch-configure:1.5   Fri Jan  1 12:46:03 2021
+++ pkgsrc/emulators/vice/patches/patch-configure       Sat Dec 31 18:30:00 2022
@@ -1,16 +1,16 @@
-$NetBSD: patch-configure,v 1.5 2021/01/01 12:46:03 rhialto Exp $
+$NetBSD: patch-configure,v 1.6 2022/12/31 18:30:00 rhialto Exp $
 
 1. Ignore the option --enable-option-checking instead of erroring,
    it's the default anyway.
 
---- configure.orig     2020-12-23 12:58:34.000000000 +0000
+--- configure.orig     2022-12-27 23:57:16.000000000 +0000
 +++ configure
-@@ -4173,6 +4173,8 @@ for argcheck in $@
- do
+@@ -26048,6 +26048,8 @@ do
+   argcheck=`echo "$argcheck" | sed 's/=.*//'`
    argvalid=yes
    case $argcheck in #(
-+  --enable-option-checking=*)
-+    argvalid=yes ;; #(
-   --enable-arch=*) :
++  --enable-option-checking=*) :
++      argvalid=yes ;; #(
+   --enable-option-checking) :
      argvalid=yes ;; #(
-   --enable-make-command*) :
+   --enable-*) :

Index: pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_data_unix_Makefile.in
diff -u pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_data_unix_Makefile.in:1.1 pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_data_unix_Makefile.in:1.2
--- pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_data_unix_Makefile.in:1.1 Fri Jan  1 12:46:03 2021
+++ pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_data_unix_Makefile.in     Sat Dec 31 18:30:00 2022
@@ -1,22 +1,22 @@
-$NetBSD: patch-src_arch_gtk3_data_unix_Makefile.in,v 1.1 2021/01/01 12:46:03 rhialto Exp $
+$NetBSD: patch-src_arch_gtk3_data_unix_Makefile.in,v 1.2 2022/12/31 18:30:00 rhialto Exp $
 
 Install .desktop files in the system location instead of
 the (fake) home directory.
 
---- src/arch/gtk3/data/unix/Makefile.in.orig   2020-12-25 17:59:47.574456497 +0000
+--- src/arch/gtk3/data/unix/Makefile.in.orig   2022-12-27 23:57:18.000000000 +0000
 +++ src/arch/gtk3/data/unix/Makefile.in
-@@ -737,12 +737,12 @@ uninstall-am:
- @INSTALL_DESKTOP_FILES_TRUE@@UNIX_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_FALSE@            "SID_1024.svg"
+@@ -735,12 +735,12 @@ 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.
- @INSTALL_DESKTOP_FILES_TRUE@@UNIX_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_FALSE@uninstall-hook:
--@INSTALL_DESKTOP_FILES_TRUE@@UNIX_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_FALSE@    $(XDG_DESKTOP_MENU) uninstall "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)
-+@INSTALL_DESKTOP_FILES_TRUE@@UNIX_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_FALSE@    $(XDG_DESKTOP_MENU) uninstall --mode system "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)
+ @INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@uninstall-hook:
+-@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@  $(XDG_DESKTOP_MENU) uninstall "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)
++@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@  $(XDG_DESKTOP_MENU) uninstall --mode system "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)
  
  # if INSTALL_DESKTOP_FILES
- # if !UNIX_MACOSX_COMPILE
+ # if !MACOS_COMPILE

Added files:

Index: pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_actions-help.c
diff -u /dev/null pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_actions-help.c:1.1
--- /dev/null   Sat Dec 31 18:30:00 2022
+++ pkgsrc/emulators/vice/patches/patch-src_arch_gtk3_actions-help.c    Sat Dec 31 18:30:00 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_arch_gtk3_actions-help.c,v 1.1 2022/12/31 18:30:00 rhialto Exp $
+
+We disable generating the PDF docs (because of expensive dependencies),
+so instead, try to show the cheaply generated html version.
+
+--- src/arch/gtk3/actions-help.c.orig  2022-12-30 19:22:07.891133431 +0000
++++ src/arch/gtk3/actions-help.c
+@@ -63,7 +63,7 @@ static void help_manual_action(void)
+      */
+     path = archdep_get_vice_docsdir();
+ 
+-    uri = util_join_paths(path, "vice.pdf", NULL);
++    uri = util_join_paths(path, "html/vice_toc.html", NULL);
+     debug_gtk3("URI before GTK3: %s", uri);
+     final_uri = g_filename_to_uri(uri, NULL, &error);
+     debug_gtk3("final URI (pdf): %s", final_uri);

Prev by Date: CVS commit: pkgsrc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index