--- xtrabackup/distinfo 2016-12-27 21:13:55.000000000 +0300 +++ xtrabackup/distinfo 2018-03-17 00:48:20.411917000 +0300 @@ -1,3 +1,5 @@ -TIMESTAMP = 1482861814 -SHA256 (percona-xtrabackup-2.3.6.tar.gz) = 9d2dfa4ad61dd9ef8a3c292f0c15d7504c4c0de7e141a69fc5afde9d4666aec7 -SIZE (percona-xtrabackup-2.3.6.tar.gz) = 34916730 +TIMESTAMP = 1521236900 +SHA256 (percona-xtrabackup-2.4.9.tar.gz) = 23c1e42ad4161b38edef126cf600e28779788a4d1736cadbb8e8f3dc219135a7 +SIZE (percona-xtrabackup-2.4.9.tar.gz) = 58001052 +SHA256 (boost_1_59_0.tar.bz2) = 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca +SIZE (boost_1_59_0.tar.bz2) = 70389425 --- xtrabackup/files/patch-cmake-install_layout.cmake 2014-12-06 21:09:21.000000000 +0300 +++ xtrabackup/files/patch-cmake-install_layout.cmake 2018-03-16 23:41:56.302697000 +0300 @@ -1,11 +1,11 @@ ---- cmake/install_layout.cmake.orig 2014-11-19 12:37:46.000000000 +0100 -+++ cmake/install_layout.cmake 2014-11-19 12:38:08.000000000 +0100 -@@ -114,7 +114,7 @@ +--- 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 @@ # SET(INSTALL_SHAREDIR_STANDALONE "share") SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share") -SET(INSTALL_MYSQLTESTDIR_STANDALONE "xtrabackup-test") -+# SET(INSTALL_MYSQLTESTDIR_STANDALONE "xtrabackup-test") - SET(INSTALL_SQLBENCHDIR_STANDALONE ".") ++#SET(INSTALL_MYSQLTESTDIR_STANDALONE "xtrabackup-test") SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files") # + SET(INSTALL_MYSQLDATADIR_STANDALONE "data") --- xtrabackup/files/patch-libarchive-CMakeLists.txt 2016-01-20 06:36:50.000000000 +0300 +++ xtrabackup/files/patch-libarchive-CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300 @@ -1,14 +0,0 @@ ---- storage/innobase/xtrabackup/src/libarchive/CMakeLists.txt 2015-10-16 20:40:52.000000000 +0200 -+++ storage/innobase/xtrabackup/src/libarchive/CMakeLists.txt.new 2015-11-03 14:46:57.952677630 +0100 -@@ -822,9 +822,9 @@ - # Especially for early development, we want to be a little - # aggressive about diagnosing build problems; this can get - # relaxed somewhat in final shipping versions. --IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$") -+IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$") - ADD_DEFINITIONS(-Wall -Werror) --ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$") -+ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$") - - IF(ENABLE_TEST) - ADD_CUSTOM_TARGET(run_all_tests) --- xtrabackup/files/patch-sql-json_dom.h 1970-01-01 03:00:00.000000000 +0300 +++ xtrabackup/files/patch-sql-json_dom.h 2018-03-17 00:22:06.395735000 +0300 @@ -0,0 +1,11 @@ +--- 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 --- xtrabackup/files/patch-storage-innobase-buf-buf0buf.cc 1970-01-01 03:00:00.000000000 +0300 +++ xtrabackup/files/patch-storage-innobase-buf-buf0buf.cc 2018-03-17 00:18:23.789493000 +0300 @@ -0,0 +1,11 @@ +--- 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; --- xtrabackup/files/patch-storage-innobase-dict-dict0stats.cc 1970-01-01 03:00:00.000000000 +0300 +++ xtrabackup/files/patch-storage-innobase-dict-dict0stats.cc 2018-03-17 00:38:28.814185000 +0300 @@ -0,0 +1,11 @@ +--- 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(). */ --- xtrabackup/files/patch-storage-innobase-sync-sync0debug.cc 1970-01-01 03:00:00.000000000 +0300 +++ xtrabackup/files/patch-storage-innobase-sync-sync0debug.cc 2018-03-17 00:28:09.907946000 +0300 @@ -0,0 +1,29 @@ +--- 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; --- xtrabackup/files/patch-storage-myisam-mi_dynrec.c 1970-01-01 03:00:00.000000000 +0300 +++ xtrabackup/files/patch-storage-myisam-mi_dynrec.c 2018-03-17 02:01:38.034695000 +0300 @@ -0,0 +1,23 @@ +--- storage/myisam/mi_dynrec.c.orig 2018-03-16 23:50:04.334166000 +0300 ++++ storage/myisam/mi_dynrec.c 2018-03-16 23:50:29.996533000 +0300 +@@ -65,18 +65,13 @@ + DBUG_RETURN(1); + } + /* +- I wonder if it is good to use MAP_NORESERVE. From the Linux man page: +- MAP_NORESERVE +- Do not reserve swap space for this mapping. When swap space is +- reserved, one has the guarantee that it is possible to modify the +- mapping. When swap space is not reserved one might get SIGSEGV +- upon a write if no physical memory is available. ++ MAP_NORESERVE is unimplemented in FreeBSD + */ + info->s->file_map= (uchar*) + my_mmap(0, (size_t) size, + info->s->mode==O_RDONLY ? PROT_READ : + PROT_READ | PROT_WRITE, +- MAP_SHARED | MAP_NORESERVE, ++ MAP_SHARED, + info->dfile, 0L); + if (info->s->file_map == (uchar*) MAP_FAILED) + { --- xtrabackup/Makefile 2018-01-11 23:34:08.000000000 +0300 +++ xtrabackup/Makefile 2018-03-17 00:46:49.786058000 +0300 @@ -2,10 +2,13 @@ # $FreeBSD: head/databases/xtrabackup/Makefile 458786 2018-01-11 20:34:08Z adamw $ PORTNAME= xtrabackup -PORTVERSION= 2.3.6 +PORTVERSION= 2.4.9 CATEGORIES= databases -MASTER_SITES= https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PORTVERSION}/source/tarball/ -DISTNAME= percona-${PORTNAME}-${PORTVERSION} +MASTER_SITES= https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PORTVERSION}/source/tarball/:xtrabackup \ + SF/boost/boost/1.59.0/:boost +WRKSRC= ${WRKDIR}/percona-${PORTNAME}-${PORTVERSION} + +DISTFILES= percona-${PORTNAME}-${PORTVERSION}.tar.gz:xtrabackup boost_1_59_0.tar.bz2:boost MAINTAINER= aleks@twindb.com COMMENT= OpenSource version of InnoDB backup with support of Percona extensions @@ -33,6 +36,7 @@ USES= alias autoreconf:build cpe gettext cmake:noninja libtool perl5 shebangfix CPE_VENDOR= percona SHEBANG_FILES= storage/innobase/xtrabackup/xbcloud_osenv.sh +CMAKE_ARGS+= -DWITH_BOOST=${WRKDIR}/boost_1_59_0 PLIST_FILES= bin/xtrabackup bin/xbstream bin/innobackupex bin/xbcrypt \ bin/xbcloud bin/xbcloud_osenv