diff options
| -rw-r--r-- | fonts/fontconfig/Makefile | 5 | ||||
| -rw-r--r-- | fonts/fontconfig/PLIST | 365 | ||||
| -rw-r--r-- | fonts/fontconfig/distinfo | 14 | ||||
| -rw-r--r-- | fonts/fontconfig/patches/patch-aa | 24 | ||||
| -rw-r--r-- | fonts/fontconfig/patches/patch-ac | 14 | ||||
| -rw-r--r-- | fonts/fontconfig/patches/patch-cb | 61 |
6 files changed, 244 insertions, 239 deletions
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile index bd140340622..8b910dd0b7c 100644 --- a/fonts/fontconfig/Makefile +++ b/fonts/fontconfig/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.67 2009/04/07 21:40:12 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2009/07/18 13:20:00 wiz Exp $ -DISTNAME= fontconfig-2.6.0 -PKGREVISION= 1 +DISTNAME= fontconfig-2.7.0 CATEGORIES= fonts MASTER_SITES= http://www.fontconfig.org/release/ diff --git a/fonts/fontconfig/PLIST b/fonts/fontconfig/PLIST index 18b8abf769b..9814519245b 100644 --- a/fonts/fontconfig/PLIST +++ b/fonts/fontconfig/PLIST @@ -1,8 +1,10 @@ -@comment $NetBSD: PLIST,v 1.18 2009/06/14 17:54:13 joerg Exp $ +@comment $NetBSD: PLIST,v 1.19 2009/07/18 13:20:00 wiz Exp $ bin/fc-cache bin/fc-cat bin/fc-list bin/fc-match +bin/fc-query +bin/fc-scan include/fontconfig/fcfreetype.h include/fontconfig/fcprivate.h include/fontconfig/fontconfig.h @@ -12,6 +14,8 @@ man/man1/fc-cache.1 man/man1/fc-cat.1 man/man1/fc-list.1 man/man1/fc-match.1 +man/man1/fc-query.1 +man/man1/fc-scan.1 man/man3/FcAtomicCreate.3 man/man3/FcAtomicDeleteNew.3 man/man3/FcAtomicDestroy.3 @@ -41,6 +45,7 @@ man/man3/FcCharSetHasChar.3 man/man3/FcCharSetIntersect.3 man/man3/FcCharSetIntersectCount.3 man/man3/FcCharSetIsSubset.3 +man/man3/FcCharSetMerge.3 man/man3/FcCharSetNew.3 man/man3/FcCharSetNextPage.3 man/man3/FcCharSetSubtract.3 @@ -65,6 +70,7 @@ man/man3/FcConfigGetFonts.3 man/man3/FcConfigGetRescanInterval.3 man/man3/FcConfigHome.3 man/man3/FcConfigParseAndLoad.3 +man/man3/FcConfigReference.3 man/man3/FcConfigSetCurrent.3 man/man3/FcConfigSetRescanInterval.3 man/man3/FcConfigSubstitute.3 @@ -116,6 +122,7 @@ man/man3/FcLangSetCopy.3 man/man3/FcLangSetCreate.3 man/man3/FcLangSetDestroy.3 man/man3/FcLangSetEqual.3 +man/man3/FcLangSetGetLangs.3 man/man3/FcLangSetHasLang.3 man/man3/FcLangSetHash.3 man/man3/FcMatrixCopy.3 @@ -148,6 +155,8 @@ man/man3/FcPatternDestroy.3 man/man3/FcPatternDuplicate.3 man/man3/FcPatternEqual.3 man/man3/FcPatternEqualSubset.3 +man/man3/FcPatternFilter.3 +man/man3/FcPatternFormat.3 man/man3/FcPatternGet-Type.3 man/man3/FcPatternGet.3 man/man3/FcPatternHash.3 @@ -188,180 +197,186 @@ man/man3/FcValueSave.3 man/man5/fonts-conf.5 share/doc/fontconfig/fontconfig-devel.pdf share/doc/fontconfig/fontconfig-devel.txt -share/doc/fontconfig/fontconfig-devel/index.html -share/doc/fontconfig/fontconfig-devel/r1034.html -share/doc/fontconfig/fontconfig-devel/r1056.html -share/doc/fontconfig/fontconfig-devel/r108.html -share/doc/fontconfig/fontconfig-devel/r1099.html -share/doc/fontconfig/fontconfig-devel/r1127.html -share/doc/fontconfig/fontconfig-devel/r1148.html -share/doc/fontconfig/fontconfig-devel/r1171.html -share/doc/fontconfig/fontconfig-devel/r1192.html -share/doc/fontconfig/fontconfig-devel/r1237.html -share/doc/fontconfig/fontconfig-devel/r1260.html -share/doc/fontconfig/fontconfig-devel/r1283.html -share/doc/fontconfig/fontconfig-devel/r129.html -share/doc/fontconfig/fontconfig-devel/r1309.html -share/doc/fontconfig/fontconfig-devel/r1336.html -share/doc/fontconfig/fontconfig-devel/r1367.html -share/doc/fontconfig/fontconfig-devel/r1389.html -share/doc/fontconfig/fontconfig-devel/r1412.html -share/doc/fontconfig/fontconfig-devel/r1434.html -share/doc/fontconfig/fontconfig-devel/r1460.html -share/doc/fontconfig/fontconfig-devel/r1482.html -share/doc/fontconfig/fontconfig-devel/r150.html -share/doc/fontconfig/fontconfig-devel/r1505.html -share/doc/fontconfig/fontconfig-devel/r1529.html -share/doc/fontconfig/fontconfig-devel/r1552.html -share/doc/fontconfig/fontconfig-devel/r1577.html -share/doc/fontconfig/fontconfig-devel/r1602.html -share/doc/fontconfig/fontconfig-devel/r1627.html -share/doc/fontconfig/fontconfig-devel/r1652.html -share/doc/fontconfig/fontconfig-devel/r1677.html -share/doc/fontconfig/fontconfig-devel/r1699.html -share/doc/fontconfig/fontconfig-devel/r171.html -share/doc/fontconfig/fontconfig-devel/r1724.html -share/doc/fontconfig/fontconfig-devel/r1749.html -share/doc/fontconfig/fontconfig-devel/r1774.html -share/doc/fontconfig/fontconfig-devel/r1801.html -share/doc/fontconfig/fontconfig-devel/r1829.html -share/doc/fontconfig/fontconfig-devel/r1858.html -share/doc/fontconfig/fontconfig-devel/r1883.html -share/doc/fontconfig/fontconfig-devel/r1905.html -share/doc/fontconfig/fontconfig-devel/r192.html -share/doc/fontconfig/fontconfig-devel/r1927.html -share/doc/fontconfig/fontconfig-devel/r1950.html -share/doc/fontconfig/fontconfig-devel/r1976.html -share/doc/fontconfig/fontconfig-devel/r2002.html -share/doc/fontconfig/fontconfig-devel/r2032.html -share/doc/fontconfig/fontconfig-devel/r2057.html -share/doc/fontconfig/fontconfig-devel/r2081.html -share/doc/fontconfig/fontconfig-devel/r2110.html -share/doc/fontconfig/fontconfig-devel/r213.html -share/doc/fontconfig/fontconfig-devel/r2131.html -share/doc/fontconfig/fontconfig-devel/r2155.html -share/doc/fontconfig/fontconfig-devel/r2178.html -share/doc/fontconfig/fontconfig-devel/r2201.html -share/doc/fontconfig/fontconfig-devel/r2227.html -share/doc/fontconfig/fontconfig-devel/r2256.html -share/doc/fontconfig/fontconfig-devel/r2286.html -share/doc/fontconfig/fontconfig-devel/r2316.html -share/doc/fontconfig/fontconfig-devel/r234.html -share/doc/fontconfig/fontconfig-devel/r2349.html -share/doc/fontconfig/fontconfig-devel/r2370.html -share/doc/fontconfig/fontconfig-devel/r2391.html -share/doc/fontconfig/fontconfig-devel/r2413.html -share/doc/fontconfig/fontconfig-devel/r2434.html -share/doc/fontconfig/fontconfig-devel/r2456.html -share/doc/fontconfig/fontconfig-devel/r2478.html -share/doc/fontconfig/fontconfig-devel/r2501.html -share/doc/fontconfig/fontconfig-devel/r2522.html -share/doc/fontconfig/fontconfig-devel/r2544.html -share/doc/fontconfig/fontconfig-devel/r2566.html -share/doc/fontconfig/fontconfig-devel/r258.html -share/doc/fontconfig/fontconfig-devel/r2588.html -share/doc/fontconfig/fontconfig-devel/r2609.html -share/doc/fontconfig/fontconfig-devel/r2631.html -share/doc/fontconfig/fontconfig-devel/r2655.html -share/doc/fontconfig/fontconfig-devel/r2676.html -share/doc/fontconfig/fontconfig-devel/r2698.html -share/doc/fontconfig/fontconfig-devel/r2721.html -share/doc/fontconfig/fontconfig-devel/r2744.html -share/doc/fontconfig/fontconfig-devel/r2767.html -share/doc/fontconfig/fontconfig-devel/r2788.html -share/doc/fontconfig/fontconfig-devel/r279.html -share/doc/fontconfig/fontconfig-devel/r2817.html -share/doc/fontconfig/fontconfig-devel/r2842.html -share/doc/fontconfig/fontconfig-devel/r2873.html -share/doc/fontconfig/fontconfig-devel/r2911.html -share/doc/fontconfig/fontconfig-devel/r2942.html -share/doc/fontconfig/fontconfig-devel/r2969.html -share/doc/fontconfig/fontconfig-devel/r2993.html -share/doc/fontconfig/fontconfig-devel/r301.html -share/doc/fontconfig/fontconfig-devel/r3021.html -share/doc/fontconfig/fontconfig-devel/r3045.html -share/doc/fontconfig/fontconfig-devel/r3069.html -share/doc/fontconfig/fontconfig-devel/r3094.html -share/doc/fontconfig/fontconfig-devel/r3118.html -share/doc/fontconfig/fontconfig-devel/r3142.html -share/doc/fontconfig/fontconfig-devel/r3164.html -share/doc/fontconfig/fontconfig-devel/r3192.html -share/doc/fontconfig/fontconfig-devel/r3213.html -share/doc/fontconfig/fontconfig-devel/r323.html -share/doc/fontconfig/fontconfig-devel/r3234.html -share/doc/fontconfig/fontconfig-devel/r3257.html -share/doc/fontconfig/fontconfig-devel/r3283.html -share/doc/fontconfig/fontconfig-devel/r3305.html -share/doc/fontconfig/fontconfig-devel/r3327.html -share/doc/fontconfig/fontconfig-devel/r3349.html -share/doc/fontconfig/fontconfig-devel/r3371.html -share/doc/fontconfig/fontconfig-devel/r3393.html -share/doc/fontconfig/fontconfig-devel/r3414.html -share/doc/fontconfig/fontconfig-devel/r3435.html -share/doc/fontconfig/fontconfig-devel/r344.html -share/doc/fontconfig/fontconfig-devel/r3460.html -share/doc/fontconfig/fontconfig-devel/r3496.html -share/doc/fontconfig/fontconfig-devel/r3518.html -share/doc/fontconfig/fontconfig-devel/r3553.html -share/doc/fontconfig/fontconfig-devel/r3581.html -share/doc/fontconfig/fontconfig-devel/r3607.html -share/doc/fontconfig/fontconfig-devel/r3629.html -share/doc/fontconfig/fontconfig-devel/r3656.html -share/doc/fontconfig/fontconfig-devel/r3683.html -share/doc/fontconfig/fontconfig-devel/r369.html -share/doc/fontconfig/fontconfig-devel/r3708.html -share/doc/fontconfig/fontconfig-devel/r3733.html -share/doc/fontconfig/fontconfig-devel/r3755.html -share/doc/fontconfig/fontconfig-devel/r3778.html -share/doc/fontconfig/fontconfig-devel/r3805.html -share/doc/fontconfig/fontconfig-devel/r3827.html -share/doc/fontconfig/fontconfig-devel/r3852.html -share/doc/fontconfig/fontconfig-devel/r3873.html -share/doc/fontconfig/fontconfig-devel/r3898.html -share/doc/fontconfig/fontconfig-devel/r3923.html -share/doc/fontconfig/fontconfig-devel/r3948.html -share/doc/fontconfig/fontconfig-devel/r397.html -share/doc/fontconfig/fontconfig-devel/r3973.html -share/doc/fontconfig/fontconfig-devel/r3999.html -share/doc/fontconfig/fontconfig-devel/r4021.html -share/doc/fontconfig/fontconfig-devel/r4043.html -share/doc/fontconfig/fontconfig-devel/r4065.html -share/doc/fontconfig/fontconfig-devel/r4090.html -share/doc/fontconfig/fontconfig-devel/r4119.html -share/doc/fontconfig/fontconfig-devel/r4144.html -share/doc/fontconfig/fontconfig-devel/r4176.html -share/doc/fontconfig/fontconfig-devel/r418.html -share/doc/fontconfig/fontconfig-devel/r4209.html -share/doc/fontconfig/fontconfig-devel/r4245.html -share/doc/fontconfig/fontconfig-devel/r4267.html -share/doc/fontconfig/fontconfig-devel/r4289.html -share/doc/fontconfig/fontconfig-devel/r4311.html -share/doc/fontconfig/fontconfig-devel/r4334.html -share/doc/fontconfig/fontconfig-devel/r4356.html -share/doc/fontconfig/fontconfig-devel/r4380.html -share/doc/fontconfig/fontconfig-devel/r4405.html -share/doc/fontconfig/fontconfig-devel/r4430.html -share/doc/fontconfig/fontconfig-devel/r4457.html -share/doc/fontconfig/fontconfig-devel/r446.html -share/doc/fontconfig/fontconfig-devel/r4484.html -share/doc/fontconfig/fontconfig-devel/r4509.html -share/doc/fontconfig/fontconfig-devel/r4530.html -share/doc/fontconfig/fontconfig-devel/r4552.html -share/doc/fontconfig/fontconfig-devel/r475.html -share/doc/fontconfig/fontconfig-devel/r570.html -share/doc/fontconfig/fontconfig-devel/r600.html -share/doc/fontconfig/fontconfig-devel/r707.html -share/doc/fontconfig/fontconfig-devel/r759.html -share/doc/fontconfig/fontconfig-devel/r782.html -share/doc/fontconfig/fontconfig-devel/r807.html -share/doc/fontconfig/fontconfig-devel/r828.html -share/doc/fontconfig/fontconfig-devel/r856.html -share/doc/fontconfig/fontconfig-devel/r878.html -share/doc/fontconfig/fontconfig-devel/r902.html -share/doc/fontconfig/fontconfig-devel/r923.html -share/doc/fontconfig/fontconfig-devel/r944.html -share/doc/fontconfig/fontconfig-devel/r967.html -share/doc/fontconfig/fontconfig-devel/r999.html +share/doc/fontconfig/fontconfig-devel/fcatomiccreate.html +share/doc/fontconfig/fontconfig-devel/fcatomicdeletenew.html +share/doc/fontconfig/fontconfig-devel/fcatomicdestroy.html +share/doc/fontconfig/fontconfig-devel/fcatomiclock.html +share/doc/fontconfig/fontconfig-devel/fcatomicnewfile.html +share/doc/fontconfig/fontconfig-devel/fcatomicorigfile.html +share/doc/fontconfig/fontconfig-devel/fcatomicreplaceorig.html +share/doc/fontconfig/fontconfig-devel/fcatomicunlock.html +share/doc/fontconfig/fontconfig-devel/fcblanksadd.html +share/doc/fontconfig/fontconfig-devel/fcblankscreate.html +share/doc/fontconfig/fontconfig-devel/fcblanksdestroy.html +share/doc/fontconfig/fontconfig-devel/fcblanksismember.html +share/doc/fontconfig/fontconfig-devel/fccachecopyset.html +share/doc/fontconfig/fontconfig-devel/fccachedir.html +share/doc/fontconfig/fontconfig-devel/fccachenumfont.html +share/doc/fontconfig/fontconfig-devel/fccachenumsubdir.html +share/doc/fontconfig/fontconfig-devel/fccachesubdir.html +share/doc/fontconfig/fontconfig-devel/fccharsetaddchar.html +share/doc/fontconfig/fontconfig-devel/fccharsetcopy.html +share/doc/fontconfig/fontconfig-devel/fccharsetcount.html +share/doc/fontconfig/fontconfig-devel/fccharsetcoverage.html +share/doc/fontconfig/fontconfig-devel/fccharsetcreate.html +share/doc/fontconfig/fontconfig-devel/fccharsetdestroy.html +share/doc/fontconfig/fontconfig-devel/fccharsetequal.html +share/doc/fontconfig/fontconfig-devel/fccharsetfirstpage.html +share/doc/fontconfig/fontconfig-devel/fccharsethaschar.html +share/doc/fontconfig/fontconfig-devel/fccharsetintersect.html +share/doc/fontconfig/fontconfig-devel/fccharsetintersectcount.html +share/doc/fontconfig/fontconfig-devel/fccharsetissubset.html +share/doc/fontconfig/fontconfig-devel/fccharsetmerge.html +share/doc/fontconfig/fontconfig-devel/fccharsetnew.html +share/doc/fontconfig/fontconfig-devel/fccharsetnextpage.html +share/doc/fontconfig/fontconfig-devel/fccharsetsubtract.html +share/doc/fontconfig/fontconfig-devel/fccharsetsubtractcount.html +share/doc/fontconfig/fontconfig-devel/fccharsetunion.html +share/doc/fontconfig/fontconfig-devel/fcconfigappfontadddir.html +share/doc/fontconfig/fontconfig-devel/fcconfigappfontaddfile.html +share/doc/fontconfig/fontconfig-devel/fcconfigappfontclear.html +share/doc/fontconfig/fontconfig-devel/fcconfigbuildfonts.html +share/doc/fontconfig/fontconfig-devel/fcconfigcreate.html +share/doc/fontconfig/fontconfig-devel/fcconfigdestroy.html +share/doc/fontconfig/fontconfig-devel/fcconfigenablehome.html +share/doc/fontconfig/fontconfig-devel/fcconfigfilename.html +share/doc/fontconfig/fontconfig-devel/fcconfiggetblanks.html +share/doc/fontconfig/fontconfig-devel/fcconfiggetcache.html +share/doc/fontconfig/fontconfig-devel/fcconfiggetcachedirs.html +share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigdirs.html +share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigfiles.html +share/doc/fontconfig/fontconfig-devel/fcconfiggetcurrent.html +share/doc/fontconfig/fontconfig-devel/fcconfiggetfontdirs.html +share/doc/fontconfig/fontconfig-devel/fcconfiggetfonts.html +share/doc/fontconfig/fontconfig-devel/fcconfiggetrescaninterval.html +share/doc/fontconfig/fontconfig-devel/fcconfighome.html +share/doc/fontconfig/fontconfig-devel/fcconfigparseandload.html +share/doc/fontconfig/fontconfig-devel/fcconfigreference.html +share/doc/fontconfig/fontconfig-devel/fcconfigsetcurrent.html +share/doc/fontconfig/fontconfig-devel/fcconfigsetrescaninterval.html +share/doc/fontconfig/fontconfig-devel/fcconfigsubstitute.html +share/doc/fontconfig/fontconfig-devel/fcconfigsubstitutewithpat.html +share/doc/fontconfig/fontconfig-devel/fcconfiguptodate.html +share/doc/fontconfig/fontconfig-devel/fcdefaultsubstitute.html +share/doc/fontconfig/fontconfig-devel/fcdircacheload.html +share/doc/fontconfig/fontconfig-devel/fcdircacheloadfile.html +share/doc/fontconfig/fontconfig-devel/fcdircacheread.html +share/doc/fontconfig/fontconfig-devel/fcdircacheunlink.html +share/doc/fontconfig/fontconfig-devel/fcdircacheunload.html +share/doc/fontconfig/fontconfig-devel/fcdircachevalid.html +share/doc/fontconfig/fontconfig-devel/fcdirsave.html +share/doc/fontconfig/fontconfig-devel/fcdirscan.html +share/doc/fontconfig/fontconfig-devel/fcfileisdir.html +share/doc/fontconfig/fontconfig-devel/fcfilescan.html +share/doc/fontconfig/fontconfig-devel/fcfini.html +share/doc/fontconfig/fontconfig-devel/fcfontlist.html +share/doc/fontconfig/fontconfig-devel/fcfontmatch.html +share/doc/fontconfig/fontconfig-devel/fcfontrenderprepare.html +share/doc/fontconfig/fontconfig-devel/fcfontsetadd.html +share/doc/fontconfig/fontconfig-devel/fcfontsetcreate.html +share/doc/fontconfig/fontconfig-devel/fcfontsetdestroy.html +share/doc/fontconfig/fontconfig-devel/fcfontsetlist.html +share/doc/fontconfig/fontconfig-devel/fcfontsetmatch.html +share/doc/fontconfig/fontconfig-devel/fcfontsetprint.html +share/doc/fontconfig/fontconfig-devel/fcfontsetsort.html +share/doc/fontconfig/fontconfig-devel/fcfontsetsortdestroy.html +share/doc/fontconfig/fontconfig-devel/fcfontsort.html +share/doc/fontconfig/fontconfig-devel/fcfreetypecharindex.html +share/doc/fontconfig/fontconfig-devel/fcfreetypecharset.html +share/doc/fontconfig/fontconfig-devel/fcfreetypecharsetandspacing.html +share/doc/fontconfig/fontconfig-devel/fcfreetypequery.html +share/doc/fontconfig/fontconfig-devel/fcfreetypequeryface.html +share/doc/fontconfig/fontconfig-devel/fcgetlangs.html +share/doc/fontconfig/fontconfig-devel/fcgetversion.html +share/doc/fontconfig/fontconfig-devel/fcinit.html +share/doc/fontconfig/fontconfig-devel/fcinitbringuptodate.html +share/doc/fontconfig/fontconfig-devel/fcinitloadconfig.html +share/doc/fontconfig/fontconfig-devel/fcinitloadconfigandfonts.html +share/doc/fontconfig/fontconfig-devel/fcinitreinitialize.html +share/doc/fontconfig/fontconfig-devel/fcislower.html +share/doc/fontconfig/fontconfig-devel/fcisupper.html +share/doc/fontconfig/fontconfig-devel/fclanggetcharset.html +share/doc/fontconfig/fontconfig-devel/fclangsetadd.html +share/doc/fontconfig/fontconfig-devel/fclangsetcompare.html +share/doc/fontconfig/fontconfig-devel/fclangsetcontains.html +share/doc/fontconfig/fontconfig-devel/fclangsetcopy.html +share/doc/fontconfig/fontconfig-devel/fclangsetcreate.html +share/doc/fontconfig/fontconfig-devel/fclangsetdestroy.html +share/doc/fontconfig/fontconfig-devel/fclangsetequal.html +share/doc/fontconfig/fontconfig-devel/fclangsetgetlangs.html +share/doc/fontconfig/fontconfig-devel/fclangsethash.html +share/doc/fontconfig/fontconfig-devel/fclangsethaslang.html +share/doc/fontconfig/fontconfig-devel/fcmatrixcopy.html +share/doc/fontconfig/fontconfig-devel/fcmatrixequal.html +share/doc/fontconfig/fontconfig-devel/fcmatrixinit.html +share/doc/fontconfig/fontconfig-devel/fcmatrixmultiply.html +share/doc/fontconfig/fontconfig-devel/fcmatrixrotate.html +share/doc/fontconfig/fontconfig-devel/fcmatrixscale.html +share/doc/fontconfig/fontconfig-devel/fcmatrixshear.html +share/doc/fontconfig/fontconfig-devel/fcnameconstant.html +share/doc/fontconfig/fontconfig-devel/fcnamegetconstant.html +share/doc/fontconfig/fontconfig-devel/fcnamegetobjecttype.html +share/doc/fontconfig/fontconfig-devel/fcnameparse.html +share/doc/fontconfig/fontconfig-devel/fcnameregisterconstants.html +share/doc/fontconfig/fontconfig-devel/fcnameregisterobjecttypes.html +share/doc/fontconfig/fontconfig-devel/fcnameunparse.html +share/doc/fontconfig/fontconfig-devel/fcnameunregisterconstants.html +share/doc/fontconfig/fontconfig-devel/fcnameunregisterobjecttypes.html +share/doc/fontconfig/fontconfig-devel/fcobjectsetadd.html +share/doc/fontconfig/fontconfig-devel/fcobjectsetbuild.html +share/doc/fontconfig/fontconfig-devel/fcobjectsetcreate.html +share/doc/fontconfig/fontconfig-devel/fcobjectsetdestroy.html +share/doc/fontconfig/fontconfig-devel/fcpatternadd-type.html +share/doc/fontconfig/fontconfig-devel/fcpatternadd.html +share/doc/fontconfig/fontconfig-devel/fcpatternaddweak.html +share/doc/fontconfig/fontconfig-devel/fcpatternbuild.html +share/doc/fontconfig/fontconfig-devel/fcpatterncreate.html +share/doc/fontconfig/fontconfig-devel/fcpatterndel.html +share/doc/fontconfig/fontconfig-devel/fcpatterndestroy.html +share/doc/fontconfig/fontconfig-devel/fcpatternduplicate.html +share/doc/fontconfig/fontconfig-devel/fcpatternequal.html +share/doc/fontconfig/fontconfig-devel/fcpatternequalsubset.html +share/doc/fontconfig/fontconfig-devel/fcpatternfilter.html +share/doc/fontconfig/fontconfig-devel/fcpatternformat.html +share/doc/fontconfig/fontconfig-devel/fcpatternget-type.html +share/doc/fontconfig/fontconfig-devel/fcpatternget.html +share/doc/fontconfig/fontconfig-devel/fcpatternhash.html +share/doc/fontconfig/fontconfig-devel/fcpatternprint.html +share/doc/fontconfig/fontconfig-devel/fcpatternreference.html +share/doc/fontconfig/fontconfig-devel/fcpatternremove.html +share/doc/fontconfig/fontconfig-devel/fcstrbasename.html +share/doc/fontconfig/fontconfig-devel/fcstrcmp.html +share/doc/fontconfig/fontconfig-devel/fcstrcmpignorecase.html +share/doc/fontconfig/fontconfig-devel/fcstrcopy.html +share/doc/fontconfig/fontconfig-devel/fcstrcopyfilename.html +share/doc/fontconfig/fontconfig-devel/fcstrdirname.html +share/doc/fontconfig/fontconfig-devel/fcstrdowncase.html +share/doc/fontconfig/fontconfig-devel/fcstrfree.html +share/doc/fontconfig/fontconfig-devel/fcstrlistcreate.html +share/doc/fontconfig/fontconfig-devel/fcstrlistdone.html +share/doc/fontconfig/fontconfig-devel/fcstrlistnext.html +share/doc/fontconfig/fontconfig-devel/fcstrplus.html +share/doc/fontconfig/fontconfig-devel/fcstrsetadd.html +share/doc/fontconfig/fontconfig-devel/fcstrsetaddfilename.html +share/doc/fontconfig/fontconfig-devel/fcstrsetcreate.html +share/doc/fontconfig/fontconfig-devel/fcstrsetdel.html +share/doc/fontconfig/fontconfig-devel/fcstrsetdestroy.html +share/doc/fontconfig/fontconfig-devel/fcstrsetequal.html +share/doc/fontconfig/fontconfig-devel/fcstrsetmember.html +share/doc/fontconfig/fontconfig-devel/fcstrstr.html +share/doc/fontconfig/fontconfig-devel/fcstrstrignorecase.html +share/doc/fontconfig/fontconfig-devel/fctolower.html +share/doc/fontconfig/fontconfig-devel/fcucs4toutf8.html +share/doc/fontconfig/fontconfig-devel/fcutf16len.html +share/doc/fontconfig/fontconfig-devel/fcutf16toucs4.html +share/doc/fontconfig/fontconfig-devel/fcutf8len.html +share/doc/fontconfig/fontconfig-devel/fcutf8toucs4.html +share/doc/fontconfig/fontconfig-devel/fcvaluedestroy.html +share/doc/fontconfig/fontconfig-devel/fcvalueequal.html +share/doc/fontconfig/fontconfig-devel/fcvalueprint.html +share/doc/fontconfig/fontconfig-devel/fcvaluesave.html +share/doc/fontconfig/fontconfig-devel/ln12.html +share/doc/fontconfig/fontconfig-devel/t1.html share/doc/fontconfig/fontconfig-devel/x102.html share/doc/fontconfig/fontconfig-devel/x19.html share/doc/fontconfig/fontconfig-devel/x31.html diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo index 472d1bf44e3..f228fa837fd 100644 --- a/fonts/fontconfig/distinfo +++ b/fonts/fontconfig/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.28 2008/06/21 18:47:44 wiz Exp $ +$NetBSD: distinfo,v 1.29 2009/07/18 13:20:00 wiz Exp $ -SHA1 (fontconfig-2.6.0.tar.gz) = 93752566b8327485b153bd156049614f779b4c57 -RMD160 (fontconfig-2.6.0.tar.gz) = 2fea7fa3fe1757b58ce53c4225b9f8e6ec7507bf -Size (fontconfig-2.6.0.tar.gz) = 1403857 bytes -SHA1 (patch-aa) = dcba787c07758c9d20945338be7b4f9bb5b439c2 -SHA1 (patch-ac) = e19d653334526630cf002d292ede4dd4d737567e +SHA1 (fontconfig-2.7.0.tar.gz) = 9732f9ed2e17cbc9b85514046b8b77b8ad0380db +RMD160 (fontconfig-2.7.0.tar.gz) = 92f755c1054c9e6109abe342ebe4a8629663fe1e +Size (fontconfig-2.7.0.tar.gz) = 1539834 bytes +SHA1 (patch-aa) = e49e03606abbf51231b1ced8cdaa4b1a2aa4940f +SHA1 (patch-ac) = 7745afc09fbd463c184bfb783acf8d30f2effbf4 SHA1 (patch-ae) = 7348e85cfa2d0b97649b4648346e6ea906b02769 SHA1 (patch-ca) = 8d3abf96af648a44494afad8495635fceb6098ec -SHA1 (patch-cb) = 62a15e26a4a767eaa5d0cf96304fdf5dd9652a4b +SHA1 (patch-cb) = 4816c914da277ccf826bdb8c82fec6de04e49a1d diff --git a/fonts/fontconfig/patches/patch-aa b/fonts/fontconfig/patches/patch-aa index 4f25e6aa4f5..8dc0b5d4a71 100644 --- a/fonts/fontconfig/patches/patch-aa +++ b/fonts/fontconfig/patches/patch-aa @@ -1,18 +1,18 @@ -$NetBSD: patch-aa,v 1.12 2007/11/30 22:31:16 wiz Exp $ +$NetBSD: patch-aa,v 1.13 2009/07/18 13:20:01 wiz Exp $ ---- Makefile.in.orig 2007-11-14 02:57:09.000000000 +0000 +--- Makefile.in.orig 2009-06-24 19:05:28.000000000 +0000 +++ Makefile.in -@@ -259,7 +259,7 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +@@ -299,7 +299,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ -SUBDIRS = fontconfig fc-case fc-lang fc-glyphname fc-arch src \ +SUBDIRS = fontconfig fc-case fc-lang fc-glyphname src \ - fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test + fc-cache fc-cat fc-list fc-match fc-query fc-scan conf.d $(DOCSRC) test EXTRA_DIST = fontconfig.pc.in fonts.conf.in fonts.dtd \ -@@ -275,10 +275,11 @@ MAINTAINERCLEANFILES = $(srcdir)/aclocal - -type f -name Makefile.in -print` ChangeLog +@@ -316,10 +316,11 @@ MAINTAINERCLEANFILES = $(srcdir)/aclocal + -type f -name Makefile.in -print` $(srcdir)/ChangeLog pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = fontconfig.pc -configdir = $(CONFDIR) @@ -24,10 +24,10 @@ $NetBSD: patch-aa,v 1.12 2007/11/30 22:31:16 wiz Exp $ all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive -@@ -783,7 +784,8 @@ ChangeLog: - .PHONY: ChangeLog +@@ -896,7 +897,8 @@ fonts.conf: fonts.conf.in Makefile + mv $@.tmp $@ - install-data-local: + install-data-local: fonts.conf - $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir) + $(mkinstalldirs) $(DESTDIR)$(configdir) + $(mkinstalldirs) $(DESTDIR)$(fc_cachedir) diff --git a/fonts/fontconfig/patches/patch-ac b/fonts/fontconfig/patches/patch-ac index 394076d0de8..f62e8480e89 100644 --- a/fonts/fontconfig/patches/patch-ac +++ b/fonts/fontconfig/patches/patch-ac @@ -1,17 +1,17 @@ -$NetBSD: patch-ac,v 1.9 2008/06/21 18:47:44 wiz Exp $ +$NetBSD: patch-ac,v 1.10 2009/07/18 13:20:01 wiz Exp $ ---- conf.d/Makefile.in.orig 2008-06-01 02:30:57.000000000 +0000 +--- conf.d/Makefile.in.orig 2009-06-24 19:05:23.000000000 +0000 +++ conf.d/Makefile.in -@@ -236,7 +236,7 @@ program_transform_name = @program_transf - psdir = @psdir@ +@@ -237,7 +237,7 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ -sysconfdir = @sysconfdir@ +sysconfdir = $(prefix)/share/examples/fontconfig target_alias = @target_alias@ - DOC_FILES = \ - README -@@ -288,8 +288,8 @@ CONF_LINKS = \ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ +@@ -292,8 +292,8 @@ CONF_LINKS = \ EXTRA_DIST = $(CONF_FILES) $(DOC_FILES) configdir = $(CONFDIR) diff --git a/fonts/fontconfig/patches/patch-cb b/fonts/fontconfig/patches/patch-cb index e414e12a538..03e08124041 100644 --- a/fonts/fontconfig/patches/patch-cb +++ b/fonts/fontconfig/patches/patch-cb @@ -1,24 +1,32 @@ -$NetBSD: patch-cb,v 1.3 2008/06/21 18:47:44 wiz Exp $ +$NetBSD: patch-cb,v 1.4 2009/07/18 13:20:01 wiz Exp $ ---- configure.orig 2008-06-01 02:31:02.000000000 +0000 +--- configure.orig 2009-06-24 19:05:31.000000000 +0000 +++ configure -@@ -893,7 +893,6 @@ CROSS_COMPILING_TRUE - CROSS_COMPILING_FALSE - CC_FOR_BUILD - EXEEXT_FOR_BUILD --ARCHITECTURE - ICONV_LIBS - ft_config +@@ -815,7 +815,6 @@ FREETYPE_CFLAGS FREETYPE_LIBS -@@ -1539,7 +1538,6 @@ Optional Packages: + ft_config + ICONV_LIBS +-ARCHITECTURE + EXEEXT_FOR_BUILD + CC_FOR_BUILD + CROSS_COMPILING_FALSE +@@ -953,7 +952,6 @@ with_pic + enable_fast_install + with_gnu_ld + enable_libtool_lock +-with_arch + with_freetype_config + with_expat + with_expat_includes +@@ -1624,7 +1622,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] - --with-tags[=TAGS] include additional configurations [automatic] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-arch=ARCH Force architecture to ARCH --with-freetype-config=PROG Use FreeType configuration program PROG --with-expat=DIR Use Expat in DIR --with-expat-includes=DIR Use Expat includes in DIR -@@ -20587,31 +20585,6 @@ echo "${ECHO_T}$EXEEXT_FOR_BUILD" >&6; } +@@ -11933,31 +11930,6 @@ $as_echo "$EXEEXT_FOR_BUILD" >&6; } @@ -34,9 +42,9 @@ $NetBSD: patch-cb,v 1.3 2008/06/21 18:47:44 wiz Exp $ -if test $cross_compiling = yes; then - case "$arch" in - auto) -- { { echo "$as_me:$LINENO: error: Cannot autodetect architecture in cross compile environment +- { { $as_echo "$as_me:$LINENO: error: Cannot autodetect architecture in cross compile environment - Use --with-arch=ARCH to specify architecture" >&5 --echo "$as_me: error: Cannot autodetect architecture in cross compile environment +-$as_echo "$as_me: error: Cannot autodetect architecture in cross compile environment - Use --with-arch=ARCH to specify architecture" >&2;} - { (exit 1); exit 1; }; } - ;; @@ -50,16 +58,16 @@ $NetBSD: patch-cb,v 1.3 2008/06/21 18:47:44 wiz Exp $ # Checks for header files. -@@ -23577,7 +23550,7 @@ fi +@@ -15026,7 +14998,7 @@ fi --ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-case/Makefile fc-arch/Makefile src/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fonts.conf fontconfig-zip" -+ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-case/Makefile fc-arch/Makefile fc-arch/fcarch.h src/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fonts.conf fontconfig-zip" +-ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-case/Makefile fc-arch/Makefile src/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile fc-query/Makefile fc-scan/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip" ++ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-case/Makefile fc-arch/Makefile fc-arch/fcarch.h src/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile fc-query/Makefile fc-scan/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure -@@ -24212,6 +24185,7 @@ do +@@ -15962,6 +15934,7 @@ do "fc-glyphname/Makefile") CONFIG_FILES="$CONFIG_FILES fc-glyphname/Makefile" ;; "fc-case/Makefile") CONFIG_FILES="$CONFIG_FILES fc-case/Makefile" ;; "fc-arch/Makefile") CONFIG_FILES="$CONFIG_FILES fc-arch/Makefile" ;; @@ -67,20 +75,3 @@ $NetBSD: patch-cb,v 1.3 2008/06/21 18:47:44 wiz Exp $ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "conf.d/Makefile") CONFIG_FILES="$CONFIG_FILES conf.d/Makefile" ;; "fc-cache/Makefile") CONFIG_FILES="$CONFIG_FILES fc-cache/Makefile" ;; -@@ -24454,7 +24428,6 @@ CROSS_COMPILING_TRUE!$CROSS_COMPILING_TR - CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim - CC_FOR_BUILD!$CC_FOR_BUILD$ac_delim - EXEEXT_FOR_BUILD!$EXEEXT_FOR_BUILD$ac_delim --ARCHITECTURE!$ARCHITECTURE$ac_delim - ICONV_LIBS!$ICONV_LIBS$ac_delim - ft_config!$ft_config$ac_delim - FREETYPE_LIBS!$FREETYPE_LIBS$ac_delim -@@ -24487,7 +24460,7 @@ LIBOBJS!$LIBOBJS$ac_delim - LTLIBOBJS!$LTLIBOBJS$ac_delim - _ACEOF - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |