Index: branches/2021Q1/games/zdoom/Makefile =================================================================== --- branches/2021Q1/games/zdoom/Makefile (revision 567351) +++ branches/2021Q1/games/zdoom/Makefile (revision 567352) @@ -1,58 +1,57 @@ # Created by: Kyle Evans # $FreeBSD$ PORTNAME= zdoom PORTVERSION= 2.8.1 PORTREVISION= 6 CATEGORIES= games MAINTAINER= kevans@FreeBSD.org COMMENT= Source port for Doom-engine games LICENSE= DOOM LICENSE_NAME= Limited Use Software License Agreement LICENSE_FILE= ${WRKSRC}/docs/doomlic.txt LICENSE_PERMS= dist-mirror pkg-mirror auto-accept BUILD_DEPENDS= zip:archivers/zip LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libsndfile.so:audio/libsndfile -BROKEN_powerpc64= fails to compile: invokes x86 assembly - USE_GITHUB= yes GH_ACCOUNT= rheit PORTSCOUT= limit:^.+\.[1-9]{1,3}[1-8]?$$ DATADIR= ${DMDIR}/${PORTNAME} -USES= cmake gettext gnome jpeg openal pkgconfig sdl +USES= cmake dos2unix gettext gnome jpeg openal pkgconfig sdl +DOS2UNIX_FILES= src/p_spec.cpp USE_GNOME= atk cairo gdkpixbuf2 gtk20 pango USE_SDL= sdl2 CMAKE_ARGS= -DNO_FMOD:BOOL=ON CXXFLAGS+= -DSHARE_DIR=\\\"${DATADIR}\\\" DESKTOP_ENTRIES= "ZDoom" "" "${PORTNAME}" "${PORTNAME}" "Game;Shooter;" "" PLIST_FILES= bin/${PORTNAME} \ ${DATADIR}/${PORTNAME}.pk3 \ share/pixmaps/${PORTNAME}.xpm OPTIONS_DEFINE= FLUIDSYNTH OPTIONS_DEFAULT=FLUIDSYNTH FLUIDSYNTH_DESC= FluidSynth sound library support FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth FLUIDSYNTH_CMAKE_BOOL= WITH_FLUIDSYNTH .include "${.CURDIR}/../doom-data/Makefile.include" do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${CONFIGURE_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${CONFIGURE_WRKSRC}/${PORTNAME}.pk3 ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.xpm ${STAGEDIR}${PREFIX}/share/pixmaps .include Index: branches/2021Q1/games/zdoom/files/patch-game-music-emu_gme_blargg__endian.h =================================================================== --- branches/2021Q1/games/zdoom/files/patch-game-music-emu_gme_blargg__endian.h (nonexistent) +++ branches/2021Q1/games/zdoom/files/patch-game-music-emu_gme_blargg__endian.h (revision 567352) @@ -0,0 +1,13 @@ +--- game-music-emu/gme/blargg_endian.h.orig 2021-02-10 16:11:06 UTC ++++ game-music-emu/gme/blargg_endian.h +@@ -33,9 +33,7 @@ + #if defined (LSB_FIRST) || defined (__LITTLE_ENDIAN__) || BLARGG_CPU_X86 || \ + (defined (LITTLE_ENDIAN) && LITTLE_ENDIAN+0 != 1234) + #define BLARGG_LITTLE_ENDIAN 1 +-#endif +- +-#if defined (MSB_FIRST) || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \ ++#elif defined (MSB_FIRST) || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \ + defined (__sparc__) || BLARGG_CPU_POWERPC || \ + (defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321) + #define BLARGG_BIG_ENDIAN 1 Property changes on: branches/2021Q1/games/zdoom/files/patch-game-music-emu_gme_blargg__endian.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/2021Q1/games/zdoom/files/patch-src_p__spec.cpp =================================================================== --- branches/2021Q1/games/zdoom/files/patch-src_p__spec.cpp (nonexistent) +++ branches/2021Q1/games/zdoom/files/patch-src_p__spec.cpp (revision 567352) @@ -0,0 +1,11 @@ +--- src/p_spec.cpp.orig 2021-03-05 01:22:24 UTC ++++ src/p_spec.cpp +@@ -1269,7 +1269,7 @@ void P_InitSectorSpecial(sector_t *sector, int special + if (sector->special >= Scroll_North_Slow && + sector->special <= Scroll_SouthWest_Fast) + { // Hexen scroll special +- static const char hexenScrollies[24][2] = ++ static const signed char hexenScrollies[24][2] = + { + { 0, 1 }, { 0, 2 }, { 0, 4 }, + { -1, 0 }, { -2, 0 }, { -4, 0 }, Property changes on: branches/2021Q1/games/zdoom/files/patch-src_p__spec.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: branches/2021Q1 =================================================================== --- branches/2021Q1 (revision 567351) +++ branches/2021Q1 (revision 567352) Property changes on: branches/2021Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r567351