[pkgsrc/trunk]: pkgsrc/net/tigervnc tigervnc: Avoid hardcoding X11BASE

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f52a1c2d828
branches:  trunk
changeset: 459189:3f52a1c2d828
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Oct 01 11:42:23 2021 +0000

description:
tigervnc: Avoid hardcoding X11BASE

diffstat:

 net/tigervnc/Makefile           |  5 +++--
 net/tigervnc/files/vncserver.pl |  8 ++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diffs (40 lines):

diff -r 7a50938808d8 -r 3f52a1c2d828 net/tigervnc/Makefile
--- a/net/tigervnc/Makefile     Fri Oct 01 11:32:50 2021 +0000
+++ b/net/tigervnc/Makefile     Fri Oct 01 11:42:23 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2021/09/30 21:38:23 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2021/10/01 11:42:23 nia Exp $
 
 DISTNAME=              tigervnc-1.11.0
 PKGNAME=               ${DISTNAME}.1.20.11
-PKGREVISION=           5
+PKGREVISION=           6
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=TigerVNC/}
 GITHUB_TAG=            v1.11.0
@@ -48,6 +48,7 @@
 SUBST_STAGE.hpath=     pre-configure
 SUBST_MESSAGE.hpath=   fixing hardcoded paths
 SUBST_FILES.hpath=     unix/vncserver/vncserver.in
+SUBST_FILES.hpath=     vncserver.pl
 SUBST_SED.hpath+=      -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g'
 SUBST_VARS.hpath+=     PREFIX X11BASE
 
diff -r 7a50938808d8 -r 3f52a1c2d828 net/tigervnc/files/vncserver.pl
--- a/net/tigervnc/files/vncserver.pl   Fri Oct 01 11:32:50 2021 +0000
+++ b/net/tigervnc/files/vncserver.pl   Fri Oct 01 11:42:23 2021 +0000
@@ -97,12 +97,8 @@
     $fontPath = "catalogue:/etc/X11/fontpath.d";
 }
 
-@fontpaths = ('/usr/share/X11/fonts', '/usr/share/fonts', '/usr/share/fonts/X11/');
-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');
+@fontpaths = ('@PREFIX@/share/fonts', '@PREFIX@/share/fonts/X11/');
+if (! -l "@X11BASE@") {push(@fontpaths, '@X11BASE@/lib/X11/fonts');}
 
 @fonttypes = ('misc',
              '75dpi',