<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/114408df7294c8077101c507fde4585de1964576">https://github.com/macports/macports-ports/commit/114408df7294c8077101c507fde4585de1964576</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 114408df729 openldap: reconcile patches with openldap-devel
</span>114408df729 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 114408df7294c8077101c507fde4585de1964576
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu Jul 28 12:22:56 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> openldap: reconcile patches with openldap-devel
</span>---
.../openldap/files/patch-dynamic_lookup-11.diff | 40 +++++++---------------
databases/openldap/files/patch-ltmain.diff | 22 ++++++------
2 files changed, 24 insertions(+), 38 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/openldap/files/patch-dynamic_lookup-11.diff b/databases/openldap/files/patch-dynamic_lookup-11.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index eff85397cd4..1a692ae0a19 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/openldap/files/patch-dynamic_lookup-11.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/openldap/files/patch-dynamic_lookup-11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +1,15 @@
</span> Handle macOS 11 and later properly. Based on patch in libtool port.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2020-04-28 09:05:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2020-08-06 18:33:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9425,19 +9425,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rhapsody* | darwin1.[012])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- allow_undefined_flag='${wl}-undefined ${wl}suppress'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *) # Darwin 1.3 on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ darwin1.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case ${MACOSX_DEPLOYMENT_TARGET} in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.[012])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case ${MACOSX_DEPLOYMENT_TARGET},$host in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 10.[012],*|,*powerpc*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2021-10-27 12:30:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-10-27 12:37:51.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9211,9 +9211,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.[012][,.]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 10.[012][,.]*|,*powerpc*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span> esac
<span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_cmds_need_lc=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/openldap/files/patch-ltmain.diff b/databases/openldap/files/patch-ltmain.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 92febde8837..8a077e8cada 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/openldap/files/patch-ltmain.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/openldap/files/patch-ltmain.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/ltmain.sh.orig 2009-01-21 18:00:41.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/ltmain.sh 2010-01-21 15:46:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2610,7 +2610,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { test "$use_static_libs" = no || test -z "$old_library"; }; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$installed" = no; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notinst_deplibs="$notinst_deplibs $lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- need_relink=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ need_relink=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is a shared library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build/ltmain.sh.orig 2021-10-25 13:06:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build/ltmain.sh 2021-10-27 12:17:55.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8140,7 +8140,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test no = "$installed"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ func_append notinst_deplibs " $lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- need_relink=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ need_relink=no
</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;'>+ esac
</span></pre><pre style='margin:0'>
</pre>