CVS commit: pkgsrc/databases/mysql57-client

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Fri Sep  1 10:02:01 UTC 2017

Modified Files:
        pkgsrc/databases/mysql57-client: distinfo
        pkgsrc/databases/mysql57-client/patches: patch-cmake_boost.cmake

Log Message:
Fix build for boost 1.65.0. Build fix so ride previous PKGREVISION bump


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/mysql57-client/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/databases/mysql57-client/patches/patch-cmake_boost.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mysql57-client/distinfo
diff -u pkgsrc/databases/mysql57-client/distinfo:1.12 pkgsrc/databases/mysql57-client/distinfo:1.13
--- pkgsrc/databases/mysql57-client/distinfo:1.12       Thu Jul 20 16:41:10 2017
+++ pkgsrc/databases/mysql57-client/distinfo    Fri Sep  1 10:02:00 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2017/07/20 16:41:10 adam Exp $
+$NetBSD: distinfo,v 1.13 2017/09/01 10:02:00 abs Exp $
 
 SHA1 (mysql-5.7.19.tar.gz) = 2420bd5f12664c18313779668a8256aea53e52a0
 RMD160 (mysql-5.7.19.tar.gz) = 69f52cee63fe1344c487bd40e027a7dc57d067f7
@@ -8,7 +8,7 @@ SHA1 (patch-CMakeLists.txt) = b47592cf88
 SHA1 (patch-client_CMakeLists.txt) = 304023577ab9c2152ca21fa9ff4895a22a321adf
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
-SHA1 (patch-cmake_boost.cmake) = 9e837691f4bcdeafcc8c6af4bc5e366f1879c32d
+SHA1 (patch-cmake_boost.cmake) = dfd2c79df2ada054c93a28dd678aea346c217c57
 SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
 SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320
 SHA1 (patch-cmake_plugin.cmake) = 29db9f49941a011176a6cdd46f3af6c5636afb4a

Index: pkgsrc/databases/mysql57-client/patches/patch-cmake_boost.cmake
diff -u pkgsrc/databases/mysql57-client/patches/patch-cmake_boost.cmake:1.4 pkgsrc/databases/mysql57-client/patches/patch-cmake_boost.cmake:1.5
--- pkgsrc/databases/mysql57-client/patches/patch-cmake_boost.cmake:1.4 Sun Apr 30 05:10:32 2017
+++ pkgsrc/databases/mysql57-client/patches/patch-cmake_boost.cmake     Fri Sep  1 10:02:01 2017
@@ -1,15 +1,15 @@
-$NetBSD: patch-cmake_boost.cmake,v 1.4 2017/04/30 05:10:32 adam Exp $
+$NetBSD: patch-cmake_boost.cmake,v 1.5 2017/09/01 10:02:01 abs Exp $
 
 Fix to use a newer version of Boost.
 
---- cmake/boost.cmake.orig     2016-09-13 14:56:09.000000000 +0000
+--- cmake/boost.cmake.orig     2017-06-22 14:13:19.000000000 +0000
 +++ cmake/boost.cmake
 @@ -13,7 +13,7 @@
  # along with this program; if not, write to the Free Software
  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  
 -# We want boost 1.59.0 in order to build our boost/geometry code.
-+# We want boost 1.64.0 in order to build our boost/geometry code.
++# We want boost 1.65.0 in order to build our boost/geometry code.
  # The boost tarball is fairly big, and takes several minutes
  # to download. So we recommend downloading/unpacking it
  # only once, in a place visible from any bzr sandbox.
@@ -18,11 +18,11 @@ Fix to use a newer version of Boost.
  # is installed on the compile host in the standard location.
  
 -SET(BOOST_PACKAGE_NAME "boost_1_59_0")
-+SET(BOOST_PACKAGE_NAME "boost_1_64_0")
++SET(BOOST_PACKAGE_NAME "boost_1_65_0")
  SET(BOOST_TARBALL "${BOOST_PACKAGE_NAME}.tar.gz")
  SET(BOOST_DOWNLOAD_URL
 -  "http://sourceforge.net/projects/boost/files/boost/1.59.0/${BOOST_TARBALL}";
-+  "http://sourceforge.net/projects/boost/files/boost/1.64.0/${BOOST_TARBALL}";
++  "http://sourceforge.net/projects/boost/files/boost/1.65.0/${BOOST_TARBALL}";
    )
  
  SET(OLD_PACKAGE_NAMES "boost_1_55_0 boost_1_56_0 boost_1_57_0 boost_1_58_0")
@@ -31,7 +31,7 @@ Fix to use a newer version of Boost.
  # //  BOOST_VERSION / 100 % 1000 is the minor version
  # //  BOOST_VERSION / 100000 is the major version
 -# #define BOOST_VERSION 105900
-+# #define BOOST_VERSION 106400
++# #define BOOST_VERSION 106500
  FILE(STRINGS "${BOOST_INCLUDE_DIR}/boost/version.hpp"
    BOOST_VERSION_NUMBER
    REGEX "^#define[\t ]+BOOST_VERSION[\t ][0-9]+.*"
@@ -40,10 +40,10 @@ Fix to use a newer version of Boost.
  ENDIF()
  
 -IF(NOT BOOST_MINOR_VERSION EQUAL 59)
-+IF(NOT BOOST_MINOR_VERSION EQUAL 64)
++IF(NOT BOOST_MINOR_VERSION EQUAL 65)
    MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
 -    "we need 59"
-+    "we need 64"
++    "we need 65"
      )
    COULD_NOT_FIND_BOOST()
  ENDIF()
@@ -52,11 +52,11 @@ Fix to use a newer version of Boost.
  
  # We have a limited set of patches/bugfixes here:
 -SET(BOOST_PATCHES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_59_0/patches")
-+SET(BOOST_PATCHES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_64_0/patches")
++SET(BOOST_PATCHES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_65_0/patches")
  
  # We have a limited set of source files here:
 -SET(BOOST_SOURCES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_59_0")
-+SET(BOOST_SOURCES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_64_0")
++SET(BOOST_SOURCES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_65_0")
  
  # Bug in sqrt(NaN) on 32bit platforms
  IF(SIZEOF_VOIDP EQUAL 4)