Update to version 1.337.

PR:		31589
Submitted by:	Stijn Hoop <stijn@win.tue.nl>

4 files changed, 20 insertions, 37 deletions

diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index a2a1fd9790b2..834b85412492 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zsnes
-PORTVERSION=	1.31b
+PORTVERSION=	1.337
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -30,15 +30,14 @@ MAN1=		zsnes.1
 ONLY_FOR_ARCHS=	i386
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-MAKE_ENV+=	SDL_CONFIG=${SDL_CONFIG} PREFIX=${PREFIX}
+CONFIGURE_ENV+=	SDL_CONFIG=${SDL_CONFIG}
 
-WRKSRC=		${WRKDIR}/zsnes
-BUILD_WRKSRC=	${WRKSRC}/src
-MAKEFILE=	makefile.linux
-ALL_TARGET=	ALL
+WRKSRC=		${WRKDIR}/zsnes/src
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/zsnes ${PREFIX}/bin/zsnes
-	${INSTALL_MAN}	${WRKSRC}/src/linux/zsnes.man ${PREFIX}/man/man1/zsnes.1
+GNU_CONFIGURE=	yes
+ALL_TARGET=	
+
+pre-configure:
+		cd ${WRKSRC} && chmod +x configure
 
 .include <bsd.port.mk>
diff --git a/emulators/zsnes/distinfo b/emulators/zsnes/distinfo
index 2171fc69e862..334ecf1199d4 100644
--- a/emulators/zsnes/distinfo
+++ b/emulators/zsnes/distinfo
@@ -1 +1 @@
-MD5 (zsnes131bsrc.zip) = 259734f3ccf2fa4cde18cebaa924b320
+MD5 (zsnes1337src.zip) = 0d52bb1015d8cea39effd83951423139
diff --git a/emulators/zsnes/files/patch-src::Makefile.in b/emulators/zsnes/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..5afa235e2c93
--- /dev/null
+++ b/emulators/zsnes/files/patch-src::Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Mon Oct 29 15:11:59 2001
++++ Makefile.in	Mon Oct 29 15:12:11 2001
+@@ -170,7 +170,7 @@
+ 
+ install:
+ 	@INSTALL@ -m 0755 @ZSNESEXE@ @prefix@/bin
+-	@INSTALL@ -m 0644 linux/zsnes.man @prefix@/man
++	@INSTALL@ -m 0644 linux/zsnes.man @prefix@/man/man1/zsnes.1
+ 
+ clean:
+ 	rm -f ${CHIPDIR}/*.o  ${CPUDIR}/*.o  ${VIDEODIR}/*.o  ${GUIDIR}/*.o  ${DOSDIR}/*.o  ${WINDIR}/*.o  ${ZIPDIR}/*.o  *.o  @ZSNESEXE@
diff --git a/emulators/zsnes/files/patch-src::makefile.linux b/emulators/zsnes/files/patch-src::makefile.linux
deleted file mode 100644
index afbf8a35b301..000000000000
--- a/emulators/zsnes/files/patch-src::makefile.linux
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/makefile.linux.orig	Fri Jun 29 23:12:52 2001
-+++ src/makefile.linux	Fri Jun 29 23:13:27 2001
-@@ -23,7 +23,7 @@
- WINDIR=linux
- OBJDIR=obj
- ZIPDIR=zip
--MANDIR=/usr/man/man1
-+MANDIR=$(PREFIX)/man/man1
- 
- CHIPSOBJ=${CHIPDIR}/sfxproc.o ${CHIPDIR}/fxemu2.o ${CHIPDIR}/dsp1proc.o\
- 	 ${CHIPDIR}/fxemu2b.o ${CHIPDIR}/fxemu2c.o ${CHIPDIR}/fxtable.o\
-@@ -59,12 +59,12 @@
- MAINOBJ=cfgload.o endmem.o fixsin.o init.o ui.o vcache.o water.o
- 
- OBJS=${CHIPSOBJ} ${CPUOBJ} ${WINOBJ} ${WINDOSOBJ} ${GUIOBJ} ${VIDEOBJ} ${ZIPOBJ} ${MAINOBJ}
--SDLLIBS := $(shell sdl-config --libs)
--SDLCFLAGS := $(shell sdl-config --cflags)
-+SDLLIBS := $(shell $(SDL_CONFIG) --libs)
-+SDLCFLAGS := $(shell $(SDL_CONFIG) --cflags)
- #LIBS=-static -pg ${SDLLIBS} -lz
- LIBS=${SDLLIBS} -lz -lpng
- #CFLAGS=-pg -g -Wall -D__LINUX__ ${SDLCFLAGS}
--CFLAGS=-g -Wall -O2 -mcpu=pentium -finline-functions -funroll-loops -D__LINUX__ ${SDLCFLAGS}
-+CFLAGS:=-g -Wall -O2 -finline-functions -funroll-loops -D__LINUX__ ${CFLAGS} ${SDLCFLAGS}
- ASM=nasm
- ASMFLAGS=-f elf -D__LINUX__ -g -w-orphan-labels 
- CC=gcc