Index: branches/2018Q2/games/openbor/Makefile =================================================================== --- branches/2018Q2/games/openbor/Makefile (revision 469879) +++ branches/2018Q2/games/openbor/Makefile (revision 469880) @@ -1,106 +1,106 @@ # $FreeBSD$ PORTNAME= openbor # Hint: svn revision is git rev-list --count ${GH_TAGNAME} -PORTVERSION?= 5137 +PORTVERSION?= 6138 .ifndef PKGNAMESUFFIX PORTREVISION= 0 .endif CATEGORIES= games MAINTAINER= jbeich@FreeBSD.org COMMENT= Moddable fighting game engine (aka Beats of Rage) LICENSE= BSD3CLAUSE GPLv2+ .if ${PORTVERSION} >= 4134 LICENSE+= ISCL .endif LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE LICENSE_FILE_GPLv2+ = ${_LICENSE_STORE}/GPLv2 # source/gfxlib/hq2x.c LICENSE_FILE_ISCL= ${WRKSRC}/source/webmlib/nestegg/LICENSE LIB_DEPENDS= libpng.so:graphics/png .if ${PORTVERSION} >= 4134 LIB_DEPENDS+= libvpx.so:multimedia/libvpx .endif .ifdef PKGNAMESUFFIX PORTSCOUT= ignore:1 .endif USE_GITHUB= yes GH_ACCOUNT= DCurrent -GH_TAGNAME?= 0b077e46 +GH_TAGNAME?= 5673214c USES+= gmake pkgconfig .if ${PORTVERSION} < 4433 USE_CSTD= gnu89 .endif .if ${PORTVERSION} < 4108 USE_SDL= gfx .else USE_SDL= gfx2 .endif WRKSRC_SUBDIR= engine MAKE_ENV= BUILD_LINUX=1 SDKPATH="${LOCALBASE}" \ GCC_TARGET="${CONFIGURE_TARGET:S/amd64/x86_64/}" MAKE_ARGS= CC="${CC}" LIBRARIES="${LOCALBASE}/lib" \ TARGET_ARCH=${ARCH:S/i386/x86/} ARCHFLAGS="" \ TARGET_FINAL='${TARGET}' BUILD_MMX="" ECHO="${ECHO}" LDFLAGS+= -Wl,--as-needed # ogg, pthread, zlib SUB_FILES= pkg-message SUB_LIST= PKGBASE=${PKGBASE} PLIST_FILES= bin/${PKGBASE} \ share/pixmaps/${PKGBASE}.png DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= README DESKTOP_ENTRIES="OpenBOR v3.0 Build ${PORTVERSION}" \ "" \ "${PKGBASE}" \ "${PKGBASE}" \ "Game;ArcadeGame;" \ "" OPTIONS_DEFINE= TREMOR OPTIONS_DEFAULT= ${MACHINE_CPU:Msoftfp:C/.+/TREMOR/} OPTIONS_DEFINE_i386= MMX OPTIONS_DEFAULT_i386= MMX # runtime detection MMX_BUILD_DEPENDS= yasm:devel/yasm MMX_MAKE_ARGS= BUILD_MMX=1 TREMOR_LIB_DEPENDS= libvorbisidec.so:audio/libtremor TREMOR_MAKE_ARGS= BUILD_TREMOR=1 BUILD_VORBIS="" TREMOR_LIB_DEPENDS_OFF= libvorbisfile.so:audio/libvorbis post-patch: @${REINPLACE_CMD} -e 's/ -O[0-9]//; s/ -g//; s/ -Werror//' \ -e 's/ -fomit-frame-pointer//' \ -e 's/ -freorder-blocks//' \ -e 's/ -Wl,-rpath,$$(LIBRARIES)//' \ -e '/echo/!s/ @/ /' \ -e 's/@echo/@$$(ECHO)/' \ -e 's/$$(LIBS)/$$(LDFLAGS) &/' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's/\.openbor/.${PKGBASE}/' \ ${WRKSRC}/sdl/sdlport.c @${GREP} -Flr 'malloc.h' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ 's,malloc\.h,stdlib.h,' @${REINPLACE_CMD} -e 's/^function \(.*\) {/\1() {/' \ -e 's/^get_revnum$$/VERSION_BUILD=${PORTVERSION}/' \ ${WRKSRC}/version.sh do-configure: (cd ${WRKSRC} && ${SH} ./version.sh) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/OpenBOR.elf \ ${STAGEDIR}${PREFIX}/bin/${PKGBASE} ${INSTALL_DATA} ${WRKSRC}/resources/OpenBOR_Icon_128x128.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${PKGBASE}.png (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include Index: branches/2018Q2/games/openbor/distinfo =================================================================== --- branches/2018Q2/games/openbor/distinfo (revision 469879) +++ branches/2018Q2/games/openbor/distinfo (revision 469880) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525902990 -SHA256 (DCurrent-openbor-5137-0b077e46_GH0.tar.gz) = 549538689d66d641410abb6a25457cadd13c04176f737b9e8b5f5ac52246ec17 -SIZE (DCurrent-openbor-5137-0b077e46_GH0.tar.gz) = 74507480 +TIMESTAMP = 1526285237 +SHA256 (DCurrent-openbor-6138-5673214c_GH0.tar.gz) = e07a3970ae1eb050ade6ea02ae21dd0dbc00c028b504a8fa8f3ee73379ba7fe3 +SIZE (DCurrent-openbor-6138-5673214c_GH0.tar.gz) = 74511657 Index: branches/2018Q2/games/openbor/files/patch-source_utils.c =================================================================== --- branches/2018Q2/games/openbor/files/patch-source_utils.c (revision 469879) +++ branches/2018Q2/games/openbor/files/patch-source_utils.c (revision 469880) @@ -1,11 +1,19 @@ ---- source/utils.c.bak 2017-04-22 14:20:08 UTC +source/utils.c:303:54: error: implicit declaration of function 'mallinfo' is invalid in C99 + [-Werror,-Wimplicit-function-declaration] + writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena); + ^ +source/utils.c:303:64: error: member reference base type 'int' is not a structure or union + writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena); + ~~~~~~~~~~^~~~~~ + +--- source/utils.c.orig 2017-04-22 14:20:08 UTC +++ source/utils.c -@@ -295,7 +295,7 @@ void *checkAlloc(void *ptr, size_t size, const char *f +@@ -299,7 +299,7 @@ void *checkAlloc(void *ptr, size_t size, const char *f "\n* Shutting Down *\n\n"); writeToLogFile("Out of memory!\n"); writeToLogFile("Allocation of size %i failed in function '%s' at %s:%i.\n", size, func, file, line); -#ifndef WIN +#if defined(__GLIBC__) || defined(ANDROID) || defined(VITA) writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena); #endif exit(2); Index: branches/2018Q2/games/openbor/files/patch-source_utils.h =================================================================== --- branches/2018Q2/games/openbor/files/patch-source_utils.h (nonexistent) +++ branches/2018Q2/games/openbor/files/patch-source_utils.h (revision 469880) @@ -0,0 +1,19 @@ +In file included from openborscript.c:30: +In file included from source/openborscript/config.h:12: +In file included from source/scriptlib/Interpreter.h:11: +In file included from source/scriptlib/depends.h:13: +In file included from source/globals.h:24: +source/utils.h:65:59: error: unknown type name 'time_t' +void get_time_string(char buffer[], unsigned buffer_size, time_t timestamp, char* pattern); // ex. "%Y-%m-%d %H:%M:%S" + ^ + +--- source/utils.h.orig 2018-05-13 22:01:54 UTC ++++ source/utils.h +@@ -10,6 +10,7 @@ + #define UTILS_H + + // *** INCLUDES *** ++#include + #include "types.h" + #include "stringptr.h" + Property changes on: branches/2018Q2/games/openbor/files/patch-source_utils.h ___________________________________________________________________ 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: branches/2018Q2 =================================================================== --- branches/2018Q2 (revision 469879) +++ branches/2018Q2 (revision 469880) Property changes on: branches/2018Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r469877