18 files changed, 204 insertions, 207 deletions

diff --git a/converters/p5-Boulder/Makefile b/converters/p5-Boulder/Makefile
index ed59fad2f438..05f73568a2e6 100644
--- a/converters/p5-Boulder/Makefile
+++ b/converters/p5-Boulder/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	An API for hierarchical tag/value structures
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	YES
diff --git a/converters/p5-Boulder/pkg-plist b/converters/p5-Boulder/pkg-plist
index 7ab07ada196d..5c36d96ceae1 100644
--- a/converters/p5-Boulder/pkg-plist
+++ b/converters/p5-Boulder/pkg-plist
@@ -1,23 +1,23 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Boulder/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Stone/Cursor.pm
-lib/perl5/site_perl/%%PERL_VER%%/Stone/GB_Sequence.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Swissprot.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Medline.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Blast/NCBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Blast/WU.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Labbase.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/LocusLink.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Unigene.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Stream.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Store.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/XML.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Omim.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Blast.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/Genbank.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder/String.pm
-lib/perl5/site_perl/%%PERL_VER%%/Stone.pm
-lib/perl5/site_perl/%%PERL_VER%%/Boulder.pod
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Boulder
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Boulder/Blast
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Boulder
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Stone
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Boulder/.packlist
+%%SITE_PERL%%/Stone/Cursor.pm
+%%SITE_PERL%%/Stone/GB_Sequence.pm
+%%SITE_PERL%%/Boulder/Swissprot.pm
+%%SITE_PERL%%/Boulder/Medline.pm
+%%SITE_PERL%%/Boulder/Blast/NCBI.pm
+%%SITE_PERL%%/Boulder/Blast/WU.pm
+%%SITE_PERL%%/Boulder/Labbase.pm
+%%SITE_PERL%%/Boulder/LocusLink.pm
+%%SITE_PERL%%/Boulder/Unigene.pm
+%%SITE_PERL%%/Boulder/Stream.pm
+%%SITE_PERL%%/Boulder/Store.pm
+%%SITE_PERL%%/Boulder/XML.pm
+%%SITE_PERL%%/Boulder/Omim.pm
+%%SITE_PERL%%/Boulder/Blast.pm
+%%SITE_PERL%%/Boulder/Genbank.pm
+%%SITE_PERL%%/Boulder/String.pm
+%%SITE_PERL%%/Stone.pm
+%%SITE_PERL%%/Boulder.pod
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Boulder
+@dirrm %%SITE_PERL%%/Boulder/Blast
+@dirrm %%SITE_PERL%%/Boulder
+@dirrm %%SITE_PERL%%/Stone
diff --git a/converters/p5-Convert-ASCII-Armour/Makefile b/converters/p5-Convert-ASCII-Armour/Makefile
index c7f96f199132..6b759091234d 100644
--- a/converters/p5-Convert-ASCII-Armour/Makefile
+++ b/converters/p5-Convert-ASCII-Armour/Makefile
@@ -15,15 +15,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	Convert binary octets into ASCII armoured messages
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Convert::ASCII::Armour.3 Convert::ASCII::Armor.3
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-ASCII-Armour/pkg-plist b/converters/p5-Convert-ASCII-Armour/pkg-plist
index a00ab1134bd3..2b76d5da9256 100644
--- a/converters/p5-Convert-ASCII-Armour/pkg-plist
+++ b/converters/p5-Convert-ASCII-Armour/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/Convert/ASCII/Armor.pm
-lib/perl5/site_perl/%%PERL_VER%%/Convert/ASCII/Armour.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour/.packlist
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/ASCII 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Convert/ASCII 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Convert 2>/dev/null || true
+%%SITE_PERL%%/Convert/ASCII/Armor.pm
+%%SITE_PERL%%/Convert/ASCII/Armour.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Convert/ASCII 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Convert 2>/dev/null || true
diff --git a/converters/p5-Convert-Morse/Makefile b/converters/p5-Convert-Morse/Makefile
index 8c56db260381..dd1460cacc8e 100644
--- a/converters/p5-Convert-Morse/Makefile
+++ b/converters/p5-Convert-Morse/Makefile
@@ -21,10 +21,9 @@ COMMENT=	Perl module to convert between ASCII and Morse codes
 #BROKEN=		"Requires perl 5.6.0"
 .endif
 
-SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL=	${SITE_PERL}
 PERL_CONFIGURE=	yes
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Convert::Morse.3
 
 .include <bsd.port.post.mk>
diff --git a/converters/p5-Convert-Morse/pkg-plist b/converters/p5-Convert-Morse/pkg-plist
index 1f81d57e85a4..d9b58def8734 100644
--- a/converters/p5-Convert-Morse/pkg-plist
+++ b/converters/p5-Convert-Morse/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Convert/Morse.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/Morse/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/Morse
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Convert 2>/dev/null || true
+%%SITE_PERL%%/Convert/Morse.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Morse/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Morse
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Convert 2>/dev/null || true
diff --git a/converters/p5-Convert-PEM/Makefile b/converters/p5-Convert-PEM/Makefile
index a33c1e4c9bd9..9b123bde441c 100644
--- a/converters/p5-Convert-PEM/Makefile
+++ b/converters/p5-Convert-PEM/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mharo@FreeBSD.org
 COMMENT=	Read/write access to ASN.1-encoded PEM files with optional encryption
 
-PERLBASE=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+PERLBASE=	${SITE_PERL}
 BUILD_DEPENDS=	${PERLBASE}/Convert/ASN1.pm:${PORTSDIR}/converters/p5-Convert-ASN1 \
 		${PERLBASE}/${PERL_ARCH}/Crypt/DES.pm:${PORTSDIR}/security/p5-Crypt-DES \
 		${PERLBASE}/Crypt/DES_EDE3.pm:${PORTSDIR}/security/p5-Crypt-DES_EDE3 \
diff --git a/converters/p5-Convert-PEM/pkg-plist b/converters/p5-Convert-PEM/pkg-plist
index 138816e4af5d..2274f6e9f366 100644
--- a/converters/p5-Convert-PEM/pkg-plist
+++ b/converters/p5-Convert-PEM/pkg-plist
@@ -1,7 +1,7 @@
-lib/perl5/site_perl/%%PERL_VER%%/Convert/PEM/CBC.pm
-lib/perl5/site_perl/%%PERL_VER%%/Convert/PEM.pm
-lib/perl5/site_perl/%%PERL_VER%%/Crypt/DES_EDE3.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/PEM/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Convert/PEM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/PEM
+%%SITE_PERL%%/Convert/PEM/CBC.pm
+%%SITE_PERL%%/Convert/PEM.pm
+%%SITE_PERL%%/Crypt/DES_EDE3.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/PEM/.packlist
+@dirrm %%SITE_PERL%%/Convert/PEM
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/PEM
 @unexec rmdir %D/lib/perl5/site_perl/5.005/Crypt || true
diff --git a/converters/p5-Convert-Recode/pkg-plist b/converters/p5-Convert-Recode/pkg-plist
index a2cb90cef97c..ea11e365e1d0 100644
--- a/converters/p5-Convert-Recode/pkg-plist
+++ b/converters/p5-Convert-Recode/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Convert/Recode.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/Recode/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/Recode
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Convert
+%%SITE_PERL%%/Convert/Recode.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Recode/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Recode
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
+@dirrm %%SITE_PERL%%/Convert
diff --git a/converters/p5-Convert-TNEF/Makefile b/converters/p5-Convert-TNEF/Makefile
index 2f2b23e0fb82..83c153767a00 100644
--- a/converters/p5-Convert-TNEF/Makefile
+++ b/converters/p5-Convert-TNEF/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	roman@xpert.com
 COMMENT=	Perl module to read TNEF files
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/Wrap.pm:${PORTSDIR}/devel/p5-IO-stringy \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools
+BUILD_DEPENDS=	${SITE_PERL}/IO/Wrap.pm:${PORTSDIR}/devel/p5-IO-stringy \
+		${SITE_PERL}/MIME/Body.pm:${PORTSDIR}/mail/p5-MIME-Tools
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes	
diff --git a/converters/p5-Convert-TNEF/pkg-plist b/converters/p5-Convert-TNEF/pkg-plist
index 5966b34e5ecf..7b2baea90f21 100644
--- a/converters/p5-Convert-TNEF/pkg-plist
+++ b/converters/p5-Convert-TNEF/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/Convert/TNEF.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/TNEF/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/TNEF
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Convert 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
+%%SITE_PERL%%/Convert/TNEF.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/TNEF/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/TNEF
+@unexec rmdir %D/%%SITE_PERL%%/Convert 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Convert 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
diff --git a/converters/p5-Convert-UU/pkg-plist b/converters/p5-Convert-UU/pkg-plist
index 5c63a348145d..d76e8dd4cb88 100644
--- a/converters/p5-Convert-UU/pkg-plist
+++ b/converters/p5-Convert-UU/pkg-plist
@@ -1,7 +1,7 @@
 bin/puudecode
 bin/puuencode
-lib/perl5/site_perl/%%PERL_VER%%/Convert/UU.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/UU/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Convert
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert/UU
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Convert
+%%SITE_PERL%%/Convert/UU.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/UU/.packlist
+@dirrm %%SITE_PERL%%/Convert
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/UU
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
diff --git a/converters/p5-Text-Iconv/pkg-plist b/converters/p5-Text-Iconv/pkg-plist
index afed950235d8..1fd71d9c3969 100644
--- a/converters/p5-Text-Iconv/pkg-plist
+++ b/converters/p5-Text-Iconv/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text/Iconv.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Iconv/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Iconv/Iconv.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Iconv/Iconv.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Iconv/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text/Iconv
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/Text/Iconv.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/Iconv.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/Iconv.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/autosplit.ix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
diff --git a/converters/p5-Unicode-IMAPUtf7/Makefile b/converters/p5-Unicode-IMAPUtf7/Makefile
index 69bcc00cc25b..1a48c5ad74e6 100644
--- a/converters/p5-Unicode-IMAPUtf7/Makefile
+++ b/converters/p5-Unicode-IMAPUtf7/Makefile
@@ -18,10 +18,9 @@ COMMENT=	Perl extension to deal with IMAP UTF7
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+SITE_PERL=	${SITE_PERL}
 PERL_CONFIGURE=	yes
 
 MAN3=		Unicode::IMAPUtf7.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/converters/p5-Unicode-IMAPUtf7/pkg-plist b/converters/p5-Unicode-IMAPUtf7/pkg-plist
index aee9efb42eb1..a9b413bf1665 100644
--- a/converters/p5-Unicode-IMAPUtf7/pkg-plist
+++ b/converters/p5-Unicode-IMAPUtf7/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/IMAPUtf7/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Unicode/IMAPUtf7.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/Unicode/IMAPUtf7/autosplit.ix
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Unicode/IMAPUtf7 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/IMAPUtf7 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/IMAPUtf7/.packlist
+%%SITE_PERL%%/Unicode/IMAPUtf7.pm
+%%SITE_PERL%%/auto/Unicode/IMAPUtf7/autosplit.ix
+@unexec rmdir %D/%%SITE_PERL%%/auto/Unicode/IMAPUtf7 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/auto/Unicode 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Unicode 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/IMAPUtf7 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
diff --git a/converters/p5-Unicode-Map/pkg-plist b/converters/p5-Unicode-Map/pkg-plist
index de6a6eb2680d..96cbfb4db2fe 100644
--- a/converters/p5-Unicode-Map/pkg-plist
+++ b/converters/p5-Unicode-Map/pkg-plist
@@ -2,115 +2,115 @@ bin/mirrorMappings
 bin/mkmapfile
 bin/map
 bin/mkCSGB2312
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/STDENC.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/SYMBOL.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/ZDINGBAT.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ARABIC.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CENTEURO.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CHINSIMP.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CHINTRAD.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CROATIAN.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CYRILLIC.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/DEVANAGA.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/DINGBATS.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/GREEK.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/GUJARATI.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/GURMUKHI.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/HEBREW.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ICELAND.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/JAPANESE.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/KOREAN.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ROMAN.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ROMANIAN.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/SYMBOL.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/THAI.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE/TURKISH.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/BIG5.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/CNS-11643-1986.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/EUC-JP.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/EUC-KR.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/GB12345-80.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/GB2312-80.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/GB2312.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0201.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0208.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0212.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JOHAB.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/KSC1001.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/KSC5601-1992.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/SHIFTJIS.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/IBM/IBM038.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-1.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-10.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-13.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-14.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-15.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-2.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-3.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-4.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-5.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-6.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-7.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-8.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-9.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO/ISO646-US.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP437.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP737.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP775.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP850.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP852.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP855.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP857.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP860.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP861.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP862.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP863.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP864.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP865.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP866.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP869.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP874.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP037.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP1026.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP500.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP875.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/CYRILLIC.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/GREEK.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/ICELAND.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/LATIN2.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/ROMAN.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/TURKISH.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1250.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1251.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1252.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1253.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1254.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1255.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1256.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1257.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1258.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP932.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP936.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP949.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP950.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/NEXT/NEXTSTEP.map
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/REGISTRY
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Map/Map.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Map/Map.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Map/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ADOBE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/APPLE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/IBM
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/ISO
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/MS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map/NEXT
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/Map
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Map
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/STDENC.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/SYMBOL.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ADOBE/ZDINGBAT.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ARABIC.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CENTEURO.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CHINSIMP.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CHINTRAD.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CROATIAN.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/CYRILLIC.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/DEVANAGA.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/DINGBATS.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/GREEK.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/GUJARATI.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/GURMUKHI.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/HEBREW.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ICELAND.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/JAPANESE.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/KOREAN.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ROMAN.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/ROMANIAN.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/SYMBOL.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/THAI.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE/TURKISH.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/BIG5.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/CNS-11643-1986.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/EUC-JP.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/EUC-KR.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/GB12345-80.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/GB2312-80.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/GB2312.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0201.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0208.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JIS-X-0212.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/JOHAB.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/KSC1001.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/KSC5601-1992.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA/SHIFTJIS.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/IBM/IBM038.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-1.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-10.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-13.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-14.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-15.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-2.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-3.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-4.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-5.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-6.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-7.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-8.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/8859-9.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO/ISO646-US.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP437.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP737.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP775.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP850.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP852.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP855.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP857.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP860.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP861.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP862.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP863.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP864.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP865.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP866.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP869.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS/CP874.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP037.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP1026.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP500.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC/CP875.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/CYRILLIC.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/GREEK.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/ICELAND.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/LATIN2.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/ROMAN.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC/TURKISH.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1250.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1251.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1252.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1253.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1254.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1255.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1256.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1257.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP1258.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP932.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP936.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP949.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN/CP950.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/NEXT/NEXTSTEP.map
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/REGISTRY
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map/Map.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map/Map.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ADOBE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/APPLE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/EASTASIA
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/IBM
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/ISO
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/DOS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/EBCDIC
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/MAC
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS/WIN
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/MS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map/NEXT
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
diff --git a/converters/p5-Unicode-MapUTF8/Makefile b/converters/p5-Unicode-MapUTF8/Makefile
index c8b39b7e5d2f..8e9b08199a85 100644
--- a/converters/p5-Unicode-MapUTF8/Makefile
+++ b/converters/p5-Unicode-MapUTF8/Makefile
@@ -14,10 +14,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	rtdean@cytherianage.net
 COMMENT=	Perl class that implements conversion between arbitrary charsets
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/Map.pm:${PORTSDIR}/converters/p5-Unicode-Map \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Unicode/Map8.pm:${PORTSDIR}/converters/p5-Unicode-Map8 \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Unicode/Map.pm:${PORTSDIR}/converters/p5-Unicode-Map \
+		${SITE_PERL}/${PERL_ARCH}/Unicode/String.pm:${PORTSDIR}/converters/p5-Unicode-String \
+		${SITE_PERL}/${PERL_ARCH}/Unicode/Map8.pm:${PORTSDIR}/converters/p5-Unicode-Map8 \
+		${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/converters/p5-Unicode-MapUTF8/pkg-plist b/converters/p5-Unicode-MapUTF8/pkg-plist
index 15cd18f4c397..6a633ea87f33 100644
--- a/converters/p5-Unicode-MapUTF8/pkg-plist
+++ b/converters/p5-Unicode-MapUTF8/pkg-plist
@@ -1,5 +1,5 @@
-lib/perl5/site_perl/%%PERL_VER%%/Unicode/MapUTF8.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/MapUTF8/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/MapUTF8
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Unicode
+%%SITE_PERL%%/Unicode/MapUTF8.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/MapUTF8/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/MapUTF8
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
+@dirrm %%SITE_PERL%%/Unicode