git: 014002e7d288 - main - french/med: Fix build with HDF5 1.10.8+
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 16 Jun 2022 15:14:14 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=014002e7d2886644b9d040402e7c885552c5a90f
commit 014002e7d2886644b9d040402e7c885552c5a90f
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-06-16 15:11:43 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-06-16 15:13:02 +0000
french/med: Fix build with HDF5 1.10.8+
- While I'm here, use sed from basd system instead of gesed from ports
---
french/med/Makefile | 1 -
french/med/files/patch-configure | 6 +++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/french/med/Makefile b/french/med/Makefile
index 8d4a513f607c..6e392fc0eb53 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -9,7 +9,6 @@ COMMENT= Modelisation et Echanges de Donnees
LICENSE= GPLv3
-BUILD_DEPENDS= gsed:textproc/gsed
LIB_DEPENDS= libhdf5.so:science/hdf5
USES= fortran gmake libtool tk
diff --git a/french/med/files/patch-configure b/french/med/files/patch-configure
index 6c299c940364..c4c17d44daca 100644
--- a/french/med/files/patch-configure
+++ b/french/med/files/patch-configure
@@ -20,9 +20,9 @@
- H5_VER_MAJOR=` grep '#define *H5_VERS_MAJOR' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_MAJOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
- H5_VER_MINOR=` grep '#define *H5_VERS_MINOR' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_MINOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
- H5_VER_RELEASE=`grep '#define *H5_VERS_RELEASE' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_RELEASE[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
-+ H5_VER_MAJOR=` grep '#define *H5_VERS_MAJOR' $HDF5_ABS_PATH | gsed 's/^.*H5_VERS_MAJOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
-+ 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' `
++ H5_VER_MAJOR=` grep '#define *H5_VERS_MAJOR' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_MAJOR *\([0-9]*\).*$/\1/' `
++ H5_VER_MINOR=` grep '#define *H5_VERS_MINOR' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_MINOR *\([0-9]*\).*$/\1/' `
++ H5_VER_RELEASE=`grep '#define *H5_VERS_RELEASE' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_RELEASE *\([0-9]*\).*$/\1/' `
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 $? "
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}.