[Midnightbsd-cvs] mports: x11-fonts/fontconfig: Update to 2.4.2
ctriv at midnightbsd.org
ctriv at midnightbsd.org
Thu Oct 4 16:00:22 EDT 2007
Log Message:
-----------
Update to 2.4.2
Modified Files:
--------------
mports/x11-fonts/fontconfig:
Makefile (r1.5 -> r1.6)
distinfo (r1.2 -> r1.3)
pkg-plist (r1.1.1.1 -> r1.2)
mports/x11-fonts/fontconfig/files:
patch-Makefile.in (r1.1.1.1 -> r1.2)
pkg-install.in (r1.1.1.1 -> r1.2)
Added Files:
-----------
mports/x11-fonts/fontconfig/files:
fc-cache.1 (r1.1)
fc-cat.1 (r1.1)
fc-list.1 (r1.1)
fc-match.1 (r1.1)
patch-fc-git (r1.1)
Removed Files:
-------------
mports/x11-fonts/fontconfig/files:
patch-fc_match.c
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11-fonts/fontconfig/pkg-plist,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lx11-fonts/fontconfig/pkg-plist -Lx11-fonts/fontconfig/pkg-plist -u -r1.1.1.1 -r1.2
--- x11-fonts/fontconfig/pkg-plist
+++ x11-fonts/fontconfig/pkg-plist
@@ -1,12 +1,47 @@
bin/fc-cache
+bin/fc-cat
bin/fc-list
bin/fc-match
-etc/fonts/conf.d/autohint.conf
-etc/fonts/conf.d/no-bitmaps.conf
-etc/fonts/conf.d/no-sub-pixel.conf
-etc/fonts/conf.d/sub-pixel.conf
-etc/fonts/conf.d/unhinted.conf
-etc/fonts/conf.d/yes-bitmaps.conf
+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
+etc/fonts/conf.avail/10-sub-pixel-rgb.conf
+etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
+etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
+etc/fonts/conf.avail/10-unhinted.conf
+etc/fonts/conf.avail/20-fix-globaladvance.conf
+etc/fonts/conf.avail/20-lohit-gujarati.conf
+etc/fonts/conf.avail/20-unhint-small-vera.conf
+etc/fonts/conf.avail/30-amt-aliases.conf
+etc/fonts/conf.avail/30-urw-aliases.conf
+etc/fonts/conf.avail/40-generic.conf
+etc/fonts/conf.avail/49-sansserif.conf
+etc/fonts/conf.avail/50-user.conf
+etc/fonts/conf.avail/51-local.conf
+etc/fonts/conf.avail/60-latin.conf
+etc/fonts/conf.avail/65-fonts-persian.conf
+etc/fonts/conf.avail/65-nonlatin.conf
+etc/fonts/conf.avail/69-unifont.conf
+etc/fonts/conf.avail/70-no-bitmaps.conf
+etc/fonts/conf.avail/70-yes-bitmaps.conf
+etc/fonts/conf.avail/80-delicious.conf
+etc/fonts/conf.avail/90-synthetic.conf
+etc/fonts/conf.avail/README
+etc/fonts/conf.d/20-fix-globaladvance.conf
+etc/fonts/conf.d/20-lohit-gujarati.conf
+etc/fonts/conf.d/20-unhint-small-vera.conf
+etc/fonts/conf.d/30-amt-aliases.conf
+etc/fonts/conf.d/30-urw-aliases.conf
+etc/fonts/conf.d/40-generic.conf
+etc/fonts/conf.d/49-sansserif.conf
+etc/fonts/conf.d/50-user.conf
+etc/fonts/conf.d/51-local.conf
+etc/fonts/conf.d/60-latin.conf
+etc/fonts/conf.d/65-fonts-persian.conf
+etc/fonts/conf.d/65-nonlatin.conf
+etc/fonts/conf.d/69-unifont.conf
+etc/fonts/conf.d/80-delicious.conf
+etc/fonts/conf.d/90-synthetic.conf
@unexec if cmp -s %D/etc/fonts/fonts.conf %D/etc/fonts/fonts.conf.default; then rm -f %D/etc/fonts/fonts.conf; fi
etc/fonts/fonts.conf.default
@exec [ -f %B/fonts.conf ] || cp %B/%f %B/fonts.conf
@@ -21,4 +56,6 @@
libdata/pkgconfig/fontconfig.pc
@dirrm include/fontconfig
@dirrmtry etc/fonts/conf.d
+ at dirrmtry etc/fonts/conf.avail
@dirrmtry etc/fonts
+ at unexec rm -rf /var/db/fontconfig 2>/dev/null || true
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-fonts/fontconfig/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lx11-fonts/fontconfig/Makefile -Lx11-fonts/fontconfig/Makefile -u -r1.5 -r1.6
--- x11-fonts/fontconfig/Makefile
+++ x11-fonts/fontconfig/Makefile
@@ -2,24 +2,20 @@
# Date created: 06 October 2002
# Whom: Joe Marcus Clarke <marcus at FreeBSD.org>
#
+# $FreeBSD: ports/x11-fonts/fontconfig/Makefile,v 1.69 2007/07/28 18:19:09 marcus Exp $
# $MidnightBSD$
-# $FreeBSD: ports/x11-fonts/fontconfig/Makefile,v 1.57 2006/06/12 04:58:42 mezz Exp $
-# $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.3 2005/08/26 04:03:55 marcus Exp $
+# $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.12 2007/02/02 19:49:43 mezz Exp $
#
PORTNAME= fontconfig
-PORTVERSION= 2.3.2
-PORTREVISION?= 6
+PORTVERSION= 2.4.2
PORTEPOCH?= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://fontconfig.org/release/
MAINTAINER= ports at MidnightBSD.org
COMMENT= An XML-based font configuration API for X Windows
-
-PATCH_SITES+= http://www.freetype.org/freetype2/patches/
-PATCHFILES+= fontconfig-2.3.2-noftinternals.patch
-PATCH_DIST_STRIP+= -p1
+LICENSE= x11
.if !defined(REFERENCE_PORT)
@@ -28,51 +24,43 @@
USE_GMAKE= yes
PREFIX?= ${X11BASE}
-INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
-USE_GNOME= gnomehack gnometarget pkgconfig
+USE_LDCONFIG= yes
+USE_AUTOTOOLS= libtool:15
+USE_GNOME= gnomehack gnometarget pkgconfig ltverhack
CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \
--with-expat-includes=${LOCALBASE}/include \
--with-expat-lib=${LOCALBASE}/lib \
--with-default-fonts=${X11BASE}/lib/X11/fonts \
+ --with-cache-dir=/var/db/fontconfig \
--without-add-fonts \
--disable-docs
-CONFIGURE_ENV= HASDOCBOOK=no
MAKE_ENV= LC_ALL=C
+SUB_FILES= pkg-install
PKGINSTALL= ${WRKDIR}/pkg-install
-PKGDEINSTALL= ${PKGINSTALL}
-MAN1= fc-match.1
+MAN1= fc-cache.1 fc-cat.1 fc-list.1 fc-match.1
MAN5= fonts-conf.5
PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
.include <bsd.port.pre.mk>
-.if defined(WITH_CJK)
-PATCH_SITES+= http://lwj-hinet.myweb.hinet.net/ \
- ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \
- http://bsdchat.com/dist/firefly-cjk-patchset/
-PATCHFILES+= cjk-fontconfig-2.3.2-20051217.patch.gz
-PATCH_DIST_STRIP+= -p1
+.if exists(${LOCALBASE}/bin/docbook2man)
+USE_DOCBOOK2MAN= yes
+BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410
.endif
-MTREE_FILE= /etc/mtree/BSD.x11-4.dist
-
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
.endif
${INSTALL_MAN} ${MAN5:S|^|${WRKSRC}/doc/|} ${PREFIX}/man/man5
- if [ ! -f ${PREFIX}/etc/fonts/fonts.conf ]; then \
- ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf; \
- ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \
- else \
- ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \
- fi
- @${SED} -e 's|%%PREFIX%%|${TRUE_PREFIX}| ; \
- s|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \
- > ${PKGINSTALL}
+.if !defined(USE_DOCBOOK2MAN)
+.for manpage in ${MAN1}
+ ${INSTALL_MAN} ${FILESDIR}/${manpage} ${PREFIX}/man/man1
+.endfor
+.endif
+ ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-fonts/fontconfig/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lx11-fonts/fontconfig/distinfo -Lx11-fonts/fontconfig/distinfo -u -r1.2 -r1.3
--- x11-fonts/fontconfig/distinfo
+++ x11-fonts/fontconfig/distinfo
@@ -1,9 +1,3 @@
-MD5 (fontconfig-2.3.2.tar.gz) = 7354f9f125ea78a8f2851cb9c31d4866
-SHA256 (fontconfig-2.3.2.tar.gz) = 6f7b91d328d6408c097ec11777bf4b1c2c710613b573b399794bc5999ff12227
-SIZE (fontconfig-2.3.2.tar.gz) = 964045
-MD5 (cjk-fontconfig-2.3.2-20051217.patch.gz) = fa45698ab83100bd9d93faecf02d1e22
-SHA256 (cjk-fontconfig-2.3.2-20051217.patch.gz) = 07d8bb8999c500271b20778a3a49febb63b6993bb6f71cf7b29732af46fdb98b
-SIZE (cjk-fontconfig-2.3.2-20051217.patch.gz) = 307675
-MD5 (fontconfig-2.3.2-noftinternals.patch) = 92cad1f7eef3edc6a34a2fd5cbbf352a
-SHA256 (fontconfig-2.3.2-noftinternals.patch) = f1b41d3438acf7624c3df767111817dfdea283e418c16b3c74d25768e6d2fedd
-SIZE (fontconfig-2.3.2-noftinternals.patch) = 18275
\ No newline at end of file
+MD5 (fontconfig-2.4.2.tar.gz) = f035852f521b54677f2b5c9e2f6d54a4
+SHA256 (fontconfig-2.4.2.tar.gz) = 63a3d6413182817b91eea327b58c243f1865acfc40bef61fc52d2b0431341363
+SIZE (fontconfig-2.4.2.tar.gz) = 1278340
--- /dev/null
+++ x11-fonts/fontconfig/files/fc-cache.1
@@ -0,0 +1,75 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve at ggi-project.org>.
+.TH "FC-CACHE" "1" "12 November 2006" "" ""
+
+.SH NAME
+fc-cache \- build font information cache files
+.SH SYNOPSIS
+
+\fBfc-cache\fR [ \fB-fsvV?\fR ] [ \fB--force\fR ] [ \fB--system-only\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIdirs\fB\fR ]
+
+.SH "DESCRIPTION"
+.PP
+\fBfc-cache\fR scans the font directories on
+the system and builds font information cache files for
+applications using fontconfig for their font handling.
+.PP
+If directory arguments are not given,
+\fBfc-cache\fR uses each directory in the
+current font configuration. Each directory is scanned for
+font files readable by FreeType. A cache is created which
+contains properties of each font and the associated filename.
+This cache is used to speed up application startup when using
+the fontconfig library.
+.PP
+Note that \fBfc-cache\fR must be executed
+once per architecture to generate font information customized
+for that architecture. On a subsequent run,
+\fBfc-cache\fR will augment the cache
+information files with the information for the new
+architecture.
+.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 --force \fR
+Force re-generation of apparently up-to-date cache files,
+overriding the timestamp checking.
+.TP
+\fB-s --system-only \fR
+Only scan system-wide directories, omitting the places
+located in the user's home directory.
+.TP
+\fB-v --verbose \fR
+Display status information while busy.
+.TP
+\fB-? --help \fR
+Show summary of options.
+.TP
+\fB-V --version \fR
+Show version of the program and exit.
+.TP
+\fB\fIdirs\fB \fR
+A list of directories to scan for fonts.
+.SH "FILES"
+.TP
+\fB\fIfonts.cache-2\fB\fR
+These files are generated by \fBfc-cache\fR
+and contain maps from file names to font properties. They are
+read by the fontconfig library at application startup to locate
+appropriate fonts.
+.SH "SEE ALSO"
+.PP
+\fBfc-list\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 written by Keith Packard
+<keithp at keithp.com> and Josselin Mouette <joss at debian.org>\&.
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/x11-fonts/fontconfig/files/patch-Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lx11-fonts/fontconfig/files/patch-Makefile.in -Lx11-fonts/fontconfig/files/patch-Makefile.in -u -r1.1.1.1 -r1.2
--- x11-fonts/fontconfig/files/patch-Makefile.in
+++ x11-fonts/fontconfig/files/patch-Makefile.in
@@ -1,10 +1,10 @@
---- Makefile.in.orig Wed Jul 27 02:23:03 2005
-+++ Makefile.in Wed Jul 27 02:25:27 2005
-@@ -721,28 +721,7 @@
-
+--- Makefile.in.orig Sat Nov 4 14:54:15 2006
++++ Makefile.in Sat Nov 4 14:54:46 2006
+@@ -785,28 +785,6 @@ $(srcdir)/ChangeLog:
+ .PHONY: ChangeLog $(srcdir)/ChangeLog
install-data-local:
-- $(mkinstalldirs) $(DESTDIR)$(configdir)
+- $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
- if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
- echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
- mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \
@@ -16,17 +16,16 @@
- echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
- $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
- fi; fi
-- if $(RUN_FC_CACHE_TEST); then \
-- echo " fc-cache/fc-cache -f -v"; \
-- fc-cache/fc-cache -f -v; \
+- @(if $(RUN_FC_CACHE_TEST); then \
+- echo " fc-cache/fc-cache -s -f -v"; \
+- fc-cache/fc-cache -s -f -v; \
- else \
- echo "***"; \
- echo "*** Warning: fonts.cache not built"; \
- echo "***"; \
- echo "*** Generate this file manually on host system using fc-cache"; \
- echo "***"; \
-- fi
-+
+- fi)
uninstall-local:
if [ -f $(srcdir)/fonts.conf ]; then \
--- /dev/null
+++ x11-fonts/fontconfig/files/patch-fc-git
@@ -0,0 +1,80 @@
+--- src/fcfreetype.c.orig Sat Apr 14 01:46:21 2007
++++ src/fcfreetype.c Sat Apr 14 01:48:33 2007
+@@ -2413,6 +2413,19 @@ FcGlyphNameToUcs4 (FcChar8 *name)
+ }
+
+ /*
++* Work around a bug in some FreeType versions which fail
++* to correctly bounds check glyph name buffers and overwrite
++* the stack. As Postscript names have a limit of 127 characters,
++* this should be sufficient.
++*/
++
++#if FC_GLYPHNAME_MAXLEN < 127
++# define FC_GLYPHNAME_BUFLEN 127
++#else
++# define FC_GLYPHNAME_BUFLEN FC_GLYPHNAME_MAXLEN
++#endif
++
++/*
+ * Search through a font for a glyph by name. This is
+ * currently a linear search as there doesn't appear to be
+ * any defined order within the font
+@@ -2421,11 +2434,11 @@ static FT_UInt
+ FcFreeTypeGlyphNameIndex (FT_Face face, const FcChar8 *name)
+ {
+ FT_UInt gindex;
+- FcChar8 name_buf[FC_GLYPHNAME_MAXLEN + 2];
++ FcChar8 name_buf[FC_GLYPHNAME_BUFLEN + 2];
+
+ for (gindex = 0; gindex < (FT_UInt) face->num_glyphs; gindex++)
+ {
+- if (FT_Get_Glyph_Name (face, gindex, name_buf, FC_GLYPHNAME_MAXLEN+1) == 0)
++ if (FT_Get_Glyph_Name (face, gindex, name_buf, FC_GLYPHNAME_BUFLEN+1) == 0)
+ if (!strcmp ((char *) name, (char *) name_buf))
+ return gindex;
+ }
+@@ -2715,11 +2728,11 @@ FcFreeTypeCharSetAndSpacing (FT_Face fac
+ */
+ if (FcFreeTypeUseNames (face))
+ {
+- FcChar8 name_buf[FC_GLYPHNAME_MAXLEN + 2];
++ FcChar8 name_buf[FC_GLYPHNAME_BUFLEN + 2];
+
+ for (glyph = 0; glyph < (FT_UInt) face->num_glyphs; glyph++)
+ {
+- if (FT_Get_Glyph_Name (face, glyph, name_buf, FC_GLYPHNAME_MAXLEN+1) == 0)
++ if (FT_Get_Glyph_Name (face, glyph, name_buf, FC_GLYPHNAME_BUFLEN+1) == 0)
+ {
+ ucs4 = FcGlyphNameToUcs4 (name_buf);
+ if (ucs4 != 0xffff &&
+--- fc-glyphname/fc-glyphname.c.orig Sat Apr 14 01:49:42 2007
++++ fc-glyphname/fc-glyphname.c Sat Apr 14 01:49:55 2007
+@@ -206,7 +206,7 @@ insert (FcGlyphName *gn, FcGlyphName **t
+ i = (int) (h % hash);
+ while (table[i])
+ {
+- if (!r) r = (int) (h % rehash);
++ if (!r) r = (int) (h % rehash + 1);
+ i += r;
+ if (i >= hash)
+ i -= hash;
+--- src/fcpat.c.orig Sat Apr 14 01:51:00 2007
++++ src/fcpat.c Sat Apr 14 01:52:23 2007
+@@ -925,10 +925,13 @@ FcPatternDuplicate (const FcPattern *ori
+ for (i = 0; i < orig->num; i++)
+ {
+ for (l = FcPatternEltValues(e + i); l; l = FcValueListNext(l))
+- if (!FcPatternObjectAdd (new, e[i].object,
+- FcValueCanonicalize(&l->value),
+- FcTrue))
++ {
++ if (!FcPatternObjectAddWithBinding (new, e[i].object,
++ FcValueCanonicalize(&l->value),
++ l->binding,
++ FcTrue))
+ goto bail1;
++ }
+ }
+
+ return new;
--- /dev/null
+++ x11-fonts/fontconfig/files/fc-list.1
@@ -0,0 +1,61 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve at ggi-project.org>.
+.TH "FC-LIST" "1" "12 November 2006" "" ""
+
+.SH NAME
+fc-list \- list available fonts
+.SH SYNOPSIS
+
+\fBfc-list\fR [ \fB-vV?\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIpattern\fB\fR ] [ \fB\fIelement\fB\fR ]
+
+.SH "DESCRIPTION"
+.PP
+\fBfc-list\fR lists fonts and styles
+available on the system for applications using fontconfig.
+.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-v --verbose \fR
+Display status information while busy.
+.TP
+\fB-? --help \fR
+Show summary of options.
+.TP
+\fB-V --version \fR
+Show version of the program and exit.
+.TP
+\fB\fIpattern\fB \fR
+If this argument is set, only fonts matching
+\fIpattern\fR are displayed.
+.TP
+\fB\fIelement\fB \fR
+If set, the \fIelement\fR property
+is displayed for matching fonts.
+.SH "EXAMPLES"
+.TP
+\fBfc-list\fR
+Lists all font faces.
+.TP
+\fBfc-list :lang=hi\fR
+Lists font faces that cover Hindi.
+.TP
+\fBfc-list : family style file spacing \fR
+Lists the filename and spacing value for each font
+face. ``:'' is an empty pattern that matches all
+fonts.
+.SH "SEE ALSO"
+.PP
+\fBfc-cache\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 written by Keith Packard
+<keithp at keithp.com> and Josselin Mouette <joss at debian.org>\&.
--- /dev/null
+++ x11-fonts/fontconfig/files/fc-match.1
@@ -0,0 +1,51 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve at ggi-project.org>.
+.TH "FC-MATCH" "1" "12 November 2006" "" ""
+
+.SH NAME
+fc-match \- match available fonts
+.SH SYNOPSIS
+
+\fBfc-match\fR [ \fB-svV?\fR ] [ \fB--sort\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIfont-pattern\fB\fR ]
+
+.SH "DESCRIPTION"
+.PP
+\fBfc-match\fR matches font-pattern (empty
+pattern by default) using the normal fontconfig matching rules to find
+the best font available. If --sort is given, the sorted list of best
+matching fonts is displayed. With --verbose, the whole font pattern
+for each match is printed, otherwise only the file, family and style
+are printed..
+.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-v --verbose \fR
+Print whole font pattern for each match.
+.TP
+\fB-? --help \fR
+Show summary of options.
+.TP
+\fB-V --version \fR
+Show version of the program and exit.
+.TP
+\fB-s --sort \fR
+Displays sorted list of best matching fonts.
+.TP
+\fB\fIfont-pattern\fB \fR
+Displays fonts matching
+\fIfont-pattern\fR (uses empty pattern by default).
+.SH "SEE ALSO"
+.PP
+\fBfc-list\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 Patrick Lam <plam at csail.mit.edu>\&.
Index: pkg-install.in
===================================================================
RCS file: /home/cvs/mports/x11-fonts/fontconfig/files/pkg-install.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lx11-fonts/fontconfig/files/pkg-install.in -Lx11-fonts/fontconfig/files/pkg-install.in -u -r1.1.1.1 -r1.2
--- x11-fonts/fontconfig/files/pkg-install.in
+++ x11-fonts/fontconfig/files/pkg-install.in
@@ -6,7 +6,5 @@
if [ "$2" = "POST-INSTALL" ]; then
echo "Running fc-cache to build fontconfig cache..."
fc-cache -f -v
-elif [ "$2" = "DEINSTALL" ]; then
- find %%PREFIX%%/lib/X11/fonts/ -name fonts.cache-1 -delete
- find %%X11BASE%%/lib/X11/fonts/ -name fonts.cache-1 -delete
+ exit 0
fi
--- /dev/null
+++ x11-fonts/fontconfig/files/fc-cat.1
@@ -0,0 +1,37 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve at ggi-project.org>.
+.TH "FC-CAT" "1" "12 November 2006" "" ""
+
+.SH NAME
+fc-cat \- read font information cache files
+.SH SYNOPSIS
+
+\fBfc-cat < fonts-cache-2-file >\fR [ \fB-V?\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIdirs\fB\fR ]
+
+.SH "DESCRIPTION"
+.PP
+\fBfc-cat\fR reads a font information cache file
+and emits it in ASCII form.
+.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-? --help \fR
+Show summary of options.
+.TP
+\fB-V --version \fR
+Show version of the program and exit.
+.SH "SEE ALSO"
+.PP
+\fBfc-cache\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 written by Patrick Lam <plam at mit.edu>\&.
--- x11-fonts/fontconfig/files/patch-fc_match.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- fc-match/fc-match.c.orig Mon Dec 6 20:25:18 2004
-+++ fc-match/fc-match.c Fri Mar 9 17:26:55 2007
-@@ -99,7 +99,7 @@
- int c;
-
- #if HAVE_GETOPT_LONG
-- while ((c = getopt_long (argc, argv, "Vv?", longopts, NULL)) != -1)
-+ while ((c = getopt_long (argc, argv, "sVv?", longopts, NULL)) != -1)
- #else
- while ((c = getopt (argc, argv, "sVv?")) != -1)
- #endif
More information about the Midnightbsd-cvs
mailing list