svn commit: r322356 - in head: benchmarks/octave-forge-benchmark math/octave-forge-actuarial math/octave-forge-ad math/octave-forge-audio math/octave-forge-base math/octave-forge-bim math/octave-fo...

Fri Jul 5 20:59:53 UTC 2013

Author: stephen
Date: Fri Jul  5 20:59:44 2013
New Revision: 322356
URL: http://svnweb.freebsd.org/changeset/ports/322356

Log:
  - 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.

Modified:
  head/benchmarks/octave-forge-benchmark/Makefile
  head/math/octave-forge-actuarial/Makefile
  head/math/octave-forge-ad/Makefile
  head/math/octave-forge-audio/Makefile
  head/math/octave-forge-base/Makefile
  head/math/octave-forge-bim/Makefile
  head/math/octave-forge-bioinfo/Makefile
  head/math/octave-forge-cgi/Makefile
  head/math/octave-forge-civil-engineering/Makefile
  head/math/octave-forge-communications/Makefile
  head/math/octave-forge-control/Makefile
  head/math/octave-forge-data-smoothing/Makefile
  head/math/octave-forge-database/Makefile
  head/math/octave-forge-dataframe/Makefile
  head/math/octave-forge-dicom/Makefile
  head/math/octave-forge-econometrics/Makefile
  head/math/octave-forge-engine/Makefile
  head/math/octave-forge-es/Makefile
  head/math/octave-forge-fenv/Makefile
  head/math/octave-forge-financial/Makefile
  head/math/octave-forge-fits/Makefile
  head/math/octave-forge-fl-core/Makefile
  head/math/octave-forge-fpl/Makefile
  head/math/octave-forge-fuzzy-logic-toolkit/Makefile
  head/math/octave-forge-ga/Makefile
  head/math/octave-forge-general/Makefile
  head/math/octave-forge-generate_html/Makefile
  head/math/octave-forge-geometry/Makefile
  head/math/octave-forge-gnuplot/Makefile
  head/math/octave-forge-gsl/Makefile
  head/math/octave-forge-ident/Makefile
  head/math/octave-forge-image/Makefile
  head/math/octave-forge-informationtheory/Makefile
  head/math/octave-forge-informationtheory/pkg-descr
  head/math/octave-forge-integration/Makefile
  head/math/octave-forge-io/Makefile
  head/math/octave-forge-irsa/Makefile
  head/math/octave-forge-java/Makefile
  head/math/octave-forge-linear-algebra/Makefile
  head/math/octave-forge-lssa/Makefile
  head/math/octave-forge-mapping/Makefile
  head/math/octave-forge-mechanics/Makefile
  head/math/octave-forge-miscellaneous/Makefile
  head/math/octave-forge-missing-functions/Makefile
  head/math/octave-forge-msh/Makefile
  head/math/octave-forge-multicore/Makefile
  head/math/octave-forge-nan/Makefile
  head/math/octave-forge-ncarray/Makefile
  head/math/octave-forge-nlwing2/Makefile
  head/math/octave-forge-nnet/Makefile
  head/math/octave-forge-nurbs/Makefile
  head/math/octave-forge-ocs/Makefile
  head/math/octave-forge-oct2mat/Makefile
  head/math/octave-forge-octcdf/Makefile
  head/math/octave-forge-octclip/Makefile
  head/math/octave-forge-octgpr/Makefile
  head/math/octave-forge-octproj/Makefile
  head/math/octave-forge-odebvp/Makefile
  head/math/octave-forge-odepkg/Makefile
  head/math/octave-forge-optim/Makefile
  head/math/octave-forge-optiminterp/Makefile
  head/math/octave-forge-outliers/Makefile
  head/math/octave-forge-parallel/Makefile
  head/math/octave-forge-pdb/Makefile
  head/math/octave-forge-plot/Makefile
  head/math/octave-forge-pt_br/Makefile
  head/math/octave-forge-quaternion/Makefile
  head/math/octave-forge-queueing/Makefile
  head/math/octave-forge-secs1d/Makefile
  head/math/octave-forge-secs2d/Makefile
  head/math/octave-forge-secs3d/Makefile
  head/math/octave-forge-signal/Makefile
  head/math/octave-forge-simp/Makefile
  head/math/octave-forge-sockets/Makefile
  head/math/octave-forge-specfun/Makefile
  head/math/octave-forge-special-matrix/Makefile
  head/math/octave-forge-spline-gcvspl/Makefile
  head/math/octave-forge-splines/Makefile
  head/math/octave-forge-statistics/Makefile
  head/math/octave-forge-strings/Makefile
  head/math/octave-forge-struct/Makefile
  head/math/octave-forge-symband/Makefile
  head/math/octave-forge-symbolic/Makefile
  head/math/octave-forge-tcl-octave/Makefile
  head/math/octave-forge-tsa/Makefile
  head/math/octave-forge-video/Makefile
  head/math/octave-forge-xraylib/Makefile
  head/math/octave-forge-zenity/Makefile

Modified: head/benchmarks/octave-forge-benchmark/Makefile
==============================================================================

--- head/benchmarks/octave-forge-benchmark/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/benchmarks/octave-forge-benchmark/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-benchmark
-# Date created:		11 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-benchmark
 PORTVERSION=	1.1.1
@@ -13,6 +9,5 @@ CATEGORIES=	benchmarks math
 MAINTAINER=	stephen at 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>

Modified: head/math/octave-forge-actuarial/Makefile
==============================================================================
--- head/math/octave-forge-actuarial/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-actuarial/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-actuarial
-# Date created:		2 June 2010
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-actuarial
 PORTVERSION=	1.1.0
@@ -17,8 +13,8 @@ COMMENT=	Octave-forge package ${OCTAVE_P
 # 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>

Modified: head/math/octave-forge-ad/Makefile
==============================================================================
--- head/math/octave-forge-ad/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-ad/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-ad
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-ad
 PORTVERSION=	1.0.6
@@ -16,6 +12,5 @@ COMMENT=	Octave-forge package ${OCTAVE_P
 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>

Modified: head/math/octave-forge-audio/Makefile
==============================================================================
--- head/math/octave-forge-audio/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-audio/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-audio
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-audio
 PORTVERSION=	1.1.4
@@ -12,8 +8,8 @@ CATEGORIES=	math
 
 MAINTAINER=	stephen at 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>

Modified: head/math/octave-forge-base/Makefile
==============================================================================
--- head/math/octave-forge-base/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-base/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-base
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-base
 PORTVERSION=	1.2

Modified: head/math/octave-forge-bim/Makefile
==============================================================================
--- head/math/octave-forge-bim/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-bim/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -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>

Modified: head/math/octave-forge-bioinfo/Makefile
==============================================================================
--- head/math/octave-forge-bioinfo/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-bioinfo/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-bioinfo
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-bioinfo
 PORTVERSION=	0.1.2
@@ -12,8 +8,8 @@ CATEGORIES=	math
 
 MAINTAINER=	stephen at 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>

Modified: head/math/octave-forge-cgi/Makefile
==============================================================================
--- head/math/octave-forge-cgi/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-cgi/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -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>

Modified: head/math/octave-forge-civil-engineering/Makefile
==============================================================================
--- head/math/octave-forge-civil-engineering/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-civil-engineering/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-civil-engineering
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-civil-engineering
 PORTVERSION=	1.0.7
@@ -12,8 +8,8 @@ CATEGORIES=	math
 
 MAINTAINER=	stephen at 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>

Modified: head/math/octave-forge-communications/Makefile
==============================================================================
--- head/math/octave-forge-communications/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-communications/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-communications
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at 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>

Modified: head/math/octave-forge-control/Makefile
==============================================================================
--- head/math/octave-forge-control/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-control/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -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>

Modified: head/math/octave-forge-data-smoothing/Makefile
==============================================================================
--- head/math/octave-forge-data-smoothing/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-data-smoothing/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-data-smoothing
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at 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>

Modified: head/math/octave-forge-database/Makefile
==============================================================================
--- head/math/octave-forge-database/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-database/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -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>

Modified: head/math/octave-forge-dataframe/Makefile
==============================================================================
--- head/math/octave-forge-dataframe/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-dataframe/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-dataframe
-# Date created:		26 August 2010
-# Whom:			Stephen Montgomery-Smith <stephen at missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-dataframe
 PORTVERSION=	0.9.1
@@ -17,8 +13,8 @@ COMMENT=	Octave-forge package ${OCTAVE_P
 # 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>

Modified: head/math/octave-forge-dicom/Makefile
==============================================================================
--- head/math/octave-forge-dicom/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-dicom/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-dicom
-# Date created:		26 December 2011
-# Whom:			Stephen Montgomery-Smith <stephen at FreeBSD.org>
-#
+# Created by: Stephen Montgomery-Smith <stephen at 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>

Modified: head/math/octave-forge-econometrics/Makefile
==============================================================================
--- head/math/octave-forge-econometrics/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-econometrics/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -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>

Modified: head/math/octave-forge-engine/Makefile
==============================================================================
--- head/math/octave-forge-engine/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-engine/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-engine
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-engine
 PORTVERSION=	1.0.9
@@ -12,9 +8,8 @@ CATEGORIES=	math
 
 MAINTAINER=	stephen at FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
-GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
+GNU_CONFIGURE=	yes
 
-.include "${PORTSDIR}/Mk/bsd.octave.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../Mk/bsd.octave.mk"
+.include <bsd.port.mk>

Modified: head/math/octave-forge-es/Makefile
==============================================================================
--- head/math/octave-forge-es/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-es/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -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>

Modified: head/math/octave-forge-fenv/Makefile
==============================================================================
--- head/math/octave-forge-fenv/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-fenv/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-fenv
-# Date created:		6 June 2010
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at 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>

Modified: head/math/octave-forge-financial/Makefile
==============================================================================
--- head/math/octave-forge-financial/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-financial/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-financial
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at 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>

Modified: head/math/octave-forge-fits/Makefile
==============================================================================
--- head/math/octave-forge-fits/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-fits/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-fits
-# Date created:		13 Janurary 2011
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at 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>

Modified: head/math/octave-forge-fl-core/Makefile
==============================================================================
--- head/math/octave-forge-fl-core/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-fl-core/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-fl-core
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at 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>

Modified: head/math/octave-forge-fpl/Makefile
==============================================================================
--- head/math/octave-forge-fpl/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-fpl/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -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>

Modified: head/math/octave-forge-fuzzy-logic-toolkit/Makefile
==============================================================================
--- head/math/octave-forge-fuzzy-logic-toolkit/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-fuzzy-logic-toolkit/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,4 +1,4 @@
-# Created by:	Stephen Montgomery-Smith <stephen at math.missouri.edu>
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
 
 PORTNAME=	octave-forge-fuzzy-logic-toolkit
@@ -12,8 +12,8 @@ COMMENT=	Octave-forge package ${OCTAVE_P
 # 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>

Modified: head/math/octave-forge-ga/Makefile
==============================================================================
--- head/math/octave-forge-ga/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-ga/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-ga
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-ga
 PORTVERSION=	0.10.0
@@ -17,8 +13,8 @@ COMMENT=	Octave-forge package ${OCTAVE_P
 # 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>

Modified: head/math/octave-forge-general/Makefile
==============================================================================
--- head/math/octave-forge-general/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-general/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-general
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at 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>

Modified: head/math/octave-forge-generate_html/Makefile
==============================================================================
--- head/math/octave-forge-generate_html/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-generate_html/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -12,8 +12,8 @@ COMMENT=	Octave-forge package ${OCTAVE_P
 # 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>

Modified: head/math/octave-forge-geometry/Makefile
==============================================================================
--- head/math/octave-forge-geometry/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-geometry/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -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>

Modified: head/math/octave-forge-gnuplot/Makefile
==============================================================================
--- head/math/octave-forge-gnuplot/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-gnuplot/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-gnuplot
-# Date created:		6 June 2010
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-gnuplot
 PORTVERSION=	1.0.1
@@ -17,8 +13,8 @@ COMMENT=	Octave-forge package ${OCTAVE_P
 # 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>

Modified: head/math/octave-forge-gsl/Makefile
==============================================================================
--- head/math/octave-forge-gsl/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-gsl/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-gsl
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-gsl
 PORTVERSION=	1.0.8
@@ -12,13 +8,13 @@ CATEGORIES=	math
 
 MAINTAINER=	stephen at FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
-GNU_CONFIGURE=	yes
 
-LIB_DEPENDS=	gsl.16:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	gsl:${PORTSDIR}/math/gsl
+
+GNU_CONFIGURE=	yes
 
 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>

Modified: head/math/octave-forge-ident/Makefile
==============================================================================
--- head/math/octave-forge-ident/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-ident/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-ident
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-ident
 PORTVERSION=	1.0.7
@@ -12,8 +8,8 @@ CATEGORIES=	math
 
 MAINTAINER=	stephen at 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>

Modified: head/math/octave-forge-image/Makefile
==============================================================================
--- head/math/octave-forge-image/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-image/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -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>

Modified: head/math/octave-forge-informationtheory/Makefile
==============================================================================
--- head/math/octave-forge-informationtheory/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-informationtheory/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-informationtheory
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-informationtheory
 PORTVERSION=	0.1.8
@@ -12,8 +8,8 @@ CATEGORIES=	math
 
 MAINTAINER=	stephen at 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>

Modified: head/math/octave-forge-informationtheory/pkg-descr
==============================================================================
--- head/math/octave-forge-informationtheory/pkg-descr	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-informationtheory/pkg-descr	Fri Jul  5 20:59:44 2013	(r322356)
@@ -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/

Modified: head/math/octave-forge-integration/Makefile
==============================================================================
--- head/math/octave-forge-integration/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-integration/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-integration
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-integration
 PORTVERSION=	1.0.7
@@ -12,8 +8,8 @@ CATEGORIES=	math
 
 MAINTAINER=	stephen at 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>

Modified: head/math/octave-forge-io/Makefile
==============================================================================
--- head/math/octave-forge-io/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-io/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -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>

Modified: head/math/octave-forge-irsa/Makefile
==============================================================================
--- head/math/octave-forge-irsa/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-irsa/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-irsa
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-irsa
 PORTVERSION=	1.0.7
@@ -12,8 +8,8 @@ CATEGORIES=	math
 
 MAINTAINER=	stephen at 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>

Modified: head/math/octave-forge-java/Makefile
==============================================================================
--- head/math/octave-forge-java/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-java/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -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>

Modified: head/math/octave-forge-linear-algebra/Makefile
==============================================================================
--- head/math/octave-forge-linear-algebra/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-linear-algebra/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-linear-algebra
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at 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>

Modified: head/math/octave-forge-lssa/Makefile
==============================================================================
--- head/math/octave-forge-lssa/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-lssa/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-lssa
-# Date created:		14 August 2012
-# Whom:			Stephen Montgomery-Smith <stephen at FreeBSD.org>
-#
+# Created by: Stephen Montgomery-Smith <stephen at 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>

Modified: head/math/octave-forge-mapping/Makefile
==============================================================================
--- head/math/octave-forge-mapping/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-mapping/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-mapping
-# Date created:		8 September 2008
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at math.missouri.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	octave-forge-mapping
 PORTVERSION=	1.0.7
@@ -12,8 +8,8 @@ CATEGORIES=	math
 
 MAINTAINER=	stephen at 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>

Modified: head/math/octave-forge-mechanics/Makefile
==============================================================================
--- head/math/octave-forge-mechanics/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-mechanics/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	octave-forge-mechanics
-# Date created:		27 September 2011
-# Whom:			Stephen Montgomery-Smith <stephen at math.missouri.edu>
-#
+# Created by: Stephen Montgomery-Smith <stephen at 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>

Modified: head/math/octave-forge-miscellaneous/Makefile
==============================================================================
--- head/math/octave-forge-miscellaneous/Makefile	Fri Jul  5 20:15:48 2013	(r322355)
+++ head/math/octave-forge-miscellaneous/Makefile	Fri Jul  5 20:59:44 2013	(r322356)
@@ -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>

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
