Attachment #151597 for bug #196702

View | Details | Raw Unified | Return to bug 196702
Collapse All | Expand All




PLIST_SUB+=	FONTSDIR=${FONTSDIR_REL}

XFONTSDIR?=	${LOCALBASE}/lib/X11/fonts/TrueType
XFONTSDIR_REL=	${XFONTSDIR:S,${LOCALBASE}/,,}
PLIST_SUB+=	XFONTSDIR=${XFONTSDIR_REL}

.if ${PORT_OPTIONS:MX11}
RUN_DEPENDS+=	${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig

	@${FALSE}
.endif

.if !defined(PACKAGE_BUILDING)
post-install: do-install-ttf
do-install-ttf:
.if defined(_TTF_MODULES)

	@${ECHO_MSG} "===>  Running fc-cache"
	-@${LOCALBASE}/bin/fc-cache -f -v ${STAGEDIR}${XFONTSDIR}
.endif
.endif

add-plist-post: add-plist-ttf
add-plist-ttf:

.if ${PORT_OPTIONS:MX11}
	@${ECHO_CMD} "@unexec ${LOCALBASE}/bin/fc-cache -f -v ${XFONTSDIR} || true" >> ${TMPPLIST}
	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/fc-cache -f -v ${XFONTSDIR} || true" >> ${TMPPLIST}
	@${ECHO_CMD} "@unexec find ${XFONTSDIR} -size -3c -delete || true" >> ${TMPPLIST}
	@${ECHO_CMD} "@dirrmtry ${XFONTSDIR}" >> ${TMPPLIST}
.endif
	@${ECHO_CMD} "@dirrmtry ${FONTSDIR}" >> ${TMPPLIST}
	@${ECHO_CMD} "@dirrmtry share/fonts" >> ${TMPPLIST}

Return to bug 196702

Lines 17-24 Link Here

(-)Makefile.ttf (-4 / +2 lines)
17	PLIST_SUB+= FONTSDIR=${FONTSDIR_REL}	17	PLIST_SUB+= FONTSDIR=${FONTSDIR_REL}
18		18
19	XFONTSDIR?= ${LOCALBASE}/lib/X11/fonts/TrueType	19	XFONTSDIR?= ${LOCALBASE}/lib/X11/fonts/TrueType
20	XFONTSDIR_REL= ${XFONTSDIR:S,${LOCALBASE}/,,}
21	PLIST_SUB+= XFONTSDIR=${XFONTSDIR_REL}
22		20
23	.if ${PORT_OPTIONS:MX11}	21	.if ${PORT_OPTIONS:MX11}
24	RUN_DEPENDS+= ${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig	22	RUN_DEPENDS+= ${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig
Lines 50-55 Link Here
50	@${FALSE}	48	@${FALSE}
51	.endif	49	.endif
52		50
		51	.if !defined(PACKAGE_BUILDING)
53	post-install: do-install-ttf	52	post-install: do-install-ttf
54	do-install-ttf:	53	do-install-ttf:
55	.if defined(_TTF_MODULES)	54	.if defined(_TTF_MODULES)
Lines 64-69 Link Here
64	@${ECHO_MSG} "===> Running fc-cache"	63	@${ECHO_MSG} "===> Running fc-cache"
65	-@${LOCALBASE}/bin/fc-cache -f -v ${STAGEDIR}${XFONTSDIR}	64	-@${LOCALBASE}/bin/fc-cache -f -v ${STAGEDIR}${XFONTSDIR}
66	.endif	65	.endif
		66	.endif
67		67
68	add-plist-post: add-plist-ttf	68	add-plist-post: add-plist-ttf
69	add-plist-ttf:	69	add-plist-ttf:
Lines 83-90 Link Here
83	.if ${PORT_OPTIONS:MX11}	83	.if ${PORT_OPTIONS:MX11}
84	@${ECHO_CMD} "@unexec ${LOCALBASE}/bin/fc-cache -f -v ${XFONTSDIR} \|\| true" >> ${TMPPLIST}	84	@${ECHO_CMD} "@unexec ${LOCALBASE}/bin/fc-cache -f -v ${XFONTSDIR} \|\| true" >> ${TMPPLIST}
85	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/fc-cache -f -v ${XFONTSDIR} \|\| true" >> ${TMPPLIST}	85	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/fc-cache -f -v ${XFONTSDIR} \|\| true" >> ${TMPPLIST}
86	@${ECHO_CMD} "@unexec find ${XFONTSDIR} -size -3c -delete \|\| true" >> ${TMPPLIST}
87	@${ECHO_CMD} "@dirrmtry ${XFONTSDIR}" >> ${TMPPLIST}
88	.endif	86	.endif
89	@${ECHO_CMD} "@dirrmtry ${FONTSDIR}" >> ${TMPPLIST}	87	@${ECHO_CMD} "@dirrmtry ${FONTSDIR}" >> ${TMPPLIST}
90	@${ECHO_CMD} "@dirrmtry share/fonts" >> ${TMPPLIST}	88	@${ECHO_CMD} "@dirrmtry share/fonts" >> ${TMPPLIST}