Update to VNC 3.3.2r3, fix distribution site, adjust for new distribution tar file layout

4 files changed, 94 insertions, 191 deletions

diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 9f8efb33e3a..ad88533c47a 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,28 +1,26 @@
-# $NetBSD: Makefile,v 1.6 1998/08/20 15:17:21 tsarna Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/17 18:50:49 tls Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/03/19 01:54:59 msmith Exp
 #
 
-DISTNAME=       	vnc-3.3.2r2_unixsrc
-PKGNAME=        	vnc-3.3.2
+DISTNAME=       	vnc-3.3.2r3_unixsrc
+PKGNAME=        	vnc-3.3.2r3
 CATEGORIES=		net x11
-MASTER_SITES=   	http://www.orl.co.uk/vnc/dist/
-DISTFILES=		vnc-3.3.2r2_unixsrc.tgz \
-			vnc-3.3.2_doc.tgz
+MASTER_SITES=   	http://www.uk.research.att.com/vnc/dist/
+DISTFILES=		vnc-3.3.2r3_unixsrc.tgz \
+			vnc-3.3.2r3_doc.tgz
 
 MAINTAINER=	 	packages@netbsd.org
-HOMEPAGE=		http://www.orl.co.uk/vnc/
+HOMEPAGE=		http://www.uk.research.att.com/vnc/
 
 IGNOREFILES=		${DISTFILES}
 
 USE_PERL5=		yes
 
-EXTRACT_ONLY=		vnc-3.3.2r2_unixsrc.tgz
-
 # Is this for real? The code was developed in the UK,
 # but the DES parts came from the USA in the first place.
 RESTRICTED=		Contains cryptographic software
 
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}/vnc_unixsrc
 
 USE_IMAKE=		yes
 NO_INSTALL_MANPAGES=	yes
@@ -32,18 +30,18 @@ ALL_TARGET=    		World
 # We have to frob a few things, and we want our own permissions, so it's easier
 # to do the install ourselves.
 post-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/Xvnc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
-	${INSTALL_PROGRAM} ${WRKDIR}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
-	${INSTALL_PROGRAM} ${WRKDIR}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
+	${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
+	${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
+	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
 	${SED} -e 's|/usr/local/vnc/classes|${X11BASE}/share/vnc/classes|g' \
 		-e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|g' \
-		< ${WRKDIR}/vncserver \
-		> ${WRKDIR}/vncserver.local
-	${INSTALL_SCRIPT} ${WRKDIR}/vncserver.local ${PREFIX}/bin/vncserver
+		< ${WRKSRC}/vncserver \
+		> ${WRKSRC}/vncserver.local
+	${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver
 # The documentation comes with bogus ownerships; this is a little leaky security-wise
 	${MKDIR} ${PREFIX}/share/doc/vnc
-	tar --exclude '*~' --exclude .lastinstall --exclude makefile \
-	    -xzf ${DISTDIR}/vnc-3.3.2_doc.tgz -C ${PREFIX}/share/doc/vnc
+	(cd ${WRKDIR}/vnc_docs ; tar --exclude '*~' --exclude .lastinstall \
+	--exclude makefile -cf - . ) | tar -xf - -C ${PREFIX}/share/doc/vnc
 	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/vnc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/vnc/files/md5 b/net/vnc/files/md5
index b21837209af..5a540f2cf76 100644
--- a/net/vnc/files/md5
+++ b/net/vnc/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:25:13 agc Exp $
+$NetBSD: md5,v 1.4 1999/02/17 18:50:50 tls Exp $
 
-MD5 (vnc-3.3.2r2_unixsrc.tgz) = IGNORE
-MD5 (vnc-3.3.2_doc.tgz) = IGNORE
+MD5 (vnc-3.3.2r3_unixsrc.tgz) = IGNORE
+MD5 (vnc-3.3.2r3_doc.tgz) = IGNORE
diff --git a/net/vnc/patches/patch-ad b/net/vnc/patches/patch-ad
deleted file mode 100644
index 3ce9673a6e4..00000000000
--- a/net/vnc/patches/patch-ad
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1998/10/01 20:19:48 frueauf Exp $
-
---- Xvnc/programs/Xserver/hw/vnc/rfbserver.c-orig	Mon Jul 13 18:01:52 1998
-+++ Xvnc/programs/Xserver/hw/vnc/rfbserver.c	Thu Oct  1 21:58:27 1998
-@@ -816,10 +816,15 @@
-     ublen = sz_rfbFramebufferUpdateMsg;
- 
-     if (REGION_NOTEMPTY(pScreen,&updateCopyRegion)) {
--	if (!rfbSendCopyRegion(cl,&updateCopyRegion,dx,dy))
-+      if (!rfbSendCopyRegion(cl,&updateCopyRegion,dx,dy)) {
-+            REGION_UNINIT(pScreen,&updateRegion);
-+            REGION_UNINIT(pScreen,&updateCopyRegion);
- 	    return FALSE;
-+      }
-     }
- 
-+    REGION_UNINIT(pScreen,&updateCopyRegion);
-+
-     for (i = 0; i < REGION_NUM_RECTS(&updateRegion); i++) {
- 	int x = REGION_RECTS(&updateRegion)[i].x1;
- 	int y = REGION_RECTS(&updateRegion)[i].y1;
-@@ -831,24 +836,34 @@
- 
- 	switch (cl->preferredEncoding) {
- 	case rfbEncodingRaw:
--	    if (!rfbSendRectEncodingRaw(cl, x, y, w, h))
-+	    if (!rfbSendRectEncodingRaw(cl, x, y, w, h)) {
-+                REGION_UNINIT(pScreen,&updateRegion);
- 		return FALSE;
-+            }
- 	    break;
- 	case rfbEncodingRRE:
--	    if (!rfbSendRectEncodingRRE(cl, x, y, w, h))
-+	    if (!rfbSendRectEncodingRRE(cl, x, y, w, h)) {
-+                REGION_UNINIT(pScreen,&updateRegion);
- 		return FALSE;
-+            }
- 	    break;
- 	case rfbEncodingCoRRE:
--	    if (!rfbSendRectEncodingCoRRE(cl, x, y, w, h))
-+	    if (!rfbSendRectEncodingCoRRE(cl, x, y, w, h)) {
-+                REGION_UNINIT(pScreen,&updateRegion);
-+            }
- 		return FALSE;
- 	    break;
- 	case rfbEncodingHextile:
--	    if (!rfbSendRectEncodingHextile(cl, x, y, w, h))
-+	    if (!rfbSendRectEncodingHextile(cl, x, y, w, h)) {
-+                REGION_UNINIT(pScreen,&updateRegion);
- 		return FALSE;
-+            }
- 	    break;
- 	}
-     }
- 
-+    REGION_UNINIT(pScreen,&updateRegion);
-+
-     if (!rfbSendUpdateBuf(cl))
- 	return FALSE;
- 
-@@ -896,9 +911,9 @@
- 	firstInNextBand = thisRect;
- 	nrectsInBand = 0;
- 
--	while ((REGION_RECTS(reg)[firstInNextBand].y1
--		== REGION_RECTS(reg)[thisRect].y1) &&
--	       (nrects > 0))
-+        while ((nrects > 0) &&
-+               (REGION_RECTS(reg)[firstInNextBand].y1
-+                == REGION_RECTS(reg)[thisRect].y1))
- 	{
- 	    firstInNextBand += y_inc;
- 	    nrects--;
diff --git a/net/vnc/pkg/PLIST b/net/vnc/pkg/PLIST
index bd64c0e70fd..762fed9909f 100644
--- a/net/vnc/pkg/PLIST
+++ b/net/vnc/pkg/PLIST
@@ -1,102 +1,80 @@
-@comment $NetBSD: PLIST,v 1.3 1998/08/03 20:54:48 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/02/17 18:50:50 tls Exp $
 bin/Xvnc
 bin/vncviewer
 bin/vncpasswd
 bin/vncserver
-share/doc/vnc/images/photos/vncce1_small.jpg
-share/doc/vnc/images/photos/vncce2.jpg
-share/doc/vnc/images/photos/vncce2_small.jpg
-share/doc/vnc/images/photos/vncce3.jpg
-share/doc/vnc/images/photos/vncce3_small.jpg
-share/doc/vnc/images/photos/vncce1.jpg
-share/doc/vnc/images/people/jnw.jpg
-share/doc/vnc/images/people/krw.jpg
-share/doc/vnc/images/people/pmw.jpg
-share/doc/vnc/images/people/qsf.jpg
-share/doc/vnc/images/people/tjr.jpg
-share/doc/vnc/images/people/ach.jpg
-share/doc/vnc/images/bluepix.gif
-share/doc/vnc/images/cdplay.gif
-share/doc/vnc/images/clientserver.gif
-share/doc/vnc/images/collage.gif
-share/doc/vnc/images/collagesmaller.gif
-share/doc/vnc/images/conndlg.gif
-share/doc/vnc/images/docbutton.gif
-share/doc/vnc/images/downloadbutton.gif
-share/doc/vnc/images/freebutton.gif
-share/doc/vnc/images/homebutton.gif
-share/doc/vnc/images/ie1.gif
-share/doc/vnc/images/ie1_small.gif
-share/doc/vnc/images/intouchbutton.gif
-share/doc/vnc/images/newlogosmall2.gif
-share/doc/vnc/images/ns1.gif
-share/doc/vnc/images/ns1_small.gif
-share/doc/vnc/images/orlbutton.gif
-share/doc/vnc/images/screenbutton.gif
-share/doc/vnc/images/vnc.gif
-share/doc/vnc/images/sidebarbg.gif
-share/doc/vnc/images/spacer.gif
-share/doc/vnc/images/startbutton.gif
-share/doc/vnc/images/vinci1.gif
-share/doc/vnc/images/vinci1_small.gif
-share/doc/vnc/images/winviewer1.gif
-share/doc/vnc/images/winviewer1_small.gif
-share/doc/vnc/images/winvnctray.GIF
-share/doc/vnc/images/Xvnc.gif
-share/doc/vnc/images/faqbutton.gif
-share/doc/vnc/images/vncpeoplebutton.gif
-share/doc/vnc/images/helpbutton.gif
-share/doc/vnc/images/viewertray.gif
-share/doc/vnc/images/iemacwin.gif
-share/doc/vnc/images/iemacwin_small.gif
-share/doc/vnc/images/iemacx.gif
-share/doc/vnc/images/iemacx_small.gif
-share/doc/vnc/images/contribbutton.gif
-share/doc/vnc/images/sideblank.gif
-share/doc/vnc/images/sidelogo.gif
-share/doc/vnc/images/searchbutton.gif
-share/doc/vnc/images/videos1.jpg
-share/doc/vnc/images/videos2.jpg
-share/doc/vnc/images/backbutton.gif
-share/doc/vnc/images/videos3.jpg
-share/doc/vnc/images/badgeshad.gif
-share/doc/vnc/_vti_pvt/_x_todo.htm
-share/doc/vnc/_vti_pvt/_x_todoh.htm
-share/doc/vnc/_private/footer.html
-share/doc/vnc/_private/header.html
-share/doc/vnc/_private/sidebar.html
-share/doc/vnc/download.htm
-share/doc/vnc/faq.html
-share/doc/vnc/free.html
-share/doc/vnc/gpl.html
-share/doc/vnc/help.html
-share/doc/vnc/howitworks.html
-share/doc/vnc/index.html
-share/doc/vnc/internalversion.html
-share/doc/vnc/intouch.html
-share/doc/vnc/javavncviewer.html
-share/doc/vnc/oldcontribs.html
-share/doc/vnc/oldfaq.html
-share/doc/vnc/protocol.html
-share/doc/vnc/rfbproto.pdf
-share/doc/vnc/rfbprotoheader.pdf
-share/doc/vnc/screenshots.html
-share/doc/vnc/start.html
-share/doc/vnc/styles.css
-share/doc/vnc/twmideas.html
-share/doc/vnc/videos.html
-share/doc/vnc/vnchistory.html
-share/doc/vnc/vncpeople.html
-share/doc/vnc/winhistory.html
-share/doc/vnc/winvnc.html
-share/doc/vnc/winvncviewer.html
-share/doc/vnc/xvnc.html
-share/doc/vnc/xvncviewer.html
-share/doc/vnc/contribs.html
-share/doc/vnc/docs.html
-@dirrm share/doc/vnc/_private
-@dirrm share/doc/vnc/_vti_pvt
-@dirrm share/doc/vnc/images/people
-@dirrm share/doc/vnc/images/photos
-@dirrm share/doc/vnc/images
+share/doc/vnc
+share/doc/vnc/Xvnc.gif
+share/doc/vnc/ach.jpg
+share/doc/vnc/backbutton.gif
+share/doc/vnc/badgeshad.gif
+share/doc/vnc/bluepix.gif
+share/doc/vnc/cdplay.gif
+share/doc/vnc/cevncviewer.html
+share/doc/vnc/cim.jpg
+share/doc/vnc/clientserver.gif
+share/doc/vnc/collage.gif
+share/doc/vnc/collagesmaller.gif
+share/doc/vnc/conndlg.gif
+share/doc/vnc/contribbutton.gif
+share/doc/vnc/docbutton.gif
+share/doc/vnc/downloadbutton.gif
+share/doc/vnc/extras.html
+share/doc/vnc/faqbutton.gif
+share/doc/vnc/freebutton.gif
+share/doc/vnc/helpbutton.gif
+share/doc/vnc/homebutton.gif
+share/doc/vnc/ie1.gif
+share/doc/vnc/ie1_small.gif
+share/doc/vnc/iemacwin.gif
+share/doc/vnc/iemacwin_small.gif
+share/doc/vnc/iemacx.gif
+share/doc/vnc/iemacx_small.gif
+share/doc/vnc/intouchbutton.gif
+share/doc/vnc/invalid-download.html
+share/doc/vnc/jnw.jpg
+share/doc/vnc/krw.jpg
+share/doc/vnc/macshot.gif
+share/doc/vnc/machistory.html
+share/doc/vnc/macshot_small.gif
+share/doc/vnc/macvnc.html
+share/doc/vnc/macvncviewer.html
+share/doc/vnc/mailinglist.html
+share/doc/vnc/newlogosmall2.gif
+share/doc/vnc/ns1.gif
+share/doc/vnc/ns1_small.gif
+share/doc/vnc/orlbutton.gif
+share/doc/vnc/platforms.html
+share/doc/vnc/pmw.jpg
+share/doc/vnc/qsf.jpg
+share/doc/vnc/rfbcounter.gif
+share/doc/vnc/rfbcounter.html
+share/doc/vnc/screenbutton.gif
+share/doc/vnc/tjr.jpg
+share/doc/vnc/spacer.gif
+share/doc/vnc/searchbutton.gif
+share/doc/vnc/sidebarbg.gif
+share/doc/vnc/sideblank.gif
+share/doc/vnc/sidelogo.gif
+share/doc/vnc/startbutton.gif
+share/doc/vnc/template.html
+share/doc/vnc/videos1.jpg
+share/doc/vnc/videos2.jpg
+share/doc/vnc/videos3.jpg
+share/doc/vnc/viewertray.gif
+share/doc/vnc/vinci1.gif
+share/doc/vnc/vinci1_small.gif
+share/doc/vnc/vnc.gif
+share/doc/vnc/vncce1.jpg
+share/doc/vnc/vncce1_medium.jpg
+share/doc/vnc/vncce1_small.jpg
+share/doc/vnc/vncce2.jpg
+share/doc/vnc/vncce2_small.jpg
+share/doc/vnc/vncce3.jpg
+share/doc/vnc/vncce3_small.jpg
+share/doc/vnc/vncpeoplebutton.gif
+share/doc/vnc/winviewer1.gif
+share/doc/vnc/winviewer1_small.gif
+share/doc/vnc/winvnctray.GIF
+share/doc/vnc/xvnchistory.html
 @dirrm share/doc/vnc