- Update net/vncviewer4 to 4.1.2 (release notes just state "FIXED: Security

  vulnerability.", and move to net/vncviewer, replacing vncviewer-3.x
- Remove vncpasswd from net/vnc and add to net/vncviewer
- Bump PKGREVISION for net/vnc

13 files changed, 45 insertions, 168 deletions

diff --git a/net/Makefile b/net/Makefile
index e9fd0e7e6b3..acf8926ab63 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.629 2006/07/22 08:12:56 tron Exp $
+# $NetBSD: Makefile,v 1.630 2006/07/22 19:21:11 abs Exp $
 #
 
 COMMENT=	Networking tools
@@ -457,7 +457,6 @@ SUBDIR+=	vde
 SUBDIR+=	vino
 SUBDIR+=	vnc
 SUBDIR+=	vncviewer
-SUBDIR+=	vncviewer4
 SUBDIR+=	vpnc
 SUBDIR+=	vsftpd
 SUBDIR+=	vtun
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 22f7eb1d1f1..dfb649ebb65 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2006/02/05 23:10:32 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2006/07/22 19:21:11 abs Exp $
 
 DISTNAME=		vnc-3.3.3r2
 PKGNAME=		vnc-3.3.3.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		net x11
 MASTER_SITES=		ftp://ftp.uk.research.att.com/pub/vnc/dist/
 DISTFILES=		vnc-3.3.3r2_unixsrc.tgz \
@@ -41,7 +41,6 @@ post-install:
 	${CHMOD} 2555 ${PREFIX}/bin/Xvnc
 .endif
 	${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${PREFIX}/bin/vncconnect
-	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
 	${SED} -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' \
 		-e 's|/usr/bin/perl|${PERL5}|g' \
 		< ${WRKSRC}/vncserver \
diff --git a/net/vnc/PLIST b/net/vnc/PLIST
index ab952475d34..6acd0125511 100644
--- a/net/vnc/PLIST
+++ b/net/vnc/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:42 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/07/22 19:21:11 abs Exp $
 bin/Xvnc
 bin/vncconnect
-bin/vncpasswd
 bin/vncserver
 share/doc/vnc/Xvnc.gif
 share/doc/vnc/ach.jpg
diff --git a/net/vncviewer/Makefile b/net/vncviewer/Makefile
index 5813cb37b06..f01bd764962 100644
--- a/net/vncviewer/Makefile
+++ b/net/vncviewer/Makefile
@@ -1,31 +1,36 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:10:32 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/07/22 19:21:11 abs Exp $
 
-DISTNAME=       	vnc-3.3.3r2_unixsrc
-PKGNAME=		vncviewer-3.3.3.2
-PKGREVISION=		3
+DISTNAME=       	vnc-4_1_2-unixsrc
+PKGNAME=		vncviewer-4.1.2
 CATEGORIES=		net x11
-MASTER_SITES=   	http://www.uk.research.att.com/archive/vnc/dist/
-EXTRACT_SUFX=		.tgz
+MASTER_SITES=   	http://www.realvnc.com/dist/
 
-PATCH_SITES=		ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=		vnc-3.3.3r2-v6-20010421.diff.gz
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER=	 	abs@NetBSD.org
-HOMEPAGE=		http://www.uk.research.att.com/vnc/
+MAINTAINER=	 	riz@NetBSD.org
+HOMEPAGE=		http://www.realvnc.com/
 COMMENT=		Viewer for remote X and Win32 VNC servers
 
-WRKSRC=			${WRKDIR}/vnc_unixsrc
+WRKSRC=			${WRKDIR}/${DISTNAME}/unix
 CRYPTO=			yes
 NO_INSTALL_MANPAGES=	yes
-USE_IMAKE=		yes
-BUILD_DEFS+=		USE_INET6
+USE_LANGUAGES=		c c++
+USE_X11BASE=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-installed-zlib
 
-INSTALLATION_DIRS=	bin
+# The distfile listed above is bogus, there is no direct link to download the
+# file, so a special command must be used.  I lifted this from FreeBSD Ports.
+DISTURL=http://www.realvnc.com/cgi-bin/download.cgi?product=free4/src/unix&acceptLicense=1&filever=4.1.2&filetype=tar_gz&haveDetails=1
+pre-fetch:
+	${TEST} -f ${DISTDIR}/${DISTNAME}.tar.gz || \
+	 (cd ${DISTDIR} && ${FETCH_CMD} -o ${DISTNAME}.tar.gz ${DISTURL:Q})
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vncviewer
-	${INSTALL_DATA} ${WRKSRC}/vncviewer/README ${PREFIX}/share/doc/vncviewer
+	${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man \
+		${PREFIX}/man/man1/vncviewer.1
+	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
+	${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man \
+		${PREFIX}/man/man1/vncpasswd.1
 
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/vncviewer/PLIST b/net/vncviewer/PLIST
index 2534c5ebea8..46cd2d73f0f 100644
--- a/net/vncviewer/PLIST
+++ b/net/vncviewer/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:43 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/07/22 19:21:11 abs Exp $
+bin/vncpasswd
 bin/vncviewer
-share/doc/vncviewer/README
-@dirrm share/doc/vncviewer
+man/man1/vncpasswd.1
+man/man1/vncviewer.1
diff --git a/net/vncviewer/distinfo b/net/vncviewer/distinfo
index ca551e33fcb..77ae0a3eb43 100644
--- a/net/vncviewer/distinfo
+++ b/net/vncviewer/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.8 2005/07/13 13:47:57 hubertf Exp $
+$NetBSD: distinfo,v 1.9 2006/07/22 19:21:11 abs Exp $
 
-SHA1 (vnc-3.3.3r2_unixsrc.tgz) = 98e9d2e2c2d0f4f9cb9cafee22d21a868189b176
-RMD160 (vnc-3.3.3r2_unixsrc.tgz) = 3c70c386065d8b0254b1a0627455fb7bc03846ae
-Size (vnc-3.3.3r2_unixsrc.tgz) = 2072772 bytes
-SHA1 (vnc-3.3.3r2-v6-20010421.diff.gz) = d2af7e0fb0074200f490f6463fb250901368875e
-RMD160 (vnc-3.3.3r2-v6-20010421.diff.gz) = dea9aff6124bfdbe099fd1207e20d22cab1c0d6b
-Size (vnc-3.3.3r2-v6-20010421.diff.gz) = 6510 bytes
-SHA1 (patch-aa) = ec85472922c648648c89c7f1bb0ce406214289c8
-SHA1 (patch-ab) = b387f2ee2e78ced366e312f90bb9bad809f9e3ba
+SHA1 (vnc-4_1_2-unixsrc.tar.gz) = 9d8d8d93f4120b2e60c0ec0fce7e81ea302614e7
+RMD160 (vnc-4_1_2-unixsrc.tar.gz) = 2a2d615825e6ac74aca5f0c29d025e576b725dc3
+Size (vnc-4_1_2-unixsrc.tar.gz) = 537713 bytes
+SHA1 (patch-aa) = 2b598d63502b8abc6aaa4cb1bde736e15b455f1a
diff --git a/net/vncviewer/patches/patch-aa b/net/vncviewer/patches/patch-aa
index 3c38fe9bb9a..34f45ede533 100644
--- a/net/vncviewer/patches/patch-aa
+++ b/net/vncviewer/patches/patch-aa
@@ -1,23 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2005/07/13 13:47:57 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 2006/07/22 19:21:11 abs Exp $
 
---- vncviewer/Imakefile.orig	2005-07-13 15:26:57.329207000 +0200
-+++ vncviewer/Imakefile
-@@ -8,9 +8,7 @@ CDEBUGFLAGS = -O2
- XCOMM Shared memory support works OK on x86 linux, not tested elsewhere but
- XCOMM seems to cause problems on Digital Unix.
+--- tx/TXDialog.h.orig	2006-03-23 16:39:31.000000000 +0000
++++ tx/TXDialog.h
+@@ -30,6 +30,7 @@
  
--#if defined(i386Architecture) && defined(LinuxArchitecture)
- DEFINES = -DMITSHM
--#endif
+ #include "TXWindow.h"
+ #include <errno.h>
++#include <unistd.h>
  
- INCLUDES = -I../include -I.
- VNCAUTH_LIB = ../libvncauth/libvncauth.a
-@@ -36,4 +34,8 @@ SRCS = \
- 
- OBJS = $(SRCS:.c=.o)
- 
-+#if !defined(SunArchitecture)
-+ComplexProgramTargetNoMan(vncviewer)
-+#else
- ComplexProgramTarget(vncviewer)
-+#endif
+ class TXDialog : public TXWindow, public TXDeleteWindowCallback {
+ public:
diff --git a/net/vncviewer/patches/patch-ab b/net/vncviewer/patches/patch-ab
deleted file mode 100644
index 08223a7bffa..00000000000
--- a/net/vncviewer/patches/patch-ab
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/10/23 21:12:37 bouyer Exp $
-
---- vncviewer/sockets.c.orig	Wed Oct 23 20:17:57 2002
-+++ vncviewer/sockets.c	Wed Oct 23 20:23:48 2002
-@@ -210,7 +210,11 @@
-     return -1;
-   }
- 
-+#ifdef SVR4
-+  if (connect(sock, sa, sizeof(struct sockaddr_in)) < 0) {
-+#else
-   if (connect(sock, sa, sa->sa_len) < 0) {
-+#endif
-     fprintf(stderr,programName);
-     perror(": ConnectToTcpAddr: connect");
-     close(sock);
-@@ -369,26 +373,27 @@
- #else
-   /* just for IPv4 */
-   struct hostent *hp;
--  struct sockaddr_in *sin;
-+  struct sockaddr_in *sin  = (struct sockaddr_in *)sa;
-   struct in_addr *addr = &sin->sin_addr;
- 
--  sin = (struct sockaddr_in *)sa;
-   sin->sin_family = AF_INET;
-+#ifndef SVR4
-   sin->sin_len = sizeof(struct sockaddr_in);
-+#endif
-   sin->sin_port = 0;
- 
-   if (strcmp(str,"") == 0) {
--    *addr = 0; /* local */
-+    memset(addr, 0, sizeof(struct sockaddr_in)); /* local */
-     return True;
-   }
- 
--  if ((addr.s_addr = inet_addr(str)) == -1) {
-+  if ((addr->s_addr = inet_addr(str)) == -1) {
-     if (!(hp = gethostbyname(str)))
-       return False;
--    memcpy(&addr, hp->h_addr, sizeof(struct in_addr));
-+    memcpy(addr, hp->h_addr, sizeof(struct in_addr));
-   }
- 
--  return False;
-+  return True;
- #endif
- }
- 
diff --git a/net/vncviewer4/DESCR b/net/vncviewer4/DESCR
deleted file mode 100644
index 9c7122cbea4..00000000000
--- a/net/vncviewer4/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-"VNC stands for Virtual Network Computing. It is, in essence, a remote
- display system which allows you to view a computing 'desktop'
- environment not only on the machine where it is running, but from
- anywhere on the Internet and from a wide variety of machine
- architectures."
-
-This package contains the viewer for remote X and Win32 VNC servers
diff --git a/net/vncviewer4/Makefile b/net/vncviewer4/Makefile
deleted file mode 100644
index de5498917c3..00000000000
--- a/net/vncviewer4/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/05/12 09:45:12 joerg Exp $
-
-DISTNAME=       	vnc-4_1_1-unixsrc
-PKGNAME=		vncviewer-4.1.1
-CATEGORIES=		net x11
-MASTER_SITES=   	http://www.realvnc.com/dist/
-
-MAINTAINER=	 	riz@NetBSD.org
-HOMEPAGE=		http://www.realvnc.com/
-COMMENT=		Viewer for remote X and Win32 VNC servers
-
-WRKSRC=			${WRKDIR}/${DISTNAME}/unix
-CRYPTO=			yes
-NO_INSTALL_MANPAGES=	yes
-USE_LANGUAGES=		c c++
-USE_X11BASE=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-installed-zlib
-
-# The distfile listed above is bogus, there is no direct link to download the
-# file, so a special command must be used.  I lifted this from FreeBSD Ports.
-DISTURL=http://www.realvnc.com/cgi-bin/download.cgi?product=free4/src/unix&acceptLicense=1&filever=4.1.1&filetype=tar_gz&haveDetails=1
-pre-fetch:
-	${TEST} -f ${DISTDIR}/${DISTNAME}.tar.gz || \
-	 (cd ${DISTDIR} && ${FETCH_CMD} -o ${DISTNAME}.tar.gz ${DISTURL:Q})
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
-	${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man \
-		${PREFIX}/man/man1/vncviewer.1
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/vncviewer4/PLIST b/net/vncviewer4/PLIST
deleted file mode 100644
index f670da30934..00000000000
--- a/net/vncviewer4/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/14 21:10:07 drochner Exp $
-bin/vncviewer
-man/man1/vncviewer.1
diff --git a/net/vncviewer4/distinfo b/net/vncviewer4/distinfo
deleted file mode 100644
index 6f7b1ceae29..00000000000
--- a/net/vncviewer4/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2006/03/23 16:52:42 joerg Exp $
-
-SHA1 (vnc-4_1_1-unixsrc.tar.gz) = a5945d54f35c6be05d56f8dad3c1978fee2b2196
-RMD160 (vnc-4_1_1-unixsrc.tar.gz) = 5050d7f6936a41debc58b4fa914e12dbbeb80641
-Size (vnc-4_1_1-unixsrc.tar.gz) = 529894 bytes
-SHA1 (patch-aa) = 2b598d63502b8abc6aaa4cb1bde736e15b455f1a
diff --git a/net/vncviewer4/patches/patch-aa b/net/vncviewer4/patches/patch-aa
deleted file mode 100644
index 176707251a3..00000000000
--- a/net/vncviewer4/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/03/23 16:52:42 joerg Exp $
-
---- tx/TXDialog.h.orig	2006-03-23 16:39:31.000000000 +0000
-+++ tx/TXDialog.h
-@@ -30,6 +30,7 @@
- 
- #include "TXWindow.h"
- #include <errno.h>
-+#include <unistd.h>
- 
- class TXDialog : public TXWindow, public TXDeleteWindowCallback {
- public: