Update to bh-ttf 1.0.3.

Fixes installation of fontconfig configuration files.

6 files changed, 81 insertions, 22 deletions

diff --git a/font/bh-ttf/ChangeLog b/font/bh-ttf/ChangeLog
index c565c4e61..e172c6bb8 100644
--- a/font/bh-ttf/ChangeLog
+++ b/font/bh-ttf/ChangeLog
@@ -1,3 +1,34 @@
+commit 65a15b8dfe79e1941c85a96aaa48b8ec1369a9e4
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Wed Nov 10 21:24:40 2010 -0800
+
+    font-bh-ttf 1.0.3
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 4f6484b0a4834ffa2d7f69c61b12fc8dcbfaacd6
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Wed Oct 6 17:08:56 2010 -0700
+
+    Use XORG_FONT_FC_CONFDIR from font-util 1.2 to find fontconfig's confdir
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+    Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1c388c46660827782879a539c8d239e01060cb52
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Tue Oct 5 16:30:51 2010 -0700
+
+    Correct installation path for fontconfig files
+    
+    Should be /etc/fonts/{conf.d,conf.avail},
+    not /etc/fonts/conf/{conf.d,conf.avail}
+    
+    Reported-by: Frédéric L. W. Meunier <fredlwm@gmail.com>
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: Julien Cristau <jcristau@debian.org>
+
 commit 1421e1089749ddcbe5e72fa70cfc153cb107e9ae
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Mon Oct 4 23:43:59 2010 -0700
diff --git a/font/bh-ttf/Makefile.am b/font/bh-ttf/Makefile.am
index 90e4f4643..a36f565c4 100644
--- a/font/bh-ttf/Makefile.am
+++ b/font/bh-ttf/Makefile.am
@@ -36,9 +36,8 @@ FONT_FILES = \
 fontdir = @FONTDIR@
 font_DATA = $(FONT_FILES)
 
-fontconfigdir = $(sysconfdir)/fonts/conf
-actualconfigdir = $(fontconfigdir)/conf.d
-availconfigdir = $(fontconfigdir)/conf.avail
+actualconfigdir = $(FC_CONFDIR)/conf.d
+availconfigdir = $(FC_CONFDIR)/conf.avail
 dist_availconfig_DATA = 42-luxi-mono.conf
 
 EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH
diff --git a/font/bh-ttf/Makefile.bsd-wrapper b/font/bh-ttf/Makefile.bsd-wrapper
index cc571899b..c7d9581b4 100644
--- a/font/bh-ttf/Makefile.bsd-wrapper
+++ b/font/bh-ttf/Makefile.bsd-wrapper
@@ -1,3 +1,5 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.1 2006/11/26 17:37:04 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2010/11/11 10:57:47 matthieu Exp $
+
+CONFIGURE_ARGS += --with-fc-confdir=/etc/fonts
 
 .include <bsd.xorg.mk>
diff --git a/font/bh-ttf/Makefile.in b/font/bh-ttf/Makefile.in
index c1e99e695..3c9a82280 100644
--- a/font/bh-ttf/Makefile.in
+++ b/font/bh-ttf/Makefile.in
@@ -124,6 +124,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FCCACHE = @FCCACHE@
+FC_CONFDIR = @FC_CONFDIR@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FONTDIR = @FONTDIR@
@@ -224,9 +225,8 @@ FONT_FILES = \
 
 fontdir = @FONTDIR@
 font_DATA = $(FONT_FILES)
-fontconfigdir = $(sysconfdir)/fonts/conf
-actualconfigdir = $(fontconfigdir)/conf.d
-availconfigdir = $(fontconfigdir)/conf.avail
+actualconfigdir = $(FC_CONFDIR)/conf.d
+availconfigdir = $(FC_CONFDIR)/conf.avail
 dist_availconfig_DATA = 42-luxi-mono.conf
 EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH
 MAINTAINERCLEANFILES = ChangeLog INSTALL
diff --git a/font/bh-ttf/configure b/font/bh-ttf/configure
index 6a969b8e4..c5a155ee0 100644
--- a/font/bh-ttf/configure
+++ b/font/bh-ttf/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for font-bh-ttf 1.0.2.
+# Generated by GNU Autoconf 2.62 for font-bh-ttf 1.0.3.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='font-bh-ttf'
 PACKAGE_TARNAME='font-bh-ttf'
-PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='font-bh-ttf 1.0.2'
+PACKAGE_VERSION='1.0.3'
+PACKAGE_STRING='font-bh-ttf 1.0.3'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 # Factoring default headers for most tests.
@@ -750,6 +750,7 @@ FCCACHE
 RUN_FCCACHE
 MKFONTDIR
 MKFONTSCALE
+FC_CONFDIR
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
@@ -760,6 +761,7 @@ enable_dependency_tracking
 enable_strict_compilation
 with_fontrootdir
 with_fontdir
+with_fc_confdir
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1323,7 +1325,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures font-bh-ttf 1.0.2 to adapt to many kinds of systems.
+\`configure' configures font-bh-ttf 1.0.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1393,7 +1395,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of font-bh-ttf 1.0.2:";;
+     short | recursive ) echo "Configuration of font-bh-ttf 1.0.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1414,6 +1416,7 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-fontrootdir=DIR  Path to root directory for font files
   --with-fontdir=DIR      Path to TTF files [FONTROOTDIR/TTF]
+  --with-fc-confdir=DIR   Path to fontconfig's configuration directory
 
 Some influential environment variables:
   CC          C compiler command
@@ -1492,7 +1495,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-font-bh-ttf configure 1.0.2
+font-bh-ttf configure 1.0.3
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1506,7 +1509,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by font-bh-ttf $as_me 1.0.2, which was
+It was created by font-bh-ttf $as_me 1.0.3, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -2155,7 +2158,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='font-bh-ttf'
- VERSION='1.0.2'
+ VERSION='1.0.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4989,7 +4992,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Require X.Org's font util macros 1.1 or later
+# Require X.Org's font util macros 1.2 or later
 
 
 
@@ -5191,6 +5194,29 @@ $as_echo "$as_me: error: mkfontscale is required to build $PACKAGE_NAME." >&2;}
 
 
 
+
+
+	{ $as_echo "$as_me:$LINENO: checking for fontconfig's configuration directory" >&5
+$as_echo_n "checking for fontconfig's configuration directory... " >&6; }
+
+# Check whether --with-fc-confdir was given.
+if test "${with_fc_confdir+set}" = set; then
+  withval=$with_fc_confdir; FC_CONFDIR="$withval"
+fi
+
+	# if --with-fc-confdir was not specified
+	if test "x${FC_CONFDIR}" = "x"; then
+		FC_CONFDIR=`$PKG_CONFIG --variable=confdir fontconfig`
+	fi
+	# ...and if pkg-config didn't find confdir in fontconfig.pc...
+	if test "x${FC_CONFDIR}" = "x"; then
+		FC_CONFDIR="${sysconfdir}/fonts"
+	fi
+
+	{ $as_echo "$as_me:$LINENO: result: ${FC_CONFDIR}" >&5
+$as_echo "${FC_CONFDIR}" >&6; }
+
+
 ac_config_files="$ac_config_files Makefile"
 
 cat >confcache <<\_ACEOF
@@ -5669,7 +5695,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by font-bh-ttf $as_me 1.0.2, which was
+This file was extended by font-bh-ttf $as_me 1.0.3, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5716,7 +5742,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-font-bh-ttf config.status 1.0.2
+font-bh-ttf config.status 1.0.3
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/font/bh-ttf/configure.ac b/font/bh-ttf/configure.ac
index eb883cc3c..4d834f871 100644
--- a/font/bh-ttf/configure.ac
+++ b/font/bh-ttf/configure.ac
@@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT([font-bh-ttf], [1.0.2],
+AC_INIT([font-bh-ttf], [1.0.3],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [font-bh-ttf])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
@@ -36,12 +36,13 @@ XORG_DEFAULT_OPTIONS
 
 AC_PROG_INSTALL
 
-# Require X.Org's font util macros 1.1 or later
+# Require X.Org's font util macros 1.2 or later
 m4_ifndef([XORG_FONT_MACROS_VERSION],
-	  [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])])
-XORG_FONT_MACROS_VERSION(1.1)
+	  [m4_fatal([must install X.Org font-util 1.2 or later before running autoconf/autogen])])
+XORG_FONT_MACROS_VERSION(1.2)
 
 XORG_FONTDIR([TTF])
 XORG_FONT_SCALED_UTILS
+XORG_FONT_FC_CONFDIR
 
 AC_OUTPUT([Makefile])