Changes 2.2.2:

* Changed #include syntax to follow new Freetype rules
* Made external compilation work

4 files changed, 23 insertions, 26 deletions

diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index f9751092a2e..98171041f71 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.29 2004/04/19 17:37:19 minskim Exp $
+# $NetBSD: Makefile,v 1.30 2004/04/27 15:09:10 adam Exp $
 #
 
-DISTNAME=	fontconfig-2.2.1
-PKGREVISION=	3
+DISTNAME=	fontconfig-2.2.2
 CATEGORIES=	fonts gnome
 MASTER_SITES=	http://pdx.freedesktop.org/software/fontconfig/releases/
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://fontconfig.org/
+HOMEPAGE=	http://freedesktop.org/software/fontconfig/
 COMMENT=	Library for configuring and customizing font access
 
 # This can use 2.0.5 but things which use it (ala pango) require 2.0.9 so make
diff --git a/fonts/fontconfig/PLIST b/fonts/fontconfig/PLIST
index a106ec826a9..54a4236e178 100644
--- a/fonts/fontconfig/PLIST
+++ b/fonts/fontconfig/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/08/31 19:19:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/04/27 15:09:10 adam Exp $
 bin/fc-cache
 bin/fc-list
 include/fontconfig/fcfreetype.h
@@ -10,6 +10,8 @@ lib/libfontconfig.so
 lib/libfontconfig.so.1
 lib/libfontconfig.so.1.4
 lib/pkgconfig/fontconfig.pc
+man/man1/fc-cache.1
+man/man1/fc-list.1
 man/man3/FcAtomicCreate.3
 man/man3/FcAtomicDeleteNew.3
 man/man3/FcAtomicDestroy.3
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo
index 7d48de4f0ef..2d9061247e3 100644
--- a/fonts/fontconfig/distinfo
+++ b/fonts/fontconfig/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2003/12/20 10:02:06 recht Exp $
+$NetBSD: distinfo,v 1.6 2004/04/27 15:09:10 adam Exp $
 
-SHA1 (fontconfig-2.2.1.tar.gz) = 1ba5a531cdc8df9f53c89e7de9241728628a6ab5
-Size (fontconfig-2.2.1.tar.gz) = 613391 bytes
-SHA1 (patch-aa) = ce3c55333418ef22612688591e37eea7f3f8fb9c
+SHA1 (fontconfig-2.2.2.tar.gz) = 121b79bdb32981b78612cb6320939616b84fdb4c
+Size (fontconfig-2.2.2.tar.gz) = 743895 bytes
+SHA1 (patch-aa) = 740dd63a9f07a801ceab1b9a1d6ddac303ace436
diff --git a/fonts/fontconfig/patches/patch-aa b/fonts/fontconfig/patches/patch-aa
index 0ee9d6674d3..d720833d677 100644
--- a/fonts/fontconfig/patches/patch-aa
+++ b/fonts/fontconfig/patches/patch-aa
@@ -1,28 +1,24 @@
-$NetBSD: patch-aa,v 1.3 2003/12/18 15:07:00 recht Exp $
+$NetBSD: patch-aa,v 1.4 2004/04/27 15:09:10 adam Exp $
 
---- Makefile.in.orig	2003-06-09 20:40:48.000000000 +0200
+--- Makefile.in.orig	2004-04-14 15:12:47.000000000 +0000
 +++ Makefile.in
-@@ -201,14 +201,14 @@ fontconfig-zip: $(top_builddir)/config.s
- 
+@@ -282,12 +282,12 @@ uninstall-info-am:
+ configDATA_INSTALL = $(INSTALL_DATA)
  install-configDATA: $(config_DATA)
  	@$(NORMAL_INSTALL)
 -	$(mkinstalldirs) $(DESTDIR)$(configdir)
 +	$(mkinstalldirs) $(DESTDIR)$(datadir)/examples/fontconfig
  	@list='$(config_DATA)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
--	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configdir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configdir)/$$p; \
-+	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$p"; \
-+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$p; \
- 	  else if test -f $$p; then \
--	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(configdir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(DESTDIR)$(configdir)/$$p; \
-+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/examples/fontconfig/$$p"; \
-+	    $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/examples/fontconfig/$$p; \
- 	  fi; fi; \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(configdir)/$$f"; \
+-	  $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(configdir)/$$f; \
++	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$f"; \
++	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$f; \
  	done
  
-@@ -465,16 +465,15 @@ mostlyclean distclean maintainer-clean
+ uninstall-configDATA:
+@@ -671,16 +671,15 @@ uninstall-info: uninstall-info-recursive
  
  
  install-data-local:
@@ -42,6 +38,6 @@ $NetBSD: patch-aa,v 1.3 2003/12/18 15:07:00 recht Exp $
 +	  $(INSTALL_DATA) local.conf $(DESTDIR)$(datadir)/examples/fontconfig/local.conf; \
  	fi; fi; fi
 -	if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
- 
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: