Index: Makefile
===================================================================
RCS file: /cvs/ports/net/tightvnc/Makefile,v
retrieving revision 1.22
diff -N -u Makefile
--- Makefile	10 Aug 2009 06:33:43 -0000	1.22
+++ Makefile	25 Oct 2009 23:37:07 -0000
@@ -3,9 +3,9 @@
 COMMENT-main=	cross-platform remote desktop access
 COMMENT-viewer=	client for cross-platform remote desktop access
 
-VERSION=	1.3.9
-PKGNAME-main=	tightvnc-${VERSION}p1
-PKGNAME-viewer=	tightvnc-viewer-${VERSION}p0
+VERSION=	1.3.10
+PKGNAME-main=	tightvnc-${VERSION}
+PKGNAME-viewer=	tightvnc-viewer-${VERSION}
 DISTNAME=	tightvnc-${VERSION}_unixsrc
 CATEGORIES=	net
 
@@ -33,7 +33,7 @@
 
 NO_REGRESS=	Yes
 
-WANTLIB=		X11 Xau Xdmcp Xext c pthread-stubs xcb z
+WANTLIB=		X11 Xau Xdmcp Xext c z
 
 WANTLIB-viewer=		${WANTLIB} ICE SM Xaw Xmu Xp Xpm Xt 
 LIB_DEPENDS-viewer=	jpeg.>=62.::graphics/jpeg
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/tightvnc/distinfo,v
retrieving revision 1.9
diff -N -u distinfo
--- distinfo	19 Jan 2009 08:01:34 -0000	1.9
+++ distinfo	25 Oct 2009 23:37:07 -0000
@@ -1,5 +1,5 @@
-MD5 (tightvnc-1.3.9_unixsrc.tar.gz) = gLkE1KEPzO6QRdD+6qZd+A==
-RMD160 (tightvnc-1.3.9_unixsrc.tar.gz) = nGPsmZGv8cINCw/QfbNt2nNAYo8=
-SHA1 (tightvnc-1.3.9_unixsrc.tar.gz) = CyGmDgYGAuIlsXZpXB3deH8AftI=
-SHA256 (tightvnc-1.3.9_unixsrc.tar.gz) = VgYnCLtUdCX46PD5xXHU+gb8yJoRFGpbFcYI/Y3r24A=
-SIZE (tightvnc-1.3.9_unixsrc.tar.gz) = 2246697
+MD5 (tightvnc-1.3.10_unixsrc.tar.gz) = lTcSewKkWJRD8tCXG9ixrw==
+RMD160 (tightvnc-1.3.10_unixsrc.tar.gz) = RA4U/ErFQ19yCQlnEx+j3zetbLo=
+SHA1 (tightvnc-1.3.10_unixsrc.tar.gz) = k4rWv6dZSKMV45njWFMpSEPcR5M=
+SHA256 (tightvnc-1.3.10_unixsrc.tar.gz) = vyW72G5eVd35fTziwU0QPnHr47BlRb2wcDmX5VEIiz0=
+SIZE (tightvnc-1.3.10_unixsrc.tar.gz) = 2250547
Index: patches/patch-Xvnc_programs_Xserver_Imakefile
===================================================================
RCS file: patches/patch-Xvnc_programs_Xserver_Imakefile
diff -N -u patches/patch-Xvnc_programs_Xserver_Imakefile
--- /dev/null	25 Oct 2009 23:37:07 -0000
+++ patches/patch-Xvnc_programs_Xserver_Imakefile	25 Oct 2009 23:37:07 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Xvnc/programs/Xserver/Imakefile.orig	Mon Oct 26 07:06:46 2009
++++ Xvnc/programs/Xserver/Imakefile	Mon Oct 26 07:07:13 2009
+@@ -140,7 +140,7 @@ XPFBLIBS = dix/LibraryTargetName(xpstubs)
+ #if BuildLBX || GzipFontCompression
+            ZLIB = GzipLibrary
+ #endif
+-             OS = os/LibraryTargetName(os) $(XAULIB) $(XDMCPLIB)
++             OS = os/LibraryTargetName(os) dix/libdix.a $(XAULIB) $(XDMCPLIB)
+         BSDEMUL = $(DEPXBSDLIB)
+             MFB = mfb/LibraryTargetName(mfb)
+             CFB = cfb/LibraryTargetName(cfb) cfb16/LibraryTargetName(cfb) cfb24/LibraryTargetName(cfb) cfb32/LibraryTargetName(cfb)
Index: patches/patch-vncserver
===================================================================
RCS file: /cvs/ports/net/tightvnc/patches/patch-vncserver,v
retrieving revision 1.4
diff -N -u patches/patch-vncserver
--- patches/patch-vncserver	19 Jan 2009 08:01:34 -0000	1.4
+++ patches/patch-vncserver	25 Oct 2009 23:37:07 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-vncserver,v 1.4 2009/01/19 08:01:34 pea Exp $
---- vncserver.orig	Thu Apr 26 12:57:06 2007
-+++ vncserver	Fri Dec  5 12:37:37 2008
-@@ -76,13 +76,23 @@ unless ($xauthorityFile) {
+--- vncserver.orig	Thu Feb 12 15:27:18 2009
++++ vncserver	Mon Oct 26 06:53:56 2009
+@@ -66,13 +66,23 @@ unless ($xauthorityFile) {
      }
  }
  
@@ -26,7 +26,7 @@
  
  &Usage() if ($opt{'-help'} || $opt{'-h'} || $opt{'--help'});
  
-@@ -105,6 +115,25 @@ if ($opt{'-pixelformat'}) {
+@@ -95,6 +105,25 @@ if ($opt{'-pixelformat'}) {
  
  &CheckGeometryAndDepth();
  
@@ -52,7 +52,7 @@
  if ($opt{'-name'}) {
      $desktopName = $opt{'-name'};
  }
-@@ -236,6 +265,7 @@ if (-e "/tmp/.X11-unix/X$displayNumber") {
+@@ -226,6 +255,7 @@ if (-e "/tmp/.X11-unix/X$displayNumber") {
      $ENV{DISPLAY}= "$host:$displayNumber";
  }
  $ENV{VNCDESKTOP}= $desktopName;
@@ -60,7 +60,7 @@
  
  system("$xstartup >> " . &quotedString($desktopLog) . " 2>&1 &");
  
-@@ -247,6 +277,8 @@ exit;
+@@ -237,6 +267,8 @@ exit;
  # CheckGeometryAndDepth simply makes sure that the geometry and depth values
  # are sensible.
  #