Update x11vnc to 0.9.7.

Pkgsrc changes:
 * add avahi option (disabled by default).

Notes:

New in the 0.9.7 x11vnc release:

        Basic support for building with VirtualGL's TurboVNC (an
                enhanced TightVNC for fast LAN high framerate usage)
                encoding and TightVNC modifications.  More info:
                http://www.karlrunge.com/x11vnc/faq.html#faq-turbovnc
                and x11vnc/misc/turbovnc/README.

        The -ncache_cr option has been fixed and so in -ncache mode
                smooth opaque window motions are now work correctly. Try
                it out to see how smooth it is even on a slow link.

        Support for Linux text consoles (virtual terminals, e.g. 1-6)
                is provided via, e.g., 'x11vnc -rawfb vt2' (for virtual
                terminal #2).

                This is like LinuxVNC (i.e. text only), it avoids using
                /dev/fb and uses /dev/vcsaN instead (the '-rawfb console'
                mode uses /dev/fb.)  With /dev/vcsaN the text terminal
                is accessible even it if is not the currently active one.

        The -rawfb option now supports framebuffers with bits per pixel
                less than 8 (e.g. 4 or 1 bpp.)

        Reverse connections now work in Anonymous Diffie Hellman SSL/TLS
                mode.  Reverse connections also work for VeNCrypt and
                ANONTLS modes.


  miscellaneous new features and changes:

        The included SSL enabled UltraVNC java viewer now has a
                configurable [Home] entry in the drives drop down menu.

        In the -create, -svc, etc. modes one can now specify a
                range of X displays to ignore in X11VNC_SKIP_DISPLAY.
                Improvements and bugfixes were made to the find_display
                and create_display scripts.  FD_EXTRA option is provided.

        The '-rawfb video' option finds the video device file more
                carefully.

        The -rmflag option allows a new way to indicate to other
                applications that x11vnc has started.

        All of the java applet parameters are now documented in
                the classes/ssl/README file.

        There is now a "sendbell" remote control command.

        A one-time -padgeom once:WxH mode is added.

        Improvements to the CUPS Terminal Services helper mode.

        If the X display cannot be opened normally then the env. var.
                XAUTHLOCALHOSTNAME=localhost is tried.

        Bugfix for selection transfer to a now non-existent X window
                (Thunderbird can cause this.)  Related, the env. variable
                LIBXCB_ALLOW_SLOPPY_LOCK is now set by default.

        Bugfix for -8to24 mode due to nonstandard indexed color support.

        The libvncserver and x11vnc autoconf/automake settings have
                been improved.

        libXrandr include file is now found on Solaris.

3 files changed, 18 insertions, 8 deletions

diff --git a/x11/x11vnc/Makefile b/x11/x11vnc/Makefile
index 640a826481a..1aacd19ee89 100644
--- a/x11/x11vnc/Makefile
+++ b/x11/x11vnc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2008/12/11 07:27:00 obache Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/07 14:03:26 obache Exp $
 #
 
-DISTNAME=	x11vnc-0.9.6
+DISTNAME=	x11vnc-0.9.7
 CATEGORIES=	x11 net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libvncserver/}
 
@@ -9,6 +9,8 @@ MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://www.karlrunge.com/x11vnc/
 COMMENT=	VNC server for real X displays
 
+LICENSE=	gnu-gpl-v2
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_DIRS+=	xdg-1.1
@@ -30,5 +32,6 @@ INSTALL_DIRS=	x11vnc classes
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../net/libvncserver/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/x11vnc/distinfo b/x11/x11vnc/distinfo
index 6fb10ffe4de..a44cc7cee5c 100644
--- a/x11/x11vnc/distinfo
+++ b/x11/x11vnc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2008/12/11 07:27:00 obache Exp $
+$NetBSD: distinfo,v 1.13 2009/05/07 14:03:26 obache Exp $
 
-SHA1 (x11vnc-0.9.6.tar.gz) = 2cc67604a8a4bb0c40738f3bdf7295dee9637eb3
-RMD160 (x11vnc-0.9.6.tar.gz) = 5587d325fc9a3d735e653fefa2e4425c9e737477
-Size (x11vnc-0.9.6.tar.gz) = 2461744 bytes
+SHA1 (x11vnc-0.9.7.tar.gz) = 0ce3a0dd83694fddd64d262320ab7d2edb5310cc
+RMD160 (x11vnc-0.9.7.tar.gz) = e9eec21ca31b5ec215898624057edc6bd275edcb
+Size (x11vnc-0.9.7.tar.gz) = 2528334 bytes
diff --git a/x11/x11vnc/options.mk b/x11/x11vnc/options.mk
index 3dd56a5c046..98b040c91df 100644
--- a/x11/x11vnc/options.mk
+++ b/x11/x11vnc/options.mk
@@ -1,12 +1,19 @@
-# $NetBSD: options.mk,v 1.1 2008/10/25 06:12:06 obache Exp $
+# $NetBSD: options.mk,v 1.2 2009/05/07 14:03:26 obache Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.x11vnc
-PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUPPORTED_OPTIONS=	avahi x11
 PKG_SUGGESTED_OPTIONS=	x11
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mavahi)
+.include "../../net/avahi/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-avahi=${BUILDLINK_PREFIX.avahi}
+.else
+CONFIGURE_ARGS+=	--without-avahi
+.endif
+
 .if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=		--with-x
 BUILDLINK_DEPMETHOD.libXt?=	build