update to 1.0.23 and add Avahi support.

net/ssvnc/Makefile

@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.7 2009/04/05 12:12:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2009/06/23 20:57:46 sthen Exp $
 
 COMMENT-gui =		enhanced TightVNC client GUI and wrappers
 COMMENT-main =		enhanced TightVNC client
 
-V =			1.0.22
+V =			1.0.23
 DISTNAME =		ssvnc-$V.src
 CATEGORIES =		net x11
 
 PKGNAME =		ssvnc-$V
-FULLPKGNAME-gui =	ssvnc-$Vp0
-FULLPKGNAME-main =	ssvnc-viewer-$Vp0
+FULLPKGNAME-gui =	ssvnc-$V
+FULLPKGNAME-main =	ssvnc-viewer-$V
 
 HOMEPAGE =		http://www.karlrunge.com/x11vnc/ssvnc.html
 
@@ -38,9 +38,10 @@ WANTLIB-main =		X11 Xext c z ICE SM Xaw Xmu Xp Xpm Xt Xau Xdmcp
 LIB_DEPENDS-main =	jpeg.>=62.::graphics/jpeg
 
 WANTLIB-gui =		c crypto
-RUN_DEPENDS-gui =	::security/stunnel \
-			::devel/desktop-file-utils \
+RUN_DEPENDS-gui =	::devel/desktop-file-utils \
+			::net/avahi,no_gtk,no_qt3,no_qt4 \
 			::net/ssvnc,-main \
+			::security/stunnel \
 			${MODTK_RUN_DEPENDS}
 
 CONFIGURE_STYLE =	imake noman

net/ssvnc/distinfo

@@ -1,5 +1,5 @@
-MD5 (ssvnc-1.0.22.src.tar.gz) = YnOuhioOGxud1apG6rUS3A==
-RMD160 (ssvnc-1.0.22.src.tar.gz) = TjZ9lmKt2GMAKXcu3Tkt003iPmo=
-SHA1 (ssvnc-1.0.22.src.tar.gz) = TPd8MRCscwq9WfLCuEYcj56xwfo=
-SHA256 (ssvnc-1.0.22.src.tar.gz) = p1itX0WE8reqFw+65amYSbvJfvBQCx7LdEXcvQHXNtk=
-SIZE (ssvnc-1.0.22.src.tar.gz) = 453665
+MD5 (ssvnc-1.0.23.src.tar.gz) = jiezS98JBC1C98jGEZcnIA==
+RMD160 (ssvnc-1.0.23.src.tar.gz) = SXklSkV0j7TI9/R+yQZWZZn6sfM=
+SHA1 (ssvnc-1.0.23.src.tar.gz) = cOKplQK8T4x+m6+4poXi02p0alg=
+SHA256 (ssvnc-1.0.23.src.tar.gz) = 0oY4ygK/vLWzF4jSkvp2QK4R5nPtAkuup/fYDxOtx98=
+SIZE (ssvnc-1.0.23.src.tar.gz) = 483158

net/ssvnc/patches/patch-scripts_ssvnc

@@ -1,4 +1,8 @@
-$OpenBSD: patch-scripts_ssvnc,v 1.1 2009/01/13 15:08:27 sthen Exp $
+$OpenBSD: patch-scripts_ssvnc,v 1.2 2009/06/23 20:57:46 sthen Exp $
+
+use the correct wish binary first.  N.B. update-patches will destroy
+the ${MODTK_BIN} expansion in the 'for' line.
+
 --- scripts/ssvnc.orig	Tue Jan 13 03:02:08 2009
 +++ scripts/ssvnc	Tue Jan 13 03:04:45 2009
 @@ -30,7 +30,7 @@ fi

net/ssvnc/patches/patch-scripts_util_ssvnc_tcl

@@ -0,0 +1,34 @@
+$OpenBSD: patch-scripts_util_ssvnc_tcl,v 1.1 2009/06/23 20:57:46 sthen Exp $
+
+type sometimes returns "xx is a tracked alias for /foo/bar" which
+isn't handled. whence is sufficient and more reliable.
+
+--- scripts/util/ssvnc.tcl.orig	Tue Jun 23 21:49:09 2009
++++ scripts/util/ssvnc.tcl	Tue Jun 23 21:49:44 2009
+@@ -15453,7 +15453,7 @@ proc check_zeroconf_browse {} {
+ 		return 0;
+ 	}
+ 	set p ""
+-	set r [catch {set p [exec /bin/sh -c {type avahi-browse}]}]
++	set r [catch {set p [exec /bin/sh -c {whence avahi-browse}]}]
+ 	if {$r == 0} {
+ 		regsub {^.* is  *} $p "" p
+ 		regsub -all {[ \t\n\r]} $p "" p
+@@ -15463,7 +15463,7 @@ proc check_zeroconf_browse {} {
+ 		}
+ 	}
+ 	set p ""
+-	set r [catch {set p [exec /bin/sh -c {type dns-sd}]}]
++	set r [catch {set p [exec /bin/sh -c {whence dns-sd}]}]
+ 	if {$r == 0} {
+ 		regsub {^.* is  *} $p "" p
+ 		regsub -all {[ \t\n\r]} $p "" p
+@@ -15478,7 +15478,7 @@ proc check_zeroconf_browse {} {
+ 		}
+ 	}
+ 	set p ""
+-	set r [catch {set p [exec /bin/sh -c {type mDNS}]}]
++	set r [catch {set p [exec /bin/sh -c {whence mDNS}]}]
+ 	if {$r == 0} {
+ 		regsub {^.* is  *} $p "" p
+ 		regsub -all {[ \t\n\r]} $p "" p

net/ssvnc/patches/patch-vnc_unixsrc_vncviewer_rfbproto_c

@@ -1,10 +1,10 @@
-$OpenBSD: patch-vnc_unixsrc_vncviewer_rfbproto_c,v 1.1 2009/03/27 02:04:44 sthen Exp $
+$OpenBSD: patch-vnc_unixsrc_vncviewer_rfbproto_c,v 1.2 2009/06/23 20:57:46 sthen Exp $
 
 allow to build with GCC 2
 
---- vnc_unixsrc/vncviewer/rfbproto.c.orig	Thu Mar 26 20:24:19 2009
-+++ vnc_unixsrc/vncviewer/rfbproto.c	Thu Mar 26 20:25:24 2009
-@@ -1705,8 +1705,8 @@ extern void raiseme(int force);
+--- vnc_unixsrc/vncviewer/rfbproto.c.orig	Sun May 31 18:29:44 2009
++++ vnc_unixsrc/vncviewer/rfbproto.c	Tue Jun 23 21:28:20 2009
+@@ -2247,8 +2247,8 @@ extern void raiseme(int force);
  Bool
  SendTextChatOpen(void)
  {
@@ -14,19 +14,19 @@ allow to build with GCC 2
  	chat.type = rfbTextChat;
  	chat.pad1 = 0;
  	chat.pad2 = 0;
-@@ -2070,6 +2070,7 @@ HandleRFBServerMessage()
- 	int area_zrle = 0;
- 	int area_raw = 0;
- 	static int rdb = -1;
+@@ -2617,6 +2617,7 @@ HandleRFBServerMessage()
+ 	int try_delay_sync = 0;
+ 	int cnt_pseudo = 0;
+ 	int cnt_image  = 0;
 +	int skip_incFBU = 0;
  
  	if (db) fprintf(stderr, "FBU-0:    %.6f\n", dnow());
  	if (rdb < 0) {
-@@ -2080,7 +2081,6 @@ HandleRFBServerMessage()
+@@ -2635,7 +2636,6 @@ HandleRFBServerMessage()
  		}
  	}
  
 -	int skip_incFBU = 0;
  	sent_FBU = -1;
  
- 	if (!ReadFromRFBServer(((char *)&msg.fu) + 1, sz_rfbFramebufferUpdateMsg - 1)) {
+ 	if (appData.pipelineUpdates) {

net/ssvnc/pkg/PLIST-gui

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-gui,v 1.1 2009/01/13 15:08:27 sthen Exp $
+@comment $OpenBSD: PLIST-gui,v 1.2 2009/06/23 20:57:46 sthen Exp $
 bin/sshvnc
 bin/ssvnc
 bin/tsvnc
@@ -17,7 +17,7 @@ lib/ssvnc/util/stunnel-server.conf
 @bin lib/ssvnc/vncstorepw
 @man man/man1/ssvnc.1
 %%SHARED%%
-share/applications/
+@comment share/applications/
 share/applications/ssvnc.desktop
 @exec %D/bin/update-desktop-database
 @unexec %D/bin/update-desktop-database