Update aranym to 0.9.10 with emutos 0.8.5.

Based on PR#43567 by Ryo ONODERA.

2010/05/27 - version 0.9.10 released

 New feature: GEM clipboard support that allows you to pass data between
 GEM clipboard and the host one (MS Windows, Mac OS X and X Window System).
 It's currently implemented in FreeMiNT only and uses its aranym.xfs
 virtual filesystem (U:\host\clipbrd). Please see setup instructions
 in http://wiki.aranym.org/gem_clipbrd

 Also couple of important bugfixes:

 o fixed two nasty crashes in HostFS (related to recent symlink fixes)
 o fixed Xcode building universal binaries on PPC
 o VIDEL autozoom feature with correct aspect ratio for non-square pixels


2009/09/05 - version 0.9.9 released

 This time mostly bugfixes:

 o fixed possible crash in HostFS when quitting ARAnyM (not serious)
 o fixed possible crash due to bug in libSDL up to v1.2.13 (very serious)
 o fixed some redrawing problems in 8 and 16 color depths with soft NfVDI
 o fixed all compile time warnings and Categories entry in aranym.desktop
 o fixed weirdness when mouse pointer was leaving the window on Win and OSX
 o fixed problem with invalid HostFS symlink breaking directory list
 o improvement: HostFS symlinks are now shown as relative if possible
 o fixed indirect descriptors handling in MMU
 o fixed HostFS symlinks for certain path configurations
 o added Mode key in the set of ARAnyM hotkey modifiers
 o fixed Alt+mouse click problem on Mac OSX
 o fixed Right Shift detection upon startup

 If you found ARAnyM crashing previously when moving windows around
 or doing any other activity where VDI had to blit screen areas then
 please upgrade to this version ASAP. We've added a workaround for
 a serious bug in the libSDL that was causing these weird ARAnyM crashes.


2009/04/25 - version 0.9.8beta released

 o CPU: fixed TRAPcc and FTRAPcc instructions (for Guillaume's mplayer :-)
 o VIDEL: pixel precise horizontal scrolling implemented
 o fixed BUSY signal handling on the parallel port
 o fixed mouse grab/ungrab/autograb (see below)
 o added new ARAnyM mouse cursor (white arrow)
 o added middle mouse button handling (in Eiffel mode)
 o added suport for reversing mouse Y-axis in IKBD (used in Linux-m68k)
 o fixed many DSP56001 instructions
 o fixed NFJPEG on 64bit hosts
 o fixed several NF drivers to work under FreeMiNT (not rely on __NF cookie)
 o buggy JIT-FPU was disabled. Now FPU is precise though slower in JIT mode

 Mouse grab/ungrab/autograb has changed: first, ungrabbing when leaving
 ARAnyM window was fixed (issue with autograb on the window border).
 Then, ARAnyM got a new mouse cursor (white one) so you can recognize
 now when the mouse is grabbed (the cursor pointer is black in TOS)
 and when it's not (the cursor pointer is white now).
 At last, mouse autograb upon entering ARAnyM window was disabled until
 we can ensure the Atari mouse cursor is positioned in sync with host
 mouse cursor (will require Atari OS support, probably in a form
 of aranym.acc and AES implementing appl_tplay).
 Also the "AutoGrabMouse" config option has been removed.


2008/11/08 - version 0.9.7beta released

 Mostly small fixes at various places plus a lot of work went into
 improving the DSP56001 emulation. Also the sound DMA emulation is improved
 to a point where GSXB driver should be unnecessary.

 o improved automatic network setup on Mac
 o reworked audio DMA emulation. Also added configurable host sound frequency
 o one MMU bug fixed (regarding TTR)
 o special support for halting ARAnyM on linux-m68k reboot (--halt)
 o SDL GUI fixed (missing events after alerts)
 o EMULOP is now privileged so if some old ARAnyM TSR starts crashing this is why
 o joypads are now emulated
 o joysticks and joypads can be configured in the config file
 o '<>' and 'End' keys' scancodes made Atari compatible

 Check the doc/config example file for the new [JOYSTICKS] and [AUDIO] sections.

5 files changed, 72 insertions, 44 deletions

diff --git a/emulators/aranym/Makefile b/emulators/aranym/Makefile
index 6627a065879..7de38b7d917 100644
--- a/emulators/aranym/Makefile
+++ b/emulators/aranym/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.21 2010/01/29 20:20:53 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2010/07/08 11:28:05 obache Exp $
 #
 
-DISTNAME=			aranym-0.9.6beta2
-PKGREVISION=			1
+DISTNAME=			aranym-0.9.10
 CATEGORIES=			emulators
 MASTER_SITES=			${MASTER_SITE_SOURCEFORGE:=aranym/}
-SITES.emutos-512k-0.8.3.zip=	${MASTER_SITE_SOURCEFORGE:=emutos/}
-DISTFILES=			aranym-0.9.6beta2.tar.gz emutos-512k-0.8.3.zip
+SITES.emutos-512k-0.8.5.zip=	${MASTER_SITE_SOURCEFORGE:=emutos/}
+DISTFILES=			${DEFAULT_DISTFILES} emutos-512k-0.8.5.zip
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://aranym.sourceforge.net/
 COMMENT=		Atari Running on Any Machine
+LICENSE=		gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -20,8 +20,9 @@ GNU_CONFIGURE=		yes
 MANCOMPRESSED=		yes
 
 CONFIGURE_ARGS+=	--enable-fullmmu
+CONFIGURE_ARGS+=	--enable-atc=full
 
-EMUTOS_WRKSRC=		${WRKDIR}/emutos-512k-0.8.3
+EMUTOS_WRKSRC=		${WRKDIR}/emutos-512k-0.8.5
 EMUTOS_DOC_DIR=		${PREFIX}/share/doc/aranym/emutos
 EMUTOS_ROM_DIR=		${PREFIX}/share/aranym
 
@@ -38,10 +39,15 @@ SUBST_MESSAGE.paths=	Fixing hardcoded paths.
 .include "options.mk"
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} != "NetBSD" && ${OPSYS} != "DragonFly"
+.if ${OPSYS} == "Linux"
 CONFIGURE_ARGS+=	--enable-nfpci
 .endif
 
+.if !empty(MACHINE_PLATFORM:MLinux-*-i386)
+CONFIGURE_ARGS+=	--enable-jit-compiler
+CONFIGURE_ARGS+=	--enable-jit-fpu
+.endif
+
 INSTALLATION_DIRS+=	${EMUTOS_DOC_DIR} ${EMUTOS_ROM_DIR}
 
 post-install:
diff --git a/emulators/aranym/distinfo b/emulators/aranym/distinfo
index 0599769b3a5..302a16a4f56 100644
--- a/emulators/aranym/distinfo
+++ b/emulators/aranym/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.7 2008/08/07 16:19:34 hauke Exp $
+$NetBSD: distinfo,v 1.8 2010/07/08 11:28:05 obache Exp $
 
-SHA1 (aranym-0.9.6beta2.tar.gz) = 7f66d0770b58ffcbcff5b3e0c36a5e9310d8df08
-RMD160 (aranym-0.9.6beta2.tar.gz) = 512032c46a0a67ac79762ac34dd000e0f03d2231
-Size (aranym-0.9.6beta2.tar.gz) = 1527029 bytes
-SHA1 (emutos-512k-0.8.3.zip) = 5edb36b4f959c6ae258f30ac5107fd1a5725215d
-RMD160 (emutos-512k-0.8.3.zip) = ddc0fae3d332425f2b5b551544c78676d412a5be
-Size (emutos-512k-0.8.3.zip) = 211069 bytes
-SHA1 (patch-aa) = 8bf0ef529ce3cc2ff4e6436e00bdcf28e4a85905
+SHA1 (aranym-0.9.10.tar.gz) = b7d55756c3c6a73b26f1e504ceee1016b7d40231
+RMD160 (aranym-0.9.10.tar.gz) = d0f5beffbc81d9ffbe22c54ec49e7d3353359c0d
+Size (aranym-0.9.10.tar.gz) = 1737163 bytes
+SHA1 (emutos-512k-0.8.5.zip) = 63ec3326e65d07c64e529694b7cfbbc559188f47
+RMD160 (emutos-512k-0.8.5.zip) = 8440e97667dbdf3de7b484d98ae6ada3b5e1fe2a
+Size (emutos-512k-0.8.5.zip) = 213435 bytes
+SHA1 (patch-aa) = 4b45ad6cf60d7c0766756db69cf33fe612d56025
 SHA1 (patch-ab) = 8796751780cc559acd089298f3e8a0918d36db3a
-SHA1 (patch-ac) = b9456fced8f9f89f5f9bd388f0329478f775b62f
+SHA1 (patch-ac) = 8899894456b01c84efd9f96f553750c87df7c21a
 SHA1 (patch-ad) = bb8d6b2ecd0c0066f3032a0ef196a1adb51d1786
+SHA1 (patch-ae) = 6c7ab7cf17bb9da5944c9a09474079bcfe7e7f43
diff --git a/emulators/aranym/patches/patch-aa b/emulators/aranym/patches/patch-aa
index e2fa5053075..a58549bc85a 100644
--- a/emulators/aranym/patches/patch-aa
+++ b/emulators/aranym/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2008/07/30 14:08:59 hauke Exp $
+$NetBSD: patch-aa,v 1.5 2010/07/08 11:28:05 obache Exp $
 
---- configure.orig	2008-01-29 20:26:32.000000000 +0100
+--- configure.orig	2010-06-01 13:42:21.000000000 +0000
 +++ configure
-@@ -2335,7 +2335,7 @@ case "$host_os" in
+@@ -3069,7 +3069,7 @@ case "$host_os" in
    linux*)	OS_TYPE=linux;;
    openbsd*)	OS_TYPE=openbsd;;
    netbsd*)	OS_TYPE=netbsd;;
@@ -11,16 +11,15 @@ $NetBSD: patch-aa,v 1.4 2008/07/30 14:08:59 hauke Exp $
    solaris*)	OS_TYPE=solaris;;
    darwin*)	OS_TYPE=darwin;;
    cygwin*)	OS_TYPE=cygwin;;
-@@ -5887,7 +5887,7 @@ done
- 
+@@ -5154,13 +5154,16 @@ fi
  
+ done
  
 -for ac_header in linux/if.h linux/if_tun.h net/if.h net/if_tun.h
 +for ac_header in linux/if.h linux/if_tun.h net/if.h net/if_tun.h net/if_tap.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -5905,6 +5905,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
  #ifdef HAVE_SYS_SOCKET_H
  #include <sys/socket.h>
  #endif
@@ -28,18 +27,18 @@ $NetBSD: patch-aa,v 1.4 2008/07/30 14:08:59 hauke Exp $
 +#include <sys/types.h>
 +#endif
  
- 
- #include <$ac_header>
-@@ -11456,7 +11459,7 @@ _ACEOF
+ "
+ eval as_val=\$$as_ac_Header
+@@ -6424,7 +6427,7 @@ $as_echo "#define _POSIX_C_SOURCE 199506
    irix*)
      EXTRASYSSRCS="Unix/parameters_unix.cpp Unix/irix/unaligned.c Unix/host_filesys_unix.cpp"
      ;;
 -  freebsd*|kfreebsd*-gnu)
 +  freebsd*|dragonfly*|kfreebsd*-gnu)
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_O_FSYNC 1
-@@ -11914,8 +11917,14 @@ cat >>conftest.$ac_ext <<_ACEOF
+ $as_echo "#define HAVE_O_FSYNC 1" >>confdefs.h
+ 
+@@ -6720,8 +6723,14 @@ else
        #include <linux/if_tun.h>
        #endif
        #if defined(HAVE_NET_IF_H) && defined(HAVE_NET_IF_TUN_H)
@@ -54,8 +53,8 @@ $NetBSD: patch-aa,v 1.4 2008/07/30 14:08:59 hauke Exp $
        #endif
  
  int
-@@ -13455,7 +13464,7 @@ echo "$as_me: error: Sorry, extended seg
-    { (exit 1); exit 1; }; }
+@@ -7775,7 +7784,7 @@ $as_echo "#define NO_NESTED_SIGSEGV 1 " 
+         as_fn_error "Sorry, extended segfault handler not supported on your platform" "$LINENO" 5
        fi
        ;;
 -    freebsd*|kfreebsd*-gnu)
@@ -63,12 +62,12 @@ $NetBSD: patch-aa,v 1.4 2008/07/30 14:08:59 hauke Exp $
        if [ "x$HAVE_I386" = "xyes" ]; then
          SYSSRCS="$SYSSRCS Unix/xbsd/sigsegv_xbsd.cpp"
        else
-@@ -14975,7 +14984,7 @@ fi
+@@ -8486,7 +8495,7 @@ fi
  
  SDL_CFLAGS=
  SDL_LIBS=
 -if test "x$OS_TYPE" == "xdarwin" -a "x$WITH_FINK" = "xno"; then
 +if test "x$OS_TYPE" = "xdarwin" -a "x$WITH_FINK" = "xno"; then
  
-     { echo "$as_me:$LINENO: checking whether compiler supports framework SDL" >&5
- echo $ECHO_N "checking whether compiler supports framework SDL... $ECHO_C" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports framework SDL" >&5
+ $as_echo_n "checking whether compiler supports framework SDL... " >&6; }
diff --git a/emulators/aranym/patches/patch-ac b/emulators/aranym/patches/patch-ac
index da90fbbe3c4..0dda7bbe480 100644
--- a/emulators/aranym/patches/patch-ac
+++ b/emulators/aranym/patches/patch-ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.2 2008/07/30 14:08:59 hauke Exp $
+$NetBSD: patch-ac,v 1.3 2010/07/08 11:28:05 obache Exp $
 
---- Makefile.in.orig	2008-01-29 00:07:52.000000000 +0100
+--- Makefile.in.orig	2010-05-27 18:40:47.000000000 +0000
 +++ Makefile.in
-@@ -237,8 +237,8 @@ $(APP_BUNDLE): $(APP)
- install: $(APP) $(TAPIF) $(APP).1.gz $(APP)-jit.1.gz $(APP)-mmu.1.gz $(APP_IFC).1.gz installdirs
+@@ -239,8 +239,8 @@ $(APP_BUNDLE): $(APP)
+ install: $(APP) $(TAPIF) doc/$(APP).1 doc/$(APP)-jit.1 doc/$(APP)-mmu.1 doc/$(APP_IFC).1 installdirs
  	$(INSTALL_PROGRAM) $(APP) $(DESTDIR)$(bindir)/$(APP)
  	if [ "x$(APP_IFC)" = "x$(TAPIF)" ]; then \
 -	$(INSTALL_PROGRAM) $(APP_IFC) $(DESTDIR)$(bindir)/$(APP_IFC);\
--	$(INSTALL_DATA) $(APP_IFC).1.gz $(DESTDIR)$(man1dir)/$(APP_IFC).1.gz ;\
+-	$(INSTALL_DATA) doc/$(APP_IFC).1 $(DESTDIR)$(man1dir)/$(APP_IFC).1 ;\
 +	$(INSTALL_PROGRAM) $(APP_IFC) $(DESTDIR)$(bindir)/$(APP_IFC); \
-+	$(INSTALL_DATA) $(APP_IFC).1.gz $(DESTDIR)$(man1dir)/$(APP_IFC).1.gz ; \
++	$(INSTALL_DATA) doc/$(APP_IFC).1 $(DESTDIR)$(man1dir)/$(APP_IFC).1; \
  	fi
- 	$(INSTALL_DATA) $(APP).1.gz $(DESTDIR)$(man1dir)/$(APP).1.gz
- 	$(INSTALL_DATA) $(APP)-jit.1.gz $(DESTDIR)$(man1dir)/$(APP)-jit.1.gz
+ 	$(INSTALL_DATA) doc/$(APP).1 $(DESTDIR)$(man1dir)/$(APP).1
+ 	$(INSTALL_DATA) doc/$(APP)-jit.1 $(DESTDIR)$(man1dir)/$(APP)-jit.1
diff --git a/emulators/aranym/patches/patch-ae b/emulators/aranym/patches/patch-ae
new file mode 100644
index 00000000000..290c7459711
--- /dev/null
+++ b/emulators/aranym/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2010/07/08 11:28:05 obache Exp $
+
+--- src/Unix/darwin/aratapif.sh.orig	2008-02-05 21:37:06.000000000 +0000
++++ src/Unix/darwin/aratapif.sh
+@@ -25,7 +25,7 @@ DNSFWNATD_PORT=8669
+ DNSFW_RULENUM=00100
+ IPFW_RULENUM=00200
+ 
+-if [ "$FW_INTERFACE" == "" ]
++if [ "$FW_INTERFACE" = "" ]
+ then
+ 	ifconfig -u -a inet >/tmp/ifchk 2>/dev/null
+ 	
+@@ -51,7 +51,7 @@ then
+ 	echo $FW_INTERFACE - $ADDR
+ fi
+ 
+-if [ "$NAMESERVER" == "" ]
++if [ "$NAMESERVER" = "" ]
+ then
+ 	while read -r line
+     do