Move fonts from lib/X11/fonts to share/fonts/X11.

As discussed on tech-pkg.

Bump PKGREVISION.

2 files changed, 135 insertions, 135 deletions

diff --git a/fonts/cyr-rfx-windows_1251/Makefile b/fonts/cyr-rfx-windows_1251/Makefile
index 034add5cf40..bb87badd805 100644
--- a/fonts/cyr-rfx-windows_1251/Makefile
+++ b/fonts/cyr-rfx-windows_1251/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2006/09/22 21:53:57 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:33 wiz Exp $
 
 CYR_RFX_ENCODING=windows-1251
 PKGNAME=	${DISTNAME:S/s-1/s_1/}
-PKGREVISION=	3
+PKGREVISION=	4
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-windows_1251/PLIST b/fonts/cyr-rfx-windows_1251/PLIST
index da354b8670b..6e882b5a119 100644
--- a/fonts/cyr-rfx-windows_1251/PLIST
+++ b/fonts/cyr-rfx-windows_1251/PLIST
@@ -1,133 +1,133 @@
-@comment $NetBSD: PLIST,v 1.3 2006/09/22 21:53:57 joerg 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
-lib/X11/fonts/local/windows-1251/75dpi/courB14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/courB18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/courB24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/courBO08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/courBO10w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/courBO12w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/courBO14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/courBO18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/courBO24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/courO08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/courO10w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/courO12w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/courO14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/courO18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/courO24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/courR08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/courR10w.pcf
-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/helvB08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvB10w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvB12w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvB14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvB18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvB24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvBO08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvBO10w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvBO12w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvBO14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvBO18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvBO24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvO08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvO10w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvO12w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvO14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvO18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvO24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvR08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvR10w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvR12w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvR14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvR18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/helvR24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luBIS08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luBIS10w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luBIS12w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luBIS14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luBIS18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luBIS19w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luBIS24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luBS08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luBS10w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luBS12w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luBS14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luBS18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luBS19w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luBS24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luIS08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luIS10w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luIS12w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luIS14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luIS18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luIS19w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luIS24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luRS08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luRS10w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luRS12w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luRS14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luRS18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luRS19w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/luRS24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/lutBS08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/lutBS10w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/lutBS12w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/lutBS14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/lutBS18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/lutBS19w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/lutBS24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/lutRS08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/lutRS10w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/lutRS12w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/lutRS14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/lutRS18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/lutRS19w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/lutRS24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timB08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timB10w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timB12w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timB14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timB18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timB24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timBI08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timBI10w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timBI12w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timBI14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timBI18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timBI24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timI08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timI10w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timI12w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timI14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timI18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timI24w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timR08w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timR10w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timR12w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timR14w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timR18w.pcf
-lib/X11/fonts/local/windows-1251/75dpi/timR24w.pcf
-lib/X11/fonts/local/windows-1251/misc/10x20w.pcf
-lib/X11/fonts/local/windows-1251/misc/12x24w.pcf
-lib/X11/fonts/local/windows-1251/misc/5x7w.pcf
-lib/X11/fonts/local/windows-1251/misc/6x10w.pcf
-lib/X11/fonts/local/windows-1251/misc/6x13Bw.pcf
-lib/X11/fonts/local/windows-1251/misc/6x13w.pcf
-lib/X11/fonts/local/windows-1251/misc/7x13Bw.pcf
-lib/X11/fonts/local/windows-1251/misc/7x13w.pcf
-lib/X11/fonts/local/windows-1251/misc/7x14Bw.pcf
-lib/X11/fonts/local/windows-1251/misc/7x14w.pcf
-lib/X11/fonts/local/windows-1251/misc/8x13Bw.pcf
-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/nil2w.pcf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:33 wiz Exp $
+share/fonts/X11/local/windows-1251/75dpi/courB08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courB10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courB12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courB14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courB18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courB24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courBO08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courBO10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courBO12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courBO14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courBO18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courBO24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courO08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courO10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courO12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courO14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courO18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courO24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courR08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courR10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courR12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courR14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courR18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/courR24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/fonts.alias
+share/fonts/X11/local/windows-1251/75dpi/helvB08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvB10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvB12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvB14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvB18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvB24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvBO08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvBO10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvBO12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvBO14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvBO18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvBO24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvO08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvO10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvO12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvO14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvO18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvO24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvR08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvR10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvR12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvR14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvR18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/helvR24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luBIS08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luBIS10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luBIS12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luBIS14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luBIS18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luBIS19w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luBIS24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luBS08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luBS10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luBS12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luBS14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luBS18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luBS19w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luBS24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luIS08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luIS10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luIS12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luIS14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luIS18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luIS19w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luIS24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luRS08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luRS10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luRS12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luRS14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luRS18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luRS19w.pcf
+share/fonts/X11/local/windows-1251/75dpi/luRS24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/lutBS08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/lutBS10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/lutBS12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/lutBS14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/lutBS18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/lutBS19w.pcf
+share/fonts/X11/local/windows-1251/75dpi/lutBS24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/lutRS08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/lutRS10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/lutRS12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/lutRS14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/lutRS18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/lutRS19w.pcf
+share/fonts/X11/local/windows-1251/75dpi/lutRS24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timB08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timB10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timB12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timB14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timB18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timB24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timBI08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timBI10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timBI12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timBI14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timBI18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timBI24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timI08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timI10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timI12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timI14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timI18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timI24w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timR08w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timR10w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timR12w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timR14w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timR18w.pcf
+share/fonts/X11/local/windows-1251/75dpi/timR24w.pcf
+share/fonts/X11/local/windows-1251/misc/10x20w.pcf
+share/fonts/X11/local/windows-1251/misc/12x24w.pcf
+share/fonts/X11/local/windows-1251/misc/5x7w.pcf
+share/fonts/X11/local/windows-1251/misc/6x10w.pcf
+share/fonts/X11/local/windows-1251/misc/6x13Bw.pcf
+share/fonts/X11/local/windows-1251/misc/6x13w.pcf
+share/fonts/X11/local/windows-1251/misc/7x13Bw.pcf
+share/fonts/X11/local/windows-1251/misc/7x13w.pcf
+share/fonts/X11/local/windows-1251/misc/7x14Bw.pcf
+share/fonts/X11/local/windows-1251/misc/7x14w.pcf
+share/fonts/X11/local/windows-1251/misc/8x13Bw.pcf
+share/fonts/X11/local/windows-1251/misc/8x13w.pcf
+share/fonts/X11/local/windows-1251/misc/8x16w.pcf
+share/fonts/X11/local/windows-1251/misc/9x15Bw.pcf
+share/fonts/X11/local/windows-1251/misc/9x15w.pcf
+share/fonts/X11/local/windows-1251/misc/fonts.alias
+share/fonts/X11/local/windows-1251/misc/nil2w.pcf