diff --git a/french/med/Makefile b/french/med/Makefile index 8d4a513f607c..6e392fc0eb53 100644 --- a/french/med/Makefile +++ b/french/med/Makefile @@ -1,65 +1,64 @@ # Created by: thierry@pompo.net PORTNAME= med DISTVERSION= 4.0.0 CATEGORIES= french science MAINTAINER= thierry@FreeBSD.org COMMENT= Modelisation et Echanges de Donnees LICENSE= GPLv3 -BUILD_DEPENDS= gsed:textproc/gsed LIB_DEPENDS= libhdf5.so:science/hdf5 USES= fortran gmake libtool tk OPTIONS_DEFINE= DOCS EXAMPLES USE_CXXSTD= gnu++98 CFLAGS+= -fPIC CONFIGURE_ARGS= --disable-python --with-hdf5=${LOCALBASE} CONFIGURE_ENV= WISH=${WISH} GNU_CONFIGURE= yes USE_LDCONFIG= yes TEST_WRKSRC= ${WRKSRC}/tests TEST_TARGET= check # XXX: one fail TEST_ENV= ${MAKE_ENV} HDF5_DISABLE_VERSION_CHECK=1 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} LIBVER= 11.0.0 PLIST_SUB+= VE=${LIBVER} PATCH_TK_SCRIPTS= tools/mdump/xmdump2.in tools/mdump/xmdump3.in DOC2FIX= . dox gif html html.dox jpg png TST2FIX= c f pre-configure: ${REINPLACE_CMD} -e 's|||' \ ${WRKSRC}/include/2.3.6/med_outils.h \ ${WRKSRC}/include/med_outils.h .for dd in ${DOC2FIX} ${REINPLACE_CMD} -e 's|docdir = $$(datadir)/doc|docdir = @docdir@|' \ ${WRKSRC}/doc/${dd}/Makefile.in .endfor .for dd in ${TST2FIX} ${FIND} ${WRKSRC}/tests -name Makefile.in | ${XARGS} \ ${REINPLACE_CMD} -e 's|test${dd}dir = $$(bindir)/test|test${dd}dir = ${EXAMPLESDIR}/test|' \ -e 's|unittestsdir = $$(bindir)/unit|unittestsdir = ${EXAMPLESDIR}/unit|' \ -e 's|usescasesdir = $$(bindir)/uses|usescasesdir = ${EXAMPLESDIR}/uses|' .endfor post-patch-DOCS-off: ${REINPLACE_CMD} -e '/SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in post-patch-EXAMPLES-off: ${REINPLACE_CMD} -e '/SUBDIRS/ s|tests||' ${WRKSRC}/Makefile.in post-install: (cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf mdump3 mdump \ && ${LN} -sf xmdump3 xmdump) .include "${.CURDIR}/../../french/aster/bsd.aster.mk" .include 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 @@ -1,28 +1,28 @@ --- 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 HDF5_VERSION="0" if test -n "$HDF5_ABS_PATH" ; then HDF5_USED_VER=` grep H5_VERS_INFO $HDF5_ABS_PATH | sed 's/\([^"]*\)\(".*"\)\([^"]*\)/\2/g' ` - 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}.