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/games/quake-data/Makefile b/games/quake-data/Makefile
index 31f1c08083b8..7867d8f93190 100644
--- a/games/quake-data/Makefile
+++ b/games/quake-data/Makefile
@@ -38,7 +38,7 @@ PLIST_FILES+=	%%DATADIR%%/id1/pak1.pak
 .endif
 
 .if ${PORT_OPTIONS:MQW_DATA} || ${PORT_OPTIONS:MQW_SKINS}
-MASTER_SITES+=	${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/unix/:qw|}
+MASTER_SITES+=	IDSOFTWARE/quakeworld/unix/:qw
 DISTFILES+=	${PROGFILE}:qw
 EXTRACT_ONLY+=	${PROGFILE}
 COMMENT:=	${COMMENT:S,Quake,& and &World,}
@@ -48,7 +48,7 @@ PLIST_SUB+=	QUAKEWORLD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MQW_SKINS}
-MASTER_SITES+=	${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/skins/:skins|}
+MASTER_SITES+=	IDSOFTWARE/quakeworld/skins/:skins
 DISTFILES+=	${SKINFILES:S/$/:skins/}
 PLIST_SUB+=	QUAKEWORLD_SKINS=""
 COMMENT+=	and skins