Index: head/science/hdf5-18/Makefile =================================================================== --- head/science/hdf5-18/Makefile (revision 454080) +++ head/science/hdf5-18/Makefile (revision 454081) @@ -1,87 +1,94 @@ # Created by: Wen Heping # $FreeBSD$ PORTNAME= hdf5 -PORTVERSION= 1.8.19 -PORTREVISION= 1 +PORTVERSION= 1.8.19 # When PORTVERSION changes, please update french/med/files/patch-configure +PORTREVISION= 2 CATEGORIES= science archivers graphics MASTER_SITES= https://support.hdfgroup.org/ftp/HDF5/current18/src/ \ http://support.hdfgroup.org/ftp/HDF5/current18/src/ \ ftp://ftp.hdfgroup.org/HDF5/current18/src/ PKGNAMESUFFIX= -18 MAINTAINER= thierry@FreeBSD.org COMMENT= Hierarchical Data Format library (from NCSA) 1.8 LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_sparc64= Does not compile on ${ARCH} + OPTIONS_DEFINE= DEBUG EXAMPLES FORTRAN SZIP -USES= libtool:keepla tar:bzip2 +USES= libtool:keepla localbase tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes +PORTSUFF= ${PORTNAME}${PKGNAMESUFFIX} CONFIGURE_ARGS= --enable-cxx \ --enable-instrument \ --enable-strict-format-checks \ --with-pthread=/usr \ --with-zlib=/usr \ --program-suffix=${PKGNAMESUFFIX} \ - --includedir=${PREFIX}/include/${PORTNAME}${PKGNAMESUFFIX} -EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}${PKGNAMESUFFIX} + --includedir=${PREFIX}/include/${PORTSUFF} +EXAMPLESDIR= ${PREFIX}/share/examples/${PORTSUFF} +SUFF2FIX= tools/misc/h5cc.in tools/misc/h5redeploy.in \ + c++/src/h5c++.in fortran/src/h5fc.in + .include .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--disable-production --enable-debug=all .endif .if ${PORT_OPTIONS:MFORTRAN} USES+= fortran CONFIGURE_ARGS+=--enable-fortran CONFIGURE_ENV+= F9X=${FC} PLIST_SUB+= FORTRAN="" FCFLAGS_f90= ${FCFLAGS} LIBS+= -lstdc++ .else PLIST_SUB+= FORTRAN="@comment " .endif .if ${PORT_OPTIONS:MSZIP} LIB_DEPENDS+= libsz.so:science/szip CONFIGURE_ARGS+=--with-szlib=${LOCALBASE} .endif -.include - -.if ${ARCH} == "sparc64" -BROKEN= Does not compile on ${ARCH} -.endif - pre-configure: ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure ${REINPLACE_CMD} -e 's|-O3||g' ${WRKSRC}/config/gnu-flags ${REINPLACE_CMD} \ -e '/LD_LIBRARY_PATH/ s|^|#|' \ -e 's|/share/hdf5_examples|/${EXAMPLESDIR_REL}|' \ -e 's|(INSTALL)|(INSTALL_DATA)|' \ `${FIND} ${WRKSRC} -regex '.*/examples/Makefile.in'` ${REINPLACE_CMD} -e 's|\[ -a|\[ -f|g' `${FIND} ${WRKSRC} -name \*.sh\*` .if !${PORT_OPTIONS:MEXAMPLES} ${REINPLACE_CMD} -e '/^install:/ s|install-examples||' ${WRKSRC}/Makefile.in .endif ${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ ${REINPLACE_CMD} -e 's|libhdf5|libhdf5${PKGNAMESUFFIX}|g' ${REINPLACE_CMD} -e 's|libhdf5|libhdf5${PKGNAMESUFFIX}|g' \ ${WRKSRC}/test/testlibinfo.sh.in +.for pf in ${SUFF2FIX} + ${REINPLACE_CMD} -e 's|%%SUFF%%|${PKGNAMESUFFIX}|g' ${WRKSRC}/${pf} +.endfor post-configure: ${CP} -p ${WRKSRC}/src/libhdf5.settings.in \ ${WRKSRC}/src/libhdf5${PKGNAMESUFFIX}.settings.in ${CP} -p ${WRKSRC}/src/libhdf5.settings \ ${WRKSRC}/src/libhdf5${PKGNAMESUFFIX}.settings +post-stage: +.if ${PORT_OPTIONS:MFORTRAN} + ${MV} ${STAGEDIR}${PREFIX}/bin/h5fc ${STAGEDIR}${PREFIX}/bin/h5fc${PKGNAMESUFFIX} +.endif regression-test test: build cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE} check -.include +.include Index: head/science/hdf5-18/files/patch-c++_src_h5c++.in =================================================================== --- head/science/hdf5-18/files/patch-c++_src_h5c++.in (nonexistent) +++ head/science/hdf5-18/files/patch-c++_src_h5c++.in (revision 454081) @@ -0,0 +1,49 @@ +--- c++/src/h5c++.in.orig 2017-06-15 15:46:52 UTC ++++ c++/src/h5c++.in +@@ -159,7 +159,7 @@ usage() { + # libhdf5.settings file reside in the lib directory. + showconfigure() + { +- cat ${libdir}/libhdf5.settings ++ cat ${libdir}/libhdf5%%SUFF%%.settings + status=$? + } + +@@ -313,9 +313,9 @@ if test "x$do_link" = "xyes"; then + shared_link="" + # conditionnaly link with the hl library + if test "X$HL" = "Xhl"; then +- libraries=" $libraries -lhdf5_hl_cpp -lhdf5_cpp -lhdf5_hl -lhdf5 " ++ libraries=" $libraries -lhdf5%%SUFF%%_hl_cpp -lhdf5%%SUFF%%_cpp -lhdf5%%SUFF%%_hl -lhdf5%%SUFF%% " + else +- libraries=" $libraries -lhdf5_cpp -lhdf5 " ++ libraries=" $libraries -lhdf5%%SUFF%%_cpp -lhdf5%%SUFF%% " + fi + link_args="$link_args -L${libdir}" + +@@ -345,17 +345,17 @@ if test "x$do_link" = "xyes"; then + new_libraries="" + for lib in $libraries; do + case "$lib" in +- -lhdf5) +- new_libraries="$new_libraries ${libdir}/libhdf5.a" ++ -lhdf5%%SUFF%%) ++ new_libraries="$new_libraries ${libdir}/libhdf5%%SUFF%%.a" + ;; +- -lhdf5_hl) +- new_libraries="$new_libraries ${libdir}/libhdf5_hl.a" ++ -lhdf5%%SUFF%%_hl) ++ new_libraries="$new_libraries ${libdir}/libhdf5%%SUFF%%_hl.a" + ;; +- -lhdf5_cpp) +- new_libraries="$new_libraries ${libdir}/libhdf5_cpp.a" ++ -lhdf5%%SUFF%%_cpp) ++ new_libraries="$new_libraries ${libdir}/libhdf5%%SUFF%%_cpp.a" + ;; +- -lhdf5_hl_cpp) +- new_libraries="$new_libraries ${libdir}/libhdf5_hl_cpp.a" ++ -lhdf5%%SUFF%%_hl_cpp) ++ new_libraries="$new_libraries ${libdir}/libhdf5%%SUFF%%_hl_cpp.a" + ;; + *) + new_libraries="$new_libraries $lib" Property changes on: head/science/hdf5-18/files/patch-c++_src_h5c++.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/science/hdf5-18/files/patch-c++_test_Makefile.in =================================================================== --- head/science/hdf5-18/files/patch-c++_test_Makefile.in (revision 454080) +++ head/science/hdf5-18/files/patch-c++_test_Makefile.in (revision 454081) @@ -1,12 +1,12 @@ ---- c++/test/Makefile.in.orig 2016-05-10 21:24:51 UTC +--- c++/test/Makefile.in.orig 2017-06-15 17:14:28 UTC +++ c++/test/Makefile.in -@@ -400,8 +400,7 @@ AMTAR = @AMTAR@ +@@ -408,8 +408,7 @@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@ # Include src, test, and c++/src directories -AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src \ - -I$(top_srcdir)/test -I$(top_srcdir)/c++/src +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src @AM_CPPFLAGS@ @H5_CPPFLAGS@ AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ Property changes on: head/science/hdf5-18/files/patch-c++_test_Makefile.in ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/science/hdf5-18/files/patch-fortran_src_Makefile.in =================================================================== --- head/science/hdf5-18/files/patch-fortran_src_Makefile.in (revision 454080) +++ head/science/hdf5-18/files/patch-fortran_src_Makefile.in (revision 454081) @@ -1,11 +1,11 @@ ---- fortran/src/Makefile.in.orig 2016-05-10 21:24:52 UTC +--- fortran/src/Makefile.in.orig 2017-06-15 17:14:28 UTC +++ fortran/src/Makefile.in -@@ -241,7 +241,7 @@ am__v_FC_1 = +@@ -244,7 +244,7 @@ am__v_FC_1 = FCLD = $(FC) FCLINK = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(LDFLAGS) -o $@ AM_V_FCLD = $(am__v_FCLD_@AM_V@) am__v_FCLD_ = $(am__v_FCLD_@AM_DEFAULT_V@) am__v_FCLD_0 = @echo " FCLD " $@; Property changes on: head/science/hdf5-18/files/patch-fortran_src_Makefile.in ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/science/hdf5-18/files/patch-fortran_src_h5fc.in =================================================================== --- head/science/hdf5-18/files/patch-fortran_src_h5fc.in (nonexistent) +++ head/science/hdf5-18/files/patch-fortran_src_h5fc.in (revision 454081) @@ -0,0 +1,59 @@ +--- fortran/src/h5fc.in.orig 2017-06-15 15:46:52 UTC ++++ fortran/src/h5fc.in +@@ -151,10 +151,10 @@ usage() { + } + + # Show the configuration summary of the library recorded in the +-# libhdf5.settings file reside in the lib directory. ++# libhdf5%%SUFF%%.settings file reside in the lib directory. + showconfigure() + { +- cat ${libdir}/libhdf5.settings ++ cat ${libdir}/libhdf5%%SUFF%%.settings + status=$? + } + +@@ -300,9 +300,9 @@ if test "x$do_link" = "xyes"; then + shared_link="" + # conditionnaly link with the hl library + if test "X$HL" = "Xhl"; then +- libraries=" $libraries -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 " ++ libraries=" $libraries -lhdf5%%SUFF%%hl_fortran -lhdf5%%SUFF%%_hl -lhdf5%%SUFF%%_fortran -lhdf5%%SUFF%% " + else +- libraries=" $libraries -lhdf5_fortran -lhdf5 " ++ libraries=" $libraries -lhdf5%%SUFF%%_fortran -lhdf5%%SUFF%% " + fi + link_args="$link_args -L${libdir}" + +@@ -320,22 +320,22 @@ if test "x$do_link" = "xyes"; then + fi + + if test "x$USE_SHARED_LIB" != "xyes"; then +- # The hdf5 library "-l" flags are in here already. This is a static ++ # The hdf5%%SUFF%% library "-l" flags are in here already. This is a static + # compile though, so change it to the static versions (.a) of the libraries. + new_libraries="" + for lib in $libraries; do + case "$lib" in +- -lhdf5) +- new_libraries="$new_libraries ${libdir}/libhdf5.a" ++ -lhdf5%%SUFF%%) ++ new_libraries="$new_libraries ${libdir}/libhdf5%%SUFF%%.a" + ;; +- -lhdf5_hl) +- new_libraries="$new_libraries ${libdir}/libhdf5_hl.a" ++ -lhdf5%%SUFF%%_hl) ++ new_libraries="$new_libraries ${libdir}/libhdf5%%SUFF%%_hl.a" + ;; +- -lhdf5_fortran) +- new_libraries="$new_libraries ${libdir}/libhdf5_fortran.a" ++ -lhdf5%%SUFF%%_fortran) ++ new_libraries="$new_libraries ${libdir}/libhdf5%%SUFF%%_fortran.a" + ;; +- -lhdf5hl_fortran) +- new_libraries="$new_libraries ${libdir}/libhdf5hl_fortran.a" ++ -lhdf5%%SUFF%%hl_fortran) ++ new_libraries="$new_libraries ${libdir}/libhdf5%%SUFF%%hl_fortran.a" + ;; + *) + new_libraries="$new_libraries $lib" Property changes on: head/science/hdf5-18/files/patch-fortran_src_h5fc.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/science/hdf5-18/files/patch-fortran_test_Makefile.in =================================================================== --- head/science/hdf5-18/files/patch-fortran_test_Makefile.in (revision 454080) +++ head/science/hdf5-18/files/patch-fortran_test_Makefile.in (revision 454081) @@ -1,20 +1,20 @@ ---- fortran/test/Makefile.in.orig 2016-05-10 21:24:52 UTC +--- fortran/test/Makefile.in.orig 2017-06-15 17:14:28 UTC +++ fortran/test/Makefile.in -@@ -150,7 +150,7 @@ fortranlib_test_DEPENDENCIES = libh5test +@@ -153,7 +153,7 @@ fortranlib_test_DEPENDENCIES = libh5test $(LIBH5F) $(LIBHDF5) fortranlib_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=FC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(FCLD) \ - $(fortranlib_test_FCFLAGS) $(FCFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + $(fortranlib_test_FCFLAGS) $(FCFLAGS) $(LDFLAGS) \ -o $@ am_fortranlib_test_1_8_OBJECTS = tH5O.$(OBJEXT) tH5A_1_8.$(OBJEXT) \ tH5G_1_8.$(OBJEXT) tH5MISC_1_8.$(OBJEXT) tHDF5_1_8.$(OBJEXT) \ -@@ -219,7 +219,7 @@ am__v_FC_1 = +@@ -222,7 +222,7 @@ am__v_FC_1 = FCLD = $(FC) FCLINK = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(LDFLAGS) -o $@ AM_V_FCLD = $(am__v_FCLD_@AM_V@) am__v_FCLD_ = $(am__v_FCLD_@AM_DEFAULT_V@) am__v_FCLD_0 = @echo " FCLD " $@; Property changes on: head/science/hdf5-18/files/patch-fortran_test_Makefile.in ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/science/hdf5-18/files/patch-hl_c++_test_Makefile.in =================================================================== --- head/science/hdf5-18/files/patch-hl_c++_test_Makefile.in (revision 454080) +++ head/science/hdf5-18/files/patch-hl_c++_test_Makefile.in (revision 454081) @@ -1,16 +1,16 @@ ---- hl/c++/test/Makefile.in.orig 2016-05-10 21:24:53 UTC +--- hl/c++/test/Makefile.in.orig 2017-06-15 17:14:28 UTC +++ hl/c++/test/Makefile.in -@@ -395,10 +395,11 @@ AMTAR = @AMTAR@ +@@ -404,10 +404,11 @@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@ # Include directories -AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/c++/src -I$(top_srcdir)/hl/src \ -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test \ - -I$(top_builddir)/hl/test -I$(top_srcdir)/hl/test + -I$(top_builddir)/hl/test -I$(top_srcdir)/hl/test \ + @AM_CPPFLAGS@ @H5_CPPFLAGS@ AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ Property changes on: head/science/hdf5-18/files/patch-hl_c++_test_Makefile.in ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/science/hdf5-18/files/patch-hl_fortran_test_Makefile.in =================================================================== --- head/science/hdf5-18/files/patch-hl_fortran_test_Makefile.in (revision 454080) +++ head/science/hdf5-18/files/patch-hl_fortran_test_Makefile.in (revision 454081) @@ -1,11 +1,11 @@ ---- hl/fortran/test/Makefile.in.orig 2016-05-10 21:24:53 UTC +--- hl/fortran/test/Makefile.in.orig 2017-06-15 17:14:28 UTC +++ hl/fortran/test/Makefile.in -@@ -160,7 +160,7 @@ am__v_FC_1 = +@@ -165,7 +165,7 @@ am__v_FC_1 = FCLD = $(FC) FCLINK = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(LDFLAGS) -o $@ AM_V_FCLD = $(am__v_FCLD_@AM_V@) am__v_FCLD_ = $(am__v_FCLD_@AM_DEFAULT_V@) am__v_FCLD_0 = @echo " FCLD " $@; Property changes on: head/science/hdf5-18/files/patch-hl_fortran_test_Makefile.in ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/science/hdf5-18/files/patch-src-H5FDdirect.c =================================================================== --- head/science/hdf5-18/files/patch-src-H5FDdirect.c (revision 454080) +++ head/science/hdf5-18/files/patch-src-H5FDdirect.c (revision 454081) @@ -1,11 +1,11 @@ ---- ./src/H5FDdirect.c.orig 2011-11-07 14:11:30.000000000 -0800 -+++ ./src/H5FDdirect.c 2011-12-21 16:50:03.000000000 -0800 -@@ -29,6 +29,8 @@ +--- src/H5FDdirect.c.orig 2017-06-15 15:47:13 UTC ++++ src/H5FDdirect.c +@@ -27,6 +27,8 @@ * this file. */ /* #define _XOPEN_SOURCE 600 */ +#define O_DIRECT 0x00010000 + #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ #include "H5Fprivate.h" /* File access */ Property changes on: head/science/hdf5-18/files/patch-src-H5FDdirect.c ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/science/hdf5-18/files/patch-tools_misc_Makefile.in =================================================================== --- head/science/hdf5-18/files/patch-tools_misc_Makefile.in (revision 454080) +++ head/science/hdf5-18/files/patch-tools_misc_Makefile.in (revision 454081) @@ -1,25 +1,25 @@ ---- tools/misc/Makefile.in.orig 2016-05-10 21:24:56 UTC +--- tools/misc/Makefile.in.orig 2017-06-15 17:14:30 UTC +++ tools/misc/Makefile.in -@@ -674,7 +674,7 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src +@@ -684,7 +684,7 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = ${DESTDIR}$(bindir)/h5cc +H5CC = ${DESTDIR}$(bindir)/$(H5CC_NAME) H5CC_PP = ${DESTDIR}$(bindir)/h5pcc H5FC = ${DESTDIR}$(bindir)/h5fc H5FC_PP = ${DESTDIR}$(bindir)/h5pfc -@@ -715,11 +715,11 @@ DISTCLEANFILES = h5cc testh5repart.sh +@@ -725,11 +725,11 @@ DISTCLEANFILES = h5cc testh5repart.sh # All programs rely on hdf5 library and h5tools library LDADD = $(LIBH5TOOLS) $(LIBHDF5) -@BUILD_PARALLEL_CONDITIONAL_FALSE@H5CC_NAME = h5cc +@BUILD_PARALLEL_CONDITIONAL_FALSE@H5CC_NAME = h5cc-18 # h5cc needs custom install and uninstall rules, since it may be # named h5pcc if hdf5 is being built in parallel mode. -@BUILD_PARALLEL_CONDITIONAL_TRUE@H5CC_NAME = h5pcc +@BUILD_PARALLEL_CONDITIONAL_TRUE@H5CC_NAME = h5pcc-18 - # Automake needs to be taught how to build lib, progs, and tests targets. + # Automake needs to be taught how to build lib, dyn, progs, and tests targets. # These will be filled in automatically for the most part (e.g., Property changes on: head/science/hdf5-18/files/patch-tools_misc_Makefile.in ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/science/hdf5-18/files/patch-tools_misc_h5cc.in =================================================================== --- head/science/hdf5-18/files/patch-tools_misc_h5cc.in (nonexistent) +++ head/science/hdf5-18/files/patch-tools_misc_h5cc.in (revision 454081) @@ -0,0 +1,36 @@ +--- tools/misc/h5cc.in.orig 2017-06-15 15:47:13 UTC ++++ tools/misc/h5cc.in +@@ -170,7 +170,7 @@ usage() { + # libhdf5.settings file reside in the lib directory. + showconfigure() + { +- cat ${libdir}/libhdf5.settings ++ cat ${libdir}/libhdf5%%SUFF%%.settings + status=$? + } + +@@ -327,9 +327,9 @@ if test "x$do_link" = "xyes"; then + shared_link="" + # conditionnaly link with the hl library + if test "X$HL" = "Xhl"; then +- libraries=" $libraries -lhdf5_hl -lhdf5 " ++ libraries=" $libraries -lhdf5%%SUFF%%_hl -lhdf5%%SUFF%% " + else +- libraries=" $libraries -lhdf5 " ++ libraries=" $libraries -lhdf5%%SUFF%% " + fi + link_args="$link_args -L${libdir}" + +@@ -360,10 +360,10 @@ if test "x$do_link" = "xyes"; then + for lib in $libraries; do + case "$lib" in + -lhdf5) +- new_libraries="$new_libraries ${libdir}/libhdf5.a" ++ new_libraries="$new_libraries ${libdir}/libhdf5%%SUFF%%.a" + ;; + -lhdf5_hl) +- new_libraries="$new_libraries ${libdir}/libhdf5_hl.a" ++ new_libraries="$new_libraries ${libdir}/libhdf5%%SUFF%%_hl.a" + ;; + *) + new_libraries="$new_libraries $lib" Property changes on: head/science/hdf5-18/files/patch-tools_misc_h5cc.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/science/hdf5-18/files/patch-tools_misc_h5redeploy.in =================================================================== --- head/science/hdf5-18/files/patch-tools_misc_h5redeploy.in (nonexistent) +++ head/science/hdf5-18/files/patch-tools_misc_h5redeploy.in (revision 454081) @@ -0,0 +1,11 @@ +--- tools/misc/h5redeploy.in.orig 2017-06-15 15:47:13 UTC ++++ tools/misc/h5redeploy.in +@@ -145,7 +145,7 @@ if [ -z "$includedir" ]; then + includedir='${prefix}'/include # use single quotes to prevent expansion of $ + fi + +-for x in $h5tools; do ++for x in $h5tools%%SUFF%%; do + if [ -f $x ]; then + foundtools="$foundtools $x" + if [ ! -w $x ]; then Property changes on: head/science/hdf5-18/files/patch-tools_misc_h5redeploy.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/science/hdf5-18/pkg-plist =================================================================== --- head/science/hdf5-18/pkg-plist (revision 454080) +++ head/science/hdf5-18/pkg-plist (revision 454081) @@ -1,252 +1,252 @@ bin/gif2h5-18 bin/h52gif-18 bin/h5c++-18 bin/h5cc-18 bin/h5copy-18 bin/h5debug-18 bin/h5diff-18 bin/h5dump-18 -%%FORTRAN%%bin/h5fc +%%FORTRAN%%bin/h5fc-18 bin/h5import-18 bin/h5jam-18 bin/h5ls-18 bin/h5mkgrp-18 bin/h5perf_serial-18 bin/h5redeploy-18 bin/h5repack-18 bin/h5repart-18 bin/h5stat-18 bin/h5unjam-18 include/hdf5-18/H5AbstractDs.h include/hdf5-18/H5ACpublic.h include/hdf5-18/H5api_adpt.h include/hdf5-18/H5Apublic.h include/hdf5-18/H5ArrayType.h include/hdf5-18/H5AtomType.h include/hdf5-18/H5Attribute.h include/hdf5-18/H5Classes.h include/hdf5-18/H5CommonFG.h include/hdf5-18/H5CompType.h include/hdf5-18/H5Cpp.h include/hdf5-18/H5CppDoc.h include/hdf5-18/H5Cpublic.h include/hdf5-18/H5DataSet.h include/hdf5-18/H5DataSpace.h include/hdf5-18/H5DataType.h include/hdf5-18/H5DcreatProp.h include/hdf5-18/H5DOpublic.h include/hdf5-18/H5Dpublic.h include/hdf5-18/H5DSpublic.h include/hdf5-18/H5DxferProp.h include/hdf5-18/H5EnumType.h include/hdf5-18/H5Epubgen.h include/hdf5-18/H5Epublic.h include/hdf5-18/H5Exception.h include/hdf5-18/H5FaccProp.h include/hdf5-18/H5FcreatProp.h include/hdf5-18/H5FDcore.h include/hdf5-18/H5FDdirect.h include/hdf5-18/H5FDfamily.h include/hdf5-18/H5FDlog.h include/hdf5-18/H5FDmpi.h include/hdf5-18/H5FDmpio.h include/hdf5-18/H5FDmulti.h include/hdf5-18/H5FDpublic.h include/hdf5-18/H5FDsec2.h include/hdf5-18/H5FDstdio.h include/hdf5-18/H5File.h include/hdf5-18/H5FloatType.h include/hdf5-18/H5Fpublic.h include/hdf5-18/H5Gpublic.h include/hdf5-18/H5Group.h include/hdf5-18/H5IdComponent.h include/hdf5-18/H5IMpublic.h include/hdf5-18/H5Include.h include/hdf5-18/H5IntType.h include/hdf5-18/H5Ipublic.h %%FORTRAN%%include/hdf5-18/H5LaccProp.h include/hdf5-18/H5Library.h include/hdf5-18/H5Location.h include/hdf5-18/H5Lpublic.h include/hdf5-18/H5LTpublic.h include/hdf5-18/H5MMpublic.h include/hdf5-18/H5Object.h include/hdf5-18/H5OcreatProp.h include/hdf5-18/H5Opublic.h include/hdf5-18/H5PacketTable.h include/hdf5-18/H5PLextern.h include/hdf5-18/H5PLpublic.h include/hdf5-18/H5Ppublic.h include/hdf5-18/H5PredType.h include/hdf5-18/H5PropList.h include/hdf5-18/H5PTpublic.h include/hdf5-18/H5Rpublic.h include/hdf5-18/H5Spublic.h include/hdf5-18/H5StrType.h include/hdf5-18/H5TBpublic.h include/hdf5-18/H5Tpublic.h include/hdf5-18/H5VarLenType.h include/hdf5-18/H5Zpublic.h %%FORTRAN%%include/hdf5-18/H5f90i.h %%FORTRAN%%include/hdf5-18/H5f90i_gen.h include/hdf5-18/H5overflow.h include/hdf5-18/H5pubconf.h include/hdf5-18/H5public.h include/hdf5-18/H5version.h %%FORTRAN%%include/hdf5-18/h5_dble_interface.mod %%FORTRAN%%include/hdf5-18/h5a.mod %%FORTRAN%%include/hdf5-18/h5a_provisional.mod %%FORTRAN%%include/hdf5-18/h5d.mod %%FORTRAN%%include/hdf5-18/h5d_provisional.mod %%FORTRAN%%include/hdf5-18/h5ds.mod %%FORTRAN%%include/hdf5-18/h5e.mod %%FORTRAN%%include/hdf5-18/h5e_provisional.mod %%FORTRAN%%include/hdf5-18/h5f.mod %%FORTRAN%%include/hdf5-18/h5f_provisional.mod %%FORTRAN%%include/hdf5-18/h5fortran_types.mod %%FORTRAN%%include/hdf5-18/h5g.mod %%FORTRAN%%include/hdf5-18/h5global.mod %%FORTRAN%%include/hdf5-18/h5i.mod %%FORTRAN%%include/hdf5-18/h5im.mod %%FORTRAN%%include/hdf5-18/h5l.mod %%FORTRAN%%include/hdf5-18/h5l_provisional.mod %%FORTRAN%%include/hdf5-18/h5lib.mod %%FORTRAN%%include/hdf5-18/h5lib_provisional.mod %%FORTRAN%%include/hdf5-18/h5lt.mod %%FORTRAN%%include/hdf5-18/h5o.mod %%FORTRAN%%include/hdf5-18/h5o_provisional.mod %%FORTRAN%%include/hdf5-18/h5p.mod %%FORTRAN%%include/hdf5-18/h5p_provisional.mod %%FORTRAN%%include/hdf5-18/h5r.mod %%FORTRAN%%include/hdf5-18/h5r_provisional.mod %%FORTRAN%%include/hdf5-18/h5s.mod %%FORTRAN%%include/hdf5-18/h5t.mod %%FORTRAN%%include/hdf5-18/h5t_provisional.mod %%FORTRAN%%include/hdf5-18/h5tb.mod %%FORTRAN%%include/hdf5-18/h5test_kind_storage_size_mod.mod %%FORTRAN%%include/hdf5-18/h5z.mod include/hdf5-18/hdf5.h %%FORTRAN%%include/hdf5-18/hdf5.mod include/hdf5-18/hdf5_hl.h lib/libhdf5-18.a lib/libhdf5-18.la lib/libhdf5-18.settings lib/libhdf5-18.so lib/libhdf5-18.so.10 lib/libhdf5-18.so.10.3.0 lib/libhdf5-18_cpp.a lib/libhdf5-18_cpp.la lib/libhdf5-18_cpp.so lib/libhdf5-18_cpp.so.14 lib/libhdf5-18_cpp.so.14.0.0 %%FORTRAN%%lib/libhdf5-18_fortran.a %%FORTRAN%%lib/libhdf5-18_fortran.la %%FORTRAN%%lib/libhdf5-18_fortran.so %%FORTRAN%%lib/libhdf5-18_fortran.so.10 %%FORTRAN%%lib/libhdf5-18_fortran.so.10.0.4 lib/libhdf5-18_hl.a lib/libhdf5-18_hl.la lib/libhdf5-18_hl.so lib/libhdf5-18_hl.so.10 lib/libhdf5-18_hl.so.10.2.0 lib/libhdf5-18_hl_cpp.a lib/libhdf5-18_hl_cpp.la lib/libhdf5-18_hl_cpp.so lib/libhdf5-18_hl_cpp.so.11 lib/libhdf5-18_hl_cpp.so.11.1.0 %%FORTRAN%%lib/libhdf5-18hl_fortran.a %%FORTRAN%%lib/libhdf5-18hl_fortran.la %%FORTRAN%%lib/libhdf5-18hl_fortran.so %%FORTRAN%%lib/libhdf5-18hl_fortran.so.10 %%FORTRAN%%lib/libhdf5-18hl_fortran.so.10.0.3 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/chunks.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/compound.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/create.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/extend_ds.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5group.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_cmprss.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_crtatt.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_crtdat.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_crtgrp.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_crtgrpar.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_crtgrpd.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_extend.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_rdwt.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5tutr_subset.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/readdata.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/run-c++-ex.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/writedata.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_attribute.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_chunk_read.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_cmprss.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_compound.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_crtatt.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_crtdat.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_crtgrp.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_crtgrpar.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_crtgrpd.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_drivers.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_elink_unix2win.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_extend.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_extend_write.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_extlink.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_group.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_mount.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_rdwt.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_read.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_ref2reg.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_reference.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_select.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_shared_mesg.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_subset.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_write.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ph5example.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/run-c-ex.sh %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/compound.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/h5_cmprss.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/h5_crtatt.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/h5_crtdat.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/h5_crtgrp.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/h5_crtgrpar.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/h5_crtgrpd.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/h5_extend.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/h5_rdwt.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/h5_subset.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/hyperslab.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/mountexample.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/ph5example.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/refobjexample.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/refregexample.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/run-fortran-ex.sh %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/selectele.f90 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c++/ptExampleFL.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c++/run-hlc++-ex.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_ds1.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_image1.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_image2.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_lite1.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_lite2.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_lite3.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_01.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_02.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_03.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_04.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_05.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_06.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_07.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_08.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_09.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_10.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_11.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_12.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/image24pixel.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/image8.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/pal_rgb.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ptExampleFL.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/run-hlc-ex.sh %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/fortran/ex_ds1.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/fortran/exlite.f90 %%FORTRAN%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/fortran/run-hlfortran-ex.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/run-hl-ex.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/run-all-ex.sh