pkgsrc-WIP-changes archive

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

htslib: install pkgconfig file in default place.



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

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

Log Message:
htslib: install pkgconfig file in default place.

Add rpath to it.

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

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

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

diffs:
diff --git a/htslib/Makefile b/htslib/Makefile
index 00397411b2..5098f0b778 100644
--- a/htslib/Makefile
+++ b/htslib/Makefile
@@ -26,6 +26,8 @@ SUBST_STAGE.version=	post-patch
 SUBST_SED.version+=	-e "s|m4_esyscmd_s(\[make print-version\])|[${PORTVERSION}]|"
 SUBST_FILES.version+=	${WRKSRC}/configure.ac
 
+PKGCONFIG_OVERRIDE=	htslib.pc.in
+
 PORTVERSION=	1.3.2
 
 pre-configure:
diff --git a/htslib/PLIST b/htslib/PLIST
index d563be4a55..a040045fe2 100644
--- a/htslib/PLIST
+++ b/htslib/PLIST
@@ -28,7 +28,7 @@ lib/libhts.a
 lib/libhts.so
 lib/libhts.so.1
 lib/libhts.so.${PKGVERSION}
-libdata/pkgconfig/htslib.pc
+lib/pkgconfig/htslib.pc
 man/man1/htsfile.1
 man/man1/tabix.1
 man/man5/faidx.5
diff --git a/htslib/distinfo b/htslib/distinfo
index 9e1bf1eaef..8a1b983cea 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) = e108255656c59d6775b1a1f34537e4c62bd8110c
+SHA1 (patch-Makefile) = 5508f222237a33afde7474d8b7e6c999641316d6
 SHA1 (patch-hfile__libcurl.c) = 5369ce80563a57917192760e9673398f383bf71e
diff --git a/htslib/patches/patch-Makefile b/htslib/patches/patch-Makefile
index 75e02c59e4..c37098f6e4 100644
--- a/htslib/patches/patch-Makefile
+++ b/htslib/patches/patch-Makefile
@@ -36,7 +36,7 @@ $NetBSD$
 -INSTALL_PROGRAM = $(INSTALL)
 -INSTALL_DATA    = $(INSTALL) -m 644
 -INSTALL_DIR     = $(MKDIR_P) -m 755
-+pkgconfigdir= $(exec_prefix)/libdata/pkgconfig
++pkgconfigdir= $(exec_prefix)/lib/pkgconfig
  
  # Set by config.mk if plugins are enabled
  plugindir =


Home | Main Index | Thread Index | Old Index