update emulators/stella to 4.6.7 and enable darwin

6 files changed, 31 insertions, 30 deletions

diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 20d2aeb560a..736b73d2949 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2015/04/25 14:20:47 tnn Exp $
+# $NetBSD: Makefile,v 1.46 2015/12/21 06:46:04 dbj Exp $
 
-STELLA_VERSION=	3.9.2
+STELLA_VERSION=	4.6.7
 DISTNAME=	stella-${STELLA_VERSION}-src
 PKGNAME=	stella-${STELLA_VERSION}
-PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=stella/}
 
@@ -25,7 +24,7 @@ GCC_REQD+=	3.0
 .endif
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/emulators/stella/PLIST b/emulators/stella/PLIST
index 2b40f76d807..006ad396215 100644
--- a/emulators/stella/PLIST
+++ b/emulators/stella/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2014/01/06 23:42:38 dholland Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/12/21 06:46:04 dbj Exp $
 bin/stella
 share/applications/stella.desktop
 share/doc/stella/Announce.txt
@@ -22,6 +22,8 @@ share/doc/stella/graphics/debugger_dataops.png
 share/doc/stella/graphics/debugger_globalbuttons.png
 share/doc/stella/graphics/debugger_iotab.png
 share/doc/stella/graphics/debugger_main.png
+share/doc/stella/graphics/debugger_ram-dpc.png
+share/doc/stella/graphics/debugger_ram-f8sc.png
 share/doc/stella/graphics/debugger_ram.png
 share/doc/stella/graphics/debugger_ramsearch.png
 share/doc/stella/graphics/debugger_rom.png
diff --git a/emulators/stella/distinfo b/emulators/stella/distinfo
index eaa76c83264..393ce307d79 100644
--- a/emulators/stella/distinfo
+++ b/emulators/stella/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2015/11/03 20:31:02 agc Exp $
+$NetBSD: distinfo,v 1.18 2015/12/21 06:46:04 dbj Exp $
 
-SHA1 (stella-3.9.2-src.tar.gz) = 96b83dd2c41dddfe77f7bb1ecf74ab4c47e06e9b
-RMD160 (stella-3.9.2-src.tar.gz) = 6d9127db8ee9f67f9af173aa140c0da826a0cb84
-SHA512 (stella-3.9.2-src.tar.gz) = 4b1a612c584762580e192e4f2b73fd1f564311203ce36015f915be18e590ae905fc63a94ce03f8102c39fb9822fe3cb28d59fffd79da1094e6d9c5ebd9a61a22
-Size (stella-3.9.2-src.tar.gz) = 2282963 bytes
-SHA1 (patch-ab) = 80504428805995d6a7c651254aded4f4d3fa3962
-SHA1 (patch-src_unix_FSNodePOSIX.cxx) = 1ca0a4f34794843a5f7df0bcc0d5f589cd11a3bd
+SHA1 (stella-4.6.7-src.tar.gz) = abcd26fe1ebc8caadf4180e74d6453ff6fe688a5
+RMD160 (stella-4.6.7-src.tar.gz) = da2f24a3f594fcbea45ed9cdf57ba9ba76ff73d9
+SHA512 (stella-4.6.7-src.tar.gz) = 3c0a1f149c46073c72053fd071d449f8d4cc156edc9fb064afd99ba0b061089b5479c39f53636a0c39a83e32b25979a5abb00979a0fc6ffb6a5446cb8a03c759
+Size (stella-4.6.7-src.tar.gz) = 2293052 bytes
+SHA1 (patch-configure) = 141f240a686a85ffe7eda4a145fa681c4733dbe9
+SHA1 (patch-src_unix_FSNodePOSIX.cxx) = 8679698480dd443bbcf9d92411ad307bfbe700b3
diff --git a/emulators/stella/patches/patch-ab b/emulators/stella/patches/patch-ab
deleted file mode 100644
index 7c3fffbcaee..00000000000
--- a/emulators/stella/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2014/01/06 23:42:38 dholland Exp $
-
-Recognize dragonfly and solaris.
-
---- configure.orig	2013-04-17 15:00:32.000000000 +0000
-+++ configure
-@@ -542,7 +542,7 @@ else
- 	echo_n "Checking hosttype... "
- 	echo $_host_os
- 	case $_host_os in
--		linux* | openbsd* | freebsd* | kfreebsd* | netbsd* | bsd* | gnu0.3 | sunos* | hpux* | beos*)
-+		linux* | openbsd* | freebsd* | kfreebsd* | netbsd* | bsd* | gnu0.3 | sunos* | solaris* | hpux* | beos* | dragonfly*)
- 			DEFINES="$DEFINES -DUNIX"
- 			_host_os=unix
- 			;;
diff --git a/emulators/stella/patches/patch-configure b/emulators/stella/patches/patch-configure
new file mode 100644
index 00000000000..1a782c9beb9
--- /dev/null
+++ b/emulators/stella/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2015/12/21 06:46:04 dbj Exp $
+
+Recognize solaris, dragonfly, and darwin.
+
+--- configure.orig	2015-04-22 14:11:11.000000000 +0000
++++ configure
+@@ -497,7 +497,7 @@ else
+ 	echo_n "Checking hosttype... "
+ 	echo $_host_os
+ 	case $_host_os in
+-		linux* | openbsd* | freebsd* | kfreebsd* | netbsd* | bsd* | gnu0.* | sunos* | hpux* | beos*)
++		linux* | openbsd* | freebsd* | kfreebsd* | netbsd* | bsd* | gnu0.* | sunos* | hpux* | beos* | solaris* | dragonfly* | darwin*)
+ 			DEFINES="$DEFINES -DUNIX"
+ 			_host_os=unix
+ 			;;
diff --git a/emulators/stella/patches/patch-src_unix_FSNodePOSIX.cxx b/emulators/stella/patches/patch-src_unix_FSNodePOSIX.cxx
index 812223b86ee..2db201c505d 100644
--- a/emulators/stella/patches/patch-src_unix_FSNodePOSIX.cxx
+++ b/emulators/stella/patches/patch-src_unix_FSNodePOSIX.cxx
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_unix_FSNodePOSIX.cxx,v 1.1 2014/02/17 18:36:07 dholland Exp $
+$NetBSD: patch-src_unix_FSNodePOSIX.cxx,v 1.2 2015/12/21 06:46:04 dbj Exp $
 
 Try to make the dirent->d_type handling code autodetect. (As best as I
 can tell it is not, in the current version 3.9.2 at least, handled
 from configure.)
 
---- src/unix/FSNodePOSIX.cxx~	2013-06-29 00:02:49.000000000 +0000
+--- src/unix/FSNodePOSIX.cxx.orig	2015-01-01 03:49:32.000000000 +0000
 +++ src/unix/FSNodePOSIX.cxx
-@@ -145,6 +145,12 @@ bool FilesystemNodePOSIX::getChildren(Ab
+@@ -120,6 +120,12 @@ bool FilesystemNodePOSIX::getChildren(Ab
  
      FilesystemNodePOSIX entry(newPath, false);