Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1561976749198950"
MIME-Version: 1.0
Date: Mon, 1 Jul 2019 10:25:49 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/databases/mysql57-client
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20190701102550.013C0FBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1561976749198950
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Mon Jul  1 10:25:49 UTC 2019

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

Log Message:
mysql57-client: allow newer Boost; fixes building with boost-1.70.0


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/mysql57-client/distinfo
cvs rdiff -u -r1.10 -r1.11 \
    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.


--_----------=_1561976749198950
Content-Disposition: inline
Content-Length: 4066
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/databases/mysql57-client/distinfo
diff -u pkgsrc/databases/mysql57-client/distinfo:1.29 pkgsrc/databases/mysql57-client/distinfo:1.30
--- pkgsrc/databases/mysql57-client/distinfo:1.29	Thu Apr 25 10:13:04 2019
+++ pkgsrc/databases/mysql57-client/distinfo	Mon Jul  1 10:25:49 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2019/04/25 10:13:04 adam Exp $
+$NetBSD: distinfo,v 1.30 2019/07/01 10:25:49 adam Exp $
 
 SHA1 (mysql-5.7.26.tar.gz) = 06afaa471c4d17f00e0717467094027eeaff8ad5
 RMD160 (mysql-5.7.26.tar.gz) = 3ab0a5b4d6883af767869fa9d55a5c8fd9013121
@@ -8,7 +8,7 @@ SHA1 (patch-CMakeLists.txt) = 1409a98380
 SHA1 (patch-client_CMakeLists.txt) = 990d6df52380981f11a4ac5aafe48f34a3b2097f
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
-SHA1 (patch-cmake_boost.cmake) = cab30ebdff1e773d6970f541f96fce8ed51257f8
+SHA1 (patch-cmake_boost.cmake) = ecf03b396c57c69e0d251497e7217e47632613c2
 SHA1 (patch-cmake_build__configurations_mysql__release.cmake) = 7a1fb8c686f187db8fd9d8ad203c1f764d6e55a6
 SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320
 SHA1 (patch-cmake_plugin.cmake) = 4480438969e297f67890b1974a86fb88a23d28ed

Index: pkgsrc/databases/mysql57-client/patches/patch-cmake_boost.cmake
diff -u pkgsrc/databases/mysql57-client/patches/patch-cmake_boost.cmake:1.10 pkgsrc/databases/mysql57-client/patches/patch-cmake_boost.cmake:1.11
--- pkgsrc/databases/mysql57-client/patches/patch-cmake_boost.cmake:1.10	Thu Dec 13 19:51:45 2018
+++ pkgsrc/databases/mysql57-client/patches/patch-cmake_boost.cmake	Mon Jul  1 10:25:49 2019
@@ -1,49 +1,20 @@
-$NetBSD: patch-cmake_boost.cmake,v 1.10 2018/12/13 19:51:45 adam Exp $
+$NetBSD: patch-cmake_boost.cmake,v 1.11 2019/07/01 10:25:49 adam Exp $
 
-Fix to use a newer version of Boost.
+Allow newer Boost.
 
---- cmake/boost.cmake.orig	2017-06-22 14:13:19.000000000 +0000
+--- cmake/boost.cmake.orig	2019-04-13 13:32:15.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.69.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.
-@@ -31,10 +31,10 @@
- # we assume that the correct version (see below)
- # is installed on the compile host in the standard location.
- 
--SET(BOOST_PACKAGE_NAME "boost_1_59_0")
-+SET(BOOST_PACKAGE_NAME "boost_1_69_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.69.0/${BOOST_TARBALL}"
-   )
- 
- SET(OLD_PACKAGE_NAMES "boost_1_55_0 boost_1_56_0 boost_1_57_0 boost_1_58_0")
-@@ -244,7 +244,7 @@ ENDIF()
- # //  BOOST_VERSION % 100 is the patch level
- # //  BOOST_VERSION / 100 % 1000 is the minor version
- # //  BOOST_VERSION / 100000 is the major version
--# #define BOOST_VERSION 105900
-+# #define BOOST_VERSION 106900
- FILE(STRINGS "${BOOST_INCLUDE_DIR}/boost/version.hpp"
-   BOOST_VERSION_NUMBER
-   REGEX "^#define[\t ]+BOOST_VERSION[\t ][0-9]+.*"
-@@ -262,9 +262,9 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10)
+@@ -262,12 +262,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10)
    COULD_NOT_FIND_BOOST()
  ENDIF()
  
 -IF(NOT BOOST_MINOR_VERSION EQUAL 59)
-+IF(NOT BOOST_MINOR_VERSION EQUAL 69)
-   MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
+-  MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
 -    "we need 59"
-+    "we need 69"
-     )
-   COULD_NOT_FIND_BOOST()
- ENDIF()
+-    )
+-  COULD_NOT_FIND_BOOST()
+-ENDIF()
++
+ 
+ MESSAGE(STATUS "BOOST_INCLUDE_DIR ${BOOST_INCLUDE_DIR}")
+ 


--_----------=_1561976749198950--