- viewer subpackage, suggested by Joshua Stein <jcs@rt.fm>

- add missing vncconnect binary to main package
- better COMMENT

net/vnc/Makefile

@@ -1,13 +1,15 @@
-# $OpenBSD: Makefile,v 1.11 2001/05/22 19:30:16 matt Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/01 23:44:47 matt Exp $
 # $FreeBSD: Makefile,v 1.10 1999/02/18 16:05:47 steve Exp $
 
-COMMENT=	"display X & Win32 desktops on remote X/Win32/Java displays"
+COMMENT=	"cross-platform remote desktop access"
+COMMENT-viewer=	"client for cross-platform remote desktop access"
 
 VERSION=	3.3.3r2
 PKGNAME=        vnc-${VERSION}
+PKGNAME-viewer=	vnc-viewer-${VERSION}
 DISTNAME=       ${PKGNAME}_unixsrc
 CATEGORIES=	net
-NEED_VERSION=	1.402
+NEED_VERSION=	1.413
 
 HOMEPAGE=	http://www.uk.research.att.com/vnc/
 MAINTAINER=	Matt Behrens <matt@openbsd.org>
@@ -21,6 +23,9 @@ MASTER_SITES=   http://www.uk.research.att.com/vnc/dist/
 DISTFILES=	${DISTNAME}.tgz ${IGNOREFILES}
 IGNOREFILES=	vnc-latest_doc.tgz
 
+MULTI_PACKAGES=	-viewer
+SUBPACKAGE?=
+
 CONFIGURE_STYLE=imake
 
 WRKDIST=	${WRKDIR}/vnc_unixsrc
@@ -33,6 +38,8 @@ post-install:
 		${PREFIX}/bin/vncviewer
 	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd \
 		${PREFIX}/bin/vncpasswd
+	${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect \
+		${PREFIX}/bin/vncconnect
 	sed -e s%/usr/local/vnc/classes%${TRUEPREFIX}/share/vnc/classes% \
 		< ${WRKSRC}/vncserver \
 		> ${WRKSRC}/vncserver.local

net/vnc/pkg/DESCR-viewer

@@ -0,0 +1,7 @@
+VNC stands for Virtual Network Computing. It is, in essence, a
+remote display system which allows you to view a computing 'desktop'
+environment not only on the machine where it is running, but from
+anywhere on the Internet and from a wide variety of machine
+architectures.
+
+WWW: ${HOMEPAGE}

net/vnc/pkg/PLIST

@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.2 2001/05/22 19:30:17 matt Exp $
+@comment $OpenBSD: PLIST,v 1.3 2001/06/01 23:44:47 matt Exp $
+@pkgcfl vnc-viewer-*
 bin/Xvnc
+bin/vncconnect
 bin/vncpasswd
 bin/vncserver
 bin/vncviewer

net/vnc/pkg/PLIST-viewer

@@ -0,0 +1,121 @@
+@comment $OpenBSD: PLIST-viewer,v 1.1 2001/06/01 23:44:47 matt Exp $
+@pkgcfl vnc-*
+bin/vncviewer
+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/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/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/macvncviewer.html
+share/doc/vnc/mailinglist.html
+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/virus.html
+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