4 files changed, 19 insertions, 54 deletions

diff --git a/sysutils/pdsh/Makefile b/sysutils/pdsh/Makefile
index 82975cf7d3c9..9989754c432c 100644
--- a/sysutils/pdsh/Makefile
+++ b/sysutils/pdsh/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pdsh
-PORTVERSION=	2.28
-PORTREVISION=	1
+PORTVERSION=	2.29
 CATEGORIES=	sysutils
 MASTER_SITES=	GOOGLE_CODE
 
@@ -14,54 +13,21 @@ LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 # :keepla because port uses lt_dlopen
-USES=		libtool:keepla perl5 tar:bzip2
+USES=		libtool:keepla perl5 shebangfix tar:bzip2
 USE_PERL5=	build
+SHEBANG_FILES=	scripts/dshbak
 
 OPTIONS_DEFINE=		SSH DSHGROUPS NETGROUP READLINE RSH
 OPTIONS_DEFAULT=	SSH DSHGROUPS
+OPTIONS_SUB=		yes
 DSHGROUPS_DESC=		DSH groups supprt
+DSHGROUPS_CONFIGURE_WITH=	dshgroups
 NETGROUP_DESC=		NIS Netgroup support
+NETGROUP_CONFIGURE_WITH=netgroup
+READLINE_CONFIGURE_WITH=readline
+READLINE_LIB_DEPENDS=	libreadline.so.6:${PORTSDIR}/devel/readline
 RSH_DESC=		RSH support
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSSH}
-CONFIGURE_ARGS+=	--with-ssh
-PLIST_SUB+=		SSH=""
-.else
-CONFIGURE_ARGS+=	--without-ssh
-PLIST_SUB+=		SSH="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDSHGROUPS}
-CONFIGURE_ARGS+=	--with-dshgroups
-PLIST_SUB+=		DSH=""
-.else
-CONFIGURE_ARGS+=	--without-dshgroups
-PLIST_SUB+=		DSH="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNETGROUP}
-CONFIGURE_ARGS+=	--with-netgroup
-PLIST_SUB+=		NETGROUP=""
-.else
-CONFIGURE_ARGS+=	--without-netgroup
-PLIST_SUB+=		NETGROUP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MREADLINE}
-CONFIGURE_ARGS+=	--with-readline
-LIB_DEPENDS+=		libreadline.so.6:${PORTSDIR}/devel/readline
-.else
-CONFIGURE_ARGS+=	--without-readline
-.endif
-
-.if ${PORT_OPTIONS:MRSH}
-CONFIGURE_ARGS+=	--with-rsh
-PLIST_SUB+=		RSH=""
-.else
-CONFIGURE_ARGS+=	--without-rsh
-PLIST_SUB+=		RSH="@comment "
-.endif
+RSH_CONFIGURE_WITH=	rsh
+SSH_CONFIGURE_WITH=	ssh
 
 .include <bsd.port.mk>
diff --git a/sysutils/pdsh/distinfo b/sysutils/pdsh/distinfo
index ee9458353b30..756602530c76 100644
--- a/sysutils/pdsh/distinfo
+++ b/sysutils/pdsh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pdsh-2.28.tar.bz2) = 251a09f9e19ac23c042d2b32d2d709bd268413797ba4fecc1599087e5763838a
-SIZE (pdsh-2.28.tar.bz2) = 487934
+SHA256 (pdsh-2.29.tar.bz2) = 57f0903bf782afe00874267b59e0f4adefa79da4c48d0257c5ae2bef02f87fcf
+SIZE (pdsh-2.29.tar.bz2) = 470693
diff --git a/sysutils/pdsh/pkg-descr b/sysutils/pdsh/pkg-descr
index af46d7b06d81..b2546de5081a 100644
--- a/sysutils/pdsh/pkg-descr
+++ b/sysutils/pdsh/pkg-descr
@@ -1,6 +1,6 @@
-Pdsh is a an efficient, multithreaded remote shell client which executes
-commands on multiple remote hosts in parallel. Pdsh implements dynamically
-loadable modules for extended functionality such as new remote shell services
-and remote host selection.
+Pdsh is a high-performance, parallel remote shell utility. It uses a sliding
+window of threads to execute remote commands, conserving socket resources while
+allowing some connections to timeout if needed. It was originally written as a
+replacement for IBM's DSH on clusters at LLNL.
 
 WWW: http://code.google.com/p/pdsh/
diff --git a/sysutils/pdsh/pkg-plist b/sysutils/pdsh/pkg-plist
index 4d8d48ac1b1b..5f21f457e088 100644
--- a/sysutils/pdsh/pkg-plist
+++ b/sysutils/pdsh/pkg-plist
@@ -5,9 +5,9 @@ bin/rpdcp
 lib/pdsh/execcmd.a
 lib/pdsh/execcmd.la
 lib/pdsh/execcmd.so
-%%DSH%%lib/pdsh/dshgroup.a
-%%DSH%%lib/pdsh/dshgroup.la
-%%DSH%%lib/pdsh/dshgroup.so
+%%DSHGROUPS%%lib/pdsh/dshgroup.a
+%%DSHGROUPS%%lib/pdsh/dshgroup.la
+%%DSHGROUPS%%lib/pdsh/dshgroup.so
 %%NETGROUP%%lib/pdsh/netgroup.a
 %%NETGROUP%%lib/pdsh/netgroup.la
 %%NETGROUP%%lib/pdsh/netgroup.so
@@ -21,4 +21,3 @@ man/man1/dshbak.1.gz
 man/man1/pdcp.1.gz
 man/man1/pdsh.1.gz
 man/man1/rpdcp.1.gz
-@dirrm lib/pdsh