Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Jun 2000 14:33:27 -0700 (PDT)
From:      bmah@cisco.com (Bruce A. Mah)
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/19154: [patch] Fix a few net/vnc port problems
Message-ID:  <200006092133.e59LXRU84350@bmah-freebsd-0.cisco.com>

next in thread | raw e-mail | index | archive | help

>Number:         19154
>Category:       ports
>Synopsis:       [patch] Fix a few net/vnc port problems
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 09 14:40:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Bruce A. Mah
>Release:        FreeBSD 4.0-RELEASE i386
>Organization:
Cisco Systems, Inc.
>Environment:

Current ports collection, cvsup-ed today.

>Description:

The fscking docs tarfile for vnc changed yet again.  This causes
the PLIST to break without warning, because there's no version
bump.  I gave up trying to update checksums for this file long ago.
I'm tired of playing "chase the distfile".

This patch adds the following fixes to the net/vnc port:

1.  Dynamically generate the PLIST at install-time, so regardless
(heh) of what the vnc developers do to their docs tarball, PLIST
should be correct.  I'd like someone with experience with on-the-fly
PLISTs to look through my Makefile and tell me if I did this right.

2.  Fix the PORTVERSION variable to adhere to numbering conventions.

3.  Fix a wordwrap in the Makefile.

Would I go through all this if I wasn't the port maintainer?  :-)

>How-To-Repeat:

	

>Fix:

diff -rcN /usr/ports/net/vnc/Makefile ./vnc/Makefile
*** /usr/ports/net/vnc/Makefile	Thu Jun  1 14:30:49 2000
--- ./vnc/Makefile	Fri Jun  9 14:24:25 2000
***************
*** 6,12 ****
  #
  
  PORTNAME=		vnc
! PORTVERSION=		3.3.3r1
  CATEGORIES=		net
  MASTER_SITES=   	http://www.uk.research.att.com/vnc/dist/
  DISTFILES=		vnc-3.3.3r1_unixsrc.tgz \
--- 6,12 ----
  #
  
  PORTNAME=		vnc
! 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,42 ****
  		< ${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
  	${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
  # Go install Java classes
  	${MKDIR} ${PREFIX}/share/vnc
  	${CP} -R ${WRKSRC}/classes ${PREFIX}/share/vnc
--- 33,47 ----
  		< ${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
  	${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 -rcN /usr/ports/net/vnc/pkg/PLIST ./vnc/pkg/PLIST
*** /usr/ports/net/vnc/pkg/PLIST	Thu Jun  1 14:30:49 2000
--- ./vnc/pkg/PLIST	Fri Jun  9 14:05:03 2000
***************
*** 13,138 ****
  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
--- 13,17 ----

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200006092133.e59LXRU84350>