From owner-svn-ports-all@freebsd.org Fri Mar 1 13:06:11 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 006701516BAB; Fri, 1 Mar 2019 13:06:11 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 894CD779A4; Fri, 1 Mar 2019 13:06:10 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 529131D0BA; Fri, 1 Mar 2019 13:06:10 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x21D6A9C008978; Fri, 1 Mar 2019 13:06:10 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x21D6AQ1008976; Fri, 1 Mar 2019 13:06:10 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201903011306.x21D6AQ1008976@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 1 Mar 2019 13:06:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494293 - in head/games/linwarrior: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/games/linwarrior: . files X-SVN-Commit-Revision: 494293 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 894CD779A4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.982,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Mar 2019 13:06:11 -0000 Author: amdmi3 Date: Fri Mar 1 13:06:09 2019 New Revision: 494293 URL: https://svnweb.freebsd.org/changeset/ports/494293 Log: - Switch to more correct way of avoiding C++11 related build errors - Make upstream build system properly respect CXX/CXXFLAGS - Add missing USES Modified: head/games/linwarrior/Makefile head/games/linwarrior/files/patch-Makefile Modified: head/games/linwarrior/Makefile ============================================================================== --- head/games/linwarrior/Makefile Fri Mar 1 13:06:06 2019 (r494292) +++ head/games/linwarrior/Makefile Fri Mar 1 13:06:09 2019 (r494293) @@ -12,13 +12,11 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Navigate a mech through a 3D world and fire at enemies -USES= compiler gmake openal:al,alut +USES= gl gmake openal:al,alut sdl USE_GL= gl glu USE_SDL= sdl LLD_UNSAFE= yes - -CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} -CFLAGS_clang= -Wno-c++11-narrowing +USE_CXXSTD= gnu++98 WRKSRC= ${WRKDIR}/${PORTNAME} Modified: head/games/linwarrior/files/patch-Makefile ============================================================================== --- head/games/linwarrior/files/patch-Makefile Fri Mar 1 13:06:06 2019 (r494292) +++ head/games/linwarrior/files/patch-Makefile Fri Mar 1 13:06:09 2019 (r494293) @@ -9,7 +9,7 @@ # Automatic searching for source files. # Objects to compile are all sources (cpp) and put the .o below build-dir. -@@ -20,18 +20,17 @@ ifneq (,$(findstring Win,$(OS))) +@@ -20,40 +20,38 @@ ifneq (,$(findstring Win,$(OS))) LIMITER=$(dir \file) CFLAGS+= -static-libgcc else @@ -29,12 +29,30 @@ -CFLAGS += -Wp,-M,-MP,-MT,$@,-MF,dep/$(subst /,-,$@).d # Print warnings when compiling. - CFLAGS += -Wall -@@ -40,7 +39,6 @@ CFLAGS += -Wall - CFLAGS += $(INCLUDES) +-CFLAGS += -Wall ++CXXFLAGS += -Wall + # Use the given includepathes. +-CFLAGS += $(INCLUDES) ++CXXFLAGS += $(INCLUDES) + # Optimizations. -CFLAGS += -O1 -funroll-loops # Default makefile Target. all: $(TARGET) + + # For executable we need all sources compiled to objects. + $(TARGET): $(OBJECTS) +- $(CPP) -o $(TARGET) $(OBJECTS) $(LIBRARIES) ++ $(CXX) -o $(TARGET) $(OBJECTS) ${LDFLAGS} $(LIBRARIES) + + # Compile all Source files, creates output directories as necessary. + build/%.o: %.cpp + $(shell $(MKDIR) build 2>/dev/null) + $(shell $(MKDIR) $(dir $@) 2>/dev/null) +- $(CPP) $(CFLAGS) -c $< -o $@ ++ $(CXX) $(CXXFLAGS) -c $< -o $@ + + # IDE may call makefile with target "build" instead of "all". + build: all