Thu Jan 25 19:52:38 2018 UTC ()
libssh: fix options.mk for current cmake based build


(markd)
diff -r1.2 -r1.3 pkgsrc/security/libssh/options.mk
cvs diff -r1.2 -r1.3 pkgsrc/security/libssh/options.mk (expand / switch to unified diff)

--- pkgsrc/security/libssh/options.mk 2015/11/18 21:00:51 1.2
+++ pkgsrc/security/libssh/options.mk 2018/01/25 19:52:38 1.3
@@ -1,29 +1,27 @@ @@ -1,29 +1,27 @@
1# $NetBSD: options.mk,v 1.2 2015/11/18 21:00:51 christos Exp $ 1# $NetBSD: options.mk,v 1.3 2018/01/25 19:52:38 markd Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME} 3PKG_OPTIONS_VAR= PKG_OPTIONS.libssh
4PKG_OPTIONS_REQUIRED_GROUPS= crypto 4PKG_OPTIONS_REQUIRED_GROUPS= crypto
5PKG_OPTIONS_GROUP.crypto= openssl libgcrypt 5PKG_OPTIONS_GROUP.crypto= openssl libgcrypt
6#PKG_SUPPORTED_OPTIONS= compression 6#PKG_SUPPORTED_OPTIONS= compression
7PKG_SUGGESTED_OPTIONS= openssl # XXX zlib 7PKG_SUGGESTED_OPTIONS= openssl # XXX zlib
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11.if !empty(PKG_OPTIONS:Mzlib) 11.if !empty(PKG_OPTIONS:Mzlib)
12BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2 12BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2
13CONFIGURE_ARGS+= --with-libz=${BUILDLINK_PREFIX.zlib:Q} 13CONFIGURE_ARGS+= --with-libz=${BUILDLINK_PREFIX.zlib:Q}
14.include "../../devel/zlib/buildlink3.mk" 14.include "../../devel/zlib/buildlink3.mk"
15.endif 15.endif
16 16
17.if !empty(PKG_OPTIONS:Mopenssl) 17.if !empty(PKG_OPTIONS:Mopenssl)
18BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.8 18BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.8
19CONFIGURE_ARGS+= --with-libgcrypt=no 19CMAKE_ARGS+= -DWITH_GCRYPT:BOOL=OFF
20CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 
21.include "../../security/openssl/buildlink3.mk" 20.include "../../security/openssl/buildlink3.mk"
22.endif 21.endif
23 22
24.if !empty(PKG_OPTIONS:Mlibgcrypt) 23.if !empty(PKG_OPTIONS:Mlibgcrypt)
25BUILDLINK_API_DEPENDS.libgcrypt+= libgcrypt>=1.4 24BUILDLINK_API_DEPENDS.libgcrypt+= libgcrypt>=1.4
26CONFIGURE_ARGS+= --with-libgcrypt=${BUILDLINK_PREFIX.libgcrypt:Q} 25CMAKE_ARGS+= -DWITH_GCRYPT:BOOL=ON
27CONFIGURE_ARGS+= --with-openssl=no 
28.include "../../security/libgcrypt/buildlink3.mk" 26.include "../../security/libgcrypt/buildlink3.mk"
29.endif 27.endif