From owner-svn-ports-head@freebsd.org Wed Jan 2 09:09:52 2019 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 4BFFD143B7CD; Wed, 2 Jan 2019 09:09:52 +0000 (UTC) (envelope-from linimon@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 E6D4582885; Wed, 2 Jan 2019 09:09:51 +0000 (UTC) (envelope-from linimon@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 C0CAE7640; Wed, 2 Jan 2019 09:09:51 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0299plj052845; Wed, 2 Jan 2019 09:09:51 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0299puJ052842; Wed, 2 Jan 2019 09:09:51 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201901020909.x0299puJ052842@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Wed, 2 Jan 2019 09:09:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489067 - in head/devel/astyle: . files X-SVN-Group: ports-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: in head/devel/astyle: . files X-SVN-Commit-Revision: 489067 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E6D4582885 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_SHORT(-0.98)[-0.981,0]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.998,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: Wed, 02 Jan 2019 09:09:52 -0000 Author: linimon Date: Wed Jan 2 09:09:50 2019 New Revision: 489067 URL: https://svnweb.freebsd.org/changeset/ports/489067 Log: Fix CXX assignment and add new includes to fix build on GCC-based architectures. PR: 232734 Submitted by: Piotr Kubaj Approved by: portmgr (tier-2 blanket) Added: head/devel/astyle/files/ head/devel/astyle/files/patch-build_gcc_Makefile (contents, props changed) head/devel/astyle/files/patch-src_astyle__main.cpp (contents, props changed) Modified: head/devel/astyle/Makefile Modified: head/devel/astyle/Makefile ============================================================================== --- head/devel/astyle/Makefile Wed Jan 2 09:03:39 2019 (r489066) +++ head/devel/astyle/Makefile Wed Jan 2 09:09:50 2019 (r489067) @@ -14,10 +14,6 @@ COMMENT= Source code indenter and formatter for C, C++ LICENSE= MIT LICENSE_FILE= ${WRKDIR}/astyle/LICENSE.md -BROKEN_mips= fails to build: unrecognized command line option "-std=c++11" -BROKEN_mips64= fails to build: unrecognized command line option "-std=c++11" -BROKEN_powerpc64= fails to build: unrecognized command line option "-std=c++11" - USES= compiler:c++11-lang dos2unix gmake ALL_TARGET= astyle @@ -25,6 +21,10 @@ DOS2UNIX_GLOB= *.ini WRKSRC= ${WRKDIR}/astyle/build/${CHOSEN_COMPILER_TYPE} OPTIONS_DEFINE= DOCS EXAMPLES + +do-configure: + @${REINPLACE_CMD} -e "s:%%CXX%%:${CXX}:" \ + ${WRKSRC}/${MAKEFILE} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/astyle ${STAGEDIR}${PREFIX}/bin Added: head/devel/astyle/files/patch-build_gcc_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/astyle/files/patch-build_gcc_Makefile Wed Jan 2 09:09:50 2019 (r489067) @@ -0,0 +1,11 @@ +--- ../../build/gcc/Makefile.orig 2018-01-11 17:18:18 UTC ++++ ../../build/gcc/Makefile +@@ -37,7 +37,7 @@ objdir = obj + ipath=$(prefix)/bin + CBASEFLAGS = -Wall -Wextra -fno-rtti -fno-exceptions -std=c++11 + JAVAINCS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux +-CXX = g++ ++CXX = %%CXX%% + INSTALL=install -o $(USER) -g $(USER) + + # Library's major version number -- Increment in case of incompatible API Added: head/devel/astyle/files/patch-src_astyle__main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/astyle/files/patch-src_astyle__main.cpp Wed Jan 2 09:09:50 2019 (r489067) @@ -0,0 +1,13 @@ +--- ../../src/astyle_main.cpp.orig 2018-11-28 00:32:16.924868000 +0100 ++++ ../../src/astyle_main.cpp 2018-11-28 00:33:36.071105000 +0100 +@@ -46,6 +46,10 @@ + #ifdef _WIN32 + #undef UNICODE // use ASCII windows functions + #include ++#elif defined(__FreeBSD__) ++ #include ++ #include ++ #include + #else + #include + #include