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
author: Mathieu Arnold <mat@FreeBSD.org> 2015-05-14 10:15:04 +0000
committer: Mathieu Arnold <mat@FreeBSD.org> 2015-05-14 10:15:04 +0000
commit: 60d1a83c2a113150cedbc43ff12a7375144f741a (patch)
tree: 627649ff7699a289d5d78c11bf8d105881402ca8 /japanese
parent: Update MASTER_SITES (diff)
54 files changed, 63 insertions, 116 deletions
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 4de1976016ad..8b3c3ea8f3d4 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -5,10 +5,8 @@ PORTNAME=	FreeWnn
 PORTVERSION=	1.1.1.a021
 PORTREVISION=	13
 CATEGORIES?=	japanese
-MASTER_SITES=	ftp://ftp.freewnn.org/pub/%SUBDIR%/ \
-		${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	FreeWnn/alpha \
-			freewnn/17724
+MASTER_SITES=	ftp://ftp.freewnn.org/pub/FreeWnn/alpha/ \
+		SFJP/freewnn/17724
 PKGNAMESUFFIX=	-lib
 DISTNAME=	${PORTNAME}-1.1.1-a021
 
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index 6318d4d0c48f..548d90bb19a6 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -5,10 +5,8 @@ PORTNAME=	FreeWnn
 PORTVERSION=	1.1.1.a021
 PORTREVISION=	13
 CATEGORIES?=	japanese
-MASTER_SITES=	ftp://ftp.freewnn.org/pub/%SUBDIR%/ \
-		${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	FreeWnn/alpha \
-			freewnn/17724
+MASTER_SITES=	ftp://ftp.freewnn.org/pub/FreeWnn/alpha/ \
+		SFJP/freewnn/17724
 PKGNAMESUFFIX=	-server
 DISTNAME=	${PORTNAME}-1.1.1-a021
 
diff --git a/japanese/a2ps/Makefile b/japanese/a2ps/Makefile
index 8bd20854e709..e53bfa84802e 100644
--- a/japanese/a2ps/Makefile
+++ b/japanese/a2ps/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.45
 PORTREVISION=	5
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/ \
-		${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/a2ps|}
+		LOCAL/tota/a2ps
 DISTNAME=	${PORTNAME}.pl-${PORTVERSION}
 EXTRACT_SUFX=	# empty
 
diff --git a/japanese/ajaxzip2-data/Makefile b/japanese/ajaxzip2-data/Makefile
index 5bf5eb6e3004..b035145a1bdd 100644
--- a/japanese/ajaxzip2-data/Makefile
+++ b/japanese/ajaxzip2-data/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	ajaxzip2
 PORTVERSION=	20150430
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kuriyama
+MASTER_SITES=	LOCAL/kuriyama
 PKGNAMESUFFIX=	-data
 DISTFILES=	ken_all-${PORTVERSION_K}.zip jigyosyo-${PORTVERSION_J}.zip
 
diff --git a/japanese/anthy/Makefile b/japanese/anthy/Makefile
index 6558a17dfa6c..ba33c3e787eb 100644
--- a/japanese/anthy/Makefile
+++ b/japanese/anthy/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	anthy
 PORTVERSION=	9100h
 PORTREVISION=	4
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	${PORTNAME}/37536
+MASTER_SITES=	SFJP/${PORTNAME}/37536
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	anthy
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/japanese/bugzilla44/Makefile b/japanese/bugzilla44/Makefile
index 5fc78c4de103..c33c84ed2fd7 100644
--- a/japanese/bugzilla44/Makefile
+++ b/japanese/bugzilla44/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	bugzilla
 PORTVERSION=	4.4.6
 CATEGORIES=	japanese
 MASTER_SITES=	http://bug-ja.org/releases/4.4/ \
-		LOCAL
-MASTER_SITE_SUBDIR=	tota/bugzilla-ja
+		LOCAL/tota/bugzilla-ja
 DISTNAME=	Bugzilla-ja-${PORTVERSION}-template
 
 MAINTAINER=	bz-ports@FreeBSD.org
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index 03ab7004b462..c0a5c4f697ef 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	canna
 PORTVERSION=	3.7p3
 PORTREVISION=	9
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	canna/9565/
+MASTER_SITES=	SFJP/canna/9565
 PKGNAMESUFFIX=	-lib
 DISTNAME=	Canna${PORTVERSION:S/.//g}
 
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index d6c4d1857ca5..a83baa5918e0 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	canna
 PORTVERSION=	3.7p3
 PORTREVISION=	10
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	canna/9565/
+MASTER_SITES=	SFJP/canna/9565
 PKGNAMESUFFIX=	-server
 DISTNAME=	Canna${PORTVERSION:S/.//g}
 
diff --git a/japanese/dbskkd-cdb/Makefile b/japanese/dbskkd-cdb/Makefile
index 9de42a2c27ed..b0f60f578245 100644
--- a/japanese/dbskkd-cdb/Makefile
+++ b/japanese/dbskkd-cdb/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	dbskkd-cdb
 PORTVERSION=	2.00
 PORTREVISION=	1
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-#DISTVERSIONSUFFIX=
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet another dictionary server for SKK
diff --git a/japanese/dvi2tty/Makefile b/japanese/dvi2tty/Makefile
index 4a04ea12e83a..e1f5a8386006 100644
--- a/japanese/dvi2tty/Makefile
+++ b/japanese/dvi2tty/Makefile
@@ -5,13 +5,11 @@ PORTNAME=	dvi2tty
 PORTVERSION=	5.0
 PORTREVISION=	2
 CATEGORIES=	japanese print
-MASTER_SITES=	LOCAL
-MASTER_SITE_SUBDIR=	hrs
+MASTER_SITES=	LOCAL/hrs
 PKGNAMESUFFIX=	-ascii
 DISTNAME=	dvi2tty${PORTVERSION}
 
 PATCH_SITES=	${MASTER_SITES}
-PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
 PATCH_DIST_STRIP=	-p1
 PATCHFILES=	dvi2tty-ascii-jtex-patch dvi2tty.c-patch
 
diff --git a/japanese/esecanna-module-vje25/Makefile b/japanese/esecanna-module-vje25/Makefile
index 591b35965fd6..8718a89efa20 100644
--- a/japanese/esecanna-module-vje25/Makefile
+++ b/japanese/esecanna-module-vje25/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	0.14.6
 PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://esecanna.netfort.gr.jp/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	knu
+		LOCAL/knu
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 DIST_SUBDIR=	esecanna
 
diff --git a/japanese/esecanna-module-vje30/Makefile b/japanese/esecanna-module-vje30/Makefile
index 43a00a7e7662..11b9ea27e7f7 100644
--- a/japanese/esecanna-module-vje30/Makefile
+++ b/japanese/esecanna-module-vje30/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.0.1
 PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://esecanna.netfort.gr.jp/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	knu
+		LOCAL/knu
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 DIST_SUBDIR=	esecanna
 
diff --git a/japanese/esecanna-module-wnn6/Makefile b/japanese/esecanna-module-wnn6/Makefile
index 8af409c608d6..45de193e521e 100644
--- a/japanese/esecanna-module-wnn6/Makefile
+++ b/japanese/esecanna-module-wnn6/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.0.0
 PORTREVISION=	4
 CATEGORIES=	japanese
 MASTER_SITES=	http://esecanna.netfort.gr.jp/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	knu
+		LOCAL/knu
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 DIST_SUBDIR=	esecanna
 
diff --git a/japanese/esecanna/Makefile b/japanese/esecanna/Makefile
index d60fe4c8e2fa..30a22b3c36b4 100644
--- a/japanese/esecanna/Makefile
+++ b/japanese/esecanna/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.0.1
 PORTREVISION=	6
 CATEGORIES=	japanese
 MASTER_SITES=	http://esecanna.netfort.gr.jp/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	knu
+		LOCAL/knu
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 DIST_SUBDIR=	esecanna
 
diff --git a/japanese/font-migu/Makefile b/japanese/font-migu/Makefile
index c3525e3b79fd..82cda56a26e6 100644
--- a/japanese/font-migu/Makefile
+++ b/japanese/font-migu/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	migu
 PORTVERSION=	1.0.20130617
 PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	mix-mplus-ipa/59022
+MASTER_SITES=	SFJP/mix-mplus-ipa/59022
 PKGNAMEPREFIX=	ja-font-
 DISTFILES=	${PORTNAME}-1p-${PORTVERSION:E}${EXTRACT_SUFX} \
 		${PORTNAME}-1c-${PORTVERSION:E}${EXTRACT_SUFX} \
diff --git a/japanese/font-motoya-al/Makefile b/japanese/font-motoya-al/Makefile
index 3b4e73cc8cdb..32d9a6cdf929 100644
--- a/japanese/font-motoya-al/Makefile
+++ b/japanese/font-motoya-al/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	font-motoya-al
 PORTVERSION=	0.0.20100921
 PORTREVISION=	3
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	LOCAL
-MASTER_SITE_SUBDIR=	hrs
+MASTER_SITES=	LOCAL/hrs
 DISTNAME=	motoya-al-fonts-${PORTVERSION:S,^0.0.,,}
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/japanese/font-mplus-ipa/Makefile b/japanese/font-mplus-ipa/Makefile
index 4be26be0214d..6b4b9e927cb8 100644
--- a/japanese/font-mplus-ipa/Makefile
+++ b/japanese/font-mplus-ipa/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	mplus-ipa
 PORTVERSION=	1.0.20060520.p1
 PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	hrs
+MASTER_SITES=	LOCAL/hrs
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	mixfont-mplus-ipa-TrueType-20060520p1
 
diff --git a/japanese/font-ume/Makefile b/japanese/font-ume/Makefile
index fdf30f7a2618..ce17b469591f 100644
--- a/japanese/font-ume/Makefile
+++ b/japanese/font-ume/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	ume
 PORTVERSION=	0.0.470
 PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	${PORTNAME}-font/22212
+MASTER_SITES=	SOURCEFORGE_JP/${PORTNAME}-font/22212
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	umefont_${PORTVERSION:E}
 
diff --git a/japanese/gawk/Makefile b/japanese/gawk/Makefile
index 63ea663b5bd3..1244d33898a5 100644
--- a/japanese/gawk/Makefile
+++ b/japanese/gawk/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gawk
 PORTVERSION=	3.0.6
 PORTREVISION=	1
 CATEGORIES=	japanese lang
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
 PATCH_SITES=	http://www.hinadori.atnifty.com/~wills/program/
 PATCHFILES=	${PORTNAME}mb115.diff.gz
diff --git a/japanese/hns/Makefile b/japanese/hns/Makefile
index 08b5959086ca..b87076df0099 100644
--- a/japanese/hns/Makefile
+++ b/japanese/hns/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	hns
 PORTVERSION=	2.19.9
 CATEGORIES=	japanese www perl5
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	h14m/22597
+MASTER_SITES=	SFJP/h14m/22597
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hyper NIKKI System, a CGI system for Electric Diary Interchange
diff --git a/japanese/ibus-anthy/Makefile b/japanese/ibus-anthy/Makefile
index 3703317888f3..4c436b67340b 100644
--- a/japanese/ibus-anthy/Makefile
+++ b/japanese/ibus-anthy/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.2.7
 PORTREVISION=	6
 CATEGORIES=	japanese
 PROJECTHOST=	ibus
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	ja-
 
 MAINTAINER=	daichi@FreeBSD.org
diff --git a/japanese/japaneseAFM/Makefile b/japanese/japaneseAFM/Makefile
index 96b74fa0e864..4794752b8246 100644
--- a/japanese/japaneseAFM/Makefile
+++ b/japanese/japaneseAFM/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	japaneseAFM
 PORTVERSION=	1.0
 CATEGORIES=	japanese print
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kiri
+MASTER_SITES=	LOCAL/kiri
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile
index 3eba1b883857..c6f4128958c9 100644
--- a/japanese/jed/Makefile
+++ b/japanese/jed/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	jed
 PORTVERSION=	${VERSION}.j${JP_VERSION}
 PORTREVISION=	5
 CATEGORIES=	japanese editors
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
+MASTER_SITES=	LOCAL/knu \
 		http://www.kondara.org/~g/slang/
-MASTER_SITE_SUBDIR=	knu
 DISTNAME=	${PORTNAME}-B${VERSION:R}-${VERSION:E}__J${JP_VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-extralibs-${VERSION}.tar.gz
diff --git a/japanese/jmode/Makefile b/japanese/jmode/Makefile
index 27eee7b1b719..870e858baa0f 100644
--- a/japanese/jmode/Makefile
+++ b/japanese/jmode/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	jmode
 PORTVERSION=	0.6.7
 PORTREVISION=	9
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	anthy/5467
+MASTER_SITES=	SFJP/anthy/5467
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT?=	XIM server for Anthy input method
diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile
index 45b804869865..3d2811164825 100644
--- a/japanese/k12/Makefile
+++ b/japanese/k12/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	kaname12
 PORTVERSION=	1.1
 PORTREVISION=	5
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+MASTER_SITES=	PORTS_JP
 DISTNAME=	kaname_k12_bdf
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		knm_new_linux.tar.gz
diff --git a/japanese/kana-no-quiz/Makefile b/japanese/kana-no-quiz/Makefile
index bf8352a281d1..78eff5acec0e 100644
--- a/japanese/kana-no-quiz/Makefile
+++ b/japanese/kana-no-quiz/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	kana-no-quiz
 DISTVERSION=	1.9
 PORTREVISION=	10
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}
 DISTNAME=	${PORTNAME:S,k,K,}-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/japanese/kanji18/Makefile b/japanese/kanji18/Makefile
index ae9b9dbb651f..ca2be08f6808 100644
--- a/japanese/kanji18/Makefile
+++ b/japanese/kanji18/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	kanji
 PORTVERSION?=	1.0
 PORTREVISION?=	6
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=   ${MASTER_SITE_PORTS_JP}
-MASTER_SITE_SUBDIR=	${DISTNAME}
+MASTER_SITES=   PORTS_JP/${DISTNAME}
 PKGNAMESUFFIX?=	18
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}
 DISTFILES?=	573.z 574.z 575.z 576.z 577.z 578.z 579.z 580.z 581.z
diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile
index c47067f562f9..165c89fa0d90 100644
--- a/japanese/kappa20/Makefile
+++ b/japanese/kappa20/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	k20fonts
 PORTVERSION=	0.396
 PORTREVISION=	7
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	${MASTER_SITE_NETBSD:S/$/:kappa20/:S/%SUBDIR%/LOCAL_PORTS/} \
+MASTER_SITES=	NETBSD/LOCAL_PORTS:kappa20 \
 		SFJP/x-tt/8412/:ayu20
 DISTNAME=	Kappa20-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:kappa20 \
diff --git a/japanese/kasumi/Makefile b/japanese/kasumi/Makefile
index 23146d10ca1b..df745f384e4f 100644
--- a/japanese/kasumi/Makefile
+++ b/japanese/kasumi/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	kasumi
 PORTVERSION=	2.5
 PORTREVISION=	6
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	${PORTNAME}/41436
+MASTER_SITES=	SFJP/${PORTNAME}/41436
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Dictionary management tool for anthy
diff --git a/japanese/kcc/Makefile b/japanese/kcc/Makefile
index 6e899e528884..151769c5d0db 100644
--- a/japanese/kcc/Makefile
+++ b/japanese/kcc/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	kcc
 PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+MASTER_SITES=	PORTS_JP
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/japanese/kon2-16dot/Makefile b/japanese/kon2-16dot/Makefile
index 4b08e789b8ee..9156d7df036f 100644
--- a/japanese/kon2-16dot/Makefile
+++ b/japanese/kon2-16dot/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.3
 PORTREVISION=	7
 # '+=' is for slave ports
 CATEGORIES+=	japanese
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+MASTER_SITES=	PORTS_JP
 PKGNAMESUFFIX=	-${KONFONT}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		k14.bdf 7x14rk.bdf \
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index 0ded7946dd8b..450e5a8aa5fd 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -4,13 +4,10 @@ PORTNAME=	kterm
 PORTVERSION=	6.2.0
 PORTREVISION=	13
 CATEGORIES=	japanese x11
-MASTER_SITES=	${MASTER_SITE_PORTS_JP:S/$/:wp_jp/} \
-		${MASTER_SITE_XCONTRIB} \
-		${MASTER_SITE_LOCAL:S/$/:wp_local,pcemu/}
-MASTER_SITE_SUBDIR= applications \
-		kterm/:wp_jp \
-		shige/kterm/:wp_local \
-		hrs/:pcemu
+MASTER_SITES=	PORTS_JP/kterm/:wp_jp \
+		XCONTRIB/applications \
+		LOCAL/shige/kterm/:wp_local \
+		LOCAL/hrs/:pcemu
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		README.wallpaper.ja:wp_local,wp_jp \
 		pcemu1.01alpha.tar.gz:pcemu
@@ -20,10 +17,9 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/x11/kterm/:nfs \
 		http://www.asahi-net.or.jp/~hc3j-tkg/kterm/:wpi \
 		http://dists.lovepeers.org/distfiles/:termios \
-		${MASTER_SITE_LOCAL:S/$/:color16,termios,utf/}
-PATCH_SITE_SUBDIR=	shige/kterm/:color16 \
-			nork/:termios \
-			hrs/:utf
+		LOCAL/shige/kterm/:color16 \
+		LOCAL/nork/:termios \
+		LOCAL/hrs/:utf
 PATCHFILES=	${DISTNAME}.NFS-xauth.patch:nfs \
 		${DISTNAME}-wpi.patch.gz:wpi \
 		${DISTNAME}-color16.patch.gz:color16 \
diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index fdfb5b00c4d5..c9a5badef057 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -12,8 +12,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		regex_cs-lwp9k.shar.gz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	nork
+PATCH_SITES=	LOCAL/nork
 PATCHFILES=	${DISTNAME}-iso258.patch.gz \
 		${DISTNAME}-iso258-259.patch.gz \
 		${DISTNAME}-iso259-260.patch.gz \
diff --git a/japanese/man-doc/Makefile b/japanese/man-doc/Makefile
index f683baa23460..eea35dba4a9c 100644
--- a/japanese/man-doc/Makefile
+++ b/japanese/man-doc/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	5.4.20050911
 PORTREVISION=	3
 CATEGORIES=	japanese
 .if !defined(WITH_CVS)
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	hrs
+MASTER_SITES=	LOCAL/hrs
 .else
 DISTFILES=	# empty
 .endif
diff --git a/japanese/marumoji-fonts/Makefile b/japanese/marumoji-fonts/Makefile
index 88ae4619c8e5..4299ce436e04 100644
--- a/japanese/marumoji-fonts/Makefile
+++ b/japanese/marumoji-fonts/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	marumoji-fonts
 PORTVERSION=	1.0
 PORTREVISION=	7
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	yoichi
+MASTER_SITES=	LOCAL/yoichi
 DISTFILES=	maru14.bdf.v13.gz maru18.bdf.v10.gz \
 		m18to16.sed \
 		7x14maru.bdf.gz 7x14rkmr.bdf.gz \
diff --git a/japanese/migemo/Makefile b/japanese/migemo/Makefile
index 8420fe8db6be..46e1824b573f 100644
--- a/japanese/migemo/Makefile
+++ b/japanese/migemo/Makefile
@@ -7,8 +7,7 @@ PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://0xcc.net/migemo/ \
-		${MASTER_SITE_LOCAL:S/$/:skkdic/}
-MASTER_SITE_SUBDIR=	nobutaka/:skkdic
+		LOCAL/nobutaka/:skkdic
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SKKDIC_FILE}.bz2:skkdic
 DIST_SUBDIR=	migemo
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/japanese/mime_pls/Makefile b/japanese/mime_pls/Makefile
index c674b6658243..0d02927f4c6b 100644
--- a/japanese/mime_pls/Makefile
+++ b/japanese/mime_pls/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	mime_pls
 PORTVERSION=	2.02
 PORTREVISION=	2
 CATEGORIES=	japanese perl5 mail
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	nork
+MASTER_SITES=	LOCAL/nork
 PKGNAMEPREFIX=	ja-p5-
 DISTNAME=	${PORTNAME}${PORTVERSION:C/\.//}
 
diff --git a/japanese/mtools/Makefile b/japanese/mtools/Makefile
index e29a5545c2ec..76ddad3bcf3b 100644
--- a/japanese/mtools/Makefile
+++ b/japanese/mtools/Makefile
@@ -7,9 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	japanese emulators
 MASTER_SITES=	ftp://ftp.tux.org/pub/knaff/mtools/:mtools  \
 		http://mtools.linux.lu/:mtools \
-		${MASTER_SITE_LOCAL:S/$/:local/} \
-		${MASTER_SITE_PORTS_JP:S/$/:jp/}
-MASTER_SITE_SUBDIR=	steve/:local ./:jp
+		LOCAL/steve:local PORTS_JP:jp
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:mtools \
 		${DISTNAME}.PC98.patch.gz:local,jp
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/japanese/namazu/Makefile b/japanese/namazu/Makefile
index 97fd03668376..f6afb8f3b26a 100644
--- a/japanese/namazu/Makefile
+++ b/japanese/namazu/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	namazu
 PORTVERSION=	1.3.0.11
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.namazu.org/stable/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	flathill
+		LOCAL/flathill
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Search engine software intended for easy use
diff --git a/japanese/newosaka/Makefile b/japanese/newosaka/Makefile
index d6aaf7f256a5..4e85c6557837 100644
--- a/japanese/newosaka/Makefile
+++ b/japanese/newosaka/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	newosaka
 PORTVERSION=	1.0
 CATEGORIES+=	japanese
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+MASTER_SITES=	PORTS_JP
 DISTFILES=	new-osaka.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/japanese/nhocr/Makefile b/japanese/nhocr/Makefile
index 93fbe509f6c3..af5d5d56d59a 100644
--- a/japanese/nhocr/Makefile
+++ b/japanese/nhocr/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	nhocr
 PORTVERSION=	0.21
 CATEGORIES=	japanese graphics
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	hiroto.kagotani@gmail.com
 COMMENT=	OCR engine for Japanese language
diff --git a/japanese/ochusha/Makefile b/japanese/ochusha/Makefile
index 300217e25c9f..7d6c00751909 100644
--- a/japanese/ochusha/Makefile
+++ b/japanese/ochusha/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	ochusha
 PORTVERSION=	0.5.8.2
 PORTREVISION=	13
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=		ochusha/16560
+MASTER_SITES=	SFJP/ochusha/16560
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI BBS browser for 2ch.net
diff --git a/japanese/plain2/Makefile b/japanese/plain2/Makefile
index 5456ca7f0354..b3c504338be0 100644
--- a/japanese/plain2/Makefile
+++ b/japanese/plain2/Makefile
@@ -5,12 +5,10 @@ PORTNAME=	plain2
 PORTVERSION=	2.54.1
 PORTREVISION=	2
 CATEGORIES=	japanese textproc
-MASTER_SITES=	LOCAL
-MASTER_SITE_SUBDIR=	hrs
+MASTER_SITES=	LOCAL/hrs
 DISTNAME=	${PORTNAME}_${PORTVERSION:R}p${PORTVERSION:E}.orig
 
 PATCH_SITES=	${MASTER_SITES}
-PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
 PATCHFILES=	${PORTNAME}_${PORTVERSION:R}p${PORTVERSION:E}-4.2.diff.gz
 PATCH_DIST_STRIP=	-p1
 
diff --git a/japanese/prn/Makefile b/japanese/prn/Makefile
index 23051206caf7..f0b3edcecd28 100644
--- a/japanese/prn/Makefile
+++ b/japanese/prn/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	prn
 PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	japanese print
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+MASTER_SITES=	PORTS_JP
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/japanese/rogue_s/Makefile b/japanese/rogue_s/Makefile
index 44458df5efb1..e20eaf2a775b 100644
--- a/japanese/rogue_s/Makefile
+++ b/japanese/rogue_s/Makefile
@@ -5,16 +5,12 @@ PORTNAME=	rogue_s
 PORTVERSION=	1.3a
 PORTREVISION=	2
 CATEGORIES=	japanese games
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		${MASTER_SITE_PORTS_JP:S,/%SUBDIR%/,/,}
-MASTER_SITE_SUBDIR=	knu
+MASTER_SITES=	LOCAL/knu PORTS_JP
 DISTFILES=	rogue_s.tar.z rogue_s.patch02.z rogue_s.patch03.z \
 		rogue_s.message.z
 EXTRACT_ONLY=	rogue_s.tar.z
 
-PATCH_SITES=	${MASTER_SITE_LOCAL} \
-		${MASTER_SITE_PORTS_JP:S,/%SUBDIR%/,/,}
-PATCH_SITE_SUBDIR=	knu
+PATCH_SITES=	LOCAL/knu PORTS_JP
 PATCHFILES=	rogue_s.patch04
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/japanese/ruby-mecab/Makefile b/japanese/ruby-mecab/Makefile
index 906e9926e7fd..6d5331b628b4 100644
--- a/japanese/ruby-mecab/Makefile
+++ b/japanese/ruby-mecab/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	mecab
 PORTVERSION=	0.996
 PORTREVISION=	1
 CATEGORIES=	japanese textproc ruby
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
 
 MAINTAINER=	ruby@FreeBSD.org
diff --git a/japanese/ruby-usersguide/Makefile b/japanese/ruby-usersguide/Makefile
index 681a31fe64b2..425dc04f10c0 100644
--- a/japanese/ruby-usersguide/Makefile
+++ b/japanese/ruby-usersguide/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	ruby-usersguide
 PORTVERSION=	980206
 CATEGORIES=	japanese lang ruby
-MASTER_SITES=	${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	doc
+MASTER_SITES=	RUBY/doc
 DISTNAME=	${SHORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index eb08512de917..b27215274696 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	scim-anthy
 PORTVERSION=	1.2.7
 PORTREVISION=	4
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=scim-imengine/37309
+MASTER_SITES=	SFJP/scim-imengine/37309
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SCIM IMEngine module using Anthy
diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index 161cd58dac95..d599be838ede 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	scim-canna
 PORTVERSION=	1.0.0
 PORTREVISION=	14
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	scim-imengine/18849
+MASTER_SITES=	SFJP/scim-imengine/18849
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SCIM IMEngine module using Canna
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index aa92a2ab224d..33b410b7010a 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -6,8 +6,7 @@ PORTNAME=	scim-skk
 PORTVERSION=	0.5.2
 PORTREVISION=	11
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	scim-imengine/18121
+MASTER_SITES=	SFJP/scim-imengine/18121
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SCIM IMEngine module like SKK
diff --git a/japanese/skkserv/Makefile b/japanese/skkserv/Makefile
index 830d0a328d86..0b9ec7b35aa7 100644
--- a/japanese/skkserv/Makefile
+++ b/japanese/skkserv/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	skkserv
 PORTVERSION=	9.6
 PORTREVISION=	6
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+MASTER_SITES=	PORTS_JP
 DISTNAME=	skk${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/japanese/slrn/Makefile b/japanese/slrn/Makefile
index 564d82abb20c..4d7c871491cb 100644
--- a/japanese/slrn/Makefile
+++ b/japanese/slrn/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://dists.lovepeers.org/distfiles/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-doc-j0.9.5.6-0.tar.gz
 
-PATCH_SITES=	${MASTER_SITE_PORTS_JP} \
+PATCH_SITES=	PORTS_JP \
 		http://dists.lovepeers.org/distfiles/
 PATCHFILES=	${PORTNAME}-${PORTVERSION}jp0.pat.gz
 PATCH_DIST_STRIP=-p1
diff --git a/japanese/texinfo/Makefile b/japanese/texinfo/Makefile
index 7cb30049cc95..b3239c60300e 100644
--- a/japanese/texinfo/Makefile
+++ b/japanese/texinfo/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	texinfo
 PORTVERSION=	4.7
 PORTREVISION=	8
 CATEGORIES=	japanese print
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
 PATCH_SITES=	ftp://jupiter.fsci.fuk.kindai.ac.jp/pub/ptex/utils/ \
 		http://www.fsci.fuk.kindai.ac.jp/aftp/pub/ptex/utils/
diff --git a/japanese/zipcodes/Makefile b/japanese/zipcodes/Makefile
index 9c5f1d7c0b5c..a16eea315c71 100644
--- a/japanese/zipcodes/Makefile
+++ b/japanese/zipcodes/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	zipcodes
 PORTVERSION=	20150430
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kuriyama
+MASTER_SITES=	LOCAL/kuriyama
 DISTFILES=	ken_all-${PORTVERSION_K}.zip jigyosyo-${PORTVERSION_J}.zip
 
 MAINTAINER=	kuriyama@FreeBSD.org
author	Mathieu Arnold <mat@FreeBSD.org>	2015-05-14 10:15:04 +0000
committer	Mathieu Arnold <mat@FreeBSD.org>	2015-05-14 10:15:04 +0000
commit	60d1a83c2a113150cedbc43ff12a7375144f741a (patch)
tree	627649ff7699a289d5d78c11bf8d105881402ca8 /japanese
parent	Update MASTER_SITES (diff)