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

4 files changed, 4 insertions, 8 deletions

diff --git a/korean/aleefonts-ttf/Makefile b/korean/aleefonts-ttf/Makefile
index 081a1a72be4e..b9b0542c5b13 100644
--- a/korean/aleefonts-ttf/Makefile
+++ b/korean/aleefonts-ttf/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	aleefonts
 PORTVERSION=	12
 PORTREVISION=	1
 CATEGORIES=	korean x11-fonts
-MASTER_SITES=	DEBIAN
-MASTER_SITE_SUBDIR=	pool/main/t/ttf-alee
+MASTER_SITES=	DEBIAN/pool/main/t/ttf-alee
 PKGNAMESUFFIX=	-ttf
 DISTNAME=	ttf-alee_${PORTVERSION}
 
diff --git a/korean/man-doc/Makefile b/korean/man-doc/Makefile
index 44a9c1b6bc1e..bf7cb45bc3b6 100644
--- a/korean/man-doc/Makefile
+++ b/korean/man-doc/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	man
 PORTVERSION=	021120
 PORTREVISION=	3
 CATEGORIES=	korean
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
+MASTER_SITES=	LOCAL/perky \
 		http://people.freebsd.org/~perky/distfiles/
-MASTER_SITE_SUBDIR=	perky
 PKGNAMESUFFIX=	-doc
 DISTNAME=	ko-man-doc-${PORTVERSION}
 
diff --git a/korean/nanumcoding-ttf/Makefile b/korean/nanumcoding-ttf/Makefile
index 5484abec5dc7..02a33557c529 100644
--- a/korean/nanumcoding-ttf/Makefile
+++ b/korean/nanumcoding-ttf/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=	2.0
 PORTREVISION=	1
 CATEGORIES=	korean
 MASTER_SITES=	http://dev.naver.com/frs/download.php/441/ \
-		LOCAL
-MASTER_SITE_SUBDIR=	jkim
+		LOCAL/jkim
 PKGNAMESUFFIX=	-ttf
 DISTNAME=	NanumGothicCoding-${PORTVERSION}
 
diff --git a/korean/nanumfonts-otf/Makefile b/korean/nanumfonts-otf/Makefile
index afbd2871dd98..3fbf3d1d0480 100644
--- a/korean/nanumfonts-otf/Makefile
+++ b/korean/nanumfonts-otf/Makefile
@@ -5,8 +5,7 @@ PORTVERSION=	3.1
 PORTREVISION=	1
 CATEGORIES=	korean
 MASTER_SITES=	http://cdn.naver.com/naver/NanumFont/fontfiles/ \
-		LOCAL
-MASTER_SITE_SUBDIR=	jkim
+		LOCAL/jkim
 PKGNAMESUFFIX=	-${FONTTYPE}
 DISTFILES=	NanumFont_${FONTTYPE:tu}_ALL${EXTRACT_SUFX} \
 		NanumFontSetup_${FONTTYPE:tu}_GOTHICECO${EXTRACT_SUFX} \