[Midnightbsd-cvs] mports [19639] trunk/databases: update mysql to 5.6.25
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jul 31 20:29:09 EDT 2015
Revision: 19639
http://svnweb.midnightbsd.org/mports/?rev=19639
Author: laffer1
Date: 2015-07-31 20:29:08 -0400 (Fri, 31 Jul 2015)
Log Message:
-----------
update mysql to 5.6.25
Modified Paths:
--------------
trunk/databases/mysql56-client/pkg-plist
trunk/databases/mysql56-server/Makefile
trunk/databases/mysql56-server/distinfo
trunk/databases/mysql56-server/pkg-plist
Added Paths:
-----------
trunk/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake
Removed Paths:
-------------
trunk/databases/mysql56-client/files/patch-cmake_readline.cmake
Added: trunk/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake
===================================================================
--- trunk/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake (rev 0)
+++ trunk/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake 2015-08-01 00:29:08 UTC (rev 19639)
@@ -0,0 +1,20 @@
+--- cmake/build_configurations/compiler_options.cmake.orig 2014-12-05 10:49:17.394216277 +0000
++++ cmake/build_configurations/compiler_options.cmake 2014-12-05 10:50:58.144209859 +0000
+@@ -25,7 +25,7 @@
+
+ # Default GCC flags
+ IF(CMAKE_COMPILER_IS_GNUCC)
+- SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
++ SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+ # Disable inline optimizations for valgrind testing to avoid false positives
+ IF(WITH_VALGRIND)
+ SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}")
+@@ -34,7 +34,7 @@
+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
+ ENDIF()
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
++ SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+ # Disable inline optimizations for valgrind testing to avoid false positives
+ IF(WITH_VALGRIND)
+ SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}")
Property changes on: trunk/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/databases/mysql56-client/files/patch-cmake_readline.cmake
===================================================================
--- trunk/databases/mysql56-client/files/patch-cmake_readline.cmake 2015-08-01 00:19:11 UTC (rev 19638)
+++ trunk/databases/mysql56-client/files/patch-cmake_readline.cmake 2015-08-01 00:29:08 UTC (rev 19639)
@@ -1,11 +0,0 @@
---- cmake/readline.cmake.orig 2013-06-30 10:45:55.000000000 +0200
-+++ cmake/readline.cmake 2013-06-30 10:47:08.000000000 +0200
-@@ -147,7 +147,7 @@
-
- FIND_LIBRARY(EDITLINE_LIBRARY
- NAMES
-- edit
-+ readline
- )
- MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
-
Modified: trunk/databases/mysql56-client/pkg-plist
===================================================================
--- trunk/databases/mysql56-client/pkg-plist 2015-08-01 00:19:11 UTC (rev 19638)
+++ trunk/databases/mysql56-client/pkg-plist 2015-08-01 00:29:08 UTC (rev 19639)
@@ -110,7 +110,3 @@
man/man1/mysqlshow.1.gz
man/man1/mysqlslap.1.gz
share/aclocal/mysql.m4
- at dirrm include/mysql/mysql/psi
- at dirrm include/mysql/mysql
- at dirrm include/mysql
- at dirrmtry lib/mysql
Modified: trunk/databases/mysql56-server/Makefile
===================================================================
--- trunk/databases/mysql56-server/Makefile 2015-08-01 00:19:11 UTC (rev 19638)
+++ trunk/databases/mysql56-server/Makefile 2015-08-01 00:29:08 UTC (rev 19639)
@@ -1,11 +1,10 @@
# $MidnightBSD$
PORTNAME?= mysql
-PORTVERSION= 5.6.23
+PORTVERSION= 5.6.25
PORTREVISION?= 0
CATEGORIES= databases ipv6
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= MySQL-5.6
+MASTER_SITES= MYSQL/MySQL-5.6
PKGNAMESUFFIX?= 56-server
MAINTAINER= ports at MidnightBSD.org
@@ -46,9 +45,12 @@
USE_MYSQL= yes
WANT_MYSQL_VER= 56
-USE_PERL5_RUN= yes
+USES+= perl5
+USE_PERL5= run
-CONFLICTS_INSTALL= mysql5.[0-57-9]-server-* mysql[0-46-9][0-9]-server-* percona[0-9][0-9]-server-* mariadb[0-9][0-9]-server-*
+CONFLICTS_INSTALL= mysql5[0-57-9]-server-* \
+ mariadb*-server-* \
+ percona*-server-*
USE_RC_SUBR= mysql-server
@@ -64,7 +66,8 @@
CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON"
.else
-USES+= readline
+BUILD_DEPENDS+= libedit>=0:${PORTSDIR}/devel/libedit
+RUN_DEPENDS+= libedit>=0:${PORTSDIR}/devel/libedit
.endif
post-patch:
Modified: trunk/databases/mysql56-server/distinfo
===================================================================
--- trunk/databases/mysql56-server/distinfo 2015-08-01 00:19:11 UTC (rev 19638)
+++ trunk/databases/mysql56-server/distinfo 2015-08-01 00:29:08 UTC (rev 19639)
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.6.23.tar.gz) = 3bd21af06a9304e372daba41fa5612bb54ac1bc05a4349b3160d0cda972ac098
-SIZE (mysql-5.6.23.tar.gz) = 33115859
+SHA256 (mysql-5.6.25.tar.gz) = 15079c0b83d33a092649cbdf402c9225bcd3f33e87388407be5cdbf1432c7fbd
+SIZE (mysql-5.6.25.tar.gz) = 33203321
Modified: trunk/databases/mysql56-server/pkg-plist
===================================================================
--- trunk/databases/mysql56-server/pkg-plist 2015-08-01 00:19:11 UTC (rev 19638)
+++ trunk/databases/mysql56-server/pkg-plist 2015-08-01 00:29:08 UTC (rev 19639)
@@ -1,4 +1,3 @@
- at stopdaemon mysql-server
bin/innochecksum
bin/my_print_defaults
bin/myisam_ftdump
@@ -31,6 +30,7 @@
lib/mysql/plugin/daemon_example.ini
lib/mysql/plugin/libdaemon_example.so
lib/mysql/plugin/mypluglib.so
+lib/mysql/plugin/mysql_no_login.so
lib/mysql/plugin/qa_auth_client.so
lib/mysql/plugin/qa_auth_interface.so
lib/mysql/plugin/qa_auth_server.so
@@ -129,31 +129,3 @@
%%DATADIR%%/spanish/errmsg.sys
%%DATADIR%%/swedish/errmsg.sys
%%DATADIR%%/ukrainian/errmsg.sys
- at dirrm lib/mysql/plugin
- at dirrmtry lib/mysql
- at dirrm %%DATADIR%%/bulgarian
- at dirrm %%DATADIR%%/charsets
- at dirrm %%DATADIR%%/czech
- at dirrm %%DATADIR%%/danish
- at dirrm %%DATADIR%%/dutch
- at dirrm %%DATADIR%%/english
- at dirrm %%DATADIR%%/estonian
- at dirrm %%DATADIR%%/french
- at dirrm %%DATADIR%%/german
- at dirrm %%DATADIR%%/greek
- at dirrm %%DATADIR%%/hungarian
- at dirrm %%DATADIR%%/italian
- at dirrm %%DATADIR%%/japanese
- at dirrm %%DATADIR%%/korean
- at dirrm %%DATADIR%%/norwegian
- at dirrm %%DATADIR%%/norwegian-ny
- at dirrm %%DATADIR%%/polish
- at dirrm %%DATADIR%%/portuguese
- at dirrm %%DATADIR%%/romanian
- at dirrm %%DATADIR%%/russian
- at dirrm %%DATADIR%%/serbian
- at dirrm %%DATADIR%%/slovak
- at dirrm %%DATADIR%%/spanish
- at dirrm %%DATADIR%%/swedish
- at dirrm %%DATADIR%%/ukrainian
- at dirrm %%DATADIR%%
More information about the Midnightbsd-cvs
mailing list