diff options
author | adam <adam@pkgsrc.org> | 2015-11-26 11:25:10 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2015-11-26 11:25:10 +0000 |
commit | aa3a199cfaf18b559b14cfd5b7635c3005c55bfe (patch) | |
tree | df7c072a3c7a2ddf1538d4d99c5a9db5928e25da /devel | |
parent | 072ee5a69efc1a4564903aef40973c521a9f59f7 (diff) | |
download | pkgsrc-aa3a199cfaf18b559b14cfd5b7635c3005c55bfe.tar.gz |
Changes 1.8.16:
* Improvements made to the CMake build system.
* Added Memory Allocation Functions that Use the Library's Allocator
* Added Functions to Control the Value of H5PL_no_plugin_g without
Using an Environment Variable
* MPI_Finalize and HDF5 Library Shutdown
* New Wrappers for C Functions H5P[s/g]et_libver_bounds
* more...
Diffstat (limited to 'devel')
-rw-r--r-- | devel/hdf5-c++/Makefile | 19 | ||||
-rw-r--r-- | devel/hdf5/Makefile.common | 4 | ||||
-rw-r--r-- | devel/hdf5/PLIST | 51 | ||||
-rw-r--r-- | devel/hdf5/distinfo | 29 | ||||
-rw-r--r-- | devel/hdf5/patches/patch-bin_cmakehdf5 | 15 | ||||
-rw-r--r-- | devel/hdf5/patches/patch-c++_examples_Makefile.in | 12 | ||||
-rw-r--r-- | devel/hdf5/patches/patch-c++_examples_run-c++-ex.sh.in | 8 | ||||
-rw-r--r-- | devel/hdf5/patches/patch-configure | 20 | ||||
-rw-r--r-- | devel/hdf5/patches/patch-examples_Makefile.in | 14 | ||||
-rw-r--r-- | devel/hdf5/patches/patch-examples_run-c-ex.sh.in | 10 | ||||
-rw-r--r-- | devel/hdf5/patches/patch-hl_c++_examples_Makefile.in | 12 | ||||
-rw-r--r-- | devel/hdf5/patches/patch-hl_c++_examples_run-hlc++-ex.sh.in | 8 | ||||
-rw-r--r-- | devel/hdf5/patches/patch-hl_examples_Makefile.in | 18 | ||||
-rw-r--r-- | devel/hdf5/patches/patch-hl_examples_run-hlc-ex.sh.in | 8 |
14 files changed, 118 insertions, 110 deletions
diff --git a/devel/hdf5-c++/Makefile b/devel/hdf5-c++/Makefile index 8f28aab204e..e92f7f8fa42 100644 --- a/devel/hdf5-c++/Makefile +++ b/devel/hdf5-c++/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2015/08/24 17:58:34 gdt Exp $ +# $NetBSD: Makefile,v 1.5 2015/11/26 11:25:11 adam Exp $ PKGNAME= ${DISTNAME:S/-/-c++-/} -PKGREVISION= 1 COMMENT= Hierarchical Data Format (new generation) - C++ wrappers USE_LANGUAGES= c c++ @@ -39,17 +38,17 @@ do-install: .endfor .include "../../devel/hdf5/Makefile.common" - .include "../../devel/hdf5/buildlink3.mk" - # Since the package is build from source code shared with hdf5, # same options should be passed: -.if !empty(PKG_BUILD_OPTIONS.hdf5:Mszip) -CONFIGURE_ARGS+= --with-szlib -.endif +.include "../../devel/hdf5/options.mk" + +#.if !empty(PKG_BUILD_OPTIONS.hdf5:Mszip) +#CONFIGURE_ARGS+= --with-szlib +#.endif -.if !empty(PKG_BUILD_OPTIONS.hdf5:Mthreads) -CONFIGURE_ARGS+= --enable-threadsafe -.endif +#.if !empty(PKG_BUILD_OPTIONS.hdf5:Mthreads) +#CONFIGURE_ARGS+= --enable-threadsafe +#.endif .include "../../mk/bsd.pkg.mk" diff --git a/devel/hdf5/Makefile.common b/devel/hdf5/Makefile.common index 8ebc557ef15..df55e31932f 100644 --- a/devel/hdf5/Makefile.common +++ b/devel/hdf5/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.10 2015/08/22 23:03:39 alnsn Exp $ +# $NetBSD: Makefile.common,v 1.11 2015/11/26 11:25:10 adam Exp $ # used by devel/hdf5/Makefile # used by devel/hdf5-c++/Makefile -DISTNAME= hdf5-1.8.14 +DISTNAME= hdf5-1.8.16 CATEGORIES= devel MASTER_SITES= ftp://ftp.hdfgroup.org/HDF5/current/src/ EXTRACT_SUFX= .tar.bz2 diff --git a/devel/hdf5/PLIST b/devel/hdf5/PLIST index 9860e9b1031..887b7712955 100644 --- a/devel/hdf5/PLIST +++ b/devel/hdf5/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2015/04/10 02:49:56 wen Exp $ +@comment $NetBSD: PLIST,v 1.24 2015/11/26 11:25:10 adam Exp $ bin/gif2h5 bin/h52gif bin/h5cc @@ -43,6 +43,7 @@ include/H5Lpublic.h include/H5MMpublic.h include/H5Opublic.h include/H5PLextern.h +include/H5PLpublic.h include/H5PTpublic.h include/H5Ppublic.h include/H5Rpublic.h @@ -91,28 +92,28 @@ share/examples/hdf5/c/h5_subset.c share/examples/hdf5/c/h5_write.c share/examples/hdf5/c/ph5example.c share/examples/hdf5/c/run-c-ex.sh +share/examples/hdf5/hl/c/ex_ds1.c +share/examples/hdf5/hl/c/ex_image1.c +share/examples/hdf5/hl/c/ex_image2.c +share/examples/hdf5/hl/c/ex_lite1.c +share/examples/hdf5/hl/c/ex_lite2.c +share/examples/hdf5/hl/c/ex_lite3.c +share/examples/hdf5/hl/c/ex_table_01.c +share/examples/hdf5/hl/c/ex_table_02.c +share/examples/hdf5/hl/c/ex_table_03.c +share/examples/hdf5/hl/c/ex_table_04.c +share/examples/hdf5/hl/c/ex_table_05.c +share/examples/hdf5/hl/c/ex_table_06.c +share/examples/hdf5/hl/c/ex_table_07.c +share/examples/hdf5/hl/c/ex_table_08.c +share/examples/hdf5/hl/c/ex_table_09.c +share/examples/hdf5/hl/c/ex_table_10.c +share/examples/hdf5/hl/c/ex_table_11.c +share/examples/hdf5/hl/c/ex_table_12.c +share/examples/hdf5/hl/c/image24pixel.txt +share/examples/hdf5/hl/c/image8.txt +share/examples/hdf5/hl/c/pal_rgb.h +share/examples/hdf5/hl/c/ptExampleFL.c +share/examples/hdf5/hl/c/run-hlc-ex.sh +share/examples/hdf5/hl/run-hl-ex.sh share/examples/hdf5/run-all-ex.sh -share/hdf5_examples/hl/c/ex_ds1.c -share/hdf5_examples/hl/c/ex_image1.c -share/hdf5_examples/hl/c/ex_image2.c -share/hdf5_examples/hl/c/ex_lite1.c -share/hdf5_examples/hl/c/ex_lite2.c -share/hdf5_examples/hl/c/ex_lite3.c -share/hdf5_examples/hl/c/ex_table_01.c -share/hdf5_examples/hl/c/ex_table_02.c -share/hdf5_examples/hl/c/ex_table_03.c -share/hdf5_examples/hl/c/ex_table_04.c -share/hdf5_examples/hl/c/ex_table_05.c -share/hdf5_examples/hl/c/ex_table_06.c -share/hdf5_examples/hl/c/ex_table_07.c -share/hdf5_examples/hl/c/ex_table_08.c -share/hdf5_examples/hl/c/ex_table_09.c -share/hdf5_examples/hl/c/ex_table_10.c -share/hdf5_examples/hl/c/ex_table_11.c -share/hdf5_examples/hl/c/ex_table_12.c -share/hdf5_examples/hl/c/image24pixel.txt -share/hdf5_examples/hl/c/image8.txt -share/hdf5_examples/hl/c/pal_rgb.h -share/hdf5_examples/hl/c/ptExampleFL.c -share/hdf5_examples/hl/c/run-hlc-ex.sh -share/hdf5_examples/hl/run-hl-ex.sh diff --git a/devel/hdf5/distinfo b/devel/hdf5/distinfo index cdf866c53e9..239a7b63af2 100644 --- a/devel/hdf5/distinfo +++ b/devel/hdf5/distinfo @@ -1,16 +1,17 @@ -$NetBSD: distinfo,v 1.35 2015/11/03 03:27:31 agc Exp $ +$NetBSD: distinfo,v 1.36 2015/11/26 11:25:10 adam Exp $ -SHA1 (hdf5-1.8.14.tar.bz2) = 3c48bcb0d5fb21a3aa425ed035c08d8da3d5483a -RMD160 (hdf5-1.8.14.tar.bz2) = 21680eb5c3831870aef116e50b313512f70b624c -SHA512 (hdf5-1.8.14.tar.bz2) = c4f0bb01df7bef9cd29c42ec2e27f4bd27c3e059cf18f1285c583e92b94ef799f8a29ec85c17bab12e47a69626851fbda4b8d74543266b01aa2cffc42cde4fea -Size (hdf5-1.8.14.tar.bz2) = 9503743 bytes -SHA1 (patch-c++_examples_Makefile.in) = 9ae14ae81abc9c858abb0d03b92e498b2113591c -SHA1 (patch-c++_examples_run-c++-ex.sh.in) = 58c38b2ba5557cdae2c4fe1e72c6fa55e5606f1e -SHA1 (patch-configure) = e60e951f6a7d81ab85b2413d6082576f7e719adb -SHA1 (patch-examples_Makefile.in) = 93d0764eaa8ccebdd3705195ba0ffc5fa83c2610 -SHA1 (patch-examples_run-c-ex.sh.in) = 744d3e6bbae1a9b496e3657db6a62fac78fcd7ed -SHA1 (patch-hl_c++_examples_Makefile.in) = a3310436f9f73946fba0d404158c990d68638f16 -SHA1 (patch-hl_c++_examples_run-hlc++-ex.sh.in) = fba3d976adb02d80682ddc42a8ef64f6dddffa41 -SHA1 (patch-hl_examples_Makefile.in) = c303d95ca675cc9b414d1204c7ff5b23250e46bb -SHA1 (patch-hl_examples_run-hlc-ex.sh.in) = 38c2c112439d6febb023d638d965f04bbaa45d5f +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 (patch-bin_cmakehdf5) = c31107e3f67dd2b58318ebc94e6044c8c76df049 +SHA1 (patch-c++_examples_Makefile.in) = 2df6015f121e9e86080cf937b64990a39acf9f65 +SHA1 (patch-c++_examples_run-c++-ex.sh.in) = b5b68a72a7b93ac0c87bbce229171136dbe3fcd2 +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-tools_h5jam_testh5jam.sh.in) = 89068ae1694c586f85b25240fda30549eddf2d0f diff --git a/devel/hdf5/patches/patch-bin_cmakehdf5 b/devel/hdf5/patches/patch-bin_cmakehdf5 new file mode 100644 index 00000000000..ac82e93b26c --- /dev/null +++ b/devel/hdf5/patches/patch-bin_cmakehdf5 @@ -0,0 +1,15 @@ +$NetBSD: patch-bin_cmakehdf5,v 1.1 2015/11/26 11:25:10 adam Exp $ + +Portability fix. + +--- bin/cmakehdf5.orig 2015-11-26 11:09:09.000000000 +0000 ++++ bin/cmakehdf5 +@@ -30,7 +30,7 @@ exit_code=0 + # and should have invoked as "$srcdir/bin/$progname" or + # "bin/$progname". So, by striping bin/$program from $0, + # we can find $srcdir. +-if [ $0 == bin/$progname ]; then ++if [ $0 = bin/$progname ]; then + srcdir="." # current directory + else + # $0 is $srdir/bin/$progname diff --git a/devel/hdf5/patches/patch-c++_examples_Makefile.in b/devel/hdf5/patches/patch-c++_examples_Makefile.in index f45230294c8..72f76b59ad1 100644 --- a/devel/hdf5/patches/patch-c++_examples_Makefile.in +++ b/devel/hdf5/patches/patch-c++_examples_Makefile.in @@ -1,15 +1,17 @@ -$NetBSD: patch-c++_examples_Makefile.in,v 1.2 2012/12/09 00:07:38 adam Exp $ +$NetBSD: patch-c++_examples_Makefile.in,v 1.3 2015/11/26 11:25:10 adam Exp $ Fix paths to examples. ---- c++/examples/Makefile.in.orig 2011-05-10 14:20:43.000000000 +0000 +--- c++/examples/Makefile.in.orig 2015-11-10 14:01:02.000000000 +0000 +++ c++/examples/Makefile.in -@@ -405,7 +405,7 @@ CXX_API = yes +@@ -626,8 +626,8 @@ CXX_API = yes # Where to install examples # Note: no '/' after DESTDIR. Explanation in commence.am --EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/c++ -+EXAMPLEDIR = ${DESTDIR}$(prefix)/share/examples/hdf5/c++ +-EXAMPLEDIR = ${DESTDIR}$(datarootdir)/hdf5_examples/c++ +-EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/hdf5_examples ++EXAMPLEDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/c++ ++EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/examples/hdf5 # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. 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 5e81ea14e33..a083ef13a3d 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.1 2011/10/07 10:38:51 alnsn Exp $ +$NetBSD: patch-c++_examples_run-c++-ex.sh.in,v 1.2 2015/11/26 11:25:10 adam Exp $ Fix paths to examples. ---- c++/examples/run-c++-ex.sh.in.orig 2011-05-09 16:47:59.000000000 +0000 +--- c++/examples/run-c++-ex.sh.in.orig 2015-10-24 05:14:06.000000000 +0000 +++ c++/examples/run-c++-ex.sh.in @@ -20,7 +20,7 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # @@ -17,8 +17,8 @@ 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:-../../..}" ++prefix="${prefix:-../../../..}" AR="@AR@" RANLIB="@RANLIB@" H5TOOL="h5c++" # The tool name diff --git a/devel/hdf5/patches/patch-configure b/devel/hdf5/patches/patch-configure index 0a582b1d6a7..6cf9cbb303d 100644 --- a/devel/hdf5/patches/patch-configure +++ b/devel/hdf5/patches/patch-configure @@ -1,28 +1,14 @@ -$NetBSD: patch-configure,v 1.2 2014/09/24 10:40:57 jperkin Exp $ +$NetBSD: patch-configure,v 1.3 2015/11/26 11:25:10 adam Exp $ -Unreverse order of CPPFLAGS. Avoid reference to WRAPPER_BINDIR in final binaries. ---- configure.orig 2013-11-21 15:14:04.000000000 +0000 +--- configure.orig 2015-11-10 14:01:10.000000000 +0000 +++ configure -@@ -30801,7 +30801,7 @@ else +@@ -27779,7 +27779,6 @@ else CC_VERSION="$CC"; for x in `echo $PATH | sed -e 's/:/ /g'`; do if test -x $x/$CC_NOFLAGS; then - CC_VERSION="$x/$CC" -+ #CC_VERSION="$x/$CC" break fi done -@@ -30902,9 +30902,9 @@ if test -n "$AM_CPPFLAGS"; then - d="-I${ROOT}/${d}" - ;; - esac -- TEMP_CPPFLAGS="$d $TEMP_CPPFLAGS" -+ TEMP_CPPFLAGS="$TEMP_CPPFLAGS $d" - done -- AM_CPPFLAGS=$TEMP_CPPFLAGS -+ AM_CPPFLAGS="$TEMP_CPPFLAGS" - fi - - ## ---------------------------------------------------------------------- diff --git a/devel/hdf5/patches/patch-examples_Makefile.in b/devel/hdf5/patches/patch-examples_Makefile.in index d82082b5062..6b430c177ca 100644 --- a/devel/hdf5/patches/patch-examples_Makefile.in +++ b/devel/hdf5/patches/patch-examples_Makefile.in @@ -1,17 +1,17 @@ -$NetBSD: patch-examples_Makefile.in,v 1.2 2012/12/09 00:07:38 adam Exp $ +$NetBSD: patch-examples_Makefile.in,v 1.3 2015/11/26 11:25:10 adam Exp $ Fix paths to examples. ---- examples/Makefile.in.orig 2011-05-10 14:20:44.000000000 +0000 +--- examples/Makefile.in.orig 2015-11-10 14:01:03.000000000 +0000 +++ examples/Makefile.in -@@ -417,8 +417,8 @@ EXTLINK_DIRS = red blue u2w +@@ -636,8 +636,8 @@ EXTLINK_DIRS = red blue u2w # Example directory # Note: no '/' after DESTDIR. Explanation in commence.am --EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/c --EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples -+EXAMPLEDIR = ${DESTDIR}$(prefix)/share/examples/hdf5/c -+EXAMPLETOPDIR = ${DESTDIR}$(prefix)/share/examples/hdf5 +-EXAMPLEDIR = ${DESTDIR}$(datarootdir)/hdf5_examples/c +-EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/hdf5_examples ++EXAMPLEDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/c ++EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/examples/hdf5 @BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH) # Assume that all tests in this directory are examples, and tell 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 0c71b64627f..13177974f88 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.1 2011/10/07 10:38:52 alnsn Exp $ +$NetBSD: patch-examples_run-c-ex.sh.in,v 1.2 2015/11/26 11:25:10 adam Exp $ -Fix paths to examples. +Fix path to examples. ---- examples/run-c-ex.sh.in.orig 2011-05-09 16:48:00.000000000 +0000 +--- examples/run-c-ex.sh.in.orig 2015-10-24 05:14:08.000000000 +0000 +++ examples/run-c-ex.sh.in @@ -20,7 +20,7 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # @@ -17,8 +17,8 @@ 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:-../../..}" ++prefix="${prefix:-../../../..}" PARALLEL=@PARALLEL@ # Am I in parallel mode? AR="@AR@" RANLIB="@RANLIB@" diff --git a/devel/hdf5/patches/patch-hl_c++_examples_Makefile.in b/devel/hdf5/patches/patch-hl_c++_examples_Makefile.in index 8a3ea12b41a..d38602a1d6d 100644 --- a/devel/hdf5/patches/patch-hl_c++_examples_Makefile.in +++ b/devel/hdf5/patches/patch-hl_c++_examples_Makefile.in @@ -1,15 +1,17 @@ -$NetBSD: patch-hl_c++_examples_Makefile.in,v 1.2 2012/12/09 00:07:38 adam Exp $ +$NetBSD: patch-hl_c++_examples_Makefile.in,v 1.3 2015/11/26 11:25:10 adam Exp $ Fix paths to examples. ---- hl/c++/examples/Makefile.in.orig 2011-05-10 14:20:48.000000000 +0000 +--- hl/c++/examples/Makefile.in.orig 2015-11-10 14:01:04.000000000 +0000 +++ hl/c++/examples/Makefile.in -@@ -401,7 +401,7 @@ CXX_API = yes +@@ -615,8 +615,8 @@ CXX_API = yes # Where to install examples # Note: no '/' after DESTDIR. Explanation in commence.am --EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c++ -+EXAMPLEDIR = ${DESTDIR}$(prefix)/share/examples/hdf5/hl/c++ +-EXAMPLEDIR = ${DESTDIR}$(datarootdir)/hdf5_examples/hl/c++ +-EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/hdf5_examples/hl ++EXAMPLEDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/hl/c++ ++EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/hl # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. 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 ee235aa9b0a..718e19d3065 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.1 2011/10/07 10:38:52 alnsn Exp $ +$NetBSD: patch-hl_c++_examples_run-hlc++-ex.sh.in,v 1.2 2015/11/26 11:25:10 adam Exp $ Fix paths to examples. ---- hl/c++/examples/run-hlc++-ex.sh.in.orig 2011-05-09 16:47:58.000000000 +0000 +--- 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 @@ -20,7 +20,7 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # @@ -17,8 +17,8 @@ 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:-../../../..}" ++prefix="${prefix:-../../../../..}" AR="@AR@" RANLIB="@RANLIB@" H5TOOL="h5c++" # The tool name diff --git a/devel/hdf5/patches/patch-hl_examples_Makefile.in b/devel/hdf5/patches/patch-hl_examples_Makefile.in index 29913d744eb..e21f608c451 100644 --- a/devel/hdf5/patches/patch-hl_examples_Makefile.in +++ b/devel/hdf5/patches/patch-hl_examples_Makefile.in @@ -1,15 +1,17 @@ -$NetBSD: patch-hl_examples_Makefile.in,v 1.2 2015/04/10 02:49:56 wen Exp $ -Fix EXAMPLEDIR ---- hl/examples/Makefile.in.orig 2015-04-10 09:53:27.000000000 +0000 +$NetBSD: patch-hl_examples_Makefile.in,v 1.3 2015/11/26 11:25:10 adam Exp $ + +Fix paths to examples. + +--- hl/examples/Makefile.in.orig 2015-11-10 14:01:04.000000000 +0000 +++ hl/examples/Makefile.in -@@ -614,8 +614,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.c +@@ -604,8 +604,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.c # Example directory # Note: no '/' after DESTDIR. Explanation in commence.am --EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c --EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl -+EXAMPLEDIR = ${DESTDIR}$(prefix)/share/hdf5_examples/hl/c -+EXAMPLETOPDIR = ${DESTDIR}$(prefix)/share/hdf5_examples/hl +-EXAMPLEDIR = ${DESTDIR}$(datarootdir)/hdf5_examples/hl/c +-EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/hdf5_examples/hl ++EXAMPLEDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/hl/c ++EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/hl INSTALL_SCRIPT_FILES = run-hlc-ex.sh INSTALL_TOP_SCRIPT_FILES = run-hl-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 2e63052f5fb..d0d1ebde97b 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.1 2011/10/07 10:38:52 alnsn Exp $ +$NetBSD: patch-hl_examples_run-hlc-ex.sh.in,v 1.2 2015/11/26 11:25:10 adam Exp $ Fix paths to examples. ---- hl/examples/run-hlc-ex.sh.in.orig 2011-05-09 16:47:58.000000000 +0000 +--- hl/examples/run-hlc-ex.sh.in.orig 2015-10-24 05:14:03.000000000 +0000 +++ hl/examples/run-hlc-ex.sh.in @@ -20,7 +20,7 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # @@ -17,8 +17,8 @@ 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:-../../../..}" ++prefix="${prefix:-../../../../..}" PARALLEL=@PARALLEL@ # Am I in parallel mode? AR="@AR@" RANLIB="@RANLIB@" |