<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/c389d839fbd5599c2b6d088b5f7447cc44edf82c">https://github.com/macports/macports-ports/commit/c389d839fbd5599c2b6d088b5f7447cc44edf82c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c389d839fbd5599c2b6d088b5f7447cc44edf82c
</span>Author: Brian D. Weitzner <brian.weitzner@gmail.com>
AuthorDate: Wed May 26 13:03:32 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> ncbi_tools: update to version 20120620
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to version 20120620
</span><span style='display:block; white-space:pre;color:#404040;'> * add new patch file to fix compilation issues
</span><span style='display:block; white-space:pre;color:#404040;'> * remove outdated patch files
</span><span style='display:block; white-space:pre;color:#404040;'> * update Portfile to copy the correct binaries and data files
</span><span style='display:block; white-space:pre;color:#404040;'> * fixing remaining warnings in portfile
</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/19513
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62513
</span>---
science/ncbi_tools/Portfile | 57 ++++++++++++++-----
science/ncbi_tools/files/c-toolkit-no-carbon.patch | 60 --------------------
science/ncbi_tools/files/darwin.ncbi.mk.diff | 13 -----
science/ncbi_tools/files/patch-fix-build.diff | 64 ++++++++++++++++++++++
4 files changed, 108 insertions(+), 86 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 e42aba85c2d..9064a0d8db4 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;'>@@ -1,52 +1,79 @@
</span> PortSystem 1.0
name ncbi_tools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20080302
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20120620
</span> description blast is a set of tools for doing nucleotide and protein searches
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license public-domain
</span> categories science
platforms darwin
homepage https://www.ncbi.nlm.nih.gov/blast/
fetch.use_epsv no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ftp://ftp.ncbi.nlm.nih.gov/toolbox/ncbi_tools/old/20080302
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ftp://ftp.ncbi.nlm.nih.gov/toolbox/ncbi_tools/old/${version}
</span> distfiles ncbi.tar.gz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 f8de9d7264aed7de1d87d2185df2e07c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 e84826b8d390ca1ec6d0dfcaaf4cb6aa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 603c9a4ade2a6f2f8e412558b732924d78fae403d225706e2ac38d553b08073c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b37a6eda9f370d02632c1497cd66a3ca64aa0a36 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 68428744
</span> dist_subdir ${name}/${version}
extract.mkdir yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles darwin.ncbi.mk.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *64* $build_arch]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append c-toolkit-no-carbon.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-fix-build.diff
</span>
use_configure no
use_parallel_build no
build.cmd './ncbi/make/makedis.csh'
build.target
set binaries "blastall dosimple gil2bin \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-asn2ff blastall_old entrcmd idfetch seedtop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+asn2ff entrcmd idfetch seedtop \
</span> asn2gb blastcl3 impala seqtest \
asn2idx blastclust errhdr indexpub tbl2asn \
asn2xml blastpgp fa2htgs makemat test_regexp \
asndhuff cdscan fastacmd makeset testcore \
asntool checksub findspl megablast testobj \
bl2bag.cgi copymat formatdb ncbisort testval \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-bl2seq formatrpsdb nph-viewgif.cgi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-blast debruijn gene2xml vecscreen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bl2seq formatrpsdb nph-viewgif.cgi taxblast \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+debruijn gene2xml vecscreen \
</span> demo_regexp getmesh wblast2.REAL \
demo_regexp_grep getpub rpsblast wblast2_cs.REAL"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set manpages "Psequin.1 asnval.1 cleanasn.1 formatdb.1 insdseqget.1 tbl2asn.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set manpages "Psequin.1 asnval.1 cleanasn.1 formatdb.1 insdseqget.1 tbl2asn.1 \
</span> asn2all.1 bl2seq.1 copymat.1 formatrpsdb.1 makemat.1 trna2sap.1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-asn2asn.1 blast.1 ddv.1 gbseqget.1 makeset.1 trna2tbl.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+asn2asn.1 ddv.1 gbseqget.1 makeset.1 trna2tbl.1 taxblast.1\
</span> asn2ff.1 blastall.1 debruijn.1 gene2xml.1 megablast.1 udv.1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-asn2fsa.1 blastall_old.1 entrez2.1 getmesh.1 nps2gps.1 vecscreen.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+asn2fsa.1 entrez2.1 getmesh.1 nps2gps.1 vecscreen.1 \
</span> asn2gb.1 blastcl3.1 errhdr.1 getpub.1 rpsblast.1 \
asn2idx.1 blastclust.1 fa2htgs.1 gil2bin.1 sbtedit.1 \
asn2xml.1 blastpgp.1 fastacmd.1 idfetch.1 seedtop.1 \
asndhuff.1 cdscan.1 findspl.1 impala.1 sortbyquote.1 \
asntool.1 checksub.1 fmerge.1 indexpub.1 spidey.1"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set datafiles "lat_lon_country.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+16SCore.nhr KSesigc.mat UniVec.nhr lat_lon_island.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+16SCore.nin KSesigl.mat UniVec.nin lat_lon_water.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+16SCore.nsq KSgc.flt UniVec.nsq lineages.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+64-matK-FINAL-aligned-DNA.fas.nhr KShopp.flt UniVec_Core.nhr makerpt.prt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+64-matK-FINAL-aligned-DNA.fas.nin KSkyte.flt UniVec_Core.nin ncbiendo.dat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+64-matK-FINAL-aligned-DNA.fas.nsq KSmtidk.mat UniVec_Core.nsq ncbipnam.dat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+64-rbcL-FINAL-aligned-DNA.fas.nhr KSmtk.mat asn2ff.prt ncbipros.dat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+64-rbcL-FINAL-aligned-DNA.fas.nin KSnsigc.mat autofix.prt ncbiren.dat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+64-rbcL-FINAL-aligned-DNA.fas.nsq KSnsigl.mat blast.prt ncbirnam.dat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+BLOSUM45 KSpcc.mat bstdt.prt objprt.prt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+BLOSUM50 KSpsigc.mat bstdt.val organelle_products.prt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+BLOSUM62 KSpsigl.mat country_lat_lon.txt product_rules.prt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+BLOSUM80 KSpur.flt ecnum_ambiguous.txt pubkey.enc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+BLOSUM90 KSpyr.flt ecnum_deleted.txt rRNA_blast.nal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Combined16SrRNA.nhr LSURef_93.fasta.nhr ecnum_replaced.txt rRNAstrand.nal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Combined16SrRNA.nin LSURef_93.fasta.nin ecnum_specific.txt seqcode.prt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Combined16SrRNA.nsq LSURef_93.fasta.nsq featdef.prt seqcode.val \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Combined16SrRNA_2-12-2008.nhr PAM250 featdef.val sequin.hlp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Combined16SrRNA_2-12-2008.nin PAM30 gc.prt sgmlbb.ent \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Combined16SrRNA_2-12-2008.nsq PAM70 gc.val taxlist.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ContactPotential SSURef_93.fasta.nhr humrep.fsa validrules.prt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+KSat.flt SSURef_93.fasta.nin institution_codes.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+KSchoth.flt SSURef_93.fasta.nsq"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
file copy ${worksrcpath}/ncbi/doc ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,6 +83,10 @@ destroot {
</span> foreach manpage ${manpages} {
xinstall -m 444 ${worksrcpath}/ncbi/doc/man/${manpage} ${destroot}${prefix}/share/man/man1/
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach datafile ${datafiles} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 444 ${worksrcpath}/ncbi/data/${datafile} ${destroot}${prefix}/data/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
long_description ${description}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncbi_tools/files/c-toolkit-no-carbon.patch b/science/ncbi_tools/files/c-toolkit-no-carbon.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d39bc76b7fa..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ncbi_tools/files/c-toolkit-no-carbon.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,60 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ncbi/corelib/ncbienv.c 17 Aug 2009 19:56:13 -0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ncbi/corelib/ncbienv.c 9 Nov 2009 18:44:01 -0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1938,7 +1938,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static char **targv = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(WIN_MAC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(WIN_MAC) || defined(OS_UNIX_DARWIN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static FSSpec apFileSpec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static Str255 apName;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static Handle apParam;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2053,7 +2053,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* defined(OS_UNIX_DARWIN) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* defined(WIN_MAC) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* defined(WIN_MAC) || defined(OS_UNIX_DARWIN) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(OS_MSWIN) || defined(OS_VMS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2244,7 +2244,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NlmMutexLockEx( &corelibMutex );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wasSetup = TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(WIN_MAC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(WIN_MAC) || defined(OS_UNIX_DARWIN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wasSetup = Nlm_SetupArguments_ST_Mac();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(OS_UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2424,7 +2424,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int mib [2];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Nlm_Char model [32];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- long sysVer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Nlm_Int4 sysVer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Nlm_CharPtr str = "unknown";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ncbi/corelib/ncbiwin.h 24 Nov 2006 20:05:36 -0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ncbi/corelib/ncbiwin.h 9 Nov 2009 18:44:01 -0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -168,6 +168,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Sound.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Folders.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(OS_UNIX_DARWIN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <CoreServices/CoreServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* used in ncbifile.c *****/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ncbi/make/makedis.csh 23 Mar 2009 17:10:14 -0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ncbi/make/makedis.csh 9 Nov 2009 18:44:01 -0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -240,7 +240,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set HAVE_MOTIF=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set HAVE_MAC=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # set HAVE_MAC=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- breaksw
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case NetBSD:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set platform=netbsd
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncbi_tools/files/darwin.ncbi.mk.diff b/science/ncbi_tools/files/darwin.ncbi.mk.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 41eee56f6f4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ncbi_tools/files/darwin.ncbi.mk.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ncbi/platform/darwin.ncbi.mk.orig 2005-12-02 06:52:56.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ncbi/platform/darwin.ncbi.mk 2010-07-11 06:35:05.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,8 +9,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NCBI_MAKE_SHELL = /bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NCBI_AR=ar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NCBI_CC = cc -pipe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#NCBI_CFLAGS1 = -c -g -no-cpp-precomp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--NCBI_CFLAGS1 = -c -no-cpp-precomp -Wno-long-double
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#NCBI_CFLAGS1 = -c -g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+NCBI_CFLAGS1 = -c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NCBI_LDFLAGS1 = -framework CoreServices -O2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NCBI_OPTFLAG = -O2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NCBI_BIN_MASTER = /home/coremake/ncbi/bin
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2c5f3e212c2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,64 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ncbi/api/asn2gnb2.c.orig 2021-05-21 18:31:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ncbi/api/asn2gnb2.c 2021-05-21 18:32:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,6 +56,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <edutil.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <alignmgr2.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <asn2gnbi.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <ffprint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef WIN_MAC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if __profile__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ncbi/api/salutil.c.orig 2021-05-21 17:33:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ncbi/api/salutil.c 2021-05-21 17:33:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,6 +51,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <edutil.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sequtil.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sqnutils.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <alignmgr2.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SALSA_DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <simutil.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ncbi/network/wwwblast/Src/viewgif.c.orig 2021-05-21 17:34:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ncbi/network/wwwblast/Src/viewgif.c 2021-05-21 17:34:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,6 +45,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <signal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.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;'>+ static void SigAlrmHandler(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ncbi/network/wwwblast/Src/wblast2.c.orig 2021-05-21 17:35:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ncbi/network/wwwblast/Src/wblast2.c 2021-05-21 17:36:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -296,6 +296,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <algo/blast/api/twoseq_api.h>
</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;'>++#include <algo/blast/core/blast_util.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <accid1.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MY_BLOSUM62 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MY_PAM30 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MY_PAM70 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ncbi/corelib/ncbimisc.c.orig 2021-05-21 18:20:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ncbi/corelib/ncbimisc.c 2021-05-21 18:20:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1266,7 +1266,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (len < 1) return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rsult = (Nlm_CharPtr) MemNew (len + 3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (rsult == NULL) return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (rsult == NULL) return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp = rsult;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; /* local [i] != NULL */ i < numitems; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ncbi/make/makedis.csh 23 Mar 2009 17:10:14 -0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ncbi/make/makedis.csh 9 Nov 2009 18:44:01 -0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -240,7 +240,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set HAVE_MOTIF=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set HAVE_MAC=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # set HAVE_MAC=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ breaksw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case NetBSD:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set platform=netbsd
</span></pre><pre style='margin:0'>
</pre>