8 files changed, 112 insertions, 41 deletions

diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index df8f2a119f3c..065e0973ab3d 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	snes9x
-PORTVERSION=	1.29
+PORTVERSION=	1.32
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.snes9x.com/zips/
-DISTNAME=	s9xs129
+DISTNAME=	s9xs132
 
 MAINTAINER=	nakai@FreeBSD.org
 
@@ -42,6 +42,5 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/snes9x ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/s9xserver ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/emulators/snes9x/distinfo b/emulators/snes9x/distinfo
index 9ac471142f00..c3dd0118c737 100644
--- a/emulators/snes9x/distinfo
+++ b/emulators/snes9x/distinfo
@@ -1 +1 @@
-MD5 (s9xs129.zip) = 1af2990cd62925359ad9786a52dda748
+MD5 (s9xs132.zip) = 67bd0f3b036cedb8d16f49a2f554bbab
diff --git a/emulators/snes9x/files/patch-aa b/emulators/snes9x/files/patch-aa
index 2fa126a69dcb..f9b5126bf69d 100644
--- a/emulators/snes9x/files/patch-aa
+++ b/emulators/snes9x/files/patch-aa
@@ -1,6 +1,14 @@
---- Makefile.orig	Mon Jan 24 16:15:50 2000
-+++ Makefile	Wed Mar 15 02:23:16 2000
-@@ -50,11 +50,6 @@
+--- Makefile.orig	Mon Oct  2 03:36:11 2000
++++ Makefile	Fri Oct 13 20:56:31 2000
+@@ -3,7 +3,6 @@
+ #SPC700ASM=1
+ NETPLAY=1
+ UNZIP=1
+-GLIDE=1
+ #GUI=1
+ THREAD_SOUND=1
+ 
+@@ -60,11 +59,6 @@
  UNZIPDEFINES=-DUNZIP_SUPPORT
  endif
  
@@ -12,29 +20,25 @@
  ifdef GLIDE
  GLIDEOBJS = unix/glide.o
  GLIDEDEFINES = -DUSE_GLIDE -I/usr/include/glide
-@@ -66,24 +61,30 @@
- GLIDENO_DEPENDS=use_glide
+@@ -77,28 +71,26 @@
  endif
  
--CCC = gcc
--CC = gcc
+ MOC = $(QTDIR)/bin/moc
+-CCC = g++ -fno-rtti
 +CCC = $(CXX) -fno-rtti
-+CC ?= gcc
+ CC = gcc
  NASM = nasm
  
 -INCLUDES=-I/usr/X11R6/include -I/usr/local/include
-+ifdef THREAD_SOUND
-+CPUDEFINES += -DUSE_THREADS
-+CC += -pthread
-+CCC += -pthread
-+endif
-+
-+INCLUDES=-I${X11BASE}/include -I${LOCALBASE}/include
+-
+-OPTIMISE=-O6 -mpentium -fno-exceptions -Wall -W -pedantic -pipe -fomit-frame-pointer 
++INCLUDES= -I$(X11BASE)/include -I$(LOCALBASE)/include
  
--OPTIMISE=-O6 -mpentium -fomit-frame-pointer -fno-exceptions
-+OPTIMISE= $(CXXFLAGS)
+ #OPTIMISE=-g -fno-exceptions
+ #-DMITSHM 
  
- CCFLAGS = $(OPTIMISE) -DMITSHM \
+-CCFLAGS = $(OPTIMISE) -DMITSHM \
++CCFLAGS = -fomit-frame-pointer -DMITSHM \
  -Ii386 \
  -I. \
  -Iunzip \
@@ -42,30 +46,26 @@
  -DZLIB \
  -DNO_INLINE_SET_GET \
  -DVAR_CYCLES \
+ -DDEBUGGER \
  -DCPU_SHUTDOWN \
  -DSPC700_SHUTDOWN \
 +-DSOUND \
  $(LINUXDEFINES) \
  $(FXDEFINES) \
  $(CPUDEFINES) \
-@@ -108,7 +109,7 @@
- # system using the egcs compiler get an undefined __register_frame_info
- # symbol error when run on a Redhat box.
+@@ -115,12 +107,12 @@
+ #-DCPU_SHUTDOWN
+ #-DSPC700_SHUTDOWN
  
+-CFLAGS=$(CCFLAGS)
++CFLAGS+=$(CCFLAGS)
+ 
+ .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm
 -LDLIBS = -L/usr/X11R6/lib frame.o
-+LDLIBS = -L${X11BASE}/lib
++LDLIBS = -L$(X11BASE)/lib
  
- ifdef GLIDE
- ifdef NETPLAY
-@@ -118,9 +119,9 @@
- endif
- else
- ifdef NETPLAY
--all: offsets snes9x ssnes9x s9xserver
-+all: offsets snes9x s9xserver
- else
 -all: offsets snes9x ssnes9x
 +all: offsets snes9x
- endif
- endif
  
+ #ggisnes9x
+ #xf86snes9x
diff --git a/emulators/snes9x/files/patch-ae b/emulators/snes9x/files/patch-ae
index 57798904e310..b7b120bf16dd 100644
--- a/emulators/snes9x/files/patch-ae
+++ b/emulators/snes9x/files/patch-ae
@@ -1,5 +1,5 @@
---- port.h.orig	Mon Jan 24 16:13:54 2000
-+++ port.h	Wed Mar  8 23:09:50 2000
+--- port.h.orig	Fri Oct  6 17:02:39 2000
++++ port.h	Fri Oct 13 18:37:38 2000
 @@ -56,15 +56,15 @@
  
  #ifndef snes9x_types_defined
@@ -16,7 +16,7 @@
 +typedef u_int8_t bool8;
 +typedef int8_t int8;
 +typedef int16_t int16;
- #ifndef _WIN32
+ #ifndef __WIN32__
 -typedef int int32;
 -typedef long long int64;
 +typedef int32_t int32;
diff --git a/emulators/snes9x/files/patch-ai b/emulators/snes9x/files/patch-ai
new file mode 100644
index 000000000000..703ba3ebc44d
--- /dev/null
+++ b/emulators/snes9x/files/patch-ai
@@ -0,0 +1,10 @@
+--- apudebug.cpp.orig	Fri Oct 13 18:39:22 2000
++++ apudebug.cpp	Fri Oct 13 18:39:28 2000
+@@ -41,7 +41,6 @@
+ #include "apu.h"
+ #include "soundux.h"
+ #include "cpuexec.h"
+-#include "spctool/spc700.h"
+ 
+ #ifdef DEBUGGER
+ extern int NoiseFreq [32];
diff --git a/emulators/snes9x/files/patch-aj b/emulators/snes9x/files/patch-aj
new file mode 100644
index 000000000000..1230887f0cb2
--- /dev/null
+++ b/emulators/snes9x/files/patch-aj
@@ -0,0 +1,41 @@
+--- netplay.cpp.orig	Fri Oct 13 18:44:41 2000
++++ netplay.cpp	Fri Oct 13 18:56:53 2000
+@@ -682,22 +682,24 @@
+         return;
+     }
+     char fname [L_tmpnam];
+-    FILE *tmp;
+-    if (tmpnam (fname))
++    int tmp;
++    int flen = snprintf(fname, sizeof(fname), "%s/snes9x.XXXXXX",
++      getenv("TMPDIR") ? getenv("TMPDIR") : P_tmpdir);
++    if (flen == -1 || flen >= sizeof(fname) || (tmp = mkstemp(fname)) == -1)
+     {
+-        if ((tmp = fopen (fname, "wb")))
+-        {
+-            if (fwrite (data, 1, len, tmp) == len)
+-            {
+-                fclose (tmp);
+-                if (!S9xUnfreezeGame (fname))
+-                    S9xNPSetError ("Unable to load freeze file just received.");
+-            }
+-            else
+-                fclose (tmp);
+-        }
+-        remove (fname);
++	S9xNPSetError("Unable to open a temporary freeze file.");
++	delete data;
++	return;
+     }
++    if (write(tmp, data, len) == len)
++    {
++        close(tmp);
++        if (!S9xUnfreezeGame (fname))
++            S9xNPSetError ("Unable to load freeze file just received.");
++    }
++    else
++        close(tmp);
++    remove(fname);
+     delete data;
+ }
+ 
diff --git a/emulators/snes9x/files/patch-ak b/emulators/snes9x/files/patch-ak
new file mode 100644
index 000000000000..f91abc7d2a31
--- /dev/null
+++ b/emulators/snes9x/files/patch-ak
@@ -0,0 +1,22 @@
+--- server.cpp.orig	Fri Oct 13 18:57:43 2000
++++ server.cpp	Fri Oct 13 19:02:56 2000
+@@ -940,11 +940,18 @@
+ void S9xNPSyncClient (int client)
+ {
+     char fname [L_tmpnam];
++    int fd;
+ 
+     S9xNPWaitForEmulationToComplete ();
+ 
++    int flen = snprintf(fname, sizeof(fname), "%s/snes9x.XXXXXX",
++      getenv("TMPDIR") ? getenv("TMPDIR") : P_tmpdir);
++    if (flen == -1 || flen >= sizeof(fname) || (fd = mkstemp(fname)) == -1)
++	return;
++    close(fd);
++
+     S9xNPSetAction ("SERVER: Freezing game...", TRUE);
+-    if (tmpnam (fname) && S9xFreezeGame (fname))
++    if (S9xFreezeGame (fname))
+     {
+         uint8 *data;
+         uint32 len;
diff --git a/emulators/snes9x/pkg-plist b/emulators/snes9x/pkg-plist
index 6a44a1ff2c24..c5496363eef7 100644
--- a/emulators/snes9x/pkg-plist
+++ b/emulators/snes9x/pkg-plist
@@ -1,2 +1 @@
-bin/s9xserver
 bin/snes9x