update to 2.10.1

changes:
* FC_GLOBAL_ADVANCE now deprecated
* Disable non-Unicode SFNT names by default (Use --enable-iconv to
  enable it)
* Available config files has been moved to
  /usr/share/fontconfig/conf.avail
* Warns multiple values of <test>s and <family>s in <match> and <alias>
* Add XDG Base Directory Specification support
* Add FC_LANG environment variable for default substitute language.
* Add more options to configure the installation paths
* Add "namelang" object to obtain the localized name of the family,
  style and fullname.
* Unicode 6.1 support
* CACHEDIR.TAG support
* Fix several build issues with older gcc, MinGW, Win32.
* Fix a fail of creating caches on some filesystems
* Fix memory leaks
* Add/Update orthography files
* Improve documents
* and more bug fixes and enhancements.

pkgsrc changes: some cleanup - install only useful stuff to /etc

1 files changed, 32 insertions, 16 deletions

diff --git a/fonts/fontconfig/patches/patch-aa b/fonts/fontconfig/patches/patch-aa
index 89b191e1891..b671cab88a4 100644
--- a/fonts/fontconfig/patches/patch-aa
+++ b/fonts/fontconfig/patches/patch-aa
@@ -1,27 +1,43 @@
-$NetBSD: patch-aa,v 1.14 2012/06/10 16:12:47 wiz Exp $
+$NetBSD: patch-aa,v 1.15 2012/07/31 18:12:28 drochner Exp $
 
---- Makefile.in.orig	2012-03-10 17:30:13.000000000 +0000
+--- Makefile.in.orig	2012-07-27 02:24:51.000000000 +0000
 +++ Makefile.in
-@@ -319,10 +319,11 @@ MAINTAINERCLEANFILES = $(srcdir)/aclocal
- 	-type f -name Makefile.in -print` $(srcdir)/ChangeLog
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = fontconfig.pc
--configdir = $(CONFDIR)
-+configdir = $(prefix)/share/examples/fontconfig
- config_DATA = fonts.dtd
+@@ -317,6 +317,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xmldir = $(XMLDIR)
++egdir = $(prefix)/share/examples/fontconfig
+ SUBDIRS = fontconfig fc-case fc-lang fc-glyphname src \
+ 	fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \
+ 	conf.d $(DOCSRC) test
+@@ -340,6 +341,7 @@ pkgconfig_DATA = fontconfig.pc
+ xml_DATA = fonts.dtd
  @CROSS_COMPILING_FALSE@RUN_FC_CACHE_TEST = test -z "$(DESTDIR)"
  @CROSS_COMPILING_TRUE@RUN_FC_CACHE_TEST = false
 +RUN_FC_CACHE_TEST = false
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
-@@ -900,7 +901,8 @@ fonts.conf: fonts.conf.in Makefile
+@@ -932,17 +934,13 @@ fonts.conf: fonts.conf.in Makefile
  	mv $@.tmp $@
  
  install-data-local: fonts.conf
--	$(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
-+	$(mkinstalldirs) $(DESTDIR)$(configdir)
-+	$(mkinstalldirs) $(DESTDIR)$(fc_cachedir)
- 	if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
- 	  echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
- 	  mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \
+-	$(mkinstalldirs) $(DESTDIR)$(baseconfigdir) $(DESTDIR)$(fc_cachedir)
+-	if [ -f $(DESTDIR)$(baseconfigdir)/fonts.conf ]; then \
+-	  echo "backing up existing $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
+-	  mv $(DESTDIR)$(baseconfigdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf.bak; \
+-	fi
++	$(mkinstalldirs) $(DESTDIR)$(egdir)
+ 	if [ -f $(srcdir)/fonts.conf ]; then \
+-	  echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
+-	  $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \
++	  echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(egdir)/fonts.conf"; \
++	  $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(egdir)/fonts.conf; \
+ 	else if [ -f fonts.conf ]; then \
+-	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
+-	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \
++	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(egdir)/fonts.conf"; \
++	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(egdir)/fonts.conf; \
+ 	fi; fi
+ 	@(if $(RUN_FC_CACHE_TEST); then \
+ 	    echo "fc-cache$(EXEEXT) -s -f -v"; \