Attachment 221417 Details for Bug 251894 – Patch to keep hdf5 1.10 in // with 1.12

[patch] Patch to keep hdf5 1.10 in // with 1.12

science_hdf5-110.diff (text/plain), 12.62 KB, created by Thierry Thomas on 2021-01-09 10:10:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2021-01-09 10:10:34 UTC

Size: 12.62 KB

patch

obsolete

>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 <bsd.port.options.mk>
>+
>+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 <bsd.port.mk>
>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

Actions: View | Diff

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