Index: head/emulators/vba/Makefile =================================================================== --- head/emulators/vba/Makefile (revision 433096) +++ head/emulators/vba/Makefile (revision 433097) @@ -1,70 +1,68 @@ # Created by: Alexander Best # $FreeBSD$ PORTNAME= vba PORTVERSION= 1.7.2 PORTREVISION= 13 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/VisualBoyAdvance/${PORTVERSION} DISTNAME= VisualBoyAdvance-src-${PORTVERSION} MAINTAINER= arundel@h3c.de COMMENT= Open source Gameboy Advance emulator LICENSE= GPLv2 BUILD_DEPENDS= nasm:devel/nasm LIB_DEPENDS= libpng.so:graphics/png USES= gettext gmake GNU_CONFIGURE= yes USE_SDL= sdl CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lintl WRKSRC= ${WRKDIR}/VisualBoyAdvance-${PORTVERSION} SUB_FILES= pkg-message DATA_FILES= ${WRKSRC}/src/VisualBoyAdvance.cfg PROG_FILES= ${WRKSRC}/src/sdl/VisualBoyAdvance PORTDOCS= AUTHORS NEWS README ChangeLog OPTIONS_DEFINE= DOCS GTK2 PROFILING OPTIONS_SUB= yes PROFILING_DESC= Enable profiling GTK2_CONFIGURE_ON= --enable-gtk=2.4 GTK2_LIB_DEPENDS= libglademm-2.4.so:devel/libglademm24 GTK2_USES= pkgconfig PROFILING_CONFIGURE_ENABLE= profiling BROKEN_ia64= Runaway cc1plus process BROKEN_powerpc= Runaway cc1plus process BROKEN_sparc64= Runaway cc1plus process .include .if ${PORT_OPTIONS:MGTK2} PROG_FILES+= ${WRKSRC}/src/gtk/gvba GTK2_DATA_FILES= ${WRKSRC}/src/gtk/vba.glade .endif post-patch: @${REINPLACE_CMD} -e '/for(int i = 0; i < 16; i++/s| i|&_|g' \ ${WRKSRC}/src/sdl/debugger.cpp - @${REINPLACE_CMD} -e '/^namespace std/ { x; \ - s|^|#include |; H; x; }' ${WRKSRC}/src/expr.cpp do-install: ${INSTALL_PROGRAM} ${PROG_FILES} ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MGTK2} ${MKDIR} ${STAGEDIR}${PREFIX}/share/VisualBoyAdvance ${INSTALL_DATA} ${GTK2_DATA_FILES} ${STAGEDIR}${PREFIX}/share/VisualBoyAdvance .endif ${SED} -e 's|filter=0|filter=1|' ${DATA_FILES} > ${DATA_FILES}-default ${INSTALL_DATA} ${DATA_FILES}-default ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/emulators/vba/files/patch-src-Util.cpp =================================================================== --- head/emulators/vba/files/patch-src-Util.cpp (revision 433096) +++ head/emulators/vba/files/patch-src-Util.cpp (revision 433097) @@ -1,20 +1,65 @@ --- src/Util.cpp.orig 2004-05-20 19:42:37.000000000 +0200 +++ src/Util.cpp 2012-05-02 20:49:07.000000000 +0200 @@ -79,7 +79,7 @@ bool utilWritePNGFile(const char *fileNa return false; } - if(setjmp(png_ptr->jmpbuf)) { + if(setjmp(png_jmpbuf(png_ptr))) { png_destroy_write_struct(&png_ptr,NULL); fclose(fp); return false; +@@ -478,7 +478,7 @@ bool utilIsGBAImage(const char * file) + { + cpuIsMultiBoot = false; + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gba") == 0) +@@ -502,7 +502,7 @@ bool utilIsGBAImage(const char * file) + bool utilIsGBImage(const char * file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gb") == 0) +@@ -522,7 +522,7 @@ bool utilIsGBImage(const char * file) + bool utilIsZipFile(const char *file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".zip") == 0) +@@ -537,7 +537,7 @@ bool utilIsZipFile(const char *file) + bool utilIsRarFile(const char *file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".rar") == 0) +@@ -552,7 +552,7 @@ bool utilIsRarFile(const char *file) + bool utilIsGzipFile(const char *file) + { + if(strlen(file) > 3) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gz") == 0) @@ -984,7 +984,7 @@ void utilWriteData(gzFile gzFile, variab gzFile utilGzOpen(const char *file, const char *mode) { - utilGzWriteFunc = (int (*)(void *,void * const, unsigned int))gzwrite; + utilGzWriteFunc = (int (*)(gzFile, voidp const, unsigned int))gzwrite; utilGzReadFunc = gzread; utilGzCloseFunc = gzclose; Index: head/emulators/vba/files/patch-src_GBA.cpp =================================================================== --- head/emulators/vba/files/patch-src_GBA.cpp (nonexistent) +++ head/emulators/vba/files/patch-src_GBA.cpp (revision 433097) @@ -0,0 +1,38 @@ +--- src/GBA.cpp.orig 2004-05-13 14:37:59 UTC ++++ src/GBA.cpp +@@ -1130,7 +1130,7 @@ bool CPUWriteBMPFile(const char *fileNam + bool CPUIsZipFile(const char * file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".zip") == 0) +@@ -1145,7 +1145,7 @@ bool CPUIsGBAImage(const char * file) + { + cpuIsMultiBoot = false; + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gba") == 0) +@@ -1169,7 +1169,7 @@ bool CPUIsGBAImage(const char * file) + bool CPUIsGBABios(const char * file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gba") == 0) +@@ -1189,7 +1189,7 @@ bool CPUIsGBABios(const char * file) + bool CPUIsELF(const char *file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".elf") == 0) Property changes on: head/emulators/vba/files/patch-src_GBA.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/vba/files/patch-src_expr.cpp =================================================================== --- head/emulators/vba/files/patch-src_expr.cpp (nonexistent) +++ head/emulators/vba/files/patch-src_expr.cpp (revision 433097) @@ -0,0 +1,19 @@ +--- src/expr.cpp.orig 2002-10-20 13:03:12 UTC ++++ src/expr.cpp +@@ -14,15 +14,12 @@ + + #line 1 "expr.y" + +-namespace std { ++#include + #include + #include + #include + #include +-} + +-using namespace std; +- + #include "System.h" + #include "elf.h" + #include "exprNode.h" Property changes on: head/emulators/vba/files/patch-src_expr.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property