Index: Makefile
===================================================================
--- Makefile	(revision 560761)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	galera
-PORTVERSION?=	25.3.31
+PORTVERSION?=	25.3.32
 DISTVERSIONPREFIX?=	release_
 CATEGORIES=	databases
 
@@ -32,7 +32,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
 
@@ -40,34 +40,15 @@
 GH_TUPLE?=	codership:galera:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \
 		codership:wsrep-API:eab2d5d5a31672c0b7d116ef1629ff18392fd7d0: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 = 1603459107
-SHA256 (codership-galera-release_25.3.31_GH0.tar.gz) = b0843b8190b48bbbb6596997a221e08cf51eca0213ef709f9009c4c8f26b370d
-SIZE (codership-galera-release_25.3.31_GH0.tar.gz) = 3321870
+TIMESTAMP = 1610105381
+SHA256 (codership-galera-release_25.3.32_GH0.tar.gz) = 6be3d3f8e912261e8f9634fba5302b2dcc5ffb70f5ab670752d8d21087432c1b
+SIZE (codership-galera-release_25.3.32_GH0.tar.gz) = 3335638
 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
Index: files/patch-CMakeLists.txt
===================================================================
--- files/patch-CMakeLists.txt	(nonexistent)
+++ files/patch-CMakeLists.txt	(working copy)
@@ -0,0 +1,33 @@
+--- CMakeLists.txt.orig	2020-12-29 14:45:24 UTC
++++ CMakeLists.txt
+@@ -105,17 +105,19 @@ 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)
+-install(FILES ${CMAKE_SOURCE_DIR}/chromium/LICENSE
+-  DESTINATION doc
+-  RENAME LICENSE.chromium)
++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)
++  install(FILES ${CMAKE_SOURCE_DIR}/chromium/LICENSE
++    DESTINATION doc
++    RENAME LICENSE.chromium)
++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-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
Index: files/patch-gcomm_src_asio__tcp.cpp
===================================================================
--- files/patch-gcomm_src_asio__tcp.cpp	(revision 560761)
+++ files/patch-gcomm_src_asio__tcp.cpp	(working copy)
@@ -1,4 +1,4 @@
---- gcomm/src/asio_tcp.cpp.orig	2020-01-23 13:38:58 UTC
+--- gcomm/src/asio_tcp.cpp.orig	2020-12-29 14:45:24 UTC
 +++ gcomm/src/asio_tcp.cpp
 @@ -775,7 +775,7 @@ void gcomm::AsioTcpSocket::assign_remote_addr()
  gcomm::SocketStats gcomm::AsioTcpSocket::stats() const
@@ -9,7 +9,7 @@
      struct tcp_info tcpi;
      memset(&tcpi, 0, sizeof(tcpi));
      socklen_t tcpi_len(sizeof(tcpi));
-@@ -798,7 +798,7 @@ gcomm::SocketStats gcomm::AsioTcpSocket::stats() const
+@@ -807,7 +807,7 @@ gcomm::SocketStats gcomm::AsioTcpSocket::stats() const
          ret.send_queue_bytes = send_q_.queued_bytes();
          ret.send_queue_segments = send_q_.segments();
      }