Update emulators/zsnes to 1.40, remove emulators/linux-zsnes.

PR:		75500
Submitted by:	maintainer

4 files changed, 12 insertions, 42 deletions

diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 53332664069a..d5eed1a390a2 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	zsnes
-PORTVERSION=	1.36
-PORTREVISION=	3
+PORTVERSION=	1.40
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -25,18 +24,23 @@ USE_SDL=	sdl
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 
+CFLAGS+=	-I${X11BASE}/include
+
+WANT_AUTOCONF_VER=	259
+WANT_AUTOMAKE_VER=	15
+
 MAN1=		zsnes.1
 PLIST_FILES=	bin/zsnes
 
-# non-portable, for a portable version see emulators/snes9x
+# non-portable, for a portable emulator see emulators/snes9x
 ONLY_FOR_ARCHS=	i386
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
+WRKSRC=		${WRKDIR}/${PORTNAME}_1_40/src
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	ALL
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
+pre-configure:
+	cd ${WRKSRC}; ${SH} ${ACLOCAL}; ${SH} ${AUTOCONF}
 
 .include <bsd.port.mk>
diff --git a/emulators/zsnes/distinfo b/emulators/zsnes/distinfo
index 69142034da88..8f56dbc06719 100644
--- a/emulators/zsnes/distinfo
+++ b/emulators/zsnes/distinfo
@@ -1,2 +1,2 @@
-MD5 (zsnes136src.tar.gz) = 576f6f5cc50c7c6f7877aca220ee99b3
-SIZE (zsnes136src.tar.gz) = 901081
+MD5 (zsnes140src.tar.gz) = 770afa48055722e76574841ca5976126
+SIZE (zsnes140src.tar.gz) = 1062598
diff --git a/emulators/zsnes/files/patch-aa b/emulators/zsnes/files/patch-aa
deleted file mode 100644
index a8547a18074d..000000000000
--- a/emulators/zsnes/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- linux/sdllink.c.orig	Mon May 31 01:15:18 2004
-+++ linux/sdllink.c	Mon May 31 01:16:17 2004
-@@ -493,7 +493,7 @@
- int InitSound(void)
- {
- 	SDL_AudioSpec wanted;
--	const int samptab[7] = { 1, 1, 2, 4, 2, 4, 4 };
-+	const int samptab[7] = { 64, 64, 128, 256, 128, 256, 256 };
- 	const int freqtab[7] = { 8000, 11025, 22050, 44100, 16000, 32000, 48000 };
- 
- 	SDL_CloseAudio();
-@@ -519,7 +519,7 @@
- 		wanted.channels = 1;
- 	}
- 
--	wanted.samples = samptab[SoundQuality] * 128 * wanted.channels;
-+	wanted.samples = samptab[SoundQuality] * 8 * wanted.channels;
- 	wanted.format = AUDIO_S16LSB;
- 	wanted.userdata = NULL;
- 	wanted.callback = UpdateSound;
diff --git a/emulators/zsnes/pkg-message b/emulators/zsnes/pkg-message
deleted file mode 100644
index 96f64030ce7e..000000000000
--- a/emulators/zsnes/pkg-message
+++ /dev/null
@@ -1,14 +0,0 @@
--------------------------------------------------------------------------------
-This port revision fixes a sound problem (distortion) many have been 
-experiencing with ZSNES on FreeBSD.
-
-With this revision comes a new bug. You will have to restart ZSNES each 
-time you modify the sound settings within the sound menu for them to work 
-properly. 
-
-Please let me know if you experience any other problems or if you have 
-any information regarding this issue! 
-
-- Travis Poppe
-tlp@LiquidX.org
--------------------------------------------------------------------------------