diff options
author | wiz <wiz> | 2008-06-21 18:47:44 +0000 |
---|---|---|
committer | wiz <wiz> | 2008-06-21 18:47:44 +0000 |
commit | 102413f204c87841b2fed785f28331c5c6f4787c (patch) | |
tree | 7c52e20788b10c8cca88cf8f6a548f873e905589 | |
parent | 616af345e59b64ec9f2a15dcd6c0558fcdc0c5f9 (diff) | |
download | pkgsrc-102413f204c87841b2fed785f28331c5c6f4787c.tar.gz |
Update to 2.6.0:
Major changes since 2.5.0:
* Handle bitmap-only TTF files that do not have a GLYF table
* Ignore point size and DPI for bitmap (PCF) fonts.
* Add fantasy and cursive generic families
* Merge Fedora and Mandriva configuration options
* Build fixes for cross compile and Win32 platforms
-rw-r--r-- | fonts/fontconfig/Makefile | 4 | ||||
-rw-r--r-- | fonts/fontconfig/PLIST | 7 | ||||
-rw-r--r-- | fonts/fontconfig/distinfo | 12 | ||||
-rw-r--r-- | fonts/fontconfig/patches/patch-ac | 16 | ||||
-rw-r--r-- | fonts/fontconfig/patches/patch-cb | 22 |
5 files changed, 32 insertions, 29 deletions
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile index 11f803bd67c..3dadbe88331 100644 --- a/fonts/fontconfig/Makefile +++ b/fonts/fontconfig/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.64 2007/11/30 22:31:15 wiz Exp $ +# $NetBSD: Makefile,v 1.65 2008/06/21 18:47:44 wiz Exp $ -DISTNAME= fontconfig-2.5.0 +DISTNAME= fontconfig-2.6.0 CATEGORIES= fonts MASTER_SITES= http://www.fontconfig.org/release/ diff --git a/fonts/fontconfig/PLIST b/fonts/fontconfig/PLIST index 6a9ee403dd5..48d0eaad5b6 100644 --- a/fonts/fontconfig/PLIST +++ b/fonts/fontconfig/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2007/11/30 22:31:16 wiz Exp $ +@comment $NetBSD: PLIST,v 1.16 2008/06/21 18:47:44 wiz Exp $ bin/fc-cache bin/fc-cat bin/fc-list @@ -159,6 +159,7 @@ man/man3/FcStrCmp.3 man/man3/FcStrCmpIgnoreCase.3 man/man3/FcStrCopy.3 man/man3/FcStrCopyFilename.3 +man/man3/FcStrDirname.3 man/man3/FcStrDowncase.3 man/man3/FcStrFree.3 man/man3/FcStrListCreate.3 @@ -345,6 +346,7 @@ 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 @@ -385,13 +387,13 @@ share/examples/fontconfig/conf.avail/50-user.conf share/examples/fontconfig/conf.avail/51-local.conf share/examples/fontconfig/conf.avail/60-latin.conf share/examples/fontconfig/conf.avail/65-fonts-persian.conf +share/examples/fontconfig/conf.avail/65-khmer.conf share/examples/fontconfig/conf.avail/65-nonlatin.conf share/examples/fontconfig/conf.avail/69-unifont.conf share/examples/fontconfig/conf.avail/70-no-bitmaps.conf share/examples/fontconfig/conf.avail/70-yes-bitmaps.conf share/examples/fontconfig/conf.avail/80-delicious.conf share/examples/fontconfig/conf.avail/90-synthetic.conf -share/examples/fontconfig/conf.avail/README share/examples/fontconfig/conf.d/20-fix-globaladvance.conf share/examples/fontconfig/conf.d/20-unhint-small-vera.conf share/examples/fontconfig/conf.d/30-metric-aliases.conf @@ -407,6 +409,7 @@ share/examples/fontconfig/conf.d/65-nonlatin.conf share/examples/fontconfig/conf.d/69-unifont.conf share/examples/fontconfig/conf.d/80-delicious.conf share/examples/fontconfig/conf.d/90-synthetic.conf +share/examples/fontconfig/conf.d/README share/examples/fontconfig/fonts.conf share/examples/fontconfig/fonts.dtd @dirrm share/examples/fontconfig/conf.d diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo index 03b225731e6..472d1bf44e3 100644 --- a/fonts/fontconfig/distinfo +++ b/fonts/fontconfig/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.27 2007/11/30 22:31:16 wiz Exp $ +$NetBSD: distinfo,v 1.28 2008/06/21 18:47:44 wiz Exp $ -SHA1 (fontconfig-2.5.0.tar.gz) = 9ffad5f5eb2c5dd277bfed1cafc6e62aa0172842 -RMD160 (fontconfig-2.5.0.tar.gz) = 2c61ba3adc49aa5dd4eb081e13a849cc1d62d9da -Size (fontconfig-2.5.0.tar.gz) = 1385058 bytes +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) = 759ec3251ba24b98db646a24e9a2ce7195ecc00e +SHA1 (patch-ac) = e19d653334526630cf002d292ede4dd4d737567e SHA1 (patch-ae) = 7348e85cfa2d0b97649b4648346e6ea906b02769 SHA1 (patch-ca) = 8d3abf96af648a44494afad8495635fceb6098ec -SHA1 (patch-cb) = e9988f401b07d338bf314b2df9b07f11e296d37c +SHA1 (patch-cb) = 62a15e26a4a767eaa5d0cf96304fdf5dd9652a4b diff --git a/fonts/fontconfig/patches/patch-ac b/fonts/fontconfig/patches/patch-ac index f98f1bede8e..394076d0de8 100644 --- a/fonts/fontconfig/patches/patch-ac +++ b/fonts/fontconfig/patches/patch-ac @@ -1,24 +1,24 @@ -$NetBSD: patch-ac,v 1.8 2007/11/30 22:31:16 wiz Exp $ +$NetBSD: patch-ac,v 1.9 2008/06/21 18:47:44 wiz Exp $ ---- conf.d/Makefile.in.orig 2007-11-14 02:57:06.000000000 +0000 +--- conf.d/Makefile.in.orig 2008-06-01 02:30:57.000000000 +0000 +++ conf.d/Makefile.in -@@ -229,7 +229,7 @@ program_transform_name = @program_transf +@@ -236,7 +236,7 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ +sysconfdir = $(prefix)/share/examples/fontconfig target_alias = @target_alias@ - CONF_FILES = \ - README \ -@@ -278,8 +278,8 @@ CONF_LINKS = \ + DOC_FILES = \ + README +@@ -288,8 +288,8 @@ CONF_LINKS = \ - EXTRA_DIST = $(CONF_FILES) + EXTRA_DIST = $(CONF_FILES) $(DOC_FILES) configdir = $(CONFDIR) -confavaildir = $(configdir)/conf.avail -confddir = $(configdir)/conf.d +confavaildir = $(sysconfdir)/conf.avail +confddir = $(sysconfdir)/conf.d confavail_DATA = $(CONF_FILES) + confd_DATA = $(DOC_FILES) all: all-am - diff --git a/fonts/fontconfig/patches/patch-cb b/fonts/fontconfig/patches/patch-cb index 62d839d172b..e414e12a538 100644 --- a/fonts/fontconfig/patches/patch-cb +++ b/fonts/fontconfig/patches/patch-cb @@ -1,8 +1,8 @@ -$NetBSD: patch-cb,v 1.2 2007/11/30 22:31:17 wiz Exp $ +$NetBSD: patch-cb,v 1.3 2008/06/21 18:47:44 wiz Exp $ ---- configure.orig 2007-11-14 02:57:10.000000000 +0000 +--- configure.orig 2008-06-01 02:31:02.000000000 +0000 +++ configure -@@ -888,7 +888,6 @@ CROSS_COMPILING_TRUE +@@ -893,7 +893,6 @@ CROSS_COMPILING_TRUE CROSS_COMPILING_FALSE CC_FOR_BUILD EXEEXT_FOR_BUILD @@ -10,7 +10,7 @@ $NetBSD: patch-cb,v 1.2 2007/11/30 22:31:17 wiz Exp $ ICONV_LIBS ft_config FREETYPE_LIBS -@@ -1534,7 +1533,6 @@ Optional Packages: +@@ -1539,7 +1538,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-tags[=TAGS] include additional configurations [automatic] @@ -18,7 +18,7 @@ $NetBSD: patch-cb,v 1.2 2007/11/30 22:31:17 wiz Exp $ --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 -@@ -20043,31 +20041,6 @@ echo "${ECHO_T}$EXEEXT_FOR_BUILD" >&6; } +@@ -20587,31 +20585,6 @@ echo "${ECHO_T}$EXEEXT_FOR_BUILD" >&6; } @@ -50,7 +50,7 @@ $NetBSD: patch-cb,v 1.2 2007/11/30 22:31:17 wiz Exp $ # Checks for header files. -@@ -23033,7 +23006,7 @@ fi +@@ -23577,7 +23550,7 @@ fi @@ -59,7 +59,7 @@ $NetBSD: patch-cb,v 1.2 2007/11/30 22:31:17 wiz Exp $ cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure -@@ -23668,6 +23641,7 @@ do +@@ -24212,6 +24185,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,7 +67,7 @@ $NetBSD: patch-cb,v 1.2 2007/11/30 22:31:17 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" ;; -@@ -23905,7 +23879,6 @@ CROSS_COMPILING_TRUE!$CROSS_COMPILING_TR +@@ -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 @@ -75,12 +75,12 @@ $NetBSD: patch-cb,v 1.2 2007/11/30 22:31:17 wiz Exp $ ICONV_LIBS!$ICONV_LIBS$ac_delim ft_config!$ft_config$ac_delim FREETYPE_LIBS!$FREETYPE_LIBS$ac_delim -@@ -23938,7 +23911,7 @@ LIBOBJS!$LIBOBJS$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` = 55; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then +- 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 |