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

2 files changed, 2 insertions, 3 deletions

diff --git a/x11-fm/asfiles/Makefile b/x11-fm/asfiles/Makefile
index 51c9a1cb2059..40ca85aafb60 100644
--- a/x11-fm/asfiles/Makefile
+++ b/x11-fm/asfiles/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	asfiles
 PORTVERSION=	1.0
 PORTREVISION=	3
 CATEGORIES=	x11-fm afterstep windowmaker
-MASTER_SITES=	${MASTER_SITE_AFTERSTEP}
-MASTER_SITE_SUBDIR=	apps/ASFiles
+MASTER_SITES=	AFTERSTEP/apps/ASFiles
 DISTNAME=	ASFiles-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index 5668956d25fd..4477dbd41e14 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	doublecmd
 PORTVERSION=	0.6.1
 CATEGORIES=	x11-fm
-MASTER_SITES=	SOURCEFORGE/${PORTNAME}/Double%20Commander%20Source
+MASTER_SITES=	SF/${PORTNAME}/Double%20Commander%20Source
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 DISTFILES=	${DISTNAME}.tar.gz ${PORTNAME}-help-${HELPVERSION}-src.tar.gz