Update to 1.11.

Changes since 1.10:
** General
- The memory reset pattern can be configured now.
** C128 changes
- Fixed some MMU issues.
- Fixed color RAM support.
** PET changes
- A crash at startup has been fixed.
** VIC-II
- Improved sprite support.
- Fixed some video cache bugs.
- Fixed some IRQ emulation bugs.
** Drive changes
- Improved byte-ready line emulation.
- The track offset is calculated properly on track change now.
** Unix changes
- Real device access through OpenCBM library via XA1541/XM1541 cable.
- Added support to access 1581 formatted disks with the 3.5" host
  drive (Linux only).
- Added event recording & playback (experimental).
** Miscellaneous changes
- The monitor can access disks attached to #8..11 now.

6 files changed, 16 insertions, 112 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 7384c4355d2..5529a33172c 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2002/11/30 23:36:33 salo Exp $
+# $NetBSD: Makefile,v 1.30 2003/02/21 14:25:14 wiz Exp $
 #
 
-DISTNAME=		vice-1.10
+DISTNAME=		vice-1.11
 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/distinfo b/emulators/vice/distinfo
index 91b294b01ce..eb63d2ee325 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2002/09/07 09:17:12 kristerw Exp $
+$NetBSD: distinfo,v 1.8 2003/02/21 14:25:14 wiz Exp $
 
-SHA1 (vice-1.10.tar.gz) = 13f89c5302d2601cf136e200305b503835ca067f
-Size (vice-1.10.tar.gz) = 3111990 bytes
+SHA1 (vice-1.11.tar.gz) = 46fd20c9b7ee1806f2935c279026193fb05ba8f5
+Size (vice-1.11.tar.gz) = 3185213 bytes
 SHA1 (64gs.390852-01.bin) = 21940ef5f1bfe67d7537164f7ca130a1095b067a
 Size (64gs.390852-01.bin) = 16384 bytes
 SHA1 (kernal.4064.901246-01.bin) = 6c4fa9465f6091b174df27dfe679499df447503c
@@ -9,7 +9,5 @@ Size (kernal.4064.901246-01.bin) = 8192 bytes
 SHA1 (kernal.sx.251104-04.bin) = aa136e91ecf3c5ac64f696b3dbcbfc5ba0871c98
 Size (kernal.sx.251104-04.bin) = 8192 bytes
 SHA1 (patch-ab) = 0be2ec8b98a50e5c879095b1d0327c802b7740e2
-SHA1 (patch-ad) = ea9f6ebb3696591d1f0c4d496bff41fe1c8a8a73
-SHA1 (patch-ae) = 8e595b5b304fe2f3b6084fb30d569d0186d3d0c7
-SHA1 (patch-af) = b2c8e616f1000ae635c9b88486725f35bd8dd524
-SHA1 (patch-ag) = 2731f8964f29730f91afee81063945f4fa15e8ce
+SHA1 (patch-ad) = 6b934d8101bd2b88994115975fd87c3c20d0852e
+SHA1 (patch-ae) = f2a4453c2c460dc284e9a824d498c0b40e7d4dfc
diff --git a/emulators/vice/patches/patch-ad b/emulators/vice/patches/patch-ad
index 445261914f4..ba86496bfb4 100644
--- a/emulators/vice/patches/patch-ad
+++ b/emulators/vice/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2001/10/02 20:04:33 jlam Exp $
+$NetBSD: patch-ad,v 1.7 2003/02/21 14:25:15 wiz Exp $
 
---- src/arch/unix/c64ui.c.orig	Sat Jun 16 16:03:42 2001
-+++ src/arch/unix/c64ui.c	Wed Aug  1 23:02:01 2001
-@@ -460,6 +460,15 @@
+--- src/arch/unix/c64ui.c.orig	Tue Dec 31 18:29:18 2002
++++ src/arch/unix/c64ui.c
+@@ -278,6 +278,15 @@
      { N_("Load default ROMs"),
        (ui_callback_t)ui_set_romset,
        (ui_callback_data_t)"default.vrs", NULL },
diff --git a/emulators/vice/patches/patch-ae b/emulators/vice/patches/patch-ae
index b99f6c9baee..b2103874e0f 100644
--- a/emulators/vice/patches/patch-ae
+++ b/emulators/vice/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.3 2001/10/02 20:04:34 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2003/02/21 14:25:15 wiz Exp $
 
---- src/Makefile.in.orig	Mon Jul 23 14:09:00 2001
+--- src/Makefile.in.orig	Mon Jan 20 19:47:08 2003
 +++ src/Makefile.in
 @@ -38,7 +38,7 @@
  DESTDIR =
@@ -11,12 +11,12 @@ $NetBSD: patch-ae,v 1.3 2001/10/02 20:04:34 jlam Exp $
  pkgincludedir = $(includedir)/@PACKAGE@
  
  top_builddir = ..
-@@ -125,7 +125,7 @@
+@@ -126,7 +126,7 @@
  cxx = @cxx@
  sdl_config = @sdl_config@
  
 -LINK = @LINKCC@ $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -o $@
 +LINK = @LINKCC@ $(CFLAGS) $(INCLUDES) $(CPPFLAGS) $(LDFLAGS) -o $@
- @HAVE_RS232_TRUE@rs232_ldadd = rsuser.o
- @HAVE_RS232_FALSE@rs232_ldadd = 
+ 
+ ARCH_LIBS = @ARCH_LIBS@
  
diff --git a/emulators/vice/patches/patch-af b/emulators/vice/patches/patch-af
deleted file mode 100644
index 2d94c15acce..00000000000
--- a/emulators/vice/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.3 2002/08/08 11:59:37 wiz Exp $
-
---- src/resid/Makefile.am.orig	Sun Mar  4 13:24:35 2001
-+++ src/resid/Makefile.am
-@@ -6,13 +6,13 @@ libresid_a_SOURCES = sid.cc voice.cc wav
- 
- BUILT_SOURCES = $(noinst_DATA:.dat=.cc)
- 
--pkginclude_HEADERS = siddefs.h sid.h voice.h wave.h envelope.h filter.h extfilt.h pot.h spline.h
-+noinst_HEADERS = siddefs.h sid.h voice.h wave.h envelope.h filter.h extfilt.h pot.h spline.h
- 
- noinst_DATA = wave6581_PST.dat wave6581_PS_.dat wave6581_P_T.dat wave6581__ST.dat wave8580_PST.dat wave8580_PS_.dat wave8580_P_T.dat wave8580__ST.dat
- 
- noinst_SCRIPTS = samp2src.pl
- 
--EXTRA_DIST = $(noinst_DATA) $(noinst_SCRIPTS) README.VICE
-+EXTRA_DIST = $(noinst_DATA) $(noinst_HEADERS) $(noinst_SCRIPTS) README.VICE
- 
- SUFFIXES = .dat
- 
diff --git a/emulators/vice/patches/patch-ag b/emulators/vice/patches/patch-ag
deleted file mode 100644
index 96439710413..00000000000
--- a/emulators/vice/patches/patch-ag
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2002/08/08 11:59:37 wiz Exp $
-
---- src/resid/Makefile.in.orig	Tue Dec 18 22:44:20 2001
-+++ src/resid/Makefile.in
-@@ -73,13 +73,13 @@ libresid_a_SOURCES = sid.cc voice.cc wav
- 
- BUILT_SOURCES = $(noinst_DATA:.dat=.cc)
- 
--pkginclude_HEADERS = siddefs.h sid.h voice.h wave.h envelope.h filter.h extfilt.h pot.h spline.h
-+noinst_HEADERS = siddefs.h sid.h voice.h wave.h envelope.h filter.h extfilt.h pot.h spline.h
- 
- noinst_DATA = wave6581_PST.dat wave6581_PS_.dat wave6581_P_T.dat wave6581__ST.dat wave8580_PST.dat wave8580_PS_.dat wave8580_P_T.dat wave8580__ST.dat
- 
- noinst_SCRIPTS = samp2src.pl
- 
--EXTRA_DIST = $(noinst_DATA) $(noinst_SCRIPTS) README.VICE
-+EXTRA_DIST = $(noinst_DATA) $(noinst_HEADERS) $(noinst_SCRIPTS) README.VICE
- 
- SUFFIXES = .dat
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -110,7 +110,7 @@ CCLD = $(CC)
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- DATA =  $(noinst_DATA)
- 
--HEADERS =  $(pkginclude_HEADERS)
-+HEADERS =  $(noinst_HEADERS)
- 
- DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
- Makefile.in NEWS THANKS TODO aclocal.m4 configure configure.in \
-@@ -179,21 +181,6 @@ libresid.a: $(libresid_a_OBJECTS) $(libr
- .cc.o:
- 	$(CXXCOMPILE) -c $<
- 
--install-pkgincludeHEADERS: $(pkginclude_HEADERS)
--	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
--	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
--	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
--	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \
--	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \
--	done
--
--uninstall-pkgincludeHEADERS:
--	@$(NORMAL_UNINSTALL)
--	list='$(pkginclude_HEADERS)'; for p in $$list; do \
--	  rm -f $(DESTDIR)$(pkgincludedir)/$$p; \
--	done
--
- tags: TAGS
- 
- ID: $(HEADERS) $(SOURCES) $(LISP)
-@@ -300,20 +325,19 @@ installcheck: installcheck-am
- install-exec-am:
- install-exec: install-exec-am
- 
--install-data-am: install-pkgincludeHEADERS
-+install-data-am:
- install-data: install-data-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- install: install-am
--uninstall-am: uninstall-pkgincludeHEADERS
-+uninstall-am:
- uninstall: uninstall-am
- all-am: Makefile $(LIBRARIES) $(SCRIPTS) $(DATA) $(HEADERS)
- all-redirect: all-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pkgincludedir)
- 
- 
- mostlyclean-generic: