From owner-svn-ports-all@freebsd.org Mon Mar 4 11:33:41 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 9D9A3150D7A4; Mon, 4 Mar 2019 11:33:41 +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 38DFC951CB; Mon, 4 Mar 2019 11:33:41 +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 1FE3937B7; Mon, 4 Mar 2019 11:33:41 +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 x24BXec8035862; Mon, 4 Mar 2019 11:33:40 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x24BXenB035861; Mon, 4 Mar 2019 11:33:40 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201903041133.x24BXenB035861@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 11:33:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494586 - head/net-im/psi X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/net-im/psi X-SVN-Commit-Revision: 494586 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 38DFC951CB X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,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-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 11:33:41 -0000 Author: jbeich Date: Mon Mar 4 11:33:40 2019 New Revision: 494586 URL: https://svnweb.freebsd.org/changeset/ports/494586 Log: net-im/psi: unbreak with libc++ 8 In file included from src/Certificates/moc_CertificateDisplayDialog.cpp:9: In file included from src/Certificates/../../../psi-1.3/src/Certificates/CertificateDisplayDialog.h:23: In file included from /usr/local/include/Qca-qt5/QtCrypto/QtCrypto:1: In file included from /usr/local/include/Qca-qt5/QtCrypto/qca.h:36: In file included from /usr/local/include/Qca-qt5/QtCrypto/qca_core.h:36: In file included from /usr/local/include/qt5/QtCore/QString:1: In file included from /usr/local/include/qt5/QtCore/qstring.h:48: In file included from /usr/local/include/qt5/QtCore/qchar.h:43: In file included from /usr/local/include/qt5/QtCore/qglobal.h:45: 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 1.3 ^ PR: 236192 Modified: head/net-im/psi/Makefile (contents, props changed) Modified: head/net-im/psi/Makefile ============================================================================== --- head/net-im/psi/Makefile Mon Mar 4 11:21:02 2019 (r494585) +++ head/net-im/psi/Makefile Mon Mar 4 11:33:40 2019 (r494586) @@ -40,4 +40,10 @@ ENCHANT_DESC= Use Enchant for spell checking ENCHANT_LIB_DEPENDS= libenchant.so:textproc/enchant ENCHANT_CMAKE_BOOL= USE_ENCHANT +post-patch: +# Avoid conflict with C++20 by adding .txt suffix + @${MV} ${WRKSRC}/version ${WRKSRC}/version.txt + @${REINPLACE_CMD} -i .c++20 's,SOURCE_DIR}/version,&.txt,' \ + ${WRKSRC}/CMakeLists.txt + .include