From owner-svn-ports-all@freebsd.org Thu Jan 31 01:47:03 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 059AE133E0FC; Thu, 31 Jan 2019 01:47:03 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A16BB8E491; Thu, 31 Jan 2019 01:47:02 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7E37D1AC; Thu, 31 Jan 2019 01:47:02 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0V1l2lZ022425; Thu, 31 Jan 2019 01:47:02 GMT (envelope-from araujo@FreeBSD.org) Received: (from araujo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0V1l21C022423; Thu, 31 Jan 2019 01:47:02 GMT (envelope-from araujo@FreeBSD.org) Message-Id: <201901310147.x0V1l21C022423@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: araujo set sender to araujo@FreeBSD.org using -f From: Marcelo Araujo Date: Thu, 31 Jan 2019 01:47:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491673 - in head/net/libvncserver: . files X-SVN-Group: ports-head X-SVN-Commit-Author: araujo X-SVN-Commit-Paths: in head/net/libvncserver: . files X-SVN-Commit-Revision: 491673 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A16BB8E491 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2019 01:47:03 -0000 Author: araujo Date: Thu Jan 31 01:47:01 2019 New Revision: 491673 URL: https://svnweb.freebsd.org/changeset/ports/491673 Log: - Add CMAKE options properly. - Add SASL as an OPTIONS_DEFINE. - Bump PORTREVISION. PR: 234929 and 235302 Submitted by: Derek Schrock , O. Hartmann , Chad Jacob Milios Tested by: many Differential Revision: https://reviews.freebsd.org/D19009 Added: head/net/libvncserver/files/patch-libvncclient_sasl.c (contents, props changed) Modified: head/net/libvncserver/Makefile Modified: head/net/libvncserver/Makefile ============================================================================== --- head/net/libvncserver/Makefile Thu Jan 31 01:38:50 2019 (r491672) +++ head/net/libvncserver/Makefile Thu Jan 31 01:47:01 2019 (r491673) @@ -4,6 +4,7 @@ PORTNAME= libvncserver PORTVERSION= 0.9.12 DISTVERSIONPREFIX= LibVNCServer- +PORTREVISION= 1 CATEGORIES= net devel MAINTAINER= araujo@FreeBSD.org @@ -17,27 +18,36 @@ LIB_DEPENDS= libpng.so:graphics/png \ USES= cmake jpeg libtool pathfix pkgconfig USE_LDCONFIG= yes +CMAKE_ON= WITH_24BPP WITH_JPEG WITH_LZO WITH_PNG \ + WITH_THREADS WITH_TIGHTVNC_FILETRANSFER \ + WITH_WEBSOCKETS WITH_ZLIB +CMAKE_OFF= WITH_FFMPEG WITH_SDL WITH_SDL WITH_SYSTEMD + USE_GITHUB= yes GH_ACCOUNT= LibVNC -OPTIONS_DEFINE= GCRYPT IPV6 +OPTIONS_DEFINE= GCRYPT IPV6 SASL OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= GNUTLS OPENSSL OPTIONS_DEFAULT= OPENSSL GCRYPT_DESC= libgcrypt support +SASL_DESC= SASL support +GCRYPT_CMAKE_BOOL= WITH_GCRYPT +GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ + libgpg-error.so:security/libgpg-error + +IPV6_CMAKE_BOOL= WITH_IPv6 + +SASL_CMAKE_BOOL= WITH_SASL +SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 + GNUTLS_IMPLIES= GCRYPT GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CMAKE_BOOL= WITH_GNUTLS OPENSSL_CMAKE_BOOL= WITH_OPENSSL OPENSSL_USES= ssl - -GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ - libgpg-error.so:security/libgpg-error -GCRYPT_CMAKE_BOOL= WITH_GCRYPT - -IPV6_CMAKE_BOOL= WITH_IPv6 post-install: ${INSTALL_DATA} ${WRKSRC}/rfb/default8x16.h ${STAGEDIR}${PREFIX}/include/rfb Added: head/net/libvncserver/files/patch-libvncclient_sasl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libvncserver/files/patch-libvncclient_sasl.c Thu Jan 31 01:47:01 2019 (r491673) @@ -0,0 +1,11 @@ +--- libvncclient/sasl.c.orig 2019-01-30 04:13:40 UTC ++++ libvncclient/sasl.c +@@ -55,6 +55,8 @@ + #endif /* LIBVNCSERVER_HAVE_WS2TCPIP_H */ + #else /* WIN32 */ + #include ++#include ++#include + #endif /* WIN32 */ + + #include "sasl.h"