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

29 files changed, 26 insertions, 48 deletions

diff --git a/deskutils/cal/Makefile b/deskutils/cal/Makefile
index 5efd9906aca3..72a897908670 100644
--- a/deskutils/cal/Makefile
+++ b/deskutils/cal/Makefile
@@ -5,8 +5,7 @@ PORTNAME=		cal
 PORTVERSION=		3.5
 PORTREVISION=		1
 CATEGORIES=		deskutils
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	utils/shell
+MASTER_SITES=		SUNSITE/utils/shell
 
 MAINTAINER=	sanpei@FreeBSD.org
 COMMENT=	Enhanced color version of standard calendar utility
diff --git a/deskutils/cartotheque/Makefile b/deskutils/cartotheque/Makefile
index 4b94407bc57f..993296e64554 100644
--- a/deskutils/cartotheque/Makefile
+++ b/deskutils/cartotheque/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	cartotheque
 PORTVERSION=	0.1
 PORTREVISION=	4
 CATEGORIES=	deskutils gnustep
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dinoex
+MASTER_SITES=	LOCAL/dinoex
 DISTNAME=	Cartotheque-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/deskutils/charmap/Makefile b/deskutils/charmap/Makefile
index 2a39b692c2b9..a2feb6136aff 100644
--- a/deskutils/charmap/Makefile
+++ b/deskutils/charmap/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	charmap
 PORTVERSION=	0.2
 PORTREVISION=	4
 CATEGORIES=	deskutils gnustep
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	charmap
+MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Character map for GNUstep
diff --git a/deskutils/dlume/Makefile b/deskutils/dlume/Makefile
index 678550eda9cb..df586c4a0588 100644
--- a/deskutils/dlume/Makefile
+++ b/deskutils/dlume/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	dlume
 PORTVERSION=	0.2.4
 PORTREVISION=	12
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	${MASTER_SITE_TUCOWS}
+MASTER_SITES=	TUCOWS
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK2 address book
diff --git a/deskutils/gnustep-wrapper/Makefile b/deskutils/gnustep-wrapper/Makefile
index 7a087275ca91..6f4638c7935d 100644
--- a/deskutils/gnustep-wrapper/Makefile
+++ b/deskutils/gnustep-wrapper/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=	0.1.0
 PORTREVISION=	4
 CATEGORIES=	deskutils gnustep
 #MASTER_SITES=	ftp://ftp.raffael.ch/software/GNUstepWrapper/
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dinoex
+MASTER_SITES=	LOCAL/dinoex
 PKGNAMEPREFIX=	gnustep-
 DISTNAME=	GNUstepWrapper-${PORTVERSION}
 
diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile
index 389d226a9483..fa7a122a47f8 100644
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=	0.9.2
 PORTREVISION=	4
 CATEGORIES=	deskutils gnustep
 #MASTER_SITES=	http://www.gnustep.it/enrico/gworkspace/
-MASTER_SITES=	${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR=	usr-apps
+MASTER_SITES=	GNUSTEP/usr-apps
 PKGNAMESUFFIX=	-gwmetadata${PKGNAMESUFFIX2}
 
 MAINTAINER=	theraven@FreeBSD.org
diff --git a/deskutils/gworkspace/Makefile b/deskutils/gworkspace/Makefile
index 3692aae1f029..53f9c510208d 100644
--- a/deskutils/gworkspace/Makefile
+++ b/deskutils/gworkspace/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=	0.9.2
 PORTREVISION=	2
 CATEGORIES=	deskutils gnustep
 #MASTER_SITES=	http://www.gnustep.it/enrico/gworkspace/
-MASTER_SITES=	${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR=	usr-apps
+MASTER_SITES=	GNUSTEP/usr-apps
 
 MAINTAINER=	theraven@FreeBSD.org
 COMMENT=	GNUstep workspace manager
diff --git a/deskutils/hot-babe/Makefile b/deskutils/hot-babe/Makefile
index bf52d815b924..dfea5b5c722a 100644
--- a/deskutils/hot-babe/Makefile
+++ b/deskutils/hot-babe/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	0.2.2
 PORTREVISION=	8
 CATEGORIES=	deskutils
 MASTER_SITES=	http://dindinx.net/hotbabe/downloads/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	novel
+		LOCAL/novel
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Small utility which displays the system activity in a special way
diff --git a/deskutils/libgcal/Makefile b/deskutils/libgcal/Makefile
index 77b23f4e303d..3d86c5402321 100644
--- a/deskutils/libgcal/Makefile
+++ b/deskutils/libgcal/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	libgcal
 PORTVERSION=	0.9.6
 PORTREVISION=	2
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library allowing communication with Google calendar and contacts
diff --git a/deskutils/libopensync-plugin-vformat-devel/Makefile b/deskutils/libopensync-plugin-vformat-devel/Makefile
index 7031649e88b0..d8f5aafbad6a 100644
--- a/deskutils/libopensync-plugin-vformat-devel/Makefile
+++ b/deskutils/libopensync-plugin-vformat-devel/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	libopensync-plugin-vformat
 PORTVERSION=	0.39
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.opensync.org/download/releases/${PORTVERSION}/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	danilo
+		LOCAL/danilo
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	danilo@FreeBSD.org
diff --git a/deskutils/mrundlg/Makefile b/deskutils/mrundlg/Makefile
index c508e779366d..929173a50719 100644
--- a/deskutils/mrundlg/Makefile
+++ b/deskutils/mrundlg/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.0
 PORTREVISION=	3
 CATEGORIES=	deskutils
 # MASTER_SITES=	http://matt.sixxgate.com/files/
-MASTER_SITES=	${MASTER_SITE_FREEBSD}
+MASTER_SITES=	FREEBSD
 
 MAINTAINER=	sixxgate@hotmail.com
 COMMENT=	Application / program launcher for Motif
diff --git a/deskutils/osynctool/Makefile b/deskutils/osynctool/Makefile
index 7d82c7bd0aa2..ce660585b6ea 100644
--- a/deskutils/osynctool/Makefile
+++ b/deskutils/osynctool/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	osynctool
 PORTVERSION=	0.39
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.opensync.org/download/releases/${PORTVERSION}/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	danilo
+		LOCAL/danilo
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Command line client for the OpenSync framework
diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index 137fa20528d0..0332f921b6df 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -7,7 +7,6 @@ PORTNAME=	plan
 PORTVERSION=	1.10.1
 CATEGORIES+=	deskutils
 MASTER_SITES=	ftp://plan.ftp.fu-berlin.de/
-MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X/Motif schedule planner with calendar
diff --git a/deskutils/plasma-applet-playwolf/Makefile b/deskutils/plasma-applet-playwolf/Makefile
index d62cd041080b..4c157108117b 100644
--- a/deskutils/plasma-applet-playwolf/Makefile
+++ b/deskutils/plasma-applet-playwolf/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	playwolf
 PORTVERSION=	0.8.1
 PORTREVISION=	6
 CATEGORIES=	deskutils kde
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	plasma-applet-
 
 MAINTAINER=	jhale@FreeBSD.org
diff --git a/deskutils/plopfolio/Makefile b/deskutils/plopfolio/Makefile
index a9acc5f86daf..d7e72b64d846 100644
--- a/deskutils/plopfolio/Makefile
+++ b/deskutils/plopfolio/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	plopfolio
 PORTVERSION=	0.1.0
 PORTREVISION=	4
 CATEGORIES=	deskutils gnustep
-MASTER_SITES=	${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR=	usr-apps
+MASTER_SITES=	GNUSTEP/usr-apps
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free clone of KlipFolio for GNUstep
diff --git a/deskutils/rednotebook/Makefile b/deskutils/rednotebook/Makefile
index bb225e739058..97cdeffe8c5f 100644
--- a/deskutils/rednotebook/Makefile
+++ b/deskutils/rednotebook/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	rednotebook
 PORTVERSION=	1.9.0
 CATEGORIES=	deskutils python
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	rednotebook
+MASTER_SITES=	SF/rednotebook
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	cheunghonyu@gmail.com
diff --git a/deskutils/sliderule/Makefile b/deskutils/sliderule/Makefile
index 5941761bdce6..b12d4618c9ee 100644
--- a/deskutils/sliderule/Makefile
+++ b/deskutils/sliderule/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	sliderule
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	joerg
+MASTER_SITES=	LOCAL/joerg
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	joerg@FreeBSD.org
diff --git a/deskutils/sugarcrm/Makefile b/deskutils/sugarcrm/Makefile
index 8eeac747137f..a5d0100e9cdc 100644
--- a/deskutils/sugarcrm/Makefile
+++ b/deskutils/sugarcrm/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	sugarcrm
 PORTVERSION=	6.5.20
 CATEGORIES=	deskutils www
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}/1%20-%20SugarCRM%206.5.X/SugarCommunityEdition-6.5.X
+MASTER_SITES=	SF/${PORTNAME}/1%20-%20SugarCRM%206.5.X/SugarCommunityEdition-6.5.X
 DISTNAME=	SugarCE-${PORTVERSION}
 
 MAINTAINER=	wen@FreeBSD.org
diff --git a/deskutils/systempreferences/Makefile b/deskutils/systempreferences/Makefile
index d198609b092d..8b443b5633dc 100644
--- a/deskutils/systempreferences/Makefile
+++ b/deskutils/systempreferences/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	systempreferences
 PORTVERSION=	1.2.0
 PORTREVISION=	3
 CATEGORIES=	deskutils gnustep
-MASTER_SITES=	${MASTER_SITE_GNUSTEP}
-MASTER_SITE_SUBDIR=usr-apps
+MASTER_SITES=	GNUSTEP/usr-apps
 DISTNAME=	SystemPreferences-${PORTVERSION}
 
 MAINTAINER=	theraven@FreeBSD.org
diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile
index e9ed24874869..98ce95ee004c 100644
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@@ -8,7 +8,6 @@ CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/:treeline \
 		http://treeline.bellz.org/plugins/:plugins \
 		http://depot.fsck.ch/mirror/distfiles/:treeline,plugins
-MASTER_SITE_SUBDIR=treeline/:treeline
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:treeline
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/deskutils/tuxcards/Makefile b/deskutils/tuxcards/Makefile
index 4a90f0a50bee..457bdacb2272 100644
--- a/deskutils/tuxcards/Makefile
+++ b/deskutils/tuxcards/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	tuxcards
 PORTVERSION=	2.2.1
 PORTREVISION=	1
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.tuxcards.de/src/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	http://www.tuxcards.de/src/${PORTNAME}-${PORTVERSION}/
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Tool for managing notes within a hierarchical tree
diff --git a/deskutils/vboxgtk/Makefile b/deskutils/vboxgtk/Makefile
index 2f5844540119..37432b1b2f73 100644
--- a/deskutils/vboxgtk/Makefile
+++ b/deskutils/vboxgtk/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	vboxgtk
 PORTVERSION=	0.8.2
 PORTREVISION=	1
 CATEGORIES=	deskutils emulators gnome
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK frontend for VirtualBox
diff --git a/deskutils/vnc2flv/Makefile b/deskutils/vnc2flv/Makefile
index 5174a55f2715..333917f2b8e9 100644
--- a/deskutils/vnc2flv/Makefile
+++ b/deskutils/vnc2flv/Makefile
@@ -5,7 +5,6 @@ PORTVERSION=	20100207
 PORTREVISION=	1
 CATEGORIES=	deskutils multimedia www python
 MASTER_SITES=	CHEESESHOP
-MASTER_SITE_SUBDIR=	source/v/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/deskutils/wmpinboard/Makefile b/deskutils/wmpinboard/Makefile
index 8db734c4076e..40317ed6d1d8 100644
--- a/deskutils/wmpinboard/Makefile
+++ b/deskutils/wmpinboard/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	wmpinboard
 PORTVERSION=	1.0
 PORTREVISION=	5
 CATEGORIES=	deskutils afterstep windowmaker
-MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	t.kempka@web.de
diff --git a/deskutils/xcalendar/Makefile b/deskutils/xcalendar/Makefile
index 8d20db8978d1..ddd0ecb12c7a 100644
--- a/deskutils/xcalendar/Makefile
+++ b/deskutils/xcalendar/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xcalendar
 PORTVERSION=	4.0.2008
 PORTREVISION=	2
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+MASTER_SITES=	PORTS_JP
 DISTNAME=	${PORTNAME}-4.0+i18n
 
 MAINTAINER=	sarumaru@jp.FreeBSD.org
diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile
index 9e6a98757401..978d283fbdb5 100644
--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xfce4-notifyd
 PORTVERSION=	0.2.4
 PORTREVISION=	1
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	XFCE
-MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/deskutils/xfce4-volumed/Makefile b/deskutils/xfce4-volumed/Makefile
index 3cca6e4b49ec..2d1cf7965776 100644
--- a/deskutils/xfce4-volumed/Makefile
+++ b/deskutils/xfce4-volumed/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xfce4-volumed
 PORTVERSION=	0.1.13
 PORTREVISION=	2
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	XFCE
-MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	sergey.dyatko@gmail.com
diff --git a/deskutils/xmaddressbook/Makefile b/deskutils/xmaddressbook/Makefile
index 0412cde06183..118d0d9a18d3 100644
--- a/deskutils/xmaddressbook/Makefile
+++ b/deskutils/xmaddressbook/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	xmaddressbook
 PORTVERSION=	1.5.3
 PORTREVISION=	3
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	office
+MASTER_SITES=	XCONTRIB/office
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11/Motif-based addressbook program
diff --git a/deskutils/xpostitPlus/Makefile b/deskutils/xpostitPlus/Makefile
index cf9efdbceda2..a97b2ce24958 100644
--- a/deskutils/xpostitPlus/Makefile
+++ b/deskutils/xpostitPlus/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	XPostitPlus
 PORTVERSION=	2.3
 PORTREVISION=	3
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	office
+MASTER_SITES=	XCONTRIB/office
 
 MAINTAINER=	ports2@dclg.ca
 COMMENT=	PostIt (R) messages onto your X11 screen