Update to tightvnc-1.3.9. pkgsrc changes:

---
 o patch-{ad,al}: regen
 o patch-ak: recognise NetBSD/amd64
 o Makefile: support X11_TYPE=modular and NetBSD/amd64

Major upstream changes that affect the server portion of the unix port:

1.3.9
-----
 o Added support for the standard RFB protocol version 3.8 with TightVNC
   extensions.
 o Made "host:port" parsing maximally compatible with VNC4. Interpreting a
   number in host names like somehost:5900 as an actual port number if it's not
   in the range [0..99].
 o Applied patches from Debian Linux that port Xvnc to x86_64 platform
   (tightvnc-1.2.9-amd64support.p and tightvnc-1.3_alpha7-x86_64.patch), thanks
   to Quanah Gibson-Mount.

1.3dev7
-------
 o Fixed a serious bug with sending cursor updates when there was no
   FrameBufferUpdateRequest from that client.
 o Fixed problems with building Xvnc on modern linux distributions, such as
   Fedora Core 3.
 o Disallowing clipboard transfers for view-only clients.

1.3dev5
-------
 o A number of bugfixes -- copying clipboard to non-authenticated clients in
   Xvnc, delayed cursor shape updates in Xvnc, and crashing on switching
   between KDE virtual desktops in vncviewer.
 o Support for the new -autopass option has been added, a patch from
   Ki NETWORKS, Inc.

5 files changed, 33 insertions, 24 deletions

diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 0bf29befb6f..97c24224004 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:07 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2007/06/17 20:58:49 tnn Exp $
 #
 
-DISTNAME=		tightvnc-1.2.9
-PKGREVISION=	2
+DISTNAME=		tightvnc-1.3.9
 CATEGORIES=		net x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vnc-tight/}
 DISTFILES=		${DISTNAME}_unixsrc.tar.bz2
@@ -21,6 +20,14 @@ NO_INSTALL_MANPAGES=	yes
 
 BUILD_TARGET=		World
 
+.include "../../mk/bsd.prefs.mk"
+
+# XXX - this should go into Xvnc's NetBSD.cf, but imake doesn't
+# seem to pick it up. Someone with strong X-fu needs to look at it.
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64)
+_WRAP_EXTRA_ARGS.CC+=	-DDDXTIME -D_XSERVER64 -DGCCUSESGAS
+.endif
+
 # We have to frob a few things, and we want our own permissions, so it's easier
 # to do the install ourselves.
 post-install:
@@ -46,4 +53,7 @@ post-install:
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo
index 1600b5981b0..3616d148214 100644
--- a/net/tightvnc/distinfo
+++ b/net/tightvnc/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.12 2005/04/06 04:44:15 xtraeme Exp $
+$NetBSD: distinfo,v 1.13 2007/06/17 20:58:49 tnn Exp $
 
-SHA1 (tightvnc-1.2.9_unixsrc.tar.bz2) = 62b55237676bbdc7f08771e6ff72c0f70264f4ee
-RMD160 (tightvnc-1.2.9_unixsrc.tar.bz2) = 57c4d24bbc008b7188ae4bb177fbb409bc1d26d3
-Size (tightvnc-1.2.9_unixsrc.tar.bz2) = 1738256 bytes
+SHA1 (tightvnc-1.3.9_unixsrc.tar.bz2) = a9529a262a060517402fb9845ef63a0d18c3141f
+RMD160 (tightvnc-1.3.9_unixsrc.tar.bz2) = 79d858466b7fab740b4d66d6b0963533f48a5163
+Size (tightvnc-1.3.9_unixsrc.tar.bz2) = 1792459 bytes
 SHA1 (patch-aa) = 3445af5bc4b85f7a45049378f5806a5c993503f4
 SHA1 (patch-ab) = b610979131497edae24119961bb56122e9d5a5c4
 SHA1 (patch-ac) = 7068947b76270e858c66d1c46a8ebb8675ecdbbd
-SHA1 (patch-ad) = 437c27c443bd8511bce0c3787e028a54829ab223
+SHA1 (patch-ad) = ea79684c715de8a8364c391b5df38945b0a56ad1
 SHA1 (patch-ae) = f541c3d7f143145798eb2d3eca3d2a1992619a50
 SHA1 (patch-af) = 372b8ca93a93dab938363c6b9408ab82155a172d
 SHA1 (patch-ag) = 675c42780888ff471109521de0a358ba40a6b8f3
 SHA1 (patch-ah) = 013acd16171cdfdc4b97529af60978afb9b4d861
 SHA1 (patch-ai) = c95caf348ad41e2fd0954119d23c17e1c73795af
 SHA1 (patch-aj) = bac4b0703f86f10a8a39a2de255694517330af22
-SHA1 (patch-ak) = 71e36559fe55c80382691b6292fa68084f8e7ca1
-SHA1 (patch-al) = 4a45378b53b0e550c87ddc0b244b7a03f518bfb4
+SHA1 (patch-ak) = f79238fabee0dfcf6c8ffa29c269d0d70d2f362f
+SHA1 (patch-al) = 57f01fbaa2679105b849a43b16e49a5033c210ce
 SHA1 (patch-am) = 2de40589cc8ff7401086d6400655123f0eaeff3a
diff --git a/net/tightvnc/patches/patch-ad b/net/tightvnc/patches/patch-ad
index ecdb171dc3d..45daa9aaed6 100644
--- a/net/tightvnc/patches/patch-ad
+++ b/net/tightvnc/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2004/05/11 04:22:49 snj Exp $
+$NetBSD: patch-ad,v 1.5 2007/06/17 20:58:49 tnn Exp $
 
---- Xvnc/config/cf/vnclibs.def.orig	2002-06-28 06:53:19.000000000 +0100
+--- Xvnc/config/cf/vnclibs.def.orig	2003-05-03 11:31:55.000000000 +0200
 +++ Xvnc/config/cf/vnclibs.def
 @@ -11,7 +11,7 @@ VNCLIBS = $(TOP)/../libvncauth/libvncaut
  /* Avoid linking with different libjpeg in /usr/shlib under Tru64. */
- VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a
+ VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a -lcrypt
  #else
--VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz
-+VNCSYSLIBS = ${LDFLAGS} -ljpeg -lz
+-VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt
++VNCSYSLIBS = ${LDFLAGS} -ljpeg -lz -lcrypt
  #endif
  
 -VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include
diff --git a/net/tightvnc/patches/patch-ak b/net/tightvnc/patches/patch-ak
index 9620f13b475..13068075615 100644
--- a/net/tightvnc/patches/patch-ak
+++ b/net/tightvnc/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.2 2004/01/03 14:18:57 mrg Exp $
+$NetBSD: patch-ak,v 1.3 2007/06/17 20:58:49 tnn Exp $
 
---- Xvnc/programs/Xserver/include/servermd.h.orig	2003-02-19 16:39:54.000000000 +0000
+--- Xvnc/programs/Xserver/include/servermd.h.orig	2006-12-23 13:07:55.000000000 +0100
 +++ Xvnc/programs/Xserver/include/servermd.h
 @@ -132,7 +132,7 @@ SOFTWARE.
  
@@ -16,7 +16,7 @@ $NetBSD: patch-ak,v 1.2 2004/01/03 14:18:57 mrg Exp $
  #endif /* (__s390__ || __s390x__) && linux */
      
 -#if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && defined(__i386__)) || (defined(__OpenBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || (defined(linux) && !defined(__mc68000__)) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__) || (defined(Lynx) && defined(__i386__)))
-+#if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && (defined(__i386__) || defined(__arm32__) || defined(__arm__))) || (defined(__OpenBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || (defined(linux) && !defined(__mc68000__)) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__) || (defined(Lynx) && defined(__i386__)))
++#if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && (defined(__i386__) || defined(__arm32__) || defined(__arm__))) || (defined(__OpenBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || (defined(linux) && !defined(__mc68000__)) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__) || (defined(Lynx) && defined(__i386__))) || (defined(__x86_64__) && defined(__NetBSD__))
  
  #ifndef IMAGE_BYTE_ORDER
  #define IMAGE_BYTE_ORDER	LSBFirst
diff --git a/net/tightvnc/patches/patch-al b/net/tightvnc/patches/patch-al
index 9f7a37b406e..985ca655b83 100644
--- a/net/tightvnc/patches/patch-al
+++ b/net/tightvnc/patches/patch-al
@@ -1,18 +1,17 @@
-$NetBSD: patch-al,v 1.1 2003/11/27 17:27:29 abs Exp $
+$NetBSD: patch-al,v 1.2 2007/06/17 20:58:49 tnn Exp $
 
---- vncserver.orig	2003-07-31 15:19:37.000000000 +0100
+--- vncserver.orig	2007-04-26 12:57:06.000000000 +0200
 +++ vncserver
-@@ -41,10 +41,11 @@ $vncUserDir = "$ENV{HOME}/.vnc";
- $fontPath = "unix/:7100";
+@@ -42,10 +42,10 @@ $fontPath = "unix/:7100";
+ $authType = "-rfbauth $vncUserDir/passwd";
  
  # Here is another example of setting the font path:
 -# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
-+# $fontPath = "/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/75dpi/";
 +$fontPath = "/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/75dpi/";
  
  # X colors database path is optional, uncomment and edit to use:
 -# $colorPath = "/usr/lib/X11/rgb";
-+# $colorPath = "/usr/X11R6/lib/X11/rgb";
++$colorPath = "/usr/X11R6/lib/X11/rgb";
  
  # You might wish to make your vnc directory under /tmp, to make sure
  # passwords are always kept on the local filesystem. To do that, just