diff --git a/science/cantera/Makefile b/science/cantera/Makefile
index 97f903f18e9b..26c37e182566 100644
--- a/science/cantera/Makefile
+++ b/science/cantera/Makefile
@@ -1,82 +1,82 @@
 PORTNAME=	cantera
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.6.0
 PORTREVISION=	2
 CATEGORIES=	science # chemistry physics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Chemical kinetics, thermodynamics, and transport tool suite
 WWW=		https://cantera.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 BUILD_DEPENDS=	googletest>0:devel/googletest \
 		${LOCALBASE}/include/boost/algorithm/string.hpp:devel/boost-libs
 LIB_DEPENDS=	libfmt.so:devel/libfmt \
 		libyaml-cpp.so:devel/yaml-cpp
 
 USES=		compiler:c++11-lang eigen:3 scons
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cantera
 GH_TUPLE=	LLNL:sundials:887af43:sundials/ext/sundials # bundled sundials is only needed for the Octave option
 
 MAKE_ARGS=	system_eigen='y' \
 		system_sundials='n' \
 		system_fmt='y' \
 		system_yamlcpp='y' \
 		googletest='system' \
 		sundials_include='${LOCALBASE}/include/sundials' \
 		extra_inc_dirs="${LOCALBASE}/include:${LOCALBASE}/include/eigen3" \
 		extra_lib_dirs="${LOCALBASE}/lib" \
 		debug='no' \
 		cc_flags="${CXXFLAGS}" \
 		prefix="${PREFIX}"
 
 ALL_TARGET=	build
 TEST_TARGET=	test # some tests fail, see https://github.com/Cantera/cantera/issues/1095
 
 OPTIONS_DEFINE=		OCTAVE PYTHON
 OPTIONS_DEFAULT=	# PYTHON is broken; OCTAVE is off by default because Octave interface is not as frequently requested feature
 OPTIONS_SUB=		yes
 
 OCTAVE_DESC=		Octave support
 OCTAVE_MAKE_ARGS=	matlab_toolbox=y matlab_path=${LOCALBASE}
 OCTAVE_CXXFLAGS=	-I${LOCALBASE}/include/octave-${OCTAVE_VERSION}/octave
 OCTAVE_LIB_DEPENDS=	liboctave.so:math/octave
 OCTAVE_SUB_FILES=	pkg-message-octave
-.include "../../math/octave/Makefile.version" # for OCTAVE_VERSION
+OCTAVE_USES=		octave:env
 
 PYTHON_USES=		python:3.6+
 PYTHON_USE=		PYTHON=cython
 PYTHON_MAKE_ARGS=	python_cmd=${PYTHON_CMD} python_package=full
 PYTHON_MAKE_ARGS_OFF=	python_package="none"
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 PYTHON_BROKEN=		https://github.com/Cantera/cantera/issues/1269
 
 do-install:
 	cd ${WRKSRC} && \
 		${MAKE_CMD} install \
 			stage_dir="${STAGEDIR}"
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcantera_shared.so.2.6.0
 
 do-install-PYTHON-on:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cantera/_cantera.cpython-${PYTHON_SUFFIX}.so
 
 post-patch-OCTAVE-on: # adjust Octave version in SConscript (python styled os.environ['OCTAVE_VERSION'] somehow doesn't work for this)
 	@${REINPLACE_CMD} -e "s|, 'bin', 'glnx.*')|, 'lib', 'octave', '${OCTAVE_VERSION}')|" ${WRKSRC}/src/matlab/SConscript
 
 post-install-OCTAVE-on: # adjust .mex file name
 	@${MV} \
 		${STAGEDIR}${PREFIX}/lib/cantera/matlab/toolbox/ctmethods.mexa64 \
 		${STAGEDIR}${PREFIX}/lib/cantera/matlab/toolbox/ctmethods.mex
 
 .include <bsd.port.mk>
diff --git a/science/h5utils/Makefile b/science/h5utils/Makefile
index a32d97be6151..f16be1fa8a85 100644
--- a/science/h5utils/Makefile
+++ b/science/h5utils/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	h5utils
 DISTVERSION=	1.13.1
 PORTREVISION=	6
 CATEGORIES=	science
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Set of utilities for visualization and conversion of HDF5 format
 WWW=		https://github.com/stevengj/h5utils
 
 LICENSE=	MIT GPLv2
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gawk:lang/gawk
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libpng.so:graphics/png \
 		libmatheval.so:devel/libmatheval
 
 USES=		autoreconf compiler:c++11-lang
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	stevengj
 
 CFLAGS+=	-L${LOCALBASE}/lib -I${LOCALBASE}/include -lpthread
 CXXFLAGS+=	-std=c++11
 
 OPTIONS_DEFINE=		OCTAVE
 OPTIONS_SUB=		yes
 
 OCTAVE_DESC=		With Octave support
 OCTAVE_CONFIGURE_WITH=	octave
 OCTAVE_BUILD_DEPENDS=	${LOCALBASE}/include/octave-${OCTAVE_VERSION}/octave/octave.h:math/octave
+OCTAVE_USES=		octave:env
 OCTAVE_VARS=		PLIST_SUB+="OCTAVE_VERSION=${OCTAVE_VERSION} CONFIGURE_TARGET=${CONFIGURE_TARGET}"
 
 post-install-OCTAVE-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/octave/${OCTAVE_VERSION}/site/oct/${CONFIGURE_TARGET}/h5read.oct
 
-.include "../../math/octave/Makefile.version"
 .include <bsd.port.mk>