25 files changed, 25 insertions, 53 deletions

diff --git a/x11-toolkits/attica/Makefile b/x11-toolkits/attica/Makefile
index e27e642056aa..3552d43040c7 100644
--- a/x11-toolkits/attica/Makefile
+++ b/x11-toolkits/attica/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	attica
 PORTVERSION=	0.4.2
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTNAME}
+MASTER_SITES=	KDE/stable/${PORTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Open Collaboration Services API library
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index c3120b3657ae..082e2e538876 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -6,8 +6,7 @@ PORTNAME=	gal2
 PORTVERSION=	2.5.3
 PORTREVISION?=	12
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
+MASTER_SITES=	GNOME/sources/${PORTNAME:S/2$//}/2.5
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 75fba785f0dd..22dea441bfd7 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gnustep-gui
 PORTVERSION=	0.24.0
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits gnustep
-MASTER_SITES=	${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR=	core
+MASTER_SITES=	GNUSTEP/core
 
 MAINTAINER=	theraven@FreeBSD.org
 COMMENT=	GNUstep GUI library
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 4600fcd62c49..b8f7c9d47107 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -6,8 +6,7 @@ PORTNAME=	gtk
 PORTVERSION=	1.2.10
 PORTREVISION=	24
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/gtk+/1.2
+MASTER_SITES=	GNOME/sources/gtk+/1.2
 PKGNAMESUFFIX=	12
 DISTNAME=	gtk+-${PORTVERSION}
 
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index f3b79eb4b3f8..2481979e7371 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gtk
 PORTVERSION=	2.24.27
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMESUFFIX=	2
 DISTNAME=	gtk+-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index a4f7e6b6109a..0aa9bb6ef12b 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -7,8 +7,7 @@ PORTNAME=	gtk
 PORTVERSION=	3.14.12
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMESUFFIX=	3
 DISTNAME=	gtk+-${PORTVERSION}
 DIST_SUBDIR=	gnome3
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index be4a8cc9b9b0..e6e30968353d 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -6,8 +6,7 @@ PORTNAME=	gtksourceview2
 PORTVERSION=	2.10.5
 PORTREVISION?=	4
 CATEGORIES=	x11-toolkits gnome
-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-toolkits/linux-c6-qt47-x11/Makefile b/x11-toolkits/linux-c6-qt47-x11/Makefile
index a5fc2adb164f..24b1a172ccb5 100644
--- a/x11-toolkits/linux-c6-qt47-x11/Makefile
+++ b/x11-toolkits/linux-c6-qt47-x11/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	qt47-x11
 PORTVERSION=	4.7.2
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits linux
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	xmj
+MASTER_SITES=	LOCAL/xmj
 DIST_SUBDIR=	rpm/${LINUX_RPM_ARCH}/centos/c5
 
 MAINTAINER=	emulation@FreeBSD.org
diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile
index e51af8243a07..30f2c1391eec 100644
--- a/x11-toolkits/linux-f10-pango/Makefile
+++ b/x11-toolkits/linux-f10-pango/Makefile
@@ -5,9 +5,7 @@ PORTNAME=	pango
 PORTVERSION=	1.28.3
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits linux
-MASTER_SITES=	LOCAL
-MASTER_SITE_SUBDIR=	netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
-MASTER_SITE_SRC_SUBDIR=	netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
+MASTER_SITES=	LOCAL/netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Pango library (Linux Fedora 10)
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index c041488180e8..a9b4b3f4a306 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -6,8 +6,7 @@ PORTNAME=	gnome
 PORTVERSION=	2.28.1
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits python gnome
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME/sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	gnome-python-${PORTVERSION}
 DIST_SUBDIR=	gnome2
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 2e996e1513ab..bb30340065bd 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -6,8 +6,7 @@ PORTNAME=	gtk
 PORTVERSION=	2.24.0
 PORTREVISION=	3
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME/sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	2
 DISTNAME=	pygtk-${PORTVERSION}
diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
index 68fbba88a8c6..d3873bc658f7 100644
--- a/x11-toolkits/py-gtksourceview/Makefile
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gtksourceview
 PORTVERSION=	2.10.1
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome python
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME/sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pygtksourceview-${PORTVERSION}
 
diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile
index d62ffe0d91d1..63e87251de59 100644
--- a/x11-toolkits/py-tkinter/Makefile
+++ b/x11-toolkits/py-tkinter/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	tkinter
 PORTVERSION=	${PYTHON_PORTVERSION}
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits 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/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile
index e59780925d7c..87f277b87282 100644
--- a/x11-toolkits/slingshot/Makefile
+++ b/x11-toolkits/slingshot/Makefile
@@ -7,8 +7,7 @@ PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
 		http://komquats.com/distfiles/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=     cy
+		LOCAL/cy
 
 DISTNAME=	SlingShot${PORTVERSION}
 
diff --git a/x11-toolkits/swt-devel/Makefile b/x11-toolkits/swt-devel/Makefile
index 2a4a7a4cc54a..f354a0a36aec 100644
--- a/x11-toolkits/swt-devel/Makefile
+++ b/x11-toolkits/swt-devel/Makefile
@@ -6,8 +6,7 @@ DISTVERSION=	3.7.1
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits devel java
-MASTER_SITES=	ECLIPSE
-MASTER_SITE_SUBDIR=	R-${DISTVERSION}-201109091335
+MASTER_SITES=	ECLIPSE/R-${DISTVERSION}-201109091335
 PKGNAMESUFFIX=	-devel
 DISTNAME=	swt-${DISTVERSION}-${DIST_EXT}
 
diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile
index 0f7e28fa9e97..67cde4f8c15f 100644
--- a/x11-toolkits/swt/Makefile
+++ b/x11-toolkits/swt/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	swt
 DISTVERSION=	3.5.2
 PORTREVISION=	3
 CATEGORIES=	x11-toolkits devel java
-#MASTER_SITES=	${MASTER_SITE_ECLIPSE}
-MASTER_SITES=	http://archive.eclipse.org/eclipse/downloads/drops/${MASTER_SITE_SUBDIR}/
-MASTER_SITE_SUBDIR=	R-${DISTVERSION}-201002111343
+#MASTER_SITES=	ECLIPSE/R-${DISTVERSION}-201002111343
+MASTER_SITES=	http://archive.eclipse.org/eclipse/downloads/drops/R-${DISTVERSION}-201002111343/
 DISTNAME=	swt-${DISTVERSION}-${DIST_EXT}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index b4d162e36421..0cff9f305399 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -4,9 +4,7 @@ PORTNAME=	tk
 PORTVERSION=	8.4.20
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits tk
-MASTER_SITES=	${MASTER_SITE_TCLTK} \
-		SF/tcl/Tcl/${PORTVERSION}
-MASTER_SITE_SUBDIR=tcl8_4
+MASTER_SITES=	TCLTK/tcl8_4 SF/tcl/Tcl/${PORTVERSION}
 PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index e84bdd3fe772..279fbf55d7e6 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -4,9 +4,7 @@
 PORTNAME=	tk
 PORTVERSION=	8.5.18
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_TCLTK} \
-		SF/tcl/Tcl/${PORTVERSION}
-MASTER_SITE_SUBDIR=tcl8_5
+MASTER_SITES=	TCLTK/tcl8_5 SF/tcl/Tcl/${PORTVERSION}
 PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index ffb2fdba40a4..7d420ca2e864 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -4,9 +4,7 @@
 PORTNAME=	tk
 PORTVERSION=	8.6.4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION} \
-		${MASTER_SITE_TCLTK}
-MASTER_SITE_SUBDIR=tcl8_6
+MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION} TCLTK/tcl8_6
 PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
diff --git a/x11-toolkits/tktray/Makefile b/x11-toolkits/tktray/Makefile
index 21aca0846d1c..21ee31a91eab 100644
--- a/x11-toolkits/tktray/Makefile
+++ b/x11-toolkits/tktray/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	tktray
 PORTVERSION=	1.3.9
 CATEGORIES=	x11-toolkits tk
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	tcltk@FreeBSD.org
diff --git a/x11-toolkits/vte290/Makefile b/x11-toolkits/vte290/Makefile
index 0de60fdbd4b4..579ebd8280e3 100644
--- a/x11-toolkits/vte290/Makefile
+++ b/x11-toolkits/vte290/Makefile
@@ -7,7 +7,6 @@ PORTVERSION=	0.34.7
 PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/gnome-pty-helper/vte/}/${PORTVERSION:R}
 DISTNAME=	vte-${PORTVERSION}
 PKGNAMESUFFIX?=	3-290
 DIST_SUBDIR=	gnome3
diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile
index 56915476e076..aedda06a25fa 100644
--- a/x11-toolkits/vte3/Makefile
+++ b/x11-toolkits/vte3/Makefile
@@ -6,8 +6,7 @@ PORTNAME?=	vte
 PORTVERSION=	0.38.3
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/gnome-pty-helper/vte/}/${PORTVERSION:R}
+MASTER_SITES=	GNOME/sources/${PORTNAME:S/gnome-pty-helper/vte/}/${PORTVERSION:R}
 DISTNAME=	vte-${PORTVERSION}
 PKGNAMESUFFIX?=	3
 DIST_SUBDIR=	gnome3
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index bc35adf7a8b7..f6e239993278 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -6,8 +6,7 @@ DISTVERSION=	1.2.4
 PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits graphics
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical user interface toolkit for X Window System
diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile
index daf5b55842de..11b1a5ab60b0 100644
--- a/x11-toolkits/xview-clients/Makefile
+++ b/x11-toolkits/xview-clients/Makefile
@@ -7,8 +7,7 @@ PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.physionet.org/physiotools/xview/src/ \
 		http://komquats.com/distfiles/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	cy
+		LOCAL/cy
 DISTNAME=	xview-3.2p1.4-19c
 # EXTRACT_ONLY=	# empty
 
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index f67fff60d11e..3c88c6f78f3a 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -7,8 +7,7 @@ PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.physionet.org/physiotools/xview/src/ \
 		http://komquats.com/distfiles/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	cy
+		LOCAL/cy
 DISTNAME=	xview-3.2p1.4-19c
 
 MAINTAINER=	cy@FreeBSD.org