htslib: Remove extraneous github tag and patch

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

Module Name:	pkgsrc-wip
Committed By:	Jason W Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Sat Feb 6 13:33:27 2021 -0600
Changeset:	b4ff3d75581c8156938855a301d892d4ceb676a7

Modified Files:
	htslib/Makefile
	htslib/PLIST
	htslib/buildlink3.mk
	htslib/distinfo
Removed Files:
	htslib/patches/patch-cram_open__trace__file.c

Log Message:
htslib: Remove extraneous github tag and patch

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

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

diffstat:
 htslib/Makefile                               |  1 -
 htslib/PLIST                                  |  2 +-
 htslib/buildlink3.mk                          |  2 +-
 htslib/distinfo                               |  9 ++++-----
 htslib/patches/patch-cram_open__trace__file.c | 18 ------------------
 5 files changed, 6 insertions(+), 26 deletions(-)

diffs:
diff --git a/htslib/Makefile b/htslib/Makefile
index 0307cab2fb..03ac16a9c9 100644
--- a/htslib/Makefile
+++ b/htslib/Makefile
@@ -3,7 +3,6 @@
 DISTNAME=	htslib-1.11.0
 CATEGORIES=	biology
 MASTER_SITES=	${MASTER_SITE_GITHUB:=samtools/}
-GITHUB_TAG=	da595880d134b29fb62f726b72bdc6302ffc9ccc
 
 MAINTAINER=	bacon%NetBSD.org@localhost
 HOMEPAGE=	https://www.htslib.org/
diff --git a/htslib/PLIST b/htslib/PLIST
index 7ee80d6df9..fdf49ff8f4 100644
--- a/htslib/PLIST
+++ b/htslib/PLIST
@@ -31,7 +31,7 @@ include/htslib/vcf_sweep.h
 include/htslib/vcfutils.h
 lib/libhts.a
 lib/libhts.so
-lib/libhts.so.1.10.2
+lib/libhts.so.1.11
 lib/libhts.so.3
 lib/pkgconfig/htslib.pc
 man/man1/bgzip.1
diff --git a/htslib/buildlink3.mk b/htslib/buildlink3.mk
index ac18811a1e..37481d5273 100644
--- a/htslib/buildlink3.mk
+++ b/htslib/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	htslib
 .if !defined(HTSLIB_BUILDLINK3_MK)
 HTSLIB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.htslib+=	htslib>=1.8
+BUILDLINK_API_DEPENDS.htslib+=	htslib>=1.10.2
 BUILDLINK_ABI_DEPENDS.htslib+=	htslib>=1.10.2
 BUILDLINK_PKGSRCDIR.htslib?=	../../wip/htslib
 
diff --git a/htslib/distinfo b/htslib/distinfo
index 2aef197f44..a160e4c0ae 100644
--- a/htslib/distinfo
+++ b/htslib/distinfo
@@ -1,8 +1,7 @@
 $NetBSD$
 
-SHA1 (htslib-1.11.0-da595880d134b29fb62f726b72bdc6302ffc9ccc.tar.gz) = cf698267f2701b71714cfd18754a7108a46c542d
-RMD160 (htslib-1.11.0-da595880d134b29fb62f726b72bdc6302ffc9ccc.tar.gz) = ff8c0d69cccd94349082da474ff0288d36d2ed21
-SHA512 (htslib-1.11.0-da595880d134b29fb62f726b72bdc6302ffc9ccc.tar.gz) = f3ed4b25521694e9655ad5ad0229e012f281c98be610e6b4d3c71892565a06f365ca14a19493280db4d0f6143111eb5638381cf070a1858b63e30e2ce24a28ae
-Size (htslib-1.11.0-da595880d134b29fb62f726b72bdc6302ffc9ccc.tar.gz) = 1477520 bytes
+SHA1 (htslib-1.11.0.tar.gz) = 8ecf722ae5988f44667b22057ba17d4c2223408e
+RMD160 (htslib-1.11.0.tar.gz) = e7c388dbc6b4a9a89e107c1b319e02c95717be41
+SHA512 (htslib-1.11.0.tar.gz) = 146468f25fcc7781a8f4528af8f9823d16e22f6b1e87c5d29bd3e8d323c9bc403a57b6344ddfb569629be71f04e710af56cfb7d876dc7ed7cce73e05f71624a3
+Size (htslib-1.11.0.tar.gz) = 1485848 bytes
 SHA1 (patch-Makefile) = 3170f9e4405a605f3a349785df13d156c846983d
-SHA1 (patch-cram_open__trace__file.c) = 49b47e13786317e652a8ec810cc91f10d21bb8ea
diff --git a/htslib/patches/patch-cram_open__trace__file.c b/htslib/patches/patch-cram_open__trace__file.c
deleted file mode 100644
index 9e4a633a42..0000000000
--- a/htslib/patches/patch-cram_open__trace__file.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-# Enhance error message
-
---- cram/open_trace_file.c.orig	2019-12-19 09:54:30.000000000 +0000
-+++ cram/open_trace_file.c
-@@ -204,8 +204,9 @@ mFILE *find_file_url(const char *file, c
-             goto fail;
-         }
-     }
--    if (hclose(hf) < 0 || len < 0) {
--        hts_log_warning("Failed to read reference \"%s\": %s", path, strerror(errno));
-+    int close_status = hclose(hf);
-+    if (close_status < 0 || len < 0) {
-+        hts_log_warning("Failed to read reference \"%s\": %s  close_status = %d len = %ld", path, strerror(errno));
-         goto fail;
-     }
-