Update vice to 1.12.

Changes since 1.11 include:
** General changes
- Added -autoload switch which acts like -autostart but without
  actually starting the program.
- It is possible to use the printer emulation without switching off
  true drive emulation now.

** C64 changes
- Mouse emulation should work again.
- Improved trap emulation compatibility.

** C128 changes
- Fixed some VDC crashs.
- Added support for national firmware and keyboard mappings.
- Implemented fast IEC bus.

** PLUS4 changes
- New emulator.  Currently it contains many bugs and several features
  are missing.  Do not send any bug reports for now.

** VIC-II
- Fixed some raster interrupt emulation bugs.
- Some minor NTSC fixes.
- Reset should properly reset the VIC-II now.

** SID changes
- The ReSID state is saved in snapshots now.

** Drive changes
- Improved GCR sync detection.
- Added some more jobcodes to the 1581 emulation.
- RAM mirrors are properly emulated now.

4 files changed, 45 insertions, 28 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 5529a33172c..1562632609b 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2003/02/21 14:25:14 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2003/06/23 19:05:09 kristerw Exp $
 #
 
-DISTNAME=		vice-1.11
+DISTNAME=		vice-1.12
 CATEGORIES=		emulators
 MASTER_SITES=		ftp://ftp.funet.fi/pub/cbm/firmware/computers/c64/ \
 			ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/ \
diff --git a/emulators/vice/PLIST b/emulators/vice/PLIST
index d01584846bc..f5daffa00ff 100644
--- a/emulators/vice/PLIST
+++ b/emulators/vice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/09/07 09:17:11 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/06/23 19:05:09 kristerw Exp $
 bin/c1541
 bin/petcat
 bin/vsid
@@ -16,6 +16,7 @@ info/vice.info-3
 info/vice.info-4
 info/vice.info-5
 info/vice.info-6
+info/vice.info-7
 @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/vice.info
 man/man1/c1541.1
 man/man1/petcat.1
@@ -38,24 +39,40 @@ share/doc/html/vice/vice_7.html
 share/doc/html/vice/vice_8.html
 share/doc/html/vice/vice_9.html
 share/doc/html/vice/vice_toc.html
+share/doc/vice/64doc.txt
+share/doc/vice/BUGS
+share/doc/vice/COPYING
+share/doc/vice/NEWS
 share/doc/vice/NLS-Howto.txt
+share/doc/vice/PETdoc.txt
 share/doc/vice/Readme.beos
 share/doc/vice/Readme.dos
+share/doc/vice/TODO
 share/doc/vice/Win32-Howto.txt
+share/doc/vice/cbm_basic_tokens.txt
+share/doc/vice/drive_info.txt
 share/doc/vice/mon.txt
+share/doc/vice/navbarlogo.gif
+share/doc/vice/new.gif
+share/doc/vice/serial.txt
+share/doc/vice/vice-logo.jpg
+share/doc/vice/vice-sublogo.jpg
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/vice.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/vice.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/vice.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/vice.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/vice.mo
-share/vice/C128/basic
 share/vice/C128/basic64
+share/vice/C128/basichi
+share/vice/C128/basiclo
 share/vice/C128/beos_pos.vkm
 share/vice/C128/beos_sym.vkm
 share/vice/C128/c64s.vpl
 share/vice/C128/ccs64.vpl
-share/vice/C128/charg64
+share/vice/C128/chargde
 share/vice/C128/chargen
+share/vice/C128/chargfr
+share/vice/C128/chargse
 share/vice/C128/default.vpl
 share/vice/C128/default.vrs
 share/vice/C128/dos_pos.vkm
@@ -64,6 +81,12 @@ share/vice/C128/frodo.vpl
 share/vice/C128/godot.vpl
 share/vice/C128/kernal
 share/vice/C128/kernal64
+share/vice/C128/kernalde
+share/vice/C128/kernalfi
+share/vice/C128/kernalfr
+share/vice/C128/kernalit
+share/vice/C128/kernalno
+share/vice/C128/kernalse
 share/vice/C128/os2.vkm
 share/vice/C128/pc64.vpl
 share/vice/C128/vdc_deft.vpl
@@ -72,14 +95,13 @@ share/vice/C128/win_pos.vkm
 share/vice/C128/win_sym.vkm
 share/vice/C128/x11_pos.vkm
 share/vice/C128/x11_sym.vkm
-share/vice/C128/z80bios
 share/vice/C64/4064.vrs
 share/vice/C64/64gs.vrs
 share/vice/C64/basic
+share/vice/C64/basic.64gs
 share/vice/C64/beos_pos.vkm
 share/vice/C64/beos_sym.vkm
 share/vice/C64/c64mem.sym
-share/vice/C64/basic.64gs
 share/vice/C64/c64s.vpl
 share/vice/C64/ccs64.vpl
 share/vice/C64/chargen
@@ -208,10 +230,6 @@ share/vice/VIC20/win_pos.vkm
 share/vice/VIC20/win_sym.vkm
 share/vice/VIC20/x11_pos.vkm
 share/vice/VIC20/x11_sym.vkm
-share/vice/fonts/cbm-directory-charset.fon
-share/vice/fonts/fonts.dir
-share/vice/fonts/vice-cbm.pcf
-@dirrm share/vice/fonts
 @dirrm share/vice/VIC20
 @dirrm share/vice/PRINTER
 @dirrm share/vice/PLUS4
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index eb63d2ee325..ff1deb13121 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2003/02/21 14:25:14 wiz Exp $
+$NetBSD: distinfo,v 1.9 2003/06/23 19:05:10 kristerw Exp $
 
-SHA1 (vice-1.11.tar.gz) = 46fd20c9b7ee1806f2935c279026193fb05ba8f5
-Size (vice-1.11.tar.gz) = 3185213 bytes
+SHA1 (vice-1.12.tar.gz) = 1b579393b914d736c6522fef4c12e1c39b4f4cb3
+Size (vice-1.12.tar.gz) = 3537855 bytes
 SHA1 (64gs.390852-01.bin) = 21940ef5f1bfe67d7537164f7ca130a1095b067a
 Size (64gs.390852-01.bin) = 16384 bytes
 SHA1 (kernal.4064.901246-01.bin) = 6c4fa9465f6091b174df27dfe679499df447503c
@@ -10,4 +10,4 @@ SHA1 (kernal.sx.251104-04.bin) = aa136e91ecf3c5ac64f696b3dbcbfc5ba0871c98
 Size (kernal.sx.251104-04.bin) = 8192 bytes
 SHA1 (patch-ab) = 0be2ec8b98a50e5c879095b1d0327c802b7740e2
 SHA1 (patch-ad) = 6b934d8101bd2b88994115975fd87c3c20d0852e
-SHA1 (patch-ae) = f2a4453c2c460dc284e9a824d498c0b40e7d4dfc
+SHA1 (patch-ae) = c2ede31953ebaf033c9ae1aa1985012fb0e5f3b6
diff --git a/emulators/vice/patches/patch-ae b/emulators/vice/patches/patch-ae
index b2103874e0f..58e51fb4cf4 100644
--- a/emulators/vice/patches/patch-ae
+++ b/emulators/vice/patches/patch-ae
@@ -1,22 +1,21 @@
-$NetBSD: patch-ae,v 1.4 2003/02/21 14:25:15 wiz Exp $
-
---- src/Makefile.in.orig	Mon Jan 20 19:47:08 2003
-+++ src/Makefile.in
-@@ -38,7 +38,7 @@
- DESTDIR =
- 
+$NetBSD: patch-ae,v 1.5 2003/06/23 19:05:11 kristerw Exp $
+--- src/Makefile.in.orig	Mon Jun 23 20:03:19 2003
++++ src/Makefile.in	Mon Jun 23 20:04:28 2003
+@@ -18,7 +18,7 @@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
 +pkglibdir = $(datadir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
- 
  top_builddir = ..
-@@ -126,7 +126,7 @@
- cxx = @cxx@
- sdl_config = @sdl_config@
  
+@@ -220,7 +220,7 @@
+ 
+ # We have to override the automake default, because we need to use
+ # $(CXX) instead of $(CC) when compiling with reSID.
 -LINK = @LINKCC@ $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -o $@
 +LINK = @LINKCC@ $(CFLAGS) $(INCLUDES) $(CPPFLAGS) $(LDFLAGS) -o $@
  
- ARCH_LIBS = @ARCH_LIBS@
- 
+ SUBDIRS = \
+ 	@RESID_DIR@ \