. Support staging

. Add devel/p5-Term-ReadLine-Perl as dependency, as suggested by install scripts

4 files changed, 91 insertions, 80 deletions

diff --git a/shells/psh/Makefile b/shells/psh/Makefile
index e962c1886855..ccd838cc07c4 100644
--- a/shells/psh/Makefile
+++ b/shells/psh/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	psh
 PORTVERSION=	1.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	shells perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GREGOR
@@ -11,81 +11,11 @@ MASTER_SITE_SUBDIR=	CPAN:GREGOR
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	New shell made entirely out of a Perl script
 
+RUN_DEPENDS=	${SITE_PERL}/Term/ReadLine/Perl.pm:${PORTSDIR}/devel/p5-Term-ReadLine-Perl
+
 USES=		perl5
 USE_PERL5=	configure
 
 SUB_FILES=	pkg-install pkg-deinstall
 
-MAN1=	psh.1 \
-	pshcomplete.1 \
-	pshconfig.1 \
-	pshdevel.1
-MAN3=	Psh::Builtins::Alias.3 \
-	Psh::Builtins::Bg.3 \
-	Psh::Builtins::Bind.3 \
-	Psh::Builtins::Builtin.3 \
-	Psh::Builtins::Cd.3 \
-	Psh::Builtins::Complete.3 \
-	Psh::Builtins::Delenv.3 \
-	Psh::Builtins::Dirs.3 \
-	Psh::Builtins::Drives.3 \
-	Psh::Builtins::Exit.3 \
-	Psh::Builtins::Export.3 \
-	Psh::Builtins::Fallback::Env.3 \
-	Psh::Builtins::Fallback::Ls.3 \
-	Psh::Builtins::Fc.3 \
-	Psh::Builtins::Fg.3 \
-	Psh::Builtins::Firsttime.3 \
-	Psh::Builtins::Forfile.3 \
-	Psh::Builtins::Function.3 \
-	Psh::Builtins::Hash.3 \
-	Psh::Builtins::Help.3 \
-	Psh::Builtins::History.3 \
-	Psh::Builtins::Jobs.3 \
-	Psh::Builtins::Kill.3 \
-	Psh::Builtins::Modules.3 \
-	Psh::Builtins::Option.3 \
-	Psh::Builtins::Package.3 \
-	Psh::Builtins::Printenv.3 \
-	Psh::Builtins::Readline.3 \
-	Psh::Builtins::Rehash.3 \
-	Psh::Builtins::Rename.3 \
-	Psh::Builtins::Set.3 \
-	Psh::Builtins::Setenv.3 \
-	Psh::Builtins::Source.3 \
-	Psh::Builtins::Strategy.3 \
-	Psh::Builtins::Sudo.3 \
-	Psh::Builtins::Symbols.3 \
-	Psh::Builtins::Theme.3 \
-	Psh::Builtins::Tieopt.3 \
-	Psh::Builtins::Unalias.3 \
-	Psh::Builtins::Which.3 \
-	Psh::Completion.3 \
-	Psh::Joblist.3 \
-	Psh::Locale.3 \
-	Psh::Locale::Default.3 \
-	Psh::OS.3 \
-	Psh::OS::Win.3 \
-	Psh::Parser.3 \
-	Psh::PerlEval.3 \
-	Psh::Strategy.3 \
-	Psh::StrategyBunch.3 \
-	Psh::Strategy::Auto_cd.3 \
-	Psh::Strategy::Auto_resume.3 \
-	Psh::Strategy::Bang.3 \
-	Psh::Strategy::Brace.3 \
-	Psh::Strategy::Darwin_apps.3 \
-	Psh::Strategy::Debug.3 \
-	Psh::Strategy::Eval.3 \
-	Psh::Strategy::Executable.3 \
-	Psh::Strategy::Fallback_builtin.3 \
-	Psh::Strategy::Perl.3 \
-	Psh::Strategy::Perlfunc.3 \
-	Psh::Strategy::Perlfunc_heavy.3 \
-	Psh::Strategy::Perlscript.3
-
-NO_STAGE=	yes
-post-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
 .include <bsd.port.mk>
diff --git a/shells/psh/files/patch-Makefile.PL b/shells/psh/files/patch-Makefile.PL
index 283792b3f0bd..867521d3ed5f 100644
--- a/shells/psh/files/patch-Makefile.PL
+++ b/shells/psh/files/patch-Makefile.PL
@@ -1,5 +1,14 @@
---- Makefile.PL.orig	Thu Apr  7 08:01:59 2005
-+++ Makefile.PL	Thu Apr  7 08:01:42 2005
+--- Makefile.PL.orig	2007-07-06 00:42:01.000000000 -0300
++++ Makefile.PL	2013-10-23 21:22:44.000000000 -0200
+@@ -22,7 +22,7 @@
+ 	my $tmp="
+ 
+ install ::
+-	\$(PERL) postinstall.pl \$(SITEPREFIX) \$(PREFIX)
++	\$(PERL) postinstall.pl \$(DESTDIR)\$(SITEPREFIX) \$(DESTDIR)\$(PREFIX)
+ 
+ 
+ lib/Psh/StrategyBunch.pm : $sb_depends
 @@ -67,6 +67,7 @@
  
  WriteMakefile (
diff --git a/shells/psh/files/patch-postinstall.pl b/shells/psh/files/patch-postinstall.pl
index 6770690f8947..a8b92c8c3baa 100644
--- a/shells/psh/files/patch-postinstall.pl
+++ b/shells/psh/files/patch-postinstall.pl
@@ -1,6 +1,6 @@
---- postinstall.pl.orig	Tue Apr 19 10:41:53 2005
-+++ postinstall.pl	Tue Apr 19 10:42:00 2005
-@@ -1,9 +1,4 @@
+--- postinstall.pl.orig	2007-07-06 00:42:01.000000000 -0300
++++ postinstall.pl	2013-10-23 21:34:44.000000000 -0200
+@@ -1,19 +1,9 @@
  
 -if ($^O eq 'MSWin32') {
 -	mkdir("/psh");
@@ -9,8 +9,13 @@
 -} else {
  	my $where;
  
- 	if( -w '/') {
-@@ -15,5 +10,4 @@
+-	if( -w '/') {
+-		$where= $ARGV[0]||$ARGV[1]||'/usr/local';
+-	} else {
+-		$where ='~/.psh';
+-	}
++	$where= $ARGV[0]||$ARGV[1]||'/usr/local';
+ 	print "Installing share files to $where/share/psh\n";
  	system("mkdir -p $where/share/psh");
  	system("cp -r share/themes $where/share/psh");
  	system("cp -r share/complete $where/share/psh");
diff --git a/shells/psh/pkg-plist b/shells/psh/pkg-plist
index 2c91ac26fbe2..c750a9f4689c 100644
--- a/shells/psh/pkg-plist
+++ b/shells/psh/pkg-plist
@@ -113,6 +113,73 @@ bin/psh
 %%SITE_PERL%%/Psh/Support/TiedOption.pm
 %%SITE_PERL%%/Psh/Util.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/psh/.packlist
+man/man1/psh.1.gz
+man/man1/pshcomplete.1.gz
+man/man1/pshconfig.1.gz
+man/man1/pshdevel.1.gz
+%%PERL5_MAN3%%/Psh::Builtins::Alias.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Bg.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Bind.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Builtin.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Cd.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Complete.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Delenv.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Dirs.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Drives.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Exit.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Export.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Fallback::Env.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Fallback::Ls.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Fc.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Fg.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Firsttime.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Forfile.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Function.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Hash.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Help.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::History.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Jobs.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Kill.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Modules.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Option.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Package.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Printenv.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Readline.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Rehash.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Rename.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Set.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Setenv.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Source.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Strategy.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Sudo.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Symbols.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Theme.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Tieopt.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Unalias.3.gz
+%%PERL5_MAN3%%/Psh::Builtins::Which.3.gz
+%%PERL5_MAN3%%/Psh::Completion.3.gz
+%%PERL5_MAN3%%/Psh::Joblist.3.gz
+%%PERL5_MAN3%%/Psh::Locale.3.gz
+%%PERL5_MAN3%%/Psh::Locale::Default.3.gz
+%%PERL5_MAN3%%/Psh::OS.3.gz
+%%PERL5_MAN3%%/Psh::OS::Win.3.gz
+%%PERL5_MAN3%%/Psh::Parser.3.gz
+%%PERL5_MAN3%%/Psh::PerlEval.3.gz
+%%PERL5_MAN3%%/Psh::Strategy.3.gz
+%%PERL5_MAN3%%/Psh::StrategyBunch.3.gz
+%%PERL5_MAN3%%/Psh::Strategy::Auto_cd.3.gz
+%%PERL5_MAN3%%/Psh::Strategy::Auto_resume.3.gz
+%%PERL5_MAN3%%/Psh::Strategy::Bang.3.gz
+%%PERL5_MAN3%%/Psh::Strategy::Brace.3.gz
+%%PERL5_MAN3%%/Psh::Strategy::Darwin_apps.3.gz
+%%PERL5_MAN3%%/Psh::Strategy::Debug.3.gz
+%%PERL5_MAN3%%/Psh::Strategy::Eval.3.gz
+%%PERL5_MAN3%%/Psh::Strategy::Executable.3.gz
+%%PERL5_MAN3%%/Psh::Strategy::Fallback_builtin.3.gz
+%%PERL5_MAN3%%/Psh::Strategy::Perl.3.gz
+%%PERL5_MAN3%%/Psh::Strategy::Perlfunc.3.gz
+%%PERL5_MAN3%%/Psh::Strategy::Perlfunc_heavy.3.gz
+%%PERL5_MAN3%%/Psh::Strategy::Perlscript.3.gz
 @dirrm %%DATADIR%%/complete
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%