Page MenuHomeFreeBSD

D37887.id.diff
No OneTemporary

D37887.id.diff

diff --git a/Mk/Uses/octave.mk b/Mk/Uses/octave.mk
new file mode 100644
--- /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
--- 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
--- a/benchmarks/octave-forge-benchmark/Makefile
+++ b/benchmarks/octave-forge-benchmark/Makefile
@@ -12,5 +12,8 @@
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
--- a/math/octave-forge-actuarial/Makefile
+++ b/math/octave-forge-actuarial/Makefile
@@ -10,21 +10,13 @@
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
--- a/math/octave-forge-audio/Makefile
+++ b/math/octave-forge-audio/Makefile
@@ -13,19 +13,8 @@
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
--- a/math/octave-forge-automatic-differentiation/Makefile
+++ b/math/octave-forge-automatic-differentiation/Makefile
@@ -8,27 +8,18 @@
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
--- a/math/octave-forge-bim/Makefile
+++ b/math/octave-forge-bim/Makefile
@@ -8,28 +8,19 @@
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
--- a/math/octave-forge-bioinfo/Makefile
+++ b/math/octave-forge-bioinfo/Makefile
@@ -12,7 +12,10 @@
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
--- a/math/octave-forge-biosig/Makefile
+++ b/math/octave-forge-biosig/Makefile
@@ -10,23 +10,14 @@
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
--- a/math/octave-forge-bsltl/Makefile
+++ b/math/octave-forge-bsltl/Makefile
@@ -10,23 +10,11 @@
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
--- a/math/octave-forge-cfitsio/Makefile
+++ b/math/octave-forge-cfitsio/Makefile
@@ -11,25 +11,12 @@
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
--- a/math/octave-forge-cgi/Makefile
+++ b/math/octave-forge-cgi/Makefile
@@ -10,23 +10,13 @@
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
--- a/math/octave-forge-civil-engineering/Makefile
+++ b/math/octave-forge-civil-engineering/Makefile
@@ -12,7 +12,10 @@
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
--- a/math/octave-forge-coder/Makefile
+++ b/math/octave-forge-coder/Makefile
@@ -8,27 +8,20 @@
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
--- a/math/octave-forge-communications/Makefile
+++ b/math/octave-forge-communications/Makefile
@@ -10,23 +10,14 @@
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
--- a/math/octave-forge-control/Makefile
+++ b/math/octave-forge-control/Makefile
@@ -10,20 +10,10 @@
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
--- 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 @@
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
--- a/math/octave-forge-data-smoothing/Makefile
+++ b/math/octave-forge-data-smoothing/Makefile
@@ -10,22 +10,15 @@
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
--- a/math/octave-forge-database/Makefile
+++ b/math/octave-forge-database/Makefile
@@ -10,24 +10,13 @@
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
--- a/math/octave-forge-dataframe/Makefile
+++ b/math/octave-forge-dataframe/Makefile
@@ -10,21 +10,11 @@
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
--- a/math/octave-forge-dicom/Makefile
+++ b/math/octave-forge-dicom/Makefile
@@ -9,23 +9,14 @@
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
--- a/math/octave-forge-divand/Makefile
+++ b/math/octave-forge-divand/Makefile
@@ -10,23 +10,14 @@
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
--- a/math/octave-forge-doctest/Makefile
+++ b/math/octave-forge-doctest/Makefile
@@ -10,23 +10,11 @@
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
--- a/math/octave-forge-econometrics/Makefile
+++ b/math/octave-forge-econometrics/Makefile
@@ -10,20 +10,10 @@
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
--- a/math/octave-forge-fda/Makefile
+++ b/math/octave-forge-fda/Makefile
@@ -8,28 +8,17 @@
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
--- a/math/octave-forge-femoctave/Makefile
+++ b/math/octave-forge-femoctave/Makefile
@@ -8,22 +8,13 @@
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
--- a/math/octave-forge-fenv/Makefile
+++ b/math/octave-forge-fenv/Makefile
@@ -10,20 +10,11 @@
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
--- a/math/octave-forge-financial/Makefile
+++ b/math/octave-forge-financial/Makefile
@@ -10,24 +10,14 @@
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
--- a/math/octave-forge-fits/Makefile
+++ b/math/octave-forge-fits/Makefile
@@ -10,22 +10,12 @@
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
--- a/math/octave-forge-fpl/Makefile
+++ b/math/octave-forge-fpl/Makefile
@@ -10,22 +10,15 @@
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
--- a/math/octave-forge-fuzzy-logic-toolkit/Makefile
+++ b/math/octave-forge-fuzzy-logic-toolkit/Makefile
@@ -10,23 +10,15 @@
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
--- a/math/octave-forge-ga/Makefile
+++ b/math/octave-forge-ga/Makefile
@@ -10,21 +10,11 @@
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
--- a/math/octave-forge-general/Makefile
+++ b/math/octave-forge-general/Makefile
@@ -9,17 +9,8 @@
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
--- a/math/octave-forge-generate_html/Makefile
+++ b/math/octave-forge-generate_html/Makefile
@@ -9,21 +9,11 @@
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
--- a/math/octave-forge-geographiclib/Makefile
+++ b/math/octave-forge-geographiclib/Makefile
@@ -10,21 +10,11 @@
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
--- a/math/octave-forge-geometry/Makefile
+++ b/math/octave-forge-geometry/Makefile
@@ -10,22 +10,11 @@
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
--- a/math/octave-forge-gnuplot/Makefile
+++ b/math/octave-forge-gnuplot/Makefile
@@ -10,21 +10,13 @@
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
--- a/math/octave-forge-gsl/Makefile
+++ b/math/octave-forge-gsl/Makefile
@@ -10,22 +10,12 @@
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
--- a/math/octave-forge-ident/Makefile
+++ b/math/octave-forge-ident/Makefile
@@ -12,7 +12,10 @@
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
--- a/math/octave-forge-image/Makefile
+++ b/math/octave-forge-image/Makefile
@@ -11,24 +11,12 @@
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
--- a/math/octave-forge-informationtheory/Makefile
+++ b/math/octave-forge-informationtheory/Makefile
@@ -12,7 +12,10 @@
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
--- a/math/octave-forge-integration/Makefile
+++ b/math/octave-forge-integration/Makefile
@@ -12,7 +12,10 @@
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
--- a/math/octave-forge-internal-fluid-flow/Makefile
+++ b/math/octave-forge-internal-fluid-flow/Makefile
@@ -8,25 +8,16 @@
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
--- a/math/octave-forge-interval/Makefile
+++ b/math/octave-forge-interval/Makefile
@@ -10,20 +10,10 @@
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
--- a/math/octave-forge-io/Makefile
+++ b/math/octave-forge-io/Makefile
@@ -11,18 +11,8 @@
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
--- a/math/octave-forge-irsa/Makefile
+++ b/math/octave-forge-irsa/Makefile
@@ -12,7 +12,10 @@
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
--- a/math/octave-forge-level-set/Makefile
+++ b/math/octave-forge-level-set/Makefile
@@ -11,20 +11,12 @@
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
--- a/math/octave-forge-linear-algebra/Makefile
+++ b/math/octave-forge-linear-algebra/Makefile
@@ -10,21 +10,9 @@
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
--- a/math/octave-forge-lssa/Makefile
+++ b/math/octave-forge-lssa/Makefile
@@ -10,18 +10,8 @@
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
--- a/math/octave-forge-ltfat/Makefile
+++ b/math/octave-forge-ltfat/Makefile
@@ -11,7 +11,7 @@
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 @@
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
--- a/math/octave-forge-mapping/Makefile
+++ b/math/octave-forge-mapping/Makefile
@@ -10,23 +10,15 @@
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
--- a/math/octave-forge-matgeom/Makefile
+++ b/math/octave-forge-matgeom/Makefile
@@ -10,22 +10,11 @@
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
--- a/math/octave-forge-mccabe-thiele/Makefile
+++ b/math/octave-forge-mccabe-thiele/Makefile
@@ -8,27 +8,18 @@
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
--- a/math/octave-forge-mechanics/Makefile
+++ b/math/octave-forge-mechanics/Makefile
@@ -10,22 +10,16 @@
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
--- a/math/octave-forge-miscellaneous/Makefile
+++ b/math/octave-forge-miscellaneous/Makefile
@@ -10,22 +10,12 @@
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
--- a/math/octave-forge-missing-functions/Makefile
+++ b/math/octave-forge-missing-functions/Makefile
@@ -9,7 +9,10 @@
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
--- a/math/octave-forge-mpi/Makefile
+++ b/math/octave-forge-mpi/Makefile
@@ -8,27 +8,18 @@
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
--- a/math/octave-forge-mqtt/Makefile
+++ b/math/octave-forge-mqtt/Makefile
@@ -10,26 +10,12 @@
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
--- a/math/octave-forge-msh/Makefile
+++ b/math/octave-forge-msh/Makefile
@@ -8,28 +8,19 @@
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
--- a/math/octave-forge-multicore/Makefile
+++ b/math/octave-forge-multicore/Makefile
@@ -12,7 +12,10 @@
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
--- a/math/octave-forge-mvn/Makefile
+++ b/math/octave-forge-mvn/Makefile
@@ -10,21 +10,13 @@
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
--- a/math/octave-forge-nan/Makefile
+++ b/math/octave-forge-nan/Makefile
@@ -9,23 +9,14 @@
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
--- a/math/octave-forge-ncarray/Makefile
+++ b/math/octave-forge-ncarray/Makefile
@@ -9,26 +9,14 @@
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
--- a/math/octave-forge-netcdf/Makefile
+++ b/math/octave-forge-netcdf/Makefile
@@ -9,22 +9,14 @@
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
--- a/math/octave-forge-nlwing2/Makefile
+++ b/math/octave-forge-nlwing2/Makefile
@@ -10,18 +10,10 @@
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
--- a/math/octave-forge-nnet/Makefile
+++ b/math/octave-forge-nnet/Makefile
@@ -10,21 +10,13 @@
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
--- a/math/octave-forge-nurbs/Makefile
+++ b/math/octave-forge-nurbs/Makefile
@@ -10,15 +10,9 @@
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 @@
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
--- a/math/octave-forge-oct2mat/Makefile
+++ b/math/octave-forge-oct2mat/Makefile
@@ -12,9 +12,12 @@
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
--- a/math/octave-forge-octclip/Makefile
+++ b/math/octave-forge-octclip/Makefile
@@ -9,18 +9,8 @@
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
--- a/math/octave-forge-octproj/Makefile
+++ b/math/octave-forge-octproj/Makefile
@@ -10,23 +10,13 @@
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
--- a/math/octave-forge-odebvp/Makefile
+++ b/math/octave-forge-odebvp/Makefile
@@ -12,7 +12,10 @@
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
--- a/math/octave-forge-onsas/Makefile
+++ b/math/octave-forge-onsas/Makefile
@@ -9,25 +9,16 @@
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
--- a/math/octave-forge-optics/Makefile
+++ b/math/octave-forge-optics/Makefile
@@ -11,21 +11,9 @@
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
--- a/math/octave-forge-optim/Makefile
+++ b/math/octave-forge-optim/Makefile
@@ -10,27 +10,16 @@
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
--- a/math/octave-forge-optiminterp/Makefile
+++ b/math/octave-forge-optiminterp/Makefile
@@ -10,21 +10,16 @@
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 @@
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
--- a/math/octave-forge-outliers/Makefile
+++ b/math/octave-forge-outliers/Makefile
@@ -12,7 +12,10 @@
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
--- a/math/octave-forge-parallel/Makefile
+++ b/math/octave-forge-parallel/Makefile
@@ -10,24 +10,15 @@
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
--- a/math/octave-forge-pde1dm/Makefile
+++ b/math/octave-forge-pde1dm/Makefile
@@ -9,25 +9,16 @@
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
--- a/math/octave-forge-plot/Makefile
+++ b/math/octave-forge-plot/Makefile
@@ -10,21 +10,13 @@
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
--- a/math/octave-forge-ponchon-savarit/Makefile
+++ b/math/octave-forge-ponchon-savarit/Makefile
@@ -8,27 +8,16 @@
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
--- a/math/octave-forge-psychrometrics/Makefile
+++ b/math/octave-forge-psychrometrics/Makefile
@@ -8,25 +8,16 @@
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
--- a/math/octave-forge-pythonic/Makefile
+++ b/math/octave-forge-pythonic/Makefile
@@ -7,28 +7,19 @@
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
--- a/math/octave-forge-quaternion/Makefile
+++ b/math/octave-forge-quaternion/Makefile
@@ -10,18 +10,10 @@
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
--- a/math/octave-forge-queueing/Makefile
+++ b/math/octave-forge-queueing/Makefile
@@ -10,21 +10,13 @@
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
--- a/math/octave-forge-secs1d/Makefile
+++ b/math/octave-forge-secs1d/Makefile
@@ -10,23 +10,15 @@
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
--- a/math/octave-forge-secs2d/Makefile
+++ b/math/octave-forge-secs2d/Makefile
@@ -12,10 +12,13 @@
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
--- a/math/octave-forge-secs3d/Makefile
+++ b/math/octave-forge-secs3d/Makefile
@@ -10,24 +10,14 @@
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
--- a/math/octave-forge-signal/Makefile
+++ b/math/octave-forge-signal/Makefile
@@ -9,23 +9,13 @@
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
--- a/math/octave-forge-simp/Makefile
+++ b/math/octave-forge-simp/Makefile
@@ -12,7 +12,10 @@
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
--- a/math/octave-forge-sockets/Makefile
+++ b/math/octave-forge-sockets/Makefile
@@ -9,23 +9,13 @@
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
--- a/math/octave-forge-sole/Makefile
+++ b/math/octave-forge-sole/Makefile
@@ -10,23 +10,15 @@
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
--- a/math/octave-forge-sparsersb/Makefile
+++ b/math/octave-forge-sparsersb/Makefile
@@ -10,20 +10,10 @@
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
--- a/math/octave-forge-specfun/Makefile
+++ b/math/octave-forge-specfun/Makefile
@@ -10,18 +10,10 @@
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
--- a/math/octave-forge-special-matrix/Makefile
+++ b/math/octave-forge-special-matrix/Makefile
@@ -9,7 +9,10 @@
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
--- a/math/octave-forge-splines/Makefile
+++ b/math/octave-forge-splines/Makefile
@@ -10,23 +10,11 @@
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
--- a/math/octave-forge-sqlite/Makefile
+++ b/math/octave-forge-sqlite/Makefile
@@ -8,28 +8,15 @@
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
--- a/math/octave-forge-statistics-bootstrap/Makefile
+++ b/math/octave-forge-statistics-bootstrap/Makefile
@@ -9,25 +9,17 @@
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
--- a/math/octave-forge-statistics/Makefile
+++ b/math/octave-forge-statistics/Makefile
@@ -8,22 +8,13 @@
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
--- a/math/octave-forge-stk/Makefile
+++ b/math/octave-forge-stk/Makefile
@@ -10,18 +10,10 @@
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
--- a/math/octave-forge-strings/Makefile
+++ b/math/octave-forge-strings/Makefile
@@ -13,19 +13,8 @@
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
--- a/math/octave-forge-struct/Makefile
+++ b/math/octave-forge-struct/Makefile
@@ -9,20 +9,10 @@
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
--- a/math/octave-forge-symband/Makefile
+++ b/math/octave-forge-symband/Makefile
@@ -12,7 +12,10 @@
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
--- a/math/octave-forge-symbolic/Makefile
+++ b/math/octave-forge-symbolic/Makefile
@@ -9,28 +9,14 @@
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
--- a/math/octave-forge-tcl-octave/Makefile
+++ b/math/octave-forge-tcl-octave/Makefile
@@ -9,9 +9,10 @@
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
--- a/math/octave-forge-tsa/Makefile
+++ b/math/octave-forge-tsa/Makefile
@@ -10,22 +10,12 @@
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
--- a/math/octave-forge-video/Makefile
+++ b/math/octave-forge-video/Makefile
@@ -10,26 +10,13 @@
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
--- a/math/octave-forge-websockets/Makefile
+++ b/math/octave-forge-websockets/Makefile
@@ -9,27 +9,18 @@
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
--- a/math/octave-forge-zenity/Makefile
+++ b/math/octave-forge-zenity/Makefile
@@ -12,9 +12,12 @@
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
--- a/math/octave-forge-zeromq/Makefile
+++ b/math/octave-forge-zeromq/Makefile
@@ -9,25 +9,12 @@
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
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -35,18 +35,18 @@
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
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -10,81 +10,77 @@
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 @@
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 @@
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 @@
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 @@
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
--- a/math/octave/Makefile.version
+++ /dev/null
@@ -1,2 +0,0 @@
-# Version to share with ports depending on octave
-OCTAVE_VERSION= 7.3.0

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 31, 10:27 AM (6 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35780616
Default Alt Text
D37887.id.diff (94 KB)

Event Timeline