Attachment 221422 Details for Bug 251894 – Patch to upgrade science/hdf5 to 1.12

[patch] Patch to upgrade science/hdf5 to 1.12

science_hdf5.diff (text/plain), 11.70 KB, created by Thierry Thomas on 2021-01-09 15:40:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2021-01-09 15:40:48 UTC

Size: 11.70 KB

patch

obsolete

>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}/${DISTNAME}/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 <bsd.port.options.mk>
> 
>+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 <bsd.port.mk>
>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

Actions: View | Diff

Attachments on bug 251894: 220626 | 221416 | 221417 | 221422 | 221475 | 221869 | 221874