[pkgsrc/pkgsrc-2021Q3]: pkgsrc/net/tigervnc Pullup ticket #6501 - requested b...

[tm <tm%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a2f0305f2b9f
branches:  pkgsrc-2021Q3
changeset: 459377:a2f0305f2b9f
user:      tm <tm%pkgsrc.org@localhost>
date:      Tue Oct 05 19:04:33 2021 +0000

description:
Pullup ticket #6501 - requested by bsiegert
net/tigervnc: Bugfix for X11R7 fonts

Revisions pulled up:
- net/tigervnc/Makefile                                         1.43
- net/tigervnc/files/vncserver.pl                               1.2

---
   Module Name:    pkgsrc
   Committed By:   wiz
   Date:           Thu Sep 30 21:38:23 UTC 2021

   Modified Files:
           pkgsrc/net/tigervnc: Makefile
           pkgsrc/net/tigervnc/files: vncserver.pl

   Log Message:
   tigervnc: look in /usr/X11R7 for fonts

   From Chavdar Ivanov in PR 56427.

   Bump PKGREVISION.

diffstat:

 net/tigervnc/Makefile           |  4 ++--
 net/tigervnc/files/vncserver.pl |  1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r 8a6fcd62b9e7 -r a2f0305f2b9f net/tigervnc/Makefile
--- a/net/tigervnc/Makefile     Sun Oct 03 17:56:53 2021 +0000
+++ b/net/tigervnc/Makefile     Tue Oct 05 19:04:33 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2021/07/10 23:19:36 dholland Exp $
+# $NetBSD: Makefile,v 1.41.2.1 2021/10/05 19:04:33 tm Exp $
 
 DISTNAME=              tigervnc-1.11.0
 PKGNAME=               ${DISTNAME}.1.20.11
-PKGREVISION=           3
+PKGREVISION=           5
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=TigerVNC/}
 GITHUB_TAG=            v1.11.0
diff -r 8a6fcd62b9e7 -r a2f0305f2b9f net/tigervnc/files/vncserver.pl
--- a/net/tigervnc/files/vncserver.pl   Sun Oct 03 17:56:53 2021 +0000
+++ b/net/tigervnc/files/vncserver.pl   Tue Oct 05 19:04:33 2021 +0000
@@ -101,6 +101,7 @@
 if (! -l "/usr/lib/X11") {push(@fontpaths, '/usr/lib/X11/fonts');}
 if (! -l "/usr/X11") {push(@fontpaths, '/usr/X11/lib/X11/fonts');}
 if (! -l "/usr/X11R6") {push(@fontpaths, '/usr/X11R6/lib/X11/fonts');}
+if (! -l "/usr/X11R7") {push(@fontpaths, '/usr/X11R7/lib/X11/fonts');}
 push(@fontpaths, '/usr/share/fonts/default');
 
 @fonttypes = ('misc',