Modified: trunk/dports/databases/mysql56/Portfile (120631 => 120632)
--- trunk/dports/databases/mysql56/Portfile 2014-06-03 22:34:01 UTC (rev 120631)
+++ trunk/dports/databases/mysql56/Portfile 2014-06-03 23:20:31 UTC (rev 120632)
@@ -9,9 +9,9 @@
version 5.6.19
# Set revision_client, revision_server and revision_innodb_memcached_plugin to 0 on
# version bump.
-set revision_client 0
-set revision_server 0
-set revision_innodb_memcached_plugin 0
+set revision_client 1
+set revision_server 1
+set revision_innodb_memcached_plugin 1
set version_branch [join [lrange [split ${version} .] 0 1] .]
categories databases
platforms darwin
@@ -20,7 +20,7 @@
homepage http://www.mysql.com/
master_sites mysql:MySQL-${version_branch}
-if {${subport} ne "${name_mysql}-server"} {
+if {${subport} eq ${name_mysql}} {
PortGroup archcheck 1.0
PortGroup cmake 1.0
@@ -100,7 +100,9 @@
-DENABLE_DTRACE:BOOL=OFF \
-DWITH_LIBWRAP:BOOL=ON \
-DWITH_SSL:STRING=bundled \
- -DWITH_INNODB_MEMCACHED=0
+ -DWITH_INNODB_MEMCACHED=1
+ configure.cppflags-delete \
+ -I${prefix}/include
}
if {${subport} eq ${name}} {
@@ -182,7 +184,12 @@
}
}
- variant openssl description {Enable OpenSSL support} {
+ 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] } {
configure.args-delete -DWITH_SSL:STRING=bundled
configure.args-append -DWITH_SSL:STRING=${prefix}
depends_lib-append port:openssl
@@ -265,19 +272,8 @@
subport ${name_mysql}-innodb-memcached-plugin {
- revision ${revision_innodb_memcached_plugin}
- license GPL-2
- description InnoDB Memcached Plugin for ${name_mysql}
- long_description ${description}
+ replaced_by ${name_mysql}
+ PortGroup obsolete 1.0
- distname mysql-${version}
-
- depends_lib-append port:${name_mysql}
-
- configure.args-delete \
- -DWITH_INNODB_MEMCACHED=0
- configure.args-append \
- -DWITH_INNODB_MEMCACHED=1
- build.dir ${worksrcpath}/build_macports/plugin/innodb_memcached
- destroot.dir ${worksrcpath}/build_macports/plugin/innodb_memcached
+ depends_lib port:${name_mysql}
}