13 files changed, 28 insertions, 15 deletions

diff --git a/japanese/p5-Date-Japanese-Holiday/Makefile b/japanese/p5-Date-Japanese-Holiday/Makefile
index 0d1c0e4ddc1f..2a3940dd186d 100644
--- a/japanese/p5-Date-Japanese-Holiday/Makefile
+++ b/japanese/p5-Date-Japanese-Holiday/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	p5-Date-Calc>5.3:${PORTSDIR}/devel/p5-Date-Calc \
 		p5-Time-modules>0.01:${PORTSDIR}/devel/p5-Time-modules
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	YES
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Date::Japanese::Holiday.3
 
diff --git a/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile b/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
index c4b7358f862d..eeb24f42b1f5 100644
--- a/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
+++ b/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
@@ -24,7 +24,8 @@ BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		DateTime::Calendar::Japanese::Era.3
 
diff --git a/japanese/p5-DateTime-Format-Japanese/Makefile b/japanese/p5-DateTime-Format-Japanese/Makefile
index 116b029e7e6f..8e49bdbd9c56 100644
--- a/japanese/p5-DateTime-Format-Japanese/Makefile
+++ b/japanese/p5-DateTime-Format-Japanese/Makefile
@@ -21,7 +21,8 @@ BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		DateTime::Format::Japanese.3 \
 		DateTime::Format::Japanese::Common.3 \
diff --git a/japanese/p5-Encode-EUCJPMS/Makefile b/japanese/p5-Encode-EUCJPMS/Makefile
index 0d5e9a322d65..5ff473291f16 100644
--- a/japanese/p5-Encode-EUCJPMS/Makefile
+++ b/japanese/p5-Encode-EUCJPMS/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	CPAN
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Perl5 module defining Microsoft compatible encodings for Japanese
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/japanese/p5-Encode-JP-Mobile/Makefile b/japanese/p5-Encode-JP-Mobile/Makefile
index 3ef70095fc52..eebc3c9cd14a 100644
--- a/japanese/p5-Encode-JP-Mobile/Makefile
+++ b/japanese/p5-Encode-JP-Mobile/Makefile
@@ -15,7 +15,8 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
 	p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 .include <bsd.port.pre.mk>
 
diff --git a/japanese/p5-HTML-MobileJp/Makefile b/japanese/p5-HTML-MobileJp/Makefile
index 83200a21cadf..7dee908b8707 100644
--- a/japanese/p5-HTML-MobileJp/Makefile
+++ b/japanese/p5-HTML-MobileJp/Makefile
@@ -23,7 +23,8 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	p5-Test-Base>0:${PORTSDIR}/devel/p5-Test-Base \
 		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		HTML::MobileJp.3 \
 		HTML::MobileJp::Plugin::GPS.3 \
diff --git a/japanese/p5-Jcode/Makefile b/japanese/p5-Jcode/Makefile
index 3a4b632ca58e..aa3885cc098d 100644
--- a/japanese/p5-Jcode/Makefile
+++ b/japanese/p5-Jcode/Makefile
@@ -13,7 +13,9 @@ MASTER_SITES=	CPAN
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension interface to convert Japanese text
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
+
 MAN3=		Jcode.3 Jcode::Nihongo.3
 
 .include <bsd.port.pre.mk>
diff --git a/japanese/p5-Lingua-JA-Kana/Makefile b/japanese/p5-Lingua-JA-Kana/Makefile
index bc75ae84c455..debc2100aa66 100644
--- a/japanese/p5-Lingua-JA-Kana/Makefile
+++ b/japanese/p5-Lingua-JA-Kana/Makefile
@@ -13,7 +13,8 @@ MASTER_SITES=	CPAN
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Converts between Kanas and Romaji
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	${PORTNAME:S/-/::/g}.3
 
diff --git a/japanese/p5-Lingua-JA-Summarize-Extract/Makefile b/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
index 3e6edf7e28da..b58c8c712de6 100644
--- a/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
+++ b/japanese/p5-Lingua-JA-Summarize-Extract/Makefile
@@ -19,7 +19,8 @@ BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Lingua::JA::Summarize::Extract::Plugin::Sentence::Base.3 \
 		Lingua::JA::Summarize::Extract::Plugin::Parser::Ngram.3 \
diff --git a/japanese/p5-Text-MeCab/Makefile b/japanese/p5-Text-MeCab/Makefile
index 7da247d72e99..7f1cb55db3d8 100644
--- a/japanese/p5-Text-MeCab/Makefile
+++ b/japanese/p5-Text-MeCab/Makefile
@@ -28,7 +28,8 @@ MAN3=			Text::MeCab.3 \
 			Text::MeCab::Dict.3 \
 			Text::MeCab::Node.3
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 CONFIGURE_ARGS=	</dev/null
 
 # dictionary encoding (euc-jp, shift_jis, utf-8)
diff --git a/japanese/p5-Unicode-Japanese/Makefile b/japanese/p5-Unicode-Japanese/Makefile
index 08fbf127c3fa..a3477fd78aca 100644
--- a/japanese/p5-Unicode-Japanese/Makefile
+++ b/japanese/p5-Unicode-Japanese/Makefile
@@ -13,7 +13,9 @@ MASTER_SITES=	CPAN
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Perl5 module to handle Japanese character encodings
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
+
 MAN1=		ujconv.1 ujguess.1
 MAN3=		Unicode::Japanese.3 Unicode::Japanese::JA.3
 
diff --git a/japanese/p5-WWW-MobileCarrierJP/Makefile b/japanese/p5-WWW-MobileCarrierJP/Makefile
index 747c6138eaa0..afdf2cc09944 100644
--- a/japanese/p5-WWW-MobileCarrierJP/Makefile
+++ b/japanese/p5-WWW-MobileCarrierJP/Makefile
@@ -26,7 +26,8 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	p5-LWP-Online>=1.07:${PORTSDIR}/www/p5-LWP-Online \
 		p5-Test-Base>0:${PORTSDIR}/devel/p5-Test-Base
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=		www-mobilecarrierjp-dump_all.pl.1
 MAN3=		WWW::MobileCarrierJP::EZWeb::PictogramInfo.3 \
diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile
index 495608175ccc..763d4cfddc99 100644
--- a/japanese/tomoe/Makefile
+++ b/japanese/tomoe/Makefile
@@ -18,11 +18,10 @@ COMMENT=	Tegaki Online MOji-ninshiki Engine
 
 USE_GNOME=	lthack gnomehack
 GNU_CONFIGURE=	yes
-USES=		gettext pkgconfig
-USE_GMAKE=	yes
+USES=		gettext pkgconfig gmake perl5
 USE_LDCONFIG=	yes
 USE_RUBY=	yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 
 BUILD_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2 \
 		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser