17 files changed, 13 insertions, 26 deletions

diff --git a/x11-fonts/charis-compact/Makefile b/x11-fonts/charis-compact/Makefile
index 399bd2515328..7a324044309b 100644
--- a/x11-fonts/charis-compact/Makefile
+++ b/x11-fonts/charis-compact/Makefile
@@ -11,7 +11,6 @@ MASTER_SITES=	http://scripts.sil.org/ttw/fonts2go.cgi?family=CharisSIL&pkg=Compa
 .else
 MASTER_SITES=	LOCAL/bf
 .endif
-MASTER_SITE_SUBDIR=	#prevent bsd.xorg.mk from setting a default subdirectory
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Charis SIL TrueType font collection, compact variant
diff --git a/x11-fonts/charis/Makefile b/x11-fonts/charis/Makefile
index 489cd7ba0717..dc62f08f571e 100644
--- a/x11-fonts/charis/Makefile
+++ b/x11-fonts/charis/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/ \
 		LOCAL/bf
-MASTER_SITE_SUBDIR=	#prevent bsd.xorg.mk from setting a default subdirectory
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Charis SIL TrueType font collection
diff --git a/x11-fonts/doulos-compact/Makefile b/x11-fonts/doulos-compact/Makefile
index 43776052c7cf..ad556a3d2ef4 100644
--- a/x11-fonts/doulos-compact/Makefile
+++ b/x11-fonts/doulos-compact/Makefile
@@ -11,7 +11,6 @@ MASTER_SITES=	http://scripts.sil.org/ttw/fonts2go.cgi?family=DoulosSIL&pkg=Compa
 .else
 MASTER_SITES=	LOCAL/bf
 .endif
-MASTER_SITE_SUBDIR=	#prevent bsd.xorg.mk from setting a default subdirectory
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Doulos SIL TrueType font collection, compact variant
diff --git a/x11-fonts/font-manager/Makefile b/x11-fonts/font-manager/Makefile
index 067f851a64f0..f18d0249d640 100644
--- a/x11-fonts/font-manager/Makefile
+++ b/x11-fonts/font-manager/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	font-manager
 PORTVERSION=	0.5.7
 PORTREVISION=	5
 CATEGORIES=	x11-fonts gnome
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Font management application for the GNOME desktop
diff --git a/x11-fonts/gfe/Makefile b/x11-fonts/gfe/Makefile
index 006b3e693c72..7df26ac6ebec 100644
--- a/x11-fonts/gfe/Makefile
+++ b/x11-fonts/gfe/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gfe
 PORTVERSION=	0.0.4
 PORTREVISION=	6
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	X11/fonts
+MASTER_SITES=	SUNSITE/X11/fonts
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+-based .bdf font editor for X
diff --git a/x11-fonts/gnu-unifont-ttf/Makefile b/x11-fonts/gnu-unifont-ttf/Makefile
index f67da54e3778..7ec6dfb68a5e 100644
--- a/x11-fonts/gnu-unifont-ttf/Makefile
+++ b/x11-fonts/gnu-unifont-ttf/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=	7.0.03
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=unifont/unifont-${PORTVERSION}
+MASTER_SITES=	GNU/unifont/unifont-${PORTVERSION}
 DISTNAME=	unifont-${PORTVERSION}
 
 MAINTAINER=	bsdports@gmail.com
diff --git a/x11-fonts/gnu-unifont/Makefile b/x11-fonts/gnu-unifont/Makefile
index 54e035e03c72..26a3d007e994 100644
--- a/x11-fonts/gnu-unifont/Makefile
+++ b/x11-fonts/gnu-unifont/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=	7.0.03
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=unifont/unifont-${PORTVERSION}
+MASTER_SITES=	GNU/unifont/unifont-${PORTVERSION}
 DISTNAME=	unifont-${PORTVERSION}.pcf
 EXTRACT_SUFX=	.gz
 EXTRACT_ONLY=
diff --git a/x11-fonts/hanazono-fonts-ttf/Makefile b/x11-fonts/hanazono-fonts-ttf/Makefile
index 07e5f3e57d1d..d8b9e8fc9ad9 100644
--- a/x11-fonts/hanazono-fonts-ttf/Makefile
+++ b/x11-fonts/hanazono-fonts-ttf/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	hanazono-fonts-ttf
 PORTVERSION=	20141012
 CATEGORIES=	x11-fonts
-MASTER_SITES=	SFJP
-MASTER_SITE_SUBDIR=	hanazono-font/62072
+MASTER_SITES=	SFJP/hanazono-font/62072
 DISTNAME=	${PORTNAME:C/-.*//}-${PORTVERSION}
 
 MAINTAINER=	lichray@gmail.com
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile
index 42b6c703d7c3..78e75f69afd7 100644
--- a/x11-fonts/intlfonts/Makefile
+++ b/x11-fonts/intlfonts/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	intlfonts
 PORTVERSION=	1.2.1
 PORTREVISION=	4
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	intlfonts
+MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free X11 fonts for all characters that Emacs can handle
diff --git a/x11-fonts/liberation-fonts-ttf/Makefile b/x11-fonts/liberation-fonts-ttf/Makefile
index ce753ed313e5..0a37312fff62 100644
--- a/x11-fonts/liberation-fonts-ttf/Makefile
+++ b/x11-fonts/liberation-fonts-ttf/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	2.00.1
 PORTEPOCH=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://fedorahosted.org/releases/l/i/liberation-fonts/	\
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	thierry
+		LOCAL/thierry
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Liberation fonts from Red Hat to replace MS TTF fonts
diff --git a/x11-fonts/mkbold/Makefile b/x11-fonts/mkbold/Makefile
index 24acd46320b3..027a40f9ef3c 100644
--- a/x11-fonts/mkbold/Makefile
+++ b/x11-fonts/mkbold/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	mkbold
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+MASTER_SITES=	PORTS_JP
 EXTRACT_SUFX=	.bz2
 
 MAINTAINER=	koma2@lovepeers.org
diff --git a/x11-fonts/mkitalic/Makefile b/x11-fonts/mkitalic/Makefile
index c8e132c8d7ab..35d9ffd40bb1 100644
--- a/x11-fonts/mkitalic/Makefile
+++ b/x11-fonts/mkitalic/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	mkitalic
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+MASTER_SITES=	PORTS_JP
 EXTRACT_SUFX=	.bz2
 
 MAINTAINER=	koma2@lovepeers.org
diff --git a/x11-fonts/nexfontsel/Makefile b/x11-fonts/nexfontsel/Makefile
index b502f5be25fc..35f7ad85fcde 100644
--- a/x11-fonts/nexfontsel/Makefile
+++ b/x11-fonts/nexfontsel/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	3.0.1
 PORTREVISION=	4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.netlab.is.tsukuba.ac.jp/~yokota/archive/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	pav
+		LOCAL/pav
 DISTNAME=	NeXFontSel-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile
index f86425b4e589..bb1271384c39 100644
--- a/x11-fonts/p5-type1inst/Makefile
+++ b/x11-fonts/p5-type1inst/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	type1inst
 PORTVERSION=	0.6.1
 PORTREVISION=	5
 CATEGORIES=	x11-fonts perl5
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=X11/xutils
+MASTER_SITES=	SUNSITE/X11/xutils
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/x11-fonts/paratype/Makefile b/x11-fonts/paratype/Makefile
index 8e1d6026d9bf..0fb073a1d657 100644
--- a/x11-fonts/paratype/Makefile
+++ b/x11-fonts/paratype/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	2.004
 PORTREVISION=	6
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://paratype.0xdc.ru/
-MASTER_SITE_SUBDIR=	#prevent bsd.xorg.mk from setting a default subdirectory
 DISTFILES=	PTSansOFL-2.004.zip PTSerifOFL-1.000.zip PTMonoOFL-1.002_1.zip
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile
index af5da795e342..bf2e521b419c 100644
--- a/x11-fonts/terminus-font/Makefile
+++ b/x11-fonts/terminus-font/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	terminus-font
 PORTVERSION=	4.39
 PORTREVISION=	1
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S|%SUBDIR%|${PORTNAME:tl}/${PORTNAME}-${PORTVERSION}|}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT=	Terminus Font - a clean fixed width font
diff --git a/x11-fonts/tkfont/Makefile b/x11-fonts/tkfont/Makefile
index b1ce5b00749e..a5467775d77e 100644
--- a/x11-fonts/tkfont/Makefile
+++ b/x11-fonts/tkfont/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	tkfont
 PORTVERSION=	1.1
 PORTREVISION=	3
 CATEGORIES=	x11-fonts tcl tk
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	petef
+MASTER_SITES=	LOCAL/petef
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tk based replacement for xfontsel