3 files changed, 30 insertions, 8 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 25f83052a9fd..9d7628d0f0b6 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	vice
-PORTVERSION=	1.22
-PORTREVISION=	4
+PORTVERSION=	2.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.viceteam.org/online/ \
 		http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \
@@ -67,6 +66,14 @@ INFO=		vice
 
 .include <bsd.port.pre.mk>
 
+.if exists(${LOCALBASE}/bin/fc-cache)
+PLIST_SUB+=		FCCACHE=""
+PLIST_SUB+=		NOFCCACHE="@comment "
+.else
+PLIST_SUB+=		FCCACHE="@comment "
+PLIST_SUB+=		NOFCCACHE=""
+.endif
+
 .if exists(${LOCALBASE}/include/esd.h) && !defined(WITHOUT_ESOUND)
 WITH_ESOUND?=yes
 .endif
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index 7cc1f3a43e38..06988c33214d 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,3 +1,3 @@
-MD5 (vice-1.22.tar.gz) = 33204acbb74bafb12594d39b55888626
-SHA256 (vice-1.22.tar.gz) = cd45ce3eea98ce70ae03002a4d02bb3188c982ee7fb7435ac8777bc8a780ef01
-SIZE (vice-1.22.tar.gz) = 6088483
+MD5 (vice-2.0.tar.gz) = e4af3962469cb2279429718946528f1d
+SHA256 (vice-2.0.tar.gz) = 3f53e8fd9bb033df1c55bc045066b3a033000c887ce315fa07ce044078a8ee47
+SIZE (vice-2.0.tar.gz) = 7442564
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index f9c74748028b..ea36e0205cbf 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -51,6 +51,7 @@ lib/vice/C128/pc64.vpl
 lib/vice/C128/vdc_deft.vpl
 lib/vice/C128/vice.vpl
 lib/vice/C128/win_pos.vkm
+lib/vice/C128/win_shortcuts.vsc
 lib/vice/C128/win_sym.vkm
 lib/vice/C128/x11_pos.vkm
 lib/vice/C128/x11_sym.vkm
@@ -75,10 +76,12 @@ lib/vice/C64/kernal
 lib/vice/C64/os2.vkm
 lib/vice/C64/os2_sym.vkm
 lib/vice/C64/osx_pos.vkm
-lib/vice/C64/osx_sym.vkm
+lib/vice/C64/osx_sym_de.vkm
+lib/vice/C64/osx_sym_us.vkm
 lib/vice/C64/pc64.vpl
 lib/vice/C64/vice.vpl
 lib/vice/C64/win_pos.vkm
+lib/vice/C64/win_shortcuts.vsc
 lib/vice/C64/win_sym_de.vkm
 lib/vice/C64/win_sym_us.vkm
 lib/vice/C64/x11_pos.vkm
@@ -115,6 +118,7 @@ lib/vice/CBM-II/rom256l.vrs
 lib/vice/CBM-II/rom500.vrs
 lib/vice/CBM-II/white.vpl
 lib/vice/CBM-II/win_pos_uk.vkm
+lib/vice/CBM-II/win_shortcuts.vsc
 lib/vice/CBM-II/win_sym_uk.vkm
 lib/vice/CBM-II/x11_buks.vkm
 lib/vice/DRIVES/d1541II
@@ -162,6 +166,7 @@ lib/vice/PET/rom4b40.vrs
 lib/vice/PET/rom4b80.vrs
 lib/vice/PET/rom4g40.vrs
 lib/vice/PET/white.vpl
+lib/vice/PET/win_shortcuts.vsc
 lib/vice/PET/win_sym_gr.vkm
 lib/vice/PET/win_sym_uk.vkm
 lib/vice/PET/x11_bdep.vkm
@@ -184,6 +189,7 @@ lib/vice/PLUS4/kernal
 lib/vice/PLUS4/os2.vkm
 lib/vice/PLUS4/vice.vpl
 lib/vice/PLUS4/win_pos.vkm
+lib/vice/PLUS4/win_shortcuts.vsc
 lib/vice/PLUS4/win_sym.vkm
 lib/vice/PLUS4/x11_pos.vkm
 lib/vice/PLUS4/x11_sym.vkm
@@ -206,37 +212,46 @@ lib/vice/VIC20/dos_sym.vkm
 lib/vice/VIC20/kernal
 lib/vice/VIC20/os2.vkm
 lib/vice/VIC20/win_pos.vkm
+lib/vice/VIC20/win_shortcuts.vsc
 lib/vice/VIC20/win_sym.vkm
 lib/vice/VIC20/x11_pos.vkm
 lib/vice/VIC20/x11_sym.vkm
-lib/vice/fonts/fonts.dir
-lib/vice/fonts/vice-cbm.pcf
+lib/vice/fonts/CBM.ttf
+%%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%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/GP2X-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/MSDOS-Ethernet-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/MSDOS-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/Minix-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/NLS-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/OpenVMS-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/PETdoc.txt
 %%PORTDOCS%%%%DOCSDIR%%/Readme.beos
 %%PORTDOCS%%%%DOCSDIR%%/Readme.dos
 %%PORTDOCS%%%%DOCSDIR%%/ReadmeMacOSX.txt
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/Walkthrough-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/Win32-Cygwin-HOWTO.txt
 %%PORTDOCS%%%%DOCSDIR%%/Win32-Howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/amigaos.html
 %%PORTDOCS%%%%DOCSDIR%%/beos.html
 %%PORTDOCS%%%%DOCSDIR%%/cartconv.txt
 %%PORTDOCS%%%%DOCSDIR%%/cbm_basic_tokens.txt
 %%PORTDOCS%%%%DOCSDIR%%/drive_info.txt
+%%PORTDOCS%%%%DOCSDIR%%/hpux.html
 %%PORTDOCS%%%%DOCSDIR%%/iec-bus.txt
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/macosx.html
 %%PORTDOCS%%%%DOCSDIR%%/mon.txt
 %%PORTDOCS%%%%DOCSDIR%%/new.gif
 %%PORTDOCS%%%%DOCSDIR%%/openGLsync-howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/qnx.html
+%%PORTDOCS%%%%DOCSDIR%%/sco.html
 %%PORTDOCS%%%%DOCSDIR%%/serial.txt
 %%PORTDOCS%%%%DOCSDIR%%/solaris.html
 %%PORTDOCS%%%%DOCSDIR%%/vice_1.html