22 files changed, 22 insertions, 39 deletions

diff --git a/japanese/aterm/Makefile b/japanese/aterm/Makefile
index f7124cf1b311..646bb2c22f47 100644
--- a/japanese/aterm/Makefile
+++ b/japanese/aterm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	aterm
 PORTVERSION=	0.4.2
 PORTREVISION=	5
 CATEGORIES+=	japanese x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 PATCH_SITES=	http://www.jaist.ac.jp/~amatsus/linux/src/xfree86/aterm/
 PATCHFILES=	${DISTNAME}-xim.patch.gz \
diff --git a/japanese/ebview/Makefile b/japanese/ebview/Makefile
index 124e5cf1a63f..e527883a4629 100644
--- a/japanese/ebview/Makefile
+++ b/japanese/ebview/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ebview
 PORTVERSION=	0.2.1
 PORTREVISION=	9
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Electronic Book Viewer
diff --git a/japanese/ical/Makefile b/japanese/ical/Makefile
index ff601066ac65..7ccef100b98e 100644
--- a/japanese/ical/Makefile
+++ b/japanese/ical/Makefile
@@ -12,9 +12,7 @@ CATEGORIES=	japanese deskutils tk
 MASTER_SITES=	ftp://ftp.sco.com/skunkware/src/shellutil/ \
 		ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/ \
 		ftp://ftp.netsw.org/netsw/X11/Tools/Desktop/ \
-		${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.sunsite.org.uk/Mirrors/ftp.sco.com/skunkware/src/shellutil/
-MASTER_SITE_SUBDIR=	ical
 
 PATCH_SITES=	http://www-jlc.kek.jp/~fujiik/mklinux/Packages/dr3/JRPMS/ical/SOURCES/
 PATCHFILES=	ical-2.2-jp1.patch
diff --git a/japanese/jadetex-ptex/Makefile b/japanese/jadetex-ptex/Makefile
index 7cb9784c1070..41144a9d0878 100644
--- a/japanese/jadetex-ptex/Makefile
+++ b/japanese/jadetex-ptex/Makefile
@@ -9,8 +9,7 @@ PORTNAME=		jadetex
 PORTVERSION=		3.13
 PORTREVISION=	6
 CATEGORIES=		japanese print
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SF
 PKGNAMESUFFIX=		-ptex
 DISTNAME=		jadetex-${PORTVERSION}
 
diff --git a/japanese/lambdamoo/Makefile b/japanese/lambdamoo/Makefile
index c22951413651..714e2636089c 100644
--- a/japanese/lambdamoo/Makefile
+++ b/japanese/lambdamoo/Makefile
@@ -11,6 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	japanese net
 MASTER_SITES=	SF\
 		ftp://ftp.leo.chubu.ac.jp/pub/network/mnews/:MN
+
 DISTNAME=	LambdaMOO-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		mnews122.tar.gz:MN
diff --git a/japanese/libtomoe-gtk/Makefile b/japanese/libtomoe-gtk/Makefile
index 0272bc3b553b..5e391031775a 100644
--- a/japanese/libtomoe-gtk/Makefile
+++ b/japanese/libtomoe-gtk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	libtomoe-gtk
 PORTVERSION=	0.6.0
 PORTREVISION=	3
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=tomoe
+MASTER_SITES=	SF/tomoe/tomoe-gtk/tomoe-gtk-${PORTVERSION}
 DISTNAME=	tomoe-gtk-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	ume@FreeBSD.org
diff --git a/japanese/mecab-ipadic/Makefile b/japanese/mecab-ipadic/Makefile
index 95eb5f2254d6..f6ddd9caccf1 100644
--- a/japanese/mecab-ipadic/Makefile
+++ b/japanese/mecab-ipadic/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	mecab
 DISTVERSION=	2.7.0-20070801
 CATEGORIES=	japanese textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-ipadic/2.7.0-20070801
 PKGNAMESUFFIX=	-ipadic
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}
 
diff --git a/japanese/monafonts-ttf/Makefile b/japanese/monafonts-ttf/Makefile
index 67f04cad56f3..bce839b2ec48 100644
--- a/japanese/monafonts-ttf/Makefile
+++ b/japanese/monafonts-ttf/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	monafonts-ttf
 PORTVERSION=	2.90
 PORTREVISION=	2
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	monafont
+MASTER_SITES=	SF/monafont/monafont/monafont-${PORTVERSION}
 DISTNAME=	monafont-ttf-${PORTVERSION}
 
 MAINTAINER=	nobutaka@FreeBSD.org
diff --git a/japanese/monafonts/Makefile b/japanese/monafonts/Makefile
index 103dbe93840c..c30f4e9617ec 100644
--- a/japanese/monafonts/Makefile
+++ b/japanese/monafonts/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.90
 PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	SF/monafont
+MASTER_SITES=	SF/monafont/monafont/monafont-${PORTVERSION}
 DISTNAME=	monafont-${PORTVERSION}
 
 MAINTAINER=	nobutaka@FreeBSD.org
diff --git a/japanese/navi2ch/Makefile b/japanese/navi2ch/Makefile
index 4fb33a8da9fa..f2a2134d5789 100644
--- a/japanese/navi2ch/Makefile
+++ b/japanese/navi2ch/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.8.2
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese www elisp
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	hrs@FreeBSD.org
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index 4b2bb35228e2..e1cffb8720d5 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	nethack
 PORTVERSION=	3.4.3
 PORTREVISION=	5
 CATEGORIES=	japanese games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}-src
 EXTRACT_SUFX=	.tgz
 
diff --git a/japanese/p5-MeCab/Makefile b/japanese/p5-MeCab/Makefile
index 27ba77de68d3..a81094480144 100644
--- a/japanese/p5-MeCab/Makefile
+++ b/japanese/p5-MeCab/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	MeCab
 PORTVERSION=	0.97
 CATEGORIES=	japanese textproc perl5
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=     ${PORTNAME:L}
+MASTER_SITES=		SF/${PORTNAME:L}/${PORTNAME:L}-perl/${PORTVERSION}
 DISTNAME=		${PORTNAME:L}-perl-${PORTVERSION}
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/japanese/py-mecab/Makefile b/japanese/py-mecab/Makefile
index 83c529a550d0..7ce67538bee5 100644
--- a/japanese/py-mecab/Makefile
+++ b/japanese/py-mecab/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	mecab
 PORTVERSION=	0.97
 CATEGORIES=	japanese python textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-python/${PORTVERSION}
 DISTNAME=	${PORTNAME}-python-${PORTVERSION}
 
 MAINTAINER=	jun-g@daemonfreaks.com
diff --git a/japanese/ruby-mecab/Makefile b/japanese/ruby-mecab/Makefile
index 56a99b8ce0d6..ce451b10da8a 100644
--- a/japanese/ruby-mecab/Makefile
+++ b/japanese/ruby-mecab/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	mecab
 PORTVERSION=	0.97
 CATEGORIES=	japanese textproc ruby
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-ruby/${PORTVERSION}
 DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
 
 MAINTAINER=	ruby@FreeBSD.org
diff --git a/japanese/scim-tables/Makefile b/japanese/scim-tables/Makefile
index 0f457394b415..70ab15778fa4 100644
--- a/japanese/scim-tables/Makefile
+++ b/japanese/scim-tables/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	scim-tables
 PORTVERSION=	0.5.7
 PORTREVISION=	3
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=scim
+MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	SCIM table based Japanese input methods
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index e18194810639..c371bef5c898 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	scim-tomoe
 PORTVERSION=	0.6.0
 PORTREVISION=	4
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=tomoe
+MASTER_SITES=	SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	SCIM IMEngine module using Tomoe
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index f8066d3b8e99..da093c3ee7c2 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -9,9 +9,9 @@ PORTNAME=	scim-uim
 PORTVERSION=	0.2.0
 PORTREVISION=	2
 CATEGORIES=	japanese
-MASTER_SITES=	SF \
+MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION} \
 		http://freedesktop.org/~suzhe/sources/
-MASTER_SITE_SUBDIR=scim
+
 
 MAINTAINER=	s_yanagita@ybb.ne.jp
 COMMENT=	SCIM IMEngine module using UIM input method library
diff --git a/japanese/stardict-dict-ja/Makefile b/japanese/stardict-dict-ja/Makefile
index efcd3e36d4de..167d9bb6ac9f 100644
--- a/japanese/stardict-dict-ja/Makefile
+++ b/japanese/stardict-dict-ja/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	stardict2-dict-ja
 PORTVERSION=	2.4.2
 PORTREVISION=	7
 CATEGORIES=	japanese textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	stardict
+MASTER_SITES=	SF/stardict/stardict-dictionaries-ja/${PORTVERSION}
 DISTFILES=	stardict-jmdict-en-ja-${PORTVERSION}.tar.bz2 \
 		stardict-jmdict-ja-en-${PORTVERSION}.tar.bz2
 DIST_SUBDIR=	stardict
diff --git a/japanese/stardict2-dict-ja/Makefile b/japanese/stardict2-dict-ja/Makefile
index efcd3e36d4de..167d9bb6ac9f 100644
--- a/japanese/stardict2-dict-ja/Makefile
+++ b/japanese/stardict2-dict-ja/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	stardict2-dict-ja
 PORTVERSION=	2.4.2
 PORTREVISION=	7
 CATEGORIES=	japanese textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	stardict
+MASTER_SITES=	SF/stardict/stardict-dictionaries-ja/${PORTVERSION}
 DISTFILES=	stardict-jmdict-en-ja-${PORTVERSION}.tar.bz2 \
 		stardict-jmdict-ja-en-${PORTVERSION}.tar.bz2
 DIST_SUBDIR=	stardict
diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile
index aed40d1826bd..f7c97bfa54e9 100644
--- a/japanese/tomoe/Makefile
+++ b/japanese/tomoe/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	tomoe
 PORTVERSION=	0.6.0
 PORTREVISION=	3
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=tomoe
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile
index 419ca4d1d475..0872f4e89c1f 100644
--- a/japanese/uim-tomoe-gtk/Makefile
+++ b/japanese/uim-tomoe-gtk/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	uim-tomoe-gtk
 PORTVERSION=	0.6.0
 PORTREVISION=	5
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=tomoe
+MASTER_SITES=	SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	UIM helper program for Tomoe
diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 6e3cad95ac17..1ea5c31e1ca4 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	xdvik
 PORTVERSION=	${VERSION_XDVIK}.${VERSION_JPATCH}
 PORTREVISION=	11
 CATEGORIES=	japanese print
-MASTER_SITES=	SF/xdvi
+MASTER_SITES=	SF/xdvi/OldFiles
 PKGNAMEPREFIX=	ja-
 PKGNAMESUFFIX=	-tetex
 DISTNAME=	xdvik-${VERSION_XDVIK}