- update to 3.0

- use gnome 3.0 default
- use sdl 2.0
- allways use fontconfig
- enable threads
- remove option XAW3D
- drop PKGNAMESUFFIX

18 files changed, 249 insertions, 403 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 69f4fe399344..79dc7684c0de 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	vice
-PORTVERSION=	2.4
-PORTREVISION=	10
+PORTVERSION=	3.0
+PORTREVISION=	0
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \
 		ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/
-PKGNAMESUFFIX?=	${GNOME_SUFFIX}${PKGNAMESUFFIX2}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Emulator for Commodore C64, C128, VIC20, PET, and CBM-II
@@ -19,28 +18,31 @@ BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
 		mkfontscale:x11-fonts/mkfontscale
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libgif.so:graphics/giflib \
+		libportaudio.so:audio/portaudio \
 		libmp3lame.so:audio/lame \
-		libavcodec.so:multimedia/ffmpeg
+		libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis \
+		libavcodec.so:multimedia/ffmpeg \
+		libFLAC.so:audio/flac \
+		libpci.so:devel/libpci \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
 
 RESTRICTED=	ROMs are copyrighted by Commodore Business Machines
 
-USES=		iconv:patch gmake pkgconfig makeinfo
-USE_XORG=	xpm ice sm xext xv xt x11 xmu
+USES=		dos2unix pkgconfig makeinfo gmake iconv jpeg
+USE_XORG=	xpm ice sm xext xv xt x11 xmu xxf86vm
 USE_XORG+=	xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes
+DOS2UNIX_FILES=	doc/vice.texi src/arch/unix/io-access.c
 GNU_CONFIGURE=	yes
 MAKE_ENV+=	MAKEINFOFLAGS="--no-split"
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-fullscreen --enable-ipv6 \
+			--enable-external-ffmpeg \
+			--with-uithreads \
 			--disable-dependency-tracking
-#CONFIGURE_ARGS+=	--enable-ethernet
-# libpcap or libnet
-#CONFIGURE_ARGS+=	--enable-sdlui
-#CONFIGURE_ARGS+=	--enable-gp2x
-#CONFIGURE_ARGS+=	--enable-wiz
-#CONFIGURE_ARGS+=	--enable-parsid
-#CONFIGURE_ARGS+=	--enable-memmap
 
 LMLINKS=	vice.1 x64.1 \
 		vice.1 x128.1 \
@@ -49,39 +51,23 @@ LMLINKS=	vice.1 x64.1 \
 		vice.1 xplus4.1 \
 		vice.1 xcbm2.1
 
-FIX_XAW=	src/arch/unix/x11/xaw/about.c \
-		src/arch/unix/x11/xaw/uicartridge.c \
-		src/arch/unix/x11/xaw/uiedisk.c \
-		src/arch/unix/x11/xaw/uimenu.c \
-		src/arch/unix/x11/xaw/uipalcontrol.c \
-		src/arch/unix/x11/xaw/uiscreenshot.c \
-		src/arch/unix/x11/xaw/uisnapshot.c \
-		src/arch/unix/x11/xaw/uivsidcontrol.c \
-		src/arch/unix/x11/xaw/x11ui.c \
-		src/arch/unix/x11/xaw/widgets/FileSel.c \
-		src/arch/unix/x11/xaw/widgets/FileSelP.h \
-		src/arch/unix/x11/xaw/widgets/MultiList.h \
-		src/arch/unix/x11/xaw/widgets/MultiListP.h \
-		src/arch/unix/x11/xaw/widgets/ScrList.c \
-
 OPTIONS_DEFINE=	SDL ASOUND PULSE DOCS
-OPTIONS_SINGLE= GUI
-OPTIONS_SINGLE_GUI=	GNOMEUI XAW3D XAW
-OPTIONS_DEFAULT?=	GNOMEUI SDL
+OPTIONS_SINGLE=	GUI
+OPTIONS_SINGLE_GUI=	GNOMEUI3 GNOMEUI2 XAW
+OPTIONS_DEFAULT?=	GNOMEUI3 SDL ASOUND
 NO_OPTIONS_SORT=yes
-GNOMEUI_DESC=	use gnomeui toolkit
-XAW3D_DESC=	use Xaw3d library
+OPTIONS_SUB=	yes
+GNOMEUI3_DESC=	use gnome3 user interface
+GNOMEUI2_DESC=	use gnome2 user interface
 XAW_DESC=	use plain Xaw library
-SDL_DESC=	build with SDL sound system support
+SDL_DESC=	build with SDL2 sound system support
 ASOUND_DESC=	build with asound support
 PULSE_DESC=	build with pulseaudio support
 
-GNOMEUI_CONFIGURE_ENABLE=	gnomeui
-XAW3D_CONFIGURE_WITH=	xaw3d
-XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
-SDL_USE=		SDL=sdl
+GNOMEUI2_CONFIGURE_ENABLE=	gnomeui
+GNOMEUI3_CONFIGURE_ENABLE=	gnomeui3
+SDL_USE=		SDL=sdl2
 SDL_CONFIGURE_ON=	--with-sdlsound
-SDL_CPPFLAGS=		-I${LOCALBASE}/include/SDL
 ASOUND_CONFIGURE_OFF=	--without-alsa
 ASOUND_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 PULSE_CONFIGURE_OFF=	--without-pulse
@@ -90,7 +76,7 @@ PULSE_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 .include <bsd.port.options.mk>
 
 .if !defined(BUILDING_INDEX)
-__pmlinks1!= ${ECHO_CMD} '${LMLINKS:S/    / /}' | ${AWK} \
+__pmlinks1!=	${ECHO_CMD} '${LMLINKS:S/    / /}' | ${AWK} \
 	'{ if (NF % 2 != 0) { print "broken"; exit; } \
 	for (i=1; i<=NF; i++) { \
 		if ( i % 2 == 0) { print " " $$i " ;"; } \
@@ -98,36 +84,27 @@ __pmlinks1!= ${ECHO_CMD} '${LMLINKS:S/    / /}' | ${AWK} \
 	} }'
 .endif
 
-.if ${PORT_OPTIONS:MXAW3D}
-GNOME_SUFFIX=   -xaw3d
-CONFLICTS?=     vice-gnome-1.* vice-1.*
-USES+=		perl5
+.if ${PORT_OPTIONS:MGNOMEUI2}
+USE_GNOME+=	gtk20 vte cairo gdkpixbuf2 pangox-compat
+USE_GL+=	glu gl
+LIB_DEPENDS+=	libgdkglext-x11-1.0.so:x11-toolkits/gtkglext
 .endif
 
-.if ${PORT_OPTIONS:MGNOMEUI}
-GNOME_SUFFIX=   -gnome
-USE_GNOME=      gtk20 vte
-CONFLICTS?=     vice-1.* vice-xaw3d-1.*
+.if ${PORT_OPTIONS:MGNOMEUI3}
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext-runtime
 .endif
-
-.if ${PORT_OPTIONS:MXAW}
-CONFLICTS?=     vice-xaw3d-1.* vice-gnome-1.*
-USE_XORG+=      xaw
+USE_GNOME+=	gtk30 vte3 cairo gdkpixbuf2
+USE_GL+=	glu gl
 .endif
 
-.if exists(${LOCALBASE}/bin/fc-cache)
-PLIST_SUB+=		FCCACHE=""
-PLIST_SUB+=		NOFCCACHE="@comment "
-.else
-PLIST_SUB+=		FCCACHE="@comment "
-PLIST_SUB+=		NOFCCACHE=""
+.if ${PORT_OPTIONS:MXAW}
+USE_XORG+=	xaw
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 CONFIGURE_ARGS+=	--enable-nls --localedir=${LOCALBASE}/share/locale
-# causes vice to crash:
-#LDFLAGS+=		-lgettextlib
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
@@ -139,54 +116,39 @@ INFO+=		vice
 .endif
 
 .if ${PORT_OPTIONS:MSDL}
-USE_SDL=	sdl
+USE_SDL=	sdl2
 .endif
 
-post-extract:
-	@${RM} ${WRKSRC}/doc/vice.info*
-
 post-patch:
-	${CHMOD} +x "${WRKSRC}/doc/html/texi2html"
-	${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
-	${REINPLACE_CMD} -e 's|lungif|lgif|g' -e 's|== "x|= "x|' \
-		-e 's|"DATADIRNAME"/locale|share/locale|' \
-		${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's|CODEC_ID_|AV_CODEC_ID_|' \
-		-e 's|PIX_FMT_|AV_PIX_FMT_|' \
-		${WRKSRC}/src/gfxoutputdrv/ffmpegdrv.c
 	${REINPLACE_CMD} \
 		-e 's|enum PixelFormat|enum AVPixelFormat|g' \
 		${WRKSRC}/src/gfxoutputdrv/ffmpeglib.h
-.for i in da.po de.po fr.po hu.po it.po nl.po pl.po sv.po tr.po
+.for i in da.po de.po es.po fr.po hu.po it.po nl.po pl.po sv.po tr.po
 	${MV} "${WRKSRC}/po/${i}" "${WRKSRC}/po/${i}.latin"
 	${ICONV_CMD} -f latin1 -t utf-8 < "${WRKSRC}/po/${i}.latin" > "${WRKSRC}/po/${i}"
 .endfor
+
+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
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's| doc||' ${WRKSRC}/Makefile.in
 .endif
-.if ${PORT_OPTIONS:MXAW3D}
-.for i in ${FIX_XAW}
-	${REINPLACE_CMD} -e 's|X11/Xaw/|X11/Xaw3d/|' ${WRKSRC}/${i}
-.endfor
-.endif
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vice/fonts
-.if exists(${LOCALBASE}/bin/fc-cache)
 	${INSTALL_DATA} ${WRKSRC}/data/fonts/vice-cbm.bdf \
 		${STAGEDIR}${PREFIX}/lib/vice/fonts/
-.endif
-.if ${PORT_OPTIONS:MDOCS}
+
+pre-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.endif
 
 post-install:
 	( cd ${STAGEDIR}${PREFIX}/man/man1 && ${__pmlinks1} )
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
 	${LN} -sf vice_toc.html ${STAGEDIR}${DOCSDIR}/index.html
-.endif
 
 .include <bsd.port.mk>
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index b080b96bbcf6..e0422fa857ef 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,2 +1,3 @@
-SHA256 (vice-2.4.tar.gz) = ff8b8d5f0f497d1f8e75b95bbc4204993a789284a08a8a59ba727ad81dcace10
-SIZE (vice-2.4.tar.gz) = 13656511
+TIMESTAMP = 1484124124
+SHA256 (vice-3.0.tar.gz) = bc56811381920d43ab5f2f85a5e08f21ab5bdf6190dd5dfe9f500a745d14972b
+SIZE (vice-3.0.tar.gz) = 26513197
diff --git a/emulators/vice/files/patch-c1541.1 b/emulators/vice/files/patch-c1541.1
deleted file mode 100644
index eb5758f67d6a..000000000000
--- a/emulators/vice/files/patch-c1541.1
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./man/c1541.1.orig	Sat May 29 11:34:58 1999
-+++ ./man/c1541.1	Sat May 29 11:35:16 1999
-@@ -77,7 +77,8 @@
- .B \-
- as a file name, it stands for \fIstdin\fR or \fIstdout\fR.
- .SH SEE ALSO
--.BR VICE (1),
-+.BR vice (1),
-+.BR c1541 (1),
- .BR petcat (1)
- .SH AUTHORS
- Teemu Rantanen <tvr@cs.hut.fi>
diff --git a/emulators/vice/files/patch-configure b/emulators/vice/files/patch-configure
new file mode 100644
index 000000000000..10af1cf1137b
--- /dev/null
+++ b/emulators/vice/files/patch-configure
@@ -0,0 +1,10 @@
+--- 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_html_texi2html b/emulators/vice/files/patch-doc_html_texi2html
deleted file mode 100644
index 3400bb8ea306..000000000000
--- a/emulators/vice/files/patch-doc_html_texi2html
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/html/texi2html.orig	2008-03-30 15:04:15 UTC
-+++ doc/html/texi2html
-@@ -1557,7 +1557,7 @@ sub update_sec_num {
-     $level--; # here we start at 0
-     if ($name =~ /^appendix/) {
- 	# appendix style
--	if (defined(@appendix_sec_num)) {
-+	if (@appendix_sec_num) {
- 	    &incr_sec_num($level, @appendix_sec_num);
- 	} else {
- 	    @appendix_sec_num = ('A', 0, 0, 0);
-@@ -1565,7 +1565,7 @@ sub update_sec_num {
- 	return(join('.', @appendix_sec_num[0..$level]));
-     } else {
- 	# normal style
--	if (defined(@normal_sec_num)) {
-+	if (@normal_sec_num) {
- 	    &incr_sec_num($level, @normal_sec_num);
- 	} else {
- 	    @normal_sec_num = (1, 0, 0, 0);
diff --git a/emulators/vice/files/patch-doc_vice.texi b/emulators/vice/files/patch-doc_vice.texi
new file mode 100644
index 000000000000..b744f79222c9
--- /dev/null
+++ b/emulators/vice/files/patch-doc_vice.texi
@@ -0,0 +1,48 @@
+--- doc/vice.texi.orig	2016-12-15 21:30:13 UTC
++++ doc/vice.texi
+@@ -1555,8 +1555,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
+-command-line options or by modifying resource values (@pxref{Resource
+-files}).
++command-line options or by modifying
++resource values (@pxref{Resource files}).
+ 
+ @menu
+ * ROM files::                   Files containing dumps of the original ROMs.
+@@ -11013,8 +11013,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
+-window.  This is done by specifying a palette file name (@pxref{Palette
+-files}) in the @code{PaletteName} resource.  The menu provides the
++window.  This is done by specifying a palette file
++name (@pxref{Palette files}) in the @code{PaletteName}
++resource.  The menu provides the
+ following values:
+ 
+ @itemize @bullet
+@@ -11442,8 +11443,9 @@ xcbm5x0: (510)
+ @subsection Changing screen colors
+ 
+ It is also possible to choose what color set is used for the emulation
+-window.  This is done by specifying a palette file name (@pxref{Palette
+-files}) in the @code{PaletteName} resource.  The menu provides the
++window.  This is done by specifying a palette file name
++(@pxref{Palette files}) in the @code{PaletteName}
++resource.  The menu provides the
+ following values:
+ 
+ @itemize @bullet
+@@ -27895,8 +27897,8 @@ the VICE FAQ (it is available on the Int
+ VICE home page:
+ @uref{http://vice-emu.sourceforge.net});
+ @item
+-the @code{comp.emulators.cbm} and @code{comp.sys.cbm} FAQs (@pxref{FAQs
+-you should read}).
++the @code{comp.emulators.cbm} and @code{comp.sys.cbm}
++FAQs (@pxref{FAQs you should read}).
+ @end itemize
+ 
+ @item
diff --git a/emulators/vice/files/patch-dynlib.c b/emulators/vice/files/patch-dynlib.c
deleted file mode 100644
index d315ed7ddcfe..000000000000
--- a/emulators/vice/files/patch-dynlib.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/arch/unix/dynlib.c.orig	2009-10-21 18:46:46.000000000 +0200
-+++ src/arch/unix/dynlib.c	2009-12-25 19:00:10.000000000 +0100
-@@ -51,6 +51,8 @@
- 
- #else
- 
-+#include <string.h>
-+
- void *vice_dynlib_open(const char *name)
- {
-     return NULL;
diff --git a/emulators/vice/files/patch-ffmpegdrv.c b/emulators/vice/files/patch-ffmpegdrv.c
deleted file mode 100644
index 675986934f95..000000000000
--- a/emulators/vice/files/patch-ffmpegdrv.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- src/gfxoutputdrv/ffmpegdrv.c.orig	2012-02-13 20:31:44.000000000 +0100
-+++ src/gfxoutputdrv/ffmpegdrv.c	2012-11-25 13:10:46.712199998 +0100
-@@ -343,7 +343,7 @@ static int ffmpegmovie_init_audio(int sp
-     c = st->codec;
-     c->codec_id = ffmpegdrv_fmt->audio_codec;
-     c->codec_type = AVMEDIA_TYPE_AUDIO;
--    c->sample_fmt = SAMPLE_FMT_S16;
-+    c->sample_fmt = AV_SAMPLE_FMT_S16;
- 
-     /* put sample parameters */
-     c->bit_rate = audio_bitrate;
-@@ -613,11 +613,6 @@ static int ffmpegdrv_init_file(void)
-     if (!video_init_done || !audio_init_done)
-         return 0;
- 
--    if ((*ffmpeglib.p_av_set_parameters)(ffmpegdrv_oc, NULL) < 0) {
--        log_debug("ffmpegdrv: Invalid output format parameters");
--            return -1;
--    }
--
-     (*ffmpeglib.p_dump_format)(ffmpegdrv_oc, 0, ffmpegdrv_oc->filename, 1);
- 
-     if (video_st && (ffmpegdrv_open_video(ffmpegdrv_oc, video_st) < 0)) {
-@@ -632,8 +627,8 @@ static int ffmpegdrv_init_file(void)
-     }
- 
-     if (!(ffmpegdrv_fmt->flags & AVFMT_NOFILE)) {
--        if ((*ffmpeglib.p_url_fopen)(&ffmpegdrv_oc->pb, ffmpegdrv_oc->filename,
--                            URL_WRONLY) < 0) 
-+        if ((*ffmpeglib.p_avio_open)(&ffmpegdrv_oc->pb, ffmpegdrv_oc->filename,
-+                            AVIO_FLAG_WRITE) < 0) 
-         {
-             ui_error(translate_text(IDGS_FFMPEG_CANNOT_OPEN_S), ffmpegdrv_oc->filename);
-             screenshot_stop_recording();
-@@ -642,7 +637,7 @@ static int ffmpegdrv_init_file(void)
- 
-     }
- 
--    (*ffmpeglib.p_av_write_header)(ffmpegdrv_oc);
-+    (*ffmpeglib.p_avformat_write_header)(ffmpegdrv_oc, NULL);
- 
-     log_debug("ffmpegdrv: Initialized file successfully");
- 
-@@ -724,7 +719,7 @@ static int ffmpegdrv_close(screenshot_t
-         (*ffmpeglib.p_av_write_trailer)(ffmpegdrv_oc);
-         if (!(ffmpegdrv_fmt->flags & AVFMT_NOFILE)) {
-             /* close the output file */
--            (*ffmpeglib.p_url_fclose)(ffmpegdrv_oc->pb);
-+            (*ffmpeglib.p_avio_close)(ffmpegdrv_oc->pb);
-         }
-     }
-     
diff --git a/emulators/vice/files/patch-ffmpeglib.c b/emulators/vice/files/patch-ffmpeglib.c
deleted file mode 100644
index 28183e79ec01..000000000000
--- a/emulators/vice/files/patch-ffmpeglib.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/gfxoutputdrv/ffmpeglib.c.orig	2011-09-18 15:09:45.000000000 +0200
-+++ src/gfxoutputdrv/ffmpeglib.c	2012-11-25 13:11:58.342198505 +0100
-@@ -208,12 +208,11 @@ static int load_avformat(ffmpeglib_t *li
-         GET_SYMBOL_AND_TEST_AVFORMAT(av_init_packet);
-         GET_SYMBOL_AND_TEST_AVFORMAT(av_register_all);
-         GET_SYMBOL_AND_TEST_AVFORMAT(av_new_stream);
--        GET_SYMBOL_AND_TEST_AVFORMAT(av_set_parameters);
--        GET_SYMBOL_AND_TEST_AVFORMAT(av_write_header);
-+        GET_SYMBOL_AND_TEST_AVFORMAT(avformat_write_header);
-         GET_SYMBOL_AND_TEST_AVFORMAT(av_write_frame);
-         GET_SYMBOL_AND_TEST_AVFORMAT(av_write_trailer);
--        GET_SYMBOL_AND_TEST_AVFORMAT(url_fopen);
--        GET_SYMBOL_AND_TEST_AVFORMAT(url_fclose);
-+        GET_SYMBOL_AND_TEST_AVFORMAT(avio_open);
-+        GET_SYMBOL_AND_TEST_AVFORMAT(avio_close);
-         GET_SYMBOL_AND_TEST_AVFORMAT(dump_format);
-         GET_SYMBOL_AND_TEST_AVFORMAT(av_guess_format);
- #ifndef HAVE_FFMPEG_SWSCALE
-@@ -240,12 +239,11 @@ static void free_avformat(ffmpeglib_t *l
-     lib->p_av_init_packet = NULL;
-     lib->p_av_register_all = NULL;
-     lib->p_av_new_stream = NULL;
--    lib->p_av_set_parameters = NULL;
--    lib->p_av_write_header = NULL;
-+    lib->p_avformat_write_header = NULL;
-     lib->p_av_write_frame = NULL;
-     lib->p_av_write_trailer = NULL;
--    lib->p_url_fopen = NULL;
--    lib->p_url_fclose = NULL;
-+    lib->p_avio_open = NULL;
-+    lib->p_avio_close = NULL;
-     lib->p_dump_format = NULL;
-     lib->p_av_guess_format = NULL;
- #ifndef HAVE_FFMPEG_SWSCALE
diff --git a/emulators/vice/files/patch-ffmpeglib.h b/emulators/vice/files/patch-ffmpeglib.h
deleted file mode 100644
index b3f3f8a079e2..000000000000
--- a/emulators/vice/files/patch-ffmpeglib.h
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/gfxoutputdrv/ffmpeglib.h.orig	2011-10-24 21:06:48.000000000 +0200
-+++ src/gfxoutputdrv/ffmpeglib.h	2012-11-25 13:09:18.518868503 +0100
-@@ -70,7 +70,7 @@
- /* avcodec fucntions */
- typedef int (*avcodec_open_t) (AVCodecContext*, AVCodec*);
- typedef int (*avcodec_close_t) (AVCodecContext*);
--typedef AVCodec* (*avcodec_find_encoder_t) (enum CodecID);
-+typedef AVCodec* (*avcodec_find_encoder_t) (enum AVCodecID);
- typedef int (*avcodec_encode_audio_t) (AVCodecContext*, uint8_t*, int, const short*);
- typedef int (*avcodec_encode_video_t) (AVCodecContext*, uint8_t*, int, const AVFrame*);
- typedef int (*avpicture_fill_t) (AVPicture*, uint8_t*, int, int, int);
-@@ -80,12 +80,11 @@ typedef int (*avpicture_get_size_t) (int
- typedef void (*av_init_packet_t) (AVPacket *pkt);
- typedef void (*av_register_all_t) (void);
- typedef AVStream* (*av_new_stream_t) (AVFormatContext*, int);
--typedef int (*av_set_parameters_t) (AVFormatContext*, AVFormatParameters*);
--typedef int (*av_write_header_t) (AVFormatContext*);
-+typedef int (*avformat_write_header_t) (AVFormatContext*, AVDictionary **);
- typedef int (*av_write_frame_t) (AVFormatContext*, AVPacket*);
- typedef int (*av_write_trailer_t) (AVFormatContext*);
--typedef int (*url_fopen_t) (ByteIOContext**, const char*, int);
--typedef int (*url_fclose_t) (ByteIOContext*);
-+typedef int (*avio_open_t) (AVIOContext**, const char*, int);
-+typedef int (*avio_close_t) (AVIOContext*);
- typedef void (*dump_format_t) (AVFormatContext *, int, const char*, int);
- typedef AVOutputFormat* (*av_guess_format_t) (const char*, const char*, const char*);
- typedef int (*img_convert_t) (AVPicture*, int, AVPicture*, int, int, int);
-@@ -118,12 +117,11 @@ struct ffmpeglib_s {
-     av_init_packet_t            p_av_init_packet;
-     av_register_all_t           p_av_register_all;
-     av_new_stream_t             p_av_new_stream;
--    av_set_parameters_t         p_av_set_parameters;
--    av_write_header_t           p_av_write_header;
-+    avformat_write_header_t     p_avformat_write_header;
-     av_write_frame_t            p_av_write_frame;
-     av_write_trailer_t          p_av_write_trailer;
--    url_fopen_t                 p_url_fopen;
--    url_fclose_t                p_url_fclose;
-+    avio_open_t                 p_avio_open;
-+    avio_close_t                p_avio_close;
-     dump_format_t               p_dump_format;
-     av_guess_format_t           p_av_guess_format;
- #ifndef HAVE_FFMPEG_SWSCALE
diff --git a/emulators/vice/files/patch-vice.1 b/emulators/vice/files/patch-man_vice.1
index d107826f8370..e2669d96fc43 100644
--- a/emulators/vice/files/patch-vice.1
+++ b/emulators/vice/files/patch-man_vice.1
@@ -1,10 +1,10 @@
---- man/vice.1.orig	Mon Nov 22 06:25:55 1999
-+++ man/vice.1	Fri Nov 23 02:01:16 2001
-@@ -31,7 +31,7 @@
+--- man/vice.1.orig	2016-12-09 03:46:53 UTC
++++ man/vice.1
+@@ -55,7 +55,7 @@ a cartridge file (bin<--->crt) converter
  .PP
  The whole documentation for these programs is available in HTML
  format; the main file should be installed on your system as
--/usr/local/lib/VICE/doc/vice_toc.html.
+-/usr/local/lib/vice/doc/vice_toc.html.
 +%%PREFIX%%/share/doc/vice/vice_toc.html.
  .P
  For up to date news about VICE, have a look at the official home page
diff --git a/emulators/vice/files/patch-sound.c b/emulators/vice/files/patch-sound.c
deleted file mode 100644
index b442cc7ee74a..000000000000
--- a/emulators/vice/files/patch-sound.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sound.c.orig	Wed Sep 14 22:27:31 2005
-+++ src/sound.c	Sat Dec  3 18:54:20 2005
-@@ -1233,7 +1233,7 @@
- 
- /* don't use uss for FreeBSD or BSDI */
- 
--#if !defined(__FreeBSD__) && !defined(__bsdi__)
-+#if !defined(__bsdi__)
-     sound_init_uss_device();
- #endif
- #endif
diff --git a/emulators/vice/files/patch-sounduss.c b/emulators/vice/files/patch-sounduss.c
deleted file mode 100644
index 52103b07cc1a..000000000000
--- a/emulators/vice/files/patch-sounduss.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sounddrv/sounduss.c.orig	Sun May 29 19:05:49 2005
-+++ src/sounddrv/sounduss.c	Sat Dec  3 19:09:24 2005
-@@ -30,7 +30,7 @@
-    sound driver. For BSDI this uss sound driver should
-    not be used either. */
- 
--#if !defined(__FreeBSD__) && !defined(__bsdi__)
-+#if !defined(__bsdi__)
- 
- #include "vice.h"
- 
diff --git a/emulators/vice/files/patch-src_arch_unix_io-access.c b/emulators/vice/files/patch-src_arch_unix_io-access.c
new file mode 100644
index 000000000000..d82199a186b4
--- /dev/null
+++ b/emulators/vice/files/patch-src_arch_unix_io-access.c
@@ -0,0 +1,20 @@
+--- src/arch/unix/io-access.c.orig	2016-11-17 19:06:26 UTC
++++ src/arch/unix/io-access.c
+@@ -77,7 +77,7 @@
+ #include "log.h"
+ #include "types.h"
+ 
+-#if defined(__linux) || defined(__FreeBSD__) || ((defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)))
++#if defined(__linux) || ((defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)))
+ 
+ #define IO_PORT_ACCESS
+ 
+@@ -162,7 +162,7 @@ static void device_io_outb(WORD addr, BY
+ }
+ #endif
+ 
+-#ifdef __FreeBSD__
++#if 0
+ static int device_io_open(void)
+ {
+     io_fd = open("/dev/io", O_RDWR);
diff --git a/emulators/vice/files/patch-src_gfxoutputdrv_gifdrv.c b/emulators/vice/files/patch-src_gfxoutputdrv_gifdrv.c
deleted file mode 100644
index c7552a809fe3..000000000000
--- a/emulators/vice/files/patch-src_gfxoutputdrv_gifdrv.c
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/gfxoutputdrv/gifdrv.c.orig	2012-07-25 23:46:05 UTC
-+++ src/gfxoutputdrv/gifdrv.c
-@@ -114,7 +114,11 @@ static int gifdrv_open(screenshot_t *scr
-   if (EGifPutScreenDesc(sdata->fd, screenshot->width, screenshot->height, 8, 0, gif_colors) == GIF_ERROR ||
-       EGifPutImageDesc(sdata->fd, 0, 0, screenshot->width, screenshot->height, 0, NULL) == GIF_ERROR)
-   {
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+    EGifCloseFile(sdata->fd, NULL);
-+#else
-     EGifCloseFile(sdata->fd);
-+#endif
-     VICE_FreeMapObject(gif_colors);
-     lib_free(sdata->data);
-     lib_free(sdata->ext_filename);
-@@ -145,7 +149,11 @@ static int gifdrv_close(screenshot_t *sc
- 
-     sdata = screenshot->gfxoutputdrv_data;
- 
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+    EGifCloseFile(sdata->fd, NULL);
-+#else
-     EGifCloseFile(sdata->fd);
-+#endif
-     VICE_FreeMapObject(gif_colors);
- 
-     /* for some reason giflib will create a file with unexpected
-@@ -184,7 +192,11 @@ static char *gifdrv_memmap_ext_filename;
- 
- static int gifdrv_close_memmap(void)
- {
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+  EGifCloseFile(gifdrv_memmap_fd, NULL);
-+#else
-   EGifCloseFile(gifdrv_memmap_fd);
-+#endif
-   VICE_FreeMapObject(gif_colors);
-   lib_free(gifdrv_memmap_ext_filename);
- 
-@@ -231,7 +243,11 @@ static int gifdrv_open_memmap(const char
-   if (EGifPutScreenDesc(gifdrv_memmap_fd, x_size, y_size, 8, 0, gif_colors) == GIF_ERROR ||
-       EGifPutImageDesc(gifdrv_memmap_fd, 0, 0, x_size, y_size, 0, NULL) == GIF_ERROR)
-   {
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+    EGifCloseFile(gifdrv_memmap_fd, NULL);
-+#else
-     EGifCloseFile(gifdrv_memmap_fd);
-+#endif
-     VICE_FreeMapObject(gif_colors);
-     lib_free(gifdrv_memmap_ext_filename);
-     return -1;
diff --git a/emulators/vice/files/patch-vice.texi b/emulators/vice/files/patch-vice.texi
deleted file mode 100644
index f39583eb3dc6..000000000000
--- a/emulators/vice/files/patch-vice.texi
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/vice.texi.orig	2012-11-02 21:50:13 UTC
-+++ doc/vice.texi
-@@ -8243,7 +8243,7 @@ Use an internal calculated palette
- @item -Crtcextpal
- Use an external palette (file)
- @cindex -Crtcpalette
--@itemx -Crtcpalette NAME
-+@item -Crtcpalette NAME
- Specify @code{NAME} as the palette file (@code{CrtcPaletteFile}).
- @cindex -Crtcfulldevice
- @item -Crtcfulldevice <device>
diff --git a/emulators/vice/files/patch-x11video.c b/emulators/vice/files/patch-x11video.c
deleted file mode 100644
index 6cf649a97996..000000000000
--- a/emulators/vice/files/patch-x11video.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/arch/unix/x11/xaw/x11video.c.orig	2009-10-21 18:46:45.000000000 +0200
-+++ src/arch/unix/x11/xaw/x11video.c	2010-08-03 06:00:50.000000000 +0200
-@@ -342,6 +342,9 @@
- int mitshm_failed = 0; /* will be set to true if XShmAttach() failed */
- int shmmajor;          /* major number of MITSHM error codes */
- 
-+#include <X11/X.h>
-+#include <X11/extensions/shmproto.h>
-+
- /* Catch XShmAttach()-failure. */
- int shmhandler(Display *display, XErrorEvent *err)
- {
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index 7d7f91d39e04..48835d9ca8ea 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -10,6 +10,7 @@ bin/xcbm2
 bin/xcbm5x0
 bin/xpet
 bin/xplus4
+bin/xscpu64
 bin/xvic
 %%PORTDOCS%%info/vice.txt
 %%NLS%%share/locale/da/LC_MESSAGES/vice.mo
@@ -30,16 +31,19 @@ lib/vice/C128/basiclo
 lib/vice/C128/c64hq.vpl
 lib/vice/C128/c64s.vpl
 lib/vice/C128/ccs64.vpl
+lib/vice/C128/chargch
 lib/vice/C128/chargde
 lib/vice/C128/chargen
 lib/vice/C128/chargfr
 lib/vice/C128/chargse
-lib/vice/C128/default.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/kernal
 lib/vice/C128/kernal64
+lib/vice/C128/kernalch
 lib/vice/C128/kernalde
 lib/vice/C128/kernalfi
 lib/vice/C128/kernalfr
@@ -47,6 +51,12 @@ lib/vice/C128/kernalit
 lib/vice/C128/kernalno
 lib/vice/C128/kernalse
 lib/vice/C128/pc64.vpl
+lib/vice/C128/pepto-ntsc-sony.vpl
+lib/vice/C128/pepto-ntsc.vpl
+lib/vice/C128/pepto-pal.vpl
+lib/vice/C128/pepto-palold.vpl
+lib/vice/C128/ptoing.vpl
+lib/vice/C128/rgb.vpl
 lib/vice/C128/vdc_comp.vpl
 lib/vice/C128/vdc_deft.vpl
 lib/vice/C128/vice.vpl
@@ -58,25 +68,44 @@ lib/vice/C64/c64mem.sym
 lib/vice/C64/c64s.vpl
 lib/vice/C64/ccs64.vpl
 lib/vice/C64/chargen
-lib/vice/C64/default.vpl
+lib/vice/C64/community-colors.vpl
+lib/vice/C64/deekay.vpl
 lib/vice/C64/default.vrs
+lib/vice/C64/edkernal
 lib/vice/C64/frodo.vpl
 lib/vice/C64/godot.vpl
+lib/vice/C64/gskernal
+lib/vice/C64/jpchrgen
+lib/vice/C64/jpkernal
 lib/vice/C64/kernal
 lib/vice/C64/pc64.vpl
+lib/vice/C64/pepto-ntsc-sony.vpl
+lib/vice/C64/pepto-ntsc.vpl
+lib/vice/C64/pepto-pal.vpl
+lib/vice/C64/pepto-palold.vpl
+lib/vice/C64/ptoing.vpl
+lib/vice/C64/rgb.vpl
+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_posger.vkm
+lib/vice/C64/x11_pos_de.vkm
 lib/vice/C64/x11_sym.vkm
-lib/vice/C64/x11_symger.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/kernal
+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
@@ -87,34 +116,41 @@ 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/default.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/kernal
 lib/vice/CBM-II/kernal.500
 lib/vice/CBM-II/pc64.vpl
+lib/vice/CBM-II/pepto-ntsc-sony.vpl
+lib/vice/CBM-II/pepto-ntsc.vpl
+lib/vice/CBM-II/pepto-pal.vpl
+lib/vice/CBM-II/pepto-palold.vpl
+lib/vice/CBM-II/ptoing.vpl
+lib/vice/CBM-II/rgb.vpl
 lib/vice/CBM-II/rom128h.vrs
 lib/vice/CBM-II/rom128l.vrs
 lib/vice/CBM-II/rom256h.vrs
 lib/vice/CBM-II/rom256l.vrs
 lib/vice/CBM-II/rom500.vrs
+lib/vice/CBM-II/vice.vpl
 lib/vice/CBM-II/white.vpl
-lib/vice/CBM-II/x11_buks.vkm
-lib/vice/CBM-II/x11_buks_de.vkm
+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
+lib/vice/DRIVES/dos1540
 lib/vice/DRIVES/dos1541
 lib/vice/DRIVES/dos1551
 lib/vice/DRIVES/dos1570
 lib/vice/DRIVES/dos1571
 lib/vice/DRIVES/dos1581
-lib/vice/DRIVES/dos2000
 lib/vice/DRIVES/dos2031
 lib/vice/DRIVES/dos2040
 lib/vice/DRIVES/dos3040
-lib/vice/DRIVES/dos4000
 lib/vice/DRIVES/dos4040
 lib/vice/PET/amber.vpl
 lib/vice/PET/basic1
@@ -130,6 +166,9 @@ lib/vice/PET/edit4b40
 lib/vice/PET/edit4b80
 lib/vice/PET/edit4g40
 lib/vice/PET/green.vpl
+lib/vice/PET/hre-9000.324992-02.bin
+lib/vice/PET/hre-a000.324993-02.bin
+lib/vice/PET/hre.vrs
 lib/vice/PET/kernal1
 lib/vice/PET/kernal2
 lib/vice/PET/kernal4
@@ -147,45 +186,76 @@ 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_bdep.vkm
-lib/vice/PET/x11_bdep_de.vkm
-lib/vice/PET/x11_bdes.vkm
-lib/vice/PET/x11_bdes_de.vkm
-lib/vice/PET/x11_bgrs.vkm
-lib/vice/PET/x11_bgrs_de.vkm
-lib/vice/PET/x11_buks.vkm
-lib/vice/PET/x11_buks_de.vkm
-lib/vice/PET/x11_bgrp.vkm
-lib/vice/PET/x11_bgrp_de.vkm
-lib/vice/PET/x11_bukp.vkm
-lib/vice/PET/x11_bukp_de.vkm
+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/default.vpl
 lib/vice/PLUS4/default.vrs
 lib/vice/PLUS4/kernal
+lib/vice/PLUS4/kernal.005
 lib/vice/PLUS4/kernal.232
 lib/vice/PLUS4/kernal.364
-lib/vice/PLUS4/vice.vpl
+lib/vice/PLUS4/yape-ntsc.vpl
+lib/vice/PLUS4/yape-pal.vpl
 lib/vice/PLUS4/x11_pos.vkm
 lib/vice/PLUS4/x11_sym.vkm
 lib/vice/PLUS4/x11_sym_de.vkm
+lib/vice/PRINTER/1520.vpl
 lib/vice/PRINTER/cbm1526
 lib/vice/PRINTER/mps801
 lib/vice/PRINTER/mps803
 lib/vice/PRINTER/mps803.vpl
+lib/vice/PRINTER/nl10.vpl
 lib/vice/PRINTER/nl10-cbm
+lib/vice/SCPU64/c64hq.vpl
+lib/vice/SCPU64/c64s.vpl
+lib/vice/SCPU64/ccs64.vpl
+lib/vice/SCPU64/chargen
+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/jpchrgen
+lib/vice/SCPU64/pc64.vpl
+lib/vice/SCPU64/pepto-ntsc-sony.vpl
+lib/vice/SCPU64/pepto-ntsc.vpl
+lib/vice/SCPU64/pepto-pal.vpl
+lib/vice/SCPU64/pepto-palold.vpl
+lib/vice/SCPU64/ptoing.vpl
+lib/vice/SCPU64/rgb.vpl
+lib/vice/SCPU64/scpu64
+lib/vice/SCPU64/scpu64mem.sym
+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/default.vpl
 lib/vice/VIC20/default.vrs
 lib/vice/VIC20/kernal
+lib/vice/VIC20/mike-ntsc.vpl
+lib/vice/VIC20/mike-pal.vpl
+lib/vice/VIC20/vice.vpl
 lib/vice/VIC20/x11_pos.vkm
 lib/vice/VIC20/x11_sym.vkm
 lib/vice/fonts/CBM.ttf
 man/man1/c1541.1.gz
+man/man1/cartconv.1.gz
 man/man1/petcat.1.gz
 man/man1/vice.1.gz
 man/man1/x128.1.gz
@@ -194,19 +264,17 @@ man/man1/xcbm2.1.gz
 man/man1/xpet.1.gz
 man/man1/xplus4.1.gz
 man/man1/xvic.1.gz
-%%FCCACHE%%lib/vice/fonts/vice-cbm.bdf
-%%NOFCCACHE%%lib/vice/fonts/vice-cbm.pcf
-%%NOFCCACHE%%lib/vice/fonts/fonts.dir
-%%PORTDOCS%%%%DOCSDIR%%/64doc.txt
-%%PORTDOCS%%%%DOCSDIR%%/65C02.txt
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
+lib/vice/fonts/vice-cbm.bdf
+lib/vice/fonts/fonts.dir
+lib/vice/fonts/vice-cbm.pcf
+%%PORTDOCS%%%%DOCSDIR%%/Android-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/CIA-README.txt
+%%PORTDOCS%%%%DOCSDIR%%/CIPS2008.png
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/CommodoreInnovationPriceSoftware2008.jpg
 %%PORTDOCS%%%%DOCSDIR%%/Documentation-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/Doxygen-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/GP2X-Howto.txt
 %%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-Howto.txt
@@ -215,35 +283,38 @@ man/man1/xvic.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/NLS-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/OpenVMS-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/PETdoc.txt
+%%PORTDOCS%%%%DOCSDIR%%/OpenWatcom-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/Readme-Amiga.txt
 %%PORTDOCS%%%%DOCSDIR%%/Readme-BeOS.txt
 %%PORTDOCS%%%%DOCSDIR%%/Readme-DOS.txt
 %%PORTDOCS%%%%DOCSDIR%%/Readme-MacOSX.txt
 %%PORTDOCS%%%%DOCSDIR%%/Readme-OS2.txt
 %%PORTDOCS%%%%DOCSDIR%%/Readme-SDL.txt
+%%PORTDOCS%%%%DOCSDIR%%/Readme-SDL2.txt
+%%PORTDOCS%%%%DOCSDIR%%/Readme-Unix.txt
 %%PORTDOCS%%%%DOCSDIR%%/SDL-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/VIC-Addendum.txt
-%%PORTDOCS%%%%DOCSDIR%%/VIC-Article.txt
-%%PORTDOCS%%%%DOCSDIR%%/VIC-Artikel.txt
 %%PORTDOCS%%%%DOCSDIR%%/Win32-Cygwin-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/Win32-MSVC-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/Win32-Mingw32-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/WinNT-Unicode.txt
 %%PORTDOCS%%%%DOCSDIR%%/amigaos.html
+%%PORTDOCS%%%%DOCSDIR%%/android.html
 %%PORTDOCS%%%%DOCSDIR%%/beos.html
-%%PORTDOCS%%%%DOCSDIR%%/cbm_basic_tokens.txt
 %%PORTDOCS%%%%DOCSDIR%%/coding-guidelines.txt
-%%PORTDOCS%%%%DOCSDIR%%/drive_info.txt
+%%PORTDOCS%%%%DOCSDIR%%/darwin.html
+%%PORTDOCS%%%%DOCSDIR%%/hardware-sids.txt
 %%PORTDOCS%%%%DOCSDIR%%/iec-bus.txt
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/macosx.html
 %%PORTDOCS%%%%DOCSDIR%%/new.gif
-%%PORTDOCS%%%%DOCSDIR%%/pixel_aspect.txt
+%%PORTDOCS%%%%DOCSDIR%%/nsosrh.html
+%%PORTDOCS%%%%DOCSDIR%%/ports-status.txt
 %%PORTDOCS%%%%DOCSDIR%%/qnx.html
+%%PORTDOCS%%%%DOCSDIR%%/robots.txt
 %%PORTDOCS%%%%DOCSDIR%%/sco.html
-%%PORTDOCS%%%%DOCSDIR%%/serial.txt
+%%PORTDOCS%%%%DOCSDIR%%/sitemap.xml
 %%PORTDOCS%%%%DOCSDIR%%/solaris.html
-%%PORTDOCS%%%%DOCSDIR%%/vice-logo-small.png
+%%PORTDOCS%%%%DOCSDIR%%/vice-logo.svg
 %%PORTDOCS%%%%DOCSDIR%%/vice.chm
 %%PORTDOCS%%%%DOCSDIR%%/vice.css
 %%PORTDOCS%%%%DOCSDIR%%/vice.guide
@@ -264,6 +335,8 @@ man/man1/xvic.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/vice_18.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_19.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_20.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_21.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_22.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_2.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_3.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_4.html
@@ -273,4 +346,3 @@ man/man1/xvic.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/vice_8.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_9.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_toc.html
-%%PORTDOCS%%%%DOCSDIR%%/vice-logo.jpg