7 files changed, 8 insertions, 14 deletions

diff --git a/japanese/ajaxzip2-core/Makefile b/japanese/ajaxzip2-core/Makefile
index 1af1eabb2219..6661aaa0e7d6 100644
--- a/japanese/ajaxzip2-core/Makefile
+++ b/japanese/ajaxzip2-core/Makefile
@@ -4,8 +4,7 @@ PORTNAME=	ajaxzip2
 PORTVERSION=	20081102
 PORTREVISION=	1
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kuriyama
+MASTER_SITES=	LOCAL/kuriyama
 PKGNAMESUFFIX=	-core
 DISTNAME=	${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
 
diff --git a/japanese/gskk/Makefile b/japanese/gskk/Makefile
index 1981edd64554..3b21f1bd2a5e 100644
--- a/japanese/gskk/Makefile
+++ b/japanese/gskk/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	gskk
 PORTVERSION=	20041208
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.ohnolab.org/~kimoto/
-DISTNAME=	${PORTNAME}-${PORTVERSION}.t
-EXTRACT_SUFX=	.gz
+EXTRACT_SUFX=	.t.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SKK's dictionary for Canna
diff --git a/japanese/jd/Makefile b/japanese/jd/Makefile
index eba692ac68cc..1b572e331cec 100644
--- a/japanese/jd/Makefile
+++ b/japanese/jd/Makefile
@@ -3,11 +3,10 @@
 
 PORTNAME=	jd
 PORTVERSION=	2.8.8
+DISTVERSIONSUFFIX=	-140601
 PORTREVISION=	5
 CATEGORIES=	japanese www
-MASTER_SITES=	SFJP
-MASTER_SITE_SUBDIR=	jd4linux/61281
-DISTNAME=	${PORTNAME}-${PORTVERSION}-140601
+MASTER_SITES=	SFJP/jd4linux/61281
 
 MAINTAINER=	townwear@gmail.com
 COMMENT=	2ch browser
diff --git a/japanese/kcode/Makefile b/japanese/kcode/Makefile
index 1b204265b9ef..a9c13ee318af 100644
--- a/japanese/kcode/Makefile
+++ b/japanese/kcode/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	kcode
 PORTVERSION=	1.0
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.irori.org/dl/tool/
-DISTFILES=	${PORTNAME}-${PORTVERSION}.gz
-EXTRACT_ONLY=	${DISTFILES}
+EXTRACT_SUFX=	.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Handy utility to show codepoint information of given characters
diff --git a/japanese/mailman/Makefile b/japanese/mailman/Makefile
index e4279ad02bb7..06d2feee51b7 100644
--- a/japanese/mailman/Makefile
+++ b/japanese/mailman/Makefile
@@ -7,8 +7,7 @@ PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese mail
 MASTER_SITES=	http://www.python.jp/doc/contrib/mailman/_static/ \
-		LOCAL
-MASTER_SITE_SUBDIR=	tota/${PORTNAME}
+		LOCAL/tota/${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.j/+j/}
 DIST_SUBDIR=	mailman
 
diff --git a/japanese/man/Makefile b/japanese/man/Makefile
index 7084d7e171dc..6506d1b71760 100644
--- a/japanese/man/Makefile
+++ b/japanese/man/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.1j
 PORTREVISION=	9
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://daemon.jp.freebsd.org/pub/FreeBSD-jp/man-jp/ \
-		${MASTER_SITE_PORTS_JP}
+		PORTS_JP
 DISTNAME=	jp-${PORTNAME}-${PORTVERSION}
 
 PATCH_SITES=	ftp://daemon.jp.freebsd.org/pub/FreeBSD-jp/man-jp/
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index 40eafa18f637..b43ddcf3d6b1 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -8,8 +8,7 @@ CATEGORIES=	japanese games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}-src
 
-PATCH_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-PATCH_SITE_SUBDIR=	jnethack/58545
+PATCH_SITES=	SOURCEFORGE_JP/jnethack/58545
 PATCHFILES=	jnethack-${PORTVERSION}-0.11.diff.gz
 PATCH_DIST_STRIP=	-p1