Attachment #71151 for bug #103693

View | Details | Raw Unified | Return to bug 103693
Collapse All | Expand All




#

PORTNAME=	tightvnc
PORTVERSION=	1.3.8
PORTREVISION=	1
CATEGORIES=	net
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	vnc-tight

.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
.endif

post-patch:

Lines 1-3 Link Here

(-)/disk/3/home/nivo/ports/tightvnc/distinfo (-3 / +3 lines)
1	MD5 (tightvnc-1.2.9_unixsrc.tar.bz2) = f804b26c098625e3a2675a0aa7709e31	1	MD5 (tightvnc-1.3.8_unixsrc.tar.bz2) = 9b9b0465834289d1b7899982c0096440
2	SHA256 (tightvnc-1.2.9_unixsrc.tar.bz2) = c1ba77f832d6c81349f05219802c48b3435cfb6db88f496c9bb08b52b8405548	2	SHA256 (tightvnc-1.3.8_unixsrc.tar.bz2) = cd76e1c5c6843fec2a7a5c493158cdb3642eb1ef4caecee7a89bfd2078881178
3	SIZE (tightvnc-1.2.9_unixsrc.tar.bz2) = 1738256	3	SIZE (tightvnc-1.3.8_unixsrc.tar.bz2) = 1766473




--- 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 -lcrypt
-#else
+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




--- 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";
 $authType = "-rfbauth $vncUserDir/passwd";

 # Here is another example of setting the font path:





--- 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:




bin/vncpasswd
bin/vncserver
bin/vncviewer
%%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%%

Return to bug 103693

Lines 7-14 Link Here

(-)/disk/3/home/nivo/ports/tightvnc/Makefile (-4 / +3 lines)
7	#	7	#
8		8
9	PORTNAME= tightvnc	9	PORTNAME= tightvnc
10	PORTVERSION= 1.2.9	10	PORTVERSION= 1.3.8
11	PORTREVISION= 1
12	CATEGORIES= net	11	CATEGORIES= net
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
14	MASTER_SITE_SUBDIR= vnc-tight	13	MASTER_SITE_SUBDIR= vnc-tight
Lines 35-45 Link Here
35	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
36		35
37	.if ${ARCH} != "i386"	36	.if ${ARCH} != "i386"
38	BROKEN= "Does not compile on !i386"	37	BROKEN= Does not compile on !i386
39	.endif	38	.endif
40		39
41	.if exists(${X11BASE}/share/vnc/classes/index.vnc)	40	.if exists(${X11BASE}/share/vnc/classes/index.vnc)
42	IGNORE= vnc has already been installed, please uninstall it first.	41	IGNORE= vnc has already been installed, please uninstall it first
43	.endif	42	.endif
44		43
45	post-patch:	44	post-patch:

Lines 1-18 Link Here

(-)/disk/3/home/nivo/ports/tightvnc/files/patch-Xvnc::config::cf::vnclibs.def (-8 / +8 lines)
1	--- Xvnc/config/cf/vnclibs.def.orig Thu Sep 26 12:32:21 2002	1	--- Xvnc/config/cf/vnclibs.def.orig Sat May 3 11:31:54 2003
2	+++ Xvnc/config/cf/vnclibs.def Thu Sep 26 12:34:04 2002	2	+++ Xvnc/config/cf/vnclibs.def Tue Sep 26 21:48:43 2006
3	@@ -5,13 +5,5 @@	3	@@ -5,13 +5,6 @@
4	* and programs/Xserver/hw/vnc whenever you change this file.	4	* and programs/Xserver/hw/vnc whenever you change this file.
5	*/	5	*/
6		6
7	-VNCLIBS = $(TOP)/../libvncauth/libvncauth.a	7	-VNCLIBS = $(TOP)/../libvncauth/libvncauth.a
8	-	8	-
9	-#ifdef OSF1Architecture	9	-#ifdef OSF1Architecture
10	-/* Avoid linking with different libjpeg in /usr/shlib under Tru64. */	10	-/* Avoid linking with different libjpeg in /usr/shlib under Tru64. */
11	-VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a	11	-VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a -lcrypt
12	-#else	12	-#else
13	-VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz	13	+VNCLIBS = $(TOP)/../libvncauth/libvncauth.a /usr/local/lib/libjpeg.a
		14	+VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include -L/usr/local/lib
		15	VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt
14	-#endif	16	-#endif
15	-	17	-
16	-VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include	18	-VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include
17	+VNCLIBS = $(TOP)/../libvncauth/libvncauth.a %%LOCALBASE%%/lib/libjpeg.a
18	+VNCCPPFLAGS = -I$(TOP)/../include -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib

Lines 1-11 Link Here

(-)/disk/3/home/nivo/ports/tightvnc/files/patch-vncserver (-6 / +7 lines)
1	--- vncserver.orig Fri Mar 29 05:58:01 2002	1	--- vncserver.orig Thu Aug 10 13:01:07 2006
2	+++ vncserver Fri Mar 29 05:58:15 2002	2	+++ vncserver Tue Sep 26 21:08:10 2006
3	@@ -37,7 +37,7 @@	3	@@ -38,7 +38,7 @@
4	$desktopName = "X";	4	$desktopName = "X";
5	$vncClasses = "/usr/local/vnc/classes";	5	$vncClasses = "/usr/local/vnc/classes";
6	$vncUserDir = "$ENV{HOME}/.vnc";	6	$vncUserDir = "$ENV{HOME}/.vnc";
7	-$fontPath = "unix/:7100";	7	-$fontPath = "unix/:7100";
8	+# $fontPath = "unix/:7100";	8	+#$fontPath = "unix/:7100";
9		9	$authType = "-rfbauth $vncUserDir/passwd";
		10
10	# Here is another example of setting the font path:	11	# Here is another example of setting the font path:
11	# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";	12

Lines 1-14 Link Here

(-)/disk/3/home/nivo/ports/tightvnc/files/patch-vncviewer::desktop.c (-14 lines)
1	--- vncviewer/desktop.c.orig Thu Jul 31 00:01:00 2003
2	+++ vncviewer/desktop.c Sun Sep 18 19:20:06 2005
3	@@ -180,8 +180,9 @@
4	break;
5
6	case FocusIn:
7	- XSetInputFocus(dpy, XtWindowOfObject(desktop), RevertToPointerRoot,
8	- CurrentTime);
9	+ /** XSetInputFocus(dpy, XtWindowOfObject(desktop), RevertToPointerRoot,
10	+ CurrentTime); **/
11	+ XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
12	break;
13
14	case FocusOut:

Lines 3-23 Link Here

(-)/disk/3/home/nivo/ports/tightvnc/pkg-plist (-18 / +18 lines)
3	bin/vncpasswd	3	bin/vncpasswd
4	bin/vncserver	4	bin/vncserver
5	bin/vncviewer	5	bin/vncviewer
6	share/tightvnc/classes/AuthPanel.class	6	%%DATADIR%%classes/AuthPanel.class
7	share/tightvnc/classes/ButtonPanel.class	7	%%DATADIR%%/classes/ButtonPanel.class
8	share/tightvnc/classes/ClipboardFrame.class	8	%%DATADIR%%/classes/ClipboardFrame.class
9	share/tightvnc/classes/DesCipher.class	9	%%DATADIR%%/classes/DesCipher.class
10	share/tightvnc/classes/HTTPConnectSocket.class	10	%%DATADIR%%/classes/HTTPConnectSocket.class
11	share/tightvnc/classes/HTTPConnectSocketFactory.class	11	%%DATADIR%%/classes/HTTPConnectSocketFactory.class
12	share/tightvnc/classes/OptionsFrame.class	12	%%DATADIR%%/classes/OptionsFrame.class
13	share/tightvnc/classes/RecordingFrame.class	13	%%DATADIR%%/classes/RecordingFrame.class
14	share/tightvnc/classes/ReloginPanel.class	14	%%DATADIR%%/classes/ReloginPanel.class
15	share/tightvnc/classes/RfbProto.class	15	%%DATADIR%%/classes/RfbProto.class
16	share/tightvnc/classes/SessionRecorder.class	16	%%DATADIR%%/classes/SessionRecorder.class
17	share/tightvnc/classes/SocketFactory.class	17	%%DATADIR%%/classes/SocketFactory.class
18	share/tightvnc/classes/VncCanvas.class	18	%%DATADIR%%/classes/VncCanvas.class
19	share/tightvnc/classes/VncViewer.class	19	%%DATADIR%%/classes/VncViewer.class
20	share/tightvnc/classes/VncViewer.jar	20	%%DATADIR%%/classes/VncViewer.jar
21	share/tightvnc/classes/index.vnc	21	%%DATADIR%%/classes/index.vnc
22	@dirrm share/tightvnc/classes	22	@dirrm %%DATADIR%%/classes
23	@dirrm share/tightvnc	23	@dirrm %%DATADIR%%