Fri Sep 1 10:02:01 2017 UTC ()
Fix build for boost 1.65.0. Build fix so ride previous PKGREVISION bump


(abs)
diff -r1.12 -r1.13 pkgsrc/databases/mysql57-client/distinfo
diff -r1.4 -r1.5 pkgsrc/databases/mysql57-client/patches/patch-cmake_boost.cmake
cvs diff -r1.12 -r1.13 pkgsrc/databases/mysql57-client/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql57-client/distinfo 2017/07/20 16:41:10 1.12
+++ pkgsrc/databases/mysql57-client/distinfo 2017/09/01 10:02:00 1.13
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.12 2017/07/20 16:41:10 adam Exp $ 1$NetBSD: distinfo,v 1.13 2017/09/01 10:02:00 abs Exp $
2 2
3SHA1 (mysql-5.7.19.tar.gz) = 2420bd5f12664c18313779668a8256aea53e52a0 3SHA1 (mysql-5.7.19.tar.gz) = 2420bd5f12664c18313779668a8256aea53e52a0
4RMD160 (mysql-5.7.19.tar.gz) = 69f52cee63fe1344c487bd40e027a7dc57d067f7 4RMD160 (mysql-5.7.19.tar.gz) = 69f52cee63fe1344c487bd40e027a7dc57d067f7
5SHA512 (mysql-5.7.19.tar.gz) = 04296e480fc91381137a32d064f6d33d0a96b28ae64ca1202ef045a8e78434a61e81d83e36b8bfa7fccdcf37f1b65e955b4466c7d036bc014cecac83f0c4b1cf 5SHA512 (mysql-5.7.19.tar.gz) = 04296e480fc91381137a32d064f6d33d0a96b28ae64ca1202ef045a8e78434a61e81d83e36b8bfa7fccdcf37f1b65e955b4466c7d036bc014cecac83f0c4b1cf
6Size (mysql-5.7.19.tar.gz) = 51686763 bytes 6Size (mysql-5.7.19.tar.gz) = 51686763 bytes
7SHA1 (patch-CMakeLists.txt) = b47592cf8801538375da3df2990fde4d292fc365 7SHA1 (patch-CMakeLists.txt) = b47592cf8801538375da3df2990fde4d292fc365
8SHA1 (patch-client_CMakeLists.txt) = 304023577ab9c2152ca21fa9ff4895a22a321adf 8SHA1 (patch-client_CMakeLists.txt) = 304023577ab9c2152ca21fa9ff4895a22a321adf
9SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb 9SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
10SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93 10SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
11SHA1 (patch-cmake_boost.cmake) = 9e837691f4bcdeafcc8c6af4bc5e366f1879c32d 11SHA1 (patch-cmake_boost.cmake) = dfd2c79df2ada054c93a28dd678aea346c217c57
12SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356 12SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
13SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320 13SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320
14SHA1 (patch-cmake_plugin.cmake) = 29db9f49941a011176a6cdd46f3af6c5636afb4a 14SHA1 (patch-cmake_plugin.cmake) = 29db9f49941a011176a6cdd46f3af6c5636afb4a
15SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c 15SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
16SHA1 (patch-include_CMakeLists.txt) = 944991702f046ea7a5e2b6ea4dc390f17426e55a 16SHA1 (patch-include_CMakeLists.txt) = 944991702f046ea7a5e2b6ea4dc390f17426e55a
17SHA1 (patch-include_my__compare.h) = f45bac4b488332a668b0005751856279b67401f5 17SHA1 (patch-include_my__compare.h) = f45bac4b488332a668b0005751856279b67401f5
18SHA1 (patch-include_my__global.h) = 3870266cb1dd2cd0d58417dfe21bab19b62100e2 18SHA1 (patch-include_my__global.h) = 3870266cb1dd2cd0d58417dfe21bab19b62100e2
19SHA1 (patch-include_my__thread.h) = 0f095acf94f8d130516dc4d858de1c64dd2bc127 19SHA1 (patch-include_my__thread.h) = 0f095acf94f8d130516dc4d858de1c64dd2bc127
20SHA1 (patch-include_my__thread__os__id.h) = a51861b791086a0eeb9cb4d64892c5033da8c8eb 20SHA1 (patch-include_my__thread__os__id.h) = a51861b791086a0eeb9cb4d64892c5033da8c8eb
21SHA1 (patch-libmysql_CMakeLists.txt) = 00ce9c7f0e2c4132b872ffde05ee74e81c280f68 21SHA1 (patch-libmysql_CMakeLists.txt) = 00ce9c7f0e2c4132b872ffde05ee74e81c280f68
22SHA1 (patch-mysql-test_CMakeLists.txt) = 4ba56ce255f5f89d9aece93181e54ddb572f301b 22SHA1 (patch-mysql-test_CMakeLists.txt) = 4ba56ce255f5f89d9aece93181e54ddb572f301b
23SHA1 (patch-mysys__ssl_CMakeLists.txt) = 7ec44642cd13c5477175a94a007354c583ca9c3c 23SHA1 (patch-mysys__ssl_CMakeLists.txt) = 7ec44642cd13c5477175a94a007354c583ca9c3c
24SHA1 (patch-mysys_kqueue__timers.c) = 836803e9c7353b813bc22a5b69cc263dea384c9b 24SHA1 (patch-mysys_kqueue__timers.c) = 836803e9c7353b813bc22a5b69cc263dea384c9b
cvs diff -r1.4 -r1.5 pkgsrc/databases/mysql57-client/patches/Attic/patch-cmake_boost.cmake (expand / switch to unified diff)

--- pkgsrc/databases/mysql57-client/patches/Attic/patch-cmake_boost.cmake 2017/04/30 05:10:32 1.4
+++ pkgsrc/databases/mysql57-client/patches/Attic/patch-cmake_boost.cmake 2017/09/01 10:02:01 1.5
@@ -1,62 +1,62 @@ @@ -1,62 +1,62 @@
1$NetBSD: patch-cmake_boost.cmake,v 1.4 2017/04/30 05:10:32 adam Exp $ 1$NetBSD: patch-cmake_boost.cmake,v 1.5 2017/09/01 10:02:01 abs Exp $
2 2
3Fix to use a newer version of Boost. 3Fix to use a newer version of Boost.
4 4
5--- cmake/boost.cmake.orig 2016-09-13 14:56:09.000000000 +0000 5--- cmake/boost.cmake.orig 2017-06-22 14:13:19.000000000 +0000
6+++ cmake/boost.cmake 6+++ cmake/boost.cmake
7@@ -13,7 +13,7 @@ 7@@ -13,7 +13,7 @@
8 # along with this program; if not, write to the Free Software 8 # along with this program; if not, write to the Free Software
9 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 9 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
10  10
11-# We want boost 1.59.0 in order to build our boost/geometry code. 11-# We want boost 1.59.0 in order to build our boost/geometry code.
12+# We want boost 1.64.0 in order to build our boost/geometry code. 12+# We want boost 1.65.0 in order to build our boost/geometry code.
13 # The boost tarball is fairly big, and takes several minutes 13 # The boost tarball is fairly big, and takes several minutes
14 # to download. So we recommend downloading/unpacking it 14 # to download. So we recommend downloading/unpacking it
15 # only once, in a place visible from any bzr sandbox. 15 # only once, in a place visible from any bzr sandbox.
16@@ -31,10 +31,10 @@ 16@@ -31,10 +31,10 @@
17 # we assume that the correct version (see below) 17 # we assume that the correct version (see below)
18 # is installed on the compile host in the standard location. 18 # is installed on the compile host in the standard location.
19  19
20-SET(BOOST_PACKAGE_NAME "boost_1_59_0") 20-SET(BOOST_PACKAGE_NAME "boost_1_59_0")
21+SET(BOOST_PACKAGE_NAME "boost_1_64_0") 21+SET(BOOST_PACKAGE_NAME "boost_1_65_0")
22 SET(BOOST_TARBALL "${BOOST_PACKAGE_NAME}.tar.gz") 22 SET(BOOST_TARBALL "${BOOST_PACKAGE_NAME}.tar.gz")
23 SET(BOOST_DOWNLOAD_URL 23 SET(BOOST_DOWNLOAD_URL
24- "http://sourceforge.net/projects/boost/files/boost/1.59.0/${BOOST_TARBALL}" 24- "http://sourceforge.net/projects/boost/files/boost/1.59.0/${BOOST_TARBALL}"
25+ "http://sourceforge.net/projects/boost/files/boost/1.64.0/${BOOST_TARBALL}" 25+ "http://sourceforge.net/projects/boost/files/boost/1.65.0/${BOOST_TARBALL}"
26 ) 26 )
27  27
28 SET(OLD_PACKAGE_NAMES "boost_1_55_0 boost_1_56_0 boost_1_57_0 boost_1_58_0") 28 SET(OLD_PACKAGE_NAMES "boost_1_55_0 boost_1_56_0 boost_1_57_0 boost_1_58_0")
29@@ -244,7 +244,7 @@ ENDIF() 29@@ -244,7 +244,7 @@ ENDIF()
30 # // BOOST_VERSION % 100 is the patch level 30 # // BOOST_VERSION % 100 is the patch level
31 # // BOOST_VERSION / 100 % 1000 is the minor version 31 # // BOOST_VERSION / 100 % 1000 is the minor version
32 # // BOOST_VERSION / 100000 is the major version 32 # // BOOST_VERSION / 100000 is the major version
33-# #define BOOST_VERSION 105900 33-# #define BOOST_VERSION 105900
34+# #define BOOST_VERSION 106400 34+# #define BOOST_VERSION 106500
35 FILE(STRINGS "${BOOST_INCLUDE_DIR}/boost/version.hpp" 35 FILE(STRINGS "${BOOST_INCLUDE_DIR}/boost/version.hpp"
36 BOOST_VERSION_NUMBER 36 BOOST_VERSION_NUMBER
37 REGEX "^#define[\t ]+BOOST_VERSION[\t ][0-9]+.*" 37 REGEX "^#define[\t ]+BOOST_VERSION[\t ][0-9]+.*"
38@@ -262,9 +262,9 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10) 38@@ -262,9 +262,9 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10)
39 COULD_NOT_FIND_BOOST() 39 COULD_NOT_FIND_BOOST()
40 ENDIF() 40 ENDIF()
41  41
42-IF(NOT BOOST_MINOR_VERSION EQUAL 59) 42-IF(NOT BOOST_MINOR_VERSION EQUAL 59)
43+IF(NOT BOOST_MINOR_VERSION EQUAL 64) 43+IF(NOT BOOST_MINOR_VERSION EQUAL 65)
44 MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} " 44 MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
45- "we need 59" 45- "we need 59"
46+ "we need 64" 46+ "we need 65"
47 ) 47 )
48 COULD_NOT_FIND_BOOST() 48 COULD_NOT_FIND_BOOST()
49 ENDIF() 49 ENDIF()
50@@ -272,10 +272,10 @@ ENDIF() 50@@ -272,10 +272,10 @@ ENDIF()
51 MESSAGE(STATUS "BOOST_INCLUDE_DIR ${BOOST_INCLUDE_DIR}") 51 MESSAGE(STATUS "BOOST_INCLUDE_DIR ${BOOST_INCLUDE_DIR}")
52  52
53 # We have a limited set of patches/bugfixes here: 53 # We have a limited set of patches/bugfixes here:
54-SET(BOOST_PATCHES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_59_0/patches") 54-SET(BOOST_PATCHES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_59_0/patches")
55+SET(BOOST_PATCHES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_64_0/patches") 55+SET(BOOST_PATCHES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_65_0/patches")
56  56
57 # We have a limited set of source files here: 57 # We have a limited set of source files here:
58-SET(BOOST_SOURCES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_59_0") 58-SET(BOOST_SOURCES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_59_0")
59+SET(BOOST_SOURCES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_64_0") 59+SET(BOOST_SOURCES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_65_0")
60  60
61 # Bug in sqrt(NaN) on 32bit platforms 61 # Bug in sqrt(NaN) on 32bit platforms
62 IF(SIZEOF_VOIDP EQUAL 4) 62 IF(SIZEOF_VOIDP EQUAL 4)