Tue Oct 5 19:04:33 2021 UTC ()
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.


(tm)
diff -r1.41 -r1.41.2.1 pkgsrc/net/tigervnc/Makefile
diff -r1.1 -r1.1.4.1 pkgsrc/net/tigervnc/files/vncserver.pl
cvs diff -r1.41 -r1.41.2.1 pkgsrc/net/tigervnc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/Makefile 2021/07/10 23:19:36 1.41
+++ pkgsrc/net/tigervnc/Makefile 2021/10/05 19:04:33 1.41.2.1
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.41 2021/07/10 23:19:36 dholland Exp $ 1# $NetBSD: Makefile,v 1.41.2.1 2021/10/05 19:04:33 tm Exp $
2 2
3DISTNAME= tigervnc-1.11.0 3DISTNAME= tigervnc-1.11.0
4PKGNAME= ${DISTNAME}.1.20.11 4PKGNAME= ${DISTNAME}.1.20.11
5PKGREVISION= 3 5PKGREVISION= 5
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/}
8GITHUB_TAG= v1.11.0 8GITHUB_TAG= v1.11.0
9XORG_SERVER_FILE= xorg-server-1.20.11 9XORG_SERVER_FILE= xorg-server-1.20.11
10SITES.${XORG_SERVER_FILE}.tar.bz2= ${MASTER_SITE_XORG:=xserver/} 10SITES.${XORG_SERVER_FILE}.tar.bz2= ${MASTER_SITE_XORG:=xserver/}
11DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2 11DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://tigervnc.org/ 14HOMEPAGE= https://tigervnc.org/
15COMMENT= High-performance, platform-neutral VNC client/server 15COMMENT= High-performance, platform-neutral VNC client/server
16LICENSE= gnu-gpl-v2 16LICENSE= gnu-gpl-v2
17 17
18BUILD_DEPENDS+= xorg-util-macros-[0-9]*:../../devel/xorg-util-macros 18BUILD_DEPENDS+= xorg-util-macros-[0-9]*:../../devel/xorg-util-macros
cvs diff -r1.1 -r1.1.4.1 pkgsrc/net/tigervnc/files/vncserver.pl (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/files/vncserver.pl 2021/05/16 21:06:42 1.1
+++ pkgsrc/net/tigervnc/files/vncserver.pl 2021/10/05 19:04:33 1.1.4.1
@@ -91,26 +91,27 @@ $defaultConfig @@ -91,26 +91,27 @@ $defaultConfig
91 "# localhost\n". 91 "# localhost\n".
92 "# alwaysshared\n"); 92 "# alwaysshared\n");
93 93
94chop($host = `uname -n`); 94chop($host = `uname -n`);
95 95
96if (-d "/etc/X11/fontpath.d") { 96if (-d "/etc/X11/fontpath.d") {
97 $fontPath = "catalogue:/etc/X11/fontpath.d"; 97 $fontPath = "catalogue:/etc/X11/fontpath.d";
98} 98}
99 99
100@fontpaths = ('/usr/share/X11/fonts', '/usr/share/fonts', '/usr/share/fonts/X11/'); 100@fontpaths = ('/usr/share/X11/fonts', '/usr/share/fonts', '/usr/share/fonts/X11/');
101if (! -l "/usr/lib/X11") {push(@fontpaths, '/usr/lib/X11/fonts');} 101if (! -l "/usr/lib/X11") {push(@fontpaths, '/usr/lib/X11/fonts');}
102if (! -l "/usr/X11") {push(@fontpaths, '/usr/X11/lib/X11/fonts');} 102if (! -l "/usr/X11") {push(@fontpaths, '/usr/X11/lib/X11/fonts');}
103if (! -l "/usr/X11R6") {push(@fontpaths, '/usr/X11R6/lib/X11/fonts');} 103if (! -l "/usr/X11R6") {push(@fontpaths, '/usr/X11R6/lib/X11/fonts');}
 104if (! -l "/usr/X11R7") {push(@fontpaths, '/usr/X11R7/lib/X11/fonts');}
104push(@fontpaths, '/usr/share/fonts/default'); 105push(@fontpaths, '/usr/share/fonts/default');
105 106
106@fonttypes = ('misc', 107@fonttypes = ('misc',
107 '75dpi', 108 '75dpi',
108 '100dpi', 109 '100dpi',
109 'Speedo', 110 'Speedo',
110 'Type1'); 111 'Type1');
111 112
112foreach $_fpath (@fontpaths) { 113foreach $_fpath (@fontpaths) {
113 foreach $_ftype (@fonttypes) { 114 foreach $_ftype (@fonttypes) {
114 if (-f "$_fpath/$_ftype/fonts.dir") { 115 if (-f "$_fpath/$_ftype/fonts.dir") {
115 if (! -l "$_fpath/$_ftype") { 116 if (! -l "$_fpath/$_ftype") {
116 $defFontPath .= "$_fpath/$_ftype,"; 117 $defFontPath .= "$_fpath/$_ftype,";