svn commit: r349059 - in head/databases: percona55-client percona55-client/files percona55-server percona55-server/files
Florian Smeets
flo at FreeBSD.org
Mon Mar 24 20:16:34 UTC 2014
Author: flo
Date: Mon Mar 24 20:16:31 2014
New Revision: 349059
URL: http://svnweb.freebsd.org/changeset/ports/349059
QAT: https://qat.redports.org/buildarchive/r349059/
Log:
- Update to 5.5.36-34.1
- Also pass --defaults-extra-file to mysql_install_db [1]
Submitted by: Daniel Ylitalo <daniel at 203core.se>
Modified:
head/databases/percona55-client/Makefile
head/databases/percona55-client/files/patch-CMakeLists.txt
head/databases/percona55-client/files/patch-client_CMakeLists.txt
head/databases/percona55-client/pkg-plist
head/databases/percona55-server/Makefile
head/databases/percona55-server/distinfo
head/databases/percona55-server/files/mysql-server.in
head/databases/percona55-server/files/patch-client_CMakeLists.txt
head/databases/percona55-server/files/patch-libmysql_CMakeLists.txt
Modified: head/databases/percona55-client/Makefile
==============================================================================
--- head/databases/percona55-client/Makefile Mon Mar 24 20:03:27 2014 (r349058)
+++ head/databases/percona55-client/Makefile Mon Mar 24 20:16:31 2014 (r349059)
@@ -23,4 +23,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/percona55-client/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/percona55-client/files/patch-CMakeLists.txt Mon Mar 24 20:03:27 2014 (r349058)
+++ head/databases/percona55-client/files/patch-CMakeLists.txt Mon Mar 24 20:16:31 2014 (r349059)
@@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2013-05-16 17:47:15.000000000 +0200
+++ CMakeLists.txt 2013-06-12 09:22:45.000000000 +0200
-@@ -305,31 +305,11 @@
+@@ -305,32 +305,11 @@
ENDIF()
ADD_SUBDIRECTORY(extra)
@@ -28,6 +28,7 @@
- ADD_SUBDIRECTORY(internal)
- ENDIF()
- ADD_SUBDIRECTORY(packaging/rpm-uln)
+- ADD_SUBDIRECTORY(packaging/rpm-oel)
-ENDIF()
+ADD_SUBDIRECTORY(client)
+ADD_SUBDIRECTORY(libservices)
Modified: head/databases/percona55-client/files/patch-client_CMakeLists.txt
==============================================================================
--- head/databases/percona55-client/files/patch-client_CMakeLists.txt Mon Mar 24 20:03:27 2014 (r349058)
+++ head/databases/percona55-client/files/patch-client_CMakeLists.txt Mon Mar 24 20:16:31 2014 (r349059)
@@ -1,5 +1,5 @@
---- client/CMakeLists.txt.orig 2011-09-09 17:56:40.000000000 +0200
-+++ client/CMakeLists.txt 2011-10-07 11:08:18.000000000 +0200
+--- client/CMakeLists.txt.orig 2014-03-15 18:08:16.000000000 +0100
++++ client/CMakeLists.txt 2014-03-22 19:33:32.505508311 +0100
@@ -33,9 +33,11 @@
TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
ENDIF(UNIX)
@@ -7,32 +7,32 @@
+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)
@@ -47,15 +49,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)
-@@ -72,7 +78,7 @@
+ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
+ ../sql/rpl_filter.cc ../sql/sql_list.cc)
+@@ -73,7 +79,7 @@
MYSQL_ADD_EXECUTABLE(echo echo.c)
ENDIF(WIN32)
Modified: head/databases/percona55-client/pkg-plist
==============================================================================
--- head/databases/percona55-client/pkg-plist Mon Mar 24 20:03:27 2014 (r349058)
+++ head/databases/percona55-client/pkg-plist Mon Mar 24 20:16:31 2014 (r349059)
@@ -61,12 +61,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/percona55-server/Makefile
==============================================================================
--- head/databases/percona55-server/Makefile Mon Mar 24 20:03:27 2014 (r349058)
+++ head/databases/percona55-server/Makefile Mon Mar 24 20:16:31 2014 (r349059)
@@ -1,12 +1,12 @@
# $FreeBSD$
PORTNAME?= percona
-DISTVERSION= 5.5.35-33.0
+DISTVERSION= 5.5.36-34.1
PORTREVISION?= 0
CATEGORIES= databases ipv6
-MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/${DISTNAME}/source/
+MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${DISTVERSION}/source/tarball/
PKGNAMESUFFIX?= 55-server
-DISTNAME= Percona-Server-5.5.35-rel33.0
+DISTNAME= percona-server-5.5.36-34.1
MAINTAINER= flo at FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
Modified: head/databases/percona55-server/distinfo
==============================================================================
--- head/databases/percona55-server/distinfo Mon Mar 24 20:03:27 2014 (r349058)
+++ head/databases/percona55-server/distinfo Mon Mar 24 20:16:31 2014 (r349059)
@@ -1,2 +1,2 @@
-SHA256 (Percona-Server-5.5.35-rel33.0.tar.gz) = ffa9335fc6ee204b13c5d6ebe32709f2b5bc930665e8000db1864555a02049b8
-SIZE (Percona-Server-5.5.35-rel33.0.tar.gz) = 22465700
+SHA256 (percona-server-5.5.36-34.1.tar.gz) = 623821c379df5d5bb70223a4bbecac149531edca6e5a91aff939f87b466d422e
+SIZE (percona-server-5.5.36-34.1.tar.gz) = 24207160
Modified: head/databases/percona55-server/files/mysql-server.in
==============================================================================
--- head/databases/percona55-server/files/mysql-server.in Mon Mar 24 20:03:27 2014 (r349058)
+++ head/databases/percona55-server/files/mysql-server.in Mon Mar 24 20:16:31 2014 (r349059)
@@ -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/percona55-server/files/patch-client_CMakeLists.txt
==============================================================================
--- head/databases/percona55-server/files/patch-client_CMakeLists.txt Mon Mar 24 20:03:27 2014 (r349058)
+++ head/databases/percona55-server/files/patch-client_CMakeLists.txt Mon Mar 24 20:16:31 2014 (r349059)
@@ -1,12 +1,12 @@
---- client/CMakeLists.txt.orig 2013-01-07 07:29:49.000000000 +0100
-+++ client/CMakeLists.txt 2013-01-10 23:56:53.794287046 +0100
+--- client/CMakeLists.txt.orig 2014-03-15 18:08:16.000000000 +0100
++++ client/CMakeLists.txt 2014-03-22 21:03:06.194178397 +0100
@@ -27,17 +27,20 @@
ADD_DEFINITIONS(${READLINE_DEFINES})
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 ${READLINE_LIBRARY})
ENDIF(UNIX)
@@ -14,39 +14,39 @@
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)
@@ -46,17 +49,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)
-
-@@ -66,13 +73,14 @@
+ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
+ ../sql/rpl_filter.cc ../sql/sql_list.cc)
+ TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient)
+@@ -67,13 +74,14 @@
MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
+ TARGET_LINK_LIBRARIES(mysqlslap perconaserverclient)
+ENDIF()
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
Modified: head/databases/percona55-server/files/patch-libmysql_CMakeLists.txt
==============================================================================
--- head/databases/percona55-server/files/patch-libmysql_CMakeLists.txt Mon Mar 24 20:03:27 2014 (r349058)
+++ head/databases/percona55-server/files/patch-libmysql_CMakeLists.txt Mon Mar 24 20:16:31 2014 (r349059)
@@ -1,11 +1,11 @@
---- libmysql/CMakeLists.txt.orig 2014-01-19 11:47:44.423382348 -0500
-+++ libmysql/CMakeLists.txt 2014-01-19 12:08:16.021297429 -0500
+--- libmysql/CMakeLists.txt.orig 2014-03-15 18:08:16.000000000 +0100
++++ libmysql/CMakeLists.txt 2014-03-22 19:37:32.145100925 +0100
@@ -165,7 +165,7 @@
- # 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(mysqlclient STATIC ${LIBS} COMPONENT Development)
-+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
+-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
INSTALL_DEBUG_SYMBOLS(clientlib)
@@ -19,7 +19,7 @@
SET(DOT_VERSION ".${VERSION}")
@@ -188,9 +189,11 @@
ENDMACRO()
- INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
+ INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a perconaserverclient ${INSTALL_LIBDIR} Development)
ENDIF()
+ENDIF()
More information about the svn-ports-head
mailing list