pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

htslib: Use pkgsrc install macros instead of mkdir



Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Wed May 17 10:26:28 2017 -0500
Changeset:	0fc0360d748dff8399777ae3ca93d9dfcad494de

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

Log Message:
htslib: Use pkgsrc install macros instead of mkdir

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

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

diffstat:
 htslib/Makefile               |  4 +++-
 htslib/distinfo               |  2 +-
 htslib/patches/patch-Makefile | 19 +++++++++++++++++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diffs:
diff --git a/htslib/Makefile b/htslib/Makefile
index 129674a378..3706f66d54 100644
--- a/htslib/Makefile
+++ b/htslib/Makefile
@@ -29,7 +29,9 @@ SUBST_FILES.version+=	${WRKSRC}/configure.ac
 MAKE_ENV=	INSTALL_LIB=${INSTALL_LIB:Q} \
 		INSTALL_DATA=${INSTALL_DATA:Q} \
 		INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
-		INSTALL_DIR=${INSTALL_LIB_DIR: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
 
diff --git a/htslib/distinfo b/htslib/distinfo
index ef81f2d60b..7dbca55dc6 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) = 968d1ff20b843747cdcd199a321b3c66a8a0b520
+SHA1 (patch-Makefile) = 1b3d6f3231f04b463e1f5c95a9840082d9c0f799
 SHA1 (patch-hfile__libcurl.c) = 5369ce80563a57917192760e9673398f383bf71e
diff --git a/htslib/patches/patch-Makefile b/htslib/patches/patch-Makefile
index e181c4fe66..4ffc041e9a 100644
--- a/htslib/patches/patch-Makefile
+++ b/htslib/patches/patch-Makefile
@@ -2,7 +2,7 @@ $NetBSD$
 
 # Respect build env and filesystem hierarchy
 
---- Makefile.orig	2015-12-15 16:34:33 UTC
+--- Makefile.orig	2016-09-13 06:15:37.000000000 +0000
 +++ Makefile
 @@ -22,16 +22,7 @@
  # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
@@ -49,7 +49,22 @@ $NetBSD$
  
  HTSPREFIX =
  include htslib_vars.mk
-@@ -361,7 +346,7 @@ installdirs:
+@@ -352,15 +337,20 @@ install: libhts.a $(BUILT_PROGRAMS) $(BU
+ 	$(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) \
++		$(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
+ 
+ # 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)
  # and libhts.so.NN (used by client executables at runtime).
  
  install-so: libhts.so installdirs


Home | Main Index | Thread Index | Old Index