Fix font handling. Bump PKGREVISION.

25 files changed, 147 insertions, 225 deletions

diff --git a/fonts/cyr-rfx-bulgarian-mik/Makefile b/fonts/cyr-rfx-bulgarian-mik/Makefile
index a87cc124364..7207895ad70 100644
--- a/fonts/cyr-rfx-bulgarian-mik/Makefile
+++ b/fonts/cyr-rfx-bulgarian-mik/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:08 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/17 19:29:56 wiz Exp $
 
 CYR_RFX_ENCODING=bulgarian-mik
-PKGREVISION=	1
+PKGREVISION=	2
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-bulgarian-mik/PLIST b/fonts/cyr-rfx-bulgarian-mik/PLIST
index 4dc66e8c5f2..94d1b744c28 100644
--- a/fonts/cyr-rfx-bulgarian-mik/PLIST
+++ b/fonts/cyr-rfx-bulgarian-mik/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/08 01:47:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:56 wiz Exp $
 lib/X11/fonts/local/bulgarian-mik/75dpi/courB08b.pcf
 lib/X11/fonts/local/bulgarian-mik/75dpi/courB10b.pcf
 lib/X11/fonts/local/bulgarian-mik/75dpi/courB12b.pcf
@@ -23,8 +23,6 @@ lib/X11/fonts/local/bulgarian-mik/75dpi/courR12b.pcf
 lib/X11/fonts/local/bulgarian-mik/75dpi/courR14b.pcf
 lib/X11/fonts/local/bulgarian-mik/75dpi/courR18b.pcf
 lib/X11/fonts/local/bulgarian-mik/75dpi/courR24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/fonts.alias
-lib/X11/fonts/local/bulgarian-mik/75dpi/fonts.dir
 lib/X11/fonts/local/bulgarian-mik/75dpi/helvB08b.pcf
 lib/X11/fonts/local/bulgarian-mik/75dpi/helvB10b.pcf
 lib/X11/fonts/local/bulgarian-mik/75dpi/helvB12b.pcf
@@ -130,9 +128,4 @@ lib/X11/fonts/local/bulgarian-mik/misc/8x13b.pcf
 lib/X11/fonts/local/bulgarian-mik/misc/8x16b.pcf
 lib/X11/fonts/local/bulgarian-mik/misc/9x15Bb.pcf
 lib/X11/fonts/local/bulgarian-mik/misc/9x15b.pcf
-lib/X11/fonts/local/bulgarian-mik/misc/fonts.alias
-lib/X11/fonts/local/bulgarian-mik/misc/fonts.dir
 lib/X11/fonts/local/bulgarian-mik/misc/nil2b.pcf
-@dirrm lib/X11/fonts/local/bulgarian-mik/75dpi
-@dirrm lib/X11/fonts/local/bulgarian-mik/misc
-@dirrm lib/X11/fonts/local/bulgarian-mik
diff --git a/fonts/cyr-rfx-ibm-cp866/Makefile b/fonts/cyr-rfx-ibm-cp866/Makefile
index 3a59f6079c2..5b231ea587d 100644
--- a/fonts/cyr-rfx-ibm-cp866/Makefile
+++ b/fonts/cyr-rfx-ibm-cp866/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:08 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/17 19:29:56 wiz Exp $
 
 CYR_RFX_ENCODING=ibm-cp866
-PKGREVISION=	1
+PKGREVISION=	2
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-ibm-cp866/PLIST b/fonts/cyr-rfx-ibm-cp866/PLIST
index ae785d0eb48..51535669f7a 100644
--- a/fonts/cyr-rfx-ibm-cp866/PLIST
+++ b/fonts/cyr-rfx-ibm-cp866/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/08 01:47:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:56 wiz Exp $
 lib/X11/fonts/local/ibm-cp866/75dpi/courB08d.pcf
 lib/X11/fonts/local/ibm-cp866/75dpi/courB10d.pcf
 lib/X11/fonts/local/ibm-cp866/75dpi/courB12d.pcf
@@ -23,8 +23,6 @@ lib/X11/fonts/local/ibm-cp866/75dpi/courR12d.pcf
 lib/X11/fonts/local/ibm-cp866/75dpi/courR14d.pcf
 lib/X11/fonts/local/ibm-cp866/75dpi/courR18d.pcf
 lib/X11/fonts/local/ibm-cp866/75dpi/courR24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/fonts.alias
-lib/X11/fonts/local/ibm-cp866/75dpi/fonts.dir
 lib/X11/fonts/local/ibm-cp866/75dpi/helvB08d.pcf
 lib/X11/fonts/local/ibm-cp866/75dpi/helvB10d.pcf
 lib/X11/fonts/local/ibm-cp866/75dpi/helvB12d.pcf
@@ -130,9 +128,4 @@ lib/X11/fonts/local/ibm-cp866/misc/8x13d.pcf
 lib/X11/fonts/local/ibm-cp866/misc/8x16d.pcf
 lib/X11/fonts/local/ibm-cp866/misc/9x15Bd.pcf
 lib/X11/fonts/local/ibm-cp866/misc/9x15d.pcf
-lib/X11/fonts/local/ibm-cp866/misc/fonts.alias
-lib/X11/fonts/local/ibm-cp866/misc/fonts.dir
 lib/X11/fonts/local/ibm-cp866/misc/nil2d.pcf
-@dirrm lib/X11/fonts/local/ibm-cp866/75dpi
-@dirrm lib/X11/fonts/local/ibm-cp866/misc
-@dirrm lib/X11/fonts/local/ibm-cp866
diff --git a/fonts/cyr-rfx-iso10646_0400/Makefile b/fonts/cyr-rfx-iso10646_0400/Makefile
index 7e2856b1770..30d936e0fab 100644
--- a/fonts/cyr-rfx-iso10646_0400/Makefile
+++ b/fonts/cyr-rfx-iso10646_0400/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:56 wiz Exp $
 
 CYR_RFX_ENCODING=iso10646-0400
 PKGNAME=	${DISTNAME:S/6-0/6_0/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-iso10646_0400/PLIST b/fonts/cyr-rfx-iso10646_0400/PLIST
index beb754a1f7b..ff4efa88082 100644
--- a/fonts/cyr-rfx-iso10646_0400/PLIST
+++ b/fonts/cyr-rfx-iso10646_0400/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/10 18:14:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:56 wiz Exp $
 lib/X11/fonts/local/iso10646-0400/75dpi/courB08c.pcf
 lib/X11/fonts/local/iso10646-0400/75dpi/courB10c.pcf
 lib/X11/fonts/local/iso10646-0400/75dpi/courB12c.pcf
@@ -23,8 +23,6 @@ lib/X11/fonts/local/iso10646-0400/75dpi/courR12c.pcf
 lib/X11/fonts/local/iso10646-0400/75dpi/courR14c.pcf
 lib/X11/fonts/local/iso10646-0400/75dpi/courR18c.pcf
 lib/X11/fonts/local/iso10646-0400/75dpi/courR24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/fonts.alias
-lib/X11/fonts/local/iso10646-0400/75dpi/fonts.dir
 lib/X11/fonts/local/iso10646-0400/75dpi/helvB08c.pcf
 lib/X11/fonts/local/iso10646-0400/75dpi/helvB10c.pcf
 lib/X11/fonts/local/iso10646-0400/75dpi/helvB12c.pcf
@@ -130,9 +128,4 @@ lib/X11/fonts/local/iso10646-0400/misc/8x13c.pcf
 lib/X11/fonts/local/iso10646-0400/misc/8x16c.pcf
 lib/X11/fonts/local/iso10646-0400/misc/9x15Bc.pcf
 lib/X11/fonts/local/iso10646-0400/misc/9x15c.pcf
-lib/X11/fonts/local/iso10646-0400/misc/fonts.alias
-lib/X11/fonts/local/iso10646-0400/misc/fonts.dir
 lib/X11/fonts/local/iso10646-0400/misc/nil2c.pcf
-@dirrm lib/X11/fonts/local/iso10646-0400/75dpi
-@dirrm lib/X11/fonts/local/iso10646-0400/misc
-@dirrm lib/X11/fonts/local/iso10646-0400
diff --git a/fonts/cyr-rfx-iso8859_15/Makefile b/fonts/cyr-rfx-iso8859_15/Makefile
index e6e5db9a192..69b69665096 100644
--- a/fonts/cyr-rfx-iso8859_15/Makefile
+++ b/fonts/cyr-rfx-iso8859_15/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=iso8859-15
 PKGNAME=	${DISTNAME:S/9-1/9_1/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-iso8859_15/PLIST b/fonts/cyr-rfx-iso8859_15/PLIST
index 50d954a4227..f71984f71d7 100644
--- a/fonts/cyr-rfx-iso8859_15/PLIST
+++ b/fonts/cyr-rfx-iso8859_15/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/10 18:14:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:57 wiz Exp $
 lib/X11/fonts/local/iso8859-15/75dpi/courB08e.pcf
 lib/X11/fonts/local/iso8859-15/75dpi/courB10e.pcf
 lib/X11/fonts/local/iso8859-15/75dpi/courB12e.pcf
@@ -23,8 +23,6 @@ lib/X11/fonts/local/iso8859-15/75dpi/courR12e.pcf
 lib/X11/fonts/local/iso8859-15/75dpi/courR14e.pcf
 lib/X11/fonts/local/iso8859-15/75dpi/courR18e.pcf
 lib/X11/fonts/local/iso8859-15/75dpi/courR24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/fonts.alias
-lib/X11/fonts/local/iso8859-15/75dpi/fonts.dir
 lib/X11/fonts/local/iso8859-15/75dpi/helvB08e.pcf
 lib/X11/fonts/local/iso8859-15/75dpi/helvB10e.pcf
 lib/X11/fonts/local/iso8859-15/75dpi/helvB12e.pcf
@@ -130,9 +128,4 @@ lib/X11/fonts/local/iso8859-15/misc/8x13e.pcf
 lib/X11/fonts/local/iso8859-15/misc/8x16e.pcf
 lib/X11/fonts/local/iso8859-15/misc/9x15Be.pcf
 lib/X11/fonts/local/iso8859-15/misc/9x15e.pcf
-lib/X11/fonts/local/iso8859-15/misc/fonts.alias
-lib/X11/fonts/local/iso8859-15/misc/fonts.dir
 lib/X11/fonts/local/iso8859-15/misc/nil2e.pcf
-@dirrm lib/X11/fonts/local/iso8859-15/75dpi
-@dirrm lib/X11/fonts/local/iso8859-15/misc
-@dirrm lib/X11/fonts/local/iso8859-15
diff --git a/fonts/cyr-rfx-iso8859_5/Makefile b/fonts/cyr-rfx-iso8859_5/Makefile
index d986d8513d6..56659d9f631 100644
--- a/fonts/cyr-rfx-iso8859_5/Makefile
+++ b/fonts/cyr-rfx-iso8859_5/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=iso8859-5
 PKGNAME=	${DISTNAME:S/9-5/9_5/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-iso8859_5/PLIST b/fonts/cyr-rfx-iso8859_5/PLIST
index eb56e4fc904..29d7d1e530c 100644
--- a/fonts/cyr-rfx-iso8859_5/PLIST
+++ b/fonts/cyr-rfx-iso8859_5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/10 18:14:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:57 wiz Exp $
 lib/X11/fonts/local/iso8859-5/75dpi/courB08i.pcf
 lib/X11/fonts/local/iso8859-5/75dpi/courB10i.pcf
 lib/X11/fonts/local/iso8859-5/75dpi/courB12i.pcf
@@ -23,8 +23,6 @@ lib/X11/fonts/local/iso8859-5/75dpi/courR12i.pcf
 lib/X11/fonts/local/iso8859-5/75dpi/courR14i.pcf
 lib/X11/fonts/local/iso8859-5/75dpi/courR18i.pcf
 lib/X11/fonts/local/iso8859-5/75dpi/courR24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/fonts.alias
-lib/X11/fonts/local/iso8859-5/75dpi/fonts.dir
 lib/X11/fonts/local/iso8859-5/75dpi/helvB08i.pcf
 lib/X11/fonts/local/iso8859-5/75dpi/helvB10i.pcf
 lib/X11/fonts/local/iso8859-5/75dpi/helvB12i.pcf
@@ -130,9 +128,4 @@ lib/X11/fonts/local/iso8859-5/misc/8x13i.pcf
 lib/X11/fonts/local/iso8859-5/misc/8x16i.pcf
 lib/X11/fonts/local/iso8859-5/misc/9x15Bi.pcf
 lib/X11/fonts/local/iso8859-5/misc/9x15i.pcf
-lib/X11/fonts/local/iso8859-5/misc/fonts.alias
-lib/X11/fonts/local/iso8859-5/misc/fonts.dir
 lib/X11/fonts/local/iso8859-5/misc/nil2i.pcf
-@dirrm lib/X11/fonts/local/iso8859-5/75dpi
-@dirrm lib/X11/fonts/local/iso8859-5/misc
-@dirrm lib/X11/fonts/local/iso8859-5
diff --git a/fonts/cyr-rfx-koi8-o/Makefile b/fonts/cyr-rfx-koi8-o/Makefile
index 4c8002dbb1b..e2fc9fa140a 100644
--- a/fonts/cyr-rfx-koi8-o/Makefile
+++ b/fonts/cyr-rfx-koi8-o/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:08 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/17 19:29:57 wiz Exp $
 
 CYR_RFX_ENCODING=koi8-o
-PKGREVISION=	1
+PKGREVISION=	2
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-koi8-o/PLIST b/fonts/cyr-rfx-koi8-o/PLIST
index aa463068ef9..b9e6e32d2b5 100644
--- a/fonts/cyr-rfx-koi8-o/PLIST
+++ b/fonts/cyr-rfx-koi8-o/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/08 01:47:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:57 wiz Exp $
 lib/X11/fonts/local/koi8-o/75dpi/courB08o.pcf
 lib/X11/fonts/local/koi8-o/75dpi/courB10o.pcf
 lib/X11/fonts/local/koi8-o/75dpi/courB12o.pcf
@@ -23,8 +23,6 @@ lib/X11/fonts/local/koi8-o/75dpi/courR12o.pcf
 lib/X11/fonts/local/koi8-o/75dpi/courR14o.pcf
 lib/X11/fonts/local/koi8-o/75dpi/courR18o.pcf
 lib/X11/fonts/local/koi8-o/75dpi/courR24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/fonts.alias
-lib/X11/fonts/local/koi8-o/75dpi/fonts.dir
 lib/X11/fonts/local/koi8-o/75dpi/helvB08o.pcf
 lib/X11/fonts/local/koi8-o/75dpi/helvB10o.pcf
 lib/X11/fonts/local/koi8-o/75dpi/helvB12o.pcf
@@ -130,9 +128,4 @@ lib/X11/fonts/local/koi8-o/misc/8x13o.pcf
 lib/X11/fonts/local/koi8-o/misc/8x16o.pcf
 lib/X11/fonts/local/koi8-o/misc/9x15Bo.pcf
 lib/X11/fonts/local/koi8-o/misc/9x15o.pcf
-lib/X11/fonts/local/koi8-o/misc/fonts.alias
-lib/X11/fonts/local/koi8-o/misc/fonts.dir
 lib/X11/fonts/local/koi8-o/misc/nil2o.pcf
-@dirrm lib/X11/fonts/local/koi8-o/75dpi
-@dirrm lib/X11/fonts/local/koi8-o/misc
-@dirrm lib/X11/fonts/local/koi8-o
diff --git a/fonts/cyr-rfx-koi8-ru/Makefile b/fonts/cyr-rfx-koi8-ru/Makefile
index 18710635e00..7452686b7be 100644
--- a/fonts/cyr-rfx-koi8-ru/Makefile
+++ b/fonts/cyr-rfx-koi8-ru/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:08 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/17 19:29:57 wiz Exp $
 
 CYR_RFX_ENCODING=koi8-ru
-PKGREVISION=	1
+PKGREVISION=	2
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-koi8-ru/PLIST b/fonts/cyr-rfx-koi8-ru/PLIST
index a8969757db8..4b33533f904 100644
--- a/fonts/cyr-rfx-koi8-ru/PLIST
+++ b/fonts/cyr-rfx-koi8-ru/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/08 01:47:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:57 wiz Exp $
 lib/X11/fonts/local/koi8-ru/75dpi/courB08u.pcf
 lib/X11/fonts/local/koi8-ru/75dpi/courB10u.pcf
 lib/X11/fonts/local/koi8-ru/75dpi/courB12u.pcf
@@ -23,8 +23,6 @@ lib/X11/fonts/local/koi8-ru/75dpi/courR12u.pcf
 lib/X11/fonts/local/koi8-ru/75dpi/courR14u.pcf
 lib/X11/fonts/local/koi8-ru/75dpi/courR18u.pcf
 lib/X11/fonts/local/koi8-ru/75dpi/courR24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/fonts.alias
-lib/X11/fonts/local/koi8-ru/75dpi/fonts.dir
 lib/X11/fonts/local/koi8-ru/75dpi/helvB08u.pcf
 lib/X11/fonts/local/koi8-ru/75dpi/helvB10u.pcf
 lib/X11/fonts/local/koi8-ru/75dpi/helvB12u.pcf
@@ -130,9 +128,4 @@ lib/X11/fonts/local/koi8-ru/misc/8x13u.pcf
 lib/X11/fonts/local/koi8-ru/misc/8x16u.pcf
 lib/X11/fonts/local/koi8-ru/misc/9x15Bu.pcf
 lib/X11/fonts/local/koi8-ru/misc/9x15u.pcf
-lib/X11/fonts/local/koi8-ru/misc/fonts.alias
-lib/X11/fonts/local/koi8-ru/misc/fonts.dir
 lib/X11/fonts/local/koi8-ru/misc/nil2u.pcf
-@dirrm lib/X11/fonts/local/koi8-ru/75dpi
-@dirrm lib/X11/fonts/local/koi8-ru/misc
-@dirrm lib/X11/fonts/local/koi8-ru
diff --git a/fonts/cyr-rfx-koi8-ub/Makefile b/fonts/cyr-rfx-koi8-ub/Makefile
index 68d11dc08f2..e20b23f57b5 100644
--- a/fonts/cyr-rfx-koi8-ub/Makefile
+++ b/fonts/cyr-rfx-koi8-ub/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:08 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/17 19:29:57 wiz Exp $
 
 CYR_RFX_ENCODING=koi8-ub
-PKGREVISION=	1
+PKGREVISION=	2
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-koi8-ub/PLIST b/fonts/cyr-rfx-koi8-ub/PLIST
index b74bef41124..46a2a1389ba 100644
--- a/fonts/cyr-rfx-koi8-ub/PLIST
+++ b/fonts/cyr-rfx-koi8-ub/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/08 01:47:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:57 wiz Exp $
 lib/X11/fonts/local/koi8-ub/75dpi/courB08s.pcf
 lib/X11/fonts/local/koi8-ub/75dpi/courB10s.pcf
 lib/X11/fonts/local/koi8-ub/75dpi/courB12s.pcf
@@ -23,8 +23,6 @@ lib/X11/fonts/local/koi8-ub/75dpi/courR12s.pcf
 lib/X11/fonts/local/koi8-ub/75dpi/courR14s.pcf
 lib/X11/fonts/local/koi8-ub/75dpi/courR18s.pcf
 lib/X11/fonts/local/koi8-ub/75dpi/courR24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/fonts.alias
-lib/X11/fonts/local/koi8-ub/75dpi/fonts.dir
 lib/X11/fonts/local/koi8-ub/75dpi/helvB08s.pcf
 lib/X11/fonts/local/koi8-ub/75dpi/helvB10s.pcf
 lib/X11/fonts/local/koi8-ub/75dpi/helvB12s.pcf
@@ -130,9 +128,4 @@ lib/X11/fonts/local/koi8-ub/misc/8x13s.pcf
 lib/X11/fonts/local/koi8-ub/misc/8x16s.pcf
 lib/X11/fonts/local/koi8-ub/misc/9x15Bs.pcf
 lib/X11/fonts/local/koi8-ub/misc/9x15s.pcf
-lib/X11/fonts/local/koi8-ub/misc/fonts.alias
-lib/X11/fonts/local/koi8-ub/misc/fonts.dir
 lib/X11/fonts/local/koi8-ub/misc/nil2s.pcf
-@dirrm lib/X11/fonts/local/koi8-ub/75dpi
-@dirrm lib/X11/fonts/local/koi8-ub/misc
-@dirrm lib/X11/fonts/local/koi8-ub
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
diff --git a/fonts/cyr-rfx-mac-cyrillic/Makefile b/fonts/cyr-rfx-mac-cyrillic/Makefile
index 602e78b64d9..c64127a6597 100644
--- a/fonts/cyr-rfx-mac-cyrillic/Makefile
+++ b/fonts/cyr-rfx-mac-cyrillic/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:08 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/17 19:29:57 wiz Exp $
 
 CYR_RFX_ENCODING=mac-cyrillic
-PKGREVISION=	1
+PKGREVISION=	2
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-mac-cyrillic/PLIST b/fonts/cyr-rfx-mac-cyrillic/PLIST
index 647a2d2f3df..7185b34d61d 100644
--- a/fonts/cyr-rfx-mac-cyrillic/PLIST
+++ b/fonts/cyr-rfx-mac-cyrillic/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/08 01:47:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:57 wiz Exp $
 lib/X11/fonts/local/mac-cyrillic/75dpi/courB08m.pcf
 lib/X11/fonts/local/mac-cyrillic/75dpi/courB10m.pcf
 lib/X11/fonts/local/mac-cyrillic/75dpi/courB12m.pcf
@@ -23,8 +23,6 @@ lib/X11/fonts/local/mac-cyrillic/75dpi/courR12m.pcf
 lib/X11/fonts/local/mac-cyrillic/75dpi/courR14m.pcf
 lib/X11/fonts/local/mac-cyrillic/75dpi/courR18m.pcf
 lib/X11/fonts/local/mac-cyrillic/75dpi/courR24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/fonts.alias
-lib/X11/fonts/local/mac-cyrillic/75dpi/fonts.dir
 lib/X11/fonts/local/mac-cyrillic/75dpi/helvB08m.pcf
 lib/X11/fonts/local/mac-cyrillic/75dpi/helvB10m.pcf
 lib/X11/fonts/local/mac-cyrillic/75dpi/helvB12m.pcf
@@ -130,9 +128,4 @@ lib/X11/fonts/local/mac-cyrillic/misc/8x13m.pcf
 lib/X11/fonts/local/mac-cyrillic/misc/8x16m.pcf
 lib/X11/fonts/local/mac-cyrillic/misc/9x15Bm.pcf
 lib/X11/fonts/local/mac-cyrillic/misc/9x15m.pcf
-lib/X11/fonts/local/mac-cyrillic/misc/fonts.alias
-lib/X11/fonts/local/mac-cyrillic/misc/fonts.dir
 lib/X11/fonts/local/mac-cyrillic/misc/nil2m.pcf
-@dirrm lib/X11/fonts/local/mac-cyrillic/75dpi
-@dirrm lib/X11/fonts/local/mac-cyrillic/misc
-@dirrm lib/X11/fonts/local/mac-cyrillic
diff --git a/fonts/cyr-rfx-share/Makefile.common b/fonts/cyr-rfx-share/Makefile.common
index 78c2ba4e7ec..6f872289e7f 100644
--- a/fonts/cyr-rfx-share/Makefile.common
+++ b/fonts/cyr-rfx-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2005/09/28 22:23:50 rillig Exp $
+# $NetBSD: Makefile.common,v 1.7 2006/02/17 19:29:57 wiz Exp $
 
 DISTNAME=	cyr-rfx-${CYR_RFX_ENCODING}-1.1
 CATEGORIES=	fonts x11
@@ -19,6 +19,12 @@ NO_BUILD=	yes
 
 USE_TOOLS+=	gtar
 
+FONTS_DIRS.x11+=	${PREFIX}/lib/X11/fonts/local/${CYR_RFX_ENCODING}/75dpi
+FONTS_DIRS.x11+=	${PREFIX}/lib/X11/fonts/local/${CYR_RFX_ENCODING}/misc
+REQD_DIRS+=		${PREFIX}/lib/X11/fonts/local/${CYR_RFX_ENCODING}
+REQD_DIRS+=		${PREFIX}/lib/X11/fonts/local/${CYR_RFX_ENCODING}/75dpi
+REQD_DIRS+=		${PREFIX}/lib/X11/fonts/local/${CYR_RFX_ENCODING}/misc
+
 do-install:
 	@cd ${PREFIX}/lib/X11/fonts/local && ${GTAR} xzf ${_DISTDIR}/${DISTFILES} ${CYR_RFX_ENCODING}/misc ${CYR_RFX_ENCODING}/75dpi
 
diff --git a/fonts/cyr-rfx-windows_1251/Makefile b/fonts/cyr-rfx-windows_1251/Makefile
index e7392d997ab..c186e4ba98f 100644
--- a/fonts/cyr-rfx-windows_1251/Makefile
+++ b/fonts/cyr-rfx-windows_1251/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=windows-1251
 PKGNAME=	${DISTNAME:S/s-1/s_1/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-windows_1251/PLIST b/fonts/cyr-rfx-windows_1251/PLIST
index 592e1eea9ce..3f4c74c68f7 100644
--- a/fonts/cyr-rfx-windows_1251/PLIST
+++ b/fonts/cyr-rfx-windows_1251/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/10 18:14:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:57 wiz Exp $
 lib/X11/fonts/local/windows-1251/75dpi/courB08w.pcf
 lib/X11/fonts/local/windows-1251/75dpi/courB10w.pcf
 lib/X11/fonts/local/windows-1251/75dpi/courB12w.pcf
@@ -23,8 +23,6 @@ lib/X11/fonts/local/windows-1251/75dpi/courR12w.pcf
 lib/X11/fonts/local/windows-1251/75dpi/courR14w.pcf
 lib/X11/fonts/local/windows-1251/75dpi/courR18w.pcf
 lib/X11/fonts/local/windows-1251/75dpi/courR24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/fonts.alias
-lib/X11/fonts/local/windows-1251/75dpi/fonts.dir
 lib/X11/fonts/local/windows-1251/75dpi/helvB08w.pcf
 lib/X11/fonts/local/windows-1251/75dpi/helvB10w.pcf
 lib/X11/fonts/local/windows-1251/75dpi/helvB12w.pcf
@@ -130,9 +128,4 @@ lib/X11/fonts/local/windows-1251/misc/8x13w.pcf
 lib/X11/fonts/local/windows-1251/misc/8x16w.pcf
 lib/X11/fonts/local/windows-1251/misc/9x15Bw.pcf
 lib/X11/fonts/local/windows-1251/misc/9x15w.pcf
-lib/X11/fonts/local/windows-1251/misc/fonts.alias
-lib/X11/fonts/local/windows-1251/misc/fonts.dir
 lib/X11/fonts/local/windows-1251/misc/nil2w.pcf
-@dirrm lib/X11/fonts/local/windows-1251/75dpi
-@dirrm lib/X11/fonts/local/windows-1251/misc
-@dirrm lib/X11/fonts/local/windows-1251
diff --git a/fonts/cyr-rfx-winlatin_1/Makefile b/fonts/cyr-rfx-winlatin_1/Makefile
index c25727a45e8..466186e99a1 100644
--- a/fonts/cyr-rfx-winlatin_1/Makefile
+++ b/fonts/cyr-rfx-winlatin_1/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:09:09 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/02/17 19:29:57 wiz Exp $
 
 CYR_RFX_ENCODING=winlatin-1
 PKGNAME=	${DISTNAME:S/n-1/n_1/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-winlatin_1/PLIST b/fonts/cyr-rfx-winlatin_1/PLIST
index 2277cb25f90..f8f2bd22d4f 100644
--- a/fonts/cyr-rfx-winlatin_1/PLIST
+++ b/fonts/cyr-rfx-winlatin_1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/10 18:14:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:57 wiz Exp $
 lib/X11/fonts/local/winlatin-1/75dpi/courB08l.pcf
 lib/X11/fonts/local/winlatin-1/75dpi/courB10l.pcf
 lib/X11/fonts/local/winlatin-1/75dpi/courB12l.pcf
@@ -23,8 +23,6 @@ lib/X11/fonts/local/winlatin-1/75dpi/courR12l.pcf
 lib/X11/fonts/local/winlatin-1/75dpi/courR14l.pcf
 lib/X11/fonts/local/winlatin-1/75dpi/courR18l.pcf
 lib/X11/fonts/local/winlatin-1/75dpi/courR24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/fonts.alias
-lib/X11/fonts/local/winlatin-1/75dpi/fonts.dir
 lib/X11/fonts/local/winlatin-1/75dpi/helvB08l.pcf
 lib/X11/fonts/local/winlatin-1/75dpi/helvB10l.pcf
 lib/X11/fonts/local/winlatin-1/75dpi/helvB12l.pcf
@@ -130,9 +128,4 @@ lib/X11/fonts/local/winlatin-1/misc/8x13l.pcf
 lib/X11/fonts/local/winlatin-1/misc/8x16l.pcf
 lib/X11/fonts/local/winlatin-1/misc/9x15Bl.pcf
 lib/X11/fonts/local/winlatin-1/misc/9x15l.pcf
-lib/X11/fonts/local/winlatin-1/misc/fonts.alias
-lib/X11/fonts/local/winlatin-1/misc/fonts.dir
 lib/X11/fonts/local/winlatin-1/misc/nil2l.pcf
-@dirrm lib/X11/fonts/local/winlatin-1/75dpi
-@dirrm lib/X11/fonts/local/winlatin-1/misc
-@dirrm lib/X11/fonts/local/winlatin-1