svn commit: r494588 - head/textproc/groonga

Jan Beich jbeich at FreeBSD.org
Mon Mar 4 11:51:33 UTC 2019


Author: jbeich
Date: Mon Mar  4 11:51:32 2019
New Revision: 494588
URL: https://svnweb.freebsd.org/changeset/ports/494588

Log:
  textproc/groonga: unbreak with libc++ 8
  
  In file included from cursor-factory.cpp:18:
  In file included from ./cursor-factory.hpp:21:
  In file included from ./cursor.hpp:21:
  In file included from ./key.hpp:21:
  In file included from ./string.hpp:21:
  In file included from ./dat.hpp:26:
  In file included from /usr/include/c++/v1/cstddef:38:
  ../../version:1:1: error: expected unqualified-id
  9.0.0
  ^
  
  PR:		236192
  Approved by:	portmgr blanket

Modified:
  head/textproc/groonga/Makefile   (contents, props changed)

Modified: head/textproc/groonga/Makefile
==============================================================================
--- head/textproc/groonga/Makefile	Mon Mar  4 11:33:50 2019	(r494587)
+++ head/textproc/groonga/Makefile	Mon Mar  4 11:51:32 2019	(r494588)
@@ -60,6 +60,10 @@ post-patch:
 		 /NGX_HTTP_LOG_PATH/s|mkdir|${TRUE}| ; \
 		 /NGX_ERROR_LOG_PATH/s|mkdir|${TRUE}|' \
 		${WRKSRC}/vendor/nginx-1.15.8/auto/install
+# Avoid conflict with C++20 <version> by adding .txt suffix
+	@${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
+	@${REINPLACE_CMD} -Ei .c++20 '/test|cat/s/[[:<:]]version/&.txt/' \
+		${WRKSRC}/version-gen.sh
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/groonga-httpd


More information about the svn-ports-all mailing list