svn commit: r520463 - head/Mk

Stephen Montgomery-Smith stephen at FreeBSD.org
Fri Dec 20 04:30:02 UTC 2019


Author: stephen
Date: Fri Dec 20 04:30:01 2019
New Revision: 520463
URL: https://svnweb.freebsd.org/changeset/ports/520463

Log:
  - Replace with a cleaner way to get OCTAVE_VERSION.

Modified:
  head/Mk/bsd.octave.mk

Modified: head/Mk/bsd.octave.mk
==============================================================================
--- head/Mk/bsd.octave.mk	Fri Dec 20 04:15:56 2019	(r520462)
+++ head/Mk/bsd.octave.mk	Fri Dec 20 04:30:01 2019	(r520463)
@@ -28,8 +28,10 @@ OCTAVE_PKGNAME=	${PORTNAME:S/octave-forge-//}
 TARBALLS_DIR=	${LOCALBASE}/share/octave/tarballs
 INSTALL_TARBALLS_DIR=	${STAGEDIR}${PREFIX}/share/octave/tarballs
 
+.include "${.CURDIR}/../../math/octave/Makefile.version"
+
 MAKE_ENV+=	PACKAGE=${WRKDIR}/${DISTNAME}.tar.gz
-MAKE_ARGS=	CC="${CC}" CXX="${CXX}" LD_CXX="${CXX}" DL_LD="${CXX}" MKOCTFILE="${LOCALBASE}/bin/mkoctfile" OCTAVE_VERSION=-`${MAKE} -C ${.CURDIR}/../../math/octave -V PORTVERSION`
+MAKE_ARGS=	CC="${CC}" CXX="${CXX}" LD_CXX="${CXX}" DL_LD="${CXX}" MKOCTFILE="${LOCALBASE}/bin/mkoctfile" OCTAVE_VERSION=-${OCTAVE_VERSION}
 
 LOAD_OCTAVE_PKG_CMD=	${LOCALBASE}/libexec/octave/load-octave-pkg
 


More information about the svn-ports-head mailing list