--- a/open-src/lib/fontconfig/Makefile Thu Nov 26 11:00:00 2009 -0800
+++ b/open-src/lib/fontconfig/Makefile Tue Dec 01 14:24:44 2009 -0800
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)Makefile 1.87 09/11/26 SMI"
+# ident "@(#)Makefile 1.88 09/12/01 SMI"
#
# Package name used in tarballs
@@ -120,7 +120,7 @@
@f=`basename $@` ; $(START_CMD_ECHO) ; \
cp -fp $$f $@ ; \
rm -f $(PROTODIR)/etc/fonts/conf.d/$$f ; \
- ln -s ../conf.avail/$$f $(PROTODIR)/etc/fonts/conf.d/$$f
+ ln -sf ../conf.avail/$$f $(PROTODIR)/etc/fonts/conf.d/$$f
FC_MAN_DIR=$(PROTODIR)/usr/share/man
@@ -130,7 +130,7 @@
-e 's/SUNWfontconfig/SUNWfontconfig-root/' \
$(FC_MAN_DIR)/man5/fonts-conf.5 > $(FC_MAN_DIR)/man4/fonts.conf.4
-rm -f $(FC_MAN_DIR)/man3lib/libfontconfig.3lib
- perl -p -e 's/^$$/.LP/;' -e 's/\251/\\(co/;' \
+ perl -p -e 's/^$$/.LP/;' -e 's/.?\251/\\(co/;' \
libfontconfig.3lib $(SOURCE_DIR)/COPYING >> \
$(FC_MAN_DIR)/man3lib/libfontconfig.3lib
-rm -f $(FC_MAN_DIR)/man1/fc-cache.1
--- a/open-src/lib/fontconfig/libfontconfig.3lib Thu Nov 26 11:00:00 2009 -0800
+++ b/open-src/lib/fontconfig/libfontconfig.3lib Tue Dec 01 14:24:44 2009 -0800
@@ -1,16 +1,41 @@
'\" t
-.\" Copyright 2004 Sun Microsystems, Inc. All rights reserved.
-.\" Use subject to license terms.
+.\" Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+.\" Use is subject to license terms.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a
+.\" copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, and/or sell copies of the Software, and to permit persons
+.\" to whom the Software is furnished to do so, provided that the above
+.\" copyright notice(s) and this permission notice appear in all copies of
+.\" the Software and that both the above copyright notice(s) and this
+.\" permission notice appear in supporting documentation.
.\"
-.\" ident "@(#)libfontconfig.3lib 1.3 04/11/17 SMI"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+.\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.\" Except as contained in this notice, the name of a copyright holder
+.\" shall not be used in advertising or otherwise to promote the sale, use
+.\" or other dealings in this Software without prior written authorization
+.\" of the copyright holder.
+.\"
+.\" ident "@(#)libfontconfig.3lib 1.4 09/12/01 SMI"
.\"
.\" This man page created by Sun to document stability level & license
.\"
-.TH libfontconfig 3lib "4 Nov 2004"
+.TH libfontconfig 3lib "30 Nov 2009"
.SH NAME
libfontconfig \- font configuration API
.SH SYNOPSIS
-Use
+Use
.B pkg-config fontconfig
to determine compiler and linker flags.
.SH DESCRIPTION
@@ -19,73 +44,100 @@
.B http://www.fontconfig.org/
.SH INTERFACES
The shared object libfontconfig.so.1 provides the public interfaces
-defined below. See the man page for each function for additional
+defined below. See the man page for each function for additional
information.
.TS
lw(2.750000i) lw(2.750000i).
-FcAtomicCreate FcFreeTypeQuery
-FcAtomicDeleteNew FcGetVersion
-FcAtomicDestroy FcInit
-FcAtomicLock FcInitBringUptoDate
-FcAtomicNewFile FcInitLoadConfig
-FcAtomicOrigFile FcInitLoadConfigAndFonts
-FcAtomicReplaceOrig FcInitReinitialize
-FcAtomicUnlock FcMatrixCopy
-FcBlanksAdd FcMatrixEqual
-FcBlanksCreate FcMatrixInit
-FcBlanksDestroy FcMatrixMultiply
-FcBlanksIsMember FcMatrixRotate
-FcCharSetAddChar FcMatrixScale
-FcCharSetCopy FcMatrixShear
-FcCharSetCount FcNameConstant
-FcCharSetCreate FcNameGetConstant
-FcCharSetDestroy FcNameGetObjectType
-FcCharSetEqual FcNameParse
-FcCharSetFirstPage FcNameRegisterConstants
-FcCharSetHasChar FcNameRegisterObjectTypes
-FcCharSetIntersect FcNameUnparse
-FcCharSetIntersectCount FcNameUnregisterConstants
-FcCharSetIsSubset FcNameUnregisterObjectTypes
-FcCharSetNextPage FcObjectSetAdd
-FcCharSetSubtract FcObjectSetBuild
-FcCharSetSubtractCount FcObjectSetCreate
-FcCharSetUnion FcObjectSetDestroy
-FcConfigAppFontAddDir FcPatternAdd-Type
-FcConfigAppFontAddFile FcPatternAdd
-FcConfigAppFontClear FcPatternAddWeak
-FcConfigBuildFonts FcPatternBuild
-FcConfigCreate FcPatternCreate
-FcConfigDestroy FcPatternDel
-FcConfigFilename FcPatternDestroy
-FcConfigGetBlanks FcPatternEqual
-FcConfigGetCache FcPatternEqualSubset
-FcConfigGetConfigDirs FcPatternGet-Type
-FcConfigGetConfigFiles FcPatternGet
-FcConfigGetCurrent FcPatternHash
-FcConfigGetFontDirs FcPatternPrint
-FcConfigGetFonts FcStrBasename
-FcConfigGetRescanInverval FcStrCmpIgnoreCase
-FcConfigParseAndLoad FcStrCopy
-FcConfigSetCurrent FcStrCopyFilename
-FcConfigSetRescanInverval FcStrDirname
-FcConfigSubstitute FcStrListCreate
-FcConfigSubstituteWithPat FcStrListDone
-FcConfigUptoDate FcStrListNext
-FcDefaultSubstitute FcStrSetAdd
-FcDirCacheValid FcStrSetAddFilename
-FcDirSave FcStrSetCreate
-FcDirScan FcStrSetDel
-FcFileScan FcStrSetDestroy
-FcFontList FcStrSetMember
-FcFontMatch FcUcs4ToUtf8
-FcFontRenderPrepare FcUtf16Len
-FcFontSetAdd FcUtf16ToUcs4
-FcFontSetCreate FcUtf8Len
-FcFontSetDestroy FcUtf8ToUcs4
-FcFontSort FcValueDestroy
-FcFreeTypeCharIndex FcValueSave
-FcFreeTypeCharSet
+FcAtomicCreate FcGetLangs
+FcAtomicDeleteNew FcGetVersion
+FcAtomicDestroy FcInit
+FcAtomicLock FcInitBringUptoDate
+FcAtomicNewFile FcInitLoadConfig
+FcAtomicOrigFile FcInitLoadConfigAndFonts
+FcAtomicReplaceOrig FcInitReinitialize
+FcAtomicUnlock FcIsLower
+FcBlanksAdd FcIsUpper
+FcBlanksCreate FcLangGetCharSet
+FcBlanksDestroy FcLangSetAdd
+FcBlanksIsMember FcLangSetCompare
+FcCacheCopySet FcLangSetContains
+FcCacheDir FcLangSetCopy
+FcCacheNumFont FcLangSetCreate
+FcCacheNumSubdir FcLangSetDestroy
+FcCacheSubdir FcLangSetEqual
+FcCharSetAddChar FcLangSetGetLangs
+FcCharSetCopy FcLangSetHash
+FcCharSetCount FcLangSetHasLang
+FcCharSetCoverage FcMatrixCopy
+FcCharSetCreate FcMatrixEqual
+FcCharSetDestroy FcMatrixInit
+FcCharSetEqual FcMatrixMultiply
+FcCharSetFirstPage FcMatrixRotate
+FcCharSetHasChar FcMatrixScale
+FcCharSetIntersect FcMatrixShear
+FcCharSetIntersectCount FcNameConstant
+FcCharSetIsSubset FcNameGetConstant
+FcCharSetMerge FcNameGetObjectType
+FcCharSetNew FcNameParse
+FcCharSetNextPage FcNameRegisterConstants
+FcCharSetSubtract FcNameRegisterObjectTypes
+FcCharSetSubtractCount FcNameUnparse
+FcCharSetUnion FcNameUnregisterConstants
+FcConfigAppFontAddDir FcNameUnregisterObjectTypes
+FcConfigAppFontAddFile FcObjectSetAdd
+FcConfigAppFontClear FcObjectSetBuild
+FcConfigBuildFonts FcObjectSetCreate
+FcConfigCreate FcObjectSetDestroy
+FcConfigDestroy FcPatternAdd-Type
+FcConfigEnableHome FcPatternAdd
+FcConfigFilename FcPatternAddWeak
+FcConfigGetBlanks FcPatternBuild
+FcConfigGetCache FcPatternCreate
+FcConfigGetCacheDirs FcPatternDel
+FcConfigGetConfigDirs FcPatternDestroy
+FcConfigGetConfigFiles FcPatternDuplicate
+FcConfigGetCurrent FcPatternEqual
+FcConfigGetFontDirs FcPatternEqualSubset
+FcConfigGetFonts FcPatternFilter
+FcConfigGetRescanInterval FcPatternFormat
+FcConfigHome FcPatternGet-Type
+FcConfigParseAndLoad FcPatternGet
+FcConfigReference FcPatternHash
+FcConfigSetCurrent FcPatternPrint
+FcConfigSetRescanInterval FcPatternReference
+FcConfigSubstitute FcPatternRemove
+FcConfigSubstituteWithPat FcStrBasename
+FcConfigUptoDate FcStrCmp
+FcDefaultSubstitute FcStrCmpIgnoreCase
+FcDirCacheLoad FcStrCopy
+FcDirCacheLoadFile FcStrCopyFilename
+FcDirCacheRead FcStrDirname
+FcDirCacheUnlink FcStrDowncase
+FcDirCacheUnload FcStrFree
+FcDirCacheValid FcStrListCreate
+FcDirSave FcStrListDone
+FcDirScan FcStrListNext
+FcFileIsDir FcStrPlus
+FcFileScan FcStrSetAdd
+FcFini FcStrSetAddFilename
+FcFontList FcStrSetCreate
+FcFontMatch FcStrSetDel
+FcFontRenderPrepare FcStrSetDestroy
+FcFontSetAdd FcStrSetEqual
+FcFontSetCreate FcStrSetMember
+FcFontSetDestroy FcStrStr
+FcFontSetList FcStrStrIgnoreCase
+FcFontSetMatch FcToLower
+FcFontSetPrint FcUcs4ToUtf8
+FcFontSetSort FcUtf16Len
+FcFontSetSortDestroy FcUtf16ToUcs4
+FcFontSort FcUtf8Len
+FcFreeTypeCharIndex FcUtf8ToUcs4
+FcFreeTypeCharSet FcValueDestroy
+FcFreeTypeCharSetAndSpacing FcValueEqual
+FcFreeTypeQuery FcValuePrint
+FcFreeTypeQueryFace FcValueSave
.TE
.SH FILES
.PD 0
@@ -95,6 +147,9 @@
.TP
/usr/lib/64/libfontconfig.so.1
64-bit shared object
+.TP
+/usr/share/doc/fontconfig
+Developer and user documentation in other formats
.PD
.SH ATTRIBUTES
See
@@ -109,12 +164,16 @@
=
Availability SUNWfontconfig
=
-Interface Stability External
+Interface Stability Volatile
.TE
.SH "SEE ALSO"
-.BR pkg-config (1),
-.BR fc-cache (1),
-.BR fc-list (1),
+.BR pkg-config (1),
+.BR fc-cache (1),
+.BR fc-cat (1),
+.BR fc-list (1),
+.BR fc-match (1),
+.BR fc-query (1),
+.BR fc-scan (1),
.BR fonts.conf (4)
.SH LICENSE
.\" Makefile will append license from COPYING file in fontconfig src here
--- a/packages/SUNWfontconfig-docs/prototype Thu Nov 26 11:00:00 2009 -0800
+++ b/packages/SUNWfontconfig-docs/prototype Tue Dec 01 14:24:44 2009 -0800
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype 1.10 09/09/09 SMI"
+# ident "@(#)prototype 1.11 09/12/01 SMI"
#
# Fontconfig documentation
@@ -43,9 +43,11 @@
!search $HOME/man/man1
d none share/man/man1 0755 root bin
f none share/man/man1/fc-cache.1 0444 root bin
+f none share/man/man1/fc-cat.1 0444 root bin
f none share/man/man1/fc-list.1 0444 root bin
f none share/man/man1/fc-match.1 0444 root bin
-f none share/man/man1/fc-cat.1 0444 root bin
+f none share/man/man1/fc-query.1 0444 root bin
+f none share/man/man1/fc-scan.1 0444 root bin
!search $HOME/man/man4
d none share/man/man4 0755 root bin
@@ -86,6 +88,7 @@
f none share/man/man3fontconfig/FcCharSetIntersect.3fontconfig=$HOME/man/man3/FcCharSetIntersect.3 0444 root bin
f none share/man/man3fontconfig/FcCharSetIntersectCount.3fontconfig=$HOME/man/man3/FcCharSetIntersectCount.3 0444 root bin
f none share/man/man3fontconfig/FcCharSetIsSubset.3fontconfig=$HOME/man/man3/FcCharSetIsSubset.3 0444 root bin
+f none share/man/man3fontconfig/FcCharSetMerge.3fontconfig=$HOME/man/man3/FcCharSetMerge.3 0444 root bin
f none share/man/man3fontconfig/FcCharSetNew.3fontconfig=$HOME/man/man3/FcCharSetNew.3 0444 root bin
f none share/man/man3fontconfig/FcCharSetNextPage.3fontconfig=$HOME/man/man3/FcCharSetNextPage.3 0444 root bin
f none share/man/man3fontconfig/FcCharSetSubtract.3fontconfig=$HOME/man/man3/FcCharSetSubtract.3 0444 root bin
@@ -110,6 +113,7 @@
f none share/man/man3fontconfig/FcConfigGetRescanInterval.3fontconfig=$HOME/man/man3/FcConfigGetRescanInterval.3 0444 root bin
f none share/man/man3fontconfig/FcConfigHome.3fontconfig=$HOME/man/man3/FcConfigHome.3 0444 root bin
f none share/man/man3fontconfig/FcConfigParseAndLoad.3fontconfig=$HOME/man/man3/FcConfigParseAndLoad.3 0444 root bin
+f none share/man/man3fontconfig/FcConfigReference.3fontconfig=$HOME/man/man3/FcConfigReference.3 0444 root bin
f none share/man/man3fontconfig/FcConfigSetCurrent.3fontconfig=$HOME/man/man3/FcConfigSetCurrent.3 0444 root bin
f none share/man/man3fontconfig/FcConfigSetRescanInterval.3fontconfig=$HOME/man/man3/FcConfigSetRescanInterval.3 0444 root bin
f none share/man/man3fontconfig/FcConfigSubstitute.3fontconfig=$HOME/man/man3/FcConfigSubstitute.3 0444 root bin
@@ -161,6 +165,7 @@
f none share/man/man3fontconfig/FcLangSetCreate.3fontconfig=$HOME/man/man3/FcLangSetCreate.3 0444 root bin
f none share/man/man3fontconfig/FcLangSetDestroy.3fontconfig=$HOME/man/man3/FcLangSetDestroy.3 0444 root bin
f none share/man/man3fontconfig/FcLangSetEqual.3fontconfig=$HOME/man/man3/FcLangSetEqual.3 0444 root bin
+f none share/man/man3fontconfig/FcLangSetGetLangs.3fontconfig=$HOME/man/man3/FcLangSetGetLangs.3 0444 root bin
f none share/man/man3fontconfig/FcLangSetHasLang.3fontconfig=$HOME/man/man3/FcLangSetHasLang.3 0444 root bin
f none share/man/man3fontconfig/FcLangSetHash.3fontconfig=$HOME/man/man3/FcLangSetHash.3 0444 root bin
f none share/man/man3fontconfig/FcMatrixCopy.3fontconfig=$HOME/man/man3/FcMatrixCopy.3 0444 root bin
@@ -193,6 +198,8 @@
f none share/man/man3fontconfig/FcPatternDuplicate.3fontconfig=$HOME/man/man3/FcPatternDuplicate.3 0444 root bin
f none share/man/man3fontconfig/FcPatternEqual.3fontconfig=$HOME/man/man3/FcPatternEqual.3 0444 root bin
f none share/man/man3fontconfig/FcPatternEqualSubset.3fontconfig=$HOME/man/man3/FcPatternEqualSubset.3 0444 root bin
+f none share/man/man3fontconfig/FcPatternFilter.3fontconfig=$HOME/man/man3/FcPatternFilter.3 0444 root bin
+f none share/man/man3fontconfig/FcPatternFormat.3fontconfig=$HOME/man/man3/FcPatternFormat.3 0444 root bin
f none share/man/man3fontconfig/FcPatternGet-Type.3fontconfig=$HOME/man/man3/FcPatternGet-Type.3 0444 root bin
f none share/man/man3fontconfig/FcPatternGet.3fontconfig=$HOME/man/man3/FcPatternGet.3 0444 root bin
f none share/man/man3fontconfig/FcPatternHash.3fontconfig=$HOME/man/man3/FcPatternHash.3 0444 root bin
@@ -204,6 +211,7 @@
f none share/man/man3fontconfig/FcStrCmpIgnoreCase.3fontconfig=$HOME/man/man3/FcStrCmpIgnoreCase.3 0444 root bin
f none share/man/man3fontconfig/FcStrCopy.3fontconfig=$HOME/man/man3/FcStrCopy.3 0444 root bin
f none share/man/man3fontconfig/FcStrCopyFilename.3fontconfig=$HOME/man/man3/FcStrCopyFilename.3 0444 root bin
+f none share/man/man3fontconfig/FcStrDirname.3fontconfig=$HOME/man/man3/FcStrDirname.3 0444 root bin
f none share/man/man3fontconfig/FcStrDowncase.3fontconfig=$HOME/man/man3/FcStrDowncase.3 0444 root bin
f none share/man/man3fontconfig/FcStrFree.3fontconfig=$HOME/man/man3/FcStrFree.3 0444 root bin
f none share/man/man3fontconfig/FcStrListCreate.3fontconfig=$HOME/man/man3/FcStrListCreate.3 0444 root bin