Module Name: src
Committed By: mrg
Date: Mon Sep 7 21:07:04 UTC 2009
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/xetc: mi
src/etc/mtree: NetBSD.dist.base
src/external/mit/xorg: Makefile
src/external/mit/xorg/lib/fontconfig/etc: Makefile
src/usr.sbin/postinstall: postinstall
Added Files:
src/external/mit/xorg/lib/fontconfig/etc/conf.avail: Makefile
src/external/mit/xorg/lib/fontconfig/etc/conf.d: Makefile
Log Message:
install the fontconfig files into /etc/fonts/conf.avail, and symlink
the default ones into /etc/fonts/conf.d, as per default.
reported by jukka marin on netbsd-users.
To generate a diff of this commit:
cvs rdiff -u -r1.827 -r1.828 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.1 -r1.2 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/fontconfig/etc/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
cvs rdiff -u -r1.102 -r1.103 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/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.827 src/distrib/sets/lists/base/mi:1.828
--- src/distrib/sets/lists/base/mi:1.827 Mon Sep 7 19:34:29 2009
+++ src/distrib/sets/lists/base/mi Mon Sep 7 21:07:02 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.827 2009/09/07 19:34:29 mrg Exp $
+# $NetBSD: mi,v 1.828 2009/09/07 21:07:02 mrg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -89,6 +89,7 @@
./etc/disklabels base-obsolete obsolete
./etc/fonts base-x11-root
./etc/fonts/conf.d base-x11-root
+./etc/fonts/conf.avail base-x11-root
./etc/iscsi base-sysutil-root
./etc/kerberosIV base-obsolete obsolete
./etc/kerberosV base-krb5-root
Index: src/distrib/sets/lists/xetc/mi
diff -u src/distrib/sets/lists/xetc/mi:1.15 src/distrib/sets/lists/xetc/mi:1.16
--- src/distrib/sets/lists/xetc/mi:1.15 Mon Apr 20 21:33:49 2009
+++ src/distrib/sets/lists/xetc/mi Mon Sep 7 21:07:03 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.15 2009/04/20 21:33:49 mrg Exp $
+# $NetBSD: mi,v 1.16 2009/09/07 21:07:03 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -55,16 +55,34 @@
./etc/X11/xserver/SecurityPolicy -unknown- x11
./etc/X11/xsm/system.xsm -unknown- x11
./etc/X11/xsm/system.xsm -unknown- xorg
-./etc/fonts/conf.d/10-autohint.conf -unknown- xorg
-./etc/fonts/conf.d/10-no-sub-pixel.conf -unknown- xorg
-./etc/fonts/conf.d/10-sub-pixel-bgr.conf -unknown- xorg
-./etc/fonts/conf.d/10-sub-pixel-rgb.conf -unknown- xorg
-./etc/fonts/conf.d/10-sub-pixel-vbgr.conf -unknown- xorg
-./etc/fonts/conf.d/10-sub-pixel-vrgb.conf -unknown- xorg
-./etc/fonts/conf.d/10-unhinted.conf -unknown- xorg
+./etc/fonts/conf.avail/10-autohint.conf -unknown- xorg
+./etc/fonts/conf.avail/10-no-sub-pixel.conf -unknown- xorg
+./etc/fonts/conf.avail/10-sub-pixel-bgr.conf -unknown- xorg
+./etc/fonts/conf.avail/10-sub-pixel-rgb.conf -unknown- xorg
+./etc/fonts/conf.avail/10-sub-pixel-vbgr.conf -unknown- xorg
+./etc/fonts/conf.avail/10-sub-pixel-vrgb.conf -unknown- xorg
+./etc/fonts/conf.avail/10-unhinted.conf -unknown- xorg
+./etc/fonts/conf.avail/20-fix-globaladvance.conf -unknown- xorg
+./etc/fonts/conf.avail/20-unhint-small-vera.conf -unknown- xorg
+./etc/fonts/conf.avail/25-unhint-nonlatin.conf -unknown- xorg
+./etc/fonts/conf.avail/30-metric-aliases.conf -unknown- xorg
+./etc/fonts/conf.avail/30-urw-aliases.conf -unknown- xorg
+./etc/fonts/conf.avail/40-nonlatin.conf -unknown- xorg
+./etc/fonts/conf.avail/45-latin.conf -unknown- xorg
+./etc/fonts/conf.avail/49-sansserif.conf -unknown- xorg
+./etc/fonts/conf.avail/50-user.conf -unknown- xorg
+./etc/fonts/conf.avail/51-local.conf -unknown- xorg
+./etc/fonts/conf.avail/60-latin.conf -unknown- xorg
+./etc/fonts/conf.avail/65-fonts-persian.conf -unknown- xorg
+./etc/fonts/conf.avail/65-khmer.conf -unknown- xorg
+./etc/fonts/conf.avail/65-nonlatin.conf -unknown- xorg
+./etc/fonts/conf.avail/69-unifont.conf -unknown- xorg
+./etc/fonts/conf.avail/70-no-bitmaps.conf -unknown- xorg
+./etc/fonts/conf.avail/70-yes-bitmaps.conf -unknown- xorg
+./etc/fonts/conf.avail/80-delicious.conf -unknown- xorg
+./etc/fonts/conf.avail/90-synthetic.conf -unknown- xorg
./etc/fonts/conf.d/20-fix-globaladvance.conf -unknown- xorg
./etc/fonts/conf.d/20-unhint-small-vera.conf -unknown- xorg
-./etc/fonts/conf.d/25-unhint-nonlatin.conf -unknown- xorg
./etc/fonts/conf.d/30-metric-aliases.conf -unknown- xorg
./etc/fonts/conf.d/30-urw-aliases.conf -unknown- xorg
./etc/fonts/conf.d/40-nonlatin.conf -unknown- xorg
@@ -74,11 +92,8 @@
./etc/fonts/conf.d/51-local.conf -unknown- xorg
./etc/fonts/conf.d/60-latin.conf -unknown- xorg
./etc/fonts/conf.d/65-fonts-persian.conf -unknown- xorg
-./etc/fonts/conf.d/65-khmer.conf -unknown- xorg
./etc/fonts/conf.d/65-nonlatin.conf -unknown- xorg
./etc/fonts/conf.d/69-unifont.conf -unknown- xorg
-./etc/fonts/conf.d/70-no-bitmaps.conf -unknown- xorg
-./etc/fonts/conf.d/70-yes-bitmaps.conf -unknown- xorg
./etc/fonts/conf.d/80-delicious.conf -unknown- xorg
./etc/fonts/conf.d/90-synthetic.conf -unknown- xorg
./etc/fonts/fonts.conf -unknown- x11
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.1 src/etc/mtree/NetBSD.dist.base:1.2
--- src/etc/mtree/NetBSD.dist.base:1.1 Mon Sep 7 19:34:30 2009
+++ src/etc/mtree/NetBSD.dist.base Mon Sep 7 21:07:03 2009
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.1 2009/09/07 19:34:30 mrg Exp $
+# $NetBSD: NetBSD.dist.base,v 1.2 2009/09/07 21:07:03 mrg Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -33,6 +33,7 @@
./etc/defaults
./etc/fonts
./etc/fonts/conf.d
+./etc/fonts/conf.avail
./etc/iscsi
./etc/kerberosV
./etc/mail
Index: src/external/mit/xorg/Makefile
diff -u src/external/mit/xorg/Makefile:1.6 src/external/mit/xorg/Makefile:1.7
--- src/external/mit/xorg/Makefile:1.6 Mon Apr 20 15:39:46 2009
+++ src/external/mit/xorg/Makefile Mon Sep 7 21:07:03 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/04/20 15:39:46 jnemeth Exp $
+# $NetBSD: Makefile,v 1.7 2009/09/07 21:07:03 mrg Exp $
# Top level Makefile to cross build xorg inside the NetBSD tree.
@@ -57,7 +57,9 @@
bin/xfs \
bin/xinit \
bin/xsm \
- lib/fontconfig/etc
+ lib/fontconfig/etc \
+ lib/fontconfig/etc/conf.avail \
+ lib/fontconfig/etc/conf.d
distribution: check_X11SRCDIR
.for tgt in ${DISTRIBTARGETS}
Index: src/external/mit/xorg/lib/fontconfig/etc/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/Makefile:1.2 src/external/mit/xorg/lib/fontconfig/etc/Makefile:1.3
--- src/external/mit/xorg/lib/fontconfig/etc/Makefile:1.2 Fri Sep 26 07:02:57 2008
+++ src/external/mit/xorg/lib/fontconfig/etc/Makefile Mon Sep 7 21:07:03 2009
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2008/09/26 07:02:57 rtr Exp $
+# $NetBSD: Makefile,v 1.3 2009/09/07 21:07:03 mrg Exp $
+
+SUBDIR= conf.d conf.avail
.include <bsd.own.mk>
@@ -7,43 +9,9 @@
fonts.conf \
fonts.dtd
-FILESDIR_fonts.conf= \
- /etc/fonts
-
-FILESDIR_fonts.dtd= \
- /etc/fonts
-
-.PATH: ${X11SRCDIR.fontconfig}/conf.d
-CONFIGFILES+= \
- 10-autohint.conf \
- 10-no-sub-pixel.conf \
- 10-sub-pixel-bgr.conf \
- 10-sub-pixel-rgb.conf \
- 10-sub-pixel-vbgr.conf \
- 10-sub-pixel-vrgb.conf \
- 10-unhinted.conf \
- 20-fix-globaladvance.conf \
- 20-unhint-small-vera.conf \
- 25-unhint-nonlatin.conf \
- 30-metric-aliases.conf \
- 30-urw-aliases.conf \
- 40-nonlatin.conf \
- 45-latin.conf \
- 49-sansserif.conf \
- 50-user.conf \
- 51-local.conf \
- 60-latin.conf \
- 65-fonts-persian.conf \
- 65-khmer.conf \
- 65-nonlatin.conf \
- 69-unifont.conf \
- 70-no-bitmaps.conf \
- 70-yes-bitmaps.conf \
- 80-delicious.conf \
- 90-synthetic.conf
-
FILESDIR= \
- /etc/fonts/conf.d
+ /etc/fonts
.include <bsd.x11.mk>
.include <bsd.prog.mk>
+.include <bsd.subdir.mk>
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.102 src/usr.sbin/postinstall/postinstall:1.103
--- src/usr.sbin/postinstall/postinstall:1.102 Mon Sep 7 19:34:30 2009
+++ src/usr.sbin/postinstall/postinstall Mon Sep 7 21:07:04 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.102 2009/09/07 19:34:30 mrg Exp $
+# $NetBSD: postinstall,v 1.103 2009/09/07 21:07:04 mrg Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -759,6 +759,43 @@
}
#
+# X11 fontconfig
+#
+additem fontconfig "X11 font configuration is up to date"
+do_fontconfig()
+{
+ [ -n "$1" ] || err 3 "USAGE: do_fontconfig fix|check"
+ op="$1"
+ failed=0
+
+ if [ -f "${DEST_DIR}/etc/fonts/conf.d/10-unhinted.conf" -a \
+ -f "${DEST_DIR}/etc/fonts/conf.d/10-autohint.conf" ]; then
+ failed=1
+ fi
+
+ if [ "$op" = "check" -a "$failed" = 1 ]; then
+ msg \
+ "Broken fontconfig configuration found; please delete these files"
+ msg \
+ "in the ${DESTDIR}/etc/fonts/conf.d/ subdirectory:"
+ msg \
+ " 10-autohint.conf 10-no-sub-pixel.conf 10-sub-pixel-bgr.conf"
+ msg \
+ " 10-sub-pixel-rgb.conf 10-sub-pixel-vbgr.conf"
+ msg \
+ " 10-sub-pixel-vrgb.conf 10-unhinted.conf 25-unhint-nonlatin.conf"
+ msg \
+ " 65-khmer.conf 70-no-bitmaps.conf 70-yes-bitmaps.conf"
+ msg \
+ "(This warning only appears if both the 10-unhinted.conf and"
+ msg \
+ "10-autohint.conf files are present."
+ fi
+
+ return ${failed}
+}
+
+#
# gid
#
additem gid "required groups in /etc/group"
Added files:
Index: src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
diff -u /dev/null src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.1
--- /dev/null Mon Sep 7 21:07:04 2009
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile Mon Sep 7 21:07:04 2009
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.1 2009/09/07 21:07:04 mrg Exp $
+
+.include <bsd.own.mk>
+
+.PATH: ${X11SRCDIR.fontconfig}/conf.d
+CONFIGFILES= \
+ 10-autohint.conf \
+ 10-no-sub-pixel.conf \
+ 10-sub-pixel-bgr.conf \
+ 10-sub-pixel-rgb.conf \
+ 10-sub-pixel-vbgr.conf \
+ 10-sub-pixel-vrgb.conf \
+ 10-unhinted.conf \
+ 20-fix-globaladvance.conf \
+ 20-unhint-small-vera.conf \
+ 25-unhint-nonlatin.conf \
+ 30-metric-aliases.conf \
+ 30-urw-aliases.conf \
+ 40-nonlatin.conf \
+ 45-latin.conf \
+ 49-sansserif.conf \
+ 50-user.conf \
+ 51-local.conf \
+ 60-latin.conf \
+ 65-fonts-persian.conf \
+ 65-khmer.conf \
+ 65-nonlatin.conf \
+ 69-unifont.conf \
+ 70-no-bitmaps.conf \
+ 70-yes-bitmaps.conf \
+ 80-delicious.conf \
+ 90-synthetic.conf
+
+FILESDIR= \
+ /etc/fonts/conf.avail
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
diff -u /dev/null src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.1
--- /dev/null Mon Sep 7 21:07:04 2009
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile Mon Sep 7 21:07:04 2009
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2009/09/07 21:07:04 mrg Exp $
+
+.include <bsd.own.mk>
+
+.PATH: ${X11SRCDIR.fontconfig}/conf.d
+FONTCONFIG_LINKS= \
+ 20-fix-globaladvance.conf \
+ 20-unhint-small-vera.conf \
+ 30-urw-aliases.conf \
+ 30-metric-aliases.conf \
+ 40-nonlatin.conf \
+ 45-latin.conf \
+ 49-sansserif.conf \
+ 50-user.conf \
+ 51-local.conf \
+ 60-latin.conf \
+ 65-fonts-persian.conf \
+ 65-nonlatin.conf \
+ 69-unifont.conf \
+ 80-delicious.conf \
+ 90-synthetic.conf
+
+CONFAVAILDIR= ../conf.avail
+CONFDIR= /etc/fonts/conf.d
+
+.for _conffile in ${FONTCONFIG_LINKS}
+CONFIGSYMLINKS+=${CONFAVAILDIR}/${_conffile} ${CONFDIR}/${_conffile}
+.endfor
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
