svn commit: r494546 - head/mail/notmuch

[Jan Beich]

Author: jbeich
Date: Mon Mar  4 04:35:13 2019
New Revision: 494546
URL: https://svnweb.freebsd.org/changeset/ports/494546

Log:
  mail/notmuch: unbreak with libc++ 8
  
  In file included from lib/database.cc:21:
  In file included from ./lib/database-private.h:39:
  In file included from /usr/local/include/xapian.h:56:
  In file included from /usr/local/include/xapian/error.h:30:
  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.28.1
  ^
  
  PR:		236192
  Approved by:	portmgr blanket

Modified:
  head/mail/notmuch/Makefile   (contents, props changed)

Modified: head/mail/notmuch/Makefile
==============================================================================
--- head/mail/notmuch/Makefile	Mon Mar  4 03:18:13 2019	(r494545)
+++ head/mail/notmuch/Makefile	Mon Mar  4 04:35:13 2019	(r494546)
@@ -60,6 +60,11 @@ DOXYGEN_CONFIGURE_WITH=	api-docs
 MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 MANPAGES_CONFIGURE_WITH=	docs
 
+post-patch:
+# Avoid conflict with C++20 <version> by ignoring <...> under WRKSRC
+	@${REINPLACE_CMD} -i .c++20 's/-I$$(srcdir)/-iquote$$(srcdir)/' \
+		${WRKSRC}/*/Makefile.local
+
 # Install bash completions without incurring a dependcy on
 # shells/bash-completion.  Also avoid automatic installation of
 # info pages on FreeBSD 10.