Date: Mon, 4 Mar 2019 11:51:32 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494588 - head/textproc/groonga Message-ID: <201903041151.x24BpW9p048357@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Mar 4 11:51:32 2019 New Revision: 494588 URL: https://svnweb.freebsd.org/changeset/ports/494588 Log: textproc/groonga: unbreak with libc++ 8 In file included from cursor-factory.cpp:18: In file included from ./cursor-factory.hpp:21: In file included from ./cursor.hpp:21: In file included from ./key.hpp:21: In file included from ./string.hpp:21: In file included from ./dat.hpp:26: In file included from /usr/include/c++/v1/cstddef:38: ../../version:1:1: error: expected unqualified-id 9.0.0 ^ PR: 236192 Approved by: portmgr blanket Modified: head/textproc/groonga/Makefile (contents, props changed) Modified: head/textproc/groonga/Makefile ============================================================================== --- head/textproc/groonga/Makefile Mon Mar 4 11:33:50 2019 (r494587) +++ head/textproc/groonga/Makefile Mon Mar 4 11:51:32 2019 (r494588) @@ -60,6 +60,10 @@ post-patch: /NGX_HTTP_LOG_PATH/s|mkdir|${TRUE}| ; \ /NGX_ERROR_LOG_PATH/s|mkdir|${TRUE}|' \ ${WRKSRC}/vendor/nginx-1.15.8/auto/install +# Avoid conflict with C++20 <version> by adding .txt suffix + @${MV} ${WRKSRC}/version ${WRKSRC}/version.txt + @${REINPLACE_CMD} -Ei .c++20 '/test|cat/s/[[:<:]]version/&.txt/' \ + ${WRKSRC}/version-gen.sh post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/groonga-httpd
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903041151.x24BpW9p048357>