Module Name: src
Committed By: martin
Date: Tue Aug 12 15:14:55 UTC 2014
Modified Files:
src/usr.sbin/postinstall [netbsd-7]: postinstall
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.175.2.1 -r1.175.2.2 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.175.2.1 src/usr.sbin/postinstall/postinstall:1.175.2.2
--- src/usr.sbin/postinstall/postinstall:1.175.2.1 Tue Aug 12 14:38:29 2014
+++ src/usr.sbin/postinstall/postinstall Tue Aug 12 15:14:55 2014
@@ -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 @@ do_fontconfig()
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 \
