[pkgsrc/trunk]: pkgsrc/databases/mysql55-client Use uniform shared library na...

[asau <asau%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/24a4fa2db22f
branches:  trunk
changeset: 627801:24a4fa2db22f
user:      asau <asau%pkgsrc.org@localhost>
date:      Sun Dec 15 18:45:18 2013 +0000

description:
Use uniform shared library names to avoid packaging list divergence.
This fixes package (and some its dependents) on FreeBSD at least.

diffstat:

 databases/mysql55-client/distinfo                              |   3 +-
 databases/mysql55-client/patches/patch-libmysql_CMakeLists.txt |  26 ++++++++++
 2 files changed, 28 insertions(+), 1 deletions(-)

diffs (47 lines):

diff -r ea239644c4da -r 24a4fa2db22f databases/mysql55-client/distinfo
--- a/databases/mysql55-client/distinfo Sun Dec 15 18:35:41 2013 +0000
+++ b/databases/mysql55-client/distinfo Sun Dec 15 18:45:18 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2013/12/03 15:40:19 adam Exp $
+$NetBSD: distinfo,v 1.29 2013/12/15 18:45:18 asau Exp $
 
 SHA1 (mysql-5.5.35.tar.gz) = ede7015b698bef5ede4c59a7a9d428b2a679ac77
 RMD160 (mysql-5.5.35.tar.gz) = 5bdd8fdeaaefe3c60bc5fc16daf6e19c8b8ca7a4
@@ -16,6 +16,7 @@
 SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af
 SHA1 (patch-include_my_pthread.h) = 109d376b4cf5b64c5243f9e91300667441131f86
 SHA1 (patch-include_myisam.h) = 475070d41b06c04c6ae692743fc1b0244afe0a88
+SHA1 (patch-libmysql_CMakeLists.txt) = 83deca6faca4116a088db87bf359524e3e6cd3ff
 SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892
 SHA1 (patch-mysys_stacktrace.c) = 294b043984f740b99ba25abc8256ce8ad54d84c3
 SHA1 (patch-scripts_CMakeLists.txt) = 17ec1d8d5f0c9e453c64f2b59e757e645a3a1a59
diff -r ea239644c4da -r 24a4fa2db22f databases/mysql55-client/patches/patch-libmysql_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql55-client/patches/patch-libmysql_CMakeLists.txt    Sun Dec 15 18:45:18 2013 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-libmysql_CMakeLists.txt,v 1.1 2013/12/15 18:45:19 asau Exp $
+
+Use uniform shared library names to avoid packaging list divergence.
+
+--- libmysql/CMakeLists.txt.orig       2013-11-05 07:19:26.000000000 +0000
++++ libmysql/CMakeLists.txt    2013-12-15 17:49:19.435504292 +0000
+@@ -193,13 +193,13 @@
+   MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries)
+   IF(UNIX)
+     # libtool compatability
+-    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
+-      SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
+-    ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
+-      SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0")
+-    ELSE()
++#    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
++#      SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
++#    ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
++#      SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0")
++#    ELSE()
+       SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0")
+-    ENDIF()
++#    ENDIF()
+     # Name of shared library is mysqlclient on Unix
+     SET_TARGET_PROPERTIES(libmysql PROPERTIES 
+       OUTPUT_NAME mysqlclient