[120590] trunk/dports/databases/mysql56

2 Jun 2014

Revision: 120590
          https://trac.macports.org/changeset/120590
Author:   pixilla@macports.org
Date:     2014-06-02 11:08:58 -0700 (Mon, 02 Jun 2014)
Log Message:
-----------
databases/mysql56:
- Update to version 5.6.19.
- Patch mysql_secure_installation to find mysql client. Closes #40606
- Use bundled yassl by default.
- Patch scripts/* files that do not find configuration, support and binary files.

Modified Paths:
--------------
    trunk/dports/databases/mysql56/Portfile
    trunk/dports/databases/mysql56/files/patch-scripts-mysql_install_db.pl.in.diff

Modified: trunk/dports/databases/mysql56/Portfile
===================================================================

--- trunk/dports/databases/mysql56/Portfile	2014-06-02 14:41:18 UTC (rev 120589)
+++ trunk/dports/databases/mysql56/Portfile	2014-06-02 18:08:58 UTC (rev 120590)
@@ -6,10 +6,10 @@
 
 name                mysql56
 set name_mysql      ${name}
-version             5.6.16
+version             5.6.19
 # Set revision_client, revision_server and revision_innodb_memcached_plugin to 0 on
 # version bump.
-set revision_client 3
+set revision_client 0
 set revision_server 0
 set revision_innodb_memcached_plugin 0
 set version_branch  [join [lrange [split ${version} .] 0 1] .]
@@ -31,10 +31,9 @@
     patch.pre_args      -p1
     patchfiles          patch-cmake-install_layout.cmake.diff
 
-    # Fix some mysql_install_db paths.
-    # Using reinplace since mysql_install_db.pl.in appears broken with regard to using SYSCONDIR
-    # and SUPPORTFILESDIR.
-    patchfiles-append   patch-scripts-mysql_install_db.pl.in.diff
+    # Patch scripts/* files that do not find configuration, support and binary files.
+    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
@@ -52,8 +51,8 @@
         configure.compiler gcc
     }
 
-    checksums           rmd160  11d21eb50e63776876dccf3a72e19e5de4eec9c2 \
-                        sha256  70fe55985ba187a26cce6905c57f66bb9904b33760e3ff30b611697b4bf2fde0
+    checksums           rmd160  3cc8acbef87c98f5221307f9b8351bd7d2f7f7e3 \
+                        sha256  80ef3aae048866539380e7e330d9f1034f0ee50ddfb9c662570132492678b09f
 
     archcheck.files     lib/libz.dylib lib/libwrap.dylib
 
@@ -77,6 +76,8 @@
             ${worksrcpath}/scripts/mysql_install_db.pl.in
         reinplace "s|@SUPPORTFILESDIR@|share/${name_mysql}/support-files|g" \
             ${worksrcpath}/scripts/mysql_install_db.pl.in
+        reinplace "s|@BINDIR@|${prefix}/lib/${name}/bin|g" \
+            ${worksrcpath}/scripts/mysql_secure_installation.pl.in
     }
 
     configure.dir       ${worksrcpath}/build_macports
@@ -181,12 +182,7 @@
         }
     }
 
-    variant openssl description {Enable OpenSSL support} {}
-    # Until yassl builds use MacPorts openssl.
-    # Getting mysql56 to build with yassl would make the binaries distributable.
-    # When mysql56 builds with yassl remove "true" from the "if" statement below or
-    # put the contents of the "if" block into the openssl variant block.
-    if { true || [variant_isset openssl] } {
+    variant openssl description {Enable OpenSSL support} {
         configure.args-delete   -DWITH_SSL:STRING=bundled
         configure.args-append   -DWITH_SSL:STRING=${prefix}
         depends_lib-append      port:openssl

Modified: trunk/dports/databases/mysql56/files/patch-scripts-mysql_install_db.pl.in.diff
===================================================================
--- trunk/dports/databases/mysql56/files/patch-scripts-mysql_install_db.pl.in.diff	2014-06-02 14:41:18 UTC (rev 120589)
+++ trunk/dports/databases/mysql56/files/patch-scripts-mysql_install_db.pl.in.diff	2014-06-02 18:08:58 UTC (rev 120590)
@@ -1,15 +1,15 @@
---- a/scripts/mysql_install_db.pl.in	2013-06-20 08:22:33.000000000 -0700
-+++ b/scripts/mysql_install_db.pl.in	2013-06-20 19:36:15.000000000 -0700
-@@ -428,10 +428,10 @@
- # This will be the default config file
- # ----------------------------------------------------------------------
+--- a/scripts/mysql_install_db.pl.in	2014-05-12 23:43:21.000000000 -0430
++++ b/scripts/mysql_install_db.pl.in	2014-05-12 23:49:54.000000000 -0430
+@@ -460,10 +460,10 @@
  
--$config_file= "$basedir/my.cnf";
-+$config_file= "$basedir@SYSCONFDIR@/my.cnf";
+ my $cnfext = ( $^O =~ m/^(MSWin32|cygwin)$/ ) ? "ini" : "cnf";
  
- my $cfg_template= find_in_basedir($opt,"file","my-default.cnf",
--				  "share","share/mysql","support-files");
-+				  "@SUPPORTFILESDIR@","share","share/mysql","support-files");
- -e $cfg_template or cannot_find_file("my-default.cnf");
+-$config_file= "$basedir/my.$cnfext";
++$config_file= "$basedir@SYSCONFDIR@/my.$cnfext";
  
+ my $cfg_template= find_in_basedir($opt,"file","my-default.$cnfext",
+-				  ".", "share","share/mysql","support-files");
++                  "@SUPPORTFILESDIR@",".", "share","share/mysql","support-files");
+ -e $cfg_template or cannot_find_file("my-default.$cnfext");
+ 
  $copy_cfg_file= $config_file;

    

pixilla＠macports.org

tags

participants (1)