[pkgsrc/trunk]: pkgsrc openssh: Add optional command line editing to "sftp"

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ce0152641280
branches:  trunk
changeset: 322623:ce0152641280
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Apr 25 14:55:03 2019 +0000

description:
openssh: Add optional command line editing to "sftp"

Add new package option "editline" (enabled by default) which adds
command line editing and filename completion to the "sftp" client.

Bump the package revision because of this change.

diffstat:

 doc/TODO                        |   3 +--
 mk/defaults/options.description |   1 +
 security/openssh/Makefile       |   3 ++-
 security/openssh/options.mk     |  15 ++++++++++-----
 4 files changed, 14 insertions(+), 8 deletions(-)

diffs (70 lines):

diff -r e9d606f59c68 -r ce0152641280 doc/TODO
--- a/doc/TODO  Thu Apr 25 13:50:28 2019 +0000
+++ b/doc/TODO  Thu Apr 25 14:55:03 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.18952 2019/04/23 09:52:00 wiz Exp $
+$NetBSD: TODO,v 1.18953 2019/04/25 14:55:03 tron Exp $
 
 Suggested new packages
 ======================
@@ -1041,7 +1041,6 @@
        o opensc-0.19.0
        o openslp-2.0.0
        o opensmtpd-6.0.0
-       o openssh-7.9p1
        o openssl-1.0.2q
        o openvas-libraries-8.0.8
        o opera-26
diff -r e9d606f59c68 -r ce0152641280 mk/defaults/options.description
--- a/mk/defaults/options.description   Thu Apr 25 13:50:28 2019 +0000
+++ b/mk/defaults/options.description   Thu Apr 25 14:55:03 2019 +0000
@@ -159,6 +159,7 @@
 ecap                   Enable eCAP support.
 ecl                    Use Embeddable Common Lisp.
 ecore                  Enable ecore library support.
+editline               Enable use of the NetBSD Editline library.
 eekboard               Use eekboard for virtual keyboard support.
 efence                 Build with Electric Fence malloc() debugger support.
 efnet                  Enable tweaks to support EFNet.
diff -r e9d606f59c68 -r ce0152641280 security/openssh/Makefile
--- a/security/openssh/Makefile Thu Apr 25 13:50:28 2019 +0000
+++ b/security/openssh/Makefile Thu Apr 25 14:55:03 2019 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.257 2019/01/18 20:13:36 tnn Exp $
+# $NetBSD: Makefile,v 1.258 2019/04/25 14:55:04 tron Exp $
 
 DISTNAME=              openssh-7.9p1
 PKGNAME=               ${DISTNAME:S/p1/.1/}
+PKGREVISION=           1
 CATEGORIES=            security
 MASTER_SITES=          ${MASTER_SITE_OPENBSD:=OpenSSH/portable/}
 
diff -r e9d606f59c68 -r ce0152641280 security/openssh/options.mk
--- a/security/openssh/options.mk       Thu Apr 25 13:50:28 2019 +0000
+++ b/security/openssh/options.mk       Thu Apr 25 14:55:03 2019 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.35 2017/07/24 16:33:22 he Exp $
+# $NetBSD: options.mk,v 1.36 2019/04/25 14:55:04 tron Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.openssh
+PKG_SUPPORTED_OPTIONS= editline kerberos openssl pam
+PKG_SUGGESTED_OPTIONS= editline openssl
 
 .include "../../mk/bsd.prefs.mk"
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.openssh
-PKG_SUPPORTED_OPTIONS= kerberos openssl pam
-PKG_SUGGESTED_OPTIONS= openssl
-
 .if ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=        pam
 .endif
@@ -44,3 +44,8 @@
 PLIST.pam=     yes
 .  endif
 .endif
+
+.if !empty(PKG_OPTIONS:Meditline)
+.include "../../devel/editline/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-libedit=${BUILDLINK_PREFIX.editline}
+.endif