3 files changed, 42 insertions, 17 deletions

diff --git a/security/clusterssh/Makefile b/security/clusterssh/Makefile
index 84ae2b7a9c00..874cc7915136 100644
--- a/security/clusterssh/Makefile
+++ b/security/clusterssh/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	clusterssh
-PORTVERSION=	4.02
-PORTREVISION=	1
+PORTVERSION=	4.05
 CATEGORIES=	security net
 MASTER_SITES=	SF/${PORTNAME}/2.%20ClusterSSH%20Series%204
-DISTNAME=	App-ClusterSSH-${PORTVERSION}_01
+DISTNAME=	App-ClusterSSH-${PORTVERSION}
 
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	Controls multiple hosts simultaneously via xterms and ssh
@@ -18,13 +17,35 @@ BUILD_DEPENDS=	p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
 		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
 		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
 		p5-Test-Trap>=0:${PORTSDIR}/devel/p5-Test-Trap \
-		p5-Module-Manifest>=0:${PORTSDIR}/devel/p5-Module-Manifest
+		p5-Module-Manifest>=0:${PORTSDIR}/devel/p5-Module-Manifest \
+		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
+		p5-Capture-Tiny>0:${PORTSDIR}/devel/p5-Capture-Tiny \
+		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
+		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
+		p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk \
+		p5-X11-Protocol>=0:${PORTSDIR}/x11/p5-X11-Protocol \
+		p5-Sort-Naturally>=1:${PORTSDIR}/textproc/p5-Sort-Naturally \
+		xterm:${PORTSDIR}/x11/xterm
 RUN_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk \
 		p5-X11-Protocol>=0:${PORTSDIR}/x11/p5-X11-Protocol \
 		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
+		p5-Sort-Naturally>=1:${PORTSDIR}/textproc/p5-Sort-Naturally \
+		xterm:${PORTSDIR}/x11/xterm
+TEST_DEPENDS=	p5-CPAN-Changes>=0:${PORTSDIR}/devel/p5-CPAN-Changes
 
 USES=		perl5
-USE_PERL5=	configure
+USE_PERL5=	modbuild
+
+OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	BASH
+
+post-install-BASH-off:
+	@${RM} ${STAGEDIR}${PREFIX}/bin/clusterssh_bash_completion.dist
+
+post-install-BASH-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
+	${MV} ${STAGEDIR}${PREFIX}/bin/clusterssh_bash_completion.dist \
+		${STAGEDIR}${PREFIX}/etc/bash_completion.d/clusterssh
 
 .include <bsd.port.mk>
diff --git a/security/clusterssh/distinfo b/security/clusterssh/distinfo
index c1b0c79f1868..2a453d5f8bcb 100644
--- a/security/clusterssh/distinfo
+++ b/security/clusterssh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (App-ClusterSSH-4.02_01.tar.gz) = 4f1c1fc151f4dc38d3f5e5803fb39a2eee15b797650ca94cd6f673a670cdaad5
-SIZE (App-ClusterSSH-4.02_01.tar.gz) = 76109
+SHA256 (App-ClusterSSH-4.05.tar.gz) = a2fa2722f1cf6901daa4576b2c2ec09e3c44a9911912d48332a6b66de2ddabd6
+SIZE (App-ClusterSSH-4.05.tar.gz) = 84954
diff --git a/security/clusterssh/pkg-plist b/security/clusterssh/pkg-plist
index 1fd3b0b8786f..7383f7226be0 100644
--- a/security/clusterssh/pkg-plist
+++ b/security/clusterssh/pkg-plist
@@ -1,25 +1,29 @@
 bin/ccon
 bin/crsh
-bin/cscp
+bin/csftp
 bin/cssh
 bin/ctel
+%%BASH%%etc/bash_completion.d/clusterssh
 %%PERL5_MAN1%%/ccon.1.gz
 %%PERL5_MAN1%%/crsh.1.gz
+%%PERL5_MAN1%%/csftp.1.gz
 %%PERL5_MAN1%%/cssh.1.gz
 %%PERL5_MAN1%%/ctel.1.gz
-%%SITE_PERL%%/App/ClusterSSH.pm
-%%SITE_PERL%%/App/ClusterSSH/Base.pm
-%%SITE_PERL%%/App/ClusterSSH/Cluster.pm
-%%SITE_PERL%%/App/ClusterSSH/Config.pm
-%%SITE_PERL%%/App/ClusterSSH/Helper.pm
-%%SITE_PERL%%/App/ClusterSSH/Host.pm
-%%SITE_PERL%%/App/ClusterSSH/L10N.pm
-%%SITE_PERL%%/App/ClusterSSH/L10N/en.pm
 %%PERL5_MAN3%%/App::ClusterSSH.3.gz
 %%PERL5_MAN3%%/App::ClusterSSH::Base.3.gz
 %%PERL5_MAN3%%/App::ClusterSSH::Cluster.3.gz
 %%PERL5_MAN3%%/App::ClusterSSH::Config.3.gz
+%%PERL5_MAN3%%/App::ClusterSSH::Getopt.3.gz
 %%PERL5_MAN3%%/App::ClusterSSH::Helper.3.gz
 %%PERL5_MAN3%%/App::ClusterSSH::Host.3.gz
 %%PERL5_MAN3%%/App::ClusterSSH::L10N.3.gz
 %%PERL5_MAN3%%/App::ClusterSSH::L10N::en.3.gz
+%%SITE_PERL%%/App/ClusterSSH.pm
+%%SITE_PERL%%/App/ClusterSSH/Base.pm
+%%SITE_PERL%%/App/ClusterSSH/Cluster.pm
+%%SITE_PERL%%/App/ClusterSSH/Config.pm
+%%SITE_PERL%%/App/ClusterSSH/Getopt.pm
+%%SITE_PERL%%/App/ClusterSSH/Helper.pm
+%%SITE_PERL%%/App/ClusterSSH/Host.pm
+%%SITE_PERL%%/App/ClusterSSH/L10N.pm
+%%SITE_PERL%%/App/ClusterSSH/L10N/en.pm