vice updated to 1.2. Now compiles with SUN audio system, instead

of OSS. From the ChangeLog (changes since 1.0):

* Changes in VICE 1.2
=====================
** C64 changes
---------------
- Epyx Fastload and Westermann Learning Cartridges are supported now.

** C128 changes
---------------
- The VDC hardware cursor has been implemented.
- The machine can boot up in Z80 mode now.  However CP/M does not work
  currently.

** PET changes
---------------
- The CRTC emulation has been made pretty cycle-exact. You can now
  use timed raster effects.

** CBM-II changes
---------------
- The CRTC emulation has been made pretty cycle-exact. You can now
  use timed raster effects.

** Drive changes
----------------
- D64 images with error codes are supported now.
- The virtual drive emulation can process filenames containing zero
  bytes now.- The virtual drive commandline parser has been improved.
- The fsdevice and the virtual drive emulation support memory read
  commands now.
- Invalid scratch commands do not crash the fsdevice emulation.

** Unix changes
---------------
- C64/C128 NTSC support (experimental).

** MS-DOS changes
-----------------
- VDC grafic mode does not crash the emulator any more.

** MS-Windows changes
---------------------
- New mouse emulation.
- C64/C128 NTSC support (experimental).
- The datasette status is displayed now.
- Changing the palette works on-the-fly now.
- A new VIC20 settings dialog.

** OS/2 changes
---------------
- Sound, drive and joystick settings are implemented now.


* Changes in VICE 1.1
=====================

** General changes
------------------
- The datasette emulation supports saving to TAP images now.
- Autostarting TAP tape images has been improved.
- A command line option feeding the keyboard buffer on startup has
  been added.

** C64 changes
---------------
- Fixed a bug in the REU emulation.  GoDot now works.
- Atomic Power cartridge is supported now.

** C128 changes
---------------
- 80 column screen is emulated now.  Currently the hardware cursor
  is missing, but Infocom adventures and GEOS128 work.
- REU emulation is available now.
- Fixed an IO banking bug.

** VIC20 changes
----------------
- New datasette emulation.
- True 1581 emulation works now.

** PET changes
--------------
- New datasette emulation.

** CBM-II changes
-----------------
- New datasette emulation.

** Drive changes
----------------
- New 8050, 8250 and SFD1001 emulation using D80 and D82 disk images.
- The virtual drive emulation, image contents lister and monitor block
  commands fully support G64 disk images.

** C1541 changes
----------------
- G64 disk image format is fully supported now.

** Unix changes
---------------
- A dialog for creating empty disk images has been added.
- The name of currently attached disk images is displayed now.
- The disk image flip list can be maintained by a separate menu by
  clicking on the status bar.

** MS-Windows changes
---------------------
- Run/Stop key is also present at ESC key, but it's still present at
  CAPS/LOCK, altough the latter doesn't work on Win98 with German and
  French keyboard layouts.
- There is a disk/tape image contents lister now.
- The RESTORE key is present now (PAGE UP).
- Browse button in the device manager dialog works now.

** Miscellaneous changes
------------------------
- The `$xx' feature for specifying hexcodes on the command-line now
  works correctly.
- Some P00 wildcard bug has been fixed.
- An image content lister crash has been fixed.


* Changes in VICE 1.0a
======================

** MS-DOS changes
-----------------
- x64 does not crash on start-up anymore.
- Calling the emulator from a relative path works again.
- 1541-II firmware is found now.

9 files changed, 71 insertions, 58 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 0c6b4081c43..3475625c15f 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 1999/12/29 01:41:01 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2000/02/08 03:44:16 wiz Exp $
 
-DISTNAME=		vice-1.0
+DISTNAME=		vice-1.2
 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/files/md5 b/emulators/vice/files/md5
index 03471858dc4..6a409cdb20d 100644
--- a/emulators/vice/files/md5
+++ b/emulators/vice/files/md5
@@ -1,6 +1,6 @@
-$NetBSD: md5,v 1.3 1999/05/18 08:45:48 tv Exp $
+$NetBSD: md5,v 1.4 2000/02/08 03:44:17 wiz Exp $
 
-MD5 (vice-1.0.tar.gz) = ac0302262270fec358a1c89bfb008e82
+MD5 (vice-1.2.tar.gz) = b082f24c4b49558b0cfaa3162a880712
 MD5 (64gs.390852-01.bin) = 049e657afafbdd802e8c6a4f88f3d730
 MD5 (kernal.4064.901246-01.bin) = da92801e3a03b005b746a4dd0b639c7c
 MD5 (kernal.sx.251104-04.bin) = 187b8c713b51931e070872bd390b472a
diff --git a/emulators/vice/files/patch-sum b/emulators/vice/files/patch-sum
index c995f33b1a6..1a242eab6df 100644
--- a/emulators/vice/files/patch-sum
+++ b/emulators/vice/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 1999/07/27 08:38:36 mycroft Exp $
+$NetBSD: patch-sum,v 1.3 2000/02/08 03:44:17 wiz Exp $
 
 MD5 (patch-aa) = 27c778f553a11ad4fcb670a5d6d66654
-MD5 (patch-ab) = 5ee9680144f56f234d7d8dd6d0e7ecaf
-MD5 (patch-ac) = d9a30b1ccd310efe38cd85d12d046919
-MD5 (patch-ad) = bbe89876a3511fc2a077c93d76c5a907
+MD5 (patch-ab) = a95183ca3de00e25dddbaa95c098303a
+MD5 (patch-ac) = 23188f297510a8da86f9cd8f903e64ac
+MD5 (patch-ad) = b884384c4151466f6d59e9f3f3371808
diff --git a/emulators/vice/patches/patch-ab b/emulators/vice/patches/patch-ab
index 86f87672574..a3fe6f809f8 100644
--- a/emulators/vice/patches/patch-ab
+++ b/emulators/vice/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.2 1999/05/18 08:45:48 tv Exp $
+$NetBSD: patch-ab,v 1.3 2000/02/08 03:44:17 wiz Exp $
 
---- src/arch/unix/archdep.h.orig	Sun Mar 14 09:19:29 1999
-+++ src/arch/unix/archdep.h	Tue May 18 02:28:26 1999
-@@ -43,8 +43,8 @@
- #define MODE_APPEND "w+"
+--- ./src/arch/unix/archdep.h.orig	Tue Nov 16 16:19:50 1999
++++ ./src/arch/unix/archdep.h	Sun Feb  6 22:25:33 2000
+@@ -51,8 +51,8 @@
+ #define MODE_APPEND_READ_WRITE "a+"
  
  /* Define the default system directory (where the ROMs are).  */
 -#define LIBDIR          PREFIX "/lib/vice"
@@ -12,4 +12,4 @@ $NetBSD: patch-ab,v 1.2 1999/05/18 08:45:48 tv Exp $
 +#define DOCDIR          PREFIX "/share/doc/vice"
  #define VICEUSERDIR     ".vice"
  
- int archdep_startup(int *argc, char **argv);
+ extern const char *archdep_home_path(void);
diff --git a/emulators/vice/patches/patch-ac b/emulators/vice/patches/patch-ac
index 1f9b837753e..b87be4b8610 100644
--- a/emulators/vice/patches/patch-ac
+++ b/emulators/vice/patches/patch-ac
@@ -1,26 +1,25 @@
-$NetBSD: patch-ac,v 1.3 1999/07/27 08:38:37 mycroft Exp $
+$NetBSD: patch-ac,v 1.4 2000/02/08 03:44:18 wiz Exp $
 
---- configure.orig	Sat Apr 24 14:11:32 1999
-+++ configure	Tue Jul 27 04:35:03 1999
-@@ -4841,14 +4841,14 @@
-   if test x"$with_readline" != "xno" ; then
-     READLINE=""
-     unset ac_cv_lib_readline_readline
--    echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
--echo "configure:4846: checking for readline in -lreadline" >&5
-+    echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
-+echo "configure:4846: checking for readline in -ledit" >&5
- ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lreadline  $LIBS"
-+LIBS="-ledit -ltermcap $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 4854 "configure"
- #include "confdefs.h"
-@@ -4876,7 +4876,7 @@
+--- ./configure.orig	Wed Nov 24 00:41:27 1999
++++ ./configure	Tue Feb  8 04:04:41 2000
+@@ -3990,6 +3990,8 @@
+ 
+ SOUND_DRIVERS=""
+ 
++# we don't want to find OSS emulation, let's use NetBSD's own interface
++if false; then
+ for ac_hdr in linux/soundcard.h machine/soundcard.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+@@ -4029,6 +4031,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ done
++fi
+ 
+ for ac_hdr in dmedia/audio.h
+ do
+@@ -5223,7 +5226,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -29,25 +28,25 @@ $NetBSD: patch-ac,v 1.3 1999/07/27 08:38:37 mycroft Exp $
  else
    echo "$ac_t""no" 1>&6
   
-@@ -5243,7 +5243,7 @@
+@@ -5590,7 +5593,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:5249: checking whether -R must be followed by a space" >&5
+ echo "configure:5596: checking whether -R must be followed by a space" >&5
        ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-@@ -6295,7 +6295,7 @@
+@@ -6642,7 +6645,7 @@
  
    fi
  
 -
 +if false; then
    echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6
- echo "configure:6301: checking for XpmCreatePixmapFromData in -lXpm" >&5
+ echo "configure:6648: checking for XpmCreatePixmapFromData in -lXpm" >&5
  ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'`
-@@ -6340,7 +6340,7 @@
+@@ -6687,7 +6690,7 @@
  else
    echo "$ac_t""no" 1>&6
  fi
diff --git a/emulators/vice/patches/patch-ad b/emulators/vice/patches/patch-ad
index 0200b6671a0..0aac1b23dc1 100644
--- a/emulators/vice/patches/patch-ad
+++ b/emulators/vice/patches/patch-ad
@@ -1,13 +1,10 @@
-$NetBSD: patch-ad,v 1.2 1999/05/18 08:45:49 tv Exp $
+$NetBSD: patch-ad,v 1.3 2000/02/08 03:44:18 wiz Exp $
 
---- src/arch/unix/xaw/c64ui.c.orig	Tue May 18 04:31:52 1999
-+++ src/arch/unix/xaw/c64ui.c	Tue May 18 04:33:17 1999
-@@ -342,8 +342,14 @@
- /* ------------------------------------------------------------------------- */
- 
+--- ./src/arch/unix/x11/xaw/c64ui.c.orig	Sat Oct  2 23:05:26 1999
++++ ./src/arch/unix/x11/xaw/c64ui.c	Sun Feb  6 22:23:11 2000
+@@ -368,6 +368,12 @@
  static ui_menu_entry_t c64_romset_submenu[] = {
--    { "default ROMs",
-+    { "Default ROMs",
+     { "Load default ROMs",
        (ui_callback_t) ui_set_romset, (ui_callback_data_t)"default.vrs", NULL },
 +    { "C64 Game System (GS)",
 +      (ui_callback_t) ui_set_romset, (ui_callback_data_t)"64gs.vrs", NULL },
diff --git a/emulators/vice/pkg/COMMENT b/emulators/vice/pkg/COMMENT
index 211bc9eceb8..e8627f2d1c3 100644
--- a/emulators/vice/pkg/COMMENT
+++ b/emulators/vice/pkg/COMMENT
@@ -1 +1 @@
-Emulator for C64, C128, CBM-II, PET, and VIC-20
+Emulator for C64, C128, CBM-II, PET, and VIC20
diff --git a/emulators/vice/pkg/DESCR b/emulators/vice/pkg/DESCR
index dfa023f4723..635567da297 100644
--- a/emulators/vice/pkg/DESCR
+++ b/emulators/vice/pkg/DESCR
@@ -1,6 +1,18 @@
-VICE is a Versatile Commodore Emulator, i.e. a program that runs on a Unix
-or MS-DOS/Windows 95 machine and executes programs intended for the old
-8-bit Commodore computers. The current version emulates the C64, the C128
-(save the 80 columns screen), the VIC20, the CBM-II line (B128, B256), and
-all the PET models (except the SuperPET 9000, which is out of line
-anyway).
+VICE is the one and only Versatile Commodore Emulator. It provides
+emulation of the Commodore 64, 128, VIC20 and PET 8-bit computers
+within a single package. The emulators run as separate programs, but
+have the same user interface, share the same settings and support the
+same file formats.
+
+All the emulators provide an accurate 6502/6510 emulator, with
+emulation of all the opcodes (both documented and undocumented ones)
+and accurate timing. Unlike other emulators, VICE aims to be cycle
+accurate; it tries to emulate chip timings as precisely as possible
+and does so efficiently.
+
+Please do not expect the VIC20, C128 and PET emulators to be as good
+as the C64 one, as they are still under construction.
+
+The current version emulates the C64, the C128 (save the 80 columns
+screen, 2MHz and C64 mode), the VIC20, the CBM-II line (B128, B256),
+and all the PET models.
diff --git a/emulators/vice/pkg/PLIST b/emulators/vice/pkg/PLIST
index ec7b86093e6..ba368b8230d 100644
--- a/emulators/vice/pkg/PLIST
+++ b/emulators/vice/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1999/05/18 08:45:51 tv Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/02/08 03:44:18 wiz Exp $
 bin/c1541
 bin/petcat
 bin/x128
@@ -13,6 +13,7 @@ info/vice.info-2
 info/vice.info-3
 info/vice.info-4
 info/vice.info-5
+info/vice.info-6
 @exec install-info %D/info/vice.info %D/info/dir
 man/man1/c1541.1
 man/man1/petcat.1
@@ -43,6 +44,7 @@ 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/Win32-Howto.txt
 share/vice/C128/basic
 share/vice/C128/chargen
 share/vice/C128/c64s.vpl
@@ -55,6 +57,8 @@ share/vice/C128/godot.vpl
 share/vice/C128/kernal
 share/vice/C128/pc64.vpl
 share/vice/C128/position.vkm
+share/vice/C128/vdc_deft.vpl
+share/vice/C128/z80bios
 share/vice/C64/4064.vrs
 share/vice/C64/64gs.vrs
 share/vice/C64/basic
@@ -87,8 +91,9 @@ share/vice/CBM-II/rom128l.vrs
 share/vice/CBM-II/rom256h.vrs
 share/vice/CBM-II/rom256l.vrs
 share/vice/CBM-II/white.vpl
+share/vice/DRIVES/d1541II
+share/vice/DRIVES/dos1001
 share/vice/DRIVES/dos1541
-share/vice/DRIVES/dos1541II
 share/vice/DRIVES/dos1571
 share/vice/DRIVES/dos1581
 share/vice/DRIVES/dos2031