Index: head/databases/galera26/Makefile
===================================================================
--- head/databases/galera26/Makefile	(revision 566058)
+++ head/databases/galera26/Makefile	(revision 566059)
@@ -1,73 +1,69 @@
 # Created by: Nicolas Embriz <nbari@tequila.io>
 # $FreeBSD$
 
 PORTNAME=	galera
 PORTVERSION=	26.4.6
 DISTVERSIONPREFIX=	release_
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases
 PKGNAMESUFFIX=	26
 
 MAINTAINER=	devel@galeracluster.com
 COMMENT=	Synchronous multi-master replication engine
 
 LICENSE=	GPLv2
 
-BROKEN_FreeBSD_13=	galerautils/src/gu_int128.h:163:20: error: use of undeclared identifier '__bswap64_var'
-BROKEN_FreeBSD_14=	galerautils/src/gu_int128.h:163:20: error: use of undeclared identifier '__bswap64_var'
-BROKEN_riscv64=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
 NOT_FOR_ARCHS=		i386
 # On i386 older versions of clang produce:
 #   cannot compile this atomic library call yet ... __atomic_add_fetch
 # whereas newer ones generate a call to __atomic_add_fetch which ends up with
 # undefined reference at link time:
 #   undefined reference to `__atomic_fetch_add_8'
 # https://bugs.llvm.org//show_bug.cgi?id=23262
 # https://bugs.llvm.org//show_bug.cgi?id=24908
 # https://tracker.crystax.net/issues/1263
 NOT_FOR_ARCHS_REASON_i386=Uses 64 bit atomics that clang cannot generate on i386
 
 BUILD_DEPENDS=	checkmk:devel/check \
 		${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \
 		objdump:devel/binutils
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 
 USES=		compiler:c++11-lang python:build scons ssl
 
-USE_LDCONFIG=	yes
-
 USE_GITHUB=	yes
 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
-
+USE_LDCONFIG=	yes
 USE_RC_SUBR=	garb.sh
 
+MAKE_ARGS+=	revno=${GH_TAGNAME} system_asio=0 tests=0
 # 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
+
+LDFLAGS+=	-lboost_program_options -lboost_system
 
 PLIST_FILES=	bin/garbd \
 		lib/libgalera.so \
 		lib/libgalera_smm.so
 
 OPTIONS_DEFINE=	BOOSTPOOL BPOSTATIC DEBUG
 
 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: head/databases/galera26/files/patch-galerautils_src_gu__byteswap.h
===================================================================
--- head/databases/galera26/files/patch-galerautils_src_gu__byteswap.h	(revision 566058)
+++ head/databases/galera26/files/patch-galerautils_src_gu__byteswap.h	(revision 566059)
@@ -1,22 +1,14 @@
 --- galerautils/src/gu_byteswap.h.orig	2020-10-12 06:33:51 UTC
 +++ galerautils/src/gu_byteswap.h
-@@ -54,10 +54,15 @@ static GU_FORCE_INLINE uint64_t GU_ROTL64 (uint64_t x,
+@@ -53,11 +53,6 @@ static GU_FORCE_INLINE uint64_t GU_ROTL64 (uint64_t x,
+ #  define gu_bswap16 _OSSwapInt16
  #  define gu_bswap32 _OSSwapInt32
  #  define gu_bswap64 _OSSwapInt64
- #elif defined(__FreeBSD__)
+-#elif defined(__FreeBSD__)
 -/* do not use bswapXX, because gcc44 gives old-style cast warnings */
 -#  define gu_bswap16 __bswap16_var
 -#  define gu_bswap32 __bswap32_var
 -#  define gu_bswap64 __bswap64_var
-+#  if defined(__aarch64__) || defined(__arm__)
-+#    define gu_bswap16 bswap16
-+#    define gu_bswap32 bswap32
-+#    define gu_bswap64 bswap64
-+#  else
-+#    define gu_bswap16 __bswap16_var
-+#    define gu_bswap32 __bswap32_var
-+#    define gu_bswap64 __bswap64_var
-+#  endif // __FreeBSD__
  #elif defined(__sun__)
  #  define gu_bswap16 BSWAP_16
  #  define gu_bswap32 BSWAP_32