Update to 1.41, lots of changes (bugfixes, speed improvements, etc).

See http://www.zsnes.com/ for the full list of changes.

6 files changed, 51 insertions, 34 deletions

diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 0a5d1b1a580..485a05b9699 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2004/12/03 15:14:56 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/01/20 00:43:15 xtraeme Exp $
 #
 
-DISTNAME=		zsnes136src
-PKGNAME=		zsnes-1.360
-PKGREVISION=		3
+DISTNAME=		zsnes141src
+PKGNAME=		zsnes-1.41
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=zsnes/}
 
@@ -17,13 +16,14 @@ ONLY_FOR_PLATFORM=	*-*-i386
 
 BUILD_TARGET=		zsnes
 
-WRKSRC=			${WRKDIR}/zsnes-1.36/src
-GNU_CONFIGURE=		# defined
+WRKSRC=			${WRKDIR}/zsnes_1_41/src
+GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
 USE_BUILDLINK3=		yes
-USE_X11=		# defined
+USE_X11=		yes
 
 .include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/zsnes/distinfo b/emulators/zsnes/distinfo
index 96e783f1864..7b05e2ae4c3 100644
--- a/emulators/zsnes/distinfo
+++ b/emulators/zsnes/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2004/02/11 18:34:18 ben Exp $
+$NetBSD: distinfo,v 1.5 2005/01/20 00:43:15 xtraeme Exp $
 
-SHA1 (zsnes136src.tar.gz) = 40c053ac022c098bac5f7acc8413a464a1c7690d
-Size (zsnes136src.tar.gz) = 901081 bytes
-SHA1 (patch-ab) = 571dd1af70c06f1747a213c3d5326eff76049247
-SHA1 (patch-ac) = 2573d074daac09b2cfc1369e86fe688f777ca1e6
-SHA1 (patch-ad) = 8bbecedccc5a85dfe7d843f9de75a9498195eed6
+SHA1 (zsnes141src.tar.gz) = 7f6d80a5d1aefafaf33c7cdd1967a617e8ebceb8
+Size (zsnes141src.tar.gz) = 1099608 bytes
+SHA1 (patch-ab) = fdcec7ca532199189821bb89ea9baaa3908bd449
+SHA1 (patch-ac) = 76e640aec3816eb4cbbfbe0dff1fcd2fa52f7876
+SHA1 (patch-ad) = 3c79a4c3ffe65151cd4d299b9837c6d20c8f8522
+SHA1 (patch-ae) = 81236ed52fe7095f6317f655374234ce17cf30dd
diff --git a/emulators/zsnes/patches/patch-ab b/emulators/zsnes/patches/patch-ab
index c8a58ee83b3..4fcbaba2479 100644
--- a/emulators/zsnes/patches/patch-ab
+++ b/emulators/zsnes/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2002/08/31 00:15:41 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2005/01/20 00:43:15 xtraeme Exp $
 
---- gblhdr.h.orig	Tue May 14 19:39:10 2002
-+++ gblhdr.h
-@@ -117,3 +117,5 @@
- 	#include <sys/filio.h>
+--- gblhdr.h.orig	2005-01-20 01:34:53.000000000 +0100
++++ gblhdr.h	2005-01-20 01:35:06.000000000 +0100
+@@ -122,4 +122,4 @@
  	#endif
  	#endif
-+
+ 
+-
 +	#include <pthread.h>
diff --git a/emulators/zsnes/patches/patch-ac b/emulators/zsnes/patches/patch-ac
index 111c1d11f80..f339a3832b3 100644
--- a/emulators/zsnes/patches/patch-ac
+++ b/emulators/zsnes/patches/patch-ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.2 2002/08/31 00:15:41 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2005/01/20 00:43:15 xtraeme Exp $
 
---- zip/unzip.h.orig	Thu May 23 02:03:08 2002
-+++ zip/unzip.h
-@@ -47,6 +47,10 @@ extern "C" {
- 
- #include <zlib.h>
+--- zip/unzip.c.orig	2005-01-20 01:32:47.000000000 +0100
++++ zip/unzip.c	2005-01-20 01:33:03.000000000 +0100
+@@ -15,6 +15,10 @@
+ #include "zlib.h"
+ #include "zunzip.h"
  
 +#ifndef OF
-+# define OF(args)	args
++# define OF(args)      args
 +#endif
 +
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
-     from (void*) without cast */
+ #ifdef STDC
+ #  include <stddef.h>
+ #  include <string.h>
diff --git a/emulators/zsnes/patches/patch-ad b/emulators/zsnes/patches/patch-ad
index f3da181a991..0c1063d2441 100644
--- a/emulators/zsnes/patches/patch-ad
+++ b/emulators/zsnes/patches/patch-ad
@@ -1,15 +1,16 @@
-$NetBSD: patch-ad,v 1.3 2004/02/11 18:34:18 ben Exp $
+$NetBSD: patch-ad,v 1.4 2005/01/20 00:43:15 xtraeme Exp $
 
---- linux/sw_draw.c.orig	2002-07-06 19:03:16.000000000 -0700
-+++ linux/sw_draw.c
-@@ -123,6 +123,10 @@ void sw_clearwin()
+--- linux/sw_draw.c.orig	2005-01-14 14:11:18.000000000 +0100
++++ linux/sw_draw.c	2005-01-20 01:34:10.000000000 +0100
+@@ -124,6 +124,11 @@
  
  void sw_drawwin()
  {
 +#ifdef _PTH_PTHREAD_H_
-+    pthread_yield_np();
++	pthread_yield_np();
 +#endif
 +
++
      NGNoTransp = 0;             // Set this value to 1 within the appropriate
                                  // video mode if you want to add a custom
                                  // transparency routine or hardware
diff --git a/emulators/zsnes/patches/patch-ae b/emulators/zsnes/patches/patch-ae
new file mode 100644
index 00000000000..a745ccc48c2
--- /dev/null
+++ b/emulators/zsnes/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2005/01/20 00:43:15 xtraeme Exp $
+
+--- zip/zunzip.h.orig	2005-01-20 01:37:57.000000000 +0100
++++ zip/zunzip.h	2005-01-20 01:38:09.000000000 +0100
+@@ -41,6 +41,10 @@
+ #ifndef _unz_H
+ #define _unz_H
+ 
++#ifndef OF
++# define OF(args)      args
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif