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

11 files changed, 11 insertions, 22 deletions

diff --git a/news/atp/Makefile b/news/atp/Makefile
index 7e87ef663722..9bfa3f0278cf 100644
--- a/news/atp/Makefile
+++ b/news/atp/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	atp
 PORTVERSION=	1.50
 PORTREVISION=	2
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	system/bbs/mail
+MASTER_SITES=	SUNSITE/system/bbs/mail
 DISTFILES=	${DISTNAME}-src.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/news/husky/Makefile.local b/news/husky/Makefile.local
index 92ce8ffddd04..a0c90a6802ea 100644
--- a/news/husky/Makefile.local
+++ b/news/husky/Makefile.local
@@ -11,8 +11,7 @@ PORTEPOCH=	1
 
 MAINTAINER=	osharoiko@gmail.com
 
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	husky/husky/1.9-current/2014.05.19
+MASTER_SITES=	SF/husky/husky/1.9-current/2014.05.19
 DISTNAME=	husky-all-1.9-source-20140519
 
 HUSKY_ROOTDIR=	${WRKDIR}/husky
diff --git a/news/ifmail/Makefile b/news/ifmail/Makefile
index 24ec38d63baa..4b55eb27e9cc 100644
--- a/news/ifmail/Makefile
+++ b/news/ifmail/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	ifmail
 PORTVERSION=	2.15
 PORTREVISION=	5
 CATEGORIES=	news comms
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	system/fido
+MASTER_SITES=	SUNSITE/system/fido
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	FidoNet(tm) support package for UN*X platform
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 735fa8f4b49f..b072522c8153 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -6,8 +6,7 @@ PORTVERSION?=	2.5.4
 PORTREVISION?=	2
 CATEGORIES=	news ipv6
 # Master distribution broken
-MASTER_SITES?=	${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR?=	${PORTNAME}
+MASTER_SITES?=	ISC/${PORTNAME}
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	InterNetNews -- the Internet meets Netnews
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 55118007b9af..cc2bc82f8118 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	knews
 PORTVERSION=	1.0b.1
 PORTREVISION=	13
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dinoex
+MASTER_SITES=	LOCAL/dinoex
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Threaded nntp newsreader for X
diff --git a/news/lusernet/Makefile b/news/lusernet/Makefile
index 1a5aa39de137..e7543e4acb3e 100644
--- a/news/lusernet/Makefile
+++ b/news/lusernet/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	lusernet
 PORTVERSION=	0.4.2
 PORTREVISION=	4
 CATEGORIES=	news gnustep
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dinoex
+MASTER_SITES=	LOCAL/dinoex
 DISTNAME=	LuserNET-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/news/newsfetch/Makefile b/news/newsfetch/Makefile
index aa83f708c0c0..56178b3c0ad2 100644
--- a/news/newsfetch/Makefile
+++ b/news/newsfetch/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	newsfetch
 PORTVERSION=	1.21
 PORTREVISION=	2
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	system/news/readers
+MASTER_SITES=	SUNSITE/system/news/readers
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Download news articles from NNTP server
diff --git a/news/p5-NNTPClient/Makefile b/news/p5-NNTPClient/Makefile
index e4a133d320d0..d73336bf8f12 100644
--- a/news/p5-NNTPClient/Makefile
+++ b/news/p5-NNTPClient/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	NNTPClient
 PORTVERSION=	0.37
 PORTREVISION=	1
 CATEGORIES=	news perl5
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	News
+MASTER_SITES=	CPAN/News
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	gary@hayers.org
diff --git a/news/pgpmoose/Makefile b/news/pgpmoose/Makefile
index 064dd492ac23..746b22940989 100644
--- a/news/pgpmoose/Makefile
+++ b/news/pgpmoose/Makefile
@@ -6,8 +6,7 @@ PORTREVISION=	1
 CATEGORIES=	news security
 # Distribution broken
 # MASTER_SITES=	http://people.qualcomm.com/ggr/
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dinoex
+MASTER_SITES=	LOCAL/dinoex
 DISTNAME=	PGPMoose
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/news/plor/Makefile b/news/plor/Makefile
index cca323d1f983..6357dead4e14 100644
--- a/news/plor/Makefile
+++ b/news/plor/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	plor
 PORTVERSION=	0.3.3
 PORTREVISION=	1
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/bbs/mail
+MASTER_SITES=	SUNSITE/system/bbs/mail
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Alpha-release reader for reading SOUP and QWK packets
diff --git a/news/slrnface/Makefile b/news/slrnface/Makefile
index a39b1b1be383..9ee4d5c6cfb0 100644
--- a/news/slrnface/Makefile
+++ b/news/slrnface/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	slrnface
 PORTVERSION=	2.1.1
 PORTREVISION=	6
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/s/${PORTNAME}
+MASTER_SITES=	DEBIAN
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org