Fri Nov 26 16:47:21 2021 UTC ()
tigervnc: stop using rfbwait

After the update this seems to not be supported any longer.

Bump PKGREVISION.


(wiz)
diff -r1.45 -r1.46 pkgsrc/net/tigervnc/Makefile
diff -r1.3 -r1.4 pkgsrc/net/tigervnc/files/vncserver.pl
cvs diff -r1.45 -r1.46 pkgsrc/net/tigervnc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/Makefile 2021/11/16 15:45:01 1.45
+++ pkgsrc/net/tigervnc/Makefile 2021/11/26 16:47:21 1.46
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.45 2021/11/16 15:45:01 wiz Exp $ 1# $NetBSD: Makefile,v 1.46 2021/11/26 16:47:21 wiz Exp $
2 2
3DISTNAME= tigervnc-1.12.0 3DISTNAME= tigervnc-1.12.0
4PKGNAME= ${DISTNAME}.1.20.13 4PKGNAME= ${DISTNAME}.1.20.13
 5PKGREVISION= 1
5CATEGORIES= net 6CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/}
7GITHUB_TAG= v1.12.0 8GITHUB_TAG= v1.12.0
8XORG_SERVER_FILE= xorg-server-1.20.13 9XORG_SERVER_FILE= xorg-server-1.20.13
9SITES.${XORG_SERVER_FILE}.tar.bz2= ${MASTER_SITE_XORG:=xserver/} 10SITES.${XORG_SERVER_FILE}.tar.bz2= ${MASTER_SITE_XORG:=xserver/}
10DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.xz 11DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.xz
11 12
12MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= https://tigervnc.org/ 14HOMEPAGE= https://tigervnc.org/
14COMMENT= High-performance, platform-neutral VNC client/server 15COMMENT= High-performance, platform-neutral VNC client/server
15LICENSE= gnu-gpl-v2 16LICENSE= gnu-gpl-v2
16 17
17BUILD_DEPENDS+= xorg-util-macros-[0-9]*:../../devel/xorg-util-macros 18BUILD_DEPENDS+= xorg-util-macros-[0-9]*:../../devel/xorg-util-macros
cvs diff -r1.3 -r1.4 pkgsrc/net/tigervnc/files/vncserver.pl (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/files/vncserver.pl 2021/10/01 11:42:23 1.3
+++ pkgsrc/net/tigervnc/files/vncserver.pl 2021/11/26 16:47:21 1.4
@@ -192,27 +192,27 @@ if ($opt{'-name'}) { @@ -192,27 +192,27 @@ if ($opt{'-name'}) {
192 $desktopName = "$host:$displayNumber ($ENV{USER})"; 192 $desktopName = "$host:$displayNumber ($ENV{USER})";
193} 193}
194 194
195my %default_opts; 195my %default_opts;
196my %config; 196my %config;
197 197
198# We set some reasonable defaults. Config file settings 198# We set some reasonable defaults. Config file settings
199# override these where present. 199# override these where present.
200$default_opts{desktop} = &quotedString($desktopName); 200$default_opts{desktop} = &quotedString($desktopName);
201$default_opts{auth} = &quotedString($xauthorityFile); 201$default_opts{auth} = &quotedString($xauthorityFile);
202$default_opts{geometry} = $geometry if ($geometry); 202$default_opts{geometry} = $geometry if ($geometry);
203$default_opts{depth} = $depth if ($depth); 203$default_opts{depth} = $depth if ($depth);
204$default_opts{pixelformat} = $pixelformat if ($pixelformat); 204$default_opts{pixelformat} = $pixelformat if ($pixelformat);
205$default_opts{rfbwait} = 30000; 205#$default_opts{rfbwait} = 30000;
206$default_opts{rfbauth} = "$vncUserDir/passwd"; 206$default_opts{rfbauth} = "$vncUserDir/passwd";
207$default_opts{rfbport} = $vncPort; 207$default_opts{rfbport} = $vncPort;
208$default_opts{fp} = $fontPath if ($fontPath); 208$default_opts{fp} = $fontPath if ($fontPath);
209$default_opts{pn} = ""; 209$default_opts{pn} = "";
210 210
211# Load user-overrideable system defaults 211# Load user-overrideable system defaults
212LoadConfig($vncSystemConfigDefaultsFile); 212LoadConfig($vncSystemConfigDefaultsFile);
213 213
214# Then the user's settings 214# Then the user's settings
215LoadConfig($vncUserConfig); 215LoadConfig($vncUserConfig);
216 216
217# And then override anything set above if mandatory settings exist. 217# And then override anything set above if mandatory settings exist.
218# WARNING: "Mandatory" is used loosely here! As the man page says, 218# WARNING: "Mandatory" is used loosely here! As the man page says,