 @@ -1,14 +1,14 @@
-$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
 ======================
 	Any unresolved PRs (if you have commit access)
 	http://gnats.NetBSD.org/summary/category/pkg.html
 	Any complete, polished packages in pkgsrc-wip (ditto)
 	https://www.pkgsrc.org/wip/
 	Any interesting packages in FreeBSD's ports.
 	http://freshports.org/
 @@ -1031,27 +1031,26 @@ For possible Perl packages updates, see
 	o olvwm-4.5
 	o oo2c-2.1.7
 	o opal-3.16.2
 	o openafs-1.8
 	o opencolorio-1.1.0
 	o opencsg-1.4.0
 	o openh323-1.19.1
 	o openmortal-0.7.1
 	o openoffice-4.1
 	o openoffice3-3.3
 	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
 	o orc-0.4.29
 	o oroborus-2.0.18
 	o ortp-0.25.0
 	o oto-0.5
 	o p0f-3.08b
 	o p5-DBD-DB2-1.85
 	o p5-Publican-4.3.2
 	o p5-RT-Authen-ExternalAuth-0.27
 	o packagekit-0.5.3
 	o pam-krb5-4.7

 @@ -149,26 +149,27 @@ dtrace			Enable DTrace support.
 dts			Enable DTS Coherent Acoustics support.
 dv			Enable usage of the libdv library.
 dvdcss			Enable CSS support for DVDs.
 dvdnav			Enable libdvdnav support to navigate DVDs.
 dvdread			Enable reproduction of DVDs.
 dvi			Enable device independent file format (mostly TeX) support.
 eaccelerator-disassembler	Include disassembler.
 eaccelerator-doc-comment-inclusion	Retain doc-comments in internal php structures.
 eai			Enable EAI (Email Address Internationalization) support.
 eb			Enable EB dictionary library support.
 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.
 el1			Switch to EL1 before booting kernel (required for 32-bit kernels).
 elinks-exmode		Enable vi-like command entry.
 elinks-fastmem		Allow direct use of system memory allocation functions.
 elinks-html-highlight	Enable HTML highlighting using DOM engine.
 elinks-root-exec	Allow elinks to run as root.
 emacs-w3m		W3m browser extention.
 embedded-server		Enable embedded server support for MySQL.
 enchant			Add spell checking support using enchant.
 enchant-zemberek	Add spell checking support for Turkish.
 epoll			Enable support for epoll I/O event notification facility.

 @@ -1,17 +1,18 @@
-# $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/}
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.openssh.com/
 COMMENT=		Open Source Secure shell client and server (remote login program)
 LICENSE=		modified-bsd
 CONFLICTS=		sftp-[0-9]*
 CONFLICTS+=		ssh-[0-9]* ssh6-[0-9]*
 CONFLICTS+=		ssh2-[0-9]* ssh2-nox11-[0-9]*
 CONFLICTS+=		openssh+gssapi-[0-9]*
 CONFLICTS+=		lsh>2.0

 @@ -1,20 +1,20 @@
-# $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 $
 .include "../../mk/bsd.prefs.mk"
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openssh
-PKG_SUPPORTED_OPTIONS=	kerberos openssl pam
+PKG_SUPPORTED_OPTIONS=	editline kerberos openssl pam
-PKG_SUGGESTED_OPTIONS=	openssl
+PKG_SUGGESTED_OPTIONS=	editline openssl
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=	pam
 .endif
 .include "../../mk/bsd.options.mk"
 .if !empty(PKG_OPTIONS:Mopenssl)
 .include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-ssl-dir=${SSLBASE:Q}
 .else
 CONFIGURE_ARGS+=	--without-openssl
 .endif
 @@ -34,13 +34,18 @@ CONFIGURE_ENV+=		ac_cv_search_k_hasafs=n
 #.endif
 PLIST_VARS+=	pam
 .if !empty(PKG_OPTIONS:Mpam)
 .include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pam
 MESSAGE_SRC+=		${.CURDIR}/MESSAGE.pam
 MESSAGE_SUBST+=		EGDIR=${EGDIR}
 .  if ${OPSYS} == "Linux"
 PLIST.pam=	yes
 .  endif
 .endif
 .if !empty(PKG_OPTIONS:Meditline)
 .include "../../devel/editline/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-libedit=${BUILDLINK_PREFIX.editline}
 .endif