Update to 1.6.0.

* Update MASTER_SITES and HOMEPAGE.
* Remove c++ from USE_LANGUAGES.
* Set LICENSE.

Changelog:
 Version 1.6.0 (2012-01-01):
 ---------------------------

The Hatari project has been moved from hatari.berlios.de to
http://hatari.tuxfamily.org/. Please update all bookmarks!

Emulation:
- More accurate FDC emulation (correct status bits and commands' timings,
  DMA transfer by blocks of 16 bytes, floppy change detection). This should
  fix a lot of non working games
- More accurate microwire clock emulation
- SCSI class 1 (ICD) command support for drives > 1 GB
- Improved color conversion table so that colors are a little bit brighter
- Improve shifter (add another method to do 4 pixel hardware scrolling,
    better emulation for 0 byte blank line)
- Some fixes to the IKBD emulation
- Better filters and model for sound emulation
- Correct VBL timings in TT monochrome (double clicking works now)
- More cycle accurate Falcon DSP <-> CPU emulation.  All the demos that
  needed 32Mhz CPU with the old CPU core in Hatari v1.5, work now at
  correct 16Mhz with the WinUAE CPU core
- 030 MMU emulation with the WinAUE CPU core


Emulator:
- Switch to ST mode when using TOS <= 1.04
- Replace "--slowfdc" with "--fastfdc" option and default to fast FDC being OFF
- "--fast-boot" option to initialize "memvalid" system variables to
  by-pass the memory test of TOS, so that the system boots faster
- "--force-max" option to force Hatari use specified maximum resolution
  to avoid window size changes messing up Hatari video recording
- "--desktop-st" option to keep desktop resolution also for ST/STE modes
  (unfortunately without scaling besides the low-res doubling)
- GEMDOS HD emulation:
  - Allow drives up to Z: (not Y:)
  - Unique name for each partition
  - Warn user when using too old TOS version
  - Dfree() reports host disk total and free size if they're below
    value understood by TOS and unlike earlier, it forwards Dfree()
    requests  for other (IDE/ACSI image) partitions to TOS
- Debugger improvements:
  - "history" command to list instructions executed before entering
    debugger
  - each trace output line is flushed to avoid it being buffered
- Fixed behavior of the Caps Lock key

Other changes:
- Fixes to Hatari UI Hatari window embedding
- Latest Linux sfdisk is borked so atari-hd-image script creates
  HD image partition table now itself (experimental)
- Windows needs also HOMEDRIVE for full home path in case Hatari
  isn't installed on C:, bug 18297
- Minor fixes


Fixed Demos :
  Overscan Demos and Shforstv.exe by Paulo Simoes (black line at top),
  ACF - Just Bugging (FDC), Delirious Demo IV (FDC, shifter),
  Overdrive Demos - Snirkel Screen (IKBD), Oxygene - Stniccc2000 (FDC),
  Cream - Madness (FDC)

Fixed Games :
  Superior 65 - Super Monaco GP, DBug 24 - Knightmare, Pompey Pirates 27 - X-Out,
  Fuzion 32 - Pang, Fuzion 108 - The Simpson, Fuzion 40 - Super Grand Prix,
  Fuzion 46 - Warlock, Fuzion 51 - Navy Seals, Fuzion 61 - Gods, Fuzion 78 -
  Carmen Sandiego, Fuzion 82 - Flight Of The Intruder, Fuzion 83 - RBI Baseball 2,
  Fuzion 102 - Exile, PP46 - Yolanda, Medway Boys 15 - Murders In Venice,
  Medway Boys 83 - Yogi Bear, BBC 2 - Platoon, BBC 39 - The Deep, Superior 71 - The
  Running Man, Adrenaline 24 - Demon Blue, Superior 93 - Alien Storm

Fixed Misc Programs :
  Procopy 1.50, Terminators Copy 1.68, maxYMizer (caps lock key)


 Version 1.5.0 (2011-07-19):
 ---------------------------

Emulation:
- Alternative CPU core based on WinUAE for more accurate future
  HW interaction emulation (see readme.txt on how to enable it)
- Use precise clocks values (as described in Atari's official schematics)
  for better video/dma audio synchronisation (e.g. More Or Less Zero by DHS)
- DSP:
  - Some DSP-timing sensitive Falcon demos that by luck happened to work
    with Hatari v1.4, don't work anymore in v1.5 with the default UAE CPU
    core.  This is because while DSP cycle accuracy has been improved,
    the default UAE CPU core isn't fully cycle accurate.  The experimental
    WinUAE core is needed to run them
  - Undocumented 2 bit shift special case for DSP SSI <-> crossbar exchanges
    in hanshake mode with 32 Mhz clock (fixes DSP MP2 player used in many
    demos & programs, but that requires also using WinUAE core)
- Sound improvements:
  - Major rewrite and accuracy improvements in STE DMA sound, including
    emulation of the 8 bytes FIFO, giving results nearly identical to
    a real STE (e.g. HexTracker by Paulo Simoes)
  - Improved precision in sound emulation, with nearly no rounding errors
    over successive VBL (correct sound latency on US TOS running at 60 Hz)
  - By default mix 3 YM voices using a lookup table of values
    measured on real STF to improve digisound (e.g. Flashback demo sound)
  - Remove old ST Sound's code used for tone and noise step compute
    (some low period values were not correctly emulated)
- Video emulation on STF/STE:
  - On STE, correctly shift display 8 pixels to the left when using
    224 bytes overscan
  - Add support for spec512 mode in med res (fixes 'Best Part Of The
    Creation' in 'Punish Your Machine', 'HighRes Mode' demo by Paradox)
  - Correctly shift the screen 4 pixels to the left when left border is removed
    in med res overscan (Hatari 1.4 handled only low res, fixes 'No Cooper'
    by 1984, 'Best Part Of The Creation' by Delta Force)
  - Precisely emulate the number of frames per sec (eg 50.053 fps in PAL
    instead of the usual 50 Hz)

Emulator:
- Atari program given as argument to Hatari will be automatically
  started after TOS boots. GEMDOS hard disk directory can now be
  give also as an argument, not just as a (-d) option
- TOS4 or --machine falcon option use enables DSP emulation now
  (follow them with --dsp none to disable DSP emulation)
- Memory state saving and restoring fixes, especially for Falcon
  - Crossbar state is included -> state file ABI break
- AVI recording options can be set in the new [Video] config file section
- AVI recording supports non integer frame rates.
- Falcon/TT Videl/hostscreen improvements:
  - New setting/option for using Desktop resolution & scaling
    in fullscreen instead of changing the resolution. On by default
  - User's desktop size is used as max limit for Videl zooming.
    Requires SDL >= 1.2.10
  - Videl resolution change is done immediately, not 3 VBLs late
  - Fix issues in switching between same sized VDI & TT resolutions
- SDL GUI improvements:
  - DSP can be disabled from the GUI without needing to restart Hatari
  - Disk access LED and desktop-resolution options
  - AVI video length (mins:secs) is shown in titlebar during recording
  - Option for cropping statusbar from videos & screenshots
  - Fileselector scrollbar can be used with mouse
  - YM mixing method selection
- Debugging improvements:
  - New disassembler with more Motorola like syntax
  - CPU & DSP "disasm" and "memdump" commands accept register & symbol
    names in addition to numeric addresses / address ranges
  - Option to disable Falcon mic
    ("--mic off" is needed for Mudflap debugging)
  - "--run-vbls" can be set also at run-time
  - "--bios-intercept" can be toggled from debugger (not just enabled)
  - BIOS CON: output is converted to ASCII and redirected to host console
    with the --bios-intercept option
  - Support for tracing DSP, Videl and Crossbar
  - Support for tracing AES calls.  VDI calls can now be traced
    also without using an extended VDI resolution
  - BIOS/XBIOS/GEMDOS/VDI/AES/Line-A/Line-F opcode breakpoint support
  - TEXT, DATA and BSS variables for addresses of corresponding segments
    in currently loaded program
  - "aes", "vdi" and "gemdos" subcommands for "info".  Without arguments
    they will output information about corresponding OS part state,
    with (a non-zero) argument, opcode/call name table is shown.
    "video" subcommand for showing video related information.
    "cookiejar" subcommand for showing cookiejar contents.
  - "file" subcommand to "lock" that executes debugger commands from
    given file when debugger is entered (or ":lock" breakpoint is hit)
  - ":lock" option to breakpoints that will show (without stopping the
    emulation) the same output as what's shown on entering the debugger
  - ":file" option to breakpoints that executes the commands from
    given file when the breakpoint is hit. This can be used to chain
    debugger actions
  - multiple breakpoints options can be specified per breakpoint
  - parenthesis in "evaluate" command are used to indicate memory
    accesses (instead of operator precedence like earlier)
  - DSP and CPU code profiling functionality.  Provides statistics about
    profiled code (executed code address ranges, max and total counts
    and cycles), lists addresses/instructions taking most cyles and if
    symbols are loaded, what were the most used symbol addresses.
  - Profiling information is also shown in disassembly output

Other changes:
- hmsa tool can create empty disk images in addition to converting
  disks between ST & MSA formats
- Minimal hatari-tos-register.sh Linux init script (example)
  to register Hatari as binfmt_misc handler/runner for TOS programs
- hatari-console.py renamed to hconsole.py, documented and made extensible
  (hconsole is command line Python interface for Hatari remote API)
- Support for plain Makefiles removed (except for internal tests),
  only CMake is used for configuring and building Hatari
- CMake doesn't require anymore working C++, C-compiler is enough

3 files changed, 30 insertions, 17 deletions

diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 8ffd61c1726..80aacbc50dc 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,23 +1,20 @@
-# $NetBSD: Makefile,v 1.30 2011/07/03 11:32:22 jym Exp $
+# $NetBSD: Makefile,v 1.31 2012/01/09 19:39:52 ryoon Exp $
 
-DISTNAME=	hatari-1.4.0
-PKGREVISION=	1
+DISTNAME=	hatari-1.6.0
 CATEGORIES=	emulators
-MASTER_SITES=	http://download.berlios.de/hatari/
+MASTER_SITES=	http://download.tuxfamily.org/hatari/1.6.0/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://hatari.berlios.de/
+HOMEPAGE=	http://hatari.tuxfamily.org/
 COMMENT=	Atari ST emulator
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_CMAKE=		yes
-USE_LANGUAGES=		c c++
-#USE_TOOLS+=		gmake
-#GNU_CONFIGURE=		yes
+USE_LANGUAGES=		c
 
-REPLACE_PYTHON+=	python-ui/hatari-console.py
 REPLACE_PYTHON+=	python-ui/config.py
 REPLACE_PYTHON+=	python-ui/debugui.py
 REPLACE_PYTHON+=	python-ui/dialogs.py
@@ -25,6 +22,14 @@ REPLACE_PYTHON+=	python-ui/hatari.py
 REPLACE_PYTHON+=	python-ui/hatariui.py
 REPLACE_PYTHON+=	python-ui/uihelpers.py
 
+SUBST_CLASSES+=			fix-python
+SUBST_STAGE.fix-python=		pre-configure
+SUBST_MESSAGE.fix-python=	Fixing python
+SUBST_FILES.fix-python+=	tools/hconsole/example.py
+SUBST_FILES.fix-python+=	tools/hconsole/hconsole.py
+SUBST_SED.fix-python+=		-e 's,/usr/bin/env python,${PYTHONBIN},'
+
+
 INSTALLATION_DIRS+=	share/doc/hatari
 
 .include "../../audio/portaudio/buildlink3.mk"
diff --git a/emulators/hatari/PLIST b/emulators/hatari/PLIST
index 348b7345749..74f74414ca8 100644
--- a/emulators/hatari/PLIST
+++ b/emulators/hatari/PLIST
@@ -1,12 +1,15 @@
-@comment $NetBSD: PLIST,v 1.12 2010/08/27 08:24:27 adam Exp $
-bin/atari-hd-image.sh
+@comment $NetBSD: PLIST,v 1.13 2012/01/09 19:39:52 ryoon Exp $
+bin/atari-hd-image
 bin/hatari
-bin/hatari-console.py
 bin/hatariui
 bin/hmsa
-bin/zip2st.sh
+bin/zip2st
+man/man1/atari-hd-image.1
 man/man1/hatari.1
 man/man1/hatariui.1
+man/man1/hconsole.1
+man/man1/hmsa.1
+man/man1/zip2st.1
 share/applications/hatariui.desktop
 share/doc/hatari/authors.txt
 share/doc/hatari/compatibility.html
@@ -43,5 +46,10 @@ share/hatari/hatariui/hatari.py
 share/hatari/hatariui/hatariui.py
 share/hatari/hatariui/release-notes.txt
 share/hatari/hatariui/uihelpers.py
+share/hatari/hconsole/example-commands
+share/hatari/hconsole/example-debugger
+share/hatari/hconsole/example.py
+share/hatari/hconsole/hconsole.py
+share/hatari/hconsole/release-notes.txt
 share/hatari/tos.img
 share/icons/hicolor/32x32/apps/hatari-icon.png
diff --git a/emulators/hatari/distinfo b/emulators/hatari/distinfo
index 15f13cfbfd0..833bd4dc63d 100644
--- a/emulators/hatari/distinfo
+++ b/emulators/hatari/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2010/08/27 08:24:27 adam Exp $
+$NetBSD: distinfo,v 1.14 2012/01/09 19:39:52 ryoon Exp $
 
-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 (hatari-1.6.0.tar.bz2) = d74a62e72ec9af0efc49fd65a5a01c7ecba67951
+RMD160 (hatari-1.6.0.tar.bz2) = 18da8318b12f1883306b1d2e497b15e76c6dd9bd
+Size (hatari-1.6.0.tar.bz2) = 1766501 bytes
 SHA1 (patch-aa) = 1ebe2f92ee176cf5d5b1e4a7c5e2143b1d766ea8
 SHA1 (patch-ab) = fc2b8a9cbaff50e845e6c716cab893facf2c527d