diff options
| -rw-r--r-- | fonts/fontconfig/Makefile | 7 | ||||
| -rw-r--r-- | fonts/fontconfig/PLIST | 5 | ||||
| -rw-r--r-- | fonts/fontconfig/distinfo | 13 | ||||
| -rw-r--r-- | fonts/fontconfig/patches/patch-aa | 6 | ||||
| -rw-r--r-- | fonts/fontconfig/patches/patch-ab | 100 | ||||
| -rw-r--r-- | fonts/fontconfig/patches/patch-ac | 6 |
6 files changed, 21 insertions, 116 deletions
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile index 1f5603818ff..d358bd09f9d 100644 --- a/fonts/fontconfig/Makefile +++ b/fonts/fontconfig/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.38 2005/03/01 23:38:14 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2005/03/22 14:05:54 wiz Exp $ # -DISTNAME= fontconfig-2.3.0 +DISTNAME= fontconfig-2.3.1 CATEGORIES= fonts gnome MASTER_SITES= http://www.fontconfig.org/release/ @@ -45,8 +45,11 @@ EGDIR= ${PREFIX}/share/examples/fontconfig CONF_FILES= ${EGDIR}/fonts.conf ${PKG_SYSCONFDIR}/fonts.conf CONF_FILES+= ${EGDIR}/fonts.dtd ${PKG_SYSCONFDIR}/fonts.dtd MAKE_DIRS+= ${PKG_SYSCONFDIR}/conf.d +CONF_FILES+= ${EGDIR}/conf.d/autohint.conf ${PKG_SYSCONFDIR}/conf.d/autohint.conf CONF_FILES+= ${EGDIR}/conf.d/no-bitmaps.conf ${PKG_SYSCONFDIR}/conf.d/no-bitmaps.conf +CONF_FILES+= ${EGDIR}/conf.d/no-sub-pixel.conf ${PKG_SYSCONFDIR}/conf.d/no-sub-pixel.conf CONF_FILES+= ${EGDIR}/conf.d/sub-pixel.conf ${PKG_SYSCONFDIR}/conf.d/sub-pixel.conf +CONF_FILES+= ${EGDIR}/conf.d/unhinted.conf ${PKG_SYSCONFDIR}/conf.d/unhinted.conf CONF_FILES+= ${EGDIR}/conf.d/yes-bitmaps.conf ${PKG_SYSCONFDIR}/conf.d/yes-bitmaps.conf .include "../../devel/zlib/buildlink3.mk" diff --git a/fonts/fontconfig/PLIST b/fonts/fontconfig/PLIST index 62785688560..6b6491578c9 100644 --- a/fonts/fontconfig/PLIST +++ b/fonts/fontconfig/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2005/03/01 23:39:02 wiz Exp $ +@comment $NetBSD: PLIST,v 1.11 2005/03/22 14:05:54 wiz Exp $ bin/fc-cache bin/fc-list bin/fc-match @@ -274,8 +274,11 @@ share/doc/fontconfig/fontconfig-devel/x93.html share/doc/fontconfig/fontconfig-user.html share/doc/fontconfig/fontconfig-user.pdf share/doc/fontconfig/fontconfig-user.txt +share/examples/fontconfig/conf.d/autohint.conf share/examples/fontconfig/conf.d/no-bitmaps.conf +share/examples/fontconfig/conf.d/no-sub-pixel.conf share/examples/fontconfig/conf.d/sub-pixel.conf +share/examples/fontconfig/conf.d/unhinted.conf share/examples/fontconfig/conf.d/yes-bitmaps.conf share/examples/fontconfig/fonts.conf share/examples/fontconfig/fonts.dtd diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo index 118447c98c3..84c780e68ec 100644 --- a/fonts/fontconfig/distinfo +++ b/fonts/fontconfig/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.12 2005/03/01 23:38:14 wiz Exp $ +$NetBSD: distinfo,v 1.13 2005/03/22 14:05:54 wiz Exp $ -SHA1 (fontconfig-2.3.0.tar.gz) = f5ed812fc1ba2ea6ee36da4976d8dd44c361b956 -RMD160 (fontconfig-2.3.0.tar.gz) = 026f55789c0a56ec77322ca587be906c9aa07b1f -Size (fontconfig-2.3.0.tar.gz) = 940705 bytes -SHA1 (patch-aa) = 45cc9535d2ca35de6ed9f651776d6d2731867bba -SHA1 (patch-ab) = 5609c3b19c8ef5b57d7ba932b91da09b9e47b3a3 -SHA1 (patch-ac) = e8435f0287eecce1a5d665b862c393dd3ba2500a +SHA1 (fontconfig-2.3.1.tar.gz) = f429ee221a2e6cb76eda4b85c07c853990a93d94 +RMD160 (fontconfig-2.3.1.tar.gz) = 93bf6234958dc9ec7488e1e622f9d97450976af3 +Size (fontconfig-2.3.1.tar.gz) = 962724 bytes +SHA1 (patch-aa) = 4f39b7726c11cc9d91fba0c840f26404702c0353 +SHA1 (patch-ac) = df8b145c38476e5caa1f4636be4eb56654bd11d0 diff --git a/fonts/fontconfig/patches/patch-aa b/fonts/fontconfig/patches/patch-aa index 2ca7f9a2484..9a6a605d69e 100644 --- a/fonts/fontconfig/patches/patch-aa +++ b/fonts/fontconfig/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.7 2005/02/26 16:39:51 wiz Exp $ +$NetBSD: patch-aa,v 1.8 2005/03/22 14:05:54 wiz Exp $ ---- Makefile.in.orig 2005-01-29 01:43:07.000000000 +0100 +--- Makefile.in.orig 2005-03-09 00:42:10.000000000 +0100 +++ Makefile.in -@@ -213,11 +213,12 @@ EXTRA_DIST = \ +@@ -248,11 +248,12 @@ EXTRA_DIST = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = fontconfig.pc diff --git a/fonts/fontconfig/patches/patch-ab b/fonts/fontconfig/patches/patch-ab deleted file mode 100644 index 9918e3c72fe..00000000000 --- a/fonts/fontconfig/patches/patch-ab +++ /dev/null @@ -1,100 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2005/02/26 16:39:51 wiz Exp $ - ---- doc/Makefile.in.orig 2005-01-29 01:43:08.000000000 +0100 -+++ doc/Makefile.in -@@ -378,6 +378,53 @@ distclean-libtool: - -rm -f libtool - uninstall-info-am: - -+man3dir = $(mandir)/man3 -+install-man3: $(man3_MANS) $(man_MANS) -+ @$(NORMAL_INSTALL) -+ $(mkinstalldirs) $(DESTDIR)$(man3dir) -+ @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ -+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ -+ for i in $$l2; do \ -+ case "$$i" in \ -+ *.3*) list="$$list $$i" ;; \ -+ esac; \ -+ done; \ -+ for i in $$list; do \ -+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ -+ else file=$$i; fi; \ -+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ -+ case "$$ext" in \ -+ 3*) ;; \ -+ *) ext='3' ;; \ -+ esac; \ -+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -+ inst=`echo $$inst | sed -e 's/^.*\///'`; \ -+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -+ echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \ -+ $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \ -+ done -+uninstall-man3: -+ @$(NORMAL_UNINSTALL) -+ @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ -+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ -+ for i in $$l2; do \ -+ case "$$i" in \ -+ *.3*) list="$$list $$i" ;; \ -+ esac; \ -+ done; \ -+ for i in $$list; do \ -+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ -+ case "$$ext" in \ -+ 3*) ;; \ -+ *) ext='5' ;; \ -+ esac; \ -+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -+ inst=`echo $$inst | sed -e 's/^.*\///'`; \ -+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -+ echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \ -+ rm -f $(DESTDIR)$(man3dir)/$$inst; \ -+ done -+ - man5dir = $(mandir)/man5 - install-man5: $(man5_MANS) $(man_MANS) - @$(NORMAL_INSTALL) -@@ -552,7 +599,7 @@ check: check-am - all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) all-local - - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(man5dir) $(DESTDIR)$(docdir) $(DESTDIR)$(htmldocdir) -+ $(mkinstalldirs) $(DESTDIR)$(man3dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(docdir) $(DESTDIR)$(htmldocdir) - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -603,7 +650,7 @@ install-exec-am: - - install-info: install-info-am - --install-man: install-man5 -+install-man: install-man3 install-man5 - - installcheck-am: - -@@ -628,7 +675,7 @@ ps-am: - uninstall-am: uninstall-docDATA uninstall-htmldocDATA uninstall-info-am \ - uninstall-man - --uninstall-man: uninstall-man5 -+uninstall-man: uninstall-man3 uninstall-man5 - - .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ -@@ -637,12 +684,12 @@ uninstall-man: uninstall-man5 - info-am install install-am install-data install-data-am \ - install-docDATA install-exec install-exec-am \ - install-htmldocDATA install-info install-info-am install-man \ -- install-man5 install-strip installcheck installcheck-am \ -+ install-man3 install-man5 install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-docDATA uninstall-htmldocDATA \ -- uninstall-info-am uninstall-man uninstall-man5 -+ uninstall-info-am uninstall-man uninstall-man3 uninstall-man5 - - - @USEDOCBOOK_TRUE@.fncs.sgml: diff --git a/fonts/fontconfig/patches/patch-ac b/fonts/fontconfig/patches/patch-ac index 68faab0bccd..23fc656a686 100644 --- a/fonts/fontconfig/patches/patch-ac +++ b/fonts/fontconfig/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.5 2005/03/01 23:38:27 wiz Exp $ +$NetBSD: patch-ac,v 1.6 2005/03/22 14:05:54 wiz Exp $ ---- conf.d/Makefile.in.orig 2005-03-01 21:48:52.000000000 +0100 +--- conf.d/Makefile.in.orig 2005-03-09 00:42:10.000000000 +0100 +++ conf.d/Makefile.in @@ -195,7 +195,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.5 2005/03/01 23:38:27 wiz Exp $ target_alias = @target_alias@ CONF_FILES = \ -@@ -207,7 +207,7 @@ CONF_FILES = \ +@@ -210,7 +210,7 @@ CONF_FILES = \ EXTRA_DIST = $(CONF_FILES) configdir = $(CONFDIR) |