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

1 files changed, 2 insertions, 4 deletions

diff --git a/textproc/scr2txt/Makefile b/textproc/scr2txt/Makefile
index c5b27df984b0..76fe9123d53f 100644
--- a/textproc/scr2txt/Makefile
+++ b/textproc/scr2txt/Makefile
@@ -4,14 +4,12 @@
 PORTNAME=	scr2txt
 PORTVERSION=	1.2
 CATEGORIES=	textproc
-
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= nik
-NO_WRKSUBDIR=	yes
+MASTER_SITES=	LOCAL/nik
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts the output of "vidcontrol -p" to text
 
+NO_WRKSUBDIR=	yes
 USES=		uidfix
 MAKE_ENV=	BINDIR=${PREFIX}/bin SHAREDIR=${PREFIX}