[134676] trunk/dports/databases/mysql55/Portfile

[pixilla at macports.org]

Revision: 134676
          https://trac.macports.org/changeset/134676
Author:   pixilla at macports.org
Date:     2015-04-02 18:58:43 -0700 (Thu, 02 Apr 2015)
Log Message:
-----------
databases/mysql55:
- Update version to 5.5.42.
- Use cmake.out_of_source. See #47197
- Minor organizational edits.

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

Modified: trunk/dports/databases/mysql55/Portfile
===================================================================
--- trunk/dports/databases/mysql55/Portfile	2015-04-02 23:33:15 UTC (rev 134675)
+++ trunk/dports/databases/mysql55/Portfile	2015-04-03 01:58:43 UTC (rev 134676)
@@ -5,7 +5,7 @@
 
 name                mysql55
 set name_mysql      ${name}
-version             5.5.38
+version             5.5.42
 # Set revision_client and revision_server to 0 if you bump version.
 set revision_client 0
 set revision_server 0
@@ -16,7 +16,7 @@
 maintainers         pixilla openmaintainer
 homepage            http://www.mysql.com/
 
-if {${subport} eq ${name}} {
+if {$subport eq $name} {
 
     PortGroup           archcheck 1.0
     PortGroup           cmake 1.0
@@ -30,13 +30,14 @@
     master_sites        mysql:MySQL-${version_branch}
 
     distname            mysql-${version}
+    cmake.out_of_source yes
     use_parallel_build  yes
 
     patch.pre_args      -p1
     patchfiles          patch-cmake-install_layout.cmake.diff
 
-    checksums           rmd160 57034b4b0642de0b08a4cf4e7e2641c775485e06 \
-                        sha256 61869633924ab243a3f676cf6b8feb66b672e3c07566a7190f0f1bb8c9b2fc81
+    checksums           rmd160  6dc47c5a885439a99585a0a8225a8e234a19e12e \
+                        sha256  887b12676be4893fa833e4a585c6c8b0c0f18dee30ba7d22cfe860cd85bfc74a
 
     depends_lib-append  port:zlib port:tcp_wrappers
     depends_run-append  port:mysql_select
@@ -47,27 +48,23 @@
     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
     }
 
-    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 \
@@ -89,8 +86,7 @@
                         -DWITH_SSL:STRING=no
 
     post-build {
-        set dirs ${worksrcpath}/build_macports
-        foreach dir ${dirs} {
+        foreach dir ${configure.dir} {
             reinplace -E {s|-arch [a-z0-9_]+||g} \
                 ${dir}/scripts/mysql_config \
                 ${dir}/scripts/mysqlbug
@@ -114,11 +110,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/
     }
 
@@ -189,7 +185,7 @@
 
     livecheck.type          regex
     livecheck.url           http://dev.mysql.com/downloads/mysql/${version_branch}.html
-    livecheck.regex         "<h1>MySQL Community Server (${version_branch}(\.\[0-9.\]+)?)</h1>"
+    livecheck.regex         "MySQL Community Server (${version_branch}(\.\[0-9.\]+)?)"
 }
 
 subport ${name_mysql}-server {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150402/4674831e/attachment.html>