git: 147efd9835e1 - main - databases/xtrabackup80: renamed from databases/xtrabackup8 and updated

From: Eugene Grosbein <eugen_at_FreeBSD.org>
Date: Thu, 22 Feb 2024 09:37:33 UTC
The branch main has been updated by eugen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=147efd9835e16cae10637c56e34325d1b4c573c2

commit 147efd9835e16cae10637c56e34325d1b4c573c2
Author:     Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2024-02-22 08:52:06 +0000
Commit:     Eugene Grosbein <eugen@FreeBSD.org>
CommitDate: 2024-02-22 09:35:51 +0000

    databases/xtrabackup80: renamed from databases/xtrabackup8 and updated
    
    The port databases/xtrabackup8 upgraded to version 8.0.35-30
    and renamed to databases/xtrabackup80 in preparation for upcoming
    incompatible branch databases/xtrabackup81, to avoid confusion.
    
    Drop unused dependency on libncurses.
    
    The update based on maintainer's submittion.
    
    PR:             277088
    Tested by:      Eugene M. Zheganin (maintainer)
    Approved by:    Eugene M. Zheganin (maintainer)
---
 MOVED                                              |  1 +
 UPDATING                                           |  8 +++++
 databases/Makefile                                 |  2 +-
 databases/xtrabackup8/distinfo                     |  5 ---
 databases/xtrabackup8/files/patch-CMakeLists.txt   | 21 -----------
 databases/xtrabackup8/files/patch-llvm-15          | 41 ----------------------
 databases/xtrabackup8/files/patch-procps           | 15 --------
 databases/{xtrabackup8 => xtrabackup80}/Makefile   | 27 +++++++-------
 databases/xtrabackup80/distinfo                    |  5 +++
 databases/xtrabackup80/files/patch-CMakeLists.txt  | 22 ++++++++++++
 .../files/patch-cmake-install_layout.cmake         |  0
 .../files/patch-cmake_os_FreeBSD.cmake             |  0
 databases/xtrabackup80/files/patch-file_utils      | 20 +++++++++++
 databases/xtrabackup80/files/patch-llvm-15         | 28 +++++++++++++++
 databases/xtrabackup80/files/patch-procps          | 28 +++++++++++++++
 databases/xtrabackup80/files/patch-protobuf        | 10 ++++++
 .../files/patch-storage_innobase_log__log0recv.cc  | 20 +++++------
 .../patch-storage_innobase_xtrabackup_src_utils.cc |  0
 ...h-storage_innobase_xtrabackup_xbcloud__osenv.sh |  0
 ...ge_temptable_include_temptable_lock_free_type.h |  0
 databases/{xtrabackup8 => xtrabackup80}/pkg-descr  |  0
 databases/{xtrabackup8 => xtrabackup80}/pkg-plist  |  0
 22 files changed, 146 insertions(+), 107 deletions(-)

diff --git a/MOVED b/MOVED
index ee44e2a01b2e..e45a8db0072a 100644
--- a/MOVED
+++ b/MOVED
@@ -2992,3 +2992,4 @@ security/py-pysha3||2024-02-17|Merged into python standard library since version
 graphics/qcustomplot-qt5|graphics/qcustomplot|2024-02-19|Renamed to support flavors
 audio/play||2024-02-20|Has expired: Upstream vaporized and last release was in 2000
 graphics/fotoxx|graphics/fotocx|2024-02-21|Project was renamed upstream
+databases/xtrabackup8|databases/xtrabackup80|2024-02-22|Rename port to avoid confusion
diff --git a/UPDATING b/UPDATING
index ef68f3dd115b..4bce54a71015 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,14 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20240222:
+  AFFECTS: users of databases/xtrabackup8
+  AUTHOR: eugen@FreeBSD.org
+
+  The port databases/xtrabackup8 upgraded to version 8.0.35-30
+  and renamed to databases/xtrabackup80 in preparation for upcoming
+  incompatible branch databases/xtrabackup81, to avoid confusion.
+
 20231229:
   AFFECTS: users of databases/tarantool
   AUTHOR: arrowd@FreeBSD.org
diff --git a/databases/Makefile b/databases/Makefile
index dc0aedb0165b..fa3aae96d0d4 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1066,7 +1066,7 @@
     SUBDIR += xls2txt
     SUBDIR += xrootd
     SUBDIR += xtrabackup
-    SUBDIR += xtrabackup8
+    SUBDIR += xtrabackup80
     SUBDIR += zodb
 
 .include <bsd.port.subdir.mk>
diff --git a/databases/xtrabackup8/distinfo b/databases/xtrabackup8/distinfo
deleted file mode 100644
index d0cdcc263929..000000000000
--- a/databases/xtrabackup8/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1677255149
-SHA256 (percona-xtrabackup-8.0.31-24.tar.gz) = 0031a91501a98e09b8d3955d580552ae05ac28696143369ba461aa1fa04c5140
-SIZE (percona-xtrabackup-8.0.31-24.tar.gz) = 336261760
-SHA256 (boost_1_77_0.tar.gz) = 5347464af5b14ac54bb945dc68f1dd7c56f0dad7262816b956138fc53bcc0131
-SIZE (boost_1_77_0.tar.gz) = 130620992
diff --git a/databases/xtrabackup8/files/patch-CMakeLists.txt b/databases/xtrabackup8/files/patch-CMakeLists.txt
deleted file mode 100644
index 59e23aedca07..000000000000
--- a/databases/xtrabackup8/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
---- CMakeLists.txt.orig	2023-01-30 13:34:34 UTC
-+++ CMakeLists.txt
-@@ -2081,7 +2081,6 @@ ENDIF()
-   ENDIF()
- ENDIF()
- 
--ADD_SUBDIRECTORY(extra/libkmip)
- 
- #
- # Setup maintainer mode options by the end. Platform checks are
-@@ -2292,10 +2291,6 @@ IF(ENABLE_GCOV)
- 
- IF(ENABLE_GCOV)
-   INCLUDE(fastcov)
--ENDIF()
--
--IF(UNIX)
--  ADD_SUBDIRECTORY(man)
- ENDIF()
- 
- IF(NOT WITHOUT_SERVER)
diff --git a/databases/xtrabackup8/files/patch-llvm-15 b/databases/xtrabackup8/files/patch-llvm-15
deleted file mode 100644
index 95eba05846e8..000000000000
--- a/databases/xtrabackup8/files/patch-llvm-15
+++ /dev/null
@@ -1,41 +0,0 @@
---- include/varlen_sort.h.orig	2023-01-30 20:34:34.000000000 +0700
-+++ include/varlen_sort.h	2023-02-25 15:15:11.238374000 +0700
-@@ -184,7 +184,9 @@ template <>
- 
- // Required for Iterator.
- template <>
--struct iterator_traits<varlen_iterator> : iterator_traits<varlen_element *> {};
-+struct iterator_traits<varlen_iterator> : iterator_traits<varlen_element *> {
-+  using reference = varlen_element;
-+};
- 
- }  // namespace std
- 
---- storage/innobase/include/ddl0impl.h.orig	2023-01-30 20:34:34.000000000 +0700
-+++ storage/innobase/include/ddl0impl.h	2023-02-25 15:17:06.382636000 +0700
-@@ -118,14 +118,6 @@ struct Row {
- 
- /** Physical row context. */
- struct Row {
--  /** Constructor. */
--  Row() = default;
--
--  Row(const Row &) = default;
--
--  /** Destructor. */
--  ~Row() = default;
--
-   /** Build a row from a raw record.
-   @param[in,out] ctx            DDL context.
-   @param[in,out] index          Index the record belongs to.
---- unittest/gunit/mysys_my_rdtsc-t.cc.orig	2023-01-30 20:34:34.000000000 +0700
-+++ unittest/gunit/mysys_my_rdtsc-t.cc	2023-02-25 15:23:43.264080000 +0700
-@@ -113,7 +113,7 @@ TEST_F(RDTimeStampCounter, TestCycle) {
-   ulonglong t1 = my_timer_cycles();
-   ulonglong t2;
-   int i;
--  int backward = 0;
-+  int backward [[maybe_unused]] = 0;
-   int nonzero = 0;
- 
-   for (i = 0; i < LOOP_COUNT; i++) {
diff --git a/databases/xtrabackup8/files/patch-procps b/databases/xtrabackup8/files/patch-procps
deleted file mode 100644
index 3331e9140f8a..000000000000
--- a/databases/xtrabackup8/files/patch-procps
+++ /dev/null
@@ -1,15 +0,0 @@
---- storage/innobase/xtrabackup/src/CMakeLists.txt.orig	2023-01-30 20:34:34.000000000 +0700
-+++ storage/innobase/xtrabackup/src/CMakeLists.txt	2023-02-25 17:34:58.412247000 +0700
-@@ -132,12 +132,6 @@ TARGET_LINK_LIBRARIES(xtrabackup
-   crc
-   )
- 
--IF(NOT APPLE)
--  TARGET_LINK_LIBRARIES(xtrabackup
--    procps
--    )
--ENDIF()
--
-  # We depend on protobuf because of the mysqlx plugin and replication.
-  IF(UNIX_INSTALL_RPATH_ORIGIN_PRIV_LIBDIR)
-    ADD_INSTALL_RPATH_FOR_PROTOBUF(xtrabackup)
diff --git a/databases/xtrabackup8/Makefile b/databases/xtrabackup80/Makefile
similarity index 77%
rename from databases/xtrabackup8/Makefile
rename to databases/xtrabackup80/Makefile
index f056ee9d1ac3..65315e7d2baf 100644
--- a/databases/xtrabackup8/Makefile
+++ b/databases/xtrabackup80/Makefile
@@ -1,11 +1,9 @@
-PORTNAME=	xtrabackup
-PORTVERSION=	8.0.31
-DISTVERSIONSUFFIX=	-24
-PORTREVISION=	3
+PORTNAME=	xtrabackup80
+PORTVERSION=	8.0.35
+DISTVERSIONSUFFIX=	-30
 CATEGORIES=	databases
-MASTER_SITES=	https://github.com/percona/percona-xtrabackup/archive/:percona \
+MASTER_SITES=	https://downloads.percona.com/downloads/Percona-XtraBackup-8.0/Percona-XtraBackup-8.0.35-30/source/tarball/:percona \
 		SF/boost/boost/${BOOST_VERSION}:boost
-PKGNAMESUFFIX=	8
 DISTFILES=	${PPORTNAME}-${DVERSION}${EXTRACT_SUFX}:percona \
 		boost_${BOOST_VERSION_UNDER}${EXTRACT_SUFX}:boost
 
@@ -18,14 +16,12 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	protobuf>=3.0:devel/protobuf \
 		rapidjson>=1.1.0:devel/rapidjson \
-		libevent>=2.1:devel/libevent \
-		ncurses>=6.3:devel/ncurses
+		libevent>=2.1:devel/libevent
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libev.so:devel/libev \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
 		libicudata.so:devel/icu \
-		libncurses.so.6:devel/ncurses \
 		libprotobuf-lite.so:devel/protobuf \
 		libunwind.so:devel/libunwind \
 		libzstd.so:archivers/zstd
@@ -41,7 +37,7 @@ CMAKE_ARGS=	-DBUILD_CONFIG:STRING=xtrabackup_release \
 CMAKE_ARGS+=	-DWITH_${component}:STRING=system
 .endfor
 
-CONFLICTS_INSTALL=	${PORTNAME}
+CONFLICTS_INSTALL=	${PORTNAME:C/.$//}*
 
 # Bundle last supported Boost release
 BOOST_VERSION=	1.77.0
@@ -54,8 +50,8 @@ CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
 DVERSION=	${PORTVERSION}${DISTVERSIONSUFFIX}
-PPORTNAME=	percona-${PORTNAME}
-WRKSRC=		${WRKDIR}/${PPORTNAME}-${PPORTNAME}-${DVERSION}
+PPORTNAME=	percona-xtrabackup
+WRKSRC=		${WRKDIR}/${PPORTNAME}-${DVERSION}
 
 .include <bsd.port.pre.mk>
 
@@ -69,9 +65,12 @@ CXXFLAGS+=	-malign-double
 KEEP_EXTRA=	lz4 robin-hood-hashing zlib
 
 post-patch:
+.for d in storage/innobase/xtrabackup/src sql/protobuf
+	${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/${d}/CMakeLists.txt
+.endfor
 .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
 	@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
-		${WRKSRC}/../boost_1_77_0/boost/container_hash/hash.hpp
+		${WRKSRC}/../boost_${BOOST_VERSION_UNDER}/boost/container_hash/hash.hpp
 .endif
 
 pre-configure:
@@ -84,7 +83,7 @@ pre-configure:
 .endfor
 
 post-stage:
-	@${RM} -r ${STAGEDIR}${PREFIX}/docs
+	@${RM} -r ${STAGEDIR}${PREFIX}/docs ${STAGEDIR}${PREFIX}/man
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/plugin/debug
 
 .include <bsd.port.post.mk>
diff --git a/databases/xtrabackup80/distinfo b/databases/xtrabackup80/distinfo
new file mode 100644
index 000000000000..53dc0ae04280
--- /dev/null
+++ b/databases/xtrabackup80/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1677255149
+SHA256 (percona-xtrabackup-8.0.35-30.tar.gz) = 8a3632a5a7a91834800f4f83902468bccff1d979e82347c0372b39a97b0c85f0
+SIZE (percona-xtrabackup-8.0.35-30.tar.gz) = 447842768
+SHA256 (boost_1_77_0.tar.gz) = 5347464af5b14ac54bb945dc68f1dd7c56f0dad7262816b956138fc53bcc0131
+SIZE (boost_1_77_0.tar.gz) = 130620992
diff --git a/databases/xtrabackup80/files/patch-CMakeLists.txt b/databases/xtrabackup80/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..750740325604
--- /dev/null
+++ b/databases/xtrabackup80/files/patch-CMakeLists.txt
@@ -0,0 +1,22 @@
+--- CMakeLists.txt.orig	2023-11-24 17:33:10.000000000 +0700
++++ CMakeLists.txt	2024-02-17 02:31:46.069754000 +0700
+@@ -2078,8 +2078,6 @@
+   ENDIF()
+ ENDIF()
+ 
+-ADD_SUBDIRECTORY(extra/libkmip)
+-
+ #
+ # Setup maintainer mode options by the end. Platform checks are
+ # not run with the warning options as to not perturb fragile checks
+@@ -2322,10 +2320,6 @@
+ 
+ IF(ENABLE_GCOV)
+   INCLUDE(fastcov)
+-ENDIF()
+-
+-IF(UNIX)
+-  ADD_SUBDIRECTORY(man)
+ ENDIF()
+ 
+ IF(LINUX AND NOT WITHOUT_SERVER)
diff --git a/databases/xtrabackup8/files/patch-cmake-install_layout.cmake b/databases/xtrabackup80/files/patch-cmake-install_layout.cmake
similarity index 100%
rename from databases/xtrabackup8/files/patch-cmake-install_layout.cmake
rename to databases/xtrabackup80/files/patch-cmake-install_layout.cmake
diff --git a/databases/xtrabackup8/files/patch-cmake_os_FreeBSD.cmake b/databases/xtrabackup80/files/patch-cmake_os_FreeBSD.cmake
similarity index 100%
rename from databases/xtrabackup8/files/patch-cmake_os_FreeBSD.cmake
rename to databases/xtrabackup80/files/patch-cmake_os_FreeBSD.cmake
diff --git a/databases/xtrabackup80/files/patch-file_utils b/databases/xtrabackup80/files/patch-file_utils
new file mode 100644
index 000000000000..a23aa72136d4
--- /dev/null
+++ b/databases/xtrabackup80/files/patch-file_utils
@@ -0,0 +1,20 @@
+--- storage/innobase/xtrabackup/src/file_utils.cc.orig	2023-11-24 17:33:10.000000000 +0700
++++ storage/innobase/xtrabackup/src/file_utils.cc	2024-02-17 00:40:45.193255000 +0700
+@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Bos
+ 
+ #include "file_utils.h"
+ #include <mysql/service_mysql_alloc.h>
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined (__FreeBSD__)
+ #include <sys/event.h>
+ #else
+ #include <sys/epoll.h>
+@@ -391,7 +391,7 @@ File open_fifo_for_read_with_timeout(const char *path,
+   }
+ 
+   /* File was open, lets check its open on the other side */
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+   struct timespec tm = {timeout, 0};
+   int kqueue_fd = kqueue();
+   if (kqueue_fd < 0) {
diff --git a/databases/xtrabackup80/files/patch-llvm-15 b/databases/xtrabackup80/files/patch-llvm-15
new file mode 100644
index 000000000000..094f83fbb98b
--- /dev/null
+++ b/databases/xtrabackup80/files/patch-llvm-15
@@ -0,0 +1,28 @@
+--- storage/innobase/include/ddl0impl.h.orig	2023-11-24 13:33:10.000000000 +0300
++++ storage/innobase/include/ddl0impl.h	2024-02-16 15:06:59.137578000 +0300
+@@ -118,14 +118,6 @@
+ 
+ /** Physical row context. */
+ struct Row {
+-  /** Constructor. */
+-  Row() = default;
+-
+-  Row(const Row &) = default;
+-
+-  /** Destructor. */
+-  ~Row() = default;
+-
+   Row &operator=(const Row &) = default;
+ 
+   /** Build a row from a raw record.
+--- unittest/gunit/mysys_my_rdtsc-t.cc.orig	2024-02-16 15:08:36.323297000 +0300
++++ unittest/gunit/mysys_my_rdtsc-t.cc	2024-02-16 15:08:40.000582000 +0300
+@@ -145,7 +145,7 @@
+   ulonglong t1 = my_timer_nanoseconds();
+   ulonglong t2;
+   int i;
+-  int backward = 0;
++  int backward [[maybe_unused]] = 0;
+   int nonzero = 0;
+ 
+   for (i = 0; i < LOOP_COUNT; i++) {
diff --git a/databases/xtrabackup80/files/patch-procps b/databases/xtrabackup80/files/patch-procps
new file mode 100644
index 000000000000..733821dd7c65
--- /dev/null
+++ b/databases/xtrabackup80/files/patch-procps
@@ -0,0 +1,28 @@
+--- storage/innobase/xtrabackup/src/CMakeLists.txt.orig	2023-11-24 13:33:10.000000000 +0300
++++ storage/innobase/xtrabackup/src/CMakeLists.txt	2024-02-16 15:38:03.294091000 +0300
+@@ -20,8 +20,9 @@
+ 
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+ 
++INCLUDE_DIRECTORIES(%%PREFIX%%/include)
++
+ FIND_GCRYPT()
+-FIND_PROCPS()
+ 
+ CHECK_TYPE_SIZE("unsigned long" SIZEOF_UNSIGNED_LONG)
+ 
+@@ -134,14 +135,6 @@
+   ext::icu
+   crc
+   )
+-
+-IF(NOT APPLE)
+-  IF(PROCPS_VERSION EQUAL 4)
+-    TARGET_LINK_LIBRARIES(xtrabackup proc2)
+-  ELSE()
+-    TARGET_LINK_LIBRARIES(xtrabackup procps)
+-  ENDIF()
+-ENDIF()
+ 
+  # We depend on protobuf because of the mysqlx plugin and replication.
+  IF(UNIX_INSTALL_RPATH_ORIGIN_PRIV_LIBDIR)
diff --git a/databases/xtrabackup80/files/patch-protobuf b/databases/xtrabackup80/files/patch-protobuf
new file mode 100644
index 000000000000..f1bd482d944a
--- /dev/null
+++ b/databases/xtrabackup80/files/patch-protobuf
@@ -0,0 +1,10 @@
+--- sql/protobuf/CMakeLists.txt.orig	2023-11-24 17:33:10.000000000 +0700
++++ sql/protobuf/CMakeLists.txt	2024-02-17 02:13:42.264307000 +0700
+@@ -21,6 +21,7 @@
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+ 
+ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/protobuf.cmake)
++INCLUDE_DIRECTORIES(%%PREFIX%%/include)
+ 
+ SET(PROTOBUF_LITE_LIB_NAME rpl_protobuf_lite)
+ 
diff --git a/databases/xtrabackup8/files/patch-storage_innobase_log__log0recv.cc b/databases/xtrabackup80/files/patch-storage_innobase_log__log0recv.cc
similarity index 63%
rename from databases/xtrabackup8/files/patch-storage_innobase_log__log0recv.cc
rename to databases/xtrabackup80/files/patch-storage_innobase_log__log0recv.cc
index ad9388decfa4..4f6c96125878 100644
--- a/databases/xtrabackup8/files/patch-storage_innobase_log__log0recv.cc
+++ b/databases/xtrabackup80/files/patch-storage_innobase_log__log0recv.cc
@@ -1,15 +1,15 @@
---- storage/innobase/log/log0recv.cc.orig	2023-01-30 20:34:34.000000000 +0700
-+++ storage/innobase/log/log0recv.cc	2023-03-10 12:08:29.586971000 +0700
-@@ -3789,7 +3789,7 @@ static bool recv_scan_log_recs(log_t &log,
+--- storage/innobase/log/log0recv.cc.orig	2023-11-24 13:33:10.000000000 +0300
++++ storage/innobase/log/log0recv.cc	2024-02-16 15:16:49.528584000 +0300
+@@ -3702,7 +3702,7 @@
  #else  /* !UNIV_HOTBACKUP */
  bool meb_scan_log_recs(
  #endif /* !UNIV_HOTBACKUP */
 -                               size_t *max_memory, const byte *buf, size_t len,
 +                               size_t max_memory, const byte *buf, size_t len,
                                 lsn_t start_lsn, lsn_t *read_upto_lsn,
-                                dberr_t &err, lsn_t to_lsn) {
+                                lsn_t to_lsn) {
    const byte *log_block = buf;
-@@ -4066,7 +4066,7 @@ bool meb_scan_log_recs(
+@@ -3975,7 +3975,7 @@
      recv_parse_log_recs();
  
  #ifndef UNIV_HOTBACKUP
@@ -18,12 +18,12 @@
        recv_apply_hashed_log_recs(log, false);
      }
  #endif /* !UNIV_HOTBACKUP */
-@@ -4254,7 +4254,7 @@ static dberr_t recv_recovery_begin(log_t &log, const l
- 
-     dberr_t err;
+@@ -4161,7 +4161,7 @@
+       break;
+     }
  
 -    finished = recv_scan_log_recs(log, &max_mem, log.buf, end_lsn - start_lsn,
 +    finished = recv_scan_log_recs(log, max_mem, log.buf, end_lsn - start_lsn,
-                                   start_lsn, &log.m_scanned_lsn, err, to_lsn);
+                                   start_lsn, &log.m_scanned_lsn, to_lsn);
  
-     if (err != DB_SUCCESS) {
+     start_lsn = end_lsn;
diff --git a/databases/xtrabackup8/files/patch-storage_innobase_xtrabackup_src_utils.cc b/databases/xtrabackup80/files/patch-storage_innobase_xtrabackup_src_utils.cc
similarity index 100%
rename from databases/xtrabackup8/files/patch-storage_innobase_xtrabackup_src_utils.cc
rename to databases/xtrabackup80/files/patch-storage_innobase_xtrabackup_src_utils.cc
diff --git a/databases/xtrabackup8/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh b/databases/xtrabackup80/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh
similarity index 100%
rename from databases/xtrabackup8/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh
rename to databases/xtrabackup80/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh
diff --git a/databases/xtrabackup8/files/patch-storage_temptable_include_temptable_lock_free_type.h b/databases/xtrabackup80/files/patch-storage_temptable_include_temptable_lock_free_type.h
similarity index 100%
rename from databases/xtrabackup8/files/patch-storage_temptable_include_temptable_lock_free_type.h
rename to databases/xtrabackup80/files/patch-storage_temptable_include_temptable_lock_free_type.h
diff --git a/databases/xtrabackup8/pkg-descr b/databases/xtrabackup80/pkg-descr
similarity index 100%
rename from databases/xtrabackup8/pkg-descr
rename to databases/xtrabackup80/pkg-descr
diff --git a/databases/xtrabackup8/pkg-plist b/databases/xtrabackup80/pkg-plist
similarity index 100%
rename from databases/xtrabackup8/pkg-plist
rename to databases/xtrabackup80/pkg-plist