From 1b4d61cf4edfcbe4a9e029a1e6e2e60ce3145f71 Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 1 Apr 2022 10:14:17 +0000 Subject: [PATCH] Don't print "You may wish to update your font path" at pkg_add time for paths which are under /usr/local/share/fonts. In most cases only fontconfig is relevant and this automatically searches subdirectories, so user changes are not often needed any more. The case where they might be needed is for server-side bit-map fonts (managed via 'xset fp' or 'fontpath' in /etc/X11/xorg.conf) but this is not common any more (most fonts in ports are not bit-map anyway) and this gets rid of some cases of pkg_add messages which the user does not need to act upon. ok landry@ matthieu@ and I think there were some others --- usr.sbin/pkg_add/OpenBSD/PackingElement.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm index 7f7846a1e55..3a3dcda06d5 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackingElement.pm,v 1.278 2021/08/09 16:41:21 espie Exp $ +# $OpenBSD: PackingElement.pm,v 1.279 2022/04/01 10:14:17 sthen Exp $ # # Copyright (c) 2003-2014 Marc Espie # @@ -1673,7 +1673,8 @@ sub install { my ($self, $state) = @_; $self->SUPER::install($state); - $state->log("You may wish to update your font path for #1", $self->fullname); + $state->log("You may wish to update your font path for #1", $self->fullname) + unless $self->fullname =~ /^\/usr\/local\/share\/fonts/; $state->{recorder}{fonts_todo}{$state->{destdir}.$self->fullname} = 1; } -- 2.20.1