- Update to 1.8

- Unbreak
- Remove gratuitous use of REINPLACE
- Add $FreeBSD$ on pkg-plist
- Assign maintainership to the submitter

PR:		ports/79623
Submitted by:	Renato Botelho <freebsd@galle.com.br>

8 files changed, 202 insertions, 96 deletions

diff --git a/shells/perlsh/Makefile b/shells/perlsh/Makefile
index 170316f..a63de2e 100644
--- a/shells/perlsh/Makefile
+++ b/shells/perlsh/Makefile
@@ -6,45 +6,33 @@
 #
 
 PORTNAME=	perlsh
-PORTVERSION=	0.009
-PORTREVISION=	1
+PORTVERSION=	1.8
 CATEGORIES=	shells perl5
 MASTER_SITES=	http://www.gregorpurdy.com/gregor/psh/
 DISTNAME=	psh-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd@galle.com.br
 COMMENT=	New shell made entirely out of a Perl script
 
-BROKEN=		Incomplete pkg-plist
-
 PERL_CONFIGURE=	yes
-USE_REINPLACE=	yes
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=	Psh::Builtins.3 \
-	Psh::Completion.3 \
-	Psh::Job.3 \
+MAN1=	psh.1 pshcomplete.1 pshconfig.1 pshdevel.1
+
+MAN3=	Psh::Completion.3 \
 	Psh::Joblist.3 \
-	Psh::Locale::Base.3 \
+	Psh::Locale.3 \
 	Psh::Locale::Default.3 \
-	Psh::Locale::French.3 \
-	Psh::Locale::German.3 \
-	Psh::Locale::Italian.3 \
-	Psh::Locale::Portuguese.3 \
-	Psh::Locale::Spanish.3 \
 	Psh::OS.3 \
-	Psh::OS::Mac.3 \
-	Psh::OS::Unix.3 \
 	Psh::OS::Win.3 \
-	Psh::PCompletion.3 \
 	Psh::Parser.3 \
 	Psh::PerlEval.3 \
-	Psh::Util.3
+	Psh::Strategy.3 \
+	Psh::StrategyBunch.3
 
 pre-install:
-	${REINPLACE_CMD} -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/Makefile;
-	${REINPLACE_CMD} -e "s:/usr/local/man/man1:${MAN3PREFIX}/man/man1:g" ${WRKSRC}/Makefile;
-	${REINPLACE_CMD} -e "s:/usr/local/lib/perl5/5.00503/man/man3:${MAN3PREFIX}/man/man3:g" ${WRKSRC}/Makefile;
+	@${PERL} -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/Makefile;
+	@${PERL} -pi -e "s:/usr/local/man/man1:${MAN3PREFIX}/man/man1:g" ${WRKSRC}/Makefile;
+	@${PERL} -pi -e "s:/usr/local/lib/perl5/5.00503/man/man3:${MAN3PREFIX}/man/man3:g" ${WRKSRC}/Makefile;
 
 post-install:
 	@${ECHO_MSG} "Updating /etc/shells"
diff --git a/shells/perlsh/distinfo b/shells/perlsh/distinfo
index 2884346..86b2225 100644
--- a/shells/perlsh/distinfo
+++ b/shells/perlsh/distinfo
@@ -1,2 +1,2 @@
-MD5 (psh-0.009.tar.gz) = a6d9dd7dc80ceb7ac63203bda7976622
-SIZE (psh-0.009.tar.gz) = 96704
+MD5 (psh-1.8.tar.gz) = bb2040c519e6b263239d6f795a6515b5
+SIZE (psh-1.8.tar.gz) = 119989
diff --git a/shells/perlsh/files/patch-aa b/shells/perlsh/files/patch-aa
index 1e15fc8..283792b 100644
--- a/shells/perlsh/files/patch-aa
+++ b/shells/perlsh/files/patch-aa
@@ -1,10 +1,10 @@
---- Makefile.PL	Tue Mar 14 05:29:39 2000
-+++ Makefile.PL.new	Fri Jan  5 16:36:49 2001
-@@ -25,6 +25,7 @@
+--- Makefile.PL.orig	Thu Apr  7 08:01:59 2005
++++ Makefile.PL	Thu Apr  7 08:01:42 2005
+@@ -67,6 +67,7 @@
  
  WriteMakefile (
  	NAME         => 'psh',
 +	PREFIX       => '${PREFIX}',
- 	VERSION_FROM => 'psh',
+ 	VERSION_FROM => 'lib/Psh.pm',
  	AUTHOR       => 'Gregor N. Purdy (gregor@focusresearch.com)',
  	ABSTRACT     => 'Perl Shell',
diff --git a/shells/perlsh/pkg-plist b/shells/perlsh/pkg-plist
index 7d7abf3..c34c69a 100644
--- a/shells/perlsh/pkg-plist
+++ b/shells/perlsh/pkg-plist
@@ -1,61 +1,126 @@
+@comment $FreeBSD$
 bin/psh
+share/psh/complete/debian
+share/psh/complete/perl
+share/psh/complete/standard
+share/psh/themes/aix
+share/psh/themes/blank
+share/psh/themes/blight
+share/psh/themes/bold
+share/psh/themes/clock
+share/psh/themes/combo
+share/psh/themes/cyngus
+share/psh/themes/elite2
+share/psh/themes/fade
+share/psh/themes/gilbert
+share/psh/themes/hermann
+share/psh/themes/kax
+share/psh/themes/largo
+share/psh/themes/lxtips2
+share/psh/themes/nate
+share/psh/themes/nextstep
+share/psh/themes/openbsd
+share/psh/themes/plan-9
+share/psh/themes/rasterman
+share/psh/themes/simple
+share/psh/themes/stereophonic
+share/psh/themes/sunos
+share/psh/themes/vms
+%%SITE_PERL%%/Psh.pm
+%%SITE_PERL%%/Psh/Builtins/Alias.pm
 %%SITE_PERL%%/Psh/Builtins/Bg.pm
 %%SITE_PERL%%/Psh/Builtins/Bind.pm
 %%SITE_PERL%%/Psh/Builtins/Builtin.pm
+%%SITE_PERL%%/Psh/Builtins/Cd.pm
 %%SITE_PERL%%/Psh/Builtins/Complete.pm
+%%SITE_PERL%%/Psh/Builtins/Delenv.pm
 %%SITE_PERL%%/Psh/Builtins/Dirs.pm
 %%SITE_PERL%%/Psh/Builtins/Drives.pm
+%%SITE_PERL%%/Psh/Builtins/Else.pm
+%%SITE_PERL%%/Psh/Builtins/Elsif.pm
 %%SITE_PERL%%/Psh/Builtins/Exit.pm
-%%SITE_PERL%%/Psh/Builtins/Fallback/Ls.pm
+%%SITE_PERL%%/Psh/Builtins/Export.pm
 %%SITE_PERL%%/Psh/Builtins/Fallback/Env.pm
+%%SITE_PERL%%/Psh/Builtins/Fallback/Ls.pm
 %%SITE_PERL%%/Psh/Builtins/Fc.pm
 %%SITE_PERL%%/Psh/Builtins/Fg.pm
 %%SITE_PERL%%/Psh/Builtins/Firsttime.pm
+%%SITE_PERL%%/Psh/Builtins/Forfile.pm
 %%SITE_PERL%%/Psh/Builtins/Function.pm
+%%SITE_PERL%%/Psh/Builtins/Hash.pm
 %%SITE_PERL%%/Psh/Builtins/Help.pm
 %%SITE_PERL%%/Psh/Builtins/History.pm
-%%SITE_PERL%%/Psh/Builtins/Kill.pm
+%%SITE_PERL%%/Psh/Builtins/If.pm
 %%SITE_PERL%%/Psh/Builtins/Jobs.pm
-%%SITE_PERL%%/Psh/Builtins/Pshtokenize.pm
+%%SITE_PERL%%/Psh/Builtins/Kill.pm
+%%SITE_PERL%%/Psh/Builtins/Modules.pm
+%%SITE_PERL%%/Psh/Builtins/Option.pm
+%%SITE_PERL%%/Psh/Builtins/Package.pm
+%%SITE_PERL%%/Psh/Builtins/Printenv.pm
 %%SITE_PERL%%/Psh/Builtins/Readline.pm
+%%SITE_PERL%%/Psh/Builtins/Rehash.pm
+%%SITE_PERL%%/Psh/Builtins/Rename.pm
 %%SITE_PERL%%/Psh/Builtins/Set.pm
+%%SITE_PERL%%/Psh/Builtins/Setenv.pm
 %%SITE_PERL%%/Psh/Builtins/Source.pm
 %%SITE_PERL%%/Psh/Builtins/Strategy.pm
+%%SITE_PERL%%/Psh/Builtins/Sudo.pm
 %%SITE_PERL%%/Psh/Builtins/Symbols.pm
-%%SITE_PERL%%/Psh/Builtins/Rename.pm
+%%SITE_PERL%%/Psh/Builtins/Theme.pm
+%%SITE_PERL%%/Psh/Builtins/Tieopt.pm
+%%SITE_PERL%%/Psh/Builtins/Ulimit.pm
+%%SITE_PERL%%/Psh/Builtins/Unalias.pm
 %%SITE_PERL%%/Psh/Builtins/Which.pm
-%%SITE_PERL%%/Psh/Locale/Base.pm
-%%SITE_PERL%%/Psh/Locale/Italian.pm
+%%SITE_PERL%%/Psh/Completion.pm
+%%SITE_PERL%%/Psh/Joblist.pm
+%%SITE_PERL%%/Psh/Locale.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/Italian.pm
 %%SITE_PERL%%/Psh/Locale/Portuguese.pm
+%%SITE_PERL%%/Psh/Locale/Spanish.pm
+%%SITE_PERL%%/Psh/OS.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/Options.pm
+%%SITE_PERL%%/Psh/PCompletion.pm
+%%SITE_PERL%%/Psh/Parser.pm
+%%SITE_PERL%%/Psh/PerlEval.pm
+%%SITE_PERL%%/Psh/Prompt.pm
+%%SITE_PERL%%/Psh/Strategy.pm
 %%SITE_PERL%%/Psh/Strategy/Auto_cd.pm
+%%SITE_PERL%%/Psh/Strategy/Auto_resume.pm
+%%SITE_PERL%%/Psh/Strategy/Bang.pm
+%%SITE_PERL%%/Psh/Strategy/Brace.pm
+%%SITE_PERL%%/Psh/Strategy/Built_in.pm
+%%SITE_PERL%%/Psh/Strategy/Darwin_apps.pm
 %%SITE_PERL%%/Psh/Strategy/Debug.pm
+%%SITE_PERL%%/Psh/Strategy/Eval.pm
+%%SITE_PERL%%/Psh/Strategy/Executable.pm
 %%SITE_PERL%%/Psh/Strategy/Fallback_builtin.pm
+%%SITE_PERL%%/Psh/Strategy/Perl.pm
 %%SITE_PERL%%/Psh/Strategy/Perlfunc.pm
+%%SITE_PERL%%/Psh/Strategy/Perlfunc_heavy.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/StrategyBunch.pm
+%%SITE_PERL%%/Psh/Support/Alias.pm
+%%SITE_PERL%%/Psh/Support/Builtins.pm
+%%SITE_PERL%%/Psh/Support/Debug.pm
+%%SITE_PERL%%/Psh/Support/Dirs.pm
+%%SITE_PERL%%/Psh/Support/Env.pm
+%%SITE_PERL%%/Psh/Support/Functions.pm
+%%SITE_PERL%%/Psh/Support/TiedOption.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 share/psh/complete
+@dirrm share/psh/themes
+@dirrm share/psh
 @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/Support
 @dirrm %%SITE_PERL%%/Psh
diff --git a/shells/psh/Makefile b/shells/psh/Makefile
index 170316f..a63de2e 100644
--- a/shells/psh/Makefile
+++ b/shells/psh/Makefile
@@ -6,45 +6,33 @@
 #
 
 PORTNAME=	perlsh
-PORTVERSION=	0.009
-PORTREVISION=	1
+PORTVERSION=	1.8
 CATEGORIES=	shells perl5
 MASTER_SITES=	http://www.gregorpurdy.com/gregor/psh/
 DISTNAME=	psh-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd@galle.com.br
 COMMENT=	New shell made entirely out of a Perl script
 
-BROKEN=		Incomplete pkg-plist
-
 PERL_CONFIGURE=	yes
-USE_REINPLACE=	yes
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=	Psh::Builtins.3 \
-	Psh::Completion.3 \
-	Psh::Job.3 \
+MAN1=	psh.1 pshcomplete.1 pshconfig.1 pshdevel.1
+
+MAN3=	Psh::Completion.3 \
 	Psh::Joblist.3 \
-	Psh::Locale::Base.3 \
+	Psh::Locale.3 \
 	Psh::Locale::Default.3 \
-	Psh::Locale::French.3 \
-	Psh::Locale::German.3 \
-	Psh::Locale::Italian.3 \
-	Psh::Locale::Portuguese.3 \
-	Psh::Locale::Spanish.3 \
 	Psh::OS.3 \
-	Psh::OS::Mac.3 \
-	Psh::OS::Unix.3 \
 	Psh::OS::Win.3 \
-	Psh::PCompletion.3 \
 	Psh::Parser.3 \
 	Psh::PerlEval.3 \
-	Psh::Util.3
+	Psh::Strategy.3 \
+	Psh::StrategyBunch.3
 
 pre-install:
-	${REINPLACE_CMD} -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/Makefile;
-	${REINPLACE_CMD} -e "s:/usr/local/man/man1:${MAN3PREFIX}/man/man1:g" ${WRKSRC}/Makefile;
-	${REINPLACE_CMD} -e "s:/usr/local/lib/perl5/5.00503/man/man3:${MAN3PREFIX}/man/man3:g" ${WRKSRC}/Makefile;
+	@${PERL} -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/Makefile;
+	@${PERL} -pi -e "s:/usr/local/man/man1:${MAN3PREFIX}/man/man1:g" ${WRKSRC}/Makefile;
+	@${PERL} -pi -e "s:/usr/local/lib/perl5/5.00503/man/man3:${MAN3PREFIX}/man/man3:g" ${WRKSRC}/Makefile;
 
 post-install:
 	@${ECHO_MSG} "Updating /etc/shells"
diff --git a/shells/psh/distinfo b/shells/psh/distinfo
index 2884346..86b2225 100644
--- a/shells/psh/distinfo
+++ b/shells/psh/distinfo
@@ -1,2 +1,2 @@
-MD5 (psh-0.009.tar.gz) = a6d9dd7dc80ceb7ac63203bda7976622
-SIZE (psh-0.009.tar.gz) = 96704
+MD5 (psh-1.8.tar.gz) = bb2040c519e6b263239d6f795a6515b5
+SIZE (psh-1.8.tar.gz) = 119989
diff --git a/shells/psh/files/patch-aa b/shells/psh/files/patch-aa
index 1e15fc8..283792b 100644
--- a/shells/psh/files/patch-aa
+++ b/shells/psh/files/patch-aa
@@ -1,10 +1,10 @@
---- Makefile.PL	Tue Mar 14 05:29:39 2000
-+++ Makefile.PL.new	Fri Jan  5 16:36:49 2001
-@@ -25,6 +25,7 @@
+--- Makefile.PL.orig	Thu Apr  7 08:01:59 2005
++++ Makefile.PL	Thu Apr  7 08:01:42 2005
+@@ -67,6 +67,7 @@
  
  WriteMakefile (
  	NAME         => 'psh',
 +	PREFIX       => '${PREFIX}',
- 	VERSION_FROM => 'psh',
+ 	VERSION_FROM => 'lib/Psh.pm',
  	AUTHOR       => 'Gregor N. Purdy (gregor@focusresearch.com)',
  	ABSTRACT     => 'Perl Shell',
diff --git a/shells/psh/pkg-plist b/shells/psh/pkg-plist
index 7d7abf3..c34c69a 100644
--- a/shells/psh/pkg-plist
+++ b/shells/psh/pkg-plist
@@ -1,61 +1,126 @@
+@comment $FreeBSD$
 bin/psh
+share/psh/complete/debian
+share/psh/complete/perl
+share/psh/complete/standard
+share/psh/themes/aix
+share/psh/themes/blank
+share/psh/themes/blight
+share/psh/themes/bold
+share/psh/themes/clock
+share/psh/themes/combo
+share/psh/themes/cyngus
+share/psh/themes/elite2
+share/psh/themes/fade
+share/psh/themes/gilbert
+share/psh/themes/hermann
+share/psh/themes/kax
+share/psh/themes/largo
+share/psh/themes/lxtips2
+share/psh/themes/nate
+share/psh/themes/nextstep
+share/psh/themes/openbsd
+share/psh/themes/plan-9
+share/psh/themes/rasterman
+share/psh/themes/simple
+share/psh/themes/stereophonic
+share/psh/themes/sunos
+share/psh/themes/vms
+%%SITE_PERL%%/Psh.pm
+%%SITE_PERL%%/Psh/Builtins/Alias.pm
 %%SITE_PERL%%/Psh/Builtins/Bg.pm
 %%SITE_PERL%%/Psh/Builtins/Bind.pm
 %%SITE_PERL%%/Psh/Builtins/Builtin.pm
+%%SITE_PERL%%/Psh/Builtins/Cd.pm
 %%SITE_PERL%%/Psh/Builtins/Complete.pm
+%%SITE_PERL%%/Psh/Builtins/Delenv.pm
 %%SITE_PERL%%/Psh/Builtins/Dirs.pm
 %%SITE_PERL%%/Psh/Builtins/Drives.pm
+%%SITE_PERL%%/Psh/Builtins/Else.pm
+%%SITE_PERL%%/Psh/Builtins/Elsif.pm
 %%SITE_PERL%%/Psh/Builtins/Exit.pm
-%%SITE_PERL%%/Psh/Builtins/Fallback/Ls.pm
+%%SITE_PERL%%/Psh/Builtins/Export.pm
 %%SITE_PERL%%/Psh/Builtins/Fallback/Env.pm
+%%SITE_PERL%%/Psh/Builtins/Fallback/Ls.pm
 %%SITE_PERL%%/Psh/Builtins/Fc.pm
 %%SITE_PERL%%/Psh/Builtins/Fg.pm
 %%SITE_PERL%%/Psh/Builtins/Firsttime.pm
+%%SITE_PERL%%/Psh/Builtins/Forfile.pm
 %%SITE_PERL%%/Psh/Builtins/Function.pm
+%%SITE_PERL%%/Psh/Builtins/Hash.pm
 %%SITE_PERL%%/Psh/Builtins/Help.pm
 %%SITE_PERL%%/Psh/Builtins/History.pm
-%%SITE_PERL%%/Psh/Builtins/Kill.pm
+%%SITE_PERL%%/Psh/Builtins/If.pm
 %%SITE_PERL%%/Psh/Builtins/Jobs.pm
-%%SITE_PERL%%/Psh/Builtins/Pshtokenize.pm
+%%SITE_PERL%%/Psh/Builtins/Kill.pm
+%%SITE_PERL%%/Psh/Builtins/Modules.pm
+%%SITE_PERL%%/Psh/Builtins/Option.pm
+%%SITE_PERL%%/Psh/Builtins/Package.pm
+%%SITE_PERL%%/Psh/Builtins/Printenv.pm
 %%SITE_PERL%%/Psh/Builtins/Readline.pm
+%%SITE_PERL%%/Psh/Builtins/Rehash.pm
+%%SITE_PERL%%/Psh/Builtins/Rename.pm
 %%SITE_PERL%%/Psh/Builtins/Set.pm
+%%SITE_PERL%%/Psh/Builtins/Setenv.pm
 %%SITE_PERL%%/Psh/Builtins/Source.pm
 %%SITE_PERL%%/Psh/Builtins/Strategy.pm
+%%SITE_PERL%%/Psh/Builtins/Sudo.pm
 %%SITE_PERL%%/Psh/Builtins/Symbols.pm
-%%SITE_PERL%%/Psh/Builtins/Rename.pm
+%%SITE_PERL%%/Psh/Builtins/Theme.pm
+%%SITE_PERL%%/Psh/Builtins/Tieopt.pm
+%%SITE_PERL%%/Psh/Builtins/Ulimit.pm
+%%SITE_PERL%%/Psh/Builtins/Unalias.pm
 %%SITE_PERL%%/Psh/Builtins/Which.pm
-%%SITE_PERL%%/Psh/Locale/Base.pm
-%%SITE_PERL%%/Psh/Locale/Italian.pm
+%%SITE_PERL%%/Psh/Completion.pm
+%%SITE_PERL%%/Psh/Joblist.pm
+%%SITE_PERL%%/Psh/Locale.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/Italian.pm
 %%SITE_PERL%%/Psh/Locale/Portuguese.pm
+%%SITE_PERL%%/Psh/Locale/Spanish.pm
+%%SITE_PERL%%/Psh/OS.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/Options.pm
+%%SITE_PERL%%/Psh/PCompletion.pm
+%%SITE_PERL%%/Psh/Parser.pm
+%%SITE_PERL%%/Psh/PerlEval.pm
+%%SITE_PERL%%/Psh/Prompt.pm
+%%SITE_PERL%%/Psh/Strategy.pm
 %%SITE_PERL%%/Psh/Strategy/Auto_cd.pm
+%%SITE_PERL%%/Psh/Strategy/Auto_resume.pm
+%%SITE_PERL%%/Psh/Strategy/Bang.pm
+%%SITE_PERL%%/Psh/Strategy/Brace.pm
+%%SITE_PERL%%/Psh/Strategy/Built_in.pm
+%%SITE_PERL%%/Psh/Strategy/Darwin_apps.pm
 %%SITE_PERL%%/Psh/Strategy/Debug.pm
+%%SITE_PERL%%/Psh/Strategy/Eval.pm
+%%SITE_PERL%%/Psh/Strategy/Executable.pm
 %%SITE_PERL%%/Psh/Strategy/Fallback_builtin.pm
+%%SITE_PERL%%/Psh/Strategy/Perl.pm
 %%SITE_PERL%%/Psh/Strategy/Perlfunc.pm
+%%SITE_PERL%%/Psh/Strategy/Perlfunc_heavy.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/StrategyBunch.pm
+%%SITE_PERL%%/Psh/Support/Alias.pm
+%%SITE_PERL%%/Psh/Support/Builtins.pm
+%%SITE_PERL%%/Psh/Support/Debug.pm
+%%SITE_PERL%%/Psh/Support/Dirs.pm
+%%SITE_PERL%%/Psh/Support/Env.pm
+%%SITE_PERL%%/Psh/Support/Functions.pm
+%%SITE_PERL%%/Psh/Support/TiedOption.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 share/psh/complete
+@dirrm share/psh/themes
+@dirrm share/psh
 @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/Support
 @dirrm %%SITE_PERL%%/Psh