54 files changed, 106 insertions, 115 deletions

diff --git a/japanese/freepwing/Makefile b/japanese/freepwing/Makefile
index e84bd607ff8b..e82b5b6e9c7e 100644
--- a/japanese/freepwing/Makefile
+++ b/japanese/freepwing/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	freepwing
 PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese textproc
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/freepwing/old/1.4/
 
diff --git a/japanese/freepwing/pkg-plist b/japanese/freepwing/pkg-plist
index 31def243eac1..9fbf88a73ac6 100644
--- a/japanese/freepwing/pkg-plist
+++ b/japanese/freepwing/pkg-plist
@@ -1,35 +1,35 @@
 bin/fpwmake
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/BaseText.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/BaseUserChar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/BaseWord.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/CharConv.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/ColorGraphic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Control.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/EndWord.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/ColorGraphic.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Copyright.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/FPWParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/FPWUtils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Heading.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/KeyWord.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Menu.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Sound.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Text.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils/Word2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FullUserChar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/HalfUserChar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Heading.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Index.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/KeyWord.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Link.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/RefUserChar.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Reference.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Sort.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Sound.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Tag.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Text.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Word.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/Word2.pm
+%%SITE_ARCH%%/FreePWING/BaseText.pm
+%%SITE_ARCH%%/FreePWING/BaseUserChar.pm
+%%SITE_ARCH%%/FreePWING/BaseWord.pm
+%%SITE_ARCH%%/FreePWING/CharConv.pm
+%%SITE_ARCH%%/FreePWING/ColorGraphic.pm
+%%SITE_ARCH%%/FreePWING/Control.pm
+%%SITE_ARCH%%/FreePWING/EndWord.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/ColorGraphic.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/Copyright.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/FPWParser.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/FPWUtils.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/Heading.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/KeyWord.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/Menu.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/Sound.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/Text.pm
+%%SITE_ARCH%%/FreePWING/FPWUtils/Word2.pm
+%%SITE_ARCH%%/FreePWING/FullUserChar.pm
+%%SITE_ARCH%%/FreePWING/HalfUserChar.pm
+%%SITE_ARCH%%/FreePWING/Heading.pm
+%%SITE_ARCH%%/FreePWING/Index.pm
+%%SITE_ARCH%%/FreePWING/KeyWord.pm
+%%SITE_ARCH%%/FreePWING/Link.pm
+%%SITE_ARCH%%/FreePWING/RefUserChar.pm
+%%SITE_ARCH%%/FreePWING/Reference.pm
+%%SITE_ARCH%%/FreePWING/Sort.pm
+%%SITE_ARCH%%/FreePWING/Sound.pm
+%%SITE_ARCH%%/FreePWING/Tag.pm
+%%SITE_ARCH%%/FreePWING/Text.pm
+%%SITE_ARCH%%/FreePWING/Word.pm
+%%SITE_ARCH%%/FreePWING/Word2.pm
 libexec/freepwing/catdump
 libexec/freepwing/cphier
 libexec/freepwing/fpwcgraph
diff --git a/japanese/jacode.pl/Makefile b/japanese/jacode.pl/Makefile
index 73ded8fbc713..1579fd154aab 100644
--- a/japanese/jacode.pl/Makefile
+++ b/japanese/jacode.pl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jacode.pl
 PORTVERSION=	2.13.4.11
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:INA/${PORTNAME:S|.pl||}
diff --git a/japanese/jcode.pl/Makefile b/japanese/jcode.pl/Makefile
index e86c74b5ed88..ca84da635c38 100644
--- a/japanese/jcode.pl/Makefile
+++ b/japanese/jcode.pl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jcode.pl
 PORTVERSION=	2.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese perl5
 MASTER_SITES=	ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/ \
 		ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/
diff --git a/japanese/mime_pls/Makefile b/japanese/mime_pls/Makefile
index b41708b2b60b..89e55aa6bdfc 100644
--- a/japanese/mime_pls/Makefile
+++ b/japanese/mime_pls/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mime_pls
 PORTVERSION=	2.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese perl5 mail
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	nork
@@ -24,7 +24,7 @@ PLIST_FILES=	${BINS:C,^,bin/,} ${LIBS:C,^,${SITE_PERL_REL}/,}
 
 do-install:
 	${INSTALL_SCRIPT} ${BINS:C,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}
-	${INSTALL_DATA}   ${LIBS:C,^,${WRKSRC}/,} ${STAGEDIR}${SITE_PERL}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
+	${INSTALL_DATA}   ${LIBS:C,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 
 .include <bsd.port.mk>
diff --git a/japanese/p5-Acme-Lou/Makefile b/japanese/p5-Acme-Lou/Makefile
index 5cfb56982727..778b2cd7ac98 100644
--- a/japanese/p5-Acme-Lou/Makefile
+++ b/japanese/p5-Acme-Lou/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Acme-Lou
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	ja-p5-
diff --git a/japanese/p5-Acme-Lou/pkg-plist b/japanese/p5-Acme-Lou/pkg-plist
index 8ebeaee04b19..76dd41ae46bb 100644
--- a/japanese/p5-Acme-Lou/pkg-plist
+++ b/japanese/p5-Acme-Lou/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/Lou/.packlist
 %%SITE_PERL%%/Acme/Lou.pm
 %%SITE_PERL%%/Acme/Lou/Effect.pm
 %%SITE_PERL%%/Acme/Lou/lou-ja2kana.db
diff --git a/japanese/p5-Date-Japanese-Era/Makefile b/japanese/p5-Date-Japanese-Era/Makefile
index 28cddb46a844..820f5a159340 100644
--- a/japanese/p5-Date-Japanese-Era/Makefile
+++ b/japanese/p5-Date-Japanese-Era/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Japanese-Era
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Date-Japanese-Era/pkg-plist b/japanese/p5-Date-Japanese-Era/pkg-plist
index 5d237b6c8c85..e4fd315e88d1 100644
--- a/japanese/p5-Date-Japanese-Era/pkg-plist
+++ b/japanese/p5-Date-Japanese-Era/pkg-plist
@@ -4,4 +4,3 @@
 %%SITE_PERL%%/Date/Japanese/Era.pm
 %%SITE_PERL%%/Date/Japanese/Era/Table.pm
 %%SITE_PERL%%/Date/Japanese/Era/Table/JIS_X0301.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Japanese/Era/.packlist
diff --git a/japanese/p5-Date-Japanese-Holiday/Makefile b/japanese/p5-Date-Japanese-Holiday/Makefile
index 20aa1474fa4c..06539cb1d78e 100644
--- a/japanese/p5-Date-Japanese-Holiday/Makefile
+++ b/japanese/p5-Date-Japanese-Holiday/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Date-Japanese-Holiday
 PORTVERSION=	0.05
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Date-Japanese-Holiday/pkg-plist b/japanese/p5-Date-Japanese-Holiday/pkg-plist
index 4ab1a3d7819f..de944cce6eae 100644
--- a/japanese/p5-Date-Japanese-Holiday/pkg-plist
+++ b/japanese/p5-Date-Japanese-Holiday/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Date/Japanese/Holiday.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Japanese/Holiday/.packlist
 %%PERL5_MAN3%%/Date::Japanese::Holiday.3.gz
diff --git a/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile b/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
index 1077c04fe4ae..01da096af455 100644
--- a/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
+++ b/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	DateTime-Calendar-Japanese-Era
 PORTVERSION=	0.08001
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese devel perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-DateTime-Calendar-Japanese-Era/pkg-plist b/japanese/p5-DateTime-Calendar-Japanese-Era/pkg-plist
index d42a2024cf0e..de7b221a5941 100644
--- a/japanese/p5-DateTime-Calendar-Japanese-Era/pkg-plist
+++ b/japanese/p5-DateTime-Calendar-Japanese-Era/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Japanese/Era/.packlist
 %%SITE_PERL%%/auto/share/module/DateTime-Calendar-Japanese-Era/eras.yaml
 %%SITE_PERL%%/auto/share/module/DateTime-Calendar-Japanese-Era/south-eras.yaml
 %%SITE_PERL%%/DateTime/Calendar/Japanese/Era.pm
diff --git a/japanese/p5-DateTime-Format-Japanese/Makefile b/japanese/p5-DateTime-Format-Japanese/Makefile
index 191436c3b180..b74676abc656 100644
--- a/japanese/p5-DateTime-Format-Japanese/Makefile
+++ b/japanese/p5-DateTime-Format-Japanese/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	DateTime-Format-Japanese
 PORTVERSION=	0.04000
+PORTREVISION=	1
 CATEGORIES=	japanese devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
diff --git a/japanese/p5-DateTime-Format-Japanese/pkg-plist b/japanese/p5-DateTime-Format-Japanese/pkg-plist
index 3f2a6b801c6d..ac07c46a2d0a 100644
--- a/japanese/p5-DateTime-Format-Japanese/pkg-plist
+++ b/japanese/p5-DateTime-Format-Japanese/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Japanese/.packlist
 %%SITE_PERL%%/DateTime/Format/Japanese.pm
 %%SITE_PERL%%/DateTime/Format/Japanese/Common.pm
 %%SITE_PERL%%/DateTime/Format/Japanese/Traditional.pm
diff --git a/japanese/p5-Encode-EUCJPMS/Makefile b/japanese/p5-Encode-EUCJPMS/Makefile
index 79da5f1854cd..1f3d4b292299 100644
--- a/japanese/p5-Encode-EUCJPMS/Makefile
+++ b/japanese/p5-Encode-EUCJPMS/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Encode-EUCJPMS
 PORTVERSION=	0.07
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese converters perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Encode-EUCJPMS/pkg-plist b/japanese/p5-Encode-EUCJPMS/pkg-plist
index fe5e40197729..fb7a55d122bc 100644
--- a/japanese/p5-Encode-EUCJPMS/pkg-plist
+++ b/japanese/p5-Encode-EUCJPMS/pkg-plist
@@ -1,3 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/EUCJPMS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/EUCJPMS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/EUCJPMS/EUCJPMS.so
+%%SITE_ARCH%%/Encode/EUCJPMS.pm
+%%SITE_ARCH%%/auto/Encode/EUCJPMS/EUCJPMS.so
diff --git a/japanese/p5-Encode-JP-Emoji/Makefile b/japanese/p5-Encode-JP-Emoji/Makefile
index 090cb6e0e42b..f4e36bc7b27b 100644
--- a/japanese/p5-Encode-JP-Emoji/Makefile
+++ b/japanese/p5-Encode-JP-Emoji/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Encode-JP-Emoji
 PORTVERSION=	0.60
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Encode-JP-Emoji/pkg-plist b/japanese/p5-Encode-JP-Emoji/pkg-plist
index 562403a71eb4..e8d015b1ec93 100644
--- a/japanese/p5-Encode-JP-Emoji/pkg-plist
+++ b/japanese/p5-Encode-JP-Emoji/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Emoji/.packlist
 %%SITE_PERL%%/Encode/JP/Emoji.pm
 %%SITE_PERL%%/Encode/JP/Emoji/Encoding.pm
 %%SITE_PERL%%/Encode/JP/Emoji/FB_EMOJI_TEXT.pm
diff --git a/japanese/p5-Encode-JP-Mobile/Makefile b/japanese/p5-Encode-JP-Mobile/Makefile
index 63d2362f2fbe..de6731b2aeed 100644
--- a/japanese/p5-Encode-JP-Mobile/Makefile
+++ b/japanese/p5-Encode-JP-Mobile/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Encode-JP-Mobile
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
@@ -19,7 +20,7 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Encode/JP/Mobile/Mobile.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Encode/JP/Mobile/Mobile.so
 
 .include <bsd.port.pre.mk>
 
diff --git a/japanese/p5-Encode-JP-Mobile/pkg-plist b/japanese/p5-Encode-JP-Mobile/pkg-plist
index cfb5057ae41a..a8f1c19706c8 100644
--- a/japanese/p5-Encode-JP-Mobile/pkg-plist
+++ b/japanese/p5-Encode-JP-Mobile/pkg-plist
@@ -1,25 +1,24 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/AirHJIS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/Character.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/Charnames.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/ConvertPictogramSJIS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/Cookbook.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/Fallback.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/KDDIJIS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/MIME.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/MIME/AirH.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/MIME/DoCoMo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/MIME/KDDI.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/MIME/SoftBank.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/Mobile/Vodafone.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/Mobile.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/convert-map-utf8.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/convert-map-utf8.yaml
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/docomo-table.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/docomo-table.yaml
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/kddi-table.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/kddi-table.yaml
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/softbank-table.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/softbank-table.yaml
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/Mobile/softbank-unicode2sjis_auto.yaml
+%%SITE_ARCH%%/Encode/JP/Mobile.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/AirHJIS.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/Character.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/Charnames.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/ConvertPictogramSJIS.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/Cookbook.pod
+%%SITE_ARCH%%/Encode/JP/Mobile/Fallback.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/KDDIJIS.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/MIME.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/MIME/AirH.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/MIME/DoCoMo.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/MIME/KDDI.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/MIME/SoftBank.pm
+%%SITE_ARCH%%/Encode/JP/Mobile/Vodafone.pm
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/Mobile.so
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/convert-map-utf8.pl
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/convert-map-utf8.yaml
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/docomo-table.pl
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/docomo-table.yaml
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/kddi-table.pl
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/kddi-table.yaml
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/softbank-table.pl
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/softbank-table.yaml
+%%SITE_ARCH%%/auto/Encode/JP/Mobile/softbank-unicode2sjis_auto.yaml
diff --git a/japanese/p5-HTML-MobileJp/Makefile b/japanese/p5-HTML-MobileJp/Makefile
index 5ab878a7dec2..084e839fc7f5 100644
--- a/japanese/p5-HTML-MobileJp/Makefile
+++ b/japanese/p5-HTML-MobileJp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	HTML-MobileJp
 PORTVERSION=	0.08
+PORTREVISION=	1
 CATEGORIES=	japanese www perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-HTML-MobileJp/pkg-plist b/japanese/p5-HTML-MobileJp/pkg-plist
index c48235750963..e643c4a82ab2 100644
--- a/japanese/p5-HTML-MobileJp/pkg-plist
+++ b/japanese/p5-HTML-MobileJp/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/MobileJp/.packlist
 %%SITE_PERL%%/HTML/MobileJp/Plugin/EZweb/Object.pm
 %%SITE_PERL%%/HTML/MobileJp/Plugin/GPS.pm
 %%SITE_PERL%%/HTML/MobileJp.pm
diff --git a/japanese/p5-Jcode/Makefile b/japanese/p5-Jcode/Makefile
index a4ec86c9de9a..f9744e247b78 100644
--- a/japanese/p5-Jcode/Makefile
+++ b/japanese/p5-Jcode/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Jcode
 PORTVERSION=	2.07
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Jcode/pkg-plist b/japanese/p5-Jcode/pkg-plist
index 5bdcb4d1df20..c0f10e7a58e8 100644
--- a/japanese/p5-Jcode/pkg-plist
+++ b/japanese/p5-Jcode/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Jcode::Nihongo.3.gz
 %%SITE_PERL%%/Jcode.pm
 %%SITE_PERL%%/Jcode/Nihongo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/.packlist
diff --git a/japanese/p5-Lingua-JA-Kana/Makefile b/japanese/p5-Lingua-JA-Kana/Makefile
index 421524da86a8..fef151308938 100644
--- a/japanese/p5-Lingua-JA-Kana/Makefile
+++ b/japanese/p5-Lingua-JA-Kana/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-JA-Kana
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Lingua-JA-Kana/pkg-plist b/japanese/p5-Lingua-JA-Kana/pkg-plist
index c1595b634686..2eb1f82b506b 100644
--- a/japanese/p5-Lingua-JA-Kana/pkg-plist
+++ b/japanese/p5-Lingua-JA-Kana/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Lingua/JA/Kana.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/JA/Kana/.packlist
 %%PERL5_MAN3%%/Lingua::JA::Kana.3.gz
diff --git a/japanese/p5-Lingua-JA-Numbers/Makefile b/japanese/p5-Lingua-JA-Numbers/Makefile
index df528da1fe4c..c338345951c4 100644
--- a/japanese/p5-Lingua-JA-Numbers/Makefile
+++ b/japanese/p5-Lingua-JA-Numbers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-JA-Numbers
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/japanese/p5-Lingua-JA-Numbers/pkg-plist b/japanese/p5-Lingua-JA-Numbers/pkg-plist
index 08bfab35ccea..e9230952597c 100644
--- a/japanese/p5-Lingua-JA-Numbers/pkg-plist
+++ b/japanese/p5-Lingua-JA-Numbers/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::JA::Numbers.3.gz
 %%SITE_PERL%%/Lingua/JA/Numbers.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/JA/Numbers/.packlist
diff --git a/japanese/p5-Lingua-JA-Regular-Unicode/Makefile b/japanese/p5-Lingua-JA-Regular-Unicode/Makefile
index 7872b8bc9850..448cd537e3c1 100644
--- a/japanese/p5-Lingua-JA-Regular-Unicode/Makefile
+++ b/japanese/p5-Lingua-JA-Regular-Unicode/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Lingua-JA-Regular-Unicode
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Lingua-JA-Summarize-Extract/Makefile b/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
index 4c7aac6831de..386b06a76625 100644
--- a/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
+++ b/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Lingua-JA-Summarize-Extract
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese textproc perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Lingua-JA-Summarize-Extract/pkg-plist b/japanese/p5-Lingua-JA-Summarize-Extract/pkg-plist
index 5ab74adafbbb..75c62168bcde 100644
--- a/japanese/p5-Lingua-JA-Summarize-Extract/pkg-plist
+++ b/japanese/p5-Lingua-JA-Summarize-Extract/pkg-plist
@@ -3,7 +3,6 @@
 %%PERL5_MAN3%%/Lingua::JA::Summarize::Extract::Plugin::Parser::NgramSimple.3.gz
 %%PERL5_MAN3%%/Lingua::JA::Summarize::Extract::Plugin::Parser::Trim.3.gz
 %%PERL5_MAN3%%/Lingua::JA::Summarize::Extract::Plugin::Sentence::Base.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/JA/Summarize/Extract/.packlist
 %%SITE_PERL%%/Lingua/JA/Summarize/Extract.pm
 %%SITE_PERL%%/Lingua/JA/Summarize/Extract/Plugin.pm
 %%SITE_PERL%%/Lingua/JA/Summarize/Extract/ResultSet.pm
diff --git a/japanese/p5-MeCab/Makefile b/japanese/p5-MeCab/Makefile
index 844c0384340f..a2c15dbc3cdf 100644
--- a/japanese/p5-MeCab/Makefile
+++ b/japanese/p5-MeCab/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MeCab
 PORTVERSION=	0.996
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese textproc perl5
 MASTER_SITES=	GOOGLE_CODE
 PROJECTHOST=	${PORTNAME:tl}
diff --git a/japanese/p5-MeCab/pkg-plist b/japanese/p5-MeCab/pkg-plist
index 2d3b6ba00141..7c1d655a2a3e 100644
--- a/japanese/p5-MeCab/pkg-plist
+++ b/japanese/p5-MeCab/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/MeCab.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MeCab/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/MeCab/MeCab.so
+%%SITE_ARCH%%/MeCab.pm
+%%SITE_ARCH%%/auto/MeCab/MeCab.so
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.pl
diff --git a/japanese/p5-Number-Phone-JP/Makefile b/japanese/p5-Number-Phone-JP/Makefile
index 1524e9c38662..1ad2c55a28b8 100644
--- a/japanese/p5-Number-Phone-JP/Makefile
+++ b/japanese/p5-Number-Phone-JP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Number-Phone-JP
 PORTVERSION=	0.20141105
+PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TANIGUCHI
diff --git a/japanese/p5-Number-Phone-JP/pkg-plist b/japanese/p5-Number-Phone-JP/pkg-plist
index 0e2aae19d76d..6d11e7593a45 100644
--- a/japanese/p5-Number-Phone-JP/pkg-plist
+++ b/japanese/p5-Number-Phone-JP/pkg-plist
@@ -13,6 +13,5 @@
 %%SITE_PERL%%/Number/Phone/JP/Table/United.pm
 %%SITE_PERL%%/Number/Phone/JP/Table/Upt.pm
 %%SITE_PERL%%/Number/Phone/regexp-table-maker.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Phone/JP/.packlist
 %%PERL5_MAN3%%/Number::Phone::JP.3.gz
 %%PERL5_MAN3%%/Number::Phone::JP::Table.3.gz
diff --git a/japanese/p5-PDFJ/Makefile b/japanese/p5-PDFJ/Makefile
index f3caee354cd0..b94fc0039eab 100644
--- a/japanese/p5-PDFJ/Makefile
+++ b/japanese/p5-PDFJ/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	PDFJ
 PORTVERSION=	0.90
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese perl5
 MASTER_SITES=	http://hp1.jonex.ne.jp/%7Enakajima.yasushi/archives/
 
diff --git a/japanese/p5-PDFJ/pkg-plist b/japanese/p5-PDFJ/pkg-plist
index 6249b6cc37c0..f9f5fbee0407 100644
--- a/japanese/p5-PDFJ/pkg-plist
+++ b/japanese/p5-PDFJ/pkg-plist
@@ -36,7 +36,6 @@ bin/xpdfj.pl
 %%EXAMPLESDIR%%/qrcode.pl
 %%EXAMPLESDIR%%/stdmacro.xp
 %%EXAMPLESDIR%%/stdmacro.xp.pdf
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDFJ/.packlist
 %%SITE_PERL%%/PDFJ.pm
 %%SITE_PERL%%/PDFJ/CFF.pm
 %%SITE_PERL%%/PDFJ/E2U.pm
diff --git a/japanese/p5-Text-ChaSen/Makefile b/japanese/p5-Text-ChaSen/Makefile
index aef6d2791be6..a7736af81b23 100644
--- a/japanese/p5-Text-ChaSen/Makefile
+++ b/japanese/p5-Text-ChaSen/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-ChaSen
 PORTVERSION=	1.03
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese textproc perl5
 MASTER_SITES=	SFJP
 MASTER_SITE_SUBDIR=	chasen-legacy/32224
diff --git a/japanese/p5-Text-ChaSen/pkg-plist b/japanese/p5-Text-ChaSen/pkg-plist
index aa379935feef..596fe247d7b6 100644
--- a/japanese/p5-Text-ChaSen/pkg-plist
+++ b/japanese/p5-Text-ChaSen/pkg-plist
@@ -1,5 +1,4 @@
 %%PERL5_MAN3%%/Text::ChaSen.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/ChaSen.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen/ChaSen.so
+%%SITE_ARCH%%/Text/ChaSen.pm
+%%SITE_ARCH%%/auto/Text/ChaSen/ChaSen.so
 %%PORTDOCS%%%%DOCSDIR%%/README.perl
diff --git a/japanese/p5-Text-Kakasi/Makefile b/japanese/p5-Text-Kakasi/Makefile
index 551e9907bdf2..70fd069fcf90 100644
--- a/japanese/p5-Text-Kakasi/Makefile
+++ b/japanese/p5-Text-Kakasi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-Kakasi
 PORTVERSION=	2.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese textproc perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Text-Kakasi/pkg-plist b/japanese/p5-Text-Kakasi/pkg-plist
index a4c5f729362e..5f11afd45d41 100644
--- a/japanese/p5-Text-Kakasi/pkg-plist
+++ b/japanese/p5-Text-Kakasi/pkg-plist
@@ -1,6 +1,5 @@
 %%PERL5_MAN3%%/Text::Kakasi.3.gz
 %%PERL5_MAN3%%/Text::Kakasi::JP.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Kakasi.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/Kakasi/JP.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi/Kakasi.so
+%%SITE_ARCH%%/Text/Kakasi.pm
+%%SITE_ARCH%%/Text/Kakasi/JP.pod
+%%SITE_ARCH%%/auto/Text/Kakasi/Kakasi.so
diff --git a/japanese/p5-Text-MeCab/Makefile b/japanese/p5-Text-MeCab/Makefile
index 9b75c710b3ba..d200e25e80f0 100644
--- a/japanese/p5-Text-MeCab/Makefile
+++ b/japanese/p5-Text-MeCab/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		Text-MeCab
 PORTVERSION=		0.20009
+PORTREVISION=	1
 CATEGORIES=		japanese textproc perl5
 MASTER_SITES=		CPAN
 
diff --git a/japanese/p5-Text-MeCab/pkg-plist b/japanese/p5-Text-MeCab/pkg-plist
index 3e580bbb18ee..bcce3fbd9e0d 100644
--- a/japanese/p5-Text-MeCab/pkg-plist
+++ b/japanese/p5-Text-MeCab/pkg-plist
@@ -1,8 +1,7 @@
 %%PERL5_MAN3%%/Text::MeCab.3.gz
 %%PERL5_MAN3%%/Text::MeCab::Dict.3.gz
 %%PERL5_MAN3%%/Text::MeCab::Node.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/MeCab.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/MeCab/Dict.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/MeCab/Node.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MeCab/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MeCab/MeCab.so
+%%SITE_ARCH%%/Text/MeCab.pm
+%%SITE_ARCH%%/Text/MeCab/Dict.pm
+%%SITE_ARCH%%/Text/MeCab/Node.pod
+%%SITE_ARCH%%/auto/Text/MeCab/MeCab.so
diff --git a/japanese/p5-Unicode-Japanese/Makefile b/japanese/p5-Unicode-Japanese/Makefile
index cefca68d7a79..946e4611ec36 100644
--- a/japanese/p5-Unicode-Japanese/Makefile
+++ b/japanese/p5-Unicode-Japanese/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Unicode-Japanese
 PORTVERSION=	0.49
+PORTREVISION=	1
 CATEGORIES=	japanese converters perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-Unicode-Japanese/pkg-plist b/japanese/p5-Unicode-Japanese/pkg-plist
index 7928510dcc05..ae495f66dc88 100644
--- a/japanese/p5-Unicode-Japanese/pkg-plist
+++ b/japanese/p5-Unicode-Japanese/pkg-plist
@@ -1,10 +1,9 @@
 bin/ujconv
 bin/ujguess
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Japanese.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Japanese.mlpod
-%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Japanese/JA.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Japanese/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Japanese/Japanese.so
+%%SITE_ARCH%%/Unicode/Japanese.pm
+%%SITE_ARCH%%/Unicode/Japanese.mlpod
+%%SITE_ARCH%%/Unicode/Japanese/JA.pod
+%%SITE_ARCH%%/auto/Unicode/Japanese/Japanese.so
 %%PERL5_MAN3%%/Unicode::Japanese.3.gz
 %%PERL5_MAN3%%/Unicode::Japanese::JA.3.gz
 man/man1/ujconv.1.gz
diff --git a/japanese/p5-WWW-2ch/Makefile b/japanese/p5-WWW-2ch/Makefile
index c1e13625fa6c..7ca6cce0565c 100644
--- a/japanese/p5-WWW-2ch/Makefile
+++ b/japanese/p5-WWW-2ch/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WWW-2ch
 PORTVERSION=	0.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/japanese/p5-WWW-2ch/pkg-plist b/japanese/p5-WWW-2ch/pkg-plist
index 874a137f2080..0b401dc023d5 100644
--- a/japanese/p5-WWW-2ch/pkg-plist
+++ b/japanese/p5-WWW-2ch/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/2ch/.packlist
 %%SITE_PERL%%/WWW/2ch.pm
 %%SITE_PERL%%/WWW/2ch/Cache.pm
 %%SITE_PERL%%/WWW/2ch/Cache/File.pm
diff --git a/japanese/p5-WWW-MobileCarrierJP/Makefile b/japanese/p5-WWW-MobileCarrierJP/Makefile
index b933390c47cc..bed5739736ed 100644
--- a/japanese/p5-WWW-MobileCarrierJP/Makefile
+++ b/japanese/p5-WWW-MobileCarrierJP/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	WWW-MobileCarrierJP
 PORTVERSION=	0.63
+PORTREVISION=	1
 CATEGORIES=	japanese www perl5
 MASTER_SITES=	CPAN
 
diff --git a/japanese/p5-WWW-MobileCarrierJP/pkg-plist b/japanese/p5-WWW-MobileCarrierJP/pkg-plist
index c26b3626c087..204a4a7d42fe 100644
--- a/japanese/p5-WWW-MobileCarrierJP/pkg-plist
+++ b/japanese/p5-WWW-MobileCarrierJP/pkg-plist
@@ -1,5 +1,4 @@
 bin/www-mobilecarrierjp-dump_all.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/MobileCarrierJP/.packlist
 %%SITE_PERL%%/WWW/MobileCarrierJP/AirHPhone/CIDR.pm
 %%SITE_PERL%%/WWW/MobileCarrierJP/DoCoMo/Display.pm
 %%SITE_PERL%%/WWW/MobileCarrierJP/DoCoMo/Flash.pm
diff --git a/japanese/p5-nkf/Makefile b/japanese/p5-nkf/Makefile
index 1147948bf199..377ea3d3465f 100644
--- a/japanese/p5-nkf/Makefile
+++ b/japanese/p5-nkf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nkf
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	SFJP/${PORTNAME}/53171
diff --git a/japanese/p5-nkf/pkg-plist b/japanese/p5-nkf/pkg-plist
index 90a6ee0820f2..6ee3cc6e3977 100644
--- a/japanese/p5-nkf/pkg-plist
+++ b/japanese/p5-nkf/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/NKF.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NKF/NKF.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/NKF/.packlist
+%%SITE_ARCH%%/NKF.pm
+%%SITE_ARCH%%/auto/NKF/NKF.so
 %%PERL5_MAN3%%/NKF.3.gz
diff --git a/japanese/spamassassin/Makefile b/japanese/spamassassin/Makefile
index 20d7ca7b9aed..9626598a4df6 100644
--- a/japanese/spamassassin/Makefile
+++ b/japanese/spamassassin/Makefile
@@ -1,7 +1,7 @@
 # Created by: TAOKA Fumiyoshi
 # $FreeBSD$
 
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	japanese mail perl5
 PKGNAMEPREFIX=	ja-
 
diff --git a/japanese/spamassassin/files/spamassassin-ja.plist b/japanese/spamassassin/files/spamassassin-ja.plist
index 91d905205633..acfde3df93a1 100644
--- a/japanese/spamassassin/files/spamassassin-ja.plist
+++ b/japanese/spamassassin/files/spamassassin-ja.plist
@@ -1,6 +1,5 @@
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Util/Charset.pm
 %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Tokenizer.3.gz