Revision: 129000 https://trac.macports.org/changeset/129000 Author: pixilla@macports.org Date: 2014-12-02 14:09:38 -0800 (Tue, 02 Dec 2014) Log Message: ----------- databases/mysql56: closes #46109 - Update version to 5.6.22. - Remove patch fixed upstream: http://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-22.html Modified Paths: -------------- trunk/dports/databases/mysql56/Portfile Removed Paths: ------------- trunk/dports/databases/mysql56/files/patch-CMakeLists.txt.diff Modified: trunk/dports/databases/mysql56/Portfile =================================================================== --- trunk/dports/databases/mysql56/Portfile 2014-12-02 21:51:51 UTC (rev 128999) +++ trunk/dports/databases/mysql56/Portfile 2014-12-02 22:09:38 UTC (rev 129000) @@ -6,7 +6,7 @@ name mysql56 set name_mysql ${name} -version 5.6.21 +version 5.6.22 # Set revision_client, revision_server and revision_innodb_memcached_plugin to 0 on # version bump. set revision_client 0 @@ -39,10 +39,6 @@ patchfiles-append patch-scripts-mysql_install_db.pl.in.diff \ patch-scripts-mysql_secure_installation.pl.in.diff - # Don't allow mysql to set the compiler to g++ - # See http://bazaar.launchpad.net/~mysql/mysql-server/5.6/revision/4223.1.4 - # See also #42943 - patchfiles-append patch-CMakeLists.txt.diff if { (![variant_isset universal] && ${build_arch} eq "i386") || ([variant_isset universal] && [lsearch ${universal_archs} i386] != -1) } { # Disallow clang versions older than the clang version which caused the problem #compiler.blacklist {clang < 425} @@ -55,8 +51,8 @@ configure.compiler gcc } - checksums rmd160 549b3476c3bbe6ca6b459b5970fc59a345334cd7 \ - sha256 ea4daf6a8f4b1a9c62e416249a08fbdcbf686667d738004ef82044def96feb7c + checksums rmd160 64ad57c080454cf52ff097251b9684a68ed00804 \ + sha256 c4d2dfabb20a8e26e8437dff41f366520001eb031ffd77fbfcde70d0073fc9f6 archcheck.files lib/libz.dylib lib/libwrap.dylib Deleted: trunk/dports/databases/mysql56/files/patch-CMakeLists.txt.diff =================================================================== --- trunk/dports/databases/mysql56/files/patch-CMakeLists.txt.diff 2014-12-02 21:51:51 UTC (rev 128999) +++ trunk/dports/databases/mysql56/files/patch-CMakeLists.txt.diff 2014-12-02 22:09:38 UTC (rev 129000) @@ -1,15 +0,0 @@ ---- a/CMakeLists.txt 2014-01-14 08:38:00.000000000 -0700 -+++ b/CMakeLists.txt 2014-03-17 07:59:18.000000000 -0700 -@@ -61,9 +61,9 @@ - CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel") - - # Possibly temporary fix: Clang on 32 bit causes non-debug server to crash --IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386") -- SET(CMAKE_CXX_COMPILER g++) --ENDIF() -+#IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386") -+# SET(CMAKE_CXX_COMPILER g++) -+#ENDIF() - - IF(WITH_DEBUG) - SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING ${BUILDTYPE_DOCSTRING} FORCE)