8 files changed, 49 insertions, 26 deletions

diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 70da31009d97..a18bac299f54 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.14 2008/01/08 04:28:10 marcus Exp $
+#   $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.18 2008/08/21 21:53:01 mezz Exp $
 #
 
 PORTNAME=	fontconfig
-PORTVERSION=	2.5.0
+PORTVERSION=	2.6.0
 PORTREVISION?=	0
 PORTEPOCH?=	1
 CATEGORIES=	x11-fonts
@@ -24,7 +24,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_GNOME=	gnomehack gnometarget pkgconfig ltverhack
+USE_GNOME=	gnomehack pkgconfig ltverhack
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc/fonts \
 		--with-expat-includes=${LOCALBASE}/include \
 		--with-expat-lib=${LOCALBASE}/lib \
@@ -41,22 +41,15 @@ PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/bin/docbook2man)
-USE_DOCBOOK2MAN=	yes
-BUILD_DEPENDS+=		${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410
-.endif
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
 .endif
 	${INSTALL_MAN} ${MAN5:S|^|${WRKSRC}/doc/|} ${PREFIX}/man/man5
-.if !defined(USE_DOCBOOK2MAN)
 .for manpage in ${MAN1}
 	${INSTALL_MAN} ${FILESDIR}/${manpage} ${PREFIX}/man/man1
 .endfor
-.endif
 	if [ ! -f ${PREFIX}/etc/fonts/fonts.conf ]; then \
 		${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf; \
 		${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \
diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo
index 0687fa08ca78..24a1c943bf82 100644
--- a/x11-fonts/fontconfig/distinfo
+++ b/x11-fonts/fontconfig/distinfo
@@ -1,3 +1,3 @@
-MD5 (fontconfig-2.5.0.tar.gz) = 21d14af8ecf645ef76211c782cdd7aeb
-SHA256 (fontconfig-2.5.0.tar.gz) = 34c6badb4cb7eb496779d30616903de400fa244838ea39c2a7f63eaa5fdf0efe
-SIZE (fontconfig-2.5.0.tar.gz) = 1385058
+MD5 (fontconfig-2.6.0.tar.gz) = ab54ec1d4ddd836313fdbc0cd5299d6d
+SHA256 (fontconfig-2.6.0.tar.gz) = a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5
+SIZE (fontconfig-2.6.0.tar.gz) = 1403857
diff --git a/x11-fonts/fontconfig/files/fc-cache.1 b/x11-fonts/fontconfig/files/fc-cache.1
index 18809ffb1b01..3d77bd59c5b0 100644
--- a/x11-fonts/fontconfig/files/fc-cache.1
+++ b/x11-fonts/fontconfig/files/fc-cache.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "FC-CACHE" "1" "12 November 2006" "" ""
+.TH "FC-CACHE" "1" "05 May 2008" "" ""
 
 .SH NAME
 fc-cache \- build font information cache files
diff --git a/x11-fonts/fontconfig/files/fc-cat.1 b/x11-fonts/fontconfig/files/fc-cat.1
index 07152a09abcf..b025d7c5e7ea 100644
--- a/x11-fonts/fontconfig/files/fc-cat.1
+++ b/x11-fonts/fontconfig/files/fc-cat.1
@@ -3,17 +3,18 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "FC-CAT" "1" "12 November 2006" "" ""
+.TH "FC-CAT" "1" "05 May 2008" "" ""
 
 .SH NAME
 fc-cat \- read font information cache files
 .SH SYNOPSIS
 
-\fBfc-cat < fonts-cache-2-file >\fR [ \fB-V?\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIdirs\fB\fR ]
+\fBfc-cat\fR [ \fB-rvV?\fR ] [ \fB--recurse\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIfonts-cache-2-files\fB\fR ] [ \fB\fIdirs\fB\fR ]
 
 .SH "DESCRIPTION"
 .PP
-\fBfc-cat\fR reads a font information cache file
+\fBfc-cat\fR reads the font information from
+cache files or related to font directories
 and emits it in ASCII form.
 .SH "OPTIONS"
 .PP
@@ -21,6 +22,12 @@ This program follows the usual GNU command line syntax,
 with long options starting with two dashes (`-').  A summary of
 options is included below.
 .TP
+\fB-r --recurse \fR
+Recurse into subdirectories.
+.TP
+\fB-v --verbose \fR
+Be verbose.
+.TP
 \fB-? --help \fR
 Show summary of options.
 .TP
diff --git a/x11-fonts/fontconfig/files/fc-list.1 b/x11-fonts/fontconfig/files/fc-list.1
index 0bff184f883a..6a0145db1783 100644
--- a/x11-fonts/fontconfig/files/fc-list.1
+++ b/x11-fonts/fontconfig/files/fc-list.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "FC-LIST" "1" "12 November 2006" "" ""
+.TH "FC-LIST" "1" "05 May 2008" "" ""
 
 .SH NAME
 fc-list \- list available fonts
diff --git a/x11-fonts/fontconfig/files/fc-match.1 b/x11-fonts/fontconfig/files/fc-match.1
index 336abc33a258..06f7aa3cb905 100644
--- a/x11-fonts/fontconfig/files/fc-match.1
+++ b/x11-fonts/fontconfig/files/fc-match.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "FC-MATCH" "1" "12 November 2006" "" ""
+.TH "FC-MATCH" "1" "05 May 2008" "" ""
 
 .SH NAME
 fc-match \- match available fonts
diff --git a/x11-fonts/fontconfig/files/patch-Makefile.in b/x11-fonts/fontconfig/files/patch-Makefile.in
index 0ebabf44ab0e..40d586736f14 100644
--- a/x11-fonts/fontconfig/files/patch-Makefile.in
+++ b/x11-fonts/fontconfig/files/patch-Makefile.in
@@ -1,7 +1,7 @@
---- Makefile.in.orig	Sat Nov  4 14:54:15 2006
-+++ Makefile.in	Sat Nov  4 14:54:46 2006
-@@ -785,28 +785,6 @@ $(srcdir)/ChangeLog:
- .PHONY: ChangeLog $(srcdir)/ChangeLog
+--- Makefile.in.orig	2008-07-03 03:20:43.000000000 -0400
++++ Makefile.in	2008-07-03 03:21:18.000000000 -0400
+@@ -789,28 +789,28 @@ ChangeLog:
+ .PHONY: ChangeLog
  
  install-data-local:
 -	$(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
@@ -17,8 +17,8 @@
 -	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
 -	fi; fi
 -	@(if $(RUN_FC_CACHE_TEST); then \
--	    echo " fc-cache/fc-cache -s -f -v"; \
--	    fc-cache/fc-cache -s -f -v; \
+-	    echo " $(bindir)/fc-cache -s -f -v"; \
+-	    $(bindir)/fc-cache -s -f -v; \
 -	else \
 -	    echo "***"; \
 -	    echo "*** Warning: fonts.cache not built"; \
@@ -26,6 +26,28 @@
 -	    echo "*** Generate this file manually on host system using fc-cache"; \
 -	    echo "***"; \
 -	fi)
++#	$(mkinstalldirs) $(DESTDIR)$(configdir) $(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; \
++#	fi
++#	if [ -f $(srcdir)/fonts.conf ]; then \
++#	  echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
++#	  $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
++#	else if [ -f fonts.conf ]; then \
++#	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
++#	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
++#	fi; fi
++#	@(if $(RUN_FC_CACHE_TEST); then \
++#	    echo " $(bindir)/fc-cache -s -f -v"; \
++#	    $(bindir)/fc-cache -s -f -v; \
++#	else \
++#	    echo "***"; \
++#	    echo "*** Warning: fonts.cache not built"; \
++#	    echo "***"; \
++#	    echo "*** Generate this file manually on host system using fc-cache"; \
++#	    echo "***"; \
++#	fi)
  
  uninstall-local:
  	if [ -f $(srcdir)/fonts.conf ]; then \
diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
index 46bba932d100..3101d5ccf879 100644
--- a/x11-fonts/fontconfig/pkg-plist
+++ b/x11-fonts/fontconfig/pkg-plist
@@ -21,13 +21,13 @@ etc/fonts/conf.avail/50-user.conf
 etc/fonts/conf.avail/51-local.conf
 etc/fonts/conf.avail/60-latin.conf
 etc/fonts/conf.avail/65-fonts-persian.conf
+etc/fonts/conf.avail/65-khmer.conf
 etc/fonts/conf.avail/65-nonlatin.conf
 etc/fonts/conf.avail/69-unifont.conf
 etc/fonts/conf.avail/70-no-bitmaps.conf
 etc/fonts/conf.avail/70-yes-bitmaps.conf
 etc/fonts/conf.avail/80-delicious.conf
 etc/fonts/conf.avail/90-synthetic.conf
-etc/fonts/conf.avail/README
 etc/fonts/conf.d/20-fix-globaladvance.conf
 etc/fonts/conf.d/20-unhint-small-vera.conf
 etc/fonts/conf.d/30-metric-aliases.conf
@@ -43,6 +43,7 @@ etc/fonts/conf.d/65-nonlatin.conf
 etc/fonts/conf.d/69-unifont.conf
 etc/fonts/conf.d/80-delicious.conf
 etc/fonts/conf.d/90-synthetic.conf
+etc/fonts/conf.d/README
 @unexec if cmp -s %D/etc/fonts/fonts.conf %D/etc/fonts/fonts.conf.default; then rm -f %D/etc/fonts/fonts.conf; fi
 etc/fonts/fonts.conf.default
 @exec [ -f %B/fonts.conf ] || cp %B/%f %B/fonts.conf