Date: Sun, 27 Dec 2015 13:34:48 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404567 - in head/databases/mysql57-client: . files Message-ID: <201512271334.tBRDYm3g058159@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Sun Dec 27 13:34:48 2015 New Revision: 404567 URL: https://svnweb.freebsd.org/changeset/ports/404567 Log: - Restore backwards compatibility PR: 205433 Modified: head/databases/mysql57-client/files/patch-scripts_CMakeLists.txt head/databases/mysql57-client/pkg-plist Modified: head/databases/mysql57-client/files/patch-scripts_CMakeLists.txt ============================================================================== --- head/databases/mysql57-client/files/patch-scripts_CMakeLists.txt Sun Dec 27 13:15:00 2015 (r404566) +++ head/databases/mysql57-client/files/patch-scripts_CMakeLists.txt Sun Dec 27 13:34:48 2015 (r404567) @@ -24,23 +24,15 @@ IF(UNIX) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" ) -@@ -152,6 +155,7 @@ IF(UNIX) +@@ -150,6 +153,7 @@ IF(UNIX) + COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution + ) ENDIF() ++ENDIF() IF(NOT WITHOUT_SERVER) -+IF(FALSE) INSTALL(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql - ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql -@@ -282,6 +286,7 @@ SET(HOSTNAME "hostname") - SET(MYSQLD_USER "mysql") - - ENDIF(UNIX) -+ENDIF() - - SET(bindir ${prefix}/${INSTALL_BINDIR}) - SET(sbindir ${prefix}/${INSTALL_SBINDIR}) -@@ -347,6 +352,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) +@@ -347,6 +351,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) @@ -49,40 +41,24 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -433,14 +440,10 @@ ELSE() - IF(WITH_SYSTEMD) - SET(BIN_SCRIPTS - mysql_config +@@ -430,19 +436,7 @@ ELSE() + # On Unix, most of the files end up in the bin directory + SET(mysql_config_COMPONENT COMPONENT Development) + +- IF(WITH_SYSTEMD) +- SET(BIN_SCRIPTS +- mysql_config - mysqldumpslow - ) - ELSE() - SET(BIN_SCRIPTS - mysql_config +- ) +- ELSE() +- SET(BIN_SCRIPTS +- mysql_config - mysqldumpslow - mysqld_multi - mysqld_safe - ) - ENDIF() - -@@ -510,11 +513,13 @@ ELSE() - CONFIGURE_FILE(systemd/mysqld.tmpfiles.d.in - ${CMAKE_CURRENT_BINARY_DIR}/mysql.conf ESCAPE_QUOTES @ONLY) - -+IF(FALSE) - INSTALL_SCRIPT( - ${CMAKE_CURRENT_BINARY_DIR}/mysqld_pre_systemd - DESTINATION ${INSTALL_BINDIR} - COMPONENT Server - ) -+ENDIF() - - IF(INSTALL_LAYOUT MATCHES "STANDALONE") - SET(SYSTEMD_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/") -@@ -532,6 +537,7 @@ ELSE() - ) - ENDIF() - ENDIF() -+ENDIF() +- ) +- ENDIF() ++ SET(BIN_SCRIPTS mysql_config) - # Install libgcc as mylibgcc.a - IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static") + SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc) + STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}") Modified: head/databases/mysql57-client/pkg-plist ============================================================================== --- head/databases/mysql57-client/pkg-plist Sun Dec 27 13:15:00 2015 (r404566) +++ head/databases/mysql57-client/pkg-plist Sun Dec 27 13:34:48 2015 (r404567) @@ -1,4 +1,5 @@ bin/mysql +bin/mysql_config bin/mysql_config_editor bin/mysql_ssl_rsa_setup bin/mysqladmin @@ -115,6 +116,7 @@ lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.20 lib/mysql/libmysqlservices.a +libdata/pkgconfig/mysqlclient.pc man/man1/comp_err.1.gz man/man1/mysql.1.gz man/man1/mysql_config.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512271334.tBRDYm3g058159>