MASTER_SITES cleanup.

- Replace ${MASTER_SITE_FOO} with FOO.
- Merge MASTER_SITE_SUBDIR into MASTER_SITES when possible. (This means 99.9%
  of the time.)
- Remove occurrences of MASTER_SITE_LOCAL when no subdirectory was present and
  no hint of what it should be was present.
- Fix some logic.
- And generally, make things more simple and easy to understand.

While there, add magic values to the FESTIVAL, GENTOO, GIMP, GNUPG, QT and
SAMBA macros.

Also, replace some EXTRACT_SUFX occurences with USES=tar:*.

Checked by:	make fetch-urlall-list
With hat:	portmgr
Sponsored by:	Absolight

33 files changed, 33 insertions, 56 deletions

diff --git a/x11/9box/Makefile b/x11/9box/Makefile
index bcb8cdc..148517a 100644
--- a/x11/9box/Makefile
+++ b/x11/9box/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	9box
 PORTVERSION=	0.2.1
 PORTREVISION=	3
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	thierry
+MASTER_SITES=	LOCAL/thierry
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	9box can "pack" windows inside itself
diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile
index 1340263..33d140f 100644
--- a/x11/9menu/Makefile
+++ b/x11/9menu/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.8
 PORTREVISION=	2
 CATEGORIES=	x11 plan9
 MASTER_SITES=	ftp://freefriends.org/arnold/Source/ \
-		${MASTER_SITE_NETBSD}
+		NETBSD
 EXTRACT_SUFX=	.shar.gz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11/arandr/Makefile b/x11/arandr/Makefile
index 7ac2de8..532b7a5 100644
--- a/x11/arandr/Makefile
+++ b/x11/arandr/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.1.7.1
 PORTREVISION=	2
 CATEGORIES=	x11 deskutils
 MASTER_SITES=	http://christian.amsuess.com/tools/arandr/files/ \
-		LOCAL/${MAINTAINER:C/([^@]*)@.*/\1/}
+		LOCAL/sbz
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Another XRandR GUI
diff --git a/x11/blast/Makefile b/x11/blast/Makefile
index 0238b90..4fe52a0 100644
--- a/x11/blast/Makefile
+++ b/x11/blast/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	blast
 PORTVERSION=	1.1
 PORTREVISION=	4
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/b/blast
+MASTER_SITES=	DEBIAN
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11/erun/Makefile b/x11/erun/Makefile
index 3e724d3..3a2e7d8 100644
--- a/x11/erun/Makefile
+++ b/x11/erun/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	E-Run
 PORTVERSION=	1.2
 PORTREVISION=	13
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kbyanc
+MASTER_SITES=	LOCAL/kbyanc
 
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Simple epplet for launching arbitrary programs
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 1ff4a23..bf8b4a5 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.4.1
 PORTREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	http://fluxbox.sourceforge.net/download/ \
-		GENTOO/distfiles
+		GENTOO
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fluxbox utility to create and manage icons on the desktop
diff --git a/x11/hotwire-shell/Makefile b/x11/hotwire-shell/Makefile
index fdad391..19f599f 100644
--- a/x11/hotwire-shell/Makefile
+++ b/x11/hotwire-shell/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	hotwire-shell
 PORTVERSION=	0.721
 PORTREVISION=	5
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	hotwire-${DISTVERSION}
 
diff --git a/x11/kb2mb2/Makefile b/x11/kb2mb2/Makefile
index 3c18b0e..9cf1744 100644
--- a/x11/kb2mb2/Makefile
+++ b/x11/kb2mb2/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	kb2mb2
 PORTVERSION=	1.0
 PORTREVISION=	3
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+MASTER_SITES=	PORTS_JP
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Redirect any key to second mouse button
diff --git a/x11/keybinder-gtk3/Makefile b/x11/keybinder-gtk3/Makefile
index 40231b5..646e0a2 100644
--- a/x11/keybinder-gtk3/Makefile
+++ b/x11/keybinder-gtk3/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	keybinder
 PORTVERSION=	0.3.0
 CATEGORIES=	x11
-MASTER_SITES=	GENTOO/distfiles
+MASTER_SITES=	GENTOO
 PKGNAMESUFFIX=	-gtk3
 DISTNAME=	${PORTNAME}-3.0-${PORTVERSION}
 
diff --git a/x11/keybinder/Makefile b/x11/keybinder/Makefile
index 9e8acbe..40e0fd3 100644
--- a/x11/keybinder/Makefile
+++ b/x11/keybinder/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	keybinder
 PORTVERSION=	0.3.0
 PORTREVISION=	3
 CATEGORIES=	x11
-MASTER_SITES=	GENTOO/distfiles
+MASTER_SITES=	GENTOO
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for registering keyboard shortcuts
diff --git a/x11/props/Makefile b/x11/props/Makefile
index 19abcb3..055861d 100644
--- a/x11/props/Makefile
+++ b/x11/props/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.0
 PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://komquats.com/distfiles/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	cy
+		LOCAL/cy
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	The OpenLook props application
diff --git a/x11/qimageblitz/Makefile b/x11/qimageblitz/Makefile
index 4f21ce8..96cd260 100644
--- a/x11/qimageblitz/Makefile
+++ b/x11/qimageblitz/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	qimageblitz
 PORTVERSION=	0.0.6
 PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTNAME}
+MASTER_SITES=	KDE/stable/${PORTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Graphical effects and filters library for KDE4
diff --git a/x11/sxpc/Makefile b/x11/sxpc/Makefile
index 57db8bf..310f107 100644
--- a/x11/sxpc/Makefile
+++ b/x11/sxpc/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	sxpc
 PORTVERSION=	1.4
 PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	utilities
+MASTER_SITES=	XCONTRIB/utilities
 EXTRACT_SUFX=	.shar.Z
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index 25d6e8c..9e30426 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	wbar
 PORTVERSION=	2.3.4
 PORTREVISION=	1
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Simple and highly customizable quick launch bar
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 691193f..abdcd2d 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -7,8 +7,7 @@ PORTREVISION=	15
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://voins.program.ru/wdm/:wdm \
 		http://wolfram.schneider.org/bsd/gif/bsd/:pic_large \
-		${MASTER_SITE_LOCAL:S/$/:pic_small/}
-MASTER_SITE_SUBDIR=	tg/:pic_small
+		LOCAL/tg:pic_small
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:wdm \
 		beastie.xpm:pic_small \
 		daemon1-HQ-1280x960.jpg:pic_large
diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index 0295115..a7bd7e8 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://linux.nawebu.cz/wmcliphist/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	uqs
+		LOCAL/uqs
 
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	Clipboard history management dockapp for Window Maker
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index 9e60a5a..22c5128 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xautolock
 PORTVERSION=	2.2
 PORTREVISION=	1
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	X11/screensavers
+MASTER_SITES=	SUNSITE/X11/screensavers
 
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Activate xlock after a user defined time of inactivity
diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile
index 9b94669..e80d69a 100644
--- a/x11/xbanner/Makefile
+++ b/x11/xbanner/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xbanner
 PORTVERSION=	1.31
 PORTREVISION=	1
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	X11/xutils
+MASTER_SITES=	SUNSITE/X11/xutils
 DISTNAME=	XBanner${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11/xcmd/Makefile b/x11/xcmd/Makefile
index b949b12..dc3ef93 100644
--- a/x11/xcmd/Makefile
+++ b/x11/xcmd/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	xcmd
 PORTVERSION=	1.8
 PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SUNSITE} \
+MASTER_SITES=	SUNSITE/X11/xutils \
 		http://www.breuninger.org/files/distfiles/
-MASTER_SITE_SUBDIR=	X11/xutils
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Xcmd is a front-end for starting programs under X11
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index 690b1c5..e1c7ba8 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xcolors
 PORTVERSION=	1.3
 PORTREVISION=	4
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	markp
+MASTER_SITES=	LOCAL/markp
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile
index 1c7274e..1abec55 100644
--- a/x11/xfce4-whiskermenu-plugin/Makefile
+++ b/x11/xfce4-whiskermenu-plugin/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xfce4-whiskermenu-plugin
 PORTVERSION=	1.5.0
 PORTREVISION=	1
 CATEGORIES=	x11 xfce
-MASTER_SITES=	XFCE
-MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile
index c75f8c4..30282fc 100644
--- a/x11/xgrab/Makefile
+++ b/x11/xgrab/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xgrab
 PORTVERSION=	2.41
 PORTREVISION=	3
 CATEGORIES=	x11
-MASTER_SITES=	XCONTRIB
-MASTER_SITE_SUBDIR=	applications
+MASTER_SITES=	XCONTRIB/applications
 DISTNAME=	${PORTNAME}sc.2_41
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11/xidle/Makefile b/x11/xidle/Makefile
index e27931e..b361f89 100644
--- a/x11/xidle/Makefile
+++ b/x11/xidle/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xidle
 PORTVERSION=	24102005
 PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	novel
+MASTER_SITES=	LOCAL/novel
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Run a program on X inactivity
diff --git a/x11/xkbctrl/Makefile b/x11/xkbctrl/Makefile
index 9fd1b09..00bb391 100644
--- a/x11/xkbctrl/Makefile
+++ b/x11/xkbctrl/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xkbctrl
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	unsupported/test/Xkb/programs
+MASTER_SITES=	XORG/unsupported/test/Xkb/programs
 DISTFILES=	Imakefile xkbctrl.c
 
 MAINTAINER=	sanpei@FreeBSD.org
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index d162fcc..8230267 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	xkeyboard-config
 PORTVERSION=	2.14
 CATEGORIES=	x11
-MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
+MASTER_SITES=	XORG/individual/${XORG_CAT}/${PORTNAME}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Keyboard Configuration Database
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 651b622..804c2e6 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xloadimage
 PORTVERSION=	4.1.21
 PORTREVISION=	1
 CATEGORIES=	x11 graphics
-MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	${PORTNAME}.${VERSION}
 DISTFILES=	${DISTNAME:S/./_/}.orig${EXTRACT_SUFX} \
 		${DISTNAME:S/./_/}-${REVISION}.debian.tar.gz
diff --git a/x11/xmon/Makefile b/x11/xmon/Makefile
index cd96bf9..e1ad47e 100644
--- a/x11/xmon/Makefile
+++ b/x11/xmon/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xmon
 PORTVERSION=	1.5.6
 PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	devel_tools
+MASTER_SITES=	XCONTRIB/devel_tools
 DISTNAME=	xmon.${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11/xprompt/Makefile b/x11/xprompt/Makefile
index 3410cff..b151a7d 100644
--- a/x11/xprompt/Makefile
+++ b/x11/xprompt/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xprompt
 PORTVERSION=	1.4
 PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	LOCAL
-MASTER_SITE_SUBDIR=	mph
+MASTER_SITES=	LOCAL/mph
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Displays a dialog box and prompts user for text
diff --git a/x11/xpyb/Makefile b/x11/xpyb/Makefile
index 248c2b9..dd901b4 100644
--- a/x11/xpyb/Makefile
+++ b/x11/xpyb/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xpyb
 PORTVERSION=	1.3.1
 PORTREVISION=	2
 CATEGORIES=	x11 python
-MASTER_SITES=	http://xcb.freedesktop.org/%SUBDIR%/
-MASTER_SITE_SUBDIR=	dist
+MASTER_SITES=	http://xcb.freedesktop.org/dist/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ashish@FreeBSD.org
diff --git a/x11/xtacy/Makefile b/x11/xtacy/Makefile
index 113b8ad..bcde5da 100644
--- a/x11/xtacy/Makefile
+++ b/x11/xtacy/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.14
 PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ultranet.com/~jjohnson/ \
-		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/graphics/hacks/X
+		SUNSITE/apps/graphics/hacks/X
 DISTNAME=	${PORTNAME}114
 
 MAINTAINER=	matt@bdd.net
diff --git a/x11/xtoolwait/Makefile b/x11/xtoolwait/Makefile
index 47591e6..9e1a855 100644
--- a/x11/xtoolwait/Makefile
+++ b/x11/xtoolwait/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xtoolwait
 PORTVERSION=	1.3
 PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	utilities
+MASTER_SITES=	XCONTRIB/utilities
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool startup utility for X11
diff --git a/x11/xwatchwin/Makefile b/x11/xwatchwin/Makefile
index 0970ae2..49838ac 100644
--- a/x11/xwatchwin/Makefile
+++ b/x11/xwatchwin/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xwatchwin
 PORTVERSION=	1.1.1
 PORTREVISION=	3
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	utilities
+MASTER_SITES=	XCONTRIB/utilities
 DISTNAME=	xwatchwin
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11/xzoom/Makefile b/x11/xzoom/Makefile
index 17a0f94..29d8a1d 100644
--- a/x11/xzoom/Makefile
+++ b/x11/xzoom/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xzoom
 PORTVERSION=	0.3
 PORTREVISION=	2
 CATEGORIES=	x11 accessibility
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	libs/X
+MASTER_SITES=	SUNSITE/libs/X
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Magnify, rotate, mirror the image on the X screen