CVS commit: pkgsrc/security/openssh

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Mon Jul 24 16:33:22 UTC 2017

Modified Files:
        pkgsrc/security/openssh: Makefile options.mk

Log Message:
Include 'pam' in the suggested/default list of options on NetBSD.
Add LICENSE setting, near as I can tell "modified-bsd".
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.252 -r1.253 pkgsrc/security/openssh/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/security/openssh/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/openssh/Makefile
diff -u pkgsrc/security/openssh/Makefile:1.252 pkgsrc/security/openssh/Makefile:1.253
--- pkgsrc/security/openssh/Makefile:1.252      Wed May 31 09:30:21 2017
+++ pkgsrc/security/openssh/Makefile    Mon Jul 24 16:33:22 2017
@@ -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@localhost
 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]*

Index: pkgsrc/security/openssh/options.mk
diff -u pkgsrc/security/openssh/options.mk:1.34 pkgsrc/security/openssh/options.mk:1.35
--- pkgsrc/security/openssh/options.mk:1.34     Fri Dec 30 04:43:16 2016
+++ pkgsrc/security/openssh/options.mk  Mon Jul 24 16:33:22 2017
@@ -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)