Repocopy shells/perlsh to shells/psh to reflect the correct project's name

PR:		ports/115305
Submitted by:	garga

10 files changed, 2 insertions, 247 deletions

diff --git a/shells/Makefile b/shells/Makefile
index 2899ae976551..8944d82c6a38 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -23,7 +23,7 @@
     SUBDIR += pash
     SUBDIR += pdksh
     SUBDIR += pear-PHP_Shell
-    SUBDIR += perlsh
+    SUBDIR += psh
     SUBDIR += rc
     SUBDIR += rssh
     SUBDIR += sash
diff --git a/shells/perlsh/Makefile b/shells/perlsh/Makefile
deleted file mode 100644
index 287cec7b40a9..000000000000
--- a/shells/perlsh/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# New ports collection makefile for:	perlsh
-# Date created:		11 Dec 1999
-# Whom:			Will Andrews <andrews@technologist.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	perlsh
-PORTVERSION=	1.8.1
-CATEGORIES=	shells perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/G/GR/GREGOR
-DISTNAME=	psh-${PORTVERSION}
-
-MAINTAINER=	garga@FreeBSD.org
-COMMENT=	New shell made entirely out of a Perl script
-
-PERL_CONFIGURE=	yes
-
-SUB_FILES=	pkg-install pkg-deinstall
-DATADIR=	${PREFIX}/share/psh
-
-MAN1=	psh.1 \
-	pshcomplete.1 \
-	pshconfig.1 \
-	pshdevel.1
-MAN3=	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
-
-post-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.mk>
diff --git a/shells/perlsh/distinfo b/shells/perlsh/distinfo
deleted file mode 100644
index c8603a2ff72a..000000000000
--- a/shells/perlsh/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (psh-1.8.1.tar.gz) = 0b992dbfb907b571249923b51b213133
-SHA256 (psh-1.8.1.tar.gz) = 9c6d276f98a3e62086bda76e1eddc0eaba6b003b903c94261bd53e80700ef88f
-SIZE (psh-1.8.1.tar.gz) = 120036
diff --git a/shells/perlsh/files/patch-Makefile.PL b/shells/perlsh/files/patch-Makefile.PL
deleted file mode 100644
index 283792b3f0bd..000000000000
--- a/shells/perlsh/files/patch-Makefile.PL
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 => 'lib/Psh.pm',
- 	AUTHOR       => 'Gregor N. Purdy (gregor@focusresearch.com)',
- 	ABSTRACT     => 'Perl Shell',
diff --git a/shells/perlsh/files/patch-postinstall.pl b/shells/perlsh/files/patch-postinstall.pl
deleted file mode 100644
index 6770690f8947..000000000000
--- a/shells/perlsh/files/patch-postinstall.pl
+++ /dev/null
@@ -1,18 +0,0 @@
---- postinstall.pl.orig	Tue Apr 19 10:41:53 2005
-+++ postinstall.pl	Tue Apr 19 10:42:00 2005
-@@ -1,9 +1,4 @@
- 
--if ($^O eq 'MSWin32') {
--	mkdir("/psh");
--	system("xcopy share\\themes \\psh /Y");
--	system("xcopy share\\complete \\psh /Y");
--} else {
- 	my $where;
- 
- 	if( -w '/') {
-@@ -15,5 +10,4 @@
- 	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/perlsh/files/pkg-deinstall.in b/shells/perlsh/files/pkg-deinstall.in
deleted file mode 100644
index 6528f0329c34..000000000000
--- a/shells/perlsh/files/pkg-deinstall.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PSH="%%PREFIX%%/bin/psh"
-SHELLS="/etc/shells"
-
-case $2 in
-DEINSTALL)
-  if grep -qs "^$PSH\$" "$SHELLS"; then
-    if [ `id -u` -eq 0 ]; then
-      TMPSHELLS=`mktemp -t shells`
-      grep -v "^$PSH\$" "$SHELLS" > "$TMPSHELLS"
-      cat "$TMPSHELLS" > "$SHELLS"
-      rm "$TMPSHELLS"
-    else
-      echo "Not root, please remove $PSH from $SHELLS manually"
-    fi
-  fi
-  ;;
-esac
diff --git a/shells/perlsh/files/pkg-install.in b/shells/perlsh/files/pkg-install.in
deleted file mode 100644
index b14f461248b8..000000000000
--- a/shells/perlsh/files/pkg-install.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PSH="%%PREFIX%%/bin/psh"
-SHELLS="/etc/shells"
-
-case $2 in
-POST-INSTALL)
-  if [ -d "${SHELLS%/*}" ] && ! grep -qs "^$PSH\$" "$SHELLS"; then
-    if [ `id -u` -eq 0 ]; then
-      echo "$PSH" >> "$SHELLS"
-    else
-      echo "Not root, please add $PSH to $SHELLS manually"
-    fi
-  fi
-  ;;
-esac
diff --git a/shells/perlsh/pkg-descr b/shells/perlsh/pkg-descr
deleted file mode 100644
index 5ab8a43e2090..000000000000
--- a/shells/perlsh/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Perl Shell is a new shell that combines the power of bash
-and several other shells with the power of perl programming.
-
-WWW: http://search.cpan.org/dist/psh/
diff --git a/shells/perlsh/pkg-plist b/shells/perlsh/pkg-plist
deleted file mode 100644
index 2c91ac26fbe2..000000000000
--- a/shells/perlsh/pkg-plist
+++ /dev/null
@@ -1,126 +0,0 @@
-@comment $FreeBSD$
-bin/psh
-%%DATADIR%%/complete/debian
-%%DATADIR%%/complete/perl
-%%DATADIR%%/complete/standard
-%%DATADIR%%/themes/aix
-%%DATADIR%%/themes/blank
-%%DATADIR%%/themes/blight
-%%DATADIR%%/themes/bold
-%%DATADIR%%/themes/clock
-%%DATADIR%%/themes/combo
-%%DATADIR%%/themes/cyngus
-%%DATADIR%%/themes/elite2
-%%DATADIR%%/themes/fade
-%%DATADIR%%/themes/gilbert
-%%DATADIR%%/themes/hermann
-%%DATADIR%%/themes/kax
-%%DATADIR%%/themes/largo
-%%DATADIR%%/themes/lxtips2
-%%DATADIR%%/themes/nate
-%%DATADIR%%/themes/nextstep
-%%DATADIR%%/themes/openbsd
-%%DATADIR%%/themes/plan-9
-%%DATADIR%%/themes/rasterman
-%%DATADIR%%/themes/simple
-%%DATADIR%%/themes/stereophonic
-%%DATADIR%%/themes/sunos
-%%DATADIR%%/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/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/If.pm
-%%SITE_PERL%%/Psh/Builtins/Jobs.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/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/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/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/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/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%%/%%PERL_ARCH%%/auto/psh/.packlist
-@dirrm %%DATADIR%%/complete
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%
-@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 287cec7b40a9..e15391c09516 100644
--- a/shells/psh/Makefile
+++ b/shells/psh/Makefile
@@ -5,12 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	perlsh
+PORTNAME=	psh
 PORTVERSION=	1.8.1
 CATEGORIES=	shells perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/G/GR/GREGOR
-DISTNAME=	psh-${PORTVERSION}
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	New shell made entirely out of a Perl script
@@ -18,7 +17,6 @@ COMMENT=	New shell made entirely out of a Perl script
 PERL_CONFIGURE=	yes
 
 SUB_FILES=	pkg-install pkg-deinstall
-DATADIR=	${PREFIX}/share/psh
 
 MAN1=	psh.1 \
 	pshcomplete.1 \