Update to 1.20:

* Changes in VICE 1.20
======================

** General
----------

- New GP2X port.

- New AmigaOS3, AmigaOS4, MorphOS and AROS (x86/ppc) ports.

- Mac OSX X11 port is included in the main distribution now.

- Fixed some unusual CPU opcodes.

** C64 changes
--------------

- Fixed some longstanding RMW to IO area VIC-II DMA timing bug.

- Added Mikro Assembler, Dela EP7x8, Dela EP256 and Rex EP256
  cart support.

- Fixed the KCS cart emulation.

- Added swiftlink and turbo232 support.

- Added +256k memory expansion support.

- Added I/O source read collision detection support, making
  simultanious use of multiple expansions possible, like on
  the real machine.

- Fixed the RR-net address decoding and REU compatibility.

- Fixed a problem with traps using the SX Kernal ROM.

- Some IDE64 ultimax bug has been fixed.

** PET changes
--------------

- Added 128kb REU memory expansion support.

** PLUS4 changes
----------------

- Added 256k csory memory expansion support.

- Added 256k, 1024k and 4096k hannes memory expansion support.

** Unix changes
---------------

- Gnome1 is no longer supported.

- Gnome2 is now supported - everthing except the Image preview with
  CBM font should work.

- Gnome 2 port supports dimmable drive LED now.

- Added experimental ParSID support.

- Added support for minix3.

- Fixed some compile problems with the ffmpeg library.

** MS-Windows changes
---------------------

- Added experimental ParSID support.

** MS-DOS changes
-----------------

- Added experimental ParSID support.

** Mac OSX X11 changes
----------------------

- Added support for Intel build.

- Added USB joystick support.

** Miscellaneous changes
------------------------

- Added support for more 3rd party basic extenders to petcat.

- Added a c64/c128 cartridge conversion program (cartconv).

- Added binary distribution (package) creation functionality.

- Fixed a bug in the trap emulation with caused programs probing
  devices on the IEC bus to fail.

- Lots of small fixes to the monitor.

12 files changed, 63 insertions, 262 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 69c3e055d94..bbf667bf569 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2006/12/27 13:37:36 joerg Exp $
+# $NetBSD: Makefile,v 1.72 2007/02/07 19:43:29 wiz Exp $
 #
 
-DISTNAME=		vice-1.19
+DISTNAME=		vice-1.20
 CATEGORIES=		emulators
 MASTER_SITES=		ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/ \
 			http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/
diff --git a/emulators/vice/PLIST b/emulators/vice/PLIST
index dbd21f85b40..fa9bf7c0afa 100644
--- a/emulators/vice/PLIST
+++ b/emulators/vice/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.17 2006/04/17 07:07:18 jlam Exp $
+@comment $NetBSD: PLIST,v 1.18 2007/02/07 19:43:29 wiz Exp $
 bin/c1541
+bin/cartconv
 bin/petcat
 bin/vsid
 bin/x128
@@ -17,7 +18,7 @@ share/doc/vice/BUGS
 share/doc/vice/COPYING
 share/doc/vice/MSDOS-Ethernet-Howto.txt
 share/doc/vice/MSDOS-Howto.txt
-share/doc/vice/MinixVmd-Howto.txt
+share/doc/vice/Minix-Howto.txt
 share/doc/vice/NEWS
 share/doc/vice/NLS-Howto.txt
 share/doc/vice/PETdoc.txt
@@ -27,6 +28,8 @@ share/doc/vice/ReadmeMacOSX.txt
 share/doc/vice/TODO
 share/doc/vice/Walkthrough-Howto.txt
 share/doc/vice/Win32-Howto.txt
+share/doc/vice/amigaos.html
+share/doc/vice/cartconv.txt
 share/doc/vice/cbm_basic_tokens.txt
 share/doc/vice/drive_info.txt
 share/doc/vice/iec-bus.txt
@@ -34,6 +37,7 @@ share/doc/vice/index.html
 share/doc/vice/mon.txt
 share/doc/vice/new.gif
 share/doc/vice/serial.txt
+share/doc/vice/solaris.html
 share/doc/vice/vice-logo.jpg
 share/doc/vice/vice_1.html
 share/doc/vice/vice_10.html
@@ -58,6 +62,8 @@ share/locale/it/LC_MESSAGES/vice.mo
 share/locale/nl/LC_MESSAGES/vice.mo
 share/locale/pl/LC_MESSAGES/vice.mo
 share/locale/sv/LC_MESSAGES/vice.mo
+share/vice/C128/amiga_pos.vkm
+share/vice/C128/amiga_sym.vkm
 share/vice/C128/basic64
 share/vice/C128/basichi
 share/vice/C128/basiclo
@@ -92,6 +98,8 @@ share/vice/C128/win_pos.vkm
 share/vice/C128/win_sym.vkm
 share/vice/C128/x11_pos.vkm
 share/vice/C128/x11_sym.vkm
+share/vice/C64/amiga_pos.vkm
+share/vice/C64/amiga_sym.vkm
 share/vice/C64/basic
 share/vice/C64/beos_pos.vkm
 share/vice/C64/beos_sym.vkm
@@ -117,6 +125,8 @@ share/vice/C64/win_sym_us.vkm
 share/vice/C64/x11_pos.vkm
 share/vice/C64/x11_sym.vkm
 share/vice/CBM-II/amber.vpl
+share/vice/CBM-II/amiga_bukp.vkm
+share/vice/CBM-II/amiga_buks.vkm
 share/vice/CBM-II/basic.128
 share/vice/CBM-II/basic.256
 share/vice/CBM-II/basic.500
@@ -160,6 +170,8 @@ share/vice/DRIVES/dos2040
 share/vice/DRIVES/dos3040
 share/vice/DRIVES/dos4040
 share/vice/PET/amber.vpl
+share/vice/PET/amiga_bgrs.vkm
+share/vice/PET/amiga_buks.vkm
 share/vice/PET/basic1
 share/vice/PET/basic2
 share/vice/PET/basic4
@@ -196,6 +208,8 @@ share/vice/PET/x11_bgrs.vkm
 share/vice/PET/x11_buks.vkm
 share/vice/PLUS4/3plus1hi
 share/vice/PLUS4/3plus1lo
+share/vice/PLUS4/amiga_pos.vkm
+share/vice/PLUS4/amiga_sym.vkm
 share/vice/PLUS4/basic
 share/vice/PLUS4/beos_pos.vkm
 share/vice/PLUS4/beos_sym.vkm
@@ -215,6 +229,8 @@ share/vice/PRINTER/mps801
 share/vice/PRINTER/mps803
 share/vice/PRINTER/mps803.vpl
 share/vice/PRINTER/nl10-cbm
+share/vice/VIC20/amiga_pos.vkm
+share/vice/VIC20/amiga_sym.vkm
 share/vice/VIC20/basic
 share/vice/VIC20/beos_pos.vkm
 share/vice/VIC20/beos_sym.vkm
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index f20e4c0f10b..026ec57eb5d 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,18 +1,11 @@
-$NetBSD: distinfo,v 1.28 2006/10/17 23:55:41 wiz Exp $
+$NetBSD: distinfo,v 1.29 2007/02/07 19:43:29 wiz Exp $
 
-SHA1 (vice-1.19.tar.gz) = 8620d891fa9de29eb21e334f3c7c8254e89e80a9
-RMD160 (vice-1.19.tar.gz) = d0a62750c30e3cf8645117a8e8536a8061c260ea
-Size (vice-1.19.tar.gz) = 4796181 bytes
-SHA1 (vice-1.19-gnome2.diff.gz) = 66c11e6e10886754a9a22c95d9d570dc00f57dad
-RMD160 (vice-1.19-gnome2.diff.gz) = bff155d6d6ee69b7e9df7366e49976164dea415f
-Size (vice-1.19-gnome2.diff.gz) = 24202 bytes
-SHA1 (patch-aa) = 8e1a8b661e1e4f6847c8a0495308ad3e0c2f6dcd
+SHA1 (vice-1.20.tar.gz) = ab24d4cda34e93eb8663337af127402cc6ccaa6a
+RMD160 (vice-1.20.tar.gz) = b4f7a50257cbdd6338d4e685760e99c07ad14adb
+Size (vice-1.20.tar.gz) = 5183757 bytes
+SHA1 (patch-aa) = dffd85c1be1f311508eddbbe559ad2bf73f9974d
 SHA1 (patch-ab) = 12657561998b724c39699c380290e7333365d300
-SHA1 (patch-ac) = 0a0c1da41d5dc7cb322f1a6a62023c0bad1419f2
-SHA1 (patch-ad) = 5c1510a66d775b8a5a1b0a7d596aa111218993be
-SHA1 (patch-ae) = 9528bc0da7af5a0c74f5f0d2a8bf30b71802850c
+SHA1 (patch-ac) = 32d10e8d63e0031a099062e34cd918531aae5692
+SHA1 (patch-ad) = 608d170e8b5745c239c98408e8fe216768951c6c
 SHA1 (patch-af) = 524913b7bc753dafde909bb26ace8f0500be14d5
-SHA1 (patch-ag) = ed6702ccb8d2c3193daf5ccae3e023c09f856e33
-SHA1 (patch-ah) = 3f92ef4e5f64b254c3d52f9bbd9921dd25ee0aeb
-SHA1 (patch-ai) = b05efe271c893f375a5396b358bdc78a96cd3e16
-SHA1 (patch-aj) = 664e546b83ffc7e7ed5c40eb6b8af6a01a908013
+SHA1 (patch-ag) = 293114fe28b7b3832ad0087d89da1d1a37066bbc
diff --git a/emulators/vice/options.mk b/emulators/vice/options.mk
index 0a3bd32a457..84da38164e1 100644
--- a/emulators/vice/options.mk
+++ b/emulators/vice/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2006/07/06 08:37:27 dillo Exp $
+# $NetBSD: options.mk,v 1.3 2007/02/07 19:43:29 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.vice
 PKG_SUPPORTED_OPTIONS=	esound ffmpeg lame gnome
@@ -21,8 +21,7 @@ CONFIGURE_ARGS+=	--enable-ffmpeg
 
 .if !empty(PKG_OPTIONS:Mgnome)
 CONFIGURE_ARGS+=	--enable-gnomeui
-PATCHFILES=		vice-1.19-gnome2.diff.gz
-PATCH_SITES=		http://www.viceteam.org/online/
-PATCH_DIST_STRIP=	-p1
+USE_TOOLS+=		pkg-config
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .endif
diff --git a/emulators/vice/patches/patch-aa b/emulators/vice/patches/patch-aa
index ddacbcb70dc..6621ab5c7f2 100644
--- a/emulators/vice/patches/patch-aa
+++ b/emulators/vice/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2006/06/29 22:56:34 dillo Exp $
+$NetBSD: patch-aa,v 1.6 2007/02/07 19:43:29 wiz Exp $
 
---- src/arch/unix/types.h.orig	2005-12-23 23:29:54.000000000 +0100
-+++ src/arch/unix/types.h
-@@ -61,7 +61,7 @@ typedef DWORD CLOCK;
- #define CLOCK_MAX (~((CLOCK)0))
+--- doc/Makefile.in.orig	2007-01-21 01:53:08.000000000 +0000
++++ doc/Makefile.in
+@@ -245,7 +245,7 @@ xcbm2_LDFLAGS = @xcbm2_LDFLAGS@
+ xpet_LDFLAGS = @xpet_LDFLAGS@
+ xplus4_LDFLAGS = @xplus4_LDFLAGS@
+ xvic_LDFLAGS = @xvic_LDFLAGS@
+-docdir = $(VICEDIR)/doc
++docdir = $(datadir)/doc/vice
  
- #if defined(__GNUC__) && defined(__i386__) && !defined(NO_REGPARM)
--#if defined(__NETBSD__)
-+#if defined(__NetBSD__)
- #if (__GNUC__ > 2)
- #define REGPARM1 __attribute__((regparm(1)))
- #define REGPARM2 __attribute__((regparm(2)))
+ doc_DATA = \
+ 	MSDOS-Ethernet-Howto.txt \
diff --git a/emulators/vice/patches/patch-ac b/emulators/vice/patches/patch-ac
index a93000fe57b..e16f33c264a 100644
--- a/emulators/vice/patches/patch-ac
+++ b/emulators/vice/patches/patch-ac
@@ -1,43 +1,7 @@
-$NetBSD: patch-ac,v 1.15 2006/06/29 22:56:34 dillo Exp $
+$NetBSD: patch-ac,v 1.16 2007/02/07 19:43:29 wiz Exp $
 
---- src/sounddrv/soundsun.c.orig	2005-12-23 23:29:54.000000000 +0100
+--- src/sounddrv/soundsun.c.orig	2006-08-06 15:54:56.000000000 +0000
 +++ src/sounddrv/soundsun.c
-@@ -63,7 +63,7 @@ static int sun_fd = -1;
- static int sun_8bit = 0;
- static int sun_channels = 1;
- static int sun_bufsize = 0;
--#if !defined(__NETBSD__)
-+#if !defined(__NetBSD__)
- static int sun_written = 0;
- #endif
- 
-@@ -107,7 +107,7 @@ static int sun_init(const char *param, i
-     int	st;
-     struct audio_info info;
- 
--#if !defined(__NETBSD__)
-+#if !defined(__NetBSD__)
-     /* No stereo capability. */
-     *channels = 1;
- #endif
-@@ -142,7 +142,7 @@ static int sun_init(const char *param, i
- 	log_message(LOG_DEFAULT, "Playing 8 bit ulaw at 8000Hz");
-     }
-     sun_bufsize = (*fragsize)*(*fragnr);
--#if !defined(__NETBSD__)
-+#if !defined(__NetBSD__)
-     sun_written = 0;
- #endif
-     sun_channels = *channels;
-@@ -171,7 +171,7 @@ static int sun_write(SWORD *pbuf, size_t
- 	if (now <= 0)
- 	    return 1;
-     }
--#if !defined(__NETBSD__)
-+#if !defined(__NetBSD__)
-     sun_written += nr;
- #endif
- 
 @@ -204,7 +204,7 @@ static void sun_close(void)
      sun_fd = -1;
      sun_8bit = 0;
diff --git a/emulators/vice/patches/patch-ad b/emulators/vice/patches/patch-ad
index a3a00650de4..a2e0261e7f0 100644
--- a/emulators/vice/patches/patch-ad
+++ b/emulators/vice/patches/patch-ad
@@ -1,16 +1,13 @@
-$NetBSD: patch-ad,v 1.10 2006/06/29 22:56:34 dillo Exp $
+$NetBSD: patch-ad,v 1.11 2007/02/07 19:43:29 wiz Exp $
 
---- src/arch/unix/x11/vidmode.c.orig	2005-12-23 23:29:54.000000000 +0100
-+++ src/arch/unix/x11/vidmode.c
-@@ -75,11 +75,7 @@ int vidmode_init(void)
-         &vm_modes)) {
-         log_error(vidmode_log, _("Error getting video mode information - disabling vidmode extension."));
-         vm_available = 0;
--#if !defined(__NETBSD__)
--        return -1;
--#else
-         return 0;
--#endif
-     }
+--- doc/html/Makefile.in.orig	2007-01-21 01:53:08.000000000 +0000
++++ doc/html/Makefile.in
+@@ -245,7 +245,7 @@ xcbm2_LDFLAGS = @xcbm2_LDFLAGS@
+ xpet_LDFLAGS = @xpet_LDFLAGS@
+ xplus4_LDFLAGS = @xplus4_LDFLAGS@
+ xvic_LDFLAGS = @xvic_LDFLAGS@
+-docdir = $(VICEDIR)/doc
++docdir = $(datadir)/doc/vice
  
-     for (i = 0; i < vm_mode_count; i++) {
+ doc_DATA = \
+ 	amigaos.html \
diff --git a/emulators/vice/patches/patch-ae b/emulators/vice/patches/patch-ae
deleted file mode 100644
index f664d227eaf..00000000000
--- a/emulators/vice/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2006/03/31 16:47:45 jlam Exp $
-
---- src/Makefile.in.orig	2005-11-20 14:43:07.000000000 -0500
-+++ src/Makefile.in
-@@ -715,6 +715,7 @@ c1541_LDADD = \
- 	$(diskimage_lib) \
- 	$(tape_lib) \
- 	$(serial_lib) \
-+	@INTLLIBS@ \
- 	@READLINE@ \
- 	@VICE_ZLIB@
- 
-@@ -737,6 +738,7 @@ petcat_SOURCES = \
- petcat_LDADD = \
- 	@ARCH_DIR@/archdep.o \
- 	$(fileio_lib) \
-+	@INTLLIBS@
- 	@VICE_ZLIB@
- 
- subdir = src
diff --git a/emulators/vice/patches/patch-ag b/emulators/vice/patches/patch-ag
index 6772122b15d..685768f44cb 100644
--- a/emulators/vice/patches/patch-ag
+++ b/emulators/vice/patches/patch-ag
@@ -1,49 +1,13 @@
-$NetBSD: patch-ag,v 1.7 2006/10/16 22:09:39 wiz Exp $
+$NetBSD: patch-ag,v 1.8 2007/02/07 19:43:29 wiz Exp $
 
---- configure.orig	2006-01-08 21:31:51.000000000 +0100
-+++ configure	2006-10-14 04:08:10.000000000 +0200
-@@ -1319,7 +1319,7 @@ VICE_VERSION_BUILD=0
+--- configure.orig	2007-01-21 01:44:51.000000000 +0000
++++ configure
+@@ -23531,7 +23531,7 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
  
  
- 
--if test x"$VICE_VERSION_BUILD" == "x" -o x"$VICE_VERSION_BUILD" == "x0" ; then
-+if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
-   VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR
- else
-   VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR"."$VICE_VERSION_BUILD
-@@ -1719,7 +1719,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst
-           ac_config_headers="$ac_config_headers src/config.h"
- 
- 
--if test x"$VICE_VERSION_BUILD" == "x" -o x"$VICE_VERSION_BUILD" == "x0" ; then
-+if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
-   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"
- else
-   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR","$VICE_VERSION_BUILD",0"
-@@ -10937,7 +10937,7 @@ done
-   fi
- fi
- 
--if test x"$is_beos" == "xyes"; then
-+if test x"$is_beos" = "xyes"; then
- 
- 
-   BEOS_NETWORK_HEADERS_PRESENT=yes
-@@ -19748,7 +19748,7 @@ _ACEOF
- 
- elif [ x"${enable_gnomeui}" = x"yes" ] ; then
- 
--  LIBS="${LIBS} `gnome-config --libs gnomeui`"
-+  LIBS="${LIBS} `pkg-config --libs libgnomeui-2.0`"
- 
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -20509,7 +20509,7 @@ if test x"$is_dos" != "xyes" -a x"$is_wi
-     ARCH_INCLUDES="-I\$(top_srcdir)/src/arch/unix"
-   else
-     ARCH_LIBS="$ARCH_DIR/x11/gnome/libgnomeui.a $ARCH_DIR/libarch.a $ARCH_DIR/x11/libx11ui.a $ARCH_DIR/x11/gnome/libgnomeui.a $ARCH_DIR/x11/libx11ui.a $ARCH_DIR/libarch.a"
--    ARCH_INCLUDES="-I\$(top_srcdir)/src/arch/unix `gnome-config --cflags gnomeui`"
-+    ARCH_INCLUDES="-I\$(top_srcdir)/src/arch/unix `pkg-config --cflags libgnomeui-2.0`"
-   fi
+-VICEDIR="$PREFIX/lib/vice";
++VICEDIR="$PREFIX/share/vice";
  
  
+ if false ; then
diff --git a/emulators/vice/patches/patch-ah b/emulators/vice/patches/patch-ah
deleted file mode 100644
index 8e947ec5d47..00000000000
--- a/emulators/vice/patches/patch-ah
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2006/07/06 08:37:27 dillo Exp $
-
---- src/arch/unix/x11/gnome/Makefile.in.orig	2006-06-30 02:35:06.000000000 +0200
-+++ src/arch/unix/x11/gnome/Makefile.in
-@@ -245,7 +245,6 @@ noinst_LIBRARIES = libgnomeui.a
- 
- libgnomeui_a_SOURCES = \
- 	about.c \
--	dummies.c \
- 	gnomekbd.c \
- 	gnomevideo.c \
- 	uiarch.h \
-@@ -259,6 +258,8 @@ libgnomeui_a_SOURCES = \
- 	uiscreenshot.c \
- 	uisnapshot.c \
- 	uivsidcontrol.c \
-+	uifileentry.c \
-+	uifileentry.h \
- 	videoarch.h \
- 	x11ui.c
- 
-@@ -270,18 +271,18 @@ LIBRARIES = $(noinst_LIBRARIES)
- 
- libgnomeui_a_AR = $(AR) cru
- libgnomeui_a_LIBADD =
--am_libgnomeui_a_OBJECTS = about.$(OBJEXT) dummies.$(OBJEXT) \
-+am_libgnomeui_a_OBJECTS = about.$(OBJEXT) \
- 	gnomekbd.$(OBJEXT) gnomevideo.$(OBJEXT) uicartridge.$(OBJEXT) \
- 	uicolor.$(OBJEXT) uiedisk.$(OBJEXT) uimenu.$(OBJEXT) \
- 	uinetplay.$(OBJEXT) uipalcontrol.$(OBJEXT) \
- 	uiscreenshot.$(OBJEXT) uisnapshot.$(OBJEXT) \
--	uivsidcontrol.$(OBJEXT) x11ui.$(OBJEXT)
-+	uifileentry.$(OBJEXT) uivsidcontrol.$(OBJEXT) x11ui.$(OBJEXT)
- libgnomeui_a_OBJECTS = $(am_libgnomeui_a_OBJECTS)
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/src
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
--@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/about.Po ./$(DEPDIR)/dummies.Po \
-+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/about.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/gnomekbd.Po ./$(DEPDIR)/gnomevideo.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/uicartridge.Po ./$(DEPDIR)/uicolor.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/uiedisk.Po ./$(DEPDIR)/uimenu.Po \
-@@ -289,7 +290,8 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@	./$(DEPDIR)/uipalcontrol.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/uiscreenshot.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/uisnapshot.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/uivsidcontrol.Po ./$(DEPDIR)/x11ui.Po
-+@AMDEP_TRUE@	./$(DEPDIR)/uivsidcontrol.Po ./$(DEPDIR)/uifileentry.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/x11ui.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
-@@ -322,7 +324,6 @@ distclean-compile:
- 	-rm -f *.tab.c
- 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/about.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummies.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnomekbd.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnomevideo.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uicartridge.Po@am__quote@
-@@ -334,6 +335,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uiscreenshot.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uisnapshot.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uivsidcontrol.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uifileentry.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x11ui.Po@am__quote@
- 
- distclean-depend:
diff --git a/emulators/vice/patches/patch-ai b/emulators/vice/patches/patch-ai
deleted file mode 100644
index a91bbea3dbf..00000000000
--- a/emulators/vice/patches/patch-ai
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2006/10/14 02:13:04 rillig Exp $
-
---- configure.in.orig	2006-01-08 20:32:11.000000000 +0100
-+++ configure.in	2006-10-14 04:07:48.000000000 +0200
-@@ -17,7 +17,7 @@ AC_SUBST(VICE_VERSION_BUILD)
- 
- dnl AC_DEFINE(UNSTABLE,,[Define if this version is unstable.])
- 
--if test x"$VICE_VERSION_BUILD" == "x" -o x"$VICE_VERSION_BUILD" == "x0" ; then
-+if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
-   VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR
- else
-   VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR"."$VICE_VERSION_BUILD
-@@ -27,7 +27,7 @@ AC_SUBST(VICE_VERSION)
- AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
- AM_CONFIG_HEADER(src/config.h)
- 
--if test x"$VICE_VERSION_BUILD" == "x" -o x"$VICE_VERSION_BUILD" == "x0" ; then
-+if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
-   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"
- else
-   VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR","$VICE_VERSION_BUILD",0"
-@@ -680,7 +680,7 @@ if test x"$is_win32" != "xyes" -a x"$is_
-   fi
- fi
- 
--if test x"$is_beos" == "xyes"; then
-+if test x"$is_beos" = "xyes"; then
- 
-   dnl Check for needed network headers
- 
diff --git a/emulators/vice/patches/patch-aj b/emulators/vice/patches/patch-aj
deleted file mode 100644
index c7aa2c8c98e..00000000000
--- a/emulators/vice/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2006/10/17 23:55:41 wiz Exp $
-
---- src/gfxoutputdrv/ffmpeg/common.h.orig	2005-03-12 22:15:18.000000000 +0000
-+++ src/gfxoutputdrv/ffmpeg/common.h
-@@ -93,7 +93,6 @@ extern const struct AVOption avoptions_w
- #endif
- #endif
- 
--#define EMULATE_INTTYPES
- #ifndef EMULATE_INTTYPES
- #   include <inttypes.h>
- #else