From owner-svn-ports-head@freebsd.org Sat Mar 14 17:25:22 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2DA4225F95A; Sat, 14 Mar 2020 17:25:22 +0000 (UTC) (envelope-from danfe@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 48fqFs70gMz48pw; Sat, 14 Mar 2020 17:25:21 +0000 (UTC) (envelope-from danfe@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 4FE3E22547; Sat, 14 Mar 2020 17:25:21 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02EHPL8v009682; Sat, 14 Mar 2020 17:25:21 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02EHPLRu009681; Sat, 14 Mar 2020 17:25:21 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202003141725.02EHPLRu009681@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sat, 14 Mar 2020 17:25:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528426 - head/games/trenchbroom X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/games/trenchbroom X-SVN-Commit-Revision: 528426 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Sat, 14 Mar 2020 17:25:22 -0000 Author: danfe Date: Sat Mar 14 17:25:20 2020 New Revision: 528426 URL: https://svnweb.freebsd.org/changeset/ports/528426 Log: - Fix bogus return statements to unbreak the build against Clang 10 - While here, add two missing USE_GL components per stage QA check Reported by: pkg-fallout Modified: head/games/trenchbroom/Makefile Modified: head/games/trenchbroom/Makefile ============================================================================== --- head/games/trenchbroom/Makefile Sat Mar 14 17:20:01 2020 (r528425) +++ head/games/trenchbroom/Makefile Sat Mar 14 17:25:20 2020 (r528426) @@ -19,7 +19,7 @@ GH_PROJECT= TrenchBroom GH_TAGNAME= ed46601 USES= cmake:insource compiler:c++11-lib gl gnome pkgconfig -USE_GL= glew +USE_GL= gl glew glu USE_WX= 3.0+ CMAKE_ARGS= -DAPP_BUILD_CHANNEL:STRING="Beta for ${OPSYS}/${ARCH}" INSTALLS_ICONS= yes @@ -35,6 +35,8 @@ post-patch: ${WRKSRC}/common/src/View/AppInfoPanel.cpp @${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \ ${WRKSRC}/common/src/IO/SystemPaths.cpp + @${REINPLACE_CMD} -e '/return m_.*Margin/s,(),,' \ + ${WRKSRC}/common/src/View/CellLayout.h do-install: ${INSTALL_PROGRAM} ${WRKSRC}/TrenchBroom ${STAGEDIR}${PREFIX}/bin