7 files changed, 49 insertions, 67 deletions

diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 305561886d81..0e5352138f29 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	tightvnc
-PORTVERSION=	1.2.9
-PORTREVISION=	1
+PORTVERSION=	1.3.8
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vnc-tight
@@ -34,12 +33,8 @@ MAN1=		Xvnc.1 vncviewer.1 vncpasswd.1 vncconnect.1 vncserver.1
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-BROKEN=		"Does not compile on !i386"
-.endif
-
 .if exists(${X11BASE}/share/vnc/classes/index.vnc)
-IGNORE=		vnc has already been installed, please uninstall it first.
+IGNORE=		vnc has already been installed, please uninstall it first
 .endif
 
 post-patch:
diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo
index 3c78d02fb42c..611ae493e180 100644
--- a/net/tightvnc/distinfo
+++ b/net/tightvnc/distinfo
@@ -1,3 +1,3 @@
-MD5 (tightvnc-1.2.9_unixsrc.tar.bz2) = f804b26c098625e3a2675a0aa7709e31
-SHA256 (tightvnc-1.2.9_unixsrc.tar.bz2) = c1ba77f832d6c81349f05219802c48b3435cfb6db88f496c9bb08b52b8405548
-SIZE (tightvnc-1.2.9_unixsrc.tar.bz2) = 1738256
+MD5 (tightvnc-1.3.8_unixsrc.tar.bz2) = 9b9b0465834289d1b7899982c0096440
+SHA256 (tightvnc-1.3.8_unixsrc.tar.bz2) = cd76e1c5c6843fec2a7a5c493158cdb3642eb1ef4caecee7a89bfd2078881178
+SIZE (tightvnc-1.3.8_unixsrc.tar.bz2) = 1766473
diff --git a/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf b/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf
index 4a749bdf16ef..1aa0f83d7d98 100644
--- a/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf
+++ b/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf
@@ -1,14 +1,5 @@
---- Xvnc/config/cf/FreeBSD.cf.orig	Sun Jun 11 21:00:51 2000
-+++ Xvnc/config/cf/FreeBSD.cf	Fri Dec  6 03:21:44 2002
-@@ -49,7 +49,7 @@
- 
- #define MkdirHierCmd		mkdir -p
- 
--#define CcCmd			cc
-+#define CcCmd			%%CC%%
- #define CppCmd			/usr/libexec/cpp
- #define PreProcessCmd		CppCmd
- #define StandardCppDefines	-traditional
+--- Xvnc/config/cf/FreeBSD.cf.orig	Sun Jun 11 08:00:51 2000
++++ Xvnc/config/cf/FreeBSD.cf	Tue Sep 26 19:07:31 2006
 @@ -253,9 +253,9 @@
  #endif
  
@@ -21,3 +12,11 @@
  #endif
  
  #ifndef PreIncDir
+@@ -359,6 +359,5 @@
+ 
+ #include <bsdLib.rules>
+ 
+-#ifdef i386Architecture
+ #include <xfree86.cf>
+-#endif
++
diff --git a/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def b/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def
index 0b9c0dc6c08a..40f25604a389 100644
--- a/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def
+++ b/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def
@@ -1,18 +1,18 @@
---- Xvnc/config/cf/vnclibs.def.orig	Thu Sep 26 12:32:21 2002
-+++ Xvnc/config/cf/vnclibs.def	Thu Sep 26 12:34:04 2002
-@@ -5,13 +5,5 @@
+--- Xvnc/config/cf/vnclibs.def.orig     Sat May  3 11:31:54 2003
++++ Xvnc/config/cf/vnclibs.def  Tue Sep 26 21:48:43 2006
+@@ -5,13 +5,6 @@
   * and programs/Xserver/hw/vnc whenever you change this file.
   */
- 
+
 -VNCLIBS = $(TOP)/../libvncauth/libvncauth.a
 -
 -#ifdef OSF1Architecture
 -/* Avoid linking with different libjpeg in /usr/shlib under Tru64. */
--VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a
+-VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a -lcrypt
 -#else
--VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz
++VNCLIBS = $(TOP)/../libvncauth/libvncauth.a /usr/local/lib/libjpeg.a
++VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include -L/usr/local/lib
+ VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt
 -#endif
 -
 -VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include
-+VNCLIBS = $(TOP)/../libvncauth/libvncauth.a %%LOCALBASE%%/lib/libjpeg.a
-+VNCCPPFLAGS = -I$(TOP)/../include -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib
diff --git a/net/tightvnc/files/patch-vncserver b/net/tightvnc/files/patch-vncserver
index 963e37fc3ea3..60e5b581f274 100644
--- a/net/tightvnc/files/patch-vncserver
+++ b/net/tightvnc/files/patch-vncserver
@@ -1,11 +1,12 @@
---- vncserver.orig	Fri Mar 29 05:58:01 2002
-+++ vncserver	Fri Mar 29 05:58:15 2002
-@@ -37,7 +37,7 @@
+--- vncserver.orig      Thu Aug 10 13:01:07 2006
++++ vncserver   Tue Sep 26 21:08:10 2006
+@@ -38,7 +38,7 @@
  $desktopName = "X";
  $vncClasses = "/usr/local/vnc/classes";
  $vncUserDir = "$ENV{HOME}/.vnc";
 -$fontPath = "unix/:7100";
-+# $fontPath = "unix/:7100";
- 
++#$fontPath = "unix/:7100";
+ $authType = "-rfbauth $vncUserDir/passwd";
+
  # Here is another example of setting the font path:
- # $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
+
diff --git a/net/tightvnc/files/patch-vncviewer::desktop.c b/net/tightvnc/files/patch-vncviewer::desktop.c
deleted file mode 100644
index 33a005fc4d96..000000000000
--- a/net/tightvnc/files/patch-vncviewer::desktop.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- vncviewer/desktop.c.orig	Thu Jul 31 00:01:00 2003
-+++ vncviewer/desktop.c	Sun Sep 18 19:20:06 2005
-@@ -180,8 +180,9 @@
-     break;
- 
-   case FocusIn:
--      XSetInputFocus(dpy, XtWindowOfObject(desktop), RevertToPointerRoot,
--		     CurrentTime);
-+      /** XSetInputFocus(dpy, XtWindowOfObject(desktop), RevertToPointerRoot,
-+		     CurrentTime); **/
-+      XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
-     break;
- 
-   case FocusOut:
diff --git a/net/tightvnc/pkg-plist b/net/tightvnc/pkg-plist
index 7ec1ef46a2c2..72827a1295a6 100644
--- a/net/tightvnc/pkg-plist
+++ b/net/tightvnc/pkg-plist
@@ -3,21 +3,22 @@ bin/vncconnect
 bin/vncpasswd
 bin/vncserver
 bin/vncviewer
-share/tightvnc/classes/AuthPanel.class
-share/tightvnc/classes/ButtonPanel.class
-share/tightvnc/classes/ClipboardFrame.class
-share/tightvnc/classes/DesCipher.class
-share/tightvnc/classes/HTTPConnectSocket.class
-share/tightvnc/classes/HTTPConnectSocketFactory.class
-share/tightvnc/classes/OptionsFrame.class
-share/tightvnc/classes/RecordingFrame.class
-share/tightvnc/classes/ReloginPanel.class
-share/tightvnc/classes/RfbProto.class
-share/tightvnc/classes/SessionRecorder.class
-share/tightvnc/classes/SocketFactory.class
-share/tightvnc/classes/VncCanvas.class
-share/tightvnc/classes/VncViewer.class
-share/tightvnc/classes/VncViewer.jar
-share/tightvnc/classes/index.vnc
-@dirrm share/tightvnc/classes
-@dirrm share/tightvnc
+%%DATADIR%%/classes/AuthPanel.class
+%%DATADIR%%/classes/AuthUnixLoginPanel.class
+%%DATADIR%%/classes/ButtonPanel.class
+%%DATADIR%%/classes/CapabilityInfo.class
+%%DATADIR%%/classes/CapsContainer.class
+%%DATADIR%%/classes/ClipboardFrame.class
+%%DATADIR%%/classes/DesCipher.class
+%%DATADIR%%/classes/OptionsFrame.class
+%%DATADIR%%/classes/RecordingFrame.class
+%%DATADIR%%/classes/ReloginPanel.class
+%%DATADIR%%/classes/RfbProto.class
+%%DATADIR%%/classes/SessionRecorder.class
+%%DATADIR%%/classes/SocketFactory.class
+%%DATADIR%%/classes/VncCanvas.class
+%%DATADIR%%/classes/VncViewer.class
+%%DATADIR%%/classes/VncViewer.jar
+%%DATADIR%%/classes/index.vnc
+@dirrm %%DATADIR%%/classes
+@dirrm %%DATADIR%%