Date: Wed, 15 Dec 2010 21:20:05 GMT From: Mykola Dzham <i@levsha.me> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/152718: Add user serviceable knobs to port sysutils/pdsh Message-ID: <201012152120.oBFLK5En099449@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/152718; it has been noted by GNATS.
From: Mykola Dzham <i@levsha.me>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/152718: Add user serviceable knobs to port sysutils/pdsh
Date: Wed, 15 Dec 2010 22:33:52 +0200
--/9DWx/yDrRhgMJTb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Approve with minimal changes: bump portversion and remove space.
Modified patch attached.
--
LEFT-(UANIC|RIPE)
JID: levsha@jabber.net.ua
PGP fingerprint: 1BCD 7C80 2E04 7282 C944 B0E0 7E67 619E 4E72 9280
--/9DWx/yDrRhgMJTb
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="pdsh-2.23_2.patch"
Index: Makefile
===================================================================
RCS file: /usr/local/arch/csup/ports/sysutils/pdsh/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 30 Nov 2010 01:24:10 -0000 1.4
+++ Makefile 15 Dec 2010 20:18:41 -0000
@@ -7,7 +7,7 @@
PORTNAME= pdsh
PORTVERSION= 2.23
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= GOOGLE_CODE
@@ -16,11 +16,57 @@
LICENSE= GPLv2
-CONFIGURE_ARGS= --with-ssh
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_PERL5_BUILD=yes
+OPTIONS= SSH "Enable SSH support" On \
+ DSHGROUPS "Enable DSH groups" On \
+ NETGROUP "Enable NIS Netgroup support" Off \
+ READLINE "Enable GNU readline support" Off \
+ RSH "Enable RSH support" Off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_SSH)
+CONFIGURE_ARGS+= --with-ssh
+PLIST_SUB+= SSH=""
+.else
+CONFIGURE_ARGS+= --without-ssh
+PLIST_SUB+= SSH="@comment "
+.endif
+
+.if defined(WITH_DSHGROUPS)
+CONFIGURE_ARGS+= --with-dshgroups
+PLIST_SUB+= DSH=""
+.else
+CONFIGURE_ARGS+= --without-dshgroups
+PLIST_SUB+= DSH="@comment "
+.endif
+
+.if defined(WITH_NETGROUP)
+CONFIGURE_ARGS+= --with-netgroup
+PLIST_SUB+= NETGROUP=""
+.else
+CONFIGURE_ARGS+= --without-netgroup
+PLIST_SUB+= NETGROUP="@comment "
+.endif
+
+.if defined(WITH_READLINE)
+CONFIGURE_ARGS+= --with-readline
+LIB_DEPENDS+= readline:${PORTSDIR}/devel/readline
+.else
+CONFIGURE_ARGS+= --without-readline
+.endif
+
+.if defined(WITH_RSH)
+CONFIGURE_ARGS+= --with-rsh
+PLIST_SUB+= RSH=""
+.else
+CONFIGURE_ARGS+= --without-rsh
+PLIST_SUB+= RSH="@comment "
+.endif
+
MAN1= dshbak.1 pdcp.1 pdsh.1
MLINKS= pdcp.1 rpdcp.1
Index: pkg-plist
===================================================================
RCS file: /usr/local/arch/csup/ports/sysutils/pdsh/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist 30 Nov 2010 01:24:10 -0000 1.2
+++ pkg-plist 15 Dec 2010 20:18:41 -0000
@@ -6,10 +6,16 @@
lib/pdsh/execcmd.a
lib/pdsh/execcmd.la
lib/pdsh/execcmd.so
-lib/pdsh/sshcmd.a
-lib/pdsh/sshcmd.la
-lib/pdsh/sshcmd.so
-lib/pdsh/xrcmd.a
-lib/pdsh/xrcmd.la
-lib/pdsh/xrcmd.so
+%%DSH%%lib/pdsh/dshgroup.a
+%%DSH%%lib/pdsh/dshgroup.la
+%%DSH%%lib/pdsh/dshgroup.so
+%%NETGROUP%%lib/pdsh/netgroup.a
+%%NETGROUP%%lib/pdsh/netgroup.la
+%%NETGROUP%%lib/pdsh/netgroup.so
+%%SSH%%lib/pdsh/sshcmd.a
+%%SSH%%lib/pdsh/sshcmd.la
+%%SSH%%lib/pdsh/sshcmd.so
+%%RSH%%lib/pdsh/xrcmd.a
+%%RSH%%lib/pdsh/xrcmd.la
+%%RSH%%lib/pdsh/xrcmd.so
@dirrm lib/pdsh
--/9DWx/yDrRhgMJTb--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012152120.oBFLK5En099449>