Index: databases/xtrabackup/Makefile =================================================================== --- databases/xtrabackup/Makefile +++ databases/xtrabackup/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xtrabackup -DISTVERSION= 2.4.9 +DISTVERSION= 2.4.12 CATEGORIES= databases MASTER_SITES= https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PORTVERSION}/source/tarball/:xtrabackup \ SF/boost/boost/1.59.0/:boost @@ -23,8 +23,7 @@ libev.so:devel/libev \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error -RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql \ - qpress:archivers/qpress +RUN_DEPENDS= qpress:archivers/qpress 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 @@ -38,8 +37,5 @@ CMAKE_ARGS= -DWITH_BOOST=${WRKDIR}/boost_1_59_0 WRKSRC= ${WRKDIR}/percona-${PORTNAME}-${PORTVERSION} - -PLIST_FILES= bin/xtrabackup bin/xbstream bin/innobackupex bin/xbcrypt \ - bin/xbcloud bin/xbcloud_osenv .include Index: databases/xtrabackup/distinfo =================================================================== --- databases/xtrabackup/distinfo +++ databases/xtrabackup/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1521236900 -SHA256 (percona-xtrabackup-2.4.9.tar.gz) = 23c1e42ad4161b38edef126cf600e28779788a4d1736cadbb8e8f3dc219135a7 -SIZE (percona-xtrabackup-2.4.9.tar.gz) = 58001052 +TIMESTAMP = 1533575308 +SHA256 (percona-xtrabackup-2.4.12.tar.gz) = de02cfd5bde96ddbf50339ef3a4646004dde52239698df45c19ed3e8ee40738e +SIZE (percona-xtrabackup-2.4.12.tar.gz) = 57232309 SHA256 (boost_1_59_0.tar.bz2) = 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca SIZE (boost_1_59_0.tar.bz2) = 70389425 Index: databases/xtrabackup/files/patch-cmake-install_layout.cmake =================================================================== --- databases/xtrabackup/files/patch-cmake-install_layout.cmake +++ databases/xtrabackup/files/patch-cmake-install_layout.cmake @@ -1,6 +1,6 @@ ---- cmake/install_layout.cmake 2017-02-06 18:02:22.189764000 +0000 -+++ cmake/install_layout.cmake 2017-02-06 18:02:29.642407000 +0000 -@@ -162,7 +162,7 @@ +--- cmake/install_layout.cmake.orig 2018-06-14 08:53:16 UTC ++++ cmake/install_layout.cmake +@@ -160,7 +160,7 @@ SET(INSTALL_INFODIR_STANDALONE "docs") # SET(INSTALL_SHAREDIR_STANDALONE "share") SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share") @@ -9,3 +9,12 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files") # SET(INSTALL_MYSQLDATADIR_STANDALONE "data") +@@ -216,7 +216,7 @@ SET(INSTALL_INFODIR_FREEBSD "docs") + # + SET(INSTALL_SHAREDIR_FREEBSD "share") + SET(INSTALL_MYSQLSHAREDIR_FREEBSD "share") +-SET(INSTALL_MYSQLTESTDIR_FREEBSD "xtrabackup-test") ++#SET(INSTALL_MYSQLTESTDIR_FREEBSD "xtrabackup-test") + SET(INSTALL_SUPPORTFILESDIR_FREEBSD "support-files") + # + SET(INSTALL_MYSQLDATADIR_FREEBSD "data") Index: databases/xtrabackup/files/patch-sql-json_dom.h =================================================================== --- databases/xtrabackup/files/patch-sql-json_dom.h +++ /dev/null @@ -1,11 +0,0 @@ ---- sql/json_dom.h.orig 2018-03-17 00:21:21.146040000 +0300 -+++ sql/json_dom.h 2018-03-17 00:21:26.264131000 +0300 -@@ -368,7 +368,7 @@ - Json_object class. - */ - typedef std::map > > Json_object_map; -+ Malloc_allocator > > Json_object_map; - - /** - Represents a JSON container value of type "object" (ECMA), type Index: databases/xtrabackup/files/patch-storage-innobase-buf-buf0buf.cc =================================================================== --- databases/xtrabackup/files/patch-storage-innobase-buf-buf0buf.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- storage/innobase/buf/buf0buf.cc.orig 2018-03-17 00:16:39.121076000 +0300 -+++ storage/innobase/buf/buf0buf.cc 2018-03-17 00:17:08.295213000 +0300 -@@ -340,7 +340,7 @@ - const byte*, - buf_chunk_t*, - std::less, -- ut_allocator > > -+ ut_allocator > > - buf_pool_chunk_map_t; - - static buf_pool_chunk_map_t* buf_chunk_map_reg; Index: databases/xtrabackup/files/patch-storage-innobase-dict-dict0stats.cc =================================================================== --- databases/xtrabackup/files/patch-storage-innobase-dict-dict0stats.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- storage/innobase/dict/dict0stats.cc.orig 2018-03-17 00:37:34.099255000 +0300 -+++ storage/innobase/dict/dict0stats.cc 2018-03-17 00:37:59.009449000 +0300 -@@ -139,7 +139,7 @@ - typedef std::vector > boundaries_t; - - /** Allocator type used for index_map_t. */ --typedef ut_allocator > -+typedef ut_allocator > - index_map_t_allocator; - - /** Auxiliary map used for sorting indexes by name in dict_stats_save(). */ Index: databases/xtrabackup/files/patch-storage-innobase-sync-sync0debug.cc =================================================================== --- databases/xtrabackup/files/patch-storage-innobase-sync-sync0debug.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- storage/innobase/sync/sync0debug.cc.orig 2018-03-17 00:25:16.778406000 +0300 -+++ storage/innobase/sync/sync0debug.cc 2018-03-17 00:27:34.072173000 +0300 -@@ -129,7 +129,7 @@ - os_thread_id_t, - Latches*, - os_thread_id_less, -- ut_allocator > > -+ ut_allocator > > - ThreadMap; - - /** Constructor */ -@@ -424,7 +424,7 @@ - latch_level_t, - std::string, - latch_level_less, -- ut_allocator > > -+ ut_allocator > > - Levels; - - /** Mutex protecting the deadlock detector data structures. */ -@@ -1718,7 +1718,7 @@ - const void*, - File, - std::less, -- ut_allocator > > -+ ut_allocator > > - Files; - - typedef OSMutex Mutex; Index: databases/xtrabackup/pkg-plist =================================================================== --- /dev/null +++ databases/xtrabackup/pkg-plist @@ -0,0 +1,10 @@ +bin/innobackupex +bin/xbcloud +bin/xbcloud_osenv +bin/xbcrypt +bin/xbstream +bin/xtrabackup +lib/libmysqlservices.a +lib/plugin/keyring_file.so +lib/plugin/keyring_vault.so +@dir lib/plugin/debug