htslib: Make patch set more pallatable to upstream

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

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Mon Jul 27 11:12:38 2020 -0500
Changeset:	d8ce42e8ac58d56924a221fa2103ea5bb2146e79

Modified Files:
	htslib/distinfo
	htslib/patches/patch-Makefile

Log Message:
htslib: Make patch set more pallatable to upstream

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

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

diffstat:
 htslib/distinfo               |  2 +-
 htslib/patches/patch-Makefile | 20 ++++++--------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diffs:
diff --git a/htslib/distinfo b/htslib/distinfo
index bd59f3a614..3853559d4d 100644
--- a/htslib/distinfo
+++ b/htslib/distinfo
@@ -4,5 +4,5 @@ SHA1 (htslib-1.10.2.110-da595880d134b29fb62f726b72bdc6302ffc9ccc.tar.gz) = cf698
 RMD160 (htslib-1.10.2.110-da595880d134b29fb62f726b72bdc6302ffc9ccc.tar.gz) = ff8c0d69cccd94349082da474ff0288d36d2ed21
 SHA512 (htslib-1.10.2.110-da595880d134b29fb62f726b72bdc6302ffc9ccc.tar.gz) = f3ed4b25521694e9655ad5ad0229e012f281c98be610e6b4d3c71892565a06f365ca14a19493280db4d0f6143111eb5638381cf070a1858b63e30e2ce24a28ae
 Size (htslib-1.10.2.110-da595880d134b29fb62f726b72bdc6302ffc9ccc.tar.gz) = 1477520 bytes
-SHA1 (patch-Makefile) = 571ddd0fad8b0bc8a1f5be9af33e3561aefe784d
+SHA1 (patch-Makefile) = 3170f9e4405a605f3a349785df13d156c846983d
 SHA1 (patch-cram_open__trace__file.c) = 49b47e13786317e652a8ec810cc91f10d21bb8ea
diff --git a/htslib/patches/patch-Makefile b/htslib/patches/patch-Makefile
index aa38a042ac..507c441ccd 100644
--- a/htslib/patches/patch-Makefile
+++ b/htslib/patches/patch-Makefile
@@ -4,7 +4,7 @@ $NetBSD$
 
 --- Makefile.orig	2020-07-21 09:19:56.000000000 +0000
 +++ Makefile
-@@ -22,31 +22,31 @@
+@@ -22,25 +22,26 @@
  # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  # DEALINGS IN THE SOFTWARE.
  
@@ -33,20 +33,12 @@ $NetBSD$
  LIBS     = $(htslib_default_libs)
  
 -prefix      = /usr/local
--exec_prefix = $(prefix)
 +PREFIX      ?= /usr/local
-+exec_prefix = $(PREFIX)
++prefix      = $(PREFIX)
+ exec_prefix = $(prefix)
  bindir      = $(exec_prefix)/bin
--includedir  = $(prefix)/include
-+includedir  = $(PREFIX)/include
- libdir      = $(exec_prefix)/lib
- libexecdir  = $(exec_prefix)/libexec
--datarootdir = $(prefix)/share
-+datarootdir = $(PREFIX)/share
- mandir      = $(datarootdir)/man
- man1dir     = $(mandir)/man1
- man5dir     = $(mandir)/man5
-@@ -69,7 +69,7 @@ BUILT_PROGRAMS = \
+ includedir  = $(prefix)/include
+@@ -69,7 +70,7 @@ BUILT_PROGRAMS = \
  	htsfile \
  	tabix
  
@@ -55,7 +47,7 @@ $NetBSD$
  	test/hts_endian \
  	test/fieldarith \
  	test/hfile \
-@@ -90,7 +90,7 @@ BUILT_TEST_PROGRAMS = \
+@@ -90,7 +91,7 @@ BUILT_TEST_PROGRAMS = \
  	test/test-bcf-translate \
  	test/test-parse-reg