Update uae to 0.8.21.

Changes since 0.8.20:
- Several bug fixes, including some serious filesystem emulation bugs.
- Support for A1000 boot ROMs.

4 files changed, 9 insertions, 60 deletions

diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index fecd5a46763..712876ada64 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2002/01/01 19:05:21 kristerw Exp $
+# $NetBSD: Makefile,v 1.20 2002/02/26 03:19:59 kristerw Exp $
 
-DISTNAME=	uae-0.8.20
+DISTNAME=	uae-0.8.21
 PKGNAME=	${DISTNAME}
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.freiburg.linux.de/~uae/bin/sources/develop/
@@ -9,6 +9,7 @@ MAINTAINER=	kristerw@netbsd.org
 HOMEPAGE=	http://www.freiburg.linux.de/~uae/
 COMMENT=	The UAE Amiga Emulator
 
+BUILD_DEPENDS+=	autoconf>=2.12:../../devel/autoconf
 DEPENDS=	unzip>=5.40:../../archivers/unzip
 
 USE_GMAKE=	yes
@@ -17,6 +18,9 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--enable-dga --enable-vidmode --disable-ui
 
+pre-configure:
+	cd ${WRKSRC}; ${LOCALBASE}/bin/autoconf
+
 do-install:
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} readdisk uae ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/uae
diff --git a/emulators/uae/distinfo b/emulators/uae/distinfo
index 78f4bcf1533..c93149cdddd 100644
--- a/emulators/uae/distinfo
+++ b/emulators/uae/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.7 2002/01/01 19:05:21 kristerw Exp $
+$NetBSD: distinfo,v 1.8 2002/02/26 03:19:59 kristerw Exp $
 
-SHA1 (uae-0.8.20.tar.gz) = 5a81e1bcb1fffb7f8e8d94890290a506060684e5
-Size (uae-0.8.20.tar.gz) = 911697 bytes
+SHA1 (uae-0.8.21.tar.gz) = 9b94574bb3f462b019f1b268d6a0b36940bde160
+Size (uae-0.8.21.tar.gz) = 914495 bytes
 SHA1 (patch-aa) = 6045d32ce2b123410b20bbd410111400766834f9
 SHA1 (patch-ab) = 7a174709e599b252d82ec9ef949aa8feab2f279e
-SHA1 (patch-ac) = 8cabbb011f2f0ba28aa3bb3daa953e999b02964e
-SHA1 (patch-ad) = a09d1f291d3cae46a92116c512a21601806f874e
diff --git a/emulators/uae/patches/patch-ac b/emulators/uae/patches/patch-ac
deleted file mode 100644
index 0bdb1d169c4..00000000000
--- a/emulators/uae/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2002/01/01 19:05:21 kristerw Exp $
---- configure.orig	Sun Dec 30 15:42:54 2001
-+++ configure	Tue Jan  1 19:21:03 2002
-@@ -6579,7 +6579,7 @@
- 
- if [ "x$WANT_SDL" = "xyes" ]; then
-     OD_JOYSTICK=sdl-joystick.c
--else if [ "x$HAVE_MACHINE_JOYSTICK_H" = "xyes" ]; then
-+else
-     cat > conftest.$ac_ext <<EOF
- #line 6585 "configure"
- #include "confdefs.h"
-@@ -6594,9 +6594,7 @@
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
--fi
- rm -f conftest*
--else
-     OD_JOYSTICK=$OSDEP/joystick.c
- fi
- fi
diff --git a/emulators/uae/patches/patch-ad b/emulators/uae/patches/patch-ad
deleted file mode 100644
index 86916b18c48..00000000000
--- a/emulators/uae/patches/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/05/31 21:38:52 kristerw Exp $
---- src/od-linux/joystick.c.bak	Wed Apr 15 21:30:16 1998
-+++ src/od-linux/joystick.c	Thu May 31 23:19:06 2001
-@@ -17,12 +17,12 @@
- #include "custom.h"
- #include "joystick.h"
- 
--#ifdef HAVE_MACHINE_SOUNDCARD_H
-+#ifdef HAVE_MACHINE_JOYSTICK_H
- 
- /* The BSD way.  */
- 
--# include <machine/soundcard.h>
--typedef struct joystick uae_joystick_t
-+# include <machine/joystick.h>
-+typedef struct joystick uae_joystick_t;
- 
- #define JS_DEVNAME_PREFIX "joy"
- 
-@@ -84,7 +84,11 @@
-     if (left) top = !top;
-     if (right) bot = !bot;
-     *dir = bot | (right << 1) | (top << 8) | (left << 9);
-+#ifdef HAVE_MACHINE_JOYSTICK_H
-+    *button = buffer.b1 || buffer.b2;
-+#else
-     *button = buffer.buttons & 3;
-+#endif
- }
- 
- void init_joystick(void)