<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/1f5119a6a3dd2f057801dc76c7a89bdc11113c5d">https://github.com/macports/macports-ports/commit/1f5119a6a3dd2f057801dc76c7a89bdc11113c5d</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 1f5119a6a3d muscle: update to 5.1
</span>1f5119a6a3d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1f5119a6a3dd2f057801dc76c7a89bdc11113c5d
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Thu Nov 18 09:14:55 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> muscle: update to 5.1
</span>---
science/muscle/Portfile | 40 ++++++++-------
science/muscle/files/patch-Makefile.diff | 65 +++++++++++++++---------
science/muscle/files/patch-gitver.txt.diff | 4 ++
science/muscle/files/patch-no-zero-redefine.diff | 51 +++++++++++++++++++
science/muscle/files/patch-subfams.cpp.diff | 38 --------------
5 files changed, 116 insertions(+), 82 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/muscle/Portfile b/science/muscle/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0af561b2e9d..0876a07c9fa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/muscle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/muscle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +1,39 @@
</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:#e0ffe0;'>+PortGroup github 1.0
</span> PortGroup makefile 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name muscle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.8.1551
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup rcedgar muscle 5.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories science
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license public-domain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3
</span> maintainers {reneeotten @reneeotten} openmaintainer
description A program for multiple sequence alignment with high accuracy and high throughput
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://drive5.com/muscle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname muscle_src_${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://drive5.com/muscle5
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3fe31297b1aed972fc95f0c238129e918e4d0197 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c70c552231cd3289f1bad51c9bd174804c18bb3adcf47f501afec7a68f9c482e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 190019
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7c677354cf9974e8f7a8e5b9873250b8123059fb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 091d9f8733b92ff106c2a8eb274d1e5a57960d397a2068d8638d6002e8880dab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 183891
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.mkdir yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.openmp_version 2.5
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-subfams.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-gitver.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-zero-redefine.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -W ${worksrcpath} muscle ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@VERSION@@|\"${version}\"|g" ${worksrcpath}/src/gitver.txt
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}/downloads.htm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}_src_(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.dir ${worksrcpath}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -W ${worksrcpath}/src/Darwin muscle ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/muscle/files/patch-Makefile.diff b/science/muscle/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 04e2301c6f5..b0b6067c4cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/muscle/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/muscle/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +1,41 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2020-03-02 22:27:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2020-03-02 22:27:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,9 +9,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # On OSX, using -static gives the error "ld: can't locate file for: -lcrt0.o",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this is fixed by deleting "-static" from the LDLIBS line.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS = -O3 -funroll-loops -Winline -DNDEBUG=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LDLIBS = -lm -static
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# LDLIBS = -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS += -O3 -funroll-loops -Winline -DNDEBUG=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDLIBS = -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJ = .o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXE =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,9 +18,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RM = rm -f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CP = cp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GPP = g++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GPP = $(CXX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LD = $(GPP) $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CPP = $(GPP) -c $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CPP = $(GPP) -c $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: muscle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2022-01-26 09:52:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2022-01-26 09:53:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,13 +20,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS := $(CPPFLAGS) -DNDEBUG -pthread
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX := g++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CXX := g++-11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXXFLAGS := $(CXXFLAGS) -O3 -fopenmp -ffast-math
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXXFLAGS := $(CXXFLAGS) -fopenmp -ffast-math
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LDFLAGS := $(LDFLAGS) -O3 -fopenmp -pthread -lpthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS := $(LDFLAGS) -fopenmp -pthread -lpthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(OS),Linux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS += -static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,15 +34,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PHONY: clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$(OS)/muscle : gitver.txt $(OS)/ $(OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$(OS)/muscle : $(OS)/ $(OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) $(LDFLAGS) $(OBJS) -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Warning: do not add -d option to strip, this is not portable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strip $(OS)/muscle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-gitver.txt : $(SRCS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bash ./gitver.bash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(OS)/ :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p $(OS)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,4 +47,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clean:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -rf gitver.txt $(OS)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -rf $(OS)/
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/muscle/files/patch-gitver.txt.diff b/science/muscle/files/patch-gitver.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5adfbed88cd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/muscle/files/patch-gitver.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null 2022-01-26 09:42:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gitver.txt 2022-01-26 09:41:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@@VERSION@@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/muscle/files/patch-no-zero-redefine.diff b/science/muscle/files/patch-no-zero-redefine.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4e0e082af34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/muscle/files/patch-no-zero-redefine.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,51 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Avoid redefining "zero" as this will result in error messages like:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/opt/local/libexec/llvm-9.0/bin/../include/c++/v1/__mutex_base:397:25: error: too few arguments provided to function-like macro invocation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (__d <= __d.zero())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ┆ ┆ ┆ ┆ ┆ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+./myutils.h:359:9: note: macro 'zero' defined here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define zero(a, n) memset((a), 0, (n)*sizeof(a[0]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/countsort.h.orig 2021-11-23 16:01:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/countsort.h 2021-11-23 16:01:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CountSortMem()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_MaxValueCount = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- zero(m_Vecs, NVEC);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ muscle_zero(m_Vecs, NVEC);
</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;'>+ void Free()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/myutils.cpp.orig 2021-11-23 16:01:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/myutils.cpp 2021-11-23 16:02:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -798,7 +798,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned NewThreadStrCount = ThreadIndex + 4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char **NewThreadStrs = myalloc(char *, NewThreadStrCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- zero(NewThreadStrs, NewThreadStrCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ muscle_zero(NewThreadStrs, NewThreadStrCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (g_ThreadStrCount > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(NewThreadStrs, g_ThreadStrs, g_ThreadStrCount*sizeof(char *));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_ThreadStrs = NewThreadStrs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/myutils.h.orig 2021-11-23 16:02:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/myutils.h 2021-11-23 16:02:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -356,7 +356,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define asserteq(x, y) assert(feq(x, y))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define assertaeq(x, y) asserta(feq(x, y))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define zero(a, n) memset((a), 0, (n)*sizeof(a[0]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define muscle_zero(a, n) memset((a), 0, (n)*sizeof(a[0]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define memset_zero(a, n) memset((a), 0, (n)*sizeof(a[0]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void ResetRand(unsigned Seed);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/ensemble.cpp.orig 2021-11-23 16:03:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/ensemble.cpp 2021-11-23 16:03:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ M.GetLabelToSeqIndex(Labels2, LabelToSeqIndex2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char **szSeqsSorted = myalloc(char *, SeqCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- zero(szSeqsSorted, SeqCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ muscle_zero(szSeqsSorted, SeqCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (uint SeqIndex = 0; SeqIndex < SeqCount; ++SeqIndex)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const string &Label = Labels2[SeqIndex];
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/muscle/files/patch-subfams.cpp.diff b/science/muscle/files/patch-subfams.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5b88e7a6401..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/muscle/files/patch-subfams.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Patch to avoid the error message below:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subfams.cpp:4:13: error: functions that differ only in their return type cannot be overloaded
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-const float INFINITY = float(1e29);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ~~~~~ ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/math.h:68:21: note: expanded from macro 'INFINITY'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define INFINITY HUGE_VALF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/math.h:58:28: note: expanded from macro 'HUGE_VALF'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# define HUGE_VALF __builtin_huge_valf()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/Library/Developer/CommandLineTools/usr/bin/../include/c++/v1/limits:332:90: note: previous implicit declaration is here
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return __builtin_huge_valf();}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-1 error generated.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See: https://trac.macports.org/ticket/61296
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- subfams.cpp.orig 2021-05-09 21:08:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ subfams.cpp 2021-05-09 21:09:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "muscle.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "distfunc.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--const float INFINITY = float(1e29);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+const float FAR_AWAY_DISTANCE = float(1e29); // (old name was: INFINITY; clashed with math.h on OSX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const unsigned NILL = uInsane;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static float *ShortestPathEstimate;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,7 +43,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (unsigned i = 0; i < uNodeCount; ++i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ShortestPathEstimate[i] = INFINITY;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ShortestPathEstimate[i] = FAR_AWAY_DISTANCE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Predecessor[i] = NILL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ShortestPathEstimate[uIndex] = 0;
</span></pre><pre style='margin:0'>
</pre>