[Midnightbsd-cvs] mports [17361] trunk/databases/mysql56-server: mysql 5.6.20
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Sep 17 08:18:06 EDT 2014
Revision: 17361
http://svnweb.midnightbsd.org/mports/?rev=17361
Author: laffer1
Date: 2014-09-17 08:18:05 -0400 (Wed, 17 Sep 2014)
Log Message:
-----------
mysql 5.6.20
Modified Paths:
--------------
trunk/databases/mysql56-server/Makefile
trunk/databases/mysql56-server/distinfo
trunk/databases/mysql56-server/files/patch-CMakeLists.txt
trunk/databases/mysql56-server/pkg-plist
Removed Paths:
-------------
trunk/databases/mysql56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp
trunk/databases/mysql56-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
Modified: trunk/databases/mysql56-server/Makefile
===================================================================
--- trunk/databases/mysql56-server/Makefile 2014-09-17 12:10:27 UTC (rev 17360)
+++ trunk/databases/mysql56-server/Makefile 2014-09-17 12:18:05 UTC (rev 17361)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME?= mysql
-PORTVERSION= 5.6.16
+PORTVERSION= 5.6.20
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL}
@@ -62,18 +62,12 @@
mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
-MAN8= mysqld.8
-
CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON"
+.else
+USES+= readline
.endif
post-patch:
@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "arm"
-BROKEN= Does not compile on arm
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/databases/mysql56-server/distinfo
===================================================================
--- trunk/databases/mysql56-server/distinfo 2014-09-17 12:10:27 UTC (rev 17360)
+++ trunk/databases/mysql56-server/distinfo 2014-09-17 12:18:05 UTC (rev 17361)
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.6.16.tar.gz) = 70fe55985ba187a26cce6905c57f66bb9904b33760e3ff30b611697b4bf2fde0
-SIZE (mysql-5.6.16.tar.gz) = 32821451
+SHA256 (mysql-5.6.20.tar.gz) = 4fc33b1a3ddb75fbc1cc30d0aba1af3d94c4fbe608048d46e34f39a8281a064d
+SIZE (mysql-5.6.20.tar.gz) = 32979820
Modified: trunk/databases/mysql56-server/files/patch-CMakeLists.txt
===================================================================
--- trunk/databases/mysql56-server/files/patch-CMakeLists.txt 2014-09-17 12:10:27 UTC (rev 17360)
+++ trunk/databases/mysql56-server/files/patch-CMakeLists.txt 2014-09-17 12:18:05 UTC (rev 17361)
@@ -1,37 +1,30 @@
---- CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100
-+++ CMakeLists.txt 2013-02-13 14:40:46.000000000 +0100
-@@ -379,7 +379,6 @@
+--- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000
++++ CMakeLists.txt 2014-08-04 14:18:38.795491147 +0000
+@@ -500,12 +500,10 @@
+ ENDIF()
- ADD_SUBDIRECTORY(extra)
IF(NOT WITHOUT_SERVER)
- ADD_SUBDIRECTORY(tests)
- ADD_SUBDIRECTORY(client)
ADD_SUBDIRECTORY(sql)
- ADD_SUBDIRECTORY(sql/share)
-@@ -387,14 +386,10 @@
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)
+ ENDIF()
+@@ -514,10 +512,7 @@
+ ADD_SUBDIRECTORY(scripts)
+
+ IF(NOT WITHOUT_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)
+ IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
+ ADD_SUBDIRECTORY(internal)
ENDIF()
-@@ -439,7 +434,6 @@
- SET(CPACK_GENERATOR "TGZ")
- ENDIF()
- ADD_SUBDIRECTORY(packaging/WiX)
--ADD_SUBDIRECTORY(packaging/solaris)
-
- # Create a single package with "make package"
- # (see http://public.kitware.com/Bug/view.php?id=11452)
-@@ -452,6 +446,7 @@
+@@ -572,6 +567,7 @@
#
# RPM installs documentation directly from the source tree
#
@@ -39,8 +32,10 @@
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
INSTALL(FILES COPYING LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR}
-@@ -477,3 +472,4 @@
+@@ -597,5 +593,6 @@
PATTERN "sp-imp-spec.txt" EXCLUDE
)
ENDIF()
+ENDIF()
+
+ INCLUDE(CPack)
Deleted: trunk/databases/mysql56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp
===================================================================
--- trunk/databases/mysql56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp 2014-09-17 12:10:27 UTC (rev 17360)
+++ trunk/databases/mysql56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp 2014-09-17 12:18:05 UTC (rev 17361)
@@ -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-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
===================================================================
--- trunk/databases/mysql56-server/files/patch-extra_yassl_taocrypt_src_integer.cpp 2014-09-17 12:10:27 UTC (rev 17360)
+++ trunk/databases/mysql56-server/files/patch-extra_yassl_taocrypt_src_integer.cpp 2014-09-17 12:18:05 UTC (rev 17361)
@@ -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;
Modified: trunk/databases/mysql56-server/pkg-plist
===================================================================
--- trunk/databases/mysql56-server/pkg-plist 2014-09-17 12:10:27 UTC (rev 17360)
+++ trunk/databases/mysql56-server/pkg-plist 2014-09-17 12:18:05 UTC (rev 17361)
@@ -38,6 +38,33 @@
lib/mysql/plugin/semisync_slave.so
lib/mysql/plugin/validate_password.so
libexec/mysqld
+man/man1/my_print_defaults.1.gz
+man/man1/myisam_ftdump.1.gz
+man/man1/myisamchk.1.gz
+man/man1/myisamlog.1.gz
+man/man1/myisampack.1.gz
+man/man1/mysql.server.1.gz
+man/man1/mysql_convert_table_format.1.gz
+man/man1/mysql_fix_extensions.1.gz
+man/man1/mysql_install_db.1.gz
+man/man1/mysql_plugin.1.gz
+man/man1/mysql_secure_installation.1.gz
+man/man1/mysql_setpermission.1.gz
+man/man1/mysql_tzinfo_to_sql.1.gz
+man/man1/mysql_upgrade.1.gz
+man/man1/mysql_zap.1.gz
+man/man1/mysqlbug.1.gz
+man/man1/mysqld_multi.1.gz
+man/man1/mysqld_safe.1.gz
+man/man1/mysqldumpslow.1.gz
+man/man1/mysqlhotcopy.1.gz
+man/man1/mysqlman.1.gz
+man/man1/mysqltest.1.gz
+man/man1/perror.1.gz
+man/man1/replace.1.gz
+man/man1/resolve_stack_dump.1.gz
+man/man1/resolveip.1.gz
+man/man8/mysqld.8.gz
%%DATADIR%%/binary-configure
%%DATADIR%%/bulgarian/errmsg.sys
%%DATADIR%%/charsets/Index.xml
More information about the Midnightbsd-cvs
mailing list