Module Name: src
Committed By: roy
Date: Mon Aug 11 12:49:01 UTC 2014
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
FONTCONFIG_DIR not existing does not need to be fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 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 src/usr.sbin/postinstall/postinstall:1.176
--- src/usr.sbin/postinstall/postinstall:1.175 Mon Aug 4 21:56:30 2014
+++ src/usr.sbin/postinstall/postinstall Mon Aug 11 12:49:01 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.175 2014/08/04 21:56:30 apb Exp $
+# $NetBSD: postinstall,v 1.176 2014/08/11 12:49:01 roy 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 \