[Midnightbsd-cvs] mports [23965] trunk/x11-fonts/fontconfig: update fontconfig
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Aug 27 22:53:32 EDT 2018
Revision: 23965
http://svnweb.midnightbsd.org/mports/?rev=23965
Author: laffer1
Date: 2018-08-27 22:53:31 -0400 (Mon, 27 Aug 2018)
Log Message:
-----------
update fontconfig
Modified Paths:
--------------
trunk/x11-fonts/fontconfig/Makefile
trunk/x11-fonts/fontconfig/distinfo
trunk/x11-fonts/fontconfig/files/patch-Makefile.in
trunk/x11-fonts/fontconfig/files/patch-configure
trunk/x11-fonts/fontconfig/files/patch-src__fccompat.c
trunk/x11-fonts/fontconfig/files/patch-src_fcatomic.h
trunk/x11-fonts/fontconfig/files/pkg-install.in
trunk/x11-fonts/fontconfig/pkg-descr
trunk/x11-fonts/fontconfig/pkg-plist
Removed Paths:
-------------
trunk/x11-fonts/fontconfig/files/fc-cache.1
trunk/x11-fonts/fontconfig/files/fc-cat.1
trunk/x11-fonts/fontconfig/files/fc-list.1
trunk/x11-fonts/fontconfig/files/fc-match.1
trunk/x11-fonts/fontconfig/files/fc-query.1
trunk/x11-fonts/fontconfig/files/fc-scan.1
trunk/x11-fonts/fontconfig/files/patch-fc-cache_fc-cache.c
Modified: trunk/x11-fonts/fontconfig/Makefile
===================================================================
--- trunk/x11-fonts/fontconfig/Makefile 2018-08-28 02:50:23 UTC (rev 23964)
+++ trunk/x11-fonts/fontconfig/Makefile 2018-08-28 02:53:31 UTC (rev 23965)
@@ -1,8 +1,8 @@
# $MidnightBSD$
PORTNAME= fontconfig
-PORTVERSION= 2.11.1
-PORTREVISION?= 1
+PORTVERSION= 2.12.6
+PORTREVISION?= 0
PORTEPOCH?= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://www.freedesktop.org/software/fontconfig/release/
@@ -11,16 +11,18 @@
COMMENT= XML-based font configuration API for X Windows
LICENSE= mit
+LICENSE_FILE= ${WRKSRC}/COPYING
-USES= tar:bzip2
+USES= gperf tar:bzip2
.if !defined(REFERENCE_PORT)
-LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \
- libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS= libfreetype.so:print/freetype2 \
+ libexpat.so:textproc/expat2
+USES+= cpe gmake libtool pathfix pkgconfig
+CPE_VENDOR= fontconfig_project
USE_LDCONFIG= yes
-USES+= gmake libtool pathfix pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-configdir=${PREFIX}/etc/fonts/conf.d \
--with-templatedir=${PREFIX}/etc/fonts/conf.avail \
@@ -27,39 +29,56 @@
--with-xmldir=${PREFIX}/etc/fonts \
--with-expat-includes=${LOCALBASE}/include \
--with-expat-lib=${LOCALBASE}/lib \
+ --with-default-hinting=${PREFERRED_HINTING} \
--with-default-fonts=${PREFIX}/share/fonts \
--with-add-fonts=${LOCALBASE}/lib/X11/fonts \
--with-cache-dir=/var/db/fontconfig \
--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
--disable-docs
-MAKE_ENV= LC_ALL=C
+
+# D6155: static linked library linking added to support statically linked
+# applications, e.g. x11/xforward static option
+CONFIGURE_ARGS+= --enable-static
+# Python is not required, because fc-blanks.h is available in distfile
+CONFIGURE_ENV= PYTHON=":"
+
PKGINSTALL= ${WRKDIR}/pkg-install
+INSTALL_TARGET=install-strip
-MAN1PAGES= fc-cache.1 fc-cat.1 fc-list.1 fc-match.1 fc-query.1 fc-scan.1
-MAN5PAGES= fonts-conf.5
+PLIST_SUB= PREFERRED_HINTING=${PREFERRED_HINTING}
PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
-.include <bsd.mport.options.mk>
+OPTIONS_DEFINE= DOCS NO_BITMAPS
+OPTIONS_DEFAULT=HINTING_SLIGHT
+OPTIONS_SUB= yes
+NO_BITMAPS_DESC= Reject bitmap fonts by default
+
+OPTIONS_SINGLE= HINTING
+HINTING_DESC= Preferred pixel hinting configuration
+.for opt in NONE SLIGHT MEDIUM FULL
+OPTIONS_SINGLE_HINTING+= HINTING_${opt}
+HINTING_${opt}_DESC= ${opt:tl}
+HINTING_${opt}_VARS= PREFERRED_HINTING=${opt:tl}
+.endfor
+
+post-patch-NO_BITMAPS-on:
+ @${REINPLACE_CMD} -i '.bitmaps.bak' -e \
+ '/^CONF_LINKS =/s|$$|\${.newline} 70-no-bitmaps.conf \\|' \
+ ${WRKSRC}/conf.d/Makefile.in
+
post-install:
-.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
-.endif
- ${INSTALL_MAN} ${MAN5PAGES:S|^|${WRKSRC}/doc/|} ${PREFIX}/man/man5
-.for manpage in ${MAN1PAGES}
- ${INSTALL_MAN} ${FILESDIR}/${manpage} ${PREFIX}/man/man1
-.endfor
- 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
+ ${INSTALL_MAN} ${WRKSRC}/fc-*/*.1 \
+ ${STAGEDIR}${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/doc/*.5 \
+ ${STAGEDIR}${PREFIX}/man/man5
+ ${INSTALL_DATA} ${WRKSRC}/fonts.conf \
+ ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf.sample
@${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \
s|%%LOCALBASE%%|${LOCALBASE}|' < ${FILESDIR}/pkg-install.in \
> ${PKGINSTALL}
- @${STRIP_CMD} ${PREFIX}/lib/libfontconfig.so.1.8.0
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Modified: trunk/x11-fonts/fontconfig/distinfo
===================================================================
--- trunk/x11-fonts/fontconfig/distinfo 2018-08-28 02:50:23 UTC (rev 23964)
+++ trunk/x11-fonts/fontconfig/distinfo 2018-08-28 02:53:31 UTC (rev 23965)
@@ -1,2 +1,3 @@
-SHA256 (fontconfig-2.11.1.tar.bz2) = dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99
-SIZE (fontconfig-2.11.1.tar.bz2) = 1516095
+TIMESTAMP = 1535424650
+SHA256 (fontconfig-2.12.6.tar.bz2) = cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
+SIZE (fontconfig-2.12.6.tar.bz2) = 1624683
Deleted: trunk/x11-fonts/fontconfig/files/fc-cache.1
===================================================================
--- trunk/x11-fonts/fontconfig/files/fc-cache.1 2018-08-28 02:50:23 UTC (rev 23964)
+++ trunk/x11-fonts/fontconfig/files/fc-cache.1 2018-08-28 02:53:31 UTC (rev 23965)
@@ -1,75 +0,0 @@
-.\" 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" "05 May 2008" "" ""
-
-.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>\&.
Deleted: trunk/x11-fonts/fontconfig/files/fc-cat.1
===================================================================
--- trunk/x11-fonts/fontconfig/files/fc-cat.1 2018-08-28 02:50:23 UTC (rev 23964)
+++ trunk/x11-fonts/fontconfig/files/fc-cat.1 2018-08-28 02:53:31 UTC (rev 23965)
@@ -1,44 +0,0 @@
-.\" 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" "05 May 2008" "" ""
-
-.SH NAME
-fc-cat \- read font information cache files
-.SH SYNOPSIS
-
-\fBfc-cat\fR [ \fB-rvV?\fR ] [ \fB--recurse\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIfonts-cache-2-files\fB\fR ] [ \fB\fIdirs\fB\fR ]
-
-.SH "DESCRIPTION"
-.PP
-\fBfc-cat\fR reads the font information from
-cache files or related to font directories
-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-r --recurse \fR
-Recurse into subdirectories.
-.TP
-\fB-v --verbose \fR
-Be verbose.
-.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>\&.
Deleted: trunk/x11-fonts/fontconfig/files/fc-list.1
===================================================================
--- trunk/x11-fonts/fontconfig/files/fc-list.1 2018-08-28 02:50:23 UTC (rev 23964)
+++ trunk/x11-fonts/fontconfig/files/fc-list.1 2018-08-28 02:53:31 UTC (rev 23965)
@@ -1,61 +0,0 @@
-.\" 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" "05 May 2008" "" ""
-
-.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>\&.
Deleted: trunk/x11-fonts/fontconfig/files/fc-match.1
===================================================================
--- trunk/x11-fonts/fontconfig/files/fc-match.1 2018-08-28 02:50:23 UTC (rev 23964)
+++ trunk/x11-fonts/fontconfig/files/fc-match.1 2018-08-28 02:53:31 UTC (rev 23965)
@@ -1,51 +0,0 @@
-.\" 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" "05 May 2008" "" ""
-
-.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>\&.
Deleted: trunk/x11-fonts/fontconfig/files/fc-query.1
===================================================================
--- trunk/x11-fonts/fontconfig/files/fc-query.1 2018-08-28 02:50:23 UTC (rev 23964)
+++ trunk/x11-fonts/fontconfig/files/fc-query.1 2018-08-28 02:53:31 UTC (rev 23965)
@@ -1,57 +0,0 @@
-.\\" auto-generated by docbook2man-spec $Revision: 1.5 $
-.TH "FC-QUERY" "1" "Aug 13, 2008" "" ""
-.SH NAME
-fc-query \- query font files
-.SH SYNOPSIS
-.sp
-\fBfc-query\fR [ \fB-Vh\fR ]
-
- [ \fB [ -i \fIindex\fB ] [ --index \fIindex\fB ] \fR ] [ \fB [ -f \fIformat\fB ] [ --format \fIformat\fB ] \fR ] [ \fB--version\fR ] [ \fB--help\fR ] \fB\fIfont-file\fB\fR\fI...\fR
-.SH "DESCRIPTION"
-.PP
-\fBfc-query\fR queries
-\fIfont-file\fR(s) using the normal fontconfig
-rules and prints out font pattern for each face found.
-If \fB--index\fR is given, only one face of each file is
-queried, otherwise all faces are queried.
-.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-i\fR
-Only query face indexed \fIindex\fR of
-each file.
-.TP
-\fB-f\fR
-Format output according to the format specifier
-\fIformat\fR.
-.TP
-\fB-V\fR
-Show version of the program and exit.
-.TP
-\fB-h\fR
-Show summary of options.
-.TP
-\fB\fIfont-file\fB\fR
-Query \fIfont-file\fR for font faces.
-.SH "RETURN CODES"
-.PP
-\fBfc-query\fR returns error code 0 for successful parsing,
-or 1 if any errors occured or if at least one font face could not be opened.
-.SH "SEE ALSO"
-.PP
-\fBfc-scan\fR(1)
-\fBFcFreeTypeQuery\fR(3)
-\fBFcPatternFormat\fR(3)
-\fBfc-cat\fR(1)
-\fBfc-cache\fR(1)
-\fBfc-list\fR(1)
-\fBfc-match\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 Behdad Esfahbod <behdad at behdad.org>.
Deleted: trunk/x11-fonts/fontconfig/files/fc-scan.1
===================================================================
--- trunk/x11-fonts/fontconfig/files/fc-scan.1 2018-08-28 02:50:23 UTC (rev 23964)
+++ trunk/x11-fonts/fontconfig/files/fc-scan.1 2018-08-28 02:53:31 UTC (rev 23965)
@@ -1,52 +0,0 @@
-.\\" auto-generated by docbook2man-spec $Revision: 1.5 $
-.TH "FC-SCAN" "1" "Jan 15, 2009" "" ""
-.SH NAME
-fc-scan \- scan font files or directories
-.SH SYNOPSIS
-.sp
-\fBfc-scan\fR [ \fB-Vh\fR ]
-
- [ \fB [ -f \fIformat\fB ] [ --format \fIformat\fB ] \fR ] [ \fB--version\fR ] [ \fB--help\fR ] \fB\fIfile\fB\fR\fI...\fR
-.SH "DESCRIPTION"
-.PP
-\fBfc-scan\fR scans
-\fIfile\fR(s) recursively
-and prints out font pattern for each face found.
-.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\fR
-Format output according to the format specifier
-\fIformat\fR.
-.TP
-\fB-V\fR
-Show version of the program and exit.
-.TP
-\fB-h\fR
-Show summary of options.
-.TP
-\fB\fIfile\fB\fR
-Scan \fIfile\fR recursively for font faces.
-.SH "RETURN CODES"
-.PP
-\fBfc-scan\fR returns error code 0 if at least one font
-was found or 1 otherwise.
-.SH "SEE ALSO"
-.PP
-\fBfc-query\fR(1)
-\fBFcFileScan\fR(3)
-\fBFcDirScan\fR(3)
-\fBFcPatternFormat\fR(3)
-\fBfc-cat\fR(1)
-\fBfc-cache\fR(1)
-\fBfc-list\fR(1)
-\fBfc-match\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 Behdad Esfahbod <behdad at behdad.org>.
Modified: trunk/x11-fonts/fontconfig/files/patch-Makefile.in
===================================================================
--- trunk/x11-fonts/fontconfig/files/patch-Makefile.in 2018-08-28 02:50:23 UTC (rev 23964)
+++ trunk/x11-fonts/fontconfig/files/patch-Makefile.in 2018-08-28 02:53:31 UTC (rev 23965)
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2012-11-01 10:55:40.000000000 +0000
-+++ Makefile.in 2012-11-01 10:56:37.000000000 +0000
-@@ -932,28 +932,6 @@
+--- Makefile.in.orig 2016-08-05 05:49:13 UTC
++++ Makefile.in
+@@ -1027,28 +1027,6 @@ fonts.conf: fonts.conf.in Makefile
mv $@.tmp $@
install-data-local: fonts.conf
Modified: trunk/x11-fonts/fontconfig/files/patch-configure
===================================================================
--- trunk/x11-fonts/fontconfig/files/patch-configure 2018-08-28 02:50:23 UTC (rev 23964)
+++ trunk/x11-fonts/fontconfig/files/patch-configure 2018-08-28 02:53:31 UTC (rev 23965)
@@ -1,6 +1,6 @@
---- configure.orig 2013-12-27 19:47:10.000000000 +0100
-+++ configure 2013-12-27 19:47:24.000000000 +0100
-@@ -654,6 +654,7 @@
+--- configure.orig 2016-08-05 05:49:14 UTC
++++ configure
+@@ -654,6 +654,7 @@ ax_pthread_config
XMLDIR
CONFIGDIR
BASECONFIGDIR
Deleted: trunk/x11-fonts/fontconfig/files/patch-fc-cache_fc-cache.c
===================================================================
--- trunk/x11-fonts/fontconfig/files/patch-fc-cache_fc-cache.c 2018-08-28 02:50:23 UTC (rev 23964)
+++ trunk/x11-fonts/fontconfig/files/patch-fc-cache_fc-cache.c 2018-08-28 02:53:31 UTC (rev 23965)
@@ -1,25 +0,0 @@
-From f44157c809d280e2a0ce87fb078fc4b278d24a67 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira at tagoh.org>
-Date: Thu, 10 Apr 2014 10:27:55 +0000
-Subject: Fix fc-cache fail with -r
-
-Do not unlink the cache even if --really-force is given.
-because re-scanning process expects the cache exists.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=77252
----
-diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
-index 99e0e9f..90ebad3 100644
---- fc-cache/fc-cache.c
-+++ fc-cache/fc-cache.c
-@@ -388,7 +388,7 @@ main (int argc, char **argv)
- list = FcStrListCreate (updateDirs);
- if (list)
- {
-- ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, &changed, NULL);
-+ ret += scanDirs (list, config, FcTrue, FcFalse, verbose, FcFalse, &changed, NULL);
- FcStrListDone (list);
- }
- FcStrSetDestroy (updateDirs);
---
-cgit v0.9.0.2-2-gbebe
Modified: trunk/x11-fonts/fontconfig/files/patch-src__fccompat.c
===================================================================
--- trunk/x11-fonts/fontconfig/files/patch-src__fccompat.c 2018-08-28 02:50:23 UTC (rev 23964)
+++ trunk/x11-fonts/fontconfig/files/patch-src__fccompat.c 2018-08-28 02:53:31 UTC (rev 23965)
@@ -4,9 +4,9 @@
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=183536
---- src/fccompat.c.orig 2014-08-12 16:34:15.875384345 +0200
-+++ src/fccompat.c 2014-08-12 16:35:04.752379905 +0200
-@@ -191,7 +191,7 @@
+--- src/fccompat.c.orig 2016-07-11 02:41:06 UTC
++++ src/fccompat.c
+@@ -191,7 +191,7 @@ FcRandom(void)
#else
random_r (&fcrandbuf, &result);
#endif
Modified: trunk/x11-fonts/fontconfig/files/patch-src_fcatomic.h
===================================================================
--- trunk/x11-fonts/fontconfig/files/patch-src_fcatomic.h 2018-08-28 02:50:23 UTC (rev 23964)
+++ trunk/x11-fonts/fontconfig/files/patch-src_fcatomic.h 2018-08-28 02:53:31 UTC (rev 23965)
@@ -1,6 +1,6 @@
---- ./src/fcatomic.h.orig 2013-10-11 03:10:18.000000000 +0000
-+++ ./src/fcatomic.h 2014-12-06 21:48:12.136252912 +0000
-@@ -96,7 +96,17 @@
+--- src/fcatomic.h.orig 2016-07-11 02:41:06 UTC
++++ src/fcatomic.h
+@@ -96,7 +96,17 @@ typedef int fc_atomic_int_t;
#define fc_atomic_int_add(AI, V) __sync_fetch_and_add (&(AI), (V))
#define fc_atomic_ptr_get(P) (void *) (__sync_synchronize (), *(P))
Modified: trunk/x11-fonts/fontconfig/files/pkg-install.in
===================================================================
--- trunk/x11-fonts/fontconfig/files/pkg-install.in 2018-08-28 02:50:23 UTC (rev 23964)
+++ trunk/x11-fonts/fontconfig/files/pkg-install.in 2018-08-28 02:53:31 UTC (rev 23965)
@@ -5,6 +5,6 @@
if [ "$2" = "POST-INSTALL" ]; then
echo "Running fc-cache to build fontconfig cache..."
- fc-cache -f -v
+ fc-cache -f -s -v
exit 0
fi
Modified: trunk/x11-fonts/fontconfig/pkg-descr
===================================================================
--- trunk/x11-fonts/fontconfig/pkg-descr 2018-08-28 02:50:23 UTC (rev 23964)
+++ trunk/x11-fonts/fontconfig/pkg-descr 2018-08-28 02:53:31 UTC (rev 23965)
@@ -1,16 +1,16 @@
Fontconfig does the following:
- * discover new fonts when installed automatically, removing a common source
+ * discover new fonts when installed automatically, removing a common source
of configuration problems.
- * perform font name substitution, so that appropriate alternative fonts can
+ * perform font name substitution, so that appropriate alternative fonts can
be selected if fonts are missing.
* identify the set of fonts required to completely cover a set of languages.
- * have GUI configuration tools built as it uses an XML-based configuration
+ * have GUI configuration tools built as it uses an XML-based configuration
file (though with autodiscovery, we believe this need is minimized).
- * efficiently and quickly find the fonts you need among the set of fonts
- you have installed, even if you have installed thousands of fonts, while
+ * efficiently and quickly find the fonts you need among the set of fonts
+ you have installed, even if you have installed thousands of fonts, while
minimzing memory usage.
- * be used in concert with the X Render Extension and FreeType to implement
+ * be used in concert with the X Render Extension and FreeType to implement
high quality, anti-aliased and subpixel rendered text on a display.
WWW: http://www.freedesktop.org/wiki/Software/fontconfig
Modified: trunk/x11-fonts/fontconfig/pkg-plist
===================================================================
--- trunk/x11-fonts/fontconfig/pkg-plist 2018-08-28 02:50:23 UTC (rev 23964)
+++ trunk/x11-fonts/fontconfig/pkg-plist 2018-08-28 02:53:31 UTC (rev 23965)
@@ -7,6 +7,10 @@
bin/fc-scan
bin/fc-validate
etc/fonts/conf.avail/10-autohint.conf
+etc/fonts/conf.avail/10-hinting-full.conf
+etc/fonts/conf.avail/10-hinting-medium.conf
+etc/fonts/conf.avail/10-hinting-none.conf
+etc/fonts/conf.avail/10-hinting-slight.conf
etc/fonts/conf.avail/10-no-sub-pixel.conf
etc/fonts/conf.avail/10-scale-bitmap-fonts.conf
etc/fonts/conf.avail/10-sub-pixel-bgr.conf
@@ -20,12 +24,13 @@
etc/fonts/conf.avail/20-unhint-small-vera.conf
etc/fonts/conf.avail/25-unhint-nonlatin.conf
etc/fonts/conf.avail/30-metric-aliases.conf
-etc/fonts/conf.avail/30-urw-aliases.conf
etc/fonts/conf.avail/40-nonlatin.conf
+etc/fonts/conf.avail/45-generic.conf
etc/fonts/conf.avail/45-latin.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-generic.conf
etc/fonts/conf.avail/60-latin.conf
etc/fonts/conf.avail/65-fonts-persian.conf
etc/fonts/conf.avail/65-khmer.conf
@@ -35,42 +40,42 @@
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.d/10-hinting-%%PREFERRED_HINTING%%.conf
etc/fonts/conf.d/10-scale-bitmap-fonts.conf
etc/fonts/conf.d/20-unhint-small-vera.conf
etc/fonts/conf.d/30-metric-aliases.conf
-etc/fonts/conf.d/30-urw-aliases.conf
etc/fonts/conf.d/40-nonlatin.conf
+etc/fonts/conf.d/45-generic.conf
etc/fonts/conf.d/45-latin.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-generic.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
+%%NO_BITMAPS%%etc/fonts/conf.d/70-no-bitmaps.conf
etc/fonts/conf.d/80-delicious.conf
etc/fonts/conf.d/90-synthetic.conf
etc/fonts/conf.d/README
- at 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
- at exec [ -f %B/fonts.conf ] || cp %B/%f %B/fonts.conf
+ at sample etc/fonts/fonts.conf.sample
etc/fonts/fonts.dtd
include/fontconfig/fcfreetype.h
include/fontconfig/fcprivate.h
include/fontconfig/fontconfig.h
+lib/libfontconfig.a
lib/libfontconfig.so
lib/libfontconfig.so.1
-lib/libfontconfig.so.1.8.0
+lib/libfontconfig.so.1.10.1
libdata/pkgconfig/fontconfig.pc
man/man1/fc-cache.1.gz
man/man1/fc-cat.1.gz
man/man1/fc-list.1.gz
man/man1/fc-match.1.gz
+man/man1/fc-pattern.1.gz
man/man1/fc-query.1.gz
man/man1/fc-scan.1.gz
+man/man1/fc-validate.1.gz
man/man5/fonts-conf.5.gz
- at dirrm include/fontconfig
- at dirrmtry etc/fonts/conf.d
- at dirrmtry etc/fonts/conf.avail
- at dirrmtry etc/fonts
- at unexec rm -rf /var/db/fontconfig 2>/dev/null || true
+ at dir /var/db/fontconfig
More information about the Midnightbsd-cvs
mailing list