18 files changed, 48 insertions, 76 deletions

diff --git a/astro/wmspaceweather/Makefile b/astro/wmspaceweather/Makefile
index b30ff720ef77..fadb387a990f 100644
--- a/astro/wmspaceweather/Makefile
+++ b/astro/wmspaceweather/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A DockApp that shows the weather at geosynchronous orbit
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${SITE_PERL}/Time/CTime.pm:${PORTSDIR}/devel/p5-Time-modules
+RUN_DEPENDS=	p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmSpaceWeather
 
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index d5e88d2bcc65..b41121f6e39f 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -14,10 +14,8 @@ PKGNAMESUFFIX=	2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Full-text search system intended for easy use
 
-BUILD_DEPENDS=	${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
-RUN_DEPENDS=	${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
-
-PM_BASE=	${SITE_PERL}
+BUILD_DEPENDS=	p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic
+RUN_DEPENDS=	p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic
 
 USE_PERL5=	yes
 USE_ICONV=	yes
diff --git a/devel/p5-Carp-Datum/Makefile b/devel/p5-Carp-Datum/Makefile
index 143da50658e4..594106c3bc89 100644
--- a/devel/p5-Carp-Datum/Makefile
+++ b/devel/p5-Carp-Datum/Makefile
@@ -14,12 +14,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Debugging And Tracing Ultimate Module
 
-BUILD_DEPENDS=	${PM_BASE}/Log/Agent.pm:${PORTSDIR}/devel/p5-Log-Agent \
-		${PM_BASE}/Getargs/Long.pm:${PORTSDIR}/devel/p5-Getargs-Long
+BUILD_DEPENDS=	p5-Log-Agent>=0:${PORTSDIR}/devel/p5-Log-Agent \
+		p5-Getargs-Long>=0:${PORTSDIR}/devel/p5-Getargs-Long
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-PM_BASE=	${SITE_PERL}
 
 MAN1=		datum_strip.1
 MAN3=		Carp::Datum::Assert.3 \
diff --git a/graphics/p5-Imager-AverageGray/Makefile b/graphics/p5-Imager-AverageGray/Makefile
index 8c360e550207..8120fb099a94 100644
--- a/graphics/p5-Imager-AverageGray/Makefile
+++ b/graphics/p5-Imager-AverageGray/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Finds the average gray for a Imager object or image
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Imager.pm:${PORTSDIR}/graphics/p5-Imager/
+RUN_DEPENDS=	p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager/
 
 PERL_CONFIGURE=	yes
 
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}
diff --git a/mail/websieve/Makefile b/mail/websieve/Makefile
index c3c9c8f0eec9..9138039ea37c 100644
--- a/mail/websieve/Makefile
+++ b/mail/websieve/Makefile
@@ -34,19 +34,17 @@ CYRUS_IMAPD_24_DESC=	With Cyrus IMAPd version 2.4.x
 
 .include <bsd.port.options.mk>
 
-CYRUS_IMAP_PM=	${SITE_PERL}/${PERL_ARCH}/Cyrus/IMAP/Admin.pm
-
 .if ${PORT_OPTIONS:MCYRUS_IMAPD_24}
-RUN_DEPENDS+=	${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd24
+RUN_DEPENDS+=	cyrus-imapd>=0:${PORTSDIR}/mail/cyrus-imapd24
 FUNCLIB_PL=	funclib.cyrus
 .elif ${PORT_OPTIONS:MCYRUS_IMAPD_23}
-RUN_DEPENDS+=	${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd23
+RUN_DEPENDS+=	cyrus-imapd>=0:${PORTSDIR}/mail/cyrus-imapd23
 FUNCLIB_PL=	funclib.cyrus
 .elif ${PORT_OPTIONS:MCYRUS_IMAPD_22}
-RUN_DEPENDS+=	${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd22
+RUN_DEPENDS+=	cyrus-imapd>=0:${PORTSDIR}/mail/cyrus-imapd22
 FUNCLIB_PL=	funclib.cyrus
 .elif ${PORT_OPTIONS:MCYRUS_IMAPD_21}
-RUN_DEPENDS+=	${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd2
+RUN_DEPENDS+=	cyrus-imapd>=0:${PORTSDIR}/mail/cyrus-imapd2
 FUNCLIB_PL=	funclib.cyrus
 .else
 RUN_DEPENDS+=	p5-IMAP-Admin>=0:${PORTSDIR}/mail/p5-IMAP-Admin \
diff --git a/net-mgmt/p5-Net-SNMP/Makefile b/net-mgmt/p5-Net-SNMP/Makefile
index 8a2712cc6c0e..7feb9297b642 100644
--- a/net-mgmt/p5-Net-SNMP/Makefile
+++ b/net-mgmt/p5-Net-SNMP/Makefile
@@ -16,13 +16,12 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Object oriented interface to SNMP
 
-BUILD_DEPENDS=	${ARCH_PERL}/Crypt/DES.pm:${PORTSDIR}/security/p5-Crypt-DES \
-		${ARCH_PERL}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
+BUILD_DEPENDS=	p5-Crypt-DES>=0:${PORTSDIR}/security/p5-Crypt-DES \
+		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
 		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-ARCH_PERL=	${SITE_PERL}/${PERL_ARCH}
 CONFLICTS=	p5-Net-SNMP3-[0-9]*
 
 MAN1=		snmpkey.1
diff --git a/security/p5-Crypt-Primes/Makefile b/security/p5-Crypt-Primes/Makefile
index 4d5a69fa9faf..49da15fbc54d 100644
--- a/security/p5-Crypt-Primes/Makefile
+++ b/security/p5-Crypt-Primes/Makefile
@@ -14,10 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provable Prime Number Generator suitable for Cryptographic Applications
 
-PERLBASE=	${SITE_PERL}
-
-BUILD_DEPENDS=	${PERLBASE}/Crypt/Random.pm:${PORTSDIR}/security/p5-Crypt-Random \
-		${PERLBASE}/${PERL_ARCH}/Math/Pari.pm:${PORTSDIR}/math/p5-Math-Pari
+BUILD_DEPENDS=	p5-Crypt-Random>=0:${PORTSDIR}/security/p5-Crypt-Random \
+		p5-Math-Pari>=0:${PORTSDIR}/math/p5-Math-Pari
 
 PERL_CONFIGURE=	yes
 
diff --git a/sysutils/psgconf/Makefile b/sysutils/psgconf/Makefile
index c848984f75b9..111f134d627b 100644
--- a/sysutils/psgconf/Makefile
+++ b/sysutils/psgconf/Makefile
@@ -14,14 +14,14 @@ MASTER_SITES=	ftp://ftp-dev.cites.uiuc.edu/pub/psgconf/
 MAINTAINER=	pirzyk@FreeBSD.org
 COMMENT=	Controls system configuration
 
-BUILD_DEPENDS=	${SITE_PERL}/Config/Objective.pm:${PORTSDIR}/devel/p5-Config-Objective \
- 	${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
- 	p5-NetAddr-IP>0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
-	${SITE_PERL}/${PERL_ARCH}/Proc/ProcessTable/Process.pm:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-	${SITE_PERL}/${PERL_ARCH}/Unix/Mknod.pm:${PORTSDIR}/sysutils/p5-Unix-Mknod \
-	${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog \
-	${SITE_PERL}/${PERL_ARCH}/version.pm:${PORTSDIR}/devel/p5-version \
-	${SITE_PERL}/Text/Diff.pm:${PORTSDIR}/textproc/p5-Text-Diff
+BUILD_DEPENDS=	p5-Config-Objective>=0:${PORTSDIR}/devel/p5-Config-Objective \
+ 	p5-AppConfig>=0:${PORTSDIR}/devel/p5-AppConfig \
+ 	p5-NetAddr-IP>=0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
+	p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable \
+	Unix-Mknod>=0:${PORTSDIR}/sysutils/p5-Unix-Mknod \
+	p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog \
+	p5-version>=0:${PORTSDIR}/devel/p5-version \
+	p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	YES
diff --git a/textproc/ruby-xmlparser/Makefile b/textproc/ruby-xmlparser/Makefile
index 150415ea03ba..b8ca6020d7d9 100644
--- a/textproc/ruby-xmlparser/Makefile
+++ b/textproc/ruby-xmlparser/Makefile
@@ -15,20 +15,18 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby module to access James Clark XML Parser ToolKit ("expat")
 
-BUILD_DEPENDS=	${PERL_ARCHLIB}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv \
-		${PERL_ARCHLIB}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 # to utilize encoding maps included in p5-XML-Parser
 
 USE_PERL5=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
-PERL_ARCHLIB=	${SITE_PERL}/${PERL_ARCH}
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
-CONFIGURE_ARGS=	--with-perl-enc-map=${PERL_ARCHLIB}/XML/Parser/Encodings
+CONFIGURE_ARGS=	--with-perl-enc-map=${SITE_PERL}/${PERL_ARCH}/XML/Parser/Encodings
 INSTALL_TARGET=	site-install
 
 post-extract:
diff --git a/www/bins/Makefile b/www/bins/Makefile
index 1fee21843034..1efef64fcfc1 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -15,28 +15,25 @@ MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Tool to generate HTML photo albums with XML support
 
 RUN_DEPENDS=	\
-	${PBASE}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-	${PBASE}/${PERL_ARCH}/Image/Magick.pm:${PORTSDIR}/graphics/ImageMagick \
-	${PBASE}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \
-	${PBASE}/${PERL_ARCH}/Text/Unaccent.pm:${PORTSDIR}/textproc/p5-Text-Unaccent \
-	${PBASE}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
-	${PBASE}/HTML/Clean.pm:${PORTSDIR}/www/p5-HTML-Clean \
-	${PBASE}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
-	${PBASE}/IO/String.pm:${PORTSDIR}/devel/p5-IO-String \
-	${PBASE}/Image/Info.pm:${PORTSDIR}/graphics/p5-Image-Info \
-	${PBASE}/Image/Size.pm:${PORTSDIR}/graphics/p5-Image-Size \
-	${PBASE}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
-	${PBASE}/XML/Grove.pm:${PORTSDIR}/textproc/p5-XML-Grove \
-	${PBASE}/XML/Handler/YAWriter.pm:${PORTSDIR}/textproc/p5-XML-Handler-YAWriter \
-	${PBASE}/XML/Parser/PerlSAX.pm:${PORTSDIR}/textproc/p5-libxml
+	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+	convert:${PORTSDIR}/graphics/ImageMagick \
+	p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv \
+	p5-Text-Iconv>=0:${PORTSDIR}/textproc/p5-Text-Unaccent \
+	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
+	p5-HTML-Clean>0:${PORTSDIR}/www/p5-HTML-Clean \
+	p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
+	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
+	p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info \
+	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
+	p5-URI>=0:${PORTSDIR}/net/p5-URI \
+	p5-XML-Grove>=0:${PORTSDIR}/textproc/p5-XML-Grove \
+	p5-XML-Handler-YAWriter>=0:${PORTSDIR}/textproc/p5-XML-Handler-YAWriter \
+	p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml
 
 USE_BZIP2=	yes
 USE_PERL5_RUN=	yes
 NO_BUILD=	yes
 
-# perlbase
-PBASE=	${SITE_PERL}
-
 # additional scripts
 BINS_SCRIPTS=	tools/bins_txt2xml
 # doc file extension
@@ -84,8 +81,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-install.sh
 
 # localization support
 .if defined(WITH_I18N)
-RUN_DEPENDS+=	\
-	${PBASE}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext
+RUN_DEPENDS+=	p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
 .endif
 
 pre-everything::
diff --git a/www/fswiki/Makefile b/www/fswiki/Makefile
index 326dddad0b32..6e1b612628f8 100644
--- a/www/fswiki/Makefile
+++ b/www/fswiki/Makefile
@@ -15,15 +15,13 @@ DISTNAME=	wiki${PORTVERSION:S|.|_|g}
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	FreeStyle Wiki (perl based wiki clone)
 
-RUN_DEPENDS=	${JCODE}:${PORTSDIR}/japanese/p5-Jcode \
+RUN_DEPENDS=	ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode \
 	p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template
 
 USE_ZIP=	yes
 USE_PERL5=	yes
 NO_BUILD=	yes
 
-JCODE=	${SITE_PERL}/Jcode.pm
-
 post-extract:
 	${SED} -e 's|__DATADIR__|${DATADIR}|' ${FILESDIR}/setup.sh \
 		>${WRKSRC}/setup.sh