From a1dcfa7f0e6507be10ee6d8cca6c3367ed4259da Mon Sep 17 00:00:00 2001 From: form Date: Wed, 19 Jan 2000 08:52:31 +0000 Subject: [PATCH] Oops. Install fonts.dir files. --- russian/xcyrillic/Makefile | 20 +++++++++----------- russian/xcyrillic/pkg/PLIST | 3 +++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/russian/xcyrillic/Makefile b/russian/xcyrillic/Makefile index ea2530c492e..a8d32a60931 100644 --- a/russian/xcyrillic/Makefile +++ b/russian/xcyrillic/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2000/01/19 08:30:28 form Exp $ +# $OpenBSD: Makefile,v 1.10 2000/01/19 08:52:31 form Exp $ DISTNAME= xcyrillic-1.1 CATEGORIES= russian x11 @@ -9,20 +9,18 @@ USE_X11= yes MAINTAINER= form@openbsd.org +post-build: + ${PREFIX}/bin/mkfontdir ${WRKSRC}/misc ${WRKSRC}/75dpi ${WRKSRC}/100dpi + do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/xcyrillic - ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/xcyrillic/misc \ - ${PREFIX}/lib/X11/fonts/xcyrillic/75dpi \ - ${PREFIX}/lib/X11/fonts/xcyrillic/100dpi - ${INSTALL_DATA} ${WRKSRC}/misc/*.pcf.gz \ - ${PREFIX}/lib/X11/fonts/xcyrillic/misc +.for d in misc 75dpi 100dpi + ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/xcyrillic/${d} + ${INSTALL_DATA} ${WRKSRC}/${d}/fonts.dir ${WRKSRC}/${d}/*.pcf.gz \ + ${PREFIX}/lib/X11/fonts/xcyrillic/${d} +.endfor ${INSTALL_DATA} ${WRKSRC}/misc/fonts.alias \ ${PREFIX}/lib/X11/fonts/xcyrillic/misc - ${INSTALL_DATA} ${WRKSRC}/75dpi/*.pcf.gz \ - ${PREFIX}/lib/X11/fonts/xcyrillic/75dpi - ${INSTALL_DATA} ${WRKSRC}/100dpi/*.pcf.gz \ - ${PREFIX}/lib/X11/fonts/xcyrillic/100dpi - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL .include diff --git a/russian/xcyrillic/pkg/PLIST b/russian/xcyrillic/pkg/PLIST index ee2f906802f..fb4714e065d 100644 --- a/russian/xcyrillic/pkg/PLIST +++ b/russian/xcyrillic/pkg/PLIST @@ -58,6 +58,7 @@ lib/X11/fonts/xcyrillic/100dpi/crox6t.pcf.gz lib/X11/fonts/xcyrillic/100dpi/crox6tb.pcf.gz lib/X11/fonts/xcyrillic/100dpi/crox6tbo.pcf.gz lib/X11/fonts/xcyrillic/100dpi/crox6to.pcf.gz +lib/X11/fonts/xcyrillic/100dpi/fonts.dir lib/X11/fonts/xcyrillic/75dpi/crox1c.pcf.gz lib/X11/fonts/xcyrillic/75dpi/crox1cb.pcf.gz lib/X11/fonts/xcyrillic/75dpi/crox1cbo.pcf.gz @@ -118,7 +119,9 @@ lib/X11/fonts/xcyrillic/75dpi/crox6t.pcf.gz lib/X11/fonts/xcyrillic/75dpi/crox6tb.pcf.gz lib/X11/fonts/xcyrillic/75dpi/crox6tbo.pcf.gz lib/X11/fonts/xcyrillic/75dpi/crox6to.pcf.gz +lib/X11/fonts/xcyrillic/75dpi/fonts.dir lib/X11/fonts/xcyrillic/misc/fonts.alias +lib/X11/fonts/xcyrillic/misc/fonts.dir lib/X11/fonts/xcyrillic/misc/koi10x16b.pcf.gz lib/X11/fonts/xcyrillic/misc/koi10x20.pcf.gz lib/X11/fonts/xcyrillic/misc/koi12x24.pcf.gz