Update the good ole docs location and make PLIST generation on-the-fly so

Bruce won't have to chase the distfile around.

PR:		19154
Submitted by:	MAINTAINER

2 files changed, 7 insertions, 123 deletions

diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 2192be192bf8..33c53ce0c0b6 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		vnc
-PORTVERSION=		3.3.3r1
+PORTVERSION=		3.3.3.1
 CATEGORIES=		net
 MASTER_SITES=   	http://www.uk.research.att.com/vnc/dist/
 DISTFILES=		vnc-3.3.3r1_unixsrc.tgz \
@@ -33,10 +33,15 @@ post-install:
 		< ${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
+# The documentation comes with bogus ownerships; this is a little leaky
+# security-wise
 	${TAR} -C ${PREFIX}/share/doc -xzf ${DISTDIR}/vnc-latest_doc.tgz
 	(cd ${PREFIX}/share/doc; ${RM} -rf vnc; ${MV} vnc_docs vnc)
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/vnc
+# Add to PLIST because VNC developers can't/won't freeze their doc
+# distfile.
+	(cd ${PREFIX}; ls share/doc/vnc/* >> ${TMPPLIST})
+	${ECHO} '@dirrm share/doc/vnc' >> ${TMPPLIST}
 # Go install Java classes
 	${MKDIR} ${PREFIX}/share/vnc
 	${CP} -R ${WRKSRC}/classes ${PREFIX}/share/vnc
diff --git a/net/vnc/pkg-plist b/net/vnc/pkg-plist
index 003ad93afe09..828ed7eb39e0 100644
--- a/net/vnc/pkg-plist
+++ b/net/vnc/pkg-plist
@@ -13,126 +13,5 @@ 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/alicebobcharlie.gif
-share/doc/vnc/alicecharlie.gif
-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.html
-share/doc/vnc/downloadbutton.gif
-share/doc/vnc/downloadtemplate.html
-share/doc/vnc/extras.html
-share/doc/vnc/faq.dtd
-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/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/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/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/sshwin.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/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
 @dirrm share/vnc/classes
 @dirrm share/vnc