Attachment #191354 for bug #225164

Lines 2-9 Link Here

(-)Makefile (-4 / +13 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= fontconfig	4	PORTNAME= fontconfig
5	PORTVERSION= 2.12.1	5	PORTVERSION= 2.12.6
6	PORTREVISION?= 2	6	PORTREVISION?= 0
7	PORTEPOCH?= 1	7	PORTEPOCH?= 1
8	CATEGORIES= x11-fonts	8	CATEGORIES= x11-fonts
9	MASTER_SITES= http://www.freedesktop.org/software/fontconfig/release/	9	MASTER_SITES= http://www.freedesktop.org/software/fontconfig/release/
Lines 49-55 Link Here
49	PLIST_SUB= PREFERRED_HINTING=${PREFERRED_HINTING}	49	PLIST_SUB= PREFERRED_HINTING=${PREFERRED_HINTING}
50	PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt	50	PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
51		51
52	OPTIONS_DEFINE= DOCS	52	OPTIONS_DEFINE= DOCS NO_BITMAPS
		53	OPTIONS_DEFAULT= HINTING_SLIGHT NO_BITMAPS
		54	OPTIONS_SUB= yes
		55
		56	NO_BITMAPS_DESC= Reject bitmap fonts by default
		57
53	OPTIONS_SINGLE= HINTING	58	OPTIONS_SINGLE= HINTING
54	HINTING_DESC= Preferred pixel hinting configuration	59	HINTING_DESC= Preferred pixel hinting configuration
55	.for opt in NONE SLIGHT MEDIUM FULL	60	.for opt in NONE SLIGHT MEDIUM FULL
Lines 57-64 Link Here
57	HINTING_${opt}_DESC= ${opt:tl}	62	HINTING_${opt}_DESC= ${opt:tl}
58	HINTING_${opt}_VARS= PREFERRED_HINTING=${opt:tl}	63	HINTING_${opt}_VARS= PREFERRED_HINTING=${opt:tl}
59	.endfor	64	.endfor
60	OPTIONS_DEFAULT= HINTING_SLIGHT
61		65
		66	post-patch-NO_BITMAPS-on:
		67	@${REINPLACE_CMD} -i '.bitmaps.bak' -e \
		68	'/^CONF_LINKS =/s\|$$\|\${.newline} 70-no-bitmaps.conf \\\|' \
		69	${WRKSRC}/conf.d/Makefile.in
		70
62	post-install:	71	post-install:
63	${INSTALL_MAN} ${WRKSRC}/fc-/.1 \	72	${INSTALL_MAN} ${WRKSRC}/fc-/.1 \
64	${STAGEDIR}${PREFIX}/man/man1	73	${STAGEDIR}${PREFIX}/man/man1

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1470376167	1	TIMESTAMP = 1505981313
2	SHA256 (fontconfig-2.12.1.tar.bz2) = b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3	2	SHA256 (fontconfig-2.12.6.tar.bz2) = cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
3	SIZE (fontconfig-2.12.1.tar.bz2) = 1608901	3	SIZE (fontconfig-2.12.6.tar.bz2) = 1624683

Lines 1-10 Link Here

(-)files/patch-conf.d_Makefile.in (-10 lines)
1	--- conf.d/Makefile.in.orig 2018-03-09 08:02:13 UTC
2	+++ conf.d/Makefile.in
3	@@ -364,6 +364,7 @@ CONF_LINKS = \
4	65-fonts-persian.conf \
5	65-nonlatin.conf \
6	69-unifont.conf \
7	+ 70-no-bitmaps.conf \
8	80-delicious.conf \
9	90-synthetic.conf
10

Lines 1-4 Link Here

(-)files/patch-src_fclang.c (-3 / +4 lines)
1	--- src/fclang.c.orig 2014-01-20 08:14:20 UTC	1	--- src/fclang.c.orig 2017-09-21 04:44:27 UTC
2	+++ src/fclang.c	2	+++ src/fclang.c
3	@@ -183,6 +183,7 @@ FcLangNormalize (const FcChar8 *lang)	3	@@ -183,6 +183,7 @@ FcLangNormalize (const FcChar8 *lang)
4	{	4	{
Lines 8-14 Link Here
8	size_t llen, tlen = 0, mlen = 0;	8	size_t llen, tlen = 0, mlen = 0;
9		9
10	if (!lang \|\| !*lang)	10	if (!lang \|\| !*lang)
11	@@ -241,26 +242,32 @@ FcLangNormalize (const FcChar8 *lang)	11	@@ -246,27 +247,33 @@ FcLangNormalize (const FcChar8 *lang)
12	modifier = encoding;	12	modifier = encoding;
13	}	13	}
14	}	14	}
Lines 39-45 Link Here
39	+ s, lang);	39	+ s, lang);
40	goto bail0;	40	goto bail0;
41	}	41	}
42	if (territory && (tlen < 2 \|\| tlen > 3))	42	if (territory && (tlen < 2 \|\| tlen > 3) &&
		43	!(territory[0] == 'z' && tlen < 5))
43	{	44	{
44	- fprintf (stderr, "Fontconfig warning: ignoring %s: not a valid region tag\n",	45	- fprintf (stderr, "Fontconfig warning: ignoring %s: not a valid region tag\n",
45	- lang);	46	- lang);




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

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

lib/libfontconfig.a
lib/libfontconfig.so
lib/libfontconfig.so.1
lib/libfontconfig.so.1.10.1
libdata/pkgconfig/fontconfig.pc
man/man1/fc-cache.1.gz
man/man1/fc-cat.1.gz

Return to bug 225164

Lines 24-35 Link Here

(-)pkg-plist (-4 / +6 lines)
24	etc/fonts/conf.avail/20-unhint-small-vera.conf	24	etc/fonts/conf.avail/20-unhint-small-vera.conf
25	etc/fonts/conf.avail/25-unhint-nonlatin.conf	25	etc/fonts/conf.avail/25-unhint-nonlatin.conf
26	etc/fonts/conf.avail/30-metric-aliases.conf	26	etc/fonts/conf.avail/30-metric-aliases.conf
27	etc/fonts/conf.avail/30-urw-aliases.conf
28	etc/fonts/conf.avail/40-nonlatin.conf	27	etc/fonts/conf.avail/40-nonlatin.conf
		28	etc/fonts/conf.avail/45-generic.conf
29	etc/fonts/conf.avail/45-latin.conf	29	etc/fonts/conf.avail/45-latin.conf
30	etc/fonts/conf.avail/49-sansserif.conf	30	etc/fonts/conf.avail/49-sansserif.conf
31	etc/fonts/conf.avail/50-user.conf	31	etc/fonts/conf.avail/50-user.conf
32	etc/fonts/conf.avail/51-local.conf	32	etc/fonts/conf.avail/51-local.conf
		33	etc/fonts/conf.avail/60-generic.conf
33	etc/fonts/conf.avail/60-latin.conf	34	etc/fonts/conf.avail/60-latin.conf
34	etc/fonts/conf.avail/65-fonts-persian.conf	35	etc/fonts/conf.avail/65-fonts-persian.conf
35	etc/fonts/conf.avail/65-khmer.conf	36	etc/fonts/conf.avail/65-khmer.conf
Lines 43-59 Link Here
43	etc/fonts/conf.d/10-scale-bitmap-fonts.conf	44	etc/fonts/conf.d/10-scale-bitmap-fonts.conf
44	etc/fonts/conf.d/20-unhint-small-vera.conf	45	etc/fonts/conf.d/20-unhint-small-vera.conf
45	etc/fonts/conf.d/30-metric-aliases.conf	46	etc/fonts/conf.d/30-metric-aliases.conf
46	etc/fonts/conf.d/30-urw-aliases.conf
47	etc/fonts/conf.d/40-nonlatin.conf	47	etc/fonts/conf.d/40-nonlatin.conf
		48	etc/fonts/conf.d/45-generic.conf
48	etc/fonts/conf.d/45-latin.conf	49	etc/fonts/conf.d/45-latin.conf
49	etc/fonts/conf.d/49-sansserif.conf	50	etc/fonts/conf.d/49-sansserif.conf
50	etc/fonts/conf.d/50-user.conf	51	etc/fonts/conf.d/50-user.conf
51	etc/fonts/conf.d/51-local.conf	52	etc/fonts/conf.d/51-local.conf
		53	etc/fonts/conf.d/60-generic.conf
52	etc/fonts/conf.d/60-latin.conf	54	etc/fonts/conf.d/60-latin.conf
53	etc/fonts/conf.d/65-fonts-persian.conf	55	etc/fonts/conf.d/65-fonts-persian.conf
54	etc/fonts/conf.d/65-nonlatin.conf	56	etc/fonts/conf.d/65-nonlatin.conf
55	etc/fonts/conf.d/69-unifont.conf	57	etc/fonts/conf.d/69-unifont.conf
56	etc/fonts/conf.d/70-no-bitmaps.conf	58	%%NO_BITMAPS%%etc/fonts/conf.d/70-no-bitmaps.conf
57	etc/fonts/conf.d/80-delicious.conf	59	etc/fonts/conf.d/80-delicious.conf
58	etc/fonts/conf.d/90-synthetic.conf	60	etc/fonts/conf.d/90-synthetic.conf
59	etc/fonts/conf.d/README	61	etc/fonts/conf.d/README
Lines 65-71 Link Here
65	lib/libfontconfig.a	67	lib/libfontconfig.a
66	lib/libfontconfig.so	68	lib/libfontconfig.so
67	lib/libfontconfig.so.1	69	lib/libfontconfig.so.1
68	lib/libfontconfig.so.1.9.2	70	lib/libfontconfig.so.1.10.1
69	libdata/pkgconfig/fontconfig.pc	71	libdata/pkgconfig/fontconfig.pc
70	man/man1/fc-cache.1.gz	72	man/man1/fc-cache.1.gz
71	man/man1/fc-cat.1.gz	73	man/man1/fc-cat.1.gz