Update vice to 1.7.

Changes in VICE 1.7
===================
** C64 changes
- REU support has been rewritten to support different types and
  images.
- Fixed a processor emulation bug which caused a crash in Summer
  Games II.
- Fixed a snapshot bug causing Castles of Dr. Creep to quit after the
  snapshot has been restored.

** C128 changes
- REU support has been rewritten to support different types and
  images.
- Added support for internal and external function ROM images.
- Tape emulation has been added.
- Added register 26 support to VDC emulation to make LUnix work.
- Support for the CAPS key has been added.
- There is a limited C64 mode now.

** VIC20 changes
- VIC video emulation now almost cycle exact (try vimm or vvv demos)
  NTSC video mode is supported.

** CBM-II changes
- Implemented a C510 (aka P128) emulation, using the existing VIC-II
  emulation.
- Fix a couple of bugs in the CBM-II emulation (C610-C720).

** Drive changes
- Implemented experimental DOS1 (670 blocks free) support with CBM
  2040 emulation.
- The read-only bit of the 1581 disk drive is emulated now.

** Unix changes
- Added preliminary (beta) DGA2 support.
- French translation; Credits to Eric (meepmeep).
- Datasette control UI.
- Zlib is used for reading compressed images.

5 files changed, 78 insertions, 40 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 9efef39f6ed..2316b666088 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2001/02/26 22:13:34 tron Exp $
+# $NetBSD: Makefile,v 1.17 2001/08/01 22:16:46 kristerw Exp $
 
-DISTNAME=		vice-1.6
+DISTNAME=		vice-1.7
 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 d06ab18f7b6..a2f24bfc277 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 10:50:00 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/01 22:16:46 kristerw Exp $
 
-SHA1 (vice-1.6.tar.gz) = 9468d9746e6fd8b4cedf94ba47dbd7c99fd54af6
-Size (vice-1.6.tar.gz) = 2524798 bytes
+SHA1 (vice-1.7.tar.gz) = 75d4b7d349c13b965368014e6dbd8df7410e1db4
+Size (vice-1.7.tar.gz) = 2728101 bytes
 SHA1 (64gs.390852-01.bin) = 21940ef5f1bfe67d7537164f7ca130a1095b067a
 Size (64gs.390852-01.bin) = 16384 bytes
 SHA1 (kernal.4064.901246-01.bin) = 6c4fa9465f6091b174df27dfe679499df447503c
@@ -9,5 +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-ac) = 01980383bfa7fbd7eabe0022356fd057c664b364
-SHA1 (patch-ad) = 36ed17eb5e8020c28026842eb5a85c60b60cdcd8
+SHA1 (patch-ac) = c15c93874527f3dd855e8b495e9cda35a2bc9170
+SHA1 (patch-ad) = f05127f36b2b52d41089044f36617217a3523edd
diff --git a/emulators/vice/patches/patch-ac b/emulators/vice/patches/patch-ac
index 56f87ebe231..95afffa7b13 100644
--- a/emulators/vice/patches/patch-ac
+++ b/emulators/vice/patches/patch-ac
@@ -1,8 +1,7 @@
-$NetBSD: patch-ac,v 1.8 2001/02/26 22:13:35 tron Exp $
-
---- configure.orig	Mon Dec 11 23:28:18 2000
-+++ configure	Mon Feb 26 23:03:01 2001
-@@ -4706,6 +4706,8 @@
+$NetBSD: patch-ac,v 1.9 2001/08/01 22:16:46 kristerw Exp $
+--- configure.orig	Mon Jul 23 20:08:13 2001
++++ configure	Wed Aug  1 23:24:36 2001
+@@ -4714,6 +4714,8 @@
  	SOUND_DRIVERS="$SOUND_DRIVERS soundsdl.o"
  fi
  
@@ -11,7 +10,7 @@ $NetBSD: patch-ac,v 1.8 2001/02/26 22:13:35 tron Exp $
  for ac_hdr in linux/soundcard.h machine/soundcard.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-@@ -4745,6 +4747,7 @@
+@@ -4753,6 +4755,7 @@
    echo "$ac_t""no" 1>&6
  fi
  done
@@ -19,7 +18,16 @@ $NetBSD: patch-ac,v 1.8 2001/02/26 22:13:35 tron Exp $
  
  for ac_hdr in dmedia/audio.h
  do
-@@ -5326,7 +5329,7 @@
+@@ -5300,7 +5303,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lesd $SOUND_LIBS $LIBS"
++LIBS="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lesd $SOUND_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 5306 "configure"
+ #include "confdefs.h"
+@@ -5334,7 +5337,7 @@
  #define $ac_tr_lib 1
  EOF
  
@@ -28,16 +36,16 @@ $NetBSD: patch-ac,v 1.8 2001/02/26 22:13:35 tron Exp $
  
  else
    echo "$ac_t""no" 1>&6
-@@ -5826,7 +5829,7 @@
+@@ -5834,7 +5837,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lreadline  $LIBS"
-+LIBS="-ledit -ltermcap  $LIBS"
++LIBS="-ledit -ltermcap $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 5832 "configure"
+ #line 5840 "configure"
  #include "confdefs.h"
-@@ -5854,7 +5857,7 @@
+@@ -5862,7 +5865,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -46,30 +54,29 @@ $NetBSD: patch-ac,v 1.8 2001/02/26 22:13:35 tron Exp $
  else
    echo "$ac_t""no" 1>&6
   
-@@ -6360,7 +6363,7 @@
+@@ -6449,7 +6452,7 @@
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
      case "`(uname -sr) 2>/dev/null`" in
 -    "SunOS 5"*)
 +    "SunOS 5"*|"NetBSD "*)
        echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
- echo "configure:6366: checking whether -R must be followed by a space" >&5
+ echo "configure:6455: checking whether -R must be followed by a space" >&5
        ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-@@ -7412,7 +7415,7 @@
+@@ -7501,7 +7504,7 @@
  
    fi
  
 -
 +if false; then
    echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6
- echo "configure:7418: checking for XpmCreatePixmapFromData in -lXpm" >&5
+ echo "configure:7507: checking for XpmCreatePixmapFromData in -lXpm" >&5
  ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'`
-@@ -7457,7 +7460,7 @@
+@@ -7545,6 +7548,7 @@
+  
  else
    echo "$ac_t""no" 1>&6
- fi
--
 +fi
+ fi
+ 
  
-   if test x"$MISSING_X_LIBS" != "x"; then
-     echo
diff --git a/emulators/vice/patches/patch-ad b/emulators/vice/patches/patch-ad
index 5d102435562..409b9a2b0d4 100644
--- a/emulators/vice/patches/patch-ad
+++ b/emulators/vice/patches/patch-ad
@@ -1,17 +1,19 @@
-$NetBSD: patch-ad,v 1.4 2000/08/27 14:08:35 wiz Exp $
-
---- src/arch/unix/c64ui.c.orig	Thu Jul 20 23:49:46 2000
-+++ src/arch/unix/c64ui.c
-@@ -448,6 +448,12 @@
- static ui_menu_entry_t c64_romset_submenu[] = {
+$NetBSD: patch-ad,v 1.5 2001/08/01 22:16:46 kristerw 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 @@
      { N_("Load default ROMs"),
-       (ui_callback_t) ui_set_romset, (ui_callback_data_t)"default.vrs", NULL },
+       (ui_callback_t)ui_set_romset,
+       (ui_callback_data_t)"default.vrs", NULL },
 +    { N_("C64 Game System (GS)"),
-+      (ui_callback_t) ui_set_romset, (ui_callback_data_t)"64gs.vrs", NULL },
++      (ui_callback_t)ui_set_romset,
++      (ui_callback_data_t)"64gs.vrs", NULL },
 +    { N_("Educator 64 (4064)"),
-+      (ui_callback_t) ui_set_romset, (ui_callback_data_t)"4064.vrs", NULL },
++      (ui_callback_t)ui_set_romset,
++      (ui_callback_data_t)"4064.vrs", NULL },
 +    { N_("SX-64"),
-+      (ui_callback_t) ui_set_romset, (ui_callback_data_t)"sx64.vrs", NULL },
++      (ui_callback_t)ui_set_romset,
++      (ui_callback_data_t)"sx64.vrs", NULL },
      { "--" },
      { N_("Load new kernal ROM"),
-       (ui_callback_t) ui_load_rom_file, (ui_callback_data_t)"KernalName", NULL },
+       (ui_callback_t)ui_load_rom_file,
diff --git a/emulators/vice/pkg/PLIST b/emulators/vice/pkg/PLIST
index eb5b6793a14..475f133c59d 100644
--- a/emulators/vice/pkg/PLIST
+++ b/emulators/vice/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2001/02/25 19:35:53 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/08/01 22:16:47 kristerw Exp $
 bin/c1541
 bin/petcat
 bin/vsid
@@ -7,6 +7,16 @@ bin/x64
 bin/xcbm2
 bin/xpet
 bin/xvic
+include/resid/siddefs.h
+include/resid/sid.h
+include/resid/voice.h
+include/resid/wave.h
+include/resid/envelope.h
+include/resid/filter.h
+include/resid/extfilt.h
+include/resid/pot.h
+include/resid/spline.h
+@dirrm include/resid
 @unexec install-info --delete %D/info/vice.info %D/info/dir
 info/vice.info
 info/vice.info-1
@@ -47,8 +57,10 @@ share/doc/vice/drive_info.txt
 share/doc/vice/mon.txt
 share/doc/vice/serial.txt
 share/vice/C128/basic
+share/vice/C128/basic64
 share/vice/C128/c64s.vpl
 share/vice/C128/ccs64.vpl
+share/vice/C128/charg64
 share/vice/C128/chargen
 share/vice/C128/default.vkm
 share/vice/C128/default.vpl
@@ -56,10 +68,12 @@ share/vice/C128/default.vrs
 share/vice/C128/frodo.vpl
 share/vice/C128/godot.vpl
 share/vice/C128/kernal
+share/vice/C128/kernal64
 share/vice/C128/os2.vkm
 share/vice/C128/pc64.vpl
 share/vice/C128/position.vkm
 share/vice/C128/vdc_deft.vpl
+share/vice/C128/vice.vpl
 share/vice/C128/z80bios
 share/vice/C64/basic
 share/vice/C64/c64s.vpl
@@ -75,6 +89,7 @@ share/vice/C64/os2.vkm
 share/vice/C64/os2_sym.vkm
 share/vice/C64/pc64.vpl
 share/vice/C64/position.vkm
+share/vice/C64/vice.vpl
 share/vice/C64/4064.vrs
 share/vice/C64/64gs.vrs
 share/vice/C64/basic.64gs
@@ -85,16 +100,26 @@ share/vice/C64/sx64.vrs
 share/vice/CBM-II/amber.vpl
 share/vice/CBM-II/basic.128
 share/vice/CBM-II/basic.256
+share/vice/CBM-II/basic.500
 share/vice/CBM-II/busi_uk.vkm
+share/vice/CBM-II/c64s.vpl
+share/vice/CBM-II/ccs64.vpl
+share/vice/CBM-II/chargen.500
 share/vice/CBM-II/chargen.600
 share/vice/CBM-II/chargen.700
 share/vice/CBM-II/default.vpl
+share/vice/CBM-II/frodo.vpl
+share/vice/CBM-II/godot.vpl
+share/vice/CBM-II/green.vpl
 share/vice/CBM-II/kernal
+share/vice/CBM-II/kernal.500
 share/vice/CBM-II/os2.vkm
+share/vice/CBM-II/pc64.vpl
 share/vice/CBM-II/rom128h.vrs
 share/vice/CBM-II/rom128l.vrs
 share/vice/CBM-II/rom256h.vrs
 share/vice/CBM-II/rom256l.vrs
+share/vice/CBM-II/rom500.vrs
 share/vice/CBM-II/white.vpl
 share/vice/DRIVES/d1541II
 share/vice/DRIVES/dos1001
@@ -113,7 +138,6 @@ share/vice/PET/busi_de.vkm
 share/vice/PET/busi_uk.vkm
 share/vice/PET/chargen
 share/vice/PET/chargen.de
-share/vice/PET/default.vpl
 share/vice/PET/edit1g
 share/vice/PET/edit2b
 share/vice/PET/edit2g
@@ -121,6 +145,7 @@ share/vice/PET/edit4b40
 share/vice/PET/edit4b80
 share/vice/PET/edit4g40
 share/vice/PET/graphics.vkm
+share/vice/PET/green.vpl
 share/vice/PET/kernal1
 share/vice/PET/kernal2
 share/vice/PET/kernal4
@@ -134,6 +159,9 @@ share/vice/PET/rom4b40.vrs
 share/vice/PET/rom4b80.vrs
 share/vice/PET/rom4g40.vrs
 share/vice/PET/white.vpl
+share/vice/PRINTER/cbm1526
+share/vice/PRINTER/mps801
+share/vice/PRINTER/mps803
 share/vice/VIC20/basic
 share/vice/VIC20/chargen
 share/vice/VIC20/default.vkm
@@ -151,6 +179,7 @@ share/vice/fonts/vice-cbm.pcf
 @dirrm share/vice/CBM-II
 @dirrm share/vice/DRIVES
 @dirrm share/vice/PET
+@dirrm share/vice/PRINTER
 @dirrm share/vice/VIC20
 @dirrm share/vice/fonts
 @dirrm share/vice