diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index cda100114bb..8c9c6939401 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -1,53 +1,58 @@
-# $OpenBSD: Makefile,v 1.14 2004/12/16 00:31:26 alek Exp $
+# $OpenBSD: Makefile,v 1.15 2005/10/07 18:52:58 alek Exp $
 
 COMMENT=	"cross-platform remote desktop access"
 COMMENT-viewer=	"client for cross-platform remote desktop access"
 
-VERSION=	1.2.7
-PKGNAME=        tightvnc-${VERSION}
+VERSION=	1.2.9
+PKGNAME=	tightvnc-${VERSION}
 PKGNAME-viewer=	tightvnc-viewer-${VERSION}
-DISTNAME=       ${PKGNAME}_unixsrc
+DISTNAME=	tightvnc-${VERSION}_unixsrc
 CATEGORIES=	net
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=vnc-tight/}
-DISTFILES=	${DISTNAME}.tar.gz
 
 HOMEPAGE=	http://www.tightvnc.org/
-MAINTAINER=	Rob Casey <rob@minauros.com>
 
-LIB_DEPENDS=	jpeg.62.::graphics/jpeg
+MAINTAINER=	Rob Casey <rob@minauros.com>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ICE SM X11 Xaw Xext Xmu Xp Xpm Xt c m z 
+WANTLIB=		X11 Xext c z 
+
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vnc-tight/}
+
+LIB_DEPENDS=	jpeg.62.::graphics/jpeg
+USE_X11=	Yes
 
-EXTRACT_ONLY=	${DISTNAME}.tar.gz
 WRKDIST=	${WRKDIR}/vnc_unixsrc
 
-MULTI_PACKAGES= -viewer
+MULTI_PACKAGES=	-viewer
 SUBPACKAGE?=
 
-CONFIGURE_STYLE=	imake
+CONFIGURE_STYLE=imake
 
-ALL_TARGET=    	World
+ALL_TARGET=	World
 
 NO_REGRESS=	Yes
 
-.if defined(PACKAGING) && empty(SUBPACKAGE)
-RUN_DEPENDS+=	::net/tightvnc,-viewer
+.if defined(PACKAGING)
+.  if ${SUBPACKAGE} == "-viewer"
+WANTLIB+=	ICE SM Xaw Xmu Xp Xpm Xt 
+.  else
+RUN_DEPENDS=	:tightvnc-viewer-${VERSION}:net/tightvnc,-viewer
+LIB_DEPENDS=
+WANTLIB+=	m
+.  endif
 .endif
 
-DOCUMENTATION=vncserver.man vncpasswd/vncpasswd.man vncconnect/vncconnect.man \
-    Xvnc/programs/Xserver/Xvnc.man vncviewer/vncviewer.man
+DOCUMENTATION=	vncserver.man vncpasswd/vncpasswd.man vncconnect/vncconnect.man \
+		Xvnc/programs/Xserver/Xvnc.man vncviewer/vncviewer.man
 
 .if ${MACHINE_ARCH} == "sparc64"
 PATCH_LIST=	patch-* gcc-*
 .endif
 
-# We have to frob a few things, and we want our own permissions, so it's easier
-# to do the install ourselves.
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
 	${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
@@ -58,9 +63,9 @@ post-install:
 		> ${WRKSRC}/vncserver.local
 	${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver
 
-# Go install Java classes
 	${INSTALL_DATA_DIR} ${PREFIX}/share/vnc
-	cp -R ${WRKSRC}/classes ${PREFIX}/share/vnc
+	${INSTALL_DATA_DIR} ${PREFIX}/share/vnc/classes
+	${INSTALL_DATA} ${WRKSRC}/classes/* ${PREFIX}/share/vnc/classes
 .for i in ${DOCUMENTATION}
 	${INSTALL_MAN} ${WRKSRC}/$i ${PREFIX}/man/man1/${i:T:R}.1
 .endfor
diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo
index fe86613d0f2..7d6750d8c22 100644
--- a/net/tightvnc/distinfo
+++ b/net/tightvnc/distinfo
@@ -1,4 +1,4 @@
-MD5 (tightvnc-1.2.7_unixsrc.tar.gz) = dfc99ab9c104459d6168c25c9fa1ee1e
-RMD160 (tightvnc-1.2.7_unixsrc.tar.gz) = 1f5021d7faa03d61ca35c6e7253ad088f39e9786
-SHA1 (tightvnc-1.2.7_unixsrc.tar.gz) = 95a258a5752fcd24518426288121c03bbc0bac01
-SIZE (tightvnc-1.2.7_unixsrc.tar.gz) = 2138494
+MD5 (tightvnc-1.2.9_unixsrc.tar.gz) = ba277dc56a0cfed2e4fba778f219cd08
+RMD160 (tightvnc-1.2.9_unixsrc.tar.gz) = e889415501ed59e581b1bcdb69929a5315a5f6b6
+SHA1 (tightvnc-1.2.9_unixsrc.tar.gz) = 4c71198e2d3f3ae894ae801619e29db4eea61da9
+SIZE (tightvnc-1.2.9_unixsrc.tar.gz) = 2154893
diff --git a/net/tightvnc/pkg/PLIST b/net/tightvnc/pkg/PLIST
index ecac5316e20..7020b86dc96 100644
--- a/net/tightvnc/pkg/PLIST
+++ b/net/tightvnc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2004/09/29 20:39:48 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.13 2005/10/07 18:52:58 alek Exp $
 bin/Xvnc
 bin/vncconnect
 bin/vncpasswd
@@ -13,6 +13,8 @@ share/vnc/classes/AuthPanel.class
 share/vnc/classes/ButtonPanel.class
 share/vnc/classes/ClipboardFrame.class
 share/vnc/classes/DesCipher.class
+share/vnc/classes/HTTPConnectSocket.class
+share/vnc/classes/HTTPConnectSocketFactory.class
 share/vnc/classes/OptionsFrame.class
 share/vnc/classes/RecordingFrame.class
 share/vnc/classes/ReloginPanel.class