- there's no point in running mkfontdir only for @fontdir ; so let's run

mkfontscale too (and remove fonts.scale on package removal)

discussed with matthieu@ and espie@ weeks ago
"seems fine" pyr@, ok espie@

2 files changed, 5 insertions, 3 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
index 32de9812e08..3e2b6513751 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.142 2007/06/18 10:47:03 espie Exp $
+# $OpenBSD: PackingElement.pm,v 1.143 2007/07/14 21:50:05 ajacoutot Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -1237,6 +1237,7 @@ sub finish_fontdirs
 		map { update_fontalias($_) } @l unless $state->{not};
 		print "You may wish to update your font path for ", join(' ', @l), "\n";
 		return if $state->{not};
+		run_if_exists($state, OpenBSD::Paths->mkfontscale, @l);
 		run_if_exists($state, OpenBSD::Paths->mkfontdir, @l);
 
 		map { restore_fontdir($_) } @l;
diff --git a/usr.sbin/pkg_add/OpenBSD/Paths.pm b/usr.sbin/pkg_add/OpenBSD/Paths.pm
index 06a0cd33259..73313a23e23 100644
--- a/usr.sbin/pkg_add/OpenBSD/Paths.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Paths.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Paths.pm,v 1.4 2007/06/16 09:37:31 espie Exp $
+# $OpenBSD: Paths.pm,v 1.5 2007/07/14 21:50:05 ajacoutot Exp $
 #
 # Copyright (c) 2007 Marc Espie <espie@openbsd.org>
 #
@@ -23,6 +23,7 @@ package OpenBSD::Paths;
 # Commands
 sub ldconfig() { '/sbin/ldconfig' }
 sub chroot() { '/usr/sbin/chroot' }
+sub mkfontscale() { '/usr/X11R6/bin/mkfontscale' }
 sub mkfontdir() { '/usr/X11R6/bin/mkfontdir' }
 sub fc_cache() { '/usr/X11R6/bin/fc-cache' }
 sub install_info() { '/usr/bin/install-info' }
@@ -56,7 +57,7 @@ sub portsdir() { '/usr/ports' }
 sub library_dirs() { ("/usr", "/usr/X11R6") }
 sub master_keys() { ("/etc/master_key") }
 
-sub font_cruft() { ("fonts.alias", "fonts.dir", "fonts.cache-1") }
+sub font_cruft() { ("fonts.alias", "fonts.dir", "fonts.cache-1", "fonts.scale") }
 sub man_cruft() { ("whatis.db") }
 sub info_cruft() { ("dir") }