- update to 3.3

- new options GTK3UI, SDLUI2

6 files changed, 144 insertions, 239 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 4894dd78503c..a1c4ce835bf8 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	vice
-PORTVERSION=	3.2
+PORTVERSION=	3.3
 CATEGORIES=	emulators
 MASTER_SITES=	SF/vice-emu/releases
 
@@ -32,7 +32,7 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 RESTRICTED=	ROMs are copyrighted by Commodore Business Machines
 
 USES=		compiler:c++11-lang pkgconfig makeinfo gmake \
-		iconv:wchar_t jpeg readline
+		iconv:wchar_t jpeg readline gettext
 USE_XORG=	xpm ice sm xext xv xt x11 xmu xxf86vm
 USE_XORG+=	xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes
 HAS_CONFIGURE=	yes
@@ -40,10 +40,11 @@ MAKE_ENV+=	MAKEINFOFLAGS="--no-split"
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS+=	--enable-fullscreen --enable-ipv6 \
+CONFIGURE_ARGS+=	--enable-ipv6 \
 			--enable-external-ffmpeg \
 			--mandir="${PREFIX}/man" \
 			--infodir="${PREFIX}/${INFO_PATH}" \
+			--localedir="${LOCALBASE}/share/locale" \
 			--disable-dependency-tracking
 
 LMLINKS=	vice.1 x64.1 \
@@ -53,27 +54,26 @@ LMLINKS=	vice.1 x64.1 \
 		vice.1 xplus4.1 \
 		vice.1 xcbm2.1
 
-OPTIONS_DEFINE=	SDL ALSA PULSEAUDIO DOCS NLS
+OPTIONS_DEFINE=	SDLSOUND ALSA PULSEAUDIO DOCS
 OPTIONS_SINGLE=	GUI
-OPTIONS_SINGLE_GUI=	GTK3 GNOMEUI2 XAW
-OPTIONS_DEFAULT?=	GNOMEUI2 SDL ALSA
+OPTIONS_SINGLE_GUI=	GTK3UI SDLUI2
+OPTIONS_DEFAULT?=	GTK3UI SDLSOUND ALSA
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
-GTK3_DESC=	use GTK3 user interface
-GNOMEUI2_DESC=	use gnome2 user interface
-XAW_DESC=	use plain Xaw library
-SDL_DESC=	build with SDL2 sound system support
-
-GNOMEUI2_CONFIGURE_ENABLE=	gnomeui
-GTK3_CONFIGURE_ENABLE=	native-gtk3ui
-SDL_USE=		SDL=sdl2
-SDL_CONFIGURE_ON=	--with-sdlsound
-ALSA_CONFIGURE_OFF=	--without-alsa
-ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+GTK3UI_DESC=	use GTK3 user interface
+SDLUI2_DESC=	use SDL2 user interface
+SDLSOUND_DESC=	build with SDL2 sound system support
+
+GTK3UI_CONFIGURE_ENABLE=	native-gtk3ui
+GTK3UI_BUILD_DEPENDS=		${LOCALBASE}/bin/bash:shells/bash
+SDLUI2_USE=			SDL=sdl2
+SDLUI2_CONFIGURE_ENABLE=	sdlui2
+SDLSOUND_USE=			SDL=sdl2
+SDLSOUND_CONFIGURE_ON=		--with-sdlsound
+ALSA_CONFIGURE_OFF=		--without-alsa
+ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
 PULSEAUDIO_CONFIGURE_OFF=	--without-pulse
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
-XAW_USE=		XORG=xaw
-XAW_USES=		readline
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 
 .include <bsd.port.options.mk>
 
@@ -86,45 +86,18 @@ __pmlinks1!=	${ECHO_CMD} '${LMLINKS:S/    / /}' | ${AWK} \
 	} }'
 .endif
 
-.if ${PORT_OPTIONS:MGNOMEUI2}
-USE_GNOME+=	gtk20 vte cairo gdkpixbuf2 pangox-compat
+.if ${PORT_OPTIONS:MGTK3UI}
+USE_GNOME+=	gtk30 vte3 cairo gdkpixbuf2 pango
 USE_GL+=	glu gl
-LIB_DEPENDS+=	libgdkglext-x11-1.0.so:x11-toolkits/gtkglext
-.endif
-
-.if ${PORT_OPTIONS:MGTK3}
-USES+=		readline
-USE_GNOME+=	gtk30 vte3 cairo gdkpixbuf2
-USE_GL+=	glu gl
-.endif
-
-.if ${PORT_OPTIONS:MNLS} && ! ${PORT_OPTIONS:MGTK3}
-USES+=		gettext
-CONFIGURE_ARGS+=	--enable-nls --localedir="${LOCALBASE}/share/locale"
-PLIST_SUB+=		NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 INFO+=		vice
 .endif
 
-.if ${PORT_OPTIONS:MSDL}
-USE_SDL=	sdl2
-.endif
-
 pre-configure:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
 		${WRKSRC}/man/vice.1
-	${REINPLACE_CMD} -e 's|^localedir.*|localedir = $$(DESTDIR)${LOCALBASE}/share/locale|' \
-		${WRKSRC}/po/Makefile.in.in
-.for i in da.po de.po fr.po
-	${MV} "${WRKSRC}/po/${i}" "${WRKSRC}/po/${i}.latin"
-	${ICONV_CMD} -f latin1 -t utf-8 < "${WRKSRC}/po/${i}.latin" > "${WRKSRC}/po/${i}"
-	${REINPLACE_CMD} -e 's|ISO-8859-1|UTF-8|' ${WRKSRC}/Makefile.in
-.endfor
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's| doc||' ${WRKSRC}/Makefile.in
 .endif
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index fe626663df5c..d385a8de86e2 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542638265
-SHA256 (vice-3.2.tar.gz) = 28d99f5e110720c97ef16d8dd4219cf9a67661d58819835d19378143697ba523
-SIZE (vice-3.2.tar.gz) = 30279589
+TIMESTAMP = 1545397027
+SHA256 (vice-3.3.tar.gz) = 1a55b38cc988165b077808c07c52a779d181270b28c14b5c9abf4e569137431d
+SIZE (vice-3.3.tar.gz) = 22742913
diff --git a/emulators/vice/files/patch-configure b/emulators/vice/files/patch-configure
deleted file mode 100644
index 10af1cf1137b..000000000000
--- a/emulators/vice/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	2016-12-15 03:47:11 UTC
-+++ configure
-@@ -15857,6 +15857,7 @@ if test "x$ac_cv_lib_SDL2_SDL_OpenAudio"
-   SOUND_DRIVERS="$SOUND_DRIVERS soundsdl.o";
-                                   use_sdl_prefix=no;
-                                   use_sdl2_prefix=yes;
-+                                  SOUND_LIBS="$SOUND_LIBS -lSDL2";
-                                   USE_SDL_AUDIO_SUPPORT="yes";
- 
- $as_echo "#define USE_SDL2_PREFIX /**/" >>confdefs.h
diff --git a/emulators/vice/files/patch-doc_vice.texi b/emulators/vice/files/patch-doc_vice.texi
index b744f79222c9..a738a448bf7e 100644
--- a/emulators/vice/files/patch-doc_vice.texi
+++ b/emulators/vice/files/patch-doc_vice.texi
@@ -1,6 +1,6 @@
---- doc/vice.texi.orig	2016-12-15 21:30:13 UTC
+--- doc/vice.texi.orig	2018-12-19 23:41:08 UTC
 +++ doc/vice.texi
-@@ -1555,8 +1555,8 @@ System files can still be installed in a
+@@ -1552,8 +1552,8 @@ System files can still be installed in a
  specify a complete path instead of just a file name.  For example, if
  you specify @file{./kernal} as the kernal image name, the kernal image
  will be loaded from the current directory.  This can be done by using
@@ -11,7 +11,7 @@
  
  @menu
  * ROM files::                   Files containing dumps of the original ROMs.
-@@ -11013,8 +11013,9 @@ character cell, the 8 colour bits are us
+@@ -11775,8 +11775,9 @@ character cell, the 8 colour bits are us
  @subsection Changing screen colors
  
  It is also possible to choose what color set is used for the emulation
@@ -23,7 +23,7 @@
  following values:
  
  @itemize @bullet
-@@ -11442,8 +11443,9 @@ xcbm5x0: (510)
+@@ -12204,8 +12205,9 @@ xcbm5x0: (510)
  @subsection Changing screen colors
  
  It is also possible to choose what color set is used for the emulation
@@ -35,7 +35,7 @@
  following values:
  
  @itemize @bullet
-@@ -27895,8 +27897,8 @@ the VICE FAQ (it is available on the Int
+@@ -26924,8 +26926,8 @@ the VICE FAQ (it is available on the Int
  VICE home page:
  @uref{http://vice-emu.sourceforge.net});
  @item
diff --git a/emulators/vice/files/patch-src_gfxoutputdrv_ffmpegdrv.c b/emulators/vice/files/patch-src_gfxoutputdrv_ffmpegdrv.c
deleted file mode 100644
index 1a4c94daee7a..000000000000
--- a/emulators/vice/files/patch-src_gfxoutputdrv_ffmpegdrv.c
+++ /dev/null
@@ -1,61 +0,0 @@
-ffmpegdrv.c:363:34: error: use of undeclared identifier 'CODEC_CAP_VARIABLE_FRAME_SIZE'
-    if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
-                                 ^
-ffmpegdrv.c:457:21: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
-        c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-                    ^
-ffmpegdrv.c:790:21: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
-        c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-                    ^
-ffmpegdrv.c:970:40: error: use of undeclared identifier 'AVFMT_RAWPICTURE'
-    if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
-                                       ^
-
---- src/gfxoutputdrv/ffmpegdrv.c.orig	2017-03-30 20:32:40 UTC
-+++ src/gfxoutputdrv/ffmpegdrv.c
-@@ -360,7 +360,7 @@ static int ffmpegdrv_open_audio(AVFormatContext *oc, A
-     }
- 
-     audio_is_open = 1;
--    if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
-+    if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) {
-         audio_inbuf_samples = 10000;
-     } else {
-         audio_inbuf_samples = c->frame_size;
-@@ -454,7 +454,7 @@ static int ffmpegmovie_init_audio(int speed, int chann
- 
-     /* Some formats want stream headers to be separate. */
-     if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER)
--        c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
-     /* create resampler context */
- #ifndef HAVE_FFMPEG_AVRESAMPLE
-@@ -787,7 +787,7 @@ static void ffmpegdrv_init_video(screenshot_t *screens
- 
-     /* Some formats want stream headers to be separate. */
-     if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
--        c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-     }
- 
-     if (audio_init_done) {
-@@ -967,6 +967,7 @@ static int ffmpegdrv_record(screenshot_t *screenshot)
- 
-     video_st.frame->pts = video_st.next_pts++;
- 
-+#ifdef AVFMT_RAWPICTURE
-     if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
-         AVPacket pkt;
-         VICE_P_AV_INIT_PACKET(&pkt);
-@@ -977,7 +978,9 @@ static int ffmpegdrv_record(screenshot_t *screenshot)
-         pkt.pts = pkt.dts = video_st.frame->pts;
- 
-         ret = VICE_P_AV_INTERLEAVED_WRITE_FRAME(ffmpegdrv_oc, &pkt);
--    } else {
-+    } else
-+#endif
-+    {
-         AVPacket pkt = { 0 };
-         int got_packet;
- 
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index 493f1906ebd8..d64ff6a6de4f 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -22,15 +22,17 @@ lib/vice/C128/chargch
 lib/vice/C128/chargde
 lib/vice/C128/chargen
 lib/vice/C128/chargfr
+lib/vice/C128/chargno
 lib/vice/C128/chargse
+lib/vice/C128/cjam.vpl
 lib/vice/C128/colodore.vpl
 lib/vice/C128/community-colors.vpl
 lib/vice/C128/deekay.vpl
 lib/vice/C128/default.vrs
 lib/vice/C128/frodo.vpl
 lib/vice/C128/godot.vpl
-lib/vice/C128/gtk3_pos.vkm
-lib/vice/C128/gtk3_sym.vkm
+%%GTK3UI%%lib/vice/C128/gtk3_pos.vkm
+%%GTK3UI%%lib/vice/C128/gtk3_sym.vkm
 lib/vice/C128/kernal
 lib/vice/C128/kernal64
 lib/vice/C128/kernalch
@@ -47,17 +49,18 @@ lib/vice/C128/pepto-pal.vpl
 lib/vice/C128/pepto-palold.vpl
 lib/vice/C128/ptoing.vpl
 lib/vice/C128/rgb.vpl
+%%SDLUI2%%lib/vice/C128/sdl_hotkeys.vkm
+%%SDLUI2%%lib/vice/C128/sdl_pos.vkm
 lib/vice/C128/vdc_comp.vpl
 lib/vice/C128/vdc_deft.vpl
 lib/vice/C128/vice.vpl
-lib/vice/C128/x11_pos.vkm
-lib/vice/C128/x11_sym.vkm
 lib/vice/C64/basic
 lib/vice/C64/c64hq.vpl
 lib/vice/C64/c64mem.sym
 lib/vice/C64/c64s.vpl
 lib/vice/C64/ccs64.vpl
 lib/vice/C64/chargen
+lib/vice/C64/cjam.vpl
 lib/vice/C64/colodore.vpl
 lib/vice/C64/community-colors.vpl
 lib/vice/C64/deekay.vpl
@@ -66,12 +69,13 @@ lib/vice/C64/edkernal
 lib/vice/C64/frodo.vpl
 lib/vice/C64/godot.vpl
 lib/vice/C64/gskernal
-lib/vice/C64/gtk3_keyrah.vkm
-lib/vice/C64/gtk3_keyrah_de.vkm
-lib/vice/C64/gtk3_pos.vkm
-lib/vice/C64/gtk3_pos_de.vkm
-lib/vice/C64/gtk3_sym.vkm
-lib/vice/C64/gtk3_sym_de.vkm
+%%GTK3UI%%lib/vice/C64/gtk3_keyrah.vkm
+%%GTK3UI%%lib/vice/C64/gtk3_keyrah_de.vkm
+%%GTK3UI%%lib/vice/C64/gtk3_pos.vkm
+%%GTK3UI%%lib/vice/C64/gtk3_pos_de.vkm
+%%GTK3UI%%lib/vice/C64/gtk3_sym.vkm
+%%GTK3UI%%lib/vice/C64/gtk3_sym_de.vkm
+%%GTK3UI%%lib/vice/C64/gtk3_sym_nl.vkm
 lib/vice/C64/jpchrgen
 lib/vice/C64/jpkernal
 lib/vice/C64/kernal
@@ -82,33 +86,52 @@ lib/vice/C64/pepto-pal.vpl
 lib/vice/C64/pepto-palold.vpl
 lib/vice/C64/ptoing.vpl
 lib/vice/C64/rgb.vpl
+%%SDLUI2%%lib/vice/C64/sdl_hotkeys.vkm
+%%SDLUI2%%lib/vice/C64/sdl_hotkeys_vsid.vkm
+%%SDLUI2%%lib/vice/C64/sdl_joymap_ps3.vjm
+%%SDLUI2%%lib/vice/C64/sdl_keyrah.vkm
+%%SDLUI2%%lib/vice/C64/sdl_keyrah_combian.vkm
+%%SDLUI2%%lib/vice/C64/sdl_keyrah_de.vkm
+%%SDLUI2%%lib/vice/C64/sdl_keyrah_retropie.vkm
+%%SDLUI2%%lib/vice/C64/sdl_keyrah_retropie_de.vkm
+%%SDLUI2%%lib/vice/C64/sdl_pos.vkm
+%%SDLUI2%%lib/vice/C64/sdl_pos_da.vkm
+%%SDLUI2%%lib/vice/C64/sdl_pos_de.vkm
+%%SDLUI2%%lib/vice/C64/sdl_pos_fi.vkm
+%%SDLUI2%%lib/vice/C64/sdl_pos_no.vkm
+%%SDLUI2%%lib/vice/C64/sdl_sym.vkm
+%%SDLUI2%%lib/vice/C64/sdl_sym_de.vkm
+%%SDLUI2%%lib/vice/C64/sdl_sym_nl.vkm
 lib/vice/C64/sxkernal
 lib/vice/C64/vice.vpl
-lib/vice/C64/x11_keyrah.vkm
-lib/vice/C64/x11_keyrah_de.vkm
-lib/vice/C64/x11_pos.vkm
-lib/vice/C64/x11_pos_de.vkm
-lib/vice/C64/x11_sym.vkm
-lib/vice/C64/x11_sym_de.vkm
 lib/vice/C64DTV/basic
 lib/vice/C64DTV/c64mem.sym
 lib/vice/C64DTV/chargen
 lib/vice/C64DTV/default.vrs
 lib/vice/C64DTV/dtvrom.bin
-lib/vice/C64DTV/gtk3_keyrah.vkm
-lib/vice/C64DTV/gtk3_keyrah_de.vkm
-lib/vice/C64DTV/gtk3_pos.vkm
-lib/vice/C64DTV/gtk3_pos_de.vkm
-lib/vice/C64DTV/gtk3_sym.vkm
-lib/vice/C64DTV/gtk3_sym_de.vkm
+%%GTK3UI%%lib/vice/C64DTV/gtk3_keyrah.vkm
+%%GTK3UI%%lib/vice/C64DTV/gtk3_keyrah_de.vkm
+%%GTK3UI%%lib/vice/C64DTV/gtk3_pos.vkm
+%%GTK3UI%%lib/vice/C64DTV/gtk3_pos_de.vkm
+%%GTK3UI%%lib/vice/C64DTV/gtk3_sym.vkm
+%%GTK3UI%%lib/vice/C64DTV/gtk3_sym_de.vkm
+%%GTK3UI%%lib/vice/C64DTV/gtk3_sym_nl.vkm
 lib/vice/C64DTV/kernal
+%%SDLUI2%%lib/vice/C64DTV/sdl_hotkeys.vkm
+%%SDLUI2%%lib/vice/C64DTV/sdl_keyrah.vkm
+%%SDLUI2%%lib/vice/C64DTV/sdl_keyrah_combian.vkm
+%%SDLUI2%%lib/vice/C64DTV/sdl_keyrah_de.vkm
+%%SDLUI2%%lib/vice/C64DTV/sdl_keyrah_retropie.vkm
+%%SDLUI2%%lib/vice/C64DTV/sdl_keyrah_retropie_de.vkm
+%%SDLUI2%%lib/vice/C64DTV/sdl_pos.vkm
+%%SDLUI2%%lib/vice/C64DTV/sdl_pos_da.vkm
+%%SDLUI2%%lib/vice/C64DTV/sdl_pos_de.vkm
+%%SDLUI2%%lib/vice/C64DTV/sdl_pos_fi.vkm
+%%SDLUI2%%lib/vice/C64DTV/sdl_pos_no.vkm
+%%SDLUI2%%lib/vice/C64DTV/sdl_sym.vkm
+%%SDLUI2%%lib/vice/C64DTV/sdl_sym_de.vkm
+%%SDLUI2%%lib/vice/C64DTV/sdl_sym_nl.vkm
 lib/vice/C64DTV/spiff.vpl
-lib/vice/C64DTV/x11_keyrah.vkm
-lib/vice/C64DTV/x11_keyrah_de.vkm
-lib/vice/C64DTV/x11_pos.vkm
-lib/vice/C64DTV/x11_pos_de.vkm
-lib/vice/C64DTV/x11_sym.vkm
-lib/vice/C64DTV/x11_sym_de.vkm
 lib/vice/CBM-II/amber.vpl
 lib/vice/CBM-II/basic.128
 lib/vice/CBM-II/basic.256
@@ -119,14 +142,15 @@ lib/vice/CBM-II/ccs64.vpl
 lib/vice/CBM-II/chargen.500
 lib/vice/CBM-II/chargen.600
 lib/vice/CBM-II/chargen.700
+lib/vice/CBM-II/cjam.vpl
 lib/vice/CBM-II/colodore.vpl
 lib/vice/CBM-II/community-colors.vpl
 lib/vice/CBM-II/deekay.vpl
 lib/vice/CBM-II/frodo.vpl
 lib/vice/CBM-II/godot.vpl
 lib/vice/CBM-II/green.vpl
-lib/vice/CBM-II/gtk3_sym.vkm
-lib/vice/CBM-II/gtk3_sym_de.vkm
+%%GTK3UI%%lib/vice/CBM-II/gtk3_sym.vkm
+%%GTK3UI%%lib/vice/CBM-II/gtk3_sym_de.vkm
 lib/vice/CBM-II/kernal
 lib/vice/CBM-II/kernal.500
 lib/vice/CBM-II/pc64.vpl
@@ -141,10 +165,10 @@ lib/vice/CBM-II/rom128l.vrs
 lib/vice/CBM-II/rom256h.vrs
 lib/vice/CBM-II/rom256l.vrs
 lib/vice/CBM-II/rom500.vrs
+%%SDLUI2%%lib/vice/CBM-II/sdl_hotkeys.vkm
+%%SDLUI2%%lib/vice/CBM-II/sdl_sym.vkm
 lib/vice/CBM-II/vice.vpl
 lib/vice/CBM-II/white.vpl
-lib/vice/CBM-II/x11_sym.vkm
-lib/vice/CBM-II/x11_sym_de.vkm
 lib/vice/DRIVES/d1541II
 lib/vice/DRIVES/d1571cr
 lib/vice/DRIVES/dos1001
@@ -172,19 +196,19 @@ lib/vice/PET/edit4b40
 lib/vice/PET/edit4b80
 lib/vice/PET/edit4g40
 lib/vice/PET/green.vpl
-lib/vice/PET/gtk3_bude_pos.vkm
-lib/vice/PET/gtk3_bude_pos_de.vkm
-lib/vice/PET/gtk3_bude_sym.vkm
-lib/vice/PET/gtk3_bude_sym_de.vkm
-lib/vice/PET/gtk3_buuk_pos.vkm
-lib/vice/PET/gtk3_buuk_pos_de.vkm
-lib/vice/PET/gtk3_buuk_sym.vkm
-lib/vice/PET/gtk3_buuk_sym_de.vkm
-lib/vice/PET/gtk3_grus_pos.vkm
-lib/vice/PET/gtk3_grus_pos_de.vkm
-lib/vice/PET/gtk3_grus_sym.vkm
-lib/vice/PET/gtk3_grus_sym_de.vkm
-lib/vice/PET/gtk3_sym.vkm
+%%GTK3UI%%lib/vice/PET/gtk3_bude_pos.vkm
+%%GTK3UI%%lib/vice/PET/gtk3_bude_pos_de.vkm
+%%GTK3UI%%lib/vice/PET/gtk3_bude_sym.vkm
+%%GTK3UI%%lib/vice/PET/gtk3_bude_sym_de.vkm
+%%GTK3UI%%lib/vice/PET/gtk3_buuk_pos.vkm
+%%GTK3UI%%lib/vice/PET/gtk3_buuk_pos_de.vkm
+%%GTK3UI%%lib/vice/PET/gtk3_buuk_sym.vkm
+%%GTK3UI%%lib/vice/PET/gtk3_buuk_sym_de.vkm
+%%GTK3UI%%lib/vice/PET/gtk3_grus_pos.vkm
+%%GTK3UI%%lib/vice/PET/gtk3_grus_pos_de.vkm
+%%GTK3UI%%lib/vice/PET/gtk3_grus_sym.vkm
+%%GTK3UI%%lib/vice/PET/gtk3_grus_sym_de.vkm
+%%GTK3UI%%lib/vice/PET/gtk3_sym.vkm
 lib/vice/PET/hre-9000.324992-02.bin
 lib/vice/PET/hre-a000.324993-02.bin
 lib/vice/PET/hre.vrs
@@ -198,6 +222,10 @@ lib/vice/PET/rom4b40.vrs
 lib/vice/PET/rom4b80.vrs
 lib/vice/PET/rom4g40.vrs
 lib/vice/PET/romsuperpet.vrs
+%%SDLUI2%%lib/vice/PET/sdl_buuk_sym.vkm
+%%SDLUI2%%lib/vice/PET/sdl_grus_sym.vkm
+%%SDLUI2%%lib/vice/PET/sdl_hotkeys.vkm
+%%SDLUI2%%lib/vice/PET/sdl_sym.vkm
 lib/vice/PET/waterloo-a000.901898-01.bin
 lib/vice/PET/waterloo-b000.901898-02.bin
 lib/vice/PET/waterloo-c000.901898-03.bin
@@ -205,35 +233,21 @@ lib/vice/PET/waterloo-d000.901898-04.bin
 lib/vice/PET/waterloo-e000.901897-01.bin
 lib/vice/PET/waterloo-f000.901898-05.bin
 lib/vice/PET/white.vpl
-lib/vice/PET/x11_bude_pos.vkm
-lib/vice/PET/x11_bude_pos_de.vkm
-lib/vice/PET/x11_bude_sym.vkm
-lib/vice/PET/x11_bude_sym_de.vkm
-lib/vice/PET/x11_buuk_pos.vkm
-lib/vice/PET/x11_buuk_pos_de.vkm
-lib/vice/PET/x11_buuk_sym.vkm
-lib/vice/PET/x11_buuk_sym_de.vkm
-lib/vice/PET/x11_grus_pos.vkm
-lib/vice/PET/x11_grus_pos_de.vkm
-lib/vice/PET/x11_grus_sym.vkm
-lib/vice/PET/x11_grus_sym_de.vkm
-lib/vice/PET/x11_sym.vkm
 lib/vice/PLUS4/3plus1hi
 lib/vice/PLUS4/3plus1lo
 lib/vice/PLUS4/basic
 lib/vice/PLUS4/c2lo.364
 lib/vice/PLUS4/colodore_ted.vpl
 lib/vice/PLUS4/default.vrs
-lib/vice/PLUS4/gtk3_pos.vkm
-lib/vice/PLUS4/gtk3_sym.vkm
-lib/vice/PLUS4/gtk3_sym_de.vkm
+%%GTK3UI%%lib/vice/PLUS4/gtk3_pos.vkm
+%%GTK3UI%%lib/vice/PLUS4/gtk3_sym.vkm
+%%GTK3UI%%lib/vice/PLUS4/gtk3_sym_de.vkm
 lib/vice/PLUS4/kernal
 lib/vice/PLUS4/kernal.005
 lib/vice/PLUS4/kernal.232
 lib/vice/PLUS4/kernal.364
-lib/vice/PLUS4/x11_pos.vkm
-lib/vice/PLUS4/x11_sym.vkm
-lib/vice/PLUS4/x11_sym_de.vkm
+%%SDLUI2%%lib/vice/PLUS4/sdl_hotkeys.vkm
+%%SDLUI2%%lib/vice/PLUS4/sdl_pos.vkm
 lib/vice/PLUS4/yape-ntsc.vpl
 lib/vice/PLUS4/yape-pal.vpl
 lib/vice/PRINTER/1520.vpl
@@ -247,16 +261,18 @@ lib/vice/SCPU64/c64hq.vpl
 lib/vice/SCPU64/c64s.vpl
 lib/vice/SCPU64/ccs64.vpl
 lib/vice/SCPU64/chargen
+lib/vice/SCPU64/cjam.vpl
 lib/vice/SCPU64/colodore.vpl
 lib/vice/SCPU64/community-colors.vpl
 lib/vice/SCPU64/deekay.vpl
 lib/vice/SCPU64/default.vrs
 lib/vice/SCPU64/frodo.vpl
 lib/vice/SCPU64/godot.vpl
-lib/vice/SCPU64/gtk3_pos.vkm
-lib/vice/SCPU64/gtk3_pos_de.vkm
-lib/vice/SCPU64/gtk3_sym.vkm
-lib/vice/SCPU64/gtk3_sym_de.vkm
+%%GTK3UI%%lib/vice/SCPU64/gtk3_pos.vkm
+%%GTK3UI%%lib/vice/SCPU64/gtk3_pos_de.vkm
+%%GTK3UI%%lib/vice/SCPU64/gtk3_sym.vkm
+%%GTK3UI%%lib/vice/SCPU64/gtk3_sym_de.vkm
+%%GTK3UI%%lib/vice/SCPU64/gtk3_sym_nl.vkm
 lib/vice/SCPU64/jpchrgen
 lib/vice/SCPU64/pc64.vpl
 lib/vice/SCPU64/pepto-ntsc-sony.vpl
@@ -267,27 +283,39 @@ lib/vice/SCPU64/ptoing.vpl
 lib/vice/SCPU64/rgb.vpl
 lib/vice/SCPU64/scpu64
 lib/vice/SCPU64/scpu64mem.sym
+%%SDLUI2%%lib/vice/SCPU64/sdl_hotkeys.vkm
+%%SDLUI2%%lib/vice/SCPU64/sdl_keyrah.vkm
+%%SDLUI2%%lib/vice/SCPU64/sdl_keyrah_combian.vkm
+%%SDLUI2%%lib/vice/SCPU64/sdl_keyrah_de.vkm
+%%SDLUI2%%lib/vice/SCPU64/sdl_keyrah_retropie.vkm
+%%SDLUI2%%lib/vice/SCPU64/sdl_keyrah_retropie_de.vkm
+%%SDLUI2%%lib/vice/SCPU64/sdl_pos.vkm
+%%SDLUI2%%lib/vice/SCPU64/sdl_pos_da.vkm
+%%SDLUI2%%lib/vice/SCPU64/sdl_pos_de.vkm
+%%SDLUI2%%lib/vice/SCPU64/sdl_pos_fi.vkm
+%%SDLUI2%%lib/vice/SCPU64/sdl_pos_no.vkm
+%%SDLUI2%%lib/vice/SCPU64/sdl_sym.vkm
+%%SDLUI2%%lib/vice/SCPU64/sdl_sym_de.vkm
+%%SDLUI2%%lib/vice/SCPU64/sdl_sym_nl.vkm
 lib/vice/SCPU64/vice.vpl
-lib/vice/SCPU64/x11_pos.vkm
-lib/vice/SCPU64/x11_pos_de.vkm
-lib/vice/SCPU64/x11_sym.vkm
-lib/vice/SCPU64/x11_sym_de.vkm
 lib/vice/VIC20/basic
 lib/vice/VIC20/chargen
 lib/vice/VIC20/colodore_vic.vpl
 lib/vice/VIC20/default.vrs
-lib/vice/VIC20/gtk3_pos.vkm
-lib/vice/VIC20/gtk3_sym.vkm
+%%GTK3UI%%lib/vice/VIC20/gtk3_pos.vkm
+%%GTK3UI%%lib/vice/VIC20/gtk3_sym.vkm
 lib/vice/VIC20/kernal
 lib/vice/VIC20/mike-ntsc.vpl
 lib/vice/VIC20/mike-pal.vpl
+%%SDLUI2%%lib/vice/VIC20/sdl_hotkeys.vkm
+%%SDLUI2%%lib/vice/VIC20/sdl_pos.vkm
+%%SDLUI2%%lib/vice/VIC20/sdl_pos_fi.vkm
 lib/vice/VIC20/vice.vpl
-lib/vice/VIC20/x11_pos.vkm
-lib/vice/VIC20/x11_sym.vkm
 lib/vice/fonts/CBM.ttf
-lib/vice/fonts/vice-cbm.bdf
-lib/vice/fonts/fonts.dir
-lib/vice/fonts/vice-cbm.pcf
+%%GTK3UI%%lib/vice/fonts/vice-cbm.bdf
+%%GTK3UI%%lib/vice/fonts/fonts.dir
+%%GTK3UI%%lib/vice/fonts/vice-cbm.pcf
+%%GTK3UI%%lib/vice/gui/vice.gresource
 man/man1/c1541.1.gz
 man/man1/cartconv.1.gz
 man/man1/petcat.1.gz
@@ -304,7 +332,8 @@ man/man1/xvic.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/Documentation-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/Doxygen-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/GTK3-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/FreeBSD-GTK3-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/GTK3-macOS.txt
 %%PORTDOCS%%%%DOCSDIR%%/Lato-Bold.eot
 %%PORTDOCS%%%%DOCSDIR%%/Lato-Bold.ttf
 %%PORTDOCS%%%%DOCSDIR%%/Lato-Bold.woff
@@ -321,31 +350,17 @@ man/man1/xvic.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/Lato-Regular.ttf
 %%PORTDOCS%%%%DOCSDIR%%/Lato-Regular.woff
 %%PORTDOCS%%%%DOCSDIR%%/Lato-Regular.woff2
-%%PORTDOCS%%%%DOCSDIR%%/Linux-Mingw32-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/Linux-Native-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/MSDOS-Ethernet-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/MSDOS-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/MacOSX-Cocoa-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/MacOSX-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/MacOSX-ResourceTree.txt
-%%PORTDOCS%%%%DOCSDIR%%/Minix-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/Linux-GTK3-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/NLS-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/NetBSD-howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/OFL.txt
-%%PORTDOCS%%%%DOCSDIR%%/OpenVMS-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/Readme-Amiga.txt
-%%PORTDOCS%%%%DOCSDIR%%/Readme-BeOS.txt
-%%PORTDOCS%%%%DOCSDIR%%/Readme-DOS.txt
 %%PORTDOCS%%%%DOCSDIR%%/Readme-GTK3.txt
-%%PORTDOCS%%%%DOCSDIR%%/Readme-MacOSX.txt
 %%PORTDOCS%%%%DOCSDIR%%/Readme-SDL.txt
 %%PORTDOCS%%%%DOCSDIR%%/Readme-SDL2.txt
-%%PORTDOCS%%%%DOCSDIR%%/Readme-Unix.txt
+%%PORTDOCS%%%%DOCSDIR%%/Release-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/SDL-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/SDL-support.txt
-%%PORTDOCS%%%%DOCSDIR%%/Win32-Cygwin-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/Win32-Mingw32-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/WinNT-Unicode.txt
+%%PORTDOCS%%%%DOCSDIR%%/Windows-MinGW-GTK3-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/amigaos.html
 %%PORTDOCS%%%%DOCSDIR%%/android.html
 %%PORTDOCS%%%%DOCSDIR%%/beos.html
@@ -358,7 +373,6 @@ man/man1/xvic.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/macosx.html
 %%PORTDOCS%%%%DOCSDIR%%/new.gif
 %%PORTDOCS%%%%DOCSDIR%%/nsosrh.html
-%%PORTDOCS%%%%DOCSDIR%%/ports-status.txt
 %%PORTDOCS%%%%DOCSDIR%%/qnx.html
 %%PORTDOCS%%%%DOCSDIR%%/robots.txt
 %%PORTDOCS%%%%DOCSDIR%%/sco.html
@@ -367,6 +381,7 @@ man/man1/xvic.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/sortix.html
 %%PORTDOCS%%%%DOCSDIR%%/unix.html
 %%PORTDOCS%%%%DOCSDIR%%/vice-logo.svg
+%%PORTDOCS%%%%DOCSDIR%%/vice-logo-black.svg
 %%PORTDOCS%%%%DOCSDIR%%/vice.chm
 %%PORTDOCS%%%%DOCSDIR%%/vice.css
 %%PORTDOCS%%%%DOCSDIR%%/vice.guide
@@ -400,15 +415,3 @@ man/man1/xvic.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/vice_toc.html
 %%PORTDOCS%%%%DOCSDIR%%/windows.html
 %%PORTDOCS%%share/info/vice.txt
-%%NO_GTK3%%%%NLS%%share/locale/da/LC_MESSAGES/vice.mo
-%%NO_GTK3%%%%NLS%%share/locale/de/LC_MESSAGES/vice.mo
-%%NO_GTK3%%%%NLS%%share/locale/es/LC_MESSAGES/vice.mo
-%%NO_GTK3%%%%NLS%%share/locale/fr/LC_MESSAGES/vice.mo
-%%NO_GTK3%%%%NLS%%share/locale/hu/LC_MESSAGES/vice.mo
-%%NO_GTK3%%%%NLS%%share/locale/it/LC_MESSAGES/vice.mo
-%%NO_GTK3%%%%NLS%%share/locale/ko/LC_MESSAGES/vice.mo
-%%NO_GTK3%%%%NLS%%share/locale/nl/LC_MESSAGES/vice.mo
-%%NO_GTK3%%%%NLS%%share/locale/pl/LC_MESSAGES/vice.mo
-%%NO_GTK3%%%%NLS%%share/locale/ru/LC_MESSAGES/vice.mo
-%%NO_GTK3%%%%NLS%%share/locale/sv/LC_MESSAGES/vice.mo
-%%NO_GTK3%%%%NLS%%share/locale/tr/LC_MESSAGES/vice.mo