aboutsummaryrefslogtreecommitdiff
path: root/databases/mysql57-server
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mysql57-server')
-rw-r--r--databases/mysql57-server/Makefile4
-rw-r--r--databases/mysql57-server/distinfo6
-rw-r--r--databases/mysql57-server/files/patch-CMakeLists.txt20
-rw-r--r--databases/mysql57-server/files/patch-sql_CMakeLists.txt10
4 files changed, 20 insertions, 20 deletions
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index 1776659f3414..cce6845e0fb2 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -1,8 +1,8 @@
# Created by: Mahdi Mokhtari <mokhi64@gmail.com>
PORTNAME?= mysql
-PORTVERSION= 5.7.34
-PORTREVISION?= 1
+PORTVERSION= 5.7.35
+PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= MYSQL/MySQL-5.7
PKGNAMESUFFIX?= 57-server
diff --git a/databases/mysql57-server/distinfo b/databases/mysql57-server/distinfo
index 1eab4b5543c1..16aa72c286a0 100644
--- a/databases/mysql57-server/distinfo
+++ b/databases/mysql57-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621509617
-SHA256 (mysql-boost-5.7.34.tar.gz) = 5bc2c7c0bb944b5bb219480dde3c1caeb049e7351b5bba94c3b00ac207929c7b
-SIZE (mysql-boost-5.7.34.tar.gz) = 52891142
+TIMESTAMP = 1627053937
+SHA256 (mysql-boost-5.7.35.tar.gz) = 6b30c93e5927857e31769bf5356eb23a5cff59c0a0205e5772b51b09bf3f9e12
+SIZE (mysql-boost-5.7.35.tar.gz) = 52959014
diff --git a/databases/mysql57-server/files/patch-CMakeLists.txt b/databases/mysql57-server/files/patch-CMakeLists.txt
index fe05a9c83935..e9f84fa8f474 100644
--- a/databases/mysql57-server/files/patch-CMakeLists.txt
+++ b/databases/mysql57-server/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
-+++ CMakeLists.txt
-@@ -614,12 +614,10 @@ IF(UNIX)
+--- CMakeLists.txt.orig 2021-07-26 19:43:45.021975000 +0200
++++ CMakeLists.txt 2021-07-26 19:49:38.318138000 +0200
+@@ -715,12 +715,10 @@ IF(UNIX)
ENDIF()
IF(NOT WITHOUT_SERVER)
@@ -13,7 +13,7 @@
ENDIF(WITH_EMBEDDED_SERVER)
ENDIF()
-@@ -628,8 +626,6 @@ ENDIF()
+@@ -729,8 +727,6 @@ ENDIF()
ADD_SUBDIRECTORY(scripts)
IF(NOT WITHOUT_SERVER)
@@ -22,19 +22,19 @@
ADD_SUBDIRECTORY(support-files)
IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
ADD_SUBDIRECTORY(internal)
-@@ -684,6 +680,7 @@ ENDIF()
+@@ -789,6 +785,7 @@ ENDIF()
#
# RPM installs documentation directly from the source tree
#
+IF(FALSE)
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
- INSTALL(FILES COPYING LICENSE.mysql
- DESTINATION ${INSTALL_DOCREADMEDIR}
-@@ -706,6 +703,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+ INSTALL(FILES
+ README
+@@ -808,6 +805,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+ PATTERN "mysql.info" EXCLUDE
PATTERN "sp-imp-spec.txt" EXCLUDE
)
- ENDIF()
+ENDIF()
+ ENDIF()
INCLUDE(CPack)
-
diff --git a/databases/mysql57-server/files/patch-sql_CMakeLists.txt b/databases/mysql57-server/files/patch-sql_CMakeLists.txt
index 033958f32efb..e29d4fc10a8e 100644
--- a/databases/mysql57-server/files/patch-sql_CMakeLists.txt
+++ b/databases/mysql57-server/files/patch-sql_CMakeLists.txt
@@ -1,11 +1,11 @@
---- sql/CMakeLists.txt.orig 2016-08-25 11:52:06 UTC
-+++ sql/CMakeLists.txt
-@@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES(
- ${ZLIB_INCLUDE_DIR}
+--- sql/CMakeLists.txt.orig 2021-07-26 19:53:15.028262000 +0200
++++ sql/CMakeLists.txt 2021-07-26 19:55:42.226384000 +0200
+@@ -30,6 +30,8 @@ INCLUDE_DIRECTORIES(
+ ${CMAKE_SOURCE_DIR}/regex
${SSL_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/sql
+ ${CMAKE_BINARY_DIR}/include
+ ${CMAKE_BINARY_DIR}
- ${LZ4_INCLUDE_DIR}
)
+ SET(CONF_SOURCES