31 files changed, 31 insertions, 58 deletions

diff --git a/x11-themes/beastie/Makefile b/x11-themes/beastie/Makefile
index ff8d26fa2300..c8ef14100f9d 100644
--- a/x11-themes/beastie/Makefile
+++ b/x11-themes/beastie/Makefile
@@ -6,9 +6,8 @@ PORTNAME=	beastie
 PORTVERSION=	06.05.03
 PORTREVISION=	5
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
+MASTER_SITES=	LOCAL/ahze \
 		http://people.freebsd.org/~ahze/distfiles/
-MASTER_SITE_SUBDIR=	ahze
 DISTNAME=	Beastie-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-themes/clearlooks-metacity/Makefile b/x11-themes/clearlooks-metacity/Makefile
index e9a1ad0fe67e..fe20f7a32447 100644
--- a/x11-themes/clearlooks-metacity/Makefile
+++ b/x11-themes/clearlooks-metacity/Makefile
@@ -7,8 +7,7 @@ PORTVERSION=	2.0
 PORTREVISION=	7
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.stellingwerff.com/
-#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-#MASTER_SITE_SUBDIR=	clearlooks
+#MASTER_SITES=	SOURCEFORGE/clearlooks
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Clearlooks Metacity theme
diff --git a/x11-themes/gnome-icons-aqua-fusion/Makefile b/x11-themes/gnome-icons-aqua-fusion/Makefile
index 7bc002c550c0..fb1974fbd67d 100644
--- a/x11-themes/gnome-icons-aqua-fusion/Makefile
+++ b/x11-themes/gnome-icons-aqua-fusion/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	aqua-fusion
 PORTVERSION=	20030216
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
+MASTER_SITES=	GNOME/teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-AquaFusion
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-themes/gnome-icons-faenza/Makefile b/x11-themes/gnome-icons-faenza/Makefile
index f116cf92751d..208be38a3295 100644
--- a/x11-themes/gnome-icons-faenza/Makefile
+++ b/x11-themes/gnome-icons-faenza/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	faenza
 PORTVERSION=	1.3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 PROJECTHOST=	${PORTNAME}-icon-theme
 PKGNAMEPREFIX=	gnome-icons-
 DISTNAME=	${PROJECTHOST}_${PORTVERSION}
diff --git a/x11-themes/gnome-icons-gentoo-test/Makefile b/x11-themes/gnome-icons-gentoo-test/Makefile
index c73537fd6e90..6438628ee00d 100644
--- a/x11-themes/gnome-icons-gentoo-test/Makefile
+++ b/x11-themes/gnome-icons-gentoo-test/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gentoo-test
 PORTVERSION=	0.1
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
+MASTER_SITES=	GNOME/teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Gentoo-Test
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-themes/gnome-icons-iris/Makefile b/x11-themes/gnome-icons-iris/Makefile
index e017fb0f1a76..8b2834d13431 100644
--- a/x11-themes/gnome-icons-iris/Makefile
+++ b/x11-themes/gnome-icons-iris/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	iris
 PORTVERSION=	20050420
 PORTREVISION=	1
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	teams/art.gnome.org/themes/icon
+MASTER_SITES=	GNOME/teams/art.gnome.org/themes/icon
 DISTNAME=	ICON-Iris
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-themes/gnome-icons-noia-warm/Makefile b/x11-themes/gnome-icons-noia-warm/Makefile
index 9d2aafc460fa..ab8d53c93c07 100644
--- a/x11-themes/gnome-icons-noia-warm/Makefile
+++ b/x11-themes/gnome-icons-noia-warm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	noia-warm
 PORTVERSION=	20041102
 PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
+MASTER_SITES=	GNOME/teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-NoiaWarm
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-themes/gnome-icons-refined/Makefile b/x11-themes/gnome-icons-refined/Makefile
index 16b391fc06e7..100a4809967e 100644
--- a/x11-themes/gnome-icons-refined/Makefile
+++ b/x11-themes/gnome-icons-refined/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	refined
 PORTVERSION=	20030203
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
+MASTER_SITES=	GNOME/teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Gnome-RH8
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-themes/gnome-icons-slick/Makefile b/x11-themes/gnome-icons-slick/Makefile
index 108ea9fa6fa0..7a5778630bf7 100644
--- a/x11-themes/gnome-icons-slick/Makefile
+++ b/x11-themes/gnome-icons-slick/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	slick
 PORTVERSION=	20030209
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
+MASTER_SITES=	GNOME/teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Slick
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-themes/gnome-icons-snow-apple/Makefile b/x11-themes/gnome-icons-snow-apple/Makefile
index 2f82df3b44d2..120a3ed0fadc 100644
--- a/x11-themes/gnome-icons-snow-apple/Makefile
+++ b/x11-themes/gnome-icons-snow-apple/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	snow-apple
 PORTVERSION=	20030202
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
+MASTER_SITES=	GNOME/teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Snow-Apple
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-themes/gnome-icons-stylish/Makefile b/x11-themes/gnome-icons-stylish/Makefile
index 9bdf712fc357..b820c540d2a6 100644
--- a/x11-themes/gnome-icons-stylish/Makefile
+++ b/x11-themes/gnome-icons-stylish/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	stylish
 PORTVERSION=	20030129
 PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
+MASTER_SITES=	GNOME/teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Stylish
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-themes/gnome-icons-ximian-south/Makefile b/x11-themes/gnome-icons-ximian-south/Makefile
index 1b711fd8b447..ea0a4ac7df0c 100644
--- a/x11-themes/gnome-icons-ximian-south/Makefile
+++ b/x11-themes/gnome-icons-ximian-south/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ximian-south
 PORTVERSION=	1.3.6
 PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	teams/art.gnome.org/archive/themes/icon
+MASTER_SITES=	GNOME/teams/art.gnome.org/archive/themes/icon
 DISTNAME=	ICON-Ximian-South-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-themes/gtk-aqualightblue-theme/Makefile b/x11-themes/gtk-aqualightblue-theme/Makefile
index db0b66845694..fcc464d6b1f7 100644
--- a/x11-themes/gtk-aqualightblue-theme/Makefile
+++ b/x11-themes/gtk-aqualightblue-theme/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gtk-aqualightblue-theme
 PORTVERSION=	0.1
 PORTREVISION=	11
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	aqualightblue-gtk2
+MASTER_SITES=	THEMES/aqualightblue-gtk2
 DISTNAME=	aqualightblue-gtk2-default
 
 MAINTAINER=	philip@FreeBSD.org
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 8485c27b8367..50ee9c976920 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -6,8 +6,7 @@ PORTNAME=	gtk-engines2
 PORTVERSION=	2.20.2
 PORTREVISION=	2
 CATEGORIES=	x11-themes
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME/sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11-themes/gtk-flat-theme2/Makefile b/x11-themes/gtk-flat-theme2/Makefile
index e30a0af763ab..7af53481b8f5 100644
--- a/x11-themes/gtk-flat-theme2/Makefile
+++ b/x11-themes/gtk-flat-theme2/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gtk-flat-theme2
 PORTVERSION=	0.1
 PORTREVISION=	14
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_THEMES}
-MASTER_SITE_SUBDIR=	gtk2flat
+MASTER_SITES=	THEMES/gtk2flat
 DISTNAME=	gtk2flat-default
 
 MAINTAINER=	philip@FreeBSD.org
diff --git a/x11-themes/gtk-murrina-aqua/Makefile b/x11-themes/gtk-murrina-aqua/Makefile
index ba2e01a66d93..e722a093641f 100644
--- a/x11-themes/gtk-murrina-aqua/Makefile
+++ b/x11-themes/gtk-murrina-aqua/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	gtk-murrina-aqua
 PORTVERSION=	0.1
 PORTREVISION=	6
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
+MASTER_SITES=	LOCAL/itetcu \
 		http://www5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-stable/source/gnome-extra/gtk+2-engines-murrine/
-MASTER_SITE_SUBDIR=	itetcu
 DISTNAME=	Murrina-Aqua
 
 MAINTAINER=	pneumann@gmail.com
diff --git a/x11-themes/gtk-oxygen-engine/Makefile b/x11-themes/gtk-oxygen-engine/Makefile
index c814c43444eb..b965af20f11e 100644
--- a/x11-themes/gtk-oxygen-engine/Makefile
+++ b/x11-themes/gtk-oxygen-engine/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	oxygen
 PORTVERSION=	1.4.6
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTNAME}-gtk2/${PORTVERSION}/src
+MASTER_SITES=	KDE/stable/${PORTNAME}-gtk2/${PORTVERSION}/src
 PKGNAMEPREFIX=	gtk-
 PKGNAMESUFFIX=	-engine
 DISTNAME=	${PORTNAME}-gtk2-${PORTVERSION}
diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index bcb7d90a9490..a4aba9504295 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	gtk-qt-engine
 PORTVERSION=	1.1
 PORTREVISION=	12
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	GTK+ 2.x theme engine allowing to use Qt/KDE styles
diff --git a/x11-themes/gtk3-oxygen-engine/Makefile b/x11-themes/gtk3-oxygen-engine/Makefile
index 771c46c723fd..90106036d314 100644
--- a/x11-themes/gtk3-oxygen-engine/Makefile
+++ b/x11-themes/gtk3-oxygen-engine/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	oxygen
 PORTVERSION=	1.4.1
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTNAME}-gtk3/${PORTVERSION}/src
+MASTER_SITES=	KDE/stable/${PORTNAME}-gtk3/${PORTVERSION}/src
 PKGNAMEPREFIX=	gtk3-
 PKGNAMESUFFIX=	-engine
 DISTNAME=	${PORTNAME}-gtk3-${PORTVERSION}
diff --git a/x11-themes/icon-naming-utils/Makefile b/x11-themes/icon-naming-utils/Makefile
index e63a181b4d78..a2de15874ada 100644
--- a/x11-themes/icon-naming-utils/Makefile
+++ b/x11-themes/icon-naming-utils/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	icon-naming-utils
 PORTVERSION=	0.8.90
 PORTREVISION=	1
 CATEGORIES=	x11-themes
-MASTER_SITES=	GENTOO/distfiles
+MASTER_SITES=	GENTOO
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities of the Tango project
diff --git a/x11-themes/icons-tango-extras/Makefile b/x11-themes/icons-tango-extras/Makefile
index 2b7d793c27f4..f88069a06b21 100644
--- a/x11-themes/icons-tango-extras/Makefile
+++ b/x11-themes/icons-tango-extras/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=	0.1.0
 PORTREVISION=	5
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://tango.freedesktop.org/releases/ \
-		${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
+		GENTOO
 DISTNAME=	tango-icon-theme-extras-${PORTVERSION}
 
 MAINTAINER=	flz@FreeBSD.org
diff --git a/x11-themes/icons-tango/Makefile b/x11-themes/icons-tango/Makefile
index eaedc342731d..70939193c473 100644
--- a/x11-themes/icons-tango/Makefile
+++ b/x11-themes/icons-tango/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	icons-tango
 PORTVERSION=	0.8.90
 PORTREVISION=	2
 CATEGORIES=	x11-themes
-MASTER_SITES=	GENTOO/distfiles
+MASTER_SITES=	GENTOO
 DISTNAME=	tango-icon-theme-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-themes/irssi-themes/Makefile b/x11-themes/irssi-themes/Makefile
index 14cbaea0ccd8..c598035fcc94 100644
--- a/x11-themes/irssi-themes/Makefile
+++ b/x11-themes/irssi-themes/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	20101013
 CATEGORIES=	x11-themes irc
 MASTER_SITES=	http://www.irssi.org/themefiles/ \
 		LOCAL/ehaupt/${PORTNAME}
-MASTER_SITE_SUBDIR=	${PORTNAME}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/x11-themes/kde-gtk-config/Makefile b/x11-themes/kde-gtk-config/Makefile
index 17172371a516..55a83bcc0859 100644
--- a/x11-themes/kde-gtk-config/Makefile
+++ b/x11-themes/kde-gtk-config/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	kde-gtk-config
 PORTVERSION=	2.2.1
 PORTREVISION=	3
 CATEGORIES=	x11-themes kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
+MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	GTK2 and GTK3 Configurator for KDE
diff --git a/x11-themes/kde-icons-gartoon-blue-svg/Makefile b/x11-themes/kde-icons-gartoon-blue-svg/Makefile
index 8f9661e53a3e..bf310f469851 100644
--- a/x11-themes/kde-icons-gartoon-blue-svg/Makefile
+++ b/x11-themes/kde-icons-gartoon-blue-svg/Makefile
@@ -3,9 +3,8 @@
 
 PORTNAME=	gartoon
 PORTVERSION=	1.3
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
+MASTER_SITES=	LOCAL/fluffy \
 		http://ns.ael.ru/ports/distfiles/KDE/
-MASTER_SITE_SUBDIR=	fluffy
 PKGNAMESUFFIX=	-blue-svg
 DISTNAME=	ICONS-Gartoon.Blue-SVG-v${PORTVERSION}
 
diff --git a/x11-themes/kde-icons-gartoon-svg/Makefile b/x11-themes/kde-icons-gartoon-svg/Makefile
index b5caead12231..0599fb6a9d45 100644
--- a/x11-themes/kde-icons-gartoon-svg/Makefile
+++ b/x11-themes/kde-icons-gartoon-svg/Makefile
@@ -3,9 +3,8 @@
 
 PORTNAME=	gartoon
 PORTVERSION=	1.3
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
+MASTER_SITES=	LOCAL/fluffy \
 		http://ns.ael.ru/ports/distfiles/KDE/
-MASTER_SITE_SUBDIR=	fluffy
 PKGNAMESUFFIX=	-svg
 DISTNAME=	ICONS-Gartoon-SVG-v${PORTVERSION}
 
diff --git a/x11-themes/kde-icons-kool-gorilla/Makefile b/x11-themes/kde-icons-kool-gorilla/Makefile
index 06364a989629..4a231441abf2 100644
--- a/x11-themes/kde-icons-kool-gorilla/Makefile
+++ b/x11-themes/kde-icons-kool-gorilla/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	kool-gorilla
 PORTVERSION=	1.3.5
-MASTER_SITES=	${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
+MASTER_SITES=	GENTOO
 
 DISTNAME=	Korilla_Icons-v${PORTVERSION}
 
diff --git a/x11-themes/kde-icons-noia/Makefile b/x11-themes/kde-icons-noia/Makefile
index e20e44ee0cb7..c7d3993c5a3f 100644
--- a/x11-themes/kde-icons-noia/Makefile
+++ b/x11-themes/kde-icons-noia/Makefile
@@ -3,13 +3,12 @@
 
 PORTNAME=	noia
 PORTVERSION=	1.00
-MASTER_SITES=	${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
+MASTER_SITES=	GENTOO
 DISTNAME=	noia-kde-icons-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 
 COMMENT=	KDE Noia complete iconset
 
+USES=		tar:tgz
 WRKSRC=		"${WRKDIR}/noia_kde_${PORTVERSION:C/\.//}"
 PORT_SHAREDIR=	${PORTNAME}
 
diff --git a/x11-themes/kde-icons-nuvola/Makefile b/x11-themes/kde-icons-nuvola/Makefile
index a89a49371274..c23ced0b0cfb 100644
--- a/x11-themes/kde-icons-nuvola/Makefile
+++ b/x11-themes/kde-icons-nuvola/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	nuvola
 PORTVERSION=	1.0
 PORTREVISION=	1
 MASTER_SITES=	http://www.icon-king.com/files/ \
-		${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
+		GENTOO
 
 COMMENT=	KDE Nuvola iconset, SVG evolution of SKY
 
diff --git a/x11-themes/metacity-themes/Makefile.metacity b/x11-themes/metacity-themes/Makefile.metacity
index 7d8bafbff8c3..cfb8cabcf5b3 100644
--- a/x11-themes/metacity-themes/Makefile.metacity
+++ b/x11-themes/metacity-themes/Makefile.metacity
@@ -1,6 +1,5 @@
 PKGNAMEPREFIX=	metacity-theme-
-MASTER_SITES?=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR?=	teams/art.gnome.org/themes/metacity
+MASTER_SITES?=	GNOME/teams/art.gnome.org/themes/metacity
 DIST_SUBDIR=	gnome2
 
 NO_BUILD=	yes
diff --git a/x11-themes/openbox-themes/Makefile b/x11-themes/openbox-themes/Makefile
index a994feed68b4..45b635106f20 100644
--- a/x11-themes/openbox-themes/Makefile
+++ b/x11-themes/openbox-themes/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	openbox-themes
 PORTVERSION=	1.0.1
 PORTREVISION=	5
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	novel
+MASTER_SITES=	LOCAL/novel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	novel@FreeBSD.org