git: bedd5ac5f967 - main - Mk/bsd.octave.mk: move some functions from mk to ports.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 21 Oct 2022 17:07:57 UTC
The branch main has been updated by stephen:
URL: https://cgit.FreeBSD.org/ports/commit/?id=bedd5ac5f96745b0f053badafc40ad6a5f6adcd1
commit bedd5ac5f96745b0f053badafc40ad6a5f6adcd1
Author: Stephen Montgomery-Smith <stephen@FreeBSD.org>
AuthorDate: 2022-10-21 17:06:13 +0000
Commit: Stephen Montgomery-Smith <stephen@FreeBSD.org>
CommitDate: 2022-10-21 17:06:13 +0000
Mk/bsd.octave.mk: move some functions from mk to ports.
---
Mk/bsd.octave.mk | 12 ------------
benchmarks/octave-forge-benchmark/Makefile | 4 ++--
math/octave-forge-actuarial/Makefile | 2 ++
math/octave-forge-audio/Makefile | 2 ++
math/octave-forge-bim/Makefile | 2 ++
math/octave-forge-bioinfo/Makefile | 4 ++--
math/octave-forge-bsltl/Makefile | 2 ++
math/octave-forge-cgi/Makefile | 2 ++
math/octave-forge-civil-engineering/Makefile | 4 ++--
math/octave-forge-communications/Makefile | 2 ++
math/octave-forge-control/Makefile | 2 ++
math/octave-forge-data-smoothing/Makefile | 2 ++
math/octave-forge-database/Makefile | 2 ++
math/octave-forge-dataframe/Makefile | 2 ++
math/octave-forge-dicom/Makefile | 2 ++
math/octave-forge-divand/Makefile | 2 ++
math/octave-forge-doctest/Makefile | 2 ++
math/octave-forge-econometrics/Makefile | 2 ++
math/octave-forge-fenv/Makefile | 2 ++
math/octave-forge-financial/Makefile | 2 ++
math/octave-forge-fits/Makefile | 2 ++
math/octave-forge-fpl/Makefile | 2 ++
math/octave-forge-fuzzy-logic-toolkit/Makefile | 2 ++
math/octave-forge-ga/Makefile | 2 ++
math/octave-forge-general/Makefile | 2 ++
math/octave-forge-generate_html/Makefile | 2 ++
math/octave-forge-geometry/Makefile | 2 ++
math/octave-forge-gnuplot/Makefile | 2 ++
math/octave-forge-gsl/Makefile | 2 ++
math/octave-forge-ident/Makefile | 4 ++--
math/octave-forge-image/Makefile | 2 ++
math/octave-forge-informationtheory/Makefile | 4 ++--
math/octave-forge-integration/Makefile | 4 ++--
math/octave-forge-interval/Makefile | 2 ++
math/octave-forge-io/Makefile | 2 ++
math/octave-forge-irsa/Makefile | 4 ++--
math/octave-forge-level-set/Makefile | 2 ++
math/octave-forge-linear-algebra/Makefile | 2 ++
math/octave-forge-lssa/Makefile | 2 ++
math/octave-forge-ltfat/Makefile | 2 ++
math/octave-forge-mapping/Makefile | 2 ++
math/octave-forge-matgeom/Makefile | 2 ++
math/octave-forge-mechanics/Makefile | 2 ++
math/octave-forge-miscellaneous/Makefile | 2 ++
math/octave-forge-missing-functions/Makefile | 4 ++--
math/octave-forge-msh/Makefile | 2 ++
math/octave-forge-multicore/Makefile | 4 ++--
math/octave-forge-mvn/Makefile | 2 ++
math/octave-forge-nan/Makefile | 2 ++
math/octave-forge-ncarray/Makefile | 2 ++
math/octave-forge-netcdf/Makefile | 2 ++
math/octave-forge-nlwing2/Makefile | 2 ++
math/octave-forge-nnet/Makefile | 2 ++
math/octave-forge-nurbs/Makefile | 2 ++
math/octave-forge-oct2mat/Makefile | 4 ++--
math/octave-forge-octclip/Makefile | 2 ++
math/octave-forge-octproj/Makefile | 2 ++
math/octave-forge-odebvp/Makefile | 4 ++--
math/octave-forge-optics/Makefile | 2 ++
math/octave-forge-optim/Makefile | 2 ++
math/octave-forge-optiminterp/Makefile | 2 ++
math/octave-forge-outliers/Makefile | 4 ++--
math/octave-forge-parallel/Makefile | 2 ++
math/octave-forge-plot/Makefile | 2 ++
math/octave-forge-quaternion/Makefile | 2 ++
math/octave-forge-queueing/Makefile | 2 ++
math/octave-forge-secs1d/Makefile | 2 ++
math/octave-forge-secs2d/Makefile | 4 ++--
math/octave-forge-secs3d/Makefile | 2 ++
math/octave-forge-signal/Makefile | 2 ++
math/octave-forge-simp/Makefile | 4 ++--
math/octave-forge-sockets/Makefile | 2 ++
math/octave-forge-sparsersb/Makefile | 2 ++
math/octave-forge-specfun/Makefile | 2 ++
math/octave-forge-special-matrix/Makefile | 4 ++--
math/octave-forge-splines/Makefile | 2 ++
math/octave-forge-statistics/Makefile | 2 ++
math/octave-forge-stk/Makefile | 2 ++
math/octave-forge-strings/Makefile | 2 ++
math/octave-forge-struct/Makefile | 2 ++
math/octave-forge-symband/Makefile | 4 ++--
math/octave-forge-symbolic/Makefile | 2 ++
math/octave-forge-tcl-octave/Makefile | 4 ++--
math/octave-forge-tsa/Makefile | 2 ++
math/octave-forge-video/Makefile | 2 ++
math/octave-forge-zenity/Makefile | 4 ++--
math/octave-forge-zeromq/Makefile | 2 ++
87 files changed, 172 insertions(+), 48 deletions(-)
diff --git a/Mk/bsd.octave.mk b/Mk/bsd.octave.mk
index f66f2937e49e..bb42a8949944 100644
--- a/Mk/bsd.octave.mk
+++ b/Mk/bsd.octave.mk
@@ -6,18 +6,6 @@
# It is, in effect, a wrapper using the package handling already built
# into math/octave.
-.ifndef MASTER_SITES
-. if !empty(MASTER_SITE_OLD:MR2009_05)
-MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
-. elif !empty(MASTER_SITE_OLD:MR2009_06)
-MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-06-07
-. else
-MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
-. endif
-.endif
-
-DISTNAME?= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
-
bsd_octave_mk_MAINTAINER= stephen@FreeBSD.org
BUILD_DEPENDS+= octave:math/octave
diff --git a/benchmarks/octave-forge-benchmark/Makefile b/benchmarks/octave-forge-benchmark/Makefile
index d0c1546b1b14..66874b1991e0 100644
--- a/benchmarks/octave-forge-benchmark/Makefile
+++ b/benchmarks/octave-forge-benchmark/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-benchmark
PORTVERSION= 1.1.1
PORTREVISION= 27
CATEGORIES= benchmarks math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
@@ -10,7 +12,5 @@ WWW= http://octave.sourceforge.net/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-MASTER_SITE_OLD= R2009_05
-
.include "${.CURDIR}/../../Mk/bsd.octave.mk"
.include <bsd.port.mk>
diff --git a/math/octave-forge-actuarial/Makefile b/math/octave-forge-actuarial/Makefile
index ca29f11dbd0e..d66aa3d9f407 100644
--- a/math/octave-forge-actuarial/Makefile
+++ b/math/octave-forge-actuarial/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-actuarial
PORTVERSION= 1.1.0
PORTREVISION= 24
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-audio/Makefile b/math/octave-forge-audio/Makefile
index 073bc7b4c8a8..9d7cdd469040 100644
--- a/math/octave-forge-audio/Makefile
+++ b/math/octave-forge-audio/Makefile
@@ -1,6 +1,8 @@
PORTNAME= octave-forge-audio
PORTVERSION= 2.0.5
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-bim/Makefile b/math/octave-forge-bim/Makefile
index da6150c35fc0..1738f42eeab9 100644
--- a/math/octave-forge-bim/Makefile
+++ b/math/octave-forge-bim/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-bim
PORTVERSION= 1.1.5
PORTREVISION= 16
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-bioinfo/Makefile b/math/octave-forge-bioinfo/Makefile
index 05dcb4ed8bcb..963cd1b8ce5d 100644
--- a/math/octave-forge-bioinfo/Makefile
+++ b/math/octave-forge-bioinfo/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-bioinfo
PORTVERSION= 0.1.2
PORTREVISION= 27
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
@@ -10,8 +12,6 @@ WWW= http://octave.sourceforge.net/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-MASTER_SITE_OLD= R2009_05
-
GNU_CONFIGURE= yes
.include "${.CURDIR}/../../Mk/bsd.octave.mk"
diff --git a/math/octave-forge-bsltl/Makefile b/math/octave-forge-bsltl/Makefile
index c83c3251662d..6bab3823aba6 100644
--- a/math/octave-forge-bsltl/Makefile
+++ b/math/octave-forge-bsltl/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-bsltl
PORTVERSION= 1.3.1
PORTREVISION= 3
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-cgi/Makefile b/math/octave-forge-cgi/Makefile
index 9a85cda728cc..8dfbe454cbef 100644
--- a/math/octave-forge-cgi/Makefile
+++ b/math/octave-forge-cgi/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-cgi
PORTVERSION= 0.1.2
PORTREVISION= 15
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-civil-engineering/Makefile b/math/octave-forge-civil-engineering/Makefile
index c7bc6e5797a5..a4ff5d29cec2 100644
--- a/math/octave-forge-civil-engineering/Makefile
+++ b/math/octave-forge-civil-engineering/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-civil-engineering
PORTVERSION= 1.0.7
PORTREVISION= 27
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
@@ -10,8 +12,6 @@ WWW= http://octave.sourceforge.net/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-MASTER_SITE_OLD= R2009_05
-
GNU_CONFIGURE= yes
.include "${.CURDIR}/../../Mk/bsd.octave.mk"
diff --git a/math/octave-forge-communications/Makefile b/math/octave-forge-communications/Makefile
index a90ddd1217e5..e8bcc0bcb3ad 100644
--- a/math/octave-forge-communications/Makefile
+++ b/math/octave-forge-communications/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-communications
PORTVERSION= 1.2.4
PORTREVISION= 1
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-control/Makefile b/math/octave-forge-control/Makefile
index 0bcc847c81bb..5d23c4cbcd05 100644
--- a/math/octave-forge-control/Makefile
+++ b/math/octave-forge-control/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-control
PORTVERSION= 3.4.0
PORTREVISION= 1
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-data-smoothing/Makefile b/math/octave-forge-data-smoothing/Makefile
index 2e160717af8a..f8490f53030d 100644
--- a/math/octave-forge-data-smoothing/Makefile
+++ b/math/octave-forge-data-smoothing/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-data-smoothing
PORTVERSION= 1.3.0
PORTREVISION= 21
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-database/Makefile b/math/octave-forge-database/Makefile
index 9d2a217677f4..ab12c436146f 100644
--- a/math/octave-forge-database/Makefile
+++ b/math/octave-forge-database/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-database
PORTVERSION= 2.4.4
PORTREVISION= 4
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-dataframe/Makefile b/math/octave-forge-dataframe/Makefile
index 42560ffec34a..3471182c9ab7 100644
--- a/math/octave-forge-dataframe/Makefile
+++ b/math/octave-forge-dataframe/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-dataframe
PORTVERSION= 1.2.0
PORTREVISION= 13
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-dicom/Makefile b/math/octave-forge-dicom/Makefile
index 67c9ce9cb839..c6ec832329e6 100644
--- a/math/octave-forge-dicom/Makefile
+++ b/math/octave-forge-dicom/Makefile
@@ -1,6 +1,8 @@
PORTNAME= octave-forge-dicom
PORTVERSION= 0.5.0
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-divand/Makefile b/math/octave-forge-divand/Makefile
index a93421090d80..897ca0e707b6 100644
--- a/math/octave-forge-divand/Makefile
+++ b/math/octave-forge-divand/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-divand
PORTVERSION= 1.1.2
PORTREVISION= 17
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-doctest/Makefile b/math/octave-forge-doctest/Makefile
index 52ba9b78f9b1..1af256531d03 100644
--- a/math/octave-forge-doctest/Makefile
+++ b/math/octave-forge-doctest/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-doctest
PORTVERSION= 0.7.0
PORTREVISION= 4
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-econometrics/Makefile b/math/octave-forge-econometrics/Makefile
index 630bbd40b461..04ab4391c8ec 100644
--- a/math/octave-forge-econometrics/Makefile
+++ b/math/octave-forge-econometrics/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-econometrics
PORTVERSION= 1.1.2
PORTREVISION= 3
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-fenv/Makefile b/math/octave-forge-fenv/Makefile
index 53eae3f11f9c..cf7dec85070c 100644
--- a/math/octave-forge-fenv/Makefile
+++ b/math/octave-forge-fenv/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-fenv
PORTVERSION= 0.1.0
PORTREVISION= 25
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-financial/Makefile b/math/octave-forge-financial/Makefile
index 0ed43db1eba9..d768607271c2 100644
--- a/math/octave-forge-financial/Makefile
+++ b/math/octave-forge-financial/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-financial
PORTVERSION= 0.5.3
PORTREVISION= 7
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-fits/Makefile b/math/octave-forge-fits/Makefile
index f099335fa933..00b1906b5512 100644
--- a/math/octave-forge-fits/Makefile
+++ b/math/octave-forge-fits/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-fits
PORTVERSION= 1.0.7
PORTREVISION= 17
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-fpl/Makefile b/math/octave-forge-fpl/Makefile
index 4ab771b83c86..86c936d941f5 100644
--- a/math/octave-forge-fpl/Makefile
+++ b/math/octave-forge-fpl/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-fpl
PORTVERSION= 1.3.5
PORTREVISION= 16
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-fuzzy-logic-toolkit/Makefile b/math/octave-forge-fuzzy-logic-toolkit/Makefile
index 2d3f1abcde8f..d736ede5aeb8 100644
--- a/math/octave-forge-fuzzy-logic-toolkit/Makefile
+++ b/math/octave-forge-fuzzy-logic-toolkit/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-fuzzy-logic-toolkit
PORTVERSION= 0.4.6
PORTREVISION= 3
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-ga/Makefile b/math/octave-forge-ga/Makefile
index 9706e5e06972..c5f40ae5da8c 100644
--- a/math/octave-forge-ga/Makefile
+++ b/math/octave-forge-ga/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-ga
PORTVERSION= 0.10.3
PORTREVISION= 1
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-general/Makefile b/math/octave-forge-general/Makefile
index 7a803fde7933..917d70270078 100644
--- a/math/octave-forge-general/Makefile
+++ b/math/octave-forge-general/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-general
PORTVERSION= 2.1.2
PORTREVISION= 1
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-generate_html/Makefile b/math/octave-forge-generate_html/Makefile
index 3342ae671325..a34b6bd501e9 100644
--- a/math/octave-forge-generate_html/Makefile
+++ b/math/octave-forge-generate_html/Makefile
@@ -1,6 +1,8 @@
PORTNAME= octave-forge-generate_html
PORTVERSION= 0.3.3
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-geometry/Makefile b/math/octave-forge-geometry/Makefile
index 95015d6e08c7..4d218e9373be 100644
--- a/math/octave-forge-geometry/Makefile
+++ b/math/octave-forge-geometry/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-geometry
PORTVERSION= 4.0.0
PORTREVISION= 3
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-gnuplot/Makefile b/math/octave-forge-gnuplot/Makefile
index edaee8d12a21..b191db640cc2 100644
--- a/math/octave-forge-gnuplot/Makefile
+++ b/math/octave-forge-gnuplot/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-gnuplot
PORTVERSION= 1.0.1
PORTREVISION= 24
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-gsl/Makefile b/math/octave-forge-gsl/Makefile
index 83f02b2b4c3c..5846329f8aee 100644
--- a/math/octave-forge-gsl/Makefile
+++ b/math/octave-forge-gsl/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-gsl
PORTVERSION= 2.1.1
PORTREVISION= 12
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-ident/Makefile b/math/octave-forge-ident/Makefile
index 7f7d04834b1b..7264f93f9ff9 100644
--- a/math/octave-forge-ident/Makefile
+++ b/math/octave-forge-ident/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-ident
PORTVERSION= 1.0.7
PORTREVISION= 27
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
@@ -10,8 +12,6 @@ WWW= http://octave.sourceforge.net/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-MASTER_SITE_OLD= R2009_05
-
GNU_CONFIGURE= yes
.include "${.CURDIR}/../../Mk/bsd.octave.mk"
diff --git a/math/octave-forge-image/Makefile b/math/octave-forge-image/Makefile
index 7ef65197f7e3..764a322e1635 100644
--- a/math/octave-forge-image/Makefile
+++ b/math/octave-forge-image/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-image
PORTVERSION= 2.14.0
PORTREVISION= 1
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-informationtheory/Makefile b/math/octave-forge-informationtheory/Makefile
index 39e52c8f9da1..26064e719707 100644
--- a/math/octave-forge-informationtheory/Makefile
+++ b/math/octave-forge-informationtheory/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-informationtheory
PORTVERSION= 0.1.8
PORTREVISION= 27
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-06-07
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
@@ -10,8 +12,6 @@ WWW= http://octave.sourceforge.net/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-MASTER_SITE_OLD= R2009_06
-
GNU_CONFIGURE= yes
.include "${.CURDIR}/../../Mk/bsd.octave.mk"
diff --git a/math/octave-forge-integration/Makefile b/math/octave-forge-integration/Makefile
index b4f482f815c8..73bfe2b8f6c6 100644
--- a/math/octave-forge-integration/Makefile
+++ b/math/octave-forge-integration/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-integration
PORTVERSION= 1.0.7
PORTREVISION= 27
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
@@ -10,8 +12,6 @@ WWW= http://octave.sourceforge.net/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-MASTER_SITE_OLD= R2009_05
-
GNU_CONFIGURE= yes
.include "${.CURDIR}/../../Mk/bsd.octave.mk"
diff --git a/math/octave-forge-interval/Makefile b/math/octave-forge-interval/Makefile
index 0cc83831aa3b..3d4f927776f8 100644
--- a/math/octave-forge-interval/Makefile
+++ b/math/octave-forge-interval/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-interval
PORTVERSION= 3.2.1
PORTREVISION= 1
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-io/Makefile b/math/octave-forge-io/Makefile
index 4c5f7dfb75a4..3a8bba312736 100644
--- a/math/octave-forge-io/Makefile
+++ b/math/octave-forge-io/Makefile
@@ -3,6 +3,8 @@ PORTVERSION= 2.6.4
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-irsa/Makefile b/math/octave-forge-irsa/Makefile
index 11e67755285d..b8ece47e90f6 100644
--- a/math/octave-forge-irsa/Makefile
+++ b/math/octave-forge-irsa/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-irsa
PORTVERSION= 1.0.7
PORTREVISION= 27
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
@@ -10,8 +12,6 @@ WWW= http://octave.sourceforge.net/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-MASTER_SITE_OLD= R2009_05
-
GNU_CONFIGURE= yes
.include "${.CURDIR}/../../Mk/bsd.octave.mk"
diff --git a/math/octave-forge-level-set/Makefile b/math/octave-forge-level-set/Makefile
index f97469f5847e..435882c15a70 100644
--- a/math/octave-forge-level-set/Makefile
+++ b/math/octave-forge-level-set/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-level-set
PORTVERSION= 0.3.0
PORTREVISION= 16
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-linear-algebra/Makefile b/math/octave-forge-linear-algebra/Makefile
index 423e6dd3577e..cfab199ac64a 100644
--- a/math/octave-forge-linear-algebra/Makefile
+++ b/math/octave-forge-linear-algebra/Makefile
@@ -3,6 +3,8 @@ PORTVERSION= 2.2.3
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-lssa/Makefile b/math/octave-forge-lssa/Makefile
index 2e3e12fa9560..b813df45d7bc 100644
--- a/math/octave-forge-lssa/Makefile
+++ b/math/octave-forge-lssa/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-lssa
PORTVERSION= 0.1.4
PORTREVISION= 3
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-ltfat/Makefile b/math/octave-forge-ltfat/Makefile
index 33b668284005..3e8fc454377e 100644
--- a/math/octave-forge-ltfat/Makefile
+++ b/math/octave-forge-ltfat/Makefile
@@ -3,6 +3,8 @@ PORTVERSION= 2.3.1
PORTREVISION= 12
PORTEPOCH= 1
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-mapping/Makefile b/math/octave-forge-mapping/Makefile
index 19ec15f55cb6..49bad293fd8d 100644
--- a/math/octave-forge-mapping/Makefile
+++ b/math/octave-forge-mapping/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-mapping
PORTVERSION= 1.4.2
PORTREVISION= 1
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-matgeom/Makefile b/math/octave-forge-matgeom/Makefile
index a8451af95b58..fd1720391588 100644
--- a/math/octave-forge-matgeom/Makefile
+++ b/math/octave-forge-matgeom/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-matgeom
PORTVERSION= 1.2.3
PORTREVISION= 2
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-mechanics/Makefile b/math/octave-forge-mechanics/Makefile
index 6e325df10506..36b04778f52b 100644
--- a/math/octave-forge-mechanics/Makefile
+++ b/math/octave-forge-mechanics/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-mechanics
PORTVERSION= 1.3.1
PORTREVISION= 20
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-miscellaneous/Makefile b/math/octave-forge-miscellaneous/Makefile
index 277a6cbf4839..8c0f4c99e151 100644
--- a/math/octave-forge-miscellaneous/Makefile
+++ b/math/octave-forge-miscellaneous/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-miscellaneous
PORTVERSION= 1.3.0
PORTREVISION= 3
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-missing-functions/Makefile b/math/octave-forge-missing-functions/Makefile
index d116a699ade1..f338fb46608f 100644
--- a/math/octave-forge-missing-functions/Makefile
+++ b/math/octave-forge-missing-functions/Makefile
@@ -2,13 +2,13 @@ PORTNAME= octave-forge-missing-functions
PORTVERSION= 1.0.2
PORTREVISION= 27
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
WWW= http://octave.sourceforge.net/
-MASTER_SITE_OLD= R2009_05
-
GNU_CONFIGURE= yes
.include "${.CURDIR}/../../Mk/bsd.octave.mk"
diff --git a/math/octave-forge-msh/Makefile b/math/octave-forge-msh/Makefile
index d8c91ac0afb9..5c120e276d76 100644
--- a/math/octave-forge-msh/Makefile
+++ b/math/octave-forge-msh/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-msh
PORTVERSION= 1.0.10
PORTREVISION= 18
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-multicore/Makefile b/math/octave-forge-multicore/Makefile
index b899c404ed0f..56c812faa6fb 100644
--- a/math/octave-forge-multicore/Makefile
+++ b/math/octave-forge-multicore/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-multicore
PORTVERSION= 0.2.15
PORTREVISION= 27
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-06-07
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
@@ -10,8 +12,6 @@ WWW= http://octave.sourceforge.net/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-MASTER_SITE_OLD= R2009_06
-
GNU_CONFIGURE= yes
.include "${.CURDIR}/../../Mk/bsd.octave.mk"
diff --git a/math/octave-forge-mvn/Makefile b/math/octave-forge-mvn/Makefile
index bb4104606c6c..2d91b4926167 100644
--- a/math/octave-forge-mvn/Makefile
+++ b/math/octave-forge-mvn/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-mvn
PORTVERSION= 1.1.0
PORTREVISION= 19
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-nan/Makefile b/math/octave-forge-nan/Makefile
index f023a031e114..1a253c15b922 100644
--- a/math/octave-forge-nan/Makefile
+++ b/math/octave-forge-nan/Makefile
@@ -1,6 +1,8 @@
PORTNAME= octave-forge-nan
PORTVERSION= 3.7.0
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-ncarray/Makefile b/math/octave-forge-ncarray/Makefile
index 57069c0c4d31..43cec6f25d4c 100644
--- a/math/octave-forge-ncarray/Makefile
+++ b/math/octave-forge-ncarray/Makefile
@@ -1,6 +1,8 @@
PORTNAME= octave-forge-ncarray
PORTVERSION= 1.0.5
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-netcdf/Makefile b/math/octave-forge-netcdf/Makefile
index 86c445185291..353d97c1c6c6 100644
--- a/math/octave-forge-netcdf/Makefile
+++ b/math/octave-forge-netcdf/Makefile
@@ -1,6 +1,8 @@
PORTNAME= octave-forge-netcdf
PORTVERSION= 1.0.16
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-nlwing2/Makefile b/math/octave-forge-nlwing2/Makefile
index 5a8f4a24cc84..60fa988f0fd0 100644
--- a/math/octave-forge-nlwing2/Makefile
+++ b/math/octave-forge-nlwing2/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-nlwing2
PORTVERSION= 1.2.0
PORTREVISION= 24
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-nnet/Makefile b/math/octave-forge-nnet/Makefile
index 4f1f4d7dd3da..584c2a33d9a8 100644
--- a/math/octave-forge-nnet/Makefile
+++ b/math/octave-forge-nnet/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-nnet
PORTVERSION= 0.1.13
PORTREVISION= 24
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-nurbs/Makefile b/math/octave-forge-nurbs/Makefile
index cb5800c02ef8..9f294607d7f3 100644
--- a/math/octave-forge-nurbs/Makefile
+++ b/math/octave-forge-nurbs/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-nurbs
PORTVERSION= 1.4.3
PORTREVISION= 2
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-oct2mat/Makefile b/math/octave-forge-oct2mat/Makefile
index 6e9da32289a7..de031afc461f 100644
--- a/math/octave-forge-oct2mat/Makefile
+++ b/math/octave-forge-oct2mat/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-oct2mat
PORTVERSION= 1.0.7
PORTREVISION= 27
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-06-07
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
@@ -10,8 +12,6 @@ WWW= http://octave.sourceforge.net/
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-MASTER_SITE_OLD= R2009_06
-
GNU_CONFIGURE= yes
RUN_DEPENDS+= ${TARBALLS_DIR}/io.tar.gz:math/octave-forge-io
diff --git a/math/octave-forge-octclip/Makefile b/math/octave-forge-octclip/Makefile
index feb60483d626..31c5bd2eb6e2 100644
--- a/math/octave-forge-octclip/Makefile
+++ b/math/octave-forge-octclip/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-octclip
PORTVERSION= 2.0.1
PORTREVISION= 3
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-octproj/Makefile b/math/octave-forge-octproj/Makefile
index 2a6fe44a6e16..89d3a02def34 100644
--- a/math/octave-forge-octproj/Makefile
+++ b/math/octave-forge-octproj/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-octproj
PORTVERSION= 2.0.1
PORTREVISION= 6
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-odebvp/Makefile b/math/octave-forge-odebvp/Makefile
index b62f23cc3456..e7c53ed65064 100644
--- a/math/octave-forge-odebvp/Makefile
+++ b/math/octave-forge-odebvp/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-odebvp
PORTVERSION= 1.0.6
PORTREVISION= 27
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Old%20Monolithic%20Releases/R2009-05-08
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
@@ -10,8 +12,6 @@ WWW= http://octave.sourceforge.net/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-MASTER_SITE_OLD= R2009_05
-
GNU_CONFIGURE= yes
.include "${.CURDIR}/../../Mk/bsd.octave.mk"
diff --git a/math/octave-forge-optics/Makefile b/math/octave-forge-optics/Makefile
index e497b91748e0..85db393d4ef3 100644
--- a/math/octave-forge-optics/Makefile
+++ b/math/octave-forge-optics/Makefile
@@ -2,6 +2,8 @@ PORTNAME= octave-forge-optics
PORTVERSION= 0.1.4
PORTREVISION= 3
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
diff --git a/math/octave-forge-optim/Makefile b/math/octave-forge-optim/Makefile
index 0c4489bce719..c2797806099a 100644
--- a/math/octave-forge-optim/Makefile
+++ b/math/octave-forge-optim/Makefile
@@ -1,6 +1,8 @@
PORTNAME= octave-forge-optim
PORTVERSION= 1.6.2
CATEGORIES= math
+MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases
+DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL}
MAINTAINER= stephen@FreeBSD.org
COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
*** 410 LINES SKIPPED ***