3 files changed, 95 insertions, 82 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index dc73e024c398..0da5821d1ee5 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -5,15 +5,14 @@
 # $FreeBSD$
 
 PORTNAME=	vice
-PORTVERSION=	1.2
+PORTVERSION=	1.6
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/
 
-MAINTAINER=	dchapes@ddm.on.ca
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 
-WRKSRC=		${WRKDIR}/vice-1.2
 USE_XLIB=	yes
 RESTRICTED=	ROMs are copyrighted by Commodore Business Machines
 NO_CDROM=	${RESTRICTED}
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index c912af4d64d7..98fde9aeafa1 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1 +1 @@
-MD5 (vice-1.2.tar.gz) = b082f24c4b49558b0cfaa3162a880712
+MD5 (vice-1.6.tar.gz) = b948d3bf066c0d5f4e851305b661cb65
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index e399d066ed06..231cb6bfeed5 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -1,10 +1,11 @@
-bin/x64
-bin/x128
-bin/xvic
-bin/xpet
-bin/xcbm2
 bin/c1541
 bin/petcat
+bin/vsid
+bin/x128
+bin/x64
+bin/xcbm2
+bin/xpet
+bin/xvic
 @unexec install-info --delete %D/info/vice.info %D/info/dir
 info/vice.info
 info/vice.info-1
@@ -14,18 +15,6 @@ info/vice.info-4
 info/vice.info-5
 info/vice.info-6
 @exec install-info %D/info/vice.info %D/info/dir
-lib/vice/C64/basic
-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/frodo.vpl
-lib/vice/C64/godot.vpl
-lib/vice/C64/kernal
-lib/vice/C64/pc64.vpl
-lib/vice/C64/position.vkm
 lib/vice/C128/basic
 lib/vice/C128/c64s.vpl
 lib/vice/C128/ccs64.vpl
@@ -36,64 +25,106 @@ lib/vice/C128/default.vrs
 lib/vice/C128/frodo.vpl
 lib/vice/C128/godot.vpl
 lib/vice/C128/kernal
+lib/vice/C128/os2.vkm
 lib/vice/C128/pc64.vpl
-lib/vice/C128/vdc_deft.vpl
 lib/vice/C128/position.vkm
+lib/vice/C128/vdc_deft.vpl
 lib/vice/C128/z80bios
-lib/vice/VIC20/basic
-lib/vice/VIC20/chargen
-lib/vice/VIC20/default.vkm
-lib/vice/VIC20/default.vpl
-lib/vice/VIC20/kernal
-lib/vice/VIC20/position.vkm
-lib/vice/VIC20/default.vrs
-lib/vice/PET/busi_uk.vkm
-lib/vice/PET/graphics.vkm
-lib/vice/PET/posg_de.vkm
-lib/vice/PET/busi_de.vkm
-lib/vice/PET/basic1
-lib/vice/PET/basic2
-lib/vice/PET/basic4
-lib/vice/PET/kernal1
-lib/vice/PET/kernal2
-lib/vice/PET/kernal4
-lib/vice/PET/edit1g
-lib/vice/PET/edit2g
-lib/vice/PET/edit2b
-lib/vice/PET/edit4g40
-lib/vice/PET/edit4b40
-lib/vice/PET/edit4b80
-lib/vice/PET/chargen
-lib/vice/PET/chargen.de
-lib/vice/PET/amber.vpl
-lib/vice/PET/default.vpl
-lib/vice/PET/white.vpl
-lib/vice/PET/rom1g.vrs
-lib/vice/PET/rom2b.vrs
-lib/vice/PET/rom2g.vrs
-lib/vice/PET/rom4b40.vrs
-lib/vice/PET/rom4b80.vrs
-lib/vice/PET/rom4g40.vrs
+lib/vice/C64/basic
+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/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/CBM-II/amber.vpl
 lib/vice/CBM-II/basic.128
 lib/vice/CBM-II/basic.256
+lib/vice/CBM-II/busi_uk.vkm
 lib/vice/CBM-II/chargen.600
 lib/vice/CBM-II/chargen.700
-lib/vice/CBM-II/busi_uk.vkm
 lib/vice/CBM-II/default.vpl
 lib/vice/CBM-II/kernal
-lib/vice/CBM-II/white.vpl
-lib/vice/CBM-II/rom128l.vrs
+lib/vice/CBM-II/os2.vkm
 lib/vice/CBM-II/rom128h.vrs
-lib/vice/CBM-II/rom256l.vrs
+lib/vice/CBM-II/rom128l.vrs
 lib/vice/CBM-II/rom256h.vrs
-lib/vice/DRIVES/dos1541
+lib/vice/CBM-II/rom256l.vrs
+lib/vice/CBM-II/white.vpl
 lib/vice/DRIVES/d1541II
+lib/vice/DRIVES/dos1001
+lib/vice/DRIVES/dos1541
 lib/vice/DRIVES/dos1571
 lib/vice/DRIVES/dos1581
 lib/vice/DRIVES/dos2031
-lib/vice/DRIVES/dos1001
+lib/vice/DRIVES/dos2040
+lib/vice/DRIVES/dos3040
+lib/vice/DRIVES/dos4040
+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/chargen
+lib/vice/PET/chargen.de
+lib/vice/PET/default.vpl
+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/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
+lib/vice/PET/rom4b40.vrs
+lib/vice/PET/rom4b80.vrs
+lib/vice/PET/rom4g40.vrs
+lib/vice/PET/white.vpl
+lib/vice/VIC20/basic
+lib/vice/VIC20/chargen
+lib/vice/VIC20/default.vkm
+lib/vice/VIC20/default.vpl
+lib/vice/VIC20/default.vrs
+lib/vice/VIC20/kernal
+lib/vice/VIC20/os2.vkm
+lib/vice/VIC20/position.vkm
+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/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
+share/doc/vice/vice_12.html
+share/doc/vice/vice_13.html
+share/doc/vice/vice_14.html
+share/doc/vice/vice_15.html
+share/doc/vice/vice_16.html
 share/doc/vice/vice_2.html
 share/doc/vice/vice_3.html
 share/doc/vice/vice_4.html
@@ -102,30 +133,13 @@ share/doc/vice/vice_6.html
 share/doc/vice/vice_7.html
 share/doc/vice/vice_8.html
 share/doc/vice/vice_9.html
-share/doc/vice/vice_10.html
-share/doc/vice/vice_11.html
-share/doc/vice/vice_12.html
-share/doc/vice/vice_13.html
-share/doc/vice/vice_14.html
-share/doc/vice/vice_15.html
-share/doc/vice/vice_16.html
 share/doc/vice/vice_toc.html
-share/doc/vice/64doc.txt
-share/doc/vice/Evaluation
-share/doc/vice/PETdoc.txt
-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/mnemonics.txt
-share/doc/vice/mon.txt
-share/doc/vice/serial.txt
-share/doc/vice/index.html
-@dirrm lib/vice/C64
 @dirrm lib/vice/C128
+@dirrm lib/vice/C64
 @dirrm lib/vice/CBM-II
 @dirrm lib/vice/DRIVES
-@dirrm lib/vice/VIC20
 @dirrm lib/vice/PET
+@dirrm lib/vice/VIC20
+@dirrm lib/vice/fonts
 @dirrm lib/vice
 @dirrm share/doc/vice