Index: science/hdf5-110/Makefile =================================================================== --- science/hdf5-110/Makefile (revision 559838) +++ science/hdf5-110/Makefile (working copy) @@ -7,13 +7,16 @@ CATEGORIES= science archivers graphics MASTER_SITES= https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${PORTVERSION:R}/${DISTNAME}/src/ \ LOCAL/sunpoet +PKGNAMESUFFIX= -110 MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Hierarchical Data Format library (from NCSA) +COMMENT= Hierarchical Data Format library (from NCSA) 1.10 LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING +USES= compiler:c11 libtool localbase tar:bzip2 + CONFLICTS_INSTALL= hdf-4.[0-9]* hdf5-1.6.[0-9]* OPTIONS_DEFINE= DEBUG EXAMPLES FORTRAN SZIP @@ -23,25 +26,29 @@ OPTIONS_SUB= yes PARALLEL_DESC= Parallel support -USES= compiler:c11 libtool localbase tar:bzip2 - +GNU_CONFIGURE= yes +PORTSUFF= ${PORTNAME}${PKGNAMESUFFIX} CONFIGURE_ARGS= --enable-hl \ --enable-instrument \ - --enable-strict-format-checks -GNU_CONFIGURE= yes + --enable-strict-format-checks \ + --program-suffix=${PKGNAMESUFFIX} \ + --includedir=${PREFIX}/include/${PORTSUFF} INSTALL_TARGET= install-strip MAKE_JOBS_UNSAFE= yes TEST_TARGET= check USE_LDCONFIG= yes +EXAMPLESDIR= ${PREFIX}/share/examples/${PORTSUFF} PORTEXAMPLES= * CXX_CONFIGURE_ENABLE= cxx +CXX_VARS= C2FIX+=h5cc DEBUG_CONFIGURE_OFF= --enable-build-mode=production DEBUG_CONFIGURE_ON= --enable-build-mode=debug FORTRAN_CONFIGURE_ENABLE= fortran FORTRAN_CONFIGURE_ENV= F9X=${FC} FORTRAN_USES= fortran +FORTRAN_VARS= C2FIX+=h5fc PARALLEL_CONFIGURE_ENABLE= parallel PARALLEL_LDFLAGS= -L${LOCALBASE}/lib -lmpi PARALLEL_LIB_DEPENDS= libmpi.so:net/mpich @@ -48,13 +55,28 @@ SZIP_CONFIGURE_ON= --with-szlib=${LOCALBASE} SZIP_LIB_DEPENDS= libsz.so:science/szip -post-patch: - @${REINPLACE_CMD} -e 's|-O3||g' ${WRKSRC}/config/gnu-flags - @${REINPLACE_CMD} \ +.include + +pre-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\*` + ${REINPLACE_CMD} -e 's|\[ -a|\[ -f|g' `${FIND} ${WRKSRC} -name \*.sh\*` + ${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ + ${REINPLACE_CMD} -e 's|libhdf5|libhdf5${PKGNAMESUFFIX}|g' \ + -e 's|libhdf5${PKGNAMESUFFIX}.settings|libhdf5.settings|g' + ${REINPLACE_CMD} -e 's|libhdf5|libhdf5${PKGNAMESUFFIX}|g' \ + ${WRKSRC}/test/testlibinfo.sh.in +post-stage: +.for cmp in ${C2FIX} + ${MV} ${STAGEDIR}${PREFIX}/bin/${cmp} \ + ${STAGEDIR}${PREFIX}/bin/${cmp}${PKGNAMESUFFIX} +.endfor + ${MV} ${STAGEDIR}${PREFIX}/lib/libhdf5.settings \ + ${STAGEDIR}${PREFIX}/lib/libhdf5${PKGNAMESUFFIX}.settings + .include Index: science/hdf5-110/distinfo =================================================================== Index: science/hdf5-110/pkg-descr =================================================================== --- science/hdf5-110/pkg-descr (revision 559838) +++ science/hdf5-110/pkg-descr (working copy) @@ -13,4 +13,6 @@ parallel I/O, threads, and other requirements imposed by modern systems and applications. +Note: this is a legacy version, the latest is available as science/hdf5. + WWW: https://www.hdfgroup.org/ Index: science/hdf5-110/pkg-plist =================================================================== --- science/hdf5-110/pkg-plist (revision 559838) +++ science/hdf5-110/pkg-plist (working copy) @@ -1,161 +1,161 @@ -bin/gif2h5 -bin/h52gif -%%CXX%%bin/h5c++ -%%CXX%%bin/h5cc -bin/h5clear -bin/h5copy -bin/h5debug -bin/h5diff -bin/h5dump -%%FORTRAN%%bin/h5fc -bin/h5format_convert -bin/h5import -bin/h5jam -bin/h5ls -bin/h5mkgrp -%%PARALLEL%%bin/h5pcc -%%PARALLEL%%bin/h5perf -bin/h5perf_serial -bin/h5redeploy -bin/h5repack -bin/h5repart -bin/h5stat -bin/h5unjam -bin/h5watch -%%PARALLEL%%bin/ph5diff -include/H5ACpublic.h -%%CXX%%include/H5AbstractDs.h -include/H5Apublic.h -%%CXX%%include/H5ArrayType.h -%%CXX%%include/H5AtomType.h -%%CXX%%include/H5Attribute.h -%%CXX%%include/H5Classes.h -%%CXX%%include/H5CommonFG.h -%%CXX%%include/H5CompType.h -%%CXX%%include/H5Cpp.h -%%CXX%%include/H5CppDoc.h -include/H5Cpublic.h -include/H5DOpublic.h -include/H5DSpublic.h -%%CXX%%include/H5DaccProp.h -%%CXX%%include/H5DataSet.h -%%CXX%%include/H5DataSpace.h -%%CXX%%include/H5DataType.h -%%CXX%%include/H5DcreatProp.h -include/H5Dpublic.h -%%CXX%%include/H5DxferProp.h -%%CXX%%include/H5EnumType.h -include/H5Epubgen.h -include/H5Epublic.h -%%CXX%%include/H5Exception.h -include/H5FDcore.h -include/H5FDdirect.h -include/H5FDfamily.h -include/H5FDhdfs.h -include/H5FDlog.h -include/H5FDmpi.h -include/H5FDmpio.h -include/H5FDmulti.h -include/H5FDpublic.h -include/H5FDros3.h -include/H5FDsec2.h -include/H5FDstdio.h -include/H5FDwindows.h -%%CXX%%include/H5FaccProp.h -%%CXX%%include/H5FcreatProp.h -%%CXX%%include/H5File.h -%%CXX%%include/H5FloatType.h -include/H5Fpublic.h -include/H5Gpublic.h -%%CXX%%include/H5Group.h -include/H5IMpublic.h -%%CXX%%include/H5IdComponent.h -%%CXX%%include/H5Include.h -%%CXX%%include/H5IntType.h -include/H5Ipublic.h -include/H5LDpublic.h -include/H5LTpublic.h -%%CXX%%include/H5LaccProp.h -%%CXX%%include/H5LcreatProp.h -%%CXX%%include/H5Library.h -%%CXX%%include/H5Location.h -include/H5Lpublic.h -include/H5MMpublic.h -%%CXX%%include/H5Object.h -%%CXX%%include/H5OcreatProp.h -include/H5Opublic.h -include/H5PLextern.h -include/H5PLpublic.h -include/H5PTpublic.h -%%CXX%%include/H5PacketTable.h -include/H5Ppublic.h -%%CXX%%include/H5PredType.h -%%CXX%%include/H5PropList.h -include/H5Rpublic.h -include/H5Spublic.h -%%CXX%%include/H5StrType.h -include/H5TBpublic.h -include/H5Tpublic.h -%%CXX%%include/H5VarLenType.h -include/H5Zpublic.h -include/H5api_adpt.h -%%FORTRAN%%include/H5f90i.h -%%FORTRAN%%include/H5f90i_gen.h -include/H5overflow.h -include/H5pubconf.h -include/H5public.h -include/H5version.h -%%FORTRAN%%include/h5_gen.mod -%%FORTRAN%%include/h5a.mod -%%FORTRAN%%include/h5d.mod -%%FORTRAN%%include/h5ds.mod -%%FORTRAN%%include/h5e.mod -%%FORTRAN%%include/h5f.mod -%%FORTRAN%%include/h5fortkit.mod -%%FORTRAN%%include/h5fortran_types.mod -%%FORTRAN%%include/h5g.mod -%%FORTRAN%%include/h5global.mod -%%FORTRAN%%include/h5i.mod -%%FORTRAN%%include/h5im.mod -%%FORTRAN%%include/h5l.mod -%%FORTRAN%%include/h5lib.mod -%%FORTRAN%%include/h5lt.mod -%%FORTRAN%%include/h5lt_const.mod -%%FORTRAN%%include/h5o.mod -%%FORTRAN%%include/h5p.mod -%%FORTRAN%%include/h5r.mod -%%FORTRAN%%include/h5s.mod -%%FORTRAN%%include/h5t.mod -%%FORTRAN%%include/h5tb.mod -%%FORTRAN%%include/h5tb_const.mod -%%FORTRAN%%include/h5z.mod -include/hdf5.h -%%FORTRAN%%include/hdf5.mod -include/hdf5_hl.h -lib/libhdf5.a -lib/libhdf5.settings -lib/libhdf5.so -lib/libhdf5.so.103 -lib/libhdf5.so.103.2.0 -%%CXX%%lib/libhdf5_cpp.a -%%CXX%%lib/libhdf5_cpp.so -%%CXX%%lib/libhdf5_cpp.so.103 -%%CXX%%lib/libhdf5_cpp.so.103.2.0 -%%FORTRAN%%lib/libhdf5_fortran.a -%%FORTRAN%%lib/libhdf5_fortran.so -%%FORTRAN%%lib/libhdf5_fortran.so.102 -%%FORTRAN%%lib/libhdf5_fortran.so.102.0.1 -lib/libhdf5_hl.a -lib/libhdf5_hl.so -lib/libhdf5_hl.so.100 -lib/libhdf5_hl.so.100.1.3 -%%CXX%%lib/libhdf5_hl_cpp.a -%%CXX%%lib/libhdf5_hl_cpp.so -%%CXX%%lib/libhdf5_hl_cpp.so.100 -%%CXX%%lib/libhdf5_hl_cpp.so.100.1.4 -%%FORTRAN%%lib/libhdf5_hl_fortran.a -%%FORTRAN%%lib/libhdf5_hl_fortran.so -%%FORTRAN%%lib/libhdf5hl_fortran.a -%%FORTRAN%%lib/libhdf5hl_fortran.so -%%FORTRAN%%lib/libhdf5hl_fortran.so.100 -%%FORTRAN%%lib/libhdf5hl_fortran.so.100.0.5 +bin/gif2h5-110 +bin/h52gif-110 +%%CXX%%bin/h5c++-110 +%%CXX%%bin/h5cc-110 +bin/h5clear-110 +bin/h5copy-110 +bin/h5debug-110 +bin/h5diff-110 +bin/h5dump-110 +%%FORTRAN%%bin/h5fc-110 +bin/h5format_convert-110 +bin/h5import-110 +bin/h5jam-110 +bin/h5ls-110 +bin/h5mkgrp-110 +%%PARALLEL%%bin/h5pcc-110 +%%PARALLEL%%bin/h5perf-110 +bin/h5perf_serial-110 +bin/h5redeploy-110 +bin/h5repack-110 +bin/h5repart-110 +bin/h5stat-110 +bin/h5unjam-110 +bin/h5watch-110 +%%PARALLEL%%bin/ph5diff-110 +include/hdf5-110/H5ACpublic.h +%%CXX%%include/hdf5-110/H5AbstractDs.h +include/hdf5-110/H5Apublic.h +%%CXX%%include/hdf5-110/H5ArrayType.h +%%CXX%%include/hdf5-110/H5AtomType.h +%%CXX%%include/hdf5-110/H5Attribute.h +%%CXX%%include/hdf5-110/H5Classes.h +%%CXX%%include/hdf5-110/H5CommonFG.h +%%CXX%%include/hdf5-110/H5CompType.h +%%CXX%%include/hdf5-110/H5Cpp.h +%%CXX%%include/hdf5-110/H5CppDoc.h +include/hdf5-110/H5Cpublic.h +include/hdf5-110/H5DOpublic.h +include/hdf5-110/H5DSpublic.h +%%CXX%%include/hdf5-110/H5DaccProp.h +%%CXX%%include/hdf5-110/H5DataSet.h +%%CXX%%include/hdf5-110/H5DataSpace.h +%%CXX%%include/hdf5-110/H5DataType.h +%%CXX%%include/hdf5-110/H5DcreatProp.h +include/hdf5-110/H5Dpublic.h +%%CXX%%include/hdf5-110/H5DxferProp.h +%%CXX%%include/hdf5-110/H5EnumType.h +include/hdf5-110/H5Epubgen.h +include/hdf5-110/H5Epublic.h +%%CXX%%include/hdf5-110/H5Exception.h +include/hdf5-110/H5FDcore.h +include/hdf5-110/H5FDdirect.h +include/hdf5-110/H5FDfamily.h +include/hdf5-110/H5FDhdfs.h +include/hdf5-110/H5FDlog.h +include/hdf5-110/H5FDmpi.h +include/hdf5-110/H5FDmpio.h +include/hdf5-110/H5FDmulti.h +include/hdf5-110/H5FDpublic.h +include/hdf5-110/H5FDros3.h +include/hdf5-110/H5FDsec2.h +include/hdf5-110/H5FDstdio.h +include/hdf5-110/H5FDwindows.h +%%CXX%%include/hdf5-110/H5FaccProp.h +%%CXX%%include/hdf5-110/H5FcreatProp.h +%%CXX%%include/hdf5-110/H5File.h +%%CXX%%include/hdf5-110/H5FloatType.h +include/hdf5-110/H5Fpublic.h +include/hdf5-110/H5Gpublic.h +%%CXX%%include/hdf5-110/H5Group.h +include/hdf5-110/H5IMpublic.h +%%CXX%%include/hdf5-110/H5IdComponent.h +%%CXX%%include/hdf5-110/H5Include.h +%%CXX%%include/hdf5-110/H5IntType.h +include/hdf5-110/H5Ipublic.h +include/hdf5-110/H5LDpublic.h +include/hdf5-110/H5LTpublic.h +%%CXX%%include/hdf5-110/H5LaccProp.h +%%CXX%%include/hdf5-110/H5LcreatProp.h +%%CXX%%include/hdf5-110/H5Library.h +%%CXX%%include/hdf5-110/H5Location.h +include/hdf5-110/H5Lpublic.h +include/hdf5-110/H5MMpublic.h +%%CXX%%include/hdf5-110/H5Object.h +%%CXX%%include/hdf5-110/H5OcreatProp.h +include/hdf5-110/H5Opublic.h +include/hdf5-110/H5PLextern.h +include/hdf5-110/H5PLpublic.h +include/hdf5-110/H5PTpublic.h +%%CXX%%include/hdf5-110/H5PacketTable.h +include/hdf5-110/H5Ppublic.h +%%CXX%%include/hdf5-110/H5PredType.h +%%CXX%%include/hdf5-110/H5PropList.h +include/hdf5-110/H5Rpublic.h +include/hdf5-110/H5Spublic.h +%%CXX%%include/hdf5-110/H5StrType.h +include/hdf5-110/H5TBpublic.h +include/hdf5-110/H5Tpublic.h +%%CXX%%include/hdf5-110/H5VarLenType.h +include/hdf5-110/H5Zpublic.h +include/hdf5-110/H5api_adpt.h +%%FORTRAN%%include/hdf5-110/H5f90i.h +%%FORTRAN%%include/hdf5-110/H5f90i_gen.h +include/hdf5-110/H5overflow.h +include/hdf5-110/H5pubconf.h +include/hdf5-110/H5public.h +include/hdf5-110/H5version.h +%%FORTRAN%%include/hdf5-110/h5_gen.mod +%%FORTRAN%%include/hdf5-110/h5a.mod +%%FORTRAN%%include/hdf5-110/h5d.mod +%%FORTRAN%%include/hdf5-110/h5ds.mod +%%FORTRAN%%include/hdf5-110/h5e.mod +%%FORTRAN%%include/hdf5-110/h5f.mod +%%FORTRAN%%include/hdf5-110/h5fortkit.mod +%%FORTRAN%%include/hdf5-110/h5fortran_types.mod +%%FORTRAN%%include/hdf5-110/h5g.mod +%%FORTRAN%%include/hdf5-110/h5global.mod +%%FORTRAN%%include/hdf5-110/h5i.mod +%%FORTRAN%%include/hdf5-110/h5im.mod +%%FORTRAN%%include/hdf5-110/h5l.mod +%%FORTRAN%%include/hdf5-110/h5lib.mod +%%FORTRAN%%include/hdf5-110/h5lt.mod +%%FORTRAN%%include/hdf5-110/h5lt_const.mod +%%FORTRAN%%include/hdf5-110/h5o.mod +%%FORTRAN%%include/hdf5-110/h5p.mod +%%FORTRAN%%include/hdf5-110/h5r.mod +%%FORTRAN%%include/hdf5-110/h5s.mod +%%FORTRAN%%include/hdf5-110/h5t.mod +%%FORTRAN%%include/hdf5-110/h5tb.mod +%%FORTRAN%%include/hdf5-110/h5tb_const.mod +%%FORTRAN%%include/hdf5-110/h5z.mod +include/hdf5-110/hdf5.h +%%FORTRAN%%include/hdf5-110/hdf5.mod +include/hdf5-110/hdf5_hl.h +lib/libhdf5-110.a +lib/libhdf5-110.settings +lib/libhdf5-110.so +lib/libhdf5-110.so.103 +lib/libhdf5-110.so.103.2.0 +%%CXX%%lib/libhdf5-110_cpp.a +%%CXX%%lib/libhdf5-110_cpp.so +%%CXX%%lib/libhdf5-110_cpp.so.103 +%%CXX%%lib/libhdf5-110_cpp.so.103.2.0 +%%FORTRAN%%lib/libhdf5-110_fortran.a +%%FORTRAN%%lib/libhdf5-110_fortran.so +%%FORTRAN%%lib/libhdf5-110_fortran.so.102 +%%FORTRAN%%lib/libhdf5-110_fortran.so.102.0.1 +lib/libhdf5-110_hl.a +lib/libhdf5-110_hl.so +lib/libhdf5-110_hl.so.100 +lib/libhdf5-110_hl.so.100.1.3 +%%CXX%%lib/libhdf5-110_hl_cpp.a +%%CXX%%lib/libhdf5-110_hl_cpp.so +%%CXX%%lib/libhdf5-110_hl_cpp.so.100 +%%CXX%%lib/libhdf5-110_hl_cpp.so.100.1.4 +%%FORTRAN%%lib/libhdf5-110_hl_fortran.a +%%FORTRAN%%lib/libhdf5-110_hl_fortran.so +%%FORTRAN%%lib/libhdf5-110hl_fortran.a +%%FORTRAN%%lib/libhdf5-110hl_fortran.so +%%FORTRAN%%lib/libhdf5-110hl_fortran.so.100 +%%FORTRAN%%lib/libhdf5-110hl_fortran.so.100.0.5 Index: science/hdf5/Makefile =================================================================== --- science/hdf5/Makefile (revision 559838) +++ science/hdf5/Makefile (working copy) @@ -2,59 +2,89 @@ # $FreeBSD$ PORTNAME= hdf5 -PORTVERSION= 1.10.6 +PORTVERSION= 1.12.0 PORTEPOCH= 1 CATEGORIES= science archivers graphics -MASTER_SITES= https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${PORTVERSION:R}/${DISTNAME}/src/ \ - LOCAL/sunpoet +MASTER_SITES= https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${PORTVERSION:R}/hdf5-${PORTVERSION}/src/ +DISTNAME= CMake-${PORTNAME}-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Hierarchical Data Format library (from NCSA) +COMMENT= Hierarchical Data Format library (from NCSA) (latest) LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING +USES= cmake compiler:c11 localbase perl5 +USE_PERL5= build + CONFLICTS_INSTALL= hdf-4.[0-9]* hdf5-1.6.[0-9]* OPTIONS_DEFINE= DEBUG EXAMPLES FORTRAN SZIP OPTIONS_RADIO= SUPPORT OPTIONS_RADIO_SUPPORT= CXX PARALLEL -OPTIONS_DEFAULT=CXX SZIP +OPTIONS_DEFAULT=CXX FORTRAN SZIP OPTIONS_SUB= yes PARALLEL_DESC= Parallel support -USES= compiler:c11 libtool localbase tar:bzip2 - -CONFIGURE_ARGS= --enable-hl \ - --enable-instrument \ - --enable-strict-format-checks -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -MAKE_JOBS_UNSAFE= yes -TEST_TARGET= check +WRKSRC_SUBDIR= ${PORTNAME}-${PORTVERSION} +CMAKE_ON= HDF5_BUILD_HL_LIB \ + HDF5_ENABLE_INSTRUMENT \ + HDF5_BUILD_TOOLS \ + HDF5_STRICT_FORMAT_CHECKS +CMAKE_ARGS= -DHDF5_INSTALL_INCLUDE_DIR:PATH=${PREFIX}/include \ + -DDEFAULT_API_VERSION="v110" +EXAMPLESVER= 1.12.6 +TEST_TARGET= test USE_LDCONFIG= yes +DATASTUFF= RELEASE.txt \ + USING_HDF5_CMake.txt +DATASTUFFEX= CTestScript.cmake \ + HDF5_Examples.cmake \ + HDF5_Examples_options.cmake \ + USING_CMake_Examples.txt +PKGCFGDIR= ${PREFIX}/libdata/pkgconfig +PKGCFG= hdf5.pc hdf5_hl.pc +PKGCFGCXX= hdf5_cpp.pc hdf5_hl_cpp.pc +PKGCFGFC= hdf5_fortran.pc + PORTEXAMPLES= * -CXX_CONFIGURE_ENABLE= cxx -DEBUG_CONFIGURE_OFF= --enable-build-mode=production -DEBUG_CONFIGURE_ON= --enable-build-mode=debug -FORTRAN_CONFIGURE_ENABLE= fortran +CXX_CMAKE_BOOL= HDF5_BUILD_CPP_LIB +CXX_VARS= PKGCFG+="${PKGCFGCXX}" +EXAMPLES_CMAKE_BOOL= HDF5_BUILD_EXAMPLES HDF5_TEST_EXAMPLES HDF5_PACK_EXAMPLES +EXAMPLES_VARS= DATASTUFF+="${DATASTUFFEX}" +FORTRAN_CMAKE_BOOL= HDF5_BUILD_FORTRAN FORTRAN_CONFIGURE_ENV= F9X=${FC} FORTRAN_USES= fortran -PARALLEL_CONFIGURE_ENABLE= parallel -PARALLEL_LDFLAGS= -L${LOCALBASE}/lib -lmpi +FORTRAN_VARS= PKGCFG+="${PKGCFGFC}" +PARALLEL_IMPLIES= FORTRAN +PARALLEL_CMAKE_BOOL= HDF5_ENABLE_PARALLEL +PARALLEL_VARS= FCFLAGS+=-I${LOCALBASE}/include +PARALLEL_LDFLAGS= -L${LOCALBASE}/lib -lmpifort -lmpi PARALLEL_LIB_DEPENDS= libmpi.so:net/mpich -SZIP_CONFIGURE_ON= --with-szlib=${LOCALBASE} +SZIP_CMAKE_BOOL= HDF5_ENABLE_SZIP_SUPPORT SZIP_LIB_DEPENDS= libsz.so:science/szip -post-patch: - @${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\*` +.include +post-extract-EXAMPLES-on: + (cd ${WRKSRC} && ${TAR} xfz ../HDF5Examples-${EXAMPLESVER}-Source.tar.gz) + +pre-build-EXAMPLES-on: + ${MKDIR} ${WRKDIR}/.build + ${CP} -R ${WRKSRC}/HDF5Examples ${WRKDIR}/.build + +post-stage: + ${RM} ${STAGEDIR}${PREFIX}/share/COPYING + ${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${STAGEDIR}${PREFIX}/share && ${MV} ${DATASTUFF} ${STAGEDIR}${DATADIR}/) +.for pk in ${PKGCFG} + ${LN} -sf ${pk:C/5/5${PKGNAMESUFFIX}/:C/.pc/-${PORTVERSION}.pc/} \ + ${STAGEDIR}${PKGCFGDIR}/${pk} +.endfor + +post-stage-EXAMPLES-on: + ${MV} ${STAGEDIR}${PREFIX}/share/HDF5Examples ${STAGEDIR}${EXAMPLESDIR} + .include Index: science/hdf5/distinfo =================================================================== --- science/hdf5/distinfo (revision 559838) +++ science/hdf5/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1577693899 -SHA256 (hdf5-1.10.6.tar.bz2) = 09d6301901685201bb272a73e21c98f2bf7e044765107200b01089104a47c3bd -SIZE (hdf5-1.10.6.tar.bz2) = 8813699 +TIMESTAMP = 1608044656 +SHA256 (CMake-hdf5-1.12.0.tar.gz) = 01b9c01c45cc8c66da86e69c510e17f3cff0706a65d8683cd86af405eaf75397 +SIZE (CMake-hdf5-1.12.0.tar.gz) = 13950636 Index: science/hdf5/pkg-plist =================================================================== --- science/hdf5/pkg-plist (revision 559838) +++ science/hdf5/pkg-plist (working copy) @@ -1,30 +1,47 @@ bin/gif2h5 +bin/gif2h5-shared bin/h52gif +bin/h52gif-shared %%CXX%%bin/h5c++ %%CXX%%bin/h5cc bin/h5clear +bin/h5clear-shared bin/h5copy +bin/h5copy-shared bin/h5debug +bin/h5debug-shared bin/h5diff +bin/h5diff-shared bin/h5dump -%%FORTRAN%%bin/h5fc +bin/h5dump-shared +%%NO_PARALLEL%%%%FORTRAN%%bin/h5fc bin/h5format_convert +bin/h5format_convert-shared +%%CXX%%bin/h5hlc++ +bin/h5hlcc bin/h5import +bin/h5import-shared bin/h5jam +bin/h5jam-shared bin/h5ls +bin/h5ls-shared bin/h5mkgrp -%%PARALLEL%%bin/h5pcc -%%PARALLEL%%bin/h5perf -bin/h5perf_serial -bin/h5redeploy +bin/h5mkgrp-shared bin/h5repack +bin/h5repack-shared bin/h5repart +bin/h5repart-shared bin/h5stat +bin/h5stat-shared bin/h5unjam +bin/h5unjam-shared bin/h5watch +bin/h5watch-shared %%PARALLEL%%bin/ph5diff +%%PARALLEL%%bin/ph5diff-shared include/H5ACpublic.h %%CXX%%include/H5AbstractDs.h +%%CXX%%include/H5Alltypes.h include/H5Apublic.h %%CXX%%include/H5ArrayType.h %%CXX%%include/H5AtomType.h @@ -44,6 +61,7 @@ %%CXX%%include/H5DcreatProp.h include/H5Dpublic.h %%CXX%%include/H5DxferProp.h +include/H5ESpublic.h %%CXX%%include/H5EnumType.h include/H5Epubgen.h include/H5Epublic.h @@ -58,6 +76,7 @@ include/H5FDmulti.h include/H5FDpublic.h include/H5FDros3.h +include/H5FDs3comms.h include/H5FDsec2.h include/H5FDstdio.h include/H5FDwindows.h @@ -81,6 +100,7 @@ %%CXX%%include/H5Location.h include/H5Lpublic.h include/H5MMpublic.h +include/H5Mpublic.h %%CXX%%include/H5Object.h %%CXX%%include/H5OcreatProp.h include/H5Opublic.h @@ -96,66 +116,131 @@ %%CXX%%include/H5StrType.h include/H5TBpublic.h include/H5Tpublic.h +include/H5VLconnector.h +include/H5VLconnector_passthru.h +include/H5VLnative.h +include/H5VLpassthru.h +include/H5VLpublic.h %%CXX%%include/H5VarLenType.h include/H5Zpublic.h include/H5api_adpt.h +%%FORTRAN%%include/H5f90.h %%FORTRAN%%include/H5f90i.h %%FORTRAN%%include/H5f90i_gen.h +%%FORTRAN%%include/H5f90proto.h +%%FORTRAN%%include/H5fortran_types.F90 include/H5overflow.h include/H5pubconf.h include/H5public.h include/H5version.h -%%FORTRAN%%include/h5_gen.mod -%%FORTRAN%%include/h5a.mod -%%FORTRAN%%include/h5d.mod -%%FORTRAN%%include/h5ds.mod -%%FORTRAN%%include/h5e.mod -%%FORTRAN%%include/h5f.mod -%%FORTRAN%%include/h5fortkit.mod -%%FORTRAN%%include/h5fortran_types.mod -%%FORTRAN%%include/h5g.mod -%%FORTRAN%%include/h5global.mod -%%FORTRAN%%include/h5i.mod -%%FORTRAN%%include/h5im.mod -%%FORTRAN%%include/h5l.mod -%%FORTRAN%%include/h5lib.mod -%%FORTRAN%%include/h5lt.mod -%%FORTRAN%%include/h5lt_const.mod -%%FORTRAN%%include/h5o.mod -%%FORTRAN%%include/h5p.mod -%%FORTRAN%%include/h5r.mod -%%FORTRAN%%include/h5s.mod -%%FORTRAN%%include/h5t.mod -%%FORTRAN%%include/h5tb.mod -%%FORTRAN%%include/h5tb_const.mod -%%FORTRAN%%include/h5z.mod include/hdf5.h -%%FORTRAN%%include/hdf5.mod include/hdf5_hl.h +%%FORTRAN%%include/shared/h5_gen.mod +%%FORTRAN%%include/shared/h5a.mod +%%FORTRAN%%include/shared/h5d.mod +%%FORTRAN%%include/shared/h5ds.mod +%%FORTRAN%%include/shared/h5e.mod +%%FORTRAN%%include/shared/h5f.mod +%%FORTRAN%%include/shared/h5fortkit.mod +%%FORTRAN%%include/shared/h5fortran_types.mod +%%FORTRAN%%include/shared/h5g.mod +%%FORTRAN%%include/shared/h5global.mod +%%FORTRAN%%include/shared/h5i.mod +%%FORTRAN%%include/shared/h5im.mod +%%FORTRAN%%include/shared/h5l.mod +%%FORTRAN%%include/shared/h5lib.mod +%%FORTRAN%%include/shared/h5lt.mod +%%FORTRAN%%include/shared/h5lt_const.mod +%%FORTRAN%%include/shared/h5o.mod +%%FORTRAN%%include/shared/h5p.mod +%%FORTRAN%%include/shared/h5r.mod +%%FORTRAN%%include/shared/h5s.mod +%%FORTRAN%%include/shared/h5t.mod +%%FORTRAN%%include/shared/h5tb.mod +%%FORTRAN%%include/shared/h5tb_const.mod +%%FORTRAN%%include/shared/h5vl.mod +%%FORTRAN%%include/shared/h5z.mod +%%FORTRAN%%include/shared/hdf5.mod +%%FORTRAN%%include/static/h5_gen.mod +%%FORTRAN%%include/static/h5a.mod +%%FORTRAN%%include/static/h5d.mod +%%FORTRAN%%include/static/h5ds.mod +%%FORTRAN%%include/static/h5e.mod +%%FORTRAN%%include/static/h5f.mod +%%FORTRAN%%include/static/h5fortkit.mod +%%FORTRAN%%include/static/h5fortran_types.mod +%%FORTRAN%%include/static/h5g.mod +%%FORTRAN%%include/static/h5global.mod +%%FORTRAN%%include/static/h5i.mod +%%FORTRAN%%include/static/h5im.mod +%%FORTRAN%%include/static/h5l.mod +%%FORTRAN%%include/static/h5lib.mod +%%FORTRAN%%include/static/h5lt.mod +%%FORTRAN%%include/static/h5lt_const.mod +%%FORTRAN%%include/static/h5o.mod +%%FORTRAN%%include/static/h5p.mod +%%FORTRAN%%include/static/h5r.mod +%%FORTRAN%%include/static/h5s.mod +%%FORTRAN%%include/static/h5t.mod +%%FORTRAN%%include/static/h5tb.mod +%%FORTRAN%%include/static/h5tb_const.mod +%%FORTRAN%%include/static/h5vl.mod +%%FORTRAN%%include/static/h5z.mod +%%FORTRAN%%include/static/hdf5.mod lib/libhdf5.a -lib/libhdf5.settings lib/libhdf5.so -lib/libhdf5.so.103 -lib/libhdf5.so.103.2.0 +lib/libhdf5.so.200 +lib/libhdf5.so.200.0.0 %%CXX%%lib/libhdf5_cpp.a %%CXX%%lib/libhdf5_cpp.so -%%CXX%%lib/libhdf5_cpp.so.103 -%%CXX%%lib/libhdf5_cpp.so.103.2.0 +%%CXX%%lib/libhdf5_cpp.so.200 +%%CXX%%lib/libhdf5_cpp.so.200.0.0 +%%FORTRAN%%lib/libhdf5_f90cstub.a +%%FORTRAN%%lib/libhdf5_f90cstub.so +%%FORTRAN%%lib/libhdf5_f90cstub.so.200 +%%FORTRAN%%lib/libhdf5_f90cstub.so.200.0.0 %%FORTRAN%%lib/libhdf5_fortran.a %%FORTRAN%%lib/libhdf5_fortran.so -%%FORTRAN%%lib/libhdf5_fortran.so.102 -%%FORTRAN%%lib/libhdf5_fortran.so.102.0.1 +%%FORTRAN%%lib/libhdf5_fortran.so.200 +%%FORTRAN%%lib/libhdf5_fortran.so.200.0.0 lib/libhdf5_hl.a lib/libhdf5_hl.so -lib/libhdf5_hl.so.100 -lib/libhdf5_hl.so.100.1.3 +lib/libhdf5_hl.so.200 +lib/libhdf5_hl.so.200.0.0 %%CXX%%lib/libhdf5_hl_cpp.a %%CXX%%lib/libhdf5_hl_cpp.so -%%CXX%%lib/libhdf5_hl_cpp.so.100 -%%CXX%%lib/libhdf5_hl_cpp.so.100.1.4 +%%CXX%%lib/libhdf5_hl_cpp.so.200 +%%CXX%%lib/libhdf5_hl_cpp.so.200.0.0 +%%FORTRAN%%lib/libhdf5_hl_f90cstub.a +%%FORTRAN%%lib/libhdf5_hl_f90cstub.so +%%FORTRAN%%lib/libhdf5_hl_f90cstub.so.200 +%%FORTRAN%%lib/libhdf5_hl_f90cstub.so.200.0.0 %%FORTRAN%%lib/libhdf5_hl_fortran.a %%FORTRAN%%lib/libhdf5_hl_fortran.so -%%FORTRAN%%lib/libhdf5hl_fortran.a -%%FORTRAN%%lib/libhdf5hl_fortran.so -%%FORTRAN%%lib/libhdf5hl_fortran.so.100 -%%FORTRAN%%lib/libhdf5hl_fortran.so.100.0.5 +%%FORTRAN%%lib/libhdf5_hl_fortran.so.200 +%%FORTRAN%%lib/libhdf5_hl_fortran.so.200.0.0 +lib/libhdf5_tools.a +lib/libhdf5_tools.so +lib/libhdf5_tools.so.200 +lib/libhdf5_tools.so.200.0.0 +lib/libhdf5.settings +%%CXX%%libdata/pkgconfig/hdf5_cpp.pc +%%FORTRAN%%libdata/pkgconfig/hdf5_fortran.pc +%%CXX%%libdata/pkgconfig/hdf5_hl_cpp.pc +libdata/pkgconfig/hdf5_hl.pc +%%CXX%%libdata/pkgconfig/hdf5_cpp-1.12.0.pc +%%FORTRAN%%libdata/pkgconfig/hdf5_fortran-1.12.0.pc +%%CXX%%libdata/pkgconfig/hdf5_hl_cpp-1.12.0.pc +libdata/pkgconfig/hdf5_hl-1.12.0.pc +libdata/pkgconfig/hdf5-1.12.0.pc +libdata/pkgconfig/hdf5.pc +share/cmake/hdf5/hdf5-config-version.cmake +share/cmake/hdf5/hdf5-config.cmake +share/cmake/hdf5/hdf5-targets-%%CMAKE_BUILD_TYPE%%.cmake +share/cmake/hdf5/hdf5-targets.cmake +%%PORTEXAMPLES%%%%DATADIR%%/CTestScript.cmake +%%PORTEXAMPLES%%%%DATADIR%%/HDF5_Examples.cmake +%%PORTEXAMPLES%%%%DATADIR%%/HDF5_Examples_options.cmake +%%DATADIR%%/RELEASE.txt +%%PORTEXAMPLES%%%%DATADIR%%/USING_CMake_Examples.txt +%%DATADIR%%/USING_HDF5_CMake.txt Index: french/med/Makefile =================================================================== --- french/med/Makefile (revision 559838) +++ french/med/Makefile (working copy) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= med -DISTVERSION= 4.0.0 +PORTVERSION= 4.0.0 +PORTREVISION= 1 CATEGORIES= french science MAINTAINER= thierry@FreeBSD.org @@ -11,7 +12,7 @@ LICENSE= GPLv3 BUILD_DEPENDS= gsed:textproc/gsed -LIB_DEPENDS= libhdf5.so:science/hdf5 +LIB_DEPENDS= libhdf5-110.so:science/hdf5-110 USES= fortran gmake libtool tk @@ -19,7 +20,8 @@ USE_CXXSTD= gnu++98 CFLAGS+= -fPIC -CONFIGURE_ARGS= --disable-python --with-hdf5=${LOCALBASE} +CONFIGURE_ARGS= --disable-python --with-hdf5=${LOCALBASE} \ + --with-hdf5-include=${LOCALBASE}/include/hdf5-110 CONFIGURE_ENV= WISH=${WISH} GNU_CONFIGURE= yes USE_LDCONFIG= yes Index: french/med/files/patch-configure =================================================================== --- french/med/files/patch-configure (revision 559838) +++ french/med/files/patch-configure (working copy) @@ -1,19 +1,6 @@ --- configure.orig 2018-12-10 10:32:28 UTC +++ configure -@@ -3194,10 +3194,10 @@ MEDIMPORT_CMAKE_SO_VERSION="0.3.0" - #Une modification de HDF_VERSION_NUM - #demande une modification du test de version ds - #med_check_hdf5.m4 --HDF_VERSION_REF=5-1.10.2 -+HDF_VERSION_REF=5-1.10.5 - HDF_VERSION_MAJOR_REF=1 - HDF_VERSION_MINOR_REF=10 --HDF_VERSION_RELEASE_REF=2 -+HDF_VERSION_RELEASE_REF=5 - - - -@@ -7572,9 +7572,9 @@ _ACEOF +@@ -7572,11 +7572,11 @@ _ACEOF HDF5_VERSION="0" if test -n "$HDF5_ABS_PATH" ; then HDF5_USED_VER=` grep H5_VERS_INFO $HDF5_ABS_PATH | sed 's/\([^"]*\)\(".*"\)\([^"]*\)/\2/g' ` @@ -24,5 +11,74 @@ + H5_VER_MINOR=` grep '#define *H5_VERS_MINOR' $HDF5_ABS_PATH | gsed 's/^.*H5_VERS_MINOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' ` + H5_VER_RELEASE=`grep '#define *H5_VERS_RELEASE' $HDF5_ABS_PATH | gsed 's/^.*H5_VERS_RELEASE[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' ` HDF5_VERSION=` expr 10000 \* ${H5_VER_MAJOR} + 100 \* ${H5_VER_MINOR} + ${H5_VER_RELEASE} ` - test "0${HDF5_VERSION}" -gt "11100" || test "0${HDF5_VERSION}" -lt "11002" && as_fn_error $? " +- test "0${HDF5_VERSION}" -gt "11100" || test "0${HDF5_VERSION}" -lt "11002" && as_fn_error $? " ++ test "0${HDF5_VERSION}" -gt "11100" || test "0${HDF5_VERSION}" -lt "11006" && as_fn_error $? " This HDF5 version ${H5_VER_MAJOR}.${H5_VER_MINOR}.${H5_VER_RELEASE} must not be used with med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE}. + The HDF5 library version used by med-fichier${MED_NUM_MAJEUR}.y.z MUST NOT be > 1.10 and have to be at least HDF${HDF_VERSION_REF}. + DO NOT TRY TO COMPILE med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE} version with an HDF5 library which would generate an hdf5 file not compliant with HDF5-${HDF_VERSION_MAJOR_REF}.${HDF_VERSION_MINOR_REF}.z library. +@@ -7633,13 +7633,13 @@ _ACEOF + + # AC_CHECK_LIB([m],[sin],[],[AC_MSG_ERROR([Can't find C math library.])],[]) + # AC_CHECK_LIB([z],[compress],[],[AC_MSG_ERROR([Can't find z library.])],[]) +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5open in -lhdf5" >&5 +-$as_echo_n "checking for H5open in -lhdf5... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5open in -lhdf5-110" >&5 ++$as_echo_n "checking for H5open in -lhdf5-110... " >&6; } + if ${ac_cv_lib_hdf5_H5open+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lhdf5 -lm -lz $LIBS" ++LIBS="-lhdf5-110 -lm -lz $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -7674,10 +7674,10 @@ if test "x$ac_cv_lib_hdf5_H5open" = xyes; then : + #define HAVE_LIBHDF5 1 + _ACEOF + +- LIBS="-lhdf5 $LIBS" ++ LIBS="-lhdf5-110 $LIBS" + + else +- as_fn_error $? "Can't find hdf5 library, either use HDF5HOME env. var. , --with-hdf5= or --with-hdf5-lib=" "$LINENO" 5 ++ as_fn_error $? "Can't find hdf5-110 library, either use HDF5HOME env. var. , --with-hdf5= or --with-hdf5-lib=" "$LINENO" 5 + fi + + test "x$mpi_wanted_test" = "xyes" && for ac_func in H5Pset_fapl_mpio +@@ -7696,7 +7696,7 @@ done + + if test "x$with_hdf5_include" = "xno"; then + # Extract the first word of "h5dump", so it can be a program name with args. +-set dummy h5dump; ac_word=$2 ++set dummy h5dump-110; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if ${ac_cv_path_H5DUMP+:} false; then : +@@ -7738,7 +7738,7 @@ fi + + else + # Extract the first word of "h5dump", so it can be a program name with args. +-set dummy h5dump; ac_word=$2 ++set dummy h5dump-110; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if ${ac_cv_path_H5DUMP+:} false; then : +@@ -7780,7 +7780,7 @@ fi + + fi + if test "X$H5DUMP" = "Xno"; then +- as_fn_error $? "Can't find h5dump, please verify your env. var. PATH or use of --with-hdf5bin=." "$LINENO" 5 ++ as_fn_error $? "Can't find h5dump-110, please verify your env. var. PATH or use of --with-hdf5bin=." "$LINENO" 5 + fi + + +@@ -7797,7 +7797,7 @@ fi + #La ligne suivante est inutile car effectuée par AC_CHECK_PROG + # AC_SUBST(H5DUMP) + +- HDF5_LIBS="-lhdf5" ++ HDF5_LIBS="-lhdf5-110" + + + Index: french/med/files/patch-include_med.h.in =================================================================== --- french/med/files/patch-include_med.h.in (revision 559838) +++ french/med/files/patch-include_med.h.in (nonexistent) @@ -1,15 +0,0 @@ ---- include/med.h.in.orig 2014-10-09 08:12:57 UTC -+++ include/med.h.in -@@ -27,12 +27,7 @@ extern "C" { - - #define HDF5_VERSION (H5_VERS_MAJOR * 10000 + H5_VERS_MINOR * 100 + H5_VERS_RELEASE ) - --#if HDF5_VERSION < 10607 --/*TODO : A enlever après MAJ complète api hdf5-1.8 */ --#define HDF5_SELECT_BUG (const hsize_t **) --#else - #define HDF5_SELECT_BUG --#endif - - /*Le symbole H5F_LIBVER_18 n'existe pas dans hdf5-1.8.4 (uniquement à partir de la version 1.8.6) - Pour rester dans le modèle interne hdf introduit en 1.8 quelque soit les futurs modèles internes hdf Property changes on: french/med/files/patch-include_med.h.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: science/cgnslib/Makefile =================================================================== --- science/cgnslib/Makefile (revision 559838) +++ science/cgnslib/Makefile (working copy) @@ -4,7 +4,7 @@ PORTNAME= cgnslib PORTVERSION= 4.1.2 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= science @@ -37,8 +37,9 @@ FORTRAN_USES= fortran FORTRAN_CMAKE_BOOL= CGNS_ENABLE_FORTRAN -HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 libsz.so:science/szip -HDF5_CMAKE_BOOL= CGNS_ENABLE_HDF5 +HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 \ + libsz.so:science/szip +HDF5_CMAKE_BOOL= CGNS_ENABLE_HDF5 HDF5_BUILD_SHARED_LIBS HDF5_CMAKE_ON= -DHDF5_INCLUDE_PATH:PATH="${LOCALBASE}/include" TESTS_CMAKE_BOOL= CGNS_ENABLE_TESTS Index: science/cgnslib/files/patch-CMakeLists.txt =================================================================== --- science/cgnslib/files/patch-CMakeLists.txt (nonexistent) +++ science/cgnslib/files/patch-CMakeLists.txt (working copy) @@ -0,0 +1,10 @@ +--- CMakeLists.txt.orig 2020-08-18 19:44:35 UTC ++++ CMakeLists.txt +@@ -204,7 +204,6 @@ if (CGNS_ENABLE_HDF5) + find_package (HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS ${FIND_HDF_COMPONENTS}) + message (STATUS "HDF5 C libs:${HDF5_FOUND} static:${HDF5_static_C_FOUND} and shared:${HDF5_shared_C_FOUND}") + if (HDF5_FOUND) +- add_executable (h5dump IMPORTED) + if (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND) + set (FIND_HDF_COMPONENTS C) + Property changes on: science/cgnslib/files/patch-CMakeLists.txt ___________________________________________________________________ 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: sysutils/slurm-wlm/Makefile =================================================================== --- sysutils/slurm-wlm/Makefile (revision 561111) +++ sysutils/slurm-wlm/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= slurm DISTVERSION= 20.02.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils python MASTER_SITES= https://download.schedmd.com/slurm/ PKGNAMESUFFIX= -wlm @@ -21,8 +21,8 @@ libmunge.so:security/munge \ liblz4.so:archivers/liblz4 -USES= compiler:c11 gmake gnome libtool lua pkgconfig python:build \ - readline:port shebangfix ssl tar:bz2 +USES= compiler:c11 gmake gnome libtool localbase lua pkgconfig \ + python:build readline:port shebangfix ssl tar:bz2 USE_LDCONFIG= yes USE_PERL5= configure USE_RC_SUBR= slurmctld slurmd @@ -63,6 +63,7 @@ HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 \ libsz.so:science/szip HDF5_CONFIGURE_WITH= hdf5 +HDF5_CONFIGURE_ENV= H5CC=${LOCALBASE}/bin/h5cc HWLOC_LIB_DEPENDS= libhwloc.so.15:devel/hwloc2 HWLOC_CONFIGURE_WITH= hwloc @@ -96,7 +97,7 @@ pre-configure: @${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm @${REINPLACE_CMD} -e 's|sched_setaffinity|cpuset_setaffinity|g' \ - ${WRKSRC}/configure + -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|"/proc|"/compat/linux/proc|g' \ -e 's|(/proc)|(/compat/linux/proc)|g' \ Index: sysutils/slurm-wlm/files/patch-configure =================================================================== --- sysutils/slurm-wlm/files/patch-configure (revision 561111) +++ sysutils/slurm-wlm/files/patch-configure (working copy) @@ -1,8 +1,62 @@ ---- configure.orig 2020-11-30 15:56:36 UTC +--- configure.orig 2020-03-26 21:44:05 UTC +++ configure -@@ -24075,8 +24075,24 @@ fi +@@ -20744,25 +20744,19 @@ HDF5 support is being disabled (equivalent to --with-h + with_hdf5="no" + with_hdf5_fortran="no" + else +- HDF5_SHOW=$(eval $H5CC -show) ++ HDF5_SHOW=`$PKG_CONFIG --cflags hdf5 --libs hdf5` +- HDF5_CC=$(eval $H5CC -show | $AWK '{print $1}') +- if test "$HDF5_CC" = "ccache"; then +- HDF5_CC=$(eval $H5CC -show | $AWK '{print $2}') +- fi ++ HDF5_CC=$CC ++ HDF5_VERSION=`$GREP 'HDF5 Version:' %%LOCALBASE%%/lib/libhdf5.settings \ ++ | $AWK '{print $3}'` + +- HDF5_VERSION=$(eval $H5CC -showconfig | $GREP 'HDF5 Version:' \ +- | $AWK '{print $3}') ++ HDF5_tmp_flags=`$GREP 'FLAGS\|Extra libraries:' %%LOCALBASE%%/lib/libhdf5.settings \ ++ | $AWK -F: '{printf("%s "), $2}' ` + +- HDF5_tmp_flags=$(eval $H5CC -showconfig \ +- | $GREP 'FLAGS\|Extra libraries:' \ +- | $AWK -F: '{printf("%s "), $2}' ) ++ HDF5_tmp_inst=`$GREP 'Installation point:' %%LOCALBASE%%/lib/libhdf5.settings \ ++ | $AWK '{print $NF}' ` + +- HDF5_tmp_inst=$(eval $H5CC -showconfig \ +- | $GREP 'Installation point:' \ +- | $AWK '{print $NF}' ) +- + HDF5_CPPFLAGS="-I${HDF5_tmp_inst}/include" + + for arg in $HDF5_SHOW $HDF5_tmp_flags ; do +@@ -20907,7 +20901,7 @@ $as_echo "$H5FC" >&6; } + with_hdf5_fortran="yes" + + +- for arg in `$H5FC -show` ++ for arg in `$PKG_CONFIG --cflags hdf5_fortran --libs hdf5_fortran` + do + case "$arg" in #( + -I*) echo $HDF5_FFLAGS | $GREP -e "$arg" >/dev/null \ +@@ -20967,9 +20961,8 @@ fi + # because slurm uses the 1.8 API. By defining this CPP macro we get + # the 1.8 API. + +-$as_echo "#define H5_NO_DEPRECATED_SYMBOLS 1" >>confdefs.h ++# Remove on FreeBSD ports because we use 1.12 with 1.10 API + +- + # + # Handle user hints + # +@@ -24075,8 +24068,24 @@ fi + + x_ac_lua_pkg_name="lua" - #check for 5.3 then 5.2 then 5.1 - if test -n "$PKG_CONFIG" && \ @@ -27,7 +81,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3\""; } >&5 ($PKG_CONFIG --exists --print-errors "lua5.3") 2>&5 ac_status=$? -@@ -24125,6 +24141,8 @@ else +@@ -24125,6 +24134,8 @@ else x_ac_lua_pkg_name=lua-5.1 else x_ac_lua_pkg_name="lua >= 5.1" Index: sysutils/slurm-wlm/files/patch-src_api_Makefile.in =================================================================== --- sysutils/slurm-wlm/files/patch-src_api_Makefile.in (revision 561111) +++ sysutils/slurm-wlm/files/patch-src_api_Makefile.in (working copy) @@ -1,6 +1,6 @@ ---- src/api/Makefile.in.orig 2020-02-29 23:53:10 UTC +--- src/api/Makefile.in.orig 2020-03-26 21:44:05 UTC +++ src/api/Makefile.in -@@ -1300,7 +1300,6 @@ $(VERSION_SCRIPT) : +@@ -1311,7 +1311,6 @@ $(VERSION_SCRIPT) : $(FULL_VERSION_SCRIPT) : (echo "{ global: *;"; \