<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/f9a758b8aac5f6900bb2f23fd3868115e7b5e6dd">https://github.com/macports/macports-ports/commit/f9a758b8aac5f6900bb2f23fd3868115e7b5e6dd</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 f9a758b mariadb-10.2: make libxml2 a top-level dependency again
</span>f9a758b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f9a758b8aac5f6900bb2f23fd3868115e7b5e6dd
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sat Dec 21 06:33:39 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> mariadb-10.2: make libxml2 a top-level dependency again
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove +connect_with_libxml2 variant.
</span><span style='display:block; white-space:pre;color:#404040;'> Rev-bump just in case.
</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/59850
</span>---
databases/mariadb-10.2/Portfile | 27 +++++----------------------
1 file changed, 5 insertions(+), 22 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 4f00ed6..21ff362 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;'>@@ -11,7 +11,7 @@ set version_branch [join [lrange [split ${version} .] 0 1] .]
</span> # Please set revision_client and revision_server to 0 if you bump
# version; these can be changed independently for the 2 subports, but
# can be changed at the same time if that's what's required.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_client 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 1
</span> set revision_server 0
categories databases
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +81,7 @@ if {$subport eq $name} {
</span> }
depends_lib-append port:zlib port:tcp_wrappers port:ncurses port:judy \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libssl.dylib:openssl port:libxml2
</span> depends_run-append port:mysql_select
select.group mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,7 +136,8 @@ if {$subport eq $name} {
</span> -DWITH_SSL_PATH=${prefix} \
-DMYSQL_MAINTAINER_MODE:STRING=AUTO \
-DICONV_LIBRARIES=${prefix}/lib/libiconv.dylib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DICONV_INCLUDE_DIR:PATH=${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DICONV_INCLUDE_DIR:PATH=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCONNECT_WITH_LIBXML2=ON
</span>
post-destroot {
# proc portdestroot::destroot_finish fails to find and compress our man pages
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,7 +191,6 @@ if {$subport eq $name} {
</span> }
variant system_readline description {Use system readline instead of bundled readline} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Add readline support.
# "-DWITH_READLINE:BOOL=OFF" has the peculiar meaning "do not use the bundled copy
# of readline but use the system's (i.e. MacPorts') copy of readline"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -199,23 +199,6 @@ if {$subport eq $name} {
</span> configure.args-append -DWITH_READLINE:BOOL=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant connect_with_libxml2 description {Compile CONNECT storage engine with LIBXML2 support} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset connect_with_libxml2]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # requires libxml2, which in turn requires ICU. As of MP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # commit 134cb9c9, if the project using libxml2 (here MariaDB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 10.2) is compiling using C++, then the libxml2 header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # directs the ICU header to hide its C++ API if the C++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # standard version in use is older than that with which ICU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # was built. Hence, we don't have to worry about the C++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # standard version here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libxml2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCONNECT_WITH_LIBXML2=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCONNECT_WITH_LIBXML2=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> notes "
On activation if no ${prefix}/etc/${name_mysql}/my.cnf file exists one
will be created which loads
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -277,7 +260,7 @@ subport ${name_mysql}-server {
</span> reinplace "s|@GROUP@|${mysqluser}|g" \
${workpath}/org.macports.${subport}.plist
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
build {}
</pre><pre style='margin:0'>
</pre>