Update to tightvncviewer 1.2.6. Notable changes:

- install app-defaults and (the now available) manual page
- improved full-screen scrolling
- fixed repeated challenge replay attack vulnerability, bugtraq id 5296
- handle XCursor encoding operating on the framebuffer instead of setting new
  cursors directly in X.
- Made grabbing the keyboard optional in full-screen mode, new boolean
  "grabKeyboard" X resource added to control this behavior.
- applied patch to solve keyboard focus problems in full-screen mode

4 files changed, 28 insertions, 24 deletions

diff --git a/net/tightvncviewer/Makefile b/net/tightvncviewer/Makefile
index 2fdd3556608..337f6a2ead4 100644
--- a/net/tightvncviewer/Makefile
+++ b/net/tightvncviewer/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2002/10/09 21:14:40 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/17 12:17:14 lukem Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/03/19 01:54:59 msmith Exp
 #
 
-DISTNAME=		tightvnc-1.2.2
-PKGNAME=		tightvncviewer-1.2.2
+DISTNAME=		tightvnc-1.2.6
+PKGNAME=		tightvncviewer-1.2.6
 CATEGORIES=		net x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vnc-tight/}
-DISTFILES=		tightvnc-1.2.2_unixsrc.tar.bz2
+DISTFILES=		tightvnc-1.2.6_unixsrc.tar.bz2
 
 MAINTAINER=		mycroft@netbsd.org
 HOMEPAGE=		http://www.tightvnc.com/
@@ -17,15 +17,13 @@ CONFLICTS=		vncviewer-[0-9]*
 CRYPTO=			yes
 USE_BUILDLINK2=		yes
 USE_IMAKE=		yes
-NO_INSTALL_MANPAGES=	yes
 
 WRKSRC=			${WRKDIR}/vnc_unixsrc
 
-post-patch:
-	${TOUCH} ${WRKSRC}/vncviewer/vncviewer.man
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
+	${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man ${PREFIX}/man/man1/vncviewer.1
+	${INSTALL_DATA} ${WRKSRC}/vncviewer/Vncviewer ${PREFIX}/lib/X11/app-defaults
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vncviewer
 	${INSTALL_DATA} ${WRKSRC}/vncviewer/README ${PREFIX}/share/doc/vncviewer/README
 
diff --git a/net/tightvncviewer/PLIST b/net/tightvncviewer/PLIST
index adaae63bfe0..961621559b2 100644
--- a/net/tightvncviewer/PLIST
+++ b/net/tightvncviewer/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:31 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/10/17 12:17:14 lukem Exp $
 bin/vncviewer
+lib/X11/app-defaults/Vncviewer
+man/man1/vncviewer.1
 share/doc/vncviewer/README
 @dirrm share/doc/vncviewer
diff --git a/net/tightvncviewer/distinfo b/net/tightvncviewer/distinfo
index d683df282d3..4d70d1a47c2 100644
--- a/net/tightvncviewer/distinfo
+++ b/net/tightvncviewer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/10/09 21:14:41 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/10/17 12:17:14 lukem Exp $
 
-SHA1 (tightvnc-1.2.2_unixsrc.tar.bz2) = c764122d17bb54a78accdf658029b5097caaa4f1
-Size (tightvnc-1.2.2_unixsrc.tar.bz2) = 1720393 bytes
-SHA1 (patch-aa) = 81fff66d91a45b2d053cbb469efc1aca41d48919
+SHA1 (tightvnc-1.2.6_unixsrc.tar.bz2) = 3ff266a89d12cf49855fbeee3c7c6a8c6c2f07bd
+Size (tightvnc-1.2.6_unixsrc.tar.bz2) = 1717851 bytes
+SHA1 (patch-aa) = d3c3ef90e110293b5934f85a77344b9733677bdc
diff --git a/net/tightvncviewer/patches/patch-aa b/net/tightvncviewer/patches/patch-aa
index dea6488d3d6..6449d7dd66c 100644
--- a/net/tightvncviewer/patches/patch-aa
+++ b/net/tightvncviewer/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.3 2002/10/09 21:14:41 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2002/10/17 12:17:14 lukem Exp $
 
---- vncviewer/Imakefile.orig	Tue Nov 13 03:31:34 2001
+--- vncviewer/Imakefile.orig	Fri Jun 28 15:53:19 2002
 +++ vncviewer/Imakefile
-@@ -6,19 +6,14 @@ CCOPTIONS =
- CDEBUGFLAGS = -O2
+@@ -3,24 +3,14 @@
+ EXTRA_DEFINES = -D__EXTENSIONS__
  #endif
  
 -XCOMM Shared memory support works OK on x86 linux, not tested elsewhere but
@@ -13,16 +13,20 @@ $NetBSD: patch-aa,v 1.3 2002/10/09 21:14:41 jlam Exp $
  DEFINES = -DMITSHM
 -#endif
  
--INCLUDES = -I../include -I. -I/usr/include
+ ZLIB_INC = -I/usr/local/include
+ JPEG_INC = -I/usr/local/include
+-INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include
 +INCLUDES = -I../include -I. ${BUILDLINK_CPPFLAGS}
  VNCAUTH_LIB = ../libvncauth/libvncauth.a
--ZLIB_LIB = /usr/lib/libz.a
--JPEG_LIB = /usr/lib/libjpeg.a
+-ZLIB_LIB = -L/usr/local/lib -lz
+-#ifdef OSF1Architecture
+-XCOMM Avoid linking with different libjpeg in /usr/shlib under Tru64.
+-JPEG_LIB = /usr/local/lib/libjpeg.a
+-#else
+-JPEG_LIB = -L/usr/local/lib -ljpeg
+-#endif
 +ZLIB_LIB = -lz
 +JPEG_LIB = ${BUILDLINK_LDFLAGS} -ljpeg
  
--DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB)
-+DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
+ DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
  LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB)
- 
- SRCS = \