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

9 files changed, 8 insertions, 15 deletions

diff --git a/dns/bind10/Makefile b/dns/bind10/Makefile
index 4d99e679659b..86d2462cff82 100644
--- a/dns/bind10/Makefile
+++ b/dns/bind10/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	bind10
 PORTVERSION=	1.2.0
 PORTREVISION=	3
 CATEGORIES=	dns
-MASTER_SITES=	${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	ISC/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Development version of ISC BIND 10 DNS Suite
diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index 53aeace92cc5..d242dd6c188c 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -48,7 +48,7 @@ BROKEN=		The jumbo patch currently conflicts with the IPv6, ignoreip2, SRV and D
 .endif
 
 PATCH_SITES+=	http://people.FreeBSD.org/~roam/ports/dns/djbdns/:jumbo \
-		${MASTER_SITE_LOCAL:S/%SUBDIR%\//roam\/dns\/djbdns\/:jumbo/}
+		LOCAL/roam/dns/djbdns:jumbo
 PATCHFILES+=	jumbo-p13.patch.gz:jumbo
 PATCH_DIST_STRIP=	-p1
 .if ${PORT_OPTIONS:MDUMPCACHE}
diff --git a/dns/doc/Makefile b/dns/doc/Makefile
index c9fd07f67d52..73f823088e04 100644
--- a/dns/doc/Makefile
+++ b/dns/doc/Makefile
@@ -4,9 +4,8 @@
 PORTNAME=	doc
 PORTVERSION=	2.2.3
 CATEGORIES=	dns
-MASTER_SITES=   ${MASTER_SITE_LOCAL} \
+MASTER_SITES=   LOCAL/sanpei \
 		ftp://ftp.shub-internet.org/pub/shub/brad/dns/
-MASTER_SITE_SUBDIR=	sanpei
 
 MAINTAINER=	sanpei@FreeBSD.org
 COMMENT=	Diagnose unhealthy DNS domains
diff --git a/dns/inadyn/Makefile b/dns/inadyn/Makefile
index 533b8980c171..1073f5c89f36 100644
--- a/dns/inadyn/Makefile
+++ b/dns/inadyn/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.96.2
 PORTREVISION=	3
 CATEGORIES=	dns
 MASTER_SITES=	http://www.inatech.eu/inadyn/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dhn
+		LOCAL/dhn
 DISTNAME=	${PORTNAME}.v${PORTVERSION}
 
 MAINTAINER=	samm@os2.kiev.ua
diff --git a/dns/ipcheck/Makefile b/dns/ipcheck/Makefile
index 094adfed42ad..84f78f01e7dc 100644
--- a/dns/ipcheck/Makefile
+++ b/dns/ipcheck/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.240
 PORTEPOCH=	1
 CATEGORIES=	dns python
 MASTER_SITES=	http://ipcheck.sourceforge.net/releases/
-MASTER_SITE_SUBDIR=	lioux
 DISTNAME=	${PORTNAME}.${PORTVERSION:S/^0.//}
 EXTRACT_SUFX=
 EXTRACT_ONLY=
diff --git a/dns/nsping/Makefile b/dns/nsping/Makefile
index 1079a1486895..59ff2cc99cb6 100644
--- a/dns/nsping/Makefile
+++ b/dns/nsping/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	nsping
 PORTVERSION=	0.8
 PORTREVISION=	2
 CATEGORIES=	dns
-MASTER_SITES=	LOCAL
-MASTER_SITE_SUBDIR=	roam
+MASTER_SITES=	LOCAL/roam
 DISTFILES=	nsping.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/dns/py-adns/Makefile b/dns/py-adns/Makefile
index b5d7ce162019..1bc965412f13 100644
--- a/dns/py-adns/Makefile
+++ b/dns/py-adns/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	adns
 PORTVERSION=	1.2.1
 PORTREVISION=	14
 CATEGORIES=	dns python
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	adns-python-${PORTVERSION}
 
diff --git a/dns/samba-nsupdate/Makefile b/dns/samba-nsupdate/Makefile
index e456961c1a85..d2edf9533395 100644
--- a/dns/samba-nsupdate/Makefile
+++ b/dns/samba-nsupdate/Makefile
@@ -4,8 +4,7 @@ PORTNAME=		nsupdate
 PORTVERSION=		9.8.6
 PORTREVISION=		1
 CATEGORIES=		dns net ipv6
-MASTER_SITES=		${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
+MASTER_SITES=		ISC/bind9/${ISCVERSION}
 PKGNAMEPREFIX=		samba-
 DISTNAME=		bind-${ISCVERSION}
 
diff --git a/dns/updatedd/Makefile b/dns/updatedd/Makefile
index 26cbab85e31c..f43bf0edc20e 100644
--- a/dns/updatedd/Makefile
+++ b/dns/updatedd/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	updatedd
 PORTVERSION=	2.6
 PORTREVISION=	1
 CATEGORIES=	dns
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SAVANNAH
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	geniusj@ods.org