53 files changed, 52 insertions, 101 deletions

diff --git a/databases/cassandra/Makefile b/databases/cassandra/Makefile
index 2ce352de37be..0c83d57525bd 100644
--- a/databases/cassandra/Makefile
+++ b/databases/cassandra/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	cassandra
 PORTVERSION=	1.2.18
 PORTREVISION=	1
 CATEGORIES=	databases java
-MASTER_SITES=	APACHE
-MASTER_SITE_SUBDIR=	cassandra/${PORTVERSION}
+MASTER_SITES=	APACHE/cassandra/${PORTVERSION}
 DISTNAME=	apache-cassandra-${PORTVERSION}
 EXTRACT_SUFX=	-bin.tar.gz
 
diff --git a/databases/cassandra2/Makefile b/databases/cassandra2/Makefile
index 23c11ccef7db..b2b701bfe930 100644
--- a/databases/cassandra2/Makefile
+++ b/databases/cassandra2/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	cassandra
 PORTVERSION=	2.1.1
 CATEGORIES=	databases java
-MASTER_SITES=	APACHE
-MASTER_SITE_SUBDIR=	cassandra/${PORTVERSION}
+MASTER_SITES=	APACHE/cassandra/${PORTVERSION}
 PKGNAMESUFFIX=	2
 DISTNAME=	apache-cassandra-${PORTVERSION}
 EXTRACT_SUFX=	-bin.tar.gz
diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index d12de7f83bf3..3782a7fd5575 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.6.1
 PORTREVISION=	4
 PORTEPOCH=	2
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	couchdb/source/${PORTVERSION}
+MASTER_SITES=	APACHE/couchdb/source/${PORTVERSION}
 DISTNAME=	apache-couchdb-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/databases/dbview/Makefile b/databases/dbview/Makefile
index ffffc523e526..53c0ca18d90f 100644
--- a/databases/dbview/Makefile
+++ b/databases/dbview/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	dbview
 PORTVERSION=	1.0.4
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/database/proprietary
+MASTER_SITES=	SUNSITE/apps/database/proprietary
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	View dBase III files
diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile
index 5f746dd0577f..6ab8ceb4dda4 100644
--- a/databases/gnats4/Makefile
+++ b/databases/gnats4/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gnats
 PORTVERSION=	4.1.0
 PORTREVISION=	3
 CATEGORIES=	databases devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	gnats
+MASTER_SITES=	GNU
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	portmaster@bsdforge.com
diff --git a/databases/isql-viewer/Makefile b/databases/isql-viewer/Makefile
index 0f1869681cc1..97d09ef6a582 100644
--- a/databases/isql-viewer/Makefile
+++ b/databases/isql-viewer/Makefile
@@ -6,9 +6,7 @@ PORTVERSION=	2.1.8
 PORTREVISION=	4
 CATEGORIES=	databases java
 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
+		APACHE/ws/soap/version-2.2:bsf
 DISTFILES=	${ISQL_JAR}:isql \
 		${BSF_JAR}:bsf
 EXTRACT_ONLY=	# none
diff --git a/databases/jdbm2/Makefile b/databases/jdbm2/Makefile
index 5bff267123bd..bc37c828b19a 100644
--- a/databases/jdbm2/Makefile
+++ b/databases/jdbm2/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	jdbm
 PORTVERSION=	2.4
 CATEGORIES=	databases java
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Fast, simple, and transactional Java persistence engine
diff --git a/databases/ldb/Makefile b/databases/ldb/Makefile
index dd161a40332b..c881289ab257 100644
--- a/databases/ldb/Makefile
+++ b/databases/ldb/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=		1.1.19
 PORTREVISION=		1
 PORTEPOCH=		0
 CATEGORIES=		databases
-MASTER_SITES=		${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SAMBA
 
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		LDAP-like embedded database
diff --git a/databases/luadbi/Makefile b/databases/luadbi/Makefile
index a1001dbd1f9c..44839a01bc64 100644
--- a/databases/luadbi/Makefile
+++ b/databases/luadbi/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	luadbi
 PORTVERSION=	0.5
 PORTREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 
 MAINTAINER=	olexander.v.melnyk@gmail.com
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 985ed1ce3000..e9f8f364a0e7 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	memcached
 PORTVERSION=	1.4.22
 CATEGORIES=	databases
 MASTER_SITES=	http://www.memcached.org/files/ \
-		${MASTER_SITE_GOOGLE_CODE} \
-		${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
+		GOOGLE_CODE \
+		GENTOO
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	High-performance distributed memory object cache system
diff --git a/databases/memcacheq/Makefile b/databases/memcacheq/Makefile
index 495593137760..0dfa69fc5658 100644
--- a/databases/memcacheq/Makefile
+++ b/databases/memcacheq/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	memcacheq
 PORTVERSION=	0.2.0
 PORTREVISION=	4
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
-		${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
+MASTER_SITES=	GOOGLE_CODE \
+		GENTOO
 
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Simple queue service over Memcache
diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index 604a6c661407..7946aeedbeb3 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	mysql-connector-c++
 PORTVERSION=	1.1.5
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	Connector-C++
+MASTER_SITES=	MYSQL/Connector-C++
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MySQL database connector for C++
diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index 3d38a6299953..5bdc72e0df0f 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@@ -5,8 +5,7 @@
 PORTNAME=	mysql-connector-java
 PORTVERSION=	5.1.35
 CATEGORIES=	databases java
-MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	Connector-J
+MASTER_SITES=	MYSQL/Connector-J
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	MySQL Connector/J: JDBC interface for MySQL
diff --git a/databases/mysql-proxy/Makefile b/databases/mysql-proxy/Makefile
index eb7495a6f339..be5aeac9d5dd 100644
--- a/databases/mysql-proxy/Makefile
+++ b/databases/mysql-proxy/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	mysql-proxy
 PORTVERSION=	0.8.4
 PORTREVISION=	2
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	MySQL-Proxy
+MASTER_SITES=	MYSQL/MySQL-Proxy
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Monitor, analyze, or transform the communication of MySQL
diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile
index f425bb1a339b..fa44003fe3c3 100644
--- a/databases/mysql-workbench51/Makefile
+++ b/databases/mysql-workbench51/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	mysql-workbench-oss
 PORTVERSION=	5.1.16
 PORTREVISION=	11
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	MySQLGUITools
+MASTER_SITES=	MYSQL/MySQLGUITools
 PKGNAMESUFFIX=	51
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index c026b74dabc6..ec1baa52cff9 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?=	mysql
 PORTVERSION=	5.1.73
 PORTREVISION?=	2
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	MySQL-5.1
+MASTER_SITES=	MYSQL/MySQL-5.1
 PKGNAMESUFFIX?=	51-server
 
 MAINTAINER=	ale@FreeBSD.org
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index e1e68e6529a6..87457a3b0d95 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?=	mysql
 PORTVERSION=	5.5.43
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
-MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	MySQL-5.5
+MASTER_SITES=	MYSQL/MySQL-5.5
 PKGNAMESUFFIX?=	55-server
 
 MAINTAINER=	ale@FreeBSD.org
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index 859c3f4356ff..71b559d97933 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?=	mysql
 PORTVERSION=	5.6.24
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
-MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	MySQL-5.6
+MASTER_SITES=	MYSQL/MySQL-5.6
 PKGNAMESUFFIX?=	56-server
 
 MAINTAINER=	ale@FreeBSD.org
diff --git a/databases/nagios-check_postgres_replication/Makefile b/databases/nagios-check_postgres_replication/Makefile
index e14572be6ad8..91484524c685 100644
--- a/databases/nagios-check_postgres_replication/Makefile
+++ b/databases/nagios-check_postgres_replication/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	check_postgres_replication
 PORTVERSION=	2010.12.16
 CATEGORIES=	databases python
 MASTER_SITES=	https://gist.github.com/raw/743942/4b9454d6aaf919fe77d15ecea09c7a001ae83b59/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	brooks
+		LOCAL/brooks
 PKGNAMEPREFIX=	nagios-
 DISTNAME=	check_postgres_replication.py
 EXTRACT_SUFX=
diff --git a/databases/ntdb/Makefile b/databases/ntdb/Makefile
index aae678a36f1b..031b4bc8da63 100644
--- a/databases/ntdb/Makefile
+++ b/databases/ntdb/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=		1.0
 PORTREVISION=		0
 PORTEPOCH=		0
 CATEGORIES=		databases
-MASTER_SITES=		${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR=	tdb
+MASTER_SITES=		SAMBA/tdb
 
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		Not so Trivial DataBase
diff --git a/databases/openark-kit/Makefile b/databases/openark-kit/Makefile
index 204878a75e12..8d123a5c9ee1 100644
--- a/databases/openark-kit/Makefile
+++ b/databases/openark-kit/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	openark-kit
 PORTVERSION=	196
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Common utilities for MySQL
diff --git a/databases/p5-Class-DBI-Pg/Makefile b/databases/p5-Class-DBI-Pg/Makefile
index 28cc8bd27756..f571cb31d353 100644
--- a/databases/p5-Class-DBI-Pg/Makefile
+++ b/databases/p5-Class-DBI-Pg/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	Class-DBI-Pg
 PORTVERSION=	0.09
 PORTREVISION=	2
 CATEGORIES=	databases perl5
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Class/DMAKI
+MASTER_SITES=	CPAN/Class/DMAKI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-DBD-InterBase/Makefile b/databases/p5-DBD-InterBase/Makefile
index e195fa0ed1af..46cc3964b8b9 100644
--- a/databases/p5-DBD-InterBase/Makefile
+++ b/databases/p5-DBD-InterBase/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.48
 PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	DBD
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	yuri@rivera.ru
diff --git a/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile b/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
index 02a6158e22f4..0cb90cfd2db8 100644
--- a/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
+++ b/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
@@ -5,7 +5,6 @@ PORTVERSION=	0.01
 PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	DBIx
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fw@moov.de
diff --git a/databases/p5-DBIx-Class-PassphraseColumn/Makefile b/databases/p5-DBIx-Class-PassphraseColumn/Makefile
index 210a4a28a4e3..1826802ac6d7 100644
--- a/databases/p5-DBIx-Class-PassphraseColumn/Makefile
+++ b/databases/p5-DBIx-Class-PassphraseColumn/Makefile
@@ -5,7 +5,6 @@ PORTVERSION=	0.02
 PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	DBIx
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fw@moov.de
diff --git a/databases/p5-DBIx-Class-TimeStamp/Makefile b/databases/p5-DBIx-Class-TimeStamp/Makefile
index f597969bc11c..d596cee9d65b 100644
--- a/databases/p5-DBIx-Class-TimeStamp/Makefile
+++ b/databases/p5-DBIx-Class-TimeStamp/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.14
 PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	DBIx
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/databases/p5-DBIx-Ease/Makefile b/databases/p5-DBIx-Ease/Makefile
index 06ca02e80107..5a7402560e6f 100644
--- a/databases/p5-DBIx-Ease/Makefile
+++ b/databases/p5-DBIx-Ease/Makefile
@@ -5,10 +5,8 @@ PORTNAME=	DBIx-Ease
 PORTVERSION=	0.07
 PORTREVISION=	1
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_LOCAL:S/$/:local/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
-MASTER_SITE_SUBDIR=	mat/:local DBIx/:cpan
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:local,cpan
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Less-code DBI interactions for all drivers
diff --git a/databases/p5-DBIx-HA/Makefile b/databases/p5-DBIx-HA/Makefile
index e734a0770a89..7ade82529a1d 100644
--- a/databases/p5-DBIx-HA/Makefile
+++ b/databases/p5-DBIx-HA/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.1
 PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	DBIx
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-DBIx-MySQLSequence/Makefile b/databases/p5-DBIx-MySQLSequence/Makefile
index 60622cbcc256..a0f6307ac189 100644
--- a/databases/p5-DBIx-MySQLSequence/Makefile
+++ b/databases/p5-DBIx-MySQLSequence/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.04
 PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	DBIx
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lth@FreeBSD.org
diff --git a/databases/p5-MongoDB/Makefile b/databases/p5-MongoDB/Makefile
index 30b031451090..9eacf23a49b1 100644
--- a/databases/p5-MongoDB/Makefile
+++ b/databases/p5-MongoDB/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	MongoDB
 PORTVERSION=	0.708.1.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MONGODB
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mongo Driver for Perl
diff --git a/databases/p5-Oryx/Makefile b/databases/p5-Oryx/Makefile
index d17a66c435d5..996a2c29d9cd 100644
--- a/databases/p5-Oryx/Makefile
+++ b/databases/p5-Oryx/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	Oryx
 PORTVERSION=	0.24
 PORTREVISION=	2
 CATEGORIES=	databases perl5
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	XML/RHUNDT
+MASTER_SITES=	CPAN/XML/RHUNDT
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-Pg/Makefile b/databases/p5-Pg/Makefile
index af57fc5c98e9..dbef4678097d 100644
--- a/databases/p5-Pg/Makefile
+++ b/databases/p5-Pg/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	2.1.1
 PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR=	projects/gborg/pgperl/stable
+MASTER_SITES=	PGSQL/projects/gborg/pgperl/stable
 PKGNAMEPREFIX=	p5-
 DIST_SUBDIR=	postgresql
 
diff --git a/databases/p5-RRD-Simple/Makefile b/databases/p5-RRD-Simple/Makefile
index 5d31dcd158e6..f661e6ff65c7 100644
--- a/databases/p5-RRD-Simple/Makefile
+++ b/databases/p5-RRD-Simple/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	RRD-Simple
 PORTVERSION=	1.44
 PORTREVISION=	6
 CATEGORIES=	databases perl5
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Proc/NICOLAW
+MASTER_SITES=	CPAN/Proc/NICOLAW
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile b/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
index b43663165858..f04dba894829 100644
--- a/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
+++ b/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	Rose-DBx-Object-MoreHelpers
 PORTVERSION=	0.100
 PORTREVISION=	1
 CATEGORIES=	databases perl5
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Rose/KARMAN
+MASTER_SITES=	CPAN/Rose/KARMAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/databases/p5-TokyoCabinet/Makefile b/databases/p5-TokyoCabinet/Makefile
index b8e1d79fcbeb..7c6c027e51e8 100644
--- a/databases/p5-TokyoCabinet/Makefile
+++ b/databases/p5-TokyoCabinet/Makefile
@@ -4,9 +4,8 @@ PORTNAME=	TokyoCabinet
 PORTVERSION=	1.34
 PORTREVISION=	1
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
+MASTER_SITES=	LOCAL/kuriyama \
 		http://fallabs.com/tokyocabinet/perlpkg/
-MASTER_SITE_SUBDIR=	kuriyama
 PKGNAMEPREFIX=	p5-
 DISTNAME=	tokyocabinet-perl-${PORTVERSION}
 
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index 067fd45ca841..30257da0a72d 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	pgadmin3
 PORTVERSION=	1.18.1
 PORTREVISION=	2
 CATEGORIES=	databases
-MASTER_SITES=	PGSQL
-MASTER_SITE_SUBDIR=	pgadmin3/release/v${PORTVERSION}/src
+MASTER_SITES=	PGSQL/pgadmin3/release/v${PORTVERSION}/src
 DIST_SUBDIR=	postgresql
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/databases/pgagent/Makefile b/databases/pgagent/Makefile
index 1d3bf2e240c3..9ecedc2a8e52 100644
--- a/databases/pgagent/Makefile
+++ b/databases/pgagent/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	pgagent
 PORTVERSION=	3.4.0
 PORTREVISION=	0
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR=	pgadmin3/release/pgagent
+MASTER_SITES=	PGSQL/pgadmin3/release/pgagent
 DISTNAME=	pgAgent-${PORTVERSION}-Source
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/databases/pgbadger/Makefile b/databases/pgbadger/Makefile
index 2b0ac445af0b..c93c6279579d 100644
--- a/databases/pgbadger/Makefile
+++ b/databases/pgbadger/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	pgbadger
 PORTVERSION=	6.2
 PORTREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Very competent log analyzer for PostgreSQL
diff --git a/databases/pgtcl/Makefile b/databases/pgtcl/Makefile
index 335a5132d7dd..fb21096092b8 100644
--- a/databases/pgtcl/Makefile
+++ b/databases/pgtcl/Makefile
@@ -5,10 +5,10 @@ PORTNAME=	pgtcl
 PORTVERSION=	2.0.0
 PORTREVISION=	1
 CATEGORIES=	databases tcl
-MASTER_SITES=	SF/pgtclng/pgtclng/${PORTVERSION}:src
-MASTER_SITE_SUBDIR=	pgtclng
+MASTER_SITES=	SF/pgtclng/pgtclng/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	TCL extension for accessing a PostgreSQL server (PGTCL-NG)
@@ -33,7 +33,6 @@ MANUALREL=	20110918
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-EXTRACT_ONLY=	${_DISTFILES:M*tar.gz}
 DISTFILES+=	pgtcldocs-${MANUALREL}.zip:doc
 MASTER_SITES+=	SF/pgtclng/Manual/${MANUALREL}:doc
 .endif
diff --git a/databases/postgresql-libpgeasy/Makefile b/databases/postgresql-libpgeasy/Makefile
index 25135cc0d6b2..bcda0ba4b7eb 100644
--- a/databases/postgresql-libpgeasy/Makefile
+++ b/databases/postgresql-libpgeasy/Makefile
@@ -6,8 +6,7 @@ PORTNAME=	libpgeasy
 PORTVERSION=	3.0.4
 PORTREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR=	projects/gborg/pgeasy/stable
+MASTER_SITES=	PGSQL/projects/gborg/pgeasy/stable
 DIST_SUBDIR=	postgresql
 
 MAINTAINER=	pgsql@FreeBSD.org
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index c984f29a92e1..21e1d13e6c50 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?=	postgresql
 DISTVERSION?=	8.4.22
 PORTREVISION?=	1
 CATEGORIES?=	databases
-MASTER_SITES=	PGSQL
-MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
+MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 858ec228e863..f0d9e54375b1 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?=	postgresql
 DISTVERSION?=	9.1.15
 PORTREVISION?=	0
 CATEGORIES?=	databases
-MASTER_SITES=	PGSQL
-MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
+MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index ed3c9c6087e1..eb90bcad1316 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME?=	postgresql
 DISTVERSION?=	9.2.10
 PORTREVISION?=	0
 CATEGORIES?=	databases
-MASTER_SITES=	PGSQL
-MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
+MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
diff --git a/databases/py-apsw/Makefile b/databases/py-apsw/Makefile
index 03ef9186cb5d..909e0140e737 100644
--- a/databases/py-apsw/Makefile
+++ b/databases/py-apsw/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	apsw
 PORTVERSION=	3.8.0.2
+DISTVERSIONSUFFIX=	-r1
 PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-r1
 
 MAINTAINER=	rnejdl@ringofsaturn.com
 COMMENT=	APSW stands for Another Python SQLite Wrapper
diff --git a/databases/py-bsddb/Makefile b/databases/py-bsddb/Makefile
index ef4188fcdb94..ad7a61e290b4 100644
--- a/databases/py-bsddb/Makefile
+++ b/databases/py-bsddb/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	bsddb
 PORTVERSION=	${PYTHON_PORTVERSION}
 PORTREVISION=	5
 CATEGORIES=	databases python
-MASTER_SITES=	PYTHON
-MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
+MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Python-${PORTVERSION}
 
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index 2187b1bca27e..eeb9e613b960 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gdbm
 PORTVERSION=	${PYTHON_PORTVERSION}
 PORTREVISION=	3
 CATEGORIES=	databases python
-MASTER_SITES=	PYTHON
-MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
+MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Python-${PORTVERSION}
 
diff --git a/databases/py-mysql-connector-python/Makefile b/databases/py-mysql-connector-python/Makefile
index 3ce237952a13..a4d1f92b90fb 100644
--- a/databases/py-mysql-connector-python/Makefile
+++ b/databases/py-mysql-connector-python/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=		mysql-connector-python
 PORTVERSION=		1.2.3
 CATEGORIES=		databases python
-MASTER_SITES=		${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	Connector-Python
+MASTER_SITES=		MYSQL/Connector-Python
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=		bofh@FreeBSD.org
diff --git a/databases/py-mysql-connector-python2/Makefile b/databases/py-mysql-connector-python2/Makefile
index 92e49c207916..1e37e4ccd91a 100644
--- a/databases/py-mysql-connector-python2/Makefile
+++ b/databases/py-mysql-connector-python2/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=		mysql-connector-python
 PORTVERSION=		2.0.3
 CATEGORIES=		databases python
-MASTER_SITES=		${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	Connector-Python
+MASTER_SITES=		MYSQL/Connector-Python
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=		2
 
diff --git a/databases/py-sqlalchemy-migrate/Makefile b/databases/py-sqlalchemy-migrate/Makefile
index 3343369793db..64c1109d7acd 100644
--- a/databases/py-sqlalchemy-migrate/Makefile
+++ b/databases/py-sqlalchemy-migrate/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	sqlalchemy-migrate
 PORTVERSION=	0.7.2
 PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lwhsu@FreeBSD.org
diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile
index ca1535c39c5a..e6fb955bd250 100644
--- a/databases/py-sqlite3/Makefile
+++ b/databases/py-sqlite3/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	sqlite3
 PORTVERSION=	${PYTHON_PORTVERSION}
 PORTREVISION=	6
 CATEGORIES=	databases python
-MASTER_SITES=	PYTHON
-MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
+MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Python-${PORTVERSION}
 DIST_SUBDIR=	python
diff --git a/databases/soci/Makefile b/databases/soci/Makefile
index 4151e74696ea..6fc7bdbca692 100644
--- a/databases/soci/Makefile
+++ b/databases/soci/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	soci
 PORTVERSION=	3.2.2
 PORTREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	The C++ Database Access Library
diff --git a/databases/sqlclient/Makefile b/databases/sqlclient/Makefile
index 6b7db35b2795..876244a5b64b 100644
--- a/databases/sqlclient/Makefile
+++ b/databases/sqlclient/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	sqlclient
 PORTVERSION=	1.7.0
 PORTREVISION=	2
 CATEGORIES=	databases gnustep
-MASTER_SITES=	${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR=	libs
+MASTER_SITES=	GNUSTEP/libs
 DISTNAME=	SQLClient-${PORTVERSION}
 
 MAINTAINER=	theraven@FreeBSD.org
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index 1683a188fad7..35908062d00b 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=		1.3.4
 PORTREVISION=		0
 PORTEPOCH=		1
 CATEGORIES=		databases
-MASTER_SITES=		${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SAMBA
 
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		Trivial Database