From bmah@eisenhower.ca.sandia.gov Thu Sep  9 08:52:43 1999
Return-Path: <bmah@eisenhower.ca.sandia.gov>
Received: from eisenhower.ca.sandia.gov (eisenhower.ca.sandia.gov [146.246.243.57])
	by hub.freebsd.org (Postfix) with ESMTP id 773BF14D49
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  9 Sep 1999 08:52:36 -0700 (PDT)
	(envelope-from bmah@eisenhower.ca.sandia.gov)
Received: (from bmah@localhost)
	by eisenhower.ca.sandia.gov (8.9.3/8.9.3) id IAA14328;
	Thu, 9 Sep 1999 08:51:55 -0700 (PDT)
	(envelope-from bmah)
Message-Id: <199909091551.IAA14328@eisenhower.ca.sandia.gov>
Date: Thu, 9 Sep 1999 08:51:55 -0700 (PDT)
From: bmah@ca.sandia.gov
Sender: bmah@eisenhower.ca.sandia.gov
Reply-To: bmah@ca.sandia.gov
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] Update vnc port
X-Send-Pr-Version: 3.2

>Number:         13664
>Category:       ports
>Synopsis:       [patch] Update vnc port
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    cpiazza
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep  9 09:00:01 PDT 1999
>Closed-Date:    Fri Sep 10 14:15:43 PDT 1999
>Last-Modified:  Fri Sep 10 14:16:00 PDT 1999
>Originator:     Bruce A. Mah
>Release:        FreeBSD 3.2-RELEASE i386
>Organization:
Sandia National Laboratories
>Environment:

	

>Description:

Here's a context diff to take the vnc port from vnc-3.3.2r3 to vnc-3.3.3,
for which I'm the port maintainer.

Please note that patches/patch-ab is to be deleted, as it was rolled
into the main vnc codebase.

If possible I would like someone to double-check the package-building
and -deletion for me.  In particular, the ports infrastructure seems to
assume a dependence on XFree86-3.3.5 (as opposed to any other version of
XFree86), a version that I currently don't have installed.  Thanks.

>How-To-Repeat:

	

>Fix:
	
diff -r -c /usr/ports/net/vnc/Makefile vnc/Makefile
*** /usr/ports/net/vnc/Makefile	Sun Sep  5 10:41:26 1999
--- vnc/Makefile	Wed Sep  8 20:20:00 1999
***************
*** 6,23 ****
  # $FreeBSD: ports/net/vnc/Makefile,v 1.12 1999/08/30 14:24:30 peter Exp $
  #
  
! DISTNAME=       	vnc-3.3.2r3_unixsrc
! PKGNAME=        	vnc-3.3.2r3
  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
  
  MAINTAINER=	 	bmah@ca.sandia.gov
  
  USE_PERL5=		YES
  
! EXTRACT_ONLY=		vnc-3.3.2r3_unixsrc.tgz
  IGNOREFILES=		${DISTFILES}
  
  WRKSRC=			${WRKDIR}/vnc_unixsrc
--- 6,23 ----
  # $FreeBSD: ports/net/vnc/Makefile,v 1.12 1999/08/30 14:24:30 peter Exp $
  #
  
! 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.3_unixsrc.tgz \
! 			vnc-latest_doc.tgz
  
  MAINTAINER=	 	bmah@ca.sandia.gov
  
  USE_PERL5=		YES
  
! EXTRACT_ONLY=		vnc-3.3.3_unixsrc.tgz
  IGNOREFILES=		${DISTFILES}
  
  WRKSRC=			${WRKDIR}/vnc_unixsrc
***************
*** 39,46 ****
  		> ${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
  	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/vnc
  # Go install Java classes
  	${MKDIR} ${PREFIX}/share/vnc
--- 39,46 ----
  		> ${WRKSRC}/vncserver.local
  	${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)
  	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/vnc
  # Go install Java classes
  	${MKDIR} ${PREFIX}/share/vnc
diff -r -c /usr/ports/net/vnc/files/md5 vnc/files/md5
*** /usr/ports/net/vnc/files/md5	Tue Dec 22 17:43:14 1998
--- vnc/files/md5	Wed Sep  8 14:57:26 1999
***************
*** 1,2 ****
! MD5 (vnc-3.3.2r3_unixsrc.tgz) = IGNORE
! MD5 (vnc-3.3.2_doc.tgz) = IGNORE
--- 1,2 ----
! MD5 (vnc-3.3.3_unixsrc.tgz) = IGNORE
! MD5 (vnc-latest_doc.tgz) = IGNORE
Only in /usr/ports/net/vnc/patches: patch-ab
diff -r -c /usr/ports/net/vnc/pkg/PLIST vnc/pkg/PLIST
*** /usr/ports/net/vnc/pkg/PLIST	Fri Oct  9 19:14:26 1998
--- vnc/pkg/PLIST	Wed Sep  8 20:22:54 1999
***************
*** 2,124 ****
  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/doc/vnc/contribs.html
  share/doc/vnc/docs.html
  share/doc/vnc/download.htm
! 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/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/index.html
  share/doc/vnc/internalversion.html
  share/doc/vnc/intouch.html
  share/doc/vnc/javavncviewer.html
  share/doc/vnc/makefile
  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/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
--- 2,137 ----
  bin/vncviewer
  bin/vncpasswd
  bin/vncserver
! 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.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/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/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/xvnchistory.html~
  share/doc/vnc/xvncviewer.html
  @dirrm share/doc/vnc
  @dirrm share/vnc/classes
  @dirrm share/vnc

>Release-Note:
>Audit-Trail:

From: bmah@CA.Sandia.GOV (Bruce A. Mah)
To: FreeBSD-gnats-submit@FreeBSD.ORG
Cc: bmah@california.sandia.gov
Subject: Re: ports/13664: [patch] Update vnc port 
Date: Thu, 09 Sep 1999 10:34:16 -0700

 If memory serves me right, bmah@california.sandia.gov wrote:
 
 > If possible I would like someone to double-check the package-building
 > and -deletion for me.  In particular, the ports infrastructure seems to
 > assume a dependence on XFree86-3.3.5 (as opposed to any other version of
 > XFree86), a version that I currently don't have installed.  Thanks.
 
 Disregard.  I was doing something stupid.  This diff is OK to commit.
 
 Bruce.
 
 
 
Responsible-Changed-From-To: freebsd-ports->cpiazza  
Responsible-Changed-By: cpiazza 
Responsible-Changed-When: Fri Sep 10 14:05:12 PDT 1999 
Responsible-Changed-Why:  
I'll look at this 
State-Changed-From-To: open->closed  
State-Changed-By: cpiazza 
State-Changed-When: Fri Sep 10 14:15:43 PDT 1999 
State-Changed-Why:  
Committed with some changees to PLIST, thanks! 
>Unformatted:
