Mon Nov 6 10:21:09 2023 UTC ()
openssh: Use OPSYSVARS.


(jperkin)
diff -r1.42 -r1.43 pkgsrc/security/openssh/options.mk
cvs diff -r1.42 -r1.43 pkgsrc/security/openssh/options.mk (expand / switch to unified diff)

--- pkgsrc/security/openssh/options.mk 2023/11/06 10:11:34 1.42
+++ pkgsrc/security/openssh/options.mk 2023/11/06 10:21:09 1.43
@@ -1,27 +1,21 @@ @@ -1,27 +1,21 @@
1# $NetBSD: options.mk,v 1.42 2023/11/06 10:11:34 wiz Exp $ 1# $NetBSD: options.mk,v 1.43 2023/11/06 10:21:09 jperkin Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.openssh 3PKG_OPTIONS_VAR= PKG_OPTIONS.openssh
4PKG_SUPPORTED_OPTIONS= editline fido kerberos openssl pam legacymodsz 4PKG_SUPPORTED_OPTIONS= editline fido kerberos openssl pam legacymodsz
5PKG_SUGGESTED_OPTIONS= editline openssl 5PKG_SUGGESTED_OPTIONS= editline openssl
6 6
7.include "../../mk/bsd.prefs.mk" 7PKG_SUGGESTED_OPTIONS.Darwin+= fido
8 8PKG_SUGGESTED_OPTIONS.NetBSD+= fido pam
9.if ${OPSYS} == "NetBSD" 
10PKG_SUGGESTED_OPTIONS+= fido pam 
11.endif 
12.if ${OPSYS} == "Darwin" 
13PKG_SUGGESTED_OPTIONS+= fido 
14.endif 
15 9
16.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
17 11
18.if !empty(PKG_OPTIONS:Mopenssl) 12.if !empty(PKG_OPTIONS:Mopenssl)
19.include "../../security/openssl/buildlink3.mk" 13.include "../../security/openssl/buildlink3.mk"
20CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE:Q} 14CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE:Q}
21.else 15.else
22CONFIGURE_ARGS+= --without-openssl 16CONFIGURE_ARGS+= --without-openssl
23.endif 17.endif
24 18
25.if !empty(PKG_OPTIONS:Mkerberos) 19.if !empty(PKG_OPTIONS:Mkerberos)
26. include "../../mk/krb5.buildlink3.mk" 20. include "../../mk/krb5.buildlink3.mk"
27CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE} 21CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE}