- update to 2.1

3 files changed, 23 insertions, 79 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 9d7628d0f0b6..f4de5332f825 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	vice
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.viceteam.org/online/ \
 		http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index 06988c33214d..00583cd34d92 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,3 +1,3 @@
-MD5 (vice-2.0.tar.gz) = e4af3962469cb2279429718946528f1d
-SHA256 (vice-2.0.tar.gz) = 3f53e8fd9bb033df1c55bc045066b3a033000c887ce315fa07ce044078a8ee47
-SIZE (vice-2.0.tar.gz) = 7442564
+MD5 (vice-2.1.tar.gz) = a4cca1aad12e12ac7f37d6c85310ade8
+SHA256 (vice-2.1.tar.gz) = dc42df924bd4b4ab4af43e372d873a79ea035059f31f2f5c297c234b1c532c66
+SIZE (vice-2.1.tar.gz) = 8097482
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index ea36e0205cbf..1a6139077092 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -4,6 +4,7 @@ bin/petcat
 bin/vsid
 bin/x128
 bin/x64
+bin/x64dtv
 bin/xcbm2
 bin/xpet
 bin/xplus4
@@ -15,14 +16,9 @@ bin/xvic
 %%NLS%%share/locale/nl/LC_MESSAGES/vice.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/vice.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/vice.mo
-lib/vice/C128/ROdflt.vkm
-lib/vice/C128/amiga_pos.vkm
-lib/vice/C128/amiga_sym.vkm
 lib/vice/C128/basic64
 lib/vice/C128/basichi
 lib/vice/C128/basiclo
-lib/vice/C128/beos_pos.vkm
-lib/vice/C128/beos_sym.vkm
 lib/vice/C128/c64hq.vpl
 lib/vice/C128/c64s.vpl
 lib/vice/C128/ccs64.vpl
@@ -32,8 +28,6 @@ lib/vice/C128/chargfr
 lib/vice/C128/chargse
 lib/vice/C128/default.vpl
 lib/vice/C128/default.vrs
-lib/vice/C128/dos_pos.vkm
-lib/vice/C128/dos_sym.vkm
 lib/vice/C128/frodo.vpl
 lib/vice/C128/godot.vpl
 lib/vice/C128/kernal
@@ -44,23 +38,12 @@ lib/vice/C128/kernalfr
 lib/vice/C128/kernalit
 lib/vice/C128/kernalno
 lib/vice/C128/kernalse
-lib/vice/C128/os2.vkm
-lib/vice/C128/osx_pos.vkm
-lib/vice/C128/osx_sym.vkm
 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
-lib/vice/C64/ROdflt.vkm
-lib/vice/C64/amiga_pos.vkm
-lib/vice/C64/amiga_sym.vkm
 lib/vice/C64/basic
-lib/vice/C64/beos_pos.vkm
-lib/vice/C64/beos_sym.vkm
 lib/vice/C64/c64hq.vpl
 lib/vice/C64/c64mem.sym
 lib/vice/C64/c64s.vpl
@@ -68,33 +51,33 @@ lib/vice/C64/ccs64.vpl
 lib/vice/C64/chargen
 lib/vice/C64/default.vpl
 lib/vice/C64/default.vrs
-lib/vice/C64/dos_pos.vkm
-lib/vice/C64/dos_sym.vkm
 lib/vice/C64/frodo.vpl
 lib/vice/C64/godot.vpl
 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_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
 lib/vice/C64/x11_sym.vkm
-lib/vice/CBM-II/ROdflt.vkm
+lib/vice/C64DTV/basic
+lib/vice/C64DTV/c64hq.vpl
+lib/vice/C64DTV/c64mem.sym
+lib/vice/C64DTV/c64s.vpl
+lib/vice/C64DTV/ccs64.vpl
+lib/vice/C64DTV/chargen
+lib/vice/C64DTV/default.vpl
+lib/vice/C64DTV/default.vrs
+lib/vice/C64DTV/dtvrom.bin
+lib/vice/C64DTV/frodo.vpl
+lib/vice/C64DTV/godot.vpl
+lib/vice/C64DTV/kernal
+lib/vice/C64DTV/pc64.vpl
+lib/vice/C64DTV/vice.vpl
+lib/vice/C64DTV/x11_pos.vkm
+lib/vice/C64DTV/x11_sym.vkm
 lib/vice/CBM-II/amber.vpl
-lib/vice/CBM-II/amiga_bukp.vkm
-lib/vice/CBM-II/amiga_buks.vkm
 lib/vice/CBM-II/basic.128
 lib/vice/CBM-II/basic.256
 lib/vice/CBM-II/basic.500
-lib/vice/CBM-II/beos_bukp.vkm
-lib/vice/CBM-II/beos_buks.vkm
 lib/vice/CBM-II/c64hq.vpl
 lib/vice/CBM-II/c64s.vpl
 lib/vice/CBM-II/ccs64.vpl
@@ -102,14 +85,11 @@ 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/dos_bukp.vkm
-lib/vice/CBM-II/dos_buks.vkm
 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/os2.vkm
 lib/vice/CBM-II/pc64.vpl
 lib/vice/CBM-II/rom128h.vrs
 lib/vice/CBM-II/rom128l.vrs
@@ -117,9 +97,6 @@ lib/vice/CBM-II/rom256h.vrs
 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
 lib/vice/DRIVES/d1571cr
@@ -133,20 +110,12 @@ lib/vice/DRIVES/dos2031
 lib/vice/DRIVES/dos2040
 lib/vice/DRIVES/dos3040
 lib/vice/DRIVES/dos4040
-lib/vice/PET/RObusi.vkm
-lib/vice/PET/ROgrph.vkm
 lib/vice/PET/amber.vpl
-lib/vice/PET/amiga_bgrs.vkm
-lib/vice/PET/amiga_buks.vkm
 lib/vice/PET/basic1
 lib/vice/PET/basic2
 lib/vice/PET/basic4
-lib/vice/PET/beos_bgrs.vkm
-lib/vice/PET/beos_buks.vkm
 lib/vice/PET/chargen
 lib/vice/PET/chargen.de
-lib/vice/PET/dos_bgrs.vkm
-lib/vice/PET/dos_buks.vkm
 lib/vice/PET/edit1g
 lib/vice/PET/edit2b
 lib/vice/PET/edit2g
@@ -157,8 +126,6 @@ lib/vice/PET/green.vpl
 lib/vice/PET/kernal1
 lib/vice/PET/kernal2
 lib/vice/PET/kernal4
-lib/vice/PET/os2.vkm
-lib/vice/PET/os2_40.vkm
 lib/vice/PET/rom1g.vrs
 lib/vice/PET/rom2b.vrs
 lib/vice/PET/rom2g.vrs
@@ -166,31 +133,17 @@ 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
 lib/vice/PET/x11_bdes.vkm
 lib/vice/PET/x11_bgrs.vkm
 lib/vice/PET/x11_buks.vkm
-lib/vice/PLUS4/ROdflt.vkm
 lib/vice/PLUS4/3plus1hi
 lib/vice/PLUS4/3plus1lo
-lib/vice/PLUS4/amiga_pos.vkm
-lib/vice/PLUS4/amiga_sym.vkm
 lib/vice/PLUS4/basic
-lib/vice/PLUS4/beos_pos.vkm
-lib/vice/PLUS4/beos_sym.vkm
 lib/vice/PLUS4/default.vpl
 lib/vice/PLUS4/default.vrs
-lib/vice/PLUS4/dos_pos.vkm
-lib/vice/PLUS4/dos_sym.vkm
 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
 lib/vice/PRINTER/cbm1526
@@ -198,22 +151,11 @@ lib/vice/PRINTER/mps801
 lib/vice/PRINTER/mps803
 lib/vice/PRINTER/mps803.vpl
 lib/vice/PRINTER/nl10-cbm
-lib/vice/VIC20/ROdflt.vkm
-lib/vice/VIC20/amiga_pos.vkm
-lib/vice/VIC20/amiga_sym.vkm
 lib/vice/VIC20/basic
-lib/vice/VIC20/beos_pos.vkm
-lib/vice/VIC20/beos_sym.vkm
 lib/vice/VIC20/chargen
 lib/vice/VIC20/default.vpl
 lib/vice/VIC20/default.vrs
-lib/vice/VIC20/dos_pos.vkm
-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/CBM.ttf
@@ -242,6 +184,7 @@ lib/vice/fonts/CBM.ttf
 %%PORTDOCS%%%%DOCSDIR%%/beos.html
 %%PORTDOCS%%%%DOCSDIR%%/cartconv.txt
 %%PORTDOCS%%%%DOCSDIR%%/cbm_basic_tokens.txt
+%%PORTDOCS%%%%DOCSDIR%%/coding-guidelines.txt
 %%PORTDOCS%%%%DOCSDIR%%/drive_info.txt
 %%PORTDOCS%%%%DOCSDIR%%/hpux.html
 %%PORTDOCS%%%%DOCSDIR%%/iec-bus.txt
@@ -280,6 +223,7 @@ lib/vice/fonts/CBM.ttf
 @dirrm lib/vice/PET
 @dirrm lib/vice/DRIVES
 @dirrm lib/vice/CBM-II
+@dirrm lib/vice/C64DTV
 @dirrm lib/vice/C64
 @dirrm lib/vice/C128
 @dirrm lib/vice