svn commit: r518809 - in head/databases/mariadb104-server: . files

[Bernard Spil]

Author: brnrd
Date: Sun Dec  1 19:50:45 2019
New Revision: 518809
URL: https://svnweb.freebsd.org/changeset/ports/518809

Log:
  databases/mariadb104-server: Fix include clash with c++/v1/version

Added:
  head/databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt
     - copied unchanged from r518787, head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt
Modified:
  head/databases/mariadb104-server/Makefile

Modified: head/databases/mariadb104-server/Makefile
==============================================================================
--- head/databases/mariadb104-server/Makefile	Sun Dec  1 19:48:08 2019	(r518808)
+++ head/databases/mariadb104-server/Makefile	Sun Dec  1 19:50:45 2019	(r518809)
@@ -192,6 +192,7 @@ post-patch:
 	${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh \
 		${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
+	${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt
 .if ${OPSYS} == DragonFly
 	${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
 		${WRKSRC}/cmake/os/DragonFly.cmake

Copied: head/databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt (from r518787, head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mariadb104-server/files/patch-storage_mroonga_CMakeLists.txt	Sun Dec  1 19:50:45 2019	(r518809, copy of r518787, head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt)
@@ -0,0 +1,11 @@
+--- storage/mroonga/CMakeLists.txt.orig	2019-11-06 16:01:58 UTC
++++ storage/mroonga/CMakeLists.txt
+@@ -80,7 +80,7 @@ else()
+   set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR})
+ endif()
+ 
+-file(READ ${MRN_SOURCE_DIR}/version        MRN_VERSION)
++file(READ ${MRN_SOURCE_DIR}/version_txt    MRN_VERSION)
+ file(READ ${MRN_SOURCE_DIR}/version_major  MRN_VERSION_MAJOR)
+ file(READ ${MRN_SOURCE_DIR}/version_minor  MRN_VERSION_MINOR)
+ file(READ ${MRN_SOURCE_DIR}/version_micro  MRN_VERSION_MICRO)