From 30d79d3c39eab42f0d6e91c37e4e7532e67a67d1 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Thu, 7 Jun 2018 08:34:27 +0000 Subject: [PATCH] - Switch to new test framework - Switch to options helpers Approved by: portmgr blanket --- french/med/Makefile | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/french/med/Makefile b/french/med/Makefile index d88a58b655f4..db954d031511 100644 --- a/french/med/Makefile +++ b/french/med/Makefile @@ -26,6 +26,9 @@ CONFIGURE_ARGS= --disable-python --with-hdf5=${LOCALBASE} \ CONFIGURE_ENV= WISH=${WISH} H5DUMP=h5dump-18 GNU_CONFIGURE= yes USE_LDCONFIG= yes +TEST_WRKSRC= ${WRKSRC}/tests +TEST_TARGET= check # XXX: 1 of 16 tests fail +TEST_ENV= ${MAKE_ENV} HDF5_DISABLE_VERSION_CHECK=1 LIBVER= 1.8.0 PLIST_SUB+= VE=${LIBVER} @@ -35,38 +38,32 @@ PATCH_TK_SCRIPTS= tools/mdump/xmdump2.in tools/mdump/xmdump3.in DOC2FIX= . dox gif html html.dox jpg png TST2FIX= c f -.include - -pre-configure: - ${REINPLACE_CMD} -e 's|||' \ +post-patch: + @${REINPLACE_CMD} -e 's|||' \ ${WRKSRC}/include/2.3.6/med_outils.h \ ${WRKSRC}/include/med_outils.h -.if ! ${PORT_OPTIONS:MDOCS} - ${REINPLACE_CMD} -e '/SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in -.endif -.if ! ${PORT_OPTIONS:MEXAMPLES} - ${REINPLACE_CMD} -e '/SUBDIRS/ s|tests||' ${WRKSRC}/Makefile.in -.endif .for dd in ${DOC2FIX} - ${REINPLACE_CMD} -e 's|docdir = $$(datadir)/doc|docdir = @docdir@|' \ + @${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} \ + @${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 # ATM MED is only compatible with hdf5-18 - ${REINPLACE_CMD} -e 's|-lhdf5|-lhdf5-18|' ${WRKSRC}/${CONFIGURE_SCRIPT} + @${REINPLACE_CMD} -e 's|-lhdf5|-lhdf5-18|' ${WRKSRC}/${CONFIGURE_SCRIPT} + +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) -regression-test: - (cd ${BUILD_WRKSRC}/tests && ${SETENV} ${MAKE_ENV} HDF5_DISABLE_VERSION_CHECK=1 \ - ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) - .include "${.CURDIR}/../../french/aster/bsd.aster.mk" .include