Module Name: src
Committed By: snj
Date: Fri Jul 17 03:41:52 UTC 2015
Modified Files:
src/usr.sbin/postinstall [netbsd-7]: postinstall
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.175.2.6 -r1.175.2.7 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.6 src/usr.sbin/postinstall/postinstall:1.175.2.7
--- src/usr.sbin/postinstall/postinstall:1.175.2.6 Sun Jul 5 20:15:03 2015
+++ src/usr.sbin/postinstall/postinstall Fri Jul 17 03:41:52 2015
@@ -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 @@ 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
