- Remove SITE_PERL from *_DEPENDS (final part)

Approved by: portmgr@ (bapt@)

7 files changed, 7 insertions, 19 deletions

diff --git a/japanese/another-htmllint/Makefile b/japanese/another-htmllint/Makefile
index f0a8d7b41b1c..4821b9b32706 100644
--- a/japanese/another-htmllint/Makefile
+++ b/japanese/another-htmllint/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Another HTML-lint (all messages are written in Japanese)
 
 RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		${JCODE}:${PORTSDIR}/japanese/p5-Jcode
+		ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode
 
 USE_PERL5=	YES
 USE_ZIP=	YES
@@ -51,6 +51,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-JCODE=	${SITE_PERL}/Jcode.pm
-
 .include <bsd.port.mk>
diff --git a/japanese/eijiro-fpw/Makefile b/japanese/eijiro-fpw/Makefile
index bd4c46dafb1a..0b7b0a499780 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 \
-		${JCODE}:${PORTSDIR}/japanese/p5-Jcode
+		ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode
 
 MANUAL_PACKAGE_BUILD=Needs data from CDROM
 RESTRICTED=	"The original dictionary is not free"
@@ -30,8 +30,6 @@ SRCFILE?=	eijiro52.txt
 # For eijiro included in a book sold by ALC Inc.
 # (http://www.alc.co.jp/alcshop/eng/eijiro/)
 
-JCODE=	${SITE_PERL}/Jcode.pm
-
 .include <bsd.port.pre.mk>
 
 DICT_ARCHIVE!=	${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE}
diff --git a/japanese/mypaedia-fpw/Makefile b/japanese/mypaedia-fpw/Makefile
index a1317be5b45c..c8736b56e601 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 \
-		${JCODE}:${PORTSDIR}/japanese/p5-Jcode
+		ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode
 
 IS_INTERACTIVE= YES
 RESTRICTED=	"The original dictionary is not free"
@@ -56,6 +56,4 @@ do-install:
 .endfor
 .endif
 
-JCODE=	${SITE_PERL}/Jcode.pm
-
 .include <bsd.port.mk>
diff --git a/japanese/namazu2/Makefile b/japanese/namazu2/Makefile
index dba5a78b5d1b..2db9a5482b14 100644
--- a/japanese/namazu2/Makefile
+++ b/japanese/namazu2/Makefile
@@ -17,9 +17,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Meta-port of Namazu and Japanese support modules
 
 LIB_DEPENDS=	nmz.8:${PORTSDIR}/databases/namazu2
-RUN_DEPENDS=	${PM_BASE}/${PERL_ARCH}/NKF.pm:${PORTSDIR}/japanese/p5-nkf
+RUN_DEPENDS=	ja-p5-nkf>=0:${PORTSDIR}/japanese/p5-nkf
 
-PM_BASE=	${SITE_PERL}
 PLIST=		"@comment this plist is intentionally left empty"
 
 .if defined(WITH_CHASEN)
diff --git a/japanese/otojiro-fpw/Makefile b/japanese/otojiro-fpw/Makefile
index 3177723bd4a9..12c33704c0dd 100644
--- a/japanese/otojiro-fpw/Makefile
+++ b/japanese/otojiro-fpw/Makefile
@@ -21,7 +21,7 @@ EXPIRATION_DATE=	2012-10-20
 
 EXTRACT_DEPENDS=${LOCALBASE}/share/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing
 BUILD_DEPENDS=	${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \
-		${JCODE}:${PORTSDIR}/japanese/p5-Jcode
+		ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode
 
 MANUAL_PACKAGE_BUILD=Needs data from CDROM
 RESTRICTED=	"The original dictionary is not free"
@@ -35,8 +35,6 @@ SRCFILE?=	otojiro.txt
 # (http://www.alc.co.jp/alcshop/eng/eijiro/)
 .include <bsd.port.pre.mk>
 
-JCODE=	${SITE_PERL}/Jcode.pm
-
 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 86d33263310c..8db5ed52e7d1 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 \
-		${JCODE}:${PORTSDIR}/japanese/p5-Jcode
+		ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode
 
 IS_INTERACTIVE= YES
 RESTRICTED=	"The original dictionary is not free"
@@ -60,6 +60,4 @@ do-install:
 .endfor
 .endif
 
-JCODE=	${SITE_PERL}/Jcode.pm
-
 .include <bsd.port.mk>
diff --git a/japanese/waeijiro-fpw/Makefile b/japanese/waeijiro-fpw/Makefile
index a48c0beb77c0..3cd3e719f206 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 \
-		${JCODE}:${PORTSDIR}/japanese/p5-Jcode
+		ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode
 
 MANUAL_PACKAGE_BUILD=Needs data from a CDROM
 RESTRICTED=	"The original dictionary is not free"
@@ -29,7 +29,6 @@ SRCFILE?=	waeiji52.txt
 
 # For eijiro included in a book sold by ALC Inc.
 # (http://www.alc.co.jp/alcshop/eng/eijiro/)
-JCODE=	${SITE_PERL}/Jcode.pm
 
 .include <bsd.port.pre.mk>
 DICT_ARCHIVE!=	${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE}