Index: head/games/linwarrior/Makefile =================================================================== --- head/games/linwarrior/Makefile (revision 473080) +++ head/games/linwarrior/Makefile (revision 473081) @@ -1,44 +1,46 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= linwarrior PORTVERSION= 20100320 PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://www.hackcraft.de/games/linwarrior_3d/downloads/ \ http://mirror.amdmi3.ru/distfiles/ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Navigate a mech through a 3D world and fire at enemies USES= gmake openal:al,alut USE_GL= gl glu USE_SDL= sdl +CFLAGS+= -Wno-c++11-narrowing + WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_FILES= bin/${PORTNAME} PORTDATA= * DESKTOP_ENTRIES="LinWarrior 3D" \ "Mech Simulation Game" \ "" \ "linwarrior" \ "Game;ActionGame;Simulation;" \ false post-extract: - @${FIND} ${WRKSRC} -type d -exec chmod a+rx {} \; - @${FIND} ${WRKSRC} -type f -exec chmod a+r {} \; + @${FIND} ${WRKSRC} -type d -exec ${CHMOD} a+rx {} \; + @${FIND} ${WRKSRC} -type f -exec ${CHMOD} a+r {} \; post-patch: @${REINPLACE_CMD} -e '/hash_set/ d' ${WRKSRC}/source/cAlert.h @${FIND} ${WRKSRC}/source -name '*.cpp' -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dist/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ .include Index: head/games/linwarrior/files/patch-Makefile =================================================================== --- head/games/linwarrior/files/patch-Makefile (revision 473080) +++ head/games/linwarrior/files/patch-Makefile (revision 473081) @@ -1,40 +1,40 @@ ---- Makefile.orig 2010-02-05 22:50:30.000000000 +0300 -+++ Makefile 2010-04-04 06:18:24.000000000 +0400 +--- Makefile.orig 2010-02-05 19:50:30 UTC ++++ Makefile @@ -2,7 +2,7 @@ # Makefile with auto-dependency generation # Add Include directories here. -INCLUDES = -I . +INCLUDES = -I . `${SDL_CONFIG} --cflags` # Automatic searching for source files. # Objects to compile are all sources (cpp) and put the .o below build-dir. -@@ -20,18 +20,17 @@ +@@ -20,18 +20,17 @@ ifneq (,$(findstring Win,$(OS))) LIMITER=$(dir \file) CFLAGS+= -static-libgcc else - LIBRARIES= -lGL -lGLU -lSDL -lopenal -lalut + LIBRARIES= -lGL -lGLU `${SDL_CONFIG} --libs` -lopenal -lalut TARGET=dist/linwarrior MKDIR=mkdir RM=rm -f RMREC=rm -f -r CP=cp - CPP=c++ + CPP=${CXX} LIMITER=/ endif # Creation of dependency information when compiling. -CFLAGS += -Wp,-M,-MP,-MT,$@,-MF,dep/$(subst /,-,$@).d # Print warnings when compiling. CFLAGS += -Wall -@@ -40,7 +39,6 @@ +@@ -40,7 +39,6 @@ CFLAGS += -Wall CFLAGS += $(INCLUDES) # Optimizations. -CFLAGS += -O1 -funroll-loops # Default makefile Target. all: $(TARGET) Index: head/games/linwarrior/files/patch-source_cController.cpp =================================================================== --- head/games/linwarrior/files/patch-source_cController.cpp (nonexistent) +++ head/games/linwarrior/files/patch-source_cController.cpp (revision 473081) @@ -0,0 +1,22 @@ +--- source/cController.cpp.orig 2018-06-22 20:39:57 UTC ++++ source/cController.cpp +@@ -182,16 +182,16 @@ void cController::attackEnemy() { + + cObject* target = cWorld::instance->mIndex[entity]; + if (mDevice->inTargetRange() < 0.01) { +- mDevice->do_aimFor(NULL); ++ mDevice->do_aimFor(0); + pop(); + return; + } + if (target == NULL) { // Target disappeared +- mDevice->do_aimFor(NULL); ++ mDevice->do_aimFor(0); + pop(); + return; + } else if (target->hasRole(DEAD)) { +- mDevice->do_aimFor(NULL); ++ mDevice->do_aimFor(0); + pop(); + return; + } Property changes on: head/games/linwarrior/files/patch-source_cController.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