[Midnightbsd-cvs] mports [17362] trunk/databases/mysql56-client: mysql 5.6.20 client
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Sep 17 08:19:18 EDT 2014
Revision: 17362
http://svnweb.midnightbsd.org/mports/?rev=17362
Author: laffer1
Date: 2014-09-17 08:19:17 -0400 (Wed, 17 Sep 2014)
Log Message:
-----------
mysql 5.6.20 client
Modified Paths:
--------------
trunk/databases/mysql56-client/files/patch-CMakeLists.txt
trunk/databases/mysql56-client/pkg-plist
Added Paths:
-----------
trunk/databases/mysql56-client/files/patch-include-CMakeLists.txt
Removed Paths:
-------------
trunk/databases/mysql56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp
trunk/databases/mysql56-client/files/patch-extra_yassl_taocrypt_src_integer.cpp
Modified: trunk/databases/mysql56-client/files/patch-CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-client/files/patch-CMakeLists.txt 2014-09-17 12:18:05 UTC (rev 17361)
+++ trunk/databases/mysql56-client/files/patch-CMakeLists.txt 2014-09-17 12:19:17 UTC (rev 17362)
@@ -1,45 +1,16 @@
---- CMakeLists.txt.orig 2013-11-17 18:02:53.000000000 +0000
-+++ CMakeLists.txt 2013-12-16 14:43:48.037159232 +0000
-@@ -458,33 +458,11 @@
- ENDIF()
+--- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000
++++ CMakeLists.txt 2014-08-04 13:56:19.445692503 +0000
+@@ -492,8 +492,8 @@
ADD_SUBDIRECTORY(extra)
--IF(NOT WITHOUT_SERVER)
-- ADD_SUBDIRECTORY(tests)
-- ADD_SUBDIRECTORY(client)
-- ADD_SUBDIRECTORY(sql)
-- ADD_SUBDIRECTORY(sql/share)
-- ADD_SUBDIRECTORY(libservices)
-- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
-- IF(WITH_EMBEDDED_SERVER)
-- ADD_SUBDIRECTORY(libmysqld)
-- ADD_SUBDIRECTORY(libmysqld/examples)
-- ENDIF(WITH_EMBEDDED_SERVER)
--
-- ADD_SUBDIRECTORY(mysql-test)
-- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
-- ADD_SUBDIRECTORY(support-files)
-- ADD_SUBDIRECTORY(scripts)
-- ADD_SUBDIRECTORY(sql-bench)
-- IF(UNIX)
-- ADD_SUBDIRECTORY(man)
-- ENDIF()
-- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
-- ADD_SUBDIRECTORY(internal)
-- ENDIF()
-- ADD_SUBDIRECTORY(packaging/rpm-uln)
-- ADD_SUBDIRECTORY(packaging/rpm-oel)
-- ADD_SUBDIRECTORY(packaging/rpm-fedora)
--ENDIF()
-+ADD_SUBDIRECTORY(client)
-+ADD_SUBDIRECTORY(libservices)
+ ADD_SUBDIRECTORY(client)
+-ADD_SUBDIRECTORY(sql/share)
+ ADD_SUBDIRECTORY(libservices)
+ADD_SUBDIRECTORY(support-files)
-+ADD_SUBDIRECTORY(scripts)
-+ADD_SUBDIRECTORY(man)
- INCLUDE(cmake/abi_check.cmake)
- INCLUDE(cmake/tags.cmake)
-@@ -521,18 +499,17 @@
+ IF(UNIX)
+ ADD_SUBDIRECTORY(man)
+@@ -560,18 +560,17 @@
SET(CPACK_GENERATOR "TGZ")
ENDIF()
ADD_SUBDIRECTORY(packaging/WiX)
@@ -59,7 +30,7 @@
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
INSTALL(FILES COPYING LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR}
-@@ -558,5 +535,6 @@
+@@ -597,5 +596,6 @@
PATTERN "sp-imp-spec.txt" EXCLUDE
)
ENDIF()
Deleted: trunk/databases/mysql56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp
===================================================================
--- trunk/databases/mysql56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp 2014-09-17 12:18:05 UTC (rev 17361)
+++ trunk/databases/mysql56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp 2014-09-17 12:19:17 UTC (rev 17362)
@@ -1,11 +0,0 @@
---- extra/yassl/taocrypt/include/misc.hpp.orig
-+++ extra/yassl/taocrypt/include/misc.hpp
-@@ -124,7 +124,7 @@
-
-
- // no gas on these systems ?, disable for now
--#if defined(__sun__) || defined (__APPLE__)
-+#if defined(__sun__) || defined (__APPLE__) || defined(__clang__)
- #define TAOCRYPT_DISABLE_X86ASM
- #endif
-
Deleted: trunk/databases/mysql56-client/files/patch-extra_yassl_taocrypt_src_integer.cpp
===================================================================
--- trunk/databases/mysql56-client/files/patch-extra_yassl_taocrypt_src_integer.cpp 2014-09-17 12:18:05 UTC (rev 17361)
+++ trunk/databases/mysql56-client/files/patch-extra_yassl_taocrypt_src_integer.cpp 2014-09-17 12:19:17 UTC (rev 17362)
@@ -1,11 +0,0 @@
---- extra/yassl/taocrypt/src/integer.cpp.orig 2012-04-02 09:37:09.000000000 +0200
-+++ extra/yassl/taocrypt/src/integer.cpp 2012-04-02 09:37:41.000000000 +0200
-@@ -73,7 +73,7 @@
- CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
- size_type n, const void *)
- {
-- if (n > max_size())
-+ if (n > AlignedAllocator<T>::max_size())
- return 0;
- if (n == 0)
- return 0;
Added: trunk/databases/mysql56-client/files/patch-include-CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-client/files/patch-include-CMakeLists.txt (rev 0)
+++ trunk/databases/mysql56-client/files/patch-include-CMakeLists.txt 2014-09-17 12:19:17 UTC (rev 17362)
@@ -0,0 +1,10 @@
+--- include/CMakeLists.txt.orig 2014-01-14 23:38:00.000000000 +0800
++++ include/CMakeLists.txt 2014-02-28 04:51:50.269412818 +0800
+@@ -35,6 +35,7 @@
+
+ SET(HEADERS
+ ${HEADERS_ABI}
++ hash.h
+ my_dbug.h
+ m_string.h
+ my_sys.h
Modified: trunk/databases/mysql56-client/pkg-plist
===================================================================
--- trunk/databases/mysql56-client/pkg-plist 2014-09-17 12:18:05 UTC (rev 17361)
+++ trunk/databases/mysql56-client/pkg-plist 2014-09-17 12:19:17 UTC (rev 17362)
@@ -19,6 +19,7 @@
include/mysql/byte_order_generic_x86_64.h
include/mysql/decimal.h
include/mysql/errmsg.h
+include/mysql/hash.h
include/mysql/keycache.h
include/mysql/little_endian.h
include/mysql/m_ctype.h
@@ -92,6 +93,21 @@
lib/mysql/libmysqlclient_r.so
lib/mysql/libmysqlclient_r.so.18
lib/mysql/libmysqlservices.a
+man/man1/comp_err.1.gz
+man/man1/msql2mysql.1.gz
+man/man1/mysql.1.gz
+man/man1/mysql_config.1.gz
+man/man1/mysql_config_editor.1.gz
+man/man1/mysql_find_rows.1.gz
+man/man1/mysql_waitpid.1.gz
+man/man1/mysqlaccess.1.gz
+man/man1/mysqladmin.1.gz
+man/man1/mysqlbinlog.1.gz
+man/man1/mysqlcheck.1.gz
+man/man1/mysqldump.1.gz
+man/man1/mysqlimport.1.gz
+man/man1/mysqlshow.1.gz
+man/man1/mysqlslap.1.gz
share/aclocal/mysql.m4
@dirrm include/mysql/mysql/psi
@dirrm include/mysql/mysql
More information about the Midnightbsd-cvs
mailing list