3 files changed, 82 insertions, 19 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 8236ecc54799..1149ce709212 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	vice
-PORTVERSION=	1.7
+PORTVERSION=	1.10
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/
 
@@ -24,6 +24,7 @@ MLINKS=		vice.1 x64.1 \
 		vice.1 x128.1 \
 		vice.1 xvic.1 \
 		vice.1 xpet.1 \
+		vice.1 xplus4.1 \
 		vice.1 xcbm2.1
 
 .include <bsd.port.pre.mk>
@@ -48,6 +49,9 @@ post-patch:
 	${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
 		${WRKSRC}/man/vice.1.sed > ${WRKSRC}/man/vice.1
 
+pre-install:
+	@${MKDIR} ${DOCSDIR}/images ${DOCSDIR}/plain
+
 post-install:
 	@${LN} -sf vice_toc.html ${DOCSDIR}/index.html
 
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index 18cf2b1b151b..072740652533 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1 +1 @@
-MD5 (vice-1.7.tar.gz) = e582144f7d0300110318dfacaae46603
+MD5 (vice-1.10.tar.gz) = f8389487363ffe8e7708e6491ed20150
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index 34a9e6d4c08d..2dd9ebfb51b9 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -5,6 +5,7 @@ bin/x128
 bin/x64
 bin/xcbm2
 bin/xpet
+bin/xplus4
 bin/xvic
 include/resid/envelope.h
 include/resid/extfilt.h
@@ -20,49 +21,63 @@ info/vice.info
 @exec install-info %D/info/vice.info %D/info/dir
 lib/vice/C128/basic
 lib/vice/C128/basic64
+lib/vice/C128/beos_pos.vkm
+lib/vice/C128/beos_sym.vkm
 lib/vice/C128/c64s.vpl
 lib/vice/C128/ccs64.vpl
 lib/vice/C128/charg64
 lib/vice/C128/chargen
-lib/vice/C128/default.vkm
 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
 lib/vice/C128/kernal64
 lib/vice/C128/os2.vkm
 lib/vice/C128/pc64.vpl
-lib/vice/C128/position.vkm
 lib/vice/C128/vdc_deft.vpl
 lib/vice/C128/vice.vpl
+lib/vice/C128/win_pos.vkm
+lib/vice/C128/win_sym.vkm
+lib/vice/C128/x11_pos.vkm
+lib/vice/C128/x11_sym.vkm
 lib/vice/C128/z80bios
 lib/vice/C64/basic
+lib/vice/C64/beos_pos.vkm
+lib/vice/C64/beos_sym.vkm
+lib/vice/C64/c64mem.sym
 lib/vice/C64/c64s.vpl
 lib/vice/C64/ccs64.vpl
 lib/vice/C64/chargen
-lib/vice/C64/default.vkm
 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/pc64.vpl
-lib/vice/C64/position.vkm
 lib/vice/C64/vice.vpl
+lib/vice/C64/win_pos.vkm
+lib/vice/C64/win_sym.vkm
+lib/vice/C64/x11_pos.vkm
+lib/vice/C64/x11_sym.vkm
 lib/vice/CBM-II/amber.vpl
 lib/vice/CBM-II/basic.128
 lib/vice/CBM-II/basic.256
 lib/vice/CBM-II/basic.500
-lib/vice/CBM-II/busi_uk.vkm
+lib/vice/CBM-II/beos_buks.vkm
 lib/vice/CBM-II/c64s.vpl
 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/dos_buks.vkm
 lib/vice/CBM-II/frodo.vpl
 lib/vice/CBM-II/godot.vpl
 lib/vice/CBM-II/green.vpl
@@ -76,9 +91,12 @@ 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_buks.vkm
+lib/vice/CBM-II/x11_buks.vkm
 lib/vice/DRIVES/d1541II
 lib/vice/DRIVES/dos1001
 lib/vice/DRIVES/dos1541
+lib/vice/DRIVES/dos1551
 lib/vice/DRIVES/dos1571
 lib/vice/DRIVES/dos1581
 lib/vice/DRIVES/dos2031
@@ -89,24 +107,24 @@ lib/vice/PET/amber.vpl
 lib/vice/PET/basic1
 lib/vice/PET/basic2
 lib/vice/PET/basic4
-lib/vice/PET/busi_de.vkm
-lib/vice/PET/busi_uk.vkm
+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
 lib/vice/PET/edit4b40
 lib/vice/PET/edit4b80
 lib/vice/PET/edit4g40
-lib/vice/PET/graphics.vkm
 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/posg_de.vkm
 lib/vice/PET/rom1g.vrs
 lib/vice/PET/rom2b.vrs
 lib/vice/PET/rom2g.vrs
@@ -114,30 +132,55 @@ lib/vice/PET/rom4b40.vrs
 lib/vice/PET/rom4b80.vrs
 lib/vice/PET/rom4g40.vrs
 lib/vice/PET/white.vpl
+lib/vice/PET/win_bgrs.vkm
+lib/vice/PET/win_buks.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/3plus1hi
+lib/vice/PLUS4/3plus1lo
+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_sym.vkm
+lib/vice/PLUS4/x11_pos.vkm
+lib/vice/PLUS4/x11_sym.vkm
 lib/vice/PRINTER/cbm1526
 lib/vice/PRINTER/mps801
 lib/vice/PRINTER/mps803
+lib/vice/PRINTER/mps803.vpl
 lib/vice/VIC20/basic
+lib/vice/VIC20/beos_pos.vkm
+lib/vice/VIC20/beos_sym.vkm
 lib/vice/VIC20/chargen
-lib/vice/VIC20/default.vkm
 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/position.vkm
+lib/vice/VIC20/win_pos.vkm
+lib/vice/VIC20/win_sym.vkm
+lib/vice/VIC20/x11_pos.vkm
+lib/vice/VIC20/x11_sym.vkm
+lib/vice/fonts/cbm-directory-charset.fon
 lib/vice/fonts/fonts.dir
 lib/vice/fonts/vice-cbm.pcf
-share/doc/vice/64doc.txt
-share/doc/vice/Evaluation
-share/doc/vice/PETdoc.txt
+share/doc/vice/NLS-Howto.txt
 share/doc/vice/Readme.beos
 share/doc/vice/Readme.dos
 share/doc/vice/Win32-Howto.txt
-share/doc/vice/cbm_basic_tokens.txt
-share/doc/vice/drive_info.txt
 share/doc/vice/index.html
 share/doc/vice/mon.txt
-share/doc/vice/serial.txt
 share/doc/vice/vice_1.html
 share/doc/vice/vice_10.html
 share/doc/vice/vice_11.html
@@ -155,8 +198,24 @@ share/doc/vice/vice_7.html
 share/doc/vice/vice_8.html
 share/doc/vice/vice_9.html
 share/doc/vice/vice_toc.html
+share/doc/vice/images/navbarlogo.gif
+share/doc/vice/images/new.gif
+share/doc/vice/images/vice-logo.jpg
+share/doc/vice/images/vice-sublogo.jpg
+share/doc/vice/plain/64doc.txt
+share/doc/vice/plain/BUGS
+share/doc/vice/plain/COPYING
+share/doc/vice/plain/NEWS
+share/doc/vice/plain/PETdoc.txt
+share/doc/vice/plain/TODO
+share/doc/vice/plain/cbm_basic_tokens.txt
+share/doc/vice/plain/drive_info.txt
+share/doc/vice/plain/serial.txt
+@dirrm share/doc/vice/plain
+@dirrm share/doc/vice/images
 @dirrm share/doc/vice
 @dirrm lib/vice/VIC20
+@dirrm lib/vice/PLUS4
 @dirrm lib/vice/PRINTER
 @dirrm lib/vice/PET
 @dirrm lib/vice/DRIVES