upgrade to 1.2.6

PR:		43393
Submitted by:	Marco Molteni <molter@tin.it>

5 files changed, 25 insertions, 11 deletions

diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 5dea5c145a22..e7380bf2ab09 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	tightvnc
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.6
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vnc-tight
diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo
index 8076f031e3e6..b1aba4f00800 100644
--- a/net/tightvnc/distinfo
+++ b/net/tightvnc/distinfo
@@ -1 +1 @@
-MD5 (tightvnc-1.2.4_unixsrc.tar.bz2) = 57e4fcb590415797c641c0d15ef60ba8
+MD5 (tightvnc-1.2.6_unixsrc.tar.bz2) = 9b48da1465ee78b614f0d26f4a8c7aaf
diff --git a/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def b/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def
index 3a4c99ae2d34..0b9c0dc6c08a 100644
--- a/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def
+++ b/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def
@@ -1,11 +1,18 @@
---- 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 @@
+--- 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 @@
   * and programs/Xserver/hw/vnc whenever you change this file.
   */
  
 -VNCLIBS = $(TOP)/../libvncauth/libvncauth.a
--VNCSYSLIBS = -L$(TOP)/../lib/jpeg -ljpeg
--VNCCPPFLAGS = -I$(TOP)/../include -I$(TOP)/../lib/zlib -I$(TOP)/../lib/jpeg
+-
+-#ifdef OSF1Architecture
+-/* Avoid linking with different libjpeg in /usr/shlib under Tru64. */
+-VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a
+-#else
+-VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz
+-#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-vncviewer::Imakefile b/net/tightvnc/files/patch-vncviewer::Imakefile
index 41b6f6f53c35..0cf49c07a7c0 100644
--- a/net/tightvnc/files/patch-vncviewer::Imakefile
+++ b/net/tightvnc/files/patch-vncviewer::Imakefile
@@ -1,6 +1,6 @@
---- vncviewer/Imakefile.orig	Tue Apr 30 09:07:31 2002
-+++ vncviewer/Imakefile	Wed May 22 21:48:12 2002
-@@ -10,12 +10,12 @@
+--- vncviewer/Imakefile.orig	Thu Sep 26 11:26:17 2002
++++ vncviewer/Imakefile	Thu Sep 26 11:28:47 2002
+@@ -10,17 +10,12 @@
  DEFINES = -DMITSHM
  #endif
  
@@ -11,13 +11,18 @@
  INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include
  VNCAUTH_LIB = ../libvncauth/libvncauth.a
 -ZLIB_LIB = -L/usr/local/lib -lz
+-#ifdef OSF1Architecture
+-XCOMM Avoid linking with different libjpeg in /usr/shlib under Tru64.
+-JPEG_LIB = /usr/local/lib/libjpeg.a
+-#else
 -JPEG_LIB = -L/usr/local/lib -ljpeg
+-#endif
 +ZLIB_LIB = -L%%LOCALBASE%%/lib -lz
 +JPEG_LIB = -L%%LOCALBASE%%/lib -ljpeg
  
  DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
  LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB)
-@@ -39,4 +39,4 @@
+@@ -44,4 +39,4 @@
  
  OBJS = $(SRCS:.c=.o)
  
diff --git a/net/tightvnc/pkg-plist b/net/tightvnc/pkg-plist
index 8486f6882401..f598f4b02937 100644
--- a/net/tightvnc/pkg-plist
+++ b/net/tightvnc/pkg-plist
@@ -8,7 +8,9 @@ share/tightvnc/classes/ButtonPanel.class
 share/tightvnc/classes/ClipboardFrame.class
 share/tightvnc/classes/DesCipher.class
 share/tightvnc/classes/OptionsFrame.class
+share/tightvnc/classes/RecordingFrame.class
 share/tightvnc/classes/RfbProto.class
+share/tightvnc/classes/SessionRecorder.class
 share/tightvnc/classes/VncCanvas.class
 share/tightvnc/classes/VncViewer.class
 share/tightvnc/classes/VncViewer.jar