[pkgsrc/trunk]: pkgsrc/net/libvncserver Fix build when security/cyrus-sasl is...

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f347d802c63a
branches:  trunk
changeset: 391988:f347d802c63a
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Wed Feb 20 12:21:34 2019 +0000

description:
Fix build when security/cyrus-sasl is installed

Introduce sasl option (disabled by default) to inconsistent
detection of cyrus-sasl between CMAKE and CC.
Reported by NISHIMURA Takeshi.

diffstat:

 net/libvncserver/Makefile   |   3 +--
 net/libvncserver/options.mk |  11 +++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r e61d3eb9db43 -r f347d802c63a net/libvncserver/Makefile
--- a/net/libvncserver/Makefile Wed Feb 20 12:21:27 2019 +0000
+++ b/net/libvncserver/Makefile Wed Feb 20 12:21:34 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/02/01 12:45:21 tnn Exp $
+# $NetBSD: Makefile,v 1.27 2019/02/20 12:21:34 ryoon Exp $
 #
 
 DISTNAME=              libvncserver-LibVNCServer-0.9.12
@@ -29,7 +29,6 @@
 CMAKE_ARGS+=           -DWITH_TIGHTVNC_FILETRANSFER=ON
 CMAKE_ARGS+=           -DWITH_WEBSOCKETS=ON
 CMAKE_ARGS+=           -DWITH_24BPP=ON
-CMAKE_ARGS+=           -DWITH_SASL=ON
 CMAKE_ARGS+=           -DWITH_LZO=ON
 CMAKE_ARGS+=           -DWITH_ZLIB=ON
 CMAKE_ARGS+=           -DWITH_JPEG=ON
diff -r e61d3eb9db43 -r f347d802c63a net/libvncserver/options.mk
--- a/net/libvncserver/options.mk       Wed Feb 20 12:21:27 2019 +0000
+++ b/net/libvncserver/options.mk       Wed Feb 20 12:21:34 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2019/02/01 12:45:21 tnn Exp $
+# $NetBSD: options.mk,v 1.3 2019/02/20 12:21:34 ryoon Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libVNCServer
-PKG_SUPPORTED_OPTIONS= gnutls inet6 libgcrypt openssl
+PKG_SUPPORTED_OPTIONS= gnutls inet6 libgcrypt openssl sasl
 PKG_SUGGESTED_OPTIONS= gnutls inet6 libgcrypt
 PKG_OPTIONS_OPTIONAL_GROUPS+=  ssl
 PKG_OPTIONS_GROUP.ssl=         gnutls openssl
@@ -34,3 +34,10 @@
 .else
 CMAKE_ARGS+=   -DWITH_OPENSSL=OFF
 .endif
+
+.if !empty(PKG_OPTIONS:Msasl)
+.include "../../security/cyrus-sasl/buildlink3.mk"
+CMAKE_ARGS+=   -DWITH_SASL=ON
+.else
+CMAKE_ARGS+=   -DWITH_SASL=OFF
+.endif