6 files changed, 46 insertions, 7 deletions

diff --git a/japanese/eijiro-fpw/Makefile b/japanese/eijiro-fpw/Makefile
index fb35842a3f47..c22b2c45381f 100644
--- a/japanese/eijiro-fpw/Makefile
+++ b/japanese/eijiro-fpw/Makefile
@@ -17,7 +17,7 @@ COMMENT=	EIJIRO English - Japanese Dictionary (EPWING V1 format)
 
 EXTRACT_DEPENDS=${LOCALBASE}/share/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing
 BUILD_DEPENDS=	${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \
-		${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+		${JCODE}:${PORTSDIR}/japanese/p5-Jcode
 
 RESTRICTED=	"The original dictionary is not free"
 NO_PACKAGE=	"The original dictionary is not free"
@@ -29,6 +29,13 @@ 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
+
 DICT_ARCHIVE!=	${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE}
 .if exists(${DICT_ARCHIVE})
 EXTRACT_DEPENDS+=	lha:${PORTSDIR}/archivers/lha
diff --git a/japanese/kcode/Makefile b/japanese/kcode/Makefile
index 84c6219d2a07..612b6528f699 100644
--- a/japanese/kcode/Makefile
+++ b/japanese/kcode/Makefile
@@ -32,6 +32,8 @@ MANCOMPRESSED=	no
 IGNORE=		This port requires perl 5.6.0 or later
 .elif ${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:
diff --git a/japanese/mypaedia-fpw/Makefile b/japanese/mypaedia-fpw/Makefile
index 50e45af07e96..7ca91d3b1fe2 100644
--- a/japanese/mypaedia-fpw/Makefile
+++ b/japanese/mypaedia-fpw/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An encyclopedia  "Mypaedia" (EPWING V1 format)
 
 BUILD_DEPENDS=	fpwmake:${PORTSDIR}/japanese/freepwing \
-		${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+		${JCODE}:${PORTSDIR}/japanese/p5-Jcode
 
 IS_INTERACTIVE= YES
 RESTRICTED=	"The original dictionary is not free"
@@ -55,4 +55,12 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.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>
diff --git a/japanese/otojiro-fpw/Makefile b/japanese/otojiro-fpw/Makefile
index 93303b4dd3fc..f05c86c3dd00 100644
--- a/japanese/otojiro-fpw/Makefile
+++ b/japanese/otojiro-fpw/Makefile
@@ -18,7 +18,7 @@ COMMENT=	OTOJIRO English - Japanese Dictionary (EPWING V1 format)
 
 EXTRACT_DEPENDS=${LOCALBASE}/share/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing
 BUILD_DEPENDS=	${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \
-		${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+		${JCODE}:${PORTSDIR}/japanese/p5-Jcode
 
 RESTRICTED=	"The original dictionary is not free"
 NO_PACKAGE=	"The original dictionary is not free"
@@ -31,6 +31,13 @@ SRCFILE?=	otojiro.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
+
 DICT_ARCHIVE!=	${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE}
 .if exists(${DICT_ARCHIVE})
 EXTRACT_DEPENDS+=	lha:${PORTSDIR}/archivers/lha
diff --git a/japanese/srd-fpw/Makefile b/japanese/srd-fpw/Makefile
index 8ba4d468a858..9ef4313fe34f 100644
--- a/japanese/srd-fpw/Makefile
+++ b/japanese/srd-fpw/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A English - Japanese Dictionary "Random House" (EPWING V1 format)
 
 BUILD_DEPENDS=	fpwmake:${PORTSDIR}/japanese/freepwing \
-		${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+		${JCODE}:${PORTSDIR}/japanese/p5-Jcode
 
 IS_INTERACTIVE= YES
 RESTRICTED=	"The original dictionary is not free"
@@ -59,4 +59,12 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.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>
diff --git a/japanese/waeijiro-fpw/Makefile b/japanese/waeijiro-fpw/Makefile
index 91159a5d684a..1994b70fa7e6 100644
--- a/japanese/waeijiro-fpw/Makefile
+++ b/japanese/waeijiro-fpw/Makefile
@@ -18,7 +18,7 @@ COMMENT=	WAEIJIRO English - Japanese Dictionary (EPWING V1 format)
 
 EXTRACT_DEPENDS=${LOCALBASE}/share/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing
 BUILD_DEPENDS=	${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \
-		${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+		${JCODE}:${PORTSDIR}/japanese/p5-Jcode
 
 RESTRICTED=	"The original dictionary is not free"
 NO_PACKAGE=	"The original dictionary is not free"
@@ -29,6 +29,13 @@ 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
+
 DICT_ARCHIVE!=	${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE}
 .if exists(${DICT_ARCHIVE})
 EXTRACT_DEPENDS+=	lha:${PORTSDIR}/archivers/lha