Update to 1.37.3, based on pkg/13070 by Jared D. McNeill; buildlinked.

Lots of emulation-related fixes and improvements.

11 files changed, 195 insertions, 135 deletions

diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 6e55925684c..d4644952695 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2001/03/27 03:19:55 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2001/07/17 15:31:24 wiz Exp $
 
-DISTNAME=		s9xs132
-PKGNAME=		snes9x-1.32
+DISTNAME=		s9xs137c
+PKGNAME=		snes9x-1.37.3
 WRKSRC=			${WRKDIR}/release
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.snes9x.com/zips/
@@ -11,7 +11,7 @@ MAINTAINER=		jmcneill@invisible.yi.org
 HOMEPAGE=		http://www.snes9x.com/
 COMMENT=		Super Nintendo Entertainment System (SNES) emulator
 
-BUILD_DEPENDS+=		nasm-0.98:../../devel/nasm
+BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
 USE_X11=		yes
 USE_GMAKE=		yes
@@ -28,9 +28,11 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/README.TXT ${PREFIX}/share/doc/snes9x
 	${INSTALL_MAN} ${WRKSRC}/TODO.TXT ${PREFIX}/share/doc/snes9x
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../mk/bsd.prefs.mk"
 
+MAKE_ENV+=	THREAD_SOUND=1
 .if ( ${MACHINE_ARCH} == "i386" )
+MAKE_ENV+=	USING_I386=1
 .if ( ${OBJECT_FMT} == "a.out" )
 MAKE_ENV+=	FILEFORMAT=aoutb
 MAKE_ENV+=	_ASM_UNDERBARS=1
@@ -38,10 +40,17 @@ MAKE_ENV+=	_ASM_UNDERBARS=1
 MAKE_ENV+=	FILEFORMAT=elf
 # use assembler part only for ELF, since it doesn't link on a.out
 MAKE_ENV+=	ZSNESFX=1
+MAKE_ENV+=	ZSNESC4=1
 MAKE_ENV+=	ASMCPU=1
+.if defined(USE_MMX) && ${USE_MMX} == "YES"
+MAKE_ENV+=	ASMKREED=1
+.endif
 .endif
 .endif
 
 .if exists(${X11BASE}/lib/libXxf86dga.a)
 MAKE_ENV+=	NETBSD_USE_DGA=1
 .endif
+
+.include "../../devel/pth/buildlink.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/snes9x/distinfo b/emulators/snes9x/distinfo
index 1c51a2f5ab2..25e0f8ffa8d 100644
--- a/emulators/snes9x/distinfo
+++ b/emulators/snes9x/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 10:49:56 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/17 15:31:24 wiz Exp $
 
-SHA1 (s9xs132.zip) = fc2ee1be04cb5983fc499b420525503de693daae
-Size (s9xs132.zip) = 601820 bytes
-SHA1 (patch-aa) = 7dcd4e19e5b79d5504f138c204bfd9a6a13f2e44
-SHA1 (patch-ab) = 24d7428994478da9a185227b63be03ebccdb88c0
-SHA1 (patch-ac) = 4998ed2fcc6f8c69696d04c4792d281e6a88c186
-SHA1 (patch-ad) = d6996524a0ac7dc4313979c7d6bfdfa68a8818d2
-SHA1 (patch-ae) = b197f858ed7c3e23ea0bc808f2114bb11f68b6c2
-SHA1 (patch-af) = 9de3b9420fcef7217561afa1bd3c4be234588a19
-SHA1 (patch-ag) = 23660a32dd160870117eee49dec7e3b9b3767e66
+SHA1 (s9xs137c.zip) = c0adc6ca41572a6dfd31ab98ea6c6c448777d56f
+Size (s9xs137c.zip) = 653410 bytes
+SHA1 (patch-aa) = 19b4e22c31741f0726d527e18a1bbc7fbfd11546
+SHA1 (patch-ab) = b99893934074d8693a9609d49e49953ade2b2062
+SHA1 (patch-ac) = 25a054c55774421f1ba133906de9134a0ba233f5
+SHA1 (patch-ad) = 72cc9904c74e0668cce450fcada24453aec344e4
+SHA1 (patch-ae) = cb2ed8dc3ad409ffb88cb9851b04c6c42c3b2b0e
+SHA1 (patch-af) = 302967c91a1e0b384c4990687fb11bf236202783
+SHA1 (patch-ag) = cd708790ad2f3628263b78154cebdac52d90e0d2
 SHA1 (patch-ah) = 60bd35e51faca36fbd8d8d6354487554af17fe7a
-SHA1 (patch-ai) = 7243ef63d42a3d867bdb8611f01d7090f65f51ef
+SHA1 (patch-ai) = 2f522a560577aff89af9efa7a6b129faa99670fd
diff --git a/emulators/snes9x/patches/patch-aa b/emulators/snes9x/patches/patch-aa
index 3dd41006bf3..fadef9a5db5 100644
--- a/emulators/snes9x/patches/patch-aa
+++ b/emulators/snes9x/patches/patch-aa
@@ -1,11 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2000/11/16 02:27:05 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2001/07/17 15:31:25 wiz Exp $
 
---- Makefile.orig	Mon Oct  2 09:36:11 2000
+--- Makefile.orig	Wed Feb 28 21:29:58 2001
 +++ Makefile
-@@ -1,11 +1,11 @@
+@@ -1,13 +1,13 @@
 -ZSNESFX=1
+-ZSNESC4=1
 -ASMCPU=1
 +#ZSNESFX=1
++#ZSNESC4=1
 +#ASMCPU=1
  #SPC700ASM=1
  NETPLAY=1
@@ -14,12 +16,14 @@ $NetBSD: patch-aa,v 1.3 2000/11/16 02:27:05 wiz Exp $
 +#GLIDE=1
  #GUI=1
 -THREAD_SOUND=1
+-ASMKREED=1
 +#THREAD_SOUND=1
++#ASMKREED=1
  
  ifdef ZSNESFX
- FXOBJ=i386/fxemu2b.o i386/fxemu2.o i386/fxemu2c.o i386/fxtable.o i386/sfxproc.o i386/zsnes.o i386/spc.o
-@@ -19,7 +19,10 @@
- FXNO_DEPENDS=zsnes_fx
+ FXOBJ=i386/fxemu2b.o i386/fxemu2.o i386/fxemu2c.o i386/fxtable.o i386/sfxproc.o i386/zsnes.o
+@@ -33,7 +33,10 @@
+ C4NO_DEPENDS=zsnes_c4
  endif
  
 +ifdef NETBSD_USE_DGA
@@ -29,39 +33,54 @@ $NetBSD: patch-aa,v 1.3 2000/11/16 02:27:05 wiz Exp $
  
  ifdef SPC700ASM
  SOUNDOBJ=spctool/spc700.o spctool/dsp.o spctool.o spctool/soundmod.o spc.o
-@@ -81,9 +84,9 @@
+@@ -82,8 +85,8 @@
+ endif
+ 
+ ifdef THREAD_SOUND
+-CPUDEFINES += -DUSE_THREADS
+-EXTRALIBS += -lpthread
++CPUDEFINES += -DUSE_THREADS -I${BUILDLINK_DIR}/include
++EXTRALIBS += -Wl,-R${LOCALBASE}/lib -L${BUILDLINK_DIR}/lib -lpthread
+ endif
+ 
+ ifdef GLIDE
+@@ -102,9 +105,13 @@
  CC = gcc
  NASM = nasm
  
 -INCLUDES=-I/usr/X11R6/include -I/usr/local/include
 +INCLUDES=-I${X11BASE}/include
  
--OPTIMISE=-O6 -mpentium -fno-exceptions -Wall -W -pedantic -pipe -fomit-frame-pointer 
-+OPTIMISE=-fno-exceptions -Wall -W -pedantic -pipe -fomit-frame-pointer 
+-OPTIMISE= -O6 -mpentium -fomit-frame-pointer -fno-exceptions -Wall -W -pedantic -pipe 
++ifdef USING_I386
++OPTIMISE=-O6 -mpentium -fomit-frame-pointer -fno-exceptions -Wall -W -pedantic -pipe 
++else
++OPTIMISE=-fno-exceptions -Wall -W -pedantic -pipe -fomit-frame-pointer
++endif
  
  #OPTIMISE=-g -fno-exceptions
  #-DMITSHM 
-@@ -92,7 +95,6 @@
+@@ -113,7 +120,6 @@
  -Ii386 \
  -I. \
  -Iunzip \
 --DJOYSTICK_SUPPORT \
  -DZLIB \
- -DNO_INLINE_SET_GET \
  -DVAR_CYCLES \
-@@ -118,9 +120,9 @@
+ -DDEBUGGER \
+@@ -141,9 +147,9 @@
  CFLAGS=$(CCFLAGS)
  
- .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm
+ .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm .obj
 -LDLIBS = -L/usr/X11R6/lib frame.o
-+LDLIBS = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
++LDLIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib
  
 -all: offsets snes9x ssnes9x
 +all: offsets snes9x
  
  #ggisnes9x
  #xf86snes9x
-@@ -138,7 +140,7 @@
+@@ -165,7 +171,7 @@
  	./offsets >i386/offsets.h
  
  snes9x: $(OBJECTS) unix/x11.o $(GLIDEOBJS) $(GUIOBJS)
@@ -70,7 +89,7 @@ $NetBSD: patch-aa,v 1.3 2000/11/16 02:27:05 wiz Exp $
  
  ssnes9x: $(OBJECTS) unix/svga.o $(GLIDEOBJS) 
  	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/svga.o $(LDLIBS) $(GLIDELIBS) -lvga -lvgagl -lz $(EXTRALIBS) -lm
-@@ -168,7 +170,7 @@
+@@ -195,7 +201,7 @@
  	$(CCC) $(INCLUDES) -c -E $(CCFLAGS) $*.S -o $@
  
  .asm.o:
diff --git a/emulators/snes9x/patches/patch-ab b/emulators/snes9x/patches/patch-ab
index 818448e5f18..5b8654d6868 100644
--- a/emulators/snes9x/patches/patch-ab
+++ b/emulators/snes9x/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/11/09 16:43:40 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2001/07/17 15:31:25 wiz Exp $
 
---- i386/asmstruc.h.orig	Mon Jan 24 16:13:54 2000
+--- i386/asmstruc.h.orig	Wed Feb 28 22:12:23 2001
 +++ i386/asmstruc.h
-@@ -36,7 +36,7 @@
+@@ -38,7 +38,7 @@
+  * Super NES and Super Nintendo Entertainment System are trademarks of
   * Nintendo Co., Limited and its subsidiary companies.
   */
- 
 -#if defined(__DJGCC) || defined(MICROSOFT_C) || defined(_WINDOWS)
 +#if defined(__DJGCC) || defined(MICROSOFT_C) || defined(_WINDOWS) || defined(_ASM_UNDERBARS)
  #define S9xTraceMessage _S9xTraceMessage
diff --git a/emulators/snes9x/patches/patch-ac b/emulators/snes9x/patches/patch-ac
index 81c87894ffd..02c1ef48b15 100644
--- a/emulators/snes9x/patches/patch-ac
+++ b/emulators/snes9x/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/11/09 16:43:42 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2001/07/17 15:31:25 wiz Exp $
 
---- i386/fxemu2.asm.orig	Fri Sep 10 19:18:40 1999
+--- i386/fxemu2.asm.orig	Fri Sep 10 21:18:39 1999
 +++ i386/fxemu2.asm
 @@ -2683,4 +2683,3 @@
  SECTION .data
diff --git a/emulators/snes9x/patches/patch-ad b/emulators/snes9x/patches/patch-ad
index 3af4610b47b..2ff304400f3 100644
--- a/emulators/snes9x/patches/patch-ad
+++ b/emulators/snes9x/patches/patch-ad
@@ -1,15 +1,17 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/11/09 16:43:42 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2001/07/17 15:31:25 wiz Exp $
 
---- port.h.orig	Mon Jan 24 16:13:54 2000
-+++ port.h
-@@ -164,6 +164,10 @@
- #define TITLE "Snes9X: Linux"
- #endif
+--- netplay.cpp.orig	Wed Feb 28 22:12:22 2001
++++ netplay.cpp
+@@ -75,8 +75,12 @@
  
+ #ifdef USE_THREADS
+ #include <pthread.h>
 +#ifdef __NetBSD__
-+#define TITLE "Snes9X: NetBSD"
++#include <sys/sched.h>
++#else
+ #include <sched.h>
+ #include <semaphore.h>
 +#endif
-+
- #ifndef TITLE
- #define TITLE "Snes9x"
  #endif
+ 
+ #include "snes9x.h"
diff --git a/emulators/snes9x/patches/patch-ae b/emulators/snes9x/patches/patch-ae
index 017b4b2ccb3..2bfb67427fe 100644
--- a/emulators/snes9x/patches/patch-ae
+++ b/emulators/snes9x/patches/patch-ae
@@ -1,13 +1,15 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/11/09 16:43:42 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2001/07/17 15:31:25 wiz Exp $
 
---- soundux.h.orig	Mon Jan 24 16:13:54 2000
-+++ soundux.h
-@@ -77,7 +77,7 @@
-     int stereo;
-     bool8 sixteen_bit;
-     bool8 encoded;
--#ifdef __sun
-+#if defined(__sun) || defined(__NetBSD__)
-     int last_eof;
+--- port.h.orig	Wed Feb 28 22:12:22 2001
++++ port.h
+@@ -188,6 +188,10 @@
+ #define TITLE "Snes9X: Linux"
+ #endif
+ 
++#ifdef __NetBSD__
++#define TITLE "Snes9X: NetBSD"
++#endif
++
+ #ifndef TITLE
+ #define TITLE "Snes9x"
  #endif
- #ifdef __sgi
diff --git a/emulators/snes9x/patches/patch-af b/emulators/snes9x/patches/patch-af
index 449815892de..72b99897b4a 100644
--- a/emulators/snes9x/patches/patch-af
+++ b/emulators/snes9x/patches/patch-af
@@ -1,68 +1,13 @@
-$NetBSD: patch-af,v 1.2 2000/11/16 02:27:05 wiz Exp $
+$NetBSD: patch-af,v 1.3 2001/07/17 15:31:25 wiz Exp $
 
---- unix/unix.cpp.orig	Fri Oct  6 23:02:40 2000
-+++ unix/unix.cpp
-@@ -79,7 +79,14 @@
- #endif
- #endif
- 
--#if defined(__sun) && defined(__GNUC__)
-+#ifdef __NetBSD__
-+#include <sys/ioctl.h>
-+#include <sys/audioio.h>
-+#endif
-+
-+#if defined(__NetBSD__)
-+typedef void (*SIG_PF)(int);
-+#elif defined(__sun) && defined(__GNUC__)
- typedef void (*SIG_PF)();
- #endif
- 
-@@ -167,7 +174,7 @@
- char *rom_filename = NULL;
- char *snapshot_filename = NULL;
- 
--#if defined(__linux) || defined(__sun)
-+#if defined(__linux) || defined(__sun) || defined(__NetBSD__)
- static void sigbrkhandler(int)
- {
- #ifdef DEBUGGER
-@@ -1373,7 +1380,7 @@
- }
- #endif
- 
+--- soundux.h.orig	Wed Feb 28 22:12:23 2001
++++ soundux.h
+@@ -79,7 +79,7 @@
+     int stereo;
+     bool8 sixteen_bit;
+     bool8 encoded;
 -#ifdef __sun
 +#if defined(__sun) || defined(__NetBSD__)
- static int Rates[8] =
- {
-     0, 8000, 11025, 16000, 22050, 32000, 37800, 44100
-@@ -1442,9 +1449,9 @@
- {
-     int J, K;
- 
--    if ((so.sound_fd = open ("/dev/dsp", O_WRONLY)) < 0)
-+    if ((so.sound_fd = open ("/dev/audio", O_WRONLY)) < 0)
-     {
--	perror ("/dev/dsp");
-+	perror ("/dev/audio");
- 	return (FALSE);
-     }
- 
-@@ -1546,7 +1553,7 @@
- }
+     int last_eof;
  #endif
- 
--#if defined (__linux) || defined (__sun)
-+#if defined (__linux) || defined (__sun) || defined(__NetBSD__)
- void S9xUnixProcessSound (void)
- {
- }
-@@ -1669,7 +1676,7 @@
- #endif
- 
- #endif
--#ifdef __sun
-+#if defined(__sun) || defined(__NetBSD__)
-     audio_info_t audio;
-     if (!Settings.ThreadSound)
-     {
+ #ifdef __sgi
diff --git a/emulators/snes9x/patches/patch-ag b/emulators/snes9x/patches/patch-ag
index 7760b0ed3a5..88744018e4b 100644
--- a/emulators/snes9x/patches/patch-ag
+++ b/emulators/snes9x/patches/patch-ag
@@ -1,12 +1,95 @@
-$NetBSD: patch-ag,v 1.1 2000/11/16 02:27:05 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2001/07/17 15:31:25 wiz Exp $
 
---- apudebug.cpp.orig	Fri Oct  6 23:02:38 2000
-+++ apudebug.cpp
-@@ -41,7 +41,6 @@
- #include "apu.h"
- #include "soundux.h"
- #include "cpuexec.h"
--#include "spctool/spc700.h"
+--- unix/unix.cpp.orig	Wed Feb 28 22:12:23 2001
++++ unix/unix.cpp
+@@ -51,7 +51,7 @@
+ #include <ctype.h>
  
+ 
+-#if defined(__linux) || defined(__sun)
++#if defined(__linux) || defined(__sun) || defined(__NetBSD__)
+ #undef USE_THREADS
+ #define USE_THREADS
+ #include <unistd.h>
+@@ -62,7 +62,11 @@
+ 
+ #ifdef USE_THREADS
+ #include <pthread.h>
++#ifdef __NetBSD__
++#include <sys/sched.h>
++#else
+ #include <sched.h>
++#endif
+ 
+ pthread_t thread;
+ pthread_mutex_t mutex;
+@@ -81,7 +85,14 @@
+ #endif
+ #endif
+ 
+-#if defined(__sun) && defined(__GNUC__)
++#ifdef __NetBSD__
++#include <sys/ioctl.h>
++#include <sys/audioio.h>
++#endif
++
++#if defined(__NetBSD__)
++typedef void (*SIG_PF)(int);
++#elif defined(__sun) && defined(__GNUC__)
+ typedef void (*SIG_PF)();
+ #endif
+ 
+@@ -168,7 +179,7 @@
+ char *rom_filename = NULL;
+ char *snapshot_filename = NULL;
+ 
+-#if defined(__linux) || defined(__sun)
++#if defined(__linux) || defined(__sun) || defined(__NetBSD__)
+ static void sigbrkhandler(int)
+ {
  #ifdef DEBUGGER
- extern int NoiseFreq [32];
+@@ -1368,7 +1379,7 @@
+ }
+ #endif
+ 
+-#ifdef __sun
++#if defined(__sun) || defined(__NetBSD__)
+ static int Rates[8] =
+ {
+     0, 8000, 11025, 16000, 22050, 32000, 37800, 44100
+@@ -1541,7 +1552,7 @@
+ }
+ #endif
+ 
+-#if defined (__linux) || defined (__sun)
++#if defined (__linux) || defined (__sun) || defined(__NetBSD__)
+ void S9xUnixProcessSound (void)
+ {
+ }
+@@ -1664,7 +1675,7 @@
+ #endif
+ 
+ #endif
+-#ifdef __sun
++#if defined(__sun) || defined(__NetBSD__)
+     audio_info_t audio;
+     if (!Settings.ThreadSound)
+     {
+@@ -1766,7 +1777,7 @@
+     } while (Settings.ThreadSound);
+ #endif
+ 
+-#ifdef __sun
++#if defined(__sun) || defined(__NetBSD__)
+     if (!Settings.ThreadSound)
+ 	write (so.sound_fd, NULL, 0);
+ #endif
+@@ -1786,7 +1797,7 @@
+     return (0);
+ }
+ 
+-#ifdef __sun
++#if defined(__sun) || defined(__NetBSD__)
+ uint8 int2ulaw(int ch)
+ {
+     int mask;
diff --git a/emulators/snes9x/patches/patch-ah b/emulators/snes9x/patches/patch-ah
index 73a12f5b4b5..788b24bf0ca 100644
--- a/emulators/snes9x/patches/patch-ah
+++ b/emulators/snes9x/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 2001/03/13 13:46:57 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2001/07/17 15:31:25 wiz Exp $
 
 --- unzip/unz.h.orig	Wed Aug 25 07:52:56 1999
 +++ unzip/unz.h
diff --git a/emulators/snes9x/patches/patch-ai b/emulators/snes9x/patches/patch-ai
index dc309f75eb0..4082dabbba7 100644
--- a/emulators/snes9x/patches/patch-ai
+++ b/emulators/snes9x/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1 2001/03/13 13:46:57 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2001/07/17 15:31:25 wiz Exp $
 
 --- unzip/unzip.h.orig	Wed Aug 25 07:52:56 1999
 +++ unzip/unzip.h
@@ -7,7 +7,7 @@ $NetBSD: patch-ai,v 1.1 2001/03/13 13:46:57 wiz Exp $
  #endif
  
 +/* removed in NetBSD around 2001/01/18 */
-+#ifndef OF /* function prototypes */
++#ifndef OF
 +#  ifdef STDC
 +#    define OF(args)  args
 +#  else