5 files changed, 53 insertions, 41 deletions

diff --git a/shells/psh/Makefile b/shells/psh/Makefile
index 9e20076d89b2..84ebf9d16cb1 100644
--- a/shells/psh/Makefile
+++ b/shells/psh/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	perlsh
-PORTVERSION=	0.007
+PORTVERSION=	0.009
 CATEGORIES=	shells perl5
 MASTER_SITES=	http://www.focusresearch.com/gregor/psh/
 DISTNAME=	psh-${PORTVERSION}
@@ -14,15 +14,33 @@ DISTNAME=	psh-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 
 USE_PERL5=	yes
-FETCH_BEFORE_ARGS+=	-t
-MAKE_ENV+=	PPREFIX="${PREFIX}"
-MAN1=		psh.1
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+PERL_CONFIGURE=	yes
 
-.include "${.CURDIR}/files/man3"
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3=	Psh::Builtins.3 \
+	Psh::Completion.3 \
+	Psh::Job.3 \
+	Psh::Joblist.3 \
+	Psh::Locale::Base.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
 
-do-build:
-	@(cd ${WRKSRC} && ${PERL} Makefile.PL && ${MAKE})
+pre-install:
+	${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} "Updating /etc/shells"
diff --git a/shells/psh/distinfo b/shells/psh/distinfo
index 64afe5342cf8..aae4721f834d 100644
--- a/shells/psh/distinfo
+++ b/shells/psh/distinfo
@@ -1 +1 @@
-MD5 (psh-0.007.tar.gz) = caae93083d1cf5724b9e7d5864ba1d2c
+MD5 (psh-0.009.tar.gz) = a6d9dd7dc80ceb7ac63203bda7976622
diff --git a/shells/psh/files/man3 b/shells/psh/files/man3
deleted file mode 100644
index 72352696c2a6..000000000000
--- a/shells/psh/files/man3
+++ /dev/null
@@ -1,19 +0,0 @@
-MAN3=	\
-	Psh::OS::Unix.3 \
-	Psh::Locale::French.3 \
-	Psh::Locale::Spanish.3 \
-	Psh::Joblist.3 \
-	Psh::Locale::German.3 \
-	Psh::Locale::Base.3 \
-	Psh::Completion.3 \
-	Psh::PerlEval.3 \
-	Psh::Job.3 \
-	Psh::Util.3 \
-	Psh::OS::Win.3 \
-	Psh::Locale::Italian.3 \
-	Psh::OS.3 \
-	Psh::OS::Mac.3 \
-	Psh::Locale::Default.3 \
-	Psh::Builtins.3 \
-	Psh::Parser.3 \
-	Psh::Locale::Portuguese.3
diff --git a/shells/psh/files/patch-aa b/shells/psh/files/patch-aa
index 365334e4e1eb..1e15fc8f9b87 100644
--- a/shells/psh/files/patch-aa
+++ b/shells/psh/files/patch-aa
@@ -1,10 +1,10 @@
---- Makefile.PL	Mon Dec 27 06:11:05 1999
-+++ Makefile.PL.new	Sun Feb 27 22:34:55 2000
-@@ -17,6 +17,7 @@
+--- Makefile.PL	Tue Mar 14 05:29:39 2000
++++ Makefile.PL.new	Fri Jan  5 16:36:49 2001
+@@ -25,6 +25,7 @@
  
  WriteMakefile (
  	NAME         => 'psh',
-+	PREFIX	     => '${PPREFIX}',
++	PREFIX       => '${PREFIX}',
  	VERSION_FROM => 'psh',
  	AUTHOR       => 'Gregor N. Purdy (gregor@focusresearch.com)',
  	ABSTRACT     => 'Perl Shell',
diff --git a/shells/psh/pkg-plist b/shells/psh/pkg-plist
index 01d5d21d0578..1060df549eb6 100644
--- a/shells/psh/pkg-plist
+++ b/shells/psh/pkg-plist
@@ -1,24 +1,36 @@
 bin/psh
 lib/perl5/site_perl/%%PERL_VER%%/Psh.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Joblist.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/OS/Mac.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/Joblist.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/Readline.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Bg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Symbols.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Fg.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Jobs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Which.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Bind.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Complete.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Builtin.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Drives.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Dirs.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Exit.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/Jobs.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Builtins/Kill.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/Rename.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/Which.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/Completion.pm
+lib/perl5/site_perl/%%PERL_VER%%/Psh/PCompletion.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
@@ -28,6 +40,7 @@ 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/PerlEval.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Perlfunc.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/Auto_resume.pm
 lib/perl5/site_perl/%%PERL_VER%%/Psh/Strategy/Auto_cd.pm