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

pixilla at macports.org pixilla at macports.org
Wed Apr 1 15:35:51 PDT 2015


Revision: 134646
          https://trac.macports.org/changeset/134646
Author:   pixilla at macports.org
Date:     2015-04-01 15:35:51 -0700 (Wed, 01 Apr 2015)
Log Message:
-----------
databases/mysql56:
- Use cmake.out_of_source. See #47197
- Minor organizational edits.

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

Modified: trunk/dports/databases/mysql56/Portfile
===================================================================
--- trunk/dports/databases/mysql56/Portfile	2015-04-01 21:52:39 UTC (rev 134645)
+++ trunk/dports/databases/mysql56/Portfile	2015-04-01 22:35:51 UTC (rev 134646)
@@ -18,14 +18,22 @@
 license             GPL-2
 maintainers         pixilla openmaintainer
 homepage            http://www.mysql.com/
-master_sites        mysql:MySQL-${version_branch}
 
-if {${subport} eq ${name_mysql}} {
+if {$subport eq $name} {
 
     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}
+    cmake.out_of_source yes
     use_parallel_build  yes
 
     patch.pre_args      -p1
@@ -58,24 +66,30 @@
     checksums           rmd160  90e1b18264493434d986f39962d249c176b8469a \
                         sha256  3bd21af06a9304e372daba41fa5612bb54ac1bc05a4349b3160d0cda972ac098
 
+    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 {
-        file mkdir ${worksrcpath}/build_macports/macports
+        file mkdir ${configure.dir}/macports
         copy ${filespath}/macports-default.cnf \
             ${filespath}/my.cnf \
-            ${worksrcpath}/build_macports/macports/
+            ${configure.dir}/macports/
     }
 
     post-patch {
         reinplace "s|@NAME@|${name_mysql}|g" \
             ${worksrcpath}/cmake/install_layout.cmake
         reinplace "s|@NAME@|${name_mysql}|g" \
-            ${worksrcpath}/build_macports/macports/macports-default.cnf \
-            ${worksrcpath}/build_macports/macports/my.cnf
+            ${configure.dir}/macports/macports-default.cnf \
+            ${configure.dir}/macports/my.cnf
         reinplace "s|@PREFIX@|${prefix}|g" \
-            ${worksrcpath}/build_macports/macports/macports-default.cnf \
-            ${worksrcpath}/build_macports/macports/my.cnf
+            ${configure.dir}/macports/macports-default.cnf \
+            ${configure.dir}/macports/my.cnf
         reinplace "s|@SYSCONFDIR@|/etc/${name_mysql}|g" \
             ${worksrcpath}/scripts/mysql_install_db.pl.in
         reinplace "s|@SUPPORTFILESDIR@|share/${name_mysql}/support-files|g" \
@@ -84,8 +98,6 @@
             ${worksrcpath}/scripts/mysql_secure_installation.pl.in
     }
 
-    configure.dir       ${worksrcpath}/build_macports
-    configure.cmd       cmake ..
     configure.args-delete \
                         -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
     configure.args-append \
@@ -107,33 +119,7 @@
                         -DWITH_INNODB_MEMCACHED=1
     configure.cppflags-delete \
                         -I${prefix}/include
-}
 
-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} {
-            reinplace -E {s|-arch [a-z0-9_]+||g} \
-                ${dir}/scripts/mysql_config \
-                ${dir}/scripts/mysqlbug
-        }
-    }
-
     post-destroot {
         # proc portdestroot::destroot_finish fails to find and compress our man pages
         # so borrow the compress command and run on our files now.
@@ -151,11 +137,11 @@
         }
         xinstall -m 755 -o root -d \
             ${destroot}${prefix}/etc/${name_mysql}
-        copy ${worksrcpath}/build_macports/macports/macports-default.cnf \
+        copy ${configure.dir}/macports/macports-default.cnf \
             ${destroot}${prefix}/etc/${name_mysql}/
         xinstall -m 755 -o root -d \
             ${destroot}${prefix}/share/${name_mysql}/support-files/macports
-        copy ${worksrcpath}/build_macports/macports/my.cnf \
+        copy ${configure.dir}/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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150401/fb1650a4/attachment.html>


More information about the macports-changes mailing list