<pre style='margin:0'>
Jeremy Lavergne (nerdling) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2fc686d75679397013381ad49dde2771c14d6297">https://github.com/macports/macports-ports/commit/2fc686d75679397013381ad49dde2771c14d6297</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 2fc686d7567 unixODBC: conditionally conflict with libiodbc (#8282)
</span>2fc686d7567 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2fc686d75679397013381ad49dde2771c14d6297
</span>Author: Jeremy Lavergne <snc@macports.org>
AuthorDate: Sun Sep 6 13:51:48 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> unixODBC: conditionally conflict with libiodbc (#8282)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> libiodbc: avoid default conflicts with unixODBC
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * reword variant description from .so to .a
</span><span style='display:block; white-space:pre;color:#404040;'> * fix typo in default variants
</span><span style='display:block; white-space:pre;color:#404040;'> * change include dir
</span><span style='display:block; white-space:pre;color:#404040;'> * conditionally conflict with unixODBC
</span><span style='display:block; white-space:pre;color:#404040;'> * bump revision due to changes to installed files
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes https://trac.macports.org/ticket/55661
</span>---
databases/unixODBC/Portfile | 5 ++++-
devel/libiodbc/Portfile | 10 +++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/unixODBC/Portfile b/databases/unixODBC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b183a26482d..db500d2cdf7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/unixODBC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/unixODBC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,10 @@
</span> PortSystem 1.0
name unixODBC
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts libiodbc virtuoso virtuoso-7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts virtuoso virtuoso-7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[file exists ${prefix}/lib/libodbc.a]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append libiodbc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> version 2.3.7
revision 1
checksums rmd160 ebbd9e9cee6888779e572b8a32596f49a8bdad2d \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libiodbc/Portfile b/devel/libiodbc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d43f0fec7c0..a00e89bd4a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libiodbc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libiodbc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,12 +4,10 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts unixODBC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> github.setup openlink iODBC 3.52.13 v
#override name (keep it lowercase)
name libiodbc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories devel
maintainers {snc @nerdling} openmaintainer
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +29,9 @@ patchfiles-append patch-iodbcinst-unicode.h.diff
</span>
configure.args-append --disable-libodbc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant libodbc description {install extra libodbc.so library} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant libodbc description {install extra libodbc.a library} {
</span> configure.args-replace --disable-libodbc --enable-libodbc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts unixODBC
</span> }
variant x11 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,12 +62,13 @@ variant x11 {
</span> configure.args-delete --disable-gui
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +x11 +libiodbc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +x11 +libodbc
</span>
pre-configure {
system -W ${worksrcpath} "sh ./autogen.sh"
}
configure.args-append --disable-gui \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --includedir=${prefix}/include/${name} \
</span> --with-iodbc-inidir=${prefix}/etc
# make[2]: *** No rule to make target `../iodbcadm/libiodbcadm.la', needed by `iodbcadm-gtk'. Stop.
</pre><pre style='margin:0'>
</pre>