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

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

details:   https://anonhg.NetBSD.org/src/rev/24b2d1403fa2
branches:  netbsd-7
changeset: 798234:24b2d1403fa2
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Aug 12 15:14:55 2014 +0000

description:
Pull up following revision(s) (requested by apb in ticket #9):
        usr.sbin/postinstall/postinstall: revision 1.176
FONTCONFIG_DIR not existing does not need to be fixed.

diffstat:

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

diffs (23 lines):

diff -r eae9528d4d40 -r 24b2d1403fa2 usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall  Tue Aug 12 14:39:49 2014 +0000
+++ b/usr.sbin/postinstall/postinstall  Tue Aug 12 15:14:55 2014 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.175.2.1 2014/08/12 14:38:29 martin Exp $
+# $NetBSD: postinstall,v 1.175.2.2 2014/08/12 15:14:55 martin Exp $
 #
 # Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -941,6 +941,11 @@
                FONTCONFIG_DIR="${XSRC_DIR}/external/mit/fontconfig/dist/conf.d"
        fi
 
+       if [ ! -d "${FONTCONFIG_DIR}" ]; then
+               msg "${FONTCONFIG_DIR} is not a directory; skipping check"
+               return 0
+       fi
+
        populate_dir "$op" false "${FONTCONFIG_DIR}" "${DEST_DIR}/etc/fonts/conf.avail" 444 \
                10-autohint.conf \
                10-no-sub-pixel.conf \