Ignore:
Timestamp:
Jun 2, 2014, 6:08:58 PM (5 years ago)
Author:
pixilla@…
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.
Location:
trunk/dports/databases/mysql56
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/databases/mysql56/Portfile

    r118102 r120590  
    77name                mysql56
    88set name_mysql      ${name}
    9 version             5.6.16
     9version             5.6.19
    1010# Set revision_client, revision_server and revision_innodb_memcached_plugin to 0 on
    1111# version bump.
    12 set revision_client 3
     12set revision_client 0
    1313set revision_server 0
    1414set revision_innodb_memcached_plugin 0
     
    3232    patchfiles          patch-cmake-install_layout.cmake.diff
    3333
    34     # Fix some mysql_install_db paths.
    35     # Using reinplace since mysql_install_db.pl.in appears broken with regard to using SYSCONDIR
    36     # and SUPPORTFILESDIR.
    37     patchfiles-append   patch-scripts-mysql_install_db.pl.in.diff
     34    # Patch scripts/* files that do not find configuration, support and binary files.
     35    patchfiles-append   patch-scripts-mysql_install_db.pl.in.diff \
     36                        patch-scripts-mysql_secure_installation.pl.in.diff
    3837
    3938    # Don't allow mysql to set the compiler to g++
     
    5352    }
    5453
    55     checksums           rmd160  11d21eb50e63776876dccf3a72e19e5de4eec9c2 \
    56                         sha256  70fe55985ba187a26cce6905c57f66bb9904b33760e3ff30b611697b4bf2fde0
     54    checksums           rmd160  3cc8acbef87c98f5221307f9b8351bd7d2f7f7e3 \
     55                        sha256  80ef3aae048866539380e7e330d9f1034f0ee50ddfb9c662570132492678b09f
    5756
    5857    archcheck.files     lib/libz.dylib lib/libwrap.dylib
     
    7877        reinplace "s|@SUPPORTFILESDIR@|share/${name_mysql}/support-files|g" \
    7978            ${worksrcpath}/scripts/mysql_install_db.pl.in
     79        reinplace "s|@BINDIR@|${prefix}/lib/${name}/bin|g" \
     80            ${worksrcpath}/scripts/mysql_secure_installation.pl.in
    8081    }
    8182
     
    182183    }
    183184
    184     variant openssl description {Enable OpenSSL support} {}
    185     # Until yassl builds use MacPorts openssl.
    186     # Getting mysql56 to build with yassl would make the binaries distributable.
    187     # When mysql56 builds with yassl remove "true" from the "if" statement below or
    188     # put the contents of the "if" block into the openssl variant block.
    189     if { true || [variant_isset openssl] } {
     185    variant openssl description {Enable OpenSSL support} {
    190186        configure.args-delete   -DWITH_SSL:STRING=bundled
    191187        configure.args-append   -DWITH_SSL:STRING=${prefix}
  • trunk/dports/databases/mysql56/files/patch-scripts-mysql_install_db.pl.in.diff

    r117939 r120590  
    1 --- a/scripts/mysql_install_db.pl.in    2013-06-20 08:22:33.000000000 -0700
    2 +++ b/scripts/mysql_install_db.pl.in    2013-06-20 19:36:15.000000000 -0700
    3 @@ -428,10 +428,10 @@
    4  # This will be the default config file
    5  # ----------------------------------------------------------------------
     1--- a/scripts/mysql_install_db.pl.in    2014-05-12 23:43:21.000000000 -0430
     2+++ b/scripts/mysql_install_db.pl.in    2014-05-12 23:49:54.000000000 -0430
     3@@ -460,10 +460,10 @@
    64 
    7 -$config_file= "$basedir/my.cnf";
    8 +$config_file= "$basedir@SYSCONFDIR@/my.cnf";
     5 my $cnfext = ( $^O =~ m/^(MSWin32|cygwin)$/ ) ? "ini" : "cnf";
    96 
    10  my $cfg_template= find_in_basedir($opt,"file","my-default.cnf",
    11 -                                 "share","share/mysql","support-files");
    12 +                                 "@SUPPORTFILESDIR@","share","share/mysql","support-files");
    13  -e $cfg_template or cannot_find_file("my-default.cnf");
     7-$config_file= "$basedir/my.$cnfext";
     8+$config_file= "$basedir@SYSCONFDIR@/my.$cnfext";
     9 
     10 my $cfg_template= find_in_basedir($opt,"file","my-default.$cnfext",
     11-                                 ".", "share","share/mysql","support-files");
     12+                  "@SUPPORTFILESDIR@",".", "share","share/mysql","support-files");
     13 -e $cfg_template or cannot_find_file("my-default.$cnfext");
    1414 
    1515 $copy_cfg_file= $config_file;
Note: See TracChangeset for help on using the changeset viewer.