Index: Makefile
===================================================================
--- Makefile	(revision 560761)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	galera
-PORTVERSION=	26.4.6
+PORTVERSION=	26.4.7
 DISTVERSIONPREFIX=	release_
 PORTREVISION=	0
 CATEGORIES=	databases
@@ -30,7 +30,7 @@
 		objdump:devel/binutils
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 
-USES=		compiler:c++11-lang python:build scons ssl
+USES=		compiler:c++11-lang python:build cmake ssl
 
 USE_LDCONFIG=	yes
 
@@ -38,34 +38,15 @@
 GH_TUPLE?=	codership:galera:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \
 		codership:wsrep-API:75a5f452f2ba07b0f4a3a9a94825fccc71b27398:dummy/wsrep/src
 
-LDFLAGS+=	-lboost_program_options -lboost_system
-MAKE_ARGS+=	revno=${GH_TAGNAME} system_asio=0 tests=0
+CMAKE_ARGS+=	-DGALERA_REVISION=${GH_TAGNAME}
 
 USE_RC_SUBR=	garb.sh
 
-# Abuse TEST_TARGET to append tests=1 (which is not a target, strictly
-# speaking) at the end of the "scons ..." command so that it overrides
-# tests=0 from ${MAKE_ARGS}. To rerun the tests a second time, remove
-# all *.passed files: find ./work -name *.passed -print -delete
-TEST_TARGET=	deterministic_tests=1 tests=1
-
 PLIST_FILES=	bin/garbd \
 		lib/libgalera.so \
 		lib/libgalera_smm.so
 
-OPTIONS_DEFINE=	BOOSTPOOL BPOSTATIC DEBUG
+post-install:
+	${RLN} ${STAGEDIR}/${PREFIX}/lib/libgalera_smm.so ${STAGEDIR}/${PREFIX}/lib/libgalera.so
 
-BOOSTPOOL_DESC=	Use boost pool allocator
-BPOSTATIC_DESC=	Use static boost_program_options
-
-BOOSTPOOL_MAKE_ARGS=	boost_pool=1
-BPOSTATIC_MAKE_ARGS=	bpostatic=${LOCALBASE}/lib/libboost_program_options.a
-DEBUG_MAKE_ARGS=	debug=0
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/garb/garbd ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_LIB} ${WRKSRC}/libgalera_smm.so ${STAGEDIR}${PREFIX}/lib/
-	@(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libgalera_smm.so \
-		libgalera.so)
-
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 560761)
+++ distinfo	(working copy)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1603735085
-SHA256 (codership-galera-release_26.4.6_GH0.tar.gz) = d1d0f300bcf1097191f438952e7ceea59f40e158cf2c5f83b325da5437728b99
-SIZE (codership-galera-release_26.4.6_GH0.tar.gz) = 3438009
+TIMESTAMP = 1610114975
+SHA256 (codership-galera-release_26.4.7_GH0.tar.gz) = 77d519c66e588660f0d1d5d23e87d8d515ff5c6f94c618f6730c9c10312915dc
+SIZE (codership-galera-release_26.4.7_GH0.tar.gz) = 3445191
 SHA256 (codership-wsrep-API-75a5f452f2ba07b0f4a3a9a94825fccc71b27398_GH0.tar.gz) = ac782d33d84a874d89bbe4eeb818ab56ae729aee4c491f91892694a2e134c558
 SIZE (codership-wsrep-API-75a5f452f2ba07b0f4a3a9a94825fccc71b27398_GH0.tar.gz) = 50214
Index: files/patch-CMakeLists.txt
===================================================================
--- files/patch-CMakeLists.txt	(nonexistent)
+++ files/patch-CMakeLists.txt	(working copy)
@@ -0,0 +1,27 @@
+--- CMakeLists.txt.orig	2020-12-29 15:10:20 UTC
++++ CMakeLists.txt
+@@ -105,14 +105,16 @@ add_subdirectory(galera)
+ add_subdirectory(scripts/packages)
+ add_subdirectory(wsrep/tests)
+ 
+-install(FILES
+-  ${CMAKE_SOURCE_DIR}/AUTHORS
+-  ${CMAKE_SOURCE_DIR}/COPYING
+-  ${CMAKE_SOURCE_DIR}/README
+-  DESTINATION doc)
+-install(FILES ${CMAKE_SOURCE_DIR}/asio/LICENSE_1_0.txt
+-  DESTINATION doc
+-  RENAME LICENSE.asio)
++if (NOT CMAKE_SYSTEM MATCHES ".*BSD")
++  install(FILES
++    ${CMAKE_SOURCE_DIR}/AUTHORS
++    ${CMAKE_SOURCE_DIR}/COPYING
++    ${CMAKE_SOURCE_DIR}/README
++    DESTINATION doc)
++  install(FILES ${CMAKE_SOURCE_DIR}/asio/LICENSE_1_0.txt
++    DESTINATION doc
++    RENAME LICENSE.asio)
++endif()
+ 
+ message(STATUS "")
+ message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")

Property changes on: files/patch-CMakeLists.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-cmake_compiler.cmake
===================================================================
--- files/patch-cmake_compiler.cmake	(nonexistent)
+++ files/patch-cmake_compiler.cmake	(working copy)
@@ -0,0 +1,13 @@
+--- cmake/compiler.cmake.orig	2021-01-12 07:58:44 UTC
++++ cmake/compiler.cmake
+@@ -41,6 +41,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_ASSERTIONS")
+   # Enable debug sync points
+   add_definitions(-DGU_DBUG_ON)
++else()
++  # Due to liberal use of assert() in some modules, make sure that
++  # non-debug builds have -DNDEBUG enabled.
++  add_definitions(-DNDEBUG)
+ endif()
+ 
+ if (GALERA_GU_DEBUG_MUTEX)

Property changes on: files/patch-cmake_compiler.cmake
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-galerautils_src_gu__crc32c__arm64.c
===================================================================
--- files/patch-galerautils_src_gu__crc32c__arm64.c	(revision 560761)
+++ files/patch-galerautils_src_gu__crc32c__arm64.c	(working copy)
@@ -1,16 +1,17 @@
---- galerautils/src/gu_crc32c_arm64.c.orig	2020-10-27 20:24:41 UTC
+--- galerautils/src/gu_crc32c_arm64.c.orig	2020-12-29 15:10:20 UTC
 +++ galerautils/src/gu_crc32c_arm64.c
-@@ -74,7 +74,13 @@ gu_crc32c_arm64(gu_crc32c_t state, const void* data, s
- gu_crc32c_func_t
+@@ -83,7 +83,13 @@ gu_crc32c_func_t
  gu_crc32c_hardware()
  {
+ #if defined(GU_AT_HWCAP)
+-    unsigned long int const hwcaps = getauxval(GU_AT_HWCAP);
 +#if defined(__linux__)
-     unsigned long int const hwcaps = getauxval(AT_HWCAP);
++     unsigned long int const hwcaps = getauxval(AT_HWCAP);
 +#endif
 +#if defined(__FreeBSD__)
 +    unsigned long hwcaps;
 +    elf_aux_info(AT_HWCAP, &hwcaps, sizeof(hwcaps));
 +#endif
-     if (hwcaps & HWCAP_CRC32)
+     if (hwcaps & GU_HWCAP_CRC32)
      {
          gu_info ("CRC-32C: using hardware acceleration.");
Index: files/patch-garb_CMakeLists.txt
===================================================================
--- files/patch-garb_CMakeLists.txt	(nonexistent)
+++ files/patch-garb_CMakeLists.txt	(working copy)
@@ -0,0 +1,24 @@
+--- garb/CMakeLists.txt.orig	2021-01-08 11:51:42 UTC
++++ garb/CMakeLists.txt
+@@ -32,11 +32,13 @@ target_link_libraries(garbd gcs4garb gcomm gcache
+   ${Boost_PROGRAM_OPTIONS_LIBRARIES})
+ 
+ install(TARGETS garbd DESTINATION bin)
+-install(FILES
+-  ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.cnf
+-  ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.service
+-  ${CMAKE_CURRENT_SOURCE_DIR}/files/garb-systemd
+-  DESTINATION share)
+-install(FILES
+-  ${CMAKE_SOURCE_DIR}/man/garbd.8
+-  DESTINATION man/man8)
++if (NOT CMAKE_SYSTEM MATCHES ".*BSD")
++  install(FILES
++    ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.cnf
++    ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.service
++    ${CMAKE_CURRENT_SOURCE_DIR}/files/garb-systemd
++    DESTINATION share)
++  install(FILES
++    ${CMAKE_SOURCE_DIR}/man/garbd.8
++    DESTINATION man/man8)
++endif()

Property changes on: files/patch-garb_CMakeLists.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property