From owner-svn-ports-head@freebsd.org Wed Mar 6 08:21:24 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 0FDD41508357; Wed, 6 Mar 2019 08:21:24 +0000 (UTC) (envelope-from jbeich@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 A79E98278B; Wed, 6 Mar 2019 08:21:23 +0000 (UTC) (envelope-from jbeich@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 9E527D50; Wed, 6 Mar 2019 08:21:23 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x268LNVO085195; Wed, 6 Mar 2019 08:21:23 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x268LNLO085194; Wed, 6 Mar 2019 08:21:23 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201903060821.x268LNLO085194@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 6 Mar 2019 08:21:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494781 - head/databases/mroonga X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/databases/mroonga X-SVN-Commit-Revision: 494781 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A79E98278B 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)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.976,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-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, 06 Mar 2019 08:21:24 -0000 Author: jbeich Date: Wed Mar 6 08:21:23 2019 New Revision: 494781 URL: https://svnweb.freebsd.org/changeset/ports/494781 Log: databases/mroonga: unbreak with libc++ 8 In file included from mrn_path_mapper.cpp:22: In file included from ../mrn_mysql.h:46: In file included from /wrkdirs/usr/ports/databases/mysql56-server/work/mysql-5.6.43/sql/sql_plugin.h:19: In file included from /wrkdirs/usr/ports/databases/mysql56-server/work/mysql-5.6.43/include/my_global.h:319: In file included from /usr/include/c++/v1/math.h:309: In file included from /usr/include/c++/v1/type_traits:406: In file included from /usr/include/c++/v1/cstddef:38: ../version:1:1: error: expected unqualified-id 9.00 ^ PR: 236192 Approved by: portmgr blanket Modified: head/databases/mroonga/Makefile (contents, props changed) Modified: head/databases/mroonga/Makefile ============================================================================== --- head/databases/mroonga/Makefile Wed Mar 6 07:31:17 2019 (r494780) +++ head/databases/mroonga/Makefile Wed Mar 6 08:21:23 2019 (r494781) @@ -25,6 +25,12 @@ SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS +post-patch: +# Avoid conflict with C++20 by adding .txt suffix + @${MV} ${WRKSRC}/version ${WRKSRC}/version.txt + @${REINPLACE_CMD} -i .c++20 's,srcdir)/version[[:>:]],&.txt,' \ + ${WRKSRC}/Makefile.in + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/ha_mroonga.so.0.0.0