Attachment 71151 Details for Bug 103693 – tightvnc-1.3.8.patch

[patch] tightvnc-1.3.8.patch

tightvnc-1.3.8.patch (text/plain), 6.25 KB, created by Nils Vogels on 2006-09-26 21:00:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nils Vogels

Created: 2006-09-26 21:00:44 UTC

Size: 6.25 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/net/tightvnc/Makefile /disk/3/home/nivo/ports/tightvnc/Makefile
>--- /usr/ports/net/tightvnc/Makefile	Tue Sep 20 15:25:16 2005
>+++ /disk/3/home/nivo/ports/tightvnc/Makefile	Tue Sep 26 21:54:46 2006
>@@ -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
>@@ -35,11 +34,11 @@
> .include <bsd.port.pre.mk>
> 
> .if ${ARCH} != "i386"
>-BROKEN=		"Does not compile on !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 -ruN --exclude=CVS /usr/ports/net/tightvnc/distinfo /disk/3/home/nivo/ports/tightvnc/distinfo
>--- /usr/ports/net/tightvnc/distinfo	Fri Nov 25 17:48:27 2005
>+++ /disk/3/home/nivo/ports/tightvnc/distinfo	Tue Sep 26 20:23:22 2006
>@@ -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 -ruN --exclude=CVS /usr/ports/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def /disk/3/home/nivo/ports/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def
>--- /usr/ports/net/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def	Mon Oct  7 08:59:10 2002
>+++ /disk/3/home/nivo/ports/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def	Tue Sep 26 21:49:56 2006
>@@ -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 -ruN --exclude=CVS /usr/ports/net/tightvnc/files/patch-vncserver /disk/3/home/nivo/ports/tightvnc/files/patch-vncserver
>--- /usr/ports/net/tightvnc/files/patch-vncserver	Fri Mar 29 12:11:44 2002
>+++ /disk/3/home/nivo/ports/tightvnc/files/patch-vncserver	Tue Sep 26 21:08:56 2006
>@@ -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 -ruN --exclude=CVS /usr/ports/net/tightvnc/files/patch-vncviewer::desktop.c /disk/3/home/nivo/ports/tightvnc/files/patch-vncviewer::desktop.c
>--- /usr/ports/net/tightvnc/files/patch-vncviewer::desktop.c	Tue Sep 20 15:25:16 2005
>+++ /disk/3/home/nivo/ports/tightvnc/files/patch-vncviewer::desktop.c	Thu Jan  1 01:00:00 1970
>@@ -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 -ruN --exclude=CVS /usr/ports/net/tightvnc/pkg-plist /disk/3/home/nivo/ports/tightvnc/pkg-plist
>--- /usr/ports/net/tightvnc/pkg-plist	Tue Aug  5 07:48:20 2003
>+++ /disk/3/home/nivo/ports/tightvnc/pkg-plist	Tue Sep 26 20:40:39 2006
>@@ -3,21 +3,21 @@
> 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/ButtonPanel.class
>+%%DATADIR%%/classes/ClipboardFrame.class
>+%%DATADIR%%/classes/DesCipher.class
>+%%DATADIR%%/classes/HTTPConnectSocket.class
>+%%DATADIR%%/classes/HTTPConnectSocketFactory.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%%

Actions: View | Diff

Attachments on bug 103693: 71151