- Update to 5.5.36-34.1

- Also pass --defaults-extra-file to mysql_install_db [1]

Submitted by:	Daniel Ylitalo <daniel@203core.se>

4 files changed, 26 insertions, 13 deletions

diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index 2638a24c5c6a..ba96157ec754 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -23,4 +23,12 @@ MANPAGES=	comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
 
 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"
diff --git a/databases/percona55-client/files/patch-CMakeLists.txt b/databases/percona55-client/files/patch-CMakeLists.txt
index 2fab8152273e..d677a2c75ac8 100644
--- a/databases/percona55-client/files/patch-CMakeLists.txt
+++ b/databases/percona55-client/files/patch-CMakeLists.txt
@@ -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)
diff --git a/databases/percona55-client/files/patch-client_CMakeLists.txt b/databases/percona55-client/files/patch-client_CMakeLists.txt
index 23a951a0e7ad..22287ab39b24 100644
--- a/databases/percona55-client/files/patch-client_CMakeLists.txt
+++ b/databases/percona55-client/files/patch-client_CMakeLists.txt
@@ -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)
  
diff --git a/databases/percona55-client/pkg-plist b/databases/percona55-client/pkg-plist
index 48f1952005ff..b1a56a9b0cbf 100644
--- a/databases/percona55-client/pkg-plist
+++ b/databases/percona55-client/pkg-plist
@@ -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