ncbi-blast+: Clean up in preparation for upgrade

[Jason Bacon <bacon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Tue Jun 8 13:01:49 2021 -0500
Changeset:	2807574eddc55b3e93c7aaffee62c18e37bbc335

Modified Files:
	ncbi-blast+/Makefile
	ncbi-blast+/buildlink3.mk
	ncbi-blast+/distinfo

Log Message:
ncbi-blast+: Clean up in preparation for upgrade

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2807574eddc55b3e93c7aaffee62c18e37bbc335

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ncbi-blast+/Makefile      | 9 +++++++--
 ncbi-blast+/buildlink3.mk | 2 +-
 ncbi-blast+/distinfo      | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diffs:
diff --git a/ncbi-blast+/Makefile b/ncbi-blast+/Makefile
index 201f7f5a71..71de3b3747 100644
--- a/ncbi-blast+/Makefile
+++ b/ncbi-blast+/Makefile
@@ -2,7 +2,6 @@
 
 DISTNAME=	ncbi-blast-2.8.1+-src
 PKGNAME=	${DISTNAME:S/+-src//:S/blast/blast+/}
-PKGREVISION=	5
 CATEGORIES=	biology
 MASTER_SITES=	https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/LATEST/ \
 		https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${PKGVERSION_NOREV}/
@@ -19,7 +18,7 @@ SUBST_STAGE.configure=	pre-configure
 SUBST_SED.configure+=	-e 's|-D_THREAD_SAFE|-D_THREAD_SAFE -D__RUNETYPE_INTERNAL|'
 SUBST_SED.configure+=	-e '/--infodir=DIR/d'
 SUBST_SED.configure+=	-e '/--mandir=DIR/d'
-SUBST_FILES.configure+=	${WRKSRC}/src/build-system/configure
+SUBST_FILES.configure+=	src/build-system/configure
 
 USE_TOOLS+=		bash gmake perl
 USE_LANGUAGES=		c c++
@@ -46,6 +45,12 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/c++
 CONFIGURE_ENV+=		ac_cv_func_statfs=no
 .endif
 
+# c++/src/objtools/edit/seq_entry_edit.cpp: In member function 'void ncbi::objects::edit::{anonymous}::CSeqdescSortMap::Init()':
+# c++/src/objtools/edit/seq_entry_edit.cpp:172:44: error: array subscript has type 'char' [-Werror=char-subscripts]
+#              while (descr_insert_order[index] != 0)
+# Maybe fix this later.
+BUILDLINK_TRANSFORM+=	rm:-Werror=char-subscripts
+
 post-install:
 	${RM} ${DESTDIR}${PREFIX}/include/ncbi-tools++/*/*/.cvsignore.extra
 .if ${OPSYS} != Darwin
diff --git a/ncbi-blast+/buildlink3.mk b/ncbi-blast+/buildlink3.mk
index acbe65a034..277a979d9a 100644
--- a/ncbi-blast+/buildlink3.mk
+++ b/ncbi-blast+/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ncbi-blast+
 NCBI_BLAST+_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ncbi-blast++=	ncbi-blast+>=2.7.1
-BUILDLINK_PKGSRCDIR.ncbi-blast+?=	../../biology/ncbi-blast+
+BUILDLINK_PKGSRCDIR.ncbi-blast+?=	../../wip/ncbi-blast+
 
 .endif	# NCBI_BLAST+_BUILDLINK3_MK
 
diff --git a/ncbi-blast+/distinfo b/ncbi-blast+/distinfo
index dd5de1e83b..1343b91086 100644
--- a/ncbi-blast+/distinfo
+++ b/ncbi-blast+/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2019/01/07 15:00:10 bacon Exp $
+$NetBSD$
 
 SHA1 (ncbi-blast-2.8.1+-src.tar.gz) = 16573b642d7861d0bed67f3eb1174fc646819eec
 RMD160 (ncbi-blast-2.8.1+-src.tar.gz) = ef8df6c4b3cae18b2ab4509af15554ee8d8f9bfd