From owner-svn-ports-head@freebsd.org Fri Dec 28 16:52:45 2018 Return-Path: Delivered-To: svn-ports-head@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 141681419B2D; Fri, 28 Dec 2018 16:52:45 +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 AE0EA916E4; Fri, 28 Dec 2018 16:52:44 +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 A13F825B38; Fri, 28 Dec 2018 16:52:44 +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 wBSGqivs065128; Fri, 28 Dec 2018 16:52:44 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBSGqiFE065127; Fri, 28 Dec 2018 16:52:44 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201812281652.wBSGqiFE065127@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 28 Dec 2018 16:52:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488611 - head/games/apricots X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/games/apricots X-SVN-Commit-Revision: 488611 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AE0EA916E4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.956,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Dec 2018 16:52:45 -0000 Author: amdmi3 Date: Fri Dec 28 16:52:44 2018 New Revision: 488611 URL: https://svnweb.freebsd.org/changeset/ports/488611 Log: - Fix build with newer compilers in portable way, by specifying C++ standard - Switch to options helpers Modified: head/games/apricots/Makefile Modified: head/games/apricots/Makefile ============================================================================== --- head/games/apricots/Makefile Fri Dec 28 16:45:23 2018 (r488610) +++ head/games/apricots/Makefile Fri Dec 28 16:52:44 2018 (r488611) @@ -11,8 +11,9 @@ MASTER_SITES= http://www.fishies.org.uk/ \ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Fly a little plane around and shoot things and drop bombs -USES= compiler dos2unix +USES= dos2unix USE_SDL= sdl +USE_CXXSTD= c++98 DOS2UNIX_GLOB= *.cpp SUB_FILES= ${PORTNAME} @@ -22,9 +23,6 @@ PORTDOCS= * CPPFLAGS+= -DAP_PATH="\"${DATADIR}/\"" LLD_UNSAFE= yes -CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} -CXXFLAGS_clang= -Wno-c++11-narrowing - DESKTOP_ENTRIES="Apricots" \ "${COMMENT}" \ "" \ @@ -46,11 +44,13 @@ do-build: do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/apricots/${PORTNAME} ${STAGEDIR}${PREFIX}/libexec - ${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} .for ext in wav shapes psf cfg ${INSTALL_DATA} ${WRKSRC}/apricots/*.${ext} ${STAGEDIR}${DATADIR} .endfor - ${MKDIR} ${STAGEDIR}${DOCSDIR} + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include