CVS commit: pkgsrc/net/tigervnc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Oct  1 11:42:23 UTC 2021

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

Log Message:
tigervnc: Avoid hardcoding X11BASE


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/net/tigervnc/Makefile
cvs rdiff -u -r1.2 -r1.3 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.43 pkgsrc/net/tigervnc/Makefile:1.44
--- pkgsrc/net/tigervnc/Makefile:1.43   Thu Sep 30 21:38:23 2021
+++ pkgsrc/net/tigervnc/Makefile        Fri Oct  1 11:42:23 2021
@@ -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_CLASSES+=               hpath
 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
 

Index: pkgsrc/net/tigervnc/files/vncserver.pl
diff -u pkgsrc/net/tigervnc/files/vncserver.pl:1.2 pkgsrc/net/tigervnc/files/vncserver.pl:1.3
--- pkgsrc/net/tigervnc/files/vncserver.pl:1.2  Thu Sep 30 21:38:23 2021
+++ pkgsrc/net/tigervnc/files/vncserver.pl      Fri Oct  1 11:42:23 2021
@@ -97,12 +97,8 @@ if (-d "/etc/X11/fontpath.d") {
     $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',