From 6b3175bbd1e21e48bbfc990e2425876d5e662569 Mon Sep 17 00:00:00 2001 From: Fred Wright Date: Thu, 21 May 2020 18:38:29 -0700 Subject: [PATCH] ntpviz: Also look in PREFIX for liberation font. This looks in PREFIX before /usr, on the theory that any locally installed version should be preferable. TESTED: With PREFIX set to /opt/local, now finds MacPorts-installed liberation font. The fallback also worked, so the only real effect in this case is to get rid of the warning. --- ntpclients/ntpviz.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ntpclients/ntpviz.py b/ntpclients/ntpviz.py index 6eb94bc07..b11d74e3c 100644 --- a/ntpclients/ntpviz.py +++ b/ntpclients/ntpviz.py @@ -1612,7 +1612,10 @@ Python by ESR, concept and gnuplot code by Dan Drown. if 2 < args.debug_level: sys.stderr.write("ntpviz: INFO: now running at nice: %s\n" % nice) - for fontpath in ("/usr/share/fonts/liberation", + for fontpath in ("@PREFIX@/share/fonts/liberation", + "@PREFIX@/share/fonts/liberation-fonts", + "@PREFIX@/share/fonts/truetype/liberation", + "/usr/share/fonts/liberation", "/usr/share/fonts/liberation-fonts", "/usr/share/fonts/truetype/liberation"): -- GitLab