<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5f7ee976cc0177fc12110e6010a86817980f8d9f">https://github.com/macports/macports-ports/commit/5f7ee976cc0177fc12110e6010a86817980f8d9f</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 5f7ee976cc0 ncbi_tools: update to fix compilation on macOS 15
</span>5f7ee976cc0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5f7ee976cc0177fc12110e6010a86817980f8d9f
</span>Author: Brian D. Weitzner <brian.weitzner@gmail.com>
AuthorDate: Wed Sep 18 19:39:03 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> ncbi_tools: update to fix compilation on macOS 15
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update patch to enable compilation on macOS 15
</span><span style='display:block; white-space:pre;color:#404040;'> * remove platform statement from portfile
</span>---
science/ncbi_tools/Portfile | 1 -
science/ncbi_tools/files/patch-fix-build.diff | 78 ++++++++++++++++++++++++++-
2 files changed, 76 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncbi_tools/Portfile b/science/ncbi_tools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 34f9d181bd3..ebcc50b8401 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ncbi_tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ncbi_tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,6 @@ PortSystem 1.0
</span>
name ncbi_tools
categories science
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license public-domain
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncbi_tools/files/patch-fix-build.diff b/science/ncbi_tools/files/patch-fix-build.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2c5f3e212c2..82c8b8fad9a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ncbi_tools/files/patch-fix-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ncbi_tools/files/patch-fix-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,12 +44,12 @@
</span> +++ ncbi/corelib/ncbimisc.c 2021-05-21 18:20:54.000000000 -0700
@@ -1266,7 +1266,7 @@
if (len < 1) return NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> rsult = (Nlm_CharPtr) MemNew (len + 3);
- if (rsult == NULL) return;
+ if (rsult == NULL) return NULL;
tmp = rsult;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> for (i = 0; /* local [i] != NULL */ i < numitems; i++) {
--- ncbi/make/makedis.csh 23 Mar 2009 17:10:14 -0000
+++ ncbi/make/makedis.csh 9 Nov 2009 18:44:01 -0000
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,3 +62,77 @@
</span> breaksw
case NetBSD:
set platform=netbsd
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ncbi/corelib/ncbimain.c.orig 2002-07-09 09:20:17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ncbi/corelib/ncbimain.c 2024-09-18 14:28:01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,7 +75,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * setups argc and argv
</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;'>+-#ifdef OS_MSWIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined OS_MSWIN || defined OS_UNIX_DARWIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ncbi/tools/kappa.c.orig 2012-04-30 06:45:01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ncbi/tools/kappa.c 2024-09-18 14:58:32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2197,7 +2197,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Callbacks used by Blast_RedoOneMatch and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Blast_RedoOneMatchSmithWaterman */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static const Blast_RedoAlignCallbacks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const Blast_RedoAlignCallbacks *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ redo_align_callbacks = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Kappa_CalcLambda,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Kappa_SequenceGetRange,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ncbi/tools/ncbisort.c.orig 2006-05-10 14:47:17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ncbi/tools/ncbisort.c 2024-09-18 14:40:01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -689,7 +689,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ of the fraction. Strings not of this form are considered to be zero. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static Int4 SORTFracCompare(register UcharPtr a, register UcharPtr b)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- register tmpa = UCHAR(*a), tmpb = UCHAR(*b);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ register int tmpa = UCHAR(*a), tmpb = UCHAR(*b);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tmpa == '.' && tmpb == '.') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ncbi/tools/pattern1.c.orig 2006-08-04 15:11:17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ncbi/tools/pattern1.c 2024-09-18 14:42:18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -741,7 +741,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*Do a word-by-word bit-wise or of a and b and put the result in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result; return 1 if there are any non-zero words*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static and(Int4 *result, Int4 *a, Int4 *b, patternSearchItems *patternSearch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static Int4 and(Int4 *result, Int4 *a, Int4 *b, patternSearchItems *patternSearch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Int4 i; /*index over words*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Int4 returnValue = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ncbi/api/asn2ff4.c.orig 2001-10-02 10:13:15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ncbi/api/asn2ff4.c 2024-09-18 14:36:13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1344,7 +1344,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Compare two ImpFeats by name and location
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * returns 1 for matching features otherwise returns 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ******************************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static CmpImpFeat (ImpFeatPtr f1, ImpFeatPtr f2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int CmpImpFeat (ImpFeatPtr f1, ImpFeatPtr f2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (f1 == NULL && f2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ncbi/api/asn2ff2.c.orig 2024-09-18 22:02:18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ncbi/api/asn2ff2.c 2024-09-18 22:36:29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -220,6 +220,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <utilpub.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ffprint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <seqmgr.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdbool.h>
</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;'>+ NLM_EXTERN Int2 GetGenDate PROTO ((Asn2ffJobPtr ajp, GBEntryPtr gbp, CharPtr buffer));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1355,7 +1356,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return newstring;
</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;'>+-static ChoicePID(SeqIdPtr sid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static bool ChoicePID(SeqIdPtr sid)
</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;'>+ DbtagPtr db;
</span></pre><pre style='margin:0'>
</pre>