diff options
| author | he <he@pkgsrc.org> | 2017-07-24 16:33:22 +0000 |
|---|---|---|
| committer | he <he@pkgsrc.org> | 2017-07-24 16:33:22 +0000 |
| commit | 6bec1aee2e6f3b6cfc93e1880efbda333885b345 (patch) | |
| tree | c8c5c53efe1f69220f7cd22f3f64f06c351c9ae1 | |
| parent | 1e69303a1cfdd5fbdb622c43793eedaf741d60c6 (diff) | |
| download | pkgsrc-6bec1aee2e6f3b6cfc93e1880efbda333885b345.tar.gz | |
Include 'pam' in the suggested/default list of options on NetBSD.
Add LICENSE setting, near as I can tell "modified-bsd".
Bump PKGREVISION.
| -rw-r--r-- | security/openssh/Makefile | 4 | ||||
| -rw-r--r-- | security/openssh/options.mk | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 151e99fa732..fe04938d06f 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,13 +1,15 @@ -# $NetBSD: Makefile,v 1.252 2017/05/31 09:30:21 jperkin Exp $ +# $NetBSD: Makefile,v 1.253 2017/07/24 16:33:22 he Exp $ DISTNAME= openssh-7.5p1 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]* diff --git a/security/openssh/options.mk b/security/openssh/options.mk index 595ba67eff2..940447d7fcd 100644 --- a/security/openssh/options.mk +++ b/security/openssh/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.34 2016/12/30 04:43:16 taca Exp $ +# $NetBSD: options.mk,v 1.35 2017/07/24 16:33:22 he Exp $ .include "../../mk/bsd.prefs.mk" @@ -6,6 +6,10 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.openssh PKG_SUPPORTED_OPTIONS= kerberos openssl pam PKG_SUGGESTED_OPTIONS= openssl +.if ${OPSYS} == "NetBSD" +PKG_SUGGESTED_OPTIONS+= pam +.endif + .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mopenssl) |