htslib: Clean up

htslib/Makefile

@@ -23,15 +23,15 @@ REPLACE_PERL=	test/compare_sam.pl test/test.pl test/test_view.pl
 
 SUBST_CLASSES+=		version
 SUBST_STAGE.version=	post-patch
-SUBST_SED.version+=	-e 's|@PORTVERSION@|${PORTVERSION}|g'
+SUBST_SED.version+=	-e "s|m4_esyscmd_s(\[make print-version\])|[${PORTVERSION}]|"
 SUBST_FILES.version+=	${WRKSRC}/configure.ac
 
-CPPFLAGS+=	-I${PREFIX}/include
+#CPPFLAGS+=	-I${PREFIX}/include
 
 MAKE_ENV=	INSTALL_LIB=${INSTALL_LIB:Q} \
 		INSTALL_DATA=${INSTALL_DATA:Q} \
 		INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
-		INSTALL_DIR=${MKDIR:Q}
+		INSTALL_DIR=${INSTALL_LIB_DIR:Q}
 
 PORTVERSION=	1.3.2
 

htslib/distinfo

@@ -4,6 +4,5 @@ SHA1 (htslib-1.3.2.tar.gz) = 41ce614ac9b9dc751fa25355e8b46a9bd9aa9ace
 RMD160 (htslib-1.3.2.tar.gz) = 6a2a9cfa0fb56bd113891aa4933e6da387a97942
 SHA512 (htslib-1.3.2.tar.gz) = f40f69c895046ab4cbb992f02926d9152b4e8e6a9ba54513f79287477a6b239c47bdb99b8d710c7bbf2f5281266b37c347b0ba5fcb9beff8ba12e53a6acff3f3
 Size (htslib-1.3.2.tar.gz) = 1066181 bytes
-SHA1 (patch-Makefile) = 270e94caa566b5a35e0871562211fdb7287f7823
-SHA1 (patch-configure.ac) = b968e2ef8c83ea991c218e9ad3a79155498791a3
+SHA1 (patch-Makefile) = 968d1ff20b843747cdcd199a321b3c66a8a0b520
 SHA1 (patch-hfile__libcurl.c) = 5369ce80563a57917192760e9673398f383bf71e

htslib/patches/patch-Makefile

@@ -26,7 +26,7 @@ $NetBSD$
  libexecdir  = $(exec_prefix)/libexec
  datarootdir = $(prefix)/share
 -mandir      = $(datarootdir)/man
-+mandir      = $(prefix)/man
++mandir      = $(PKGMANDIR)/man
  man1dir     = $(mandir)/man1
  man5dir     = $(mandir)/man5
 -pkgconfigdir= $(libdir)/pkgconfig

htslib/patches/patch-configure.ac

@@ -1,15 +0,0 @@
-$NetBSD$
-
-# Portability
-
---- configure.ac.orig	2015-12-15 16:34:33 UTC
-+++ configure.ac
-@@ -23,7 +23,7 @@
- # DEALINGS IN THE SOFTWARE.
- 
- dnl Process this file with autoconf to produce a configure script
--AC_INIT([HTSlib], m4_esyscmd_s([make print-version]),
-+AC_INIT([HTSlib], [1.3],
-         [samtools-help@lists.sourceforge.net], [], [http://www.htslib.org/])
- AC_PREREQ(2.63)  dnl This version introduced 4-argument AC_CHECK_HEADER
- AC_CONFIG_SRCDIR(hts.c)