From a13d9a603d44e9d2d333d5b2033b95a97545f73b Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sat, 22 Aug 2009 00:28:34 +0000
Subject: - Switch SourceForge ports to the new File Release System: categories
 starting with M

---
 math/PDL/Makefile                 | 6 ++----
 math/R-cran-igraph/Makefile       | 2 +-
 math/algae/Makefile               | 3 +--
 math/asymptote/Makefile           | 2 +-
 math/atlas-devel/Makefile         | 3 +--
 math/atlas/Makefile               | 3 +--
 math/blitz++/Makefile             | 3 +--
 math/calc/Makefile                | 2 +-
 math/calcoo/Makefile              | 3 +--
 math/chryzodus/Makefile           | 3 +--
 math/digitizer/Makefile           | 3 +--
 math/drgeo/Makefile               | 3 +--
 math/elmer-umfpack/Makefile       | 2 +-
 math/fann/Makefile                | 3 +--
 math/freefem/Makefile             | 2 +-
 math/freemat/Makefile             | 3 +--
 math/fung-calc/Makefile           | 3 +--
 math/galculator/Makefile          | 3 +--
 math/gambit/Makefile              | 2 +-
 math/gnuplot+/Makefile            | 5 +++--
 math/gnuplot/Makefile             | 3 +--
 math/goblin/Makefile              | 2 +-
 math/gracetmpl/Makefile           | 3 +--
 math/gri/Makefile                 | 3 +--
 math/it++/Makefile                | 3 +--
 math/jts/Makefile                 | 3 +--
 math/k3dsurf/Makefile             | 3 +--
 math/labplot/Makefile             | 3 +--
 math/lapack++/Makefile            | 4 ++--
 math/liborigin/Makefile           | 2 +-
 math/libqalculate/Makefile        | 2 +-
 math/lp_solve/Makefile            | 2 +-
 math/lybniz/Makefile              | 2 +-
 math/mpexpr/Makefile              | 3 +--
 math/muparser/Makefile            | 2 +-
 math/open-axiom/Makefile          | 2 +-
 math/ploticus-nox11/Makefile      | 2 --
 math/plplot/Makefile              | 2 +-
 math/py-basemap-data/Makefile     | 3 +--
 math/py-basemap/Makefile          | 3 +--
 math/py-gnuplot/Makefile          | 2 +-
 math/py-gsl/Makefile              | 3 +--
 math/py-mathdom/Makefile          | 3 +--
 math/py-matplotlib/Makefile       | 2 +-
 math/py-numarray/Makefile         | 3 +--
 math/py-numeric/Makefile          | 3 +--
 math/py-numpy/Makefile            | 3 +--
 math/py-plastex/Makefile          | 2 +-
 math/py-probstat/Makefile         | 3 +--
 math/py-symeig/Makefile           | 3 +--
 math/qalculate/Makefile           | 2 +-
 math/qwtplot3d/Makefile           | 3 +--
 math/rascal/Makefile              | 3 +--
 math/rkward-kde4/Makefile         | 3 +--
 math/rkward/Makefile              | 3 +--
 math/ruby-gnuplot/Makefile        | 3 +--
 math/scigraphica/Makefile         | 5 +++--
 math/scilab-toolbox-sivp/Makefile | 2 +-
 math/scilab-toolbox-swt/Makefile  | 3 +--
 math/spar/Makefile                | 3 +--
 math/stp/Makefile                 | 3 +--
 math/surf/Makefile                | 2 +-
 math/tvmet/Makefile               | 2 +-
 math/ump/Makefile                 | 2 +-
 math/wcalc/Makefile               | 3 +--
 math/wfmath/Makefile              | 3 +--
 math/wxMaxima/Makefile            | 2 +-
 67 files changed, 72 insertions(+), 113 deletions(-)

(limited to 'math')

diff --git a/math/PDL/Makefile b/math/PDL/Makefile
index d7ab89e26b1c..adfd312d786c 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -10,10 +10,8 @@ PORTNAME=	PDL
 PORTVERSION=	2.4.4
 PORTREVISION=	1
 CATEGORIES=	math perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
-		${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
-MASTER_SITE_SUBDIR=	${PORTNAME}/:cpan \
-			${PORTNAME:L}/:sf
+MASTER_SITES=	CPAN/${PORTNAME}:cpan \
+		SF/pdl/PDL/${PORTVERSION}:sf
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:cpan,sf
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/math/R-cran-igraph/Makefile b/math/R-cran-igraph/Makefile
index 3279e5df27cd..c911db69c393 100644
--- a/math/R-cran-igraph/Makefile
+++ b/math/R-cran-igraph/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	igraph
 PORTVERSION=	0.5.2
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/R%20source%20package/${PORTVERSION}
 PKGNAMEPREFIX=	R-cran-
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/math/algae/Makefile b/math/algae/Makefile
index 0bd6fd1d43a3..8f4db4976ba1 100644
--- a/math/algae/Makefile
+++ b/math/algae/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	algae
 PORTVERSION=	4.3.6
 PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A programming language for numerical analysis
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index 1d7eaef9c58d..3d55395672ff 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	asymptote
 PORTVERSION=	1.75
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/old/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 EXTRACT_SUFX=	.tgz
 
diff --git a/math/atlas-devel/Makefile b/math/atlas-devel/Makefile
index 5a09a0e42498..c306267bcc96 100644
--- a/math/atlas-devel/Makefile
+++ b/math/atlas-devel/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	atlas
 PORTVERSION=	3.9.11
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	math-atlas
+MASTER_SITES=	SF/math-${PORTNAME}/Developer%20%28unstable%29/${PORTVERSION}
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index 71c3c4b9528a..a24f7c4f327c 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	atlas
 PORTVERSION=	3.8.3
 PORTEPOCH=	1
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	math-atlas
+MASTER_SITES=	SF/math-${PORTNAME}/Stable/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	maho@FreeBSD.org
diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index c005be3a6896..87f3bb90b0bc 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	blitz++
 PORTVERSION=	0.9
 PORTREVISION=	3
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	blitz
+MASTER_SITES=	SF/blitz/blitz/Blitz%2B%2B%20${PORTVERSION}
 DISTNAME=	blitz-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/calc/Makefile b/math/calc/Makefile
index a3f9e6837a2f..8c124da29c41 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	calc
 PORTVERSION=	2.12.4.0
 CATEGORIES=	math
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2.12.4
 
 MAINTAINER=	johans@stack.nl
 COMMENT=	Arbitrary precision calculator
diff --git a/math/calcoo/Makefile b/math/calcoo/Makefile
index 78e25f330a9c..0f915b8e6963 100644
--- a/math/calcoo/Makefile
+++ b/math/calcoo/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	calcoo
 PORTVERSION=	1.3.18
 PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	calcoo
+MASTER_SITES=	SF
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	RPN and algebraic scientific calculator
diff --git a/math/chryzodus/Makefile b/math/chryzodus/Makefile
index f8c135e77905..2637efb301f6 100644
--- a/math/chryzodus/Makefile
+++ b/math/chryzodus/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	0.32
 DISTVERSIONSUFFIX=	-src
 PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A chryzode (http//www.chryzode.org) explorer
diff --git a/math/digitizer/Makefile b/math/digitizer/Makefile
index 356152227c40..bbc4fd20c68e 100644
--- a/math/digitizer/Makefile
+++ b/math/digitizer/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	digitizer
 PORTVERSION=	4.1
 PORTREVISION=	4
 CATEGORIES=	math graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/Engauge%20Digitizer/${PORTNAME}-${PORTVERSION}
 DISTNAME=	digit-src-${PORTVERSION:S/./_/}
 
 MAINTAINER=	thierry@FreeBSD.org
diff --git a/math/drgeo/Makefile b/math/drgeo/Makefile
index 097597992b26..fe9c672418ff 100644
--- a/math/drgeo/Makefile
+++ b/math/drgeo/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	drgeo
 PORTVERSION=	1.1.0
 PORTREVISION=	9
 CATEGORIES=	math
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	ofset
+MASTER_SITES=	SF/ofset/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	A GTK interactive geometry sofware
diff --git a/math/elmer-umfpack/Makefile b/math/elmer-umfpack/Makefile
index 0656b5451fe8..c9f2474e91a6 100644
--- a/math/elmer-umfpack/Makefile
+++ b/math/elmer-umfpack/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	4.4
 PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	math
-MASTER_SITES=	SF/elmerfem
+MASTER_SITES=	# none know, please fix
 PKGNAMEPREFIX=	elmer-
 
 MAINTAINER=	scjamorim@bsd.com.br
diff --git a/math/fann/Makefile b/math/fann/Makefile
index 414ca9e77e7b..cf8dda3afd24 100644
--- a/math/fann/Makefile
+++ b/math/fann/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	fann
 PORTVERSION=	2.1.0b
 CATEGORIES=	math science
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	fann
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}eta
 DISTNAME=	fann-2.1.0beta
 
 MAINTAINER=	tzhuan@csie.org
diff --git a/math/freefem/Makefile b/math/freefem/Makefile
index 48d0607296a9..ecb48d4b078e 100644
--- a/math/freefem/Makefile
+++ b/math/freefem/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	freefem
 PORTVERSION=	3.5.8
 PORTREVISION=	1
 CATEGORIES=	math science
-MASTER_SITES=	SF/kfem
+MASTER_SITES=	SF/kfem/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A language for the Finite Element Method
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index 81d6a4eba376..805b358ceffe 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -9,8 +9,7 @@ PORTNAME=		FreeMat
 PORTVERSION=		3.6
 PORTREVISION=		4
 CATEGORIES=		math science
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME:L}
+MASTER_SITES=		SF
 .ifdef WITH_MPI
 PKGNAMESUFFIX=		-mpi
 .endif
diff --git a/math/fung-calc/Makefile b/math/fung-calc/Makefile
index 82b73161ade9..ae337d620257 100644
--- a/math/fung-calc/Makefile
+++ b/math/fung-calc/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	fung-calc
 PORTVERSION=	1.3.2b
 PORTREVISION=	11
 CATEGORIES=	math kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/releases/${PORTVERSION}
 
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	Advanced graphic calculator
diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index ee03b3f9a3b4..86dcf695d55b 100644
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	galculator
 PORTVERSION=	1.3.4
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	GTK2-based scientific calculator
diff --git a/math/gambit/Makefile b/math/gambit/Makefile
index 613a62e129ec..42075dfde63e 100644
--- a/math/gambit/Makefile
+++ b/math/gambit/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	gambit
 PORTVERSION=	0.2007.12.04
 PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A library of tools for doing computation in game theory
diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index 42bdbfd2eb89..eb0e66943511 100644
--- a/math/gnuplot+/Makefile
+++ b/math/gnuplot+/Makefile
@@ -9,10 +9,11 @@ PORTNAME=	gnuplot371+
 PORTVERSION=	1.2.0
 PORTREVISION=	6
 CATEGORIES=	math japanese graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF/gnuplot/gnuplot/3.7.1 \
 		http://www.yama-ga.com/gnuplot/:patch \
+
 		http://www.h2.dion.ne.jp/~yamaga/gnuplot/:patch
-MASTER_SITE_SUBDIR=	gnuplot
+
 DISTFILES=	gnuplot-3.7.1.tar.gz \
 		gnuplot3.7.1+${PORTVERSION}.patch.tar.gz:patch
 EXTRACT_ONLY=	gnuplot-3.7.1.tar.gz
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 999e6e078eef..483a1570cacb 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gnuplot
 PORTVERSION=	4.2.5
 PORTREVISION=	1
 CATEGORIES=	math graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	A command-driven interactive function plotting program
diff --git a/math/goblin/Makefile b/math/goblin/Makefile
index 3d42e9bc45e0..856cfbc76203 100644
--- a/math/goblin/Makefile
+++ b/math/goblin/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	goblin
 DISTVERSION=	2.8b28
 CATEGORIES=	math
-MASTER_SITES=	SF/goblin2
+MASTER_SITES=	SF/${PORTNAME}2/${PORTNAME}2/${PORTNAME}.2.8b28
 DISTNAME=	${PORTNAME}.${DISTVERSION}
 EXTRACT_SUFX=	.tgz
 
diff --git a/math/gracetmpl/Makefile b/math/gracetmpl/Makefile
index 13c4c41881b6..77b000be3da8 100644
--- a/math/gracetmpl/Makefile
+++ b/math/gracetmpl/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	gracetmpl
 PORTVERSION=	0.3.2
 CATEGORIES=	math print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Provide an easy way to use existing grace-files as a template
diff --git a/math/gri/Makefile b/math/gri/Makefile
index 1db9edc7d2c5..04a9427df96a 100644
--- a/math/gri/Makefile
+++ b/math/gri/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gri
 PORTVERSION=	2.12.18
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	christopher.illies@ki.se
 COMMENT=	An extensible plotting language for producing scientific graphs
diff --git a/math/it++/Makefile b/math/it++/Makefile
index 92d4e663df51..f95dd8f21ed4 100644
--- a/math/it++/Makefile
+++ b/math/it++/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	it++
 PORTVERSION=	4.0.6
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	itpp
+MASTER_SITES=	SF/itpp/itpp/${PORTVERSION}
 DISTNAME=	itpp-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/jts/Makefile b/math/jts/Makefile
index 7f2faf086b2b..e10a66def1b0 100644
--- a/math/jts/Makefile
+++ b/math/jts/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	jts
 PORTVERSION=	1.10
 CATEGORIES=	math databases
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	jts-topo-suite
+MASTER_SITES=	SF/${PORTNAME}-topo-suite/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	JTS Topology Suite
diff --git a/math/k3dsurf/Makefile b/math/k3dsurf/Makefile
index f2378073078a..6eb6f530bfa7 100644
--- a/math/k3dsurf/Makefile
+++ b/math/k3dsurf/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	k3dsurf
 PORTVERSION=	0.6.2
 PORTREVISION=	2
 CATEGORIES=	math graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_Linux/${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Visualize and manipulate Mathematical surfaces or curves
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index 2d57b91fe681..bf3b04dd025d 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	LabPlot
 PORTVERSION=	1.6.0.2
 PORTREVISION=	4
 CATEGORIES=	math kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=labplot
+MASTER_SITES=	SF
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	LabPlot : Data analysis and visualisation
diff --git a/math/lapack++/Makefile b/math/lapack++/Makefile
index d5c4ad97ee31..994d51ea149f 100644
--- a/math/lapack++/Makefile
+++ b/math/lapack++/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	lapack++
 PORTVERSION=	2.5.3
 CATEGORIES=	math
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=   SF/lapackpp/lapackpp/${PORTVERSION} \
 		http://math.nist.gov/lapack++/:doc
-MASTER_SITE_SUBDIR=	lapackpp
+
 DISTNAME=	lapackpp-${PORTVERSION}
 .if !defined(NOPORTDOCS)
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} lapack++.ps.gz:doc lapackpp1_1.ps.gz:doc \
diff --git a/math/liborigin/Makefile b/math/liborigin/Makefile
index 45d92bd719e2..55a8ba90f94d 100644
--- a/math/liborigin/Makefile
+++ b/math/liborigin/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	liborigin
 PORTVERSION=	20070926
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2007
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Tools for importing OriginLab .OPJ files
diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile
index cf98220e672a..04098441733b 100644
--- a/math/libqalculate/Makefile
+++ b/math/libqalculate/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libqalculate
 PORTVERSION=	0.9.6
 PORTREVISION=	5
 CATEGORIES=	math
-MASTER_SITES=	SF/qalculate
+MASTER_SITES=	SF/qalculate/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	scjamorim@bsd.com.br
 COMMENT=	A a multi-purpose desktop calculator (backend library)
diff --git a/math/lp_solve/Makefile b/math/lp_solve/Makefile
index 3e444da3c914..e2779b287e45 100644
--- a/math/lp_solve/Makefile
+++ b/math/lp_solve/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	lp_solve
 PORTVERSION=	5.5.0.14
 CATEGORIES=	math
-MASTER_SITES=	SF/lpsolve
+MASTER_SITES=	SF/lpsolve/lpsolve/${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}_source
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/lybniz/Makefile b/math/lybniz/Makefile
index 7e4173f9fd98..75204f877ef6 100644
--- a/math/lybniz/Makefile
+++ b/math/lybniz/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	lybniz
 PORTVERSION=	1.3.2
 PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	SF/${PORTNAME}2
+MASTER_SITES=	SF/${PORTNAME}2/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mathematical function graph plotter
diff --git a/math/mpexpr/Makefile b/math/mpexpr/Makefile
index aaa723191fcb..64a325a26a6e 100644
--- a/math/mpexpr/Makefile
+++ b/math/mpexpr/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	mpexpr
 PORTVERSION=	1.1
 CATEGORIES=	math tcl
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	mpexpr
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multiple precision math for Tcl
diff --git a/math/muparser/Makefile b/math/muparser/Makefile
index a5c5ccc423ad..57327f3d7e8b 100644
--- a/math/muparser/Makefile
+++ b/math/muparser/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	muparser
 PORTVERSION=	1.30
 PORTREVISION=	1
 CATEGORIES=	math devel
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
 DISTNAME=	${PORTNAME}_v130
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/math/open-axiom/Makefile b/math/open-axiom/Makefile
index 6ae165829213..25c32a0ffa47 100644
--- a/math/open-axiom/Makefile
+++ b/math/open-axiom/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	open-axiom
 PORTVERSION=	1.3.0
 CATEGORIES=	math
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}
 
 MAINTAINER=	stephen@missouri.edu
 COMMENT=	A computer algebra system
diff --git a/math/ploticus-nox11/Makefile b/math/ploticus-nox11/Makefile
index 1906c4d56f9d..a236e7308f3d 100644
--- a/math/ploticus-nox11/Makefile
+++ b/math/ploticus-nox11/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ploticus
-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generates plots and graphs from data (no X11 required)
 
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 7689634c5775..88359d5cae68 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	plplot
 PORTVERSION=	5.8.0
 PORTREVISION=	3
 CATEGORIES=	math science
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A scientific plotting package
diff --git a/math/py-basemap-data/Makefile b/math/py-basemap-data/Makefile
index 15e9bb9dcd2b..849616e4daef 100644
--- a/math/py-basemap-data/Makefile
+++ b/math/py-basemap-data/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	basemap-data
 PORTVERSION=	0.9
 CATEGORIES=	math python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	matplotlib
+MASTER_SITES=	SF/matplotlib/matplotlib-toolkits/basemap-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	mainland@apeiron.net
diff --git a/math/py-basemap/Makefile b/math/py-basemap/Makefile
index 93a8f40e6d86..4da9e605d8cc 100644
--- a/math/py-basemap/Makefile
+++ b/math/py-basemap/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	basemap
 PORTVERSION=	0.9.2
 PORTREVISION=	2
 CATEGORIES=	math python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	matplotlib
+MASTER_SITES=	SF/matplotlib/matplotlib-toolkits/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	mainland@apeiron.net
diff --git a/math/py-gnuplot/Makefile b/math/py-gnuplot/Makefile
index 5181bb41cfdb..422d45b4e52d 100644
--- a/math/py-gnuplot/Makefile
+++ b/math/py-gnuplot/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	gnuplot
 PORTVERSION=	1.8
 CATEGORIES=	math python
-MASTER_SITES=	SF/gnuplot-py
+MASTER_SITES=	SF/${PORTNAME}-py/Gnuplot-py/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	gnuplot-py-${PORTVERSION}
 
diff --git a/math/py-gsl/Makefile b/math/py-gsl/Makefile
index af6aae4506f1..98cb50868b96 100644
--- a/math/py-gsl/Makefile
+++ b/math/py-gsl/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gsl
 PORTVERSION=	0.9.4
 PORTREVISION=	1
 CATEGORIES=	math python
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	pygsl
+MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pygsl-${PORTVERSION}
 DIST_SUBDIR=	python
diff --git a/math/py-mathdom/Makefile b/math/py-mathdom/Makefile
index 63ac560f5831..c99d8ca7e102 100644
--- a/math/py-mathdom/Makefile
+++ b/math/py-mathdom/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	mathdom
 PORTVERSION=	0.8
 CATEGORIES=	math python
-MASTER_SITES=	SF \
-		${MASTER_SITE_CHEESESHOP}source/m/${PORTNAME}/
+MASTER_SITES=	CHEESESHOP/source/m/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wenheping@gmail.com
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
index 3dafcd00b81c..e4436f69cf03 100644
--- a/math/py-matplotlib/Makefile
+++ b/math/py-matplotlib/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	matplotlib
 PORTVERSION=	0.98.5.2
 PORTREVISION=	1
 CATEGORIES=	math python
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	mainland@apeiron.net
diff --git a/math/py-numarray/Makefile b/math/py-numarray/Makefile
index 49270b277382..52635700314f 100644
--- a/math/py-numarray/Makefile
+++ b/math/py-numarray/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	numarray
 PORTVERSION=	1.5.2
 CATEGORIES=	math python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	numpy
+MASTER_SITES=	SF/numpy/Old%20Numarray/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	perky@FreeBSD.org
diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index 450cab16831b..b1c8b36afff4 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	24.2
 PORTREVISION=	3
 CATEGORIES=	math python
 MASTER_SITES=	http://numpy.scipy.org/:doc \
-		${MASTER_SITE_SOURCEFORGE:S/$/:source/}
-MASTER_SITE_SUBDIR=	numpy/:source
+		SF/numpy/Old%20Numeric/${PORTVERSION}:source
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	Numeric-${PORTVERSION}${EXTRACT_SUFX}:source \
 		numpy.pdf:doc
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 520d3979234e..3472b18feccd 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -11,8 +11,7 @@ PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	http://numpy.scipy.org/:doc \
-		${MASTER_SITE_SOURCEFORGE:S/$/:source/}
-MASTER_SITE_SUBDIR=	numpy/:source
+		SF/${PORTNAME}/NumPy/${PORTVERSION}:source
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX}:source \
 		numpybook.pdf:doc
diff --git a/math/py-plastex/Makefile b/math/py-plastex/Makefile
index acd200667639..8da3e3acdb8d 100644
--- a/math/py-plastex/Makefile
+++ b/math/py-plastex/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	plastex
 PORTVERSION=	0.9.1
 CATEGORIES=	math python
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/rel-0-9-1
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 EXTRACT_SUFX=	.tgz
 
diff --git a/math/py-probstat/Makefile b/math/py-probstat/Makefile
index 753f6c3b0e40..fd4a3ba6e508 100644
--- a/math/py-probstat/Makefile
+++ b/math/py-probstat/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	probstat
 PORTVERSION=	0.912
 CATEGORIES=	math python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 EXTRACT_SUFX=	.tgz
diff --git a/math/py-symeig/Makefile b/math/py-symeig/Makefile
index 94626a0c131d..7e1813d14e51 100644
--- a/math/py-symeig/Makefile
+++ b/math/py-symeig/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	symeig
 PORTVERSION=	1.4
 PORTREVISION=	1
 CATEGORIES=	math python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	mdp-toolkit
+MASTER_SITES=	SF/mdp-toolkit/mdp-toolkit/2.3
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	llwang@infor.org
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 8b80cf7752cb..5f61d1834ad2 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	qalculate
 PORTVERSION=	0.9.6
 PORTREVISION=	3
 CATEGORIES=	math
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-gtk/${PORTNAME}-gtk-${PORTVERSION}
 DISTNAME=	${PORTNAME}-gtk-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/qwtplot3d/Makefile b/math/qwtplot3d/Makefile
index 9ce8e813dbd9..d99497451049 100644
--- a/math/qwtplot3d/Makefile
+++ b/math/qwtplot3d/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	qwtplot3d
 PORTVERSION=	0.2.7
 PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/math/rascal/Makefile b/math/rascal/Makefile
index 4ca356dfa63f..3f76b1e7aabd 100644
--- a/math/rascal/Makefile
+++ b/math/rascal/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	rascal
 PORTVERSION=	0.3.2
 PORTREVISION=	4
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/Rascal/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Advanced Scientific CALculator
diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index 9d44dc222806..95e79293c037 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	rkward
 PORTVERSION=	0.5.1
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	../project/${PORTNAME}/Current_Stable_Releases
+MASTER_SITES=	SF/${PORTNAME}/Current_Stable_Releases
 PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	thierry@FreeBSD.org
diff --git a/math/rkward/Makefile b/math/rkward/Makefile
index 8cc52671adcf..c55e2dd46d21 100644
--- a/math/rkward/Makefile
+++ b/math/rkward/Makefile
@@ -10,8 +10,7 @@ DISTVERSION=	0.4.9a
 PORTREVISION=	4
 PORTEPOCH=	3
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/Historical_Releases/0.4.x_and_earlier/0.4.9a%20%28KDE3%29
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	IDE/GUI for the R-project
diff --git a/math/ruby-gnuplot/Makefile b/math/ruby-gnuplot/Makefile
index 45305577ddbb..7ed01aeea7c8 100644
--- a/math/ruby-gnuplot/Makefile
+++ b/math/ruby-gnuplot/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gnuplot
 PORTVERSION=	0.5
 PORTREVISION=	1
 CATEGORIES=	math ruby
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	r${PORTNAME}
+MASTER_SITES=	SF/r${PORTNAME}/OldFiles
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	r${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/math/scigraphica/Makefile b/math/scigraphica/Makefile
index 46cfd7c19bdb..33dd628c1eb9 100644
--- a/math/scigraphica/Makefile
+++ b/math/scigraphica/Makefile
@@ -10,9 +10,10 @@ PORTVERSION=	0.8.0
 PORTREVISION=	8
 CATEGORIES=	math gnome
 MASTER_SITES=	http://scigraphica.sourceforge.net/src/ \
-		SF \
+		SF/${PORTNAME}/${PORTNAME}-0.x/${PORTVERSION}-source \
+
 		http://magnet.fsu.edu/~feiguin/scigraphica/src/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A scientific application for data analysis and technical graphics
diff --git a/math/scilab-toolbox-sivp/Makefile b/math/scilab-toolbox-sivp/Makefile
index e2889b8fef47..afaaa465fea4 100644
--- a/math/scilab-toolbox-sivp/Makefile
+++ b/math/scilab-toolbox-sivp/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	sivp
 DISTVERSION=	0.4.3
 PORTREVISION=	2
 CATEGORIES=	math graphics multimedia
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
 PKGNAMEPREFIX=	scilab-toolbox-
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/math/scilab-toolbox-swt/Makefile b/math/scilab-toolbox-swt/Makefile
index 3f1b69c1ee77..b7257c4638ea 100644
--- a/math/scilab-toolbox-swt/Makefile
+++ b/math/scilab-toolbox-swt/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	swt
 DISTVERSION=	0.1.0rc4
 PORTREVISION=	3
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	scwt
+MASTER_SITES=	SF/scwt/${PORTNAME}/0.1.0rc4Linux
 PKGNAMEPREFIX=	scilab-toolbox-
 DISTNAME=	${PORTNAME}${DISTVERSION}
 
diff --git a/math/spar/Makefile b/math/spar/Makefile
index cd56780879a1..fdf0fbb9dd96 100644
--- a/math/spar/Makefile
+++ b/math/spar/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	spar
 PORTVERSION=	0.5.10
 PORTREVISION=	1
 CATEGORIES=	math devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/Spar/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A modular math parser
diff --git a/math/stp/Makefile b/math/stp/Makefile
index dbddd764cca0..86bda221c686 100644
--- a/math/stp/Makefile
+++ b/math/stp/Makefile
@@ -11,8 +11,7 @@ DISTVERSION=	0.1
 DISTVERSIONSUFFIX=	-11-18-2008
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	stp-fast-prover
+MASTER_SITES=	SF/${PORTNAME}-fast-prover/${PORTNAME}-fast-prover/${PORTNAME}-ver-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	lwhsu@FreeBSD.org
diff --git a/math/surf/Makefile b/math/surf/Makefile
index 3ec9dd89dc18..cf6e38d6e1d0 100644
--- a/math/surf/Makefile
+++ b/math/surf/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	surf
 PORTVERSION=	1.0.5
 PORTREVISION=	5
 CATEGORIES=	math
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 USE_XORG=	x11 xmu
 MAINTAINER=	ports@FreeBSD.org
diff --git a/math/tvmet/Makefile b/math/tvmet/Makefile
index 2e02c92a3b55..350daa8eb688 100644
--- a/math/tvmet/Makefile
+++ b/math/tvmet/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	tvmet
 PORTVERSION=	1.7.2
 CATEGORIES=	math
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/Tar.Gz_Bz2%20Archive/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tiny Vector and Matrix template library
diff --git a/math/ump/Makefile b/math/ump/Makefile
index 891d941575a8..176c7e8bdbad 100644
--- a/math/ump/Makefile
+++ b/math/ump/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	ump
 PORTVERSION=	0.8.6
 PORTREVISION=	4
 CATEGORIES=	math
-MASTER_SITES=	SF/u-m-p
+MASTER_SITES=	SF/u-m-p/u-m-p/${PORTVERSION}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A graphical, easy to use math program
diff --git a/math/wcalc/Makefile b/math/wcalc/Makefile
index 2cbc125b1ab9..d374f3ca7144 100644
--- a/math/wcalc/Makefile
+++ b/math/wcalc/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	wcalc
 PORTVERSION=	2.4
 PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	w-calc
+MASTER_SITES=	SF/w-calc/Wcalc/${PORTVERSION}
 DISTNAME=	wcalc-${PORTVERSION}
 
 MAINTAINER=	amarendra.godbole@gmail.com
diff --git a/math/wfmath/Makefile b/math/wfmath/Makefile
index 7f8d01dd46ac..ed32d5a58304 100644
--- a/math/wfmath/Makefile
+++ b/math/wfmath/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	wfmath
 PORTVERSION=	0.3.9
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	worldforge
+MASTER_SITES=	SF/worldforge/${PORTNAME}%20%28math%20lib%29/${PORTVERSION}
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Worldforge math library
diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile
index 4e56372b417f..15261d9e3dcd 100644
--- a/math/wxMaxima/Makefile
+++ b/math/wxMaxima/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	wxMaxima
 PORTVERSION=	0.8.2
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A wxWidgets GUI for the computer algebra system maxima
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0