- Switch SourceForge ports to the new File Release System: categories starting with D

66 files changed, 69 insertions, 113 deletions

diff --git a/databases/WWWdb/Makefile b/databases/WWWdb/Makefile
index 0a5cbf639cc3..254679306c43 100644
--- a/databases/WWWdb/Makefile
+++ b/databases/WWWdb/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	WWWdb
 PORTVERSION=	0.8.3
 CATEGORIES=	databases perl5 www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	wwwdb
+MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Perl based generic WWW DB interface / frontend
diff --git a/databases/adminer/Makefile b/databases/adminer/Makefile
index 55c43016dbcb..fbac00de9639 100644
--- a/databases/adminer/Makefile
+++ b/databases/adminer/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	adminer
 PORTVERSION=	1.11.1
 CATEGORIES=	databases www
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/Adminer/Adminer%20${PORTVERSION}
 
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	A full-featured MySQL management tool written in PHP
diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index 113e239400bf..0cea7e2c4ee8 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	adodb
 PORTVERSION=	4.99.1
 CATEGORIES=	databases www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	adodb
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-php-4-and-5/${PORTNAME}-4991-for-php
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.tgz
 
diff --git a/databases/adodb5/Makefile b/databases/adodb5/Makefile
index 7088dc943a7b..b109cbb6d64f 100644
--- a/databases/adodb5/Makefile
+++ b/databases/adodb5/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	adodb
 DISTVERSION=	5.09a
 CATEGORIES=	databases www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	adodb
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-php5-only/${PORTNAME}-509a-for-php5
 DISTNAME=	${PORTNAME:S/5//}${DISTVERSION:S/.//g}
 EXTRACT_SUFX=	.tgz
 
diff --git a/databases/aolserver-nsmysql/Makefile b/databases/aolserver-nsmysql/Makefile
index a883c09998e5..b188ff46f2f3 100644
--- a/databases/aolserver-nsmysql/Makefile
+++ b/databases/aolserver-nsmysql/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	nsmysql
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	databases www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	aolserver
+MASTER_SITES=	SF/aolserver/${PORTNAME}/${PORTNAME}_v1
 PKGNAMEPREFIX=	aolserver-
 DISTNAME=	nsmysql_v1
 DIST_SUBDIR=	aolserver
diff --git a/databases/aolserver-nspostgres/Makefile b/databases/aolserver-nspostgres/Makefile
index ff3efa0e2688..c86f8f121e7c 100644
--- a/databases/aolserver-nspostgres/Makefile
+++ b/databases/aolserver-nspostgres/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	4.1
 PORTREVISION=	3
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	databases www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	aolserver
+MASTER_SITES=	SF/aolserver/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	aolserver-
 DIST_SUBDIR=	aolserver
 
diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile
index 1fe0ea4ee3be..c5987b1bd599 100644
--- a/databases/bbdb/Makefile
+++ b/databases/bbdb/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	bbdb
 PORTVERSION=	2.34
 PORTREVISION=	2
 CATEGORIES=	databases elisp
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES=	SF
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	yoichi@FreeBSD.org
diff --git a/databases/buzhug/Makefile b/databases/buzhug/Makefile
index 226ded95e10f..a5a6dea6626b 100644
--- a/databases/buzhug/Makefile
+++ b/databases/buzhug/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	buzhug
 PORTVERSION=	1.5
 CATEGORIES=	databases python
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	A pure-Python database engine
diff --git a/databases/clip/Makefile b/databases/clip/Makefile
index 03eea64ddc68..acaccdd637b0 100644
--- a/databases/clip/Makefile
+++ b/databases/clip/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	clip
 DISTVERSION=	1.2.0-0
 PORTREVISION=	1
 CATEGORIES=	databases lang
-MASTER_SITES=	SF/x-clip
+MASTER_SITES=	SF/x-${PORTNAME}/${PORTNAME}%201.2/1.2.0
 DISTNAME=	${PORTNAME}-prg-${DISTVERSION}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	clip
diff --git a/databases/dbXML/Makefile b/databases/dbXML/Makefile
index 29af11a1b975..72ebc006d06a 100644
--- a/databases/dbXML/Makefile
+++ b/databases/dbXML/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	dbXML
 PORTVERSION=	1.0b2
 PORTREVISION=	3
 CATEGORIES=	databases java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME:L}-core
+MASTER_SITES=	SF/${PORTNAME:L}-core/OldFiles
 DISTNAME=	dbXML-Core-${PORTVERSION}
 
 MAINTAINER=	rws@procopia.com
diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile
index 1339e0725ec1..3276ea9534dd 100644
--- a/databases/dbconnect/Makefile
+++ b/databases/dbconnect/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	dbconnect
 PORTVERSION=	0.3.5
 PORTREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/DBConnect%20API%200.3%20Source%20Code/DBConnect%20API%20${PORTVERSION}
 
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Use C++ object API to allow applications to connect to databases
diff --git a/databases/dbh10/Makefile b/databases/dbh10/Makefile
index 2ba73b0865e6..775273d8f816 100644
--- a/databases/dbh10/Makefile
+++ b/databases/dbh10/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	dbh
 PORTVERSION=	1.0.24
 PORTREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Disk Based Hashtables
diff --git a/databases/exist/Makefile b/databases/exist/Makefile
index 34d758f7e023..f97a17a91d14 100644
--- a/databases/exist/Makefile
+++ b/databases/exist/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	exist
 PORTVERSION=	1.1.1
 PORTREVISION=	1
 CATEGORIES=	databases java
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 DISTNAME=	eXist-${PORTVERSION}-newcore-build4311
 EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=	#
diff --git a/databases/firebird-server/Makefile b/databases/firebird-server/Makefile
index 205a8c7c6788..b8b97ade388b 100644
--- a/databases/firebird-server/Makefile
+++ b/databases/firebird-server/Makefile
@@ -8,8 +8,7 @@
 PORTNAME?=	firebird
 PORTVERSION=	1.5.5
 CATEGORIES?=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=firebird
+MASTER_SITES=	SF/firebird/firebird/${PORTVERSION}-Release%20%28Source%29
 PKGNAMESUFFIX?=	-server
 DISTNAME=	firebird-1.5.5.4926
 
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index 7e03ccabda91..0d7e4364de4a 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -9,8 +9,7 @@ PORTNAME?=	firebird
 PORTVERSION=	2.0.3
 PORTREVISION=	2
 CATEGORIES?=	databases
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=firebird
+MASTER_SITES=	SF/firebird/OldFiles
 PKGNAMESUFFIX?=	-server
 DISTNAME=	Firebird-2.0.3.12981-1
 
diff --git a/databases/flamerobin/Makefile b/databases/flamerobin/Makefile
index 5b7245eaf3d1..0ba988e414fb 100644
--- a/databases/flamerobin/Makefile
+++ b/databases/flamerobin/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	flamerobin
 PORTVERSION=	0.7.6
 PORTREVISION=	4
 CATEGORIES=	databases
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	dindin@FreeBSD.org.ua
diff --git a/databases/fortytwo-bdb/Makefile b/databases/fortytwo-bdb/Makefile
index 1dcd5148197e..01605a3b77c6 100644
--- a/databases/fortytwo-bdb/Makefile
+++ b/databases/fortytwo-bdb/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	bdb
 PORTVERSION=	0.2.1
 PORTREVISION=	2
 CATEGORIES=	databases gnustep
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	fortytwo
+MASTER_SITES=	SF/fortytwo/Berkeley%20DB%20Wrapper%20%28BDB%29/${PORTVERSION}
 PKGNAMEPREFIX=	fortytwo-
 DISTFILES=	BDB-${PORTVERSION}-src.tgz \
 		BDB-${PORTVERSION}-api-ref.tgz
diff --git a/databases/geoserver-mysql-plugin/Makefile b/databases/geoserver-mysql-plugin/Makefile
index a96132fe602c..ce5fd5ce971a 100644
--- a/databases/geoserver-mysql-plugin/Makefile
+++ b/databases/geoserver-mysql-plugin/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	geoserver
 PORTVERSION=	1.7.4
 CATEGORIES=	databases geography java
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/GeoServer%20Extensions/${PORTVERSION}
 PKGNAMESUFFIX=	-mysql-plugin
 DISTNAME=	${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
 
diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile
index bac4e330452e..1667094d628f 100644
--- a/databases/gigabase/Makefile
+++ b/databases/gigabase/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	gigabase
 PORTVERSION=	3.70
 CATEGORIES=	databases
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
 
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Object-Relational Database Management System
diff --git a/databases/gqlplus/Makefile b/databases/gqlplus/Makefile
index 98c9101d9cc8..26fe9063c377 100644
--- a/databases/gqlplus/Makefile
+++ b/databases/gqlplus/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	gqlplus
 PORTVERSION=	1.12
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	SQL*PLUS with commandline editing, history, and name completion
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index c19be63e372b..02994cc28e57 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	hk_classes
 PORTVERSION=	0.8.1
 PORTREVISION=	3
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	hk-classes
+MASTER_SITES=	SF/hk-classes/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ Library for rapid development of database applications
diff --git a/databases/hsqldb/Makefile b/databases/hsqldb/Makefile
index 8a063aab5fe1..210f739d3ab0 100644
--- a/databases/hsqldb/Makefile
+++ b/databases/hsqldb/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	hsqldb
 PORTVERSION=	1.8.0.10
 CATEGORIES=	databases java
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_1_8_0
 DISTNAME=	hsqldb_${PORTVERSION:S/./_/g}
 #EXTRACT_SUFX=	.zip
 
diff --git a/databases/isql-viewer/Makefile b/databases/isql-viewer/Makefile
index 8d472166ac5f..807277835f0f 100644
--- a/databases/isql-viewer/Makefile
+++ b/databases/isql-viewer/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	isql-viewer
 PORTVERSION=	2.1.8
 PORTREVISION=	3
 CATEGORIES=	databases java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:isql/} \
+MASTER_SITES=	SF/isql/Stand%20Alone%20Jars/Version%20${PORTVERSION}:isql \
 		${MASTER_SITE_APACHE:S/$/:bsf/}
 MASTER_SITE_SUBDIR=	isql/:isql \
 			ws/soap/version-2.2/:bsf
diff --git a/databases/jasperreports/Makefile b/databases/jasperreports/Makefile
index 90e509f7a4ae..42fd449d8d98 100644
--- a/databases/jasperreports/Makefile
+++ b/databases/jasperreports/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	jasperreports
 PORTVERSION=	3.0.0
 PORTREVISION=	1
 CATEGORIES=	databases print java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/1.${PORTNAME}/JasperReports%20${PORTVERSION}
 DISTFILES=	${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}-${PORTVERSION}-applet.jar
 
 MAINTAINER=	thierry@FreeBSD.org
diff --git a/databases/jrrd/Makefile b/databases/jrrd/Makefile
index 5cde605a5931..1870a9512a84 100644
--- a/databases/jrrd/Makefile
+++ b/databases/jrrd/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	jrrd
 PORTVERSION=	1.0.3
 CATEGORIES=	databases java
-MASTER_SITES=	SF/opennms
+MASTER_SITES=	SF/opennms/JRRD/stable-1.0
 
 MAINTAINER=	rtdean@cytherianage.net
 COMMENT=	A Java native interface (JNI) to RRDtool
diff --git a/databases/kinterbasdb/Makefile b/databases/kinterbasdb/Makefile
index 548efec00809..3062f1a12767 100644
--- a/databases/kinterbasdb/Makefile
+++ b/databases/kinterbasdb/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=		kinterbasdb
 PORTVERSION=		3.1.3
 CATEGORIES=		databases python
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	kinterbasdb
+MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 DISTNAME=		${PORTNAME}-${PORTVERSION}.src
 
diff --git a/databases/knoda/Makefile b/databases/knoda/Makefile
index e2677b32a836..d4553a786941 100644
--- a/databases/knoda/Makefile
+++ b/databases/knoda/Makefile
@@ -8,8 +8,7 @@ PORTNAME=		knoda
 PORTVERSION=		0.8.1
 PORTREVISION=	3
 CATEGORIES=		databases
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SF
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Database frontend for KDE
diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile
index b4285be86b46..444ca3da0eef 100644
--- a/databases/libdbi-drivers/Makefile
+++ b/databases/libdbi-drivers/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libdbi-drivers
 DISTVERSION=	0.8.3-1
 PORTREVISION=	2
 CATEGORIES=	databases devel
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.8.3-1
 
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	Drivers for libdbi
diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
index 974f34de1e15..da0c3e27666a 100644
--- a/databases/libdbi/Makefile
+++ b/databases/libdbi/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	libdbi
 PORTVERSION=	0.8.3
 CATEGORIES=	databases devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Database Independent Abstraction Layer for C
diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile
index d77941a58200..b0709226727d 100644
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@@ -12,7 +12,8 @@ PORTNAME=	libiodbc
 PORTVERSION=	3.52.6
 CATEGORIES=	databases
 MASTER_SITES=	http://www.iodbc.org/downloads/iODBC/ \
-		SF/iodbc
+		SF/iodbc/iodbc/${PORTVERSION}
+
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An ODBC 3.x driver manager, for universal data source access
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index d5c274bc2569..43b3921b601f 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libodbc++
 PORTVERSION=	0.2.3
 PORTREVISION=	7
 CATEGORIES=	databases devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	libodbcxx
+MASTER_SITES=	SF/libodbcxx/libodbc%2B%2B/${PORTVERSION}
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	A C++ class library and toolset for ODBC access to data sources
diff --git a/databases/mantis/Makefile b/databases/mantis/Makefile
index 4917e9666e63..615c04ba26da 100644
--- a/databases/mantis/Makefile
+++ b/databases/mantis/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	mantis
 PORTVERSION=	1.1.8
 CATEGORIES=	databases www
-MASTER_SITES=	SF/mantisbt
+MASTER_SITES=	SF/${PORTNAME}bt/${PORTNAME}-stable/${PORTVERSION}
 DISTNAME=	mantisbt-${PORTVERSION}
 
 MAINTAINER=	dan@langille.org
diff --git a/databases/mtop/Makefile b/databases/mtop/Makefile
index 41d5177befd7..7d84cbf4946f 100644
--- a/databases/mtop/Makefile
+++ b/databases/mtop/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	mtop
 PORTVERSION=	0.6.6
 PORTREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MySQL Monitoring Tool
diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile
index d716576267b4..5895d91782d9 100644
--- a/databases/mysql-navigator/Makefile
+++ b/databases/mysql-navigator/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	mysql-navigator
 PORTVERSION=	1.4.2
 PORTREVISION=	7
 CATEGORIES=	databases kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S/-//}
+MASTER_SITES=	SF/mysqlnavigator/mysqlnavigator/${PORTVERSION}
 DISTNAME=	${PORTNAME:S/-//}-${PORTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
diff --git a/databases/mysql-udf/Makefile b/databases/mysql-udf/Makefile
index 486442429579..462c0731f672 100644
--- a/databases/mysql-udf/Makefile
+++ b/databases/mysql-udf/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	mysql-udf
 PORTVERSION=	0.3
 CATEGORIES=	databases
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Set of user-defined functions for the MySQL server
diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile
index 856995029c9e..c1b867475ec6 100644
--- a/databases/mysqlcppapi/Makefile
+++ b/databases/mysqlcppapi/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	mysqlcppapi
 PORTVERSION=	1.9.3
 PORTREVISION=	2
 CATEGORIES=	databases devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=mysqlcppapi
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%202/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A fork of mysql++ C++ API for MySQL
diff --git a/databases/p5-DBIWrapper/Makefile b/databases/p5-DBIWrapper/Makefile
index f457523ac84b..211d2b4c5b94 100644
--- a/databases/p5-DBIWrapper/Makefile
+++ b/databases/p5-DBIWrapper/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	DBIWrapper
 PORTVERSION=	0.24
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	dbiwrapper
+MASTER_SITES=	SF
 PKGNAMEPREFIX=	p5-
 DISTNAME=	libdbiwrapper-perl-${PORTVERSION}
 
diff --git a/databases/pgaccess/Makefile b/databases/pgaccess/Makefile
index db5a079bb77b..dd9148fed89a 100644
--- a/databases/pgaccess/Makefile
+++ b/databases/pgaccess/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	pgaccess
 PORTVERSION=	0.99.0.20040219
 PORTREVISION=	2
 CATEGORIES=	databases tcl tk
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pgaccess
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
 EXTRACT_SUFX=	.tgz
 
diff --git a/databases/php-sqlite3/Makefile b/databases/php-sqlite3/Makefile
index e853981d72b4..314e2406b3c6 100644
--- a/databases/php-sqlite3/Makefile
+++ b/databases/php-sqlite3/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=		sqlite3
 PORTVERSION=		0.4
 CATEGORIES=		databases
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	php-sqlite3
+MASTER_SITES=		SF/php-${PORTNAME}/source%20code/release%20${PORTVERSION}
 PKGNAMEPREFIX=		php-
 EXTRACT_SUFX=		.tgz
 #DISTFILES=		sqlite3-0.4.tgz
diff --git a/databases/phpminiadmin/Makefile b/databases/phpminiadmin/Makefile
index c13983c269e8..e03c5b01da75 100644
--- a/databases/phpminiadmin/Makefile
+++ b/databases/phpminiadmin/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	phpminiadmin
 DISTVERSION=	1.4.080217
 CATEGORIES=	databases www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	phpminiadmin
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	spam@rm-rf.kiev.ua
 COMMENT=	Lightweight alternative to phpMyAdmin
diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile
index 3fc2831e2964..f1eff323b15c 100644
--- a/databases/phpmyadmin211/Makefile
+++ b/databases/phpmyadmin211/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	phpMyAdmin211
 DISTVERSION=	2.11.9.5
 CATEGORIES=	databases www
-MASTER_SITES=	SF/phpmyadmin
+MASTER_SITES=	SF/phpmyadmin/phpMyAdmin/${PORTVERSION}
 DISTNAME=	${PORTNAME:S/211//}-${DISTVERSION}-all-languages
 
 MAINTAINER=	m.seaman@infracaninophile.co.uk
diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile
index de16808eb8fe..3958c44c39ec 100644
--- a/databases/pxlib/Makefile
+++ b/databases/pxlib/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	pxlib
 PORTVERSION=	0.6.3
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	C library to read various Paradox files
diff --git a/databases/py-MySQLdb-devel/Makefile b/databases/py-MySQLdb-devel/Makefile
index 9956bfb62565..479d38867118 100644
--- a/databases/py-MySQLdb-devel/Makefile
+++ b/databases/py-MySQLdb-devel/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MySQLdb
 DISTVERSION=	1.2.3c1
 CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	mysql-python
+MASTER_SITES=	SF/mysql-python/mysql-python-test/1.2.3c1
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-devel
 DISTNAME=	MySQL-python-${DISTVERSION}
diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index 4387929f326e..0432c4f69807 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MySQLdb
 DISTVERSION=	1.2.2
 CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	mysql-python
+MASTER_SITES=	SF/mysql-python/mysql-python/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	MySQL-python-${DISTVERSION}
 
diff --git a/databases/py-PySQLite10/Makefile b/databases/py-PySQLite10/Makefile
index fa8301b989ea..953b16577959 100644
--- a/databases/py-PySQLite10/Makefile
+++ b/databases/py-PySQLite10/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	PySQLite
 PORTVERSION=	1.0.1
 CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pysqlite
+MASTER_SITES=	SF/${PORTNAME:L}/OldFiles
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pysqlite-${PORTVERSION}
 
diff --git a/databases/py-forgetsql/Makefile b/databases/py-forgetsql/Makefile
index 8e2a4d9b6486..d46ac70fb772 100644
--- a/databases/py-forgetsql/Makefile
+++ b/databases/py-forgetsql/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	forgetsql
 PORTVERSION=	0.5.1
 CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	forgetSQL-${PORTVERSION}
 
diff --git a/databases/py-mssql/Makefile b/databases/py-mssql/Makefile
index 7ddd3c09a355..7ef136f4420a 100644
--- a/databases/py-mssql/Makefile
+++ b/databases/py-mssql/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	mssql
 PORTVERSION=	1.0.1
 CATEGORIES=	databases python
-MASTER_SITES=	SF/pymssql
+MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pymssql-${PORTVERSION}
 
diff --git a/databases/py-oops/Makefile b/databases/py-oops/Makefile
index 71f1cc109501..b509dabd04f0 100644
--- a/databases/py-oops/Makefile
+++ b/databases/py-oops/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	oops
 PORTVERSION=	0.9.1
 CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pyobjfs
+MASTER_SITES=	SF/pyobjfs/OOPS-Python%20Datastore/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/py-pyPgSQL/Makefile b/databases/py-pyPgSQL/Makefile
index f481b4c36e72..dc7895604a77 100644
--- a/databases/py-pyPgSQL/Makefile
+++ b/databases/py-pyPgSQL/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	pyPgSQL
 PORTVERSION=	2.5.1
 PORTREVISION=	3
 CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	pypgsql
+MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
diff --git a/databases/py-rrdtool_lgpl/Makefile b/databases/py-rrdtool_lgpl/Makefile
index 08d7b109b81d..8a36bdd32efc 100644
--- a/databases/py-rrdtool_lgpl/Makefile
+++ b/databases/py-rrdtool_lgpl/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	rrdtool_lgpl
 PORTVERSION=	0.2.1
 PORTREVISION=	2
 CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	py-rrdtool
+MASTER_SITES=	SF/py-rrdtool/py-rrdtool/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py-rrdtool-${PORTVERSION}
 
diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile
index 902d89eb9feb..9931ea319460 100644
--- a/databases/py-sqlalchemy/Makefile
+++ b/databases/py-sqlalchemy/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	sqlalchemy
 PORTVERSION=	0.5.5
 CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF \
 		CHEESESHOP
-MASTER_SITE_SUBDIR=	sqlalchemy
+
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	SQLAlchemy-${DISTVERSION}
 
diff --git a/databases/py-sqlalchemy06/Makefile b/databases/py-sqlalchemy06/Makefile
index 902d89eb9feb..9931ea319460 100644
--- a/databases/py-sqlalchemy06/Makefile
+++ b/databases/py-sqlalchemy06/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	sqlalchemy
 PORTVERSION=	0.5.5
 CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF \
 		CHEESESHOP
-MASTER_SITE_SUBDIR=	sqlalchemy
+
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	SQLAlchemy-${DISTVERSION}
 
diff --git a/databases/pydbdesigner/Makefile b/databases/pydbdesigner/Makefile
index a39e2ba4ebf9..ca76cd0e1574 100644
--- a/databases/pydbdesigner/Makefile
+++ b/databases/pydbdesigner/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	pydbdesigner
 PORTVERSION=	0.1.4.1
 PORTREVISION=	2
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	xride@FreeBSD.org
 COMMENT=	Graphical designer for relational databases
diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile
index 5085d57cfa7d..3bdc2df1e978 100644
--- a/databases/qdbm/Makefile
+++ b/databases/qdbm/Makefile
@@ -9,9 +9,9 @@ PORTNAME=	qdbm
 PORTVERSION=	1.8.77
 PORTREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF/qdbm/qdbm/${PORTVERSION} \
 		http://qdbm.sourceforge.net/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT?=	Quick Database Manager
diff --git a/databases/rrdman/Makefile b/databases/rrdman/Makefile
index 81c42836e45d..42a4654955b4 100644
--- a/databases/rrdman/Makefile
+++ b/databases/rrdman/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	rrdman
 PORTVERSION=	1.0.1
 PORTREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	rrfw
+MASTER_SITES=	SF/rrfw/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Apply Holt-Winters prediction parameters to RRD data
diff --git a/databases/sqlcached/Makefile b/databases/sqlcached/Makefile
index af874668f463..a41e8f8c7768 100644
--- a/databases/sqlcached/Makefile
+++ b/databases/sqlcached/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	sqlcached
 PORTVERSION=	r4
 CATEGORIES=	databases net
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ivoras@FreeBSD.org
diff --git a/databases/sqlitemanager/Makefile b/databases/sqlitemanager/Makefile
index 45f79fc82262..5d6b57535d9c 100644
--- a/databases/sqlitemanager/Makefile
+++ b/databases/sqlitemanager/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	sqlitemanager
 PORTVERSION=	1.2.0
 CATEGORIES=	databases www
-MASTER_SITES=	SOURCEFORGE
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	SQLiteManager-${PORTVERSION}
 
 MAINTAINER=	gslin@gslin.org
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 21a4fbd9fa5f..3ffc741cc450 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -10,7 +10,6 @@ PORTVERSION=	${SQLRELAY_PORTVERSION}
 PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	sqlrelay
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	A persistent DB connection pooling/proxying/load balancing system
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 11c4470da0ce..2004b580ffe1 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -8,7 +8,7 @@ PORTNAME=	sqsh
 PORTVERSION=	2.1.5
 PORTREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile
index 0b4d5647da5c..25e593a89c6f 100644
--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	squirrel
 PORTVERSION=	2.6.4
 PORTREVISION=	1
 CATEGORIES=	databases java
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
+MASTER_SITES=	SF/${PORTNAME}-sql/1-stable/2.6%20plain%20zip
 PKGNAMESUFFIX=	-sql
 DISTNAME=	squirrel-sql-2.6-standard
 
diff --git a/databases/sybtcl/Makefile b/databases/sybtcl/Makefile
index 9f3071d116cd..f31b428576be 100644
--- a/databases/sybtcl/Makefile
+++ b/databases/sybtcl/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	sybtcl
 PORTVERSION=	3.0rc2
 PORTREVISION=	2
 CATEGORIES=	databases devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	TCL extension to connect to Sybase servers
diff --git a/databases/tcl-Mysql/Makefile b/databases/tcl-Mysql/Makefile
index a5f47db4c938..0ae7558a5344 100644
--- a/databases/tcl-Mysql/Makefile
+++ b/databases/tcl-Mysql/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	${TCL_NODOT}-sql
 PORTVERSION=	20000114
 PORTREVISION=	6
 CATEGORIES=	databases tcl
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	tcl-sql
+MASTER_SITES=	SF/tcl-sql/tcl-sql/${PORTVERSION}
 DISTNAME=	tcl-sql-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index eced2e15ce29..87544306c93a 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	tokyotyrant
 PORTVERSION=	1.1.33
 CATEGORIES=	databases
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	tokyocabinet
+MASTER_SITES=	SF/tokyocabinet/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	gslin@gslin.org
 COMMENT=	Network interface of Tokyo Cabinet
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index aba72ce77f04..5ed4aec3e20a 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	virtuoso
 PORTVERSION=	5.0.1
 PORTREVISION=	2
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-opensource-${PORTVERSION}
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/databases/wfb2sql/Makefile b/databases/wfb2sql/Makefile
index 21f86109bfab..a6037479803a 100644
--- a/databases/wfb2sql/Makefile
+++ b/databases/wfb2sql/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	wfb2sql
 PORTVERSION=	0.6
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CIA World Fact Book to SQL Conversion Utility
diff --git a/databases/yasql/Makefile b/databases/yasql/Makefile
index 904a09c054bc..528ad4d99cd9 100644
--- a/databases/yasql/Makefile
+++ b/databases/yasql/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=		yasql
 PORTVERSION=		1.83
 CATEGORIES=		databases
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SF
 
 MAINTAINER=		thierry@FreeBSD.org
 COMMENT=		Yet Another SQL*Plus Replacement