kallisto: Clean up Makefile

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

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Wed Jul 22 13:15:03 2020 -0500
Changeset:	d178319a5158c7dca4fd22f7420748b103e98b2c

Modified Files:
	kallisto/Makefile
	kallisto/distinfo

Log Message:
kallisto: Clean up Makefile

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

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

diffstat:
 kallisto/Makefile | 10 ++++------
 kallisto/distinfo |  3 ---
 2 files changed, 4 insertions(+), 9 deletions(-)

diffs:
diff --git a/kallisto/Makefile b/kallisto/Makefile
index b8e6e3b03d..666b0759f1 100644
--- a/kallisto/Makefile
+++ b/kallisto/Makefile
@@ -10,19 +10,18 @@ HOMEPAGE=	https://pachterlab.github.io/kallisto/
 COMMENT=	Quantify abundances of transcripts from RNA-Seq data
 LICENSE=	2-clause-bsd
 
+USE_TOOLS+=	autoconf gmake pax
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	autoconf autoreconf automake gmake pax
 USE_CMAKE=	yes
 
 SUBST_CLASSES+=		test
-SUBST_STAGE.test=	post-build
+SUBST_STAGE.test=	pre-configure
 SUBST_FILES.test=	kallisto-test
 SUBST_SED.test=		-e 's|/usr/local/share/kallisto|${DATADIR}|g'
 
-DATADIR=	${PREFIX}/share/kallisto
+INSTALLATION_DIRS+=	${DATADIR}
 
-INSTALLATION_DIRS=	bin ${DATADIR}
-MAKE_JOBS_SAFE=		no
+DATADIR=		${PREFIX}/share/kallisto
 
 post-extract:
 	${CP} ${FILESDIR}/kallisto-test ${WRKSRC}
@@ -31,7 +30,6 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/kallisto-test ${DESTDIR}${PREFIX}/bin
 	cd ${WRKSRC} && pax -rw test ${DESTDIR}${DATADIR}
 
-# .include "../../biology/htslib/buildlink3.mk"
 .include "../../devel/hdf5/buildlink3.mk"
 .include "../../wip/libaec/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/kallisto/distinfo b/kallisto/distinfo
index 5aeefd98fa..5677f580b4 100644
--- a/kallisto/distinfo
+++ b/kallisto/distinfo
@@ -4,6 +4,3 @@ SHA1 (kallisto-0.46.1.tar.gz) = e39adb9801049836dcd7ac52e775f64af4d0a51b
 RMD160 (kallisto-0.46.1.tar.gz) = 8e42c5c52f19ec2e37f8591f7472a969b479bfd4
 SHA512 (kallisto-0.46.1.tar.gz) = 53a4db8fd5e0585693d8cd683651b4bdcc84c724a19e80a6162f1844fd491eb2d4e3180be2d9aabea7d49c9cbe0a05250f41da7d1de89d5d6cb6a8806f1afb7d
 Size (kallisto-0.46.1.tar.gz) = 2254560 bytes
-SHA1 (patch-CMakeLists.txt) = 2817091347e35898fec0bab77e8d9cc5ca5fff3f
-SHA1 (patch-src_CMakeLists.txt) = 2ef72024591c5216fbf44fb7cdfa4a8330b0c81a
-SHA1 (patch-src_kseq.h) = d56e9d69bd1799ffec59e468979dab2fca15b168