diff options
author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2001-05-21 16:20:59 +0000 |
---|---|---|
committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2001-05-21 16:20:59 +0000 |
commit | 556437e2139672140106c6188e9cea3007ec118e (patch) | |
tree | d808578bca3e9fdf11351ed08c219cc0e3a5b0dd /emulators/zsnes | |
parent | Add bin/gforce (diff) |
Update port to version 1.26.
PR: 27502
Submitted by: Stijn Hoop <stijn@win.tue.nl>
Notes
Notes:
svn path=/head/; revision=42860
Diffstat (limited to 'emulators/zsnes')
-rw-r--r-- | emulators/zsnes/Makefile | 9 | ||||
-rw-r--r-- | emulators/zsnes/distinfo | 2 | ||||
-rw-r--r-- | emulators/zsnes/files/patch-src::linux::protect.c | 12 | ||||
-rw-r--r-- | emulators/zsnes/files/patch-src::linux::zfilew.c | 14 | ||||
-rw-r--r-- | emulators/zsnes/files/patch-src::linux::ztcp.c | 14 | ||||
-rw-r--r-- | emulators/zsnes/files/patch-src::makefile.linux | 15 |
6 files changed, 13 insertions, 53 deletions
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile index 8039c4a04a5f..6d5262af3aea 100644 --- a/emulators/zsnes/Makefile +++ b/emulators/zsnes/Makefile @@ -6,7 +6,7 @@ # PORTNAME= zsnes -PORTVERSION= 1.20 +PORTVERSION= 1.26 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -34,13 +34,8 @@ BUILD_WRKSRC= ${WRKSRC}/src MAKEFILE= makefile.linux ALL_TARGET= ALL -.include <bsd.port.pre.mk> - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/zsnes ${PREFIX}/bin/zsnes ${INSTALL_MAN} ${WRKSRC}/src/linux/zsnes.man ${PREFIX}/man/man1/zsnes.1 -post-install: - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/emulators/zsnes/distinfo b/emulators/zsnes/distinfo index 93120cdc955e..f6a76411da5a 100644 --- a/emulators/zsnes/distinfo +++ b/emulators/zsnes/distinfo @@ -1 +1 @@ -MD5 (zsnesv1.20src.tar.gz) = f8a101cd7504cf620c154d181db6036c +MD5 (zsnesv1.26src.tar.gz) = 9182334164ce3e221600922136bf6327 diff --git a/emulators/zsnes/files/patch-src::linux::protect.c b/emulators/zsnes/files/patch-src::linux::protect.c deleted file mode 100644 index e283e7d3a043..000000000000 --- a/emulators/zsnes/files/patch-src::linux::protect.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/linux/protect.c.orig Tue May 1 21:33:14 2001 -+++ src/linux/protect.c Thu May 3 20:17:23 2001 -@@ -16,6 +16,9 @@ - //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - #include <stdio.h> -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#endif - #include <sys/mman.h> - #include <limits.h> - #include <unistd.h> diff --git a/emulators/zsnes/files/patch-src::linux::zfilew.c b/emulators/zsnes/files/patch-src::linux::zfilew.c deleted file mode 100644 index 5483ff407fb4..000000000000 --- a/emulators/zsnes/files/patch-src::linux::zfilew.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/linux/zfilew.c.orig Tue May 1 21:33:14 2001 -+++ src/linux/zfilew.c Thu May 3 22:47:47 2001 -@@ -365,6 +365,11 @@ - - *(char *)(DTALocPos + 0x15) = 0; - -+#ifdef __FreeBSD__ -+ if (globbuf.gl_matchc == 0) -+ return -1; -+#endif -+ - stat ( globbuf.gl_pathv[globcur], &filetype ); - - if(ZFileFindATTRIB&0x10 && !S_ISDIR ( filetype.st_mode )) return(ZFileFindNext()); diff --git a/emulators/zsnes/files/patch-src::linux::ztcp.c b/emulators/zsnes/files/patch-src::linux::ztcp.c deleted file mode 100644 index df10aac41cf4..000000000000 --- a/emulators/zsnes/files/patch-src::linux::ztcp.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/linux/ztcp.c.orig Tue May 1 21:33:14 2001 -+++ src/linux/ztcp.c Thu May 3 20:17:23 2001 -@@ -92,7 +92,11 @@ - #include <netdb.h> - #include <unistd.h> - #include <sys/ioctl.h> -+#ifndef __FreeBSD__ - #include <asm/ioctls.h> // for FIONREAD -+#else -+#include <sys/filio.h> // for FIONREAD -+#endif - #else - #include <windows.h> - #include <winsock.h> diff --git a/emulators/zsnes/files/patch-src::makefile.linux b/emulators/zsnes/files/patch-src::makefile.linux index d2b9468b6aa7..cffe63dd6484 100644 --- a/emulators/zsnes/files/patch-src::makefile.linux +++ b/emulators/zsnes/files/patch-src::makefile.linux @@ -1,5 +1,5 @@ ---- src/makefile.linux.orig Tue May 1 21:33:15 2001 -+++ src/makefile.linux Fri May 4 13:21:00 2001 +--- src/makefile.linux.orig Wed May 16 22:38:21 2001 ++++ src/makefile.linux Mon May 21 17:02:43 2001 @@ -23,7 +23,7 @@ WINDIR=linux OBJDIR=obj @@ -9,7 +9,7 @@ CHIPSOBJ=${CHIPDIR}/sfxproc.o ${CHIPDIR}/fxemu2.o ${CHIPDIR}/dsp1proc.o\ ${CHIPDIR}/fxemu2b.o ${CHIPDIR}/fxemu2c.o ${CHIPDIR}/fxtable.o\ -@@ -58,8 +58,8 @@ +@@ -58,12 +58,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} @@ -17,6 +17,11 @@ -SDLCFLAGS := $(shell sdl-config --cflags) +SDLLIBS := $(shell $(SDL_CONFIG) --libs) +SDLCFLAGS := $(shell $(SDL_CONFIG) --cflags) - LIBS=${SDLLIBS} -lz - CFLAGS=-g -Wall -D__LINUX__ ${SDLCFLAGS} + #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 |