Date: Mon, 4 Mar 2019 10:10:22 +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: r494575 - head/mail/courier Message-ID: <201903041010.x24AAMW8086665@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <version> 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;' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903041010.x24AAMW8086665>