From owner-svn-ports-head@FreeBSD.ORG Mon Jun 10 15:12:52 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 08092296; Mon, 10 Jun 2013 15:12:52 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id ECA921DCF; Mon, 10 Jun 2013 15:12:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5AFCpuq020154; Mon, 10 Jun 2013 15:12:51 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5AFCpUS020151; Mon, 10 Jun 2013 15:12:51 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201306101512.r5AFCpUS020151@svn.freebsd.org> From: Alex Dupre Date: Mon, 10 Jun 2013 15:12:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320486 - in head/databases: mysql56-client/files mysql56-server mysql56-server/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 15:12:52 -0000 Author: ale Date: Mon Jun 10 15:12:51 2013 New Revision: 320486 URL: http://svnweb.freebsd.org/changeset/ports/320486 Log: Update to 5.6.12 release. Deleted: head/databases/mysql56-client/files/patch-cmake_readline.cmake Modified: head/databases/mysql56-server/Makefile head/databases/mysql56-server/distinfo head/databases/mysql56-server/files/patch-client_CMakeLists.txt Modified: head/databases/mysql56-server/Makefile ============================================================================== --- head/databases/mysql56-server/Makefile Mon Jun 10 15:06:51 2013 (r320485) +++ head/databases/mysql56-server/Makefile Mon Jun 10 15:12:51 2013 (r320486) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.11 +PORTVERSION= 5.6.12 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -31,7 +31,7 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DWITH_LIBEDIT=0 \ + -DWITH_EDITLINE=system \ -DWITH_LIBWRAP=1 .ifdef USE_MYSQL Modified: head/databases/mysql56-server/distinfo ============================================================================== --- head/databases/mysql56-server/distinfo Mon Jun 10 15:06:51 2013 (r320485) +++ head/databases/mysql56-server/distinfo Mon Jun 10 15:12:51 2013 (r320486) @@ -1,2 +1,2 @@ -SHA256 (mysql-5.6.11.tar.gz) = ea4a494ea926a20ada56b1c139afdc65f5a68827068a509cd0801640d8dd079e -SIZE (mysql-5.6.11.tar.gz) = 35458544 +SHA256 (mysql-5.6.12.tar.gz) = 1153c1e0ae94116c150be5f173c336a80471b5ed4642a682b8462d36d54d5817 +SIZE (mysql-5.6.12.tar.gz) = 35876046 Modified: head/databases/mysql56-server/files/patch-client_CMakeLists.txt ============================================================================== --- head/databases/mysql56-server/files/patch-client_CMakeLists.txt Mon Jun 10 15:06:51 2013 (r320485) +++ head/databases/mysql56-server/files/patch-client_CMakeLists.txt Mon Jun 10 15:12:51 2013 (r320486) @@ -1,14 +1,14 @@ ---- client/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ client/CMakeLists.txt 2013-02-13 14:47:51.000000000 +0100 -@@ -33,17 +33,20 @@ +--- client/CMakeLists.txt.orig 2013-05-21 17:18:39.000000000 +0200 ++++ client/CMakeLists.txt 2013-06-10 15:43:33.000000000 +0200 +@@ -31,17 +31,20 @@ + COPY_OPENSSL_DLLS(copy_openssl_client) - ADD_DEFINITIONS(${READLINE_DEFINES}) ADD_DEFINITIONS(${SSL_DEFINES}) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) TARGET_LINK_LIBRARIES(mysql mysqlclient) IF(UNIX) - TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) + TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) +ENDIF() @@ -21,7 +21,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -52,17 +55,21 @@ +@@ -50,17 +53,21 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) @@ -43,7 +43,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -75,6 +82,7 @@ +@@ -73,6 +80,7 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) @@ -51,7 +51,7 @@ # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) -@@ -84,11 +92,6 @@ +@@ -82,11 +90,6 @@ SET_TARGET_PROPERTIES ( mysql_plugin mysql_upgrade