From owner-svn-ports-head@freebsd.org Mon Mar 4 10:10:22 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 CA431150A8A0; Mon, 4 Mar 2019 10:10:22 +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 7096C912CE; Mon, 4 Mar 2019 10:10:22 +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 5F31F26AD; Mon, 4 Mar 2019 10:10:22 +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 x24AAMgV086666; Mon, 4 Mar 2019 10:10:22 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x24AAMW8086665; Mon, 4 Mar 2019 10:10:22 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201903041010.x24AAMW8086665@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 10:10:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494575 - head/mail/courier X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/mail/courier X-SVN-Commit-Revision: 494575 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7096C912CE 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.965,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Mon, 04 Mar 2019 10:10:23 -0000 Author: jbeich Date: Mon Mar 4 10:10:21 2019 New Revision: 494575 URL: https://svnweb.freebsd.org/changeset/ports/494575 Log: mail/courier: unbreak with libc++ 8 In file included from afxpipe.C:6: In file included from ./afx.h:15: In file included from /usr/include/c++/v1/iostream:38: In file included from /usr/include/c++/v1/ios:216: In file included from /usr/include/c++/v1/__locale:15: In file included from /usr/include/c++/v1/string:505: In file included from /usr/include/c++/v1/string_view:176: In file included from /usr/include/c++/v1/__string:57: In file included from /usr/include/c++/v1/algorithm:640: In file included from /usr/include/c++/v1/initializer_list:47: In file included from /usr/include/c++/v1/cstddef:38: ../version:1:1: error: expected unqualified-id 0.65.3 ^ PR: 236192 Approved by: portmgr blanket Modified: head/mail/courier/Makefile (contents, props changed) Modified: head/mail/courier/Makefile ============================================================================== --- head/mail/courier/Makefile Mon Mar 4 10:06:33 2019 (r494574) +++ head/mail/courier/Makefile Mon Mar 4 10:10:21 2019 (r494575) @@ -299,6 +299,10 @@ post-patch: ${WRKSRC}/courier/perms.sh.in @${REINPLACE_CMD} '/^courieresmtp_LDADD =/s/$$/ -lcourierauth/' \ ${WRKSRC}/courier/module.esmtp/Makefile.in +# Avoid conflict with C++20 by adding .txt suffix + @${REINPLACE_CMD} -i .c++20 's/>version$$/&.txt/' ${WRKSRC}/configure + @${FIND} ${WRKSRC} -name configure -exec ${REINPLACE_CMD} \ + -i .c++20 '/^version.*cat/s,/version,&.txt,' {} + post-build: @${PERL} -pi -e 's|^(auth)\s+(required).*|$$1\t\t$$2\tpam_unix.so\ttry_first_pass|g;' \