[src/netbsd-7]: src/usr.sbin/postinstall Pull up following revision(s) (reque...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ba04871410e8
branches:  netbsd-7
changeset: 799481:ba04871410e8
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Jul 17 03:41:52 2015 +0000

description:
Pull up following revision(s) (requested by jnemeth in ticket #874):
        usr.sbin/postinstall/postinstall: revision 1.197
Check for an out of date /etc/fonts/fonts.conf and if so, forcibly
update it (it is not intended to be user editable).  This is
primarily intended so that pkgsrc fonts installed in the new location
can be found.

diffstat:

 usr.sbin/postinstall/postinstall |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r fffe7be8bcc5 -r ba04871410e8 usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall  Fri Jul 17 03:39:35 2015 +0000
+++ b/usr.sbin/postinstall/postinstall  Fri Jul 17 03:41:52 2015 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.175.2.6 2015/07/05 20:15:03 snj Exp $
+# $NetBSD: postinstall,v 1.175.2.7 2015/07/17 03:41:52 snj Exp $
 #
 # Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -991,7 +991,17 @@
                80-delicious.conf \
                90-synthetic.conf
        failed=$(( ${failed} + $? ))
+
+       if ! $SOURCEMODE; then
+               FONTS_DIR="${SRC_DIR}/etc/fonts"
+       else
+               FONTS_DIR="${SRC_DIR}/external/mit/xorg/lib/fontconfig/etc"
+       fi
                
+       populate_dir "$op" false "${FONTS_DIR}" "${DEST_DIR}/etc/fonts" 444 \
+               fonts.conf
+       failed=$(( ${failed} + $? ))
+
        # We can't modify conf.d easily; someone might have removed a file.
 
        conf_d_failed=0