6 files changed, 20 insertions, 22 deletions

diff --git a/russian/p5-Lingua-RU-Charset/Makefile b/russian/p5-Lingua-RU-Charset/Makefile
index c66c4483f532..91ac48879466 100644
--- a/russian/p5-Lingua-RU-Charset/Makefile
+++ b/russian/p5-Lingua-RU-Charset/Makefile
@@ -18,6 +18,5 @@ COMMENT=	Perl extension for detecting and converting various russian character s
 PERL_CONFIGURE=	YES
 
 MAN3=		Lingua::RU::Charset.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/russian/p5-Lingua-RU-Charset/pkg-plist b/russian/p5-Lingua-RU-Charset/pkg-plist
index 281ed04f7b4c..f91b2535e624 100644
--- a/russian/p5-Lingua-RU-Charset/pkg-plist
+++ b/russian/p5-Lingua-RU-Charset/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Lingua/RU/Charset.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/RU/Charset/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/RU/Charset
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua/RU 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Lingua 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua/RU 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+%%SITE_PERL%%/Lingua/RU/Charset.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/RU/Charset/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/RU/Charset
+@unexec rmdir %D/%%SITE_PERL%%/Lingua/RU 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/RU 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
diff --git a/russian/p5-XML-Parser-encodings/Makefile b/russian/p5-XML-Parser-encodings/Makefile
index 80f1961fb230..c9750b84897f 100644
--- a/russian/p5-XML-Parser-encodings/Makefile
+++ b/russian/p5-XML-Parser-encodings/Makefile
@@ -14,9 +14,9 @@ DISTFILES=
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Additional russian encodings for XML::Parser
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 BUILD_DEPENDS=	${RUN_DEPENDS} \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Encoding.pm:${PORTSDIR}/textproc/p5-XML-Encoding \
+		${SITE_PERL}/XML/Encoding.pm:${PORTSDIR}/textproc/p5-XML-Encoding \
 		${NONEXISTENT}:${PORTSDIR}/converters/iconv:extract \
 		${NONEXISTENT}:${PORTSDIR}/converters/iconv-extra:extract
 
diff --git a/russian/p5-XML-Parser-encodings/pkg-plist b/russian/p5-XML-Parser-encodings/pkg-plist
index e69027e39cbe..53fa70993e8e 100644
--- a/russian/p5-XML-Parser-encodings/pkg-plist
+++ b/russian/p5-XML-Parser-encodings/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/cp1251.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/cp866.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/mac-cyrillic.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/koi8-r.enc
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings/windows-1251.enc
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser/Encodings 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML/Parser 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/cp1251.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/cp866.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/mac-cyrillic.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/koi8-r.enc
+%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/windows-1251.enc
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
diff --git a/russian/p5-cyrillic/Makefile b/russian/p5-cyrillic/Makefile
index e1292689d7b9..1c26eb1555cb 100644
--- a/russian/p5-cyrillic/Makefile
+++ b/russian/p5-cyrillic/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Library for fast and easy cyrillic text manipulation
 
 PERL_CONFIGURE=	yes
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=	cyrillic.3
 
 .include <bsd.port.mk>
diff --git a/russian/p5-cyrillic/pkg-plist b/russian/p5-cyrillic/pkg-plist
index 9afe94f8470f..1b83ceaa04aa 100644
--- a/russian/p5-cyrillic/pkg-plist
+++ b/russian/p5-cyrillic/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/%%PERL_VER%%/cyrillic.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/cyrillic/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/cyrillic
+%%SITE_PERL%%/cyrillic.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/cyrillic/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/cyrillic