Attachment #205785 for bug #239167

View | Details | Raw Unified | Return to bug 239167 | Differences between

and this patch




# $FreeBSD$

PORTNAME=	fontconfig
PORTVERSION=	2.13.1
PORTREVISION?=	0
PORTEPOCH?=	1
CATEGORIES=	x11-fonts

.if !defined(REFERENCE_PORT)

LIB_DEPENDS=	libfreetype.so:print/freetype2 \
		libuuid.so:misc/e2fsprogs-libuuid \
		libexpat.so:textproc/expat2

USES+=		cpe gmake libtool pathfix pkgconfig

# 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

PLIST_SUB=	PREFERRED_HINTING=${PREFERRED_HINTING}
PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt

OPTIONS_DEFINE=	DOCS NO_BITMAPS NLS
OPTIONS_DEFAULT=HINTING_SLIGHT
OPTIONS_SUB=	yes


HINTING_${opt}_VARS=	PREFERRED_HINTING=${opt:tl}
.endfor

NLS_USES=		gettext
NLS_CONFIGURE_ENABLE=	nls

post-patch-NO_BITMAPS-on:
	@${REINPLACE_CMD} -i '.bitmaps.bak' -e \
		'/^CONF_LINKS =/s|$$|\${.newline}	70-no-bitmaps.conf \\|' \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1505981313	1	TIMESTAMP = 1550745725
2	SHA256 (fontconfig-2.12.6.tar.bz2) = cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017	2	SHA256 (fontconfig-2.13.1.tar.bz2) = f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741
3	SIZE (fontconfig-2.12.6.tar.bz2) = 1624683	3	SIZE (fontconfig-2.13.1.tar.bz2) = 1723639

Lines 1-5 Link Here

(-)pkg-plist (-1 / +7 lines)
1	bin/fc-cache	1	bin/fc-cache
2	bin/fc-cat	2	bin/fc-cat
		3	bin/fc-conflist
3	bin/fc-list	4	bin/fc-list
4	bin/fc-match	5	bin/fc-match
5	bin/fc-pattern	6	bin/fc-pattern
Lines 67-76 Link Here
67	lib/libfontconfig.a	68	lib/libfontconfig.a
68	lib/libfontconfig.so	69	lib/libfontconfig.so
69	lib/libfontconfig.so.1	70	lib/libfontconfig.so.1
70	lib/libfontconfig.so.1.10.1	71	lib/libfontconfig.so.1.12.0
71	libdata/pkgconfig/fontconfig.pc	72	libdata/pkgconfig/fontconfig.pc
72	man/man1/fc-cache.1.gz	73	man/man1/fc-cache.1.gz
73	man/man1/fc-cat.1.gz	74	man/man1/fc-cat.1.gz
		75	man/man1/fc-conflist.1.gz
74	man/man1/fc-list.1.gz	76	man/man1/fc-list.1.gz
75	man/man1/fc-match.1.gz	77	man/man1/fc-match.1.gz
76	man/man1/fc-pattern.1.gz	78	man/man1/fc-pattern.1.gz
Lines 78-81 Link Here
78	man/man1/fc-scan.1.gz	80	man/man1/fc-scan.1.gz
79	man/man1/fc-validate.1.gz	81	man/man1/fc-validate.1.gz
80	man/man5/fonts-conf.5.gz	82	man/man5/fonts-conf.5.gz
		83	share/gettext/its/fontconfig.its
		84	share/gettext/its/fontconfig.loc
		85	%%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo
		86	%%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig.mo
81	@dir /var/db/fontconfig	87	@dir /var/db/fontconfig

Return to bug 239167

Lines 2-8 Link Here

(-)Makefile (-4 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= fontconfig	4	PORTNAME= fontconfig
5	PORTVERSION= 2.12.6	5	PORTVERSION= 2.13.1
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	PORTEPOCH?= 1	7	PORTEPOCH?= 1
8	CATEGORIES= x11-fonts	8	CATEGORIES= x11-fonts
Lines 19-24 Link Here
19	.if !defined(REFERENCE_PORT)	19	.if !defined(REFERENCE_PORT)
20		20
21	LIB_DEPENDS= libfreetype.so:print/freetype2 \	21	LIB_DEPENDS= libfreetype.so:print/freetype2 \
		22	libuuid.so:misc/e2fsprogs-libuuid \
22	libexpat.so:textproc/expat2	23	libexpat.so:textproc/expat2
23		24
24	USES+= cpe gmake libtool pathfix pkgconfig	25	USES+= cpe gmake libtool pathfix pkgconfig
Lines 40-47 Link Here
40	# D6155: static linked library linking added to support statically linked	41	# D6155: static linked library linking added to support statically linked
41	# applications, e.g. x11/xforward static option	42	# applications, e.g. x11/xforward static option
42	CONFIGURE_ARGS+= --enable-static	43	CONFIGURE_ARGS+= --enable-static
43	# Python is not required, because fc-blanks.h is available in distfile
44	CONFIGURE_ENV= PYTHON=":"
45		44
46	PKGINSTALL= ${WRKDIR}/pkg-install	45	PKGINSTALL= ${WRKDIR}/pkg-install
47	INSTALL_TARGET=install-strip	46	INSTALL_TARGET=install-strip
Lines 49-55 Link Here
49	PLIST_SUB= PREFERRED_HINTING=${PREFERRED_HINTING}	48	PLIST_SUB= PREFERRED_HINTING=${PREFERRED_HINTING}
50	PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt	49	PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
51		50
52	OPTIONS_DEFINE= DOCS NO_BITMAPS	51	OPTIONS_DEFINE= DOCS NO_BITMAPS NLS
53	OPTIONS_DEFAULT=HINTING_SLIGHT	52	OPTIONS_DEFAULT=HINTING_SLIGHT
54	OPTIONS_SUB= yes	53	OPTIONS_SUB= yes
55		54
Lines 63-68 Link Here
63	HINTING_${opt}_VARS= PREFERRED_HINTING=${opt:tl}	62	HINTING_${opt}_VARS= PREFERRED_HINTING=${opt:tl}
64	.endfor	63	.endfor
65		64
		65	NLS_USES= gettext
		66	NLS_CONFIGURE_ENABLE= nls
		67
66	post-patch-NO_BITMAPS-on:	68	post-patch-NO_BITMAPS-on:
67	@${REINPLACE_CMD} -i '.bitmaps.bak' -e \	69	@${REINPLACE_CMD} -i '.bitmaps.bak' -e \
68	'/^CONF_LINKS =/s\|$$\|\${.newline} 70-no-bitmaps.conf \\\|' \	70	'/^CONF_LINKS =/s\|$$\|\${.newline} 70-no-bitmaps.conf \\\|' \