Update to 5.6.22-72.0

Fix build on arm [1]

PR:		197550 [1]
Submitted by:	mikael.urankar@gmail.com [1]
Tested by:	sbruno [1]

7 files changed, 56 insertions, 20 deletions

diff --git a/databases/percona56-client/files/patch-scripts_CMakeLists.txt b/databases/percona56-client/files/patch-scripts_CMakeLists.txt
index 0235dc2f305f..34c0ce2ac758 100644
--- a/databases/percona56-client/files/patch-scripts_CMakeLists.txt
+++ b/databases/percona56-client/files/patch-scripts_CMakeLists.txt
@@ -1,5 +1,5 @@
---- scripts/CMakeLists.txt.orig	2013-01-22 17:54:49.000000000 +0100
-+++ scripts/CMakeLists.txt	2013-02-13 14:14:11.000000000 +0100
+--- scripts/CMakeLists.txt.orig	2015-02-05 14:28:58.000000000 +0100
++++ scripts/CMakeLists.txt	2015-02-12 23:27:08.364991000 +0100
 @@ -71,6 +71,7 @@
  )
  ENDIF()
@@ -16,7 +16,7 @@
  
  # TCMalloc hacks
  IF(MALLOC_LIB)
-@@ -139,6 +141,7 @@
+@@ -143,6 +145,7 @@
  SET(HOSTNAME "hostname")
  SET(MYSQLD_USER "mysql")
  
@@ -24,7 +24,7 @@
  # Required for mysqlbug until autotools are deprecated, once done remove these
  # and expand default cmake variables
  SET(CC ${CMAKE_C_COMPILER})
-@@ -175,6 +178,7 @@
+@@ -179,6 +182,7 @@
    DESTINATION ${INSTALL_BINDIR}
    COMPONENT Server
    )
@@ -32,7 +32,7 @@
  
  ENDIF(UNIX)
  
-@@ -199,6 +203,7 @@
+@@ -203,6 +207,7 @@
    SET(localstatedir ${MYSQL_DATADIR})
  ENDIF()
  
@@ -40,15 +40,15 @@
  IF(UNIX)
    SET(EXT)
  ELSE()
-@@ -213,6 +218,7 @@
+@@ -217,6 +222,7 @@
    DESTINATION ${DEST}
    COMPONENT Server
    )
 +ENDIF()
  
- 
  SET(prefix "${CMAKE_INSTALL_PREFIX}")
-@@ -264,6 +270,8 @@
+ SET(sysconfdir ${prefix})
+@@ -273,6 +279,8 @@
            GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
            STRING(REGEX REPLACE "^lib" "" lib "${lib}")
            SET(${var} "${${var}}-l${lib} " ) 
@@ -57,7 +57,7 @@
          ELSE()
            SET(${var} "${${var}}-l${lib} " ) 
          ENDIF()
-@@ -316,17 +324,9 @@
+@@ -328,17 +336,9 @@
    SET(BIN_SCRIPTS
      msql2mysql
      mysql_config
@@ -72,10 +72,10 @@
 -    mysqldumpslow
 -    mysqld_multi
 -    mysqld_safe
+     ps_tokudb_admin
    )
    FOREACH(file ${BIN_SCRIPTS})
-     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
-@@ -350,6 +350,7 @@
+@@ -363,6 +363,7 @@
       )
    ENDFOREACH()
  
@@ -83,7 +83,7 @@
    # Input files with pl.in extension - drop the extension completely
    SET(PLIN_FILES mysql_secure_installation)
    FOREACH(file ${PLIN_FILES})
-@@ -362,6 +363,7 @@
+@@ -375,6 +376,7 @@
      INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT})
    ENDFOREACH()
  ENDIF()
diff --git a/databases/percona56-client/pkg-plist b/databases/percona56-client/pkg-plist
index 2afb7351d62e..b65c2a2bbb7e 100644
--- a/databases/percona56-client/pkg-plist
+++ b/databases/percona56-client/pkg-plist
@@ -13,6 +13,7 @@ bin/mysqldump
 bin/mysqlimport
 bin/mysqlshow
 bin/mysqlslap
+bin/ps_tokudb_admin
 include/mysql/big_endian.h
 include/mysql/byte_order_generic.h
 include/mysql/byte_order_generic_x86.h
diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile
index c090b6f2560d..740ee179f0b1 100644
--- a/databases/percona56-server/Makefile
+++ b/databases/percona56-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	percona
-DISTVERSION=	5.6.22-71.0
+DISTVERSION=	5.6.22-72.0
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/
diff --git a/databases/percona56-server/distinfo b/databases/percona56-server/distinfo
index bf89d15e9d63..3f1c75907ee7 100644
--- a/databases/percona56-server/distinfo
+++ b/databases/percona56-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (percona-server-5.6.22-71.0.tar.gz) = 0a7269a71e009bc802adef1dd3502562f22b881b7f88823ca84c987724dcf10c
-SIZE (percona-server-5.6.22-71.0.tar.gz) = 33992150
+SHA256 (percona-server-5.6.22-72.0.tar.gz) = 24eba36d13fbdd6c29528c32dc69b6767f0bacfba37d9de6b9637fdddccb314d
+SIZE (percona-server-5.6.22-72.0.tar.gz) = 34022879
diff --git a/databases/percona56-server/files/extra-patch-config.h.cmake b/databases/percona56-server/files/extra-patch-config.h.cmake
new file mode 100644
index 000000000000..4ea465832fb4
--- /dev/null
+++ b/databases/percona56-server/files/extra-patch-config.h.cmake
@@ -0,0 +1,29 @@
+--- Makefile
++++ Makefile
+@@ -95,8 +95,8 @@ post-patch:
+ 
+ .include <bsd.port.pre.mk>
+ 
+-.if ${ARCH} == "arm"
+-BROKEN=		Does not compile on arm
++.if ${ARCH} == "armv6"   
++EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config.h.cmake
+ .endif
+ 
+ .include <bsd.port.post.mk>
+
+--- /dev/null
++++ files/extra-patch-config.h.cmake
+@@ -0,0 +1,12 @@
++--- config.h.cmake.orig	2014-12-05 16:24:02 UTC
+++++ config.h.cmake
++@@ -151,7 +151,8 @@
++ #cmakedefine HAVE_FESETROUND 1
++ #cmakedefine HAVE_FINITE 1
++ #cmakedefine HAVE_FP_EXCEPT 1
++-#cmakedefine HAVE_FPSETMASK 1
+++#cmakedefine HAVE_FPSETMASK 0
+++#cmakedefine HAVE_FEDISABLEEXCEPT 1
++ #cmakedefine HAVE_FSEEKO 1
++ #cmakedefine HAVE_FSYNC 1
++ #cmakedefine HAVE_FTIME 1
diff --git a/databases/percona56-server/files/patch-scripts_CMakeLists.txt b/databases/percona56-server/files/patch-scripts_CMakeLists.txt
index ef7b3a1b506b..1ba5136f14c3 100644
--- a/databases/percona56-server/files/patch-scripts_CMakeLists.txt
+++ b/databases/percona56-server/files/patch-scripts_CMakeLists.txt
@@ -1,6 +1,6 @@
---- scripts/CMakeLists.txt.orig	2013-01-22 17:54:49.000000000 +0100
-+++ scripts/CMakeLists.txt	2013-02-13 14:39:57.000000000 +0100
-@@ -264,6 +264,8 @@
+--- scripts/CMakeLists.txt.orig	2015-02-05 14:28:58.000000000 +0100
++++ scripts/CMakeLists.txt	2015-02-12 23:25:55.432292000 +0100
+@@ -273,6 +273,8 @@
            GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
            STRING(REGEX REPLACE "^lib" "" lib "${lib}")
            SET(${var} "${${var}}-l${lib} " ) 
@@ -9,7 +9,7 @@
          ELSE()
            SET(${var} "${${var}}-l${lib} " ) 
          ENDIF()
-@@ -314,15 +316,10 @@
+@@ -326,25 +328,19 @@
    # On Unix, most of the files end up in the bin directory
    SET(mysql_config_COMPONENT COMPONENT Development)
    SET(BIN_SCRIPTS
@@ -25,7 +25,9 @@
      mysqlhotcopy
      mysqldumpslow
      mysqld_multi
-@@ -331,7 +328,7 @@
+     mysqld_safe
+-    ps_tokudb_admin
+   )
    FOREACH(file ${BIN_SCRIPTS})
      IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
        CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
diff --git a/databases/percona56-server/pkg-plist b/databases/percona56-server/pkg-plist
index 8079ead1b557..88c6e0791446 100644
--- a/databases/percona56-server/pkg-plist
+++ b/databases/percona56-server/pkg-plist
@@ -138,6 +138,10 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/swedish/errmsg.sys
 %%DATADIR%%/tests/suite/query_response_time/basic.result
 %%DATADIR%%/tests/suite/query_response_time/basic.test
+%%DATADIR%%/tests/suite/query_response_time/query_response_time-rw-begin.inc
+%%DATADIR%%/tests/suite/query_response_time/query_response_time-rw-end.inc
+%%DATADIR%%/tests/suite/query_response_time/query_response_time-rw.result
+%%DATADIR%%/tests/suite/query_response_time/query_response_time-rw.test
 %%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.inc
 %%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.result
 %%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.test