- Switch SourceForge ports to the new File Release System: categories starting with P,R,S

35 files changed, 38 insertions, 55 deletions

diff --git a/science/InsightToolkit/Makefile b/science/InsightToolkit/Makefile
index 1e21c48110e6..8353481dbd83 100644
--- a/science/InsightToolkit/Makefile
+++ b/science/InsightToolkit/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	InsightToolkit
 PORTVERSION=	2.8.1
 PORTREVISION=	2
 CATEGORIES=	science biology
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	itk
+MASTER_SITES=	SF/itk/itk/2.8
 
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Insight Toolkit
diff --git a/science/bodr/Makefile b/science/bodr/Makefile
index 401508451e51..3f9ce7089162 100644
--- a/science/bodr/Makefile
+++ b/science/bodr/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	bodr
 PORTVERSION=	8
 CATEGORIES=	science
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	bodr
+MASTER_SITES=	SF
 
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Chemistry data like element and isotope properties, atomic radii, etc
diff --git a/science/brian/Makefile b/science/brian/Makefile
index 4a158d21e119..8494b6e448a7 100644
--- a/science/brian/Makefile
+++ b/science/brian/Makefile
@@ -10,7 +10,8 @@ PORTVERSION=	1.1.2
 PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP \
-		SF
+		SF/${PORTNAME}/Brian/${PORTVERSION}
+
 
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	A clock-driven simulator for spiking neural networks
diff --git a/science/buddy/Makefile b/science/buddy/Makefile
index 150d192c704e..853d9ce73f7e 100644
--- a/science/buddy/Makefile
+++ b/science/buddy/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	buddy
 PORTVERSION=	2.4
 PORTREVISION=	1
 CATEGORIES=	science
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	buddy
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/BuDDy%20${PORTVERSION}
 
 MAINTAINER=	llwang@infor.org
 COMMENT=	A Binary Decision Diagram library
diff --git a/science/cgnslib/Makefile b/science/cgnslib/Makefile
index 946283aa9a95..881d460e74bb 100644
--- a/science/cgnslib/Makefile
+++ b/science/cgnslib/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	cgnslib
 DISTVERSION=	2.5-3
 PORTREVISION=	1
 CATEGORIES=	science
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	cgns
+MASTER_SITES=	SF/cgns/${PORTNAME}_2.5/Release%203
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
diff --git a/science/chemical-mime-data/Makefile b/science/chemical-mime-data/Makefile
index 69fffda3346b..34981728c59e 100644
--- a/science/chemical-mime-data/Makefile
+++ b/science/chemical-mime-data/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	chemical-mime-data
 PORTVERSION=	0.1.94
 PORTREVISION=	2
 CATEGORIES=	science
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	chemical-mime
+MASTER_SITES=	SF/chemical-mime/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	A collection of chemical MIME types for UNIX desktops
diff --git a/science/crf++/Makefile b/science/crf++/Makefile
index 2c1dd8c77608..5200b7e562ef 100644
--- a/science/crf++/Makefile
+++ b/science/crf++/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	crf++
 PORTVERSION=	0.52
 CATEGORIES=	science math
-MASTER_SITES=	SF \
+MASTER_SITES=	SF/crfpp/crfpp/${PORTVERSION} \
 		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	crfpp clsung/${PORTNAME}
+
 DISTNAME=	CRF++-${PORTVERSION}
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/science/elmer-eio/Makefile b/science/elmer-eio/Makefile
index d2be43cfd9f0..e12140b90a9d 100644
--- a/science/elmer-eio/Makefile
+++ b/science/elmer-eio/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	eio
 PORTVERSION=	5.4.0
 PORTREVISION=	2
 CATEGORIES=	science
-MASTER_SITES=	SF/elmerfem
+MASTER_SITES=	# none known, please fix
 PKGNAMEPREFIX=	elmer-
 
 MAINTAINER=	scjamorim@bsd.com.br
diff --git a/science/elmer-fem/Makefile b/science/elmer-fem/Makefile
index c00cd0addde1..2d1dea621117 100644
--- a/science/elmer-fem/Makefile
+++ b/science/elmer-fem/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	fem
 PORTVERSION=	5.4.0
 PORTREVISION=	5
 CATEGORIES=	science tk
-MASTER_SITES=	SF/elmerfem
+MASTER_SITES=	# none known, please fix
 PKGNAMEPREFIX=	elmer-
 
 MAINTAINER=	scjamorim@bsd.com.br
diff --git a/science/elmer-hutiter/Makefile b/science/elmer-hutiter/Makefile
index 5b2850e225df..11e4e09d7451 100644
--- a/science/elmer-hutiter/Makefile
+++ b/science/elmer-hutiter/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	hutiter
 PORTVERSION=	5.4.0
 PORTREVISION=	2
 CATEGORIES=	science
-MASTER_SITES=	SF/elmerfem
+MASTER_SITES=	# none known, please fix
 PKGNAMEPREFIX=	elmer-
 
 MAINTAINER=	scjamorim@bsd.com.br
diff --git a/science/elmer-matc/Makefile b/science/elmer-matc/Makefile
index bdb6a799ae78..1f0fdacf9632 100644
--- a/science/elmer-matc/Makefile
+++ b/science/elmer-matc/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	matc
 PORTVERSION=	5.4.0
 PORTREVISION=	4
 CATEGORIES=	science
-MASTER_SITES=	SF/elmerfem
+MASTER_SITES=	# none known, please fix
 PKGNAMEPREFIX=	elmer-
 
 MAINTAINER=	scjamorim@bsd.com.br
diff --git a/science/elmer-meshgen2d/Makefile b/science/elmer-meshgen2d/Makefile
index b398569d210f..03793d49903c 100644
--- a/science/elmer-meshgen2d/Makefile
+++ b/science/elmer-meshgen2d/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	meshgen2d
 PORTVERSION=	5.0.0
 PORTREVISION=	5
 CATEGORIES=	science
-MASTER_SITES=	SF/elmerfem
+MASTER_SITES=	# none known, please fix
 PKGNAMEPREFIX=	elmer-
 
 MAINTAINER=	scjamorim@bsd.com.br
diff --git a/science/elmergrid/Makefile b/science/elmergrid/Makefile
index 47b21eb85f54..98a02f3a51b3 100644
--- a/science/elmergrid/Makefile
+++ b/science/elmergrid/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	elmergrid
 PORTVERSION=	5.4.0
 PORTREVISION=	2
 CATEGORIES=	science
-MASTER_SITES=	SF/elmerfem
+MASTER_SITES=	# none known, please fix
 
 MAINTAINER=	scjamorim@bsd.com.br
 COMMENT=	A Mesh Manipulation Utility for use with the ELMER FEM package
diff --git a/science/elmerpost/Makefile b/science/elmerpost/Makefile
index feea64814c52..e6d69f2e299e 100644
--- a/science/elmerpost/Makefile
+++ b/science/elmerpost/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	elmerpost
 PORTVERSION=	5.4.0
 PORTREVISION=	6
 CATEGORIES=	science
-MASTER_SITES=	SF/elmerfem
+MASTER_SITES=	# none known, please fix
 
 MAINTAINER=	scjamorim@bsd.com.br
 COMMENT=	Visualization of Numerical Results in the ELMER FEM package
diff --git a/science/euler/Makefile b/science/euler/Makefile
index 779347eef2ab..13e2a788a04b 100644
--- a/science/euler/Makefile
+++ b/science/euler/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	euler
 PORTVERSION=	1.61.0
 PORTREVISION=	3
 CATEGORIES=	science
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.61
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/science/felt/Makefile b/science/felt/Makefile
index 3052f371a1d9..614a85c6e99d 100644
--- a/science/felt/Makefile
+++ b/science/felt/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	felt
 PORTVERSION=	3.06
 PORTREVISION=	2
 CATEGORIES=	science
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/FElt/${PORTVERSION}devel
 EXTRACT_SUFX=	-devel.src.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/science/gdis/Makefile b/science/gdis/Makefile
index 36cfe8d75964..03ac348bb17f 100644
--- a/science/gdis/Makefile
+++ b/science/gdis/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gdis
 PORTVERSION=	0.89
 PORTREVISION=	3
 CATEGORIES=	science
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	-source.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/science/gerris/Makefile b/science/gerris/Makefile
index bad686b882f8..c14fda238145 100644
--- a/science/gerris/Makefile
+++ b/science/gerris/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	gerris
 PORTVERSION=	0.9.2
 PORTREVISION=	1
 CATEGORIES=	science math
-MASTER_SITES=	SF/gfs
+MASTER_SITES=	SF/gfs/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A scientific CFD simulator
diff --git a/science/ghmm/Makefile b/science/ghmm/Makefile
index 7d21dbb8ecd7..b8448a329021 100644
--- a/science/ghmm/Makefile
+++ b/science/ghmm/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	ghmm
 PORTVERSION=	0.7.0b
 CATEGORIES=	science math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	General Hidden Markov Model Library in C
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index f17188444814..ecd7a96e0117 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gnudatalanguage
 DISTVERSION=	0.9pre6
 PORTREVISION=	9
 CATEGORIES=	science lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/gdl/0.9pre6
 .if defined(BUILD_PYTHON_MODULE)
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 .endif
diff --git a/science/gramps/Makefile b/science/gramps/Makefile
index b64ac4d8d5ce..a9881f4ce1f1 100644
--- a/science/gramps/Makefile
+++ b/science/gramps/Makefile
@@ -8,7 +8,7 @@ PORTNAME=	gramps
 PORTVERSION=	3.0.4
 PORTREVISION=	3
 CATEGORIES=	science gnome python
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/Stable/${PORTVERSION}
 
 MAINTAINER=	freebsd@troback.com
 COMMENT=	A GTK/GNOME-based genealogy program
diff --git a/science/gtamsanalyzer/Makefile b/science/gtamsanalyzer/Makefile
index d3bdb26cf999..cb7b1bf997c5 100644
--- a/science/gtamsanalyzer/Makefile
+++ b/science/gtamsanalyzer/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gtamsanalyzer
 PORTVERSION=	0.42
 PORTREVISION=	2
 CATEGORIES=	science gnustep
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	tamsys
+MASTER_SITES=	SF/tamsys/gnustep%20tams/GTAMSAnalyzer%2${PORTVERSION}
 DISTNAME=	GTAMSAnalyzer.src.${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/science/isaac-cfd/Makefile b/science/isaac-cfd/Makefile
index 5d6c6188eb87..eb433e2d2a4d 100644
--- a/science/isaac-cfd/Makefile
+++ b/science/isaac-cfd/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	isaac
 PORTVERSION=	4.2
 PORTREVISION=	3
 CATEGORIES=	science
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	isaac-cfd
+MASTER_SITES=	SF/${PORTNAME}-cfd/${PORTNAME}-cfd/ISAAC%20Version%20${PORTVERSION}
 DISTFILES=	${PORTNAME}src.4_2${EXTRACT_SUFX} ${PORTNAME}mk.4_2${EXTRACT_SUFX}
 .ifndef NOPORTDOCS
 DISTFILES+=	man.4_2.ps.gz
diff --git a/science/jmol/Makefile b/science/jmol/Makefile
index 744fd9a96901..58261c5a8412 100644
--- a/science/jmol/Makefile
+++ b/science/jmol/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	jmol
 PORTVERSION=	11.6.17
 CATEGORIES=	science java
-MASTER_SITES=	SF:source1 \
+MASTER_SITES=	SF/${PORTNAME}/Jmol/Version%20${PORTVERSION}:source1 \
 		http://jmol.svn.sourceforge.net/viewvc/jmol/trunk/Jmol/selfSignedCertificate/:source2
 DISTFILES=	${PORTNAME}-${PORTVERSION}-full.tar.gz:source1 \
 		selfSignedCertificate.cer:source2 \
diff --git a/science/linsmith/Makefile b/science/linsmith/Makefile
index 3d2bca1c939d..6630640e9091 100644
--- a/science/linsmith/Makefile
+++ b/science/linsmith/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	linsmith
 PORTVERSION=	0.99.12
 PORTREVISION=	1
 CATEGORIES=	science hamradio
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.9.12
 
 MAINTAINER=	beat@FreeBSD.org
 COMMENT=	Smith charting program
diff --git a/science/mayavi/Makefile b/science/mayavi/Makefile
index d1087c86dd56..59b5a36a1122 100644
--- a/science/mayavi/Makefile
+++ b/science/mayavi/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	mayavi
 PORTVERSION=	1.5
 PORTREVISION=	1
 CATEGORIES=	science python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	MayaVi-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile
index ec770faf1674..351f7db6443b 100644
--- a/science/mpqc/Makefile
+++ b/science/mpqc/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	mpqc
 PORTVERSION=	2.3.1
 PORTREVISION=	6
 CATEGORIES=	science parallel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	mpqc
+MASTER_SITES=	SF
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	The massively parallel quantum computing library and program
diff --git a/science/nifticlib/Makefile b/science/nifticlib/Makefile
index cc6b02f9c4cb..8e72e71d0b7b 100644
--- a/science/nifticlib/Makefile
+++ b/science/nifticlib/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	nifticlib
 PORTVERSION=	1.1.0
 CATEGORIES=	science graphics
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	niftilib
+MASTER_SITES=	SF/niftilib/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Neuroimaging Infoirmatics Technology Initiative data format
diff --git a/science/pcp/Makefile b/science/pcp/Makefile
index d48ce9b47fcc..98a8976491ec 100644
--- a/science/pcp/Makefile
+++ b/science/pcp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	pcp
 PORTVERSION=	2.2
 CATEGORIES=	science math
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Machine learning program for pattern classification
diff --git a/science/psi3/Makefile b/science/psi3/Makefile
index 20bb9802b7be..15fabc354478 100644
--- a/science/psi3/Makefile
+++ b/science/psi3/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	psi3
 PORTVERSION=	3.4.0
 CATEGORIES=	science
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF/psicode/psi/${PORTVERSION} \
 		http://www.psicode.org/doc/:doc
-MASTER_SITE_SUBDIR=     psicode
+
 DISTNAME=	psi-${PORTVERSION}
 .if !defined(NOPORTDOCS)
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} installation.pdf:doc userman.pdf:doc progman.pdf:doc
diff --git a/science/py-mdp/Makefile b/science/py-mdp/Makefile
index 45e0693c4f3a..34f88729cbc9 100644
--- a/science/py-mdp/Makefile
+++ b/science/py-mdp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	mdp
 PORTVERSION=	2.4
 CATEGORIES=	science python
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	mdp-toolkit
+MASTER_SITES=	SF/${PORTNAME}-toolkit/${PORTNAME}-toolkit/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:U}-${PORTVERSION}
 
diff --git a/science/py-paida/Makefile b/science/py-paida/Makefile
index f5efd1de83ed..77142a3a6ef3 100644
--- a/science/py-paida/Makefile
+++ b/science/py-paida/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	paida
 PORTVERSION=	3.2.1.2.10
 CATEGORIES=	science python
-MASTER_SITES=	SF/paida
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-3.2.1_2.10.1
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-3.2.1_2.10.1
 
diff --git a/science/pycdf/Makefile b/science/pycdf/Makefile
index 2dd5cc6e74da..97e84ec6f373 100644
--- a/science/pycdf/Makefile
+++ b/science/pycdf/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	pycdf
 PORTVERSION=	0.6.3
 CATEGORIES=	science python
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	pysclint
+MASTER_SITES=	SF/pysclint/${PORTNAME}/${PORTNAME}-${PORTVERSION}b
 DISTNAME=	${PORTNAME}-0.6-3b
 
 MAINTAINER=	wenheping@gmail.com
diff --git a/science/vis5d+/Makefile b/science/vis5d+/Makefile
index 1bff1a04fd7b..caf9376c1559 100644
--- a/science/vis5d+/Makefile
+++ b/science/vis5d+/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	vis5d+
 PORTVERSION=	1.2.1
 PORTREVISION=	12
 CATEGORIES=	science
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	vis5d
+MASTER_SITES=	SF/vis5d/vis5d/${PORTVERSION}
 
 MAINTAINER=	stephen@missouri.edu
 COMMENT=	OpenGL-based volumetric visualization program for scientific datasets
diff --git a/science/xmds/Makefile b/science/xmds/Makefile
index c09edff7f391..b873bc3e7c2f 100644
--- a/science/xmds/Makefile
+++ b/science/xmds/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xmds
 PORTVERSION=	1.6
 CATEGORIES=	science
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}.5
 DISTNAME=	xmds-1.6.5
 
 MAINTAINER=	mplekos@physics.upatras.gr