CVS commit: [pkgsrc-2021Q3] pkgsrc/net/tigervnc

["Thomas Merkel" <tm%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tm
Date:           Tue Oct  5 19:04:33 UTC 2021

Modified Files:
        pkgsrc/net/tigervnc [pkgsrc-2021Q3]: Makefile
        pkgsrc/net/tigervnc/files [pkgsrc-2021Q3]: vncserver.pl

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.2.1 pkgsrc/net/tigervnc/Makefile
cvs rdiff -u -r1.1 -r1.1.4.1 pkgsrc/net/tigervnc/files/vncserver.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/tigervnc/Makefile
diff -u pkgsrc/net/tigervnc/Makefile:1.41 pkgsrc/net/tigervnc/Makefile:1.41.2.1
--- pkgsrc/net/tigervnc/Makefile:1.41   Sat Jul 10 23:19:36 2021
+++ pkgsrc/net/tigervnc/Makefile        Tue Oct  5 19:04:33 2021
@@ -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

Index: pkgsrc/net/tigervnc/files/vncserver.pl
diff -u pkgsrc/net/tigervnc/files/vncserver.pl:1.1 pkgsrc/net/tigervnc/files/vncserver.pl:1.1.4.1
--- pkgsrc/net/tigervnc/files/vncserver.pl:1.1  Sun May 16 21:06:42 2021
+++ pkgsrc/net/tigervnc/files/vncserver.pl      Tue Oct  5 19:04:33 2021
@@ -101,6 +101,7 @@ if (-d "/etc/X11/fontpath.d") {
 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',