Fix font handling. Bump PKGREVISION.

2 files changed, 107 insertions, 114 deletions

diff --git a/fonts/cyr-rfx-koi8_1/Makefile b/fonts/cyr-rfx-koi8_1/Makefile
index f42cee18ed9..eb08cc0ef8d 100644
--- a/fonts/cyr-rfx-koi8_1/Makefile
+++ b/fonts/cyr-rfx-koi8_1/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:09:08 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/02/17 19:29:57 wiz Exp $
 
 CYR_RFX_ENCODING=koi8-1
 PKGNAME=	${DISTNAME:S/8-1/8_1/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-koi8_1/PLIST b/fonts/cyr-rfx-koi8_1/PLIST
index b1d4b3af4f4..94a451a9320 100644
--- a/fonts/cyr-rfx-koi8_1/PLIST
+++ b/fonts/cyr-rfx-koi8_1/PLIST
@@ -1,43 +1,59 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/10 18:14:51 wiz Exp $
-lib/X11/fonts/local/koi8-1/misc/10x20k.pcf
-lib/X11/fonts/local/koi8-1/misc/12x24k.pcf
-lib/X11/fonts/local/koi8-1/misc/5x7k.pcf
-lib/X11/fonts/local/koi8-1/misc/6x10k.pcf
-lib/X11/fonts/local/koi8-1/misc/6x13k.pcf
-lib/X11/fonts/local/koi8-1/misc/6x13Bk.pcf
-lib/X11/fonts/local/koi8-1/misc/7x13k.pcf
-lib/X11/fonts/local/koi8-1/misc/7x13Bk.pcf
-lib/X11/fonts/local/koi8-1/misc/7x14k.pcf
-lib/X11/fonts/local/koi8-1/misc/7x14Bk.pcf
-lib/X11/fonts/local/koi8-1/misc/8x13k.pcf
-lib/X11/fonts/local/koi8-1/misc/8x13Bk.pcf
-lib/X11/fonts/local/koi8-1/misc/8x16k.pcf
-lib/X11/fonts/local/koi8-1/misc/9x15k.pcf
-lib/X11/fonts/local/koi8-1/misc/9x15Bk.pcf
-lib/X11/fonts/local/koi8-1/misc/nil2k.pcf
-lib/X11/fonts/local/koi8-1/misc/fonts.alias
-lib/X11/fonts/local/koi8-1/misc/fonts.dir
-lib/X11/fonts/local/koi8-1/75dpi/lutRS08k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/lutRS10k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/lutRS12k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/lutRS14k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/lutRS18k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/lutRS19k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/lutRS24k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/lutBS08k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/lutBS10k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/lutBS12k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/lutBS14k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/lutBS18k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/lutBS19k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/lutBS24k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luRS08k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luRS10k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luRS12k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luRS14k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luRS18k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luRS19k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luRS24k.pcf
+@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:57 wiz Exp $
+lib/X11/fonts/local/koi8-1/75dpi/courB08k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courB10k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courB12k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courB14k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courB18k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courB24k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courBO08k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courBO10k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courBO12k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courBO14k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courBO18k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courBO24k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courO08k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courO10k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courO12k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courO14k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courO18k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courO24k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courR08k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courR10k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courR12k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courR14k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courR18k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/courR24k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvB08k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvB10k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvB12k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvB14k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvB18k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvB24k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvBO08k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvBO10k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvBO12k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvBO14k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvBO18k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvBO24k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvO08k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvO10k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvO12k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvO14k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvO18k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvO24k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvR08k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvR10k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvR12k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvR14k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvR18k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/helvR24k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/luBIS08k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/luBIS10k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/luBIS12k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/luBIS14k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/luBIS18k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/luBIS19k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/luBIS24k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/luBS08k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/luBS10k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/luBS12k.pcf
@@ -52,87 +68,64 @@ lib/X11/fonts/local/koi8-1/75dpi/luIS14k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/luIS18k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/luIS19k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/luIS24k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luBIS08k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luBIS10k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luBIS12k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luBIS14k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luBIS18k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luBIS19k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luBIS24k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/timR08k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/timR10k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/timR12k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/timR14k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/timR18k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/timR24k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/luRS08k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/luRS10k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/luRS12k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/luRS14k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/luRS18k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/luRS19k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/luRS24k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/lutBS08k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/lutBS10k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/lutBS12k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/lutBS14k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/lutBS18k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/lutBS19k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/lutBS24k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/lutRS08k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/lutRS10k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/lutRS12k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/lutRS14k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/lutRS18k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/lutRS19k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/lutRS24k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/timB08k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/timB10k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/timB12k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/timB14k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/timB18k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/timB24k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/timI08k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/timI10k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/timI12k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/timI14k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/timI18k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/timI24k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/timBI08k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/timBI10k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/timBI12k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/timBI14k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/timBI18k.pcf
 lib/X11/fonts/local/koi8-1/75dpi/timBI24k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courR08k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courR10k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courR12k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courR14k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courR18k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courR24k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courB08k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courB10k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courB12k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courB14k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courB18k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courB24k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courO08k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courO10k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courO12k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courO14k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courO18k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courO24k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courBO08k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courBO10k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courBO12k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courBO14k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courBO18k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/courBO24k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvR08k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvR10k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvR12k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvR14k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvR18k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvR24k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvB08k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvB10k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvB12k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvB14k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvB18k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvB24k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvO08k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvO10k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvO12k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvO14k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvO18k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvO24k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvBO08k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvBO10k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvBO12k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvBO14k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvBO18k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/helvBO24k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/fonts.alias
-lib/X11/fonts/local/koi8-1/75dpi/fonts.dir
-@dirrm lib/X11/fonts/local/koi8-1/misc
-@dirrm lib/X11/fonts/local/koi8-1/75dpi
-@dirrm lib/X11/fonts/local/koi8-1
+lib/X11/fonts/local/koi8-1/75dpi/timI08k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/timI10k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/timI12k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/timI14k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/timI18k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/timI24k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/timR08k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/timR10k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/timR12k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/timR14k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/timR18k.pcf
+lib/X11/fonts/local/koi8-1/75dpi/timR24k.pcf
+lib/X11/fonts/local/koi8-1/misc/10x20k.pcf
+lib/X11/fonts/local/koi8-1/misc/12x24k.pcf
+lib/X11/fonts/local/koi8-1/misc/5x7k.pcf
+lib/X11/fonts/local/koi8-1/misc/6x10k.pcf
+lib/X11/fonts/local/koi8-1/misc/6x13Bk.pcf
+lib/X11/fonts/local/koi8-1/misc/6x13k.pcf
+lib/X11/fonts/local/koi8-1/misc/7x13Bk.pcf
+lib/X11/fonts/local/koi8-1/misc/7x13k.pcf
+lib/X11/fonts/local/koi8-1/misc/7x14Bk.pcf
+lib/X11/fonts/local/koi8-1/misc/7x14k.pcf
+lib/X11/fonts/local/koi8-1/misc/8x13Bk.pcf
+lib/X11/fonts/local/koi8-1/misc/8x13k.pcf
+lib/X11/fonts/local/koi8-1/misc/8x16k.pcf
+lib/X11/fonts/local/koi8-1/misc/9x15Bk.pcf
+lib/X11/fonts/local/koi8-1/misc/9x15k.pcf
+lib/X11/fonts/local/koi8-1/misc/nil2k.pcf