Changes 1.4.0:

Emulation:
- IDE improvements:
  - Support for second drive (IDE slave)
  - WIN_FORMAT command (allows HD Driver to format IDE drives)
- GEMDOS HDD emulation:
  - Minor fixes to Fseek(), Fopen(), Fdatime() (e.g. Pure debugger works)
  - On TOS v4 Fread() size arg is unsigned, on earlier TOS its signed
    (bad code can use -1L to read whole file instead getting fail on TOS4)
  - Prevent DTA and read/write functions accessing invalid memory areas
  - Programs can now change read-only files to be writable
- Falcon sound emulation:
  - Microphone (jack) emulation in Falcon mode (requires portaudio library)
  - SSI direct sound entrance ("Audio Fun Machine" and winrec are working)
  - DMA sound recording
  - Crossbar handshake mode transfers
- Max VDI rez increased to TT-hi size (1280x960)
- 68020+FPU changed to 68EC030+FPU (no MMU 030) for Falcon and TT modes
  (Some Falcon programs didn't work with 020)
- Video emulation on STF/STE:
  - correctly shift the screen 4 pixels to the left when left border is removed
  - add support for STE's 224 bytes overscan line without stabilizer
  - when reading $ff8205/07/09 on STE, take into account the value
    of horizontal scrolling/prefetch and linewidth
  - when writing to $ff8205/07/09 on STE, correctly handle the case
    where the write is made while display in ON
- LMC1992 emulation / STE sound filtering

4 files changed, 32 insertions, 20 deletions

diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index e26dd26e03b..ec1c77cdafd 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2010/05/23 18:46:27 adam Exp $
+# $NetBSD: Makefile,v 1.28 2010/08/27 08:24:27 adam Exp $
 
-DISTNAME=	hatari-1.3.1
+DISTNAME=	hatari-1.4.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.berlios.de/hatari/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,18 +11,16 @@ COMMENT=	Atari ST emulator
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
+USE_CMAKE=		yes
+USE_LANGUAGES=		c c++
+#USE_TOOLS+=		gmake
+#GNU_CONFIGURE=		yes
 
 INSTALLATION_DIRS+=	share/doc/hatari
 
-post-install:
-	cd ${WRKSRC} && ${INSTALL_DATA} *.txt \
-			${DESTDIR}${PREFIX}/share/doc/hatari
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.txt *.html \
-			${DESTDIR}${PREFIX}/share/doc/hatari
-
+.include "../../audio/portaudio/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/hatari/PLIST b/emulators/hatari/PLIST
index f2624565bfe..348b7345749 100644
--- a/emulators/hatari/PLIST
+++ b/emulators/hatari/PLIST
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST,v 1.11 2010/05/23 18:46:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/08/27 08:24:27 adam Exp $
+bin/atari-hd-image.sh
 bin/hatari
 bin/hatari-console.py
 bin/hatariui
 bin/hmsa
-bin/zip2st
+bin/zip2st.sh
 man/man1/hatari.1
+man/man1/hatariui.1
 share/applications/hatariui.desktop
 share/doc/hatari/authors.txt
-share/doc/hatari/changelog.txt
 share/doc/hatari/compatibility.html
 share/doc/hatari/emutos.txt
-share/doc/hatari/gpl.txt
 share/doc/hatari/images/devices.png
 share/doc/hatari/images/fileselector.png
 share/doc/hatari/images/floppydisks.png
@@ -19,6 +19,7 @@ share/doc/hatari/images/joystick.png
 share/doc/hatari/images/keyboard.png
 share/doc/hatari/images/main.png
 share/doc/hatari/images/memory.png
+share/doc/hatari/images/monitor.png
 share/doc/hatari/images/newfloppy.png
 share/doc/hatari/images/screen.png
 share/doc/hatari/images/sound.png
@@ -28,11 +29,9 @@ share/doc/hatari/keymap-sample.txt
 share/doc/hatari/manual.html
 share/doc/hatari/memory-usage.txt
 share/doc/hatari/midi-linux.txt
-share/doc/hatari/readme.txt
 share/doc/hatari/release-notes.txt
 share/doc/hatari/todo.txt
 share/hatari/hatari-icon.bmp
-share/hatari/hatariui/Changelog
 share/hatari/hatariui/README
 share/hatari/hatariui/TODO
 share/hatari/hatariui/config.py
@@ -42,6 +41,7 @@ share/hatari/hatariui/hatari-icon.png
 share/hatari/hatariui/hatari.png
 share/hatari/hatariui/hatari.py
 share/hatari/hatariui/hatariui.py
+share/hatari/hatariui/release-notes.txt
 share/hatari/hatariui/uihelpers.py
 share/hatari/tos.img
 share/icons/hicolor/32x32/apps/hatari-icon.png
diff --git a/emulators/hatari/distinfo b/emulators/hatari/distinfo
index c22e87e8f97..15f13cfbfd0 100644
--- a/emulators/hatari/distinfo
+++ b/emulators/hatari/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2010/05/23 18:46:27 adam Exp $
+$NetBSD: distinfo,v 1.13 2010/08/27 08:24:27 adam Exp $
 
-SHA1 (hatari-1.3.1.tar.bz2) = d603e1ddea34af9d0c1001f83f3e16081c136ef9
-RMD160 (hatari-1.3.1.tar.bz2) = 83a7a8138013be3324cf54e5f0df2efb0ebc40d3
-Size (hatari-1.3.1.tar.bz2) = 1045627 bytes
+SHA1 (hatari-1.4.0.tar.bz2) = 9fa2ef9fbcbeeefccb6e455eb91679c12f2f37bd
+RMD160 (hatari-1.4.0.tar.bz2) = a85dda4e4ad5f84b3fe3f77b8f5d3a4bb523a929
+Size (hatari-1.4.0.tar.bz2) = 1260844 bytes
 SHA1 (patch-aa) = 1ebe2f92ee176cf5d5b1e4a7c5e2143b1d766ea8
+SHA1 (patch-ab) = fc2b8a9cbaff50e845e6c716cab893facf2c527d
diff --git a/emulators/hatari/patches/patch-ab b/emulators/hatari/patches/patch-ab
new file mode 100644
index 00000000000..8cab2ab490b
--- /dev/null
+++ b/emulators/hatari/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2010/08/27 08:24:27 adam Exp $
+
+--- CMakeLists.txt.orig	2010-07-22 18:25:40.000000000 +0000
++++ CMakeLists.txt
+@@ -177,7 +177,7 @@ if(NOT BIN2DATADIR)
+ endif()
+ 
+ if(NOT MANDIR)
+-	set(MANDIR share/man/man1)
++	set(MANDIR man/man1)
+ endif()
+ 
+ if(NOT DOCDIR)