9 files changed, 11 insertions, 17 deletions

diff --git a/x11-fonts/artwiz-aleczapka-de/Makefile b/x11-fonts/artwiz-aleczapka-de/Makefile
index 21431acaf89b..44ead6b0e5af 100644
--- a/x11-fonts/artwiz-aleczapka-de/Makefile
+++ b/x11-fonts/artwiz-aleczapka-de/Makefile
@@ -8,8 +8,7 @@ PORTNAME=		artwiz-aleczapka-de
 PORTVERSION=		1.3
 PORTREVISION=	2
 CATEGORIES=		x11-fonts
-MASTER_SITES=		SF
-MASTER_SITE_SUBDIR=	artwizaleczapka
+MASTER_SITES=		SF/artwizaleczapka/iso-8859-1/${PORTVERSION}
 
 MAINTAINER=	herbert.skuhra@gmx.at
 COMMENT=	A set of (improved) artwiz fonts
diff --git a/x11-fonts/artwiz-aleczapka-se/Makefile b/x11-fonts/artwiz-aleczapka-se/Makefile
index cdec317b8962..beb6c927b19e 100644
--- a/x11-fonts/artwiz-aleczapka-se/Makefile
+++ b/x11-fonts/artwiz-aleczapka-se/Makefile
@@ -8,8 +8,7 @@ PORTNAME=		artwiz-aleczapka-se
 PORTVERSION=		1.3
 PORTREVISION=	2
 CATEGORIES=		x11-fonts
-MASTER_SITES=		SF
-MASTER_SITE_SUBDIR=	artwizaleczapka
+MASTER_SITES=		SF/artwizaleczapka/iso-8859-1/${PORTVERSION}
 
 MAINTAINER=	herbert.skuhra@gmx.at
 COMMENT=	A set of (improved) artwiz fonts
diff --git a/x11-fonts/artwiz-aleczapka/Makefile b/x11-fonts/artwiz-aleczapka/Makefile
index e66bf659f1b4..acc79bca5376 100644
--- a/x11-fonts/artwiz-aleczapka/Makefile
+++ b/x11-fonts/artwiz-aleczapka/Makefile
@@ -9,8 +9,7 @@ PORTNAME=		artwiz-aleczapka-en
 PORTVERSION=		1.3
 PORTREVISION=		2
 CATEGORIES=		x11-fonts
-MASTER_SITES=		SF
-MASTER_SITE_SUBDIR=	artwizaleczapka
+MASTER_SITES=		SF/artwizaleczapka/iso-8859-1/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A set of (improved) artwiz fonts
diff --git a/x11-fonts/fntsample/Makefile b/x11-fonts/fntsample/Makefile
index 3d8b715ac9a2..82b6ec133644 100644
--- a/x11-fonts/fntsample/Makefile
+++ b/x11-fonts/fntsample/Makefile
@@ -9,8 +9,7 @@ PORTNAME?=	fntsample
 PORTVERSION=	3.0
 PORTREVISION?=	0
 CATEGORIES?=	x11-fonts
-MASTER_SITES=	SF http://unicode.org/Public/5.1.0/ucd/:unidata
-MASTER_SITE_SUBDIR=	fntsample
+MASTER_SITES=	SF/fntsample/fntsample/${PORTVERSION} http://unicode.org/Public/5.1.0/ucd/:unidata
 DISTNAME=	fntsample-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Blocks.txt:unidata
 EXTRACT_ONLY=	${DISTFILES:M*gz}
diff --git a/x11-fonts/junicode/Makefile b/x11-fonts/junicode/Makefile
index dfbfc5789edf..caadfa08f8e1 100644
--- a/x11-fonts/junicode/Makefile
+++ b/x11-fonts/junicode/Makefile
@@ -8,8 +8,9 @@
 PORTNAME=	junicode
 PORTVERSION=	0.6.17
 CATEGORIES=	x11-fonts
-MASTER_SITES=	SF \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0-6-17 \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/
+
 DISTNAME=	${PORTNAME}-${PORTVERSION:S|.|-|g}
 
 MAINTAINER=	nikola.lecic@anthesphoria.net
diff --git a/x11-fonts/lfpfonts-fix/Makefile b/x11-fonts/lfpfonts-fix/Makefile
index 880675c9efea..69fb555da53b 100644
--- a/x11-fonts/lfpfonts-fix/Makefile
+++ b/x11-fonts/lfpfonts-fix/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	lfpfonts-fix
 PORTVERSION=	0.82
 PORTREVISION=	2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	xfonts
+MASTER_SITES=	SF/xfonts/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Fixed width fonts from the Linux Font Project
diff --git a/x11-fonts/lfpfonts-var/Makefile b/x11-fonts/lfpfonts-var/Makefile
index 359d5e01502c..9d6003d7ca54 100644
--- a/x11-fonts/lfpfonts-var/Makefile
+++ b/x11-fonts/lfpfonts-var/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	lfpfonts-var
 PORTVERSION=	0.83
 PORTREVISION=	2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	xfonts
+MASTER_SITES=	SF/xfonts/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Variable width fonts from the Linux Font Project
diff --git a/x11-fonts/nucleus/Makefile b/x11-fonts/nucleus/Makefile
index 209c3e0a8aac..10f3bb466333 100644
--- a/x11-fonts/nucleus/Makefile
+++ b/x11-fonts/nucleus/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	nucleus
 PORTVERSION=	0.77
 PORTREVISION=	4
 CATEGORIES=	x11-fonts
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	xfonts
+MASTER_SITES=	SF/xfonts/OldFiles
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Another font package for X
diff --git a/x11-fonts/wqy/Makefile b/x11-fonts/wqy/Makefile
index c651b0806fe5..0b3b5535dddb 100644
--- a/x11-fonts/wqy/Makefile
+++ b/x11-fonts/wqy/Makefile
@@ -9,9 +9,9 @@ PORTNAME=	wqy-fonts
 PORTVERSION=	20081102
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
-MASTER_SITES=	SF \
+MASTER_SITES=	SF/wqy/wqy-bitmapfont/0.9.9 \
 		http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR=	wqy
+
 DISTFILES=	wqy-bitmapfont-pcf-0.9.9-0.tar.gz \
 		wqy-unibit-bdf-1.1.0-1.tar.gz \
 		wqy-zenhei-0.8.34-cvs20081027.tar.gz