From owner-svn-ports-all@freebsd.org Sun Dec 27 13:34:50 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DABB8A4C8DF; Sun, 27 Dec 2015 13:34:49 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B3DCF1DED; Sun, 27 Dec 2015 13:34:49 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBRDYmsr058161; Sun, 27 Dec 2015 13:34:48 GMT (envelope-from miwi@FreeBSD.org) Received: (from miwi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBRDYm3g058159; Sun, 27 Dec 2015 13:34:48 GMT (envelope-from miwi@FreeBSD.org) Message-Id: <201512271334.tBRDYm3g058159@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: miwi set sender to miwi@FreeBSD.org using -f From: Martin Wilke Date: Sun, 27 Dec 2015 13:34:48 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Dec 2015 13:34:50 -0000 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