From owner-svn-ports-all@freebsd.org Thu Jun 7 08:34:28 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 120F2FD5F6B; Thu, 7 Jun 2018 08:34:28 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B6B1A85497; Thu, 7 Jun 2018 08:34:27 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7E6E41DC65; Thu, 7 Jun 2018 08:34:27 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w578YRLi086352; Thu, 7 Jun 2018 08:34:27 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w578YRNJ086351; Thu, 7 Jun 2018 08:34:27 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201806070834.w578YRNJ086351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 7 Jun 2018 08:34:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471902 - head/french/med X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/french/med X-SVN-Commit-Revision: 471902 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2018 08:34:28 -0000 Author: amdmi3 Date: Thu Jun 7 08:34:27 2018 New Revision: 471902 URL: https://svnweb.freebsd.org/changeset/ports/471902 Log: - Switch to new test framework - Switch to options helpers Approved by: portmgr blanket Modified: head/french/med/Makefile Modified: head/french/med/Makefile ============================================================================== --- head/french/med/Makefile Thu Jun 7 06:26:39 2018 (r471901) +++ head/french/med/Makefile Thu Jun 7 08:34:27 2018 (r471902) @@ -26,6 +26,9 @@ CONFIGURE_ARGS= --disable-python --with-hdf5=${LOCALBA 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/x 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