From be43523d3b6d2084f8a0cffc1e7a344fe41577a8 Mon Sep 17 00:00:00 2001
From: will <will@FreeBSD.org>
Date: Thu, 1 Jun 2000 17:39:40 +0000
Subject: Fix PLIST problems, make installation more robust, and change email
 addr for MAINTAINER.

PR:		18950
Submitted by:	maintainer
---
 net/vnc/Makefile  | 10 +++-------
 net/vnc/pkg-plist |  2 ++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 17f0334..2192be1 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -11,19 +11,15 @@ CATEGORIES=		net
 MASTER_SITES=   	http://www.uk.research.att.com/vnc/dist/
 DISTFILES=		vnc-3.3.3r1_unixsrc.tgz \
 			vnc-latest_doc.tgz
+EXTRACT_ONLY=		vnc-3.3.3r1_unixsrc.tgz
 
-MAINTAINER=	 	bmah@ca.sandia.gov
+MAINTAINER=	 	bmah@acm.org
 
 USE_PERL5=		YES
-
-EXTRACT_ONLY=		vnc-3.3.3r1_unixsrc.tgz
 IGNOREFILES=		vnc-latest_doc.tgz
-
 WRKSRC=			${WRKDIR}/vnc_unixsrc
-
 USE_IMAKE=		YES
 NO_INSTALL_MANPAGES=	YES
-
 ALL_TARGET=    		World
 
 # We have to frob a few things, and we want our own permissions, so it's easier
@@ -39,7 +35,7 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver
 # 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; ${MV} vnc_docs vnc)
+	(cd ${PREFIX}/share/doc; ${RM} -rf vnc; ${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/pkg-plist b/net/vnc/pkg-plist
index 4d7f1ed..003ad93 100644
--- a/net/vnc/pkg-plist
+++ b/net/vnc/pkg-plist
@@ -42,6 +42,7 @@ 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
@@ -50,6 +51,7 @@ 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
-- 
cgit v1.1