htslib: simplify Makefile by using pkgsrc installation variables.

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu May 18 13:03:42 2017 +0200
Changeset:	7b654d57c5e952c1b2b36e4c3a6f1ce3e37b75af

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

Log Message:
htslib: simplify Makefile by using pkgsrc installation variables.

Remove reference to non-existent file.

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

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

diffstat:
 htslib/Makefile               |  9 +--------
 htslib/distinfo               |  2 +-
 htslib/patches/patch-Makefile | 28 +++++++++++++++++++++-------
 3 files changed, 23 insertions(+), 16 deletions(-)

diffs:
diff --git a/htslib/Makefile b/htslib/Makefile
index 3706f66d54..00397411b2 100644
--- a/htslib/Makefile
+++ b/htslib/Makefile
@@ -19,20 +19,13 @@ GITHUB_TAG=	${PORTVERSION}
 
 USE_TOOLS+=	autoconf automake autoreconf gmake perl
 GNU_CONFIGURE=	yes
-REPLACE_PERL=	test/compare_sam.pl test/test.pl test/test_view.pl
+REPLACE_PERL=	test/compare_sam.pl test/test.pl
 
 SUBST_CLASSES+=		version
 SUBST_STAGE.version=	post-patch
 SUBST_SED.version+=	-e "s|m4_esyscmd_s(\[make print-version\])|[${PORTVERSION}]|"
 SUBST_FILES.version+=	${WRKSRC}/configure.ac
 
-MAKE_ENV=	INSTALL_LIB=${INSTALL_LIB:Q} \
-		INSTALL_DATA=${INSTALL_DATA:Q} \
-		INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
-		INSTALL_PROGRAM_DIR=${INSTALL_PROGRAM_DIR:Q} \
-		INSTALL_LIB_DIR=${INSTALL_LIB_DIR:Q} \
-		INSTALL_MAN_DIR=${INSTALL_MAN_DIR:Q}
-
 PORTVERSION=	1.3.2
 
 pre-configure:
diff --git a/htslib/distinfo b/htslib/distinfo
index 7dbca55dc6..9e1bf1eaef 100644
--- a/htslib/distinfo
+++ b/htslib/distinfo
@@ -4,5 +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) = 1b3d6f3231f04b463e1f5c95a9840082d9c0f799
+SHA1 (patch-Makefile) = e108255656c59d6775b1a1f34537e4c62bd8110c
 SHA1 (patch-hfile__libcurl.c) = 5369ce80563a57917192760e9673398f383bf71e
diff --git a/htslib/patches/patch-Makefile b/htslib/patches/patch-Makefile
index 4ffc041e9a..75e02c59e4 100644
--- a/htslib/patches/patch-Makefile
+++ b/htslib/patches/patch-Makefile
@@ -49,19 +49,33 @@ $NetBSD$
  
  HTSPREFIX =
  include htslib_vars.mk
-@@ -352,15 +337,20 @@ install: libhts.a $(BUILT_PROGRAMS) $(BU
- 	$(INSTALL_DATA) faidx.5 sam.5 vcf.5 $(DESTDIR)$(man5dir)
+@@ -344,23 +329,28 @@ test/test-vcf-sweep.o: test/test-vcf-swe
+ 
+ 
+ install: libhts.a $(BUILT_PROGRAMS) $(BUILT_PLUGINS) installdirs install-$(SHLIB_FLAVOUR) install-pkgconfig
+-	$(INSTALL_PROGRAM) $(BUILT_PROGRAMS) $(DESTDIR)$(bindir)
+-	if test -n "$(BUILT_PLUGINS)"; then $(INSTALL_PROGRAM) $(BUILT_PLUGINS) $(DESTDIR)$(plugindir); fi
+-	$(INSTALL_DATA) htslib/*.h $(DESTDIR)$(includedir)/htslib
+-	$(INSTALL_DATA) libhts.a $(DESTDIR)$(libdir)/libhts.a
+-	$(INSTALL_DATA) htsfile.1 tabix.1 $(DESTDIR)$(man1dir)
+-	$(INSTALL_DATA) faidx.5 sam.5 vcf.5 $(DESTDIR)$(man5dir)
++	$(BSD_INSTALL_PROGRAM) $(BUILT_PROGRAMS) $(DESTDIR)$(bindir)
++	if test -n "$(BUILT_PLUGINS)"; then $(BSD_INSTALL_PROGRAM) $(BUILT_PLUGINS) $(DESTDIR)$(plugindir); fi
++	$(BSD_INSTALL_DATA) htslib/*.h $(DESTDIR)$(includedir)/htslib
++	$(BSD_INSTALL_DATA) libhts.a $(DESTDIR)$(libdir)/libhts.a
++	$(BSD_INSTALL_DATA) htsfile.1 tabix.1 $(DESTDIR)$(man1dir)
++	$(BSD_INSTALL_DATA) faidx.5 sam.5 vcf.5 $(DESTDIR)$(man5dir)
  
  installdirs:
 -	$(INSTALL_DIR) $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/htslib $(DESTDIR)$(libdir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(pkgconfigdir)
 -	if test -n "$(plugindir)"; then $(INSTALL_DIR) $(DESTDIR)$(plugindir); fi
-+	$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
-+	$(INSTALL_LIB_DIR) $(DESTDIR)$(includedir) \
++	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
++	$(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(includedir) \
 +		$(DESTDIR)$(includedir)/htslib \
 +		$(DESTDIR)$(libdir) \
 +		$(DESTDIR)$(pkgconfigdir)
-+	$(INSTALL_MAN_DIR) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir)
-+	if test -n "$(plugindir)"; then $(INSTALL_LIB_DIR) $(DESTDIR)$(plugindir); fi
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir)
++	if test -n "$(plugindir)"; then $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(plugindir); fi
  
  # After installation, the real file in $(libdir) will be libhts.so.X.Y.Z,
  # with symlinks libhts.so (used via -lhts during linking of client programs)
@@ -69,7 +83,7 @@ $NetBSD$
  
  install-so: libhts.so installdirs
 -	$(INSTALL_DATA) libhts.so $(DESTDIR)$(libdir)/libhts.so.$(PACKAGE_VERSION)
-+	$(INSTALL_LIB) libhts.so $(DESTDIR)$(libdir)/libhts.so.$(PACKAGE_VERSION)
++	$(BSD_INSTALL_LIB) libhts.so $(DESTDIR)$(libdir)/libhts.so.$(PACKAGE_VERSION)
  	ln -sf libhts.so.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libhts.so
  	ln -sf libhts.so.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libhts.so.$(LIBHTS_SOVERSION)