Module Name: src
Committed By: jnemeth
Date: Wed Jul 8 05:00:15 UTC 2015
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 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.196 src/usr.sbin/postinstall/postinstall:1.197
--- src/usr.sbin/postinstall/postinstall:1.196 Thu Jul 2 09:53:12 2015
+++ src/usr.sbin/postinstall/postinstall Wed Jul 8 05:00:15 2015
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.196 2015/07/02 09:53:12 martin Exp $
+# $NetBSD: postinstall,v 1.197 2015/07/08 05:00:15 jnemeth Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -991,7 +991,17 @@ do_fontconfig()
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
