Changes 1.3.6:

 * different color palette used by default
 * PNG screenshots added
 * added sector counter and speedometer
 * F6 is Atari HELP key on Curses, Falcon and in X11
 * added missing combinations of ANTIC modes with GTIA modes
 * keyboard joystick works in more games (doesn't pause the game) in SDL
 * mouse joystick emulation works in X11
 * cassette loading by hardware registers (Ninja and Elektraglide
   are examples of games that load correctly now)
 * blank boot ATR disk image can be created in the Disk Management menu
 * many small fixes and major source code clean up

4 files changed, 15 insertions, 16 deletions

diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index aeaf79c427a..136532da8e8 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.30 2005/05/17 15:08:57 adam Exp $
 
-DISTNAME=	atari800-1.3.5
+DISTNAME=	atari800-1.3.6
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=atari800/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xf25.zip
@@ -34,7 +34,6 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/*.rom ${WRKDIR}/*.xfd ${WRKDIR}/*.atr \
 		${WRKSRC}/atari800.cfg ${PREFIX}/share/atari800/
 
-.include "../../devel/zlib/buildlink3.mk"
-
+.include "../../graphics/png/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/atari800/distinfo b/emulators/atari800/distinfo
index 8196090a820..29cd2461725 100644
--- a/emulators/atari800/distinfo
+++ b/emulators/atari800/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.10 2005/02/23 18:49:17 agc Exp $
+$NetBSD: distinfo,v 1.11 2005/05/17 15:08:57 adam Exp $
 
-SHA1 (atari800-1.3.5.tar.gz) = bf9843e5ded43bb620dbd50dc0cfd2c9343bcd86
-RMD160 (atari800-1.3.5.tar.gz) = 186e1ac421a04158939b30cddc028075a9f9a00a
-Size (atari800-1.3.5.tar.gz) = 1007863 bytes
+SHA1 (atari800-1.3.6.tar.gz) = 60a33ac3a57b31e5614d34e8eb1ece354c7f1bc4
+RMD160 (atari800-1.3.6.tar.gz) = 943b5ab6beae25228c85f728462c8e8f68ce5027
+Size (atari800-1.3.6.tar.gz) = 1012231 bytes
 SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42
 RMD160 (xf25.zip) = e3960898223dd4d1b9a9cc5cfb1251bd726ea5a7
 Size (xf25.zip) = 188942 bytes
 SHA1 (patch-aa) = cf2122ef21bb8a8e27f9aa723ed11f16630bfbef
 SHA1 (patch-ab) = 15b45d358ce200bb13d8ed35eed97dd7745e4b51
 SHA1 (patch-ac) = 1815c2f531a8bdba6e12d5cf062206e8eb2740d9
-SHA1 (patch-ad) = b3636f3cbe5c2a26355eba6be4bddf33b050ff0f
+SHA1 (patch-ad) = f5046d850bc3a6f0da044fd7cca78938d715a8bb
diff --git a/emulators/atari800/options.mk b/emulators/atari800/options.mk
index 01e35fc4f62..c2838164165 100644
--- a/emulators/atari800/options.mk
+++ b/emulators/atari800/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2005/03/22 08:46:26 adam Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/17 15:08:57 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.atari800
-PKG_DEFAULT_OPTIONS=	x11
+PKG_DEFAULT_OPTIONS=	sdl
 PKG_SUPPORTED_OPTIONS=	sdl x11
 
 .include "../../mk/bsd.options.mk"
diff --git a/emulators/atari800/patches/patch-ad b/emulators/atari800/patches/patch-ad
index fc29e5eedbd..93f09c0362c 100644
--- a/emulators/atari800/patches/patch-ad
+++ b/emulators/atari800/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2004/09/24 13:42:18 adam Exp $
+$NetBSD: patch-ad,v 1.3 2005/05/17 15:08:57 adam Exp $
 
---- configure.orig	2004-08-08 08:57:17.000000000 +0000
+--- configure.orig	2005-04-30 14:18:04.000000000 +0000
 +++ configure
-@@ -1373,7 +1373,7 @@ case "$target" in
+@@ -1369,7 +1369,7 @@ case "$target" in
          a8_target="UNKNOWN"
          ;;
  esac
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.2 2004/09/24 13:42:18 adam Exp $
      echo
      echo "Usage: configure --target=<target> <other options>"
      echo
-@@ -1573,11 +1573,11 @@ _ACEOF
+@@ -1569,11 +1569,11 @@ _ACEOF
          ;;
  esac
  
@@ -25,7 +25,7 @@ $NetBSD: patch-ad,v 1.2 2004/09/24 13:42:18 adam Exp $
      LDFLAGS="-s"
  fi
  
-@@ -4317,7 +4317,7 @@ fi
+@@ -4386,7 +4386,7 @@ fi
  
  
  OBJS=