3 files changed, 114 insertions, 96 deletions

diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index f33f92e06c3e..b6a4ed04dcf0 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -6,18 +6,18 @@
 # $FreeBSD$
 #
 
-DISTNAME=       	vnc-3.3.2r3_unixsrc
-PKGNAME=        	vnc-3.3.2r3
+DISTNAME=       	vnc-3.3.3_unixsrc
+PKGNAME=        	vnc-3.3.3
 CATEGORIES=		net
 MASTER_SITES=   	http://www.uk.research.att.com/vnc/dist/
-DISTFILES=		vnc-3.3.2r3_unixsrc.tgz \
-			vnc-3.3.2_doc.tgz
+DISTFILES=		vnc-3.3.3_unixsrc.tgz \
+			vnc-latest_doc.tgz
 
 MAINTAINER=	 	bmah@ca.sandia.gov
 
 USE_PERL5=		YES
 
-EXTRACT_ONLY=		vnc-3.3.2r3_unixsrc.tgz
+EXTRACT_ONLY=		vnc-3.3.3_unixsrc.tgz
 IGNOREFILES=		${DISTFILES}
 
 WRKSRC=			${WRKDIR}/vnc_unixsrc
@@ -39,8 +39,8 @@ post-install:
 		> ${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 -C ${PREFIX}/share/doc/vnc -xzf ${DISTDIR}/vnc-3.3.2_doc.tgz
+	${TAR} -C ${PREFIX}/share/doc -xzf ${DISTDIR}/vnc-latest_doc.tgz
+	(cd ${PREFIX}/share/doc; ${MV} vnc_docs vnc)
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/vnc
 # Go install Java classes
 	${MKDIR} ${PREFIX}/share/vnc
diff --git a/net/vnc/distinfo b/net/vnc/distinfo
index 245bc9f10b3e..0db5f9893d12 100644
--- a/net/vnc/distinfo
+++ b/net/vnc/distinfo
@@ -1,2 +1,2 @@
-MD5 (vnc-3.3.2r3_unixsrc.tgz) = IGNORE
-MD5 (vnc-3.3.2_doc.tgz) = IGNORE
+MD5 (vnc-3.3.3_unixsrc.tgz) = IGNORE
+MD5 (vnc-latest_doc.tgz) = IGNORE
diff --git a/net/vnc/pkg-plist b/net/vnc/pkg-plist
index 4ff98d52cac4..c183965287d0 100644
--- a/net/vnc/pkg-plist
+++ b/net/vnc/pkg-plist
@@ -2,123 +2,141 @@ bin/Xvnc
 bin/vncviewer
 bin/vncpasswd
 bin/vncserver
-share/doc/vnc/_private/footer.html
-share/doc/vnc/_private/header.html
-share/doc/vnc/_private/sidebar.html
-share/doc/vnc/_vti_pvt/_x_todo.htm
-share/doc/vnc/_vti_pvt/_x_todoh.htm
+share/vnc/classes/DesCipher.class
+share/vnc/classes/animatedMemoryImageSource.class
+share/vnc/classes/authenticationPanel.class
+share/vnc/classes/clipboardFrame.class
+share/vnc/classes/index.vnc
+share/vnc/classes/optionsFrame.class
+share/vnc/classes/rfbProto.class
+share/vnc/classes/shared.vnc
+share/vnc/classes/vncCanvas.class
+share/vnc/classes/vncviewer.class
+share/vnc/classes/vncviewer.jar
+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/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.htm~
+share/doc/vnc/download.html
+share/doc/vnc/downloadbutton.gif
+share/doc/vnc/downloadtemplate.html
+share/doc/vnc/extras.html
+share/doc/vnc/extras.html~
 share/doc/vnc/faq.html
+share/doc/vnc/faq.xml
+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/images/backbutton.gif
-share/doc/vnc/images/badgeshad.gif
-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/makefile
-share/doc/vnc/images/.lastinstall
-share/doc/vnc/images/makefile~
-share/doc/vnc/images/faqbutton.gif
-share/doc/vnc/images/people/ach.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/makefile
-share/doc/vnc/images/people/.lastinstall
-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/photos/vncce1.jpg
-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/makefile
-share/doc/vnc/images/photos/makefile~
-share/doc/vnc/images/photos/.lastinstall
-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/videos3.jpg
+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/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/makefile
+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/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/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
+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/vnchistory.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/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/winvncviewer-new.html
+share/doc/vnc/winvncviewer-new.html~
+share/doc/vnc/xlibvncviewer.html
 share/doc/vnc/xvnc.html
+share/doc/vnc/xvnchistory.html
 share/doc/vnc/xvncviewer.html
-share/vnc/classes/DesCipher.class
-share/vnc/classes/animatedMemoryImageSource.class
-share/vnc/classes/authenticationPanel.class
-share/vnc/classes/clipboardFrame.class
-share/vnc/classes/index.vnc
-share/vnc/classes/optionsFrame.class
-share/vnc/classes/rfbProto.class
-share/vnc/classes/shared.vnc
-share/vnc/classes/vncCanvas.class
-share/vnc/classes/vncviewer.class
-share/vnc/classes/vncviewer.jar
-@dirrm share/doc/vnc/images/photos
-@dirrm share/doc/vnc/images/people
-@dirrm share/doc/vnc/images
-@dirrm share/doc/vnc/_vti_pvt
-@dirrm share/doc/vnc/_private
 @dirrm share/doc/vnc
 @dirrm share/vnc/classes
 @dirrm share/vnc