[118102] trunk/dports/databases/mysql56/Portfile

[pixilla at macports.org]

Revision: 118102
          https://trac.macports.org/changeset/118102
Author:   pixilla at macports.org
Date:     2014-03-22 08:42:06 -0700 (Sat, 22 Mar 2014)
Log Message:
-----------
databases/mysql56:
- Add subport mysql56-innodb-memcached-plugin. Closes #39753

Modified Paths:
--------------
    trunk/dports/databases/mysql56/Portfile

Modified: trunk/dports/databases/mysql56/Portfile
===================================================================
--- trunk/dports/databases/mysql56/Portfile	2014-03-22 15:16:34 UTC (rev 118101)
+++ trunk/dports/databases/mysql56/Portfile	2014-03-22 15:42:06 UTC (rev 118102)
@@ -7,29 +7,24 @@
 name                mysql56
 set name_mysql      ${name}
 version             5.6.16
-# Set revision_client and revision_server to 0 on version bump.
-set revision_client 2
+# Set revision_client, revision_server and revision_innodb_memcached_plugin to 0 on
+# version bump.
+set revision_client 3
 set revision_server 0
+set revision_innodb_memcached_plugin 0
 set version_branch  [join [lrange [split ${version} .] 0 1] .]
 categories          databases
 platforms           darwin
 license             GPL-2
 maintainers         pixilla openmaintainer
 homepage            http://www.mysql.com/
+master_sites        mysql:MySQL-${version_branch}
 
-if {${subport} eq ${name}} {
+if {${subport} ne "${name_mysql}-server"} {
 
     PortGroup           archcheck 1.0
     PortGroup           cmake 1.0
-    PortGroup           select 1.0
 
-    revision            ${revision_client}
-    license             GPL-2
-    description         Multithreaded SQL database server
-    long_description    MySQL is an open-source, multi-threaded SQL database.
-
-    master_sites        mysql:MySQL-${version_branch}
-
     distname            mysql-${version}
     use_parallel_build  yes
 
@@ -60,12 +55,6 @@
     checksums           rmd160  11d21eb50e63776876dccf3a72e19e5de4eec9c2 \
                         sha256  70fe55985ba187a26cce6905c57f66bb9904b33760e3ff30b611697b4bf2fde0
 
-    depends_lib-append  port:zlib port:tcp_wrappers
-    depends_run-append  port:mysql_select
-
-    select.group        mysql
-    select.file         ${filespath}/${name_mysql}
-
     archcheck.files     lib/libz.dylib lib/libwrap.dylib
 
     post-extract {
@@ -90,10 +79,8 @@
             ${worksrcpath}/scripts/mysql_install_db.pl.in
     }
 
+    configure.dir       ${worksrcpath}/build_macports
     configure.cmd       cmake ..
-    configure.dir       ${worksrcpath}/build_macports
-    build.dir           ${worksrcpath}/build_macports
-
     configure.args-delete \
                         -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
     configure.args-append \
@@ -111,8 +98,26 @@
                         -DENABLE_GCOV:BOOL=OFF \
                         -DENABLE_DTRACE:BOOL=OFF \
                         -DWITH_LIBWRAP:BOOL=ON \
-                        -DWITH_SSL:STRING=bundled
+                        -DWITH_SSL:STRING=bundled \
+                        -DWITH_INNODB_MEMCACHED=0
+}
 
+if {${subport} eq ${name}} {
+
+    PortGroup           select 1.0
+
+    revision            ${revision_client}
+    license             GPL-2
+    description         Multithreaded SQL database server
+    long_description    MySQL is an open-source, multi-threaded SQL database.
+
+    depends_lib-append  port:zlib port:tcp_wrappers
+    depends_run-append  port:mysql_select
+
+    select.group        mysql
+    select.file         ${filespath}/${name_mysql}
+
+    build.dir           ${worksrcpath}/build_macports
     post-build {
         set dirs ${worksrcpath}/build_macports
         foreach dir ${dirs} {
@@ -145,6 +150,9 @@
             ${destroot}${prefix}/share/${name_mysql}/support-files/macports
         copy ${worksrcpath}/build_macports/macports/my.cnf \
             ${destroot}${prefix}/share/${name_mysql}/support-files/macports/
+        # Remove file supplied by ${name_mysql}-innodb-memcached-plugin subport.
+        delete ${destroot}${prefix}/share/${name_mysql}/innodb_memcached_config.sql
+
     }
 
     post-install {
@@ -258,3 +266,22 @@
 
     livecheck.type          none
 }
+
+subport ${name_mysql}-innodb-memcached-plugin {
+
+    revision            ${revision_innodb_memcached_plugin}
+    license             GPL-2
+    description         InnoDB Memcached Plugin for ${name_mysql}
+    long_description    ${description}
+
+    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
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140322/2be4769e/attachment-0001.html>