Ignore:
Timestamp:
Jun 3, 2014, 11:20:31 PM (5 years ago)
Author:
pixilla@…
Message:

databases/mysql56:

  • Build with openssl as yassl does not build on some systems. Closes #43887.
  • Include innodb-memcached-plugin in mysql56. Closes #39753.
  • Make mysql56-innodb-memcached-plugin replaced_by mysql56.
File:
1 edited

Legend:

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

    r120590 r120632  
    1010# Set revision_client, revision_server and revision_innodb_memcached_plugin to 0 on
    1111# version bump.
    12 set revision_client 0
    13 set revision_server 0
    14 set revision_innodb_memcached_plugin 0
     12set revision_client 1
     13set revision_server 1
     14set revision_innodb_memcached_plugin 1
    1515set version_branch  [join [lrange [split ${version} .] 0 1] .]
    1616categories          databases
     
    2121master_sites        mysql:MySQL-${version_branch}
    2222
    23 if {${subport} ne "${name_mysql}-server"} {
     23if {${subport} eq ${name_mysql}} {
    2424
    2525    PortGroup           archcheck 1.0
     
    101101                        -DWITH_LIBWRAP:BOOL=ON \
    102102                        -DWITH_SSL:STRING=bundled \
    103                         -DWITH_INNODB_MEMCACHED=0
     103                        -DWITH_INNODB_MEMCACHED=1
     104    configure.cppflags-delete \
     105                        -I${prefix}/include
    104106}
    105107
     
    183185    }
    184186
    185     variant openssl description {Enable OpenSSL support} {
     187    variant openssl description {Enable OpenSSL support} {}
     188    # Until yassl builds use MacPorts openssl.
     189    # Getting mysql56 to build with yassl would make the binaries distributable.
     190    # When mysql56 builds with yassl remove "true" from the "if" statement below or
     191    # put the contents of the "if" block into the openssl variant block.
     192    if { true || [variant_isset openssl] } {
    186193        configure.args-delete   -DWITH_SSL:STRING=bundled
    187194        configure.args-append   -DWITH_SSL:STRING=${prefix}
     
    266273subport ${name_mysql}-innodb-memcached-plugin {
    267274
    268     revision            ${revision_innodb_memcached_plugin}
    269     license             GPL-2
    270     description         InnoDB Memcached Plugin for ${name_mysql}
    271     long_description    ${description}
    272 
    273     distname            mysql-${version}
    274 
    275     depends_lib-append  port:${name_mysql}
    276 
    277     configure.args-delete \
    278                         -DWITH_INNODB_MEMCACHED=0
    279     configure.args-append \
    280                         -DWITH_INNODB_MEMCACHED=1
    281     build.dir           ${worksrcpath}/build_macports/plugin/innodb_memcached
    282     destroot.dir        ${worksrcpath}/build_macports/plugin/innodb_memcached
    283 }
     275    replaced_by     ${name_mysql}
     276    PortGroup       obsolete 1.0
     277
     278    depends_lib     port:${name_mysql}
     279}
Note: See TracChangeset for help on using the changeset viewer.