5 files changed, 29 insertions, 28 deletions

diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index fbf8b44fd980..3a900cbbb0cf 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	tightvnc
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vnc-tight
diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo
index 087002acfb2e..e8d916f16b15 100644
--- a/net/tightvnc/distinfo
+++ b/net/tightvnc/distinfo
@@ -1 +1 @@
-MD5 (tightvnc-1.2.2_unixsrc.tar.bz2) = 0e3ccfca79d8bc38694e5bfe09b1f1a8
+MD5 (tightvnc-1.2.3_unixsrc.tar.bz2) = 35a2561f83eeabec7b0c91c251fbcfb4
diff --git a/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def b/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def
index 5cb1c5ecbe36..3a4c99ae2d34 100644
--- a/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def
+++ b/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def
@@ -1,10 +1,11 @@
---- Xvnc/config/cf/vnclibs.def.orig	Tue Jan 30 05:24:14 2001
-+++ Xvnc/config/cf/vnclibs.def	Sat Nov 24 17:16:47 2001
-@@ -5,5 +5,5 @@
+--- Xvnc/config/cf/vnclibs.def.orig	Wed Mar 20 05:38:00 2002
++++ Xvnc/config/cf/vnclibs.def	Fri Mar 29 03:50:10 2002
+@@ -5,6 +5,5 @@
   * and programs/Xserver/hw/vnc whenever you change this file.
   */
  
--VNCLIBS = $(TOP)/../libvncauth/libvncauth.a /usr/lib/libjpeg.a
--VNCCPPFLAGS = -I$(TOP)/../include
+-VNCLIBS = $(TOP)/../libvncauth/libvncauth.a
+-VNCSYSLIBS = -L$(TOP)/../lib/jpeg -ljpeg
+-VNCCPPFLAGS = -I$(TOP)/../include -I$(TOP)/../lib/zlib -I$(TOP)/../lib/jpeg
 +VNCLIBS = $(TOP)/../libvncauth/libvncauth.a %%LOCALBASE%%/lib/libjpeg.a
-+VNCCPPFLAGS = -I$(TOP)/../include -I%%LOCALBASE%%/include
++VNCCPPFLAGS = -I$(TOP)/../include -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib
diff --git a/net/tightvnc/files/patch-vncviewer::Imakefile b/net/tightvnc/files/patch-vncviewer::Imakefile
index 50600e32e057..3f1931aa8c08 100644
--- a/net/tightvnc/files/patch-vncviewer::Imakefile
+++ b/net/tightvnc/files/patch-vncviewer::Imakefile
@@ -1,19 +1,19 @@
---- vncviewer/Imakefile.orig	Tue Nov 13 05:31:34 2001
-+++ vncviewer/Imakefile	Sat Dec  8 18:25:22 2001
-@@ -13,10 +13,10 @@
+--- vncviewer/Imakefile.orig	Wed Mar 20 05:38:00 2002
++++ vncviewer/Imakefile	Fri Mar 29 03:26:02 2002
+@@ -11,10 +11,10 @@
  DEFINES = -DMITSHM
  #endif
  
--INCLUDES = -I../include -I. -I/usr/include
-+INCLUDES = -I../include -I. -I/usr/include -I%%LOCALBASE%%/include
+-INCLUDES = -I../include -I. -I../lib/zlib -I../lib/jpeg -I/usr/include
++INCLUDES = -I../include -I. -I%%LOCALBASE%%/include
  VNCAUTH_LIB = ../libvncauth/libvncauth.a
- ZLIB_LIB = /usr/lib/libz.a
--JPEG_LIB = /usr/lib/libjpeg.a
-+JPEG_LIB = %%LOCALBASE%%/lib/libjpeg.a
+ ZLIB_LIB = -L../lib/zlib -lz
+-JPEG_LIB = -L../lib/jpeg -ljpeg
++JPEG_LIB = -L%%LOCALBASE%%/lib -ljpeg
  
- DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB)
+ DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
  LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB)
-@@ -40,4 +40,4 @@
+@@ -38,4 +38,4 @@
  
  OBJS = $(SRCS:.c=.o)
  
diff --git a/net/tightvnc/pkg-plist b/net/tightvnc/pkg-plist
index 62580634cb28..8486f6882401 100644
--- a/net/tightvnc/pkg-plist
+++ b/net/tightvnc/pkg-plist
@@ -1,21 +1,21 @@
 bin/Xvnc
-bin/vncviewer
+bin/vncconnect
 bin/vncpasswd
 bin/vncserver
-bin/vncconnect
+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/animatedMemoryImageSource.class
-share/tightvnc/classes/authenticationPanel.class
-share/tightvnc/classes/clipboardFrame.class
+share/tightvnc/classes/OptionsFrame.class
+share/tightvnc/classes/RfbProto.class
+share/tightvnc/classes/VncCanvas.class
+share/tightvnc/classes/VncViewer.class
+share/tightvnc/classes/VncViewer.jar
 share/tightvnc/classes/hextile.vnc
 share/tightvnc/classes/index.vnc
 share/tightvnc/classes/noshared.vnc
-share/tightvnc/classes/optionsFrame.class
-share/tightvnc/classes/rfbProto.class
 share/tightvnc/classes/shared.vnc
-share/tightvnc/classes/vncCanvas.class
-share/tightvnc/classes/vncviewer.class
-share/tightvnc/classes/vncviewer.jar
 share/tightvnc/classes/tight.vnc
 share/tightvnc/classes/zlib.vnc
 @dirrm share/tightvnc/classes