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, 2 deletions

diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index d02eb217d6f1..169e9f38f788 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=	--enable-debug
 
 .if ${PORT_OPTIONS:MDOCHTML}
 # http://fluxbox.org/docbook/en/tarballs/
-MASTER_SITES+=		${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:html \
+MASTER_SITES+=		LOCAL/mezz:html \
 			http://people.freebsd.org/~mezz/distfiles/:html
 DISTFILES+=		fb-doc-mfhtml-${DOCSVERSION}.tgz:html
 EXTRACT_ONLY+=		fb-doc-mfhtml-${DOCSVERSION}.tgz
@@ -55,7 +55,7 @@ PLIST_SUB+=		DOCHTML="@comment "
 
 .if ${PORT_OPTIONS:MPDFDOCS}
 # http://fluxbox.org/docbook/en/pdf/
-MASTER_SITES+=		${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:pdf \
+MASTER_SITES+=		LOCAL/mezz:pdf \
 			http://people.freebsd.org/~mezz/distfiles/:pdf
 DISTFILES+=		fluxbook-${DOCSVERSION}.pdf:pdf
 PLIST_SUB+=		DOCPDF=""