Remove any attempts to create a libmysqlclient not linked to a threading library.

Restore previous libraries location.
These two changes should fix most of the reported errors.

Feature safe:	yes

5 files changed, 20 insertions, 44 deletions

diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 0801fcee7ca6..fb471d1dea78 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -22,7 +22,7 @@ CONFLICTS_INSTALL=	mysql-client-[34].* mysql-client-5.[0-46-9].*
 
 CMAKE_ARGS=	-DWITHOUT_SERVER=1
 
-USE_LDCONFIG=	yes
+USE_LDCONFIG=	${PREFIX}/lib/mysql
 
 MAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
 		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
diff --git a/databases/mysql55-client/files/patch-configure.cmake b/databases/mysql55-client/files/patch-configure.cmake
deleted file mode 100644
index 2bac6ffc2068..000000000000
--- a/databases/mysql55-client/files/patch-configure.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.cmake.orig	2010-12-24 10:05:05.000000000 +0100
-+++ configure.cmake	2010-12-24 10:06:21.000000000 +0100
-@@ -144,7 +144,6 @@
-   IF(NOT LIBRT)
-     MY_SEARCH_LIBS(clock_gettime rt LIBRT)
-   ENDIF()
--  FIND_PACKAGE(Threads)
- 
-   SET(CMAKE_REQUIRED_LIBRARIES 
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
-@@ -265,9 +264,6 @@
-   CHECK_INCLUDE_FILES (sys/ptem.h HAVE_SYS_PTEM_H)
- ENDIF()
- 
--# Figure out threading library
--#
--FIND_PACKAGE (Threads)
- 
- #
- # Tests for functions
diff --git a/databases/mysql55-client/files/patch-include_my_pthread.h b/databases/mysql55-client/files/patch-include_my_pthread.h
deleted file mode 100644
index bcca323e3931..000000000000
--- a/databases/mysql55-client/files/patch-include_my_pthread.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/my_pthread.h.orig	2011-01-09 10:17:18.000000000 +0100
-+++ include/my_pthread.h	2011-01-09 12:06:33.000000000 +0100
-@@ -215,7 +215,10 @@
- 
- #define my_pthread_once_t pthread_once_t
- #define MY_PTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
--#define my_pthread_once(C,F) pthread_once(C,F)
-+#define my_pthread_once(C,F) do { \
-+    if (__isthreaded) pthread_once(C,F); \
-+    else if ((C)->state == PTHREAD_NEEDS_INIT) { F(); (C)->state = PTHREAD_DONE_INIT; } \
-+  } while(0)
- 
- /* Test first for RTS or FSU threads */
- 
diff --git a/databases/mysql55-client/files/patch-scripts_CMakeLists.txt b/databases/mysql55-client/files/patch-scripts_CMakeLists.txt
index 4048f800f1d5..4dd4080c4f5f 100644
--- a/databases/mysql55-client/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysql55-client/files/patch-scripts_CMakeLists.txt
@@ -1,5 +1,5 @@
 --- scripts/CMakeLists.txt.orig	2010-12-03 18:58:26.000000000 +0100
-+++ scripts/CMakeLists.txt	2010-12-23 15:03:13.000000000 +0100
++++ scripts/CMakeLists.txt	2011-01-11 20:18:07.000000000 +0100
 @@ -71,6 +71,7 @@
  )
  ENDIF()
@@ -48,7 +48,16 @@
  
  
  SET(prefix "${CMAKE_INSTALL_PREFIX}")
-@@ -318,18 +324,9 @@
+@@ -266,6 +272,8 @@
+           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
+           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
+           SET(${var} "${${var}}-l${lib} " ) 
++        ELSEIF(lib STREQUAL "-pthread")
++          SET(${var} "${${var}}-pthread " ) 
+         ELSE()
+           SET(${var} "${${var}}-l${lib} " ) 
+         ENDIF()
+@@ -318,18 +326,9 @@
    SET(BIN_SCRIPTS
      msql2mysql
      mysql_config
diff --git a/databases/mysql55-client/pkg-plist b/databases/mysql55-client/pkg-plist
index 59448f7ee6fc..9949a27a50e9 100644
--- a/databases/mysql55-client/pkg-plist
+++ b/databases/mysql55-client/pkg-plist
@@ -61,14 +61,15 @@ include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
 include/mysql/typelib.h
-lib/libmysqlclient.a
-lib/libmysqlclient.so
-lib/libmysqlclient.so.16
-lib/libmysqlclient_r.a
-lib/libmysqlclient_r.so
-lib/libmysqlclient_r.so.16
-lib/libmysqlservices.a
+lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.16
+lib/mysql/libmysqlclient_r.a
+lib/mysql/libmysqlclient_r.so
+lib/mysql/libmysqlclient_r.so.16
+lib/mysql/libmysqlservices.a
 share/aclocal/mysql.m4
 @dirrm include/mysql/mysql/psi
 @dirrm include/mysql/mysql
 @dirrm include/mysql
+@dirrmtry lib/mysql