Index: head/games/openbor/Makefile =================================================================== --- head/games/openbor/Makefile (revision 478422) +++ head/games/openbor/Makefile (revision 478423) @@ -1,106 +1,106 @@ # $FreeBSD$ PORTNAME= openbor # Hint: svn revision is git rev-list --count ${GH_TAGNAME} -PORTVERSION?= 6263 +PORTVERSION?= 6412 .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?= cd8df016 +GH_TAGNAME?= d9bfceeb 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: head/games/openbor/distinfo =================================================================== --- head/games/openbor/distinfo (revision 478422) +++ head/games/openbor/distinfo (revision 478423) @@ -1,3 +1,3 @@ -TIMESTAMP = 1530889996 -SHA256 (DCurrent-openbor-6263-cd8df016_GH0.tar.gz) = 11493892eecfe5a570e52fa175fec90bdab290f2f1c337acf60f2001ae80da57 -SIZE (DCurrent-openbor-6263-cd8df016_GH0.tar.gz) = 154488044 +TIMESTAMP = 1535545207 +SHA256 (DCurrent-openbor-6412-d9bfceeb_GH0.tar.gz) = 9f7605e49884b1f34656144bd8eb40190d38955d571e3339e724f77938525925 +SIZE (DCurrent-openbor-6412-d9bfceeb_GH0.tar.gz) = 129005393 Index: head/games/openbor/files/patch-source_gamelib_packfile.c =================================================================== --- head/games/openbor/files/patch-source_gamelib_packfile.c (revision 478422) +++ head/games/openbor/files/patch-source_gamelib_packfile.c (nonexistent) @@ -1,23 +0,0 @@ -Reset seek position for BGM with more than 128 tracks -Don't crash with more than 256 tracks. - ---- source/gamelib/packfile.c.orig 2018-07-06 15:13:16 UTC -+++ source/gamelib/packfile.c -@@ -1407,7 +1407,7 @@ void packfile_music_read(fileliststruct *filelist, int - getBasePath(packfile, filelist[i].filename, 1); - if(stristr(packfile, ".pak")) - { -- memset(filelist[i].bgmTracks, 0, PACKFILE_PATH_MAX); -+ memset(filelist[i].bgmTracks, 0, sizeof(filelist[i].bgmTracks)); - filelist[i].nTracks = 0; - fd = fopen(packfile, "rb"); - if(fd == NULL) -@@ -1439,7 +1439,7 @@ void packfile_music_read(fileliststruct *filelist, int - { - goto nextpak; - } -- if(filelist[i].nTracks < PACKFILE_PATH_MAX) -+ if(filelist[i].nTracks < 256) - { - packfile_get_titlename(pn.namebuf, filelist[i].bgmFileName[filelist[i].nTracks]); - filelist[i].bgmTracks[filelist[i].nTracks] = off; Property changes on: head/games/openbor/files/patch-source_gamelib_packfile.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property