samtools: More intuitive Makefile organization

[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 07:55:00 2020 -0500
Changeset:	c27bef3588a7ebe7b287a61f169bc112b0a72bc9

Modified Files:
	bcftools/Makefile
	samtools/Makefile

Log Message:
samtools: More intuitive Makefile organization

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

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

diffstat:
 bcftools/Makefile | 6 +++---
 samtools/Makefile | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs:
diff --git a/bcftools/Makefile b/bcftools/Makefile
index 53d79ec2f7..5010f65ac5 100644
--- a/bcftools/Makefile
+++ b/bcftools/Makefile
@@ -7,11 +7,11 @@ GITHUB_PROJECT=	bcftools
 
 MAINTAINER=	bacon%NetBSD.org@localhost
 HOMEPAGE=	https://www.htslib.org/
-COMMENT=	Tools for manipulating BCF (binary VCF) sequence files
+COMMENT=	Tools for manipulating BCF and VCF variant call files
 LICENSE=	mit
 
-REPLACE_PERL=	misc/*.pl misc/plot-vcfstats test/test.pl
-REPLACE_PYTHON=	misc/*.py
+REPLACE_PERL+=		misc/*.pl misc/plot-vcfstats test/test.pl
+REPLACE_PYTHON+=	misc/*.py
 
 SUBST_CLASSES+=		version
 SUBST_STAGE.version=	pre-configure
diff --git a/samtools/Makefile b/samtools/Makefile
index 625637dd4c..32c30f5fec 100644
--- a/samtools/Makefile
+++ b/samtools/Makefile
@@ -9,16 +9,17 @@ HOMEPAGE=	https://www.htslib.org/
 COMMENT=	Tools for manipulating next-generation sequencing data
 LICENSE=	mit
 
-USE_TOOLS+=		autoconf automake autoreconf bash gmake perl
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-htslib=system
-TEST_TARGET=		test
+USE_TOOLS+=	autoconf automake autoreconf bash gmake perl
+GNU_CONFIGURE=	yes
 
 REPLACE_PERL+=		misc/*.pl
 REPLACE_PERL+=		test/*.pl
 REPLACE_PERL+=		misc/plot-bamstats
 REPLACE_PYTHON+=	misc/*.py
 
+CONFIGURE_ARGS+=	--with-htslib=system
+TEST_TARGET=		test
+
 pre-configure:
 	(cd ${WRKSRC} && autoreconf -if)