- Remove .include <bsd.ports.pre.mk>; bsd.ports.post.mk to bsd.ports.mk;

${PORTSDIR} to ${.CURDIR}/../.. in the .include for bsd.octave.mk. This is because USE_GMAKE no longer works after .include <bsd.ports.pre.mk>. - Trim headers. - Clean whitespace. - Portlint.
svn path=/head/; revision=322356
2024-12-24 04:33:24 +00:00 · 2013-07-05 20:59:44 +00:00 · 2013-07-05 20:59:44 +00:00 · 83d7fd8ac9 · 2021-03-31 03:12:20 +00:00
commit 83d7fd8ac9
parent 3ac6602ab1
88 changed files with 317 additions and 575 deletions
--- a/benchmarks/octave-forge-benchmark/Makefile
+++ b/benchmarks/octave-forge-benchmark/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-benchmark
-# Date created:		11 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-benchmark
 PORTVERSION=	1.1.1
@ -13,6 +9,5 @@ CATEGORIES=	benchmarks math
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-actuarial/Makefile
+++ b/math/octave-forge-actuarial/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-actuarial
-# Date created:		2 June 2010
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-actuarial
 PORTVERSION=	1.1.0
@ -17,8 +13,8 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${OCTAVE_PKGNAME}

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -26,4 +22,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-ad/Makefile
+++ b/math/octave-forge-ad/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-ad
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-ad
 PORTVERSION=	1.0.6
@ -16,6 +12,5 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 GNU_CONFIGURE=	yes
 USE_DOS2UNIX=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-audio/Makefile
+++ b/math/octave-forge-audio/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-audio
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-audio
 PORTVERSION=	1.1.4
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-base/Makefile
+++ b/math/octave-forge-base/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-base
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-base
 PORTVERSION=	1.2
--- a/math/octave-forge-bim/Makefile
+++ b/math/octave-forge-bim/Makefile
@ -15,8 +15,8 @@ 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

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -24,4 +24,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-bioinfo/Makefile
+++ b/math/octave-forge-bioinfo/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-bioinfo
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-bioinfo
 PORTVERSION=	0.1.2
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-cgi/Makefile
+++ b/math/octave-forge-cgi/Makefile
@ -14,8 +14,8 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -23,4 +23,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-civil-engineering/Makefile
+++ b/math/octave-forge-civil-engineering/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-civil-engineering
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-civil-engineering
 PORTVERSION=	1.0.7
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-communications/Makefile
+++ b/math/octave-forge-communications/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-communications
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-communications
 PORTVERSION=	1.1.1
@ -24,10 +20,10 @@ MAKE_ENV+=	MKOCTFILE=mkoctfile

 RUN_DEPENDS+=	${TARBALLS_DIR}/signal.tar.gz:${PORTSDIR}/math/octave-forge-signal

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-control/Makefile
+++ b/math/octave-forge-control/Makefile
@ -14,10 +14,10 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-data-smoothing/Makefile
+++ b/math/octave-forge-data-smoothing/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-data-smoothing
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-data-smoothing
 PORTVERSION=	1.3.0
@ -19,7 +15,6 @@ OCTSRC=		${OCTAVE_PKGNAME}

 RUN_DEPENDS+=	${TARBALLS_DIR}/optim.tar.gz:${PORTSDIR}/math/octave-forge-optim

-.include <bsd.port.pre.mk>
 do-build:
 	@${DO_NADA}

@ -27,5 +22,5 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-database/Makefile
+++ b/math/octave-forge-database/Makefile
@ -18,8 +18,7 @@ GNU_CONFIGURE=	yes
 USE_PGSQL=	yes
 ALL_TARGET=

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"

 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
@ -29,4 +28,4 @@ post-patch:
 	${REINPLACE_CMD} 's#postgresql/##' ${WRKSRC}/*
 	${REINPLACE_CMD} 's#endian.h#sys/endian.h#' ${WRKSRC}/wrap_endian.h

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-dataframe/Makefile
+++ b/math/octave-forge-dataframe/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-dataframe
-# Date created:		26 August 2010
-# Whom:			Stephen Montgomery-Smith <stephen@missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-dataframe
 PORTVERSION=	0.9.1
@ -17,8 +13,8 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${OCTAVE_PKGNAME}

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -26,4 +22,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-dicom/Makefile
+++ b/math/octave-forge-dicom/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-dicom
-# Date created:		26 December 2011
-# Whom:			Stephen Montgomery-Smith <stephen@FreeBSD.org>
-#
+# Created by: Stephen Montgomery-Smith <stephen@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-dicom
 PORTVERSION=	0.1.1
@ -28,11 +24,10 @@ post-patch:
 		${WRKSRC}/dicomread.cpp ${WRKSRC}/dicomlookup.cpp \
 		${WRKSRC}/_gendicomdict.cpp ${WRKSRC}/dicomwrite.cpp

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"

 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-econometrics/Makefile
+++ b/math/octave-forge-econometrics/Makefile
@ -16,11 +16,10 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src

 RUN_DEPENDS+=	${TARBALLS_DIR}/optim.tar.gz:${PORTSDIR}/math/octave-forge-optim

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"

 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-engine/Makefile
+++ b/math/octave-forge-engine/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-engine
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-engine
 PORTVERSION=	1.0.9
@ -12,9 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-es/Makefile
+++ b/math/octave-forge-es/Makefile
@ -17,10 +17,10 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-fenv/Makefile
+++ b/math/octave-forge-fenv/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-fenv
-# Date created:		6 June 2010
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-fenv
 PORTVERSION=	0.1.0
@ -19,11 +15,10 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"

 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-financial/Makefile
+++ b/math/octave-forge-financial/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-financial
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-financial
 PORTVERSION=	0.4.0
@ -19,8 +15,8 @@ OCTSRC=		${OCTAVE_PKGNAME}

 RUN_DEPENDS+=	${TARBALLS_DIR}/io.tar.gz:${PORTSDIR}/math/octave-forge-io

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -28,4 +24,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-fits/Makefile
+++ b/math/octave-forge-fits/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-fits
-# Date created:		13 Janurary 2011
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-fits
 PORTVERSION=	1.0.2
@ -20,10 +16,10 @@ WRKSRC=	${WRKDIR}/${OCTSRC}/src

 LIB_DEPENDS+=	cfitsio:${PORTSDIR}/astro/cfitsio

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-fl-core/Makefile
+++ b/math/octave-forge-fl-core/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-fl-core
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-fl-core
 PORTVERSION=	1.0.0
@ -19,10 +15,10 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-fpl/Makefile
+++ b/math/octave-forge-fpl/Makefile
@ -14,12 +14,12 @@ OCTSRC=		${DISTNAME}

 RUN_DEPENDS+=	dx:${PORTSDIR}/graphics/opendx

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

 post-build:
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-fuzzy-logic-toolkit/Makefile
+++ b/math/octave-forge-fuzzy-logic-toolkit/Makefile
@ -1,4 +1,4 @@
-# Created by:	Stephen Montgomery-Smith <stephen@math.missouri.edu>
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$

 PORTNAME=	octave-forge-fuzzy-logic-toolkit
@ -12,8 +12,8 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${OCTAVE_PKGNAME}

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -21,4 +21,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-ga/Makefile
+++ b/math/octave-forge-ga/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-ga
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-ga
 PORTVERSION=	0.10.0
@ -17,8 +13,8 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${OCTAVE_PKGNAME}

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -26,4 +22,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-general/Makefile
+++ b/math/octave-forge-general/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-general
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-general
 PORTVERSION=	1.3.2
@ -18,10 +14,10 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-generate_html/Makefile
+++ b/math/octave-forge-generate_html/Makefile
@ -12,8 +12,8 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${OCTAVE_PKGNAME}

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -21,4 +21,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-geometry/Makefile
+++ b/math/octave-forge-geometry/Makefile
@ -17,10 +17,10 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 RUN_DEPENDS+=	py*-lxml>=0:${PORTSDIR}/devel/py-lxml
 RUN_DEPENDS+=	${TARBALLS_DIR}/general.tar.gz:${PORTSDIR}/math/octave-forge-general

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-gnuplot/Makefile
+++ b/math/octave-forge-gnuplot/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-gnuplot
-# Date created:		6 June 2010
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-gnuplot
 PORTVERSION=	1.0.1
@ -17,8 +13,8 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${OCTAVE_PKGNAME}

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -26,4 +22,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-gsl/Makefile
+++ b/math/octave-forge-gsl/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-gsl
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-gsl
 PORTVERSION=	1.0.8
@ -12,13 +8,13 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
+LIB_DEPENDS=	gsl:${PORTSDIR}/math/gsl
+
 GNU_CONFIGURE=	yes

-LIB_DEPENDS=	gsl.16:${PORTSDIR}/math/gsl
-
 post-patch:
-	@${REINPLACE_CMD} s+/bin/bash+/usr/local/bin/bash+g ${WRKSRC}/src/config*
+	@${REINPLACE_CMD} s+/bin/bash+${LOCALBASE}/bin/bash+g ${WRKSRC}/src/config*

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-ident/Makefile
+++ b/math/octave-forge-ident/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-ident
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-ident
 PORTVERSION=	1.0.7
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-image/Makefile
+++ b/math/octave-forge-image/Makefile
@ -16,8 +16,8 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src

 RUN_DEPENDS+=	${TARBALLS_DIR}/signal.tar.gz:${PORTSDIR}/math/octave-forge-signal

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-patch:
 	${REINPLACE_CMD} s/-Wall// ${WRKSRC}/Makefile

@ -25,4 +25,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-informationtheory/Makefile
+++ b/math/octave-forge-informationtheory/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-informationtheory
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-informationtheory
 PORTVERSION=	0.1.8
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-informationtheory/pkg-descr
+++ b/math/octave-forge-informationtheory/pkg-descr
@ -5,6 +5,7 @@ build and install scripts.

 This is informationtheory.

- Functions and routines for basic Information Theory definitions, and source coding.
+ Functions and routines for basic Information Theory definitions, and source
+ coding.

 WWW: http://octave.sourceforge.net/
--- a/math/octave-forge-integration/Makefile
+++ b/math/octave-forge-integration/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-integration
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-integration
 PORTVERSION=	1.0.7
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-io/Makefile
+++ b/math/octave-forge-io/Makefile
@ -14,10 +14,10 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-irsa/Makefile
+++ b/math/octave-forge-irsa/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-irsa
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-irsa
 PORTVERSION=	1.0.7
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-java/Makefile
+++ b/math/octave-forge-java/Makefile
@ -20,12 +20,12 @@ CONFIGURE_ENV+=	JAVA_HOME=${JAVA_HOME}
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 MAKE_ENV+=	MKOCTFILE=mkoctfile

-BROKEN=		does not work with openjdk ,and will soon be part of octave base
+BROKEN=		does not work with openjdk, and will soon be part of octave base

 RUN_DEPENDS+=	${TARBALLS_DIR}/signal.tar.gz:${PORTSDIR}/math/octave-forge-signal

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-patch:
 	${REINPLACE_CMD} 's+/client/libjvm.so+/server/libjvm.so+' ${WRKSRC}/__java__.cc
 	${REINPLACE_CMD} 's|getenv ("JAVA_HOME")|"${JAVA_HOME}"|' ${WRKDIR}/java/pre_install.m
@ -34,4 +34,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-linear-algebra/Makefile
+++ b/math/octave-forge-linear-algebra/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-linear-algebra
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-linear-algebra
 PORTVERSION=	2.2.0
@ -20,10 +16,10 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src

 RUN_DEPENDS+=	${TARBALLS_DIR}/general.tar.gz:${PORTSDIR}/math/octave-forge-general

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-lssa/Makefile
+++ b/math/octave-forge-lssa/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-lssa
-# Date created:		14 August 2012
-# Whom:			Stephen Montgomery-Smith <stephen@FreeBSD.org>
-#
+# Created by: Stephen Montgomery-Smith <stephen@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-lssa
 PORTVERSION=	0.1.2
@ -18,10 +14,10 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-mapping/Makefile
+++ b/math/octave-forge-mapping/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-mapping
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-mapping
 PORTVERSION=	1.0.7
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-mechanics/Makefile
+++ b/math/octave-forge-mechanics/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-mechanics
-# Date created:		27 September 2011
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-mechanics
 PORTVERSION=	1.3.1
@ -22,11 +18,10 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/inst/molecularDynamics/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"

 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-miscellaneous/Makefile
+++ b/math/octave-forge-miscellaneous/Makefile
@ -14,10 +14,9 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-RUN_DEPENDS+=   ${TARBALLS_DIR}/general.tar.gz:${PORTSDIR}/math/octave-forge-general
+RUN_DEPENDS+=	${TARBALLS_DIR}/general.tar.gz:${PORTSDIR}/math/octave-forge-general

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"

 MAKE_ENV+=	MKOCTFILE=mkoctfile

@ -25,4 +24,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-missing-functions/Makefile
+++ b/math/octave-forge-missing-functions/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-missing-functions
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-missing-functions
 PORTVERSION=	1.0.2
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-msh/Makefile
+++ b/math/octave-forge-msh/Makefile
@ -15,8 +15,8 @@ OCTSRC=		${DISTNAME}
 RUN_DEPENDS+=	${TARBALLS_DIR}/splines.tar.gz:${PORTSDIR}/math/octave-forge-splines
 RUN_DEPENDS+=	gmsh:${PORTSDIR}/cad/gmsh

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -24,4 +24,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-multicore/Makefile
+++ b/math/octave-forge-multicore/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-multicore
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-multicore
 PORTVERSION=	0.2.15
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-nan/Makefile
+++ b/math/octave-forge-nan/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-nan
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-nan
 PORTVERSION=	2.5.5
@ -19,8 +15,7 @@ OCTSRC=		NaN

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"

 ALL_TARGET=	octave

@ -28,4 +23,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-ncarray/Makefile
+++ b/math/octave-forge-ncarray/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-ncarray
-# Date created:		20 July 2012
-# Whom:			Stephen Montgomery-Smith <stephen@FreeBSD.org>
-#
+# Created by: Stephen Montgomery-Smith <stephen@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-ncarray
 PORTVERSION=	1.0.0
@ -20,8 +16,8 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src

 RUN_DEPENDS+=	${TARBALLS_DIR}/octcdf.tar.gz:${PORTSDIR}/math/octave-forge-octcdf

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -29,4 +25,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-nlwing2/Makefile
+++ b/math/octave-forge-nlwing2/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-nlwing2
-# Date created:		11 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-nlwing2
 PORTVERSION=	1.2.0
@ -19,10 +15,10 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-nnet/Makefile
+++ b/math/octave-forge-nnet/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-nnet
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-nnet
 PORTVERSION=	0.1.13
@ -17,8 +13,8 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${OCTAVE_PKGNAME}

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -26,4 +22,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-nurbs/Makefile
+++ b/math/octave-forge-nurbs/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-nurbs
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-nurbs
 PORTVERSION=	1.3.7
@ -18,10 +14,10 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-ocs/Makefile
+++ b/math/octave-forge-ocs/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-ocs
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-ocs
 PORTVERSION=	0.1.3
@ -21,10 +17,10 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src

 RUN_DEPENDS+=	${TARBALLS_DIR}/odepkg.tar.gz:${PORTSDIR}/math/octave-forge-odepkg

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-oct2mat/Makefile
+++ b/math/octave-forge-oct2mat/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-oct2mat
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-oct2mat
 PORTVERSION=	1.0.7
@ -12,10 +8,10 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

 RUN_DEPENDS+=	${TARBALLS_DIR}/io.tar.gz:${PORTSDIR}/math/octave-forge-io

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-octcdf/Makefile
+++ b/math/octave-forge-octcdf/Makefile
@ -16,10 +16,10 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src

 LIB_DEPENDS+=	netcdf:${PORTSDIR}/science/netcdf

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-octclip/Makefile
+++ b/math/octave-forge-octclip/Makefile
@ -14,8 +14,8 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=	${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-patch:
 	${REINPLACE_CMD} -e s/CC/MKOCTFILE/ -e s/-Wall// -e s/-Wextra// ${WRKSRC}/Makefile

@ -23,4 +23,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-octgpr/Makefile
+++ b/math/octave-forge-octgpr/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-octgpr
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-octgpr
 PORTVERSION=	1.2.0
@ -20,10 +16,10 @@ OCTSRC=		${OCTAVE_PKGNAME}
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-octproj/Makefile
+++ b/math/octave-forge-octproj/Makefile
@ -16,8 +16,8 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src

 LIB_DEPENDS+=	proj:${PORTSDIR}/graphics/proj

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-patch:
 	${REINPLACE_CMD} -e s/CC/MKOCTFILE/ -e s/-Wall// -e s/-Wextra// ${WRKSRC}/Makefile

@ -25,4 +25,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-odebvp/Makefile
+++ b/math/octave-forge-odebvp/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-odebvp
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-odebvp
 PORTVERSION=	1.0.6
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-odepkg/Makefile
+++ b/math/octave-forge-odepkg/Makefile
@ -14,11 +14,10 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"

 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-optim/Makefile
+++ b/math/octave-forge-optim/Makefile
@ -17,10 +17,10 @@ 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

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-optiminterp/Makefile
+++ b/math/octave-forge-optiminterp/Makefile
@ -14,8 +14,7 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"

 MAKE_ENV+=	MKOCTFILE_FORTRAN_90=yes MKOCTFILE=mkoctfile

@ -23,4 +22,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-outliers/Makefile
+++ b/math/octave-forge-outliers/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-outliers
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-outliers
 PORTVERSION=	0.13.9
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-parallel/Makefile
+++ b/math/octave-forge-parallel/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-parallel
-# Date created:		6 June 2010
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-parallel
 PORTVERSION=	2.0.5
@ -20,10 +16,10 @@ OCTSRC=		${DISTNAME}
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-pdb/Makefile
+++ b/math/octave-forge-pdb/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-pdb
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-pdb
 PORTVERSION=	1.0.7
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-plot/Makefile
+++ b/math/octave-forge-plot/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-plot
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-plot
 PORTVERSION=	1.1.0
@ -17,8 +13,8 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${OCTAVE_PKGNAME}

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -26,4 +22,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-pt_br/Makefile
+++ b/math/octave-forge-pt_br/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-pt_br
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-pt_br
 PORTVERSION=	1.0.9
@ -19,10 +15,10 @@ OCTSRC=		pt_BR

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-quaternion/Makefile
+++ b/math/octave-forge-quaternion/Makefile
@ -14,10 +14,10 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-queueing/Makefile
+++ b/math/octave-forge-queueing/Makefile
@ -12,8 +12,7 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${OCTAVE_PKGNAME}

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"

 do-build:
 	@${DO_NADA}
@ -22,4 +21,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-secs1d/Makefile
+++ b/math/octave-forge-secs1d/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-secs1d
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-secs1d
 PORTVERSION=	0.0.9
@ -19,8 +15,8 @@ OCTSRC=		${DISTNAME}

 RUN_DEPENDS+=	${TARBALLS_DIR}/bim.tar.gz:${PORTSDIR}/math/octave-forge-bim

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -28,4 +24,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-secs2d/Makefile
+++ b/math/octave-forge-secs2d/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-secs2d
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-secs2d
 PORTVERSION=	0.0.8
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-secs3d/Makefile
+++ b/math/octave-forge-secs3d/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-secs3d
-# Date created:		12 September 2011
-# Whom:			Stephen Montgomery-Smith <stephen@FreeBSD.org>
-#
+# Created by: Stephen Montgomery-Smith <stephen@FreeBSD.org>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-secs3d
 PORTVERSION=	0.0.1
@ -20,8 +16,8 @@ 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

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -29,4 +25,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-signal/Makefile
+++ b/math/octave-forge-signal/Makefile
@ -18,8 +18,8 @@ RUN_DEPENDS+=	${TARBALLS_DIR}/specfun.tar.gz:${PORTSDIR}/math/octave-forge-specf
 RUN_DEPENDS+=	${TARBALLS_DIR}/control.tar.gz:${PORTSDIR}/math/octave-forge-control
 RUN_DEPENDS+=	${TARBALLS_DIR}/general.tar.gz:${PORTSDIR}/math/octave-forge-general

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-patch:
 	${REINPLACE_CMD} s/-Wall// ${WRKSRC}/Makefile

@ -27,4 +27,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-simp/Makefile
+++ b/math/octave-forge-simp/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-simp
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-simp
 PORTVERSION=	1.1.0
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-sockets/Makefile
+++ b/math/octave-forge-sockets/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-sockets
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-sockets
 PORTVERSION=	1.0.8
@ -20,8 +16,8 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src

 BUILD_DEPENDS+=	gsed:${PORTSDIR}/textproc/gsed

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-patch:
 	${REINPLACE_CMD} 's/sed/gsed/g' ${WRKSRC}/Makefile

@ -29,4 +25,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-specfun/Makefile
+++ b/math/octave-forge-specfun/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-specfun
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-specfun
 PORTVERSION=	1.1.0
@ -19,10 +15,10 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-special-matrix/Makefile
+++ b/math/octave-forge-special-matrix/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-special-matrix
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-special-matrix
 PORTVERSION=	1.0.7
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-spline-gcvspl/Makefile
+++ b/math/octave-forge-spline-gcvspl/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-spline-gcvspl
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-spline-gcvspl
 PORTVERSION=	1.0.8
@ -12,10 +8,10 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

 NO_CDROM=	Non-commercial use only

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-splines/Makefile
+++ b/math/octave-forge-splines/Makefile
@ -14,8 +14,8 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -23,4 +23,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-statistics/Makefile
+++ b/math/octave-forge-statistics/Makefile
@ -14,8 +14,8 @@ OCTSRC=		${OCTAVE_PKGNAME}

 RUN_DEPENDS+=	${TARBALLS_DIR}/io.tar.gz:${PORTSDIR}/math/octave-forge-io

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 do-build:
 	@${DO_NADA}

@ -23,4 +23,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-strings/Makefile
+++ b/math/octave-forge-strings/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-strings
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-strings
 PORTVERSION=	1.1.0
@ -19,10 +15,10 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-struct/Makefile
+++ b/math/octave-forge-struct/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-struct
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-struct
 PORTVERSION=	1.0.10
@ -19,10 +15,10 @@ OCTSRC=		${DISTNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-symband/Makefile
+++ b/math/octave-forge-symband/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-symband
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-symband
 PORTVERSION=	1.0.10
@ -12,8 +8,8 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-symbolic/Makefile
+++ b/math/octave-forge-symbolic/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-symbolic
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-symbolic
 PORTVERSION=	1.1.0
@ -21,10 +17,10 @@ LIB_DEPENDS+=	ginac:${PORTSDIR}/math/GiNaC

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+
 post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-tcl-octave/Makefile
+++ b/math/octave-forge-tcl-octave/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-tcl-octave
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-tcl-octave
 PORTVERSION=	0.1.8
@ -12,10 +8,10 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

 USE_TCL_WRAPPER=	yes

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-tsa/Makefile
+++ b/math/octave-forge-tsa/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-tsa
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-tsa
 PORTVERSION=	4.2.4
@ -19,8 +15,7 @@ OCTSRC=		${OCTAVE_PKGNAME}

 WRKSRC=		${WRKDIR}/${OCTSRC}/src

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"

 ALL_TARGET=	octave

@ -28,4 +23,4 @@ post-build:
 	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/math/octave-forge-video/Makefile
+++ b/math/octave-forge-video/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-video
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-video
 PORTVERSION=	1.0.2
@ -12,10 +8,10 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

 LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-xraylib/Makefile
+++ b/math/octave-forge-xraylib/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-xraylib
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-xraylib
 PORTVERSION=	1.0.8
@ -12,16 +8,16 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

 BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/bash

 post-patch:
-	@${REINPLACE_CMD} s+/bin/bash+/usr/local/bin/bash+g ${WRKSRC}/src/xraylib/src/*.sh
-	@${REINPLACE_CMD} s+/bin/bash+/usr/local/bin/bash+g ${WRKSRC}/src/xraylib/src/Makefile
-	@${REINPLACE_CMD} s+/bin/bash+/usr/local/bin/bash+g ${WRKSRC}/src/xraylib/bin/xraylib
-	@${REINPLACE_CMD} s+/bin/bash+/usr/local/bin/bash+g ${WRKSRC}/src/xraylib/*.sh
+	@${REINPLACE_CMD} s+/bin/bash+${LOCALBASE}/bin/bash+g ${WRKSRC}/src/xraylib/src/*.sh
+	@${REINPLACE_CMD} s+/bin/bash+${LOCALBASE}/bin/bash+g ${WRKSRC}/src/xraylib/src/Makefile
+	@${REINPLACE_CMD} s+/bin/bash+${LOCALBASE}/bin/bash+g ${WRKSRC}/src/xraylib/bin/xraylib
+	@${REINPLACE_CMD} s+/bin/bash+${LOCALBASE}/bin/bash+g ${WRKSRC}/src/xraylib/*.sh

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>
--- a/math/octave-forge-zenity/Makefile
+++ b/math/octave-forge-zenity/Makefile
@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-zenity
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen@math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
-#

 PORTNAME=	octave-forge-zenity
 PORTVERSION=	0.5.7
@ -12,10 +8,10 @@ CATEGORIES=	math

 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
+
 GNU_CONFIGURE=	yes

 RUN_DEPENDS+=	zenity:${PORTSDIR}/x11/zenity

-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>