Update to 1.5. Changes since 1.2:

** General changes
- Screenshots can be saved now.
- Fixed slowdown bug with flickering drive led.
** C128 changes
- The Z80 emulation has been improved.  CP/M will boot now.
- The VDC can display flashing and reverse text attributes now.
** C64 changes
- Fixed crash caused by VIC-II memory corruption.
- Expert cartridge is emulated now.
- Some NTSC fixes. Now the border looks a bit small, but most NTSC
  programs should work.
- Fixed CIA TOD initialization.
- Super Snapshot V5 and REX fastload carts are emulated now.
- The REU emulation has been improved.
- Sprites in non-visible parts of the screen should not crash the
  emulator anymore.
- A sprite snapshot bug has been fixed.
** VIC20 changes
- Fixed VIC crash.
- Fixed VIC display bug.
** Unix changes
- Palette changes work better now.
- Added support for gettext based national language support.
  Initial german translation for Unix based UIs is provided.
- NTSC timing is correct now (100% 60fps).
- The emulator keeps running when menus are used.
- Fixed some crashs and memory leaks in the XAW file selector
  widget.
- New GNOME port of VICE. (not activated in package)
- G64 images can be created now.
** Drive changes
- Fixed a bug in the 1581 true drive emulation that prevented the
  use as drive #9.
- Fixed a bug in the 8050 vdrive emulaton.
- Fixed a bug that caused drive #8 to be diabled if file system
  access for drive #11 is disabled and all disks are detached.
- Fixed IEC initialization bug that broke true drive emulation.
- D71 BAM calculation has been fixed.
- A drive RAM expansion is available now.
- New 2040, 3040 and 4040 disk drive support.
** Tape changes
- Now saving TAPs should work for big endian machines too.
** Miscellaneous changes
- The REU can be used with Super Snapshot 5 or Expert Cartridge.
- The monitor "z" command has been fixed.
- Fixed some tape counter bugs.
- Fixed a crash with ZIP archives.
- Fixed a bug that prevented writing to gzipped disk images.
- Fixed a crash if the image content lister is used on disk images
  with many files.
- There is some experimental read only REL file support in the vdrive
  emulation now.

8 files changed, 45 insertions, 50 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 4b7cbbf6090..99756f16b4b 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2000/08/18 22:46:33 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 2000/08/27 14:08:31 wiz Exp $
 
-DISTNAME=		vice-1.2
+DISTNAME=		vice-1.5
 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 6a409cdb20d..7fb8ca0819a 100644
--- a/emulators/vice/files/md5
+++ b/emulators/vice/files/md5
@@ -1,6 +1,6 @@
-$NetBSD: md5,v 1.4 2000/02/08 03:44:17 wiz Exp $
+$NetBSD: md5,v 1.5 2000/08/27 14:08:32 wiz Exp $
 
-MD5 (vice-1.2.tar.gz) = b082f24c4b49558b0cfaa3162a880712
+MD5 (vice-1.5.tar.gz) = cbb32e2773383eb5fed588870729a3a3
 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 6ba409b8043..00440b3a8ad 100644
--- a/emulators/vice/files/patch-sum
+++ b/emulators/vice/files/patch-sum
@@ -1,6 +1,5 @@
-$NetBSD: patch-sum,v 1.4 2000/02/08 11:37:54 tron Exp $
+$NetBSD: patch-sum,v 1.5 2000/08/27 14:08:33 wiz Exp $
 
-MD5 (patch-aa) = 27c778f553a11ad4fcb670a5d6d66654
-MD5 (patch-ab) = a95183ca3de00e25dddbaa95c098303a
-MD5 (patch-ac) = a7f53417c53e63e09fa80b9d92ad9bbf
-MD5 (patch-ad) = b884384c4151466f6d59e9f3f3371808
+MD5 (patch-ab) = cd1c9d2234a11a065620b05b730966f5
+MD5 (patch-ac) = 4f78c99e5da98c5344cb75cb71520c16
+MD5 (patch-ad) = 238e2f75e54ac47a68538be8f75bf366
diff --git a/emulators/vice/patches/patch-aa b/emulators/vice/patches/patch-aa
deleted file mode 100644
index 3cf4a667924..00000000000
--- a/emulators/vice/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/05/18 08:45:48 tv Exp $
-
---- src/resid/Makefile.in.orig	Mon May 17 17:51:36 1999
-+++ src/resid/Makefile.in	Mon May 17 17:51:46 1999
-@@ -290,7 +290,7 @@
- install-data: install-pkgincludeHEADERS
- 	@$(NORMAL_INSTALL)
- 
--install: install-exec install-data all
-+install: all
- 	@:
- 
- uninstall: uninstall-libLIBRARIES uninstall-pkgincludeHEADERS
diff --git a/emulators/vice/patches/patch-ab b/emulators/vice/patches/patch-ab
index a3fe6f809f8..22e54ef531f 100644
--- a/emulators/vice/patches/patch-ab
+++ b/emulators/vice/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2000/02/08 03:44:17 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2000/08/27 14:08:35 wiz Exp $
 
---- ./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
+--- src/arch/unix/archdep.h.orig	Tue Nov 16 16:19:50 1999
++++ src/arch/unix/archdep.h
 @@ -51,8 +51,8 @@
  #define MODE_APPEND_READ_WRITE "a+"
  
diff --git a/emulators/vice/patches/patch-ac b/emulators/vice/patches/patch-ac
index 5a56b44667e..da67619d268 100644
--- a/emulators/vice/patches/patch-ac
+++ b/emulators/vice/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.5 2000/02/08 11:37:55 tron Exp $
+$NetBSD: patch-ac,v 1.6 2000/08/27 14:08:35 wiz Exp $
 
---- configure.orig	Wed Nov 24 00:41:27 1999
-+++ configure	Tue Feb  8 12:22:00 2000
-@@ -3990,6 +3990,8 @@
+--- configure.orig	Tue Jul 25 00:02:45 2000
++++ configure
+@@ -4565,6 +4565,8 @@
  
  SOUND_DRIVERS=""
  
+ if test "x$is_dos" != "xyes"; then
 +# 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 @@
+@@ -4605,6 +4607,7 @@
    echo "$ac_t""no" 1>&6
  fi
  done
@@ -19,16 +19,16 @@ $NetBSD: patch-ac,v 1.5 2000/02/08 11:37:55 tron Exp $
  
  for ac_hdr in dmedia/audio.h
  do
-@@ -5195,7 +5198,7 @@
+@@ -5776,7 +5779,7 @@
    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 5201 "configure"
+ #line 5782 "configure"
  #include "confdefs.h"
-@@ -5223,7 +5226,7 @@
+@@ -5804,7 +5807,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -37,25 +37,25 @@ $NetBSD: patch-ac,v 1.5 2000/02/08 11:37:55 tron Exp $
  else
    echo "$ac_t""no" 1>&6
   
-@@ -5590,7 +5593,7 @@
+@@ -6310,7 +6313,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:5596: checking whether -R must be followed by a space" >&5
+ echo "configure:6316: checking whether -R must be followed by a space" >&5
        ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-@@ -6642,7 +6645,7 @@
+@@ -7362,7 +7365,7 @@
  
    fi
  
 -
 +if false; then
    echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6
- echo "configure:6648: checking for XpmCreatePixmapFromData in -lXpm" >&5
+ echo "configure:7368: checking for XpmCreatePixmapFromData in -lXpm" >&5
  ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'`
-@@ -6687,7 +6690,7 @@
+@@ -7407,7 +7410,7 @@
  else
    echo "$ac_t""no" 1>&6
  fi
diff --git a/emulators/vice/patches/patch-ad b/emulators/vice/patches/patch-ad
index 0aac1b23dc1..5d102435562 100644
--- a/emulators/vice/patches/patch-ad
+++ b/emulators/vice/patches/patch-ad
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.3 2000/02/08 03:44:18 wiz Exp $
+$NetBSD: patch-ad,v 1.4 2000/08/27 14:08:35 wiz Exp $
 
---- ./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 @@
+--- 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[] = {
-     { "Load default ROMs",
+     { N_("Load default ROMs"),
        (ui_callback_t) ui_set_romset, (ui_callback_data_t)"default.vrs", NULL },
-+    { "C64 Game System (GS)",
++    { N_("C64 Game System (GS)"),
 +      (ui_callback_t) ui_set_romset, (ui_callback_data_t)"64gs.vrs", NULL },
-+    { "Educator 64 (4064)",
++    { N_("Educator 64 (4064)"),
 +      (ui_callback_t) ui_set_romset, (ui_callback_data_t)"4064.vrs", NULL },
-+    { "SX-64",
++    { N_("SX-64"),
 +      (ui_callback_t) ui_set_romset, (ui_callback_data_t)"sx64.vrs", NULL },
      { "--" },
-     { "Load new kernal ROM",
+     { N_("Load new kernal ROM"),
        (ui_callback_t) ui_load_rom_file, (ui_callback_data_t)"KernalName", NULL },
diff --git a/emulators/vice/pkg/PLIST b/emulators/vice/pkg/PLIST
index ba368b8230d..05f37eddf84 100644
--- a/emulators/vice/pkg/PLIST
+++ b/emulators/vice/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2000/02/08 03:44:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2000/08/27 14:08:36 wiz Exp $
 bin/c1541
 bin/petcat
+bin/vsid
 bin/x128
 bin/x64
 bin/xcbm2
@@ -24,7 +25,6 @@ share/doc/vice/PETdoc.txt
 share/doc/vice/Readme.dos
 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/vice_1.html
@@ -55,6 +55,7 @@ share/vice/C128/default.vpl
 share/vice/C128/default.vrs
 share/vice/C128/godot.vpl
 share/vice/C128/kernal
+share/vice/C128/os2.vkm
 share/vice/C128/pc64.vpl
 share/vice/C128/position.vkm
 share/vice/C128/vdc_deft.vpl
@@ -75,6 +76,7 @@ share/vice/C64/kernal
 share/vice/C64/kernal.4064
 share/vice/C64/kernal.64gs
 share/vice/C64/kernal.sx64
+share/vice/C64/os2.vkm
 share/vice/C64/pc64.vpl
 share/vice/C64/position.vkm
 share/vice/C64/sx64.vrs
@@ -97,6 +99,9 @@ share/vice/DRIVES/dos1541
 share/vice/DRIVES/dos1571
 share/vice/DRIVES/dos1581
 share/vice/DRIVES/dos2031
+share/vice/DRIVES/dos2040
+share/vice/DRIVES/dos3040
+share/vice/DRIVES/dos4040
 share/vice/PET/amber.vpl
 share/vice/PET/basic1
 share/vice/PET/basic2
@@ -130,7 +135,10 @@ share/vice/VIC20/default.vkm
 share/vice/VIC20/default.vpl
 share/vice/VIC20/default.vrs
 share/vice/VIC20/kernal
+share/vice/VIC20/os2.vkm
 share/vice/VIC20/position.vkm
+share/vice/fonts/fonts.dir
+share/vice/fonts/vice-cbm.pcf
 @dirrm share/doc/vice
 @dirrm share/vice/C128
 @dirrm share/vice/C64
@@ -138,4 +146,5 @@ share/vice/VIC20/position.vkm
 @dirrm share/vice/DRIVES
 @dirrm share/vice/PET
 @dirrm share/vice/VIC20
+@dirrm share/vice/fonts
 @dirrm share/vice