<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/88084c72ad96359ca935f0dada1dab9432dc9241">https://github.com/macports/macports-ports/commit/88084c72ad96359ca935f0dada1dab9432dc9241</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 88084c7 mariadb-10.0: move to cmake 1.1 PG
</span>88084c7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 88084c72ad96359ca935f0dada1dab9432dc9241
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Sep 17 09:55:55 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> mariadb-10.0: move to cmake 1.1 PG
</span>---
databases/mariadb-10.0/Portfile | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.0/Portfile b/databases/mariadb-10.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e837337..30627f4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ maintainers {michaelld @michaelld} openmaintainer
</span>
if {$subport eq $name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup cmake 1.1
</span> PortGroup select 1.0
PortGroup cxx11 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +33,6 @@ if {$subport eq $name} {
</span> description Multithreaded SQL database server
long_description Mariadb is a fork of the MySQL server, a multi-threaded SQL database.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patch.pre_args -p1
patchfiles patch-cmake-install_layout.cmake.diff \
patch-CMakeLists.txt.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +51,14 @@ if {$subport eq $name} {
</span> select.group mysql
select.file ${filespath}/${name_mysql}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # override the cmake PG's build type setting, as Mariadb doesn't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build using 'MacPorts' for this setting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.build_type Debug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.build_type Release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-extract {
file mkdir ${cmake.build_dir}/macports
copy ${filespath}/macports-default.cnf \
</pre><pre style='margin:0'>
</pre>