3 files changed, 122 insertions, 122 deletions
diff --git a/shells/perlsh/pkg-plist b/shells/perlsh/pkg-plist
index 27e78ce89041..9d712dbf4602 100644
--- a/shells/perlsh/pkg-plist
+++ b/shells/perlsh/pkg-plist
@@ -1,64 +1,64 @@
 bin/psh
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Bg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Bind.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Builtin.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Complete.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Dirs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Drives.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Exit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback/Ls.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback/Env.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Firsttime.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Function.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Help.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/History.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Kill.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Jobs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Pshtokenize.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Readline.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Set.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Source.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Strategy.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Symbols.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Rename.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Which.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Italian.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Default.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/French.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Spanish.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/German.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Portuguese.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Unix.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Win.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Mac.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Auto_resume.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Auto_cd.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Debug.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Fallback_builtin.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Perlfunc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Perlscript.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Completion.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/PCompletion.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/PerlEval.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Job.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Joblist.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Prompt.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/psh/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Psh.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/psh
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/OS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh
+%%SITE_PERL%%/Psh/Builtins/Bg.pm
+%%SITE_PERL%%/Psh/Builtins/Bind.pm
+%%SITE_PERL%%/Psh/Builtins/Builtin.pm
+%%SITE_PERL%%/Psh/Builtins/Complete.pm
+%%SITE_PERL%%/Psh/Builtins/Dirs.pm
+%%SITE_PERL%%/Psh/Builtins/Drives.pm
+%%SITE_PERL%%/Psh/Builtins/Exit.pm
+%%SITE_PERL%%/Psh/Builtins/Fallback/Ls.pm
+%%SITE_PERL%%/Psh/Builtins/Fallback/Env.pm
+%%SITE_PERL%%/Psh/Builtins/Fc.pm
+%%SITE_PERL%%/Psh/Builtins/Fg.pm
+%%SITE_PERL%%/Psh/Builtins/Firsttime.pm
+%%SITE_PERL%%/Psh/Builtins/Function.pm
+%%SITE_PERL%%/Psh/Builtins/Help.pm
+%%SITE_PERL%%/Psh/Builtins/History.pm
+%%SITE_PERL%%/Psh/Builtins/Kill.pm
+%%SITE_PERL%%/Psh/Builtins/Jobs.pm
+%%SITE_PERL%%/Psh/Builtins/Pshtokenize.pm
+%%SITE_PERL%%/Psh/Builtins/Readline.pm
+%%SITE_PERL%%/Psh/Builtins/Set.pm
+%%SITE_PERL%%/Psh/Builtins/Source.pm
+%%SITE_PERL%%/Psh/Builtins/Strategy.pm
+%%SITE_PERL%%/Psh/Builtins/Symbols.pm
+%%SITE_PERL%%/Psh/Builtins/Rename.pm
+%%SITE_PERL%%/Psh/Builtins/Which.pm
+%%SITE_PERL%%/Psh/Locale/Base.pm
+%%SITE_PERL%%/Psh/Locale/Italian.pm
+%%SITE_PERL%%/Psh/Locale/Default.pm
+%%SITE_PERL%%/Psh/Locale/French.pm
+%%SITE_PERL%%/Psh/Locale/Spanish.pm
+%%SITE_PERL%%/Psh/Locale/German.pm
+%%SITE_PERL%%/Psh/Locale/Portuguese.pm
+%%SITE_PERL%%/Psh/OS/Unix.pm
+%%SITE_PERL%%/Psh/OS/Win.pm
+%%SITE_PERL%%/Psh/OS/Mac.pm
+%%SITE_PERL%%/Psh/Strategy/Auto_resume.pm
+%%SITE_PERL%%/Psh/Strategy/Auto_cd.pm
+%%SITE_PERL%%/Psh/Strategy/Debug.pm
+%%SITE_PERL%%/Psh/Strategy/Fallback_builtin.pm
+%%SITE_PERL%%/Psh/Strategy/Perlfunc.pm
+%%SITE_PERL%%/Psh/Strategy/Perlscript.pm
+%%SITE_PERL%%/Psh/Completion.pm
+%%SITE_PERL%%/Psh/OS.pm
+%%SITE_PERL%%/Psh/PCompletion.pm
+%%SITE_PERL%%/Psh/PerlEval.pm
+%%SITE_PERL%%/Psh/Job.pm
+%%SITE_PERL%%/Psh/Joblist.pm
+%%SITE_PERL%%/Psh/Util.pm
+%%SITE_PERL%%/Psh/Prompt.pm
+%%SITE_PERL%%/Psh/Builtins.pm
+%%SITE_PERL%%/Psh/Parser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/psh/.packlist
+%%SITE_PERL%%/Psh.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/psh
+@dirrm %%SITE_PERL%%/Psh/Builtins/Fallback
+@dirrm %%SITE_PERL%%/Psh/Builtins
+@dirrm %%SITE_PERL%%/Psh/Locale
+@dirrm %%SITE_PERL%%/Psh/OS
+@dirrm %%SITE_PERL%%/Psh/Strategy
+@dirrm %%SITE_PERL%%/Psh
 @unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man/man1 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man/man3 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man 2>/dev/null || true
diff --git a/shells/psh/pkg-plist b/shells/psh/pkg-plist
index 27e78ce89041..9d712dbf4602 100644
--- a/shells/psh/pkg-plist
+++ b/shells/psh/pkg-plist
@@ -1,64 +1,64 @@
 bin/psh
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Bg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Bind.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Builtin.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Complete.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Dirs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Drives.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Exit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback/Ls.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback/Env.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Firsttime.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Function.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Help.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/History.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Kill.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Jobs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Pshtokenize.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Readline.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Set.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Source.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Strategy.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Symbols.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Rename.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Which.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Italian.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Default.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/French.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Spanish.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/German.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale/Portuguese.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Unix.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Win.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Mac.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Auto_resume.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Auto_cd.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Debug.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Fallback_builtin.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Perlfunc.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Perlscript.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Completion.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/OS.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/PCompletion.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/PerlEval.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Job.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Joblist.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Prompt.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/psh/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Psh.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/psh
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fallback
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Locale
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/OS
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Psh
+%%SITE_PERL%%/Psh/Builtins/Bg.pm
+%%SITE_PERL%%/Psh/Builtins/Bind.pm
+%%SITE_PERL%%/Psh/Builtins/Builtin.pm
+%%SITE_PERL%%/Psh/Builtins/Complete.pm
+%%SITE_PERL%%/Psh/Builtins/Dirs.pm
+%%SITE_PERL%%/Psh/Builtins/Drives.pm
+%%SITE_PERL%%/Psh/Builtins/Exit.pm
+%%SITE_PERL%%/Psh/Builtins/Fallback/Ls.pm
+%%SITE_PERL%%/Psh/Builtins/Fallback/Env.pm
+%%SITE_PERL%%/Psh/Builtins/Fc.pm
+%%SITE_PERL%%/Psh/Builtins/Fg.pm
+%%SITE_PERL%%/Psh/Builtins/Firsttime.pm
+%%SITE_PERL%%/Psh/Builtins/Function.pm
+%%SITE_PERL%%/Psh/Builtins/Help.pm
+%%SITE_PERL%%/Psh/Builtins/History.pm
+%%SITE_PERL%%/Psh/Builtins/Kill.pm
+%%SITE_PERL%%/Psh/Builtins/Jobs.pm
+%%SITE_PERL%%/Psh/Builtins/Pshtokenize.pm
+%%SITE_PERL%%/Psh/Builtins/Readline.pm
+%%SITE_PERL%%/Psh/Builtins/Set.pm
+%%SITE_PERL%%/Psh/Builtins/Source.pm
+%%SITE_PERL%%/Psh/Builtins/Strategy.pm
+%%SITE_PERL%%/Psh/Builtins/Symbols.pm
+%%SITE_PERL%%/Psh/Builtins/Rename.pm
+%%SITE_PERL%%/Psh/Builtins/Which.pm
+%%SITE_PERL%%/Psh/Locale/Base.pm
+%%SITE_PERL%%/Psh/Locale/Italian.pm
+%%SITE_PERL%%/Psh/Locale/Default.pm
+%%SITE_PERL%%/Psh/Locale/French.pm
+%%SITE_PERL%%/Psh/Locale/Spanish.pm
+%%SITE_PERL%%/Psh/Locale/German.pm
+%%SITE_PERL%%/Psh/Locale/Portuguese.pm
+%%SITE_PERL%%/Psh/OS/Unix.pm
+%%SITE_PERL%%/Psh/OS/Win.pm
+%%SITE_PERL%%/Psh/OS/Mac.pm
+%%SITE_PERL%%/Psh/Strategy/Auto_resume.pm
+%%SITE_PERL%%/Psh/Strategy/Auto_cd.pm
+%%SITE_PERL%%/Psh/Strategy/Debug.pm
+%%SITE_PERL%%/Psh/Strategy/Fallback_builtin.pm
+%%SITE_PERL%%/Psh/Strategy/Perlfunc.pm
+%%SITE_PERL%%/Psh/Strategy/Perlscript.pm
+%%SITE_PERL%%/Psh/Completion.pm
+%%SITE_PERL%%/Psh/OS.pm
+%%SITE_PERL%%/Psh/PCompletion.pm
+%%SITE_PERL%%/Psh/PerlEval.pm
+%%SITE_PERL%%/Psh/Job.pm
+%%SITE_PERL%%/Psh/Joblist.pm
+%%SITE_PERL%%/Psh/Util.pm
+%%SITE_PERL%%/Psh/Prompt.pm
+%%SITE_PERL%%/Psh/Builtins.pm
+%%SITE_PERL%%/Psh/Parser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/psh/.packlist
+%%SITE_PERL%%/Psh.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/psh
+@dirrm %%SITE_PERL%%/Psh/Builtins/Fallback
+@dirrm %%SITE_PERL%%/Psh/Builtins
+@dirrm %%SITE_PERL%%/Psh/Locale
+@dirrm %%SITE_PERL%%/Psh/OS
+@dirrm %%SITE_PERL%%/Psh/Strategy
+@dirrm %%SITE_PERL%%/Psh
 @unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man/man1 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man/man3 2>/dev/null || true
 @unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man 2>/dev/null || true
diff --git a/shells/vshnu/Makefile b/shells/vshnu/Makefile
index e9a52e8c4871..d3ac27d9e9ae 100644
--- a/shells/vshnu/Makefile
+++ b/shells/vshnu/Makefile
@@ -16,11 +16,11 @@ COMMENT=	New Visual Shell
 
 .include <bsd.port.pre.mk>
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Term/Screen.pm:${PORTSDIR}/devel/p5-Term-Screen
+BUILD_DEPENDS=	${SITE_PERL}/Term/Screen.pm:${PORTSDIR}/devel/p5-Term-Screen
 
 # perl 5.6.0
 .if ${OSVERSION} < 500007
-BUILD_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor
+BUILD_DEPENDS+=	${SITE_PERL}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor
 .endif
 
 RUN_DEPENDS=	${BUILD_DEPENDS}