Index: head/databases/xtrabackup/Makefile
===================================================================
--- head/databases/xtrabackup/Makefile	(revision 554373)
+++ head/databases/xtrabackup/Makefile	(revision 554374)
@@ -1,48 +1,50 @@
 # Created by: Alex Samorukov <samm@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	xtrabackup
 DISTVERSION=	2.4.20
 CATEGORIES=	databases
 MASTER_SITES=	https://www.percona.com/downloads/Percona-XtraBackup-${PORTVERSION:R}/Percona-XtraBackup-${PORTVERSION}/source/tarball/:xtrabackup \
 		https://ftp.osuosl.org/pub/blfs/conglomeration/boost/:boost SF/boost/boost/1.59.0/:boost
 DISTFILES=	percona-${PORTNAME}-${PORTVERSION}.tar.gz:xtrabackup \
 		boost_1_59_0.tar.bz2:boost
 
 MAINTAINER=	samm@FreeBSD.org
 COMMENT=	OpenSource version of InnoDB backup with support of Percona extensions
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_armv6=		fails to compile: cannot combine with previous 'type-name' declaration specifier
 BROKEN_armv7=		fails to compile: cannot combine with previous 'type-name' declaration specifier
 BROKEN_mips64=		fails to compile: 'fpsetmask' was not declared in this scope
 
 # quilt is required by build.sh
 BUILD_DEPENDS=	bash:shells/bash \
 		cmake:devel/cmake
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libev.so:devel/libev \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error
 RUN_DEPENDS=	qpress:archivers/qpress
 
+CONFLICTS_INSTALL=	${PORTNAME}8
+
 # autotool is in use for 5.1 builds
 USES=		alias autoreconf:build bison cmake:noninja compiler:c++11-lang \
 		cpe gettext libtool perl5 shebangfix
 USE_CXXSTD=	c++11
 CPE_VENDOR=	percona
 SHEBANG_FILES=	storage/innobase/xtrabackup/xbcloud_osenv.sh
 CMAKE_ARGS=	-DWITH_BOOST=${WRKDIR}/boost_1_59_0 -DWITH_VERSION_CHECK=OFF
 
 WRKSRC=		${WRKDIR}/percona-${PORTNAME}-${PORTVERSION}
 
 PLIST_FILES=	bin/xtrabackup bin/xbstream bin/innobackupex bin/xbcrypt \
 		bin/xbcloud bin/xbcloud_osenv
 
 # Not sure why it's trying to install mysql client libraries now
 post-install:
 	${RM} -rf ${STAGEDIR}${LOCALBASE}/lib
 
 .include <bsd.port.mk>
Index: head/databases/xtrabackup/files/patch-storage_innobase_fsp_fsp0fsp.cc
===================================================================
--- head/databases/xtrabackup/files/patch-storage_innobase_fsp_fsp0fsp.cc	(nonexistent)
+++ head/databases/xtrabackup/files/patch-storage_innobase_fsp_fsp0fsp.cc	(revision 554374)
@@ -0,0 +1,11 @@
+--- storage/innobase/fsp/fsp0fsp.cc.orig	2020-04-10 19:45:19 UTC
++++ storage/innobase/fsp/fsp0fsp.cc
+@@ -1289,7 +1289,7 @@ fsp_header_decode_encryption_info(
+ 
+ 	if (elen == MY_AES_BAD_DATA) {
+ 		my_free(master_key);
+-		return(NULL);
++		return(false);
+ 	}
+ 
+ 	/* Check checksum bytes. */

Property changes on: head/databases/xtrabackup/files/patch-storage_innobase_fsp_fsp0fsp.cc
___________________________________________________________________
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: head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_ds__tmpfile.c
===================================================================
--- head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_ds__tmpfile.c	(nonexistent)
+++ head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_ds__tmpfile.c	(revision 554374)
@@ -0,0 +1,11 @@
+--- storage/innobase/xtrabackup/src/ds_tmpfile.c.orig	2020-04-10 19:45:19 UTC
++++ storage/innobase/xtrabackup/src/ds_tmpfile.c
+@@ -55,7 +55,7 @@ datasink_t datasink_tmpfile = {
+ 	&tmpfile_deinit
+ };
+ 
+-MY_TMPDIR mysql_tmpdir_list;
++extern MY_TMPDIR mysql_tmpdir_list;
+ 
+ static ds_ctxt_t *
+ tmpfile_init(const char *root)

Property changes on: head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_ds__tmpfile.c
___________________________________________________________________
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: head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xbstream.c
===================================================================
--- head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xbstream.c	(nonexistent)
+++ head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xbstream.c	(revision 554374)
@@ -0,0 +1,10 @@
+--- storage/innobase/xtrabackup/src/xbstream.c.orig	2020-04-10 19:45:19 UTC
++++ storage/innobase/xtrabackup/src/xbstream.c
+@@ -55,7 +55,6 @@ datasink_t datasink_xbstream;
+ datasink_t datasink_compress;
+ datasink_t datasink_tmpfile;
+ datasink_t datasink_encrypt;
+-datasink_t datasink_buffer;
+ 
+ static run_mode_t	opt_mode;
+ static char *		opt_directory = NULL;

Property changes on: head/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xbstream.c
___________________________________________________________________
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