8 files changed, 40 insertions, 16 deletions

diff --git a/japanese/p5-Date-Japanese-Holiday/Makefile b/japanese/p5-Date-Japanese-Holiday/Makefile
index 9091599a310e..20aa1474fa4c 100644
--- a/japanese/p5-Date-Japanese-Holiday/Makefile
+++ b/japanese/p5-Date-Japanese-Holiday/Makefile
@@ -5,7 +5,6 @@ PORTVERSION=	0.05
 PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
-PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl module for Calculate Japanese Holiday
@@ -18,4 +17,8 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
+
+.include <bsd.port.post.mk>
diff --git a/japanese/p5-DateTime-Format-Japanese/Makefile b/japanese/p5-DateTime-Format-Japanese/Makefile
index d1a1de8e16c7..10002ac32391 100644
--- a/japanese/p5-DateTime-Format-Japanese/Makefile
+++ b/japanese/p5-DateTime-Format-Japanese/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.04000
 CATEGORIES=	japanese devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
-PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	markun@onohara.to
 COMMENT=	A Japanese DateTime Formatter
@@ -21,4 +20,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
+
+.include <bsd.port.post.mk>
diff --git a/japanese/p5-Encode-EUCJPMS/Makefile b/japanese/p5-Encode-EUCJPMS/Makefile
index 5aca7c494da0..8eee2871e7ca 100644
--- a/japanese/p5-Encode-EUCJPMS/Makefile
+++ b/japanese/p5-Encode-EUCJPMS/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.07
 PORTREVISION=	2
 CATEGORIES=	japanese converters perl5
 MASTER_SITES=	CPAN
-PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Perl5 module defining Microsoft compatible encodings for Japanese
@@ -14,4 +13,8 @@ COMMENT=	A Perl5 module defining Microsoft compatible encodings for Japanese
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
+
+.include <bsd.port.post.mk>
diff --git a/japanese/p5-Encode-JP-Emoji/Makefile b/japanese/p5-Encode-JP-Emoji/Makefile
index a5fc7684f712..090cb6e0e42b 100644
--- a/japanese/p5-Encode-JP-Emoji/Makefile
+++ b/japanese/p5-Encode-JP-Emoji/Makefile
@@ -4,7 +4,6 @@ PORTNAME=	Encode-JP-Emoji
 PORTVERSION=	0.60
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
-PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Emoji encodings and cross-mapping tables
@@ -12,4 +11,8 @@ COMMENT=	Perl extension for Emoji encodings and cross-mapping tables
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
+
+.include <bsd.port.post.mk>
diff --git a/japanese/p5-Encode-JP-Mobile/Makefile b/japanese/p5-Encode-JP-Mobile/Makefile
index 673394a91bc2..63d2362f2fbe 100644
--- a/japanese/p5-Encode-JP-Mobile/Makefile
+++ b/japanese/p5-Encode-JP-Mobile/Makefile
@@ -4,7 +4,6 @@ PORTNAME=	Encode-JP-Mobile
 PORTVERSION=	0.30
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
-PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for encoding for mobile phones in Japan
@@ -22,4 +21,8 @@ USE_PERL5=	configure
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Encode/JP/Mobile/Mobile.so
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
+
+.include <bsd.port.post.mk>
diff --git a/japanese/p5-HTML-MobileJp/Makefile b/japanese/p5-HTML-MobileJp/Makefile
index 889bb3dd4090..5ab878a7dec2 100644
--- a/japanese/p5-HTML-MobileJp/Makefile
+++ b/japanese/p5-HTML-MobileJp/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	HTML-MobileJp
 PORTVERSION=	0.08
 CATEGORIES=	japanese www perl5
 MASTER_SITES=	CPAN
-PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	markun@onohara.to
 COMMENT=	Generate mobile-jp html tags
@@ -23,4 +22,8 @@ TEST_DEPENDS=	p5-Test-Base>0:${PORTSDIR}/devel/p5-Test-Base \
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
+
+.include <bsd.port.post.mk>
diff --git a/japanese/p5-Lingua-JA-Kana/Makefile b/japanese/p5-Lingua-JA-Kana/Makefile
index 9bd387604ffb..421524da86a8 100644
--- a/japanese/p5-Lingua-JA-Kana/Makefile
+++ b/japanese/p5-Lingua-JA-Kana/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	Lingua-JA-Kana
 PORTVERSION=	0.07
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
-PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Converts between Kanas and Romaji
@@ -13,4 +12,8 @@ COMMENT=	Converts between Kanas and Romaji
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
+
+.include <bsd.port.post.mk>
diff --git a/japanese/p5-Lingua-JA-Regular-Unicode/Makefile b/japanese/p5-Lingua-JA-Regular-Unicode/Makefile
index 026dc987cb6f..7872b8bc9850 100644
--- a/japanese/p5-Lingua-JA-Regular-Unicode/Makefile
+++ b/japanese/p5-Lingua-JA-Regular-Unicode/Makefile
@@ -4,7 +4,6 @@ PORTNAME=	Lingua-JA-Regular-Unicode
 PORTVERSION=	0.12
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
-PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to convert Japanese chars
@@ -15,4 +14,8 @@ TEST_DEPENDS=	\
 USES=		perl5
 USE_PERL5=	modbuild
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
+
+.include <bsd.port.post.mk>