Received: by mail.netbsd.org (Postfix, from userid 605) id 5236084EAC; Wed, 20 Feb 2019 12:21:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CD62984DA0 for ; Wed, 20 Feb 2019 12:21:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id hwE15TIGgbK3 for ; Wed, 20 Feb 2019 12:21:34 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4F6DD84D2C for ; Wed, 20 Feb 2019 12:21:34 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4CFA0FB16; Wed, 20 Feb 2019 12:21:34 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1550665294271440" MIME-Version: 1.0 Date: Wed, 20 Feb 2019 12:21:34 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/net/libvncserver To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20190220122134.4CFA0FB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1550665294271440 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Wed Feb 20 12:21:34 UTC 2019 Modified Files: pkgsrc/net/libvncserver: Makefile options.mk Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/libvncserver/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/libvncserver/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1550665294271440 Content-Disposition: inline Content-Length: 1674 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/libvncserver/Makefile diff -u pkgsrc/net/libvncserver/Makefile:1.26 pkgsrc/net/libvncserver/Makefile:1.27 --- pkgsrc/net/libvncserver/Makefile:1.26 Fri Feb 1 12:45:21 2019 +++ pkgsrc/net/libvncserver/Makefile Wed Feb 20 12:21:34 2019 @@ -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_THREADS=ON 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 Index: pkgsrc/net/libvncserver/options.mk diff -u pkgsrc/net/libvncserver/options.mk:1.2 pkgsrc/net/libvncserver/options.mk:1.3 --- pkgsrc/net/libvncserver/options.mk:1.2 Fri Feb 1 12:45:21 2019 +++ pkgsrc/net/libvncserver/options.mk Wed Feb 20 12:21:34 2019 @@ -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 @@ CMAKE_ARGS+= -DWITH_OPENSSL=ON .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 --_----------=_1550665294271440--