10 files changed, 136 insertions, 25 deletions

diff --git a/x11-fonts/fontconfig-reference/Makefile b/x11-fonts/fontconfig-reference/Makefile
index 215ecf8c5e9d..13de867bc88e 100644
--- a/x11-fonts/fontconfig-reference/Makefile
+++ b/x11-fonts/fontconfig-reference/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	0
 
 DOCSDIR=	${PREFIX}/share/doc/fontconfig-devel
diff --git a/x11-fonts/fontconfig-reference/Makefile.man b/x11-fonts/fontconfig-reference/Makefile.man
index 4aa9fd1e9d66..d26d023d3a93 100644
--- a/x11-fonts/fontconfig-reference/Makefile.man
+++ b/x11-fonts/fontconfig-reference/Makefile.man
@@ -7,9 +7,9 @@ MAN3=	FcAtomicCreate.3 FcAtomicDeleteNew.3 FcAtomicDestroy.3 \
 	FcCharSetCopy.3 FcCharSetCount.3 FcCharSetCoverage.3 \
 	FcCharSetCreate.3 FcCharSetDestroy.3 FcCharSetEqual.3 \
 	FcCharSetFirstPage.3 FcCharSetHasChar.3 FcCharSetIntersect.3 \
-	FcCharSetIntersectCount.3 FcCharSetIsSubset.3 FcCharSetNew.3 \
-	FcCharSetNextPage.3 FcCharSetSubtract.3 FcCharSetSubtractCount.3 \
-	FcCharSetUnion.3 FcConfigAppFontAddDir.3 \
+	FcCharSetIntersectCount.3 FcCharSetIsSubset.3 FcCharSetMerge.3 \
+	FcCharSetNew.3 FcCharSetNextPage.3 FcCharSetSubtract.3 \
+	FcCharSetSubtractCount.3 FcCharSetUnion.3 FcConfigAppFontAddDir.3 \
 	FcConfigAppFontAddFile.3 FcConfigAppFontClear.3 \
 	FcConfigBuildFonts.3 FcConfigCreate.3 FcConfigDestroy.3 \
 	FcConfigEnableHome.3 FcConfigFilename.3 FcConfigGetBlanks.3 \
@@ -17,7 +17,7 @@ MAN3=	FcAtomicCreate.3 FcAtomicDeleteNew.3 FcAtomicDestroy.3 \
 	FcConfigGetConfigDirs.3 FcConfigGetConfigFiles.3 \
 	FcConfigGetCurrent.3 FcConfigGetFontDirs.3 FcConfigGetFonts.3 \
 	FcConfigGetRescanInterval.3 FcConfigHome.3 \
-	FcConfigParseAndLoad.3 FcConfigSetCurrent.3 \
+	FcConfigParseAndLoad.3 FcConfigReference.3 FcConfigSetCurrent.3 \
 	FcConfigSetRescanInterval.3 FcConfigSubstitute.3 \
 	FcConfigSubstituteWithPat.3 FcConfigUptoDate.3 \
 	FcDefaultSubstitute.3 FcDirCacheLoad.3 FcDirCacheLoadFile.3 \
@@ -35,8 +35,8 @@ MAN3=	FcAtomicCreate.3 FcAtomicDeleteNew.3 FcAtomicDestroy.3 \
 	FcIsUpper.3 FcLangGetCharSet.3 FcLangSetAdd.3 FcLangSetCompare.3 \
 	FcLangSetContains.3 FcLangSetCopy.3 FcLangSetCreate.3 \
 	FcLangSetDestroy.3 FcLangSetEqual.3 FcLangSetHasLang.3 \
-	FcLangSetHash.3 FcMatrixCopy.3 FcMatrixEqual.3 FcMatrixInit.3 \
-	FcMatrixMultiply.3 FcMatrixRotate.3 FcMatrixScale.3 \
+	FcLangSetGetLangs.3 FcLangSetHash.3 FcMatrixCopy.3 FcMatrixEqual.3 \
+	FcMatrixInit.3 FcMatrixMultiply.3 FcMatrixRotate.3 FcMatrixScale.3 \
 	FcMatrixShear.3 FcNameConstant.3 FcNameGetConstant.3 \
 	FcNameGetObjectType.3 FcNameParse.3 FcNameRegisterConstants.3 \
 	FcNameRegisterObjectTypes.3 FcNameUnparse.3 \
@@ -45,9 +45,9 @@ MAN3=	FcAtomicCreate.3 FcAtomicDeleteNew.3 FcAtomicDestroy.3 \
 	FcObjectSetDestroy.3 FcPatternAdd.3 FcPatternAdd-Type.3 \
 	FcPatternAddWeak.3 FcPatternBuild.3 FcPatternCreate.3 \
 	FcPatternDel.3 FcPatternDestroy.3 FcPatternDuplicate.3 \
-	FcPatternEqual.3 FcPatternEqualSubset.3 FcPatternGet.3 \
-	FcPatternGet-Type.3 FcPatternHash.3 FcPatternPrint.3 \
-	FcPatternReference.3 FcPatternRemove.3 FcStrBasename.3 \
+	FcPatternEqual.3 FcPatternEqualSubset.3 FcPatternFilter.3 \
+	FcPatternFormat.3 FcPatternGet.3 FcPatternGet-Type.3 FcPatternHash.3 \
+	FcPatternPrint.3 FcPatternReference.3 FcPatternRemove.3 FcStrBasename.3 \
 	FcStrCmp.3 FcStrCmpIgnoreCase.3 FcStrCopy.3 FcStrCopyFilename.3 \
 	FcStrDowncase.3 FcStrFree.3 FcStrListCreate.3 FcStrListDone.3 \
 	FcStrListNext.3 FcStrPlus.3 FcStrSetAdd.3 FcStrSetAddFilename.3 \
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 54b6dcd1313d..c7bf341c9e4b 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.18 2008/08/21 21:53:01 mezz Exp $
+#   $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.25 2009/11/22 04:17:16 marcus Exp $
 #
 
 PORTNAME=	fontconfig
-PORTVERSION=	2.6.0
+PORTVERSION=	2.8.0
 PORTREVISION?=	0
 PORTEPOCH?=	1
 CATEGORIES=	x11-fonts
@@ -36,7 +36,7 @@ MAKE_ENV=	LC_ALL=C
 MAKE_JOBS_SAFE=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 
-MAN1=		fc-cache.1 fc-cat.1 fc-list.1 fc-match.1
+MAN1=		fc-cache.1 fc-cat.1 fc-list.1 fc-match.1 fc-query.1 fc-scan.1
 MAN5=		fonts-conf.5
 PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
 
diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo
index 24a1c943bf82..5b617cd3ec3a 100644
--- a/x11-fonts/fontconfig/distinfo
+++ b/x11-fonts/fontconfig/distinfo
@@ -1,3 +1,3 @@
-MD5 (fontconfig-2.6.0.tar.gz) = ab54ec1d4ddd836313fdbc0cd5299d6d
-SHA256 (fontconfig-2.6.0.tar.gz) = a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5
-SIZE (fontconfig-2.6.0.tar.gz) = 1403857
+MD5 (fontconfig-2.8.0.tar.gz) = 77e15a92006ddc2adbb06f840d591c0e
+SHA256 (fontconfig-2.8.0.tar.gz) = fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335
+SIZE (fontconfig-2.8.0.tar.gz) = 1548409
diff --git a/x11-fonts/fontconfig/files/fc-query.1 b/x11-fonts/fontconfig/files/fc-query.1
new file mode 100644
index 000000000000..a6e6e47a9387
--- /dev/null
+++ b/x11-fonts/fontconfig/files/fc-query.1
@@ -0,0 +1,57 @@
+.\\" auto-generated by docbook2man-spec $Revision: 1.1 $
+.TH "FC-QUERY" "1" "Aug 13, 2008" "" ""
+.SH NAME
+fc-query \- query font files
+.SH SYNOPSIS
+.sp
+\fBfc-query\fR [ \fB-Vh\fR ] 
+
+ [ \fB [ -i \fIindex\fB ]  [ --index \fIindex\fB ] \fR ]  [ \fB [ -f \fIformat\fB ]  [ --format \fIformat\fB ] \fR ]  [ \fB--version\fR ]  [ \fB--help\fR ]  \fB\fIfont-file\fB\fR\fI...\fR
+.SH "DESCRIPTION"
+.PP
+\fBfc-query\fR queries
+\fIfont-file\fR(s) using the normal fontconfig
+rules and prints out font pattern for each face found.
+If \fB--index\fR is given, only one face of each file is
+queried, otherwise all faces are queried.
+.SH "OPTIONS"
+.PP
+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-i\fR
+Only query face indexed \fIindex\fR of
+each file.
+.TP
+\fB-f\fR
+Format output according to the format specifier
+\fIformat\fR.
+.TP
+\fB-V\fR
+Show version of the program and exit.
+.TP
+\fB-h\fR
+Show summary of options.
+.TP
+\fB\fIfont-file\fB\fR
+Query \fIfont-file\fR for font faces.
+.SH "RETURN CODES"
+.PP
+\fBfc-query\fR returns error code 0 for successful parsing,
+or 1 if any errors occured or if at least one font face could not be opened.
+.SH "SEE ALSO"
+.PP
+\fBfc-scan\fR(1)
+\fBFcFreeTypeQuery\fR(3)
+\fBFcPatternFormat\fR(3)
+\fBfc-cat\fR(1)
+\fBfc-cache\fR(1)
+\fBfc-list\fR(1)
+\fBfc-match\fR(1)
+.PP
+The fontconfig user's guide, in HTML format:
+\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR.
+.SH "AUTHOR"
+.PP
+This manual page was updated by Behdad Esfahbod <behdad@behdad.org>.
diff --git a/x11-fonts/fontconfig/files/fc-scan.1 b/x11-fonts/fontconfig/files/fc-scan.1
new file mode 100644
index 000000000000..77748d18f5c4
--- /dev/null
+++ b/x11-fonts/fontconfig/files/fc-scan.1
@@ -0,0 +1,52 @@
+.\\" auto-generated by docbook2man-spec $Revision: 1.1 $
+.TH "FC-SCAN" "1" "Jan 15, 2009" "" ""
+.SH NAME
+fc-scan \- scan font files or directories
+.SH SYNOPSIS
+.sp
+\fBfc-scan\fR [ \fB-Vh\fR ] 
+
+ [ \fB [ -f \fIformat\fB ]  [ --format \fIformat\fB ] \fR ]  [ \fB--version\fR ]  [ \fB--help\fR ]  \fB\fIfile\fB\fR\fI...\fR
+.SH "DESCRIPTION"
+.PP
+\fBfc-scan\fR scans
+\fIfile\fR(s) recursively
+and prints out font pattern for each face found.
+.SH "OPTIONS"
+.PP
+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-f\fR
+Format output according to the format specifier
+\fIformat\fR.
+.TP
+\fB-V\fR
+Show version of the program and exit.
+.TP
+\fB-h\fR
+Show summary of options.
+.TP
+\fB\fIfile\fB\fR
+Scan \fIfile\fR recursively for font faces.
+.SH "RETURN CODES"
+.PP
+\fBfc-scan\fR returns error code 0 if at least one font
+was found or 1 otherwise.
+.SH "SEE ALSO"
+.PP
+\fBfc-query\fR(1)
+\fBFcFileScan\fR(3)
+\fBFcDirScan\fR(3)
+\fBFcPatternFormat\fR(3)
+\fBfc-cat\fR(1)
+\fBfc-cache\fR(1)
+\fBfc-list\fR(1)
+\fBfc-match\fR(1)
+.PP
+The fontconfig user's guide, in HTML format:
+\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR.
+.SH "AUTHOR"
+.PP
+This manual page was updated by Behdad Esfahbod <behdad@behdad.org>.
diff --git a/x11-fonts/fontconfig/files/patch-Makefile.in b/x11-fonts/fontconfig/files/patch-Makefile.in
index 40d586736f14..5719bed30981 100644
--- a/x11-fonts/fontconfig/files/patch-Makefile.in
+++ b/x11-fonts/fontconfig/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- 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
+--- Makefile.in.orig	2009-07-08 01:52:45.000000000 -0400
++++ Makefile.in	2009-07-08 01:53:30.000000000 -0400
+@@ -896,28 +896,28 @@ fonts.conf: fonts.conf.in Makefile
+ 	mv $@.tmp $@
  
- install-data-local:
+ install-data-local: fonts.conf
 -	$(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
 -	if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
 -	  echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
index 3101d5ccf879..bc6a0793ecca 100644
--- a/x11-fonts/fontconfig/pkg-plist
+++ b/x11-fonts/fontconfig/pkg-plist
@@ -2,6 +2,8 @@ bin/fc-cache
 bin/fc-cat
 bin/fc-list
 bin/fc-match
+bin/fc-query
+bin/fc-scan
 etc/fonts/conf.avail/10-autohint.conf
 etc/fonts/conf.avail/10-no-sub-pixel.conf
 etc/fonts/conf.avail/10-sub-pixel-bgr.conf
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index be920c37282c..696f58073d65 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libXft
-PORTVERSION=	2.1.13
+PORTVERSION=	2.1.14
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-fonts/libXft/distinfo b/x11-fonts/libXft/distinfo
index 678cf67a581f..789527c9a6d7 100644
--- a/x11-fonts/libXft/distinfo
+++ b/x11-fonts/libXft/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXft-2.1.13.tar.bz2) = bc8881851f3bd8dcc625fac37350a1c6
-SHA256 (xorg/lib/libXft-2.1.13.tar.bz2) = ce7688258af34c14af421bcfb306d4310245b727d2417ac968b7f6b2facfde8c
-SIZE (xorg/lib/libXft-2.1.13.tar.bz2) = 268153
+MD5 (xorg/lib/libXft-2.1.14.tar.bz2) = 254e62a233491e0e1251636536163e20
+SHA256 (xorg/lib/libXft-2.1.14.tar.bz2) = 700e9d594b81cad3dfd5fac4a5cfd0c4cf7780c812507ef04eb40139ebf5175e
+SIZE (xorg/lib/libXft-2.1.14.tar.bz2) = 289068