diff options
| author | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2017-04-17 14:58:06 +0000 |
|---|---|---|
| committer | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2017-04-17 14:58:06 +0000 |
| commit | efba8f70aacac1bff4c0477d92d71dcb4b1581f3 (patch) | |
| tree | c636837cfc259c7a747eea88aa13be451f0c53ac /databases/mysql57-client | |
| parent | databases/mysql56-{server client}: Update to latest 5.6.36 (diff) | |
databases/mysql57-{server client}: Update to latest 5.7.18 release
Fix some no-longer-valid (but needed) patches.
Reviewed by: feld, mat (mentors)
Approved by: feld (mentor)
Differential Revision: https://reviews.freebsd.org/D10392
Diffstat (limited to 'databases/mysql57-client')
| -rw-r--r-- | databases/mysql57-client/Makefile | 1 | ||||
| -rw-r--r-- | databases/mysql57-client/files/patch-support-files_CMakeLists.txt | 24 |
2 files changed, 7 insertions, 18 deletions
diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile index 6e8c693fe14e..5c6cb4abfeda 100644 --- a/databases/mysql57-client/Makefile +++ b/databases/mysql57-client/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION?= 2 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt b/databases/mysql57-client/files/patch-support-files_CMakeLists.txt index 218a1e701b67..405d4f734914 100644 --- a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt +++ b/databases/mysql57-client/files/patch-support-files_CMakeLists.txt @@ -1,24 +1,14 @@ ---- support-files/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- support-files/CMakeLists.txt.orig 2017-03-18 07:45:14 UTC +++ support-files/CMakeLists.txt -@@ -44,14 +44,17 @@ ELSE() - SET(inst_location ${INSTALL_SUPPORTFILESDIR}) - ENDIF() - -+IF(FALSE) - SET(inifile my-default) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh - ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} - DESTINATION ${inst_location} COMPONENT IniFiles) -+ENDIF() - - IF(UNIX) +@@ -47,6 +47,7 @@ IF(UNIX) + SET (PIDOF "pgrep -d' ' -f") + ENDIF() SET(prefix ${CMAKE_INSTALL_PREFIX}) -+IF(FALSE) ++IF (FALSE) FOREACH(script mysqld_multi.server mysql-log-rotate) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -68,9 +71,11 @@ IF(UNIX) +@@ -59,9 +60,11 @@ IF(UNIX) IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) ENDIF() @@ -30,7 +20,7 @@ SET(bindir ${prefix}/${INSTALL_BINDIR}) SET(sbindir ${prefix}/${INSTALL_SBINDIR}) SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR}) -@@ -83,3 +88,4 @@ IF(UNIX) +@@ -74,3 +77,4 @@ IF(UNIX) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDIF() |