CVS commit: pkgsrc/security/libssh

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Thu Jan 25 19:52:38 UTC 2018

Modified Files:
        pkgsrc/security/libssh: options.mk

Log Message:
libssh: fix options.mk for current cmake based build


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/libssh/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/libssh/options.mk
diff -u pkgsrc/security/libssh/options.mk:1.2 pkgsrc/security/libssh/options.mk:1.3
--- pkgsrc/security/libssh/options.mk:1.2       Wed Nov 18 21:00:51 2015
+++ pkgsrc/security/libssh/options.mk   Thu Jan 25 19:52:38 2018
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.2 2015/11/18 21:00:51 christos Exp $
+# $NetBSD: options.mk,v 1.3 2018/01/25 19:52:38 markd Exp $
 
-PKG_OPTIONS_VAR=               PKG_OPTIONS.${PKGNAME}
+PKG_OPTIONS_VAR=               PKG_OPTIONS.libssh
 PKG_OPTIONS_REQUIRED_GROUPS=   crypto
 PKG_OPTIONS_GROUP.crypto=      openssl libgcrypt
 #PKG_SUPPORTED_OPTIONS=                compression
@@ -16,14 +16,12 @@ CONFIGURE_ARGS+=            --with-libz=${BUILDLIN
 
 .if !empty(PKG_OPTIONS:Mopenssl)
 BUILDLINK_API_DEPENDS.openssl+=        openssl>=0.9.8
-CONFIGURE_ARGS+=               --with-libgcrypt=no
-CONFIGURE_ARGS+=               --with-openssl=${SSLBASE:Q}
+CMAKE_ARGS+=           -DWITH_GCRYPT:BOOL=OFF
 .include "../../security/openssl/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibgcrypt)
 BUILDLINK_API_DEPENDS.libgcrypt+=      libgcrypt>=1.4
-CONFIGURE_ARGS+=               --with-libgcrypt=${BUILDLINK_PREFIX.libgcrypt:Q}
-CONFIGURE_ARGS+=               --with-openssl=no
+CMAKE_ARGS+=           -DWITH_GCRYPT:BOOL=ON
 .include "../../security/libgcrypt/buildlink3.mk"
 .endif