<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1621b9a16f7b471720b497e2dc3e5405fc564b7b">https://github.com/macports/macports-ports/commit/1621b9a16f7b471720b497e2dc3e5405fc564b7b</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 1621b9a16f7 openldap-devel: reconcile with openldap
</span>1621b9a16f7 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 1621b9a16f7b471720b497e2dc3e5405fc564b7b
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Nov 23 12:19:57 2024 -0500

<span style='display:block; white-space:pre;color:#404040;'>    openldap-devel: reconcile with openldap
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://github.com/macports/macports-ports/pull/26700
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/71379
</span>---
 databases/openldap-devel/Portfile                     | 18 +++++++++++-------
 databases/openldap-devel/files/patch-soelim-name.diff | 13 +++++++++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/openldap-devel/Portfile b/databases/openldap-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 457225be613..f1badc6feba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/openldap-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/openldap-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,6 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           compiler_blacklist_versions 1.0
</span> PortGroup           muniversal 1.0
 PortGroup           legacysupport 1.1
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +8,7 @@ name                openldap-devel
</span> conflicts           openldap
 set my_name         openldap
 version             2.6.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> 
 checksums           rmd160  84ad02add29add7d1e33716731a9139fa982f09c \
                     sha256  48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +35,9 @@ extract.suffix      .tgz
</span> legacysupport.newest_darwin_requires_legacy \
                     16
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# ../slap-config.h:182: error: redefinition of typedef ‘ConfigArgs’
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append \
                     port:cyrus-sasl2 \
                     port:db48 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +55,7 @@ patchfiles-append   patch-ltmain.diff
</span> patchfiles-append   patch-dynamic_lookup-11.diff
 patchfiles-append   patch-fix_implicit.diff
 patchfiles-append   patch-libressl.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Use 'gdate', rather than 'date', for tests
 patchfiles-append   patch-tests-gdate.diff
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,8 +77,13 @@ platform darwin {
</span>     if {${os.major} >= 22} {
         # The openldap build uses soelim from groff, and newer OS versions do
         # not provide groff as part of the base OS install.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Replace soelim command from heavy port groff with lightweight mandoc.
</span>         depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:groff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:mandoc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Use command 'msoelim', rather than 'soelim', when using `mandoc`.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append   patch-soelim-name.diff
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,10 +101,6 @@ configure.args-append \
</span>                     --with-fetch \
                     --with-tls
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# slap-config.h: error: redefinition of typedef ‘ConfigArgs’
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    *gcc-4.0 *gcc-4.2 {clang < 421}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> startupitem.create  yes
 startupitem.name    slapd
 startupitem.init    "PID=${prefix}/var/run/slapd.pid"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/openldap-devel/files/patch-soelim-name.diff b/databases/openldap-devel/files/patch-soelim-name.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0f9f424117f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/openldap-devel/files/patch-soelim-name.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Replace soelim command from heavy port groff with lightweight mandoc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build/top.mk.orig      2024-05-21 11:19:11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build/top.mk   2024-11-21 16:43:14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -153,7 +153,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MANCOMPRESS=$(CAT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MANCOMPRESSSUFFIX=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SOELIM=soelim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SOELIM=msoelim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDEDIR= $(top_srcdir)/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDAP_INCPATH= -I$(LDAP_INCDIR) -I$(INCLUDEDIR)
</span></pre><pre style='margin:0'>

</pre>