- update to 3.4

3 files changed, 36 insertions, 33 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index d8ebe60c2d28..4aed48822fea 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	vice
-PORTVERSION=	3.3
-PORTREVISION=	5
+PORTVERSION=	3.4
 CATEGORIES=	emulators
 MASTER_SITES=	SF/vice-emu/releases
 
@@ -12,9 +11,7 @@ COMMENT=	Emulator for Commodore C64, C128, VIC20, PET, and CBM-II
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
-		mkfontscale:x11-fonts/mkfontscale \
-		xa65:devel/xa65
+BUILD_DEPENDS=	xa65:devel/xa65
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libgif.so:graphics/giflib \
 		libportaudio.so:audio/portaudio \
@@ -38,6 +35,7 @@ HAS_CONFIGURE=	yes
 MAKE_ENV+=	MAKEINFOFLAGS="--no-split"
 CONFIGURE_ARGS+=	--enable-ipv6 \
 			--enable-external-ffmpeg \
+			--enable-x64 \
 			--mandir="${PREFIX}/man" \
 			--infodir="${PREFIX}/${INFO_PATH}" \
 			--localedir="${LOCALBASE}/share/locale" \
@@ -87,7 +85,7 @@ __pmlinks1!=	${ECHO_CMD} '${LMLINKS:S/    / /}' | ${AWK} \
 .if ${PORT_OPTIONS:MGTK3UI}
 USES+=		gnome gl
 USE_GNOME+=	gtk30 vte3 cairo gdkpixbuf2 pango
-USE_GL+=	glu gl
+USE_GL+=	glu gl glew
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -101,11 +99,6 @@ pre-configure:
 	${REINPLACE_CMD} -e 's| doc||' ${WRKSRC}/Makefile.in
 .endif
 
-pre-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vice/fonts
-	${INSTALL_DATA} ${WRKSRC}/data/fonts/vice-cbm.bdf \
-		${STAGEDIR}${PREFIX}/lib/vice/fonts/
-
 pre-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index d385a8de86e2..aa698f2bd97a 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545397027
-SHA256 (vice-3.3.tar.gz) = 1a55b38cc988165b077808c07c52a779d181270b28c14b5c9abf4e569137431d
-SIZE (vice-3.3.tar.gz) = 22742913
+TIMESTAMP = 1581067923
+SHA256 (vice-3.4.tar.gz) = 4bd00c1c63d38cd1fe01b90032834b52f774bc29e4b67eeb1e525b14fee07aeb
+SIZE (vice-3.4.tar.gz) = 23964877
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index d64ff6a6de4f..1320799ec7ed 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -74,8 +74,11 @@ lib/vice/C64/gskernal
 %%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_da.vkm
 %%GTK3UI%%lib/vice/C64/gtk3_sym_de.vkm
+%%GTK3UI%%lib/vice/C64/gtk3_sym_it.vkm
 %%GTK3UI%%lib/vice/C64/gtk3_sym_nl.vkm
+%%GTK3UI%%lib/vice/C64/gtk3_sym_se.vkm
 lib/vice/C64/jpchrgen
 lib/vice/C64/jpkernal
 lib/vice/C64/kernal
@@ -95,12 +98,15 @@ lib/vice/C64/rgb.vpl
 %%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_ch.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_da.vkm
 %%SDLUI2%%lib/vice/C64/sdl_sym_de.vkm
+%%SDLUI2%%lib/vice/C64/sdl_sym_it.vkm
 %%SDLUI2%%lib/vice/C64/sdl_sym_nl.vkm
 lib/vice/C64/sxkernal
 lib/vice/C64/vice.vpl
@@ -114,8 +120,10 @@ lib/vice/C64DTV/dtvrom.bin
 %%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_da.vkm
 %%GTK3UI%%lib/vice/C64DTV/gtk3_sym_de.vkm
 %%GTK3UI%%lib/vice/C64DTV/gtk3_sym_nl.vkm
+%%GTK3UI%%lib/vice/C64DTV/gtk3_sym_se.vkm
 lib/vice/C64DTV/kernal
 %%SDLUI2%%lib/vice/C64DTV/sdl_hotkeys.vkm
 %%SDLUI2%%lib/vice/C64DTV/sdl_keyrah.vkm
@@ -124,11 +132,13 @@ lib/vice/C64DTV/kernal
 %%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_ch.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_da.vkm
 %%SDLUI2%%lib/vice/C64DTV/sdl_sym_de.vkm
 %%SDLUI2%%lib/vice/C64DTV/sdl_sym_nl.vkm
 lib/vice/C64DTV/spiff.vpl
@@ -271,8 +281,10 @@ lib/vice/SCPU64/godot.vpl
 %%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_da.vkm
 %%GTK3UI%%lib/vice/SCPU64/gtk3_sym_de.vkm
 %%GTK3UI%%lib/vice/SCPU64/gtk3_sym_nl.vkm
+%%GTK3UI%%lib/vice/SCPU64/gtk3_sym_se.vkm
 lib/vice/SCPU64/jpchrgen
 lib/vice/SCPU64/pc64.vpl
 lib/vice/SCPU64/pepto-ntsc-sony.vpl
@@ -290,11 +302,13 @@ lib/vice/SCPU64/scpu64mem.sym
 %%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_ch.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_da.vkm
 %%SDLUI2%%lib/vice/SCPU64/sdl_sym_de.vkm
 %%SDLUI2%%lib/vice/SCPU64/sdl_sym_nl.vkm
 lib/vice/SCPU64/vice.vpl
@@ -311,11 +325,13 @@ lib/vice/VIC20/mike-pal.vpl
 %%SDLUI2%%lib/vice/VIC20/sdl_pos.vkm
 %%SDLUI2%%lib/vice/VIC20/sdl_pos_fi.vkm
 lib/vice/VIC20/vice.vpl
-lib/vice/fonts/CBM.ttf
-%%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
+lib/vice/common/CBM.ttf
+lib/vice/common/CBM_Logo.svg
+lib/vice/common/Icon-128@2x.png
+lib/vice/common/icon.ico
+lib/vice/common/icon.png
+lib/vice/common/icon1024x1024.png
+%%GTK3UI%%lib/vice/common/vice.gresource
 man/man1/c1541.1.gz
 man/man1/cartconv.1.gz
 man/man1/petcat.1.gz
@@ -333,7 +349,9 @@ man/man1/xvic.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/Documentation-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/Doxygen-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/FreeBSD-GTK3-Howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/GTK3-macOS.txt
+%%GTK3UI%%%%PORTDOCS%%%%DOCSDIR%%/GTK3-Fedora-cross-build-setup.md
+%%GTK3UI%%%%PORTDOCS%%%%DOCSDIR%%/GTK3-cross-build-setup.md
+%%GTK3UI%%%%PORTDOCS%%%%DOCSDIR%%/GTK3-debian-frankenvice.md
 %%PORTDOCS%%%%DOCSDIR%%/Lato-Bold.eot
 %%PORTDOCS%%%%DOCSDIR%%/Lato-Bold.ttf
 %%PORTDOCS%%%%DOCSDIR%%/Lato-Bold.woff
@@ -370,26 +388,18 @@ man/man1/xvic.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/hardware-sids.txt
 %%PORTDOCS%%%%DOCSDIR%%/iec-bus.txt
 %%PORTDOCS%%%%DOCSDIR%%/index.html
+%%GTK3UI%%%%PORTDOCS%%%%DOCSDIR%%/macOS-Distribution-Howto.txt
+%%GTK3UI%%%%PORTDOCS%%%%DOCSDIR%%/macOS-GTK3-Howto.txt
+%%GTK3UI%%%%PORTDOCS%%%%DOCSDIR%%/macOS-SDL2-Howto.txt
+%%GTK3UI%%%%PORTDOCS%%%%DOCSDIR%%/macOS-Xcode-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/macosx.html
 %%PORTDOCS%%%%DOCSDIR%%/new.gif
-%%PORTDOCS%%%%DOCSDIR%%/nsosrh.html
-%%PORTDOCS%%%%DOCSDIR%%/qnx.html
 %%PORTDOCS%%%%DOCSDIR%%/robots.txt
-%%PORTDOCS%%%%DOCSDIR%%/sco.html
 %%PORTDOCS%%%%DOCSDIR%%/sitemap.xml
-%%PORTDOCS%%%%DOCSDIR%%/solaris.html
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/vice.hlp
-%%PORTDOCS%%%%DOCSDIR%%/vice.inf
-%%PORTDOCS%%%%DOCSDIR%%/vice.info
-%%PORTDOCS%%%%DOCSDIR%%/vice.pdf
-%%PORTDOCS%%%%DOCSDIR%%/vice.txt
 %%PORTDOCS%%%%DOCSDIR%%/vice_1.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_10.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_11.html
@@ -413,5 +423,5 @@ man/man1/xvic.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/vice_8.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_9.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_toc.html
+%%GTK3UI%%%%PORTDOCS%%%%DOCSDIR%%/vice.txt
 %%PORTDOCS%%%%DOCSDIR%%/windows.html
-%%PORTDOCS%%share/info/vice.txt