summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/mysql57-client/Makefile3
-rw-r--r--databases/mysql57-client/Makefile.common4
-rw-r--r--databases/mysql57-client/PLIST4
-rw-r--r--databases/mysql57-client/distinfo12
-rw-r--r--databases/mysql57-client/patches/patch-cmake_boost.cmake18
-rw-r--r--databases/mysql57-server/Makefile3
-rw-r--r--databases/mysql57-server/PLIST6
7 files changed, 24 insertions, 26 deletions
diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
index 871e6916108..3ae30eea778 100644
--- a/databases/mysql57-client/Makefile
+++ b/databases/mysql57-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2016/10/07 18:25:41 adam Exp $
+# $NetBSD: Makefile,v 1.3 2016/10/14 19:28:28 adam Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
-PKGREVISION= 1
COMMENT= MySQL 5, a free SQL database (client)
CONFLICTS= mysql3-client-[0-9]*
diff --git a/databases/mysql57-client/Makefile.common b/databases/mysql57-client/Makefile.common
index 526b25f7b10..36223478960 100644
--- a/databases/mysql57-client/Makefile.common
+++ b/databases/mysql57-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.1 2016/09/16 06:49:11 adam Exp $
+# $NetBSD: Makefile.common,v 1.2 2016/10/14 19:28:28 adam Exp $
#
# used by databases/mysql57-client/Makefile
# used by databases/mysql57-server/Makefile
-DISTNAME= mysql-5.7.15
+DISTNAME= mysql-5.7.16
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.7/}
diff --git a/databases/mysql57-client/PLIST b/databases/mysql57-client/PLIST
index f1980f44e0e..2ad9d02a9ea 100644
--- a/databases/mysql57-client/PLIST
+++ b/databases/mysql57-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/09/16 06:49:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/10/14 19:28:28 adam Exp $
bin/mysql
bin/mysql_client_test
bin/mysql_config
@@ -122,7 +122,7 @@ include/mysql/typelib.h
lib/libmysqlclient.a
lib/libmysqlclient.so
lib/libmysqlclient.so.20
-lib/libmysqlclient.so.20.3.2
+lib/libmysqlclient.so.20.3.3
lib/pkgconfig/mysqlclient.pc
man/man1/comp_err.1
man/man1/innochecksum.1
diff --git a/databases/mysql57-client/distinfo b/databases/mysql57-client/distinfo
index b6d933c5c0a..1ff70e7c397 100644
--- a/databases/mysql57-client/distinfo
+++ b/databases/mysql57-client/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.2 2016/09/27 09:01:59 fhajny Exp $
+$NetBSD: distinfo,v 1.3 2016/10/14 19:28:28 adam Exp $
-SHA1 (mysql-5.7.15.tar.gz) = ea4f79fea576f373560ec88b42121b4522be3d58
-RMD160 (mysql-5.7.15.tar.gz) = 02a01866339764018ae40f0109dbf1e2fafb8ab3
-SHA512 (mysql-5.7.15.tar.gz) = e1b55a068953ed8b6f3bce58d0a681d58dbbf2bc37d50b62aa668d6a0e239835c9f62e7aad60e734bac346558f81a46bc3c95cc0b7555adc7211a47c8daf3cec
-Size (mysql-5.7.15.tar.gz) = 50539618 bytes
+SHA1 (mysql-5.7.16.tar.gz) = 438ce81b85f45f8f724b5f820557a8f0a0bd34bb
+RMD160 (mysql-5.7.16.tar.gz) = 3fcda13b2d321d6975d0fa201c3314791f014aa1
+SHA512 (mysql-5.7.16.tar.gz) = 66a9a41a3813de2099d7eee45d170d79944e79e49782f852d6f3b9c6e22be912520c0ae430dea2c8f38e8ca657052903d5f5b2227485feda6cf8f2b1580b3d07
+Size (mysql-5.7.16.tar.gz) = 50509574 bytes
SHA1 (patch-CMakeLists.txt) = b47592cf8801538375da3df2990fde4d292fc365
SHA1 (patch-client_CMakeLists.txt) = 304023577ab9c2152ca21fa9ff4895a22a321adf
SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
-SHA1 (patch-cmake_boost.cmake) = 2c70f8e08e5a8e663eed53d3208a6b590c7e8d2d
+SHA1 (patch-cmake_boost.cmake) = c6c280bc037280de58a7515e7d02c47be2698f4b
SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
SHA1 (patch-cmake_plugin.cmake) = 29db9f49941a011176a6cdd46f3af6c5636afb4a
SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
diff --git a/databases/mysql57-client/patches/patch-cmake_boost.cmake b/databases/mysql57-client/patches/patch-cmake_boost.cmake
index 5ccf94af0e2..ca02ddb7ca1 100644
--- a/databases/mysql57-client/patches/patch-cmake_boost.cmake
+++ b/databases/mysql57-client/patches/patch-cmake_boost.cmake
@@ -1,4 +1,4 @@
-$NetBSD: patch-cmake_boost.cmake,v 1.1 2016/09/16 06:49:11 adam Exp $
+$NetBSD: patch-cmake_boost.cmake,v 1.2 2016/10/14 19:28:28 adam Exp $
Fix to use a newer version of Boost.
@@ -9,7 +9,7 @@ Fix to use a newer version of Boost.
# 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.61.0 in order to build our boost/geometry code.
++# We want boost 1.62.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_61_0")
++SET(BOOST_PACKAGE_NAME "boost_1_62_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.61.0/${BOOST_TARBALL}"
++ "http://sourceforge.net/projects/boost/files/boost/1.62.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 106100
++# #define BOOST_VERSION 106200
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 61)
++IF(NOT BOOST_MINOR_VERSION EQUAL 62)
MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
- "we need 59"
-+ "we need 61"
++ "we need 62"
)
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_61_0/patches")
++SET(BOOST_PATCHES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_62_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_61_0")
++SET(BOOST_SOURCES_DIR "${CMAKE_SOURCE_DIR}/include/boost_1_62_0")
# Bug in sqrt(NaN) on 32bit platforms
IF(SIZEOF_VOIDP EQUAL 4)
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index 5ed07497f52..c26f3900653 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2016/10/07 18:25:41 adam Exp $
+# $NetBSD: Makefile,v 1.3 2016/10/14 19:28:28 adam Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
-PKGREVISION= 1
COMMENT= MySQL 5, a free SQL database (server)
CONFLICTS= mysql3-server-[0-9]*
diff --git a/databases/mysql57-server/PLIST b/databases/mysql57-server/PLIST
index d90c134c07b..9e42551bbc4 100644
--- a/databases/mysql57-server/PLIST
+++ b/databases/mysql57-server/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2016/09/16 06:49:12 adam Exp $
-bin/lz4_decompress
+@comment $NetBSD: PLIST,v 1.2 2016/10/14 19:28:28 adam Exp $
bin/innochecksum
+bin/lz4_decompress
bin/my_print_defaults
bin/myisam_ftdump
bin/myisamchk
@@ -25,8 +25,8 @@ bin/resolve_stack_dump
bin/resolveip
bin/zlib_decompress
include/mysql/mysqlx_error.h
-${PLIST.embedded}lib/libmysqld.a
include/mysql/mysqlx_version.h
+${PLIST.embedded}lib/libmysqld.a
lib/libmysqlservices.a
lib/mysql/plugin/adt_null.so
lib/mysql/plugin/auth.so