Date: Mon, 4 Aug 2014 14:21:41 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364012 - in head/databases: mysql56-client/files mysql56-server mysql56-server/files Message-ID: <53df96f5.5a18.2b649519@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Mon Aug 4 14:21:40 2014 New Revision: 364012 URL: http://svnweb.freebsd.org/changeset/ports/364012 QAT: https://qat.redports.org/buildarchive/r364012/ Log: Update to 5.6.20 release. Modified: head/databases/mysql56-client/files/patch-CMakeLists.txt head/databases/mysql56-server/Makefile head/databases/mysql56-server/distinfo head/databases/mysql56-server/files/patch-CMakeLists.txt Modified: head/databases/mysql56-client/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mysql56-client/files/patch-CMakeLists.txt Mon Aug 4 14:20:24 2014 (r364011) +++ head/databases/mysql56-client/files/patch-CMakeLists.txt Mon Aug 4 14:21:40 2014 (r364012) @@ -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() Modified: head/databases/mysql56-server/Makefile ============================================================================== --- head/databases/mysql56-server/Makefile Mon Aug 4 14:20:24 2014 (r364011) +++ head/databases/mysql56-server/Makefile Mon Aug 4 14:21:40 2014 (r364012) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.19 +PORTVERSION= 5.6.20 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} Modified: head/databases/mysql56-server/distinfo ============================================================================== --- head/databases/mysql56-server/distinfo Mon Aug 4 14:20:24 2014 (r364011) +++ head/databases/mysql56-server/distinfo Mon Aug 4 14:21:40 2014 (r364012) @@ -1,2 +1,2 @@ -SHA256 (mysql-5.6.19.tar.gz) = 80ef3aae048866539380e7e330d9f1034f0ee50ddfb9c662570132492678b09f -SIZE (mysql-5.6.19.tar.gz) = 32879525 +SHA256 (mysql-5.6.20.tar.gz) = 4fc33b1a3ddb75fbc1cc30d0aba1af3d94c4fbe608048d46e34f39a8281a064d +SIZE (mysql-5.6.20.tar.gz) = 32979820 Modified: head/databases/mysql56-server/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mysql56-server/files/patch-CMakeLists.txt Mon Aug 4 14:20:24 2014 (r364011) +++ head/databases/mysql56-server/files/patch-CMakeLists.txt Mon Aug 4 14:21:40 2014 (r364012) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53df96f5.5a18.2b649519>