Changes 1.3.3:

* ANTIC mode 2 + GTIA mode 10 - half pixel shift fix
* Amiga port updated
* OS/2 port updated
* DOSVGA port updated - joystick definition read again
* X11 port has improved keyboard support (Ctrl+Pause, left Ctrl for joy button)
* SDL port updated: joysticks emulated on keyboard can be freely edited
  now with SDL_JOY_0_<direction> and SDL_TRIG_0 (same for JOY_1/TRIG_1)
  config file parameters that expect values from SDL keySyms.

4 files changed, 13 insertions, 28 deletions

diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 327bde09e28..b4479b3d94f 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2004/04/19 00:11:17 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.26 2004/09/24 13:42:18 adam Exp $
 
-DISTNAME=	atari800-1.3.2
+DISTNAME=	atari800-1.3.3
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=atari800/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xf25.zip
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://atari800.sourceforge.net/
 COMMENT=	Atari 800, 800XL, 130XE and 5200 emulator
 
diff --git a/emulators/atari800/distinfo b/emulators/atari800/distinfo
index 6a12230a098..c082fac2037 100644
--- a/emulators/atari800/distinfo
+++ b/emulators/atari800/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.7 2004/01/23 18:57:26 kristerw Exp $
+$NetBSD: distinfo,v 1.8 2004/09/24 13:42:18 adam Exp $
 
-SHA1 (atari800-1.3.2.tar.gz) = 3325fc0656a3d54b2718df1f7eb7cfda0985d5a2
-Size (atari800-1.3.2.tar.gz) = 998541 bytes
+SHA1 (atari800-1.3.3.tar.gz) = 5ddd4ea95691d940a83440ad745b27efd06b9c44
+Size (atari800-1.3.3.tar.gz) = 1004789 bytes
 SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42
 Size (xf25.zip) = 188942 bytes
 SHA1 (patch-aa) = cf2122ef21bb8a8e27f9aa723ed11f16630bfbef
 SHA1 (patch-ab) = 33edb843d4d8c4b29e725a7d0e0594a1f7c9626f
 SHA1 (patch-ac) = 1815c2f531a8bdba6e12d5cf062206e8eb2740d9
-SHA1 (patch-ad) = 45530538aaca1ccfe79906c3aee09ae2a3499d50
-SHA1 (patch-ae) = 46db6f94b486a4d9544de40b7b28e5a0a9e2071f
+SHA1 (patch-ad) = b3636f3cbe5c2a26355eba6be4bddf33b050ff0f
diff --git a/emulators/atari800/patches/patch-ad b/emulators/atari800/patches/patch-ad
index 7c2b953ce86..fc29e5eedbd 100644
--- a/emulators/atari800/patches/patch-ad
+++ b/emulators/atari800/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2004/01/23 18:57:26 kristerw Exp $
+$NetBSD: patch-ad,v 1.2 2004/09/24 13:42:18 adam Exp $
 
---- configure.orig	Fri Jan 23 19:42:59 2004
-+++ configure	Fri Jan 23 19:43:29 2004
-@@ -1396,7 +1396,7 @@
+--- configure.orig	2004-08-08 08:57:17.000000000 +0000
++++ configure
+@@ -1373,7 +1373,7 @@ case "$target" in
          a8_target="UNKNOWN"
          ;;
  esac
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1 2004/01/23 18:57:26 kristerw Exp $
      echo
      echo "Usage: configure --target=<target> <other options>"
      echo
-@@ -1593,11 +1593,11 @@
+@@ -1573,11 +1573,11 @@ _ACEOF
          ;;
  esac
  
@@ -25,7 +25,7 @@ $NetBSD: patch-ad,v 1.1 2004/01/23 18:57:26 kristerw Exp $
      LDFLAGS="-s"
  fi
  
-@@ -4331,7 +4331,7 @@
+@@ -4317,7 +4317,7 @@ fi
  
  
  OBJS=
diff --git a/emulators/atari800/patches/patch-ae b/emulators/atari800/patches/patch-ae
deleted file mode 100644
index 8789165d460..00000000000
--- a/emulators/atari800/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/01/23 18:57:26 kristerw Exp $
-
---- cartridge.c.orig	Fri Jan 23 19:44:54 2004
-+++ cartridge.c	Fri Jan 23 19:45:06 2004
-@@ -772,7 +772,7 @@
- 
- void CARTStateRead( void )
- {
--    int savedCartType = CART_NONE;;
-+    int savedCartType = CART_NONE;
-     UWORD namelen;
-     FILE *fp;
-     char filename[FILENAME_MAX];