Update "vnc" package to version 3.3.3. The patches were contributed by

Jeff Rizzo in PR pkg/8311.

5 files changed, 69 insertions, 46 deletions

diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index ad88533c47a..74717d567ca 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,19 +1,16 @@
-# $NetBSD: Makefile,v 1.7 1999/02/17 18:50:49 tls Exp $
+# $NetBSD: Makefile,v 1.8 1999/09/02 21:29:31 tron Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/03/19 01:54:59 msmith Exp
 #
 
-DISTNAME=       	vnc-3.3.2r3_unixsrc
-PKGNAME=        	vnc-3.3.2r3
+DISTNAME=       	vnc-3.3.3
 CATEGORIES=		net x11
 MASTER_SITES=   	http://www.uk.research.att.com/vnc/dist/
-DISTFILES=		vnc-3.3.2r3_unixsrc.tgz \
-			vnc-3.3.2r3_doc.tgz
+DISTFILES=		vnc-3.3.3_unixsrc.tgz \
+			vnc-latest_doc.tgz
 
 MAINTAINER=	 	packages@netbsd.org
 HOMEPAGE=		http://www.uk.research.att.com/vnc/
 
-IGNOREFILES=		${DISTFILES}
-
 USE_PERL5=		yes
 
 # Is this for real? The code was developed in the UK,
diff --git a/net/vnc/files/md5 b/net/vnc/files/md5
index 5a540f2cf76..b19b41c3cfb 100644
--- a/net/vnc/files/md5
+++ b/net/vnc/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.4 1999/02/17 18:50:50 tls Exp $
+$NetBSD: md5,v 1.5 1999/09/02 21:29:31 tron Exp $
 
-MD5 (vnc-3.3.2r3_unixsrc.tgz) = IGNORE
-MD5 (vnc-3.3.2r3_doc.tgz) = IGNORE
+MD5 (vnc-3.3.3_unixsrc.tgz) = 511bac2c503f6f870c768edcd25394b0
+MD5 (vnc-latest_doc.tgz) = d3603d8df13fd74f0140c735e9f11278
diff --git a/net/vnc/files/patch-sum b/net/vnc/files/patch-sum
index 1738c051b09..790bee3613b 100644
--- a/net/vnc/files/patch-sum
+++ b/net/vnc/files/patch-sum
@@ -1,6 +1,7 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:31 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/09/02 21:29:31 tron Exp $
 
 MD5 (patch-aa) = ee6b0756f983ca7f0d5e4401e78f968e
 MD5 (patch-ab) = 523030821006bbef34d255d0a6fb9d86
 MD5 (patch-ac) = 3fa5d05f820dab9b663c2f581054622b
 MD5 (patch-ad) = 8371234642b1b69748fd6efa610235e8
+MD5 (patch-ae) = 7d2dee70b940eed144c19d56602fe1d7
diff --git a/net/vnc/patches/patch-ae b/net/vnc/patches/patch-ae
new file mode 100644
index 00000000000..01468c90e67
--- /dev/null
+++ b/net/vnc/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 1999/09/02 21:29:31 tron Exp $
+
+*** vncviewer/Imakefile.orig	Thu Sep  2 11:45:25 1999
+--- vncviewer/Imakefile	Thu Sep  2 11:45:44 1999
+***************
+*** 35,38 ****
+  
+  OBJS = $(SRCS:.c=.o)
+  
+! ComplexProgramTarget(vncviewer)
+--- 35,38 ----
+  
+  OBJS = $(SRCS:.c=.o)
+  
+! ComplexProgramTargetNoMan(vncviewer)
diff --git a/net/vnc/pkg/PLIST b/net/vnc/pkg/PLIST
index 15271818b15..2c4c1dd7244 100644
--- a/net/vnc/pkg/PLIST
+++ b/net/vnc/pkg/PLIST
@@ -1,66 +1,96 @@
-@comment $NetBSD: PLIST,v 1.6 1999/04/20 19:00:27 tron Exp $
+@comment $NetBSD: PLIST,v 1.7 1999/09/02 21:29:32 tron Exp $
 bin/Xvnc
 bin/vncviewer
 bin/vncpasswd
 bin/vncserver
+share/doc/vnc/Xvnc.gif
+share/doc/vnc/ach.jpg
 share/doc/vnc/announcement.html
 share/doc/vnc/attbutton.gif
 share/doc/vnc/attlogo.gif
-share/doc/vnc/download.html
-share/doc/vnc/downloadtemplate.html
-share/doc/vnc/Xvnc.gif
-share/doc/vnc/ach.jpg
 share/doc/vnc/backbutton.gif
 share/doc/vnc/badgeshad.gif
+share/doc/vnc/bgdot.gif
 share/doc/vnc/bluepix.gif
+share/doc/vnc/button.gif
 share/doc/vnc/cdplay.gif
 share/doc/vnc/cevncviewer.html
+share/doc/vnc/cevncviewer.html,v
 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/contribs.html
 share/doc/vnc/docbutton.gif
+share/doc/vnc/docs.html
+share/doc/vnc/download.htm
+share/doc/vnc/download.html
 share/doc/vnc/downloadbutton.gif
+share/doc/vnc/downloadtemplate.html
 share/doc/vnc/extras.html
+share/doc/vnc/faq.html
+share/doc/vnc/faq.xml
 share/doc/vnc/faqbutton.gif
+share/doc/vnc/faqtemplate.html
+share/doc/vnc/free.html
 share/doc/vnc/freebutton.gif
+share/doc/vnc/gpl.html
+share/doc/vnc/help.html
 share/doc/vnc/helpbutton.gif
 share/doc/vnc/homebutton.gif
+share/doc/vnc/howitworks.html
 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/index.html
+share/doc/vnc/internalversion.html
+share/doc/vnc/intouch.html
 share/doc/vnc/intouchbutton.gif
 share/doc/vnc/invalid-download.html
+share/doc/vnc/javavncviewer.html
 share/doc/vnc/jnw.jpg
+share/doc/vnc/join.html
 share/doc/vnc/krw.jpg
-share/doc/vnc/macshot.gif
 share/doc/vnc/machistory.html
+share/doc/vnc/macshot.gif
 share/doc/vnc/macshot_small.gif
 share/doc/vnc/macvnc.html
+share/doc/vnc/macvnc.html.bck
 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/oldcontribs.html
+share/doc/vnc/oldfaq.html
 share/doc/vnc/platforms.html
 share/doc/vnc/pmw.jpg
+share/doc/vnc/protocol.html
 share/doc/vnc/qsf.jpg
 share/doc/vnc/rfbcounter.gif
 share/doc/vnc/rfbcounter.html
+share/doc/vnc/rfbproto.pdf
+share/doc/vnc/rfbprotoheader.pdf
 share/doc/vnc/screenbutton.gif
-share/doc/vnc/tjr.jpg
-share/doc/vnc/spacer.gif
+share/doc/vnc/screenshots.html
 share/doc/vnc/searchbutton.gif
 share/doc/vnc/sidebarbg.gif
 share/doc/vnc/sideblank.gif
 share/doc/vnc/sidelogo.gif
+share/doc/vnc/spacer.gif
+share/doc/vnc/sshvnc.html
+share/doc/vnc/start.html
 share/doc/vnc/startbutton.gif
+share/doc/vnc/styles.css
 share/doc/vnc/template.html
+share/doc/vnc/tjr.jpg
+share/doc/vnc/twmideas.html
+share/doc/vnc/videos.html
 share/doc/vnc/videos1.jpg
 share/doc/vnc/videos2.jpg
 share/doc/vnc/videos3.jpg
@@ -75,38 +105,18 @@ 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
-share/doc/vnc/contribs.html
-share/doc/vnc/docs.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/vncpeoplebutton.gif
+share/doc/vnc/vnctitle.gif
 share/doc/vnc/winhistory.html
+share/doc/vnc/winviewer1.gif
+share/doc/vnc/winviewer1_small.gif
 share/doc/vnc/winvnc.html
+share/doc/vnc/winvnctray.GIF
 share/doc/vnc/winvncviewer.html
+share/doc/vnc/xlibvncviewer.html
 share/doc/vnc/xvnc.html
+share/doc/vnc/xvnchistory.html
 share/doc/vnc/xvncviewer.html
 @dirrm share/doc/vnc