From owner-svn-ports-all@freebsd.org Mon Mar 4 04:59:07 2019 Return-Path: Delivered-To: svn-ports-all@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 E0C82150284A; Mon, 4 Mar 2019 04:59:07 +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 859B386D42; Mon, 4 Mar 2019 04:59:07 +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 76B5627209; Mon, 4 Mar 2019 04:59:07 +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 x244x7c7023433; Mon, 4 Mar 2019 04:59:07 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x244x7tW023431; Mon, 4 Mar 2019 04:59:07 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201903040459.x244x7tW023431@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 4 Mar 2019 04:59:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494547 - head/devel/libcutl X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/devel/libcutl X-SVN-Commit-Revision: 494547 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 859B386D42 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.957,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-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Mar 2019 04:59:08 -0000 Author: jbeich Date: Mon Mar 4 04:59:06 2019 New Revision: 494547 URL: https://svnweb.freebsd.org/changeset/ports/494547 Log: devel/libcutl: unbreak with libc++ 8 In file included from exception.cxx:5: In file included from /usr/include/c++/v1/typeinfo:61: In file included from /usr/include/c++/v1/exception:81: In file included from /usr/include/c++/v1/cstddef:38: ../version:1:1: error: expected unqualified-id 1.10.0 ^ PR: 236192 Approved by: portmgr blanket Modified: head/devel/libcutl/Makefile (contents, props changed) head/devel/libcutl/pkg-plist (contents, props changed) Modified: head/devel/libcutl/Makefile ============================================================================== --- head/devel/libcutl/Makefile Mon Mar 4 04:35:13 2019 (r494546) +++ head/devel/libcutl/Makefile Mon Mar 4 04:59:06 2019 (r494547) @@ -35,4 +35,10 @@ CONFIGURE_ARGS= --disable-static \ 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 '/doc_DATA/s/version/&.txt/' \ + ${WRKSRC}/Makefile.in + .include Modified: head/devel/libcutl/pkg-plist ============================================================================== --- head/devel/libcutl/pkg-plist Mon Mar 4 04:35:13 2019 (r494546) +++ head/devel/libcutl/pkg-plist Mon Mar 4 04:59:06 2019 (r494547) @@ -61,4 +61,4 @@ libdata/pkgconfig/libcutl.pc %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/version +%%PORTDOCS%%%%DOCSDIR%%/version.txt