Update vice to 1.13.

Changes since 1.12 include:
** General
- Added new Scale2x render.
- Fixed NMI line emulation bug.

** C64 changes
- Better processor port initialization (some carts depend on this)
- Fixed a bug reading old snapshot files.
- Added SS5 CRT support and fixed the SS5 screen distortion bug.

** C128 changes
- Fixed some fast IEC bus related drive bugs
- Added some opcodes to the Z80 emulation.

** PLUS4 changes
- Many TED fixes.
- User port parallel cable.

** VIC-II
- The character ROM is now displayed in bitmap mode.
- Fixed some minor DMA timing, ECM mode and sprite bugs.

** SID changes
- New HardSID support.
- Catweasel support should work now.

** Unix changes
- ACIA emulation has been fixed.

4 files changed, 26 insertions, 16 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 3d53640410f..f20f3629f7b 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2003/08/09 10:49:07 seb Exp $
+# $NetBSD: Makefile,v 1.36 2003/09/28 10:41:21 kristerw Exp $
 #
 
-DISTNAME=		vice-1.12
-PKGREVISION=		1
+DISTNAME=		vice-1.13
 CATEGORIES=		emulators
 MASTER_SITES=		ftp://ftp.funet.fi/pub/cbm/firmware/computers/c64/ \
 			ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/ \
@@ -73,12 +72,6 @@ post-install:
 .include "../../devel/readline/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
-#.include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
-
-# This is the emulator's recommended setting.  We place it last so that it
-# overrides other CFLAGS settings.
-#
-CFLAGS+=		-O5 -finline-functions
diff --git a/emulators/vice/PLIST b/emulators/vice/PLIST
index 145ecba9d8f..211afd682be 100644
--- a/emulators/vice/PLIST
+++ b/emulators/vice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/06/30 12:06:09 seb Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/09/28 10:41:21 kristerw Exp $
 bin/c1541
 bin/petcat
 bin/vsid
@@ -15,7 +15,6 @@ info/vice.info-3
 info/vice.info-4
 info/vice.info-5
 info/vice.info-6
-info/vice.info-7
 man/man1/c1541.1
 man/man1/petcat.1
 man/man1/vice.1
@@ -50,11 +49,9 @@ 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
@@ -65,6 +62,7 @@ share/vice/C128/basichi
 share/vice/C128/basiclo
 share/vice/C128/beos_pos.vkm
 share/vice/C128/beos_sym.vkm
+share/vice/C128/c64hq.vpl
 share/vice/C128/c64s.vpl
 share/vice/C128/ccs64.vpl
 share/vice/C128/chargde
@@ -99,6 +97,7 @@ share/vice/C64/basic
 share/vice/C64/basic.64gs
 share/vice/C64/beos_pos.vkm
 share/vice/C64/beos_sym.vkm
+share/vice/C64/c64hq.vpl
 share/vice/C64/c64mem.sym
 share/vice/C64/c64s.vpl
 share/vice/C64/ccs64.vpl
@@ -126,13 +125,16 @@ 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/beos_bukp.vkm
 share/vice/CBM-II/beos_buks.vkm
+share/vice/CBM-II/c64hq.vpl
 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/dos_bukp.vkm
 share/vice/CBM-II/dos_buks.vkm
 share/vice/CBM-II/frodo.vpl
 share/vice/CBM-II/godot.vpl
@@ -147,6 +149,7 @@ 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/CBM-II/win_bukp.vkm
 share/vice/CBM-II/win_buks.vkm
 share/vice/CBM-II/x11_buks.vkm
 share/vice/DRIVES/d1541II
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index ff1deb13121..057169105c5 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.9 2003/06/23 19:05:10 kristerw Exp $
+$NetBSD: distinfo,v 1.10 2003/09/28 10:41:21 kristerw Exp $
 
-SHA1 (vice-1.12.tar.gz) = 1b579393b914d736c6522fef4c12e1c39b4f4cb3
-Size (vice-1.12.tar.gz) = 3537855 bytes
+SHA1 (vice-1.13.tar.gz) = 0d6e92860afd8854680af7cbb3445ed0352fd692
+Size (vice-1.13.tar.gz) = 3599738 bytes
 SHA1 (64gs.390852-01.bin) = 21940ef5f1bfe67d7537164f7ca130a1095b067a
 Size (64gs.390852-01.bin) = 16384 bytes
 SHA1 (kernal.4064.901246-01.bin) = 6c4fa9465f6091b174df27dfe679499df447503c
 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-aa) = fa152c1d14aad31c0b50fe96c83b4e5cfa06de5f
 SHA1 (patch-ab) = 0be2ec8b98a50e5c879095b1d0327c802b7740e2
 SHA1 (patch-ad) = 6b934d8101bd2b88994115975fd87c3c20d0852e
 SHA1 (patch-ae) = c2ede31953ebaf033c9ae1aa1985012fb0e5f3b6
diff --git a/emulators/vice/patches/patch-aa b/emulators/vice/patches/patch-aa
new file mode 100644
index 00000000000..08cf6020f47
--- /dev/null
+++ b/emulators/vice/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.4 2003/09/28 10:41:21 kristerw Exp $
+--- src/arch/unix/types.h.orig	Sun Sep 28 12:29:23 2003
++++ src/arch/unix/types.h	Sun Sep 28 12:31:06 2003
+@@ -60,7 +60,8 @@
+ /* Maximum value of a CLOCK.  */
+ #define CLOCK_MAX (~((CLOCK)0))
+ 
+-#if defined(__GNUC__) && defined(__i386__) && !defined(NO_REGPARM)
++/* GCC 2.95 has code gen problems with regparam(). */
++#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__i386__) && !defined(NO_REGPARM)
+ #define REGPARM1 __attribute__((regparm(1)))
+ #define REGPARM2 __attribute__((regparm(2)))
+ #define REGPARM3 __attribute__((regparm(3)))