20 files changed, 21 insertions, 31 deletions

diff --git a/astro/accrete/Makefile b/astro/accrete/Makefile
index 52e24d423219..a4f78e8148d6 100644
--- a/astro/accrete/Makefile
+++ b/astro/accrete/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	accrete
 PORTVERSION=	1.0
 CATEGORIES=	astro
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	chuck@pkix.net
 COMMENT=	Accrete is a physical simulation of solar system planet formation
diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 58f6e55a6c63..2b23a0a6b365 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	celestia
 PORTVERSION=	1.6.0
 CATEGORIES=	astro
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/Celestia-source/${PORTVERSION}
 PKGNAMESUFFIX=	-${CELESTIA_UI}
 
 MAINTAINER=	danfe@FreeBSD.org
diff --git a/astro/gaia/Makefile b/astro/gaia/Makefile
index aed0060862ce..80f42055518a 100644
--- a/astro/gaia/Makefile
+++ b/astro/gaia/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gaia
 PORTVERSION=	0.1.2
 PORTREVISION=	6
 CATEGORIES=	astro
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	gaia-clean
+MASTER_SITES=	SF/${PORTNAME}-clean/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Display geographic maps with optional GPS tracking support
diff --git a/astro/gkrellmoon2/Makefile b/astro/gkrellmoon2/Makefile
index 2928d9bc41cc..2281c733b882 100644
--- a/astro/gkrellmoon2/Makefile
+++ b/astro/gkrellmoon2/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gkrellmoon2
 PORTVERSION=	0.6
 PORTREVISION=	6
 CATEGORIES=	astro
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	gkrellmoon
+MASTER_SITES=	SF/gkrellmoon/gkrellmoon/${PORTVERSION}
 DISTNAME=	gkrellmoon-${PORTVERSION}
 
 MAINTAINER=	w@wrzask.pl
diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile
index a95c924355bd..f5739600fbbb 100644
--- a/astro/glunarclock/Makefile
+++ b/astro/glunarclock/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	glunarclock
 PORTVERSION=	0.32.4
 PORTREVISION=	8
 CATEGORIES=	astro gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME applet that displays the current phase of the Moon
diff --git a/astro/jday/Makefile b/astro/jday/Makefile
index 151aba42e900..f641f00c80b5 100644
--- a/astro/jday/Makefile
+++ b/astro/jday/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	jday
 PORTVERSION=	2.4
 CATEGORIES=	astro
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Astronomical julian date calculator
diff --git a/astro/libnova/Makefile b/astro/libnova/Makefile
index 60fa99fe5b54..03d9f7eb949b 100644
--- a/astro/libnova/Makefile
+++ b/astro/libnova/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	libnova
 PORTVERSION=	0.13.0
 CATEGORIES=	astro
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/V%20${PORTVERSION}
 
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Astronomical Calculation Library
diff --git a/astro/libroadnav/Makefile b/astro/libroadnav/Makefile
index 83f60cb42c6f..67c6bbaee3b4 100644
--- a/astro/libroadnav/Makefile
+++ b/astro/libroadnav/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	libroadnav
 PORTVERSION=	0.19
 PORTREVISION=	1
 CATEGORIES=	astro geography
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=roadnav
+MASTER_SITES=	SF/roadnav/LibRoadnav/${PORTVERSION}
 
 MAINTAINER=	bahamasfranks@gmail.com
 COMMENT=	Helper library for Roadnav: A 3D GPS Mapping program
diff --git a/astro/openuniverse/Makefile b/astro/openuniverse/Makefile
index b9a00295cba2..91f4921e55fa 100644
--- a/astro/openuniverse/Makefile
+++ b/astro/openuniverse/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	openuniverse
 DISTVERSION=	1.0beta3
 PORTREVISION=	6
 CATEGORIES=	astro
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.0beta3
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL Solar System simulator for X Window System
diff --git a/astro/orsa/Makefile b/astro/orsa/Makefile
index 50ddf612eaf9..5047b8ce8fc3 100644
--- a/astro/orsa/Makefile
+++ b/astro/orsa/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	orsa
 PORTVERSION=	0.7.0
 PORTREVISION=	11
 CATEGORIES=	astro
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Orbit Reconstruction, Simulation and Analysis
diff --git a/astro/pp3/Makefile b/astro/pp3/Makefile
index b20a6d103a18..6b05f691b6ab 100644
--- a/astro/pp3/Makefile
+++ b/astro/pp3/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	pp3
 PORTVERSION=	1.3.3
 PORTREVISION=	1
 CATEGORIES=	astro
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/PP3/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Creates celestial charts
diff --git a/astro/ptiger/Makefile b/astro/ptiger/Makefile
index 9fc79540c6bf..9744df479275 100644
--- a/astro/ptiger/Makefile
+++ b/astro/ptiger/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ptiger
 PORTVERSION=	2.2
 PORTREVISION=	3
 CATEGORIES=	astro tk
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	tkgeomap
+MASTER_SITES=	SF/tkgeomap/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Displays U.S. Census Burea populated places on a map
diff --git a/astro/qlandkartegt/Makefile b/astro/qlandkartegt/Makefile
index 50027acde808..0b3752c79681 100644
--- a/astro/qlandkartegt/Makefile
+++ b/astro/qlandkartegt/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	qlandkartegt
 PORTVERSION=	0.14.1
 CATEGORIES=	astro
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/QLandkarteGT%20${PORTVERSION}
 
 MAINTAINER=	freebsd@levsha.org.ua
 COMMENT=	The ultimate outdoor aficionado's tool
diff --git a/astro/roadmap/Makefile b/astro/roadmap/Makefile
index 4c427a4617d4..b2e7a9698bf8 100644
--- a/astro/roadmap/Makefile
+++ b/astro/roadmap/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	1.0.6
 PORTREVISION=	5
 CATEGORIES=	astro geography
 MASTER_SITES=	http://roadmap.digitalomaha.net/roadmap/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+		SF/${PORTNAME}/OldFiles		
+
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/.r/rc/:S/./_/g}_src
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/astro/roadnav/Makefile b/astro/roadnav/Makefile
index e2ef7e55b5d8..7a42964e34c2 100644
--- a/astro/roadnav/Makefile
+++ b/astro/roadnav/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	roadnav
 PORTVERSION=	0.19
 PORTREVISION=	1
 CATEGORIES=	astro geography
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/Roadnav/${PORTVERSION}
 
 MAINTAINER=	bahamasfranks@gmail.com
 COMMENT=	A 3D GPS Mapping program
diff --git a/astro/sky2000/Makefile b/astro/sky2000/Makefile
index 25f283387fb8..bb3068f8442a 100644
--- a/astro/sky2000/Makefile
+++ b/astro/sky2000/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	sky2000
 PORTVERSION=	0.2
 CATEGORIES=	astro
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	nova
+MASTER_SITES=	SF/nova/catalogs/${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A binary representation of the Sky2000 star catalog
diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
index 4f4170a4e2f6..c067e320efa8 100644
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	stellarium
 PORTVERSION=	0.10.2
 PORTREVISION=	1
 CATEGORIES=	astro
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/Stellarium-sources/${PORTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A 3D photo-realistic sky renderer
diff --git a/astro/tclgeomap/Makefile b/astro/tclgeomap/Makefile
index b7cd45748431..4a3b5eaa96c3 100644
--- a/astro/tclgeomap/Makefile
+++ b/astro/tclgeomap/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	tclgeomap
 PORTVERSION=	2.11.5
 PORTREVISION=	1
 CATEGORIES=	astro tcl
-MASTER_SITES=	SF/tkgeomap
+MASTER_SITES=	SF/tkgeomap/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Read, manipulate and display geo data
diff --git a/astro/xeartk/Makefile b/astro/xeartk/Makefile
index bf033ccd72ac..898ea31c73ac 100644
--- a/astro/xeartk/Makefile
+++ b/astro/xeartk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	xeartk
 PORTVERSION=	2.2
 PORTREVISION=	3
 CATEGORIES=	astro tk
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	tkgeomap
+MASTER_SITES=	SF/tkgeomap/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small demo for tkgeomap
diff --git a/astro/xphoon/Makefile b/astro/xphoon/Makefile
index 3ddf5db6e2df..5c7766cb784c 100644
--- a/astro/xphoon/Makefile
+++ b/astro/xphoon/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	xphoon
 PORTVERSION=	2000.06.13
 PORTREVISION=	2
 CATEGORIES=	astro
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/20000613
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 
 MAINTAINER=	ports@FreeBSD.org