Update libVNCServer to 0.9.8.

0.9.8
   - Overall changes:
     * Automagically generated API documentation using doxygen.
     * Added support for pkg-config.
     * Fixed Mingw32 cross compilation.
     * Fixed CMake build system.

   - LibVNCServer/LibVNCClient:
     * All files used by _both_ LibVNCServer and LibVNCClient were put into
       a 'common' directory, reducing code duplication.
     * Implemented xvp VNC extension.
     * Updated minilzo library used for Ultra encoding to ver 2.04.
       According to the minilzo README, this brings a significant
       speedup on 64-bit architechtures.

   - LibVNCServer:
     * Thread safety for ZRLE, Zlib, Tight, RRE, CoRRE and Ultra encodings.
       This makes all VNC encodings safe to use with a multithreaded server.
     * A DisplayFinishedHook for LibVNCServer. If set, this hook gets called
       just before rfbSendFrameBufferUpdate() returns.
     * Fix for tight security type for RFB 3.8 in TightVNC file transfer
       (Debian Bug #517422).

   - LibVNCClient:
     * Unix sockets support.
     * Anonymous TLS security type support.
     * VeNCrypt security type support.
     * MSLogon security type support.
     * ARD (Apple Remote Desktop) security type support.
     * UltraVNC Repeater support.
     * A new FinishedFrameBufferUpdate callback that is invoked after each
       complete framebuffer update.
     * A new non-forking listen (reverse VNC) function that works under
       Windows.
     * IPv6 support. LibVNCClient is now able to connect to IPv6 VNC servers.
     * IP QoS support. This enables setting the DSCP/Traffic Class field of
       IP/IPv6 packets sent by a client. For example starting a client with
       -qosdscp 184 marks all outgoing traffic for expedited forwarding.
       Implementation for Win32 is still a TODO, though.
     * Fixed hostname resolution problems under Windows.

   - SDLvncviewer
     * Is now resizable and can do key repeat, mouse wheel scrolling
       and clipboard copy and paste.

   - LinuxVNC:
     * Fix for no input possible because of ctrl key being stuck.
       Issue was reported as Debian bug #555988.

5 files changed, 64 insertions, 12 deletions

diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile
index 2ce7420b0a1..80164503107 100644
--- a/net/libvncserver/Makefile
+++ b/net/libvncserver/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:53 dsainty Exp $
+# $NetBSD: Makefile,v 1.11 2011/04/04 09:13:44 obache Exp $
 #
 
-DISTNAME=		LibVNCServer-0.9.7
-PKGNAME=		libVNCServer-0.9.7
-PKGREVISION=		3
+DISTNAME=		LibVNCServer-0.9.8
+PKGNAME=		libVNCServer-0.9.8
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libvncserver/}
 
@@ -17,8 +16,12 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
+PKGCONFIG_OVERRIDE+=	libvncserver.pc.in
+PKGCONFIG_OVERRIDE+=	libvncclient.pc.in
+
 CONFIGURE_ARGS+=	--without-x
-CONFIGURE_ARGS+=	--without-sdl
+CONFIGURE_ARGS+=	--without-sdl-config
+CONFIGURE_ARGS+=	--without-x11vnc
 
 PTHREAD_AUTO_VARS=	yes
 SUBST_CLASSES+=		pthread
@@ -26,6 +29,8 @@ SUBST_STAGE.pthread=	pre-configure
 SUBST_FILES.pthread=	configure
 SUBST_SED.pthread=	-e 's|-lpthread||g'
 
+.include "options.mk"
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/net/libvncserver/PLIST b/net/libvncserver/PLIST
index bf990c00da3..b8015aae0ad 100644
--- a/net/libvncserver/PLIST
+++ b/net/libvncserver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:09:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/04/04 09:13:44 obache Exp $
 bin/libvncserver-config
 include/rfb/keysym.h
 include/rfb/rfb.h
@@ -9,3 +9,5 @@ include/rfb/rfbproto.h
 include/rfb/rfbregion.h
 lib/libvncclient.la
 lib/libvncserver.la
+lib/pkgconfig/libvncclient.pc
+lib/pkgconfig/libvncserver.pc
diff --git a/net/libvncserver/buildlink3.mk b/net/libvncserver/buildlink3.mk
index 1d2e1001536..e1530bbd51d 100644
--- a/net/libvncserver/buildlink3.mk
+++ b/net/libvncserver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2010/12/23 11:44:53 dsainty Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2011/04/04 09:13:44 obache Exp $
 
 BUILDLINK_TREE+=	libVNCServer
 
@@ -6,11 +6,23 @@ BUILDLINK_TREE+=	libVNCServer
 LIBVNCSERVER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libVNCServer+=	libVNCServer>=0.9.1
-BUILDLINK_ABI_DEPENDS.libVNCServer?=	libVNCServer>=0.9.7nb2
+BUILDLINK_ABI_DEPENDS.libVNCServer+=	libVNCServer>=0.9.8
 BUILDLINK_PKGSRCDIR.libVNCServer?=	../../net/libvncserver
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
+
+pkgbase := libVNCServer
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.libVNCServer:Mgnutls)
+.include "../../security/gnutls/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.libVNCServer:Mlibgcrypt)
+.include "../../security/libgcrypt/buildlink3.mk"
+.endif
+
 .endif # LIBVNCSERVER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libVNCServer
diff --git a/net/libvncserver/distinfo b/net/libvncserver/distinfo
index ec31b64b280..427a357865f 100644
--- a/net/libvncserver/distinfo
+++ b/net/libvncserver/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2009/05/07 12:19:15 obache Exp $
+$NetBSD: distinfo,v 1.4 2011/04/04 09:13:44 obache Exp $
 
-SHA1 (LibVNCServer-0.9.7.tar.gz) = 681b0f3d000ad8c18d3643e1148e1ae5052c8a9a
-RMD160 (LibVNCServer-0.9.7.tar.gz) = 50325d0827a0e65e9da91991011e2a1b05c491e2
-Size (LibVNCServer-0.9.7.tar.gz) = 1105538 bytes
+SHA1 (LibVNCServer-0.9.8.tar.gz) = 71e88ea95ad147185bbf6ca24ba7b0fbb8634421
+RMD160 (LibVNCServer-0.9.8.tar.gz) = e2ee515623ad3bb065a87fa5a66e9ada77690cc3
+Size (LibVNCServer-0.9.8.tar.gz) = 1240804 bytes
diff --git a/net/libvncserver/options.mk b/net/libvncserver/options.mk
new file mode 100644
index 00000000000..b339336ddb0
--- /dev/null
+++ b/net/libvncserver/options.mk
@@ -0,0 +1,33 @@
+# $NetBSD: options.mk,v 1.1 2011/04/04 09:13:44 obache Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.libVNCServer
+PKG_SUPPORTED_OPTIONS=	gnutls inet6 libgcrypt
+PKG_SUGGESTED_OPTIONS=	gnutls inet6 libgcrypt
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgnutls)
+.include "../../security/gnutls/buildlink3.mk"
+USE_TOOLS+=	pkg-config
+CONFIGURE_ARGS+=	--with-gnutls
+CONFIGURE_ARGS+=	--with-client-tls
+.else
+CONFIGURE_ARGS+=	--without-gnutls
+CONFIGURE_ARGS+=	--without-client-tls
+.endif
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--with-ipv6
+.else
+CONFIGURE_ARGS+=	--without-ipv6
+.endif
+
+.if !empty(PKG_OPTIONS:Mlibgcrypt)
+.include "../../security/libgcrypt/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gcrypt
+CONFIGURE_ARGS+=	--with-client-gcrypt
+CONFIGURE_ARGS+=	--with-libgcrypt-prefix=${BUILDLINK_PREFIX.libgcrypt}
+.else
+CONFIGURE_ARGS+=	--without-gcrypt
+CONFIGURE_ARGS+=	--without-client-gcrypt
+.endif