5 files changed, 17 insertions, 45 deletions

diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 492274106e41..d1f29e8bb903 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.5.8
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	databases ipv6
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.5
@@ -27,7 +27,7 @@ CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
 		-DINSTALL_INCLUDEDIR="include/mysql" \
 		-DINSTALL_INFODIR="info" \
-		-DINSTALL_LIBDIR="lib" \
+		-DINSTALL_LIBDIR="lib/mysql" \
 		-DINSTALL_MANDIR="man" \
 		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
@@ -37,10 +37,7 @@ CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_SCRIPTDIR="bin" \
 		-DINSTALL_SHAREDIR="share" \
 		-DINSTALL_SQLBENCHDIR="share/mysql" \
-		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-		-DCMAKE_THREAD_LIBS="" \
-		-DCMAKE_USE_PTHREADS=1 \
-		-DCMAKE_EXE_LINKER_FLAGS="${PTHREAD_LIBS}"
+		-DINSTALL_SUPPORTFILESDIR="share/mysql"
 
 .ifdef USE_MYSQL
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
diff --git a/databases/percona55-server/files/patch-configure.cmake b/databases/percona55-server/files/patch-configure.cmake
deleted file mode 100644
index 2bac6ffc2068..000000000000
--- a/databases/percona55-server/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/percona55-server/files/patch-include_my_pthread.h b/databases/percona55-server/files/patch-include_my_pthread.h
deleted file mode 100644
index bcca323e3931..000000000000
--- a/databases/percona55-server/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/percona55-server/files/patch-scripts_CMakeLists.txt b/databases/percona55-server/files/patch-scripts_CMakeLists.txt
index 9c9ce95a8209..c3d2d764e640 100644
--- a/databases/percona55-server/files/patch-scripts_CMakeLists.txt
+++ b/databases/percona55-server/files/patch-scripts_CMakeLists.txt
@@ -1,6 +1,15 @@
---- scripts/CMakeLists.txt.orig	2010-12-23 17:38:12.000000000 +0100
-+++ scripts/CMakeLists.txt	2010-12-23 17:40:29.000000000 +0100
-@@ -316,16 +316,11 @@
+--- scripts/CMakeLists.txt.orig	2010-12-03 18:58:26.000000000 +0100
++++ scripts/CMakeLists.txt	2011-01-11 20:20:02.000000000 +0100
+@@ -266,6 +266,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()
+@@ -316,16 +318,11 @@
    # On Unix, most of the files end up in the bin directory
    SET(mysql_config_COMPONENT COMPONENT Development)
    SET(BIN_SCRIPTS
diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist
index c2cb047a9efe..626357e8d63e 100644
--- a/databases/percona55-server/pkg-plist
+++ b/databases/percona55-server/pkg-plist
@@ -23,6 +23,7 @@ bin/perror
 bin/replace
 bin/resolve_stack_dump
 bin/resolveip
+lib/mysql/libmysqld.a
 lib/mysql/plugin/adt_null.so
 lib/mysql/plugin/auth.so
 lib/mysql/plugin/auth_test_plugin.so
@@ -37,7 +38,6 @@ lib/mysql/plugin/qa_auth_interface.so
 lib/mysql/plugin/qa_auth_server.so
 lib/mysql/plugin/semisync_master.so
 lib/mysql/plugin/semisync_slave.so
-lib/libmysqld.a
 libexec/mysqld
 %%DATADIR%%/binary-configure
 %%DATADIR%%/charsets/Index.xml
@@ -108,7 +108,7 @@ libexec/mysqld
 %%DATADIR%%/swedish/errmsg.sys
 %%DATADIR%%/ukrainian/errmsg.sys
 @dirrm lib/mysql/plugin
-@dirrm lib/mysql
+@dirrmtry lib/mysql
 @dirrm %%DATADIR%%/charsets
 @dirrm %%DATADIR%%/czech
 @dirrm %%DATADIR%%/danish