summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/hdf5/Makefile.common7
-rw-r--r--devel/hdf5/distinfo26
-rw-r--r--devel/hdf5/patches/patch-c++_examples_Makefile.in8
-rw-r--r--devel/hdf5/patches/patch-c++_examples_run-c++-ex.sh.in6
-rw-r--r--devel/hdf5/patches/patch-examples_Makefile.in8
-rw-r--r--devel/hdf5/patches/patch-examples_run-c-ex.sh.in6
-rw-r--r--devel/hdf5/patches/patch-hl_c++_examples_Makefile.in8
-rw-r--r--devel/hdf5/patches/patch-hl_c++_examples_run-hlc++-ex.sh.in6
-rw-r--r--devel/hdf5/patches/patch-hl_examples_Makefile.in8
-rw-r--r--devel/hdf5/patches/patch-hl_examples_run-hlc-ex.sh.in6
10 files changed, 44 insertions, 45 deletions
diff --git a/devel/hdf5/Makefile.common b/devel/hdf5/Makefile.common
index d6bbf5b115e..bd7a0dea88c 100644
--- a/devel/hdf5/Makefile.common
+++ b/devel/hdf5/Makefile.common
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile.common,v 1.12 2016/09/14 21:34:34 alnsn Exp $
+# $NetBSD: Makefile.common,v 1.12.2.1 2016/12/11 17:18:01 spz Exp $
# used by devel/hdf5/Makefile
# used by devel/hdf5-c++/Makefile
-DISTNAME= hdf5-1.8.16
-PKGREVISION= 1
+DISTNAME= hdf5-1.8.18
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.hdfgroup.org/HDF5/current/src/
+MASTER_SITES= ftp://ftp.hdfgroup.org/HDF5/current18/src/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/devel/hdf5/distinfo b/devel/hdf5/distinfo
index 239a7b63af2..6104b89325c 100644
--- a/devel/hdf5/distinfo
+++ b/devel/hdf5/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.36 2015/11/26 11:25:10 adam Exp $
+$NetBSD: distinfo,v 1.36.8.1 2016/12/11 17:18:01 spz Exp $
-SHA1 (hdf5-1.8.16.tar.bz2) = a7b631778cb289edec670f665d2c3265983a0d53
-RMD160 (hdf5-1.8.16.tar.bz2) = f72c7029b08dfae4562b9aa23f03aa43bd02617e
-SHA512 (hdf5-1.8.16.tar.bz2) = f3ca50ca50bb51057818165fcc36f199a7bd7a9b7c42e299314381a269c4d882f60a780b0005fc2443596e06535ff40019b3483763d926e462a90bea4fe84033
-Size (hdf5-1.8.16.tar.bz2) = 10047405 bytes
+SHA1 (hdf5-1.8.18.tar.bz2) = d7e008cbfcf5cb6913b5327a81bbcaf34cc9436d
+RMD160 (hdf5-1.8.18.tar.bz2) = a3910b7129f80080c0574bb798f6d40849724005
+SHA512 (hdf5-1.8.18.tar.bz2) = 01f6d14bdd3be2ced9c63cc9e1820cd7ea11db649ff9f3a3055c18c4b0fffe777fd23baad536e3bce31c4d76fe17db64a3972762e1bb4d232927c1ca140e72b2
+Size (hdf5-1.8.18.tar.bz2) = 10081294 bytes
SHA1 (patch-bin_cmakehdf5) = c31107e3f67dd2b58318ebc94e6044c8c76df049
-SHA1 (patch-c++_examples_Makefile.in) = 2df6015f121e9e86080cf937b64990a39acf9f65
-SHA1 (patch-c++_examples_run-c++-ex.sh.in) = b5b68a72a7b93ac0c87bbce229171136dbe3fcd2
+SHA1 (patch-c++_examples_Makefile.in) = 2b62c0b30258fcce5e22b5932bd400ca5897e0c3
+SHA1 (patch-c++_examples_run-c++-ex.sh.in) = f0605ce2cf35e72f47a1c848aa637342eab65070
SHA1 (patch-configure) = e7f141d54c39cbee2f7d703ab7d6ff582158904e
-SHA1 (patch-examples_Makefile.in) = 42b325b87e640f2731ec9b7f48d6a63c3226ffd4
-SHA1 (patch-examples_run-c-ex.sh.in) = fa1c4fd2ec50450fc738b6e0af6ce7ccad610756
-SHA1 (patch-hl_c++_examples_Makefile.in) = 4bc7501f3f221d2d2c02d01af78c5ba69e8d9fea
-SHA1 (patch-hl_c++_examples_run-hlc++-ex.sh.in) = 422a7386f1480ad7493bfb2e1e630245b0b66d90
-SHA1 (patch-hl_examples_Makefile.in) = ae28809d58465c380ff27d5cbe6b1ac9a5eef569
-SHA1 (patch-hl_examples_run-hlc-ex.sh.in) = e317704c96f41d569ce3d2550f637f903bde659e
+SHA1 (patch-examples_Makefile.in) = af9cf68a50544312a759b7732aea9297a6881582
+SHA1 (patch-examples_run-c-ex.sh.in) = 3614da26657a1428d134d915593d03cd408292d3
+SHA1 (patch-hl_c++_examples_Makefile.in) = a65d0461a6e1ac464e089703f9f5ab6c1dcf1666
+SHA1 (patch-hl_c++_examples_run-hlc++-ex.sh.in) = 48050e21799cca24b19a60b6242fd7d156a7cb59
+SHA1 (patch-hl_examples_Makefile.in) = df3650c121152471a045e1fec169eedeea757377
+SHA1 (patch-hl_examples_run-hlc-ex.sh.in) = a7cd97c716c598cd3aac05f0b1dcee46d77bd968
SHA1 (patch-tools_h5jam_testh5jam.sh.in) = 89068ae1694c586f85b25240fda30549eddf2d0f
diff --git a/devel/hdf5/patches/patch-c++_examples_Makefile.in b/devel/hdf5/patches/patch-c++_examples_Makefile.in
index 72f76b59ad1..3141fcd95c4 100644
--- a/devel/hdf5/patches/patch-c++_examples_Makefile.in
+++ b/devel/hdf5/patches/patch-c++_examples_Makefile.in
@@ -1,15 +1,15 @@
-$NetBSD: patch-c++_examples_Makefile.in,v 1.3 2015/11/26 11:25:10 adam Exp $
+$NetBSD: patch-c++_examples_Makefile.in,v 1.3.8.1 2016/12/11 17:18:02 spz Exp $
Fix paths to examples.
---- c++/examples/Makefile.in.orig 2015-11-10 14:01:02.000000000 +0000
+--- c++/examples/Makefile.in.orig 2016-05-10 21:24:51.000000000 +0000
+++ c++/examples/Makefile.in
@@ -626,8 +626,8 @@ CXX_API = yes
# Where to install examples
# Note: no '/' after DESTDIR. Explanation in commence.am
--EXAMPLEDIR = ${DESTDIR}$(datarootdir)/hdf5_examples/c++
--EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/hdf5_examples
+-EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/c++
+-EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples
+EXAMPLEDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/c++
+EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/examples/hdf5
diff --git a/devel/hdf5/patches/patch-c++_examples_run-c++-ex.sh.in b/devel/hdf5/patches/patch-c++_examples_run-c++-ex.sh.in
index a083ef13a3d..400fa5b40f5 100644
--- a/devel/hdf5/patches/patch-c++_examples_run-c++-ex.sh.in
+++ b/devel/hdf5/patches/patch-c++_examples_run-c++-ex.sh.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-c++_examples_run-c++-ex.sh.in,v 1.2 2015/11/26 11:25:10 adam Exp $
+$NetBSD: patch-c++_examples_run-c++-ex.sh.in,v 1.2.8.1 2016/12/11 17:18:02 spz Exp $
Fix paths to examples.
---- c++/examples/run-c++-ex.sh.in.orig 2015-10-24 05:14:06.000000000 +0000
+--- c++/examples/run-c++-ex.sh.in.orig 2016-04-26 12:44:06.000000000 +0000
+++ c++/examples/run-c++-ex.sh.in
@@ -20,7 +20,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -17,7 +17,7 @@ Fix paths to examples.
# Where the tool is installed.
# default is relative path to installed location of the tools
--prefix="${prefix:-../../..}"
+-prefix="${prefix:-../../../}"
+prefix="${prefix:-../../../..}"
AR="@AR@"
RANLIB="@RANLIB@"
diff --git a/devel/hdf5/patches/patch-examples_Makefile.in b/devel/hdf5/patches/patch-examples_Makefile.in
index 6b430c177ca..4e43707ca35 100644
--- a/devel/hdf5/patches/patch-examples_Makefile.in
+++ b/devel/hdf5/patches/patch-examples_Makefile.in
@@ -1,15 +1,15 @@
-$NetBSD: patch-examples_Makefile.in,v 1.3 2015/11/26 11:25:10 adam Exp $
+$NetBSD: patch-examples_Makefile.in,v 1.3.8.1 2016/12/11 17:18:02 spz Exp $
Fix paths to examples.
---- examples/Makefile.in.orig 2015-11-10 14:01:03.000000000 +0000
+--- examples/Makefile.in.orig 2016-05-10 21:24:51.000000000 +0000
+++ examples/Makefile.in
@@ -636,8 +636,8 @@ EXTLINK_DIRS = red blue u2w
# Example directory
# Note: no '/' after DESTDIR. Explanation in commence.am
--EXAMPLEDIR = ${DESTDIR}$(datarootdir)/hdf5_examples/c
--EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/hdf5_examples
+-EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/c
+-EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples
+EXAMPLEDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/c
+EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/examples/hdf5
@BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH)
diff --git a/devel/hdf5/patches/patch-examples_run-c-ex.sh.in b/devel/hdf5/patches/patch-examples_run-c-ex.sh.in
index 13177974f88..71b1fbc95a6 100644
--- a/devel/hdf5/patches/patch-examples_run-c-ex.sh.in
+++ b/devel/hdf5/patches/patch-examples_run-c-ex.sh.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-examples_run-c-ex.sh.in,v 1.2 2015/11/26 11:25:10 adam Exp $
+$NetBSD: patch-examples_run-c-ex.sh.in,v 1.2.8.1 2016/12/11 17:18:02 spz Exp $
Fix path to examples.
---- examples/run-c-ex.sh.in.orig 2015-10-24 05:14:08.000000000 +0000
+--- examples/run-c-ex.sh.in.orig 2016-04-26 12:44:10.000000000 +0000
+++ examples/run-c-ex.sh.in
@@ -20,7 +20,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -17,7 +17,7 @@ Fix path to examples.
# Where the tool is installed.
# default is relative path to installed location of the tools
--prefix="${prefix:-../../..}"
+-prefix="${prefix:-../../../}"
+prefix="${prefix:-../../../..}"
PARALLEL=@PARALLEL@ # Am I in parallel mode?
AR="@AR@"
diff --git a/devel/hdf5/patches/patch-hl_c++_examples_Makefile.in b/devel/hdf5/patches/patch-hl_c++_examples_Makefile.in
index d38602a1d6d..9bf87d210a3 100644
--- a/devel/hdf5/patches/patch-hl_c++_examples_Makefile.in
+++ b/devel/hdf5/patches/patch-hl_c++_examples_Makefile.in
@@ -1,15 +1,15 @@
-$NetBSD: patch-hl_c++_examples_Makefile.in,v 1.3 2015/11/26 11:25:10 adam Exp $
+$NetBSD: patch-hl_c++_examples_Makefile.in,v 1.3.8.1 2016/12/11 17:18:02 spz Exp $
Fix paths to examples.
---- hl/c++/examples/Makefile.in.orig 2015-11-10 14:01:04.000000000 +0000
+--- hl/c++/examples/Makefile.in.orig 2016-05-10 21:24:52.000000000 +0000
+++ hl/c++/examples/Makefile.in
@@ -615,8 +615,8 @@ CXX_API = yes
# Where to install examples
# Note: no '/' after DESTDIR. Explanation in commence.am
--EXAMPLEDIR = ${DESTDIR}$(datarootdir)/hdf5_examples/hl/c++
--EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/hdf5_examples/hl
+-EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c++
+-EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl
+EXAMPLEDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/hl/c++
+EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/hl
diff --git a/devel/hdf5/patches/patch-hl_c++_examples_run-hlc++-ex.sh.in b/devel/hdf5/patches/patch-hl_c++_examples_run-hlc++-ex.sh.in
index 718e19d3065..72fd75bdd19 100644
--- a/devel/hdf5/patches/patch-hl_c++_examples_run-hlc++-ex.sh.in
+++ b/devel/hdf5/patches/patch-hl_c++_examples_run-hlc++-ex.sh.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-hl_c++_examples_run-hlc++-ex.sh.in,v 1.2 2015/11/26 11:25:10 adam Exp $
+$NetBSD: patch-hl_c++_examples_run-hlc++-ex.sh.in,v 1.2.8.1 2016/12/11 17:18:02 spz Exp $
Fix paths to examples.
---- hl/c++/examples/run-hlc++-ex.sh.in.orig 2015-10-24 05:14:02.000000000 +0000
+--- hl/c++/examples/run-hlc++-ex.sh.in.orig 2016-04-26 12:43:57.000000000 +0000
+++ hl/c++/examples/run-hlc++-ex.sh.in
@@ -20,7 +20,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -17,7 +17,7 @@ Fix paths to examples.
EXIT_FAILURE=1
# Where the tool is installed.
# default is relative path to installed location of the tools
--prefix="${prefix:-../../../..}"
+-prefix="${prefix:-../../../../}"
+prefix="${prefix:-../../../../..}"
AR="@AR@"
RANLIB="@RANLIB@"
diff --git a/devel/hdf5/patches/patch-hl_examples_Makefile.in b/devel/hdf5/patches/patch-hl_examples_Makefile.in
index e21f608c451..42a4a9dd85a 100644
--- a/devel/hdf5/patches/patch-hl_examples_Makefile.in
+++ b/devel/hdf5/patches/patch-hl_examples_Makefile.in
@@ -1,15 +1,15 @@
-$NetBSD: patch-hl_examples_Makefile.in,v 1.3 2015/11/26 11:25:10 adam Exp $
+$NetBSD: patch-hl_examples_Makefile.in,v 1.3.8.1 2016/12/11 17:18:02 spz Exp $
Fix paths to examples.
---- hl/examples/Makefile.in.orig 2015-11-10 14:01:04.000000000 +0000
+--- hl/examples/Makefile.in.orig 2016-05-10 21:24:53.000000000 +0000
+++ hl/examples/Makefile.in
@@ -604,8 +604,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.c
# Example directory
# Note: no '/' after DESTDIR. Explanation in commence.am
--EXAMPLEDIR = ${DESTDIR}$(datarootdir)/hdf5_examples/hl/c
--EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/hdf5_examples/hl
+-EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c
+-EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl
+EXAMPLEDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/hl/c
+EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/hl
INSTALL_SCRIPT_FILES = run-hlc-ex.sh
diff --git a/devel/hdf5/patches/patch-hl_examples_run-hlc-ex.sh.in b/devel/hdf5/patches/patch-hl_examples_run-hlc-ex.sh.in
index d0d1ebde97b..2a46fd5273c 100644
--- a/devel/hdf5/patches/patch-hl_examples_run-hlc-ex.sh.in
+++ b/devel/hdf5/patches/patch-hl_examples_run-hlc-ex.sh.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-hl_examples_run-hlc-ex.sh.in,v 1.2 2015/11/26 11:25:10 adam Exp $
+$NetBSD: patch-hl_examples_run-hlc-ex.sh.in,v 1.2.8.1 2016/12/11 17:18:02 spz Exp $
Fix paths to examples.
---- hl/examples/run-hlc-ex.sh.in.orig 2015-10-24 05:14:03.000000000 +0000
+--- hl/examples/run-hlc-ex.sh.in.orig 2016-04-26 12:43:59.000000000 +0000
+++ hl/examples/run-hlc-ex.sh.in
@@ -20,7 +20,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -17,7 +17,7 @@ Fix paths to examples.
# Where the tool is installed.
# default is relative path to installed location of the tools
--prefix="${prefix:-../../../..}"
+-prefix="${prefix:-../../../../}"
+prefix="${prefix:-../../../../..}"
PARALLEL=@PARALLEL@ # Am I in parallel mode?
AR="@AR@"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 13:14:54 +0000