Update to 1.16a.

Now this can build from source code.
And can't use sound feature.

5 files changed, 117 insertions, 14 deletions

diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 4564b18a865b..a6e112b44c30 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,32 +1,36 @@
 # New ports collection makefile for:    snes9x
-# Version required:	1.05
+# Version required:     116a
 # Date created:         20 July 1997
 # Whom:                 Yukihiro Nakai<Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/08/05 09:30:50 asami Exp $
+# $Id: Makefile,v 1.4 1999/01/07 02:31:40 simokawa Exp $
 #
 
-DISTNAME=	s9x.linux.105.i386
-PKGNAME=	snes9x-1.05
+DISTNAME=	snes116a
+PKGNAME=	snes9x-116a
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.snes9x.com/zips/
+EXTRACT_SUFX=	.zip
 
-MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
+MAINTAINER=	Nacai@iname.com
 
-BUILD_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_lib
-RUN_DEPENDS=    /compat/linux/lib/libc.so.5:${PORTSDIR}/emulators/linux_lib
+BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS+=	egcc:${PORTSDIR}/lang/pgcc
+BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 
 ONLY_FOR_ARCHS=	i386
 
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-USE_X_PREFIX=	yes
+USE_GMAKE=	YES
+USE_X_PREFIX=	YES
+MAKEFILE=	Makefile.linux
 
-STRIP=
-BINOWN=		root
-BINMODE=	755
+EXTRACT_CMD=	unzip
+EXTRACT_BEFORE_ARGS=
+
+WRKSRC=		${WRKDIR}/release
 
 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 65520cc2628e..4d85d227f6cd 100644
--- a/emulators/snes9x/distinfo
+++ b/emulators/snes9x/distinfo
@@ -1 +1 @@
-MD5 (s9x.linux.105.i386.tar.gz) = 47630706b153eef51a3f5dd7cfd6a1b8
+MD5 (snes116a.zip) = 76487bcdd362065bdf6877413f895243
diff --git a/emulators/snes9x/files/patch-aa b/emulators/snes9x/files/patch-aa
new file mode 100644
index 000000000000..ba1cca9505e1
--- /dev/null
+++ b/emulators/snes9x/files/patch-aa
@@ -0,0 +1,58 @@
+--- Makefile.linux.orig	Mon Dec 21 14:40:08 1998
++++ Makefile.linux	Sun Jan 10 10:32:23 1999
+@@ -1,8 +1,8 @@
+-ZSNESFX=1
++#ZSNESFX=1
+ ASMCPU=1
+ #SPC700ASM=1
+ NETPLAY=1
+-UNZIP=1
++#UNZIP=1
+ 
+ ifdef ZSNESFX
+ FXOBJ=i386/zsnes.o
+@@ -47,8 +47,8 @@
+ UNZIPDEFINES=-DUNZIP_SUPPORT
+ endif
+ 
+-CCC = gcc
+-CC = gcc
++CCC = egcc
++CC = egcc
+ NASM = nasm
+ 
+ INCLUDES=-I/usr/X11R6/include -I/usr/local/include
+@@ -58,7 +58,7 @@
+ -Ii386 \
+ -I. \
+ -Iunzip \
+--DJOYSTICK_SUPPORT \
++#-DJOYSTICK_SUPPORT \
+ -DZLIB \
+ -DNO_INLINE_SET_GET \
+ -DVAR_CYCLES \
+@@ -84,9 +84,9 @@
+ LDLIBS = -L/usr/X11R6/lib
+ 
+ ifdef NETPLAY
+-all: offsets snes9x ssnes9x s9xserver
++all: offsets snes9x s9xserver
+ else
+-all: offsets snes9x ssnes9x
++all: offsets snes9x
+ endif
+ 
+ #ggisnes9x
+@@ -101,10 +101,10 @@
+ 	./offsets >i386/offsets.h
+ 
+ snes9x: $(OBJECTS) unix/x11.o
+-	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) unix/x11.o $(LDLIBS) -lXext -lX11 -lXxf86dga -lXxf86vm -lgz -lm
++	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) unix/x11.o $(LDLIBS) -lXext -lX11 -lXxf86dga -lXxf86vm -lz -lm
+ 
+ xf86snes9x: $(OBJECTS) unix/xf86.o
+-	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) unix/xf86.o $(LDLIBS) -lXext -lX11 -lXxf86dga -lXxf86vm -lgz -lm
++	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) unix/xf86.o $(LDLIBS) -lXext -lX11 -lXxf86dga -lXxf86vm -lz -lm
+ 	/bin/chmod u+s xf86snes9x
+ 
+ ssnes9x: $(OBJECTS) unix/svga.o
diff --git a/emulators/snes9x/files/patch-ab b/emulators/snes9x/files/patch-ab
new file mode 100644
index 000000000000..f4bc11df104d
--- /dev/null
+++ b/emulators/snes9x/files/patch-ab
@@ -0,0 +1,40 @@
+--- unix/unix.cpp.orig	Mon Dec 21 15:09:16 1998
++++ unix/unix.cpp	Sun Jan 10 10:28:58 1999
+@@ -71,6 +71,10 @@
+ #if defined(__sun) && defined(__GNUC__)
+ typedef void (*SIG_PF)();
+ #endif
++#if defined (__FreeBSD__)
++typedef void (*SIG_PF)();
++#endif
++
+ 
+ #include "snes9x.h"
+ #include "memmap.h"
+@@ -302,7 +306,7 @@
+     Settings.SoundBufferSize = 0;
+     Settings.SPCTo65c816Ratio = 2;
+     Settings.DisableSoundEcho = FALSE;
+-    Settings.APUEnabled = TRUE;
++    Settings.APUEnabled = FALSE;
+     Settings.H_Max = (100 * SNES_CYCLES_PER_SCANLINE) / 100;
+     Settings.SkipFrames = AUTO_FRAMERATE;
+     Settings.Shutdown = TRUE;
+@@ -983,7 +987,7 @@
+ #if defined(__linux)
+     sa.sa_handler = (SIG_PF) SoundTrigger;
+ #else
+-    sa.sa_handler = (SIG_PF) SoundTrigger;
++    sa.sa_handler = (void*) SoundTrigger;
+ #endif
+ 
+ #if defined (SA_RESTART)
+@@ -1615,7 +1619,7 @@
+     stretch = get_config_int("Graphics", "Scale", 0);
+     _vsync = get_config_int("Graphics", "VSync", 0);
+ 
+-    Settings.APUEnabled = get_config_int("Sound", "APUEnabled", TRUE);
++    Settings.APUEnabled = get_config_int("Sound", "APUEnabled", FALSE);
+     Settings.SoundPlaybackRate = get_config_int("Sound", "SoundPlaybackRate", 4);
+     Settings.Stereo = get_config_int("Sound", "Stereo", TRUE);
+     Settings.SoundBufferSize = get_config_int("Sound", "SoundBufferSize", 256);
diff --git a/emulators/snes9x/pkg-plist b/emulators/snes9x/pkg-plist
index c5496363eef7..6a44a1ff2c24 100644
--- a/emulators/snes9x/pkg-plist
+++ b/emulators/snes9x/pkg-plist
@@ -1 +1,2 @@
+bin/s9xserver
 bin/snes9x