<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f3ad97ec9f8ebfddf4dbd314df7c82f6b1834e69">https://github.com/macports/macports-ports/commit/f3ad97ec9f8ebfddf4dbd314df7c82f6b1834e69</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new f3ad97e  mariadb-10.2: fix checksums and submodule install
</span>f3ad97e is described below

<span style='display:block; white-space:pre;color:#808000;'>commit f3ad97ec9f8ebfddf4dbd314df7c82f6b1834e69
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Sep 20 09:11:54 2019 -0500

<span style='display:block; white-space:pre;color:#404040;'>    mariadb-10.2: fix checksums and submodule install
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/59065
</span>---
 databases/mariadb-10.2/Portfile                    | 25 ++++++----------------
 .../mariadb-10.2/files/patch-CMakeLists.txt.diff   |  2 +-
 2 files changed, 7 insertions(+), 20 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.2/Portfile b/databases/mariadb-10.2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bbefcdd..040cb22 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,37 +60,24 @@ if {$subport eq $name} {
</span>                  https://github.com/${submodule_github_author}/${submodule_github_project}/archive/${submodule_github_branch}:tagtwo
 
     checksums    ${main_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                 rmd160 05b5395d5f461061f1662016a8f6651aca38f90f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 sha256 80876d71fc1e136ec07d085e56ab922d33acfda9964e729aef8d30eb42281e95 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                 size   64533024 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 rmd160 35e8e88c92038561df0cd6155e1127c5a40c2080 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 sha256 75bcf29a80123338d5d2911de54d381244d1b85738790534b12633f4648866d2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 size   64510314 \
</span>                  ${submodule_distfile} \
                  rmd160 e5f149deecbc579addeeb9a36e17aa54131c681f \
                  sha256 72f63c54633460c6e9a087d2aaafd5719a1291c39363c071a2e352c74d44a292 \
                  size   745069
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # roughly replicate what's going on in the github PG post-extract
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # for the main tarball extract directory name. It doesn't work
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # here because we're using tags.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {[file exists [glob -nocomplain ${workpath}/${github.author}-${github.project}-*]] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                [file isdirectory [glob -nocomplain ${workpath}/${github.author}-${github.project}-*]]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ui_debug "move [glob ${workpath}/${github.author}-${github.project}-*] ${workpath}/${distname}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            move [glob ${workpath}/${github.author}-${github.project}-*] ${workpath}/${distname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # tarball is not "${github.author}-${github.project}-*"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ui_error "\n\NError: \${worksrcpath} for '${name}' does not exist after extracting distfiles. This might indicate that the author or project is different than set in the Portfile due to a rename at GitHub. Please examine the extracted directory in ${workpath} and try to correct the Portfile by either changing the author or project or adding the worksrcdir option with the correct directory name.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            return -code error "Unexpected github tarball extract."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    worksrcdir   server-${version_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    dist_subdir  ${name}/${version}_1
</span> 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-extract {
</span>         # put the submodule_github_project directory into position
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>         # remove the original directory
         ui_debug "delete ${worksrcpath}/libmariadb"
         delete ${worksrcpath}/libmariadb
         ui_debug "move ${workpath}/${submodule_distname} ${worksrcpath}/libmariadb"
         move ${workpath}/${submodule_distname} ${worksrcpath}/libmariadb
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     }
 
     depends_lib-append  port:zlib port:tcp_wrappers port:ncurses port:judy \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.2/files/patch-CMakeLists.txt.diff b/databases/mariadb-10.2/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b91f0ca..02b99c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.2/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.2/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@
</span>  SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
    ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/Internal/CPack)
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -263,6 +263,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -262,6 +262,9 @@
</span>  ELSEIF (NOT ENABLED_LOCAL_INFILE MATCHES "^(ON|OFF|AUTO)$")
    MESSAGE(FATAL_ERROR "ENABLED_LOCAL_INFILE must be one of OFF, ON, AUTO")
  ENDIF()
</pre><pre style='margin:0'>

</pre>