41 files changed, 45 insertions, 85 deletions

diff --git a/lang/basic256/Makefile b/lang/basic256/Makefile
index eb495cdabb48..3dc8b89d1d1b 100644
--- a/lang/basic256/Makefile
+++ b/lang/basic256/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	basic256
 PORTVERSION=	1.1.4.0
 PORTREVISION=	1
 CATEGORIES=	lang
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	kidbasic/${PORTNAME}
+MASTER_SITES=	SF/kidbasic/${PORTNAME}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	fernando.apesteguia@gmail.com
diff --git a/lang/clang-cheri/Makefile b/lang/clang-cheri/Makefile
index 212777ac54cf..b85c95d62e8c 100644
--- a/lang/clang-cheri/Makefile
+++ b/lang/clang-cheri/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	clang-cheri
 PORTVERSION=	3.7.d20150512
 CATEGORIES=	lang devel
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	brooks
+MASTER_SITES=	LOCAL/brooks
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and C++ compiler with CHERI CPU support
diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 5da6b407f45e..03d8601346cf 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	clang
 PORTVERSION=	3.7.r${SVN_REV}
 CATEGORIES=	lang devel
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	brooks
+MASTER_SITES=	LOCAL/brooks
 PKGNAMESUFFIX=	-devel
 DISTFILES=	${CLANG_SOURCE} \
 		${LLVM_SOURCE}
diff --git a/lang/emacs-lisp-intro/Makefile b/lang/emacs-lisp-intro/Makefile
index 451b5b7017b3..6296cb339e97 100644
--- a/lang/emacs-lisp-intro/Makefile
+++ b/lang/emacs-lisp-intro/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	emacs-lisp-intro
 PORTVERSION=	2.04
 CATEGORIES=	lang elisp
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	emacs
+MASTER_SITES=	GNU/emacs
 
 MAINTAINER=	amakawa@jp.FreeBSD.org
 COMMENT=	Introduction to Emacs Lisp programming
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 97869da4c6e6..cb318021dd71 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://www.erlang.se/doc/:erlangse			\
 		http://www.erlang.se/publications/:publications		\
 		http://www.sics.se/~joe/thesis/:joe			\
-		${MASTER_SITE_LOCAL:S/$/:local/:S,%SUBDIR%/,olgeni/,}
+		LOCAL/olgeni:local
 DISTNAME=	otp_src_${ERL_RELEASE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
 		${ERLANG_MAN}:erlangorg
diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile
index 7004be00e203..9fa24c9be22d 100644
--- a/lang/gcc-aux/Makefile
+++ b/lang/gcc-aux/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	${SNAPSHOT}
 PORTREVISION=	${MAIN_PR}
 CATEGORIES=	lang
 MASTER_SITES=	http://downloads.dragonlace.net/src/:boot \
-		LOCAL/marino:boot ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR=	${MS_SUBDIR}
+		LOCAL/marino:boot GCC/${MS_SUBDIR}
 DISTFILES=	${IDENTIFICATION}.tar.bz2
 
 MAINTAINER=	marino@FreeBSD.org
diff --git a/lang/gcc47-aux/Makefile b/lang/gcc47-aux/Makefile
index a0142b62c8d7..89de0c8351e1 100644
--- a/lang/gcc47-aux/Makefile
+++ b/lang/gcc47-aux/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	${SNAPSHOT}
 PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://downloads.dragonlace.net/src/:boot \
-		${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR=	releases/gcc-${GCC_VERSION}
+		GCC/releases/gcc-${GCC_VERSION}
 DISTFILES=	gcc-${GCC_VERSION}.tar.bz2
 
 MAINTAINER=	marino@FreeBSD.org
diff --git a/lang/gcc5-aux/Makefile b/lang/gcc5-aux/Makefile
index 89a6db9b4376..05e545c8c0a7 100644
--- a/lang/gcc5-aux/Makefile
+++ b/lang/gcc5-aux/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	${SNAPSHOT}
 PORTREVISION=	${MAIN_PR}
 CATEGORIES=	lang
 MASTER_SITES=	http://downloads.dragonlace.net/src/:boot \
-		LOCAL/marino:boot ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR=	${MS_SUBDIR}
+		LOCAL/marino:boot GCC/${MS_SUBDIR}
 DISTFILES=	${IDENTIFICATION}.tar.bz2
 
 MAINTAINER=	marino@FreeBSD.org
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 756717020913..68c463580321 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	7.8.3
 PORTREVISION=	1
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
-		${MASTER_SITE_LOCAL:S/$/:boot/}
-MASTER_SITE_SUBDIR=	pgj/:boot
+		LOCAL/pgj/:boot
 DISTFILES=	ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/lang/gnat_util/Makefile b/lang/gnat_util/Makefile
index 892657cdbb47..d34be6752534 100644
--- a/lang/gnat_util/Makefile
+++ b/lang/gnat_util/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gnat_util
 PORTVERSION=	${SNAPSHOT}
 PORTREVISION=	${UTIL_PR}
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR= ${MS_SUBDIR}
+MASTER_SITES=	GCC/${MS_SUBDIR}
 DISTNAME=	${IDENTIFICATION}
 
 MAINTAINER=	marino@FreeBSD.org
diff --git a/lang/gnatdroid-armv7/Makefile b/lang/gnatdroid-armv7/Makefile
index c2d14574c221..92453c922bab 100644
--- a/lang/gnatdroid-armv7/Makefile
+++ b/lang/gnatdroid-armv7/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	armv7
 PORTVERSION=	${SNAPSHOT}
 PORTREVISION=	${ARMV7_PR}
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR=	releases/gcc-${GCC_VERSION}
+MASTER_SITES=	GCC/releases/gcc-${GCC_VERSION}
 PKGNAMEPREFIX=	gnatdroid-
 DISTFILES=	${IDENTIFICATION}.tar.bz2
 
diff --git a/lang/gnatdroid-binutils/Makefile b/lang/gnatdroid-binutils/Makefile
index 531d7aaf29f5..0b2c8049409e 100644
--- a/lang/gnatdroid-binutils/Makefile
+++ b/lang/gnatdroid-binutils/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=		binutils
 PORTVERSION=		2.25
 CATEGORIES=		lang
-MASTER_SITES=		${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	binutils/releases
+MASTER_SITES=		SOURCEWARE/binutils/releases
 PKGNAMEPREFIX=		gnatdroid-
 
 MAINTAINER=	marino@FreeBSD.org
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 43d4fc5e30d6..59831da0acef 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -6,8 +6,7 @@ PORTNAME=	guile
 PORTVERSION=	1.8.8
 PORTREVISION=	2
 CATEGORIES=	lang scheme
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	guile
+MASTER_SITES=	GNU
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	GNU Ubiquitous Intelligent Language for Extension
diff --git a/lang/libstdc++_stldoc_4.2.2/Makefile b/lang/libstdc++_stldoc_4.2.2/Makefile
index bb73b84ec11c..10ddb2727ba9 100644
--- a/lang/libstdc++_stldoc_4.2.2/Makefile
+++ b/lang/libstdc++_stldoc_4.2.2/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	libstdc++_stldoc_4.2.2
 PORTVERSION=	20071101
 PORTREVISION=	1
 CATEGORIES=	lang devel
-MASTER_SITES=	${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR=	libstdc++/doxygen
+MASTER_SITES=	GCC/libstdc++/doxygen
 DISTNAME=	libstdc++-html-USERS-4.2.2
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index bdac81fd0a67..315f5b931b3c 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -7,7 +7,6 @@ PORTVERSION=	4.02.1
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \
 		http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs
-MASTER_SITE_SUBDIR=	distfiles
 PKGNAMESUFFIX=	${SFX}
 
 MAINTAINER=	michipili@gmail.com
diff --git a/lang/p5-v6/Makefile b/lang/p5-v6/Makefile
index d72fea90c90b..448e08f303e1 100644
--- a/lang/p5-v6/Makefile
+++ b/lang/p5-v6/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.017
 PORTREVISION=	1
 CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/F/FG/FGLOCK
+MASTER_SITE_SUBDIR=	CPAN:FGLOCK
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-alpha-${PORTVERSION}
 
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index bad2972a3f95..613a27a896cf 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	php5
 PORTVERSION=	5.4.40
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
-MASTER_SITES=	${MASTER_SITE_PHP}
-MASTER_SITE_SUBDIR=	distributions
+MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${PORTVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
@@ -63,8 +62,7 @@ DESTDIRNAME=	INSTALL_ROOT
 
 PATCH_DIST_STRIP=	-p1
 
-PATCH_SITES+=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	ale
+PATCH_SITES+=	LOCAL/ale
 
 .if ${PORT_OPTIONS:MMAILHEAD}
 PATCHFILES+=	php-5.4.x-mail-header.patch:mail
diff --git a/lang/php55/Makefile b/lang/php55/Makefile
index a847afab06ca..bd211e5c83b1 100644
--- a/lang/php55/Makefile
+++ b/lang/php55/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	php55
 PORTVERSION=	5.5.24
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
-MASTER_SITES=	${MASTER_SITE_PHP}
-MASTER_SITE_SUBDIR=	distributions
+MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${PORTVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
@@ -63,8 +62,7 @@ DESTDIRNAME=	INSTALL_ROOT
 
 PATCH_DIST_STRIP=	-p1
 
-PATCH_SITES+=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	ale
+PATCH_SITES+=	LOCAL/ale
 
 .if ${PORT_OPTIONS:MMAILHEAD}
 PATCHFILES+=	php-5.5.x-mail-header.patch:mail
diff --git a/lang/php56/Makefile b/lang/php56/Makefile
index d71863867f77..5f089af9e0d9 100644
--- a/lang/php56/Makefile
+++ b/lang/php56/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	php56
 PORTVERSION=	5.6.8
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
-MASTER_SITES=	${MASTER_SITE_PHP}
-MASTER_SITE_SUBDIR=	distributions
+MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${PORTVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
@@ -63,8 +62,7 @@ DESTDIRNAME=	INSTALL_ROOT
 
 PATCH_DIST_STRIP=	-p1
 
-PATCH_SITES+=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	ale
+PATCH_SITES+=	LOCAL/ale
 
 .if ${PORT_OPTIONS:MMAILHEAD}
 PATCHFILES+=	php-5.5.x-mail-header.patch:mail
diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile
index 4de64b1434cb..0df734ca0ec1 100644
--- a/lang/python-doc-html/Makefile
+++ b/lang/python-doc-html/Makefile
@@ -4,9 +4,8 @@
 PORTNAME=	python-doc-${DOCFORMAT}
 PORTVERSION=	${PYTHON_PORTVERSION}
 CATEGORIES=	lang python
-MASTER_SITES=	PYTHON
-MASTER_SITE_SUBDIR=	ftp/python/doc/${PORTVERSION} \
-			ftp/python/doc/current
+MASTER_SITES=	PYTHON/ftp/python/doc/${PORTVERSION} \
+		PYTHON/ftp/python/doc/current
 DISTNAME=	python-${PORTVERSION}-docs-${DOCFORMAT}
 DIST_SUBDIR=	python
 
diff --git a/lang/python-tools/Makefile b/lang/python-tools/Makefile
index 2952f0c77b82..97fb063f24b5 100644
--- a/lang/python-tools/Makefile
+++ b/lang/python-tools/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	python-tools
 PORTVERSION=	${PYTHON_PORTVERSION}
 CATEGORIES=	lang python devel
-MASTER_SITES=	PYTHON
-MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
+MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Python-${PORTVERSION}
 
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index f9972e70d9e7..5d4903c39c57 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	python27
 PORTVERSION=	2.7.9
 PORTREVISION=	1
 CATEGORIES=	lang python ipv6
-MASTER_SITES=	PYTHON
-MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
+MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
 DIST_SUBDIR=	python
 
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index ef3ceb3e244f..3bbcf0816851 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	python32
 PORTVERSION=	3.2.5
 PORTREVISION=	13
 CATEGORIES=	lang python ipv6
-MASTER_SITES=	PYTHON
-MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
+MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
 DIST_SUBDIR=	python
 
diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index 45c54ed5fb59..1755b4c376d0 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	python33
 PORTVERSION=	3.3.5
 PORTREVISION=	6
 CATEGORIES=	lang python ipv6
-MASTER_SITES=	PYTHON
-MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
+MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
 DIST_SUBDIR=	python
 
diff --git a/lang/python34/Makefile b/lang/python34/Makefile
index c7db4d43039a..35b9724620eb 100644
--- a/lang/python34/Makefile
+++ b/lang/python34/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	python34
 PORTVERSION=	3.4.3
 PORTREVISION=	1
 CATEGORIES=	lang python ipv6
-MASTER_SITES=	PYTHON
-MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
+MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
 DIST_SUBDIR=	python
 
diff --git a/lang/ratfor/Makefile b/lang/ratfor/Makefile
index c18226c14425..0cfd1889fedf 100644
--- a/lang/ratfor/Makefile
+++ b/lang/ratfor/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	ratfor
 PORTVERSION=	1985.06
 PORTREVISION=	5
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_LOCAL}  \
+MASTER_SITES=	LOCAL/obrien \
 		http://sepwww.stanford.edu/sep/prof/
-MASTER_SITE_SUBDIR=	obrien
 DISTFILES=	ratfor.shar.2 local.ratfor77.shar
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/lang/rhino/Makefile b/lang/rhino/Makefile
index 00ae267d21f1..a025ff2ce968 100644
--- a/lang/rhino/Makefile
+++ b/lang/rhino/Makefile
@@ -6,8 +6,7 @@ DISTVERSION=	1_7R4
 CATEGORIES=	lang java
 MASTER_SITES=	http://cloud.github.com/downloads/mozilla/rhino/:rhino \
 		LOCAL/nivit/${PORTNAME}/:swingex \
-		${MASTER_SITE_APACHE}:xmlbeans
-MASTER_SITE_SUBDIR=	xmlbeans/binaries/:xmlbeans
+		APACHE/xmlbeans/binaries/:xmlbeans
 DISTFILES=	${PORTNAME}${DISTVERSION}.zip:rhino \
 		src.zip:swingex \
 		xmlbeans-2.5.0.zip:xmlbeans
diff --git a/lang/ruby20/Makefile b/lang/ruby20/Makefile
index 804a60cfb9cd..fafe9df09214 100644
--- a/lang/ruby20/Makefile
+++ b/lang/ruby20/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	${RUBY_PORTVERSION}
 PORTREVISION=	${RUBY_PORTREVISION}
 PORTEPOCH=	${RUBY_PORTEPOCH}
 CATEGORIES=	lang ruby ipv6
-MASTER_SITES=		${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR_RUBY}
+MASTER_SITES=		RUBY/${MASTER_SITE_SUBDIR_RUBY}
 DISTNAME=	${RUBY_DISTNAME}
 DIST_SUBDIR=	ruby
 
diff --git a/lang/ruby21/Makefile b/lang/ruby21/Makefile
index 11ce9d211154..4faab73c62d5 100644
--- a/lang/ruby21/Makefile
+++ b/lang/ruby21/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	${RUBY_PORTVERSION}
 PORTREVISION=	${RUBY_PORTREVISION}
 PORTEPOCH=	${RUBY_PORTEPOCH}
 CATEGORIES=	lang ruby ipv6
-MASTER_SITES=		${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR_RUBY}
+MASTER_SITES=		RUBY/${MASTER_SITE_SUBDIR_RUBY}
 DISTNAME=	${RUBY_DISTNAME}
 DIST_SUBDIR=	ruby
 
diff --git a/lang/ruby22/Makefile b/lang/ruby22/Makefile
index fe7c841f267c..140f55029467 100644
--- a/lang/ruby22/Makefile
+++ b/lang/ruby22/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	${RUBY_PORTVERSION}
 PORTREVISION=	${RUBY_PORTREVISION}
 PORTEPOCH=	${RUBY_PORTEPOCH}
 CATEGORIES=	lang ruby ipv6
-MASTER_SITES=		${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR_RUBY}
+MASTER_SITES=		RUBY/${MASTER_SITE_SUBDIR_RUBY}
 DISTNAME=	${RUBY_DISTNAME}
 DIST_SUBDIR=	ruby
 
diff --git a/lang/sagittarius-scheme/Makefile b/lang/sagittarius-scheme/Makefile
index b164ca46565c..63954f65bb2f 100644
--- a/lang/sagittarius-scheme/Makefile
+++ b/lang/sagittarius-scheme/Makefile
@@ -4,9 +4,8 @@
 PORTNAME=	sagittarius
 PORTVERSION=	0.6.3
 CATEGORIES=	lang
-MASTER_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	ashish
+MASTER_SITES=	http://distfiles.pirateparty.in/ashish/ \
+		LOCAL/ashish
 PKGNAMESUFFIX=	-scheme
 
 MAINTAINER=	ashish@FreeBSD.org
diff --git a/lang/siod/Makefile b/lang/siod/Makefile
index 94ee9537585e..33befa1fe403 100644
--- a/lang/siod/Makefile
+++ b/lang/siod/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	siod
 PORTVERSION=	3.4
 CATEGORIES=	lang scheme
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jkoshy
+MASTER_SITES=	LOCAL/jkoshy
 DISTNAME=	siod
 EXTRACT_SUFX=	.tgz
 
diff --git a/lang/spidermonkey17/Makefile b/lang/spidermonkey17/Makefile
index 4394ed9296ae..a2a3ce8d65e3 100644
--- a/lang/spidermonkey17/Makefile
+++ b/lang/spidermonkey17/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	spidermonkey17
 DISTVERSION=	1.7.0
 PORTREVISION=	1
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR=	js
+MASTER_SITES=	MOZILLA_EXTENDED/js
 DISTNAME=	js-${DISTVERSION}
 
 MAINTAINER=	citric@cubicone.tmetic.com
diff --git a/lang/spidermonkey170/Makefile b/lang/spidermonkey170/Makefile
index cf805be975e2..98b3c20cba7f 100644
--- a/lang/spidermonkey170/Makefile
+++ b/lang/spidermonkey170/Makefile
@@ -5,8 +5,7 @@ PORTNAME=		spidermonkey170
 PORTVERSION=		17.0.0
 PORTREVISION=		1
 CATEGORIES=		lang
-MASTER_SITES=		${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	js
+MASTER_SITES=		MOZILLA/js
 DISTNAME=		mozjs${PORTVERSION}
 
 MAINTAINER=		kwm@FreeBSD.org
diff --git a/lang/spidermonkey185/Makefile b/lang/spidermonkey185/Makefile
index 35d20f50222b..24983a494a27 100644
--- a/lang/spidermonkey185/Makefile
+++ b/lang/spidermonkey185/Makefile
@@ -5,8 +5,7 @@ PORTNAME=		spidermonkey185
 PORTVERSION=		1.8.5
 PORTREVISION=		2
 CATEGORIES=		lang
-MASTER_SITES=		${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	js
+MASTER_SITES=		MOZILLA/js
 DISTNAME=		js185-1.0.0
 
 MAINTAINER=		koobs@FreeBSD.org
diff --git a/lang/spidermonkey24/Makefile b/lang/spidermonkey24/Makefile
index 1c25f1abbf6e..0c262911d6fe 100644
--- a/lang/spidermonkey24/Makefile
+++ b/lang/spidermonkey24/Makefile
@@ -5,9 +5,8 @@ PORTNAME=		spidermonkey24
 PORTVERSION=		24.2.0
 PORTREVISION=		1
 CATEGORIES=		lang
-MASTER_SITES=		${MASTER_SITE_MOZILLA}
+MASTER_SITES=		MOZILLA/js
 #http://people.mozilla.org/~sstangl/
-MASTER_SITE_SUBDIR=	js
 DISTNAME=		mozjs-${PORTVERSION}
 
 MAINTAINER=		kwm@FreeBSD.org
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 2756c4635477..f62e3c9a50d9 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -6,9 +6,8 @@ PORTVERSION=	8.4.20
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	lang tcl
-MASTER_SITES=	${MASTER_SITE_TCLTK} \
+MASTER_SITES=	TCLTK/tcl8_4 \
 		SF/tcl/Tcl/${PORTVERSION}
-MASTER_SITE_SUBDIR=	tcl8_4
 PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index 58f4a2ab41d7..ad69b7b44393 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -4,9 +4,8 @@
 PORTNAME=	tcl
 PORTVERSION=	8.5.18
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_TCLTK} \
+MASTER_SITES=	TCLTK/tcl8_5 \
 		SF/tcl/Tcl/${PORTVERSION}
-MASTER_SITE_SUBDIR=tcl8_5
 PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index 966a405e3313..6697ee76e0ad 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	tcl
 PORTVERSION=	8.6.4
 CATEGORIES=	lang
 MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION} \
-		${MASTER_SITE_TCLTK}
-MASTER_SITE_SUBDIR=tcl8_6
+		TCLTK/tcl8_6
 PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
diff --git a/lang/tinypy/Makefile b/lang/tinypy/Makefile
index 552c5f126db7..646dc925f478 100644
--- a/lang/tinypy/Makefile
+++ b/lang/tinypy/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	tinypy
 PORTVERSION=	1.1
 PORTREVISION=	1
 CATEGORIES=	lang python
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	saper@saper.info
 COMMENT=	Minimalist implementation of python in 64k of code
diff --git a/lang/ypsilon/Makefile b/lang/ypsilon/Makefile
index 6cd9bc3a967e..a5a6e419f37b 100644
--- a/lang/ypsilon/Makefile
+++ b/lang/ypsilon/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	ypsilon
 PORTVERSION=	0.9.6.3
 PORTREVISION=	3
 CATEGORIES=	lang scheme
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	${PORTNAME}-0.9.6.update3
 
 MAINTAINER=	vmagerya@gmail.com