aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammad Moinur Rahman <bofh@FreeBSD.org>2022-12-30 17:49:45 +0000
committerMuhammad Moinur Rahman <bofh@FreeBSD.org>2022-12-30 17:54:39 +0000
commit8231864a3b0376f9df37cc3904c4e217efc6110d (patch)
tree1527743df58dab8dec2dc27426e051818ed96898
parentc87a22b7f399da0a3446fb75c57eaba8dc7769ca (diff)
downloadports-8231864a3b0376f9df37cc3904c4e217efc6110d.tar.gz
ports-8231864a3b0376f9df37cc3904c4e217efc6110d.zip
Mk/**octave.mk: Convert to USES=octave
As part of the improvements of USES infrastructure Mk/bsd.octave.mk has been converted to Mk/Uses/octave.mk. This also declutters some old stuffs in the octave-* ports and makes it simpler to add more octave-forge ports easily. While I am here make all the ports portclippy/portfmt compliant. And use USES macros whenever possible. Reviewed by: portmgr Approved by: tcberner Differential Revision: https://reviews.freebsd.org/D37887
-rw-r--r--Mk/Uses/octave.mk90
-rw-r--r--Mk/bsd.octave.mk41
-rw-r--r--benchmarks/octave-forge-benchmark/Makefile5
-rw-r--r--math/octave-forge-actuarial/Makefile16
-rw-r--r--math/octave-forge-audio/Makefile13
-rw-r--r--math/octave-forge-automatic-differentiation/Makefile21
-rw-r--r--math/octave-forge-bim/Makefile23
-rw-r--r--math/octave-forge-bioinfo/Makefile5
-rw-r--r--math/octave-forge-biosig/Makefile17
-rw-r--r--math/octave-forge-bsltl/Makefile18
-rw-r--r--math/octave-forge-cfitsio/Makefile17
-rw-r--r--math/octave-forge-cgi/Makefile18
-rw-r--r--math/octave-forge-civil-engineering/Makefile5
-rw-r--r--math/octave-forge-coder/Makefile15
-rw-r--r--math/octave-forge-communications/Makefile17
-rw-r--r--math/octave-forge-control/Makefile16
-rw-r--r--math/octave-forge-csg-toolkit/Makefile28
-rw-r--r--math/octave-forge-data-smoothing/Makefile17
-rw-r--r--math/octave-forge-database/Makefile17
-rw-r--r--math/octave-forge-dataframe/Makefile16
-rw-r--r--math/octave-forge-dicom/Makefile13
-rw-r--r--math/octave-forge-divand/Makefile19
-rw-r--r--math/octave-forge-doctest/Makefile18
-rw-r--r--math/octave-forge-econometrics/Makefile16
-rw-r--r--math/octave-forge-fda/Makefile19
-rw-r--r--math/octave-forge-femoctave/Makefile15
-rw-r--r--math/octave-forge-fenv/Makefile15
-rw-r--r--math/octave-forge-financial/Makefile20
-rw-r--r--math/octave-forge-fits/Makefile16
-rw-r--r--math/octave-forge-fpl/Makefile17
-rw-r--r--math/octave-forge-fuzzy-logic-toolkit/Makefile18
-rw-r--r--math/octave-forge-ga/Makefile16
-rw-r--r--math/octave-forge-general/Makefile11
-rw-r--r--math/octave-forge-generate_html/Makefile16
-rw-r--r--math/octave-forge-geographiclib/Makefile16
-rw-r--r--math/octave-forge-geometry/Makefile19
-rw-r--r--math/octave-forge-gnuplot/Makefile16
-rw-r--r--math/octave-forge-gsl/Makefile14
-rw-r--r--math/octave-forge-ident/Makefile5
-rw-r--r--math/octave-forge-image/Makefile16
-rw-r--r--math/octave-forge-informationtheory/Makefile5
-rw-r--r--math/octave-forge-integration/Makefile5
-rw-r--r--math/octave-forge-internal-fluid-flow/Makefile17
-rw-r--r--math/octave-forge-interval/Makefile14
-rw-r--r--math/octave-forge-io/Makefile14
-rw-r--r--math/octave-forge-irsa/Makefile5
-rw-r--r--math/octave-forge-level-set/Makefile16
-rw-r--r--math/octave-forge-linear-algebra/Makefile16
-rw-r--r--math/octave-forge-lssa/Makefile14
-rw-r--r--math/octave-forge-ltfat/Makefile12
-rw-r--r--math/octave-forge-mapping/Makefile20
-rw-r--r--math/octave-forge-matgeom/Makefile17
-rw-r--r--math/octave-forge-mccabe-thiele/Makefile21
-rw-r--r--math/octave-forge-mechanics/Makefile20
-rw-r--r--math/octave-forge-miscellaneous/Makefile16
-rw-r--r--math/octave-forge-missing-functions/Makefile5
-rw-r--r--math/octave-forge-mpi/Makefile19
-rw-r--r--math/octave-forge-mqtt/Makefile18
-rw-r--r--math/octave-forge-msh/Makefile23
-rw-r--r--math/octave-forge-multicore/Makefile5
-rw-r--r--math/octave-forge-mvn/Makefile16
-rw-r--r--math/octave-forge-nan/Makefile17
-rw-r--r--math/octave-forge-ncarray/Makefile22
-rw-r--r--math/octave-forge-netcdf/Makefile18
-rw-r--r--math/octave-forge-nlwing2/Makefile14
-rw-r--r--math/octave-forge-nnet/Makefile16
-rw-r--r--math/octave-forge-nurbs/Makefile14
-rw-r--r--math/octave-forge-oct2mat/Makefile7
-rw-r--r--math/octave-forge-octclip/Makefile14
-rw-r--r--math/octave-forge-octproj/Makefile14
-rw-r--r--math/octave-forge-odebvp/Makefile5
-rw-r--r--math/octave-forge-onsas/Makefile17
-rw-r--r--math/octave-forge-optics/Makefile16
-rw-r--r--math/octave-forge-optim/Makefile21
-rw-r--r--math/octave-forge-optiminterp/Makefile17
-rw-r--r--math/octave-forge-outliers/Makefile5
-rw-r--r--math/octave-forge-parallel/Makefile19
-rw-r--r--math/octave-forge-pde1dm/Makefile17
-rw-r--r--math/octave-forge-plot/Makefile16
-rw-r--r--math/octave-forge-ponchon-savarit/Makefile19
-rw-r--r--math/octave-forge-psychrometrics/Makefile17
-rw-r--r--math/octave-forge-pythonic/Makefile17
-rw-r--r--math/octave-forge-quaternion/Makefile14
-rw-r--r--math/octave-forge-queueing/Makefile16
-rw-r--r--math/octave-forge-secs1d/Makefile18
-rw-r--r--math/octave-forge-secs2d/Makefile5
-rw-r--r--math/octave-forge-secs3d/Makefile20
-rw-r--r--math/octave-forge-signal/Makefile16
-rw-r--r--math/octave-forge-simp/Makefile5
-rw-r--r--math/octave-forge-sockets/Makefile14
-rw-r--r--math/octave-forge-sole/Makefile18
-rw-r--r--math/octave-forge-sparsersb/Makefile14
-rw-r--r--math/octave-forge-specfun/Makefile14
-rw-r--r--math/octave-forge-special-matrix/Makefile5
-rw-r--r--math/octave-forge-splines/Makefile18
-rw-r--r--math/octave-forge-sqlite/Makefile19
-rw-r--r--math/octave-forge-statistics-bootstrap/Makefile18
-rw-r--r--math/octave-forge-statistics/Makefile15
-rw-r--r--math/octave-forge-stk/Makefile14
-rw-r--r--math/octave-forge-strings/Makefile13
-rw-r--r--math/octave-forge-struct/Makefile14
-rw-r--r--math/octave-forge-symband/Makefile5
-rw-r--r--math/octave-forge-symbolic/Makefile20
-rw-r--r--math/octave-forge-tcl-octave/Makefile5
-rw-r--r--math/octave-forge-tsa/Makefile16
-rw-r--r--math/octave-forge-video/Makefile23
-rw-r--r--math/octave-forge-websockets/Makefile21
-rw-r--r--math/octave-forge-zenity/Makefile7
-rw-r--r--math/octave-forge-zeromq/Makefile17
-rw-r--r--math/octave-forge/Makefile8
-rw-r--r--math/octave/Makefile102
-rw-r--r--math/octave/Makefile.version2
112 files changed, 540 insertions, 1306 deletions
diff --git a/Mk/Uses/octave.mk b/Mk/Uses/octave.mk
new file mode 100644
index 000000000000..e5c6be62df25
--- /dev/null
+++ b/Mk/Uses/octave.mk
@@ -0,0 +1,90 @@
+# Support for octave based ports
+#
+# Feature: octave
+# Usage: USES=octave
+# Valid ARGS: (none), env
+# - env : Loads only one environmental variable OCTAVE_VERSION
+# MAINTAINER: stephen@FreeBSD.org
+#
+# Common code to install octave-forge packages.
+# It is, in effect, a wrapper using the package handling already built
+# into math/octave.
+
+.if !defined(_INCLUDE_USES_OCTAVE_MK)
+_INCLUDE_USES_OCTAVE_MK= yes
+
+_valid_octave_ARGS= env
+
+# Sanity check
+. for arg in ${octave_ARGS}
+. if empty(_valid_octave_ARGS:M${arg})
+IGNORE= Incorrect 'USES+= octave:${octave_ARGS}' usage: argument [${arg}] is not recognized
+. endif
+. endfor
+
+OCTAVE_VERSION= 7.3.0
+
+. if empty(octave_ARGS:Menv)
+BUILD_DEPENDS+= octave:math/octave
+RUN_DEPENDS+= octave:math/octave \
+ ${LOCALBASE}/libexec/octave/load-octave-pkg:math/octave-forge-base
+LIB_DEPENDS+= libpcre.so:devel/pcre
+
+. if ! ${USES:Mcompiler}
+_USES_POST+= compiler:c++14-lang
+. endif
+
+. if ! ${USES:Mfortran}
+_USES_POST+= fortran
+. endif
+
+. if ! ${USES:Mgmake}
+_USES_POST+= gmake
+. endif
+
+CXXFLAGS+= -I${LOCALBASE}/include/octave-${OCTAVE_VERSION}
+CFLAGS+= -I${LOCALBASE}/include/octave-${OCTAVE_VERSION}
+CPPFLAGS+= -I${LOCALBASE}/include/octave-${OCTAVE_VERSION}
+
+DIST_SUBDIR?= octave-forge
+OCTAVE_PKGNAME= ${PORTNAME:S/octave-forge-//}
+OCTAVE_DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSION}
+OCTAVE_TARBALLS_DIR= ${LOCALBASE}/share/octave/tarballs
+OCTAVE_INSTALL_TARBALLS_DIR= ${STAGEDIR}${PREFIX}/share/octave/tarballs
+OCTAVE_SRC?= ${DISTNAME}
+WRKSRC?= ${WRKDIR}/${OCTAVE_SRC}/src
+
+MAKE_ENV+= PACKAGE=${OCTAVE_DISTNAME}.tar.gz
+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
+
+. if !target(pre-install)
+pre-install: octave-pre-install
+. endif # !target(pre-install)
+
+. if !target(do-install)
+do-install: octave-do-install
+. endif # !target(do-install)
+
+. if !target(post-install)
+post-install: octave-post-install
+. endif # !target(post-install)
+
+octave-pre-install:
+ ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
+ cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTAVE_SRC}
+
+octave-do-install:
+ ${MKDIR} ${OCTAVE_INSTALL_TARBALLS_DIR}
+ ${INSTALL_DATA} ${WRKDIR}/${OCTAVE_DISTNAME}.tar.gz ${OCTAVE_INSTALL_TARBALLS_DIR}/.
+ ${LN} -s -f ${OCTAVE_DISTNAME}.tar.gz ${OCTAVE_INSTALL_TARBALLS_DIR}/${OCTAVE_PKGNAME}.tar.gz
+
+octave-post-install:
+ @${ECHO_CMD} "share/octave/tarballs/${OCTAVE_DISTNAME}.tar.gz" >> ${TMPPLIST}
+ @${ECHO_CMD} "share/octave/tarballs/${OCTAVE_PKGNAME}.tar.gz" >> ${TMPPLIST}
+ @${ECHO_CMD} "@postunexec if [ -x ${LOAD_OCTAVE_PKG_CMD} ]; then ${LOAD_OCTAVE_PKG_CMD}; fi" >> ${TMPPLIST}
+ @${ECHO_CMD} "@postexec if [ -x ${LOAD_OCTAVE_PKG_CMD} ]; then ${LOAD_OCTAVE_PKG_CMD}; fi" >> ${TMPPLIST}
+. endif # empty(octave_ARGS:Menv)
+
+.endif # !defined(_INCLUDE_USES_OCTAVE_MK)
diff --git a/Mk/bsd.octave.mk b/Mk/bsd.octave.mk
deleted file mode 100644
index a4c58c4476aa..000000000000
--- a/Mk/bsd.octave.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#-*- tab-width: 4; -*-
-# ex:ts=4
-#
-# bsd.octave.mk - Octave related macro
-# Common code to install octave-forge packages.
-# It is, in effect, a wrapper using the package handling already built
-# into math/octave.
-
-bsd_octave_mk_MAINTAINER= stephen@FreeBSD.org
-
-BUILD_DEPENDS+= octave:math/octave
-RUN_DEPENDS+= octave:math/octave \
- ${LOCALBASE}/libexec/octave/load-octave-pkg:math/octave-forge-base
-LIB_DEPENDS+= libpcre.so:devel/pcre
-
-USES+= fortran gmake compiler:c++14-lang
-CXXFLAGS+= -std=gnu++11
-
-DIST_SUBDIR?= octave-forge
-OCTAVE_PKGNAME= ${PORTNAME:S/octave-forge-//}
-OCTAVE_DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSION}
-TARBALLS_DIR= ${LOCALBASE}/share/octave/tarballs
-INSTALL_TARBALLS_DIR= ${STAGEDIR}${PREFIX}/share/octave/tarballs
-
-.include "${.CURDIR}/../../math/octave/Makefile.version"
-
-MAKE_ENV+= PACKAGE=${OCTAVE_DISTNAME}.tar.gz
-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
-
-do-install:
- ${MKDIR} ${INSTALL_TARBALLS_DIR}
- ${INSTALL_DATA} ${WRKDIR}/${OCTAVE_DISTNAME}.tar.gz ${INSTALL_TARBALLS_DIR}/.
- ${LN} -s -f ${OCTAVE_DISTNAME}.tar.gz ${INSTALL_TARBALLS_DIR}/${OCTAVE_PKGNAME}.tar.gz
-
-post-install:
- @${ECHO_CMD} "share/octave/tarballs/${OCTAVE_DISTNAME}.tar.gz" >> ${TMPPLIST}
- @${ECHO_CMD} "share/octave/tarballs/${OCTAVE_PKGNAME}.tar.gz" >> ${TMPPLIST}
- @${ECHO_CMD} "@postunexec if [ -x ${LOAD_OCTAVE_PKG_CMD} ]; then ${LOAD_OCTAVE_PKG_CMD}; fi" >> ${TMPPLIST}
- @${ECHO_CMD} "@postexec if [ -x ${LOAD_OCTAVE_PKG_CMD} ]; then ${LOAD_OCTAVE_PKG_CMD}; fi" >> ${TMPPLIST}
diff --git a/benchmarks/octave-forge-benchmark/Makefile b/benchmarks/octave-forge-benchmark/Makefile
index 099fcfcf887a..c0fdb8d26791 100644
--- a/benchmarks/octave-forge-benchmark/Makefile
+++ b/benchmarks/octave-forge-benchmark/Makefile
@@ -12,5 +12,8 @@ WWW= https://packages.octave.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+USES= octave
+
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
+
.include <bsd.port.mk>
diff --git a/math/octave-forge-actuarial/Makefile b/math/octave-forge-actuarial/Makefile
index 377546940214..d9602b932b35 100644
--- a/math/octave-forge-actuarial/Makefile
+++ b/math/octave-forge-actuarial/Makefile
@@ -10,21 +10,13 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+USES= octave
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-audio/Makefile b/math/octave-forge-audio/Makefile
index d1b795e92ff8..a2528425bd15 100644
--- a/math/octave-forge-audio/Makefile
+++ b/math/octave-forge-audio/Makefile
@@ -13,19 +13,8 @@ LICENSE_FILE= ${WRKSRC}/../COPYING
LIB_DEPENDS+= librtmidi.so:audio/rtmidi
-USES= compiler:c++11-lang pkgconfig
+USES= compiler:c++11-lang octave pkgconfig
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-automatic-differentiation/Makefile b/math/octave-forge-automatic-differentiation/Makefile
index 543b21a79960..35056303f94a 100644
--- a/math/octave-forge-automatic-differentiation/Makefile
+++ b/math/octave-forge-automatic-differentiation/Makefile
@@ -8,27 +8,18 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+RUN_DEPENDS+= ${OCTAVE_TARBALLS_DIR}/sockets.tar.gz:math/octave-forge-sockets
+
+USES= octave
USE_GITHUB= yes
GH_ACCOUNT= StevenWaldrip
GH_PROJECT= Automatic-Differentiation
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GH_PROJECT}-${DISTVERSION}
-
-RUN_DEPENDS+= ${TARBALLS_DIR}/sockets.tar.gz:math/octave-forge-sockets
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
-
NO_ARCH= yes
+NO_BUILD= yes
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${GH_PROJECT}-${DISTVERSION}
.include <bsd.port.mk>
diff --git a/math/octave-forge-bim/Makefile b/math/octave-forge-bim/Makefile
index 88a7e530487d..1aa560c0cfd7 100644
--- a/math/octave-forge-bim/Makefile
+++ b/math/octave-forge-bim/Makefile
@@ -8,28 +8,19 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv2
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/fpl.tar.gz:math/octave-forge-fpl \
+ ${OCTAVE_TARBALLS_DIR}/msh.tar.gz:math/octave-forge-msh
+
+USES= octave
USE_GITHUB= yes
GH_ACCOUNT= carlodefalco
GH_PROJECT= bim
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GH_PROJECT}-${DISTVERSION}
-
-RUN_DEPENDS+= ${TARBALLS_DIR}/fpl.tar.gz:math/octave-forge-fpl
-RUN_DEPENDS+= ${TARBALLS_DIR}/msh.tar.gz:math/octave-forge-msh
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
-
NO_ARCH= yes
+NO_BUILD= yes
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${GH_PROJECT}-${DISTVERSION}
.include <bsd.port.mk>
diff --git a/math/octave-forge-bioinfo/Makefile b/math/octave-forge-bioinfo/Makefile
index 9afb626c3eaf..6c3307609c27 100644
--- a/math/octave-forge-bioinfo/Makefile
+++ b/math/octave-forge-bioinfo/Makefile
@@ -12,7 +12,10 @@ WWW= https://packages.octave.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= octave
+
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
+
.include <bsd.port.mk>
diff --git a/math/octave-forge-biosig/Makefile b/math/octave-forge-biosig/Makefile
index e92ee1e2beff..537155bfb91a 100644
--- a/math/octave-forge-biosig/Makefile
+++ b/math/octave-forge-biosig/Makefile
@@ -10,23 +10,14 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
LIB_DEPENDS+= libbiosig.so:biology/biosig
-ALL_TARGET= # nada
-
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-
-OCTSRC= ${DISTNAME:R}
+USES= octave
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+ALL_TARGET= # nada
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${DISTNAME:R}
.include <bsd.port.mk>
diff --git a/math/octave-forge-bsltl/Makefile b/math/octave-forge-bsltl/Makefile
index bae34b04eea5..8c34ea26423e 100644
--- a/math/octave-forge-bsltl/Makefile
+++ b/math/octave-forge-bsltl/Makefile
@@ -10,23 +10,11 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- ${DO_NADA}
+USES= octave
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-cfitsio/Makefile b/math/octave-forge-cfitsio/Makefile
index 41fca05002e4..fac0318f1cc0 100644
--- a/math/octave-forge-cfitsio/Makefile
+++ b/math/octave-forge-cfitsio/Makefile
@@ -11,25 +11,12 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
LIB_DEPENDS+= libcfitsio.so:astro/cfitsio
-USES= autoreconf
-
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
+USES= autoreconf octave
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-cgi/Makefile b/math/octave-forge-cgi/Makefile
index f749b7f79852..4f82f4208ff3 100644
--- a/math/octave-forge-cgi/Makefile
+++ b/math/octave-forge-cgi/Makefile
@@ -10,23 +10,13 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv2
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
+NO_BUILD= yes
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
.include <bsd.port.mk>
diff --git a/math/octave-forge-civil-engineering/Makefile b/math/octave-forge-civil-engineering/Makefile
index e82dc1910e48..8914fce78164 100644
--- a/math/octave-forge-civil-engineering/Makefile
+++ b/math/octave-forge-civil-engineering/Makefile
@@ -12,7 +12,10 @@ WWW= https://packages.octave.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= octave
+
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
+
.include <bsd.port.mk>
diff --git a/math/octave-forge-coder/Makefile b/math/octave-forge-coder/Makefile
index 21aa004127a7..0d5ef2ce693a 100644
--- a/math/octave-forge-coder/Makefile
+++ b/math/octave-forge-coder/Makefile
@@ -8,27 +8,20 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+USES= octave
USE_GITHUB= yes
GH_ACCOUNT= shsajjadi
GH_PROJECT= OctaveCoder
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GH_PROJECT}-coder-${DISTVERSION}
+OCTAVE_SRC= ${GH_PROJECT}-coder-${DISTVERSION}
-WRKSRC= ${WRKDIR}/${OCTSRC}
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
do-build:
cd ${WRKSRC} && \
octave-cli -W -H -q --no-site-file --eval "pre_install" && \
${RM} pre_install.m
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-communications/Makefile b/math/octave-forge-communications/Makefile
index 1b44664fbc5d..dcbd60e2391b 100644
--- a/math/octave-forge-communications/Makefile
+++ b/math/octave-forge-communications/Makefile
@@ -10,23 +10,14 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/signal.tar.gz:math/octave-forge-signal
+
+USES= octave
GNU_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
MAKE_ENV+= MKOCTFILE=mkoctfile
-RUN_DEPENDS+= ${TARBALLS_DIR}/signal.tar.gz:math/octave-forge-signal
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-control/Makefile b/math/octave-forge-control/Makefile
index 7cfb117664f9..492bfbfb14c0 100644
--- a/math/octave-forge-control/Makefile
+++ b/math/octave-forge-control/Makefile
@@ -10,20 +10,10 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-GNU_CONFIGURE= yes
-
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
+USES= octave
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-csg-toolkit/Makefile b/math/octave-forge-csg-toolkit/Makefile
index ce09c981d69c..ab6f14bbc684 100644
--- a/math/octave-forge-csg-toolkit/Makefile
+++ b/math/octave-forge-csg-toolkit/Makefile
@@ -1,7 +1,7 @@
PORTNAME= octave-forge-csg-toolkit
-PORTREVISION= 1
DISTVERSIONPREFIX= v
DISTVERSION= 1.2.3
+PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
@@ -9,30 +9,18 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-USES+= compiler:gcc-c++11-lib
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/io.tar.gz:math/octave-forge-io
+USES= compiler octave
+USE_GCC= yes
USE_GITHUB= yes
GH_ACCOUNT= pr0m1th3as
GH_PROJECT= ${OCTAVE_PKGNAME}
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GH_PROJECT}-${DISTVERSION}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-RUN_DEPENDS+= ${TARBALLS_DIR}/io.tar.gz:math/octave-forge-io
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
-.include <bsd.port.pre.mk>
-
CXXFLAGS+= -stdlib=libstdc++
-.include <bsd.port.post.mk>
+OCTAVE_SRC= ${GH_PROJECT}-${DISTVERSION}
+
+.include <bsd.port.mk>
diff --git a/math/octave-forge-data-smoothing/Makefile b/math/octave-forge-data-smoothing/Makefile
index f3c9920157fb..1651c5bef626 100644
--- a/math/octave-forge-data-smoothing/Makefile
+++ b/math/octave-forge-data-smoothing/Makefile
@@ -10,22 +10,15 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+RUN_DEPENDS+= ${OCTAVE_TARBALLS_DIR}/optim.tar.gz:math/octave-forge-optim
-RUN_DEPENDS+= ${TARBALLS_DIR}/optim.tar.gz:math/octave-forge-optim
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
+NO_BUILD= yes
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
.include <bsd.port.mk>
diff --git a/math/octave-forge-database/Makefile b/math/octave-forge-database/Makefile
index 7abd06cc8ea8..49b0784c362e 100644
--- a/math/octave-forge-database/Makefile
+++ b/math/octave-forge-database/Makefile
@@ -10,24 +10,13 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-RUN_DEPENDS+= ${TARBALLS_DIR}/struct.tar.gz:math/octave-forge-struct
+RUN_DEPENDS+= ${OCTAVE_TARBALLS_DIR}/struct.tar.gz:math/octave-forge-struct
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
+USES= octave pgsql
GNU_CONFIGURE= yes
-USES+= pgsql
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
post-patch:
${REINPLACE_CMD} 's#endian.h#sys/endian.h#' ${WRKSRC}/wrap_endian.h
diff --git a/math/octave-forge-dataframe/Makefile b/math/octave-forge-dataframe/Makefile
index 9ca864028293..6418cfaa5469 100644
--- a/math/octave-forge-dataframe/Makefile
+++ b/math/octave-forge-dataframe/Makefile
@@ -10,21 +10,11 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-dicom/Makefile b/math/octave-forge-dicom/Makefile
index 414f1f1a110f..a68fe85f6bb5 100644
--- a/math/octave-forge-dicom/Makefile
+++ b/math/octave-forge-dicom/Makefile
@@ -9,23 +9,14 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
BUILD_DEPENDS+= cmake:devel/cmake-core
LIB_DEPENDS+= libgdcmCommon.so:devel/gdcm
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
+USES= octave
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-divand/Makefile b/math/octave-forge-divand/Makefile
index e0d2b789c0f0..460ecde252fa 100644
--- a/math/octave-forge-divand/Makefile
+++ b/math/octave-forge-divand/Makefile
@@ -10,23 +10,14 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv2
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
+NO_BUILD= yes
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
.include <bsd.port.mk>
diff --git a/math/octave-forge-doctest/Makefile b/math/octave-forge-doctest/Makefile
index 1f5e98292b9b..bd8738bc800a 100644
--- a/math/octave-forge-doctest/Makefile
+++ b/math/octave-forge-doctest/Makefile
@@ -10,23 +10,11 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= BSD3CLAUSE
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-econometrics/Makefile b/math/octave-forge-econometrics/Makefile
index 3541edda051e..cee2f4bff46c 100644
--- a/math/octave-forge-econometrics/Makefile
+++ b/math/octave-forge-econometrics/Makefile
@@ -10,20 +10,10 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/optim.tar.gz:math/octave-forge-optim
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-RUN_DEPENDS+= ${TARBALLS_DIR}/optim.tar.gz:math/octave-forge-optim
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+USES= octave
.include <bsd.port.mk>
diff --git a/math/octave-forge-fda/Makefile b/math/octave-forge-fda/Makefile
index 3c271323dd2f..e37038d6bc8f 100644
--- a/math/octave-forge-fda/Makefile
+++ b/math/octave-forge-fda/Makefile
@@ -8,28 +8,17 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+USES= octave
USE_GITLAB= yes
GL_ACCOUNT= kakila
GL_PROJECT= fda
GL_COMMIT= 99f733cfa284fc0fdf911e7da97269197c4dec94
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GL_PROJECT}-${GL_COMMIT}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-do-build:
- @${DO_NADA}
-
NO_ARCH= yes
+NO_BUILD= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${GL_PROJECT}-${GL_COMMIT}
.include <bsd.port.mk>
diff --git a/math/octave-forge-femoctave/Makefile b/math/octave-forge-femoctave/Makefile
index ebadd822b981..03fc944aa066 100644
--- a/math/octave-forge-femoctave/Makefile
+++ b/math/octave-forge-femoctave/Makefile
@@ -8,22 +8,13 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+USES= octave
USE_GITHUB= yes
GH_ACCOUNT= AndreasStahel
GH_PROJECT= FEMoctave
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GH_PROJECT}-${DISTVERSION}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${GH_PROJECT}-${DISTVERSION}
.include <bsd.port.mk>
diff --git a/math/octave-forge-fenv/Makefile b/math/octave-forge-fenv/Makefile
index 246082b64b73..79311397a1d3 100644
--- a/math/octave-forge-fenv/Makefile
+++ b/math/octave-forge-fenv/Makefile
@@ -10,20 +10,11 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv2
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+USES= compiler octave
USE_GCC= yes
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
.include <bsd.port.mk>
diff --git a/math/octave-forge-financial/Makefile b/math/octave-forge-financial/Makefile
index a43522b17aa3..5f569949ae60 100644
--- a/math/octave-forge-financial/Makefile
+++ b/math/octave-forge-financial/Makefile
@@ -10,24 +10,14 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/io.tar.gz:math/octave-forge-io \
+ ${OCTAVE_TARBALLS_DIR}/statistics.tar.gz:math/octave-forge-statistics
-RUN_DEPENDS+= ${TARBALLS_DIR}/io.tar.gz:math/octave-forge-io
-RUN_DEPENDS+= ${TARBALLS_DIR}/statistics.tar.gz:math/octave-forge-statistics
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-fits/Makefile b/math/octave-forge-fits/Makefile
index 863ecbeceae0..9df054dc64cc 100644
--- a/math/octave-forge-fits/Makefile
+++ b/math/octave-forge-fits/Makefile
@@ -10,22 +10,12 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
+LIB_DEPENDS= libcfitsio.so:astro/cfitsio
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-LIB_DEPENDS+= libcfitsio.so:astro/cfitsio
+USES= octave
NO_ARCH= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-fpl/Makefile b/math/octave-forge-fpl/Makefile
index 07a4907d9729..79e14b43e11b 100644
--- a/math/octave-forge-fpl/Makefile
+++ b/math/octave-forge-fpl/Makefile
@@ -10,22 +10,15 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+RUN_DEPENDS= dx:graphics/opendx
-RUN_DEPENDS+= dx:graphics/opendx
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
+NO_BUILD= yes
-post-build:
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
.include <bsd.port.mk>
diff --git a/math/octave-forge-fuzzy-logic-toolkit/Makefile b/math/octave-forge-fuzzy-logic-toolkit/Makefile
index 98b5acb57656..89cae58a3701 100644
--- a/math/octave-forge-fuzzy-logic-toolkit/Makefile
+++ b/math/octave-forge-fuzzy-logic-toolkit/Makefile
@@ -10,23 +10,15 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+USES=octave
-WRKSRC= ${WRKDIR}/${OCTSRC} # Only required so that patch will apply.
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
NO_ARCH= yes
+NO_BUILD= yes
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
.include <bsd.port.mk>
diff --git a/math/octave-forge-ga/Makefile b/math/octave-forge-ga/Makefile
index 179e0a6fab2b..44ff6b520d38 100644
--- a/math/octave-forge-ga/Makefile
+++ b/math/octave-forge-ga/Makefile
@@ -10,21 +10,11 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv2
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-general/Makefile b/math/octave-forge-general/Makefile
index 056221c9eea9..37cc6c92ab6d 100644
--- a/math/octave-forge-general/Makefile
+++ b/math/octave-forge-general/Makefile
@@ -9,17 +9,8 @@ MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
+USES= octave
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-generate_html/Makefile b/math/octave-forge-generate_html/Makefile
index a5ad9b6c1221..f43ef6b8c06b 100644
--- a/math/octave-forge-generate_html/Makefile
+++ b/math/octave-forge-generate_html/Makefile
@@ -9,21 +9,11 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-geographiclib/Makefile b/math/octave-forge-geographiclib/Makefile
index 893d1f8a11a0..0fac9550759a 100644
--- a/math/octave-forge-geographiclib/Makefile
+++ b/math/octave-forge-geographiclib/Makefile
@@ -10,21 +10,11 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-geometry/Makefile b/math/octave-forge-geometry/Makefile
index 3294c70737c3..33b22bd46f25 100644
--- a/math/octave-forge-geometry/Makefile
+++ b/math/octave-forge-geometry/Makefile
@@ -10,22 +10,11 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-USES= python:env
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
+ ${OCTAVE_TARBALLS_DIR}/matgeom.tar.gz:math/octave-forge-matgeom
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
-RUN_DEPENDS+= ${TARBALLS_DIR}/matgeom.tar.gz:math/octave-forge-matgeom
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+USES= octave python:env
.include <bsd.port.mk>
diff --git a/math/octave-forge-gnuplot/Makefile b/math/octave-forge-gnuplot/Makefile
index 7337a5a92d10..5d331d3ddf7f 100644
--- a/math/octave-forge-gnuplot/Makefile
+++ b/math/octave-forge-gnuplot/Makefile
@@ -10,21 +10,13 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+USES= octave
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-gsl/Makefile b/math/octave-forge-gsl/Makefile
index 1a0e40652f68..bca84220b5ff 100644
--- a/math/octave-forge-gsl/Makefile
+++ b/math/octave-forge-gsl/Makefile
@@ -10,22 +10,12 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv2
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
LIB_DEPENDS= libgsl.so:math/gsl
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
+USES= octave
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-ident/Makefile b/math/octave-forge-ident/Makefile
index 4de3d6260e40..5d997fb86777 100644
--- a/math/octave-forge-ident/Makefile
+++ b/math/octave-forge-ident/Makefile
@@ -12,7 +12,10 @@ WWW= https://packages.octave.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= octave
+
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
+
.include <bsd.port.mk>
diff --git a/math/octave-forge-image/Makefile b/math/octave-forge-image/Makefile
index 7a0bd7008c78..464e533b8f30 100644
--- a/math/octave-forge-image/Makefile
+++ b/math/octave-forge-image/Makefile
@@ -11,24 +11,12 @@ WWW= https://packages.octave.org/
LICENSE= Many
LICENSE_NAME= Many different licenses
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-USES= compiler:c++14-lang
-
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
+USES= compiler:c++14-lang octave
GNU_CONFIGURE= yes
CXXFLAGS+= -fPIC
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-informationtheory/Makefile b/math/octave-forge-informationtheory/Makefile
index 6598b4afd237..4b2373be1411 100644
--- a/math/octave-forge-informationtheory/Makefile
+++ b/math/octave-forge-informationtheory/Makefile
@@ -12,7 +12,10 @@ WWW= https://packages.octave.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= octave
+
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
+
.include <bsd.port.mk>
diff --git a/math/octave-forge-integration/Makefile b/math/octave-forge-integration/Makefile
index 64bd60813755..90c3d25dbcd2 100644
--- a/math/octave-forge-integration/Makefile
+++ b/math/octave-forge-integration/Makefile
@@ -12,7 +12,10 @@ WWW= https://packages.octave.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= octave
+
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
+
.include <bsd.port.mk>
diff --git a/math/octave-forge-internal-fluid-flow/Makefile b/math/octave-forge-internal-fluid-flow/Makefile
index 96101798bd2b..f8b4f40de735 100644
--- a/math/octave-forge-internal-fluid-flow/Makefile
+++ b/math/octave-forge-internal-fluid-flow/Makefile
@@ -8,25 +8,16 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+USES= octave
USE_GITHUB= yes
GH_ACCOUNT= aumpierre-unb
GH_PROJECT= internal-Fluid-Flow-for-GNU-Octave
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= Internal-Fluid-Flow-for-GNU-Octave-${DISTVERSION}
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+OCTAVE_SRC= Internal-Fluid-Flow-for-GNU-Octave-${DISTVERSION}
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-interval/Makefile b/math/octave-forge-interval/Makefile
index f2a34ac89b91..524f0443e94d 100644
--- a/math/octave-forge-interval/Makefile
+++ b/math/octave-forge-interval/Makefile
@@ -10,20 +10,10 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
LIB_DEPENDS= libmpfr.so:math/mpfr
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+USES= octave
.include <bsd.port.mk>
diff --git a/math/octave-forge-io/Makefile b/math/octave-forge-io/Makefile
index 6838da7ae4ef..13ed50d6f1bc 100644
--- a/math/octave-forge-io/Makefile
+++ b/math/octave-forge-io/Makefile
@@ -11,18 +11,8 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+USES= gmake octave
.include <bsd.port.mk>
diff --git a/math/octave-forge-irsa/Makefile b/math/octave-forge-irsa/Makefile
index 6527160c4dcc..ab3b8f2320a7 100644
--- a/math/octave-forge-irsa/Makefile
+++ b/math/octave-forge-irsa/Makefile
@@ -12,7 +12,10 @@ WWW= https://packages.octave.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= octave
+
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
+
.include <bsd.port.mk>
diff --git a/math/octave-forge-level-set/Makefile b/math/octave-forge-level-set/Makefile
index a0c5dd0239c1..fee80633c56a 100644
--- a/math/octave-forge-level-set/Makefile
+++ b/math/octave-forge-level-set/Makefile
@@ -11,20 +11,12 @@ WWW= https://packages.octave.org/
LICENSE= GPLv3
-ALL_TARGET= oct
-USES= compiler:c++0x
-GNU_CONFIGURE= yes
-
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+USES= compiler:c++0x octave
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
+GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+ALL_TARGET= oct
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
.include <bsd.port.mk>
diff --git a/math/octave-forge-linear-algebra/Makefile b/math/octave-forge-linear-algebra/Makefile
index 465b48f47e32..c08c62ec8cdb 100644
--- a/math/octave-forge-linear-algebra/Makefile
+++ b/math/octave-forge-linear-algebra/Makefile
@@ -10,21 +10,9 @@ MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-lssa/Makefile b/math/octave-forge-lssa/Makefile
index e35da6213003..52c8bcd910d4 100644
--- a/math/octave-forge-lssa/Makefile
+++ b/math/octave-forge-lssa/Makefile
@@ -10,18 +10,8 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+USES= octave
.include <bsd.port.mk>
diff --git a/math/octave-forge-ltfat/Makefile b/math/octave-forge-ltfat/Makefile
index 1f85feaefcb0..7dc4d3ffd837 100644
--- a/math/octave-forge-ltfat/Makefile
+++ b/math/octave-forge-ltfat/Makefile
@@ -11,7 +11,7 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
BROKEN_FreeBSD_12_powerpc64= fails to compile: modules/libltfat/src/dgt_multi.c:47:31: 'cexpl' undeclared (first use in this function); did you mean 'cexpf'?
@@ -19,21 +19,17 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \
libportaudio.so:audio/portaudio \
libopenblas.so:math/openblas
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+USES= octave
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
post-build:
${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
${RM} ${WRKSRC}/../inst/DESCRIPTION
${RM} ${WRKSRC}/../inst/ltfat/DESCRIPTION
${RM} ${WRKSRC}/../inst/ltfat/inst/DESCRIPTION
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+ cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTAVE_SRC}
.include <bsd.port.mk>
diff --git a/math/octave-forge-mapping/Makefile b/math/octave-forge-mapping/Makefile
index 19572a44f0a2..ba03ce4919f5 100644
--- a/math/octave-forge-mapping/Makefile
+++ b/math/octave-forge-mapping/Makefile
@@ -10,23 +10,15 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/io.tar.gz:math/octave-forge-io \
+ ${OCTAVE_TARBALLS_DIR}/geometry.tar.gz:math/octave-forge-geometry
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-GNU_CONFIGURE= yes
-ALL_TARGET= # nada
-
-RUN_DEPENDS+= ${TARBALLS_DIR}/io.tar.gz:math/octave-forge-io
-RUN_DEPENDS+= ${TARBALLS_DIR}/geometry.tar.gz:math/octave-forge-geometry
+USES= octave
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+GNU_CONFIGURE= yes
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+ALL_TARGET= # nada
.include <bsd.port.mk>
diff --git a/math/octave-forge-matgeom/Makefile b/math/octave-forge-matgeom/Makefile
index 113b8aeadf3d..6b62d23c89eb 100644
--- a/math/octave-forge-matgeom/Makefile
+++ b/math/octave-forge-matgeom/Makefile
@@ -10,22 +10,11 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= BSD2CLAUSE
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
-
-post-build:
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-mccabe-thiele/Makefile b/math/octave-forge-mccabe-thiele/Makefile
index 3c4cdbe5e962..ec7688480a59 100644
--- a/math/octave-forge-mccabe-thiele/Makefile
+++ b/math/octave-forge-mccabe-thiele/Makefile
@@ -8,27 +8,18 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/sockets.tar.gz:math/octave-forge-sockets
+
+USES= octave
USE_GITHUB= yes
GH_ACCOUNT= aumpierre-unb
GH_PROJECT= McCabe-Thiele-for-GNU-Octave
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GH_PROJECT}-${DISTVERSION}
-
-RUN_DEPENDS+= ${TARBALLS_DIR}/sockets.tar.gz:math/octave-forge-sockets
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+OCTAVE_SRC= ${GH_PROJECT}-${DISTVERSION}
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-mechanics/Makefile b/math/octave-forge-mechanics/Makefile
index 5b8fd834b04b..f3564b037ca6 100644
--- a/math/octave-forge-mechanics/Makefile
+++ b/math/octave-forge-mechanics/Makefile
@@ -10,22 +10,16 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-RUN_DEPENDS+= ${TARBALLS_DIR}/general.tar.gz:math/octave-forge-general
-RUN_DEPENDS+= ${TARBALLS_DIR}/geometry.tar.gz:math/octave-forge-geometry
-RUN_DEPENDS+= ${TARBALLS_DIR}/linear-algebra.tar.gz:math/octave-forge-linear-algebra
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/general.tar.gz:math/octave-forge-general \
+ ${OCTAVE_TARBALLS_DIR}/geometry.tar.gz:math/octave-forge-geometry \
+ ${OCTAVE_TARBALLS_DIR}/linear-algebra.tar.gz:math/octave-forge-linear-algebra
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+USES= octave
-WRKSRC= ${WRKDIR}/${OCTSRC}/inst/molecularDynamics/src
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}/inst/molecularDynamics/src
.include <bsd.port.mk>
diff --git a/math/octave-forge-miscellaneous/Makefile b/math/octave-forge-miscellaneous/Makefile
index 86da4bc7157f..9bebe7518671 100644
--- a/math/octave-forge-miscellaneous/Makefile
+++ b/math/octave-forge-miscellaneous/Makefile
@@ -10,22 +10,12 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-GNU_CONFIGURE= yes
-
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
+USES= octave
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+GNU_CONFIGURE= yes
MAKE_ENV+= MKOCTFILE=mkoctfile
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-missing-functions/Makefile b/math/octave-forge-missing-functions/Makefile
index 052518c5e392..d264d57998c6 100644
--- a/math/octave-forge-missing-functions/Makefile
+++ b/math/octave-forge-missing-functions/Makefile
@@ -9,7 +9,10 @@ MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
+USES= octave
+
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
+
.include <bsd.port.mk>
diff --git a/math/octave-forge-mpi/Makefile b/math/octave-forge-mpi/Makefile
index c7ab74bb46ad..8c97ceff6d73 100644
--- a/math/octave-forge-mpi/Makefile
+++ b/math/octave-forge-mpi/Makefile
@@ -8,27 +8,18 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+LIB_DEPENDS+= libmpi.so:net/mpich
+
+USES= octave
USE_GITHUB= yes
GH_ACCOUNT= carlodefalco
GH_PROJECT= octave-mpi
-LIB_DEPENDS+= libmpi.so:net/mpich
-
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GH_PROJECT}-${DISTVERSION}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+OCTAVE_SRC= ${GH_PROJECT}-${DISTVERSION}
post-patch:
${REINPLACE_CMD} 's/= NULL/= 0/g' ${WRKSRC}/*.cc ${WRKSRC}/*.h
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-mqtt/Makefile b/math/octave-forge-mqtt/Makefile
index 31938e380178..960aaf4055c3 100644
--- a/math/octave-forge-mqtt/Makefile
+++ b/math/octave-forge-mqtt/Makefile
@@ -10,26 +10,12 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
LIB_DEPENDS+= libpaho-mqtt3a.so:net/libpaho-mqtt3
-USES= autoreconf
-
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
+USES= autoreconf localbase octave
GNU_CONFIGURE= yes
-CFLAGS+= -I${LOCALBASE}/include
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
.include <bsd.port.mk>
diff --git a/math/octave-forge-msh/Makefile b/math/octave-forge-msh/Makefile
index b44ab265b1eb..b9d09527ab48 100644
--- a/math/octave-forge-msh/Makefile
+++ b/math/octave-forge-msh/Makefile
@@ -8,28 +8,19 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv2
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/splines.tar.gz:math/octave-forge-splines \
+ gmsh:cad/gmsh
+
+USES= octave
USE_GITHUB= yes
GH_ACCOUNT= carlodefalco
GH_PROJECT= msh
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GH_PROJECT}-${DISTVERSION}
-
-RUN_DEPENDS+= ${TARBALLS_DIR}/splines.tar.gz:math/octave-forge-splines
-RUN_DEPENDS+= gmsh:cad/gmsh
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+OCTAVE_SRC= ${GH_PROJECT}-${DISTVERSION}
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-multicore/Makefile b/math/octave-forge-multicore/Makefile
index 845871e947a5..29e8b07c5928 100644
--- a/math/octave-forge-multicore/Makefile
+++ b/math/octave-forge-multicore/Makefile
@@ -12,7 +12,10 @@ WWW= https://packages.octave.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= octave
+
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
+
.include <bsd.port.mk>
diff --git a/math/octave-forge-mvn/Makefile b/math/octave-forge-mvn/Makefile
index a267d1153d70..639872935563 100644
--- a/math/octave-forge-mvn/Makefile
+++ b/math/octave-forge-mvn/Makefile
@@ -10,21 +10,13 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+USES= octave
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-nan/Makefile b/math/octave-forge-nan/Makefile
index 0e496aae4b00..7976e9a53121 100644
--- a/math/octave-forge-nan/Makefile
+++ b/math/octave-forge-nan/Makefile
@@ -9,23 +9,14 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-MAKE_JOBS_UNSAFE= yes
-GNU_CONFIGURE= yes
-
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
+USES= gmake octave
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
+GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+MAKE_JOBS_UNSAFE= yes
ALL_TARGET= octave
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-ncarray/Makefile b/math/octave-forge-ncarray/Makefile
index fbcb48d63641..89c9d1036249 100644
--- a/math/octave-forge-ncarray/Makefile
+++ b/math/octave-forge-ncarray/Makefile
@@ -9,26 +9,14 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv2
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/netcdf.tar.gz:math/octave-forge-netcdf \
+ ${OCTAVE_TARBALLS_DIR}/statistics.tar.gz:math/octave-forge-statistics
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-RUN_DEPENDS+= ${TARBALLS_DIR}/netcdf.tar.gz:math/octave-forge-netcdf
-RUN_DEPENDS+= ${TARBALLS_DIR}/statistics.tar.gz:math/octave-forge-statistics
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-netcdf/Makefile b/math/octave-forge-netcdf/Makefile
index 438b2a4e0bda..8f7a2029cb25 100644
--- a/math/octave-forge-netcdf/Makefile
+++ b/math/octave-forge-netcdf/Makefile
@@ -9,22 +9,14 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv2
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
-
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-GNU_CONFIGURE= yes
-NO_ARCH= yes
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
LIB_DEPENDS+= libnetcdf.so:science/netcdf
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+USES= octave
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+GNU_CONFIGURE= yes
+
+NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-nlwing2/Makefile b/math/octave-forge-nlwing2/Makefile
index 50b29b3db8c0..c11d8a8591fc 100644
--- a/math/octave-forge-nlwing2/Makefile
+++ b/math/octave-forge-nlwing2/Makefile
@@ -10,18 +10,10 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+USES= octave
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
.include <bsd.port.mk>
diff --git a/math/octave-forge-nnet/Makefile b/math/octave-forge-nnet/Makefile
index 0547f35de376..bb9cd421d83f 100644
--- a/math/octave-forge-nnet/Makefile
+++ b/math/octave-forge-nnet/Makefile
@@ -10,21 +10,13 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv2
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+USES= octave
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-nurbs/Makefile b/math/octave-forge-nurbs/Makefile
index ff63439320bd..a629fb2593c6 100644
--- a/math/octave-forge-nurbs/Makefile
+++ b/math/octave-forge-nurbs/Makefile
@@ -10,15 +10,9 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+USES= compiler octave
.include <bsd.port.pre.mk>
@@ -27,8 +21,4 @@ WRKSRC= ${WRKDIR}/${OCTSRC}/src
USE_GCC= yes
.endif
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.post.mk>
diff --git a/math/octave-forge-oct2mat/Makefile b/math/octave-forge-oct2mat/Makefile
index fe83016d7349..d2f724917cc3 100644
--- a/math/octave-forge-oct2mat/Makefile
+++ b/math/octave-forge-oct2mat/Makefile
@@ -12,9 +12,12 @@ WWW= https://packages.octave.org/
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/io.tar.gz:math/octave-forge-io
+
+USES= octave
+
GNU_CONFIGURE= yes
-RUN_DEPENDS+= ${TARBALLS_DIR}/io.tar.gz:math/octave-forge-io
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
.include <bsd.port.mk>
diff --git a/math/octave-forge-octclip/Makefile b/math/octave-forge-octclip/Makefile
index 91da9032eec5..50282b3a237b 100644
--- a/math/octave-forge-octclip/Makefile
+++ b/math/octave-forge-octclip/Makefile
@@ -9,18 +9,8 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+USES= octave
.include <bsd.port.mk>
diff --git a/math/octave-forge-octproj/Makefile b/math/octave-forge-octproj/Makefile
index 3f9f8dd303db..606975c53ff7 100644
--- a/math/octave-forge-octproj/Makefile
+++ b/math/octave-forge-octproj/Makefile
@@ -10,23 +10,13 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
LIB_DEPENDS+= libproj.so:graphics/proj
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+USES= octave
post-patch:
${REINPLACE_CMD} -e s/CC/MKOCTFILE/ -e s/-Wall// -e s/-Wextra// ${WRKSRC}/Makefile
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-odebvp/Makefile b/math/octave-forge-odebvp/Makefile
index 7dbe334179b2..bd9fdc378ea4 100644
--- a/math/octave-forge-odebvp/Makefile
+++ b/math/octave-forge-odebvp/Makefile
@@ -12,7 +12,10 @@ WWW= https://packages.octave.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= octave
+
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
+
.include <bsd.port.mk>
diff --git a/math/octave-forge-onsas/Makefile b/math/octave-forge-onsas/Makefile
index 0655c4652ca9..cbba6bbcfa7e 100644
--- a/math/octave-forge-onsas/Makefile
+++ b/math/octave-forge-onsas/Makefile
@@ -9,25 +9,16 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+USES= octave
USE_GITHUB= yes
GH_ACCOUNT= ONSAS
GH_PROJECT= ONSAS.m
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GH_PROJECT}-${DISTVERSION}
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+OCTAVE_SRC= ${GH_PROJECT}-${DISTVERSION}
NO_ARCH = yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-optics/Makefile b/math/octave-forge-optics/Makefile
index 0d6d71d88d07..4f7538976d65 100644
--- a/math/octave-forge-optics/Makefile
+++ b/math/octave-forge-optics/Makefile
@@ -11,21 +11,9 @@ WWW= https://packages.octave.org/
LICENSE= GPLv3
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-optim/Makefile b/math/octave-forge-optim/Makefile
index b9357d678973..21a90e91fbc3 100644
--- a/math/octave-forge-optim/Makefile
+++ b/math/octave-forge-optim/Makefile
@@ -10,27 +10,16 @@ WWW= https://packages.octave.org/
LICENSE= Parts
LICENSE_NAME= See individual files for licenses
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/statistics.tar.gz:math/octave-forge-statistics \
+ ${OCTAVE_TARBALLS_DIR}/struct.tar.gz:math/octave-forge-struct
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
+USES= octave shebangfix
-RUN_DEPENDS+= ${TARBALLS_DIR}/statistics.tar.gz:math/octave-forge-statistics
-RUN_DEPENDS+= ${TARBALLS_DIR}/struct.tar.gz:math/octave-forge-struct
-
-GNU_CONFIGURE= yes
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-USES+= shebangfix
SHEBANG_FILES= *.pl
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-optiminterp/Makefile b/math/octave-forge-optiminterp/Makefile
index 8beb3c8f4e78..718f159b5888 100644
--- a/math/octave-forge-optiminterp/Makefile
+++ b/math/octave-forge-optiminterp/Makefile
@@ -10,21 +10,16 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-MAKE_JOBS_UNSAFE= yes
-
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
+USES= octave
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
MAKE_ENV+= MKOCTFILE_FORTRAN_90=yes MKOCTFILE=mkoctfile
+MAKE_JOBS_UNSAFE= yes
+
.include <bsd.port.pre.mk>
.if ${GCC_DEFAULT} >= 10
@@ -33,8 +28,4 @@ MAKE_ENV+= MKOCTFILE_FORTRAN_90=yes MKOCTFILE=mkoctfile
FFLAGS+= -fallow-argument-mismatch
.endif
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.post.mk>
diff --git a/math/octave-forge-outliers/Makefile b/math/octave-forge-outliers/Makefile
index a42a54bc776f..ad6f0ce61ea2 100644
--- a/math/octave-forge-outliers/Makefile
+++ b/math/octave-forge-outliers/Makefile
@@ -12,7 +12,10 @@ WWW= https://packages.octave.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= octave
+
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
+
.include <bsd.port.mk>
diff --git a/math/octave-forge-parallel/Makefile b/math/octave-forge-parallel/Makefile
index fe319fa7c646..29241f72ba56 100644
--- a/math/octave-forge-parallel/Makefile
+++ b/math/octave-forge-parallel/Makefile
@@ -10,24 +10,15 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/struct.tar.gz:math/octave-forge-struct
-RUN_DEPENDS+= ${TARBALLS_DIR}/struct.tar.gz:math/octave-forge-struct
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-GNU_CONFIGURE= yes
-USES+= compiler:gcc-c++11-lib perl5 shebangfix
+USES= compiler:gcc-c++11-lib octave perl5 shebangfix
USE_PERL5= build
-SHEBANG_FILES= *.pl
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+SHEBANG_FILES= *.pl
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-pde1dm/Makefile b/math/octave-forge-pde1dm/Makefile
index 07439c8d76b1..d6b48560a7ca 100644
--- a/math/octave-forge-pde1dm/Makefile
+++ b/math/octave-forge-pde1dm/Makefile
@@ -9,25 +9,16 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+USES= octave
USE_GITHUB= yes
GH_ACCOUNT= wgreene310
GH_PROJECT= pde1dm
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GH_PROJECT}-${DISTVERSION}
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+OCTAVE_SRC= ${GH_PROJECT}-${DISTVERSION}
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-plot/Makefile b/math/octave-forge-plot/Makefile
index ccaf9db1a578..dd50ef305813 100644
--- a/math/octave-forge-plot/Makefile
+++ b/math/octave-forge-plot/Makefile
@@ -10,21 +10,13 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv2
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+USES= octave
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-ponchon-savarit/Makefile b/math/octave-forge-ponchon-savarit/Makefile
index 8ba9799cb2b5..ad6bf20ff898 100644
--- a/math/octave-forge-ponchon-savarit/Makefile
+++ b/math/octave-forge-ponchon-savarit/Makefile
@@ -8,27 +8,16 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+USES= octave
USE_GITHUB= yes
GH_ACCOUNT= aumpierre-unb
GH_PROJECT= Ponchon-Savarit-for-GNU-Octave
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GH_PROJECT}-${DISTVERSION}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-do-build:
- @${DO_NADA}
+OCTAVE_SRC= ${GH_PROJECT}-${DISTVERSION}
NO_ARCH= yes
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-psychrometrics/Makefile b/math/octave-forge-psychrometrics/Makefile
index 39d7a30d1f30..1be1175cf737 100644
--- a/math/octave-forge-psychrometrics/Makefile
+++ b/math/octave-forge-psychrometrics/Makefile
@@ -8,25 +8,16 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+USES= octave
USE_GITHUB= yes
GH_ACCOUNT= aumpierre-unb
GH_PROJECT= Psychrometrics-for-GNU-Octave
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GH_PROJECT}-${DISTVERSION}
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+OCTAVE_SRC= ${GH_PROJECT}-${DISTVERSION}
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-pythonic/Makefile b/math/octave-forge-pythonic/Makefile
index fb71dc496a24..be5f71fbcfcd 100644
--- a/math/octave-forge-pythonic/Makefile
+++ b/math/octave-forge-pythonic/Makefile
@@ -7,28 +7,19 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
BUILD_DEPENDS= gsed:textproc/gsed
-USES= python
-MAKE_ENV+= PYTHON=${PYTHON_CMD} SED=gsed
+USES= octave python
USE_GITLAB= yes
GL_ACCOUNT= mtmiller
GL_PROJECT= octave-pythonic
GL_COMMIT= 3dbe9a06c1dec1a138f398b951e18044a00e063d
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GL_PROJECT}-${GL_COMMIT}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
+OCTAVE_SRC= ${GL_PROJECT}-${GL_COMMIT}
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+MAKE_ENV+= PYTHON=${PYTHON_CMD} SED=gsed
.include <bsd.port.mk>
diff --git a/math/octave-forge-quaternion/Makefile b/math/octave-forge-quaternion/Makefile
index 450616cb0ccd..3d19fbdf2295 100644
--- a/math/octave-forge-quaternion/Makefile
+++ b/math/octave-forge-quaternion/Makefile
@@ -10,18 +10,10 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+USES= octave
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
.include <bsd.port.mk>
diff --git a/math/octave-forge-queueing/Makefile b/math/octave-forge-queueing/Makefile
index c46a965b4eb1..6d6a8c1132b9 100644
--- a/math/octave-forge-queueing/Makefile
+++ b/math/octave-forge-queueing/Makefile
@@ -10,21 +10,13 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+USES= octave
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-secs1d/Makefile b/math/octave-forge-secs1d/Makefile
index eefb5cdc877d..536361ea2211 100644
--- a/math/octave-forge-secs1d/Makefile
+++ b/math/octave-forge-secs1d/Makefile
@@ -10,23 +10,15 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv2
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/bim.tar.gz:math/octave-forge-bim
-RUN_DEPENDS+= ${TARBALLS_DIR}/bim.tar.gz:math/octave-forge-bim
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
+NO_BUILD= yes
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
.include <bsd.port.mk>
diff --git a/math/octave-forge-secs2d/Makefile b/math/octave-forge-secs2d/Makefile
index 25ccf3e3e03d..0d812c2bee9c 100644
--- a/math/octave-forge-secs2d/Makefile
+++ b/math/octave-forge-secs2d/Makefile
@@ -12,10 +12,13 @@ WWW= https://packages.octave.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= octave
+
GNU_CONFIGURE= yes
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
+
post-patch:
${REINPLACE_CMD} -E 's/Octave_map/octave_map/g' ${WRKSRC}/src/*.cc
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
.include <bsd.port.mk>
diff --git a/math/octave-forge-secs3d/Makefile b/math/octave-forge-secs3d/Makefile
index d5fd3374add1..72a314187120 100644
--- a/math/octave-forge-secs3d/Makefile
+++ b/math/octave-forge-secs3d/Makefile
@@ -10,24 +10,14 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv2
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/bim.tar.gz:math/octave-forge-bim \
+ ${OCTAVE_TARBALLS_DIR}/fpl.tar.gz:math/octave-forge-fpl
-RUN_DEPENDS+= ${TARBALLS_DIR}/fpl.tar.gz:math/octave-forge-fpl
-RUN_DEPENDS+= ${TARBALLS_DIR}/bim.tar.gz:math/octave-forge-bim
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-signal/Makefile b/math/octave-forge-signal/Makefile
index efbb01455c57..cdf9726317f2 100644
--- a/math/octave-forge-signal/Makefile
+++ b/math/octave-forge-signal/Makefile
@@ -9,23 +9,13 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
+RUN_DEPENDS+= ${OCTAVE_TARBALLS_DIR}/control.tar.gz:math/octave-forge-control
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-RUN_DEPENDS+= ${TARBALLS_DIR}/control.tar.gz:math/octave-forge-control
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+USES= octave
post-patch:
${REINPLACE_CMD} s/-Wall// ${WRKSRC}/Makefile
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-simp/Makefile b/math/octave-forge-simp/Makefile
index 03f72469849e..5fcda7c7b20e 100644
--- a/math/octave-forge-simp/Makefile
+++ b/math/octave-forge-simp/Makefile
@@ -12,7 +12,10 @@ WWW= https://packages.octave.org/
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= octave
+
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
+
.include <bsd.port.mk>
diff --git a/math/octave-forge-sockets/Makefile b/math/octave-forge-sockets/Makefile
index 0ab37956f195..d8c662d652e6 100644
--- a/math/octave-forge-sockets/Makefile
+++ b/math/octave-forge-sockets/Makefile
@@ -9,23 +9,13 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
-
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
BUILD_DEPENDS+= gsed:textproc/gsed
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+USES= gmake octave
post-patch:
${REINPLACE_CMD} 's/sed/gsed/g' ${WRKSRC}/Makefile
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-sole/Makefile b/math/octave-forge-sole/Makefile
index cef579cf3108..7ff5393b555c 100644
--- a/math/octave-forge-sole/Makefile
+++ b/math/octave-forge-sole/Makefile
@@ -10,23 +10,15 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/bim.tar.gz:math/octave-forge-bim
-RUN_DEPENDS+= ${TARBALLS_DIR}/bim.tar.gz:math/octave-forge-bim
+USES= octave
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-sparsersb/Makefile b/math/octave-forge-sparsersb/Makefile
index 2a35b0402955..e3499b0af760 100644
--- a/math/octave-forge-sparsersb/Makefile
+++ b/math/octave-forge-sparsersb/Makefile
@@ -10,20 +10,10 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
LIB_DEPENDS= librsb.so:math/librsb
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+USES= octave
.include <bsd.port.mk>
diff --git a/math/octave-forge-specfun/Makefile b/math/octave-forge-specfun/Makefile
index c3afcc154dc6..9a5bb6e280b7 100644
--- a/math/octave-forge-specfun/Makefile
+++ b/math/octave-forge-specfun/Makefile
@@ -10,18 +10,10 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+USES= octave
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
.include <bsd.port.mk>
diff --git a/math/octave-forge-special-matrix/Makefile b/math/octave-forge-special-matrix/Makefile
index f2b65742ccc2..9900a126d591 100644
--- a/math/octave-forge-special-matrix/Makefile
+++ b/math/octave-forge-special-matrix/Makefile
@@ -9,7 +9,10 @@ MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
+USES= octave
+
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
+
.include <bsd.port.mk>
diff --git a/math/octave-forge-splines/Makefile b/math/octave-forge-splines/Makefile
index f3da07eadf6d..a83bab7acf89 100644
--- a/math/octave-forge-splines/Makefile
+++ b/math/octave-forge-splines/Makefile
@@ -10,23 +10,11 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+USES= octave
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-sqlite/Makefile b/math/octave-forge-sqlite/Makefile
index 7d1d6dddd423..bfbd6182748a 100644
--- a/math/octave-forge-sqlite/Makefile
+++ b/math/octave-forge-sqlite/Makefile
@@ -8,28 +8,15 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
-
-USES= autoreconf pkgconfig
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+USES= autoreconf octave pkgconfig sqlite
USE_GITHUB= yes
GH_ACCOUNT= gnu-octave
GH_PROJECT= octave-sqlite
-LIB_DEPENDS+= libsqlite3.so:databases/sqlite3
-
GNU_CONFIGURE= yes
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GH_PROJECT}-${DISTVERSION}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${GH_PROJECT}-${DISTVERSION}
.include <bsd.port.mk>
diff --git a/math/octave-forge-statistics-bootstrap/Makefile b/math/octave-forge-statistics-bootstrap/Makefile
index 161741149f3f..8a8c1a2ed9eb 100644
--- a/math/octave-forge-statistics-bootstrap/Makefile
+++ b/math/octave-forge-statistics-bootstrap/Makefile
@@ -9,25 +9,17 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/statistics.tar.gz:math/octave-forge-statistics
+
+USES= octave
USE_GITHUB= yes
GH_ACCOUNT= gnu-octave
GH_PROJECT= statistics-bootstrap
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GH_PROJECT}-${DISTVERSION}
+OCTAVE_SRC= ${GH_PROJECT}-${DISTVERSION}
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
ALL_TARGET= make
-RUN_DEPENDS+= ${TARBALLS_DIR}/statistics.tar.gz:math/octave-forge-statistics
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-statistics/Makefile b/math/octave-forge-statistics/Makefile
index d6c732e64e41..9a6f7f6ab5f1 100644
--- a/math/octave-forge-statistics/Makefile
+++ b/math/octave-forge-statistics/Makefile
@@ -8,22 +8,13 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+USES= octave
USE_GITHUB= yes
GH_ACCOUNT= gnu-octave
GH_PROJECT= statistics
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GH_PROJECT}-release-${DISTVERSION}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${GH_PROJECT}-release-${DISTVERSION}
.include <bsd.port.mk>
diff --git a/math/octave-forge-stk/Makefile b/math/octave-forge-stk/Makefile
index 6255655e9575..140da65b56a2 100644
--- a/math/octave-forge-stk/Makefile
+++ b/math/octave-forge-stk/Makefile
@@ -10,18 +10,10 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${OCTAVE_PKGNAME}
+USES= octave
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+OCTAVE_SRC= ${OCTAVE_PKGNAME}
.include <bsd.port.mk>
diff --git a/math/octave-forge-strings/Makefile b/math/octave-forge-strings/Makefile
index 16f9068cd8a2..6723dea052f1 100644
--- a/math/octave-forge-strings/Makefile
+++ b/math/octave-forge-strings/Makefile
@@ -13,19 +13,8 @@ LICENSE_COMB= multi
LIB_DEPENDS= libpcre2-8.so:devel/pcre2
-USES= pkgconfig
+USES= octave pkgconfig
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-struct/Makefile b/math/octave-forge-struct/Makefile
index fbbf035fac31..4cafa8b9b058 100644
--- a/math/octave-forge-struct/Makefile
+++ b/math/octave-forge-struct/Makefile
@@ -9,20 +9,10 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
+USES= gmake octave
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-symband/Makefile b/math/octave-forge-symband/Makefile
index bea4e9643d46..2f5658460dbe 100644
--- a/math/octave-forge-symband/Makefile
+++ b/math/octave-forge-symband/Makefile
@@ -12,7 +12,10 @@ WWW= https://packages.octave.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= octave
+
GNU_CONFIGURE= yes
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
+
.include <bsd.port.mk>
diff --git a/math/octave-forge-symbolic/Makefile b/math/octave-forge-symbolic/Makefile
index bb55f778998c..bd46f7b29207 100644
--- a/math/octave-forge-symbolic/Makefile
+++ b/math/octave-forge-symbolic/Makefile
@@ -9,28 +9,14 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
-
-USES= python
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
BUILD_DEPENDS+= isympy:math/py-sympy@${PY_FLAVOR}
RUN_DEPENDS+= isympy:math/py-sympy@${PY_FLAVOR}
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- ${DO_NADA}
+USES= octave python
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-tcl-octave/Makefile b/math/octave-forge-tcl-octave/Makefile
index 5ee318c79405..49bfe5df7fc4 100644
--- a/math/octave-forge-tcl-octave/Makefile
+++ b/math/octave-forge-tcl-octave/Makefile
@@ -9,9 +9,10 @@ MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
+USES= octave tcl:wrapper
+
GNU_CONFIGURE= yes
-USES+= tcl:wrapper
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
.include <bsd.port.mk>
diff --git a/math/octave-forge-tsa/Makefile b/math/octave-forge-tsa/Makefile
index c8f5245376d3..51c0936b2ebe 100644
--- a/math/octave-forge-tsa/Makefile
+++ b/math/octave-forge-tsa/Makefile
@@ -10,22 +10,12 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
+RUN_DEPENDS+= ${OCTAVE_TARBALLS_DIR}/nan.tar.gz:math/octave-forge-nan
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
-
-RUN_DEPENDS+= ${TARBALLS_DIR}/nan.tar.gz:math/octave-forge-nan
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+USES= octave
ALL_TARGET= octave
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
-
.include <bsd.port.mk>
diff --git a/math/octave-forge-video/Makefile b/math/octave-forge-video/Makefile
index 63e5010f3993..6ec1f82cd3e8 100644
--- a/math/octave-forge-video/Makefile
+++ b/math/octave-forge-video/Makefile
@@ -10,26 +10,13 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= BSD2CLAUSE
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
-USES= pkgconfig
-GNU_CONFIGURE= yes
-CONFIGURE_ENV+= HOME=${WRKSRC}
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
+LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
-LIB_DEPENDS+= libavcodec.so:multimedia/ffmpeg
+USES= octave pkgconfig
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+GNU_CONFIGURE= yes
+CONFIGURE_ENV+= HOME=${WRKSRC}
.include <bsd.port.mk>
diff --git a/math/octave-forge-websockets/Makefile b/math/octave-forge-websockets/Makefile
index 9817876514a0..e110add4ac46 100644
--- a/math/octave-forge-websockets/Makefile
+++ b/math/octave-forge-websockets/Makefile
@@ -9,27 +9,18 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
+RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/sockets.tar.gz:math/octave-forge-sockets
+
+USES= octave
USE_GITHUB= yes
GH_ACCOUNT= gnu-octave
GH_PROJECT= octave-websockets
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${GH_PROJECT}-${DISTVERSION}
-
-RUN_DEPENDS+= ${TARBALLS_DIR}/sockets.tar.gz:math/octave-forge-sockets
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-do-build:
- @${DO_NADA}
+OCTAVE_SRC= ${GH_PROJECT}-${DISTVERSION}
NO_ARCH= yes
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
+NO_BUILD= yes
.include <bsd.port.mk>
diff --git a/math/octave-forge-zenity/Makefile b/math/octave-forge-zenity/Makefile
index 71f4dc481535..ccff9edf4ca8 100644
--- a/math/octave-forge-zenity/Makefile
+++ b/math/octave-forge-zenity/Makefile
@@ -12,9 +12,12 @@ WWW= https://packages.octave.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+RUN_DEPENDS+= zenity:x11/zenity
+
+USES= octave
+
GNU_CONFIGURE= yes
-RUN_DEPENDS+= zenity:x11/zenity
+WRKSRC= ${WRKDIR}/${OCTAVE_SRC}
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
.include <bsd.port.mk>
diff --git a/math/octave-forge-zeromq/Makefile b/math/octave-forge-zeromq/Makefile
index 4f9631be8ec3..e4f4e7f8b3d3 100644
--- a/math/octave-forge-zeromq/Makefile
+++ b/math/octave-forge-zeromq/Makefile
@@ -9,25 +9,12 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= https://packages.octave.org/
LICENSE= GPLv3
-LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
+LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING
LIB_DEPENDS+= libzmq.so:net/libzmq4
-USES= pkgconfig
-
-# OCTSRC is the name of the directory of the package.
-# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
-OCTSRC= ${DISTNAME}
-
-WRKSRC= ${WRKDIR}/${OCTSRC}/src
+USES= localbase octave pkgconfig
GNU_CONFIGURE= yes
-CFLAGS+= -I${LOCALBASE}/include
-
-.include "${.CURDIR}/../../Mk/bsd.octave.mk"
-
-post-build:
- ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
- cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC}
.include <bsd.port.mk>
diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index 7ba97975c289..a46c663077ce 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -35,18 +35,18 @@ OPTIONS_DEFINE= AUDIO ACTUARIAL AUTOMATIC_DIFFERENTIATION \
OPTIONS_DEFAULT= ${OPTIONS_DEFINE}
-TARBALLS_DIR= ${LOCALBASE}/share/octave/tarballs
+OCTAVE_TARBALLS_DIR= ${LOCALBASE}/share/octave/tarballs
.for OPT in ${OPTIONS_DEFINE}
. if ${OPTIONS_DEFINE:MGENERATE_HTML} == ${OPT}
${OPT}_DESC= Install package: ${OPT:tl}
-${OPT}_RUN_DEPENDS= ${TARBALLS_DIR}/${OPT:tl}.tar.gz:math/octave-forge-${OPT:tl}
+${OPT}_RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/${OPT:tl}.tar.gz:math/octave-forge-${OPT:tl}
. else
${OPT}_DESC= Install package: ${OPT:tl:S/_/-/g}
. if ${OPTIONS_DEFINE:MBENCHMARK} == ${OPT}
-${OPT}_RUN_DEPENDS= ${TARBALLS_DIR}/${OPT:tl:S/_/-/g}.tar.gz:benchmarks/octave-forge-${OPT:tl:S/_/-/g}
+${OPT}_RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/${OPT:tl:S/_/-/g}.tar.gz:benchmarks/octave-forge-${OPT:tl:S/_/-/g}
. else
-${OPT}_RUN_DEPENDS= ${TARBALLS_DIR}/${OPT:tl:S/_/-/g}.tar.gz:math/octave-forge-${OPT:tl:S/_/-/g}
+${OPT}_RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/${OPT:tl:S/_/-/g}.tar.gz:math/octave-forge-${OPT:tl:S/_/-/g}
. endif
. endif
.endfor
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 7b5ea199e7fa..12e3c90645a5 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -10,81 +10,77 @@ WWW= https://www.octave.org/
LICENSE= GPLv3
-BUILD_DEPENDS= gnuplot:math/gnuplot \
- ${LOCALBASE}/bin/gperf:devel/gperf \
- gsed:textproc/gsed \
- ${LOCALBASE}/bin/makeinfo:print/texinfo
-RUN_DEPENDS= gnuplot:math/gnuplot \
- gsed:textproc/gsed \
- ${LOCALBASE}/bin/makeinfo:print/texinfo
-LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick \
+BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:devel/gperf \
+ ${LOCALBASE}/bin/makeinfo:print/texinfo \
+ gnuplot:math/gnuplot \
+ gsed:textproc/gsed
+RUN_DEPENDS= ${LOCALBASE}/bin/makeinfo:print/texinfo \
+ gnuplot:math/gnuplot \
+ gsed:textproc/gsed
+LIB_DEPENDS= libamd.so:math/suitesparse-amd \
libarpack.so:math/arpack-ng \
+ libcamd.so:math/suitesparse-camd \
+ libccolamd.so:math/suitesparse-ccolamd \
+ libcholmod.so:math/suitesparse-cholmod \
+ libcolamd.so:math/suitesparse-colamd \
libcurl.so:ftp/curl \
+ libcxsparse.so:math/suitesparse-cxsparse \
+ libdrm.so:graphics/libdrm \
libfftw3.so:math/fftw3 \
libfftw3f.so:math/fftw3-float \
libfltk.so:x11-toolkits/fltk \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
libftgl.so:graphics/ftgl \
+ libgl2ps.so:print/gl2ps \
+ libglpk.so:math/glpk \
+ libGraphicsMagick.so:graphics/GraphicsMagick \
libhdf5.so:science/hdf5 \
+ libklu.so:math/suitesparse-klu \
+ libOSMesa.so:graphics/libosmesa \
libpcre.so:devel/pcre \
+ libportaudio.so:audio/portaudio \
libqhull_r.so:math/qhull \
libqrupdate.so:math/qrupdate \
- libamd.so:math/suitesparse-amd \
- libcamd.so:math/suitesparse-camd \
- libccolamd.so:math/suitesparse-ccolamd \
- libcholmod.so:math/suitesparse-cholmod \
- libcolamd.so:math/suitesparse-colamd \
- libsuitesparseconfig.so:math/suitesparse-config \
- libcxsparse.so:math/suitesparse-cxsparse \
- libklu.so:math/suitesparse-klu \
libspqr.so:math/suitesparse-spqr \
- libumfpack.so:math/suitesparse-umfpack \
- libglpk.so:math/glpk \
- libgl2ps.so:print/gl2ps \
- libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2 \
- libdrm.so:graphics/libdrm \
- libOSMesa.so:graphics/libosmesa \
+ libsuitesparseconfig.so:math/suitesparse-config \
libsundials_arkode.so:math/sundials \
- libportaudio.so:audio/portaudio
+ libumfpack.so:math/suitesparse-umfpack
-USES= charsetfix fortran gmake libtool perl5 pkgconfig readline \
- tar:xz compiler:c++14-lang \
- desktop-file-utils gl iconv ncurses xorg
+USES= charsetfix compiler:c++14-lang desktop-file-utils fortran gl \
+ gmake iconv libtool localbase:ldflags ncurses octave:env perl5 \
+ pkgconfig readline tar:xz xorg
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}/${PORTVERSION}
USE_PERL5= build
GNU_CONFIGURE= yes
-USE_QT= core gui help network opengl \
- qmake:build buildtools:build linguist:build \
- printsupport sql widgets \
- xml
-USE_XORG= x11 xext xfixes xft \
- xcursor xinerama xrender
+USE_QT= core gui help network opengl printsupport sql widgets xml \
+ buildtools:build linguist:build qmake:build
+USE_XORG= x11 xcursor xext xfixes xft xinerama xrender
USE_GL= gl glu
-OCTAVE_VERSION= ${PORTVERSION}
GNU_HOST= ${ARCH}-portbld-freebsd${OSREL}
-PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt5
-CONFIGURE_ENV= GPERF="${LOCALBASE}/bin/gperf" \
+PLIST_SUB= GNU_HOST=${GNU_HOST} \
+ OCTAVE_VERSION=${OCTAVE_VERSION}
+LDFLAGS+= -L${LOCALBASE}/lib/qt5
+CONFIGURE_ENV= ac_cv_path_SED=${LOCALBASE}/bin/gsed \
+ ac_cv_type_max_align_t=yes \
+ GPERF="${LOCALBASE}/bin/gperf" \
JAVA_HOME=${JAVA_HOME} \
+ LRELEASE_QTVER=${LRELEASE} \
MAKEINFO=${LOCALBASE}/bin/makeinfo \
MKINFO=${LOCALBASE}/bin/makeinfo \
MOC_QTVER=${MOC} \
- UIC_QTVER=${UIC} \
- RCC_QTVER=${RCC} \
- LRELEASE_QTVER=${LRELEASE} \
QCOLLECTIONGENERATOR_QTVER=${QCOLLECTIONGENERATOR} \
QHELPGENERATOR_QTVER=${QHELPGENERATOR} \
- ac_cv_type_max_align_t=yes \
- ac_cv_path_SED=${LOCALBASE}/bin/gsed
+ RCC_QTVER=${RCC} \
+ UIC_QTVER=${UIC}
-CONFIGURE_ARGS= --host=${GNU_HOST} \
+CONFIGURE_ARGS= --disable-jit \
+ --disable-openmp \
+ --enable-shared \
+ --host=${GNU_HOST} \
--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
--with-lapack="${LAPACKLIB}" \
- --enable-shared \
- --disable-jit \
- --disable-openmp \
--with-osmesa
INFO= octave liboctave
@@ -95,13 +91,13 @@ TEST_TARGET= check
OPTIONS_DEFINE= DOCS JAVA QT5
OPTIONS_RADIO= BLAS
-OPTIONS_RADIO_BLAS= OPENBLAS NETLIB ATLAS
+OPTIONS_RADIO_BLAS= ATLAS NETLIB OPENBLAS
OPTIONS_DEFAULT= JAVA OPENBLAS QT5
OPTIONS_SUB= yes
DOCS_CONFIGURE_ENABLE= docs
JAVA_CONFIGURE_ENABLE= java
-QT5_CONFIGURE_WITH= qt=5 qscintilla
+QT5_CONFIGURE_WITH= qscintilla qt=5
QT5_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5
@@ -112,7 +108,7 @@ JAVA_CFLAGS= -I${JAVA_HOME}/include/${OPSYS:tl}
QT5_USES= qt:5
OPENBLAS_USES= blaslapack:openblas
NETLIB_USES= blaslapack:netlib
-ATLAS_USES= blaslapack:atlas
+ATLAS_USES= blaslapack:atlas
pre-configure:
${REINPLACE_CMD} 's+"makeinfo"+"${LOCALBASE}/bin/makeinfo"+' ${WRKSRC}/libinterp/corefcn/help.cc
@@ -124,9 +120,8 @@ pre-configure:
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for file in liboctave/liboctave.ps \
- refcard/refcard-a4.ps refcard/refcard-legal.ps \
- refcard/refcard-letter.ps interpreter/octave.ps
+.for file in liboctave/liboctave.ps refcard/refcard-a4.ps \
+ refcard/refcard-legal.ps refcard/refcard-letter.ps interpreter/octave.ps
${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR}
.endfor
@${MKDIR} ${STAGEDIR}${PREFIX}/${INFO_PATH}
@@ -137,5 +132,4 @@ post-install-DOCS-on:
check regression-test: build
@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check)
-.include "Makefile.version"
.include <bsd.port.mk>
diff --git a/math/octave/Makefile.version b/math/octave/Makefile.version
deleted file mode 100644
index d6d9fde3a96d..000000000000
--- a/math/octave/Makefile.version
+++ /dev/null
@@ -1,2 +0,0 @@
-# Version to share with ports depending on octave
-OCTAVE_VERSION= 7.3.0