diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-10-02 20:55:10 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-10-02 20:55:10 +0000 |
| commit | 06982abda898eec8ebd483e00e90f6128921ed22 (patch) | |
| tree | 8dfd00a4fff8ad4fcb518a790531a1ca204d362c /font | |
| parent | ce2650a3476139a5713037fae576c3490cb92e26 (diff) | |
Fix ownership of fonts.dir and font.scale files as well as
fontconfig font caches.
mkfontdir and mkfontscale are now run out of font/alias at the end
of the build or install, like fc-cache.
fc-cache is using its -y (sysroot) flag that works if used correctly.
Diffstat (limited to 'font')
| -rw-r--r-- | font/Makefile.inc | 4 | ||||
| -rw-r--r-- | font/alias/Makefile.bsd-wrapper | 20 |
2 files changed, 17 insertions, 7 deletions
diff --git a/font/Makefile.inc b/font/Makefile.inc index e7cceb34e..feea8f807 100644 --- a/font/Makefile.inc +++ b/font/Makefile.inc @@ -1,5 +1,5 @@ -# $OpenBSD: Makefile.inc,v 1.1 2007/06/01 01:05:25 matthieu Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2016/10/02 20:55:09 matthieu Exp $ realinstall: - exec ${MAKE} install FCCACHE=: + exec ${MAKE} install FCCACHE=: MKFONTDIR=: MKFONTSCALE=: diff --git a/font/alias/Makefile.bsd-wrapper b/font/alias/Makefile.bsd-wrapper index f2e604d96..75bd6a117 100644 --- a/font/alias/Makefile.bsd-wrapper +++ b/font/alias/Makefile.bsd-wrapper @@ -1,12 +1,22 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2012/08/18 10:38:39 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2016/10/02 20:55:09 matthieu Exp $ afterinstall: @if test -z "$(DESTDIR)"; then \ - echo "running fc-cache";\ - fc-cache -s -v ;\ + echo "fc-cache -s -v ${DESTDIR}/usr/X11R6/lib/X11/fonts";\ + fc-cache -s -v ${DESTDIR}/usr/X11R6/lib/X11/fonts ;\ else \ - echo "running fc-cache under $(DESTDIR)";\ - fc-cache -c ${DESTDIR} -s -v ;\ + echo "fc-cache -y ${DESTDIR} -s -v /usr/X11R6/lib/X11/fonts";\ + fc-cache -y ${DESTDIR} -s -v /usr/X11R6/lib/X11/fonts;\ + chown root:wheel ${DESTDIR}/var/cache/fontconfig/*; \ fi +.for fdir in 100dpi 75dpi OTF TTF Type1 cyrillic misc + rm -f ${DESTDIR}/usr/X11R6/lib/X11/fonts/${fdir}/fonts.dir + mkfontdir ${DESTDIR}/usr/X11R6/lib/X11/fonts/${fdir} + chown ${BINOWN}:${BINGRP} ${DESTDIR}/usr/X11R6/lib/X11/fonts/${fdir}/fonts.dir +.endfor +.for fdir in OTF TTF Type1 + mkfontscale ${DESTDIR}/usr/X11R6/lib/X11/fonts/${fdir} + chown ${BINOWN}:${BINGRP} ${DESTDIR}/usr/X11R6/lib/X11/fonts/${fdir}/fonts.scale +.endfor .include <bsd.xorg.mk> |