13 files changed, 15 insertions, 109 deletions

diff --git a/japanese/another-htmllint/Makefile b/japanese/another-htmllint/Makefile
index ea38fb459eeb..ec6e62ceada5 100644
--- a/japanese/another-htmllint/Makefile
+++ b/japanese/another-htmllint/Makefile
@@ -51,12 +51,6 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500801
-JCODE=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm
-.else
 JCODE=	${SITE_PERL}/Jcode.pm
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/eijiro-fpw/Makefile b/japanese/eijiro-fpw/Makefile
index 59b5d080f99e..bd4c46dafb1a 100644
--- a/japanese/eijiro-fpw/Makefile
+++ b/japanese/eijiro-fpw/Makefile
@@ -29,13 +29,10 @@ SRCFILE?=	eijiro52.txt
 
 # For eijiro included in a book sold by ALC Inc.
 # (http://www.alc.co.jp/alcshop/eng/eijiro/)
-.include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500801
-JCODE=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm
-.else
 JCODE=	${SITE_PERL}/Jcode.pm
-.endif
+
+.include <bsd.port.pre.mk>
 
 DICT_ARCHIVE!=	${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE}
 .if exists(${DICT_ARCHIVE})
diff --git a/japanese/kcode/Makefile b/japanese/kcode/Makefile
index cb94ca119966..3c3c029e9f1e 100644
--- a/japanese/kcode/Makefile
+++ b/japanese/kcode/Makefile
@@ -24,13 +24,7 @@ MANLANG=	ja
 MAN1=		kcode.1
 MANCOMPRESSED=	no
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
-.else
 RUN_DEPENDS=	${SITE_PERL}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
-.endif
 
 do-extract:
 	${MKDIR} ${WRKSRC}
@@ -41,4 +35,4 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/kcode ${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/kcode.1 ${MAN1PREFIX}/man/ja/man1/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/mypaedia-fpw/Makefile b/japanese/mypaedia-fpw/Makefile
index b6c96442a4c7..a1317be5b45c 100644
--- a/japanese/mypaedia-fpw/Makefile
+++ b/japanese/mypaedia-fpw/Makefile
@@ -56,12 +56,6 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500801
-JCODE=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm
-.else
 JCODE=	${SITE_PERL}/Jcode.pm
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/otojiro-fpw/Makefile b/japanese/otojiro-fpw/Makefile
index 9360acb7c246..4365800a6afd 100644
--- a/japanese/otojiro-fpw/Makefile
+++ b/japanese/otojiro-fpw/Makefile
@@ -32,11 +32,7 @@ SRCFILE?=	otojiro.txt
 # (http://www.alc.co.jp/alcshop/eng/eijiro/)
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500801
-JCODE=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm
-.else
 JCODE=	${SITE_PERL}/Jcode.pm
-.endif
 
 DICT_ARCHIVE!=	${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE}
 .if exists(${DICT_ARCHIVE})
diff --git a/japanese/p5-Encode-EUCJPMS/Makefile b/japanese/p5-Encode-EUCJPMS/Makefile
index 333eb82b8d19..d5761eee1810 100644
--- a/japanese/p5-Encode-EUCJPMS/Makefile
+++ b/japanese/p5-Encode-EUCJPMS/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	0.07
 PORTREVISION=	1
 CATEGORIES=	japanese converters perl5
 MASTER_SITES=	CPAN
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Perl5 module defining Microsoft compatible encodings for Japanese
@@ -19,13 +20,4 @@ PERL_CONFIGURE=	yes
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
-
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Encode.pm:${PORTSDIR}/converters/p5-Encode
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Encode.pm:${PORTSDIR}/converters/p5-Encode
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/p5-Jcode/Makefile b/japanese/p5-Jcode/Makefile
index c3a9eabeace5..3a4b632ca58e 100644
--- a/japanese/p5-Jcode/Makefile
+++ b/japanese/p5-Jcode/Makefile
@@ -17,17 +17,5 @@ PERL_CONFIGURE=	yes
 MAN3=		Jcode.3 Jcode::Nihongo.3
 
 .include <bsd.port.pre.mk>
-
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
-
-.if ${PERL_LEVEL} < 500801
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
-MAN3+=		Jcode::Unicode.3 Jcode::Unicode::Constants.3 \
-		Jcode::Unicode::NoXS.3
-PLIST_SUB+=	WRAPPER="@comment " REALMOD=""
-.else
-PLIST_SUB+=	WRAPPER="" REALMOD="@comment "
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/japanese/p5-Jcode/pkg-plist b/japanese/p5-Jcode/pkg-plist
index 34d9641de759..d6876492fc15 100644
--- a/japanese/p5-Jcode/pkg-plist
+++ b/japanese/p5-Jcode/pkg-plist
@@ -1,19 +1,5 @@
-%%WRAPPER%%%%SITE_PERL%%/Jcode.pm
-%%WRAPPER%%%%SITE_PERL%%/Jcode/Nihongo.pod
-%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode.pm
-%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Constants.pm
-%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/H2Z.pm
-%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Nihongo.pod
-%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Tr.pm
-%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode.pm
-%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode/Constants.pm
-%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode/NoXS.pm
-%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/_Classic.pm
+%%SITE_PERL%%/Jcode.pm
+%%SITE_PERL%%/Jcode/Nihongo.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/.packlist
-%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/Unicode/Unicode.bs
-%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/Unicode/Unicode.so
-%%REALMOD%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode
-%%REALMOD%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Jcode
-%%REALMOD%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/Unicode
-%%WRAPPER%%@dirrm %%SITE_PERL%%/Jcode
+@dirrm %%SITE_PERL%%/Jcode
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode
diff --git a/japanese/p5-Lingua-JA-Regular-Unicode/Makefile b/japanese/p5-Lingua-JA-Regular-Unicode/Makefile
index 7439837bc493..de6d38dd37f6 100644
--- a/japanese/p5-Lingua-JA-Regular-Unicode/Makefile
+++ b/japanese/p5-Lingua-JA-Regular-Unicode/Makefile
@@ -9,23 +9,15 @@ PORTNAME=	Lingua-JA-Regular-Unicode
 PORTVERSION=	0.03
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to convert Japanese chars
 
-#RUN_DEPENDS=
 BUILD_DEPENDS=	p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
 
 PERL_CONFIGURE=	yes
 
 MAN3=	Lingua::JA::Regular::Unicode.3
 
-.include <bsd.port.pre.mk>
-
-PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
-
-.if ${PERL_LEVEL} < 500801
-IGNORE=		older perl not supported
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/p5-Mail-SpamAssassin/Makefile b/japanese/p5-Mail-SpamAssassin/Makefile
index 3297d65d5a84..71c2ec32f44b 100644
--- a/japanese/p5-Mail-SpamAssassin/Makefile
+++ b/japanese/p5-Mail-SpamAssassin/Makefile
@@ -292,9 +292,4 @@ post-install:
 .endif
 	@${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE}
 
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
-		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/japanese/srd-fpw/Makefile b/japanese/srd-fpw/Makefile
index c6b5f979ec9f..86d33263310c 100644
--- a/japanese/srd-fpw/Makefile
+++ b/japanese/srd-fpw/Makefile
@@ -60,12 +60,6 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500801
-JCODE=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm
-.else
 JCODE=	${SITE_PERL}/Jcode.pm
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/waeijiro-fpw/Makefile b/japanese/waeijiro-fpw/Makefile
index 277f1b5c33f6..a48c0beb77c0 100644
--- a/japanese/waeijiro-fpw/Makefile
+++ b/japanese/waeijiro-fpw/Makefile
@@ -29,14 +29,9 @@ SRCFILE?=	waeiji52.txt
 
 # For eijiro included in a book sold by ALC Inc.
 # (http://www.alc.co.jp/alcshop/eng/eijiro/)
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500801
-JCODE=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm
-.else
 JCODE=	${SITE_PERL}/Jcode.pm
-.endif
 
+.include <bsd.port.pre.mk>
 DICT_ARCHIVE!=	${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE}
 .if exists(${DICT_ARCHIVE})
 EXTRACT_DEPENDS+=	lha:${PORTSDIR}/archivers/lha
diff --git a/japanese/wikicker/Makefile b/japanese/wikicker/Makefile
index df02c4978e59..876384d82515 100644
--- a/japanese/wikicker/Makefile
+++ b/japanese/wikicker/Makefile
@@ -34,13 +34,6 @@ RUN_DEPENDS+=		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
 			${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
 			${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=		${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext \
-			${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
-.endif
-
 .if defined(WITH_WIKICKER_RECENTLOG)
 RUN_DEPENDS+=		${SITE_PERL}/${PERL_ARCH}/IPC/ShareLite.pm:${PORTSDIR}/devel/p5-IPC-ShareLite
 .endif
@@ -52,11 +45,7 @@ RUN_DEPENDS+=		${SITE_PERL}/DB_File/Lock.pm:${PORTSDIR}/devel/p5-DB_File-Lock
 RUN_DEPENDS+=		${SITE_PERL}/Cache/Memcached.pm:${PORTSDIR}/databases/p5-Cache-Memcached
 .endif
 
-.if ${PERL_LEVEL} < 500801
-JCODE=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm
-.else
 JCODE=	${SITE_PERL}/Jcode.pm
-.endif
 
 PKGMESSAGE=		${WRKDIR}/pkg-message
 WIKIAUTO=		${SITE_PERL}/auto/${PORTNAME}
@@ -106,4 +95,4 @@ post-install:
 		-e 's|%%HostName%%|${HOST}|' < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>