emulators/vice: update to 3.5

The changes in the NEWS file for this version are more than 450 lines,
but here is a small part:

* Upgrading
===========

If you run into trouble please try removing any VICE configuration files
left over from previous installs.
(vice.ini / .vicerc / vice2.cfg / vice-sdl.ini depending on platform)

Before reporting bugs, always try with a clean config: Run the emulator
with the "-default" command line argument or use "restore default config"
in the UI).


* Changes in Vice 3.5
=====================

This release completes the transition to the new GTK3 based GUI and fixes a
bunch of long standing issues (see below).

** general
----------

- Remove explicit support for OS/2, AmigaOS. These platforms should be able to
  use the SDL port.
- VICE used to store its ROMs, keymaps etc into $PREFIX/lib[64]/vice, which
  isn't correct. Now VICE installs its data into $PREFIX/share/vice, which
  makes a lot more sense. The documentation location has changed as well, now
  the documentation is installed in $PREFIX/share/doc/vice.
  On Windows, the binaries and DLLs have been moved into /bin, according to the
  requirements of GTK/GDK.
- Emulator timing is now directly driven by the host system audio device.
  If sound emulation is disabled, timing is synchronized with the host clock.
  As part of this change, the choice of sound synchronization method has been
  removed.
- Emulation now occurs in blocks of time directly related to the sound fragment
  size. Previously, emulation of an entire frame happened as quickly as possible
  and then the host system would sleep until it is time to emulate the next
  entire frame. This means that user input is now visible to the emulated
  software with lower latency than before.
- Audio latency is much lower on all platforms, and new lower latency defaults
  have been set. Users are encouraged to try using smaller fragment sizes and
  experiment with finding the lowest stable buffer size on their system.
- Support for changing the emulator timing to target generating a specific number
  of video frames per second. Useful for smooth PAL scrolling on a 50Hz CRT, and
  also fun for playing games at 60fps to match a typical LCD screen refresh.
- The default behaviour on CPU JAM was changed to "continue" to better match
  the behaviour of the real machines. Additionally a "CPU JAM" message will
  be displayed in the status bar.
- A "quit emulator" option was added to the CPU JAM dialog
- The CPU JAM dialog now shows the number of the device whose CPU has crashed.
- Proper support for dual drives has been added
- Relative file support on the filesystem device
- Autostarting works from any drive (select the drive in the attach disk dialog)
- Added support for 2nd and 3rd joystick button (potx/poty), currently only via
  keyboard and via unix joystick driver.
- Added mapping for the THEC64 joystick
- New LT.Kernal emulation
- New CMD-HD emulation
- New CMD RAM-Link emulation
- New D9090/60 emulation
- New icons for the applications.
- We now use proper binary prefixes for memory sizes.
  Welcome in the 21st century!
- Recalculate the palette parameters when the videochip type changes, now we can
  actually see the subtle color differences :)
- Emulate a switch present on some compatible datasettes (not the Commodore
  ones). Turning the switch on makes the sound recorded on the tape audible.
- Fixed/improved "native" screenshots. It will now work with all videochips and
  always generate "best effort" results.
- The emulators will look for the config file at an alternative location first,
  before looking at the system wide location.
  - for windows that is the location of the .exe files
  - for Linux that is ~/.vicerc
- Fixed lightgun/pen emulation
  - use poty instead of potx for trigger for magnum lightphaser and inkwell
    lightpen
  - tweak lightphaser offset against a bunch of games
- Handling of settings and resources was improved a bit:
  - always reset resources to default before loading a settings file
  - new "-addconfig" option (or "load additional settings") loads additional
    resources from a file without resetting to defaults before. this can be used
    to keep custom setups separate from the regular settings.
- Fixed sysfile search path order.
  The order now is $HOME/.local -> path-of-binary -> VICE_DATADIR
- Fixed a bug in .tap file handling that caused some .tap files to not work in
  the preview widget(s)
- A bunch of files have been removed from the source tree because they didn't
  really belong there and/or contained outdated info:
  - hardware-sids.txt, the old info is now at
    https://vice-emu.pokefinder.org/index.php/Hardware_SID_Status
  - SDL-support.txt, the old info is now at
    https://vice-emu.pokefinder.org/index.php/SDL_Status
  - ffmpeg-support.txt, the old info is now at
    https://vice-emu.pokefinder.org/index.php/FFMPEG_Status
- Another bunch of files were removed because their content was hopelessly
  outdated and/or could be moved to other files:
  - removed ancient CHANGELOG files. Read NEWS for the recent changes. Refer to
    the SVN log for the gory details.
  - moved contents from FEEDBACK to README

** build system
---------------

Many changes and simplifications were made in the build system, to make
it more reproducible and match the expected standard behaviour:

etc etc.

6 files changed, 346 insertions, 263 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 9926f3f69ce..6961a1b88c0 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.152 2020/08/31 18:09:29 wiz Exp $
+# $NetBSD: Makefile,v 1.153 2021/01/01 12:46:03 rhialto Exp $
 
-DISTNAME=	vice-3.4
-PKGREVISION=	8
+DISTNAME=	vice-3.5
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vice-emu/}
 
@@ -18,14 +17,25 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++11
-USE_TOOLS+=		bash gmake pkg-config perl flex
+USE_TOOLS+=		bash gmake pkg-config perl flex yacc tar
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-ethernet
+CONFIGURE_ARGS+=	--enable-lame
+CONFIGURE_ARGS+=	--with-flac
+CONFIGURE_ARGS+=	--with-gif
+CONFIGURE_ARGS+=	--with-jpeg
+CONFIGURE_ARGS+=	--with-mpg123
+CONFIGURE_ARGS+=	--with-png
+CONFIGURE_ARGS+=	--with-vorbis
+CONFIGURE_ARGS+=	--with-zlib
+CONFIGURE_ARGS.NetBSD+=	--with-sun
 CONFIGURE_ARGS.NetBSD+=	--without-oss
 
-# Avoid PLIST mismatch if these programs are installed
-CONFIGURE_ENV+=		ac_cv_prog_TEXI2DVI=no
-CONFIGURE_ENV+=		ac_cv_prog_PDFTEX=no
+# Avoid build changes if these programs are installed
+CONFIGURE_ENV+=		ac_cv_prog_SVN=no
+CONFIGURE_ENV+=		ac_cv_prog_SVNVERSION=no
+CONFIGURE_ARGS+=	--disable-pdf-docs
+CONFIGURE_ARGS+=	--enable-html-docs
 
 INFO_FILES=		yes
 REQD_DIRS+=		${PREFIX}/share/vice
@@ -34,13 +44,14 @@ BUILD_DEPENDS+=		xa65-[0-9]*:../../devel/xa65
 
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	post-configure
-SUBST_FILES.prefix=	man/vice.1
-SUBST_FILES.prefix+=	doc/html/index.html
-SUBST_FILES.prefix+=	doc/html/darwin.html
-SUBST_FILES.prefix+=	doc/vice.info-1
-SUBST_FILES.prefix+=	doc/vice.txt
+SUBST_FILES.prefix+=	doc/vice.texi
 SUBST_SED.prefix=	-e 's|/usr/local|${PREFIX}|g'
 
+# Mess created by xdg-utils; clean it up.
+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/ || :
+
 .include "options.mk"
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
diff --git a/emulators/vice/PLIST b/emulators/vice/PLIST
index 900d4d97834..6e0e3f66d78 100644
--- a/emulators/vice/PLIST
+++ b/emulators/vice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2019/12/31 14:42:22 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.29 2021/01/01 12:46:03 rhialto Exp $
 bin/c1541
 bin/cartconv
 bin/petcat
@@ -13,94 +13,107 @@ bin/xpet
 bin/xplus4
 bin/xscpu64
 bin/xvic
-info/vice.info
-man/man1/c1541.1
-man/man1/cartconv.1
-man/man1/petcat.1
-man/man1/vice.1
+@comment ${PLIST.desktop}etc/xdg/menus/applications-merged/vice-org-vice-org.menu
+${PLIST.desktop}share/applications/vice-org-vsid.desktop
+${PLIST.desktop}share/applications/vice-org-x128.desktop
+${PLIST.desktop}share/applications/vice-org-x64.desktop
+${PLIST.desktop}share/applications/vice-org-x64dtv.desktop
+${PLIST.desktop}share/applications/vice-org-x64sc.desktop
+${PLIST.desktop}share/applications/vice-org-xcbm2.desktop
+${PLIST.desktop}share/applications/vice-org-xcbm5x0.desktop
+${PLIST.desktop}share/applications/vice-org-xpet.desktop
+${PLIST.desktop}share/applications/vice-org-xplus4.desktop
+${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/CIPS2008.png
-share/doc/vice/COPYING
 share/doc/vice/Documentation-Howto.txt
 share/doc/vice/Doxygen-Howto.txt
 share/doc/vice/FreeBSD-GTK3-Howto.txt
 share/doc/vice/GTK3-Fedora-cross-build-setup.md
 share/doc/vice/GTK3-cross-build-setup.md
 share/doc/vice/GTK3-debian-frankenvice.md
-share/doc/vice/Lato-Bold.eot
-share/doc/vice/Lato-Bold.ttf
-share/doc/vice/Lato-Bold.woff
-share/doc/vice/Lato-Bold.woff2
-share/doc/vice/Lato-BoldItalic.eot
-share/doc/vice/Lato-BoldItalic.ttf
-share/doc/vice/Lato-BoldItalic.woff
-share/doc/vice/Lato-BoldItalic.woff2
-share/doc/vice/Lato-Italic.eot
-share/doc/vice/Lato-Italic.ttf
-share/doc/vice/Lato-Italic.woff
-share/doc/vice/Lato-Italic.woff2
-share/doc/vice/Lato-Regular.eot
-share/doc/vice/Lato-Regular.ttf
-share/doc/vice/Lato-Regular.woff
-share/doc/vice/Lato-Regular.woff2
 share/doc/vice/Linux-GTK3-Howto.txt
-share/doc/vice/NEWS
+share/doc/vice/NetBSD-GTK3-Howto.txt
 share/doc/vice/NetBSD-howto.txt
-share/doc/vice/OFL.txt
 share/doc/vice/Readme-GTK3.txt
 share/doc/vice/Readme-SDL.txt
 share/doc/vice/Readme-SDL2.txt
 share/doc/vice/Release-Howto.txt
 share/doc/vice/SDL-Howto.txt
-share/doc/vice/SDL-support.txt
 share/doc/vice/Windows-MinGW-GTK3-Howto.txt
-share/doc/vice/amigaos.html
-share/doc/vice/android.html
-share/doc/vice/beos.html
 share/doc/vice/coding-guidelines.txt
-share/doc/vice/darwin.html
-share/doc/vice/ffmpeg-support.txt
-share/doc/vice/hardware-sids.txt
+share/doc/vice/html/COPYING
+share/doc/vice/html/NEWS
+share/doc/vice/html/amigaos.html
+share/doc/vice/html/android.html
+share/doc/vice/html/beos.html
+share/doc/vice/html/darwin.html
+share/doc/vice/html/favicon.ico
+share/doc/vice/html/fonts/Lato-Bold.eot
+share/doc/vice/html/fonts/Lato-Bold.ttf
+share/doc/vice/html/fonts/Lato-Bold.woff
+share/doc/vice/html/fonts/Lato-Bold.woff2
+share/doc/vice/html/fonts/Lato-BoldItalic.eot
+share/doc/vice/html/fonts/Lato-BoldItalic.ttf
+share/doc/vice/html/fonts/Lato-BoldItalic.woff
+share/doc/vice/html/fonts/Lato-BoldItalic.woff2
+share/doc/vice/html/fonts/Lato-Italic.eot
+share/doc/vice/html/fonts/Lato-Italic.ttf
+share/doc/vice/html/fonts/Lato-Italic.woff
+share/doc/vice/html/fonts/Lato-Italic.woff2
+share/doc/vice/html/fonts/Lato-Regular.eot
+share/doc/vice/html/fonts/Lato-Regular.ttf
+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/new.gif
+share/doc/vice/html/images/vice-logo.svg
+share/doc/vice/html/index.html
+share/doc/vice/html/latofonts.css
+share/doc/vice/html/macosx.html
+share/doc/vice/html/nsosrh.html
+share/doc/vice/html/qnx.html
+share/doc/vice/html/robots.txt
+share/doc/vice/html/sco.html
+share/doc/vice/html/sitemap.xml
+share/doc/vice/html/solaris.html
+share/doc/vice/html/sortix.html
+share/doc/vice/html/unix.html
+share/doc/vice/html/vice.css
+share/doc/vice/html/vice_1.html
+share/doc/vice/html/vice_10.html
+share/doc/vice/html/vice_11.html
+share/doc/vice/html/vice_12.html
+share/doc/vice/html/vice_13.html
+share/doc/vice/html/vice_14.html
+share/doc/vice/html/vice_15.html
+share/doc/vice/html/vice_16.html
+share/doc/vice/html/vice_17.html
+share/doc/vice/html/vice_18.html
+share/doc/vice/html/vice_19.html
+share/doc/vice/html/vice_2.html
+share/doc/vice/html/vice_20.html
+share/doc/vice/html/vice_21.html
+share/doc/vice/html/vice_22.html
+share/doc/vice/html/vice_23.html
+share/doc/vice/html/vice_3.html
+share/doc/vice/html/vice_4.html
+share/doc/vice/html/vice_5.html
+share/doc/vice/html/vice_6.html
+share/doc/vice/html/vice_7.html
+share/doc/vice/html/vice_8.html
+share/doc/vice/html/vice_9.html
+share/doc/vice/html/vice_foot.html
+share/doc/vice/html/vice_toc.html
+share/doc/vice/html/windows.html
 share/doc/vice/iec-bus.txt
-share/doc/vice/index.html
 share/doc/vice/macOS-Distribution-Howto.txt
-share/doc/vice/macOS-GTK3-Howto.txt
-share/doc/vice/macOS-SDL2-Howto.txt
+share/doc/vice/macOS-Howto.txt
 share/doc/vice/macOS-Xcode-Howto.txt
-share/doc/vice/macosx.html
-share/doc/vice/new.gif
-share/doc/vice/robots.txt
-share/doc/vice/sitemap.xml
-share/doc/vice/unix.html
-share/doc/vice/vice-logo-black.svg
-share/doc/vice/vice-logo.svg
-share/doc/vice/vice.css
-share/doc/vice/vice.txt
-share/doc/vice/vice_1.html
-share/doc/vice/vice_10.html
-share/doc/vice/vice_11.html
-share/doc/vice/vice_12.html
-share/doc/vice/vice_13.html
-share/doc/vice/vice_14.html
-share/doc/vice/vice_15.html
-share/doc/vice/vice_16.html
-share/doc/vice/vice_17.html
-share/doc/vice/vice_18.html
-share/doc/vice/vice_19.html
-share/doc/vice/vice_2.html
-share/doc/vice/vice_20.html
-share/doc/vice/vice_21.html
-share/doc/vice/vice_22.html
-share/doc/vice/vice_3.html
-share/doc/vice/vice_4.html
-share/doc/vice/vice_5.html
-share/doc/vice/vice_6.html
-share/doc/vice/vice_7.html
-share/doc/vice/vice_8.html
-share/doc/vice/vice_9.html
-share/doc/vice/vice_toc.html
-share/doc/vice/windows.html
+share/doc/vice/vice.texi
 share/vice/C128/basic64
 share/vice/C128/basichi
 share/vice/C128/basiclo
@@ -120,8 +133,8 @@ share/vice/C128/deekay.vpl
 share/vice/C128/default.vrs
 share/vice/C128/frodo.vpl
 share/vice/C128/godot.vpl
-${PLIST.gtk}share/vice/C128/gtk3_pos.vkm
-${PLIST.gtk}share/vice/C128/gtk3_sym.vkm
+${PLIST.gh}share/vice/C128/gtk3_pos.vkm
+${PLIST.gh}share/vice/C128/gtk3_sym.vkm
 share/vice/C128/kernal
 share/vice/C128/kernal64
 share/vice/C128/kernalch
@@ -158,16 +171,18 @@ share/vice/C64/edkernal
 share/vice/C64/frodo.vpl
 share/vice/C64/godot.vpl
 share/vice/C64/gskernal
-${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_de.vkm
-${PLIST.gtk}share/vice/C64/gtk3_sym.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_it.vkm
-${PLIST.gtk}share/vice/C64/gtk3_sym_nl.vkm
-${PLIST.gtk}share/vice/C64/gtk3_sym_se.vkm
+${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_de.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_da.vkm
+${PLIST.gh}share/vice/C64/gtk3_sym_de.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
@@ -181,12 +196,14 @@ share/vice/C64/rgb.vpl
 ${PLIST.sdl}share/vice/C64/sdl_hotkeys.vkm
 ${PLIST.sdl}share/vice/C64/sdl_hotkeys_vsid.vkm
 ${PLIST.sdl}share/vice/C64/sdl_joymap_ps3.vjm
+${PLIST.sdl}share/vice/C64/sdl_joymap_thec64.vjm
 ${PLIST.sdl}share/vice/C64/sdl_keyrah.vkm
 ${PLIST.sdl}share/vice/C64/sdl_keyrah_combian.vkm
 ${PLIST.sdl}share/vice/C64/sdl_keyrah_de.vkm
 ${PLIST.sdl}share/vice/C64/sdl_keyrah_retropie.vkm
 ${PLIST.sdl}share/vice/C64/sdl_keyrah_retropie_de.vkm
 ${PLIST.sdl}share/vice/C64/sdl_pos.vkm
+${PLIST.sdl}share/vice/C64/sdl_pos_bmc64.vkm
 ${PLIST.sdl}share/vice/C64/sdl_pos_ch.vkm
 ${PLIST.sdl}share/vice/C64/sdl_pos_da.vkm
 ${PLIST.sdl}share/vice/C64/sdl_pos_de.vkm
@@ -204,15 +221,18 @@ share/vice/C64DTV/c64mem.sym
 share/vice/C64DTV/chargen
 share/vice/C64DTV/default.vrs
 share/vice/C64DTV/dtvrom.bin
-${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_de.vkm
-${PLIST.gtk}share/vice/C64DTV/gtk3_sym.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_nl.vkm
-${PLIST.gtk}share/vice/C64DTV/gtk3_sym_se.vkm
+${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_de.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_da.vkm
+${PLIST.gh}share/vice/C64DTV/gtk3_sym_de.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.sdl}share/vice/C64DTV/sdl_hotkeys.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_keyrah.vkm
@@ -248,8 +268,8 @@ 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.gtk}share/vice/CBM-II/gtk3_sym.vkm
-${PLIST.gtk}share/vice/CBM-II/gtk3_sym_de.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
 share/vice/CBM-II/pc64.vpl
@@ -281,39 +301,45 @@ share/vice/DRIVES/dos2031
 share/vice/DRIVES/dos2040
 share/vice/DRIVES/dos3040
 share/vice/DRIVES/dos4040
+share/vice/DRIVES/dos9000
 share/vice/PET/amber.vpl
-share/vice/PET/basic1
-share/vice/PET/basic2
-share/vice/PET/basic4
+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-2.901447-10.bin
 share/vice/PET/characters.901640-01.bin
-share/vice/PET/chargen
 share/vice/PET/chargen.de
-share/vice/PET/edit1g
-share/vice/PET/edit2b
-share/vice/PET/edit2g
-share/vice/PET/edit4b40
-share/vice/PET/edit4b80
-share/vice/PET/edit4g40
+share/vice/PET/edit-1-n.901439-03.bin
+share/vice/PET/edit-2-b.901474-01.bin
+share/vice/PET/edit-2-n.901447-24.bin
+share/vice/PET/edit-4-40-b-50Hz.ts.bin
+share/vice/PET/edit-4-40-b-60Hz.ts.bin
+share/vice/PET/edit-4-40-n-50Hz.901498-01.bin
+share/vice/PET/edit-4-40-n-60Hz.901499-01.bin
+share/vice/PET/edit-4-80-b-50Hz.901474-04.bin
+share/vice/PET/edit-4-80-b-50Hz.901474-04_.bin
+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.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_sym.vkm
+${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_sym.vkm
 share/vice/PET/hre-9000.324992-02.bin
 share/vice/PET/hre-a000.324993-02.bin
 share/vice/PET/hre.vrs
-share/vice/PET/kernal1
-share/vice/PET/kernal2
-share/vice/PET/kernal4
+share/vice/PET/kernal-1.901439-04-07.bin
+share/vice/PET/kernal-2.901465-03.bin
+share/vice/PET/kernal-4.901465-22.bin
 share/vice/PET/rom1g.vrs
 share/vice/PET/rom2b.vrs
 share/vice/PET/rom2g.vrs
@@ -321,8 +347,14 @@ share/vice/PET/rom4b40.vrs
 share/vice/PET/rom4b80.vrs
 share/vice/PET/rom4g40.vrs
 share/vice/PET/romsuperpet.vrs
+${PLIST.sdl}share/vice/PET/sdl_buuk_pos.vkm
+${PLIST.sdl}share/vice/PET/sdl_buuk_pos_de.vkm
 ${PLIST.sdl}share/vice/PET/sdl_buuk_sym.vkm
+${PLIST.sdl}share/vice/PET/sdl_buuk_sym_de.vkm
+${PLIST.sdl}share/vice/PET/sdl_grus_pos.vkm
+${PLIST.sdl}share/vice/PET/sdl_grus_pos_de.vkm
 ${PLIST.sdl}share/vice/PET/sdl_grus_sym.vkm
+${PLIST.sdl}share/vice/PET/sdl_grus_sym_de.vkm
 ${PLIST.sdl}share/vice/PET/sdl_hotkeys.vkm
 ${PLIST.sdl}share/vice/PET/sdl_sym.vkm
 share/vice/PET/waterloo-a000.901898-01.bin
@@ -338,9 +370,9 @@ share/vice/PLUS4/basic
 share/vice/PLUS4/c2lo.364
 share/vice/PLUS4/colodore_ted.vpl
 share/vice/PLUS4/default.vrs
-${PLIST.gtk}share/vice/PLUS4/gtk3_pos.vkm
-${PLIST.gtk}share/vice/PLUS4/gtk3_sym.vkm
-${PLIST.gtk}share/vice/PLUS4/gtk3_sym_de.vkm
+${PLIST.gh}share/vice/PLUS4/gtk3_pos.vkm
+${PLIST.gh}share/vice/PLUS4/gtk3_sym.vkm
+${PLIST.gh}share/vice/PLUS4/gtk3_sym_de.vkm
 share/vice/PLUS4/kernal
 share/vice/PLUS4/kernal.005
 share/vice/PLUS4/kernal.232
@@ -367,13 +399,18 @@ share/vice/SCPU64/deekay.vpl
 share/vice/SCPU64/default.vrs
 share/vice/SCPU64/frodo.vpl
 share/vice/SCPU64/godot.vpl
-${PLIST.gtk}share/vice/SCPU64/gtk3_pos.vkm
-${PLIST.gtk}share/vice/SCPU64/gtk3_pos_de.vkm
-${PLIST.gtk}share/vice/SCPU64/gtk3_sym.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_nl.vkm
-${PLIST.gtk}share/vice/SCPU64/gtk3_sym_se.vkm
+${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_de.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_da.vkm
+${PLIST.gh}share/vice/SCPU64/gtk3_sym_de.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
 share/vice/SCPU64/pc64.vpl
 share/vice/SCPU64/pepto-ntsc-sony.vpl
@@ -405,8 +442,10 @@ share/vice/VIC20/basic
 share/vice/VIC20/chargen
 share/vice/VIC20/colodore_vic.vpl
 share/vice/VIC20/default.vrs
-${PLIST.gtk}share/vice/VIC20/gtk3_pos.vkm
-${PLIST.gtk}share/vice/VIC20/gtk3_sym.vkm
+${PLIST.gh}share/vice/VIC20/gtk3_pos.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_it.vkm
 share/vice/VIC20/kernal
 share/vice/VIC20/mike-ntsc.vpl
 share/vice/VIC20/mike-pal.vpl
@@ -414,10 +453,75 @@ ${PLIST.sdl}share/vice/VIC20/sdl_hotkeys.vkm
 ${PLIST.sdl}share/vice/VIC20/sdl_pos.vkm
 ${PLIST.sdl}share/vice/VIC20/sdl_pos_fi.vkm
 share/vice/VIC20/vice.vpl
-share/vice/common/CBM.ttf
+share/vice/common/C128_1024.svg
+share/vice/common/C128_16.png
+share/vice/common/C128_24.png
+share/vice/common/C128_256.png
+share/vice/common/C128_32.png
+share/vice/common/C128_48.png
+share/vice/common/C64_1024.svg
+share/vice/common/C64_16.png
+share/vice/common/C64_24.png
+share/vice/common/C64_256.png
+share/vice/common/C64_32.png
+share/vice/common/C64_48.png
+share/vice/common/C64_Pro_Mono-STYLE.ttf
+share/vice/common/CBM2_1024.svg
+share/vice/common/CBM2_16.png
+share/vice/common/CBM2_24.png
+share/vice/common/CBM2_256.png
+share/vice/common/CBM2_32.png
+share/vice/common/CBM2_48.png
 share/vice/common/CBM_Logo.svg
+share/vice/common/DTV_1024.svg
+share/vice/common/DTV_16.png
+share/vice/common/DTV_24.png
+share/vice/common/DTV_256.png
+share/vice/common/DTV_32.png
+share/vice/common/DTV_48.png
 share/vice/common/Icon-128@2x.png
-share/vice/common/icon.ico
-share/vice/common/icon.png
+share/vice/common/PET_16.png
+share/vice/common/PET_24.png
+share/vice/common/PET_256.png
+share/vice/common/PET_256.svg
+share/vice/common/PET_32.png
+share/vice/common/PET_48.png
+share/vice/common/Plus4_1024.svg
+share/vice/common/Plus4_16.png
+share/vice/common/Plus4_24.png
+share/vice/common/Plus4_256.png
+share/vice/common/Plus4_32.png
+share/vice/common/Plus4_48.png
+share/vice/common/SCPU_1024.svg
+share/vice/common/SCPU_16.png
+share/vice/common/SCPU_24.png
+share/vice/common/SCPU_256.png
+share/vice/common/SCPU_32.png
+share/vice/common/SCPU_48.png
+share/vice/common/SID_1024.svg
+share/vice/common/SID_16.png
+share/vice/common/SID_24.png
+share/vice/common/SID_256.png
+share/vice/common/SID_32.png
+share/vice/common/SID_48.png
+share/vice/common/VIC20_1024.svg
+share/vice/common/VIC20_16.png
+share/vice/common/VIC20_24.png
+share/vice/common/VIC20_256.png
+share/vice/common/VIC20_32.png
+share/vice/common/VIC20_48.png
 share/vice/common/icon1024x1024.png
+share/vice/common/vice-logo-black.svg
 ${PLIST.gtk}share/vice/common/vice.gresource
+share/vice/common/vsid.rc
+share/vice/common/x128.rc
+share/vice/common/x64.rc
+share/vice/common/x64dtv.rc
+share/vice/common/x64sc.rc
+share/vice/common/xcbm2.rc
+share/vice/common/xcbm5x0.rc
+share/vice/common/xpet.rc
+share/vice/common/xplus4.rc
+share/vice/common/xscpu64.rc
+share/vice/common/xvic.rc
+${PLIST.desktop}share/vice/vice-org-vice-org.menu
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index ceff5b5eacf..2703ca592e0 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.48 2019/12/31 14:42:22 rhialto Exp $
+$NetBSD: distinfo,v 1.49 2021/01/01 12:46:03 rhialto Exp $
 
-SHA1 (vice-3.4.tar.gz) = aef2a94fb23a1ac5a2bd170f78729b6925943b6e
-RMD160 (vice-3.4.tar.gz) = 44f558acf6f45b31696855753f4122e389dd9acb
-SHA512 (vice-3.4.tar.gz) = 3d42e7bbe15ec6efac918d11e354052048dac8efdeedc64bb724cb8aaf2dd8ec7a2fc176ddbc93722ce7c680f06d3966efc10587c24e9643238315ded025c4b8
-Size (vice-3.4.tar.gz) = 23964877 bytes
-SHA1 (patch-configure) = 95a6e12e1186c19b2f2d33bbefcd2f6037e3e5b0
+SHA1 (vice-3.5.tar.gz) = 09caf57ace1015fcdd6ad0dd05699dbe71204571
+RMD160 (vice-3.5.tar.gz) = c037f4c892b5712f4829bcb6f84c4cbeb21ff0aa
+SHA512 (vice-3.5.tar.gz) = 02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70
+Size (vice-3.5.tar.gz) = 22557578 bytes
+SHA1 (patch-configure) = 29dc9191d3caca6c6f5c5aef7ae714b73beaa0b0
+SHA1 (patch-src_arch_gtk3_data_unix_Makefile.in) = e22566e8566bf750f8c1618fe00f582acc18cfda
diff --git a/emulators/vice/options.mk b/emulators/vice/options.mk
index c5266b45147..4a731cbf561 100644
--- a/emulators/vice/options.mk
+++ b/emulators/vice/options.mk
@@ -1,33 +1,67 @@
-# $NetBSD: options.mk,v 1.13 2020/04/23 17:45:26 nia Exp $
+# $NetBSD: options.mk,v 1.14 2021/01/01 12:46:03 rhialto Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vice
-PKG_SUPPORTED_OPTIONS=		ffmpeg vice-x64 vice-cpuhistory
+PKG_SUPPORTED_OPTIONS=		ffmpeg vice-x64 vice-cpuhistory pulseaudio alsa
 PKG_OPTIONS_REQUIRED_GROUPS=	gui
-PKG_OPTIONS_GROUP.gui=		gtk3 sdl sdl2
+PKG_OPTIONS_GROUP.gui=		gtk3 sdl sdl2 vice-headless
 PKG_SUGGESTED_OPTIONS=		gtk3 ffmpeg
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	gtk sdl x64
+PLIST_VARS+=	gtk sdl x64 desktop gh
 
 .if !empty(PKG_OPTIONS:Mgtk3)
 CONFIGURE_ARGS+=	--enable-native-gtk3ui
 PLIST.gtk=		yes
-.  include "../../x11/gtk3/buildlink3.mk"
+PLIST.gh=		yes	# gtk-or-headless
 TOOL_DEPENDS+=		glib2-tools>=2.56:../../devel/glib2-tools
+
+CONFIGURE_ARGS+=	--enable-desktop-files
+PLIST.desktop=		yes
+TOOL_DEPENDS+=		xdg-utils-[0-9]*:../../misc/xdg-utils
+
+.  include "../../x11/gtk3/buildlink3.mk"
 .  include "../../graphics/glew/buildlink3.mk"
+
+# XXX work around misc/xdg-utils being completely broken;
+#     the post-install target moves the *.menu file around.
+XDG_CONFIG_DIR=		${PREFIX}/etc/xdg
+XDG_DATA_DIR=		${PREFIX}/share
+MAKE_ENV+=		XDG_CONFIG_DIRS="${DESTDIR}${XDG_CONFIG_DIR}"
+MAKE_ENV+=		XDG_DATA_DIRS="${DESTDIR}${XDG_DATA_DIR}"
+MAKE_ENV+=		XDG_UTILS_DEBUG_LEVEL=999
+INSTALLATION_DIRS+=	${XDG_CONFIG_DIR}/menus/applications-merged
+INSTALLATION_DIRS+=	${XDG_DATA_DIR}/applications
+INSTALLATION_DIRS+=	${XDG_DATA_DIR}/desktop-directories
+MAKE_DIRS+=		${PKG_SYSCONFBASE}/xdg/menus/applications-merged
+
+CONF_FILES+=	${PREFIX}/share/vice/vice-org-vice-org.menu \
+		${PKG_SYSCONFBASE}/xdg/menus/applications-merged/vice-org-vice-org.menu
+
+BUILD_DEFS+=	PKG_SYSCONFBASE
+
+.  include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Msdl)
 CONFIGURE_ARGS+=	--enable-sdlui
+CONFIGURE_ARGS+=	--with-sdlsound
 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+=	--with-sdlsound
 PLIST.sdl=		yes
 .  include "../../devel/SDL2/buildlink3.mk"
+.  include "../../graphics/SDL2_image/buildlink3.mk"
+.endif
+
+.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,
@@ -47,3 +81,17 @@ PLIST.x64=		yes
 .if !empty(PKG_OPTIONS:Mvice-cpuhistory)
 CONFIGURE_ARGS+=	--enable-cpuhistory
 .endif
+
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+CONFIGURE_ARGS+=	--with-pulse
+.include "../../audio/pulseaudio/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-pulse
+.endif
+
+.if !empty(PKG_OPTIONS:Malsa)
+CONFIGURE_ARGS+=	--with-alsa
+#.include "../../audio/alsa/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-alsa
+.endif
diff --git a/emulators/vice/patches/patch-configure b/emulators/vice/patches/patch-configure
index f9bfbc61169..350f8dab3cf 100644
--- a/emulators/vice/patches/patch-configure
+++ b/emulators/vice/patches/patch-configure
@@ -1,14 +1,11 @@
-$NetBSD: patch-configure,v 1.4 2019/12/31 14:42:22 rhialto Exp $
+$NetBSD: patch-configure,v 1.5 2021/01/01 12:46:03 rhialto Exp $
 
-1. Use the NetBSD configuration for every OS since the PLIST is
-   hardcoded for that.  Should fix every non-NetBSD platform.
-
-2. Ignore the option --enable-option-checking instead of erroring,
+1. Ignore the option --enable-option-checking instead of erroring,
    it's the default anyway.
 
---- configure.orig	2019-12-23 21:29:35.000000000 +0000
+--- configure.orig	2020-12-23 12:58:34.000000000 +0000
 +++ configure
-@@ -3301,6 +3301,8 @@ for argcheck in $@
+@@ -4173,6 +4173,8 @@ for argcheck in $@
  do
    argvalid=yes
    case $argcheck in #(
@@ -17,103 +14,3 @@ $NetBSD: patch-configure,v 1.4 2019/12/31 14:42:22 rhialto Exp $
    --enable-arch=*) :
      argvalid=yes ;; #(
    --enable-make-command*) :
-@@ -10009,9 +10011,6 @@ else
-   HAVE_BSD_FREE_FALSE=
- fi
- 
--    VICE_CPPFLAGS="$VICE_CPPFLAGS -I/usr/local/include"
--    fbsdrtp=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "/usr/local/lib"`
--    VICE_LDFLAGS="$VICE_LDFLAGS $fbsdrtp -L/usr/local/lib"
-     ;;
-   netbsd*)
-      if true; then
-@@ -10022,18 +10021,6 @@ else
-   HAVE_BSD_FALSE=
- fi
- 
--    CPPFLAGS="$CPPFLAGS -I/usr/pkg/include -I/usr/include"
--    nbsdrtp=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "/usr/pkg/lib"`
--    LDFLAGS="$LDFLAGS $nbsdrtp -L/usr/pkg/lib"
--    if test -d "/usr/X11R7/lib"; then
--      rtp=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "/usr/X11R7/lib"`
--      LDFLAGS="$LDFLAGS $rtp"
--    else
--      if test -d "/usr/X11R6/lib"; then
--        rtp=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "/usr/X11R6/lib"`
--        LDFLAGS="$LDFLAGS $rtp"
--      fi
--    fi
-     ;;
-   dragonfly*)
-      if true; then
-@@ -10044,9 +10031,6 @@ else
-   HAVE_BSD_FALSE=
- fi
- 
--    CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--    dfbsdrtp=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "/usr/local/lib"`
--    LDFLAGS="$LDFLAGS $dfbsdrtp -L/usr/local/lib"
-     ;;
-   *)
-     ;;
-@@ -21204,7 +21188,7 @@ _ACEOF
- 
- 
- case "$host_os" in
--  netbsd*)
-+  *)
-     VICEDIR="$PREFIX/share/vice"
-      if true; then
-   ALTERNATE_DOCDIR_TRUE=
-@@ -21215,51 +21199,6 @@ else
- fi
- 
-     ;;
--  freebsd*)
--    VICEDIR="$PREFIX/lib/vice"
--     if true; then
--  ALTERNATE_DOCDIR_TRUE=
--  ALTERNATE_DOCDIR_FALSE='#'
--else
--  ALTERNATE_DOCDIR_TRUE='#'
--  ALTERNATE_DOCDIR_FALSE=
--fi
--
--    ;;
--  linux*)
--    if test x"$host_cpu" = "xx86_64"; then
--      VICEDIR="$PREFIX/lib64/vice"
--       if false; then
--  ALTERNATE_DOCDIR_TRUE=
--  ALTERNATE_DOCDIR_FALSE='#'
--else
--  ALTERNATE_DOCDIR_TRUE='#'
--  ALTERNATE_DOCDIR_FALSE=
--fi
--
--    else
--      VICEDIR="$PREFIX/lib/vice"
--       if false; then
--  ALTERNATE_DOCDIR_TRUE=
--  ALTERNATE_DOCDIR_FALSE='#'
--else
--  ALTERNATE_DOCDIR_TRUE='#'
--  ALTERNATE_DOCDIR_FALSE=
--fi
--
--    fi
--    ;;
--  *)
--    VICEDIR="$PREFIX/lib/vice"
--     if false; then
--  ALTERNATE_DOCDIR_TRUE=
--  ALTERNATE_DOCDIR_FALSE='#'
--else
--  ALTERNATE_DOCDIR_TRUE='#'
--  ALTERNATE_DOCDIR_FALSE=
--fi
--
--    ;;
- esac
- 
- 
diff --git a/emulators/vice/patches/patch-src_arch_gtk3_data_unix_Makefile.in b/emulators/vice/patches/patch-src_arch_gtk3_data_unix_Makefile.in
new file mode 100644
index 00000000000..3fffd1cef13
--- /dev/null
+++ b/emulators/vice/patches/patch-src_arch_gtk3_data_unix_Makefile.in
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_arch_gtk3_data_unix_Makefile.in,v 1.1 2021/01/01 12:46:03 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
+@@ -737,12 +737,12 @@ uninstall-am:
+ @INSTALL_DESKTOP_FILES_TRUE@@UNIX_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_FALSE@		"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)
+ 
+ # 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)
+ 
+ # if INSTALL_DESKTOP_FILES
+ # if !UNIX_MACOSX_COMPILE