- Add CMAKE options properly.

- Add SASL as an OPTIONS_DEFINE.
- Bump PORTREVISION.

PR:		234929 and 235302
Submitted by:	Derek Schrock <dereks@lifeofadishwasher.com>,
		O. Hartmann <ohartmann@walstatt.org>,
		Chad Jacob Milios <milios@ccsys.com>
Tested by:	many
Differential Revision:	https://reviews.freebsd.org/D19009

net/libvncserver/Makefile

@@ -4,6 +4,7 @@
 PORTNAME=	libvncserver
 PORTVERSION=	0.9.12
 DISTVERSIONPREFIX=	LibVNCServer-
+PORTREVISION=	1
 CATEGORIES=	net devel
 
 MAINTAINER=	araujo@FreeBSD.org
@@ -17,14 +18,29 @@ 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
@@ -33,12 +49,6 @@ 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
 

net/libvncserver/files/patch-libvncclient_sasl.c

@@ -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 <arpa/inet.h>
++#include <netinet/in.h>
++#include <sys/socket.h>
+ #endif /* WIN32 */
+ 
+ #include "sasl.h"