Date: Mon, 24 Mar 2014 20:17:52 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349060 - in head/databases: percona56-client percona56-client/files percona56-server percona56-server/files Message-ID: <201403242017.s2OKHqF0075086@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Mon Mar 24 20:17:52 2014 New Revision: 349060 URL: http://svnweb.freebsd.org/changeset/ports/349060 QAT: https://qat.redports.org/buildarchive/r349060/ Log: - Update to 5.6.16-64.1 - Also pass --defaults-extra-file to mysql_install_db [1] Submitted by: Daniel Ylitalo <daniel@203core.se> Modified: head/databases/percona56-client/Makefile head/databases/percona56-client/files/patch-client_CMakeLists.txt head/databases/percona56-client/pkg-plist head/databases/percona56-server/Makefile head/databases/percona56-server/distinfo head/databases/percona56-server/files/mysql-server.in head/databases/percona56-server/files/patch-client_CMakeLists.txt head/databases/percona56-server/files/patch-libmysql_CMakeLists.txt Modified: head/databases/percona56-client/Makefile ============================================================================== --- head/databases/percona56-client/Makefile Mon Mar 24 20:16:31 2014 (r349059) +++ head/databases/percona56-client/Makefile Mon Mar 24 20:17:52 2014 (r349060) @@ -24,4 +24,12 @@ MANPAGES= comp_err.1 msql2mysql.1 mysql. CLIENT_ONLY= yes +# Percona renamed the libraries, until we decide how to deal with it create some symlinks +# to prevent breaking installed ports. +post-install: + ${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so + ${LN} -s libperconaserverclient.so.18 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.18 + ${LN} -s libperconaserverclient_r.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so + ${LN} -s libperconaserverclient_r.so.18 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.18 + .include "${MASTERDIR}/Makefile" Modified: head/databases/percona56-client/files/patch-client_CMakeLists.txt ============================================================================== --- head/databases/percona56-client/files/patch-client_CMakeLists.txt Mon Mar 24 20:16:31 2014 (r349059) +++ head/databases/percona56-client/files/patch-client_CMakeLists.txt Mon Mar 24 20:17:52 2014 (r349060) @@ -1,38 +1,38 @@ ---- client/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ client/CMakeLists.txt 2013-02-13 10:36:50.000000000 +0100 -@@ -39,9 +39,11 @@ - TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) +--- client/CMakeLists.txt.orig 2014-03-15 18:08:38.000000000 +0100 ++++ client/CMakeLists.txt 2014-03-22 19:41:40.272474641 +0100 +@@ -37,9 +37,11 @@ + TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) + TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex) +ENDIF() MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) -@@ -53,15 +55,19 @@ +@@ -51,15 +53,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) + TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) + TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient) ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) +ENDIF() MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) + TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) + TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient) +ENDIF() - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -82,8 +88,6 @@ + MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc + ../sql/rpl_filter.cc ../sql/sql_list.cc) +@@ -81,8 +87,6 @@ ENDIF(WIN32) SET_TARGET_PROPERTIES ( Modified: head/databases/percona56-client/pkg-plist ============================================================================== --- head/databases/percona56-client/pkg-plist Mon Mar 24 20:16:31 2014 (r349059) +++ head/databases/percona56-client/pkg-plist Mon Mar 24 20:17:52 2014 (r349060) @@ -85,12 +85,16 @@ include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h include/mysql/typelib.h -lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.18 -lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.18 +lib/mysql/libperconaserverclient.a +lib/mysql/libperconaserverclient.so +lib/mysql/libperconaserverclient.so.18 +lib/mysql/libperconaserverclient_r.a +lib/mysql/libperconaserverclient_r.so +lib/mysql/libperconaserverclient_r.so.18 lib/mysql/libmysqlservices.a man/man1/comp_err.1.gz man/man1/msql2mysql.1.gz Modified: head/databases/percona56-server/Makefile ============================================================================== --- head/databases/percona56-server/Makefile Mon Mar 24 20:16:31 2014 (r349059) +++ head/databases/percona56-server/Makefile Mon Mar 24 20:17:52 2014 (r349060) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.6.15-rel63.0 +DISTVERSION= 5.6.16-64.1 PORTREVISION?= 0 CATEGORIES= databases ipv6 -MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/${DISTNAME}/source/ +MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/ PKGNAMESUFFIX?= 56-server -DISTNAME= Percona-Server-5.6.15-rel63.0 +DISTNAME= percona-server-5.6.16-64.1 MAINTAINER= flo@FreeBSD.org COMMENT?= Multithreaded SQL database (server) Modified: head/databases/percona56-server/distinfo ============================================================================== --- head/databases/percona56-server/distinfo Mon Mar 24 20:16:31 2014 (r349059) +++ head/databases/percona56-server/distinfo Mon Mar 24 20:17:52 2014 (r349060) @@ -1,2 +1,2 @@ -SHA256 (Percona-Server-5.6.15-rel63.0.tar.gz) = 0d433310c374025e4aae05038b1542a5c90b35d01842c5b9718dcc0ed66ea0cc -SIZE (Percona-Server-5.6.15-rel63.0.tar.gz) = 33371236 +SHA256 (percona-server-5.6.16-64.1.tar.gz) = 63676705126aeb7898ed48c4110230547eb093060a32d7b089246b293d18a4e8 +SIZE (percona-server-5.6.16-64.1.tar.gz) = 34451178 Modified: head/databases/percona56-server/files/mysql-server.in ============================================================================== --- head/databases/percona56-server/files/mysql-server.in Mon Mar 24 20:16:31 2014 (r349059) +++ head/databases/percona56-server/files/mysql-server.in Mon Mar 24 20:17:52 2014 (r349060) @@ -46,7 +46,7 @@ procname="%%PREFIX%%/libexec/mysqld" start_precmd="${name}_prestart" start_postcmd="${name}_poststart" mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force" +mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --defaults-extra-file=${mysql_optfile} --force" mysql_create_auth_tables() { Modified: head/databases/percona56-server/files/patch-client_CMakeLists.txt ============================================================================== --- head/databases/percona56-server/files/patch-client_CMakeLists.txt Mon Mar 24 20:16:31 2014 (r349059) +++ head/databases/percona56-server/files/patch-client_CMakeLists.txt Mon Mar 24 20:17:52 2014 (r349060) @@ -1,12 +1,12 @@ ---- client/CMakeLists.txt.orig 2013-06-26 22:38:20.000000000 +0200 -+++ client/CMakeLists.txt 2013-06-28 18:54:21.482641124 +0200 +--- client/CMakeLists.txt.orig 2014-03-15 18:08:38.000000000 +0100 ++++ client/CMakeLists.txt 2014-03-22 21:07:36.536119132 +0100 @@ -31,17 +31,20 @@ COPY_OPENSSL_DLLS(copy_openssl_client) ADD_DEFINITIONS(${SSL_DEFINES}) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) - TARGET_LINK_LIBRARIES(mysql mysqlclient) + TARGET_LINK_LIBRARIES(mysql perconaserverclient) IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) @@ -14,44 +14,44 @@ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) + TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) - TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) + TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient) @@ -50,17 +53,21 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) + TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) + TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient) ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) + TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) + TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient) +IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc) - TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) - -@@ -73,6 +80,7 @@ + MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc + ../sql/rpl_filter.cc ../sql/sql_list.cc) + TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient) +@@ -74,6 +81,7 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) - TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) + TARGET_LINK_LIBRARIES(mysql_config_editor perconaserverclient) +ENDIF() # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) -@@ -82,11 +90,6 @@ +@@ -83,11 +91,6 @@ SET_TARGET_PROPERTIES ( mysql_plugin mysql_upgrade Modified: head/databases/percona56-server/files/patch-libmysql_CMakeLists.txt ============================================================================== --- head/databases/percona56-server/files/patch-libmysql_CMakeLists.txt Mon Mar 24 20:16:31 2014 (r349059) +++ head/databases/percona56-server/files/patch-libmysql_CMakeLists.txt Mon Mar 24 20:17:52 2014 (r349060) @@ -1,15 +1,15 @@ ---- libmysql/CMakeLists.txt.orig 2013-08-29 06:17:11.000000000 +0200 -+++ libmysql/CMakeLists.txt 2013-08-30 13:32:02.595259466 +0200 -@@ -173,7 +173,7 @@ +--- libmysql/CMakeLists.txt.orig 2014-03-15 18:08:38.000000000 +0100 ++++ libmysql/CMakeLists.txt 2014-03-22 19:48:26.793800547 +0100 +@@ -180,7 +180,7 @@ ENDIF() - # Merge several convenience libraries into one big mysqlclient --MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) -+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) + # Merge several convenience libraries into one big perconaserverclient +-MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development) ++MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development NOINSTALL) # Visual Studio users need debug static library for debug projects - IF(MSVC) -@@ -186,6 +186,7 @@ + INSTALL_DEBUG_SYMBOLS(clientlib) +@@ -195,6 +195,7 @@ SET(${out_name} ${name}) ENDMACRO() @@ -17,14 +17,14 @@ IF(UNIX) MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) SET(DOT_VERSION ".${VERSION}") -@@ -206,13 +207,15 @@ - ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a +@@ -215,13 +216,15 @@ + ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a ${INSTALL_LIBDIR} Development) ENDIF() +ENDIF() IF(NOT DISABLE_SHARED) - # Merge several convenience libraries into one big mysqlclient + # Merge several convenience libraries into one big perconaserverclient # and link them together into shared library. MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} @@ -34,7 +34,7 @@ IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -272,3 +275,4 @@ +@@ -281,3 +284,4 @@ ENDFOREACH() ENDIF() ENDIF()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403242017.s2OKHqF0075086>