diff --git a/math/octave-forge-actuarial/Makefile b/math/octave-forge-actuarial/Makefile index a94794b45d0a..cdcad07e6fa0 100644 --- a/math/octave-forge-actuarial/Makefile +++ b/math/octave-forge-actuarial/Makefile @@ -13,6 +13,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + .include .include "${PORTSDIR}/Mk/bsd.octave.mk" do-build: @@ -20,6 +24,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-bim/Makefile b/math/octave-forge-bim/Makefile index dad3f27550c5..b8a543351aec 100644 --- a/math/octave-forge-bim/Makefile +++ b/math/octave-forge-bim/Makefile @@ -12,6 +12,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${DISTNAME} + RUN_DEPENDS+= ${TARBALLS_DIR}/fpl.tar.gz:${PORTSDIR}/math/octave-forge-fpl RUN_DEPENDS+= ${TARBALLS_DIR}/msh.tar.gz:${PORTSDIR}/math/octave-forge-msh @@ -22,6 +26,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${DISTNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-communications/Makefile b/math/octave-forge-communications/Makefile index 99ef6dcccfeb..8b40be5f5ef1 100644 --- a/math/octave-forge-communications/Makefile +++ b/math/octave-forge-communications/Makefile @@ -12,7 +12,11 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + +WRKSRC= ${WRKDIR}/${OCTSRC}/src MAKE_ENV+= MKOCTFILE=mkoctfile RUN_DEPENDS+= ${TARBALLS_DIR}/signal.tar.gz:${PORTSDIR}/math/octave-forge-signal @@ -22,6 +26,6 @@ RUN_DEPENDS+= ${TARBALLS_DIR}/image.tar.gz:${PORTSDIR}/math/octave-forge-image .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-control/Makefile b/math/octave-forge-control/Makefile index e36bd71a87ad..d7afd9b623d7 100644 --- a/math/octave-forge-control/Makefile +++ b/math/octave-forge-control/Makefile @@ -12,12 +12,16 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +# 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 .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-data-smoothing/Makefile b/math/octave-forge-data-smoothing/Makefile index c17078c1e273..2362d9e588a9 100644 --- a/math/octave-forge-data-smoothing/Makefile +++ b/math/octave-forge-data-smoothing/Makefile @@ -12,6 +12,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + RUN_DEPENDS+= ${TARBALLS_DIR}/optim.tar.gz:${PORTSDIR}/math/octave-forge-optim .include @@ -20,7 +24,7 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include "${PORTSDIR}/Mk/bsd.octave.mk" .include diff --git a/math/octave-forge-dataframe/Makefile b/math/octave-forge-dataframe/Makefile index bf8b8519fe38..b13e39770237 100644 --- a/math/octave-forge-dataframe/Makefile +++ b/math/octave-forge-dataframe/Makefile @@ -13,6 +13,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${DISTNAME} + .include .include "${PORTSDIR}/Mk/bsd.octave.mk" do-build: @@ -20,6 +24,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${DISTNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-es/Makefile b/math/octave-forge-es/Makefile index 3da256693b40..793141762c76 100644 --- a/math/octave-forge-es/Makefile +++ b/math/octave-forge-es/Makefile @@ -13,12 +13,16 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +# 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 .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-fenv/Makefile b/math/octave-forge-fenv/Makefile index abbcf81ccbb3..001aeeb3126d 100644 --- a/math/octave-forge-fenv/Makefile +++ b/math/octave-forge-fenv/Makefile @@ -13,13 +13,17 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +# 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 .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-fits/Makefile b/math/octave-forge-fits/Makefile index 619dd2fccdc0..a59c93763fb7 100644 --- a/math/octave-forge-fits/Makefile +++ b/math/octave-forge-fits/Makefile @@ -12,7 +12,11 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + +WRKSRC= ${WRKDIR}/${OCTSRC}/src LIB_DEPENDS+= cfitsio:${PORTSDIR}/astro/cfitsio @@ -20,6 +24,6 @@ LIB_DEPENDS+= cfitsio:${PORTSDIR}/astro/cfitsio .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-fl-core/Makefile b/math/octave-forge-fl-core/Makefile index 65d2f903baff..71722fae7dd1 100644 --- a/math/octave-forge-fl-core/Makefile +++ b/math/octave-forge-fl-core/Makefile @@ -13,12 +13,16 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +# 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 .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-fpl/Makefile b/math/octave-forge-fpl/Makefile index 10c07077a9f9..6e17542daea7 100644 --- a/math/octave-forge-fpl/Makefile +++ b/math/octave-forge-fpl/Makefile @@ -13,6 +13,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + RUN_DEPENDS+= dx:${PORTSDIR}/graphics/opendx .include @@ -22,6 +26,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-fuzzy-logic-toolkit/Makefile b/math/octave-forge-fuzzy-logic-toolkit/Makefile index d0fab95d6cc9..001f2056c15d 100644 --- a/math/octave-forge-fuzzy-logic-toolkit/Makefile +++ b/math/octave-forge-fuzzy-logic-toolkit/Makefile @@ -12,6 +12,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + .include .include "${PORTSDIR}/Mk/bsd.octave.mk" do-build: @@ -19,6 +23,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-ga/Makefile b/math/octave-forge-ga/Makefile index 76dd3c36d5c6..446ed430cf48 100644 --- a/math/octave-forge-ga/Makefile +++ b/math/octave-forge-ga/Makefile @@ -13,6 +13,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + RUN_DEPENDS+= ${TARBALLS_DIR}/communications.tar.gz:${PORTSDIR}/math/octave-forge-communications .include @@ -22,6 +26,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-general/Makefile b/math/octave-forge-general/Makefile index 0cf65db6d40b..fcb7b447454b 100644 --- a/math/octave-forge-general/Makefile +++ b/math/octave-forge-general/Makefile @@ -13,12 +13,16 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +# 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 .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-generate_html/Makefile b/math/octave-forge-generate_html/Makefile index f4962487e528..59b73e450044 100644 --- a/math/octave-forge-generate_html/Makefile +++ b/math/octave-forge-generate_html/Makefile @@ -13,6 +13,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${DISTNAME} + .include .include "${PORTSDIR}/Mk/bsd.octave.mk" do-build: @@ -20,6 +24,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${DISTNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-geometry/Makefile b/math/octave-forge-geometry/Makefile index b3ecd1ba2b4b..84be0633082c 100644 --- a/math/octave-forge-geometry/Makefile +++ b/math/octave-forge-geometry/Makefile @@ -12,6 +12,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + RUN_DEPENDS+= py*-lxml>=0:${PORTSDIR}/devel/py-lxml .include @@ -21,6 +25,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-gnuplot/Makefile b/math/octave-forge-gnuplot/Makefile index 7c1745d78f70..bbcdc7c0421f 100644 --- a/math/octave-forge-gnuplot/Makefile +++ b/math/octave-forge-gnuplot/Makefile @@ -13,6 +13,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + .include .include "${PORTSDIR}/Mk/bsd.octave.mk" do-build: @@ -20,6 +24,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-image/Makefile b/math/octave-forge-image/Makefile index 83007638f1ff..c07cfc4b257c 100644 --- a/math/octave-forge-image/Makefile +++ b/math/octave-forge-image/Makefile @@ -12,7 +12,11 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${DISTNAME}/src +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${DISTNAME} + +WRKSRC= ${WRKDIR}/${OCTSRC}/src .include .include "${PORTSDIR}/Mk/bsd.octave.mk" @@ -21,6 +25,6 @@ post-patch: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${DISTNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-io/Makefile b/math/octave-forge-io/Makefile index 0ba5d2bf60b8..894a25941b99 100644 --- a/math/octave-forge-io/Makefile +++ b/math/octave-forge-io/Makefile @@ -12,6 +12,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + .include .include "${PORTSDIR}/Mk/bsd.octave.mk" do-build: @@ -19,6 +23,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-linear-algebra/Makefile b/math/octave-forge-linear-algebra/Makefile index ec1f0f8e6118..fc269c1ea1aa 100644 --- a/math/octave-forge-linear-algebra/Makefile +++ b/math/octave-forge-linear-algebra/Makefile @@ -12,12 +12,16 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +# 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 .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-mechanics/Makefile b/math/octave-forge-mechanics/Makefile index 49e1cfd07fb3..c1729c6444dd 100644 --- a/math/octave-forge-mechanics/Makefile +++ b/math/octave-forge-mechanics/Makefile @@ -12,6 +12,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + .include .include "${PORTSDIR}/Mk/bsd.octave.mk" do-build: @@ -19,6 +23,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-miscellaneous/Makefile b/math/octave-forge-miscellaneous/Makefile index 55acc37ecb34..0ab665d735f7 100644 --- a/math/octave-forge-miscellaneous/Makefile +++ b/math/octave-forge-miscellaneous/Makefile @@ -13,7 +13,11 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${DISTNAME}/src +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${DISTNAME} + +WRKSRC= ${WRKDIR}/${OCTSRC}/src .include .include "${PORTSDIR}/Mk/bsd.octave.mk" @@ -22,6 +26,6 @@ MAKE_ENV+= MKOCTFILE=mkoctfile post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${DISTNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-msh/Makefile b/math/octave-forge-msh/Makefile index 1452250fc6e4..e19e057b1020 100644 --- a/math/octave-forge-msh/Makefile +++ b/math/octave-forge-msh/Makefile @@ -13,6 +13,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${DISTNAME} + RUN_DEPENDS+= ${TARBALLS_DIR}/splines.tar.gz:${PORTSDIR}/math/octave-forge-splines RUN_DEPENDS+= gmsh:${PORTSDIR}/cad/gmsh @@ -23,6 +27,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${DISTNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-nan/Makefile b/math/octave-forge-nan/Makefile index 39e6a16c9f64..3be88387fe0b 100644 --- a/math/octave-forge-nan/Makefile +++ b/math/octave-forge-nan/Makefile @@ -12,7 +12,11 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/NaN/src +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= NaN + +WRKSRC= ${WRKDIR}/${OCTSRC}/src .include .include "${PORTSDIR}/Mk/bsd.octave.mk" @@ -21,6 +25,6 @@ ALL_TARGET= octave post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz NaN + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-nlwing2/Makefile b/math/octave-forge-nlwing2/Makefile index 41291793d92d..c458de6f98c0 100644 --- a/math/octave-forge-nlwing2/Makefile +++ b/math/octave-forge-nlwing2/Makefile @@ -13,11 +13,16 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +# 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 .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} + .include diff --git a/math/octave-forge-nnet/Makefile b/math/octave-forge-nnet/Makefile index e76dcb65cf03..64c7faa54edf 100644 --- a/math/octave-forge-nnet/Makefile +++ b/math/octave-forge-nnet/Makefile @@ -13,6 +13,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + .include .include "${PORTSDIR}/Mk/bsd.octave.mk" do-build: @@ -20,6 +24,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-nurbs/Makefile b/math/octave-forge-nurbs/Makefile index 5f7f30a001ec..4f8d1b3c96fd 100644 --- a/math/octave-forge-nurbs/Makefile +++ b/math/octave-forge-nurbs/Makefile @@ -12,12 +12,16 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +# 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 .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-ocs/Makefile b/math/octave-forge-ocs/Makefile index d19e59d1f968..b0c8a893e58d 100644 --- a/math/octave-forge-ocs/Makefile +++ b/math/octave-forge-ocs/Makefile @@ -13,7 +13,11 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${DISTNAME}/src +# 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+= ${TARBALLS_DIR}/odepkg.tar.gz:${PORTSDIR}/math/octave-forge-odepkg @@ -21,6 +25,6 @@ RUN_DEPENDS+= ${TARBALLS_DIR}/odepkg.tar.gz:${PORTSDIR}/math/octave-forge-odepkg .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${DISTNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-octcdf/Makefile b/math/octave-forge-octcdf/Makefile index c314d6e6a961..84da2fb638e1 100644 --- a/math/octave-forge-octcdf/Makefile +++ b/math/octave-forge-octcdf/Makefile @@ -13,7 +13,11 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + +WRKSRC= ${WRKDIR}/${OCTSRC}/src LIB_DEPENDS+= netcdf:${PORTSDIR}/science/netcdf @@ -21,6 +25,6 @@ LIB_DEPENDS+= netcdf:${PORTSDIR}/science/netcdf .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-octclip/Makefile b/math/octave-forge-octclip/Makefile index 7b1e84850df5..fded89c4f1b3 100644 --- a/math/octave-forge-octclip/Makefile +++ b/math/octave-forge-octclip/Makefile @@ -13,7 +13,11 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +# 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 .include "${PORTSDIR}/Mk/bsd.octave.mk" @@ -22,6 +26,6 @@ post-patch: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-octgpr/Makefile b/math/octave-forge-octgpr/Makefile index 19e4bbae6a4f..a0ef30303151 100644 --- a/math/octave-forge-octgpr/Makefile +++ b/math/octave-forge-octgpr/Makefile @@ -13,13 +13,17 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + +WRKSRC= ${WRKDIR}/${OCTSRC}/src GNU_CONFIGURE= yes .include .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-octproj/Makefile b/math/octave-forge-octproj/Makefile index adec6fc45a2b..24b809d6b0d0 100644 --- a/math/octave-forge-octproj/Makefile +++ b/math/octave-forge-octproj/Makefile @@ -13,7 +13,11 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + +WRKSRC= ${WRKDIR}/${OCTSRC}/src LIB_DEPENDS+= proj:${PORTSDIR}/graphics/proj @@ -24,6 +28,6 @@ post-patch: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-odepkg/Makefile b/math/octave-forge-odepkg/Makefile index 25cd7786dad3..d44ba92241ed 100644 --- a/math/octave-forge-odepkg/Makefile +++ b/math/octave-forge-odepkg/Makefile @@ -13,12 +13,16 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${DISTNAME}/src +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${DISTNAME} + +WRKSRC= ${WRKDIR}/${OCTSRC}/src .include .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${DISTNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-optim/Makefile b/math/octave-forge-optim/Makefile index c2e7edbecd70..d0c71d8a867d 100644 --- a/math/octave-forge-optim/Makefile +++ b/math/octave-forge-optim/Makefile @@ -12,7 +12,11 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${DISTNAME}/src +# 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+= ${TARBALLS_DIR}/miscellaneous.tar.gz:${PORTSDIR}/math/octave-forge-miscellaneous RUN_DEPENDS+= ${TARBALLS_DIR}/struct.tar.gz:${PORTSDIR}/math/octave-forge-struct @@ -21,6 +25,6 @@ RUN_DEPENDS+= ${TARBALLS_DIR}/struct.tar.gz:${PORTSDIR}/math/octave-forge-struct .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${DISTNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-optiminterp/Makefile b/math/octave-forge-optiminterp/Makefile index 35fc83818f19..155e45a4bf08 100644 --- a/math/octave-forge-optiminterp/Makefile +++ b/math/octave-forge-optiminterp/Makefile @@ -13,7 +13,11 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +# 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 .include "${PORTSDIR}/Mk/bsd.octave.mk" @@ -22,6 +26,6 @@ MAKE_ENV+= MKOCTFILE_FORTRAN_90=yes MKOCTFILE=mkoctfile post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-parallel/Makefile b/math/octave-forge-parallel/Makefile index 50ace7ed2a72..0a54c02bffec 100644 --- a/math/octave-forge-parallel/Makefile +++ b/math/octave-forge-parallel/Makefile @@ -13,13 +13,17 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${DISTNAME}/src +# 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 .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${DISTNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-plot/Makefile b/math/octave-forge-plot/Makefile index 791bdecefab2..f79f28e1b55a 100644 --- a/math/octave-forge-plot/Makefile +++ b/math/octave-forge-plot/Makefile @@ -12,6 +12,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + .include .include "${PORTSDIR}/Mk/bsd.octave.mk" do-build: @@ -19,6 +23,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-pt_br/Makefile b/math/octave-forge-pt_br/Makefile index e374df1ac000..1ddff6e4fda4 100644 --- a/math/octave-forge-pt_br/Makefile +++ b/math/octave-forge-pt_br/Makefile @@ -13,12 +13,16 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/pt_BR/src +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= pt_BR + +WRKSRC= ${WRKDIR}/${OCTSRC}/src .include .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz pt_BR + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-secs3d/Makefile b/math/octave-forge-secs3d/Makefile index 3ab35bc4d207..06e371103597 100644 --- a/math/octave-forge-secs3d/Makefile +++ b/math/octave-forge-secs3d/Makefile @@ -13,6 +13,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${DISTNAME} + RUN_DEPENDS+= ${TARBALLS_DIR}/fpl.tar.gz:${PORTSDIR}/math/octave-forge-fpl RUN_DEPENDS+= ${TARBALLS_DIR}/bim.tar.gz:${PORTSDIR}/math/octave-forge-bim @@ -23,6 +27,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${DISTNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-signal/Makefile b/math/octave-forge-signal/Makefile index b8ecd496d648..a181da43aa17 100644 --- a/math/octave-forge-signal/Makefile +++ b/math/octave-forge-signal/Makefile @@ -12,7 +12,11 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + +WRKSRC= ${WRKDIR}/${OCTSRC}/src RUN_DEPENDS+= ${TARBALLS_DIR}/optim.tar.gz:${PORTSDIR}/math/octave-forge-optim RUN_DEPENDS+= ${TARBALLS_DIR}/specfun.tar.gz:${PORTSDIR}/math/octave-forge-specfun @@ -26,6 +30,6 @@ post-patch: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-sockets/Makefile b/math/octave-forge-sockets/Makefile index 5dcc248e199e..34c4774fd036 100644 --- a/math/octave-forge-sockets/Makefile +++ b/math/octave-forge-sockets/Makefile @@ -13,12 +13,16 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${DISTNAME}/src +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${DISTNAME} + +WRKSRC= ${WRKDIR}/${OCTSRC}/src .include .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${DISTNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-specfun/Makefile b/math/octave-forge-specfun/Makefile index 119a64df59c4..4801f955be9e 100644 --- a/math/octave-forge-specfun/Makefile +++ b/math/octave-forge-specfun/Makefile @@ -13,12 +13,16 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${DISTNAME}/src +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${DISTNAME} + +WRKSRC= ${WRKDIR}/${OCTSRC}/src .include .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${DISTNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-statistics/Makefile b/math/octave-forge-statistics/Makefile index a229773a9858..260ea4e8a2f4 100644 --- a/math/octave-forge-statistics/Makefile +++ b/math/octave-forge-statistics/Makefile @@ -12,6 +12,10 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + RUN_DEPENDS+= ${TARBALLS_DIR}/miscellaneous.tar.gz:${PORTSDIR}/math/octave-forge-miscellaneous .include @@ -21,6 +25,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-struct/Makefile b/math/octave-forge-struct/Makefile index 5d14bf3d9132..80458101d1ad 100644 --- a/math/octave-forge-struct/Makefile +++ b/math/octave-forge-struct/Makefile @@ -13,12 +13,16 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -WRKSRC= ${WRKDIR}/${DISTNAME}/src +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${DISTNAME} + +WRKSRC= ${WRKDIR}/${OCTSRC}/src .include .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${DISTNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-symbolic/Makefile b/math/octave-forge-symbolic/Makefile index b166409cc1d5..64cedc147bf6 100644 --- a/math/octave-forge-symbolic/Makefile +++ b/math/octave-forge-symbolic/Makefile @@ -13,14 +13,18 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + LIB_DEPENDS+= ginac:${PORTSDIR}/math/GiNaC -WRKSRC= ${WRKDIR}/${OCTAVE_PKGNAME}/src +WRKSRC= ${WRKDIR}/${OCTSRC}/src .include .include "${PORTSDIR}/Mk/bsd.octave.mk" post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include diff --git a/math/octave-forge-tsa/Makefile b/math/octave-forge-tsa/Makefile index e78dbe280d3c..50ba6e79e11b 100644 --- a/math/octave-forge-tsa/Makefile +++ b/math/octave-forge-tsa/Makefile @@ -14,6 +14,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= ${OCTAVE_PKGNAME} + .include .include "${PORTSDIR}/Mk/bsd.octave.mk" do-build: @@ -21,6 +25,6 @@ do-build: post-build: ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure - cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTAVE_PKGNAME} + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include