<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/80d6f506edce2b04a0d2b54bfadcda676127d4e4">https://github.com/macports/macports-ports/commit/80d6f506edce2b04a0d2b54bfadcda676127d4e4</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 80d6f506edc libiodbc: update to 3.52.16 (#19193)
</span>80d6f506edc is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 80d6f506edce2b04a0d2b54bfadcda676127d4e4
</span>Author: Mohamed Akram <mohd-akram@users.noreply.github.com>
AuthorDate: Sun Jun 25 23:34:52 2023 +0400

<span style='display:block; white-space:pre;color:#404040;'>    libiodbc: update to 3.52.16 (#19193)
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Clean up Portfile and build GUI using macOS-specific Makefile.
</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/67661
</span>---
 devel/libiodbc/Portfile                          | 84 +++++++++++++++++++-----
 devel/libiodbc/files/patch-mac-link-inclibs.diff | 17 +++++
 2 files changed, 85 insertions(+), 16 deletions(-)

<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 e6a7365a64f..8487d32fade 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,10 +4,11 @@ PortSystem          1.0
</span> PortGroup           github 1.0
 PortGroup           active_variants 1.1
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        openlink iODBC 3.52.15 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        openlink iODBC 3.52.16 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span> #override name (keep it lowercase)
 name                libiodbc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> categories          devel
 maintainers         {snc @nerdling} openmaintainer
 license             BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,26 +16,27 @@ description         Independent Open DataBase Connectivity
</span> long_description    iODBC is the acronym for Independent Open DataBase Connectivity, \
                     an Open Source platform independent implementation of both the \
                     ODBC and X/Open specifications.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms           darwin
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  60a54f0f032e98c3dd56190044202e7d942a9eeb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  40c96973dfa02725f3e338eeed2f735e662eeb59de43a58ec871a34dc64c698d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    659032
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname            ${name}-${version}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append    port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  5b8a762b5df534f2a10a61fa80ddfe4144bed8cf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  3898b32d07961360f6f2cf36db36036b719a230e476469258a80f32243e845fa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    1086850
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   patch-iodbcinst-unicode.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-iodbcinst-unicode.h.diff patch-mac-link-inclibs.diff
</span> 
 configure.args-append   --disable-libodbc
 
 variant libodbc description {install extra libodbc.a library} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-replace --disable-libodbc --enable-libodbc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts           unixODBC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-replace  --disable-libodbc --enable-libodbc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-delete   --includedir=${prefix}/include/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts               unixODBC
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 conflicts gui {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     depends_lib-append  port:atk \
                         path:lib/pkgconfig/cairo.pc:cairo \
                         port:fontconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,11 +64,61 @@ variant x11 {
</span>     configure.args-delete   --disable-gui
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +x11 +libodbc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gui conflicts x11 description {install admin GUI} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@IODBC_VERSION@|${version}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/mac/iodbc-config.macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|/usr/local/iODBC|${prefix}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/mac/iodbc-config.macos \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/mac/link-inclibs.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|/Applications|${applications_dir}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            {*}[glob ${worksrcpath}/mac/*/*/project.pbxproj] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            {*}[glob ${worksrcpath}/mac/*/*/*/project.pbxproj]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|/Library/Application Support/iODBC/bin|${prefix}/bin|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace -E "s|(\[ \")])/Library/Frameworks|\\1${frameworks_dir}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/mac/GNUmakefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/mac/link-inclibs.sh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            {*}[glob ${worksrcpath}/mac/*/*/project.pbxproj] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            {*}[glob ${worksrcpath}/mac/*/*/*/project.pbxproj]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace -E "s|(MACOSX_DEPLOYMENT_TARGET) = 10.9|\\1 = ${macosx_deployment_target}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            {*}[glob ${worksrcpath}/mac/*/*/project.pbxproj] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            {*}[glob ${worksrcpath}/mac/*/*/*/project.pbxproj]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    use_xcode           yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.dir           ${worksrcpath}/mac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.args          MODEL="Deployment -IDECustomDerivedDataLocation=${workpath}/DerivedData"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {${os.major} >= 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            build.args-append   IODBC_32BIT=x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    system -W ${worksrcpath} "sh ./autogen.sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    destroot.args       {*}${build.args}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        copy ${worksrcpath}/man/iodbc-config.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/man/iodbctest.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/man/iodbctestw.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[variant_isset libodbc]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ln -s libiodbc.dylib ${destroot}${prefix}/lib/libodbc.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xinstall -d ${destroot}${prefix}/include/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            move {*}[glob ${destroot}${prefix}/include/*.h] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${destroot}${prefix}/include/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +gui +libodbc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append   --disable-gui \
                         --includedir=${prefix}/include/${name} \
                         --with-iodbc-inidir=${prefix}/etc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libiodbc/files/patch-mac-link-inclibs.diff b/devel/libiodbc/files/patch-mac-link-inclibs.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..36aef8f99d1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libiodbc/files/patch-mac-link-inclibs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mac/link-inclibs.sh.orig       2023-06-21 23:48:02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mac/link-inclibs.sh    2023-06-22 00:07:13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,14 +80,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INST_FW="/opt/local/Library/Frameworks/iODBCinst.framework"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#  Remove old installation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ -d "$PREFIX" ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  rm -rf "$PREFIX"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #  Create new directory structure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span></pre><pre style='margin:0'>

</pre>