Update x11vnc to 0.9.6.

New in the 0.9.6 x11vnc release:

        x11vnc's SSL encryption is extended to support the VeNCrypt and
                TLS (older; vino) SSL/TLS security type extensions to VNC.

        Anonymous Diffie-Hellman key exchange (-ssl ANON) and Certificate
                Revocation List support (-sslCRL) is added to the SSL
                encryption mode.

        The Java viewer applet can now be served up through the VNC port
                (5900) in addition to the normal HTTP port (5800) via
                the -http_oneport option.  Previously this only worked
                for SSL connections and HTTPS.

        The "-rfbport PROMPT" mode presents a simple gui for the user
                to select a port for the x11vnc service and a few other
                settings.  This enables a menu entry for naive users
                that is included in x11vnc.desktop.

        If x11vnc is not built with the Avahi Zeroconf library an external
                helper program (avahi-publish or dns-sd on Mac OS X)
                is used instead.

  miscellaneous new features and changes:

        The default mode for '-ssl' is now the '-ssl SAVE' mode; i.e.
                the generated certificate is saved and reused in
                subsequent sessions rather than being discarded.
                Use '-ssl TMP' recover the old way.  This change made
                to for it to be more likely that the VNC Viewer can save
                the accepted cert for future authentications.

        The solid background color option works on the Mac OS X console.

        The -reopen option enables x11vnc to try to re connect to the X
                display if GDM (or other display manager) kills it just
                after the user logs in.

        The -dhparams option can be used to point to your own Diffie
                Hellman parameters.

        The -setdefer option allows tuning how quickly updates will
                be sent.  Default setting tuned.

        The option -zeroconf is now an alias for -avahi/-mdns.

        In pipeinput mode, the pipe filehandle is now closed when
                x11vnc exits.

        The -sshonly option turns off VeNCrypt and TLSVNC (vino) mod
                leaving only the standard SSL (i.e. vncs://)

        For testing, the option -rand in an alias for -rawfb rand -nopw

        Minor tweaks to improve CUPS Print tunneling.

3 files changed, 11 insertions, 7 deletions

diff --git a/x11/x11vnc/Makefile b/x11/x11vnc/Makefile
index 1dcdf569a2e..640a826481a 100644
--- a/x11/x11vnc/Makefile
+++ b/x11/x11vnc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2008/10/25 06:12:06 obache Exp $
+# $NetBSD: Makefile,v 1.18 2008/12/11 07:27:00 obache Exp $
 #
 
-DISTNAME=	x11vnc-0.9.5
+DISTNAME=	x11vnc-0.9.6
 CATEGORIES=	x11 net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libvncserver/}
 
@@ -11,6 +11,8 @@ COMMENT=	VNC server for real X displays
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_DIRS+=	xdg-1.1
+
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--with-system-libvncserver
diff --git a/x11/x11vnc/PLIST b/x11/x11vnc/PLIST
index 08de4820ebb..b58cf058d91 100644
--- a/x11/x11vnc/PLIST
+++ b/x11/x11vnc/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2007/05/24 13:30:22 obache Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/12/11 07:27:00 obache Exp $
 bin/x11vnc
 man/man1/x11vnc.1
+share/applications/x11vnc.desktop
 share/x11vnc/classes/VncViewer.jar
 share/x11vnc/classes/index.vnc
 share/x11vnc/classes/ssl/README
@@ -16,3 +17,4 @@ share/x11vnc/classes/ssl/ultrasigned.vnc
 @dirrm share/x11vnc/classes/ssl
 @dirrm share/x11vnc/classes
 @dirrm share/x11vnc
+@comment in xdg-dirs: @dirrm share/applications
diff --git a/x11/x11vnc/distinfo b/x11/x11vnc/distinfo
index 97994f1c54d..6fb10ffe4de 100644
--- a/x11/x11vnc/distinfo
+++ b/x11/x11vnc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2008/10/25 06:12:06 obache Exp $
+$NetBSD: distinfo,v 1.12 2008/12/11 07:27:00 obache Exp $
 
-SHA1 (x11vnc-0.9.5.tar.gz) = 236f7b3ba6a33422cf7593de7d7843c233143129
-RMD160 (x11vnc-0.9.5.tar.gz) = ba225af1b003c4c258a0fabad5d5c792e2149770
-Size (x11vnc-0.9.5.tar.gz) = 2413415 bytes
+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