emulators/vice: update to 3.4

Much shortened from vice-3.4/NEWS or http://vice-emu.sourceforge.net/NEWS :

* Changes in Vice 3.4
=====================

We also needs support in fixing the various keyboard mappings, please test the
keyboard in your favourite OS and port and report any problems.

** General
----------

- Remove support for Syllable OS, SCO, QNX4, QNX6, SGI, AIX, OpenStep/NextStep/
  Rhapsody, Solaris/OpenIndiana and remaining traces of Minix, NeXT, SKYOS,
  UNIXWARE, Sortix

- Remove remaining traces of support for WATCOM, MSVC, OpenWatcom

- Remove aRts support

- Remove YUV rendering

- Remove generation of .chm, .hlp and .info files. Please use the .pdf or .html

- skip building x64 unless --enable-x64 is passed to configure

- do not use the new/experimental 8580 filters unless --enable-new8580filter
  is passed to configure

- update pattern generator for uninitialized ram. changed defaults so all
  raminitpattern tests pass.

- remove block device disk image (rawdrive) "support". in linux it was never
  needed (just use the device file) and on windows it was never implemented.

- added support for the IP232 protocol that was used by the long lost VICE1.19
  hack, and which is supported by tcpser for emulating DTR/DCD (carrier detect)

- various userport rs232 fixes

- always save gifs as gif89

- added a couple shift flags to keyboard maps to support virtual cbm/ctrl and
  mandatory pressed host modifiers. not all keymaps have been updated yet.

- ACIA IRQ fix

- create empty half tracks when mounting d64. fixes skew.d64

- new headless port that can be enabled by passing --enable-headlessui to
  configure. this can be used to build an emulator without video output, which
  may be useful for scripting.

[ omitted sections: ]
** Autostart fixes
** Snapshot fixes
** 6510 fixes
** VIC-II fixes
** VIC fixes
** SID fixes
** Monitor
** vdrive
** C-64 fixes
** C-128 fixes
** Gtk3 UI
** SDL fixes
** macOS fixes

6 files changed, 131 insertions, 145 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index f5cbd3dddbb..9267cc92b99 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.140 2019/12/19 22:14:07 joerg Exp $
+# $NetBSD: Makefile,v 1.141 2019/12/31 14:42:22 rhialto Exp $
 
-DISTNAME=	vice-3.3
-PKGREVISION=	2
+DISTNAME=	vice-3.4
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vice-emu/}
 
@@ -18,7 +17,7 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++11
-USE_TOOLS+=		bash gmake pkg-config perl bdftopcf
+USE_TOOLS+=		bash gmake pkg-config perl
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-ethernet
 CONFIGURE_ARGS.NetBSD+=	--without-oss
@@ -28,8 +27,6 @@ CONFIGURE_ENV+=		ac_cv_prog_TEXI2DVI=no
 CONFIGURE_ENV+=		ac_cv_prog_PDFTEX=no
 
 INFO_FILES=		yes
-FONTS_DIRS.x11=		${PREFIX}/share/vice/fonts
-REQD_DIRS+=		${PREFIX}/share/vice/fonts
 REQD_DIRS+=		${PREFIX}/share/vice
 
 BUILD_DEPENDS+=		xa65-[0-9]*:../../devel/xa65
@@ -37,8 +34,9 @@ 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/vice_4.html
-SUBST_FILES.prefix+=	doc/vice.info
+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_SED.prefix=	-e 's|/usr/local|${PREFIX}|g'
 
diff --git a/emulators/vice/PLIST b/emulators/vice/PLIST
index dc2adb49620..900d4d97834 100644
--- a/emulators/vice/PLIST
+++ b/emulators/vice/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.27 2018/12/31 15:38:55 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.28 2019/12/31 14:42:22 rhialto Exp $
 bin/c1541
 bin/cartconv
 bin/petcat
 bin/vsid
 bin/x128
-bin/x64
+${PLIST.x64}bin/x64
 bin/x64dtv
 bin/x64sc
 bin/xcbm2
@@ -14,7 +14,6 @@ bin/xplus4
 bin/xscpu64
 bin/xvic
 info/vice.info
-info/vice.txt
 man/man1/c1541.1
 man/man1/cartconv.1
 man/man1/petcat.1
@@ -26,7 +25,9 @@ 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-macOS.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
@@ -63,25 +64,18 @@ share/doc/vice/ffmpeg-support.txt
 share/doc/vice/hardware-sids.txt
 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-Xcode-Howto.txt
 share/doc/vice/macosx.html
 share/doc/vice/new.gif
-share/doc/vice/nsosrh.html
-share/doc/vice/qnx.html
 share/doc/vice/robots.txt
-share/doc/vice/sco.html
 share/doc/vice/sitemap.xml
-share/doc/vice/solaris.html
-share/doc/vice/sortix.html
 share/doc/vice/unix.html
 share/doc/vice/vice-logo-black.svg
 share/doc/vice/vice-logo.svg
-share/doc/vice/vice.chm
 share/doc/vice/vice.css
-share/doc/vice/vice.guide
-share/doc/vice/vice.hlp
-share/doc/vice/vice.inf
-share/doc/vice/vice.info
-share/doc/vice/vice.pdf
 share/doc/vice/vice.txt
 share/doc/vice/vice_1.html
 share/doc/vice/vice_10.html
@@ -126,8 +120,8 @@ share/vice/C128/deekay.vpl
 share/vice/C128/default.vrs
 share/vice/C128/frodo.vpl
 share/vice/C128/godot.vpl
-${PLIST.x11}share/vice/C128/gtk3_pos.vkm
-${PLIST.x11}share/vice/C128/gtk3_sym.vkm
+${PLIST.gtk}share/vice/C128/gtk3_pos.vkm
+${PLIST.gtk}share/vice/C128/gtk3_sym.vkm
 share/vice/C128/kernal
 share/vice/C128/kernal64
 share/vice/C128/kernalch
@@ -164,13 +158,16 @@ share/vice/C64/edkernal
 share/vice/C64/frodo.vpl
 share/vice/C64/godot.vpl
 share/vice/C64/gskernal
-${PLIST.x11}share/vice/C64/gtk3_keyrah.vkm
-${PLIST.x11}share/vice/C64/gtk3_keyrah_de.vkm
-${PLIST.x11}share/vice/C64/gtk3_pos.vkm
-${PLIST.x11}share/vice/C64/gtk3_pos_de.vkm
-${PLIST.x11}share/vice/C64/gtk3_sym.vkm
-${PLIST.x11}share/vice/C64/gtk3_sym_de.vkm
-${PLIST.x11}share/vice/C64/gtk3_sym_nl.vkm
+${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
 share/vice/C64/jpchrgen
 share/vice/C64/jpkernal
 share/vice/C64/kernal
@@ -190,12 +187,15 @@ ${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_ch.vkm
 ${PLIST.sdl}share/vice/C64/sdl_pos_da.vkm
 ${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_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_it.vkm
 ${PLIST.sdl}share/vice/C64/sdl_sym_nl.vkm
 share/vice/C64/sxkernal
 share/vice/C64/vice.vpl
@@ -204,13 +204,15 @@ share/vice/C64DTV/c64mem.sym
 share/vice/C64DTV/chargen
 share/vice/C64DTV/default.vrs
 share/vice/C64DTV/dtvrom.bin
-${PLIST.x11}share/vice/C64DTV/gtk3_keyrah.vkm
-${PLIST.x11}share/vice/C64DTV/gtk3_keyrah_de.vkm
-${PLIST.x11}share/vice/C64DTV/gtk3_pos.vkm
-${PLIST.x11}share/vice/C64DTV/gtk3_pos_de.vkm
-${PLIST.x11}share/vice/C64DTV/gtk3_sym.vkm
-${PLIST.x11}share/vice/C64DTV/gtk3_sym_de.vkm
-${PLIST.x11}share/vice/C64DTV/gtk3_sym_nl.vkm
+${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
 share/vice/C64DTV/kernal
 ${PLIST.sdl}share/vice/C64DTV/sdl_hotkeys.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_keyrah.vkm
@@ -219,11 +221,13 @@ ${PLIST.sdl}share/vice/C64DTV/sdl_keyrah_de.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_keyrah_retropie.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_keyrah_retropie_de.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_pos.vkm
+${PLIST.sdl}share/vice/C64DTV/sdl_pos_ch.vkm
 ${PLIST.sdl}share/vice/C64DTV/sdl_pos_da.vkm
 ${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_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_nl.vkm
 share/vice/C64DTV/spiff.vpl
@@ -244,8 +248,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.x11}share/vice/CBM-II/gtk3_sym.vkm
-${PLIST.x11}share/vice/CBM-II/gtk3_sym_de.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
 share/vice/CBM-II/kernal.500
 share/vice/CBM-II/pc64.vpl
@@ -291,19 +295,19 @@ share/vice/PET/edit4b40
 share/vice/PET/edit4b80
 share/vice/PET/edit4g40
 share/vice/PET/green.vpl
-${PLIST.x11}share/vice/PET/gtk3_bude_pos.vkm
-${PLIST.x11}share/vice/PET/gtk3_bude_pos_de.vkm
-${PLIST.x11}share/vice/PET/gtk3_bude_sym.vkm
-${PLIST.x11}share/vice/PET/gtk3_bude_sym_de.vkm
-${PLIST.x11}share/vice/PET/gtk3_buuk_pos.vkm
-${PLIST.x11}share/vice/PET/gtk3_buuk_pos_de.vkm
-${PLIST.x11}share/vice/PET/gtk3_buuk_sym.vkm
-${PLIST.x11}share/vice/PET/gtk3_buuk_sym_de.vkm
-${PLIST.x11}share/vice/PET/gtk3_grus_pos.vkm
-${PLIST.x11}share/vice/PET/gtk3_grus_pos_de.vkm
-${PLIST.x11}share/vice/PET/gtk3_grus_sym.vkm
-${PLIST.x11}share/vice/PET/gtk3_grus_sym_de.vkm
-${PLIST.x11}share/vice/PET/gtk3_sym.vkm
+${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
 share/vice/PET/hre-9000.324992-02.bin
 share/vice/PET/hre-a000.324993-02.bin
 share/vice/PET/hre.vrs
@@ -334,9 +338,9 @@ share/vice/PLUS4/basic
 share/vice/PLUS4/c2lo.364
 share/vice/PLUS4/colodore_ted.vpl
 share/vice/PLUS4/default.vrs
-${PLIST.x11}share/vice/PLUS4/gtk3_pos.vkm
-${PLIST.x11}share/vice/PLUS4/gtk3_sym.vkm
-${PLIST.x11}share/vice/PLUS4/gtk3_sym_de.vkm
+${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
 share/vice/PLUS4/kernal
 share/vice/PLUS4/kernal.005
 share/vice/PLUS4/kernal.232
@@ -363,11 +367,13 @@ share/vice/SCPU64/deekay.vpl
 share/vice/SCPU64/default.vrs
 share/vice/SCPU64/frodo.vpl
 share/vice/SCPU64/godot.vpl
-${PLIST.x11}share/vice/SCPU64/gtk3_pos.vkm
-${PLIST.x11}share/vice/SCPU64/gtk3_pos_de.vkm
-${PLIST.x11}share/vice/SCPU64/gtk3_sym.vkm
-${PLIST.x11}share/vice/SCPU64/gtk3_sym_de.vkm
-${PLIST.x11}share/vice/SCPU64/gtk3_sym_nl.vkm
+${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
 share/vice/SCPU64/jpchrgen
 share/vice/SCPU64/pc64.vpl
 share/vice/SCPU64/pepto-ntsc-sony.vpl
@@ -385,11 +391,13 @@ ${PLIST.sdl}share/vice/SCPU64/sdl_keyrah_de.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_keyrah_retropie.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_keyrah_retropie_de.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_pos.vkm
+${PLIST.sdl}share/vice/SCPU64/sdl_pos_ch.vkm
 ${PLIST.sdl}share/vice/SCPU64/sdl_pos_da.vkm
 ${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_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_nl.vkm
 share/vice/SCPU64/vice.vpl
@@ -397,8 +405,8 @@ share/vice/VIC20/basic
 share/vice/VIC20/chargen
 share/vice/VIC20/colodore_vic.vpl
 share/vice/VIC20/default.vrs
-${PLIST.x11}share/vice/VIC20/gtk3_pos.vkm
-${PLIST.x11}share/vice/VIC20/gtk3_sym.vkm
+${PLIST.gtk}share/vice/VIC20/gtk3_pos.vkm
+${PLIST.gtk}share/vice/VIC20/gtk3_sym.vkm
 share/vice/VIC20/kernal
 share/vice/VIC20/mike-ntsc.vpl
 share/vice/VIC20/mike-pal.vpl
@@ -406,7 +414,10 @@ ${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/fonts/CBM.ttf
-share/vice/fonts/vice-cbm.bdf
-${PLIST.pcf}share/vice/fonts/vice-cbm.pcf
-${PLIST.x11}share/vice/gui/vice.gresource
+share/vice/common/CBM.ttf
+share/vice/common/CBM_Logo.svg
+share/vice/common/Icon-128@2x.png
+share/vice/common/icon.ico
+share/vice/common/icon.png
+share/vice/common/icon1024x1024.png
+${PLIST.gtk}share/vice/common/vice.gresource
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index c933bc0f261..ceff5b5eacf 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.47 2019/06/17 14:12:18 nia Exp $
+$NetBSD: distinfo,v 1.48 2019/12/31 14:42:22 rhialto Exp $
 
-SHA1 (vice-3.3.tar.gz) = 55a34feb29955da40067ee5a5171278ed0191c93
-RMD160 (vice-3.3.tar.gz) = 7b014f2b3ed1287e74ba93c1e30a547fe40582ce
-SHA512 (vice-3.3.tar.gz) = 702942e33b6e3d7e29ca6ed483242319ed5f6be26831def88a282cf7dce25d4c34dbf3651fcf8b583492fcb280ce5f4304c6eda3712088a73db24772c7a2bb3a
-Size (vice-3.3.tar.gz) = 22742913 bytes
-SHA1 (patch-configure) = df3517e6cb5c9b4a28fad4d9074b74cfae9d5d0b
-SHA1 (patch-data_fonts_Makefile.in) = ed5b427acb6c6a20ff9e69fa9863b108e1d1675d
+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
diff --git a/emulators/vice/options.mk b/emulators/vice/options.mk
index 4d1ffd598cc..4d5152ef628 100644
--- a/emulators/vice/options.mk
+++ b/emulators/vice/options.mk
@@ -1,21 +1,21 @@
-# $NetBSD: options.mk,v 1.10 2018/12/31 15:38:55 rhialto Exp $
+# $NetBSD: options.mk,v 1.11 2019/12/31 14:42:22 rhialto Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vice
-PKG_SUPPORTED_OPTIONS=		ffmpeg
+PKG_SUPPORTED_OPTIONS=		ffmpeg x64 cpuhistory
 PKG_OPTIONS_REQUIRED_GROUPS=	gui
 PKG_OPTIONS_GROUP.gui=		gtk3 sdl sdl2
 PKG_SUGGESTED_OPTIONS=		gtk3 ffmpeg
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	pcf sdl x11
+PLIST_VARS+=	gtk sdl x64
 
 .if !empty(PKG_OPTIONS:Mgtk3)
 CONFIGURE_ARGS+=	--enable-native-gtk3ui
-PLIST.pcf=		yes
-PLIST.x11=		yes
+PLIST.gtk=		yes
 .  include "../../x11/gtk3/buildlink3.mk"
 TOOL_DEPENDS+=		glib2-tools>=2.56:../../devel/glib2-tools
+.  include "../../graphics/glew/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Msdl)
@@ -37,3 +37,13 @@ PLIST.sdl=		yes
 CONFIGURE_ARGS+=	--enable-external-ffmpeg
 .  include "../../multimedia/ffmpeg3/buildlink3.mk"
 .endif
+
+# Building x64 is deprecated, in favour of x64sc (but that is slower).
+.if !empty(PKG_OPTIONS:Mx64)
+CONFIGURE_ARGS+=	--enable-x64
+PLIST.x64=		yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mcpuhistory)
+CONFIGURE_ARGS+=	--enable-cpuhistory
+.endif
diff --git a/emulators/vice/patches/patch-configure b/emulators/vice/patches/patch-configure
index aa7f76c8bbf..f9bfbc61169 100644
--- a/emulators/vice/patches/patch-configure
+++ b/emulators/vice/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3 2019/06/17 14:12:18 nia Exp $
+$NetBSD: patch-configure,v 1.4 2019/12/31 14:42:22 rhialto Exp $
 
 1. Use the NetBSD configuration for every OS since the PLIST is
    hardcoded for that.  Should fix every non-NetBSD platform.
@@ -6,29 +6,31 @@ $NetBSD: patch-configure,v 1.3 2019/06/17 14:12:18 nia Exp $
 2. Ignore the option --enable-option-checking instead of erroring,
    it's the default anyway.
 
---- configure.orig	2018-12-19 21:25:02.000000000 +0000
+--- configure.orig	2019-12-23 21:29:35.000000000 +0000
 +++ configure
-@@ -3300,6 +3300,9 @@ for argcheck in $@
+@@ -3301,6 +3301,8 @@ for argcheck in $@
  do
    argvalid=yes
-   case $argcheck in
-+    --enable-option-checking=*)
-+      argvalid=yes
-+      ;;
-     --enable-arch=*)
-       argvalid=yes
-       ;;
-@@ -8782,34 +8785,6 @@ case "$host_os" in
- esac
- 
+   case $argcheck in #(
++  --enable-option-checking=*)
++    argvalid=yes ;; #(
+   --enable-arch=*) :
+     argvalid=yes ;; #(
+   --enable-make-command*) :
+@@ -10009,9 +10011,6 @@ else
+   HAVE_BSD_FREE_FALSE=
+ fi
  
--case "$host_os" in
--  freebsd*)
--    CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-    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"`
--    LDFLAGS="$LDFLAGS $fbsdrtp -L/usr/local/lib"
--    ;;
--  netbsd*)
+-    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"
@@ -41,19 +43,20 @@ $NetBSD: patch-configure,v 1.3 2019/06/17 14:12:18 nia Exp $
 -        LDFLAGS="$LDFLAGS $rtp"
 -      fi
 -    fi
--    ;;
--  dragonfly*)
+     ;;
+   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"
--    ;;
--  *)
--    ;;
--esac
- 
- 
- if test x"$enable_shared_ffmpeg" = "xyes" -o x"$enable_static_ffmpeg" = "xyes"; then
-@@ -21894,7 +21869,7 @@ _ACEOF
+     ;;
+   *)
+     ;;
+@@ -21204,7 +21188,7 @@ _ACEOF
  
  
  case "$host_os" in
@@ -62,7 +65,7 @@ $NetBSD: patch-configure,v 1.3 2019/06/17 14:12:18 nia Exp $
      VICEDIR="$PREFIX/share/vice"
       if true; then
    ALTERNATE_DOCDIR_TRUE=
-@@ -21905,51 +21880,6 @@ else
+@@ -21215,51 +21199,6 @@ else
  fi
  
      ;;
diff --git a/emulators/vice/patches/patch-data_fonts_Makefile.in b/emulators/vice/patches/patch-data_fonts_Makefile.in
deleted file mode 100644
index 0729a9c7706..00000000000
--- a/emulators/vice/patches/patch-data_fonts_Makefile.in
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-data_fonts_Makefile.in,v 1.3 2018/12/31 15:38:55 rhialto Exp $
-
-Don't try to mess in ${HOME}.
-Don't try mkfontdir (that is done at pkg_add time).
-Don't use bdftopcf on Darwin.
-
---- data/fonts/Makefile.in.orig	2018-12-19 21:25:03.000000000 +0000
-+++ data/fonts/Makefile.in
-@@ -589,22 +589,10 @@ uninstall-am: uninstall-fontsDATA
- 
- 
- install: install-data-am
--@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	@echo "Preparing fontdir, please wait..." ; \
--@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	if [ ! `fc-cache --list > /dev/null 2>&1` ] ; then \
--@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	  if test "x${HOME}" != "x" ; then \
--@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	    mkdir ${HOME}/.fonts > /dev/null 2>&1 ; \
--@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	    cp $(fontsdir)/CBM.ttf ${HOME}/.fonts ; \
--@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	    fc-cache ; \
--@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	  else \
--@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	    echo '$$HOME not set... giving up.' ; \
--@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	  fi \
--@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	else \
--@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	  echo 'fc-cache not available... giving up.' ; \
--@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	fi
--@SDL_COMPILE_FALSE@	@echo "Preparing fontdir..." ; \
--@SDL_COMPILE_FALSE@	cd $(DESTDIR)$(fontsdir) ; \
--@SDL_COMPILE_FALSE@	bdftopcf -o vice-cbm.pcf vice-cbm.bdf ; \
--@SDL_COMPILE_FALSE@	${MKFONTDIR_BIN} .
-+@UNIX_MACOSX_COMPILE_FALSE@@SDL_COMPILE_FALSE@	@echo "Preparing fontdir..." ; \
-+@UNIX_MACOSX_COMPILE_FALSE@@SDL_COMPILE_FALSE@	cd $(DESTDIR)$(fontsdir) ; \
-+@UNIX_MACOSX_COMPILE_FALSE@@SDL_COMPILE_FALSE@	bdftopcf -o vice-cbm.pcf vice-cbm.bdf ; \
-+@UNIX_MACOSX_COMPILE_FALSE@@SDL_COMPILE_FALSE@	${MKFONTDIR_BIN} .
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.