summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-06-01 16:35:31 +0000
committerwiz <wiz@pkgsrc.org>2014-06-01 16:35:31 +0000
commitc036855cc245592abd90257a559e0422fd9d1515 (patch)
treebc4c47ab313c1e0ab905241a3b7667947d238641 /fonts
parentea5e4c1f7f1c85c9cce785f764005fc2ac09594f (diff)
downloadpkgsrc-c036855cc245592abd90257a559e0422fd9d1515.tar.gz
Move fonts from lib/X11/fonts to share/fonts/X11.
As discussed on tech-pkg. Bump PKGREVISION.
Diffstat (limited to 'fonts')
-rw-r--r--fonts/AnonymousPro/Makefile7
-rw-r--r--fonts/AnonymousPro/PLIST10
-rw-r--r--fonts/EB-Garamond/Makefile5
-rw-r--r--fonts/EB-Garamond/PLIST22
-rw-r--r--fonts/TextFonts-ttf/Makefile5
-rw-r--r--fonts/TextFonts-ttf/PLIST28
-rw-r--r--fonts/Xg/Makefile8
-rw-r--r--fonts/Xg/PLIST350
-rw-r--r--fonts/Xg/distinfo4
-rw-r--r--fonts/Xg/patches/patch-aa4
-rw-r--r--fonts/ae-mono-ttf/Makefile7
-rw-r--r--fonts/ae-mono-ttf/PLIST6
-rw-r--r--fonts/alee-ttf/Makefile11
-rw-r--r--fonts/alee-ttf/PLIST12
-rw-r--r--fonts/arphic-ttf/Makefile6
-rw-r--r--fonts/arphic-ttf/PLIST10
-rw-r--r--fonts/artwiz-fonts/MESSAGE4
-rw-r--r--fonts/artwiz-fonts/Makefile10
-rw-r--r--fonts/artwiz-fonts/PLIST36
-rw-r--r--fonts/baekmuk-ttf/Makefile6
-rw-r--r--fonts/baekmuk-ttf/PLIST10
-rw-r--r--fonts/biznet-iso8859_2/MESSAGE24
-rw-r--r--fonts/biznet-iso8859_2/Makefile6
-rw-r--r--fonts/biznet-iso8859_2/PLIST798
-rw-r--r--fonts/cantarell-fonts/Makefile7
-rw-r--r--fonts/cantarell-fonts/PLIST6
-rw-r--r--fonts/consolamono-ttf/Makefile11
-rw-r--r--fonts/consolamono-ttf/PLIST6
-rw-r--r--fonts/courier-prime/Makefile5
-rw-r--r--fonts/courier-prime/PLIST10
-rw-r--r--fonts/croscorefonts/Makefile7
-rw-r--r--fonts/croscorefonts/PLIST28
-rw-r--r--fonts/cyberbase-ttf/Makefile4
-rw-r--r--fonts/cyberbase-ttf/PLIST4
-rw-r--r--fonts/cyberbit-ttf/Makefile4
-rw-r--r--fonts/cyberbit-ttf/Makefile.common4
-rw-r--r--fonts/cyberbit-ttf/PLIST4
-rw-r--r--fonts/cyr-rfx-bulgarian-mik/Makefile4
-rw-r--r--fonts/cyr-rfx-bulgarian-mik/PLIST266
-rw-r--r--fonts/cyr-rfx-ibm-cp866/Makefile4
-rw-r--r--fonts/cyr-rfx-ibm-cp866/PLIST266
-rw-r--r--fonts/cyr-rfx-iso10646_0400/Makefile4
-rw-r--r--fonts/cyr-rfx-iso10646_0400/PLIST266
-rw-r--r--fonts/cyr-rfx-iso8859_15/Makefile4
-rw-r--r--fonts/cyr-rfx-iso8859_15/PLIST266
-rw-r--r--fonts/cyr-rfx-iso8859_5/Makefile4
-rw-r--r--fonts/cyr-rfx-iso8859_5/PLIST266
-rw-r--r--fonts/cyr-rfx-koi8-o/Makefile4
-rw-r--r--fonts/cyr-rfx-koi8-o/PLIST266
-rw-r--r--fonts/cyr-rfx-koi8-ru/Makefile4
-rw-r--r--fonts/cyr-rfx-koi8-ru/PLIST266
-rw-r--r--fonts/cyr-rfx-koi8-ub/Makefile4
-rw-r--r--fonts/cyr-rfx-koi8-ub/PLIST266
-rw-r--r--fonts/cyr-rfx-koi8_1/Makefile4
-rw-r--r--fonts/cyr-rfx-koi8_1/PLIST266
-rw-r--r--fonts/cyr-rfx-mac-cyrillic/Makefile4
-rw-r--r--fonts/cyr-rfx-mac-cyrillic/PLIST266
-rw-r--r--fonts/cyr-rfx-share/Makefile.common16
-rw-r--r--fonts/cyr-rfx-windows_1251/Makefile4
-rw-r--r--fonts/cyr-rfx-windows_1251/PLIST266
-rw-r--r--fonts/cyr-rfx-winlatin_1/Makefile4
-rw-r--r--fonts/cyr-rfx-winlatin_1/PLIST266
-rw-r--r--fonts/dbz-ttf/Makefile6
-rw-r--r--fonts/dbz-ttf/PLIST152
-rw-r--r--fonts/dejavu-ttf/Makefile7
-rw-r--r--fonts/dejavu-ttf/PLIST44
-rw-r--r--fonts/droid-ttf/Makefile7
-rw-r--r--fonts/droid-ttf/PLIST46
-rw-r--r--fonts/efont-unicode/MESSAGE14
-rw-r--r--fonts/efont-unicode/Makefile6
-rw-r--r--fonts/evermono-ttf/Makefile5
-rw-r--r--fonts/evermono-ttf/PLIST10
-rw-r--r--fonts/fira/Makefile5
-rw-r--r--fonts/fira/PLIST70
-rw-r--r--fonts/font-misc-misc/Makefile5
-rw-r--r--fonts/fontconfig/Makefile9
-rw-r--r--fonts/freefont-ttf/Makefile7
-rw-r--r--fonts/freefont-ttf/PLIST26
-rw-r--r--fonts/freefonts/MESSAGE10
-rw-r--r--fonts/freefonts/Makefile16
-rw-r--r--fonts/freefonts/PLIST222
-rw-r--r--fonts/gentium-ttf/Makefile7
-rw-r--r--fonts/gentium-ttf/PLIST10
-rw-r--r--fonts/geoslab703-ttf/Makefile6
-rw-r--r--fonts/geoslab703-ttf/PLIST6
-rw-r--r--fonts/inconsolata-g/Makefile15
-rw-r--r--fonts/inconsolata-g/PLIST6
-rw-r--r--fonts/inconsolata-ttf/Makefile9
-rw-r--r--fonts/inconsolata-ttf/PLIST4
-rw-r--r--fonts/intlfonts/MESSAGE16
-rw-r--r--fonts/intlfonts/Makefile6
-rw-r--r--fonts/intlfonts/PLIST468
-rw-r--r--fonts/intlfonts/PLIST.extrafonts240
-rw-r--r--fonts/ipaexfont/Makefile7
-rw-r--r--fonts/ipaexfont/PLIST6
-rw-r--r--fonts/ipafont/Makefile7
-rw-r--r--fonts/ipafont/PLIST10
-rw-r--r--fonts/ja-elisat/Makefile6
-rw-r--r--fonts/ja-elisat/PLIST8
-rw-r--r--fonts/ja-elisau/Makefile6
-rw-r--r--fonts/ja-elisau/PLIST6
-rw-r--r--fonts/ja-kaname/Makefile6
-rw-r--r--fonts/ja-kaname/PLIST6
-rw-r--r--fonts/ja-kappa20/Makefile8
-rw-r--r--fonts/ja-kappa20/PLIST34
-rw-r--r--fonts/ja-naga10/Makefile8
-rw-r--r--fonts/ja-naga10/PLIST22
-rw-r--r--fonts/ja-sazanami-ttf/Makefile6
-rw-r--r--fonts/ja-sazanami-ttf/PLIST6
-rw-r--r--fonts/ja-shinonome/Makefile10
-rw-r--r--fonts/ja-shinonome/PLIST130
-rw-r--r--fonts/jisx0212fonts/Makefile6
-rw-r--r--fonts/jisx0212fonts/PLIST10
-rw-r--r--fonts/jisx0212fonts/distinfo4
-rw-r--r--fonts/jisx0212fonts/patches/patch-aa4
-rw-r--r--fonts/jisx0213fonts/Makefile6
-rw-r--r--fonts/jisx0213fonts/PLIST10
-rw-r--r--fonts/jmk-fonts/MESSAGE6
-rw-r--r--fonts/jmk-fonts/Makefile12
-rw-r--r--fonts/jmk-fonts/PLIST220
-rw-r--r--fonts/jsMath-fonts/Makefile5
-rw-r--r--fonts/jsMath-fonts/PLIST14
-rw-r--r--fonts/kanjistrokeorders-ttf/Makefile7
-rw-r--r--fonts/kanjistrokeorders-ttf/PLIST4
-rw-r--r--fonts/kcfonts/Makefile8
-rw-r--r--fonts/kcfonts/PLIST12
-rw-r--r--fonts/kcfonts/distinfo4
-rw-r--r--fonts/kcfonts/patches/patch-aa6
-rw-r--r--fonts/kiloji-ttf/Makefile5
-rw-r--r--fonts/kiloji-ttf/PLIST10
-rw-r--r--fonts/ko-baekmuk/Makefile5
-rw-r--r--fonts/ko-baekmuk/PLIST86
-rw-r--r--fonts/ko-hanyang/Makefile6
-rw-r--r--fonts/ko-hanyang/PLIST26
-rw-r--r--fonts/ko-kaist/Makefile6
-rw-r--r--fonts/ko-kaist/PLIST10
-rw-r--r--fonts/ko-mizi/Makefile6
-rw-r--r--fonts/ko-mizi/PLIST20
-rw-r--r--fonts/kochi-ttf/Makefile12
-rw-r--r--fonts/kochi-ttf/PLIST6
-rw-r--r--fonts/konatu-ttf/Makefile7
-rw-r--r--fonts/konatu-ttf/PLIST6
-rw-r--r--fonts/koruri-ttf/Makefile7
-rw-r--r--fonts/koruri-ttf/PLIST12
-rw-r--r--fonts/liberation-ttf/Makefile5
-rw-r--r--fonts/liberation-ttf/PLIST26
-rw-r--r--fonts/linux-libertine-ttf/Makefile5
-rw-r--r--fonts/linux-libertine-ttf/PLIST64
-rw-r--r--fonts/lohit-fonts/Makefile7
-rw-r--r--fonts/lohit-fonts/PLIST32
-rw-r--r--fonts/migu-ttf/Makefile5
-rw-r--r--fonts/migu-ttf/PLIST18
-rw-r--r--fonts/misaki-fonts/Makefile7
-rw-r--r--fonts/misaki-fonts/PLIST10
-rw-r--r--fonts/monafonts-ttf/Makefile5
-rw-r--r--fonts/monafonts-ttf/PLIST4
-rw-r--r--fonts/monafonts/Makefile6
-rw-r--r--fonts/monafonts/PLIST98
-rw-r--r--fonts/mothanna-ttf/Makefile5
-rw-r--r--fonts/mothanna-ttf/PLIST10
-rw-r--r--fonts/motoya-fonts/Makefile7
-rw-r--r--fonts/motoya-fonts/PLIST6
-rw-r--r--fonts/mozilla-fonts/MESSAGE4
-rw-r--r--fonts/mozilla-fonts/Makefile8
-rw-r--r--fonts/mozilla-fonts/PLIST174
-rw-r--r--fonts/mozilla-fonts/distinfo4
-rw-r--r--fonts/mozilla-fonts/patches/patch-aa4
-rw-r--r--fonts/ms-ttf/MESSAGE6
-rw-r--r--fonts/ms-ttf/Makefile6
-rw-r--r--fonts/ms-ttf/PLIST62
-rw-r--r--fonts/nanum-ttf/Makefile7
-rw-r--r--fonts/nanum-ttf/PLIST18
-rw-r--r--fonts/pixel-sagas-startrek/Makefile7
-rw-r--r--fonts/pixel-sagas-startrek/PLIST64
-rw-r--r--fonts/profont/MESSAGE4
-rw-r--r--fonts/profont/Makefile8
-rw-r--r--fonts/profont/PLIST16
-rw-r--r--fonts/proggy-fonts/Makefile7
-rw-r--r--fonts/proggy-fonts/PLIST24
-rw-r--r--fonts/ricty-ttf/Makefile13
-rw-r--r--fonts/ricty-ttf/PLIST10
-rw-r--r--fonts/roboto-fonts/Makefile7
-rw-r--r--fonts/roboto-fonts/PLIST18
-rw-r--r--fonts/sgi-fonts/Makefile12
-rw-r--r--fonts/sgi-fonts/PLIST74
-rw-r--r--fonts/takao-fonts-ttf/Makefile7
-rw-r--r--fonts/takao-fonts-ttf/PLIST14
-rw-r--r--fonts/tamsyn-font/Makefile5
-rw-r--r--fonts/tamsyn-font/PLIST50
-rw-r--r--fonts/terminus-font/Makefile10
-rw-r--r--fonts/terminus-font/PLIST470
-rw-r--r--fonts/thaixfonts/MESSAGE6
-rw-r--r--fonts/thaixfonts/Makefile5
-rw-r--r--fonts/thaixfonts/PLIST60
-rw-r--r--fonts/ttf-tlwg/Makefile5
-rw-r--r--fonts/ttf-tlwg/PLIST110
-rw-r--r--fonts/ubuntu-fonts/Makefile5
-rw-r--r--fonts/ubuntu-fonts/PLIST28
-rw-r--r--fonts/umefont-ttf/Makefile7
-rw-r--r--fonts/umefont-ttf/PLIST38
-rw-r--r--fonts/un-core-ttf/Makefile5
-rw-r--r--fonts/un-core-ttf/PLIST26
-rw-r--r--fonts/un-extra-ttf/Makefile5
-rw-r--r--fonts/un-extra-ttf/PLIST26
-rw-r--r--fonts/uni-vga/MESSAGE4
-rw-r--r--fonts/uni-vga/Makefile5
-rw-r--r--fonts/uni-vga/PLIST4
-rw-r--r--fonts/uralic-ttf/Makefile5
-rw-r--r--fonts/uralic-ttf/PLIST46
-rw-r--r--fonts/urbanrenewal-ttf/Makefile5
-rw-r--r--fonts/urbanrenewal-ttf/PLIST16
-rw-r--r--fonts/vera-ttf/Makefile8
-rw-r--r--fonts/vera-ttf/PLIST22
-rw-r--r--fonts/vlgothic-ttf/Makefile5
-rw-r--r--fonts/vlgothic-ttf/PLIST6
215 files changed, 4501 insertions, 4449 deletions
diff --git a/fonts/AnonymousPro/Makefile b/fonts/AnonymousPro/Makefile
index 3b3ff8e2159..0a0a7d79dbd 100644
--- a/fonts/AnonymousPro/Makefile
+++ b/fonts/AnonymousPro/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2013/04/08 01:42:39 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:31 wiz Exp $
#
DISTNAME= AnonymousPro-1.001
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://www.ms-studio.com/FontSales/
EXTRACT_SUFX= .zip
@@ -19,9 +20,9 @@ NO_BUILD= YES
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
-INSTALLATION_DIRS= lib/X11/fonts/TTF ${DOCSDIR}
+INSTALLATION_DIRS= share/fonts/X11/TTF ${DOCSDIR}
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
INSTALL_FONTS= AnonymousProB.ttf \
diff --git a/fonts/AnonymousPro/PLIST b/fonts/AnonymousPro/PLIST
index 66364ffda22..2b9bec03909 100644
--- a/fonts/AnonymousPro/PLIST
+++ b/fonts/AnonymousPro/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/09/03 18:24:47 wiz Exp $
-lib/X11/fonts/TTF/AnonymousProB.ttf
-lib/X11/fonts/TTF/AnonymousProBI.ttf
-lib/X11/fonts/TTF/AnonymousProI.ttf
-lib/X11/fonts/TTF/AnonymousPro.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:31 wiz Exp $
+share/fonts/X11/TTF/AnonymousProB.ttf
+share/fonts/X11/TTF/AnonymousProBI.ttf
+share/fonts/X11/TTF/AnonymousProI.ttf
+share/fonts/X11/TTF/AnonymousPro.ttf
share/doc/AnonymousPro/FONTLOG.txt
share/doc/AnonymousPro/OFL-FAQ.txt
share/doc/AnonymousPro/OFL.txt
diff --git a/fonts/EB-Garamond/Makefile b/fonts/EB-Garamond/Makefile
index 905814581c2..48241a7655b 100644
--- a/fonts/EB-Garamond/Makefile
+++ b/fonts/EB-Garamond/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2014/04/24 09:02:54 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:31 wiz Exp $
DISTNAME= EBGaramond-0.016
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= https://bitbucket.org/georgd/eb-garamond/downloads/
EXTRACT_SUFX= .zip
@@ -10,7 +11,7 @@ HOMEPAGE= http://www.georgduffner.at/ebgaramond/
COMMENT= Egenolff-Berner Garamond font
LICENSE= ofl-v1.1
-FONTS_DIRS.ttf= lib/X11/fonts/OTF
+FONTS_DIRS.ttf= share/fonts/X11/OTF
DOCDIR= share/doc/EBGaramond
INSTALLATION_DIRS= ${FONTS_DIRS.ttf} ${DOCDIR}
NO_CONFIGURE= yes
diff --git a/fonts/EB-Garamond/PLIST b/fonts/EB-Garamond/PLIST
index 217674256c5..b57ee8680cb 100644
--- a/fonts/EB-Garamond/PLIST
+++ b/fonts/EB-Garamond/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2014/04/24 09:02:54 wiz Exp $
-lib/X11/fonts/OTF/EBGaramond-Initials.otf
-lib/X11/fonts/OTF/EBGaramond-InitialsF1.otf
-lib/X11/fonts/OTF/EBGaramond-InitialsF2.otf
-lib/X11/fonts/OTF/EBGaramond08-Italic.otf
-lib/X11/fonts/OTF/EBGaramond08-Regular.otf
-lib/X11/fonts/OTF/EBGaramond12-AllSC.otf
-lib/X11/fonts/OTF/EBGaramond12-Italic.otf
-lib/X11/fonts/OTF/EBGaramond12-Regular.otf
-lib/X11/fonts/OTF/EBGaramondSC08-Regular.otf
-lib/X11/fonts/OTF/EBGaramondSC12-Regular.otf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:31 wiz Exp $
+share/fonts/X11/OTF/EBGaramond-Initials.otf
+share/fonts/X11/OTF/EBGaramond-InitialsF1.otf
+share/fonts/X11/OTF/EBGaramond-InitialsF2.otf
+share/fonts/X11/OTF/EBGaramond08-Italic.otf
+share/fonts/X11/OTF/EBGaramond08-Regular.otf
+share/fonts/X11/OTF/EBGaramond12-AllSC.otf
+share/fonts/X11/OTF/EBGaramond12-Italic.otf
+share/fonts/X11/OTF/EBGaramond12-Regular.otf
+share/fonts/X11/OTF/EBGaramondSC08-Regular.otf
+share/fonts/X11/OTF/EBGaramondSC12-Regular.otf
share/doc/EBGaramond/Specimen.pdf
diff --git a/fonts/TextFonts-ttf/Makefile b/fonts/TextFonts-ttf/Makefile
index 8125fd310ff..562a4e44008 100644
--- a/fonts/TextFonts-ttf/Makefile
+++ b/fonts/TextFonts-ttf/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 18:28:16 asau Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:31 wiz Exp $
#
DISTNAME= TextFonts
DDATE= 20111217
PKGNAME= TextFonts-ttf-${DDATE}
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://users.teilar.gr/~g1951d/
EXTRACT_SUFX= .zip
@@ -18,7 +19,7 @@ DIST_SUBDIR= TextFonts-${DDATE}
WRKSRC= ${WRKDIR}
USE_LANGUAGES= # none
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
INSTALLATION_DIRS= ${FONTDIR} share/doc/TextFonts-ttf
diff --git a/fonts/TextFonts-ttf/PLIST b/fonts/TextFonts-ttf/PLIST
index 35a5bbdd14a..03dc3324f21 100644
--- a/fonts/TextFonts-ttf/PLIST
+++ b/fonts/TextFonts-ttf/PLIST
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1 2012/07/14 21:18:26 wiz Exp $
-lib/X11/fonts/TTF/Alexander.ttf
-lib/X11/fonts/TTF/Alfios_B.ttf
-lib/X11/fonts/TTF/Alfios_I.ttf
-lib/X11/fonts/TTF/Alfios_J.ttf
-lib/X11/fonts/TTF/Alfios_R.ttf
-lib/X11/fonts/TTF/Anaktoria.ttf
-lib/X11/fonts/TTF/Aroania_B.ttf
-lib/X11/fonts/TTF/Aroania_R.ttf
-lib/X11/fonts/TTF/Atavyros.ttf
-lib/X11/fonts/TTF/Avdira_B.ttf
-lib/X11/fonts/TTF/Avdira_I.ttf
-lib/X11/fonts/TTF/Avdira_J.ttf
-lib/X11/fonts/TTF/Avdira_R.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:31 wiz Exp $
+share/fonts/X11/TTF/Alexander.ttf
+share/fonts/X11/TTF/Alfios_B.ttf
+share/fonts/X11/TTF/Alfios_I.ttf
+share/fonts/X11/TTF/Alfios_J.ttf
+share/fonts/X11/TTF/Alfios_R.ttf
+share/fonts/X11/TTF/Anaktoria.ttf
+share/fonts/X11/TTF/Aroania_B.ttf
+share/fonts/X11/TTF/Aroania_R.ttf
+share/fonts/X11/TTF/Atavyros.ttf
+share/fonts/X11/TTF/Avdira_B.ttf
+share/fonts/X11/TTF/Avdira_I.ttf
+share/fonts/X11/TTF/Avdira_J.ttf
+share/fonts/X11/TTF/Avdira_R.ttf
share/doc/TextFonts-ttf/TextFonts.pdf
diff --git a/fonts/Xg/Makefile b/fonts/Xg/Makefile
index 13a385b8ce9..b7344e1b2c4 100644
--- a/fonts/Xg/Makefile
+++ b/fonts/Xg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2012/10/03 18:28:16 asau Exp $
+# $NetBSD: Makefile,v 1.28 2014/06/01 16:35:31 wiz Exp $
DISTNAME= libXg.utf.fonts
PKGNAME= libXgFonts-1.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= fonts plan9
MASTER_SITES= ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
@@ -14,7 +14,7 @@ NO_BUILD= yes
USE_X11BASE= yes
USE_TOOLS+= bdftopcf gzip
-FONTS_DIRS.x11= ${PREFIX}/lib/X11/fonts/Xg
-REQD_DIRS= ${PREFIX}/lib/X11/fonts/Xg
+FONTS_DIRS.x11= ${PREFIX}/share/fonts/X11/Xg
+REQD_DIRS= ${PREFIX}/share/fonts/X11/Xg
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/Xg/PLIST b/fonts/Xg/PLIST
index c12ba3ebafa..98fdeae6f93 100644
--- a/fonts/Xg/PLIST
+++ b/fonts/Xg/PLIST
@@ -1,175 +1,175 @@
-@comment $NetBSD: PLIST,v 1.3 2012/02/21 06:39:54 sbd Exp $
-lib/X11/fonts/Xg/big5.4e00.16.pcf.gz
-lib/X11/fonts/Xg/big5.5000.16.pcf.gz
-lib/X11/fonts/Xg/big5.5200.16.pcf.gz
-lib/X11/fonts/Xg/big5.5400.16.pcf.gz
-lib/X11/fonts/Xg/big5.5600.16.pcf.gz
-lib/X11/fonts/Xg/big5.5800.16.pcf.gz
-lib/X11/fonts/Xg/big5.5a00.16.pcf.gz
-lib/X11/fonts/Xg/big5.5c00.16.pcf.gz
-lib/X11/fonts/Xg/big5.5e00.16.pcf.gz
-lib/X11/fonts/Xg/big5.6000.16.pcf.gz
-lib/X11/fonts/Xg/big5.6200.16.pcf.gz
-lib/X11/fonts/Xg/big5.6400.16.pcf.gz
-lib/X11/fonts/Xg/big5.6600.16.pcf.gz
-lib/X11/fonts/Xg/big5.6800.16.pcf.gz
-lib/X11/fonts/Xg/big5.6a00.16.pcf.gz
-lib/X11/fonts/Xg/big5.6c00.16.pcf.gz
-lib/X11/fonts/Xg/big5.6e00.16.pcf.gz
-lib/X11/fonts/Xg/big5.7000.16.pcf.gz
-lib/X11/fonts/Xg/big5.7200.16.pcf.gz
-lib/X11/fonts/Xg/big5.7400.16.pcf.gz
-lib/X11/fonts/Xg/big5.7600.16.pcf.gz
-lib/X11/fonts/Xg/big5.7800.16.pcf.gz
-lib/X11/fonts/Xg/big5.7a00.16.pcf.gz
-lib/X11/fonts/Xg/big5.7c00.16.pcf.gz
-lib/X11/fonts/Xg/big5.7e00.16.pcf.gz
-lib/X11/fonts/Xg/big5.8000.16.pcf.gz
-lib/X11/fonts/Xg/big5.8200.16.pcf.gz
-lib/X11/fonts/Xg/big5.8400.16.pcf.gz
-lib/X11/fonts/Xg/big5.8600.16.pcf.gz
-lib/X11/fonts/Xg/big5.8800.16.pcf.gz
-lib/X11/fonts/Xg/big5.8a00.16.pcf.gz
-lib/X11/fonts/Xg/big5.8c00.16.pcf.gz
-lib/X11/fonts/Xg/big5.8e00.16.pcf.gz
-lib/X11/fonts/Xg/big5.9000.16.pcf.gz
-lib/X11/fonts/Xg/big5.9200.16.pcf.gz
-lib/X11/fonts/Xg/big5.9400.16.pcf.gz
-lib/X11/fonts/Xg/big5.9600.16.pcf.gz
-lib/X11/fonts/Xg/big5.9800.16.pcf.gz
-lib/X11/fonts/Xg/big5.9a00.16.pcf.gz
-lib/X11/fonts/Xg/big5.9c00.16.pcf.gz
-lib/X11/fonts/Xg/big5.9e00.16.pcf.gz
-lib/X11/fonts/Xg/jis.hiragana.16.pcf.gz
-lib/X11/fonts/Xg/jis.hiragana.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis3000.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis3000.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis4e00.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis4e00.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis5000.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis5000.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis5200.16.pcf.gz
-lib/X11/fonts/Xg/lucm.greek.9.pcf.gz
-lib/X11/fonts/Xg/jis.jis5200.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis5400.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis5400.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis5600.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis5600.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis5800.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis5800.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis5a00.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis5a00.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis5c00.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis5c00.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis5e00.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis5e00.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis6000.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis6000.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis6200.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis6200.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis6400.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis6400.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis6600.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis6600.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis6800.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis6800.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis6a00.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis6a00.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis6c00.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis6c00.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis6e00.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis6e00.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis7000.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis7000.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis7200.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis7200.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis7400.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis7400.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis7600.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis7600.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis7800.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis7800.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis7a00.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis7a00.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis7c00.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis7c00.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis7e00.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis7e00.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis8000.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis8000.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis8200.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis8200.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis8400.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis8400.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis8600.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis8600.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis8800.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis8800.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis8a00.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis8a00.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis8c00.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis8c00.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis8e00.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis8e00.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis9000.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis9000.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis9200.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis9200.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis9400.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis9400.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis9600.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis9600.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis9800.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis9800.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis9a00.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis9a00.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis9c00.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis9c00.24.pcf.gz
-lib/X11/fonts/Xg/jis.jis9e00.16.pcf.gz
-lib/X11/fonts/Xg/jis.jis9e00.24.pcf.gz
-lib/X11/fonts/Xg/jis.katakana.16.pcf.gz
-lib/X11/fonts/Xg/jis.katakana.24.pcf.gz
-lib/X11/fonts/Xg/lucm.currency.9.pcf.gz
-lib/X11/fonts/Xg/lucm.genpunc.9.pcf.gz
-lib/X11/fonts/Xg/lucm.ipa.9.pcf.gz
-lib/X11/fonts/Xg/lucm.latin1.9.pcf.gz
-lib/X11/fonts/Xg/lucm.latineur.9.pcf.gz
-lib/X11/fonts/Xg/lucm.supsub.9.pcf.gz
-lib/X11/fonts/Xg/matty.blocks.pcf.gz
-lib/X11/fonts/Xg/matty.chart.pcf.gz
-lib/X11/fonts/Xg/matty.geometric.pcf.gz
-lib/X11/fonts/Xg/matty.hebrew.9.pcf.gz
-lib/X11/fonts/Xg/matty.latin1.9.pcf.gz
-lib/X11/fonts/Xg/matty.hebrew.9.orig.pcf.gz
-lib/X11/fonts/Xg/matty.math1.pcf.gz
-lib/X11/fonts/Xg/matty.hebrew.9.short.pcf.gz
-lib/X11/fonts/Xg/matty.letterlike.9.pcf.gz
-lib/X11/fonts/Xg/matty.math2.pcf.gz
-lib/X11/fonts/Xg/matty.tech.pcf.gz
-lib/X11/fonts/Xg/matty.tengwar.9.24.pcf.gz
-lib/X11/fonts/Xg/matty.tengwar.9.pcf.gz
-lib/X11/fonts/Xg/misc.arrows.pcf.gz
-lib/X11/fonts/Xg/misc.chart.pcf.gz
-lib/X11/fonts/Xg/misc.cyrillic.9.pcf.gz
-lib/X11/fonts/Xg/misc.ding.pcf.gz
-lib/X11/fonts/Xg/misc.genpunc.8.pcf.gz
-lib/X11/fonts/Xg/misc.greek.8.pcf.gz
-lib/X11/fonts/Xg/misc.ipa.8.pcf.gz
-lib/X11/fonts/Xg/misc.letterlike.8.pcf.gz
-lib/X11/fonts/Xg/misc.math1.pcf.gz
-lib/X11/fonts/Xg/misc.math2.pcf.gz
-lib/X11/fonts/Xg/misc.tech.pcf.gz
-lib/X11/fonts/Xg/misc.zapf.pcf.gz
-lib/X11/fonts/Xg/pelm.ascii.10.pcf.gz
-lib/X11/fonts/Xg/pelm.ascii.12.pcf.gz
-lib/X11/fonts/Xg/pelm.ascii.16.pcf.gz
-lib/X11/fonts/Xg/smiley.0.pcf.gz
-lib/X11/fonts/Xg/pelm.currency.9.pcf.gz
-lib/X11/fonts/Xg/pelm.fffd.9.pcf.gz
-lib/X11/fonts/Xg/pelm.latin1.8.pcf.gz
-lib/X11/fonts/Xg/pelm.latin1.9.pcf.gz
-lib/X11/fonts/Xg/pelm.latineur.8.pcf.gz
-lib/X11/fonts/Xg/pelm.latineur.9.pcf.gz
-lib/X11/fonts/Xg/pelm.supsub.8.pcf.gz
-lib/X11/fonts/Xg/pelm.supsub.9.pcf.gz
-lib/X11/fonts/Xg/unicode.9.font
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:31 wiz Exp $
+share/fonts/X11/Xg/big5.4e00.16.pcf.gz
+share/fonts/X11/Xg/big5.5000.16.pcf.gz
+share/fonts/X11/Xg/big5.5200.16.pcf.gz
+share/fonts/X11/Xg/big5.5400.16.pcf.gz
+share/fonts/X11/Xg/big5.5600.16.pcf.gz
+share/fonts/X11/Xg/big5.5800.16.pcf.gz
+share/fonts/X11/Xg/big5.5a00.16.pcf.gz
+share/fonts/X11/Xg/big5.5c00.16.pcf.gz
+share/fonts/X11/Xg/big5.5e00.16.pcf.gz
+share/fonts/X11/Xg/big5.6000.16.pcf.gz
+share/fonts/X11/Xg/big5.6200.16.pcf.gz
+share/fonts/X11/Xg/big5.6400.16.pcf.gz
+share/fonts/X11/Xg/big5.6600.16.pcf.gz
+share/fonts/X11/Xg/big5.6800.16.pcf.gz
+share/fonts/X11/Xg/big5.6a00.16.pcf.gz
+share/fonts/X11/Xg/big5.6c00.16.pcf.gz
+share/fonts/X11/Xg/big5.6e00.16.pcf.gz
+share/fonts/X11/Xg/big5.7000.16.pcf.gz
+share/fonts/X11/Xg/big5.7200.16.pcf.gz
+share/fonts/X11/Xg/big5.7400.16.pcf.gz
+share/fonts/X11/Xg/big5.7600.16.pcf.gz
+share/fonts/X11/Xg/big5.7800.16.pcf.gz
+share/fonts/X11/Xg/big5.7a00.16.pcf.gz
+share/fonts/X11/Xg/big5.7c00.16.pcf.gz
+share/fonts/X11/Xg/big5.7e00.16.pcf.gz
+share/fonts/X11/Xg/big5.8000.16.pcf.gz
+share/fonts/X11/Xg/big5.8200.16.pcf.gz
+share/fonts/X11/Xg/big5.8400.16.pcf.gz
+share/fonts/X11/Xg/big5.8600.16.pcf.gz
+share/fonts/X11/Xg/big5.8800.16.pcf.gz
+share/fonts/X11/Xg/big5.8a00.16.pcf.gz
+share/fonts/X11/Xg/big5.8c00.16.pcf.gz
+share/fonts/X11/Xg/big5.8e00.16.pcf.gz
+share/fonts/X11/Xg/big5.9000.16.pcf.gz
+share/fonts/X11/Xg/big5.9200.16.pcf.gz
+share/fonts/X11/Xg/big5.9400.16.pcf.gz
+share/fonts/X11/Xg/big5.9600.16.pcf.gz
+share/fonts/X11/Xg/big5.9800.16.pcf.gz
+share/fonts/X11/Xg/big5.9a00.16.pcf.gz
+share/fonts/X11/Xg/big5.9c00.16.pcf.gz
+share/fonts/X11/Xg/big5.9e00.16.pcf.gz
+share/fonts/X11/Xg/jis.hiragana.16.pcf.gz
+share/fonts/X11/Xg/jis.hiragana.24.pcf.gz
+share/fonts/X11/Xg/jis.jis3000.16.pcf.gz
+share/fonts/X11/Xg/jis.jis3000.24.pcf.gz
+share/fonts/X11/Xg/jis.jis4e00.16.pcf.gz
+share/fonts/X11/Xg/jis.jis4e00.24.pcf.gz
+share/fonts/X11/Xg/jis.jis5000.16.pcf.gz
+share/fonts/X11/Xg/jis.jis5000.24.pcf.gz
+share/fonts/X11/Xg/jis.jis5200.16.pcf.gz
+share/fonts/X11/Xg/lucm.greek.9.pcf.gz
+share/fonts/X11/Xg/jis.jis5200.24.pcf.gz
+share/fonts/X11/Xg/jis.jis5400.16.pcf.gz
+share/fonts/X11/Xg/jis.jis5400.24.pcf.gz
+share/fonts/X11/Xg/jis.jis5600.16.pcf.gz
+share/fonts/X11/Xg/jis.jis5600.24.pcf.gz
+share/fonts/X11/Xg/jis.jis5800.16.pcf.gz
+share/fonts/X11/Xg/jis.jis5800.24.pcf.gz
+share/fonts/X11/Xg/jis.jis5a00.16.pcf.gz
+share/fonts/X11/Xg/jis.jis5a00.24.pcf.gz
+share/fonts/X11/Xg/jis.jis5c00.16.pcf.gz
+share/fonts/X11/Xg/jis.jis5c00.24.pcf.gz
+share/fonts/X11/Xg/jis.jis5e00.16.pcf.gz
+share/fonts/X11/Xg/jis.jis5e00.24.pcf.gz
+share/fonts/X11/Xg/jis.jis6000.16.pcf.gz
+share/fonts/X11/Xg/jis.jis6000.24.pcf.gz
+share/fonts/X11/Xg/jis.jis6200.16.pcf.gz
+share/fonts/X11/Xg/jis.jis6200.24.pcf.gz
+share/fonts/X11/Xg/jis.jis6400.16.pcf.gz
+share/fonts/X11/Xg/jis.jis6400.24.pcf.gz
+share/fonts/X11/Xg/jis.jis6600.16.pcf.gz
+share/fonts/X11/Xg/jis.jis6600.24.pcf.gz
+share/fonts/X11/Xg/jis.jis6800.16.pcf.gz
+share/fonts/X11/Xg/jis.jis6800.24.pcf.gz
+share/fonts/X11/Xg/jis.jis6a00.16.pcf.gz
+share/fonts/X11/Xg/jis.jis6a00.24.pcf.gz
+share/fonts/X11/Xg/jis.jis6c00.16.pcf.gz
+share/fonts/X11/Xg/jis.jis6c00.24.pcf.gz
+share/fonts/X11/Xg/jis.jis6e00.16.pcf.gz
+share/fonts/X11/Xg/jis.jis6e00.24.pcf.gz
+share/fonts/X11/Xg/jis.jis7000.16.pcf.gz
+share/fonts/X11/Xg/jis.jis7000.24.pcf.gz
+share/fonts/X11/Xg/jis.jis7200.16.pcf.gz
+share/fonts/X11/Xg/jis.jis7200.24.pcf.gz
+share/fonts/X11/Xg/jis.jis7400.16.pcf.gz
+share/fonts/X11/Xg/jis.jis7400.24.pcf.gz
+share/fonts/X11/Xg/jis.jis7600.16.pcf.gz
+share/fonts/X11/Xg/jis.jis7600.24.pcf.gz
+share/fonts/X11/Xg/jis.jis7800.16.pcf.gz
+share/fonts/X11/Xg/jis.jis7800.24.pcf.gz
+share/fonts/X11/Xg/jis.jis7a00.16.pcf.gz
+share/fonts/X11/Xg/jis.jis7a00.24.pcf.gz
+share/fonts/X11/Xg/jis.jis7c00.16.pcf.gz
+share/fonts/X11/Xg/jis.jis7c00.24.pcf.gz
+share/fonts/X11/Xg/jis.jis7e00.16.pcf.gz
+share/fonts/X11/Xg/jis.jis7e00.24.pcf.gz
+share/fonts/X11/Xg/jis.jis8000.16.pcf.gz
+share/fonts/X11/Xg/jis.jis8000.24.pcf.gz
+share/fonts/X11/Xg/jis.jis8200.16.pcf.gz
+share/fonts/X11/Xg/jis.jis8200.24.pcf.gz
+share/fonts/X11/Xg/jis.jis8400.16.pcf.gz
+share/fonts/X11/Xg/jis.jis8400.24.pcf.gz
+share/fonts/X11/Xg/jis.jis8600.16.pcf.gz
+share/fonts/X11/Xg/jis.jis8600.24.pcf.gz
+share/fonts/X11/Xg/jis.jis8800.16.pcf.gz
+share/fonts/X11/Xg/jis.jis8800.24.pcf.gz
+share/fonts/X11/Xg/jis.jis8a00.16.pcf.gz
+share/fonts/X11/Xg/jis.jis8a00.24.pcf.gz
+share/fonts/X11/Xg/jis.jis8c00.16.pcf.gz
+share/fonts/X11/Xg/jis.jis8c00.24.pcf.gz
+share/fonts/X11/Xg/jis.jis8e00.16.pcf.gz
+share/fonts/X11/Xg/jis.jis8e00.24.pcf.gz
+share/fonts/X11/Xg/jis.jis9000.16.pcf.gz
+share/fonts/X11/Xg/jis.jis9000.24.pcf.gz
+share/fonts/X11/Xg/jis.jis9200.16.pcf.gz
+share/fonts/X11/Xg/jis.jis9200.24.pcf.gz
+share/fonts/X11/Xg/jis.jis9400.16.pcf.gz
+share/fonts/X11/Xg/jis.jis9400.24.pcf.gz
+share/fonts/X11/Xg/jis.jis9600.16.pcf.gz
+share/fonts/X11/Xg/jis.jis9600.24.pcf.gz
+share/fonts/X11/Xg/jis.jis9800.16.pcf.gz
+share/fonts/X11/Xg/jis.jis9800.24.pcf.gz
+share/fonts/X11/Xg/jis.jis9a00.16.pcf.gz
+share/fonts/X11/Xg/jis.jis9a00.24.pcf.gz
+share/fonts/X11/Xg/jis.jis9c00.16.pcf.gz
+share/fonts/X11/Xg/jis.jis9c00.24.pcf.gz
+share/fonts/X11/Xg/jis.jis9e00.16.pcf.gz
+share/fonts/X11/Xg/jis.jis9e00.24.pcf.gz
+share/fonts/X11/Xg/jis.katakana.16.pcf.gz
+share/fonts/X11/Xg/jis.katakana.24.pcf.gz
+share/fonts/X11/Xg/lucm.currency.9.pcf.gz
+share/fonts/X11/Xg/lucm.genpunc.9.pcf.gz
+share/fonts/X11/Xg/lucm.ipa.9.pcf.gz
+share/fonts/X11/Xg/lucm.latin1.9.pcf.gz
+share/fonts/X11/Xg/lucm.latineur.9.pcf.gz
+share/fonts/X11/Xg/lucm.supsub.9.pcf.gz
+share/fonts/X11/Xg/matty.blocks.pcf.gz
+share/fonts/X11/Xg/matty.chart.pcf.gz
+share/fonts/X11/Xg/matty.geometric.pcf.gz
+share/fonts/X11/Xg/matty.hebrew.9.pcf.gz
+share/fonts/X11/Xg/matty.latin1.9.pcf.gz
+share/fonts/X11/Xg/matty.hebrew.9.orig.pcf.gz
+share/fonts/X11/Xg/matty.math1.pcf.gz
+share/fonts/X11/Xg/matty.hebrew.9.short.pcf.gz
+share/fonts/X11/Xg/matty.letterlike.9.pcf.gz
+share/fonts/X11/Xg/matty.math2.pcf.gz
+share/fonts/X11/Xg/matty.tech.pcf.gz
+share/fonts/X11/Xg/matty.tengwar.9.24.pcf.gz
+share/fonts/X11/Xg/matty.tengwar.9.pcf.gz
+share/fonts/X11/Xg/misc.arrows.pcf.gz
+share/fonts/X11/Xg/misc.chart.pcf.gz
+share/fonts/X11/Xg/misc.cyrillic.9.pcf.gz
+share/fonts/X11/Xg/misc.ding.pcf.gz
+share/fonts/X11/Xg/misc.genpunc.8.pcf.gz
+share/fonts/X11/Xg/misc.greek.8.pcf.gz
+share/fonts/X11/Xg/misc.ipa.8.pcf.gz
+share/fonts/X11/Xg/misc.letterlike.8.pcf.gz
+share/fonts/X11/Xg/misc.math1.pcf.gz
+share/fonts/X11/Xg/misc.math2.pcf.gz
+share/fonts/X11/Xg/misc.tech.pcf.gz
+share/fonts/X11/Xg/misc.zapf.pcf.gz
+share/fonts/X11/Xg/pelm.ascii.10.pcf.gz
+share/fonts/X11/Xg/pelm.ascii.12.pcf.gz
+share/fonts/X11/Xg/pelm.ascii.16.pcf.gz
+share/fonts/X11/Xg/smiley.0.pcf.gz
+share/fonts/X11/Xg/pelm.currency.9.pcf.gz
+share/fonts/X11/Xg/pelm.fffd.9.pcf.gz
+share/fonts/X11/Xg/pelm.latin1.8.pcf.gz
+share/fonts/X11/Xg/pelm.latin1.9.pcf.gz
+share/fonts/X11/Xg/pelm.latineur.8.pcf.gz
+share/fonts/X11/Xg/pelm.latineur.9.pcf.gz
+share/fonts/X11/Xg/pelm.supsub.8.pcf.gz
+share/fonts/X11/Xg/pelm.supsub.9.pcf.gz
+share/fonts/X11/Xg/unicode.9.font
diff --git a/fonts/Xg/distinfo b/fonts/Xg/distinfo
index c14d6954102..41ab35d8395 100644
--- a/fonts/Xg/distinfo
+++ b/fonts/Xg/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2012/02/21 06:39:54 sbd Exp $
+$NetBSD: distinfo,v 1.6 2014/06/01 16:35:31 wiz Exp $
SHA1 (libXg.utf.fonts.tar.gz) = 9c2088486cd8644a3771cc97e818a8ac43ce6f22
RMD160 (libXg.utf.fonts.tar.gz) = b6314b4b3179c0851b1bb98eac21accaa2f2263c
Size (libXg.utf.fonts.tar.gz) = 1147674 bytes
-SHA1 (patch-aa) = 91374446ea9b5608a9e0ddb03b6b883c9e102396
+SHA1 (patch-aa) = 26fc6f9d190857ea47a21df17be1b2bd4effea87
diff --git a/fonts/Xg/patches/patch-aa b/fonts/Xg/patches/patch-aa
index 9ba440a5172..9721b85fa08 100644
--- a/fonts/Xg/patches/patch-aa
+++ b/fonts/Xg/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.4 2012/02/21 06:39:54 sbd Exp $
+$NetBSD: patch-aa,v 1.5 2014/06/01 16:35:31 wiz Exp $
--- Makefile.orig 2009-12-17 17:28:59.000000000 +0000
+++ Makefile
@@ -0,0 +1,15 @@
+
-+FONTDIR=$(DESTDIR)$(PREFIX)/lib/X11/fonts/Xg
++FONTDIR=$(DESTDIR)$(PREFIX)/share/fonts/X11/Xg
+
+all:
+ @echo nothing to be done for \`$@\'
diff --git a/fonts/ae-mono-ttf/Makefile b/fonts/ae-mono-ttf/Makefile
index c5f56b04884..6a8c826315d 100644
--- a/fonts/ae-mono-ttf/Makefile
+++ b/fonts/ae-mono-ttf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 18:28:16 asau Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:32 wiz Exp $
#
DISTNAME= ae_fonts_mono
PKGNAME= ae-mono-ttf-${VERSION}
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=arabeyes/}
EXTRACT_SUFX= .tar.bz2
@@ -16,9 +17,9 @@ NO_CONFIGURE= yes
USE_LANGUAGES= # none
VERSION= 1.0
-FONTS_DIRS.x11= ${PREFIX}/lib/X11/fonts/ae-mono-ttf
+FONTS_DIRS.x11= ${PREFIX}/share/fonts/X11/ae-mono-ttf
-INSTALLATION_DIRS= lib/X11/fonts/ae-mono-ttf
+INSTALLATION_DIRS= share/fonts/X11/ae-mono-ttf
do-install:
${INSTALL_DATA} ${WRKSRC}/10x21.bdf ${DESTDIR}${FONTS_DIRS.x11}
diff --git a/fonts/ae-mono-ttf/PLIST b/fonts/ae-mono-ttf/PLIST
index 1ec0b8770bb..e4a3ed9b8da 100644
--- a/fonts/ae-mono-ttf/PLIST
+++ b/fonts/ae-mono-ttf/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/09/16 23:41:37 wiz Exp $
-lib/X11/fonts/ae-mono-ttf/10x21.bdf
-lib/X11/fonts/ae-mono-ttf/10x21.pcf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:32 wiz Exp $
+share/fonts/X11/ae-mono-ttf/10x21.bdf
+share/fonts/X11/ae-mono-ttf/10x21.pcf
diff --git a/fonts/alee-ttf/Makefile b/fonts/alee-ttf/Makefile
index 2e268b76111..a3004a7e574 100644
--- a/fonts/alee-ttf/Makefile
+++ b/fonts/alee-ttf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2013/04/06 03:45:13 rodent Exp $
+# $NetBSD: Makefile,v 1.23 2014/06/01 16:35:32 wiz Exp $
#
DISTNAME= ttf-alee_12
PKGNAME= ${DISTNAME:S/ttf-alee_/alee-ttf-/}
+PKGREVISION= 1
CATEGORIES= fonts korean
MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/t/ttf-alee/}
@@ -15,13 +16,13 @@ NO_CONFIGURE= YES
NO_BUILD= YES
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
-FONTS_DIRS.ttf= lib/X11/fonts/TTF
-FONTS_DIRS.x11= lib/X11/fonts/TTF
+FONTS_DIRS.ttf= share/fonts/X11/TTF
+FONTS_DIRS.x11= share/fonts/X11/TTF
-INSTALLATION_DIRS= lib/X11/fonts/TTF share/doc/alee-ttf
+INSTALLATION_DIRS= share/fonts/X11/TTF share/doc/alee-ttf
do-install:
- ${INSTALL_DATA} ${WRKSRC}/*.ttf ${DESTDIR}${PREFIX}/lib/X11/fonts/TTF
+ ${INSTALL_DATA} ${WRKSRC}/*.ttf ${DESTDIR}${PREFIX}/share/fonts/X11/TTF
${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/alee-ttf
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/alee-ttf/PLIST b/fonts/alee-ttf/PLIST
index 0541f3d96df..ef997bf5ca3 100644
--- a/fonts/alee-ttf/PLIST
+++ b/fonts/alee-ttf/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.14 2011/02/06 00:33:06 ryoon Exp $
-lib/X11/fonts/TTF/Bandal.ttf
-lib/X11/fonts/TTF/Bangwool.ttf
-lib/X11/fonts/TTF/Eunjin.ttf
-lib/X11/fonts/TTF/EunjinNakseo.ttf
-lib/X11/fonts/TTF/Guseul.ttf
+@comment $NetBSD: PLIST,v 1.15 2014/06/01 16:35:32 wiz Exp $
+share/fonts/X11/TTF/Bandal.ttf
+share/fonts/X11/TTF/Bangwool.ttf
+share/fonts/X11/TTF/Eunjin.ttf
+share/fonts/X11/TTF/EunjinNakseo.ttf
+share/fonts/X11/TTF/Guseul.ttf
share/doc/alee-ttf/COPYING
diff --git a/fonts/arphic-ttf/Makefile b/fonts/arphic-ttf/Makefile
index b32306eb163..7f8ab2b21ad 100644
--- a/fonts/arphic-ttf/Makefile
+++ b/fonts/arphic-ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2013/04/19 11:26:47 rodent Exp $
+# $NetBSD: Makefile,v 1.20 2014/06/01 16:35:32 wiz Exp $
#
DISTNAME= arphic-ttf-2.11
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= fonts
MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/keith/zh-arphicttf/
DISTFILES= ${FONT_FILES:=.gz} ${MISC_FILES}
@@ -23,7 +23,7 @@ USE_X11BASE= YES
NO_CONFIGURE= YES
NO_BUILD= YES
-FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
DOCDIR= ${PREFIX}/share/doc/arphic-ttf
do-install:
diff --git a/fonts/arphic-ttf/PLIST b/fonts/arphic-ttf/PLIST
index f04b01a0368..773ff587d9e 100644
--- a/fonts/arphic-ttf/PLIST
+++ b/fonts/arphic-ttf/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:54:10 joerg Exp $
-lib/X11/fonts/TTF/bkai00mp.ttf
-lib/X11/fonts/TTF/bsmi00lp.ttf
-lib/X11/fonts/TTF/gbsn00lp.ttf
-lib/X11/fonts/TTF/gkai00mp.ttf
+@comment $NetBSD: PLIST,v 1.5 2014/06/01 16:35:32 wiz Exp $
+share/fonts/X11/TTF/bkai00mp.ttf
+share/fonts/X11/TTF/bsmi00lp.ttf
+share/fonts/X11/TTF/gbsn00lp.ttf
+share/fonts/X11/TTF/gkai00mp.ttf
share/doc/arphic-ttf/ARPHICPL.TXT
share/doc/arphic-ttf/logo.gif
share/doc/arphic-ttf/release.txt
diff --git a/fonts/artwiz-fonts/MESSAGE b/fonts/artwiz-fonts/MESSAGE
index 5035fae2f7c..cfb2c6db78d 100644
--- a/fonts/artwiz-fonts/MESSAGE
+++ b/fonts/artwiz-fonts/MESSAGE
@@ -1,8 +1,8 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/08/30 14:23:40 xtraeme Exp $
+$NetBSD: MESSAGE,v 1.2 2014/06/01 16:35:32 wiz Exp $
You may wish to add the artwiz directory to your /etc/X11/XF86Config:
- FontPath "${PREFIX}/lib/X11/fonts/artwiz/"
+ FontPath "${PREFIX}/share/fonts/X11/artwiz/"
===========================================================================
diff --git a/fonts/artwiz-fonts/Makefile b/fonts/artwiz-fonts/Makefile
index 37f8a712ef6..f6d7dd3ed7f 100644
--- a/fonts/artwiz-fonts/Makefile
+++ b/fonts/artwiz-fonts/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 18:28:17 asau Exp $
+# $NetBSD: Makefile,v 1.17 2014/06/01 16:35:32 wiz Exp $
#
DISTNAME= artwiz-aleczapka-1.3
PKGNAME= ${DISTNAME:S/aleczapka/fonts/}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= fonts
MASTER_SITES= http://fluxbox.org/artwiz-aleczapka/
EXTRACT_SUFX= .tar.bz2
@@ -18,10 +18,10 @@ USE_X11BASE= yes
NO_BUILD= yes
NO_CONFIGURE= yes
-FONTS_DIRS.x11= ${PREFIX}/lib/X11/fonts/artwiz
-REQD_DIRS= ${PREFIX}/lib/X11/fonts/artwiz
+FONTS_DIRS.x11= ${PREFIX}/share/fonts/X11/artwiz
+REQD_DIRS= ${PREFIX}/share/fonts/X11/artwiz
-INSTALLATION_DIRS= lib/X11/fonts/artwiz
+INSTALLATION_DIRS= share/fonts/X11/artwiz
do-install:
for i in ${WRKSRC}/*.pcf; do \
diff --git a/fonts/artwiz-fonts/PLIST b/fonts/artwiz-fonts/PLIST
index b7cf32894c0..976fa4cf150 100644
--- a/fonts/artwiz-fonts/PLIST
+++ b/fonts/artwiz-fonts/PLIST
@@ -1,18 +1,18 @@
-@comment $NetBSD: PLIST,v 1.2 2003/12/19 23:40:17 jmmv Exp $
-lib/X11/fonts/artwiz/anorexia.pcf
-lib/X11/fonts/artwiz/aqui.pcf
-lib/X11/fonts/artwiz/cure.pcf
-lib/X11/fonts/artwiz/cursor.pcf
-lib/X11/fonts/artwiz/drift.pcf
-lib/X11/fonts/artwiz/edges.pcf
-lib/X11/fonts/artwiz/fkp.pcf
-lib/X11/fonts/artwiz/gelly.pcf
-lib/X11/fonts/artwiz/glisp-bold.pcf
-lib/X11/fonts/artwiz/glisp.pcf
-lib/X11/fonts/artwiz/kates.pcf
-lib/X11/fonts/artwiz/lime.pcf
-lib/X11/fonts/artwiz/mints-mild.pcf
-lib/X11/fonts/artwiz/mints-strong.pcf
-lib/X11/fonts/artwiz/nu.pcf
-lib/X11/fonts/artwiz/smoothansi.pcf
-lib/X11/fonts/artwiz/snap.pcf
+@comment $NetBSD: PLIST,v 1.3 2014/06/01 16:35:32 wiz Exp $
+share/fonts/X11/artwiz/anorexia.pcf
+share/fonts/X11/artwiz/aqui.pcf
+share/fonts/X11/artwiz/cure.pcf
+share/fonts/X11/artwiz/cursor.pcf
+share/fonts/X11/artwiz/drift.pcf
+share/fonts/X11/artwiz/edges.pcf
+share/fonts/X11/artwiz/fkp.pcf
+share/fonts/X11/artwiz/gelly.pcf
+share/fonts/X11/artwiz/glisp-bold.pcf
+share/fonts/X11/artwiz/glisp.pcf
+share/fonts/X11/artwiz/kates.pcf
+share/fonts/X11/artwiz/lime.pcf
+share/fonts/X11/artwiz/mints-mild.pcf
+share/fonts/X11/artwiz/mints-strong.pcf
+share/fonts/X11/artwiz/nu.pcf
+share/fonts/X11/artwiz/smoothansi.pcf
+share/fonts/X11/artwiz/snap.pcf
diff --git a/fonts/baekmuk-ttf/Makefile b/fonts/baekmuk-ttf/Makefile
index 758494f1e46..e65227d1de6 100644
--- a/fonts/baekmuk-ttf/Makefile
+++ b/fonts/baekmuk-ttf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2012/10/03 18:28:17 asau Exp $
+# $NetBSD: Makefile,v 1.18 2014/06/01 16:35:32 wiz Exp $
DISTNAME= baekmuk-ttf-2.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= fonts korean
MASTER_SITES= http://kldp.net/download.php/1429/
@@ -13,7 +13,7 @@ USE_X11BASE= YES
NO_CONFIGURE= YES
NO_BUILD= YES
-FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
DOCDIR= ${PREFIX}/share/doc/baekmuk-ttf
do-install:
diff --git a/fonts/baekmuk-ttf/PLIST b/fonts/baekmuk-ttf/PLIST
index cc33f0923cc..af55a879076 100644
--- a/fonts/baekmuk-ttf/PLIST
+++ b/fonts/baekmuk-ttf/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:54:10 joerg Exp $
-lib/X11/fonts/TTF/batang.ttf
-lib/X11/fonts/TTF/dotum.ttf
-lib/X11/fonts/TTF/gulim.ttf
-lib/X11/fonts/TTF/hline.ttf
+@comment $NetBSD: PLIST,v 1.6 2014/06/01 16:35:32 wiz Exp $
+share/fonts/X11/TTF/batang.ttf
+share/fonts/X11/TTF/dotum.ttf
+share/fonts/X11/TTF/gulim.ttf
+share/fonts/X11/TTF/hline.ttf
share/doc/baekmuk-ttf/COPYRIGHT
share/doc/baekmuk-ttf/COPYRIGHT.ks
diff --git a/fonts/biznet-iso8859_2/MESSAGE b/fonts/biznet-iso8859_2/MESSAGE
index a4c1b74dafd..92e8a82fcfc 100644
--- a/fonts/biznet-iso8859_2/MESSAGE
+++ b/fonts/biznet-iso8859_2/MESSAGE
@@ -1,12 +1,12 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/03/17 14:17:44 skrll Exp $
+$NetBSD: MESSAGE,v 1.2 2014/06/01 16:35:32 wiz Exp $
You can tell one existing X session on the installed host to use the
new "biznet-iso8859-2" fonts with:
- $ xset +fp ${PREFIX}/lib/X11/fonts/biznet/100dpi/
- $ xset +fp ${PREFIX}/lib/X11/fonts/biznet/75dpi/
- $ xset +fp ${PREFIX}/lib/X11/fonts/biznet/misc/
+ $ xset +fp ${PREFIX}/share/fonts/X11/biznet/100dpi/
+ $ xset +fp ${PREFIX}/share/fonts/X11/biznet/75dpi/
+ $ xset +fp ${PREFIX}/share/fonts/X11/biznet/misc/
$ xset fp rehash
To make the effect permanent for future X sessions, you will have to
@@ -26,12 +26,12 @@ biznet-iso8859-2 install directory to the xfs/config file in the comma
separated list of directories given for the "catalogue" setting.
For example:
- catalogue = ${PREFIX}/lib/X11/fonts/misc/,
- ${PREFIX}/lib/X11/fonts/Speedo/,
- ${PREFIX}/lib/X11/fonts/Type1/,
- ${PREFIX}/lib/X11/fonts/100dpi/,
- ${PREFIX}/lib/X11/fonts/75dpi/,
- ${PREFIX}/lib/X11/fonts/biznet/100dpi/,
- ${PREFIX}/lib/X11/fonts/biznet/75dpi/,
- ${PREFIX}/lib/X11/fonts/biznet/misc/
+ catalogue = ${PREFIX}/share/fonts/X11/misc/,
+ ${PREFIX}/share/fonts/X11/Speedo/,
+ ${PREFIX}/share/fonts/X11/Type1/,
+ ${PREFIX}/share/fonts/X11/100dpi/,
+ ${PREFIX}/share/fonts/X11/75dpi/,
+ ${PREFIX}/share/fonts/X11/biznet/100dpi/,
+ ${PREFIX}/share/fonts/X11/biznet/75dpi/,
+ ${PREFIX}/share/fonts/X11/biznet/misc/
===========================================================================
diff --git a/fonts/biznet-iso8859_2/Makefile b/fonts/biznet-iso8859_2/Makefile
index 35c9a6c5838..9a8c5a689e1 100644
--- a/fonts/biznet-iso8859_2/Makefile
+++ b/fonts/biznet-iso8859_2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 18:28:17 asau Exp $
+# $NetBSD: Makefile,v 1.17 2014/06/01 16:35:32 wiz Exp $
#
DISTNAME= ISO8859-2-pcf
PKGNAME= biznet-iso8859_2-1.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= fonts x11
MASTER_SITES= http://ultra.cto.us.edu.pl/pub/Unix/Fonts/
@@ -17,7 +17,7 @@ NO_BUILD= YES
USE_TOOLS+= gzip
-FONTDIR= ${PREFIX}/lib/X11/fonts/biznet
+FONTDIR= ${PREFIX}/share/fonts/X11/biznet
REQD_DIRS= ${FONTDIR} ${FONTDIR}/75dpi ${FONTDIR}/100dpi ${FONTDIR}/misc
FONTS_DIRS.x11= ${FONTDIR}/75dpi ${FONTDIR}/100dpi ${FONTDIR}/misc
diff --git a/fonts/biznet-iso8859_2/PLIST b/fonts/biznet-iso8859_2/PLIST
index c6f6be332e1..d1dbe86b418 100644
--- a/fonts/biznet-iso8859_2/PLIST
+++ b/fonts/biznet-iso8859_2/PLIST
@@ -1,399 +1,399 @@
-@comment $NetBSD: PLIST,v 1.4 2006/09/22 21:53:56 joerg Exp $
-lib/X11/fonts/biznet/100dpi/UTI___10.pcf.gz
-lib/X11/fonts/biznet/100dpi/UTI___12.pcf.gz
-lib/X11/fonts/biznet/100dpi/UTI___14.pcf.gz
-lib/X11/fonts/biznet/100dpi/UTI___18.pcf.gz
-lib/X11/fonts/biznet/100dpi/UTI___24.pcf.gz
-lib/X11/fonts/biznet/100dpi/UTRG__10.pcf.gz
-lib/X11/fonts/biznet/100dpi/UTRG__12.pcf.gz
-lib/X11/fonts/biznet/100dpi/UTRG__14.pcf.gz
-lib/X11/fonts/biznet/100dpi/UTRG__18.pcf.gz
-lib/X11/fonts/biznet/100dpi/UTRG__24.pcf.gz
-lib/X11/fonts/biznet/100dpi/charI08.pcf.gz
-lib/X11/fonts/biznet/100dpi/charI10.pcf.gz
-lib/X11/fonts/biznet/100dpi/charI12.pcf.gz
-lib/X11/fonts/biznet/100dpi/charI14.pcf.gz
-lib/X11/fonts/biznet/100dpi/charI18.pcf.gz
-lib/X11/fonts/biznet/100dpi/charI24.pcf.gz
-lib/X11/fonts/biznet/100dpi/charR08.pcf.gz
-lib/X11/fonts/biznet/100dpi/charR10.pcf.gz
-lib/X11/fonts/biznet/100dpi/charR12.pcf.gz
-lib/X11/fonts/biznet/100dpi/charR14.pcf.gz
-lib/X11/fonts/biznet/100dpi/charR18.pcf.gz
-lib/X11/fonts/biznet/100dpi/charR24.pcf.gz
-lib/X11/fonts/biznet/100dpi/courB08.pcf.gz
-lib/X11/fonts/biznet/100dpi/courB10.pcf.gz
-lib/X11/fonts/biznet/100dpi/courB12.pcf.gz
-lib/X11/fonts/biznet/100dpi/courB14.pcf.gz
-lib/X11/fonts/biznet/100dpi/courB18.pcf.gz
-lib/X11/fonts/biznet/100dpi/courB24.pcf.gz
-lib/X11/fonts/biznet/100dpi/courBO08.pcf.gz
-lib/X11/fonts/biznet/100dpi/courBO10.pcf.gz
-lib/X11/fonts/biznet/100dpi/courBO12.pcf.gz
-lib/X11/fonts/biznet/100dpi/courBO14.pcf.gz
-lib/X11/fonts/biznet/100dpi/courBO18.pcf.gz
-lib/X11/fonts/biznet/100dpi/courBO24.pcf.gz
-lib/X11/fonts/biznet/100dpi/courO08.pcf.gz
-lib/X11/fonts/biznet/100dpi/courO10.pcf.gz
-lib/X11/fonts/biznet/100dpi/courO12.pcf.gz
-lib/X11/fonts/biznet/100dpi/courO14.pcf.gz
-lib/X11/fonts/biznet/100dpi/courO18.pcf.gz
-lib/X11/fonts/biznet/100dpi/courO24.pcf.gz
-lib/X11/fonts/biznet/100dpi/courR08.pcf.gz
-lib/X11/fonts/biznet/100dpi/courR10.pcf.gz
-lib/X11/fonts/biznet/100dpi/courR12.pcf.gz
-lib/X11/fonts/biznet/100dpi/courR14.pcf.gz
-lib/X11/fonts/biznet/100dpi/courR18.pcf.gz
-lib/X11/fonts/biznet/100dpi/courR24.pcf.gz
-lib/X11/fonts/biznet/100dpi/fonts.alias
-lib/X11/fonts/biznet/100dpi/helvB08.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvB10.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvB12.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvB14.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvB18.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvB24.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvBO08.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvBO10.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvBO12.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvBO14.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvBO18.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvBO24.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvO08.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvO10.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvO12.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvO14.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvO18.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvO24.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvR08.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvR10.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvR12.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvR14.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvR18.pcf.gz
-lib/X11/fonts/biznet/100dpi/helvR24.pcf.gz
-lib/X11/fonts/biznet/100dpi/luBIS08.pcf.gz
-lib/X11/fonts/biznet/100dpi/luBIS10.pcf.gz
-lib/X11/fonts/biznet/100dpi/luBIS12.pcf.gz
-lib/X11/fonts/biznet/100dpi/luBIS14.pcf.gz
-lib/X11/fonts/biznet/100dpi/luBIS18.pcf.gz
-lib/X11/fonts/biznet/100dpi/luBIS19.pcf.gz
-lib/X11/fonts/biznet/100dpi/luBIS24.pcf.gz
-lib/X11/fonts/biznet/100dpi/luBS08.pcf.gz
-lib/X11/fonts/biznet/100dpi/luBS10.pcf.gz
-lib/X11/fonts/biznet/100dpi/luBS12.pcf.gz
-lib/X11/fonts/biznet/100dpi/luBS14.pcf.gz
-lib/X11/fonts/biznet/100dpi/luBS18.pcf.gz
-lib/X11/fonts/biznet/100dpi/luBS19.pcf.gz
-lib/X11/fonts/biznet/100dpi/luBS24.pcf.gz
-lib/X11/fonts/biznet/100dpi/luIS08.pcf.gz
-lib/X11/fonts/biznet/100dpi/luIS10.pcf.gz
-lib/X11/fonts/biznet/100dpi/luIS12.pcf.gz
-lib/X11/fonts/biznet/100dpi/luIS14.pcf.gz
-lib/X11/fonts/biznet/100dpi/luIS18.pcf.gz
-lib/X11/fonts/biznet/100dpi/luIS19.pcf.gz
-lib/X11/fonts/biznet/100dpi/luIS24.pcf.gz
-lib/X11/fonts/biznet/100dpi/luRS08.pcf.gz
-lib/X11/fonts/biznet/100dpi/luRS10.pcf.gz
-lib/X11/fonts/biznet/100dpi/luRS12.pcf.gz
-lib/X11/fonts/biznet/100dpi/luRS14.pcf.gz
-lib/X11/fonts/biznet/100dpi/luRS18.pcf.gz
-lib/X11/fonts/biznet/100dpi/luRS19.pcf.gz
-lib/X11/fonts/biznet/100dpi/luRS24.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubB08.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubB10.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubB12.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubB14.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubB18.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubB19.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubB24.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubBI08.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubBI10.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubBI12.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubBI14.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubBI18.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubBI19.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubBI24.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubI08.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubI10.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubI12.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubI14.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubI18.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubI19.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubI24.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubR08.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubR10.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubR12.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubR14.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubR18.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubR19.pcf.gz
-lib/X11/fonts/biznet/100dpi/lubR24.pcf.gz
-lib/X11/fonts/biznet/100dpi/lutBS08.pcf.gz
-lib/X11/fonts/biznet/100dpi/lutBS10.pcf.gz
-lib/X11/fonts/biznet/100dpi/lutBS12.pcf.gz
-lib/X11/fonts/biznet/100dpi/lutBS14.pcf.gz
-lib/X11/fonts/biznet/100dpi/lutBS18.pcf.gz
-lib/X11/fonts/biznet/100dpi/lutBS19.pcf.gz
-lib/X11/fonts/biznet/100dpi/lutBS24.pcf.gz
-lib/X11/fonts/biznet/100dpi/lutRS08.pcf.gz
-lib/X11/fonts/biznet/100dpi/lutRS10.pcf.gz
-lib/X11/fonts/biznet/100dpi/lutRS12.pcf.gz
-lib/X11/fonts/biznet/100dpi/lutRS14.pcf.gz
-lib/X11/fonts/biznet/100dpi/lutRS18.pcf.gz
-lib/X11/fonts/biznet/100dpi/lutRS19.pcf.gz
-lib/X11/fonts/biznet/100dpi/lutRS24.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenB08.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenB10.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenB12.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenB14.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenB18.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenB24.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenBI08.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenBI10.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenBI12.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenBI14.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenBI18.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenBI24.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenI08.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenI10.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenI12.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenI14.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenI18.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenI24.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenR08.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenR10.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenR12.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenR14.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenR18.pcf.gz
-lib/X11/fonts/biznet/100dpi/ncenR24.pcf.gz
-lib/X11/fonts/biznet/100dpi/term14.pcf.gz
-lib/X11/fonts/biznet/100dpi/termB14.pcf.gz
-lib/X11/fonts/biznet/100dpi/timB08.pcf.gz
-lib/X11/fonts/biznet/100dpi/timB10.pcf.gz
-lib/X11/fonts/biznet/100dpi/timB12.pcf.gz
-lib/X11/fonts/biznet/100dpi/timB14.pcf.gz
-lib/X11/fonts/biznet/100dpi/timB18.pcf.gz
-lib/X11/fonts/biznet/100dpi/timB24.pcf.gz
-lib/X11/fonts/biznet/100dpi/timBI08.pcf.gz
-lib/X11/fonts/biznet/100dpi/timBI10.pcf.gz
-lib/X11/fonts/biznet/100dpi/timBI12.pcf.gz
-lib/X11/fonts/biznet/100dpi/timBI14.pcf.gz
-lib/X11/fonts/biznet/100dpi/timBI18.pcf.gz
-lib/X11/fonts/biznet/100dpi/timBI24.pcf.gz
-lib/X11/fonts/biznet/100dpi/timI08.pcf.gz
-lib/X11/fonts/biznet/100dpi/timI10.pcf.gz
-lib/X11/fonts/biznet/100dpi/timI12.pcf.gz
-lib/X11/fonts/biznet/100dpi/timI14.pcf.gz
-lib/X11/fonts/biznet/100dpi/timI18.pcf.gz
-lib/X11/fonts/biznet/100dpi/timI24.pcf.gz
-lib/X11/fonts/biznet/100dpi/timR08.pcf.gz
-lib/X11/fonts/biznet/100dpi/timR10.pcf.gz
-lib/X11/fonts/biznet/100dpi/timR12.pcf.gz
-lib/X11/fonts/biznet/100dpi/timR14.pcf.gz
-lib/X11/fonts/biznet/100dpi/timR18.pcf.gz
-lib/X11/fonts/biznet/100dpi/timR24.pcf.gz
-lib/X11/fonts/biznet/75dpi/UTI___10.pcf.gz
-lib/X11/fonts/biznet/75dpi/UTI___12.pcf.gz
-lib/X11/fonts/biznet/75dpi/UTI___14.pcf.gz
-lib/X11/fonts/biznet/75dpi/UTI___18.pcf.gz
-lib/X11/fonts/biznet/75dpi/UTI___24.pcf.gz
-lib/X11/fonts/biznet/75dpi/UTRG__10.pcf.gz
-lib/X11/fonts/biznet/75dpi/UTRG__12.pcf.gz
-lib/X11/fonts/biznet/75dpi/UTRG__14.pcf.gz
-lib/X11/fonts/biznet/75dpi/UTRG__18.pcf.gz
-lib/X11/fonts/biznet/75dpi/UTRG__24.pcf.gz
-lib/X11/fonts/biznet/75dpi/charI08.pcf.gz
-lib/X11/fonts/biznet/75dpi/charI10.pcf.gz
-lib/X11/fonts/biznet/75dpi/charI12.pcf.gz
-lib/X11/fonts/biznet/75dpi/charI14.pcf.gz
-lib/X11/fonts/biznet/75dpi/charI18.pcf.gz
-lib/X11/fonts/biznet/75dpi/charI24.pcf.gz
-lib/X11/fonts/biznet/75dpi/charR08.pcf.gz
-lib/X11/fonts/biznet/75dpi/charR10.pcf.gz
-lib/X11/fonts/biznet/75dpi/charR12.pcf.gz
-lib/X11/fonts/biznet/75dpi/charR14.pcf.gz
-lib/X11/fonts/biznet/75dpi/charR18.pcf.gz
-lib/X11/fonts/biznet/75dpi/charR24.pcf.gz
-lib/X11/fonts/biznet/75dpi/courB08.pcf.gz
-lib/X11/fonts/biznet/75dpi/courB10.pcf.gz
-lib/X11/fonts/biznet/75dpi/courB12.pcf.gz
-lib/X11/fonts/biznet/75dpi/courB14.pcf.gz
-lib/X11/fonts/biznet/75dpi/courB18.pcf.gz
-lib/X11/fonts/biznet/75dpi/courB24.pcf.gz
-lib/X11/fonts/biznet/75dpi/courBO08.pcf.gz
-lib/X11/fonts/biznet/75dpi/courBO10.pcf.gz
-lib/X11/fonts/biznet/75dpi/courBO12.pcf.gz
-lib/X11/fonts/biznet/75dpi/courBO14.pcf.gz
-lib/X11/fonts/biznet/75dpi/courBO18.pcf.gz
-lib/X11/fonts/biznet/75dpi/courBO24.pcf.gz
-lib/X11/fonts/biznet/75dpi/courO08.pcf.gz
-lib/X11/fonts/biznet/75dpi/courO10.pcf.gz
-lib/X11/fonts/biznet/75dpi/courO12.pcf.gz
-lib/X11/fonts/biznet/75dpi/courO14.pcf.gz
-lib/X11/fonts/biznet/75dpi/courO18.pcf.gz
-lib/X11/fonts/biznet/75dpi/courO24.pcf.gz
-lib/X11/fonts/biznet/75dpi/courR08.pcf.gz
-lib/X11/fonts/biznet/75dpi/courR10.pcf.gz
-lib/X11/fonts/biznet/75dpi/courR12.pcf.gz
-lib/X11/fonts/biznet/75dpi/courR14.pcf.gz
-lib/X11/fonts/biznet/75dpi/courR18.pcf.gz
-lib/X11/fonts/biznet/75dpi/courR24.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvB08.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvB10.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvB12.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvB14.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvB18.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvB24.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvBO08.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvBO10.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvBO12.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvBO14.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvBO18.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvBO24.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvO08.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvO10.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvO12.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvO14.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvO18.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvO24.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvR08.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvR10.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvR12.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvR14.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvR18.pcf.gz
-lib/X11/fonts/biznet/75dpi/helvR24.pcf.gz
-lib/X11/fonts/biznet/75dpi/fonts.alias
-lib/X11/fonts/biznet/75dpi/luBIS08.pcf.gz
-lib/X11/fonts/biznet/75dpi/luBIS10.pcf.gz
-lib/X11/fonts/biznet/75dpi/luBIS12.pcf.gz
-lib/X11/fonts/biznet/75dpi/luBIS14.pcf.gz
-lib/X11/fonts/biznet/75dpi/luBIS18.pcf.gz
-lib/X11/fonts/biznet/75dpi/luBIS19.pcf.gz
-lib/X11/fonts/biznet/75dpi/luBIS24.pcf.gz
-lib/X11/fonts/biznet/75dpi/luBS08.pcf.gz
-lib/X11/fonts/biznet/75dpi/luBS10.pcf.gz
-lib/X11/fonts/biznet/75dpi/luBS12.pcf.gz
-lib/X11/fonts/biznet/75dpi/luBS14.pcf.gz
-lib/X11/fonts/biznet/75dpi/luBS18.pcf.gz
-lib/X11/fonts/biznet/75dpi/luBS19.pcf.gz
-lib/X11/fonts/biznet/75dpi/luBS24.pcf.gz
-lib/X11/fonts/biznet/75dpi/luIS08.pcf.gz
-lib/X11/fonts/biznet/75dpi/luIS10.pcf.gz
-lib/X11/fonts/biznet/75dpi/luIS12.pcf.gz
-lib/X11/fonts/biznet/75dpi/luIS14.pcf.gz
-lib/X11/fonts/biznet/75dpi/luIS18.pcf.gz
-lib/X11/fonts/biznet/75dpi/luIS19.pcf.gz
-lib/X11/fonts/biznet/75dpi/luIS24.pcf.gz
-lib/X11/fonts/biznet/75dpi/luRS08.pcf.gz
-lib/X11/fonts/biznet/75dpi/luRS10.pcf.gz
-lib/X11/fonts/biznet/75dpi/luRS12.pcf.gz
-lib/X11/fonts/biznet/75dpi/luRS14.pcf.gz
-lib/X11/fonts/biznet/75dpi/luRS18.pcf.gz
-lib/X11/fonts/biznet/75dpi/luRS19.pcf.gz
-lib/X11/fonts/biznet/75dpi/luRS24.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubB08.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubB10.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubB12.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubB14.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubB18.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubB19.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubB24.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubBI08.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubBI10.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubBI12.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubBI14.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubBI18.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubBI19.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubBI24.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubI08.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubI10.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubI12.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubI14.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubI18.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubI19.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubI24.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubR08.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubR10.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubR12.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubR14.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubR18.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubR19.pcf.gz
-lib/X11/fonts/biznet/75dpi/lubR24.pcf.gz
-lib/X11/fonts/biznet/75dpi/lutBS08.pcf.gz
-lib/X11/fonts/biznet/75dpi/lutBS10.pcf.gz
-lib/X11/fonts/biznet/75dpi/lutBS12.pcf.gz
-lib/X11/fonts/biznet/75dpi/lutBS14.pcf.gz
-lib/X11/fonts/biznet/75dpi/lutBS18.pcf.gz
-lib/X11/fonts/biznet/75dpi/lutBS19.pcf.gz
-lib/X11/fonts/biznet/75dpi/lutBS24.pcf.gz
-lib/X11/fonts/biznet/75dpi/lutRS08.pcf.gz
-lib/X11/fonts/biznet/75dpi/lutRS10.pcf.gz
-lib/X11/fonts/biznet/75dpi/lutRS12.pcf.gz
-lib/X11/fonts/biznet/75dpi/lutRS14.pcf.gz
-lib/X11/fonts/biznet/75dpi/lutRS18.pcf.gz
-lib/X11/fonts/biznet/75dpi/lutRS19.pcf.gz
-lib/X11/fonts/biznet/75dpi/lutRS24.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenB08.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenB10.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenB12.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenB14.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenB18.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenB24.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenBI08.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenBI10.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenBI12.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenBI14.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenBI18.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenBI24.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenI08.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenI10.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenI12.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenI14.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenI18.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenI24.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenR08.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenR10.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenR12.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenR14.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenR18.pcf.gz
-lib/X11/fonts/biznet/75dpi/ncenR24.pcf.gz
-lib/X11/fonts/biznet/75dpi/term14.pcf.gz
-lib/X11/fonts/biznet/75dpi/termB14.pcf.gz
-lib/X11/fonts/biznet/75dpi/timB08.pcf.gz
-lib/X11/fonts/biznet/75dpi/timB10.pcf.gz
-lib/X11/fonts/biznet/75dpi/timB12.pcf.gz
-lib/X11/fonts/biznet/75dpi/timB14.pcf.gz
-lib/X11/fonts/biznet/75dpi/timB18.pcf.gz
-lib/X11/fonts/biznet/75dpi/timB24.pcf.gz
-lib/X11/fonts/biznet/75dpi/timBI08.pcf.gz
-lib/X11/fonts/biznet/75dpi/timBI10.pcf.gz
-lib/X11/fonts/biznet/75dpi/timBI12.pcf.gz
-lib/X11/fonts/biznet/75dpi/timBI14.pcf.gz
-lib/X11/fonts/biznet/75dpi/timBI18.pcf.gz
-lib/X11/fonts/biznet/75dpi/timBI24.pcf.gz
-lib/X11/fonts/biznet/75dpi/timI08.pcf.gz
-lib/X11/fonts/biznet/75dpi/timI10.pcf.gz
-lib/X11/fonts/biznet/75dpi/timI12.pcf.gz
-lib/X11/fonts/biznet/75dpi/timI14.pcf.gz
-lib/X11/fonts/biznet/75dpi/timI18.pcf.gz
-lib/X11/fonts/biznet/75dpi/timI24.pcf.gz
-lib/X11/fonts/biznet/75dpi/timR08.pcf.gz
-lib/X11/fonts/biznet/75dpi/timR10.pcf.gz
-lib/X11/fonts/biznet/75dpi/timR12.pcf.gz
-lib/X11/fonts/biznet/75dpi/timR14.pcf.gz
-lib/X11/fonts/biznet/75dpi/timR18.pcf.gz
-lib/X11/fonts/biznet/75dpi/timR24.pcf.gz
-lib/X11/fonts/biznet/misc/10x20.pcf.gz
-lib/X11/fonts/biznet/misc/12x24.pcf.gz
-lib/X11/fonts/biznet/misc/5x7.pcf.gz
-lib/X11/fonts/biznet/misc/6x10.pcf.gz
-lib/X11/fonts/biznet/misc/6x13.pcf.gz
-lib/X11/fonts/biznet/misc/6x13B.pcf.gz
-lib/X11/fonts/biznet/misc/7x13.pcf.gz
-lib/X11/fonts/biznet/misc/7x13B.pcf.gz
-lib/X11/fonts/biznet/misc/7x14.pcf.gz
-lib/X11/fonts/biznet/misc/7x14B.pcf.gz
-lib/X11/fonts/biznet/misc/8x13.pcf.gz
-lib/X11/fonts/biznet/misc/8x13B.pcf.gz
-lib/X11/fonts/biznet/misc/8x16.pcf.gz
-lib/X11/fonts/biznet/misc/9x15.pcf.gz
-lib/X11/fonts/biznet/misc/9x15B.pcf.gz
-lib/X11/fonts/biznet/misc/fonts.alias
+@comment $NetBSD: PLIST,v 1.5 2014/06/01 16:35:32 wiz Exp $
+share/fonts/X11/biznet/100dpi/UTI___10.pcf.gz
+share/fonts/X11/biznet/100dpi/UTI___12.pcf.gz
+share/fonts/X11/biznet/100dpi/UTI___14.pcf.gz
+share/fonts/X11/biznet/100dpi/UTI___18.pcf.gz
+share/fonts/X11/biznet/100dpi/UTI___24.pcf.gz
+share/fonts/X11/biznet/100dpi/UTRG__10.pcf.gz
+share/fonts/X11/biznet/100dpi/UTRG__12.pcf.gz
+share/fonts/X11/biznet/100dpi/UTRG__14.pcf.gz
+share/fonts/X11/biznet/100dpi/UTRG__18.pcf.gz
+share/fonts/X11/biznet/100dpi/UTRG__24.pcf.gz
+share/fonts/X11/biznet/100dpi/charI08.pcf.gz
+share/fonts/X11/biznet/100dpi/charI10.pcf.gz
+share/fonts/X11/biznet/100dpi/charI12.pcf.gz
+share/fonts/X11/biznet/100dpi/charI14.pcf.gz
+share/fonts/X11/biznet/100dpi/charI18.pcf.gz
+share/fonts/X11/biznet/100dpi/charI24.pcf.gz
+share/fonts/X11/biznet/100dpi/charR08.pcf.gz
+share/fonts/X11/biznet/100dpi/charR10.pcf.gz
+share/fonts/X11/biznet/100dpi/charR12.pcf.gz
+share/fonts/X11/biznet/100dpi/charR14.pcf.gz
+share/fonts/X11/biznet/100dpi/charR18.pcf.gz
+share/fonts/X11/biznet/100dpi/charR24.pcf.gz
+share/fonts/X11/biznet/100dpi/courB08.pcf.gz
+share/fonts/X11/biznet/100dpi/courB10.pcf.gz
+share/fonts/X11/biznet/100dpi/courB12.pcf.gz
+share/fonts/X11/biznet/100dpi/courB14.pcf.gz
+share/fonts/X11/biznet/100dpi/courB18.pcf.gz
+share/fonts/X11/biznet/100dpi/courB24.pcf.gz
+share/fonts/X11/biznet/100dpi/courBO08.pcf.gz
+share/fonts/X11/biznet/100dpi/courBO10.pcf.gz
+share/fonts/X11/biznet/100dpi/courBO12.pcf.gz
+share/fonts/X11/biznet/100dpi/courBO14.pcf.gz
+share/fonts/X11/biznet/100dpi/courBO18.pcf.gz
+share/fonts/X11/biznet/100dpi/courBO24.pcf.gz
+share/fonts/X11/biznet/100dpi/courO08.pcf.gz
+share/fonts/X11/biznet/100dpi/courO10.pcf.gz
+share/fonts/X11/biznet/100dpi/courO12.pcf.gz
+share/fonts/X11/biznet/100dpi/courO14.pcf.gz
+share/fonts/X11/biznet/100dpi/courO18.pcf.gz
+share/fonts/X11/biznet/100dpi/courO24.pcf.gz
+share/fonts/X11/biznet/100dpi/courR08.pcf.gz
+share/fonts/X11/biznet/100dpi/courR10.pcf.gz
+share/fonts/X11/biznet/100dpi/courR12.pcf.gz
+share/fonts/X11/biznet/100dpi/courR14.pcf.gz
+share/fonts/X11/biznet/100dpi/courR18.pcf.gz
+share/fonts/X11/biznet/100dpi/courR24.pcf.gz
+share/fonts/X11/biznet/100dpi/fonts.alias
+share/fonts/X11/biznet/100dpi/helvB08.pcf.gz
+share/fonts/X11/biznet/100dpi/helvB10.pcf.gz
+share/fonts/X11/biznet/100dpi/helvB12.pcf.gz
+share/fonts/X11/biznet/100dpi/helvB14.pcf.gz
+share/fonts/X11/biznet/100dpi/helvB18.pcf.gz
+share/fonts/X11/biznet/100dpi/helvB24.pcf.gz
+share/fonts/X11/biznet/100dpi/helvBO08.pcf.gz
+share/fonts/X11/biznet/100dpi/helvBO10.pcf.gz
+share/fonts/X11/biznet/100dpi/helvBO12.pcf.gz
+share/fonts/X11/biznet/100dpi/helvBO14.pcf.gz
+share/fonts/X11/biznet/100dpi/helvBO18.pcf.gz
+share/fonts/X11/biznet/100dpi/helvBO24.pcf.gz
+share/fonts/X11/biznet/100dpi/helvO08.pcf.gz
+share/fonts/X11/biznet/100dpi/helvO10.pcf.gz
+share/fonts/X11/biznet/100dpi/helvO12.pcf.gz
+share/fonts/X11/biznet/100dpi/helvO14.pcf.gz
+share/fonts/X11/biznet/100dpi/helvO18.pcf.gz
+share/fonts/X11/biznet/100dpi/helvO24.pcf.gz
+share/fonts/X11/biznet/100dpi/helvR08.pcf.gz
+share/fonts/X11/biznet/100dpi/helvR10.pcf.gz
+share/fonts/X11/biznet/100dpi/helvR12.pcf.gz
+share/fonts/X11/biznet/100dpi/helvR14.pcf.gz
+share/fonts/X11/biznet/100dpi/helvR18.pcf.gz
+share/fonts/X11/biznet/100dpi/helvR24.pcf.gz
+share/fonts/X11/biznet/100dpi/luBIS08.pcf.gz
+share/fonts/X11/biznet/100dpi/luBIS10.pcf.gz
+share/fonts/X11/biznet/100dpi/luBIS12.pcf.gz
+share/fonts/X11/biznet/100dpi/luBIS14.pcf.gz
+share/fonts/X11/biznet/100dpi/luBIS18.pcf.gz
+share/fonts/X11/biznet/100dpi/luBIS19.pcf.gz
+share/fonts/X11/biznet/100dpi/luBIS24.pcf.gz
+share/fonts/X11/biznet/100dpi/luBS08.pcf.gz
+share/fonts/X11/biznet/100dpi/luBS10.pcf.gz
+share/fonts/X11/biznet/100dpi/luBS12.pcf.gz
+share/fonts/X11/biznet/100dpi/luBS14.pcf.gz
+share/fonts/X11/biznet/100dpi/luBS18.pcf.gz
+share/fonts/X11/biznet/100dpi/luBS19.pcf.gz
+share/fonts/X11/biznet/100dpi/luBS24.pcf.gz
+share/fonts/X11/biznet/100dpi/luIS08.pcf.gz
+share/fonts/X11/biznet/100dpi/luIS10.pcf.gz
+share/fonts/X11/biznet/100dpi/luIS12.pcf.gz
+share/fonts/X11/biznet/100dpi/luIS14.pcf.gz
+share/fonts/X11/biznet/100dpi/luIS18.pcf.gz
+share/fonts/X11/biznet/100dpi/luIS19.pcf.gz
+share/fonts/X11/biznet/100dpi/luIS24.pcf.gz
+share/fonts/X11/biznet/100dpi/luRS08.pcf.gz
+share/fonts/X11/biznet/100dpi/luRS10.pcf.gz
+share/fonts/X11/biznet/100dpi/luRS12.pcf.gz
+share/fonts/X11/biznet/100dpi/luRS14.pcf.gz
+share/fonts/X11/biznet/100dpi/luRS18.pcf.gz
+share/fonts/X11/biznet/100dpi/luRS19.pcf.gz
+share/fonts/X11/biznet/100dpi/luRS24.pcf.gz
+share/fonts/X11/biznet/100dpi/lubB08.pcf.gz
+share/fonts/X11/biznet/100dpi/lubB10.pcf.gz
+share/fonts/X11/biznet/100dpi/lubB12.pcf.gz
+share/fonts/X11/biznet/100dpi/lubB14.pcf.gz
+share/fonts/X11/biznet/100dpi/lubB18.pcf.gz
+share/fonts/X11/biznet/100dpi/lubB19.pcf.gz
+share/fonts/X11/biznet/100dpi/lubB24.pcf.gz
+share/fonts/X11/biznet/100dpi/lubBI08.pcf.gz
+share/fonts/X11/biznet/100dpi/lubBI10.pcf.gz
+share/fonts/X11/biznet/100dpi/lubBI12.pcf.gz
+share/fonts/X11/biznet/100dpi/lubBI14.pcf.gz
+share/fonts/X11/biznet/100dpi/lubBI18.pcf.gz
+share/fonts/X11/biznet/100dpi/lubBI19.pcf.gz
+share/fonts/X11/biznet/100dpi/lubBI24.pcf.gz
+share/fonts/X11/biznet/100dpi/lubI08.pcf.gz
+share/fonts/X11/biznet/100dpi/lubI10.pcf.gz
+share/fonts/X11/biznet/100dpi/lubI12.pcf.gz
+share/fonts/X11/biznet/100dpi/lubI14.pcf.gz
+share/fonts/X11/biznet/100dpi/lubI18.pcf.gz
+share/fonts/X11/biznet/100dpi/lubI19.pcf.gz
+share/fonts/X11/biznet/100dpi/lubI24.pcf.gz
+share/fonts/X11/biznet/100dpi/lubR08.pcf.gz
+share/fonts/X11/biznet/100dpi/lubR10.pcf.gz
+share/fonts/X11/biznet/100dpi/lubR12.pcf.gz
+share/fonts/X11/biznet/100dpi/lubR14.pcf.gz
+share/fonts/X11/biznet/100dpi/lubR18.pcf.gz
+share/fonts/X11/biznet/100dpi/lubR19.pcf.gz
+share/fonts/X11/biznet/100dpi/lubR24.pcf.gz
+share/fonts/X11/biznet/100dpi/lutBS08.pcf.gz
+share/fonts/X11/biznet/100dpi/lutBS10.pcf.gz
+share/fonts/X11/biznet/100dpi/lutBS12.pcf.gz
+share/fonts/X11/biznet/100dpi/lutBS14.pcf.gz
+share/fonts/X11/biznet/100dpi/lutBS18.pcf.gz
+share/fonts/X11/biznet/100dpi/lutBS19.pcf.gz
+share/fonts/X11/biznet/100dpi/lutBS24.pcf.gz
+share/fonts/X11/biznet/100dpi/lutRS08.pcf.gz
+share/fonts/X11/biznet/100dpi/lutRS10.pcf.gz
+share/fonts/X11/biznet/100dpi/lutRS12.pcf.gz
+share/fonts/X11/biznet/100dpi/lutRS14.pcf.gz
+share/fonts/X11/biznet/100dpi/lutRS18.pcf.gz
+share/fonts/X11/biznet/100dpi/lutRS19.pcf.gz
+share/fonts/X11/biznet/100dpi/lutRS24.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenB08.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenB10.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenB12.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenB14.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenB18.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenB24.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenBI08.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenBI10.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenBI12.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenBI14.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenBI18.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenBI24.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenI08.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenI10.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenI12.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenI14.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenI18.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenI24.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenR08.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenR10.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenR12.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenR14.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenR18.pcf.gz
+share/fonts/X11/biznet/100dpi/ncenR24.pcf.gz
+share/fonts/X11/biznet/100dpi/term14.pcf.gz
+share/fonts/X11/biznet/100dpi/termB14.pcf.gz
+share/fonts/X11/biznet/100dpi/timB08.pcf.gz
+share/fonts/X11/biznet/100dpi/timB10.pcf.gz
+share/fonts/X11/biznet/100dpi/timB12.pcf.gz
+share/fonts/X11/biznet/100dpi/timB14.pcf.gz
+share/fonts/X11/biznet/100dpi/timB18.pcf.gz
+share/fonts/X11/biznet/100dpi/timB24.pcf.gz
+share/fonts/X11/biznet/100dpi/timBI08.pcf.gz
+share/fonts/X11/biznet/100dpi/timBI10.pcf.gz
+share/fonts/X11/biznet/100dpi/timBI12.pcf.gz
+share/fonts/X11/biznet/100dpi/timBI14.pcf.gz
+share/fonts/X11/biznet/100dpi/timBI18.pcf.gz
+share/fonts/X11/biznet/100dpi/timBI24.pcf.gz
+share/fonts/X11/biznet/100dpi/timI08.pcf.gz
+share/fonts/X11/biznet/100dpi/timI10.pcf.gz
+share/fonts/X11/biznet/100dpi/timI12.pcf.gz
+share/fonts/X11/biznet/100dpi/timI14.pcf.gz
+share/fonts/X11/biznet/100dpi/timI18.pcf.gz
+share/fonts/X11/biznet/100dpi/timI24.pcf.gz
+share/fonts/X11/biznet/100dpi/timR08.pcf.gz
+share/fonts/X11/biznet/100dpi/timR10.pcf.gz
+share/fonts/X11/biznet/100dpi/timR12.pcf.gz
+share/fonts/X11/biznet/100dpi/timR14.pcf.gz
+share/fonts/X11/biznet/100dpi/timR18.pcf.gz
+share/fonts/X11/biznet/100dpi/timR24.pcf.gz
+share/fonts/X11/biznet/75dpi/UTI___10.pcf.gz
+share/fonts/X11/biznet/75dpi/UTI___12.pcf.gz
+share/fonts/X11/biznet/75dpi/UTI___14.pcf.gz
+share/fonts/X11/biznet/75dpi/UTI___18.pcf.gz
+share/fonts/X11/biznet/75dpi/UTI___24.pcf.gz
+share/fonts/X11/biznet/75dpi/UTRG__10.pcf.gz
+share/fonts/X11/biznet/75dpi/UTRG__12.pcf.gz
+share/fonts/X11/biznet/75dpi/UTRG__14.pcf.gz
+share/fonts/X11/biznet/75dpi/UTRG__18.pcf.gz
+share/fonts/X11/biznet/75dpi/UTRG__24.pcf.gz
+share/fonts/X11/biznet/75dpi/charI08.pcf.gz
+share/fonts/X11/biznet/75dpi/charI10.pcf.gz
+share/fonts/X11/biznet/75dpi/charI12.pcf.gz
+share/fonts/X11/biznet/75dpi/charI14.pcf.gz
+share/fonts/X11/biznet/75dpi/charI18.pcf.gz
+share/fonts/X11/biznet/75dpi/charI24.pcf.gz
+share/fonts/X11/biznet/75dpi/charR08.pcf.gz
+share/fonts/X11/biznet/75dpi/charR10.pcf.gz
+share/fonts/X11/biznet/75dpi/charR12.pcf.gz
+share/fonts/X11/biznet/75dpi/charR14.pcf.gz
+share/fonts/X11/biznet/75dpi/charR18.pcf.gz
+share/fonts/X11/biznet/75dpi/charR24.pcf.gz
+share/fonts/X11/biznet/75dpi/courB08.pcf.gz
+share/fonts/X11/biznet/75dpi/courB10.pcf.gz
+share/fonts/X11/biznet/75dpi/courB12.pcf.gz
+share/fonts/X11/biznet/75dpi/courB14.pcf.gz
+share/fonts/X11/biznet/75dpi/courB18.pcf.gz
+share/fonts/X11/biznet/75dpi/courB24.pcf.gz
+share/fonts/X11/biznet/75dpi/courBO08.pcf.gz
+share/fonts/X11/biznet/75dpi/courBO10.pcf.gz
+share/fonts/X11/biznet/75dpi/courBO12.pcf.gz
+share/fonts/X11/biznet/75dpi/courBO14.pcf.gz
+share/fonts/X11/biznet/75dpi/courBO18.pcf.gz
+share/fonts/X11/biznet/75dpi/courBO24.pcf.gz
+share/fonts/X11/biznet/75dpi/courO08.pcf.gz
+share/fonts/X11/biznet/75dpi/courO10.pcf.gz
+share/fonts/X11/biznet/75dpi/courO12.pcf.gz
+share/fonts/X11/biznet/75dpi/courO14.pcf.gz
+share/fonts/X11/biznet/75dpi/courO18.pcf.gz
+share/fonts/X11/biznet/75dpi/courO24.pcf.gz
+share/fonts/X11/biznet/75dpi/courR08.pcf.gz
+share/fonts/X11/biznet/75dpi/courR10.pcf.gz
+share/fonts/X11/biznet/75dpi/courR12.pcf.gz
+share/fonts/X11/biznet/75dpi/courR14.pcf.gz
+share/fonts/X11/biznet/75dpi/courR18.pcf.gz
+share/fonts/X11/biznet/75dpi/courR24.pcf.gz
+share/fonts/X11/biznet/75dpi/helvB08.pcf.gz
+share/fonts/X11/biznet/75dpi/helvB10.pcf.gz
+share/fonts/X11/biznet/75dpi/helvB12.pcf.gz
+share/fonts/X11/biznet/75dpi/helvB14.pcf.gz
+share/fonts/X11/biznet/75dpi/helvB18.pcf.gz
+share/fonts/X11/biznet/75dpi/helvB24.pcf.gz
+share/fonts/X11/biznet/75dpi/helvBO08.pcf.gz
+share/fonts/X11/biznet/75dpi/helvBO10.pcf.gz
+share/fonts/X11/biznet/75dpi/helvBO12.pcf.gz
+share/fonts/X11/biznet/75dpi/helvBO14.pcf.gz
+share/fonts/X11/biznet/75dpi/helvBO18.pcf.gz
+share/fonts/X11/biznet/75dpi/helvBO24.pcf.gz
+share/fonts/X11/biznet/75dpi/helvO08.pcf.gz
+share/fonts/X11/biznet/75dpi/helvO10.pcf.gz
+share/fonts/X11/biznet/75dpi/helvO12.pcf.gz
+share/fonts/X11/biznet/75dpi/helvO14.pcf.gz
+share/fonts/X11/biznet/75dpi/helvO18.pcf.gz
+share/fonts/X11/biznet/75dpi/helvO24.pcf.gz
+share/fonts/X11/biznet/75dpi/helvR08.pcf.gz
+share/fonts/X11/biznet/75dpi/helvR10.pcf.gz
+share/fonts/X11/biznet/75dpi/helvR12.pcf.gz
+share/fonts/X11/biznet/75dpi/helvR14.pcf.gz
+share/fonts/X11/biznet/75dpi/helvR18.pcf.gz
+share/fonts/X11/biznet/75dpi/helvR24.pcf.gz
+share/fonts/X11/biznet/75dpi/fonts.alias
+share/fonts/X11/biznet/75dpi/luBIS08.pcf.gz
+share/fonts/X11/biznet/75dpi/luBIS10.pcf.gz
+share/fonts/X11/biznet/75dpi/luBIS12.pcf.gz
+share/fonts/X11/biznet/75dpi/luBIS14.pcf.gz
+share/fonts/X11/biznet/75dpi/luBIS18.pcf.gz
+share/fonts/X11/biznet/75dpi/luBIS19.pcf.gz
+share/fonts/X11/biznet/75dpi/luBIS24.pcf.gz
+share/fonts/X11/biznet/75dpi/luBS08.pcf.gz
+share/fonts/X11/biznet/75dpi/luBS10.pcf.gz
+share/fonts/X11/biznet/75dpi/luBS12.pcf.gz
+share/fonts/X11/biznet/75dpi/luBS14.pcf.gz
+share/fonts/X11/biznet/75dpi/luBS18.pcf.gz
+share/fonts/X11/biznet/75dpi/luBS19.pcf.gz
+share/fonts/X11/biznet/75dpi/luBS24.pcf.gz
+share/fonts/X11/biznet/75dpi/luIS08.pcf.gz
+share/fonts/X11/biznet/75dpi/luIS10.pcf.gz
+share/fonts/X11/biznet/75dpi/luIS12.pcf.gz
+share/fonts/X11/biznet/75dpi/luIS14.pcf.gz
+share/fonts/X11/biznet/75dpi/luIS18.pcf.gz
+share/fonts/X11/biznet/75dpi/luIS19.pcf.gz
+share/fonts/X11/biznet/75dpi/luIS24.pcf.gz
+share/fonts/X11/biznet/75dpi/luRS08.pcf.gz
+share/fonts/X11/biznet/75dpi/luRS10.pcf.gz
+share/fonts/X11/biznet/75dpi/luRS12.pcf.gz
+share/fonts/X11/biznet/75dpi/luRS14.pcf.gz
+share/fonts/X11/biznet/75dpi/luRS18.pcf.gz
+share/fonts/X11/biznet/75dpi/luRS19.pcf.gz
+share/fonts/X11/biznet/75dpi/luRS24.pcf.gz
+share/fonts/X11/biznet/75dpi/lubB08.pcf.gz
+share/fonts/X11/biznet/75dpi/lubB10.pcf.gz
+share/fonts/X11/biznet/75dpi/lubB12.pcf.gz
+share/fonts/X11/biznet/75dpi/lubB14.pcf.gz
+share/fonts/X11/biznet/75dpi/lubB18.pcf.gz
+share/fonts/X11/biznet/75dpi/lubB19.pcf.gz
+share/fonts/X11/biznet/75dpi/lubB24.pcf.gz
+share/fonts/X11/biznet/75dpi/lubBI08.pcf.gz
+share/fonts/X11/biznet/75dpi/lubBI10.pcf.gz
+share/fonts/X11/biznet/75dpi/lubBI12.pcf.gz
+share/fonts/X11/biznet/75dpi/lubBI14.pcf.gz
+share/fonts/X11/biznet/75dpi/lubBI18.pcf.gz
+share/fonts/X11/biznet/75dpi/lubBI19.pcf.gz
+share/fonts/X11/biznet/75dpi/lubBI24.pcf.gz
+share/fonts/X11/biznet/75dpi/lubI08.pcf.gz
+share/fonts/X11/biznet/75dpi/lubI10.pcf.gz
+share/fonts/X11/biznet/75dpi/lubI12.pcf.gz
+share/fonts/X11/biznet/75dpi/lubI14.pcf.gz
+share/fonts/X11/biznet/75dpi/lubI18.pcf.gz
+share/fonts/X11/biznet/75dpi/lubI19.pcf.gz
+share/fonts/X11/biznet/75dpi/lubI24.pcf.gz
+share/fonts/X11/biznet/75dpi/lubR08.pcf.gz
+share/fonts/X11/biznet/75dpi/lubR10.pcf.gz
+share/fonts/X11/biznet/75dpi/lubR12.pcf.gz
+share/fonts/X11/biznet/75dpi/lubR14.pcf.gz
+share/fonts/X11/biznet/75dpi/lubR18.pcf.gz
+share/fonts/X11/biznet/75dpi/lubR19.pcf.gz
+share/fonts/X11/biznet/75dpi/lubR24.pcf.gz
+share/fonts/X11/biznet/75dpi/lutBS08.pcf.gz
+share/fonts/X11/biznet/75dpi/lutBS10.pcf.gz
+share/fonts/X11/biznet/75dpi/lutBS12.pcf.gz
+share/fonts/X11/biznet/75dpi/lutBS14.pcf.gz
+share/fonts/X11/biznet/75dpi/lutBS18.pcf.gz
+share/fonts/X11/biznet/75dpi/lutBS19.pcf.gz
+share/fonts/X11/biznet/75dpi/lutBS24.pcf.gz
+share/fonts/X11/biznet/75dpi/lutRS08.pcf.gz
+share/fonts/X11/biznet/75dpi/lutRS10.pcf.gz
+share/fonts/X11/biznet/75dpi/lutRS12.pcf.gz
+share/fonts/X11/biznet/75dpi/lutRS14.pcf.gz
+share/fonts/X11/biznet/75dpi/lutRS18.pcf.gz
+share/fonts/X11/biznet/75dpi/lutRS19.pcf.gz
+share/fonts/X11/biznet/75dpi/lutRS24.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenB08.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenB10.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenB12.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenB14.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenB18.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenB24.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenBI08.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenBI10.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenBI12.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenBI14.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenBI18.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenBI24.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenI08.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenI10.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenI12.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenI14.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenI18.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenI24.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenR08.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenR10.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenR12.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenR14.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenR18.pcf.gz
+share/fonts/X11/biznet/75dpi/ncenR24.pcf.gz
+share/fonts/X11/biznet/75dpi/term14.pcf.gz
+share/fonts/X11/biznet/75dpi/termB14.pcf.gz
+share/fonts/X11/biznet/75dpi/timB08.pcf.gz
+share/fonts/X11/biznet/75dpi/timB10.pcf.gz
+share/fonts/X11/biznet/75dpi/timB12.pcf.gz
+share/fonts/X11/biznet/75dpi/timB14.pcf.gz
+share/fonts/X11/biznet/75dpi/timB18.pcf.gz
+share/fonts/X11/biznet/75dpi/timB24.pcf.gz
+share/fonts/X11/biznet/75dpi/timBI08.pcf.gz
+share/fonts/X11/biznet/75dpi/timBI10.pcf.gz
+share/fonts/X11/biznet/75dpi/timBI12.pcf.gz
+share/fonts/X11/biznet/75dpi/timBI14.pcf.gz
+share/fonts/X11/biznet/75dpi/timBI18.pcf.gz
+share/fonts/X11/biznet/75dpi/timBI24.pcf.gz
+share/fonts/X11/biznet/75dpi/timI08.pcf.gz
+share/fonts/X11/biznet/75dpi/timI10.pcf.gz
+share/fonts/X11/biznet/75dpi/timI12.pcf.gz
+share/fonts/X11/biznet/75dpi/timI14.pcf.gz
+share/fonts/X11/biznet/75dpi/timI18.pcf.gz
+share/fonts/X11/biznet/75dpi/timI24.pcf.gz
+share/fonts/X11/biznet/75dpi/timR08.pcf.gz
+share/fonts/X11/biznet/75dpi/timR10.pcf.gz
+share/fonts/X11/biznet/75dpi/timR12.pcf.gz
+share/fonts/X11/biznet/75dpi/timR14.pcf.gz
+share/fonts/X11/biznet/75dpi/timR18.pcf.gz
+share/fonts/X11/biznet/75dpi/timR24.pcf.gz
+share/fonts/X11/biznet/misc/10x20.pcf.gz
+share/fonts/X11/biznet/misc/12x24.pcf.gz
+share/fonts/X11/biznet/misc/5x7.pcf.gz
+share/fonts/X11/biznet/misc/6x10.pcf.gz
+share/fonts/X11/biznet/misc/6x13.pcf.gz
+share/fonts/X11/biznet/misc/6x13B.pcf.gz
+share/fonts/X11/biznet/misc/7x13.pcf.gz
+share/fonts/X11/biznet/misc/7x13B.pcf.gz
+share/fonts/X11/biznet/misc/7x14.pcf.gz
+share/fonts/X11/biznet/misc/7x14B.pcf.gz
+share/fonts/X11/biznet/misc/8x13.pcf.gz
+share/fonts/X11/biznet/misc/8x13B.pcf.gz
+share/fonts/X11/biznet/misc/8x16.pcf.gz
+share/fonts/X11/biznet/misc/9x15.pcf.gz
+share/fonts/X11/biznet/misc/9x15B.pcf.gz
+share/fonts/X11/biznet/misc/fonts.alias
diff --git a/fonts/cantarell-fonts/Makefile b/fonts/cantarell-fonts/Makefile
index 1312f30bc35..42c63038133 100644
--- a/fonts/cantarell-fonts/Makefile
+++ b/fonts/cantarell-fonts/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2013/09/26 20:48:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/01 16:35:32 wiz Exp $
#
DISTNAME= cantarell-fonts-0.0.15
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/cantarell-fonts/0.0/}
EXTRACT_SUFX= .tar.xz
@@ -14,10 +15,10 @@ LICENSE= ofl-v1.1
NO_CONFIGURE= YES
NO_BUILD= YES
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
-INSTALLATION_DIRS= lib/X11/fonts/TTF
+INSTALLATION_DIRS= share/fonts/X11/TTF
INSTALL_FONTS= Cantarell-Bold.otf \
Cantarell-Regular.otf
diff --git a/fonts/cantarell-fonts/PLIST b/fonts/cantarell-fonts/PLIST
index a263dbad156..101e9c220ec 100644
--- a/fonts/cantarell-fonts/PLIST
+++ b/fonts/cantarell-fonts/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2013/01/23 21:38:26 wiz Exp $
-lib/X11/fonts/TTF/Cantarell-Bold.otf
-lib/X11/fonts/TTF/Cantarell-Regular.otf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:32 wiz Exp $
+share/fonts/X11/TTF/Cantarell-Bold.otf
+share/fonts/X11/TTF/Cantarell-Regular.otf
diff --git a/fonts/consolamono-ttf/Makefile b/fonts/consolamono-ttf/Makefile
index facd80bedf1..0dc433cdb0d 100644
--- a/fonts/consolamono-ttf/Makefile
+++ b/fonts/consolamono-ttf/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2013/04/08 01:42:39 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:32 wiz Exp $
#
VER= 20121116
DISTNAME= consolamono
PKGNAME= ${DISTNAME}-ttf-${VER}
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://openfontlibrary.org/assets/downloads/consolamono/7c6fa601cdc82be054fb2b8fd7e3c8cc/
DIST_SUBDIR= ${PKGNAME_NOREV}
@@ -19,13 +20,13 @@ USE_LANGUAGES= # none
NO_CONFIGURE= yes
NO_BUILD= yes
-INSTALLATION_DIRS= lib/X11/fonts/TTF
-FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
+INSTALLATION_DIRS= share/fonts/X11/TTF
+FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
do-install:
${INSTALL_DATA} ${WRKSRC}/ConsolaMono-Bold.ttf \
- ${DESTDIR}${PREFIX}/lib/X11/fonts/TTF
+ ${DESTDIR}${PREFIX}/share/fonts/X11/TTF
${INSTALL_DATA} ${WRKSRC}/ConsolaMono.ttf \
- ${DESTDIR}${PREFIX}/lib/X11/fonts/TTF
+ ${DESTDIR}${PREFIX}/share/fonts/X11/TTF
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/consolamono-ttf/PLIST b/fonts/consolamono-ttf/PLIST
index 421e2a26ee8..dc4e5078168 100644
--- a/fonts/consolamono-ttf/PLIST
+++ b/fonts/consolamono-ttf/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2013/01/26 11:15:29 ryoon Exp $
-lib/X11/fonts/TTF/ConsolaMono-Bold.ttf
-lib/X11/fonts/TTF/ConsolaMono.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:32 wiz Exp $
+share/fonts/X11/TTF/ConsolaMono-Bold.ttf
+share/fonts/X11/TTF/ConsolaMono.ttf
diff --git a/fonts/courier-prime/Makefile b/fonts/courier-prime/Makefile
index 16d3eee5602..dea0f442f9c 100644
--- a/fonts/courier-prime/Makefile
+++ b/fonts/courier-prime/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2013/04/08 01:42:40 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:32 wiz Exp $
#
DISTNAME= courier-prime
# version number comes from include readme.
PKGNAME= ${DISTNAME}-1.203
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://quoteunquoteapps.com/downloads/
EXTRACT_SUFX= .zip
@@ -17,7 +18,7 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
USE_LANGUAGES= # none
-FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
INSTALLATION_DIRS= ${FONTS_DIRS.ttf}
INSTALLATION_DIRS+= share/doc/courier-prime
diff --git a/fonts/courier-prime/PLIST b/fonts/courier-prime/PLIST
index fa72cd5f2a3..f4699b9e7ae 100644
--- a/fonts/courier-prime/PLIST
+++ b/fonts/courier-prime/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2013/01/29 07:57:18 wiz Exp $
-lib/X11/fonts/TTF/Courier Prime Bold Italic.ttf
-lib/X11/fonts/TTF/Courier Prime Bold.ttf
-lib/X11/fonts/TTF/Courier Prime Italic.ttf
-lib/X11/fonts/TTF/Courier Prime.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:32 wiz Exp $
+share/fonts/X11/TTF/Courier Prime Bold Italic.ttf
+share/fonts/X11/TTF/Courier Prime Bold.ttf
+share/fonts/X11/TTF/Courier Prime Italic.ttf
+share/fonts/X11/TTF/Courier Prime.ttf
share/doc/courier-prime/Read me.txt
diff --git a/fonts/croscorefonts/Makefile b/fonts/croscorefonts/Makefile
index 6fe42a3ac61..56be8184ddd 100644
--- a/fonts/croscorefonts/Makefile
+++ b/fonts/croscorefonts/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2013/04/08 01:42:40 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:32 wiz Exp $
#
DISTNAME= croscorefonts-1.21.0
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://gsdview.appspot.com/chromeos-localmirror/distfiles/
@@ -17,10 +18,10 @@ USE_LANGUAGES= # none
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
-INSTALLATION_DIRS= lib/X11/fonts/TTF \
+INSTALLATION_DIRS= share/fonts/X11/TTF \
${DOCSDIR}
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
INSTALL_FONTS= Arimo-Bold.ttf \
diff --git a/fonts/croscorefonts/PLIST b/fonts/croscorefonts/PLIST
index f44c98a784d..9121a2aac97 100644
--- a/fonts/croscorefonts/PLIST
+++ b/fonts/croscorefonts/PLIST
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/04/14 15:53:04 ryoon Exp $
-lib/X11/fonts/TTF/Arimo-Bold.ttf
-lib/X11/fonts/TTF/Arimo-BoldItalic.ttf
-lib/X11/fonts/TTF/Arimo-Italic.ttf
-lib/X11/fonts/TTF/Arimo-Regular.ttf
-lib/X11/fonts/TTF/Cousine-Bold.ttf
-lib/X11/fonts/TTF/Cousine-BoldItalic.ttf
-lib/X11/fonts/TTF/Cousine-Italic.ttf
-lib/X11/fonts/TTF/Cousine-Regular.ttf
-lib/X11/fonts/TTF/SymbolNeu.ttf
-lib/X11/fonts/TTF/Tinos-Bold.ttf
-lib/X11/fonts/TTF/Tinos-BoldItalic.ttf
-lib/X11/fonts/TTF/Tinos-Italic.ttf
-lib/X11/fonts/TTF/Tinos-Regular.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:32 wiz Exp $
+share/fonts/X11/TTF/Arimo-Bold.ttf
+share/fonts/X11/TTF/Arimo-BoldItalic.ttf
+share/fonts/X11/TTF/Arimo-Italic.ttf
+share/fonts/X11/TTF/Arimo-Regular.ttf
+share/fonts/X11/TTF/Cousine-Bold.ttf
+share/fonts/X11/TTF/Cousine-BoldItalic.ttf
+share/fonts/X11/TTF/Cousine-Italic.ttf
+share/fonts/X11/TTF/Cousine-Regular.ttf
+share/fonts/X11/TTF/SymbolNeu.ttf
+share/fonts/X11/TTF/Tinos-Bold.ttf
+share/fonts/X11/TTF/Tinos-BoldItalic.ttf
+share/fonts/X11/TTF/Tinos-Italic.ttf
+share/fonts/X11/TTF/Tinos-Regular.ttf
share/doc/croscorefonts/LICENSE
diff --git a/fonts/cyberbase-ttf/Makefile b/fonts/cyberbase-ttf/Makefile
index ced75b8ec7b..f7c0cae6eba 100644
--- a/fonts/cyberbase-ttf/Makefile
+++ b/fonts/cyberbase-ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2009/08/25 11:56:36 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2014/06/01 16:35:32 wiz Exp $
#
PKGNAME= cyberbase-ttf-2.0
-PKGREVISION= 6
+PKGREVISION= 7
FONT_FILE= Cyberbase.ZIP
COMMENT= Cyberbit minus CJK subset, for ISO-8859-x languages
diff --git a/fonts/cyberbase-ttf/PLIST b/fonts/cyberbase-ttf/PLIST
index ea73256a0eb..5ef1f144a87 100644
--- a/fonts/cyberbase-ttf/PLIST
+++ b/fonts/cyberbase-ttf/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.6 2009/08/25 11:56:36 wiz Exp $
-lib/X11/fonts/TTF/Cyberbas.ttf
+@comment $NetBSD: PLIST,v 1.7 2014/06/01 16:35:32 wiz Exp $
+share/fonts/X11/TTF/Cyberbas.ttf
share/doc/html/cyberbit-ttf/ReadMe.htm
diff --git a/fonts/cyberbit-ttf/Makefile b/fonts/cyberbit-ttf/Makefile
index 4a9e235503b..b312be86f30 100644
--- a/fonts/cyberbit-ttf/Makefile
+++ b/fonts/cyberbit-ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2009/08/25 11:56:36 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2014/06/01 16:35:32 wiz Exp $
#
PKGNAME= cyberbit-ttf-2.0
-PKGREVISION= 6
+PKGREVISION= 7
FONT_FILE= Cyberbit.ZIP
COMMENT= Multilingual TrueType font from Bitstream
diff --git a/fonts/cyberbit-ttf/Makefile.common b/fonts/cyberbit-ttf/Makefile.common
index 7eadbcd6fc5..ddecec1aea3 100644
--- a/fonts/cyberbit-ttf/Makefile.common
+++ b/fonts/cyberbit-ttf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2012/10/03 18:28:18 asau Exp $
+# $NetBSD: Makefile.common,v 1.26 2014/06/01 16:35:32 wiz Exp $
#
DISTNAME= # empty
@@ -27,7 +27,7 @@ USE_X11BASE= YES
NO_CONFIGURE= YES
NO_BUILD= YES
-FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
DOCDIR= ${PREFIX}/share/doc/html/cyberbit-ttf
do-install:
diff --git a/fonts/cyberbit-ttf/PLIST b/fonts/cyberbit-ttf/PLIST
index 70bc5b86046..a5e812eb7de 100644
--- a/fonts/cyberbit-ttf/PLIST
+++ b/fonts/cyberbit-ttf/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.6 2009/08/25 11:56:36 wiz Exp $
-lib/X11/fonts/TTF/Cyberbit.ttf
+@comment $NetBSD: PLIST,v 1.7 2014/06/01 16:35:32 wiz Exp $
+share/fonts/X11/TTF/Cyberbit.ttf
share/doc/html/cyberbit-ttf/ReadMe.htm
diff --git a/fonts/cyr-rfx-bulgarian-mik/Makefile b/fonts/cyr-rfx-bulgarian-mik/Makefile
index 8fc4a2bdf23..73e8f35c289 100644
--- a/fonts/cyr-rfx-bulgarian-mik/Makefile
+++ b/fonts/cyr-rfx-bulgarian-mik/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2006/09/22 21:53:57 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:32 wiz Exp $
CYR_RFX_ENCODING=bulgarian-mik
-PKGREVISION= 3
+PKGREVISION= 4
.include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-bulgarian-mik/PLIST b/fonts/cyr-rfx-bulgarian-mik/PLIST
index adb80fc2e77..28d25c6a6ef 100644
--- a/fonts/cyr-rfx-bulgarian-mik/PLIST
+++ b/fonts/cyr-rfx-bulgarian-mik/PLIST
@@ -1,133 +1,133 @@
-@comment $NetBSD: PLIST,v 1.3 2006/09/22 21:53:57 joerg 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
-lib/X11/fonts/local/bulgarian-mik/75dpi/courB14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/courB18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/courB24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/courBO08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/courBO10b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/courBO12b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/courBO14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/courBO18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/courBO24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/courO08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/courO10b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/courO12b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/courO14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/courO18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/courO24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/courR08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/courR10b.pcf
-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/helvB08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvB10b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvB12b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvB14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvB18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvB24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvBO08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvBO10b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvBO12b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvBO14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvBO18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvBO24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvO08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvO10b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvO12b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvO14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvO18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvO24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvR08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvR10b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvR12b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvR14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvR18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/helvR24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luBIS08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luBIS10b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luBIS12b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luBIS14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luBIS18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luBIS19b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luBIS24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luBS08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luBS10b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luBS12b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luBS14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luBS18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luBS19b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luBS24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luIS08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luIS10b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luIS12b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luIS14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luIS18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luIS19b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luIS24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luRS08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luRS10b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luRS12b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luRS14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luRS18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luRS19b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/luRS24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/lutBS08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/lutBS10b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/lutBS12b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/lutBS14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/lutBS18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/lutBS19b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/lutBS24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/lutRS08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/lutRS10b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/lutRS12b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/lutRS14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/lutRS18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/lutRS19b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/lutRS24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timB08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timB10b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timB12b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timB14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timB18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timB24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timBI08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timBI10b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timBI12b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timBI14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timBI18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timBI24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timI08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timI10b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timI12b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timI14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timI18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timI24b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timR08b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timR10b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timR12b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timR14b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timR18b.pcf
-lib/X11/fonts/local/bulgarian-mik/75dpi/timR24b.pcf
-lib/X11/fonts/local/bulgarian-mik/misc/10x20b.pcf
-lib/X11/fonts/local/bulgarian-mik/misc/12x24b.pcf
-lib/X11/fonts/local/bulgarian-mik/misc/5x7b.pcf
-lib/X11/fonts/local/bulgarian-mik/misc/6x10b.pcf
-lib/X11/fonts/local/bulgarian-mik/misc/6x13Bb.pcf
-lib/X11/fonts/local/bulgarian-mik/misc/6x13b.pcf
-lib/X11/fonts/local/bulgarian-mik/misc/7x13Bb.pcf
-lib/X11/fonts/local/bulgarian-mik/misc/7x13b.pcf
-lib/X11/fonts/local/bulgarian-mik/misc/7x14Bb.pcf
-lib/X11/fonts/local/bulgarian-mik/misc/7x14b.pcf
-lib/X11/fonts/local/bulgarian-mik/misc/8x13Bb.pcf
-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/nil2b.pcf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:32 wiz Exp $
+share/fonts/X11/local/bulgarian-mik/75dpi/courB08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courB10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courB12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courB14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courB18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courB24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courBO08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courBO10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courBO12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courBO14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courBO18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courBO24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courO08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courO10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courO12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courO14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courO18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courO24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courR08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courR10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courR12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courR14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courR18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/courR24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/fonts.alias
+share/fonts/X11/local/bulgarian-mik/75dpi/helvB08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvB10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvB12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvB14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvB18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvB24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvBO08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvBO10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvBO12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvBO14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvBO18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvBO24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvO08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvO10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvO12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvO14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvO18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvO24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvR08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvR10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvR12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvR14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvR18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/helvR24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luBIS08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luBIS10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luBIS12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luBIS14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luBIS18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luBIS19b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luBIS24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luBS08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luBS10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luBS12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luBS14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luBS18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luBS19b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luBS24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luIS08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luIS10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luIS12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luIS14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luIS18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luIS19b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luIS24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luRS08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luRS10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luRS12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luRS14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luRS18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luRS19b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/luRS24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/lutBS08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/lutBS10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/lutBS12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/lutBS14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/lutBS18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/lutBS19b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/lutBS24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/lutRS08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/lutRS10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/lutRS12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/lutRS14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/lutRS18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/lutRS19b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/lutRS24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timB08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timB10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timB12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timB14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timB18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timB24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timBI08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timBI10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timBI12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timBI14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timBI18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timBI24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timI08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timI10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timI12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timI14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timI18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timI24b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timR08b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timR10b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timR12b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timR14b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timR18b.pcf
+share/fonts/X11/local/bulgarian-mik/75dpi/timR24b.pcf
+share/fonts/X11/local/bulgarian-mik/misc/10x20b.pcf
+share/fonts/X11/local/bulgarian-mik/misc/12x24b.pcf
+share/fonts/X11/local/bulgarian-mik/misc/5x7b.pcf
+share/fonts/X11/local/bulgarian-mik/misc/6x10b.pcf
+share/fonts/X11/local/bulgarian-mik/misc/6x13Bb.pcf
+share/fonts/X11/local/bulgarian-mik/misc/6x13b.pcf
+share/fonts/X11/local/bulgarian-mik/misc/7x13Bb.pcf
+share/fonts/X11/local/bulgarian-mik/misc/7x13b.pcf
+share/fonts/X11/local/bulgarian-mik/misc/7x14Bb.pcf
+share/fonts/X11/local/bulgarian-mik/misc/7x14b.pcf
+share/fonts/X11/local/bulgarian-mik/misc/8x13Bb.pcf
+share/fonts/X11/local/bulgarian-mik/misc/8x13b.pcf
+share/fonts/X11/local/bulgarian-mik/misc/8x16b.pcf
+share/fonts/X11/local/bulgarian-mik/misc/9x15Bb.pcf
+share/fonts/X11/local/bulgarian-mik/misc/9x15b.pcf
+share/fonts/X11/local/bulgarian-mik/misc/fonts.alias
+share/fonts/X11/local/bulgarian-mik/misc/nil2b.pcf
diff --git a/fonts/cyr-rfx-ibm-cp866/Makefile b/fonts/cyr-rfx-ibm-cp866/Makefile
index b77243b9893..af2b68ae729 100644
--- a/fonts/cyr-rfx-ibm-cp866/Makefile
+++ b/fonts/cyr-rfx-ibm-cp866/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2006/09/22 21:53:57 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:32 wiz Exp $
CYR_RFX_ENCODING=ibm-cp866
-PKGREVISION= 3
+PKGREVISION= 4
.include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-ibm-cp866/PLIST b/fonts/cyr-rfx-ibm-cp866/PLIST
index e883ecc8b19..8730be7283b 100644
--- a/fonts/cyr-rfx-ibm-cp866/PLIST
+++ b/fonts/cyr-rfx-ibm-cp866/PLIST
@@ -1,133 +1,133 @@
-@comment $NetBSD: PLIST,v 1.3 2006/09/22 21:53:57 joerg 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
-lib/X11/fonts/local/ibm-cp866/75dpi/courB14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/courB18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/courB24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/courBO08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/courBO10d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/courBO12d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/courBO14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/courBO18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/courBO24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/courO08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/courO10d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/courO12d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/courO14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/courO18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/courO24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/courR08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/courR10d.pcf
-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/helvB08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvB10d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvB12d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvB14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvB18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvB24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvBO08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvBO10d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvBO12d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvBO14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvBO18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvBO24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvO08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvO10d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvO12d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvO14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvO18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvO24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvR08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvR10d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvR12d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvR14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvR18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/helvR24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luBIS08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luBIS10d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luBIS12d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luBIS14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luBIS18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luBIS19d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luBIS24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luBS08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luBS10d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luBS12d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luBS14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luBS18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luBS19d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luBS24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luIS08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luIS10d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luIS12d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luIS14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luIS18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luIS19d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luIS24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luRS08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luRS10d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luRS12d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luRS14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luRS18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luRS19d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/luRS24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/lutBS08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/lutBS10d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/lutBS12d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/lutBS14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/lutBS18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/lutBS19d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/lutBS24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/lutRS08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/lutRS10d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/lutRS12d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/lutRS14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/lutRS18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/lutRS19d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/lutRS24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timB08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timB10d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timB12d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timB14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timB18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timB24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timBI08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timBI10d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timBI12d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timBI14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timBI18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timBI24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timI08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timI10d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timI12d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timI14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timI18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timI24d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timR08d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timR10d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timR12d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timR14d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timR18d.pcf
-lib/X11/fonts/local/ibm-cp866/75dpi/timR24d.pcf
-lib/X11/fonts/local/ibm-cp866/misc/10x20d.pcf
-lib/X11/fonts/local/ibm-cp866/misc/12x24d.pcf
-lib/X11/fonts/local/ibm-cp866/misc/5x7d.pcf
-lib/X11/fonts/local/ibm-cp866/misc/6x10d.pcf
-lib/X11/fonts/local/ibm-cp866/misc/6x13Bd.pcf
-lib/X11/fonts/local/ibm-cp866/misc/6x13d.pcf
-lib/X11/fonts/local/ibm-cp866/misc/7x13Bd.pcf
-lib/X11/fonts/local/ibm-cp866/misc/7x13d.pcf
-lib/X11/fonts/local/ibm-cp866/misc/7x14Bd.pcf
-lib/X11/fonts/local/ibm-cp866/misc/7x14d.pcf
-lib/X11/fonts/local/ibm-cp866/misc/8x13Bd.pcf
-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/nil2d.pcf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:32 wiz Exp $
+share/fonts/X11/local/ibm-cp866/75dpi/courB08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courB10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courB12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courB14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courB18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courB24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courBO08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courBO10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courBO12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courBO14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courBO18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courBO24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courO08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courO10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courO12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courO14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courO18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courO24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courR08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courR10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courR12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courR14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courR18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/courR24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/fonts.alias
+share/fonts/X11/local/ibm-cp866/75dpi/helvB08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvB10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvB12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvB14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvB18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvB24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvBO08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvBO10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvBO12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvBO14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvBO18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvBO24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvO08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvO10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvO12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvO14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvO18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvO24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvR08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvR10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvR12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvR14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvR18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/helvR24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luBIS08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luBIS10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luBIS12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luBIS14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luBIS18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luBIS19d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luBIS24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luBS08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luBS10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luBS12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luBS14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luBS18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luBS19d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luBS24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luIS08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luIS10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luIS12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luIS14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luIS18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luIS19d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luIS24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luRS08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luRS10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luRS12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luRS14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luRS18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luRS19d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/luRS24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/lutBS08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/lutBS10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/lutBS12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/lutBS14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/lutBS18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/lutBS19d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/lutBS24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/lutRS08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/lutRS10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/lutRS12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/lutRS14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/lutRS18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/lutRS19d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/lutRS24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timB08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timB10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timB12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timB14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timB18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timB24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timBI08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timBI10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timBI12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timBI14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timBI18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timBI24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timI08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timI10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timI12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timI14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timI18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timI24d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timR08d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timR10d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timR12d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timR14d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timR18d.pcf
+share/fonts/X11/local/ibm-cp866/75dpi/timR24d.pcf
+share/fonts/X11/local/ibm-cp866/misc/10x20d.pcf
+share/fonts/X11/local/ibm-cp866/misc/12x24d.pcf
+share/fonts/X11/local/ibm-cp866/misc/5x7d.pcf
+share/fonts/X11/local/ibm-cp866/misc/6x10d.pcf
+share/fonts/X11/local/ibm-cp866/misc/6x13Bd.pcf
+share/fonts/X11/local/ibm-cp866/misc/6x13d.pcf
+share/fonts/X11/local/ibm-cp866/misc/7x13Bd.pcf
+share/fonts/X11/local/ibm-cp866/misc/7x13d.pcf
+share/fonts/X11/local/ibm-cp866/misc/7x14Bd.pcf
+share/fonts/X11/local/ibm-cp866/misc/7x14d.pcf
+share/fonts/X11/local/ibm-cp866/misc/8x13Bd.pcf
+share/fonts/X11/local/ibm-cp866/misc/8x13d.pcf
+share/fonts/X11/local/ibm-cp866/misc/8x16d.pcf
+share/fonts/X11/local/ibm-cp866/misc/9x15Bd.pcf
+share/fonts/X11/local/ibm-cp866/misc/9x15d.pcf
+share/fonts/X11/local/ibm-cp866/misc/fonts.alias
+share/fonts/X11/local/ibm-cp866/misc/nil2d.pcf
diff --git a/fonts/cyr-rfx-iso10646_0400/Makefile b/fonts/cyr-rfx-iso10646_0400/Makefile
index b658889fe82..9fa9f544016 100644
--- a/fonts/cyr-rfx-iso10646_0400/Makefile
+++ b/fonts/cyr-rfx-iso10646_0400/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:32 wiz Exp $
CYR_RFX_ENCODING=iso10646-0400
PKGNAME= ${DISTNAME:S/6-0/6_0/}
-PKGREVISION= 3
+PKGREVISION= 4
.include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-iso10646_0400/PLIST b/fonts/cyr-rfx-iso10646_0400/PLIST
index dcb2d94a963..0291d19f178 100644
--- a/fonts/cyr-rfx-iso10646_0400/PLIST
+++ b/fonts/cyr-rfx-iso10646_0400/PLIST
@@ -1,133 +1,133 @@
-@comment $NetBSD: PLIST,v 1.3 2006/09/22 21:53:57 joerg 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
-lib/X11/fonts/local/iso10646-0400/75dpi/courB14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/courB18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/courB24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/courBO08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/courBO10c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/courBO12c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/courBO14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/courBO18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/courBO24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/courO08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/courO10c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/courO12c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/courO14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/courO18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/courO24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/courR08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/courR10c.pcf
-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/helvB08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvB10c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvB12c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvB14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvB18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvB24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvBO08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvBO10c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvBO12c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvBO14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvBO18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvBO24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvO08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvO10c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvO12c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvO14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvO18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvO24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvR08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvR10c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvR12c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvR14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvR18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/helvR24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luBIS08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luBIS10c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luBIS12c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luBIS14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luBIS18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luBIS19c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luBIS24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luBS08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luBS10c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luBS12c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luBS14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luBS18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luBS19c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luBS24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luIS08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luIS10c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luIS12c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luIS14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luIS18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luIS19c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luIS24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luRS08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luRS10c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luRS12c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luRS14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luRS18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luRS19c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/luRS24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/lutBS08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/lutBS10c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/lutBS12c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/lutBS14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/lutBS18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/lutBS19c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/lutBS24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/lutRS08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/lutRS10c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/lutRS12c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/lutRS14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/lutRS18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/lutRS19c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/lutRS24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timB08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timB10c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timB12c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timB14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timB18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timB24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timBI08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timBI10c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timBI12c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timBI14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timBI18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timBI24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timI08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timI10c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timI12c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timI14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timI18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timI24c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timR08c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timR10c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timR12c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timR14c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timR18c.pcf
-lib/X11/fonts/local/iso10646-0400/75dpi/timR24c.pcf
-lib/X11/fonts/local/iso10646-0400/misc/10x20c.pcf
-lib/X11/fonts/local/iso10646-0400/misc/12x24c.pcf
-lib/X11/fonts/local/iso10646-0400/misc/5x7c.pcf
-lib/X11/fonts/local/iso10646-0400/misc/6x10c.pcf
-lib/X11/fonts/local/iso10646-0400/misc/6x13Bc.pcf
-lib/X11/fonts/local/iso10646-0400/misc/6x13c.pcf
-lib/X11/fonts/local/iso10646-0400/misc/7x13Bc.pcf
-lib/X11/fonts/local/iso10646-0400/misc/7x13c.pcf
-lib/X11/fonts/local/iso10646-0400/misc/7x14Bc.pcf
-lib/X11/fonts/local/iso10646-0400/misc/7x14c.pcf
-lib/X11/fonts/local/iso10646-0400/misc/8x13Bc.pcf
-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/nil2c.pcf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:32 wiz Exp $
+share/fonts/X11/local/iso10646-0400/75dpi/courB08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courB10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courB12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courB14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courB18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courB24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courBO08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courBO10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courBO12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courBO14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courBO18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courBO24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courO08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courO10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courO12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courO14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courO18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courO24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courR08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courR10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courR12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courR14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courR18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/courR24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/fonts.alias
+share/fonts/X11/local/iso10646-0400/75dpi/helvB08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvB10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvB12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvB14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvB18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvB24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvBO08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvBO10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvBO12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvBO14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvBO18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvBO24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvO08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvO10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvO12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvO14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvO18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvO24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvR08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvR10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvR12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvR14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvR18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/helvR24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luBIS08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luBIS10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luBIS12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luBIS14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luBIS18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luBIS19c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luBIS24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luBS08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luBS10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luBS12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luBS14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luBS18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luBS19c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luBS24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luIS08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luIS10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luIS12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luIS14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luIS18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luIS19c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luIS24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luRS08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luRS10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luRS12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luRS14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luRS18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luRS19c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/luRS24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/lutBS08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/lutBS10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/lutBS12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/lutBS14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/lutBS18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/lutBS19c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/lutBS24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/lutRS08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/lutRS10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/lutRS12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/lutRS14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/lutRS18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/lutRS19c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/lutRS24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timB08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timB10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timB12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timB14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timB18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timB24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timBI08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timBI10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timBI12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timBI14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timBI18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timBI24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timI08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timI10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timI12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timI14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timI18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timI24c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timR08c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timR10c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timR12c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timR14c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timR18c.pcf
+share/fonts/X11/local/iso10646-0400/75dpi/timR24c.pcf
+share/fonts/X11/local/iso10646-0400/misc/10x20c.pcf
+share/fonts/X11/local/iso10646-0400/misc/12x24c.pcf
+share/fonts/X11/local/iso10646-0400/misc/5x7c.pcf
+share/fonts/X11/local/iso10646-0400/misc/6x10c.pcf
+share/fonts/X11/local/iso10646-0400/misc/6x13Bc.pcf
+share/fonts/X11/local/iso10646-0400/misc/6x13c.pcf
+share/fonts/X11/local/iso10646-0400/misc/7x13Bc.pcf
+share/fonts/X11/local/iso10646-0400/misc/7x13c.pcf
+share/fonts/X11/local/iso10646-0400/misc/7x14Bc.pcf
+share/fonts/X11/local/iso10646-0400/misc/7x14c.pcf
+share/fonts/X11/local/iso10646-0400/misc/8x13Bc.pcf
+share/fonts/X11/local/iso10646-0400/misc/8x13c.pcf
+share/fonts/X11/local/iso10646-0400/misc/8x16c.pcf
+share/fonts/X11/local/iso10646-0400/misc/9x15Bc.pcf
+share/fonts/X11/local/iso10646-0400/misc/9x15c.pcf
+share/fonts/X11/local/iso10646-0400/misc/fonts.alias
+share/fonts/X11/local/iso10646-0400/misc/nil2c.pcf
diff --git a/fonts/cyr-rfx-iso8859_15/Makefile b/fonts/cyr-rfx-iso8859_15/Makefile
index c35ac41124b..c9064a204e2 100644
--- a/fonts/cyr-rfx-iso8859_15/Makefile
+++ b/fonts/cyr-rfx-iso8859_15/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2006/10/09 07:02:55 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:32 wiz Exp $
CYR_RFX_ENCODING=iso8859-15
PKGNAME= ${DISTNAME:S/9-1/9_1/}
-PKGREVISION= 3
+PKGREVISION= 4
.include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-iso8859_15/PLIST b/fonts/cyr-rfx-iso8859_15/PLIST
index f75fbc647ee..1cbaf2b96de 100644
--- a/fonts/cyr-rfx-iso8859_15/PLIST
+++ b/fonts/cyr-rfx-iso8859_15/PLIST
@@ -1,133 +1,133 @@
-@comment $NetBSD: PLIST,v 1.3 2006/10/09 07:02:55 joerg 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
-lib/X11/fonts/local/iso8859-15/75dpi/courB14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/courB18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/courB24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/courBO08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/courBO10e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/courBO12e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/courBO14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/courBO18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/courBO24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/courO08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/courO10e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/courO12e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/courO14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/courO18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/courO24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/courR08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/courR10e.pcf
-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/helvB08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvB10e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvB12e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvB14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvB18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvB24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvBO08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvBO10e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvBO12e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvBO14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvBO18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvBO24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvO08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvO10e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvO12e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvO14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvO18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvO24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvR08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvR10e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvR12e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvR14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvR18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/helvR24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luBIS08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luBIS10e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luBIS12e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luBIS14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luBIS18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luBIS19e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luBIS24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luBS08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luBS10e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luBS12e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luBS14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luBS18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luBS19e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luBS24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luIS08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luIS10e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luIS12e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luIS14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luIS18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luIS19e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luIS24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luRS08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luRS10e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luRS12e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luRS14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luRS18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luRS19e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/luRS24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/lutBS08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/lutBS10e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/lutBS12e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/lutBS14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/lutBS18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/lutBS19e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/lutBS24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/lutRS08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/lutRS10e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/lutRS12e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/lutRS14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/lutRS18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/lutRS19e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/lutRS24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timB08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timB10e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timB12e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timB14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timB18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timB24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timBI08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timBI10e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timBI12e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timBI14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timBI18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timBI24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timI08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timI10e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timI12e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timI14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timI18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timI24e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timR08e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timR10e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timR12e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timR14e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timR18e.pcf
-lib/X11/fonts/local/iso8859-15/75dpi/timR24e.pcf
-lib/X11/fonts/local/iso8859-15/misc/10x20e.pcf
-lib/X11/fonts/local/iso8859-15/misc/12x24e.pcf
-lib/X11/fonts/local/iso8859-15/misc/5x7e.pcf
-lib/X11/fonts/local/iso8859-15/misc/6x10e.pcf
-lib/X11/fonts/local/iso8859-15/misc/6x13Be.pcf
-lib/X11/fonts/local/iso8859-15/misc/6x13e.pcf
-lib/X11/fonts/local/iso8859-15/misc/7x13Be.pcf
-lib/X11/fonts/local/iso8859-15/misc/7x13e.pcf
-lib/X11/fonts/local/iso8859-15/misc/7x14Be.pcf
-lib/X11/fonts/local/iso8859-15/misc/7x14e.pcf
-lib/X11/fonts/local/iso8859-15/misc/8x13Be.pcf
-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/nil2e.pcf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:32 wiz Exp $
+share/fonts/X11/local/iso8859-15/75dpi/courB08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courB10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courB12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courB14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courB18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courB24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courBO08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courBO10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courBO12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courBO14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courBO18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courBO24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courO08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courO10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courO12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courO14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courO18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courO24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courR08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courR10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courR12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courR14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courR18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/courR24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/fonts.alias
+share/fonts/X11/local/iso8859-15/75dpi/helvB08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvB10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvB12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvB14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvB18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvB24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvBO08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvBO10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvBO12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvBO14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvBO18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvBO24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvO08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvO10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvO12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvO14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvO18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvO24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvR08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvR10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvR12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvR14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvR18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/helvR24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luBIS08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luBIS10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luBIS12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luBIS14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luBIS18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luBIS19e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luBIS24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luBS08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luBS10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luBS12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luBS14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luBS18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luBS19e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luBS24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luIS08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luIS10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luIS12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luIS14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luIS18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luIS19e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luIS24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luRS08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luRS10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luRS12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luRS14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luRS18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luRS19e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/luRS24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/lutBS08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/lutBS10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/lutBS12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/lutBS14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/lutBS18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/lutBS19e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/lutBS24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/lutRS08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/lutRS10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/lutRS12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/lutRS14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/lutRS18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/lutRS19e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/lutRS24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timB08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timB10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timB12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timB14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timB18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timB24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timBI08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timBI10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timBI12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timBI14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timBI18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timBI24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timI08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timI10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timI12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timI14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timI18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timI24e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timR08e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timR10e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timR12e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timR14e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timR18e.pcf
+share/fonts/X11/local/iso8859-15/75dpi/timR24e.pcf
+share/fonts/X11/local/iso8859-15/misc/10x20e.pcf
+share/fonts/X11/local/iso8859-15/misc/12x24e.pcf
+share/fonts/X11/local/iso8859-15/misc/5x7e.pcf
+share/fonts/X11/local/iso8859-15/misc/6x10e.pcf
+share/fonts/X11/local/iso8859-15/misc/6x13Be.pcf
+share/fonts/X11/local/iso8859-15/misc/6x13e.pcf
+share/fonts/X11/local/iso8859-15/misc/7x13Be.pcf
+share/fonts/X11/local/iso8859-15/misc/7x13e.pcf
+share/fonts/X11/local/iso8859-15/misc/7x14Be.pcf
+share/fonts/X11/local/iso8859-15/misc/7x14e.pcf
+share/fonts/X11/local/iso8859-15/misc/8x13Be.pcf
+share/fonts/X11/local/iso8859-15/misc/8x13e.pcf
+share/fonts/X11/local/iso8859-15/misc/8x16e.pcf
+share/fonts/X11/local/iso8859-15/misc/9x15Be.pcf
+share/fonts/X11/local/iso8859-15/misc/9x15e.pcf
+share/fonts/X11/local/iso8859-15/misc/fonts.alias
+share/fonts/X11/local/iso8859-15/misc/nil2e.pcf
diff --git a/fonts/cyr-rfx-iso8859_5/Makefile b/fonts/cyr-rfx-iso8859_5/Makefile
index 2e6d226aafe..b415318b908 100644
--- a/fonts/cyr-rfx-iso8859_5/Makefile
+++ b/fonts/cyr-rfx-iso8859_5/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2006/10/13 11:59:16 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:33 wiz Exp $
CYR_RFX_ENCODING=iso8859-5
PKGNAME= ${DISTNAME:S/9-5/9_5/}
-PKGREVISION= 3
+PKGREVISION= 4
.include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-iso8859_5/PLIST b/fonts/cyr-rfx-iso8859_5/PLIST
index 1cb64690b8f..5f516c60112 100644
--- a/fonts/cyr-rfx-iso8859_5/PLIST
+++ b/fonts/cyr-rfx-iso8859_5/PLIST
@@ -1,133 +1,133 @@
-@comment $NetBSD: PLIST,v 1.3 2006/10/09 07:02:56 joerg 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
-lib/X11/fonts/local/iso8859-5/75dpi/courB14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/courB18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/courB24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/courBO08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/courBO10i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/courBO12i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/courBO14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/courBO18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/courBO24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/courO08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/courO10i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/courO12i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/courO14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/courO18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/courO24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/courR08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/courR10i.pcf
-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/helvB08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvB10i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvB12i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvB14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvB18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvB24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvBO08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvBO10i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvBO12i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvBO14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvBO18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvBO24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvO08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvO10i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvO12i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvO14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvO18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvO24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvR08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvR10i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvR12i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvR14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvR18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/helvR24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luBIS08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luBIS10i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luBIS12i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luBIS14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luBIS18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luBIS19i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luBIS24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luBS08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luBS10i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luBS12i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luBS14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luBS18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luBS19i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luBS24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luIS08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luIS10i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luIS12i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luIS14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luIS18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luIS19i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luIS24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luRS08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luRS10i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luRS12i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luRS14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luRS18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luRS19i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/luRS24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/lutBS08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/lutBS10i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/lutBS12i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/lutBS14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/lutBS18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/lutBS19i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/lutBS24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/lutRS08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/lutRS10i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/lutRS12i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/lutRS14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/lutRS18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/lutRS19i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/lutRS24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timB08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timB10i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timB12i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timB14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timB18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timB24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timBI08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timBI10i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timBI12i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timBI14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timBI18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timBI24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timI08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timI10i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timI12i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timI14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timI18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timI24i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timR08i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timR10i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timR12i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timR14i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timR18i.pcf
-lib/X11/fonts/local/iso8859-5/75dpi/timR24i.pcf
-lib/X11/fonts/local/iso8859-5/misc/10x20i.pcf
-lib/X11/fonts/local/iso8859-5/misc/12x24i.pcf
-lib/X11/fonts/local/iso8859-5/misc/5x7i.pcf
-lib/X11/fonts/local/iso8859-5/misc/6x10i.pcf
-lib/X11/fonts/local/iso8859-5/misc/6x13Bi.pcf
-lib/X11/fonts/local/iso8859-5/misc/6x13i.pcf
-lib/X11/fonts/local/iso8859-5/misc/7x13Bi.pcf
-lib/X11/fonts/local/iso8859-5/misc/7x13i.pcf
-lib/X11/fonts/local/iso8859-5/misc/7x14Bi.pcf
-lib/X11/fonts/local/iso8859-5/misc/7x14i.pcf
-lib/X11/fonts/local/iso8859-5/misc/8x13Bi.pcf
-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/nil2i.pcf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:33 wiz Exp $
+share/fonts/X11/local/iso8859-5/75dpi/courB08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courB10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courB12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courB14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courB18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courB24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courBO08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courBO10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courBO12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courBO14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courBO18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courBO24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courO08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courO10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courO12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courO14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courO18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courO24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courR08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courR10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courR12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courR14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courR18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/courR24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/fonts.alias
+share/fonts/X11/local/iso8859-5/75dpi/helvB08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvB10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvB12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvB14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvB18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvB24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvBO08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvBO10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvBO12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvBO14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvBO18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvBO24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvO08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvO10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvO12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvO14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvO18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvO24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvR08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvR10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvR12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvR14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvR18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/helvR24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luBIS08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luBIS10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luBIS12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luBIS14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luBIS18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luBIS19i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luBIS24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luBS08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luBS10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luBS12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luBS14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luBS18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luBS19i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luBS24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luIS08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luIS10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luIS12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luIS14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luIS18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luIS19i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luIS24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luRS08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luRS10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luRS12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luRS14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luRS18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luRS19i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/luRS24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/lutBS08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/lutBS10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/lutBS12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/lutBS14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/lutBS18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/lutBS19i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/lutBS24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/lutRS08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/lutRS10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/lutRS12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/lutRS14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/lutRS18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/lutRS19i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/lutRS24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timB08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timB10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timB12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timB14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timB18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timB24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timBI08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timBI10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timBI12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timBI14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timBI18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timBI24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timI08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timI10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timI12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timI14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timI18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timI24i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timR08i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timR10i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timR12i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timR14i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timR18i.pcf
+share/fonts/X11/local/iso8859-5/75dpi/timR24i.pcf
+share/fonts/X11/local/iso8859-5/misc/10x20i.pcf
+share/fonts/X11/local/iso8859-5/misc/12x24i.pcf
+share/fonts/X11/local/iso8859-5/misc/5x7i.pcf
+share/fonts/X11/local/iso8859-5/misc/6x10i.pcf
+share/fonts/X11/local/iso8859-5/misc/6x13Bi.pcf
+share/fonts/X11/local/iso8859-5/misc/6x13i.pcf
+share/fonts/X11/local/iso8859-5/misc/7x13Bi.pcf
+share/fonts/X11/local/iso8859-5/misc/7x13i.pcf
+share/fonts/X11/local/iso8859-5/misc/7x14Bi.pcf
+share/fonts/X11/local/iso8859-5/misc/7x14i.pcf
+share/fonts/X11/local/iso8859-5/misc/8x13Bi.pcf
+share/fonts/X11/local/iso8859-5/misc/8x13i.pcf
+share/fonts/X11/local/iso8859-5/misc/8x16i.pcf
+share/fonts/X11/local/iso8859-5/misc/9x15Bi.pcf
+share/fonts/X11/local/iso8859-5/misc/9x15i.pcf
+share/fonts/X11/local/iso8859-5/misc/fonts.alias
+share/fonts/X11/local/iso8859-5/misc/nil2i.pcf
diff --git a/fonts/cyr-rfx-koi8-o/Makefile b/fonts/cyr-rfx-koi8-o/Makefile
index b18e7d076d8..944ac60478f 100644
--- a/fonts/cyr-rfx-koi8-o/Makefile
+++ b/fonts/cyr-rfx-koi8-o/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2006/09/22 21:53:57 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:33 wiz Exp $
CYR_RFX_ENCODING=koi8-o
-PKGREVISION= 3
+PKGREVISION= 4
.include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-koi8-o/PLIST b/fonts/cyr-rfx-koi8-o/PLIST
index 07824d2080b..0f0f7e89f51 100644
--- a/fonts/cyr-rfx-koi8-o/PLIST
+++ b/fonts/cyr-rfx-koi8-o/PLIST
@@ -1,133 +1,133 @@
-@comment $NetBSD: PLIST,v 1.3 2006/09/22 21:53:57 joerg 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
-lib/X11/fonts/local/koi8-o/75dpi/courB14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/courB18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/courB24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/courBO08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/courBO10o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/courBO12o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/courBO14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/courBO18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/courBO24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/courO08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/courO10o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/courO12o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/courO14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/courO18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/courO24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/courR08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/courR10o.pcf
-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/helvB08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvB10o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvB12o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvB14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvB18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvB24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvBO08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvBO10o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvBO12o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvBO14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvBO18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvBO24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvO08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvO10o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvO12o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvO14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvO18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvO24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvR08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvR10o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvR12o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvR14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvR18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/helvR24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luBIS08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luBIS10o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luBIS12o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luBIS14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luBIS18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luBIS19o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luBIS24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luBS08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luBS10o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luBS12o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luBS14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luBS18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luBS19o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luBS24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luIS08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luIS10o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luIS12o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luIS14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luIS18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luIS19o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luIS24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luRS08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luRS10o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luRS12o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luRS14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luRS18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luRS19o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/luRS24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/lutBS08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/lutBS10o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/lutBS12o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/lutBS14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/lutBS18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/lutBS19o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/lutBS24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/lutRS08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/lutRS10o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/lutRS12o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/lutRS14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/lutRS18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/lutRS19o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/lutRS24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timB08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timB10o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timB12o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timB14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timB18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timB24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timBI08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timBI10o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timBI12o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timBI14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timBI18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timBI24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timI08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timI10o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timI12o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timI14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timI18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timI24o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timR08o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timR10o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timR12o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timR14o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timR18o.pcf
-lib/X11/fonts/local/koi8-o/75dpi/timR24o.pcf
-lib/X11/fonts/local/koi8-o/misc/10x20o.pcf
-lib/X11/fonts/local/koi8-o/misc/12x24o.pcf
-lib/X11/fonts/local/koi8-o/misc/5x7o.pcf
-lib/X11/fonts/local/koi8-o/misc/6x10o.pcf
-lib/X11/fonts/local/koi8-o/misc/6x13Bo.pcf
-lib/X11/fonts/local/koi8-o/misc/6x13o.pcf
-lib/X11/fonts/local/koi8-o/misc/7x13Bo.pcf
-lib/X11/fonts/local/koi8-o/misc/7x13o.pcf
-lib/X11/fonts/local/koi8-o/misc/7x14Bo.pcf
-lib/X11/fonts/local/koi8-o/misc/7x14o.pcf
-lib/X11/fonts/local/koi8-o/misc/8x13Bo.pcf
-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/nil2o.pcf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:33 wiz Exp $
+share/fonts/X11/local/koi8-o/75dpi/courB08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courB10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courB12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courB14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courB18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courB24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courBO08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courBO10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courBO12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courBO14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courBO18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courBO24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courO08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courO10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courO12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courO14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courO18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courO24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courR08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courR10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courR12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courR14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courR18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/courR24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/fonts.alias
+share/fonts/X11/local/koi8-o/75dpi/helvB08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvB10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvB12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvB14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvB18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvB24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvBO08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvBO10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvBO12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvBO14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvBO18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvBO24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvO08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvO10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvO12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvO14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvO18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvO24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvR08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvR10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvR12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvR14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvR18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/helvR24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luBIS08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luBIS10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luBIS12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luBIS14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luBIS18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luBIS19o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luBIS24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luBS08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luBS10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luBS12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luBS14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luBS18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luBS19o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luBS24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luIS08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luIS10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luIS12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luIS14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luIS18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luIS19o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luIS24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luRS08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luRS10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luRS12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luRS14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luRS18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luRS19o.pcf
+share/fonts/X11/local/koi8-o/75dpi/luRS24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/lutBS08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/lutBS10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/lutBS12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/lutBS14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/lutBS18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/lutBS19o.pcf
+share/fonts/X11/local/koi8-o/75dpi/lutBS24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/lutRS08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/lutRS10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/lutRS12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/lutRS14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/lutRS18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/lutRS19o.pcf
+share/fonts/X11/local/koi8-o/75dpi/lutRS24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timB08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timB10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timB12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timB14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timB18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timB24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timBI08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timBI10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timBI12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timBI14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timBI18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timBI24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timI08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timI10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timI12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timI14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timI18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timI24o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timR08o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timR10o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timR12o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timR14o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timR18o.pcf
+share/fonts/X11/local/koi8-o/75dpi/timR24o.pcf
+share/fonts/X11/local/koi8-o/misc/10x20o.pcf
+share/fonts/X11/local/koi8-o/misc/12x24o.pcf
+share/fonts/X11/local/koi8-o/misc/5x7o.pcf
+share/fonts/X11/local/koi8-o/misc/6x10o.pcf
+share/fonts/X11/local/koi8-o/misc/6x13Bo.pcf
+share/fonts/X11/local/koi8-o/misc/6x13o.pcf
+share/fonts/X11/local/koi8-o/misc/7x13Bo.pcf
+share/fonts/X11/local/koi8-o/misc/7x13o.pcf
+share/fonts/X11/local/koi8-o/misc/7x14Bo.pcf
+share/fonts/X11/local/koi8-o/misc/7x14o.pcf
+share/fonts/X11/local/koi8-o/misc/8x13Bo.pcf
+share/fonts/X11/local/koi8-o/misc/8x13o.pcf
+share/fonts/X11/local/koi8-o/misc/8x16o.pcf
+share/fonts/X11/local/koi8-o/misc/9x15Bo.pcf
+share/fonts/X11/local/koi8-o/misc/9x15o.pcf
+share/fonts/X11/local/koi8-o/misc/fonts.alias
+share/fonts/X11/local/koi8-o/misc/nil2o.pcf
diff --git a/fonts/cyr-rfx-koi8-ru/Makefile b/fonts/cyr-rfx-koi8-ru/Makefile
index d987403c90c..0b33285a911 100644
--- a/fonts/cyr-rfx-koi8-ru/Makefile
+++ b/fonts/cyr-rfx-koi8-ru/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2006/09/22 21:53:57 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:33 wiz Exp $
CYR_RFX_ENCODING=koi8-ru
-PKGREVISION= 3
+PKGREVISION= 4
.include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-koi8-ru/PLIST b/fonts/cyr-rfx-koi8-ru/PLIST
index ea2480cc855..811f1faf88d 100644
--- a/fonts/cyr-rfx-koi8-ru/PLIST
+++ b/fonts/cyr-rfx-koi8-ru/PLIST
@@ -1,133 +1,133 @@
-@comment $NetBSD: PLIST,v 1.3 2006/09/22 21:53:57 joerg 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
-lib/X11/fonts/local/koi8-ru/75dpi/courB14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/courB18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/courB24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/courBO08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/courBO10u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/courBO12u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/courBO14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/courBO18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/courBO24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/courO08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/courO10u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/courO12u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/courO14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/courO18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/courO24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/courR08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/courR10u.pcf
-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/helvB08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvB10u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvB12u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvB14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvB18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvB24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvBO08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvBO10u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvBO12u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvBO14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvBO18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvBO24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvO08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvO10u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvO12u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvO14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvO18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvO24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvR08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvR10u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvR12u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvR14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvR18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/helvR24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luBIS08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luBIS10u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luBIS12u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luBIS14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luBIS18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luBIS19u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luBIS24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luBS08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luBS10u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luBS12u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luBS14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luBS18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luBS19u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luBS24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luIS08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luIS10u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luIS12u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luIS14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luIS18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luIS19u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luIS24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luRS08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luRS10u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luRS12u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luRS14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luRS18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luRS19u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/luRS24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/lutBS08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/lutBS10u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/lutBS12u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/lutBS14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/lutBS18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/lutBS19u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/lutBS24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/lutRS08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/lutRS10u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/lutRS12u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/lutRS14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/lutRS18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/lutRS19u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/lutRS24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timB08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timB10u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timB12u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timB14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timB18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timB24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timBI08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timBI10u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timBI12u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timBI14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timBI18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timBI24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timI08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timI10u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timI12u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timI14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timI18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timI24u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timR08u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timR10u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timR12u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timR14u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timR18u.pcf
-lib/X11/fonts/local/koi8-ru/75dpi/timR24u.pcf
-lib/X11/fonts/local/koi8-ru/misc/10x20u.pcf
-lib/X11/fonts/local/koi8-ru/misc/12x24u.pcf
-lib/X11/fonts/local/koi8-ru/misc/5x7u.pcf
-lib/X11/fonts/local/koi8-ru/misc/6x10u.pcf
-lib/X11/fonts/local/koi8-ru/misc/6x13Bu.pcf
-lib/X11/fonts/local/koi8-ru/misc/6x13u.pcf
-lib/X11/fonts/local/koi8-ru/misc/7x13Bu.pcf
-lib/X11/fonts/local/koi8-ru/misc/7x13u.pcf
-lib/X11/fonts/local/koi8-ru/misc/7x14Bu.pcf
-lib/X11/fonts/local/koi8-ru/misc/7x14u.pcf
-lib/X11/fonts/local/koi8-ru/misc/8x13Bu.pcf
-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/nil2u.pcf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:33 wiz Exp $
+share/fonts/X11/local/koi8-ru/75dpi/courB08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courB10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courB12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courB14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courB18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courB24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courBO08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courBO10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courBO12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courBO14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courBO18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courBO24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courO08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courO10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courO12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courO14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courO18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courO24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courR08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courR10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courR12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courR14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courR18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/courR24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/fonts.alias
+share/fonts/X11/local/koi8-ru/75dpi/helvB08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvB10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvB12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvB14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvB18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvB24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvBO08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvBO10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvBO12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvBO14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvBO18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvBO24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvO08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvO10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvO12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvO14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvO18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvO24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvR08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvR10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvR12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvR14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvR18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/helvR24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luBIS08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luBIS10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luBIS12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luBIS14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luBIS18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luBIS19u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luBIS24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luBS08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luBS10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luBS12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luBS14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luBS18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luBS19u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luBS24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luIS08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luIS10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luIS12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luIS14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luIS18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luIS19u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luIS24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luRS08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luRS10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luRS12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luRS14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luRS18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luRS19u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/luRS24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/lutBS08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/lutBS10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/lutBS12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/lutBS14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/lutBS18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/lutBS19u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/lutBS24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/lutRS08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/lutRS10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/lutRS12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/lutRS14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/lutRS18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/lutRS19u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/lutRS24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timB08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timB10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timB12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timB14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timB18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timB24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timBI08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timBI10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timBI12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timBI14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timBI18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timBI24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timI08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timI10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timI12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timI14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timI18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timI24u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timR08u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timR10u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timR12u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timR14u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timR18u.pcf
+share/fonts/X11/local/koi8-ru/75dpi/timR24u.pcf
+share/fonts/X11/local/koi8-ru/misc/10x20u.pcf
+share/fonts/X11/local/koi8-ru/misc/12x24u.pcf
+share/fonts/X11/local/koi8-ru/misc/5x7u.pcf
+share/fonts/X11/local/koi8-ru/misc/6x10u.pcf
+share/fonts/X11/local/koi8-ru/misc/6x13Bu.pcf
+share/fonts/X11/local/koi8-ru/misc/6x13u.pcf
+share/fonts/X11/local/koi8-ru/misc/7x13Bu.pcf
+share/fonts/X11/local/koi8-ru/misc/7x13u.pcf
+share/fonts/X11/local/koi8-ru/misc/7x14Bu.pcf
+share/fonts/X11/local/koi8-ru/misc/7x14u.pcf
+share/fonts/X11/local/koi8-ru/misc/8x13Bu.pcf
+share/fonts/X11/local/koi8-ru/misc/8x13u.pcf
+share/fonts/X11/local/koi8-ru/misc/8x16u.pcf
+share/fonts/X11/local/koi8-ru/misc/9x15Bu.pcf
+share/fonts/X11/local/koi8-ru/misc/9x15u.pcf
+share/fonts/X11/local/koi8-ru/misc/fonts.alias
+share/fonts/X11/local/koi8-ru/misc/nil2u.pcf
diff --git a/fonts/cyr-rfx-koi8-ub/Makefile b/fonts/cyr-rfx-koi8-ub/Makefile
index b2f70f30e1c..26b184a8f06 100644
--- a/fonts/cyr-rfx-koi8-ub/Makefile
+++ b/fonts/cyr-rfx-koi8-ub/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2006/10/09 07:02:56 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:33 wiz Exp $
CYR_RFX_ENCODING=koi8-ub
-PKGREVISION= 3
+PKGREVISION= 4
.include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-koi8-ub/PLIST b/fonts/cyr-rfx-koi8-ub/PLIST
index 62455b03f95..9653379d052 100644
--- a/fonts/cyr-rfx-koi8-ub/PLIST
+++ b/fonts/cyr-rfx-koi8-ub/PLIST
@@ -1,133 +1,133 @@
-@comment $NetBSD: PLIST,v 1.3 2006/10/09 07:02:56 joerg 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
-lib/X11/fonts/local/koi8-ub/75dpi/courB14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/courB18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/courB24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/courBO08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/courBO10s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/courBO12s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/courBO14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/courBO18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/courBO24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/courO08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/courO10s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/courO12s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/courO14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/courO18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/courO24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/courR08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/courR10s.pcf
-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/helvB08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvB10s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvB12s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvB14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvB18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvB24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvBO08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvBO10s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvBO12s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvBO14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvBO18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvBO24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvO08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvO10s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvO12s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvO14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvO18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvO24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvR08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvR10s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvR12s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvR14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvR18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/helvR24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luBIS08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luBIS10s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luBIS12s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luBIS14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luBIS18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luBIS19s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luBIS24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luBS08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luBS10s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luBS12s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luBS14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luBS18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luBS19s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luBS24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luIS08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luIS10s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luIS12s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luIS14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luIS18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luIS19s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luIS24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luRS08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luRS10s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luRS12s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luRS14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luRS18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luRS19s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/luRS24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/lutBS08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/lutBS10s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/lutBS12s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/lutBS14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/lutBS18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/lutBS19s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/lutBS24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/lutRS08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/lutRS10s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/lutRS12s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/lutRS14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/lutRS18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/lutRS19s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/lutRS24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timB08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timB10s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timB12s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timB14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timB18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timB24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timBI08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timBI10s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timBI12s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timBI14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timBI18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timBI24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timI08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timI10s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timI12s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timI14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timI18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timI24s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timR08s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timR10s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timR12s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timR14s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timR18s.pcf
-lib/X11/fonts/local/koi8-ub/75dpi/timR24s.pcf
-lib/X11/fonts/local/koi8-ub/misc/10x20s.pcf
-lib/X11/fonts/local/koi8-ub/misc/12x24s.pcf
-lib/X11/fonts/local/koi8-ub/misc/5x7s.pcf
-lib/X11/fonts/local/koi8-ub/misc/6x10s.pcf
-lib/X11/fonts/local/koi8-ub/misc/6x13Bs.pcf
-lib/X11/fonts/local/koi8-ub/misc/6x13s.pcf
-lib/X11/fonts/local/koi8-ub/misc/7x13Bs.pcf
-lib/X11/fonts/local/koi8-ub/misc/7x13s.pcf
-lib/X11/fonts/local/koi8-ub/misc/7x14Bs.pcf
-lib/X11/fonts/local/koi8-ub/misc/7x14s.pcf
-lib/X11/fonts/local/koi8-ub/misc/8x13Bs.pcf
-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/nil2s.pcf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:33 wiz Exp $
+share/fonts/X11/local/koi8-ub/75dpi/courB08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courB10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courB12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courB14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courB18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courB24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courBO08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courBO10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courBO12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courBO14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courBO18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courBO24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courO08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courO10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courO12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courO14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courO18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courO24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courR08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courR10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courR12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courR14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courR18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/courR24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/fonts.alias
+share/fonts/X11/local/koi8-ub/75dpi/helvB08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvB10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvB12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvB14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvB18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvB24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvBO08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvBO10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvBO12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvBO14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvBO18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvBO24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvO08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvO10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvO12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvO14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvO18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvO24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvR08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvR10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvR12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvR14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvR18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/helvR24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luBIS08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luBIS10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luBIS12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luBIS14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luBIS18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luBIS19s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luBIS24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luBS08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luBS10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luBS12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luBS14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luBS18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luBS19s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luBS24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luIS08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luIS10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luIS12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luIS14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luIS18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luIS19s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luIS24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luRS08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luRS10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luRS12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luRS14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luRS18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luRS19s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/luRS24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/lutBS08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/lutBS10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/lutBS12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/lutBS14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/lutBS18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/lutBS19s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/lutBS24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/lutRS08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/lutRS10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/lutRS12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/lutRS14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/lutRS18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/lutRS19s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/lutRS24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timB08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timB10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timB12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timB14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timB18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timB24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timBI08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timBI10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timBI12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timBI14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timBI18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timBI24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timI08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timI10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timI12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timI14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timI18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timI24s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timR08s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timR10s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timR12s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timR14s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timR18s.pcf
+share/fonts/X11/local/koi8-ub/75dpi/timR24s.pcf
+share/fonts/X11/local/koi8-ub/misc/10x20s.pcf
+share/fonts/X11/local/koi8-ub/misc/12x24s.pcf
+share/fonts/X11/local/koi8-ub/misc/5x7s.pcf
+share/fonts/X11/local/koi8-ub/misc/6x10s.pcf
+share/fonts/X11/local/koi8-ub/misc/6x13Bs.pcf
+share/fonts/X11/local/koi8-ub/misc/6x13s.pcf
+share/fonts/X11/local/koi8-ub/misc/7x13Bs.pcf
+share/fonts/X11/local/koi8-ub/misc/7x13s.pcf
+share/fonts/X11/local/koi8-ub/misc/7x14Bs.pcf
+share/fonts/X11/local/koi8-ub/misc/7x14s.pcf
+share/fonts/X11/local/koi8-ub/misc/8x13Bs.pcf
+share/fonts/X11/local/koi8-ub/misc/8x13s.pcf
+share/fonts/X11/local/koi8-ub/misc/8x16s.pcf
+share/fonts/X11/local/koi8-ub/misc/9x15Bs.pcf
+share/fonts/X11/local/koi8-ub/misc/9x15s.pcf
+share/fonts/X11/local/koi8-ub/misc/fonts.alias
+share/fonts/X11/local/koi8-ub/misc/nil2s.pcf
diff --git a/fonts/cyr-rfx-koi8_1/Makefile b/fonts/cyr-rfx-koi8_1/Makefile
index 78b8edaf1a7..bda86b828f5 100644
--- a/fonts/cyr-rfx-koi8_1/Makefile
+++ b/fonts/cyr-rfx-koi8_1/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2006/10/09 07:02:56 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:33 wiz Exp $
CYR_RFX_ENCODING=koi8-1
PKGNAME= ${DISTNAME:S/8-1/8_1/}
-PKGREVISION= 3
+PKGREVISION= 4
.include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-koi8_1/PLIST b/fonts/cyr-rfx-koi8_1/PLIST
index 05b4bed8cf8..964abe15519 100644
--- a/fonts/cyr-rfx-koi8_1/PLIST
+++ b/fonts/cyr-rfx-koi8_1/PLIST
@@ -1,133 +1,133 @@
-@comment $NetBSD: PLIST,v 1.3 2006/10/09 07:02:56 joerg 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/fonts.alias
-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
-lib/X11/fonts/local/koi8-1/75dpi/luBS14k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luBS18k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luBS19k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luBS24k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luIS08k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luIS10k.pcf
-lib/X11/fonts/local/koi8-1/75dpi/luIS12k.pcf
-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/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/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/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/fonts.alias
-lib/X11/fonts/local/koi8-1/misc/nil2k.pcf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:33 wiz Exp $
+share/fonts/X11/local/koi8-1/75dpi/courB08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courB10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courB12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courB14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courB18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courB24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courBO08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courBO10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courBO12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courBO14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courBO18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courBO24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courO08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courO10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courO12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courO14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courO18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courO24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courR08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courR10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courR12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courR14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courR18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/courR24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/fonts.alias
+share/fonts/X11/local/koi8-1/75dpi/helvB08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvB10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvB12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvB14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvB18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvB24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvBO08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvBO10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvBO12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvBO14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvBO18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvBO24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvO08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvO10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvO12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvO14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvO18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvO24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvR08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvR10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvR12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvR14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvR18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/helvR24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luBIS08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luBIS10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luBIS12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luBIS14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luBIS18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luBIS19k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luBIS24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luBS08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luBS10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luBS12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luBS14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luBS18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luBS19k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luBS24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luIS08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luIS10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luIS12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luIS14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luIS18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luIS19k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luIS24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luRS08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luRS10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luRS12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luRS14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luRS18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luRS19k.pcf
+share/fonts/X11/local/koi8-1/75dpi/luRS24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/lutBS08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/lutBS10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/lutBS12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/lutBS14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/lutBS18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/lutBS19k.pcf
+share/fonts/X11/local/koi8-1/75dpi/lutBS24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/lutRS08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/lutRS10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/lutRS12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/lutRS14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/lutRS18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/lutRS19k.pcf
+share/fonts/X11/local/koi8-1/75dpi/lutRS24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timB08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timB10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timB12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timB14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timB18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timB24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timBI08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timBI10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timBI12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timBI14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timBI18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timBI24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timI08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timI10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timI12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timI14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timI18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timI24k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timR08k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timR10k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timR12k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timR14k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timR18k.pcf
+share/fonts/X11/local/koi8-1/75dpi/timR24k.pcf
+share/fonts/X11/local/koi8-1/misc/10x20k.pcf
+share/fonts/X11/local/koi8-1/misc/12x24k.pcf
+share/fonts/X11/local/koi8-1/misc/5x7k.pcf
+share/fonts/X11/local/koi8-1/misc/6x10k.pcf
+share/fonts/X11/local/koi8-1/misc/6x13Bk.pcf
+share/fonts/X11/local/koi8-1/misc/6x13k.pcf
+share/fonts/X11/local/koi8-1/misc/7x13Bk.pcf
+share/fonts/X11/local/koi8-1/misc/7x13k.pcf
+share/fonts/X11/local/koi8-1/misc/7x14Bk.pcf
+share/fonts/X11/local/koi8-1/misc/7x14k.pcf
+share/fonts/X11/local/koi8-1/misc/8x13Bk.pcf
+share/fonts/X11/local/koi8-1/misc/8x13k.pcf
+share/fonts/X11/local/koi8-1/misc/8x16k.pcf
+share/fonts/X11/local/koi8-1/misc/9x15Bk.pcf
+share/fonts/X11/local/koi8-1/misc/9x15k.pcf
+share/fonts/X11/local/koi8-1/misc/fonts.alias
+share/fonts/X11/local/koi8-1/misc/nil2k.pcf
diff --git a/fonts/cyr-rfx-mac-cyrillic/Makefile b/fonts/cyr-rfx-mac-cyrillic/Makefile
index 8adb3558735..570a05dfb15 100644
--- a/fonts/cyr-rfx-mac-cyrillic/Makefile
+++ b/fonts/cyr-rfx-mac-cyrillic/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2006/10/09 07:02:56 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:33 wiz Exp $
CYR_RFX_ENCODING=mac-cyrillic
-PKGREVISION= 3
+PKGREVISION= 4
.include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-mac-cyrillic/PLIST b/fonts/cyr-rfx-mac-cyrillic/PLIST
index 9491c21e938..cd60c665377 100644
--- a/fonts/cyr-rfx-mac-cyrillic/PLIST
+++ b/fonts/cyr-rfx-mac-cyrillic/PLIST
@@ -1,133 +1,133 @@
-@comment $NetBSD: PLIST,v 1.3 2006/10/09 07:02:56 joerg 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
-lib/X11/fonts/local/mac-cyrillic/75dpi/courB14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/courB18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/courB24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/courBO08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/courBO10m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/courBO12m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/courBO14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/courBO18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/courBO24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/courO08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/courO10m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/courO12m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/courO14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/courO18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/courO24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/courR08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/courR10m.pcf
-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/helvB08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvB10m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvB12m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvB14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvB18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvB24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvBO08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvBO10m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvBO12m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvBO14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvBO18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvBO24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvO08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvO10m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvO12m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvO14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvO18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvO24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvR08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvR10m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvR12m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvR14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvR18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/helvR24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luBIS08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luBIS10m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luBIS12m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luBIS14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luBIS18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luBIS19m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luBIS24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luBS08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luBS10m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luBS12m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luBS14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luBS18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luBS19m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luBS24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luIS08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luIS10m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luIS12m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luIS14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luIS18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luIS19m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luIS24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luRS08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luRS10m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luRS12m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luRS14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luRS18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luRS19m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/luRS24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/lutBS08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/lutBS10m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/lutBS12m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/lutBS14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/lutBS18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/lutBS19m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/lutBS24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/lutRS08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/lutRS10m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/lutRS12m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/lutRS14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/lutRS18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/lutRS19m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/lutRS24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timB08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timB10m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timB12m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timB14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timB18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timB24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timBI08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timBI10m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timBI12m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timBI14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timBI18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timBI24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timI08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timI10m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timI12m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timI14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timI18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timI24m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timR08m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timR10m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timR12m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timR14m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timR18m.pcf
-lib/X11/fonts/local/mac-cyrillic/75dpi/timR24m.pcf
-lib/X11/fonts/local/mac-cyrillic/misc/10x20m.pcf
-lib/X11/fonts/local/mac-cyrillic/misc/12x24m.pcf
-lib/X11/fonts/local/mac-cyrillic/misc/5x7m.pcf
-lib/X11/fonts/local/mac-cyrillic/misc/6x10m.pcf
-lib/X11/fonts/local/mac-cyrillic/misc/6x13Bm.pcf
-lib/X11/fonts/local/mac-cyrillic/misc/6x13m.pcf
-lib/X11/fonts/local/mac-cyrillic/misc/7x13Bm.pcf
-lib/X11/fonts/local/mac-cyrillic/misc/7x13m.pcf
-lib/X11/fonts/local/mac-cyrillic/misc/7x14Bm.pcf
-lib/X11/fonts/local/mac-cyrillic/misc/7x14m.pcf
-lib/X11/fonts/local/mac-cyrillic/misc/8x13Bm.pcf
-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/nil2m.pcf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:33 wiz Exp $
+share/fonts/X11/local/mac-cyrillic/75dpi/courB08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courB10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courB12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courB14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courB18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courB24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courBO08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courBO10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courBO12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courBO14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courBO18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courBO24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courO08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courO10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courO12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courO14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courO18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courO24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courR08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courR10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courR12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courR14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courR18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/courR24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/fonts.alias
+share/fonts/X11/local/mac-cyrillic/75dpi/helvB08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvB10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvB12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvB14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvB18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvB24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvBO08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvBO10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvBO12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvBO14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvBO18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvBO24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvO08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvO10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvO12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvO14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvO18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvO24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvR08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvR10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvR12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvR14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvR18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/helvR24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luBIS08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luBIS10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luBIS12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luBIS14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luBIS18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luBIS19m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luBIS24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luBS08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luBS10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luBS12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luBS14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luBS18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luBS19m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luBS24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luIS08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luIS10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luIS12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luIS14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luIS18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luIS19m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luIS24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luRS08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luRS10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luRS12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luRS14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luRS18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luRS19m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/luRS24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/lutBS08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/lutBS10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/lutBS12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/lutBS14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/lutBS18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/lutBS19m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/lutBS24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/lutRS08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/lutRS10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/lutRS12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/lutRS14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/lutRS18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/lutRS19m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/lutRS24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timB08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timB10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timB12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timB14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timB18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timB24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timBI08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timBI10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timBI12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timBI14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timBI18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timBI24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timI08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timI10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timI12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timI14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timI18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timI24m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timR08m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timR10m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timR12m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timR14m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timR18m.pcf
+share/fonts/X11/local/mac-cyrillic/75dpi/timR24m.pcf
+share/fonts/X11/local/mac-cyrillic/misc/10x20m.pcf
+share/fonts/X11/local/mac-cyrillic/misc/12x24m.pcf
+share/fonts/X11/local/mac-cyrillic/misc/5x7m.pcf
+share/fonts/X11/local/mac-cyrillic/misc/6x10m.pcf
+share/fonts/X11/local/mac-cyrillic/misc/6x13Bm.pcf
+share/fonts/X11/local/mac-cyrillic/misc/6x13m.pcf
+share/fonts/X11/local/mac-cyrillic/misc/7x13Bm.pcf
+share/fonts/X11/local/mac-cyrillic/misc/7x13m.pcf
+share/fonts/X11/local/mac-cyrillic/misc/7x14Bm.pcf
+share/fonts/X11/local/mac-cyrillic/misc/7x14m.pcf
+share/fonts/X11/local/mac-cyrillic/misc/8x13Bm.pcf
+share/fonts/X11/local/mac-cyrillic/misc/8x13m.pcf
+share/fonts/X11/local/mac-cyrillic/misc/8x16m.pcf
+share/fonts/X11/local/mac-cyrillic/misc/9x15Bm.pcf
+share/fonts/X11/local/mac-cyrillic/misc/9x15m.pcf
+share/fonts/X11/local/mac-cyrillic/misc/fonts.alias
+share/fonts/X11/local/mac-cyrillic/misc/nil2m.pcf
diff --git a/fonts/cyr-rfx-share/Makefile.common b/fonts/cyr-rfx-share/Makefile.common
index 6f02b2a63c7..91092dd9eba 100644
--- a/fonts/cyr-rfx-share/Makefile.common
+++ b/fonts/cyr-rfx-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2013/01/11 23:25:48 joerg Exp $
+# $NetBSD: Makefile.common,v 1.16 2014/06/01 16:35:33 wiz Exp $
# used by fonts/cyr-rfx-bulgarian-mik/Makefile
# used by fonts/cyr-rfx-ibm-cp866/Makefile
@@ -32,16 +32,16 @@ NO_BUILD= yes
USE_TOOLS+= tar gzcat
-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
+FONTS_DIRS.x11+= ${PREFIX}/share/fonts/X11/local/${CYR_RFX_ENCODING}/75dpi
+FONTS_DIRS.x11+= ${PREFIX}/share/fonts/X11/local/${CYR_RFX_ENCODING}/misc
+REQD_DIRS+= ${PREFIX}/share/fonts/X11/local/${CYR_RFX_ENCODING}
+REQD_DIRS+= ${PREFIX}/share/fonts/X11/local/${CYR_RFX_ENCODING}/75dpi
+REQD_DIRS+= ${PREFIX}/share/fonts/X11/local/${CYR_RFX_ENCODING}/misc
-INSTALLATION_DIRS= lib/X11/fonts/local
+INSTALLATION_DIRS= share/fonts/X11/local
do-install:
- cd ${DESTDIR}${PREFIX}/lib/X11/fonts/local && \
+ cd ${DESTDIR}${PREFIX}/share/fonts/X11/local && \
${GZCAT} ${_DISTDIR}/${DISTFILES} | \
${TAR} xf - ${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 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
diff --git a/fonts/cyr-rfx-winlatin_1/Makefile b/fonts/cyr-rfx-winlatin_1/Makefile
index bfd19b7d134..96f163b6a24 100644
--- a/fonts/cyr-rfx-winlatin_1/Makefile
+++ b/fonts/cyr-rfx-winlatin_1/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2006/10/09 07:02:56 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:33 wiz Exp $
CYR_RFX_ENCODING=winlatin-1
PKGNAME= ${DISTNAME:S/n-1/n_1/}
-PKGREVISION= 3
+PKGREVISION= 4
.include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-winlatin_1/PLIST b/fonts/cyr-rfx-winlatin_1/PLIST
index 2225b025485..9895ada9575 100644
--- a/fonts/cyr-rfx-winlatin_1/PLIST
+++ b/fonts/cyr-rfx-winlatin_1/PLIST
@@ -1,133 +1,133 @@
-@comment $NetBSD: PLIST,v 1.3 2006/10/09 07:02:56 joerg 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
-lib/X11/fonts/local/winlatin-1/75dpi/courB14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/courB18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/courB24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/courBO08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/courBO10l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/courBO12l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/courBO14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/courBO18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/courBO24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/courO08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/courO10l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/courO12l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/courO14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/courO18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/courO24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/courR08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/courR10l.pcf
-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/helvB08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvB10l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvB12l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvB14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvB18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvB24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvBO08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvBO10l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvBO12l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvBO14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvBO18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvBO24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvO08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvO10l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvO12l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvO14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvO18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvO24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvR08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvR10l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvR12l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvR14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvR18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/helvR24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luBIS08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luBIS10l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luBIS12l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luBIS14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luBIS18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luBIS19l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luBIS24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luBS08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luBS10l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luBS12l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luBS14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luBS18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luBS19l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luBS24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luIS08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luIS10l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luIS12l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luIS14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luIS18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luIS19l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luIS24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luRS08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luRS10l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luRS12l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luRS14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luRS18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luRS19l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/luRS24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/lutBS08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/lutBS10l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/lutBS12l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/lutBS14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/lutBS18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/lutBS19l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/lutBS24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/lutRS08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/lutRS10l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/lutRS12l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/lutRS14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/lutRS18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/lutRS19l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/lutRS24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timB08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timB10l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timB12l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timB14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timB18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timB24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timBI08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timBI10l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timBI12l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timBI14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timBI18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timBI24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timI08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timI10l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timI12l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timI14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timI18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timI24l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timR08l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timR10l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timR12l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timR14l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timR18l.pcf
-lib/X11/fonts/local/winlatin-1/75dpi/timR24l.pcf
-lib/X11/fonts/local/winlatin-1/misc/10x20l.pcf
-lib/X11/fonts/local/winlatin-1/misc/12x24l.pcf
-lib/X11/fonts/local/winlatin-1/misc/5x7l.pcf
-lib/X11/fonts/local/winlatin-1/misc/6x10l.pcf
-lib/X11/fonts/local/winlatin-1/misc/6x13Bl.pcf
-lib/X11/fonts/local/winlatin-1/misc/6x13l.pcf
-lib/X11/fonts/local/winlatin-1/misc/7x13Bl.pcf
-lib/X11/fonts/local/winlatin-1/misc/7x13l.pcf
-lib/X11/fonts/local/winlatin-1/misc/7x14Bl.pcf
-lib/X11/fonts/local/winlatin-1/misc/7x14l.pcf
-lib/X11/fonts/local/winlatin-1/misc/8x13Bl.pcf
-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/nil2l.pcf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:33 wiz Exp $
+share/fonts/X11/local/winlatin-1/75dpi/courB08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courB10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courB12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courB14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courB18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courB24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courBO08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courBO10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courBO12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courBO14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courBO18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courBO24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courO08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courO10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courO12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courO14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courO18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courO24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courR08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courR10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courR12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courR14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courR18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/courR24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/fonts.alias
+share/fonts/X11/local/winlatin-1/75dpi/helvB08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvB10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvB12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvB14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvB18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvB24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvBO08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvBO10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvBO12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvBO14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvBO18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvBO24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvO08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvO10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvO12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvO14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvO18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvO24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvR08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvR10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvR12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvR14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvR18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/helvR24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luBIS08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luBIS10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luBIS12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luBIS14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luBIS18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luBIS19l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luBIS24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luBS08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luBS10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luBS12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luBS14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luBS18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luBS19l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luBS24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luIS08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luIS10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luIS12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luIS14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luIS18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luIS19l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luIS24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luRS08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luRS10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luRS12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luRS14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luRS18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luRS19l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/luRS24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/lutBS08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/lutBS10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/lutBS12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/lutBS14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/lutBS18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/lutBS19l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/lutBS24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/lutRS08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/lutRS10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/lutRS12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/lutRS14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/lutRS18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/lutRS19l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/lutRS24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timB08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timB10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timB12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timB14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timB18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timB24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timBI08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timBI10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timBI12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timBI14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timBI18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timBI24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timI08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timI10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timI12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timI14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timI18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timI24l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timR08l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timR10l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timR12l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timR14l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timR18l.pcf
+share/fonts/X11/local/winlatin-1/75dpi/timR24l.pcf
+share/fonts/X11/local/winlatin-1/misc/10x20l.pcf
+share/fonts/X11/local/winlatin-1/misc/12x24l.pcf
+share/fonts/X11/local/winlatin-1/misc/5x7l.pcf
+share/fonts/X11/local/winlatin-1/misc/6x10l.pcf
+share/fonts/X11/local/winlatin-1/misc/6x13Bl.pcf
+share/fonts/X11/local/winlatin-1/misc/6x13l.pcf
+share/fonts/X11/local/winlatin-1/misc/7x13Bl.pcf
+share/fonts/X11/local/winlatin-1/misc/7x13l.pcf
+share/fonts/X11/local/winlatin-1/misc/7x14Bl.pcf
+share/fonts/X11/local/winlatin-1/misc/7x14l.pcf
+share/fonts/X11/local/winlatin-1/misc/8x13Bl.pcf
+share/fonts/X11/local/winlatin-1/misc/8x13l.pcf
+share/fonts/X11/local/winlatin-1/misc/8x16l.pcf
+share/fonts/X11/local/winlatin-1/misc/9x15Bl.pcf
+share/fonts/X11/local/winlatin-1/misc/9x15l.pcf
+share/fonts/X11/local/winlatin-1/misc/fonts.alias
+share/fonts/X11/local/winlatin-1/misc/nil2l.pcf
diff --git a/fonts/dbz-ttf/Makefile b/fonts/dbz-ttf/Makefile
index b7eaa9bc1ca..ba13e636340 100644
--- a/fonts/dbz-ttf/Makefile
+++ b/fonts/dbz-ttf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2012/10/03 18:28:18 asau Exp $
+# $NetBSD: Makefile,v 1.20 2014/06/01 16:35:33 wiz Exp $
#
DISTNAME= dbz
PKGNAME= dbz-ttf-20050114
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= fonts
MASTER_SITES= http://www.andrew.cmu.edu/~twm/fonts/
EXTRACT_SUFX= .zip
@@ -24,7 +24,7 @@ USE_X11= YES
NO_BUILD= YES
NO_CONFIGURE= YES
-FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
DOCDIR= ${PREFIX}/share/doc/dbz-ttf
do-install:
diff --git a/fonts/dbz-ttf/PLIST b/fonts/dbz-ttf/PLIST
index 044991bf4ba..847905772e7 100644
--- a/fonts/dbz-ttf/PLIST
+++ b/fonts/dbz-ttf/PLIST
@@ -1,77 +1,77 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:54:11 joerg Exp $
-lib/X11/fonts/TTF/32768no.ttf
-lib/X11/fonts/TTF/7hours.ttf
-lib/X11/fonts/TTF/actionj.ttf
-lib/X11/fonts/TTF/angstrom.ttf
-lib/X11/fonts/TTF/antelope.ttf
-lib/X11/fonts/TTF/antiblue.ttf
-lib/X11/fonts/TTF/bboron.ttf
-lib/X11/fonts/TTF/bttsoief.ttf
-lib/X11/fonts/TTF/codon.ttf
-lib/X11/fonts/TTF/colophon.ttf
-lib/X11/fonts/TTF/constant.ttf
-lib/X11/fonts/TTF/cosinek.ttf
-lib/X11/fonts/TTF/cwisdom.ttf
-lib/X11/fonts/TTF/davis.ttf
-lib/X11/fonts/TTF/dis.ttf
-lib/X11/fonts/TTF/dnahand.ttf
-lib/X11/fonts/TTF/doctoraz.ttf
-lib/X11/fonts/TTF/donner.ttf
-lib/X11/fonts/TTF/doves.ttf
-lib/X11/fonts/TTF/dyspro.ttf
-lib/X11/fonts/TTF/epilog.ttf
-lib/X11/fonts/TTF/faraday.ttf
-lib/X11/fonts/TTF/fresnel.ttf
-lib/X11/fonts/TTF/gauss.ttf
-lib/X11/fonts/TTF/geodesic.ttf
-lib/X11/fonts/TTF/germs.ttf
-lib/X11/fonts/TTF/gmt.ttf
-lib/X11/fonts/TTF/guildof.ttf
-lib/X11/fonts/TTF/headache.ttf
-lib/X11/fonts/TTF/hockey.ttf
-lib/X11/fonts/TTF/hydrogen.ttf
-lib/X11/fonts/TTF/initial.ttf
-lib/X11/fonts/TTF/levity.ttf
-lib/X11/fonts/TTF/lexo.ttf
-lib/X11/fonts/TTF/linear.ttf
-lib/X11/fonts/TTF/mayqueen.ttf
-lib/X11/fonts/TTF/melanie.ttf
-lib/X11/fonts/TTF/metalang.ttf
-lib/X11/fonts/TTF/musicdbz.ttf
-lib/X11/fonts/TTF/natlog.ttf
-lib/X11/fonts/TTF/nonblock.ttf
-lib/X11/fonts/TTF/nullp.ttf
-lib/X11/fonts/TTF/opticbot.ttf
-lib/X11/fonts/TTF/pinball.ttf
-lib/X11/fonts/TTF/prefix.ttf
-lib/X11/fonts/TTF/progbot.ttf
-lib/X11/fonts/TTF/proteron.ttf
-lib/X11/fonts/TTF/px10.ttf
-lib/X11/fonts/TTF/ransom.ttf
-lib/X11/fonts/TTF/resurgen.ttf
-lib/X11/fonts/TTF/robot.ttf
-lib/X11/fonts/TTF/scandal.ttf
-lib/X11/fonts/TTF/secret.ttf
-lib/X11/fonts/TTF/signal.ttf
-lib/X11/fonts/TTF/submergd.ttf
-lib/X11/fonts/TTF/suckgolf.ttf
-lib/X11/fonts/TTF/technet.ttf
-lib/X11/fonts/TTF/tetanus.ttf
-lib/X11/fonts/TTF/thisprty.ttf
-lib/X11/fonts/TTF/toast.ttf
-lib/X11/fonts/TTF/tombats1.ttf
-lib/X11/fonts/TTF/tombats3.ttf
-lib/X11/fonts/TTF/tombats4.ttf
-lib/X11/fonts/TTF/tombats6.ttf
-lib/X11/fonts/TTF/tombats7.ttf
-lib/X11/fonts/TTF/tombots.ttf
-lib/X11/fonts/TTF/tomhand.ttf
-lib/X11/fonts/TTF/tommys.ttf
-lib/X11/fonts/TTF/tomnr.ttf
-lib/X11/fonts/TTF/tsmiles.ttf
-lib/X11/fonts/TTF/tuesday.ttf
-lib/X11/fonts/TTF/valium.ttf
-lib/X11/fonts/TTF/wolves.ttf
-lib/X11/fonts/TTF/yikatu.ttf
-lib/X11/fonts/TTF/zincboom.ttf
+@comment $NetBSD: PLIST,v 1.6 2014/06/01 16:35:33 wiz Exp $
+share/fonts/X11/TTF/32768no.ttf
+share/fonts/X11/TTF/7hours.ttf
+share/fonts/X11/TTF/actionj.ttf
+share/fonts/X11/TTF/angstrom.ttf
+share/fonts/X11/TTF/antelope.ttf
+share/fonts/X11/TTF/antiblue.ttf
+share/fonts/X11/TTF/bboron.ttf
+share/fonts/X11/TTF/bttsoief.ttf
+share/fonts/X11/TTF/codon.ttf
+share/fonts/X11/TTF/colophon.ttf
+share/fonts/X11/TTF/constant.ttf
+share/fonts/X11/TTF/cosinek.ttf
+share/fonts/X11/TTF/cwisdom.ttf
+share/fonts/X11/TTF/davis.ttf
+share/fonts/X11/TTF/dis.ttf
+share/fonts/X11/TTF/dnahand.ttf
+share/fonts/X11/TTF/doctoraz.ttf
+share/fonts/X11/TTF/donner.ttf
+share/fonts/X11/TTF/doves.ttf
+share/fonts/X11/TTF/dyspro.ttf
+share/fonts/X11/TTF/epilog.ttf
+share/fonts/X11/TTF/faraday.ttf
+share/fonts/X11/TTF/fresnel.ttf
+share/fonts/X11/TTF/gauss.ttf
+share/fonts/X11/TTF/geodesic.ttf
+share/fonts/X11/TTF/germs.ttf
+share/fonts/X11/TTF/gmt.ttf
+share/fonts/X11/TTF/guildof.ttf
+share/fonts/X11/TTF/headache.ttf
+share/fonts/X11/TTF/hockey.ttf
+share/fonts/X11/TTF/hydrogen.ttf
+share/fonts/X11/TTF/initial.ttf
+share/fonts/X11/TTF/levity.ttf
+share/fonts/X11/TTF/lexo.ttf
+share/fonts/X11/TTF/linear.ttf
+share/fonts/X11/TTF/mayqueen.ttf
+share/fonts/X11/TTF/melanie.ttf
+share/fonts/X11/TTF/metalang.ttf
+share/fonts/X11/TTF/musicdbz.ttf
+share/fonts/X11/TTF/natlog.ttf
+share/fonts/X11/TTF/nonblock.ttf
+share/fonts/X11/TTF/nullp.ttf
+share/fonts/X11/TTF/opticbot.ttf
+share/fonts/X11/TTF/pinball.ttf
+share/fonts/X11/TTF/prefix.ttf
+share/fonts/X11/TTF/progbot.ttf
+share/fonts/X11/TTF/proteron.ttf
+share/fonts/X11/TTF/px10.ttf
+share/fonts/X11/TTF/ransom.ttf
+share/fonts/X11/TTF/resurgen.ttf
+share/fonts/X11/TTF/robot.ttf
+share/fonts/X11/TTF/scandal.ttf
+share/fonts/X11/TTF/secret.ttf
+share/fonts/X11/TTF/signal.ttf
+share/fonts/X11/TTF/submergd.ttf
+share/fonts/X11/TTF/suckgolf.ttf
+share/fonts/X11/TTF/technet.ttf
+share/fonts/X11/TTF/tetanus.ttf
+share/fonts/X11/TTF/thisprty.ttf
+share/fonts/X11/TTF/toast.ttf
+share/fonts/X11/TTF/tombats1.ttf
+share/fonts/X11/TTF/tombats3.ttf
+share/fonts/X11/TTF/tombats4.ttf
+share/fonts/X11/TTF/tombats6.ttf
+share/fonts/X11/TTF/tombats7.ttf
+share/fonts/X11/TTF/tombots.ttf
+share/fonts/X11/TTF/tomhand.ttf
+share/fonts/X11/TTF/tommys.ttf
+share/fonts/X11/TTF/tomnr.ttf
+share/fonts/X11/TTF/tsmiles.ttf
+share/fonts/X11/TTF/tuesday.ttf
+share/fonts/X11/TTF/valium.ttf
+share/fonts/X11/TTF/wolves.ttf
+share/fonts/X11/TTF/yikatu.ttf
+share/fonts/X11/TTF/zincboom.ttf
share/doc/dbz-ttf/readme.txt
diff --git a/fonts/dejavu-ttf/Makefile b/fonts/dejavu-ttf/Makefile
index bd8025779c7..0eb8b6999fc 100644
--- a/fonts/dejavu-ttf/Makefile
+++ b/fonts/dejavu-ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2013/09/02 16:47:42 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2014/06/01 16:35:33 wiz Exp $
DISTNAME= dejavu-fonts-ttf-2.34
PKGNAME= ${DISTNAME:S/fonts-//}
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dejavu/}
EXTRACT_SUFX= .tar.bz2
@@ -13,7 +14,7 @@ COMMENT= DejaVu family of TrueType fonts
NO_CONFIGURE= yes
NO_BUILD= yes
-FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
FCEGDIR= ${EGDIR}/fontconfig-conf.d
@@ -39,7 +40,7 @@ CONF_FILES+= ${FCEGDIR}/57-dejavu-serif.conf \
REQD_DIRS= ${EGDIR}
REQD_DIRS+= ${FCEGDIR}
-INSTALLATION_DIRS= lib/X11/fonts/TTF ${DOCSDIR} ${FCEGDIR}
+INSTALLATION_DIRS= share/fonts/X11/TTF ${DOCSDIR} ${FCEGDIR}
do-install:
${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${DESTDIR}${FONTS_DIRS.ttf}
diff --git a/fonts/dejavu-ttf/PLIST b/fonts/dejavu-ttf/PLIST
index 3158795980f..45847e02df8 100644
--- a/fonts/dejavu-ttf/PLIST
+++ b/fonts/dejavu-ttf/PLIST
@@ -1,25 +1,25 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:54:11 joerg Exp $
-lib/X11/fonts/TTF/DejaVuSans-Bold.ttf
-lib/X11/fonts/TTF/DejaVuSans-BoldOblique.ttf
-lib/X11/fonts/TTF/DejaVuSans-ExtraLight.ttf
-lib/X11/fonts/TTF/DejaVuSans-Oblique.ttf
-lib/X11/fonts/TTF/DejaVuSans.ttf
-lib/X11/fonts/TTF/DejaVuSansCondensed-Bold.ttf
-lib/X11/fonts/TTF/DejaVuSansCondensed-BoldOblique.ttf
-lib/X11/fonts/TTF/DejaVuSansCondensed-Oblique.ttf
-lib/X11/fonts/TTF/DejaVuSansCondensed.ttf
-lib/X11/fonts/TTF/DejaVuSansMono-Bold.ttf
-lib/X11/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
-lib/X11/fonts/TTF/DejaVuSansMono-Oblique.ttf
-lib/X11/fonts/TTF/DejaVuSansMono.ttf
-lib/X11/fonts/TTF/DejaVuSerif-Bold.ttf
-lib/X11/fonts/TTF/DejaVuSerif-BoldItalic.ttf
-lib/X11/fonts/TTF/DejaVuSerif-Italic.ttf
-lib/X11/fonts/TTF/DejaVuSerif.ttf
-lib/X11/fonts/TTF/DejaVuSerifCondensed-Bold.ttf
-lib/X11/fonts/TTF/DejaVuSerifCondensed-BoldItalic.ttf
-lib/X11/fonts/TTF/DejaVuSerifCondensed-Italic.ttf
-lib/X11/fonts/TTF/DejaVuSerifCondensed.ttf
+@comment $NetBSD: PLIST,v 1.10 2014/06/01 16:35:33 wiz Exp $
+share/fonts/X11/TTF/DejaVuSans-Bold.ttf
+share/fonts/X11/TTF/DejaVuSans-BoldOblique.ttf
+share/fonts/X11/TTF/DejaVuSans-ExtraLight.ttf
+share/fonts/X11/TTF/DejaVuSans-Oblique.ttf
+share/fonts/X11/TTF/DejaVuSans.ttf
+share/fonts/X11/TTF/DejaVuSansCondensed-Bold.ttf
+share/fonts/X11/TTF/DejaVuSansCondensed-BoldOblique.ttf
+share/fonts/X11/TTF/DejaVuSansCondensed-Oblique.ttf
+share/fonts/X11/TTF/DejaVuSansCondensed.ttf
+share/fonts/X11/TTF/DejaVuSansMono-Bold.ttf
+share/fonts/X11/TTF/DejaVuSansMono-BoldOblique.ttf
+share/fonts/X11/TTF/DejaVuSansMono-Oblique.ttf
+share/fonts/X11/TTF/DejaVuSansMono.ttf
+share/fonts/X11/TTF/DejaVuSerif-Bold.ttf
+share/fonts/X11/TTF/DejaVuSerif-BoldItalic.ttf
+share/fonts/X11/TTF/DejaVuSerif-Italic.ttf
+share/fonts/X11/TTF/DejaVuSerif.ttf
+share/fonts/X11/TTF/DejaVuSerifCondensed-Bold.ttf
+share/fonts/X11/TTF/DejaVuSerifCondensed-BoldItalic.ttf
+share/fonts/X11/TTF/DejaVuSerifCondensed-Italic.ttf
+share/fonts/X11/TTF/DejaVuSerifCondensed.ttf
share/doc/dejavu-ttf/AUTHORS
share/doc/dejavu-ttf/BUGS
share/doc/dejavu-ttf/LICENSE
diff --git a/fonts/droid-ttf/Makefile b/fonts/droid-ttf/Makefile
index 8dd99d0b71e..0270d9e880b 100644
--- a/fonts/droid-ttf/Makefile
+++ b/fonts/droid-ttf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2012/10/03 18:28:18 asau Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/01 16:35:33 wiz Exp $
#
DISTNAME= droid-fonts-20111115
PKGNAME= ${DISTNAME:S/fonts/ttf/}
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tar.bz2
@@ -18,10 +19,10 @@ NO_BUILD= YES
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
-INSTALLATION_DIRS= lib/X11/fonts/TTF \
+INSTALLATION_DIRS= share/fonts/X11/TTF \
${DOCSDIR}
INSTALL_FONTS= DroidKufi-Bold.ttf \
diff --git a/fonts/droid-ttf/PLIST b/fonts/droid-ttf/PLIST
index f17b6dd1fb1..0d43298d9a7 100644
--- a/fonts/droid-ttf/PLIST
+++ b/fonts/droid-ttf/PLIST
@@ -1,24 +1,24 @@
-@comment $NetBSD: PLIST,v 1.3 2011/11/17 19:16:08 ryoon Exp $
-lib/X11/fonts/TTF/DroidKufi-Bold.ttf
-lib/X11/fonts/TTF/DroidKufi-Regular.ttf
-lib/X11/fonts/TTF/DroidNaskh-Bold.ttf
-lib/X11/fonts/TTF/DroidNaskh-Regular.ttf
-lib/X11/fonts/TTF/DroidSans-Bold.ttf
-lib/X11/fonts/TTF/DroidSans.ttf
-lib/X11/fonts/TTF/DroidSansArmenian.ttf
-lib/X11/fonts/TTF/DroidSansEthiopic-Bold.ttf
-lib/X11/fonts/TTF/DroidSansEthiopic-Regular.ttf
-lib/X11/fonts/TTF/DroidSansFallback.ttf
-lib/X11/fonts/TTF/DroidSansFallbackFull.ttf
-lib/X11/fonts/TTF/DroidSansFallbackLegacy.ttf
-lib/X11/fonts/TTF/DroidSansGeorgian.ttf
-lib/X11/fonts/TTF/DroidSansHebrew-Bold.ttf
-lib/X11/fonts/TTF/DroidSansHebrew-Regular.ttf
-lib/X11/fonts/TTF/DroidSansJapanese.ttf
-lib/X11/fonts/TTF/DroidSansMono.ttf
-lib/X11/fonts/TTF/DroidSansThai.ttf
-lib/X11/fonts/TTF/DroidSerif-Bold.ttf
-lib/X11/fonts/TTF/DroidSerif-BoldItalic.ttf
-lib/X11/fonts/TTF/DroidSerif-Italic.ttf
-lib/X11/fonts/TTF/DroidSerif-Regular.ttf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:33 wiz Exp $
+share/fonts/X11/TTF/DroidKufi-Bold.ttf
+share/fonts/X11/TTF/DroidKufi-Regular.ttf
+share/fonts/X11/TTF/DroidNaskh-Bold.ttf
+share/fonts/X11/TTF/DroidNaskh-Regular.ttf
+share/fonts/X11/TTF/DroidSans-Bold.ttf
+share/fonts/X11/TTF/DroidSans.ttf
+share/fonts/X11/TTF/DroidSansArmenian.ttf
+share/fonts/X11/TTF/DroidSansEthiopic-Bold.ttf
+share/fonts/X11/TTF/DroidSansEthiopic-Regular.ttf
+share/fonts/X11/TTF/DroidSansFallback.ttf
+share/fonts/X11/TTF/DroidSansFallbackFull.ttf
+share/fonts/X11/TTF/DroidSansFallbackLegacy.ttf
+share/fonts/X11/TTF/DroidSansGeorgian.ttf
+share/fonts/X11/TTF/DroidSansHebrew-Bold.ttf
+share/fonts/X11/TTF/DroidSansHebrew-Regular.ttf
+share/fonts/X11/TTF/DroidSansJapanese.ttf
+share/fonts/X11/TTF/DroidSansMono.ttf
+share/fonts/X11/TTF/DroidSansThai.ttf
+share/fonts/X11/TTF/DroidSerif-Bold.ttf
+share/fonts/X11/TTF/DroidSerif-BoldItalic.ttf
+share/fonts/X11/TTF/DroidSerif-Italic.ttf
+share/fonts/X11/TTF/DroidSerif-Regular.ttf
share/doc/droid-ttf/NOTICE
diff --git a/fonts/efont-unicode/MESSAGE b/fonts/efont-unicode/MESSAGE
index 4795ac633cf..e5b70ebe4dd 100644
--- a/fonts/efont-unicode/MESSAGE
+++ b/fonts/efont-unicode/MESSAGE
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/05/06 17:41:12 jmmv Exp $
+$NetBSD: MESSAGE,v 1.5 2014/06/01 16:35:33 wiz Exp $
You can tell one existing X session on the installed host to use the
new "efont-unicode" fonts with:
@@ -22,11 +22,11 @@ efont-unicode install directory to the xfs/config file in the comma
separated list of directories given for the "catalogue" setting.
For example:
- catalogue = ${PREFIX}/lib/X11/fonts/misc/,
- ${PREFIX}/lib/X11/fonts/Speedo/,
- ${PREFIX}/lib/X11/fonts/Type1/,
- ${PREFIX}/lib/X11/fonts/100dpi/,
- ${PREFIX}/lib/X11/fonts/75dpi/,
- ${PREFIX}/lib/X11/fonts/efont/
+ catalogue = ${PREFIX}/share/fonts/X11/misc/,
+ ${PREFIX}/share/fonts/X11/Speedo/,
+ ${PREFIX}/share/fonts/X11/Type1/,
+ ${PREFIX}/share/fonts/X11/100dpi/,
+ ${PREFIX}/share/fonts/X11/75dpi/,
+ ${PREFIX}/share/fonts/X11/efont/
===========================================================================
diff --git a/fonts/efont-unicode/Makefile b/fonts/efont-unicode/Makefile
index 898c5e632ae..1a7997ce727 100644
--- a/fonts/efont-unicode/Makefile
+++ b/fonts/efont-unicode/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2013/06/09 13:00:47 obache Exp $
+# $NetBSD: Makefile,v 1.15 2014/06/01 16:35:33 wiz Exp $
DISTNAME= efont-unicode-bdf-0.4.2
PKGNAME= ${DISTNAME:S/-bdf//}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= fonts x11
MASTER_SITES= http://openlab.ring.gr.jp/efont/dist/unicode-bdf/
EXTRACT_SUFX= .tar.bz2
@@ -27,7 +27,7 @@ FONTS= b10 b10_b b10_bi b10_i\
h14 h14_b h14_bi h14_i\
h16 h16_b h16_bi h16_i\
h24 h24_b h24_bi h24_i
-FONTDIR= lib/X11/fonts/efont
+FONTDIR= share/fonts/X11/efont
REQD_DIRS= ${FONTDIR}
FONTS_DIRS.x11= ${FONTDIR}
diff --git a/fonts/evermono-ttf/Makefile b/fonts/evermono-ttf/Makefile
index 36d8377c962..412a34730ab 100644
--- a/fonts/evermono-ttf/Makefile
+++ b/fonts/evermono-ttf/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2012/12/17 12:29:24 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/01 16:35:33 wiz Exp $
#
DISTNAME= evermono
VERSION= 6.2.1
PKGNAME= evermono-ttf-${VERSION}
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://www.evertype.com/emono/
EXTRACT_SUFX= .zip
@@ -18,7 +19,7 @@ DIST_SUBDIR= evermono-ttf-${VERSION}
WRKSRC= ${WRKDIR}/evermono-${VERSION}
USE_LANGUAGES= # none
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
INSTALLATION_DIRS= ${FONTDIR} share/doc/evermono-ttf
diff --git a/fonts/evermono-ttf/PLIST b/fonts/evermono-ttf/PLIST
index b19ad902872..580b3c716a3 100644
--- a/fonts/evermono-ttf/PLIST
+++ b/fonts/evermono-ttf/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2012/12/17 12:29:24 wiz Exp $
-lib/X11/fonts/TTF/Everson Mono Bold Oblique.ttf
-lib/X11/fonts/TTF/Everson Mono Bold.ttf
-lib/X11/fonts/TTF/Everson Mono Oblique.ttf
-lib/X11/fonts/TTF/Everson Mono.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:33 wiz Exp $
+share/fonts/X11/TTF/Everson Mono Bold Oblique.ttf
+share/fonts/X11/TTF/Everson Mono Bold.ttf
+share/fonts/X11/TTF/Everson Mono Oblique.ttf
+share/fonts/X11/TTF/Everson Mono.ttf
share/doc/evermono-ttf/emono-licence.txt
diff --git a/fonts/fira/Makefile b/fonts/fira/Makefile
index 1290b38194b..5372e298a32 100644
--- a/fonts/fira/Makefile
+++ b/fonts/fira/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/05/24 07:26:45 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/01 16:35:33 wiz Exp $
DISTNAME= fira-${VERSION}
VERSION= 3105
PKGNAME= ${DISTNAME:C/3/3./}
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://dev.carrois.com/wordpress/wp-content/uploads/downloads/fira_${VERSION}/
EXTRACT_SUFX= .zip
@@ -16,7 +17,7 @@ LICENSE= ofl-v1.1
USE_LANGUAGES= # none
WRKSRC= ${WRKDIR}
-FONTS_DIRS.otf+= lib/X11/fonts/OTF
+FONTS_DIRS.otf+= share/fonts/X11/OTF
INSTALLATION_DIRS+= ${FONTS_DIRS.otf}
do-build:
diff --git a/fonts/fira/PLIST b/fonts/fira/PLIST
index 755bee9d920..47d1fb6bedc 100644
--- a/fonts/fira/PLIST
+++ b/fonts/fira/PLIST
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/24 07:26:45 wiz Exp $
-lib/X11/fonts/OTF/FiraMono-Bold.otf
-lib/X11/fonts/OTF/FiraMono-Regular.otf
-lib/X11/fonts/OTF/FiraSans-Bold.otf
-lib/X11/fonts/OTF/FiraSans-BoldItalic.otf
-lib/X11/fonts/OTF/FiraSans-Book.otf
-lib/X11/fonts/OTF/FiraSans-BookItalic.otf
-lib/X11/fonts/OTF/FiraSans-Eight.otf
-lib/X11/fonts/OTF/FiraSans-EightItalic.otf
-lib/X11/fonts/OTF/FiraSans-ExtraBold.otf
-lib/X11/fonts/OTF/FiraSans-ExtraBoldItalic.otf
-lib/X11/fonts/OTF/FiraSans-ExtraLight.otf
-lib/X11/fonts/OTF/FiraSans-ExtraLightItalic.otf
-lib/X11/fonts/OTF/FiraSans-Four.otf
-lib/X11/fonts/OTF/FiraSans-FourItalic.otf
-lib/X11/fonts/OTF/FiraSans-Hair.otf
-lib/X11/fonts/OTF/FiraSans-HairItalic.otf
-lib/X11/fonts/OTF/FiraSans-Heavy.otf
-lib/X11/fonts/OTF/FiraSans-HeavyItalic.otf
-lib/X11/fonts/OTF/FiraSans-Italic.otf
-lib/X11/fonts/OTF/FiraSans-Light.otf
-lib/X11/fonts/OTF/FiraSans-LightItalic.otf
-lib/X11/fonts/OTF/FiraSans-Medium.otf
-lib/X11/fonts/OTF/FiraSans-MediumItalic.otf
-lib/X11/fonts/OTF/FiraSans-Regular.otf
-lib/X11/fonts/OTF/FiraSans-SemiBold.otf
-lib/X11/fonts/OTF/FiraSans-SemiBoldItalic.otf
-lib/X11/fonts/OTF/FiraSans-Thin.otf
-lib/X11/fonts/OTF/FiraSans-ThinItalic.otf
-lib/X11/fonts/OTF/FiraSans-Two.otf
-lib/X11/fonts/OTF/FiraSans-TwoItalic.otf
-lib/X11/fonts/OTF/FiraSans-Ultra.otf
-lib/X11/fonts/OTF/FiraSans-UltraItalic.otf
-lib/X11/fonts/OTF/FiraSans-UltraLight.otf
-lib/X11/fonts/OTF/FiraSans-UltraLightItalic.otf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:33 wiz Exp $
+share/fonts/X11/OTF/FiraMono-Bold.otf
+share/fonts/X11/OTF/FiraMono-Regular.otf
+share/fonts/X11/OTF/FiraSans-Bold.otf
+share/fonts/X11/OTF/FiraSans-BoldItalic.otf
+share/fonts/X11/OTF/FiraSans-Book.otf
+share/fonts/X11/OTF/FiraSans-BookItalic.otf
+share/fonts/X11/OTF/FiraSans-Eight.otf
+share/fonts/X11/OTF/FiraSans-EightItalic.otf
+share/fonts/X11/OTF/FiraSans-ExtraBold.otf
+share/fonts/X11/OTF/FiraSans-ExtraBoldItalic.otf
+share/fonts/X11/OTF/FiraSans-ExtraLight.otf
+share/fonts/X11/OTF/FiraSans-ExtraLightItalic.otf
+share/fonts/X11/OTF/FiraSans-Four.otf
+share/fonts/X11/OTF/FiraSans-FourItalic.otf
+share/fonts/X11/OTF/FiraSans-Hair.otf
+share/fonts/X11/OTF/FiraSans-HairItalic.otf
+share/fonts/X11/OTF/FiraSans-Heavy.otf
+share/fonts/X11/OTF/FiraSans-HeavyItalic.otf
+share/fonts/X11/OTF/FiraSans-Italic.otf
+share/fonts/X11/OTF/FiraSans-Light.otf
+share/fonts/X11/OTF/FiraSans-LightItalic.otf
+share/fonts/X11/OTF/FiraSans-Medium.otf
+share/fonts/X11/OTF/FiraSans-MediumItalic.otf
+share/fonts/X11/OTF/FiraSans-Regular.otf
+share/fonts/X11/OTF/FiraSans-SemiBold.otf
+share/fonts/X11/OTF/FiraSans-SemiBoldItalic.otf
+share/fonts/X11/OTF/FiraSans-Thin.otf
+share/fonts/X11/OTF/FiraSans-ThinItalic.otf
+share/fonts/X11/OTF/FiraSans-Two.otf
+share/fonts/X11/OTF/FiraSans-TwoItalic.otf
+share/fonts/X11/OTF/FiraSans-Ultra.otf
+share/fonts/X11/OTF/FiraSans-UltraItalic.otf
+share/fonts/X11/OTF/FiraSans-UltraLight.otf
+share/fonts/X11/OTF/FiraSans-UltraLightItalic.otf
diff --git a/fonts/font-misc-misc/Makefile b/fonts/font-misc-misc/Makefile
index 17be9e106da..2e55b4844c1 100644
--- a/fonts/font-misc-misc/Makefile
+++ b/fonts/font-misc-misc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2012/10/03 18:28:21 asau Exp $
+# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:33 wiz Exp $
#
DISTNAME= font-misc-misc-1.1.2
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_XORG:=font/}
EXTRACT_SUFX= .tar.bz2
@@ -13,7 +14,7 @@ COMMENT= Standard X11 "fixed" PCF font
GNU_CONFIGURE= yes
USE_TOOLS+= gmake pkg-config bdftopcf ucs2any gzip
-FONTS_DIRS.x11= lib/X11/fonts/misc
+FONTS_DIRS.x11= share/fonts/X11/misc
.include "../../fonts/font-util/buildlink3.mk"
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index 3b6f1753460..8b8a8d1aa0c 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.90 2014/05/21 08:45:39 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2014/06/01 16:35:33 wiz Exp $
DISTNAME= fontconfig-2.11.1
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://www.fontconfig.org/release/
EXTRACT_SUFX= .tar.bz2
@@ -15,7 +16,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-default-fonts=${LOCALBASE}/lib/X11/fonts
+CONFIGURE_ARGS+= --with-default-fonts=${LOCALBASE}/share/fonts/X11
CONFIGURE_ARGS+= --with-expat-includes=${BUILDLINK_PREFIX.expat}/include
CONFIGURE_ARGS+= --with-expat-lib=${BUILDLINK_PREFIX.expat}/lib
CONFIGURE_ARGS+= --with-baseconfigdir=${PKG_SYSCONFDIR}
@@ -31,9 +32,9 @@ PKG_SYSCONFSUBDIR= fontconfig
ADDFONTS= ${PREFIX}/share/fonts/urw,${PREFIX}/share/ghostscript/fonts,${PREFIX}/share/fonts/X11
.if ${X11BASE} != ${LOCALBASE}
-ADDFONTS:= ${X11BASE}/lib/X11/fonts,${ADDFONTS}
+ADDFONTS:= ${X11BASE}/share/fonts/X11,${ADDFONTS}
.else
-ADDFONTS:= ${LOCALBASE}/lib/X11/fonts,${ADDFONTS}
+ADDFONTS:= ${LOCALBASE}/share/fonts/X11,${ADDFONTS}
.endif
.if ${OPSYS} == "Darwin"
diff --git a/fonts/freefont-ttf/Makefile b/fonts/freefont-ttf/Makefile
index 3d92040f2d7..772bb3d1dba 100644
--- a/fonts/freefont-ttf/Makefile
+++ b/fonts/freefont-ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2012/10/03 18:28:23 asau Exp $
+# $NetBSD: Makefile,v 1.10 2014/06/01 16:35:34 wiz Exp $
#
DISTNAME= freefont-ttf-20120503
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_GNU:=freefont/}
EXTRACT_SUFX= .zip
@@ -16,9 +17,9 @@ NO_CONFIGURE= yes
NO_BUILD= yes
USE_LANGUAGES= # empty
USE_TOOLS+= pax
-INSTALLATION_DIRS= share/doc/freefont lib/X11/fonts/TTF
+INSTALLATION_DIRS= share/doc/freefont share/fonts/X11/TTF
-FONTSDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTSDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTSDIR}
do-install:
diff --git a/fonts/freefont-ttf/PLIST b/fonts/freefont-ttf/PLIST
index d125874766b..85cfaa55c33 100644
--- a/fonts/freefont-ttf/PLIST
+++ b/fonts/freefont-ttf/PLIST
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:54:14 joerg Exp $
-lib/X11/fonts/TTF/FreeMono.ttf
-lib/X11/fonts/TTF/FreeMonoBold.ttf
-lib/X11/fonts/TTF/FreeMonoBoldOblique.ttf
-lib/X11/fonts/TTF/FreeMonoOblique.ttf
-lib/X11/fonts/TTF/FreeSans.ttf
-lib/X11/fonts/TTF/FreeSansBold.ttf
-lib/X11/fonts/TTF/FreeSansBoldOblique.ttf
-lib/X11/fonts/TTF/FreeSansOblique.ttf
-lib/X11/fonts/TTF/FreeSerif.ttf
-lib/X11/fonts/TTF/FreeSerifBold.ttf
-lib/X11/fonts/TTF/FreeSerifBoldItalic.ttf
-lib/X11/fonts/TTF/FreeSerifItalic.ttf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:34 wiz Exp $
+share/fonts/X11/TTF/FreeMono.ttf
+share/fonts/X11/TTF/FreeMonoBold.ttf
+share/fonts/X11/TTF/FreeMonoBoldOblique.ttf
+share/fonts/X11/TTF/FreeMonoOblique.ttf
+share/fonts/X11/TTF/FreeSans.ttf
+share/fonts/X11/TTF/FreeSansBold.ttf
+share/fonts/X11/TTF/FreeSansBoldOblique.ttf
+share/fonts/X11/TTF/FreeSansOblique.ttf
+share/fonts/X11/TTF/FreeSerif.ttf
+share/fonts/X11/TTF/FreeSerifBold.ttf
+share/fonts/X11/TTF/FreeSerifBoldItalic.ttf
+share/fonts/X11/TTF/FreeSerifItalic.ttf
share/doc/freefont/AUTHORS
share/doc/freefont/CREDITS
share/doc/freefont/README
diff --git a/fonts/freefonts/MESSAGE b/fonts/freefonts/MESSAGE
index 69375a9449b..780ea84addb 100644
--- a/fonts/freefonts/MESSAGE
+++ b/fonts/freefonts/MESSAGE
@@ -1,19 +1,19 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 22:48:58 zuntum Exp $
+$NetBSD: MESSAGE,v 1.2 2014/06/01 16:35:34 wiz Exp $
To use freefonts with X11, you can manually perform the following steps:
-1. xset fp+ ${PREFIX}/lib/X11/fonts/freefont
+1. xset fp+ ${PREFIX}/share/fonts/X11/freefont
2. xset fp rehash
Or configure your /etc/XF86Config by adding
-${PREFIX}/lib/X11/fonts/freefont to your FontPath.
+${PREFIX}/share/fonts/X11/freefont to your FontPath.
-A Fontmap file is available under ${PREFIX}/lib/X11/fonts/freefont
+A Fontmap file is available under ${PREFIX}/share/fonts/X11/freefont
for use with Ghostscript.
License files are also included for individual fonts. Read
-${PREFIX}/lib/X11/fonts/freefont/<font>.license to
+${PREFIX}/share/fonts/X11/freefont/<font>.license to
find out more about a font.
===========================================================================
diff --git a/fonts/freefonts/Makefile b/fonts/freefonts/Makefile
index 93cc39498b3..10953677365 100644
--- a/fonts/freefonts/Makefile
+++ b/fonts/freefonts/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2013/02/26 10:28:06 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2014/06/01 16:35:34 wiz Exp $
#
DISTNAME= freefonts-0.10
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_SUNSITE:=X11/fonts/} \
ftp://ftp.gimp.org/pub/gimp/fonts/
@@ -18,16 +18,16 @@ NO_BUILD= yes
USE_X11BASE= yes
USE_TOOLS+= gzcat tar
-FONTS_DIRS.x11= ${PREFIX}/lib/X11/fonts/freefont
-REQD_DIRS= ${PREFIX}/lib/X11/fonts/freefont
+FONTS_DIRS.x11= ${PREFIX}/share/fonts/X11/freefont
+REQD_DIRS= ${PREFIX}/share/fonts/X11/freefont
-INSTALLATION_DIRS= lib/X11/fonts
+INSTALLATION_DIRS= share/fonts/X11
do-install:
${GZCAT} ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
- ${TAR} -xf - -C ${DESTDIR}${PREFIX}/lib/X11/fonts
- ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/X11/fonts/freefont/*
+ ${TAR} -xf - -C ${DESTDIR}${PREFIX}/share/fonts/X11
+ ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/share/fonts/X11/freefont/*
${CHOWN} ${SHAREOWN}:${SHAREGRP} \
- ${DESTDIR}${PREFIX}/lib/X11/fonts/freefont/*
+ ${DESTDIR}${PREFIX}/share/fonts/X11/freefont/*
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/freefonts/PLIST b/fonts/freefonts/PLIST
index f926149775b..f9164b8db9e 100644
--- a/fonts/freefonts/PLIST
+++ b/fonts/freefonts/PLIST
@@ -1,111 +1,111 @@
-@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:31:00 wiz Exp $
-lib/X11/fonts/freefont/Fontmap
-lib/X11/fonts/freefont/README
-lib/X11/fonts/freefont/agate.pfb
-lib/X11/fonts/freefont/agateb.pfb
-lib/X11/fonts/freefont/agatei.pfb
-lib/X11/fonts/freefont/ans.pfb
-lib/X11/fonts/freefont/ans.tgz
-lib/X11/fonts/freefont/baskvl.pfb
-lib/X11/fonts/freefont/baskvlb.pfb
-lib/X11/fonts/freefont/baskvli.pfb
-lib/X11/fonts/freefont/becker.pfb
-lib/X11/fonts/freefont/blippo.pfb
-lib/X11/fonts/freefont/bodoni.pfb
-lib/X11/fonts/freefont/bodonib.pfb
-lib/X11/fonts/freefont/bodonii.pfb
-lib/X11/fonts/freefont/boecklin.pfb
-lib/X11/fonts/freefont/brahc___.pfb
-lib/X11/fonts/freefont/brushstr.license
-lib/X11/fonts/freefont/brushstr.pfb
-lib/X11/fonts/freefont/calig___.pfb
-lib/X11/fonts/freefont/capri.license
-lib/X11/fonts/freefont/capri.pfb
-lib/X11/fonts/freefont/carrickc.license
-lib/X11/fonts/freefont/carrickc.pfb
-lib/X11/fonts/freefont/cheq.license
-lib/X11/fonts/freefont/cheq.pfb
-lib/X11/fonts/freefont/classhvy.pfb
-lib/X11/fonts/freefont/cooprblk.pfb
-lib/X11/fonts/freefont/coronet.pfb
-lib/X11/fonts/freefont/crf_____.license
-lib/X11/fonts/freefont/crf_____.pfb
-lib/X11/fonts/freefont/crillee.license
-lib/X11/fonts/freefont/crillee.pfb
-lib/X11/fonts/freefont/cunei.pfb
-lib/X11/fonts/freefont/dabkc___.pfb
-lib/X11/fonts/freefont/dabkc____.license
-lib/X11/fonts/freefont/dos_____.pfb
-lib/X11/fonts/freefont/dragonwi.license
-lib/X11/fonts/freefont/dragonwi.pfb
-lib/X11/fonts/freefont/elann___.license
-lib/X11/fonts/freefont/elann___.pfb
-lib/X11/fonts/freefont/engravrl.pfb
-lib/X11/fonts/freefont/eras.pfb
-lib/X11/fonts/freefont/erasb.pfb
-lib/X11/fonts/freefont/erasblkb.pfb
-lib/X11/fonts/freefont/eraselt.pfb
-lib/X11/fonts/freefont/erasltra.pfb
-lib/X11/fonts/freefont/erasmed.pfb
-lib/X11/fonts/freefont/florence.pfb
-lib/X11/fonts/freefont/frquad.pfb
-lib/X11/fonts/freefont/frquadb.pfb
-lib/X11/fonts/freefont/ftpstrps.pfb
-lib/X11/fonts/freefont/garmndmi.pfb
-lib/X11/fonts/freefont/genoaita.license
-lib/X11/fonts/freefont/genoaita.pfb
-lib/X11/fonts/freefont/genoarom.license
-lib/X11/fonts/freefont/genoarom.pfb
-lib/X11/fonts/freefont/gocmase_.license
-lib/X11/fonts/freefont/gocmase_.pfb
-lib/X11/fonts/freefont/gocmseq_.license
-lib/X11/fonts/freefont/gocmseq_.pfb
-lib/X11/fonts/freefont/goudyo.pfb
-lib/X11/fonts/freefont/goudyob.pfb
-lib/X11/fonts/freefont/goudyoi.pfb
-lib/X11/fonts/freefont/igloolas.pfb
-lib/X11/fonts/freefont/linotext.pfb
-lib/X11/fonts/freefont/luxembrg.pfb
-lib/X11/fonts/freefont/manzanit.license
-lib/X11/fonts/freefont/manzanit.pfb
-lib/X11/fonts/freefont/mazama.license
-lib/X11/fonts/freefont/mazama.pfb
-lib/X11/fonts/freefont/muriel.license
-lib/X11/fonts/freefont/muriel.pfb
-lib/X11/fonts/freefont/old_town.license
-lib/X11/fonts/freefont/old_town.pfb
-lib/X11/fonts/freefont/oldcnd_r.pfb
-lib/X11/fonts/freefont/oldext_r.pfb
-lib/X11/fonts/freefont/oldtwn_r.pfb
-lib/X11/fonts/freefont/oswaldbl.pfb
-lib/X11/fonts/freefont/parkave.pfb
-lib/X11/fonts/freefont/postanti.pfb
-lib/X11/fonts/freefont/rechtman.license
-lib/X11/fonts/freefont/rechtman.pfb
-lib/X11/fonts/freefont/roosthea.license
-lib/X11/fonts/freefont/roosthea.pfb
-lib/X11/fonts/freefont/rudelsbe.license
-lib/X11/fonts/freefont/rudelsbe.pfb
-lib/X11/fonts/freefont/salter.license
-lib/X11/fonts/freefont/salter.pfb
-lib/X11/fonts/freefont/shaloold.license
-lib/X11/fonts/freefont/shaloold.pfb
-lib/X11/fonts/freefont/shaloscr.license
-lib/X11/fonts/freefont/shaloscr.pfb
-lib/X11/fonts/freefont/shalosti.license
-lib/X11/fonts/freefont/shalosti.pfb
-lib/X11/fonts/freefont/shf_____.license
-lib/X11/fonts/freefont/shf_____.pfb
-lib/X11/fonts/freefont/slogan.pfb
-lib/X11/fonts/freefont/spooky.pfb
-lib/X11/fonts/freefont/tekton.pfb
-lib/X11/fonts/freefont/tempofon.license
-lib/X11/fonts/freefont/tempofon.pfb
-lib/X11/fonts/freefont/tempoita.license
-lib/X11/fonts/freefont/tempoita.pfb
-lib/X11/fonts/freefont/tribeca.license
-lib/X11/fonts/freefont/tribeca.pfb
-lib/X11/fonts/freefont/victoria.pfb
-lib/X11/fonts/freefont/windsord.pfb
-lib/X11/fonts/freefont/zalescap.license
-lib/X11/fonts/freefont/zalescap.pfb
+@comment $NetBSD: PLIST,v 1.3 2014/06/01 16:35:34 wiz Exp $
+share/fonts/X11/freefont/Fontmap
+share/fonts/X11/freefont/README
+share/fonts/X11/freefont/agate.pfb
+share/fonts/X11/freefont/agateb.pfb
+share/fonts/X11/freefont/agatei.pfb
+share/fonts/X11/freefont/ans.pfb
+share/fonts/X11/freefont/ans.tgz
+share/fonts/X11/freefont/baskvl.pfb
+share/fonts/X11/freefont/baskvlb.pfb
+share/fonts/X11/freefont/baskvli.pfb
+share/fonts/X11/freefont/becker.pfb
+share/fonts/X11/freefont/blippo.pfb
+share/fonts/X11/freefont/bodoni.pfb
+share/fonts/X11/freefont/bodonib.pfb
+share/fonts/X11/freefont/bodonii.pfb
+share/fonts/X11/freefont/boecklin.pfb
+share/fonts/X11/freefont/brahc___.pfb
+share/fonts/X11/freefont/brushstr.license
+share/fonts/X11/freefont/brushstr.pfb
+share/fonts/X11/freefont/calig___.pfb
+share/fonts/X11/freefont/capri.license
+share/fonts/X11/freefont/capri.pfb
+share/fonts/X11/freefont/carrickc.license
+share/fonts/X11/freefont/carrickc.pfb
+share/fonts/X11/freefont/cheq.license
+share/fonts/X11/freefont/cheq.pfb
+share/fonts/X11/freefont/classhvy.pfb
+share/fonts/X11/freefont/cooprblk.pfb
+share/fonts/X11/freefont/coronet.pfb
+share/fonts/X11/freefont/crf_____.license
+share/fonts/X11/freefont/crf_____.pfb
+share/fonts/X11/freefont/crillee.license
+share/fonts/X11/freefont/crillee.pfb
+share/fonts/X11/freefont/cunei.pfb
+share/fonts/X11/freefont/dabkc___.pfb
+share/fonts/X11/freefont/dabkc____.license
+share/fonts/X11/freefont/dos_____.pfb
+share/fonts/X11/freefont/dragonwi.license
+share/fonts/X11/freefont/dragonwi.pfb
+share/fonts/X11/freefont/elann___.license
+share/fonts/X11/freefont/elann___.pfb
+share/fonts/X11/freefont/engravrl.pfb
+share/fonts/X11/freefont/eras.pfb
+share/fonts/X11/freefont/erasb.pfb
+share/fonts/X11/freefont/erasblkb.pfb
+share/fonts/X11/freefont/eraselt.pfb
+share/fonts/X11/freefont/erasltra.pfb
+share/fonts/X11/freefont/erasmed.pfb
+share/fonts/X11/freefont/florence.pfb
+share/fonts/X11/freefont/frquad.pfb
+share/fonts/X11/freefont/frquadb.pfb
+share/fonts/X11/freefont/ftpstrps.pfb
+share/fonts/X11/freefont/garmndmi.pfb
+share/fonts/X11/freefont/genoaita.license
+share/fonts/X11/freefont/genoaita.pfb
+share/fonts/X11/freefont/genoarom.license
+share/fonts/X11/freefont/genoarom.pfb
+share/fonts/X11/freefont/gocmase_.license
+share/fonts/X11/freefont/gocmase_.pfb
+share/fonts/X11/freefont/gocmseq_.license
+share/fonts/X11/freefont/gocmseq_.pfb
+share/fonts/X11/freefont/goudyo.pfb
+share/fonts/X11/freefont/goudyob.pfb
+share/fonts/X11/freefont/goudyoi.pfb
+share/fonts/X11/freefont/igloolas.pfb
+share/fonts/X11/freefont/linotext.pfb
+share/fonts/X11/freefont/luxembrg.pfb
+share/fonts/X11/freefont/manzanit.license
+share/fonts/X11/freefont/manzanit.pfb
+share/fonts/X11/freefont/mazama.license
+share/fonts/X11/freefont/mazama.pfb
+share/fonts/X11/freefont/muriel.license
+share/fonts/X11/freefont/muriel.pfb
+share/fonts/X11/freefont/old_town.license
+share/fonts/X11/freefont/old_town.pfb
+share/fonts/X11/freefont/oldcnd_r.pfb
+share/fonts/X11/freefont/oldext_r.pfb
+share/fonts/X11/freefont/oldtwn_r.pfb
+share/fonts/X11/freefont/oswaldbl.pfb
+share/fonts/X11/freefont/parkave.pfb
+share/fonts/X11/freefont/postanti.pfb
+share/fonts/X11/freefont/rechtman.license
+share/fonts/X11/freefont/rechtman.pfb
+share/fonts/X11/freefont/roosthea.license
+share/fonts/X11/freefont/roosthea.pfb
+share/fonts/X11/freefont/rudelsbe.license
+share/fonts/X11/freefont/rudelsbe.pfb
+share/fonts/X11/freefont/salter.license
+share/fonts/X11/freefont/salter.pfb
+share/fonts/X11/freefont/shaloold.license
+share/fonts/X11/freefont/shaloold.pfb
+share/fonts/X11/freefont/shaloscr.license
+share/fonts/X11/freefont/shaloscr.pfb
+share/fonts/X11/freefont/shalosti.license
+share/fonts/X11/freefont/shalosti.pfb
+share/fonts/X11/freefont/shf_____.license
+share/fonts/X11/freefont/shf_____.pfb
+share/fonts/X11/freefont/slogan.pfb
+share/fonts/X11/freefont/spooky.pfb
+share/fonts/X11/freefont/tekton.pfb
+share/fonts/X11/freefont/tempofon.license
+share/fonts/X11/freefont/tempofon.pfb
+share/fonts/X11/freefont/tempoita.license
+share/fonts/X11/freefont/tempoita.pfb
+share/fonts/X11/freefont/tribeca.license
+share/fonts/X11/freefont/tribeca.pfb
+share/fonts/X11/freefont/victoria.pfb
+share/fonts/X11/freefont/windsord.pfb
+share/fonts/X11/freefont/zalescap.license
+share/fonts/X11/freefont/zalescap.pfb
diff --git a/fonts/gentium-ttf/Makefile b/fonts/gentium-ttf/Makefile
index ddd7257a209..97947acd81f 100644
--- a/fonts/gentium-ttf/Makefile
+++ b/fonts/gentium-ttf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2013/04/08 00:35:44 rodent Exp $
+# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:34 wiz Exp $
#
DISTNAME= Gentium_102_W
PKGNAME= gentium-ttf-1.02
+PKGREVISION= 1
CATEGORIES= fonts
EXTRACT_SUFX= .zip
@@ -18,9 +19,9 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
NO_CONFIGURE= YES
NO_BUILD= YES
-FONTS_DIRS.ttf+= ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf+= ${PREFIX}/share/fonts/X11/TTF
-INSTALLATION_DIRS= lib/X11/fonts/TTF
+INSTALLATION_DIRS= share/fonts/X11/TTF
do-install:
${INSTALL_DATA} ${WRKSRC}/GenAI102.TTF ${DESTDIR}${FONTS_DIRS.ttf}/genai102.ttf
diff --git a/fonts/gentium-ttf/PLIST b/fonts/gentium-ttf/PLIST
index 0313c76395e..a6545a60786 100644
--- a/fonts/gentium-ttf/PLIST
+++ b/fonts/gentium-ttf/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/26 21:08:53 joerg Exp $
-lib/X11/fonts/TTF/genai102.ttf
-lib/X11/fonts/TTF/genar102.ttf
-lib/X11/fonts/TTF/geni102.ttf
-lib/X11/fonts/TTF/genr102.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:34 wiz Exp $
+share/fonts/X11/TTF/genai102.ttf
+share/fonts/X11/TTF/genar102.ttf
+share/fonts/X11/TTF/geni102.ttf
+share/fonts/X11/TTF/genr102.ttf
diff --git a/fonts/geoslab703-ttf/Makefile b/fonts/geoslab703-ttf/Makefile
index f3f0bb106a4..5f08b7dc4f4 100644
--- a/fonts/geoslab703-ttf/Makefile
+++ b/fonts/geoslab703-ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2012/10/03 18:28:23 asau Exp $
+# $NetBSD: Makefile,v 1.14 2014/06/01 16:35:34 wiz Exp $
#
DISTNAME= geoslab703-ttf-20010522
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= fonts
MASTER_SITES= http://www.will-harris.com/fonts/
DISTFILES= geo703l.ttf geo703li.ttf
@@ -18,7 +18,7 @@ USE_X11BASE= YES
NO_CONFIGURE= YES
NO_BUILD= YES
-FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf}
diff --git a/fonts/geoslab703-ttf/PLIST b/fonts/geoslab703-ttf/PLIST
index ca26479f74b..ed8ff165a8c 100644
--- a/fonts/geoslab703-ttf/PLIST
+++ b/fonts/geoslab703-ttf/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2004/01/25 20:31:59 wiz Exp $
-lib/X11/fonts/TTF/geo703l.ttf
-lib/X11/fonts/TTF/geo703li.ttf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:34 wiz Exp $
+share/fonts/X11/TTF/geo703l.ttf
+share/fonts/X11/TTF/geo703li.ttf
diff --git a/fonts/inconsolata-g/Makefile b/fonts/inconsolata-g/Makefile
index 01d5a5a3c83..f35d20381bd 100644
--- a/fonts/inconsolata-g/Makefile
+++ b/fonts/inconsolata-g/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2014/04/09 17:40:32 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/01 16:35:34 wiz Exp $
DISTNAME= inconsolata-g_font
PKGNAME= inconsolata-g-20090213
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://www.fantascienza.net/leonardo/ar/inconsolatag/
EXTRACT_SUFX= .zip
@@ -17,13 +18,13 @@ WRKSRC= ${WRKDIR}
NO_CONFIGURE= YES
NO_BUILD= YES
-INSTALLATION_DIRS+= lib/X11/fonts/TTF
-FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
-INSTALLATION_DIRS+= lib/X11/fonts/OTF
-FONTS_DIRS.otf= ${PREFIX}/lib/X11/fonts/OTF
+INSTALLATION_DIRS+= share/fonts/X11/TTF
+FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
+INSTALLATION_DIRS+= share/fonts/X11/OTF
+FONTS_DIRS.otf= ${PREFIX}/share/fonts/X11/OTF
do-install:
- ${INSTALL_DATA} ${WRKSRC}/Inconsolata-g.otf ${DESTDIR}${PREFIX}/lib/X11/fonts/OTF
- ${INSTALL_DATA} ${WRKSRC}/Inconsolata-g.ttf ${DESTDIR}${PREFIX}/lib/X11/fonts/TTF
+ ${INSTALL_DATA} ${WRKSRC}/Inconsolata-g.otf ${DESTDIR}${PREFIX}/share/fonts/X11/OTF
+ ${INSTALL_DATA} ${WRKSRC}/Inconsolata-g.ttf ${DESTDIR}${PREFIX}/share/fonts/X11/TTF
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/inconsolata-g/PLIST b/fonts/inconsolata-g/PLIST
index 01396859c01..8eac02dc10c 100644
--- a/fonts/inconsolata-g/PLIST
+++ b/fonts/inconsolata-g/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2014/04/09 17:40:32 wiz Exp $
-lib/X11/fonts/OTF/Inconsolata-g.otf
-lib/X11/fonts/TTF/Inconsolata-g.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:34 wiz Exp $
+share/fonts/X11/OTF/Inconsolata-g.otf
+share/fonts/X11/TTF/Inconsolata-g.ttf
diff --git a/fonts/inconsolata-ttf/Makefile b/fonts/inconsolata-ttf/Makefile
index 621ba47c3d8..30286525897 100644
--- a/fonts/inconsolata-ttf/Makefile
+++ b/fonts/inconsolata-ttf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2013/04/08 01:42:40 rodent Exp $
+# $NetBSD: Makefile,v 1.11 2014/06/01 16:35:34 wiz Exp $
#
DISTNAME= Inconsolata.otf
PKGNAME= inconsolata-ttf-20090207
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://www.levien.com/type/myfonts/
EXTRACT_SUFX= # empty
@@ -21,13 +22,13 @@ EXTRACT_ONLY= # empty
NO_CONFIGURE= YES
NO_BUILD= YES
-INSTALLATION_DIRS= lib/X11/fonts/TTF
-FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
+INSTALLATION_DIRS= share/fonts/X11/TTF
+FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
do-extract:
${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
do-install:
- ${INSTALL_DATA} ${WRKSRC}/${DISTNAME} ${DESTDIR}${PREFIX}/lib/X11/fonts/TTF
+ ${INSTALL_DATA} ${WRKSRC}/${DISTNAME} ${DESTDIR}${PREFIX}/share/fonts/X11/TTF
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/inconsolata-ttf/PLIST b/fonts/inconsolata-ttf/PLIST
index 0cb29266491..9e8e5b27071 100644
--- a/fonts/inconsolata-ttf/PLIST
+++ b/fonts/inconsolata-ttf/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2007/08/22 15:16:37 smb Exp $
-lib/X11/fonts/TTF/Inconsolata.otf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:34 wiz Exp $
+share/fonts/X11/TTF/Inconsolata.otf
diff --git a/fonts/intlfonts/MESSAGE b/fonts/intlfonts/MESSAGE
index fb53b154894..b6178c7d512 100644
--- a/fonts/intlfonts/MESSAGE
+++ b/fonts/intlfonts/MESSAGE
@@ -1,10 +1,10 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.3 2003/05/06 17:41:13 jmmv Exp $
+$NetBSD: MESSAGE,v 1.4 2014/06/01 16:35:34 wiz Exp $
You can tell one existing X session on the installed host to use the
new "intlfonts" fonts with:
- $ xset +fp ${PREFIX}/lib/X11/fonts/intlfonts
+ $ xset +fp ${PREFIX}/share/fonts/X11/intlfonts
To make the effect permanent for future X sessions, you will have to
edit certain files in yout X installation.
@@ -22,11 +22,11 @@ intlfonts install directory to the xfs/config file in the comma
separated list of directories given for the "catalogue" setting.
For example:
- catalogue = ${PREFIX}/lib/X11/fonts/misc/,
- ${PREFIX}/lib/X11/fonts/Speedo/,
- ${PREFIX}/lib/X11/fonts/Type1/,
- ${PREFIX}/lib/X11/fonts/100dpi/,
- ${PREFIX}/lib/X11/fonts/75dpi/,
- ${PREFIX}/lib/X11/fonts/intlfonts/
+ catalogue = ${PREFIX}/share/fonts/X11/misc/,
+ ${PREFIX}/share/fonts/X11/Speedo/,
+ ${PREFIX}/share/fonts/X11/Type1/,
+ ${PREFIX}/share/fonts/X11/100dpi/,
+ ${PREFIX}/share/fonts/X11/75dpi/,
+ ${PREFIX}/share/fonts/X11/intlfonts/
===========================================================================
diff --git a/fonts/intlfonts/Makefile b/fonts/intlfonts/Makefile
index 91b795aee9c..580d6b5107a 100644
--- a/fonts/intlfonts/Makefile
+++ b/fonts/intlfonts/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2013/04/08 07:37:55 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2014/06/01 16:35:34 wiz Exp $
DISTNAME= intlfonts-1.2.1
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= fonts x11
MASTER_SITES= ${MASTER_SITE_GNU:=intlfonts/intlfonts-1.2.1-split/}
# not redundant here -- needed in the DISTFILES line below
@@ -48,7 +48,7 @@ CONFIGURE_ARGS+=--with-fontdir=${FONTS_DIR} \
--enable-compress=gzip
INSTALL_MAKE_FLAGS+= fontdir=${DESTDIR}${FONTS_DIR}
-FONTS_DIR= ${PREFIX}/lib/X11/fonts/intlfonts
+FONTS_DIR= ${PREFIX}/share/fonts/X11/intlfonts
FONTS_DIRS.x11+= ${FONTS_DIR}
FONTS_DIRS.x11+= ${FONTS_DIR}/bdf
diff --git a/fonts/intlfonts/PLIST b/fonts/intlfonts/PLIST
index 2c1741d609c..d9b763dd8c1 100644
--- a/fonts/intlfonts/PLIST
+++ b/fonts/intlfonts/PLIST
@@ -1,234 +1,234 @@
-@comment $NetBSD: PLIST,v 1.8 2006/10/09 07:02:56 joerg Exp $
-lib/X11/fonts/intlfonts/a18rk.pcf.gz
-lib/X11/fonts/intlfonts/a18rkb.pcf.gz
-lib/X11/fonts/intlfonts/a18rki.pcf.gz
-lib/X11/fonts/intlfonts/arab16-0-etl.pcf.gz
-lib/X11/fonts/intlfonts/arab16-1-etl.pcf.gz
-lib/X11/fonts/intlfonts/arab16-2-etl.pcf.gz
-lib/X11/fonts/intlfonts/arab24-0-etl.pcf.gz
-lib/X11/fonts/intlfonts/arab24-1-etl.pcf.gz
-lib/X11/fonts/intlfonts/arab24-2-etl.pcf.gz
-lib/X11/fonts/intlfonts/bdf/a18rk.bdf
-lib/X11/fonts/intlfonts/bdf/a18rkb.bdf
-lib/X11/fonts/intlfonts/bdf/a18rki.bdf
-lib/X11/fonts/intlfonts/bdf/arab16-0-etl.bdf
-lib/X11/fonts/intlfonts/bdf/arab16-1-etl.bdf
-lib/X11/fonts/intlfonts/bdf/arab16-2-etl.bdf
-lib/X11/fonts/intlfonts/bdf/arab24-0-etl.bdf
-lib/X11/fonts/intlfonts/bdf/arab24-1-etl.bdf
-lib/X11/fonts/intlfonts/bdf/arab24-2-etl.bdf
-lib/X11/fonts/intlfonts/bdf/bmp16-etl.bdf
-lib/X11/fonts/intlfonts/bdf/cns1-16.bdf
-lib/X11/fonts/intlfonts/bdf/cns1-24.bdf
-lib/X11/fonts/intlfonts/bdf/cns2-16.bdf
-lib/X11/fonts/intlfonts/bdf/cns2-24.bdf
-lib/X11/fonts/intlfonts/bdf/cns3-16.bdf
-lib/X11/fonts/intlfonts/bdf/cns3-24.bdf
-lib/X11/fonts/intlfonts/bdf/cns4-16.bdf
-lib/X11/fonts/intlfonts/bdf/cns4-24.bdf
-lib/X11/fonts/intlfonts/bdf/cns5-16.bdf
-lib/X11/fonts/intlfonts/bdf/cns5-24.bdf
-lib/X11/fonts/intlfonts/bdf/cns6-16.bdf
-lib/X11/fonts/intlfonts/bdf/cns6-24.bdf
-lib/X11/fonts/intlfonts/bdf/cns7-16.bdf
-lib/X11/fonts/intlfonts/bdf/cns7-24.bdf
-lib/X11/fonts/intlfonts/bdf/cyr14-etl.bdf
-lib/X11/fonts/intlfonts/bdf/cyr16-etl.bdf
-lib/X11/fonts/intlfonts/bdf/cyr24-etl.bdf
-lib/X11/fonts/intlfonts/bdf/ethio16f-uni.bdf
-lib/X11/fonts/intlfonts/bdf/ethio24f-uni.bdf
-lib/X11/fonts/intlfonts/bdf/grk14-etl.bdf
-lib/X11/fonts/intlfonts/bdf/grk16-etl.bdf
-lib/X11/fonts/intlfonts/bdf/grk24-etl.bdf
-lib/X11/fonts/intlfonts/bdf/guob16.bdf
-lib/X11/fonts/intlfonts/bdf/hanglg16.bdf
-lib/X11/fonts/intlfonts/bdf/hanglm16.bdf
-lib/X11/fonts/intlfonts/bdf/hanglm24.bdf
-lib/X11/fonts/intlfonts/bdf/heb14-etl.bdf
-lib/X11/fonts/intlfonts/bdf/heb16-etl.bdf
-lib/X11/fonts/intlfonts/bdf/heb24-etl.bdf
-lib/X11/fonts/intlfonts/bdf/ind16-mule.bdf
-lib/X11/fonts/intlfonts/bdf/ind16-uni.bdf
-lib/X11/fonts/intlfonts/bdf/ind1c16-mule.bdf
-lib/X11/fonts/intlfonts/bdf/ind1c24-mule.bdf
-lib/X11/fonts/intlfonts/bdf/ind24-mule.bdf
-lib/X11/fonts/intlfonts/bdf/ind24-uni.bdf
-lib/X11/fonts/intlfonts/bdf/ipa14-etl.bdf
-lib/X11/fonts/intlfonts/bdf/ipa16-etl.bdf
-lib/X11/fonts/intlfonts/bdf/ipa24-etl.bdf
-lib/X11/fonts/intlfonts/bdf/isci16-mule.bdf
-lib/X11/fonts/intlfonts/bdf/isci24-mule.bdf
-lib/X11/fonts/intlfonts/bdf/j78-16.bdf
-lib/X11/fonts/intlfonts/bdf/j83-18.bdf
-lib/X11/fonts/intlfonts/bdf/j83-18b.bdf
-lib/X11/fonts/intlfonts/bdf/j83-18i.bdf
-lib/X11/fonts/intlfonts/bdf/j90-16.bdf
-lib/X11/fonts/intlfonts/bdf/jksp16.bdf
-lib/X11/fonts/intlfonts/bdf/jksp24.bdf
-lib/X11/fonts/intlfonts/bdf/koi14-etl.bdf
-lib/X11/fonts/intlfonts/bdf/koi16-etl.bdf
-lib/X11/fonts/intlfonts/bdf/koi24-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lao14-mule.bdf
-lib/X11/fonts/intlfonts/bdf/lao16-mule.bdf
-lib/X11/fonts/intlfonts/bdf/lao18-mule.bdf
-lib/X11/fonts/intlfonts/bdf/lao18b-mule.bdf
-lib/X11/fonts/intlfonts/bdf/lao18i-mule.bdf
-lib/X11/fonts/intlfonts/bdf/lao24-mule.bdf
-lib/X11/fonts/intlfonts/bdf/lt1-14-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt1-16-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt1-16b-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt1-16bi-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt1-16i-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt1-18-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt1-18.bdf
-lib/X11/fonts/intlfonts/bdf/lt1-18b-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt1-18bi-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt1-18i-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt1-24-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt1-24b-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt1-24bi-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt1-24i-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt2-14-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt2-16-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt2-24-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt3-14-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt3-16-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt3-24-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt4-14-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt4-16-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt4-24-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt5-14-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt5-16-etl.bdf
-lib/X11/fonts/intlfonts/bdf/lt5-24-etl.bdf
-lib/X11/fonts/intlfonts/bdf/sish14-etl.bdf
-lib/X11/fonts/intlfonts/bdf/sish16-etl.bdf
-lib/X11/fonts/intlfonts/bdf/sish24-etl.bdf
-lib/X11/fonts/intlfonts/bdf/taipei16.bdf
-lib/X11/fonts/intlfonts/bdf/taipei24.bdf
-lib/X11/fonts/intlfonts/bdf/thai14.bdf
-lib/X11/fonts/intlfonts/bdf/thai16.bdf
-lib/X11/fonts/intlfonts/bdf/thai18.bdf
-lib/X11/fonts/intlfonts/bdf/thai18b.bdf
-lib/X11/fonts/intlfonts/bdf/thai18bi.bdf
-lib/X11/fonts/intlfonts/bdf/thai18i.bdf
-lib/X11/fonts/intlfonts/bdf/thai24.bdf
-lib/X11/fonts/intlfonts/bdf/tib16-mule.bdf
-lib/X11/fonts/intlfonts/bdf/tib1c16-mule.bdf
-lib/X11/fonts/intlfonts/bdf/tib1c24-mule.bdf
-lib/X11/fonts/intlfonts/bdf/tib24-mule.bdf
-lib/X11/fonts/intlfonts/bdf/visc16-etl.bdf
-lib/X11/fonts/intlfonts/bdf/visc18-etl.bdf
-lib/X11/fonts/intlfonts/bdf/visc18b-etl.bdf
-lib/X11/fonts/intlfonts/bdf/visc18bi-etl.bdf
-lib/X11/fonts/intlfonts/bdf/visc18i-etl.bdf
-lib/X11/fonts/intlfonts/bdf/visc24-etl.bdf
-lib/X11/fonts/intlfonts/bdf/xtis18.bdf
-lib/X11/fonts/intlfonts/bdf/xtis24.bdf
-lib/X11/fonts/intlfonts/bmp16-etl.pcf.gz
-lib/X11/fonts/intlfonts/cns1-16.pcf.gz
-lib/X11/fonts/intlfonts/cns1-24.pcf.gz
-lib/X11/fonts/intlfonts/cns2-16.pcf.gz
-lib/X11/fonts/intlfonts/cns2-24.pcf.gz
-lib/X11/fonts/intlfonts/cns3-16.pcf.gz
-lib/X11/fonts/intlfonts/cns3-24.pcf.gz
-lib/X11/fonts/intlfonts/cns4-16.pcf.gz
-lib/X11/fonts/intlfonts/cns4-24.pcf.gz
-lib/X11/fonts/intlfonts/cns5-16.pcf.gz
-lib/X11/fonts/intlfonts/cns5-24.pcf.gz
-lib/X11/fonts/intlfonts/cns6-16.pcf.gz
-lib/X11/fonts/intlfonts/cns6-24.pcf.gz
-lib/X11/fonts/intlfonts/cns7-16.pcf.gz
-lib/X11/fonts/intlfonts/cns7-24.pcf.gz
-lib/X11/fonts/intlfonts/cyr14-etl.pcf.gz
-lib/X11/fonts/intlfonts/cyr16-etl.pcf.gz
-lib/X11/fonts/intlfonts/cyr24-etl.pcf.gz
-lib/X11/fonts/intlfonts/ethio16f-uni.pcf.gz
-lib/X11/fonts/intlfonts/ethio24f-uni.pcf.gz
-lib/X11/fonts/intlfonts/fonts.alias
-lib/X11/fonts/intlfonts/grk14-etl.pcf.gz
-lib/X11/fonts/intlfonts/grk16-etl.pcf.gz
-lib/X11/fonts/intlfonts/grk24-etl.pcf.gz
-lib/X11/fonts/intlfonts/guob16.pcf.gz
-lib/X11/fonts/intlfonts/hanglg16.pcf.gz
-lib/X11/fonts/intlfonts/hanglm16.pcf.gz
-lib/X11/fonts/intlfonts/hanglm24.pcf.gz
-lib/X11/fonts/intlfonts/heb14-etl.pcf.gz
-lib/X11/fonts/intlfonts/heb16-etl.pcf.gz
-lib/X11/fonts/intlfonts/heb24-etl.pcf.gz
-lib/X11/fonts/intlfonts/ind16-mule.pcf.gz
-lib/X11/fonts/intlfonts/ind16-uni.pcf.gz
-lib/X11/fonts/intlfonts/ind1c16-mule.pcf.gz
-lib/X11/fonts/intlfonts/ind1c24-mule.pcf.gz
-lib/X11/fonts/intlfonts/ind24-mule.pcf.gz
-lib/X11/fonts/intlfonts/ind24-uni.pcf.gz
-lib/X11/fonts/intlfonts/ipa14-etl.pcf.gz
-lib/X11/fonts/intlfonts/ipa16-etl.pcf.gz
-lib/X11/fonts/intlfonts/ipa24-etl.pcf.gz
-lib/X11/fonts/intlfonts/isci16-mule.pcf.gz
-lib/X11/fonts/intlfonts/isci24-mule.pcf.gz
-lib/X11/fonts/intlfonts/j78-16.pcf.gz
-lib/X11/fonts/intlfonts/j83-18.pcf.gz
-lib/X11/fonts/intlfonts/j83-18b.pcf.gz
-lib/X11/fonts/intlfonts/j83-18i.pcf.gz
-lib/X11/fonts/intlfonts/j90-16.pcf.gz
-lib/X11/fonts/intlfonts/jksp16.pcf.gz
-lib/X11/fonts/intlfonts/jksp24.pcf.gz
-lib/X11/fonts/intlfonts/koi14-etl.pcf.gz
-lib/X11/fonts/intlfonts/koi16-etl.pcf.gz
-lib/X11/fonts/intlfonts/koi24-etl.pcf.gz
-lib/X11/fonts/intlfonts/lao14-mule.pcf.gz
-lib/X11/fonts/intlfonts/lao16-mule.pcf.gz
-lib/X11/fonts/intlfonts/lao18-mule.pcf.gz
-lib/X11/fonts/intlfonts/lao18b-mule.pcf.gz
-lib/X11/fonts/intlfonts/lao18i-mule.pcf.gz
-lib/X11/fonts/intlfonts/lao24-mule.pcf.gz
-lib/X11/fonts/intlfonts/lt1-14-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt1-16-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt1-16b-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt1-16bi-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt1-16i-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt1-18-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt1-18.pcf.gz
-lib/X11/fonts/intlfonts/lt1-18b-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt1-18bi-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt1-18i-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt1-24-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt1-24b-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt1-24bi-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt1-24i-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt2-14-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt2-16-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt2-24-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt3-14-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt3-16-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt3-24-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt4-14-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt4-16-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt4-24-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt5-14-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt5-16-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt5-24-etl.pcf.gz
-lib/X11/fonts/intlfonts/sish14-etl.pcf.gz
-lib/X11/fonts/intlfonts/sish16-etl.pcf.gz
-lib/X11/fonts/intlfonts/sish24-etl.pcf.gz
-lib/X11/fonts/intlfonts/taipei16.pcf.gz
-lib/X11/fonts/intlfonts/taipei24.pcf.gz
-lib/X11/fonts/intlfonts/thai14.pcf.gz
-lib/X11/fonts/intlfonts/thai16.pcf.gz
-lib/X11/fonts/intlfonts/thai18.pcf.gz
-lib/X11/fonts/intlfonts/thai18b.pcf.gz
-lib/X11/fonts/intlfonts/thai18bi.pcf.gz
-lib/X11/fonts/intlfonts/thai18i.pcf.gz
-lib/X11/fonts/intlfonts/thai24.pcf.gz
-lib/X11/fonts/intlfonts/tib16-mule.pcf.gz
-lib/X11/fonts/intlfonts/tib1c16-mule.pcf.gz
-lib/X11/fonts/intlfonts/tib1c24-mule.pcf.gz
-lib/X11/fonts/intlfonts/tib24-mule.pcf.gz
-lib/X11/fonts/intlfonts/visc16-etl.pcf.gz
-lib/X11/fonts/intlfonts/visc18-etl.pcf.gz
-lib/X11/fonts/intlfonts/visc18b-etl.pcf.gz
-lib/X11/fonts/intlfonts/visc18bi-etl.pcf.gz
-lib/X11/fonts/intlfonts/visc18i-etl.pcf.gz
-lib/X11/fonts/intlfonts/visc24-etl.pcf.gz
-lib/X11/fonts/intlfonts/xtis18.pcf.gz
-lib/X11/fonts/intlfonts/xtis24.pcf.gz
+@comment $NetBSD: PLIST,v 1.9 2014/06/01 16:35:34 wiz Exp $
+share/fonts/X11/intlfonts/a18rk.pcf.gz
+share/fonts/X11/intlfonts/a18rkb.pcf.gz
+share/fonts/X11/intlfonts/a18rki.pcf.gz
+share/fonts/X11/intlfonts/arab16-0-etl.pcf.gz
+share/fonts/X11/intlfonts/arab16-1-etl.pcf.gz
+share/fonts/X11/intlfonts/arab16-2-etl.pcf.gz
+share/fonts/X11/intlfonts/arab24-0-etl.pcf.gz
+share/fonts/X11/intlfonts/arab24-1-etl.pcf.gz
+share/fonts/X11/intlfonts/arab24-2-etl.pcf.gz
+share/fonts/X11/intlfonts/bdf/a18rk.bdf
+share/fonts/X11/intlfonts/bdf/a18rkb.bdf
+share/fonts/X11/intlfonts/bdf/a18rki.bdf
+share/fonts/X11/intlfonts/bdf/arab16-0-etl.bdf
+share/fonts/X11/intlfonts/bdf/arab16-1-etl.bdf
+share/fonts/X11/intlfonts/bdf/arab16-2-etl.bdf
+share/fonts/X11/intlfonts/bdf/arab24-0-etl.bdf
+share/fonts/X11/intlfonts/bdf/arab24-1-etl.bdf
+share/fonts/X11/intlfonts/bdf/arab24-2-etl.bdf
+share/fonts/X11/intlfonts/bdf/bmp16-etl.bdf
+share/fonts/X11/intlfonts/bdf/cns1-16.bdf
+share/fonts/X11/intlfonts/bdf/cns1-24.bdf
+share/fonts/X11/intlfonts/bdf/cns2-16.bdf
+share/fonts/X11/intlfonts/bdf/cns2-24.bdf
+share/fonts/X11/intlfonts/bdf/cns3-16.bdf
+share/fonts/X11/intlfonts/bdf/cns3-24.bdf
+share/fonts/X11/intlfonts/bdf/cns4-16.bdf
+share/fonts/X11/intlfonts/bdf/cns4-24.bdf
+share/fonts/X11/intlfonts/bdf/cns5-16.bdf
+share/fonts/X11/intlfonts/bdf/cns5-24.bdf
+share/fonts/X11/intlfonts/bdf/cns6-16.bdf
+share/fonts/X11/intlfonts/bdf/cns6-24.bdf
+share/fonts/X11/intlfonts/bdf/cns7-16.bdf
+share/fonts/X11/intlfonts/bdf/cns7-24.bdf
+share/fonts/X11/intlfonts/bdf/cyr14-etl.bdf
+share/fonts/X11/intlfonts/bdf/cyr16-etl.bdf
+share/fonts/X11/intlfonts/bdf/cyr24-etl.bdf
+share/fonts/X11/intlfonts/bdf/ethio16f-uni.bdf
+share/fonts/X11/intlfonts/bdf/ethio24f-uni.bdf
+share/fonts/X11/intlfonts/bdf/grk14-etl.bdf
+share/fonts/X11/intlfonts/bdf/grk16-etl.bdf
+share/fonts/X11/intlfonts/bdf/grk24-etl.bdf
+share/fonts/X11/intlfonts/bdf/guob16.bdf
+share/fonts/X11/intlfonts/bdf/hanglg16.bdf
+share/fonts/X11/intlfonts/bdf/hanglm16.bdf
+share/fonts/X11/intlfonts/bdf/hanglm24.bdf
+share/fonts/X11/intlfonts/bdf/heb14-etl.bdf
+share/fonts/X11/intlfonts/bdf/heb16-etl.bdf
+share/fonts/X11/intlfonts/bdf/heb24-etl.bdf
+share/fonts/X11/intlfonts/bdf/ind16-mule.bdf
+share/fonts/X11/intlfonts/bdf/ind16-uni.bdf
+share/fonts/X11/intlfonts/bdf/ind1c16-mule.bdf
+share/fonts/X11/intlfonts/bdf/ind1c24-mule.bdf
+share/fonts/X11/intlfonts/bdf/ind24-mule.bdf
+share/fonts/X11/intlfonts/bdf/ind24-uni.bdf
+share/fonts/X11/intlfonts/bdf/ipa14-etl.bdf
+share/fonts/X11/intlfonts/bdf/ipa16-etl.bdf
+share/fonts/X11/intlfonts/bdf/ipa24-etl.bdf
+share/fonts/X11/intlfonts/bdf/isci16-mule.bdf
+share/fonts/X11/intlfonts/bdf/isci24-mule.bdf
+share/fonts/X11/intlfonts/bdf/j78-16.bdf
+share/fonts/X11/intlfonts/bdf/j83-18.bdf
+share/fonts/X11/intlfonts/bdf/j83-18b.bdf
+share/fonts/X11/intlfonts/bdf/j83-18i.bdf
+share/fonts/X11/intlfonts/bdf/j90-16.bdf
+share/fonts/X11/intlfonts/bdf/jksp16.bdf
+share/fonts/X11/intlfonts/bdf/jksp24.bdf
+share/fonts/X11/intlfonts/bdf/koi14-etl.bdf
+share/fonts/X11/intlfonts/bdf/koi16-etl.bdf
+share/fonts/X11/intlfonts/bdf/koi24-etl.bdf
+share/fonts/X11/intlfonts/bdf/lao14-mule.bdf
+share/fonts/X11/intlfonts/bdf/lao16-mule.bdf
+share/fonts/X11/intlfonts/bdf/lao18-mule.bdf
+share/fonts/X11/intlfonts/bdf/lao18b-mule.bdf
+share/fonts/X11/intlfonts/bdf/lao18i-mule.bdf
+share/fonts/X11/intlfonts/bdf/lao24-mule.bdf
+share/fonts/X11/intlfonts/bdf/lt1-14-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt1-16-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt1-16b-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt1-16bi-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt1-16i-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt1-18-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt1-18.bdf
+share/fonts/X11/intlfonts/bdf/lt1-18b-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt1-18bi-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt1-18i-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt1-24-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt1-24b-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt1-24bi-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt1-24i-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt2-14-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt2-16-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt2-24-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt3-14-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt3-16-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt3-24-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt4-14-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt4-16-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt4-24-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt5-14-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt5-16-etl.bdf
+share/fonts/X11/intlfonts/bdf/lt5-24-etl.bdf
+share/fonts/X11/intlfonts/bdf/sish14-etl.bdf
+share/fonts/X11/intlfonts/bdf/sish16-etl.bdf
+share/fonts/X11/intlfonts/bdf/sish24-etl.bdf
+share/fonts/X11/intlfonts/bdf/taipei16.bdf
+share/fonts/X11/intlfonts/bdf/taipei24.bdf
+share/fonts/X11/intlfonts/bdf/thai14.bdf
+share/fonts/X11/intlfonts/bdf/thai16.bdf
+share/fonts/X11/intlfonts/bdf/thai18.bdf
+share/fonts/X11/intlfonts/bdf/thai18b.bdf
+share/fonts/X11/intlfonts/bdf/thai18bi.bdf
+share/fonts/X11/intlfonts/bdf/thai18i.bdf
+share/fonts/X11/intlfonts/bdf/thai24.bdf
+share/fonts/X11/intlfonts/bdf/tib16-mule.bdf
+share/fonts/X11/intlfonts/bdf/tib1c16-mule.bdf
+share/fonts/X11/intlfonts/bdf/tib1c24-mule.bdf
+share/fonts/X11/intlfonts/bdf/tib24-mule.bdf
+share/fonts/X11/intlfonts/bdf/visc16-etl.bdf
+share/fonts/X11/intlfonts/bdf/visc18-etl.bdf
+share/fonts/X11/intlfonts/bdf/visc18b-etl.bdf
+share/fonts/X11/intlfonts/bdf/visc18bi-etl.bdf
+share/fonts/X11/intlfonts/bdf/visc18i-etl.bdf
+share/fonts/X11/intlfonts/bdf/visc24-etl.bdf
+share/fonts/X11/intlfonts/bdf/xtis18.bdf
+share/fonts/X11/intlfonts/bdf/xtis24.bdf
+share/fonts/X11/intlfonts/bmp16-etl.pcf.gz
+share/fonts/X11/intlfonts/cns1-16.pcf.gz
+share/fonts/X11/intlfonts/cns1-24.pcf.gz
+share/fonts/X11/intlfonts/cns2-16.pcf.gz
+share/fonts/X11/intlfonts/cns2-24.pcf.gz
+share/fonts/X11/intlfonts/cns3-16.pcf.gz
+share/fonts/X11/intlfonts/cns3-24.pcf.gz
+share/fonts/X11/intlfonts/cns4-16.pcf.gz
+share/fonts/X11/intlfonts/cns4-24.pcf.gz
+share/fonts/X11/intlfonts/cns5-16.pcf.gz
+share/fonts/X11/intlfonts/cns5-24.pcf.gz
+share/fonts/X11/intlfonts/cns6-16.pcf.gz
+share/fonts/X11/intlfonts/cns6-24.pcf.gz
+share/fonts/X11/intlfonts/cns7-16.pcf.gz
+share/fonts/X11/intlfonts/cns7-24.pcf.gz
+share/fonts/X11/intlfonts/cyr14-etl.pcf.gz
+share/fonts/X11/intlfonts/cyr16-etl.pcf.gz
+share/fonts/X11/intlfonts/cyr24-etl.pcf.gz
+share/fonts/X11/intlfonts/ethio16f-uni.pcf.gz
+share/fonts/X11/intlfonts/ethio24f-uni.pcf.gz
+share/fonts/X11/intlfonts/fonts.alias
+share/fonts/X11/intlfonts/grk14-etl.pcf.gz
+share/fonts/X11/intlfonts/grk16-etl.pcf.gz
+share/fonts/X11/intlfonts/grk24-etl.pcf.gz
+share/fonts/X11/intlfonts/guob16.pcf.gz
+share/fonts/X11/intlfonts/hanglg16.pcf.gz
+share/fonts/X11/intlfonts/hanglm16.pcf.gz
+share/fonts/X11/intlfonts/hanglm24.pcf.gz
+share/fonts/X11/intlfonts/heb14-etl.pcf.gz
+share/fonts/X11/intlfonts/heb16-etl.pcf.gz
+share/fonts/X11/intlfonts/heb24-etl.pcf.gz
+share/fonts/X11/intlfonts/ind16-mule.pcf.gz
+share/fonts/X11/intlfonts/ind16-uni.pcf.gz
+share/fonts/X11/intlfonts/ind1c16-mule.pcf.gz
+share/fonts/X11/intlfonts/ind1c24-mule.pcf.gz
+share/fonts/X11/intlfonts/ind24-mule.pcf.gz
+share/fonts/X11/intlfonts/ind24-uni.pcf.gz
+share/fonts/X11/intlfonts/ipa14-etl.pcf.gz
+share/fonts/X11/intlfonts/ipa16-etl.pcf.gz
+share/fonts/X11/intlfonts/ipa24-etl.pcf.gz
+share/fonts/X11/intlfonts/isci16-mule.pcf.gz
+share/fonts/X11/intlfonts/isci24-mule.pcf.gz
+share/fonts/X11/intlfonts/j78-16.pcf.gz
+share/fonts/X11/intlfonts/j83-18.pcf.gz
+share/fonts/X11/intlfonts/j83-18b.pcf.gz
+share/fonts/X11/intlfonts/j83-18i.pcf.gz
+share/fonts/X11/intlfonts/j90-16.pcf.gz
+share/fonts/X11/intlfonts/jksp16.pcf.gz
+share/fonts/X11/intlfonts/jksp24.pcf.gz
+share/fonts/X11/intlfonts/koi14-etl.pcf.gz
+share/fonts/X11/intlfonts/koi16-etl.pcf.gz
+share/fonts/X11/intlfonts/koi24-etl.pcf.gz
+share/fonts/X11/intlfonts/lao14-mule.pcf.gz
+share/fonts/X11/intlfonts/lao16-mule.pcf.gz
+share/fonts/X11/intlfonts/lao18-mule.pcf.gz
+share/fonts/X11/intlfonts/lao18b-mule.pcf.gz
+share/fonts/X11/intlfonts/lao18i-mule.pcf.gz
+share/fonts/X11/intlfonts/lao24-mule.pcf.gz
+share/fonts/X11/intlfonts/lt1-14-etl.pcf.gz
+share/fonts/X11/intlfonts/lt1-16-etl.pcf.gz
+share/fonts/X11/intlfonts/lt1-16b-etl.pcf.gz
+share/fonts/X11/intlfonts/lt1-16bi-etl.pcf.gz
+share/fonts/X11/intlfonts/lt1-16i-etl.pcf.gz
+share/fonts/X11/intlfonts/lt1-18-etl.pcf.gz
+share/fonts/X11/intlfonts/lt1-18.pcf.gz
+share/fonts/X11/intlfonts/lt1-18b-etl.pcf.gz
+share/fonts/X11/intlfonts/lt1-18bi-etl.pcf.gz
+share/fonts/X11/intlfonts/lt1-18i-etl.pcf.gz
+share/fonts/X11/intlfonts/lt1-24-etl.pcf.gz
+share/fonts/X11/intlfonts/lt1-24b-etl.pcf.gz
+share/fonts/X11/intlfonts/lt1-24bi-etl.pcf.gz
+share/fonts/X11/intlfonts/lt1-24i-etl.pcf.gz
+share/fonts/X11/intlfonts/lt2-14-etl.pcf.gz
+share/fonts/X11/intlfonts/lt2-16-etl.pcf.gz
+share/fonts/X11/intlfonts/lt2-24-etl.pcf.gz
+share/fonts/X11/intlfonts/lt3-14-etl.pcf.gz
+share/fonts/X11/intlfonts/lt3-16-etl.pcf.gz
+share/fonts/X11/intlfonts/lt3-24-etl.pcf.gz
+share/fonts/X11/intlfonts/lt4-14-etl.pcf.gz
+share/fonts/X11/intlfonts/lt4-16-etl.pcf.gz
+share/fonts/X11/intlfonts/lt4-24-etl.pcf.gz
+share/fonts/X11/intlfonts/lt5-14-etl.pcf.gz
+share/fonts/X11/intlfonts/lt5-16-etl.pcf.gz
+share/fonts/X11/intlfonts/lt5-24-etl.pcf.gz
+share/fonts/X11/intlfonts/sish14-etl.pcf.gz
+share/fonts/X11/intlfonts/sish16-etl.pcf.gz
+share/fonts/X11/intlfonts/sish24-etl.pcf.gz
+share/fonts/X11/intlfonts/taipei16.pcf.gz
+share/fonts/X11/intlfonts/taipei24.pcf.gz
+share/fonts/X11/intlfonts/thai14.pcf.gz
+share/fonts/X11/intlfonts/thai16.pcf.gz
+share/fonts/X11/intlfonts/thai18.pcf.gz
+share/fonts/X11/intlfonts/thai18b.pcf.gz
+share/fonts/X11/intlfonts/thai18bi.pcf.gz
+share/fonts/X11/intlfonts/thai18i.pcf.gz
+share/fonts/X11/intlfonts/thai24.pcf.gz
+share/fonts/X11/intlfonts/tib16-mule.pcf.gz
+share/fonts/X11/intlfonts/tib1c16-mule.pcf.gz
+share/fonts/X11/intlfonts/tib1c24-mule.pcf.gz
+share/fonts/X11/intlfonts/tib24-mule.pcf.gz
+share/fonts/X11/intlfonts/visc16-etl.pcf.gz
+share/fonts/X11/intlfonts/visc18-etl.pcf.gz
+share/fonts/X11/intlfonts/visc18b-etl.pcf.gz
+share/fonts/X11/intlfonts/visc18bi-etl.pcf.gz
+share/fonts/X11/intlfonts/visc18i-etl.pcf.gz
+share/fonts/X11/intlfonts/visc24-etl.pcf.gz
+share/fonts/X11/intlfonts/xtis18.pcf.gz
+share/fonts/X11/intlfonts/xtis24.pcf.gz
diff --git a/fonts/intlfonts/PLIST.extrafonts b/fonts/intlfonts/PLIST.extrafonts
index eb1b3f91aa8..d384c86b6b9 100644
--- a/fonts/intlfonts/PLIST.extrafonts
+++ b/fonts/intlfonts/PLIST.extrafonts
@@ -1,120 +1,120 @@
-@comment $NetBSD: PLIST.extrafonts,v 1.4 2006/02/17 19:33:44 wiz Exp $
-lib/X11/fonts/intlfonts/TrueType/lt1-b-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt1-bi-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt1-i-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt1-r-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt2-b-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt2-bi-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt2-i-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt2-r-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt3-b-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt3-bi-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt3-i-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt3-r-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt4-b-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt4-bi-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt4-i-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt4-r-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt5-b-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt5-bi-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt5-i-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/lt5-r-omega-serif.ttf
-lib/X11/fonts/intlfonts/TrueType/viscii-omega-serif.ttf
-lib/X11/fonts/intlfonts/Type1/lt1-b-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt1-b-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt1-b-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt1-bi-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt1-bi-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt1-bi-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt1-i-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt1-i-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt1-i-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt1-r-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt1-r-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt1-r-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt2-b-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt2-b-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt2-b-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt2-bi-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt2-bi-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt2-bi-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt2-i-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt2-i-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt2-i-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt2-r-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt2-r-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt2-r-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt3-b-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt3-b-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt3-b-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt3-bi-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt3-bi-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt3-bi-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt3-i-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt3-i-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt3-i-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt3-r-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt3-r-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt3-r-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt4-b-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt4-b-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt4-b-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt4-bi-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt4-bi-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt4-bi-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt4-i-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt4-i-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt4-i-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt4-r-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt4-r-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt4-r-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt5-b-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt5-b-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt5-b-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt5-bi-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt5-bi-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt5-bi-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt5-i-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt5-i-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt5-i-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/lt5-r-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/lt5-r-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/lt5-r-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/nf3.afm
-lib/X11/fonts/intlfonts/Type1/nf3.pfa
-lib/X11/fonts/intlfonts/Type1/nf3.pfb
-lib/X11/fonts/intlfonts/Type1/nf3i.afm
-lib/X11/fonts/intlfonts/Type1/nf3i.pfa
-lib/X11/fonts/intlfonts/Type1/nf3i.pfb
-lib/X11/fonts/intlfonts/Type1/tis620-r-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/tis620-r-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/tis620-r-omega-serif.pfb
-lib/X11/fonts/intlfonts/Type1/viscii-r-omega-serif.afm
-lib/X11/fonts/intlfonts/Type1/viscii-r-omega-serif.pfa
-lib/X11/fonts/intlfonts/Type1/viscii-r-omega-serif.pfb
-lib/X11/fonts/intlfonts/bdf/cc40s.bdf
-lib/X11/fonts/intlfonts/bdf/cc48s.bdf
-lib/X11/fonts/intlfonts/bdf/cns1-40.bdf
-lib/X11/fonts/intlfonts/bdf/cns2-40.bdf
-lib/X11/fonts/intlfonts/bdf/cns3-40.bdf
-lib/X11/fonts/intlfonts/bdf/cns4-40.bdf
-lib/X11/fonts/intlfonts/bdf/cns5-40.bdf
-lib/X11/fonts/intlfonts/bdf/cns6-40.bdf
-lib/X11/fonts/intlfonts/bdf/cns7-40.bdf
-lib/X11/fonts/intlfonts/bdf/jiskan32.bdf
-lib/X11/fonts/intlfonts/bdf/jiskan48.bdf
-lib/X11/fonts/intlfonts/bdf/jksp40.bdf
-lib/X11/fonts/intlfonts/bdf/lt1-40-etl.bdf
-lib/X11/fonts/intlfonts/cc40s.pcf.gz
-lib/X11/fonts/intlfonts/cc48s.pcf.gz
-lib/X11/fonts/intlfonts/cns1-40.pcf.gz
-lib/X11/fonts/intlfonts/cns2-40.pcf.gz
-lib/X11/fonts/intlfonts/cns3-40.pcf.gz
-lib/X11/fonts/intlfonts/cns4-40.pcf.gz
-lib/X11/fonts/intlfonts/cns5-40.pcf.gz
-lib/X11/fonts/intlfonts/cns6-40.pcf.gz
-lib/X11/fonts/intlfonts/cns7-40.pcf.gz
-lib/X11/fonts/intlfonts/jiskan32.pcf.gz
-lib/X11/fonts/intlfonts/jiskan48.pcf.gz
-lib/X11/fonts/intlfonts/jksp40.pcf.gz
-lib/X11/fonts/intlfonts/lt1-40-etl.pcf.gz
+@comment $NetBSD: PLIST.extrafonts,v 1.5 2014/06/01 16:35:34 wiz Exp $
+share/fonts/X11/intlfonts/TrueType/lt1-b-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt1-bi-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt1-i-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt1-r-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt2-b-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt2-bi-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt2-i-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt2-r-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt3-b-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt3-bi-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt3-i-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt3-r-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt4-b-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt4-bi-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt4-i-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt4-r-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt5-b-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt5-bi-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt5-i-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/lt5-r-omega-serif.ttf
+share/fonts/X11/intlfonts/TrueType/viscii-omega-serif.ttf
+share/fonts/X11/intlfonts/Type1/lt1-b-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt1-b-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt1-b-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt1-bi-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt1-bi-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt1-bi-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt1-i-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt1-i-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt1-i-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt1-r-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt1-r-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt1-r-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt2-b-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt2-b-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt2-b-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt2-bi-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt2-bi-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt2-bi-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt2-i-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt2-i-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt2-i-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt2-r-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt2-r-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt2-r-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt3-b-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt3-b-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt3-b-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt3-bi-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt3-bi-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt3-bi-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt3-i-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt3-i-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt3-i-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt3-r-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt3-r-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt3-r-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt4-b-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt4-b-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt4-b-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt4-bi-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt4-bi-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt4-bi-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt4-i-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt4-i-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt4-i-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt4-r-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt4-r-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt4-r-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt5-b-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt5-b-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt5-b-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt5-bi-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt5-bi-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt5-bi-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt5-i-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt5-i-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt5-i-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/lt5-r-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/lt5-r-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/lt5-r-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/nf3.afm
+share/fonts/X11/intlfonts/Type1/nf3.pfa
+share/fonts/X11/intlfonts/Type1/nf3.pfb
+share/fonts/X11/intlfonts/Type1/nf3i.afm
+share/fonts/X11/intlfonts/Type1/nf3i.pfa
+share/fonts/X11/intlfonts/Type1/nf3i.pfb
+share/fonts/X11/intlfonts/Type1/tis620-r-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/tis620-r-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/tis620-r-omega-serif.pfb
+share/fonts/X11/intlfonts/Type1/viscii-r-omega-serif.afm
+share/fonts/X11/intlfonts/Type1/viscii-r-omega-serif.pfa
+share/fonts/X11/intlfonts/Type1/viscii-r-omega-serif.pfb
+share/fonts/X11/intlfonts/bdf/cc40s.bdf
+share/fonts/X11/intlfonts/bdf/cc48s.bdf
+share/fonts/X11/intlfonts/bdf/cns1-40.bdf
+share/fonts/X11/intlfonts/bdf/cns2-40.bdf
+share/fonts/X11/intlfonts/bdf/cns3-40.bdf
+share/fonts/X11/intlfonts/bdf/cns4-40.bdf
+share/fonts/X11/intlfonts/bdf/cns5-40.bdf
+share/fonts/X11/intlfonts/bdf/cns6-40.bdf
+share/fonts/X11/intlfonts/bdf/cns7-40.bdf
+share/fonts/X11/intlfonts/bdf/jiskan32.bdf
+share/fonts/X11/intlfonts/bdf/jiskan48.bdf
+share/fonts/X11/intlfonts/bdf/jksp40.bdf
+share/fonts/X11/intlfonts/bdf/lt1-40-etl.bdf
+share/fonts/X11/intlfonts/cc40s.pcf.gz
+share/fonts/X11/intlfonts/cc48s.pcf.gz
+share/fonts/X11/intlfonts/cns1-40.pcf.gz
+share/fonts/X11/intlfonts/cns2-40.pcf.gz
+share/fonts/X11/intlfonts/cns3-40.pcf.gz
+share/fonts/X11/intlfonts/cns4-40.pcf.gz
+share/fonts/X11/intlfonts/cns5-40.pcf.gz
+share/fonts/X11/intlfonts/cns6-40.pcf.gz
+share/fonts/X11/intlfonts/cns7-40.pcf.gz
+share/fonts/X11/intlfonts/jiskan32.pcf.gz
+share/fonts/X11/intlfonts/jiskan48.pcf.gz
+share/fonts/X11/intlfonts/jksp40.pcf.gz
+share/fonts/X11/intlfonts/lt1-40-etl.pcf.gz
diff --git a/fonts/ipaexfont/Makefile b/fonts/ipaexfont/Makefile
index 9fda72defa7..41317d9dea5 100644
--- a/fonts/ipaexfont/Makefile
+++ b/fonts/ipaexfont/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2012/11/10 10:11:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2014/06/01 16:35:34 wiz Exp $
#
IPAEXVER= 00201
DISTNAME= IPAexfont${IPAEXVER}
PKGNAME= ${DISTNAME:S/IPAexfont/ipaexfont-/}
+PKGREVISION= 1
CATEGORIES= fonts japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=ipafonts/57330/} \
http://info.openlab.ipa.go.jp/ipafont/fontdata/
@@ -20,10 +21,10 @@ NO_BUILD= YES
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
-INSTALLATION_DIRS= lib/X11/fonts/TTF \
+INSTALLATION_DIRS= share/fonts/X11/TTF \
${DOCSDIR}
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
INSTALL_FONTS= ipaexg.ttf \
diff --git a/fonts/ipaexfont/PLIST b/fonts/ipaexfont/PLIST
index c5d695fa3a1..c78f3875140 100644
--- a/fonts/ipaexfont/PLIST
+++ b/fonts/ipaexfont/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/07/17 03:06:51 obache Exp $
-lib/X11/fonts/TTF/ipaexg.ttf
-lib/X11/fonts/TTF/ipaexm.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:34 wiz Exp $
+share/fonts/X11/TTF/ipaexg.ttf
+share/fonts/X11/TTF/ipaexm.ttf
share/doc/${PKGBASE}/IPA_Font_License_Agreement_v1.0.txt
share/doc/${PKGBASE}/Readme_IPAexfont${PKGVERSION}.txt
diff --git a/fonts/ipafont/Makefile b/fonts/ipafont/Makefile
index cdba5d90270..f9d8db5ff41 100644
--- a/fonts/ipafont/Makefile
+++ b/fonts/ipafont/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2014/04/07 12:32:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2014/06/01 16:35:34 wiz Exp $
#
DISTNAME= IPAfont00303
PKGNAME= ${DISTNAME:S/IPAfont/ipafont-/}
+PKGREVISION= 1
CATEGORIES= fonts japanese
MASTER_SITES= http://dl.ipafont.ipa.go.jp/IPAfont/
EXTRACT_SUFX= .zip
@@ -18,10 +19,10 @@ NO_BUILD= YES
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
-INSTALLATION_DIRS= lib/X11/fonts/TTF \
+INSTALLATION_DIRS= share/fonts/X11/TTF \
${DOCSDIR}
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
INSTALL_FONTS= ipag.ttf \
diff --git a/fonts/ipafont/PLIST b/fonts/ipafont/PLIST
index e077a5db34d..557ad088f0f 100644
--- a/fonts/ipafont/PLIST
+++ b/fonts/ipafont/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/07/17 03:03:01 obache Exp $
-lib/X11/fonts/TTF/ipag.ttf
-lib/X11/fonts/TTF/ipagp.ttf
-lib/X11/fonts/TTF/ipam.ttf
-lib/X11/fonts/TTF/ipamp.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:34 wiz Exp $
+share/fonts/X11/TTF/ipag.ttf
+share/fonts/X11/TTF/ipagp.ttf
+share/fonts/X11/TTF/ipam.ttf
+share/fonts/X11/TTF/ipamp.ttf
share/doc/${PKGBASE}/IPA_Font_License_Agreement_v1.0.txt
share/doc/${PKGBASE}/Readme_IPAfont${PKGVERSION}.txt
diff --git a/fonts/ja-elisat/Makefile b/fonts/ja-elisat/Makefile
index 5b236ab2b06..5ad11e93464 100644
--- a/fonts/ja-elisat/Makefile
+++ b/fonts/ja-elisat/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2013/07/27 11:58:07 tsutsui Exp $
+# $NetBSD: Makefile,v 1.18 2014/06/01 16:35:34 wiz Exp $
DISTNAME= elisat10
PKGNAME= ja-elisat-1.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= fonts x11 japanese
MASTER_SITES= ${MASTER_SITE_FREEBSD}
MAINTAINER= tech-pkg-ja@jp.NetBSD.org
@@ -13,7 +13,7 @@ LICENSE= no-commercial-use
WRKSRC= ${WRKDIR}
USE_X11BASE= YES
DOCDIR= ${PREFIX}/share/doc/elisat
-FONTDIR= ${PREFIX}/lib/X11/fonts/local
+FONTDIR= ${PREFIX}/share/fonts/X11/local
FONTS_DIRS.x11= ${FONTDIR}
USE_TOOLS+= bdftopcf gzip
diff --git a/fonts/ja-elisat/PLIST b/fonts/ja-elisat/PLIST
index 85c83e0c46a..7cac5ac8fa8 100644
--- a/fonts/ja-elisat/PLIST
+++ b/fonts/ja-elisat/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:54:14 joerg Exp $
-lib/X11/fonts/local/elisat10.pcf.gz
-lib/X11/fonts/local/jpnhn4-iso.pcf.gz
-lib/X11/fonts/local/jpnhn4-jis.pcf.gz
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:34 wiz Exp $
+share/fonts/X11/local/elisat10.pcf.gz
+share/fonts/X11/local/jpnhn4-iso.pcf.gz
+share/fonts/X11/local/jpnhn4-jis.pcf.gz
share/doc/elisat/elisa100.doc
share/doc/elisat/elisat10.doc
share/doc/elisat/elisat10.html
diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile
index 4fa5846d099..60be3e1bcff 100644
--- a/fonts/ja-elisau/Makefile
+++ b/fonts/ja-elisau/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2013/07/27 11:58:07 tsutsui Exp $
+# $NetBSD: Makefile,v 1.19 2014/06/01 16:35:34 wiz Exp $
DISTNAME= elisau10
PKGNAME= ja-elisau-1.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= fonts x11 japanese
MASTER_SITES= http://www.wheel.gr.jp/~dai/software/ \
ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}
USE_TOOLS+= bdftopcf gzip patch
USE_X11BASE= YES
DOCDIR= ${PREFIX}/share/doc/elisau
-FONTDIR= ${PREFIX}/lib/X11/fonts/local
+FONTDIR= ${PREFIX}/share/fonts/X11/local
FONTS_DIRS.x11= ${FONTDIR}
DISTPATCH= ${WRKSRC}/clR5x8-s5x8.diff
diff --git a/fonts/ja-elisau/PLIST b/fonts/ja-elisau/PLIST
index 17b0471b07c..25b44632612 100644
--- a/fonts/ja-elisau/PLIST
+++ b/fonts/ja-elisau/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:54:14 joerg Exp $
-lib/X11/fonts/local/clR5x8.pcf.gz
-lib/X11/fonts/local/elisau10.pcf.gz
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:34 wiz Exp $
+share/fonts/X11/local/clR5x8.pcf.gz
+share/fonts/X11/local/elisau10.pcf.gz
share/doc/elisau/elisa100.doc
share/doc/elisau/elisau10.doc
share/doc/elisau/hosoku.txt
diff --git a/fonts/ja-kaname/Makefile b/fonts/ja-kaname/Makefile
index 344d0e95697..49c07e67403 100644
--- a/fonts/ja-kaname/Makefile
+++ b/fonts/ja-kaname/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2013/07/27 11:58:08 tsutsui Exp $
+# $NetBSD: Makefile,v 1.16 2014/06/01 16:35:34 wiz Exp $
DISTNAME= kaname_k12_bdf
PKGNAME= ja-kaname-0.0.0.20030112
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= fonts x11 japanese
MASTER_SITES= ${MASTER_SITE_LOCAL} # original site was closed.
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}
USE_X11BASE= YES
USE_TOOLS+= bdftopcf gzip
DOCDIR= ${PREFIX}/share/doc/kaname
-FONTDIR= ${PREFIX}/lib/X11/fonts/local
+FONTDIR= ${PREFIX}/share/fonts/X11/local
FONTS_DIRS.x11= ${FONTDIR}
do-build:
diff --git a/fonts/ja-kaname/PLIST b/fonts/ja-kaname/PLIST
index fdff9a51c15..ce29cc9271b 100644
--- a/fonts/ja-kaname/PLIST
+++ b/fonts/ja-kaname/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:54:14 joerg Exp $
-lib/X11/fonts/local/knmhn12x.pcf.gz
-lib/X11/fonts/local/knmzn12x.pcf.gz
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:34 wiz Exp $
+share/fonts/X11/local/knmhn12x.pcf.gz
+share/fonts/X11/local/knmzn12x.pcf.gz
share/doc/kaname/readme.kaname_bdf
share/doc/kaname/kaname.doc
share/doc/kaname/readme.knm
diff --git a/fonts/ja-kappa20/Makefile b/fonts/ja-kappa20/Makefile
index 1b7cf0afe24..39e2b95e5ab 100644
--- a/fonts/ja-kappa20/Makefile
+++ b/fonts/ja-kappa20/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2012/12/26 21:14:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.17 2014/06/01 16:35:34 wiz Exp $
DISTNAME= Kappa20-0.394
PKGNAME= ja-kappa20-0.394
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= fonts x11 japanese
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tar.bz2
@@ -12,7 +12,7 @@ HOMEPAGE= http://kappa.allnet.ne.jp/20dot.fonts/
COMMENT= 20x20 dots X11 bitmap font for Japanese with several extra fonts
USE_X11BASE= YES
-FONTDIR= ${PREFIX}/lib/X11/fonts/local
+FONTDIR= ${PREFIX}/share/fonts/X11/local
ALIAS_KAPPA= ${PREFIX}/share/examples/fonts.alias.Kappa20
USE_TOOLS+= bdftopcf gzip mkfontdir patch
@@ -23,7 +23,7 @@ FILES_SUBST+= ALIAS_KAPPA=${ALIAS_KAPPA:Q}
# do not build experimental JIS X 0213 font.
BUILD_TARGET= default
-INSTALLATION_DIRS= lib/X11/fonts/local share/doc share/examples
+INSTALLATION_DIRS= share/fonts/X11/local share/doc share/examples
do-install:
${INSTALL_DATA} ${WRKSRC}/README \
diff --git a/fonts/ja-kappa20/PLIST b/fonts/ja-kappa20/PLIST
index f9cbb02dc43..a728fff5748 100644
--- a/fonts/ja-kappa20/PLIST
+++ b/fonts/ja-kappa20/PLIST
@@ -1,19 +1,19 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/03/15 20:40:56 kei Exp $
-lib/X11/fonts/local/10x20b.pcf.gz
-lib/X11/fonts/local/10x20m.pcf.gz
-lib/X11/fonts/local/10x20L2b.pcf.gz
-lib/X11/fonts/local/10x20L2m.pcf.gz
-lib/X11/fonts/local/10x20L3b.pcf.gz
-lib/X11/fonts/local/10x20L3m.pcf.gz
-lib/X11/fonts/local/10x20L9b.pcf.gz
-lib/X11/fonts/local/10x20L9m.pcf.gz
-lib/X11/fonts/local/10x20rkb.pcf.gz
-lib/X11/fonts/local/10x20rkm.pcf.gz
-lib/X11/fonts/local/ipa-10x20b.pcf.gz
-lib/X11/fonts/local/ipa-10x20m.pcf.gz
-lib/X11/fonts/local/k20b.pcf.gz
-lib/X11/fonts/local/k20m.pcf.gz
-lib/X11/fonts/local/vk20b.pcf.gz
-lib/X11/fonts/local/vk20m.pcf.gz
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:34 wiz Exp $
+share/fonts/X11/local/10x20b.pcf.gz
+share/fonts/X11/local/10x20m.pcf.gz
+share/fonts/X11/local/10x20L2b.pcf.gz
+share/fonts/X11/local/10x20L2m.pcf.gz
+share/fonts/X11/local/10x20L3b.pcf.gz
+share/fonts/X11/local/10x20L3m.pcf.gz
+share/fonts/X11/local/10x20L9b.pcf.gz
+share/fonts/X11/local/10x20L9m.pcf.gz
+share/fonts/X11/local/10x20rkb.pcf.gz
+share/fonts/X11/local/10x20rkm.pcf.gz
+share/fonts/X11/local/ipa-10x20b.pcf.gz
+share/fonts/X11/local/ipa-10x20m.pcf.gz
+share/fonts/X11/local/k20b.pcf.gz
+share/fonts/X11/local/k20m.pcf.gz
+share/fonts/X11/local/vk20b.pcf.gz
+share/fonts/X11/local/vk20m.pcf.gz
share/doc/README.Kappa20
share/examples/fonts.alias.Kappa20
diff --git a/fonts/ja-naga10/Makefile b/fonts/ja-naga10/Makefile
index 3744f4821ca..e0d691ac4f9 100644
--- a/fonts/ja-naga10/Makefile
+++ b/fonts/ja-naga10/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2013/06/09 13:00:47 obache Exp $
+# $NetBSD: Makefile,v 1.13 2014/06/01 16:35:34 wiz Exp $
DISTNAME= knj10-1.1
PKGNAME= ja-naga10-1.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= fonts x11 japanese
MASTER_SITES= http://hp.vector.co.jp/authors/VA013391/fonts/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -15,10 +15,10 @@ COMMENT= 10x10 dots X11 bitmap font for JIS X 0208
USE_X11BASE= YES
USE_TOOLS+= bdftopcf gzip patch
DOCDIR= ${PREFIX}/share/doc
-FONTDIR= ${PREFIX}/lib/X11/fonts/local
+FONTDIR= ${PREFIX}/share/fonts/X11/local
FONTS_DIRS.x11= ${FONTDIR}
-INSTALLATION_DIRS= lib/X11/fonts/local share/doc
+INSTALLATION_DIRS= share/fonts/X11/local share/doc
post-extract:
cd ${WRKDIR}; \
diff --git a/fonts/ja-naga10/PLIST b/fonts/ja-naga10/PLIST
index 248690048e9..5a9dca35457 100644
--- a/fonts/ja-naga10/PLIST
+++ b/fonts/ja-naga10/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2005/12/29 18:17:21 jlam Exp $
-lib/X11/fonts/local/5x10B.pcf.gz
-lib/X11/fonts/local/5x10a.pcf.gz
-lib/X11/fonts/local/5x10rk.pcf.gz
-lib/X11/fonts/local/6x12B.pcf.gz
-lib/X11/fonts/local/6x12a.pcf.gz
-lib/X11/fonts/local/6x12rk.pcf.gz
-lib/X11/fonts/local/knj10.pcf.gz
-lib/X11/fonts/local/knj10B.pcf.gz
-lib/X11/fonts/local/maru10.pcf.gz
-lib/X11/fonts/local/min10.pcf.gz
+@comment $NetBSD: PLIST,v 1.3 2014/06/01 16:35:34 wiz Exp $
+share/fonts/X11/local/5x10B.pcf.gz
+share/fonts/X11/local/5x10a.pcf.gz
+share/fonts/X11/local/5x10rk.pcf.gz
+share/fonts/X11/local/6x12B.pcf.gz
+share/fonts/X11/local/6x12a.pcf.gz
+share/fonts/X11/local/6x12rk.pcf.gz
+share/fonts/X11/local/knj10.pcf.gz
+share/fonts/X11/local/knj10B.pcf.gz
+share/fonts/X11/local/maru10.pcf.gz
+share/fonts/X11/local/min10.pcf.gz
share/doc/README.6x12
share/doc/README.naga10
diff --git a/fonts/ja-sazanami-ttf/Makefile b/fonts/ja-sazanami-ttf/Makefile
index 4b8dcb7996a..0926141f79c 100644
--- a/fonts/ja-sazanami-ttf/Makefile
+++ b/fonts/ja-sazanami-ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2012/10/03 18:28:25 asau Exp $
+# $NetBSD: Makefile,v 1.8 2014/06/01 16:35:34 wiz Exp $
DISTNAME= sazanami-${SAZANAMI_VERS}
PKGNAME= ja-sazanami-ttf-${SAZANAMI_VERS}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= fonts japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=efont/10087/}
EXTRACT_SUFX= .tar.bz2
@@ -12,7 +12,7 @@ HOMEPAGE= http://wiki.fdiary.net/font/?sazanami
COMMENT= Truly free Japanese TrueType font
SAZANAMI_VERS= 20040629
-FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
NO_BUILD= YES
NO_CONFIGURE= YES
diff --git a/fonts/ja-sazanami-ttf/PLIST b/fonts/ja-sazanami-ttf/PLIST
index 198773d9f72..701de144b62 100644
--- a/fonts/ja-sazanami-ttf/PLIST
+++ b/fonts/ja-sazanami-ttf/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/03/06 05:16:23 uebayasi Exp $
-lib/X11/fonts/TTF/sazanami-gothic.ttf
-lib/X11/fonts/TTF/sazanami-mincho.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:34 wiz Exp $
+share/fonts/X11/TTF/sazanami-gothic.ttf
+share/fonts/X11/TTF/sazanami-mincho.ttf
diff --git a/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile
index 805bdb40822..47886c3e5c5 100644
--- a/fonts/ja-shinonome/Makefile
+++ b/fonts/ja-shinonome/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2014/05/29 23:36:34 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2014/06/01 16:35:34 wiz Exp $
#
DISTNAME= shinonome-0.9.11-src
PKGNAME= ja-shinonome-0.9.11
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= fonts x11 japanese
MASTER_SITES= http://openlab.ring.gr.jp/efont/dist/shinonome/
EXTRACT_SUFX= .tar.bz2
@@ -16,8 +16,8 @@ LICENSE= public-domain
GNU_CONFIGURE= YES
USE_X11BASE= YES
USE_TOOLS+= gawk gmake mkfontdir perl gzip
-FONTS_DIRS.x11+= ${PREFIX}/lib/X11/fonts/local
-FONTDIR= ${PREFIX}/lib/X11/fonts/local
+FONTS_DIRS.x11+= ${PREFIX}/share/fonts/X11/local
+FONTDIR= ${PREFIX}/share/fonts/X11/local
FOUNDRY= Misc
ALIAS_SHINONOME= ${PREFIX}/share/examples/fonts.alias.shinonome
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --with-foundry=${FOUNDRY:Q}
INSTALL_MAKE_FLAGS+= FONTDIR=${DESTDIR:Q}${FONTDIR:Q}
-INSTALLATION_DIRS= lib/X11/fonts/local share/examples
+INSTALLATION_DIRS= share/fonts/X11/local share/examples
post-install:
${INSTALL_DATA} ${WRKSRC}/fonts.alias ${DESTDIR}${ALIAS_SHINONOME}
diff --git a/fonts/ja-shinonome/PLIST b/fonts/ja-shinonome/PLIST
index 241aef2ba0f..ef59b6828cc 100644
--- a/fonts/ja-shinonome/PLIST
+++ b/fonts/ja-shinonome/PLIST
@@ -1,66 +1,66 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/03/15 20:57:50 kei Exp $
-lib/X11/fonts/local/shnm6x12a.pcf.gz
-lib/X11/fonts/local/shnm6x12ab.pcf.gz
-lib/X11/fonts/local/shnm6x12abi.pcf.gz
-lib/X11/fonts/local/shnm6x12ai.pcf.gz
-lib/X11/fonts/local/shnm6x12r.pcf.gz
-lib/X11/fonts/local/shnm6x12rb.pcf.gz
-lib/X11/fonts/local/shnm6x12rbi.pcf.gz
-lib/X11/fonts/local/shnm6x12ri.pcf.gz
-lib/X11/fonts/local/shnm7x14a.pcf.gz
-lib/X11/fonts/local/shnm7x14ab.pcf.gz
-lib/X11/fonts/local/shnm7x14abi.pcf.gz
-lib/X11/fonts/local/shnm7x14ai.pcf.gz
-lib/X11/fonts/local/shnm7x14r.pcf.gz
-lib/X11/fonts/local/shnm7x14rb.pcf.gz
-lib/X11/fonts/local/shnm7x14rbi.pcf.gz
-lib/X11/fonts/local/shnm7x14ri.pcf.gz
-lib/X11/fonts/local/shnm8x16a.pcf.gz
-lib/X11/fonts/local/shnm8x16ab.pcf.gz
-lib/X11/fonts/local/shnm8x16abi.pcf.gz
-lib/X11/fonts/local/shnm8x16ai.pcf.gz
-lib/X11/fonts/local/shnm8x16r.pcf.gz
-lib/X11/fonts/local/shnm8x16rb.pcf.gz
-lib/X11/fonts/local/shnm8x16rbi.pcf.gz
-lib/X11/fonts/local/shnm8x16ri.pcf.gz
-lib/X11/fonts/local/shnm9x18a.pcf.gz
-lib/X11/fonts/local/shnm9x18ab.pcf.gz
-lib/X11/fonts/local/shnm9x18abi.pcf.gz
-lib/X11/fonts/local/shnm9x18ai.pcf.gz
-lib/X11/fonts/local/shnm9x18r.pcf.gz
-lib/X11/fonts/local/shnm9x18rb.pcf.gz
-lib/X11/fonts/local/shnm9x18rbi.pcf.gz
-lib/X11/fonts/local/shnm9x18ri.pcf.gz
-lib/X11/fonts/local/shnmk12.pcf.gz
-lib/X11/fonts/local/shnmk12b.pcf.gz
-lib/X11/fonts/local/shnmk12bi.pcf.gz
-lib/X11/fonts/local/shnmk12i.pcf.gz
-lib/X11/fonts/local/shnmk12maru.pcf.gz
-lib/X11/fonts/local/shnmk12marub.pcf.gz
-lib/X11/fonts/local/shnmk12marubi.pcf.gz
-lib/X11/fonts/local/shnmk12marui.pcf.gz
-lib/X11/fonts/local/shnmk12min.pcf.gz
-lib/X11/fonts/local/shnmk12minb.pcf.gz
-lib/X11/fonts/local/shnmk12minbi.pcf.gz
-lib/X11/fonts/local/shnmk12mini.pcf.gz
-lib/X11/fonts/local/shnmk12p.pcf.gz
-lib/X11/fonts/local/shnmk12pb.pcf.gz
-lib/X11/fonts/local/shnmk12pbi.pcf.gz
-lib/X11/fonts/local/shnmk12pi.pcf.gz
-lib/X11/fonts/local/shnmk14.pcf.gz
-lib/X11/fonts/local/shnmk14b.pcf.gz
-lib/X11/fonts/local/shnmk14bi.pcf.gz
-lib/X11/fonts/local/shnmk14i.pcf.gz
-lib/X11/fonts/local/shnmk14min.pcf.gz
-lib/X11/fonts/local/shnmk14minb.pcf.gz
-lib/X11/fonts/local/shnmk14minbi.pcf.gz
-lib/X11/fonts/local/shnmk14mini.pcf.gz
-lib/X11/fonts/local/shnmk16.pcf.gz
-lib/X11/fonts/local/shnmk16b.pcf.gz
-lib/X11/fonts/local/shnmk16bi.pcf.gz
-lib/X11/fonts/local/shnmk16i.pcf.gz
-lib/X11/fonts/local/shnmk16min.pcf.gz
-lib/X11/fonts/local/shnmk16minb.pcf.gz
-lib/X11/fonts/local/shnmk16minbi.pcf.gz
-lib/X11/fonts/local/shnmk16mini.pcf.gz
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:35 wiz Exp $
+share/fonts/X11/local/shnm6x12a.pcf.gz
+share/fonts/X11/local/shnm6x12ab.pcf.gz
+share/fonts/X11/local/shnm6x12abi.pcf.gz
+share/fonts/X11/local/shnm6x12ai.pcf.gz
+share/fonts/X11/local/shnm6x12r.pcf.gz
+share/fonts/X11/local/shnm6x12rb.pcf.gz
+share/fonts/X11/local/shnm6x12rbi.pcf.gz
+share/fonts/X11/local/shnm6x12ri.pcf.gz
+share/fonts/X11/local/shnm7x14a.pcf.gz
+share/fonts/X11/local/shnm7x14ab.pcf.gz
+share/fonts/X11/local/shnm7x14abi.pcf.gz
+share/fonts/X11/local/shnm7x14ai.pcf.gz
+share/fonts/X11/local/shnm7x14r.pcf.gz
+share/fonts/X11/local/shnm7x14rb.pcf.gz
+share/fonts/X11/local/shnm7x14rbi.pcf.gz
+share/fonts/X11/local/shnm7x14ri.pcf.gz
+share/fonts/X11/local/shnm8x16a.pcf.gz
+share/fonts/X11/local/shnm8x16ab.pcf.gz
+share/fonts/X11/local/shnm8x16abi.pcf.gz
+share/fonts/X11/local/shnm8x16ai.pcf.gz
+share/fonts/X11/local/shnm8x16r.pcf.gz
+share/fonts/X11/local/shnm8x16rb.pcf.gz
+share/fonts/X11/local/shnm8x16rbi.pcf.gz
+share/fonts/X11/local/shnm8x16ri.pcf.gz
+share/fonts/X11/local/shnm9x18a.pcf.gz
+share/fonts/X11/local/shnm9x18ab.pcf.gz
+share/fonts/X11/local/shnm9x18abi.pcf.gz
+share/fonts/X11/local/shnm9x18ai.pcf.gz
+share/fonts/X11/local/shnm9x18r.pcf.gz
+share/fonts/X11/local/shnm9x18rb.pcf.gz
+share/fonts/X11/local/shnm9x18rbi.pcf.gz
+share/fonts/X11/local/shnm9x18ri.pcf.gz
+share/fonts/X11/local/shnmk12.pcf.gz
+share/fonts/X11/local/shnmk12b.pcf.gz
+share/fonts/X11/local/shnmk12bi.pcf.gz
+share/fonts/X11/local/shnmk12i.pcf.gz
+share/fonts/X11/local/shnmk12maru.pcf.gz
+share/fonts/X11/local/shnmk12marub.pcf.gz
+share/fonts/X11/local/shnmk12marubi.pcf.gz
+share/fonts/X11/local/shnmk12marui.pcf.gz
+share/fonts/X11/local/shnmk12min.pcf.gz
+share/fonts/X11/local/shnmk12minb.pcf.gz
+share/fonts/X11/local/shnmk12minbi.pcf.gz
+share/fonts/X11/local/shnmk12mini.pcf.gz
+share/fonts/X11/local/shnmk12p.pcf.gz
+share/fonts/X11/local/shnmk12pb.pcf.gz
+share/fonts/X11/local/shnmk12pbi.pcf.gz
+share/fonts/X11/local/shnmk12pi.pcf.gz
+share/fonts/X11/local/shnmk14.pcf.gz
+share/fonts/X11/local/shnmk14b.pcf.gz
+share/fonts/X11/local/shnmk14bi.pcf.gz
+share/fonts/X11/local/shnmk14i.pcf.gz
+share/fonts/X11/local/shnmk14min.pcf.gz
+share/fonts/X11/local/shnmk14minb.pcf.gz
+share/fonts/X11/local/shnmk14minbi.pcf.gz
+share/fonts/X11/local/shnmk14mini.pcf.gz
+share/fonts/X11/local/shnmk16.pcf.gz
+share/fonts/X11/local/shnmk16b.pcf.gz
+share/fonts/X11/local/shnmk16bi.pcf.gz
+share/fonts/X11/local/shnmk16i.pcf.gz
+share/fonts/X11/local/shnmk16min.pcf.gz
+share/fonts/X11/local/shnmk16minb.pcf.gz
+share/fonts/X11/local/shnmk16minbi.pcf.gz
+share/fonts/X11/local/shnmk16mini.pcf.gz
share/examples/fonts.alias.shinonome
diff --git a/fonts/jisx0212fonts/Makefile b/fonts/jisx0212fonts/Makefile
index 1ef567501db..a2bcbef0acb 100644
--- a/fonts/jisx0212fonts/Makefile
+++ b/fonts/jisx0212fonts/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2013/06/05 13:47:51 obache Exp $
+# $NetBSD: Makefile,v 1.21 2014/06/01 16:35:35 wiz Exp $
DISTNAME= jisx0212fonts-0.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= fonts x11 japanese
MASTER_SITES= ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/ \
http://www.freebsd.org/~itojun/distfiles/
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}
EXTRACT_ONLY= ${DISTFILES}
FONTS= ${DISTFILES:C/\.bdf.*$//}
-FONTDIR= ${PREFIX}/lib/X11/fonts/local
+FONTDIR= ${PREFIX}/share/fonts/X11/local
FONTS_DIRS.x11= ${FONTDIR}
USE_TOOLS+= gzip gunzip bdftopcf
diff --git a/fonts/jisx0212fonts/PLIST b/fonts/jisx0212fonts/PLIST
index fa91b24d741..f779390198e 100644
--- a/fonts/jisx0212fonts/PLIST
+++ b/fonts/jisx0212fonts/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2004/02/26 08:15:27 uebayasi Exp $
-lib/X11/fonts/local/jisksp14.pcf.gz
-lib/X11/fonts/local/jisksp16-1990.pcf.gz
-lib/X11/fonts/local/jisksp40.pcf.gz
-lib/X11/fonts/local/min-1-24.pcf.gz
+@comment $NetBSD: PLIST,v 1.3 2014/06/01 16:35:35 wiz Exp $
+share/fonts/X11/local/jisksp14.pcf.gz
+share/fonts/X11/local/jisksp16-1990.pcf.gz
+share/fonts/X11/local/jisksp40.pcf.gz
+share/fonts/X11/local/min-1-24.pcf.gz
diff --git a/fonts/jisx0212fonts/distinfo b/fonts/jisx0212fonts/distinfo
index 3624514deb0..afb410b6d6d 100644
--- a/fonts/jisx0212fonts/distinfo
+++ b/fonts/jisx0212fonts/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 19:18:28 agc Exp $
+$NetBSD: distinfo,v 1.5 2014/06/01 16:35:35 wiz Exp $
SHA1 (jisksp14.bdf.gz) = 8286f53311a81345bd16dd29b8f860d66bd048c6
RMD160 (jisksp14.bdf.gz) = 46d3f9d433dd20cbf429e94ddbf6fd22e51017dd
@@ -12,5 +12,5 @@ Size (min-1-24.bdf.gz) = 336272 bytes
SHA1 (jisksp40.bdf.Z) = 0ed56bc280a41da088fc9d5df00a7b989d0e8932
RMD160 (jisksp40.bdf.Z) = 14afd07443e906663ae3f039d30db490f6f5ce32
Size (jisksp40.bdf.Z) = 893895 bytes
-SHA1 (patch-aa) = 366d448cbf803d406945f2a4b9002a68bf346e52
+SHA1 (patch-aa) = 1a0e0bcb2aeeb667326bc1e4e2e8d0bb9f673369
SHA1 (patch-ab) = e89c21ee2df5eb4312679cb58a7fdb9b243bf04b
diff --git a/fonts/jisx0212fonts/patches/patch-aa b/fonts/jisx0212fonts/patches/patch-aa
index 382da056008..9c8fe93da5a 100644
--- a/fonts/jisx0212fonts/patches/patch-aa
+++ b/fonts/jisx0212fonts/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/04/09 15:19:31 itojun Exp $
+$NetBSD: patch-aa,v 1.2 2014/06/01 16:35:35 wiz Exp $
--- Makefile.orig Thu Nov 12 11:49:58 1998
+++ Makefile Thu Nov 12 16:11:26 1998
@@ -0,0 +1,25 @@
@@ -8,7 +8,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/04/09 15:19:31 itojun Exp $
+BDF= ${TMP:C/.Z$//}
+PCF= ${BDF:C/.bdf$/.pcf/}
+
-+DIR= ${PREFIX}/lib/X11/fonts/local
++DIR= ${PREFIX}/share/fonts/X11/local
+
+all: ${PCF}
+
diff --git a/fonts/jisx0213fonts/Makefile b/fonts/jisx0213fonts/Makefile
index e192528196b..9d520efbc9e 100644
--- a/fonts/jisx0213fonts/Makefile
+++ b/fonts/jisx0213fonts/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2013/07/27 11:58:08 tsutsui Exp $
+# $NetBSD: Makefile,v 1.19 2014/06/01 16:35:35 wiz Exp $
#
DISTNAME= jisx0213fonts-0.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= fonts x11 japanese
MASTER_SITES= ftp://ftp.m17n.org/pub/character/fonts/imamura/jisx0213/
DISTFILES= ${FONTS:C/$/.bdf.gz/}
@@ -15,7 +15,7 @@ USE_X11BASE= yes
USE_TOOLS+= gzip bdftopcf
FONTS= K14-1 K14-2 jiskan16-2000-1 jiskan16-2000-2
-FONTDIR= ${PREFIX}/lib/X11/fonts/local
+FONTDIR= ${PREFIX}/share/fonts/X11/local
FONTS_DIRS.x11= ${FONTDIR}
WRKSRC= ${WRKDIR}
diff --git a/fonts/jisx0213fonts/PLIST b/fonts/jisx0213fonts/PLIST
index 44195ed51b8..1d87a5e9341 100644
--- a/fonts/jisx0213fonts/PLIST
+++ b/fonts/jisx0213fonts/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/26 08:37:24 uebayasi Exp $
-lib/X11/fonts/local/K14-1.pcf.gz
-lib/X11/fonts/local/K14-2.pcf.gz
-lib/X11/fonts/local/jiskan16-2000-1.pcf.gz
-lib/X11/fonts/local/jiskan16-2000-2.pcf.gz
+@comment $NetBSD: PLIST,v 1.5 2014/06/01 16:35:35 wiz Exp $
+share/fonts/X11/local/K14-1.pcf.gz
+share/fonts/X11/local/K14-2.pcf.gz
+share/fonts/X11/local/jiskan16-2000-1.pcf.gz
+share/fonts/X11/local/jiskan16-2000-2.pcf.gz
diff --git a/fonts/jmk-fonts/MESSAGE b/fonts/jmk-fonts/MESSAGE
index 5588a5c2bdf..f1943daffb1 100644
--- a/fonts/jmk-fonts/MESSAGE
+++ b/fonts/jmk-fonts/MESSAGE
@@ -1,15 +1,15 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:29:56 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2014/06/01 16:35:35 wiz Exp $
To use the fonts you have just installed, add
the line:
- FontPath ${PREFIX}/lib/X11/fonts/jmk
+ FontPath ${PREFIX}/share/fonts/X11/jmk
to your X window configuration file, or run the
following command:
- xset +fp ${PREFIX}/lib/X11/fonts/jmk
+ xset +fp ${PREFIX}/share/fonts/X11/jmk
xset fp rehash
===========================================================================
diff --git a/fonts/jmk-fonts/Makefile b/fonts/jmk-fonts/Makefile
index e4281ae4832..4db9ba3e6c7 100644
--- a/fonts/jmk-fonts/Makefile
+++ b/fonts/jmk-fonts/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 18:28:25 asau Exp $
+# $NetBSD: Makefile,v 1.17 2014/06/01 16:35:35 wiz Exp $
#
DISTNAME= jmk-x11-fonts-3.0
PKGNAME= jmk-fonts-3.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= fonts x11
MASTER_SITES= ${MASTER_SITE_SUNSITE:=X11/fonts/}
@@ -12,15 +12,15 @@ HOMEPAGE= http://www.jmknoble.net/fonts/
COMMENT= Jim Knoble's font collection for X11
USE_IMAKE= yes
-MAKE_FLAGS+= INSTALL_DIR=${PREFIX}/lib/X11/fonts/jmk
+MAKE_FLAGS+= INSTALL_DIR=${PREFIX}/share/fonts/X11/jmk
USE_TOOLS+= bdftopcf gzip
USE_X11BASE= yes
-FONTS_DIRS.x11+= ${PREFIX}/lib/X11/fonts/jmk
-REQD_DIRS+= ${PREFIX}/lib/X11/fonts/jmk
+FONTS_DIRS.x11+= ${PREFIX}/share/fonts/X11/jmk
+REQD_DIRS+= ${PREFIX}/share/fonts/X11/jmk
post-install:
- ${RM} ${DESTDIR}${PREFIX}/lib/X11/fonts/jmk/fonts.scale
+ ${RM} ${DESTDIR}${PREFIX}/share/fonts/X11/jmk/fonts.scale
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/jmk-fonts/PLIST b/fonts/jmk-fonts/PLIST
index e3ab4bdf9f0..a1daf96615b 100644
--- a/fonts/jmk-fonts/PLIST
+++ b/fonts/jmk-fonts/PLIST
@@ -1,110 +1,110 @@
-@comment $NetBSD: PLIST,v 1.4 2006/09/22 21:53:57 joerg Exp $
-lib/X11/fonts/jmk/fonts.alias
-lib/X11/fonts/jmk/modd-iso8859-1-06x11-bold.pcf.gz
-lib/X11/fonts/jmk/modd-iso8859-1-06x11.pcf.gz
-lib/X11/fonts/jmk/modd-iso8859-1-06x13-bold.pcf.gz
-lib/X11/fonts/jmk/modd-iso8859-1-06x13.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-1-05x10.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-1-05x11-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-1-05x11.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-1-06x11-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-1-06x11.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-1-06x13-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-1-06x13.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-1-08x15-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-1-08x15.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-1-10x20-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-1-10x20.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-1-12x24-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-1-12x24.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-15-05x10.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-15-05x11-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-15-05x11.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-15-06x11-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-15-06x11.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-15-06x13-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-15-06x13.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-15-08x15-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-15-08x15.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-15-10x20-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-15-10x20.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-15-12x24-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-15-12x24.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-2-05x10.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-2-05x11-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-2-05x11.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-2-06x11-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-2-06x11.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-2-06x13-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-2-06x13.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-2-08x15-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-2-08x15.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-2-10x20-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-2-10x20.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-2-12x24-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-2-12x24.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-9-05x10.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-9-05x11-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-9-05x11.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-9-06x11-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-9-06x11.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-9-06x13-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-9-06x13.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-9-08x15-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-9-08x15.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-9-10x20-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-9-10x20.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-9-12x24-bold.pcf.gz
-lib/X11/fonts/jmk/neep-alt-iso8859-9-12x24.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-1-05x10.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-1-05x11-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-1-05x11.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-1-06x11-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-1-06x11.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-1-06x13-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-1-06x13.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-1-08x15-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-1-08x15.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-1-10x20-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-1-10x20.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-1-12x24-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-1-12x24.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-15-05x10.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-15-05x11-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-15-05x11.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-15-06x11-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-15-06x11.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-15-06x13-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-15-06x13.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-15-08x15-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-15-08x15.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-15-10x20-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-15-10x20.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-15-12x24-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-15-12x24.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-2-05x10.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-2-05x11-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-2-05x11.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-2-06x11-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-2-06x11.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-2-06x13-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-2-06x13.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-2-08x15-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-2-08x15.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-2-10x20-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-2-10x20.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-2-12x24-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-2-12x24.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-9-05x10.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-9-05x11-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-9-05x11.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-9-06x11-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-9-06x11.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-9-06x13-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-9-06x13.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-9-08x15-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-9-08x15.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-9-10x20-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-9-10x20.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-9-12x24-bold.pcf.gz
-lib/X11/fonts/jmk/neep-iso8859-9-12x24.pcf.gz
+@comment $NetBSD: PLIST,v 1.5 2014/06/01 16:35:35 wiz Exp $
+share/fonts/X11/jmk/fonts.alias
+share/fonts/X11/jmk/modd-iso8859-1-06x11-bold.pcf.gz
+share/fonts/X11/jmk/modd-iso8859-1-06x11.pcf.gz
+share/fonts/X11/jmk/modd-iso8859-1-06x13-bold.pcf.gz
+share/fonts/X11/jmk/modd-iso8859-1-06x13.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-1-05x10.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-1-05x11-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-1-05x11.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-1-06x11-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-1-06x11.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-1-06x13-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-1-06x13.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-1-08x15-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-1-08x15.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-1-10x20-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-1-10x20.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-1-12x24-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-1-12x24.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-15-05x10.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-15-05x11-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-15-05x11.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-15-06x11-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-15-06x11.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-15-06x13-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-15-06x13.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-15-08x15-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-15-08x15.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-15-10x20-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-15-10x20.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-15-12x24-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-15-12x24.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-2-05x10.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-2-05x11-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-2-05x11.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-2-06x11-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-2-06x11.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-2-06x13-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-2-06x13.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-2-08x15-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-2-08x15.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-2-10x20-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-2-10x20.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-2-12x24-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-2-12x24.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-9-05x10.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-9-05x11-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-9-05x11.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-9-06x11-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-9-06x11.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-9-06x13-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-9-06x13.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-9-08x15-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-9-08x15.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-9-10x20-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-9-10x20.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-9-12x24-bold.pcf.gz
+share/fonts/X11/jmk/neep-alt-iso8859-9-12x24.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-1-05x10.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-1-05x11-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-1-05x11.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-1-06x11-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-1-06x11.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-1-06x13-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-1-06x13.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-1-08x15-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-1-08x15.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-1-10x20-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-1-10x20.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-1-12x24-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-1-12x24.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-15-05x10.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-15-05x11-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-15-05x11.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-15-06x11-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-15-06x11.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-15-06x13-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-15-06x13.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-15-08x15-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-15-08x15.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-15-10x20-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-15-10x20.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-15-12x24-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-15-12x24.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-2-05x10.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-2-05x11-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-2-05x11.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-2-06x11-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-2-06x11.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-2-06x13-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-2-06x13.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-2-08x15-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-2-08x15.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-2-10x20-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-2-10x20.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-2-12x24-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-2-12x24.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-9-05x10.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-9-05x11-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-9-05x11.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-9-06x11-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-9-06x11.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-9-06x13-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-9-06x13.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-9-08x15-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-9-08x15.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-9-10x20-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-9-10x20.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-9-12x24-bold.pcf.gz
+share/fonts/X11/jmk/neep-iso8859-9-12x24.pcf.gz
diff --git a/fonts/jsMath-fonts/Makefile b/fonts/jsMath-fonts/Makefile
index cd8f232b970..88d15b860d3 100644
--- a/fonts/jsMath-fonts/Makefile
+++ b/fonts/jsMath-fonts/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2013/03/11 18:48:02 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/01 16:35:35 wiz Exp $
#
PKGNAME= jsMath-fonts-20090709
DISTNAME= TeX-fonts-linux
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://www.math.union.edu/~dpvc/jsMath/download/
EXTRACT_SUFX= .tgz
@@ -16,7 +17,7 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
USE_LANGUAGES= # none
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf+= ${FONTDIR}
INSTALLATION_DIRS+= ${FONTDIR}
diff --git a/fonts/jsMath-fonts/PLIST b/fonts/jsMath-fonts/PLIST
index 94d8f60b0b6..e73248a0691 100644
--- a/fonts/jsMath-fonts/PLIST
+++ b/fonts/jsMath-fonts/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2013/03/11 18:48:02 wiz Exp $
-lib/X11/fonts/TTF/jsMath-cmbx10.ttf
-lib/X11/fonts/TTF/jsMath-cmex10.ttf
-lib/X11/fonts/TTF/jsMath-cmmi10.ttf
-lib/X11/fonts/TTF/jsMath-cmr10.ttf
-lib/X11/fonts/TTF/jsMath-cmsy10.ttf
-lib/X11/fonts/TTF/jsMath-cmti10.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:35 wiz Exp $
+share/fonts/X11/TTF/jsMath-cmbx10.ttf
+share/fonts/X11/TTF/jsMath-cmex10.ttf
+share/fonts/X11/TTF/jsMath-cmmi10.ttf
+share/fonts/X11/TTF/jsMath-cmr10.ttf
+share/fonts/X11/TTF/jsMath-cmsy10.ttf
+share/fonts/X11/TTF/jsMath-cmti10.ttf
diff --git a/fonts/kanjistrokeorders-ttf/Makefile b/fonts/kanjistrokeorders-ttf/Makefile
index 8128a03eaa4..137e21d3066 100644
--- a/fonts/kanjistrokeorders-ttf/Makefile
+++ b/fonts/kanjistrokeorders-ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2014/01/27 18:41:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:35 wiz Exp $
DISTNAME= KanjiStrokeOrders_v${KSOVER}
PKGNAME= ${DISTNAME:tl:S/_v/-ttf-/}
+PKGREVISION= 1
CATEGORIES= fonts japanese
MASTER_SITES= https://sites.google.com/site/nihilistorguk/
EXTRACT_SUFX= .zip
@@ -19,10 +20,10 @@ KSOVER= 3.000
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
-INSTALLATION_DIRS= lib/X11/fonts/TTF \
+INSTALLATION_DIRS= share/fonts/X11/TTF \
${DOCSDIR}
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
INSTALL_FONTS= KanjiStrokeOrders_v${KSOVER}.ttf
diff --git a/fonts/kanjistrokeorders-ttf/PLIST b/fonts/kanjistrokeorders-ttf/PLIST
index 2302c681005..582d2f8100e 100644
--- a/fonts/kanjistrokeorders-ttf/PLIST
+++ b/fonts/kanjistrokeorders-ttf/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/03/15 19:36:36 ryoon Exp $
-lib/X11/fonts/TTF/KanjiStrokeOrders_v${PKGVERSION}.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:35 wiz Exp $
+share/fonts/X11/TTF/KanjiStrokeOrders_v${PKGVERSION}.ttf
share/doc/kanjistrokeorders-ttf/KSO_Excel_Sample.pdf
share/doc/kanjistrokeorders-ttf/KSO_PPT_Sample.pdf
share/doc/kanjistrokeorders-ttf/copyright.txt
diff --git a/fonts/kcfonts/Makefile b/fonts/kcfonts/Makefile
index 82bd2721e7b..2fb21d87b6d 100644
--- a/fonts/kcfonts/Makefile
+++ b/fonts/kcfonts/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2012/10/03 18:28:25 asau Exp $
+# $NetBSD: Makefile,v 1.14 2014/06/01 16:35:35 wiz Exp $
DISTNAME= kcfonts-1.05
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_GENTOO:=distfiles/}
@@ -10,8 +10,8 @@ COMMENT= Kuo Chauo Chinese Fonts collection
WRKSRC= ${WRKDIR}
USE_X11BASE= yes
-FONTS_DIRS.x11= ${PREFIX}/lib/X11/fonts/local
-REQD_DIRS+= ${PREFIX}/lib/X11/fonts/local
+FONTS_DIRS.x11= ${PREFIX}/share/fonts/X11/local
+REQD_DIRS+= ${PREFIX}/share/fonts/X11/local
USE_TOOLS+= gzip ucs2any
diff --git a/fonts/kcfonts/PLIST b/fonts/kcfonts/PLIST
index 55c594d3b36..910df95c052 100644
--- a/fonts/kcfonts/PLIST
+++ b/fonts/kcfonts/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2006/09/22 21:53:57 joerg Exp $
-lib/X11/fonts/local/fonts.alias
-lib/X11/fonts/local/kc8x15.pcf.gz
-lib/X11/fonts/local/kc12x24.pcf.gz
-lib/X11/fonts/local/kc15f.pcf.gz
-lib/X11/fonts/local/kc24f.pcf.gz
+@comment $NetBSD: PLIST,v 1.5 2014/06/01 16:35:35 wiz Exp $
+share/fonts/X11/local/fonts.alias
+share/fonts/X11/local/kc8x15.pcf.gz
+share/fonts/X11/local/kc12x24.pcf.gz
+share/fonts/X11/local/kc15f.pcf.gz
+share/fonts/X11/local/kc24f.pcf.gz
diff --git a/fonts/kcfonts/distinfo b/fonts/kcfonts/distinfo
index c34186cc43b..a78a60b6edf 100644
--- a/fonts/kcfonts/distinfo
+++ b/fonts/kcfonts/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2010/10/02 07:10:01 obache Exp $
+$NetBSD: distinfo,v 1.6 2014/06/01 16:35:35 wiz Exp $
SHA1 (kcfonts-1.05.tar.gz) = b05d2aae45a7624cc9484e1bac0c0670200a0784
RMD160 (kcfonts-1.05.tar.gz) = 81beed36904d4a4a012da99d000ec6ddae6e3d37
Size (kcfonts-1.05.tar.gz) = 903701 bytes
-SHA1 (patch-aa) = c4a306abbbe86d09c48aa28742dc38758b5e6fb2
+SHA1 (patch-aa) = 8f8e2db0123cd61ed395f231856b465dffcdab70
SHA1 (patch-ab) = 8e395c8f5a6c157db54a9b805fede7136250b11c
SHA1 (patch-ad) = 366ba0c305433845417fc5699eb188230f235d34
SHA1 (patch-ae) = 03d0a5c4b541177df800bcea2f80858cadefd98a
diff --git a/fonts/kcfonts/patches/patch-aa b/fonts/kcfonts/patches/patch-aa
index 474774d5baa..a8f045e9ce9 100644
--- a/fonts/kcfonts/patches/patch-aa
+++ b/fonts/kcfonts/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2010/10/02 07:10:01 obache Exp $
+$NetBSD: patch-aa,v 1.4 2014/06/01 16:35:35 wiz Exp $
--- Makefile.orig 1995-12-16 20:00:46.000000000 +0000
+++ Makefile
@@ -15,8 +15,8 @@ $NetBSD: patch-aa,v 1.3 2010/10/02 07:10:01 obache Exp $
-CFONTDIR=/usr/X11R6/lib/X11/fonts/chinese
-EFONTDIR=/usr/X11R6/lib/X11/fonts/misc
-+CFONTDIR=${PREFIX}/lib/X11/fonts/local
-+EFONTDIR=${PREFIX}/lib/X11/fonts/local
++CFONTDIR=${PREFIX}/share/fonts/X11/local
++EFONTDIR=${PREFIX}/share/fonts/X11/local
FONTS =kc24f.pcf.gz kc15f.pcf.gz kc8x15.pcf.gz kc12x24.pcf.gz
PROGS =kc24f kc15f kc8x15 kc12x24 kca2et
OBJS =tran.o kc24f.o kc15f.o kc8x15.o kc12x24.o kca2et.o
diff --git a/fonts/kiloji-ttf/Makefile b/fonts/kiloji-ttf/Makefile
index 934d1c2efa2..288976754b3 100644
--- a/fonts/kiloji-ttf/Makefile
+++ b/fonts/kiloji-ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 18:28:26 asau Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:35 wiz Exp $
DISTNAME= # empty
PKGNAME= kiloji-ttf-2.1.0
+PKGREVISION= 1
CATEGORIES= fonts japanese
MASTER_SITES= http://www.ez0.net/wp-content/uploads/distribution/font/kiloji/
EXTRACT_SUFX= .zip
@@ -20,7 +21,7 @@ NO_CONFIGURE= yes
NO_BUILD= yes
DIST_SUBDIR= kiloji-ttf
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
diff --git a/fonts/kiloji-ttf/PLIST b/fonts/kiloji-ttf/PLIST
index 59f38a0ed7a..7b6d8303180 100644
--- a/fonts/kiloji-ttf/PLIST
+++ b/fonts/kiloji-ttf/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/05/04 05:41:33 ryoon Exp $
-lib/X11/fonts/TTF/kiloji.ttf
-lib/X11/fonts/TTF/kiloji_b.ttf
-lib/X11/fonts/TTF/kiloji_d.ttf
-lib/X11/fonts/TTF/kiloji_p.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:35 wiz Exp $
+share/fonts/X11/TTF/kiloji.ttf
+share/fonts/X11/TTF/kiloji_b.ttf
+share/fonts/X11/TTF/kiloji_d.ttf
+share/fonts/X11/TTF/kiloji_p.ttf
share/doc/${PKGBASE}/Collecting.txt
share/doc/${PKGBASE}/License.txt
diff --git a/fonts/ko-baekmuk/Makefile b/fonts/ko-baekmuk/Makefile
index ddd4ce6b7ac..8b1db49c713 100644
--- a/fonts/ko-baekmuk/Makefile
+++ b/fonts/ko-baekmuk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2012/10/03 18:28:26 asau Exp $
+# $NetBSD: Makefile,v 1.22 2014/06/01 16:35:35 wiz Exp $
#
DISTNAME= baekmuk-2.1
PKGNAME= ko-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= fonts x11 korean
MASTER_SITES+= ftp://ftp.mizi.com/pub/baekmuk/
@@ -26,7 +27,7 @@ BAEKMUK_BDF= batang10.bdf batang10b.bdf batang12.bdf batang12b.bdf \
gulim20b.bdf gulim24.bdf gulim24b.bdf hline10.bdf hline12.bdf \
hline14.bdf hline16.bdf hline18.bdf hline20.bdf hline24.bdf
-FONTDIR= ${PREFIX}/lib/X11/fonts/local
+FONTDIR= ${PREFIX}/share/fonts/X11/local
FONTS_DIRS.x11+= ${FONTDIR}
REQD_DIRS+= ${FONTDIR}
diff --git a/fonts/ko-baekmuk/PLIST b/fonts/ko-baekmuk/PLIST
index 4d3b6108f69..80eac7d194c 100644
--- a/fonts/ko-baekmuk/PLIST
+++ b/fonts/ko-baekmuk/PLIST
@@ -1,43 +1,43 @@
-@comment $NetBSD: PLIST,v 1.7 2007/04/12 22:10:14 wiz Exp $
-lib/X11/fonts/local/batang10.pcf.gz
-lib/X11/fonts/local/batang10b.pcf.gz
-lib/X11/fonts/local/batang12.pcf.gz
-lib/X11/fonts/local/batang12b.pcf.gz
-lib/X11/fonts/local/batang14.pcf.gz
-lib/X11/fonts/local/batang14b.pcf.gz
-lib/X11/fonts/local/batang16.pcf.gz
-lib/X11/fonts/local/batang16b.pcf.gz
-lib/X11/fonts/local/batang18.pcf.gz
-lib/X11/fonts/local/batang18b.pcf.gz
-lib/X11/fonts/local/batang20.pcf.gz
-lib/X11/fonts/local/batang20b.pcf.gz
-lib/X11/fonts/local/batang24.pcf.gz
-lib/X11/fonts/local/batang24b.pcf.gz
-lib/X11/fonts/local/dotum10.pcf.gz
-lib/X11/fonts/local/dotum12.pcf.gz
-lib/X11/fonts/local/dotum14.pcf.gz
-lib/X11/fonts/local/dotum16.pcf.gz
-lib/X11/fonts/local/dotum18.pcf.gz
-lib/X11/fonts/local/dotum20.pcf.gz
-lib/X11/fonts/local/dotum24.pcf.gz
-lib/X11/fonts/local/gulim10.pcf.gz
-lib/X11/fonts/local/gulim10b.pcf.gz
-lib/X11/fonts/local/gulim12.pcf.gz
-lib/X11/fonts/local/gulim12b.pcf.gz
-lib/X11/fonts/local/gulim14.pcf.gz
-lib/X11/fonts/local/gulim14b.pcf.gz
-lib/X11/fonts/local/gulim16.pcf.gz
-lib/X11/fonts/local/gulim16b.pcf.gz
-lib/X11/fonts/local/gulim18.pcf.gz
-lib/X11/fonts/local/gulim18b.pcf.gz
-lib/X11/fonts/local/gulim20.pcf.gz
-lib/X11/fonts/local/gulim20b.pcf.gz
-lib/X11/fonts/local/gulim24.pcf.gz
-lib/X11/fonts/local/gulim24b.pcf.gz
-lib/X11/fonts/local/hline10.pcf.gz
-lib/X11/fonts/local/hline12.pcf.gz
-lib/X11/fonts/local/hline14.pcf.gz
-lib/X11/fonts/local/hline16.pcf.gz
-lib/X11/fonts/local/hline18.pcf.gz
-lib/X11/fonts/local/hline20.pcf.gz
-lib/X11/fonts/local/hline24.pcf.gz
+@comment $NetBSD: PLIST,v 1.8 2014/06/01 16:35:35 wiz Exp $
+share/fonts/X11/local/batang10.pcf.gz
+share/fonts/X11/local/batang10b.pcf.gz
+share/fonts/X11/local/batang12.pcf.gz
+share/fonts/X11/local/batang12b.pcf.gz
+share/fonts/X11/local/batang14.pcf.gz
+share/fonts/X11/local/batang14b.pcf.gz
+share/fonts/X11/local/batang16.pcf.gz
+share/fonts/X11/local/batang16b.pcf.gz
+share/fonts/X11/local/batang18.pcf.gz
+share/fonts/X11/local/batang18b.pcf.gz
+share/fonts/X11/local/batang20.pcf.gz
+share/fonts/X11/local/batang20b.pcf.gz
+share/fonts/X11/local/batang24.pcf.gz
+share/fonts/X11/local/batang24b.pcf.gz
+share/fonts/X11/local/dotum10.pcf.gz
+share/fonts/X11/local/dotum12.pcf.gz
+share/fonts/X11/local/dotum14.pcf.gz
+share/fonts/X11/local/dotum16.pcf.gz
+share/fonts/X11/local/dotum18.pcf.gz
+share/fonts/X11/local/dotum20.pcf.gz
+share/fonts/X11/local/dotum24.pcf.gz
+share/fonts/X11/local/gulim10.pcf.gz
+share/fonts/X11/local/gulim10b.pcf.gz
+share/fonts/X11/local/gulim12.pcf.gz
+share/fonts/X11/local/gulim12b.pcf.gz
+share/fonts/X11/local/gulim14.pcf.gz
+share/fonts/X11/local/gulim14b.pcf.gz
+share/fonts/X11/local/gulim16.pcf.gz
+share/fonts/X11/local/gulim16b.pcf.gz
+share/fonts/X11/local/gulim18.pcf.gz
+share/fonts/X11/local/gulim18b.pcf.gz
+share/fonts/X11/local/gulim20.pcf.gz
+share/fonts/X11/local/gulim20b.pcf.gz
+share/fonts/X11/local/gulim24.pcf.gz
+share/fonts/X11/local/gulim24b.pcf.gz
+share/fonts/X11/local/hline10.pcf.gz
+share/fonts/X11/local/hline12.pcf.gz
+share/fonts/X11/local/hline14.pcf.gz
+share/fonts/X11/local/hline16.pcf.gz
+share/fonts/X11/local/hline18.pcf.gz
+share/fonts/X11/local/hline20.pcf.gz
+share/fonts/X11/local/hline24.pcf.gz
diff --git a/fonts/ko-hanyang/Makefile b/fonts/ko-hanyang/Makefile
index cf0763d2f25..8973612a7c1 100644
--- a/fonts/ko-hanyang/Makefile
+++ b/fonts/ko-hanyang/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2012/10/03 18:28:26 asau Exp $
+# $NetBSD: Makefile,v 1.13 2014/06/01 16:35:35 wiz Exp $
#
DISTNAME= hanyang-font-pcf
PKGNAME= ko-hanyang-20010718
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= fonts x11 korean
MASTER_SITES+= ftp://ftp.kaist.ac.kr/pub/hangul/fonts/ \
ftp://ftp.kreonet.re.kr/pub/hangul/cair-archive/fonts/
@@ -24,7 +24,7 @@ EXTRACT_ONLY+= hanyang-font-pcf.tar.gz
HANYANG_PCF= hgm10.pcf hgm12.pcf hgm14.pcf hgm16.pcf hgm18.pcf hgm20.pcf \
hmm10.pcf hmm12.pcf hmm14.pcf hmm16.pcf hmm18.pcf hmm20.pcf
-FONTDIR= ${PREFIX}/lib/X11/fonts/local
+FONTDIR= ${PREFIX}/share/fonts/X11/local
FONTS_DIRS.x11= ${FONTDIR}
post-extract:
diff --git a/fonts/ko-hanyang/PLIST b/fonts/ko-hanyang/PLIST
index 7bf5e2522dc..1fcb533d256 100644
--- a/fonts/ko-hanyang/PLIST
+++ b/fonts/ko-hanyang/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2005/12/29 18:17:21 jlam Exp $
-lib/X11/fonts/local/hgm10.pcf.gz
-lib/X11/fonts/local/hgm12.pcf.gz
-lib/X11/fonts/local/hgm14.pcf.gz
-lib/X11/fonts/local/hgm16.pcf.gz
-lib/X11/fonts/local/hgm18.pcf.gz
-lib/X11/fonts/local/hgm20.pcf.gz
-lib/X11/fonts/local/hmm10.pcf.gz
-lib/X11/fonts/local/hmm12.pcf.gz
-lib/X11/fonts/local/hmm14.pcf.gz
-lib/X11/fonts/local/hmm16.pcf.gz
-lib/X11/fonts/local/hmm18.pcf.gz
-lib/X11/fonts/local/hmm20.pcf.gz
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:35 wiz Exp $
+share/fonts/X11/local/hgm10.pcf.gz
+share/fonts/X11/local/hgm12.pcf.gz
+share/fonts/X11/local/hgm14.pcf.gz
+share/fonts/X11/local/hgm16.pcf.gz
+share/fonts/X11/local/hgm18.pcf.gz
+share/fonts/X11/local/hgm20.pcf.gz
+share/fonts/X11/local/hmm10.pcf.gz
+share/fonts/X11/local/hmm12.pcf.gz
+share/fonts/X11/local/hmm14.pcf.gz
+share/fonts/X11/local/hmm16.pcf.gz
+share/fonts/X11/local/hmm18.pcf.gz
+share/fonts/X11/local/hmm20.pcf.gz
diff --git a/fonts/ko-kaist/Makefile b/fonts/ko-kaist/Makefile
index 529b721057b..cf8af8d563a 100644
--- a/fonts/ko-kaist/Makefile
+++ b/fonts/ko-kaist/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2012/10/03 18:28:26 asau Exp $
+# $NetBSD: Makefile,v 1.16 2014/06/01 16:35:35 wiz Exp $
#
DISTNAME= ko-kaist-20010718
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= fonts x11 korean
MASTER_SITES+= ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/
DISTFILES= kaist-newmj18.bdf.gz ks_philgi16.bdf.gz \
@@ -19,7 +19,7 @@ EXTRACT_ONLY= # empty
MAKE_ENV+= FONTDIR=${DESTDIR}${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q}
-FONTDIR= ${PREFIX}/lib/X11/fonts/local
+FONTDIR= ${PREFIX}/share/fonts/X11/local
FONTS_DIRS.x11= ${FONTDIR}
INSTALLATION_DIRS= ${FONTDIR}
diff --git a/fonts/ko-kaist/PLIST b/fonts/ko-kaist/PLIST
index f589561a088..70703b2e752 100644
--- a/fonts/ko-kaist/PLIST
+++ b/fonts/ko-kaist/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2005/12/29 18:17:21 jlam Exp $
-lib/X11/fonts/local/kaist-newmj16.pcf.gz
-lib/X11/fonts/local/kaist-newmj18.pcf.gz
-lib/X11/fonts/local/ks_iyagi16.pcf.gz
-lib/X11/fonts/local/ks_philgi16.pcf.gz
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:35 wiz Exp $
+share/fonts/X11/local/kaist-newmj16.pcf.gz
+share/fonts/X11/local/kaist-newmj18.pcf.gz
+share/fonts/X11/local/ks_iyagi16.pcf.gz
+share/fonts/X11/local/ks_philgi16.pcf.gz
diff --git a/fonts/ko-mizi/Makefile b/fonts/ko-mizi/Makefile
index fce8cdc2597..ae04c2820e2 100644
--- a/fonts/ko-mizi/Makefile
+++ b/fonts/ko-mizi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2012/10/03 18:28:26 asau Exp $
+# $NetBSD: Makefile,v 1.16 2014/06/01 16:35:35 wiz Exp $
#
DISTNAME= xfntmizi-1.1-2.noarch
PKGNAME= ko-mizi-20010718
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= fonts x11 korean
MASTER_SITES+= ftp://ftp.mizi.co.kr/pub/hanIM/
EXTRACT_SUFX= .rpm
@@ -24,7 +24,7 @@ MAKE_ENV+= FONTDIR=${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q}
MIZI_PCF= mzgt16e.pcf mzgt16h1.pcf mzmj16h.pcf mzpg16h.pcf mzsm16h.pcf \
mzgt16h.pcf mzmj16e.pcf mzpg16e.pcf mzsm16e.pcf
-FONTDIR= ${PREFIX}/lib/X11/fonts/local
+FONTDIR= ${PREFIX}/share/fonts/X11/local
FONTS_DIRS.x11= ${FONTDIR}
INSTALLATION_DIRS+= ${FONTDIR}
diff --git a/fonts/ko-mizi/PLIST b/fonts/ko-mizi/PLIST
index 9e24035baab..02ae8317ba7 100644
--- a/fonts/ko-mizi/PLIST
+++ b/fonts/ko-mizi/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2005/12/29 18:17:21 jlam Exp $
-lib/X11/fonts/local/mzgt16e.pcf.gz
-lib/X11/fonts/local/mzgt16h.pcf.gz
-lib/X11/fonts/local/mzgt16h1.pcf.gz
-lib/X11/fonts/local/mzmj16e.pcf.gz
-lib/X11/fonts/local/mzmj16h.pcf.gz
-lib/X11/fonts/local/mzpg16e.pcf.gz
-lib/X11/fonts/local/mzpg16h.pcf.gz
-lib/X11/fonts/local/mzsm16e.pcf.gz
-lib/X11/fonts/local/mzsm16h.pcf.gz
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:35 wiz Exp $
+share/fonts/X11/local/mzgt16e.pcf.gz
+share/fonts/X11/local/mzgt16h.pcf.gz
+share/fonts/X11/local/mzgt16h1.pcf.gz
+share/fonts/X11/local/mzmj16e.pcf.gz
+share/fonts/X11/local/mzmj16h.pcf.gz
+share/fonts/X11/local/mzpg16e.pcf.gz
+share/fonts/X11/local/mzpg16h.pcf.gz
+share/fonts/X11/local/mzsm16e.pcf.gz
+share/fonts/X11/local/mzsm16h.pcf.gz
diff --git a/fonts/kochi-ttf/Makefile b/fonts/kochi-ttf/Makefile
index e444bbf515d..ad9e116deab 100644
--- a/fonts/kochi-ttf/Makefile
+++ b/fonts/kochi-ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2012/10/03 18:28:26 asau Exp $
+# $NetBSD: Makefile,v 1.21 2014/06/01 16:35:35 wiz Exp $
DISTNAME= kochi-substitute-${KOCHI_VERSION}
PKGNAME= kochi-ttf-${KOCHI_VERSION}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= fonts japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=efont/5411/}
EXTRACT_SUFX= .tar.bz2
@@ -15,13 +15,13 @@ KOCHI_VERSION= 20030809
NO_BUILD= yes
-FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
do-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/X11/fonts/TTF
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/fonts/X11/TTF
${INSTALL_DATA} ${WRKSRC}/kochi-gothic-subst.ttf \
- ${DESTDIR}${PREFIX}/lib/X11/fonts/TTF/kochi-gothic.ttf
+ ${DESTDIR}${PREFIX}/share/fonts/X11/TTF/kochi-gothic.ttf
${INSTALL_DATA} ${WRKSRC}/kochi-mincho-subst.ttf \
- ${DESTDIR}${PREFIX}/lib/X11/fonts/TTF/kochi-mincho.ttf
+ ${DESTDIR}${PREFIX}/share/fonts/X11/TTF/kochi-mincho.ttf
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/kochi-ttf/PLIST b/fonts/kochi-ttf/PLIST
index b6ae67f795d..eeaceb1eac3 100644
--- a/fonts/kochi-ttf/PLIST
+++ b/fonts/kochi-ttf/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.4 2005/03/07 10:12:29 uebayasi Exp $
-lib/X11/fonts/TTF/kochi-gothic.ttf
-lib/X11/fonts/TTF/kochi-mincho.ttf
+@comment $NetBSD: PLIST,v 1.5 2014/06/01 16:35:35 wiz Exp $
+share/fonts/X11/TTF/kochi-gothic.ttf
+share/fonts/X11/TTF/kochi-mincho.ttf
diff --git a/fonts/konatu-ttf/Makefile b/fonts/konatu-ttf/Makefile
index c5bb81fbf06..574411d3688 100644
--- a/fonts/konatu-ttf/Makefile
+++ b/fonts/konatu-ttf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 18:28:26 asau Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:35 wiz Exp $
#
DISTNAME= Konatu_ver_26
PKGNAME= ${DISTNAME:tl:S/_ver_/-ttf-/}
+PKGREVISION= 1
CATEGORIES= fonts japanese
MASTER_SITES= http://www.masuseki.com/be/konatu/
EXTRACT_SUFX= .zip
@@ -18,10 +19,10 @@ NO_BUILD= YES
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
-INSTALLATION_DIRS= lib/X11/fonts/TTF \
+INSTALLATION_DIRS= share/fonts/X11/TTF \
${DOCSDIR}
INSTALL_FONTS= Konatu.ttf \
diff --git a/fonts/konatu-ttf/PLIST b/fonts/konatu-ttf/PLIST
index e8db6b28eb2..0a4a3250491 100644
--- a/fonts/konatu-ttf/PLIST
+++ b/fonts/konatu-ttf/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/05/08 11:10:14 ryoon Exp $
-lib/X11/fonts/TTF/Konatu.ttf
-lib/X11/fonts/TTF/KonatuTohaba.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:35 wiz Exp $
+share/fonts/X11/TTF/Konatu.ttf
+share/fonts/X11/TTF/KonatuTohaba.ttf
share/doc/${PKGBASE}/README.txt
share/doc/${PKGBASE}/README_Japanese.txt
diff --git a/fonts/koruri-ttf/Makefile b/fonts/koruri-ttf/Makefile
index 2875dd93fc3..ac71bee0359 100644
--- a/fonts/koruri-ttf/Makefile
+++ b/fonts/koruri-ttf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/05/10 15:17:22 nonaka Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:35 wiz Exp $
#
DISTNAME= Koruri-${KORURI_VERSION}
PKGNAME= koruri-ttf-${KORURI_VERSION}
+PKGREVISION= 1
CATEGORIES= fonts japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=koruri/61152/}
EXTRACT_SUFX= .tar.xz
@@ -18,11 +19,11 @@ USE_X11BASE= YES
NO_CONFIGURE= YES
NO_BUILD= YES
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
-INSTALLATION_DIRS= lib/X11/fonts/TTF \
+INSTALLATION_DIRS= share/fonts/X11/TTF \
share/doc/${PKGBASE}
INSTALL_FONTS= Koruri-Bold.ttf \
diff --git a/fonts/koruri-ttf/PLIST b/fonts/koruri-ttf/PLIST
index 26bdf59b412..394823e280c 100644
--- a/fonts/koruri-ttf/PLIST
+++ b/fonts/koruri-ttf/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/06 13:16:18 ryoon Exp $
-lib/X11/fonts/TTF/Koruri-Bold.ttf
-lib/X11/fonts/TTF/Koruri-Extrabold.ttf
-lib/X11/fonts/TTF/Koruri-Light.ttf
-lib/X11/fonts/TTF/Koruri-Regular.ttf
-lib/X11/fonts/TTF/Koruri-Semibold.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:36 wiz Exp $
+share/fonts/X11/TTF/Koruri-Bold.ttf
+share/fonts/X11/TTF/Koruri-Extrabold.ttf
+share/fonts/X11/TTF/Koruri-Light.ttf
+share/fonts/X11/TTF/Koruri-Regular.ttf
+share/fonts/X11/TTF/Koruri-Semibold.ttf
share/doc/${PKGBASE}/LICENSE.txt
share/doc/${PKGBASE}/README.md
diff --git a/fonts/liberation-ttf/Makefile b/fonts/liberation-ttf/Makefile
index 9becd090d6f..a75e8136ae5 100644
--- a/fonts/liberation-ttf/Makefile
+++ b/fonts/liberation-ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2014/01/27 18:41:12 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2014/06/01 16:35:36 wiz Exp $
DISTNAME= liberation-fonts-ttf-2.00.1
PKGNAME= ${DISTNAME:S/-fonts//}
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= https://fedorahosted.org/releases/l/i/liberation-fonts/ \
${MASTER_SITE_LOCAL}
@@ -15,7 +16,7 @@ NO_BUILD= yes
NO_CONFIGURE= yes
DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
INSTALLATION_DIRS= ${DOCDIR} ${FONTDIR}
diff --git a/fonts/liberation-ttf/PLIST b/fonts/liberation-ttf/PLIST
index b4ae850090a..9409e286731 100644
--- a/fonts/liberation-ttf/PLIST
+++ b/fonts/liberation-ttf/PLIST
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST,v 1.4 2012/10/01 11:14:22 ryoon Exp $
-lib/X11/fonts/TTF/LiberationMono-Bold.ttf
-lib/X11/fonts/TTF/LiberationMono-BoldItalic.ttf
-lib/X11/fonts/TTF/LiberationMono-Italic.ttf
-lib/X11/fonts/TTF/LiberationMono-Regular.ttf
-lib/X11/fonts/TTF/LiberationSans-Bold.ttf
-lib/X11/fonts/TTF/LiberationSans-BoldItalic.ttf
-lib/X11/fonts/TTF/LiberationSans-Italic.ttf
-lib/X11/fonts/TTF/LiberationSans-Regular.ttf
-lib/X11/fonts/TTF/LiberationSerif-Bold.ttf
-lib/X11/fonts/TTF/LiberationSerif-BoldItalic.ttf
-lib/X11/fonts/TTF/LiberationSerif-Italic.ttf
-lib/X11/fonts/TTF/LiberationSerif-Regular.ttf
+@comment $NetBSD: PLIST,v 1.5 2014/06/01 16:35:36 wiz Exp $
+share/fonts/X11/TTF/LiberationMono-Bold.ttf
+share/fonts/X11/TTF/LiberationMono-BoldItalic.ttf
+share/fonts/X11/TTF/LiberationMono-Italic.ttf
+share/fonts/X11/TTF/LiberationMono-Regular.ttf
+share/fonts/X11/TTF/LiberationSans-Bold.ttf
+share/fonts/X11/TTF/LiberationSans-BoldItalic.ttf
+share/fonts/X11/TTF/LiberationSans-Italic.ttf
+share/fonts/X11/TTF/LiberationSans-Regular.ttf
+share/fonts/X11/TTF/LiberationSerif-Bold.ttf
+share/fonts/X11/TTF/LiberationSerif-BoldItalic.ttf
+share/fonts/X11/TTF/LiberationSerif-Italic.ttf
+share/fonts/X11/TTF/LiberationSerif-Regular.ttf
share/doc/liberation-ttf/AUTHORS
share/doc/liberation-ttf/ChangeLog
share/doc/liberation-ttf/LICENSE
diff --git a/fonts/linux-libertine-ttf/Makefile b/fonts/linux-libertine-ttf/Makefile
index b551dcc9fef..2e0963f015d 100644
--- a/fonts/linux-libertine-ttf/Makefile
+++ b/fonts/linux-libertine-ttf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2012/10/03 18:28:27 asau Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:36 wiz Exp $
#
DISTNAME= LinLibertineTTF_5.1.3_2011_06_21
PKGNAME= ${DISTNAME:S/LinLibertineTTF_/linux-libertine-ttf-/:C/_[^_].*$//}
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=linuxlibertine/}
EXTRACT_SUFX= .tgz
@@ -16,7 +17,7 @@ WRKSRC= ${WRKDIR}
NO_CONFIGURE= yes
NO_BUILD= yes
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
DOCDIR= ${PREFIX}/share/doc/linux-libertine-ttf
FONTS_DIRS.ttf= ${FONTDIR}
diff --git a/fonts/linux-libertine-ttf/PLIST b/fonts/linux-libertine-ttf/PLIST
index 834b125bc5e..215b53e6d9c 100644
--- a/fonts/linux-libertine-ttf/PLIST
+++ b/fonts/linux-libertine-ttf/PLIST
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST,v 1.3 2011/11/17 18:16:03 ryoon Exp $
-lib/X11/fonts/TTF/LinBiolinum_K.ttf
-lib/X11/fonts/TTF/LinBiolinum_R.ttf
-lib/X11/fonts/TTF/LinBiolinum_RB.ttf
-lib/X11/fonts/TTF/LinBiolinum_RI.ttf
-lib/X11/fonts/TTF/LinBiolinum_aBL.ttf
-lib/X11/fonts/TTF/LinBiolinum_aRL.ttf
-lib/X11/fonts/TTF/LinBiolinum_aS.ttf
-lib/X11/fonts/TTF/LinBiolinum_aSB.ttf
-lib/X11/fonts/TTF/LinBiolinum_aSI.ttf
-lib/X11/fonts/TTF/LinBiolinum_aU.ttf
-lib/X11/fonts/TTF/LinBiolinum_aUB.ttf
-lib/X11/fonts/TTF/LinBiolinum_aUI.ttf
-lib/X11/fonts/TTF/LinBiolinum_aW.ttf
-lib/X11/fonts/TTF/LinBiolinum_aWB.ttf
-lib/X11/fonts/TTF/LinBiolinum_aWI.ttf
-lib/X11/fonts/TTF/LinLibertine_DR.ttf
-lib/X11/fonts/TTF/LinLibertine_I.ttf
-lib/X11/fonts/TTF/LinLibertine_R.ttf
-lib/X11/fonts/TTF/LinLibertine_RB.ttf
-lib/X11/fonts/TTF/LinLibertine_RBI.ttf
-lib/X11/fonts/TTF/LinLibertine_RI.ttf
-lib/X11/fonts/TTF/LinLibertine_RZ.ttf
-lib/X11/fonts/TTF/LinLibertine_RZI.ttf
-lib/X11/fonts/TTF/LinLibertine_aBL.ttf
-lib/X11/fonts/TTF/LinLibertine_aBS.ttf
-lib/X11/fonts/TTF/LinLibertine_aDRS.ttf
-lib/X11/fonts/TTF/LinLibertine_aRL.ttf
-lib/X11/fonts/TTF/LinLibertine_aS.ttf
-lib/X11/fonts/TTF/LinLibertine_aSI.ttf
-lib/X11/fonts/TTF/LinLibertine_aSZI.ttf
-lib/X11/fonts/TTF/LinLibertine_aZL.ttf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:36 wiz Exp $
+share/fonts/X11/TTF/LinBiolinum_K.ttf
+share/fonts/X11/TTF/LinBiolinum_R.ttf
+share/fonts/X11/TTF/LinBiolinum_RB.ttf
+share/fonts/X11/TTF/LinBiolinum_RI.ttf
+share/fonts/X11/TTF/LinBiolinum_aBL.ttf
+share/fonts/X11/TTF/LinBiolinum_aRL.ttf
+share/fonts/X11/TTF/LinBiolinum_aS.ttf
+share/fonts/X11/TTF/LinBiolinum_aSB.ttf
+share/fonts/X11/TTF/LinBiolinum_aSI.ttf
+share/fonts/X11/TTF/LinBiolinum_aU.ttf
+share/fonts/X11/TTF/LinBiolinum_aUB.ttf
+share/fonts/X11/TTF/LinBiolinum_aUI.ttf
+share/fonts/X11/TTF/LinBiolinum_aW.ttf
+share/fonts/X11/TTF/LinBiolinum_aWB.ttf
+share/fonts/X11/TTF/LinBiolinum_aWI.ttf
+share/fonts/X11/TTF/LinLibertine_DR.ttf
+share/fonts/X11/TTF/LinLibertine_I.ttf
+share/fonts/X11/TTF/LinLibertine_R.ttf
+share/fonts/X11/TTF/LinLibertine_RB.ttf
+share/fonts/X11/TTF/LinLibertine_RBI.ttf
+share/fonts/X11/TTF/LinLibertine_RI.ttf
+share/fonts/X11/TTF/LinLibertine_RZ.ttf
+share/fonts/X11/TTF/LinLibertine_RZI.ttf
+share/fonts/X11/TTF/LinLibertine_aBL.ttf
+share/fonts/X11/TTF/LinLibertine_aBS.ttf
+share/fonts/X11/TTF/LinLibertine_aDRS.ttf
+share/fonts/X11/TTF/LinLibertine_aRL.ttf
+share/fonts/X11/TTF/LinLibertine_aS.ttf
+share/fonts/X11/TTF/LinLibertine_aSI.ttf
+share/fonts/X11/TTF/LinLibertine_aSZI.ttf
+share/fonts/X11/TTF/LinLibertine_aZL.ttf
share/doc/linux-libertine-ttf/GPL.txt
share/doc/linux-libertine-ttf/LICENCE.txt
share/doc/linux-libertine-ttf/OFL.txt
diff --git a/fonts/lohit-fonts/Makefile b/fonts/lohit-fonts/Makefile
index 2d19a36e0dd..0c46f234bb3 100644
--- a/fonts/lohit-fonts/Makefile
+++ b/fonts/lohit-fonts/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 18:28:27 asau Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:36 wiz Exp $
DISTNAME= lohit-fonts-2.3.1
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://rbhalera.fedorapeople.org/released/lohit/
MASTER_SITES+= ${MASTER_SITE_GENTOO:=distfiles/}
@@ -13,10 +14,10 @@ USE_X11BASE= yes
NO_CONFIGURE= yes
NO_BUILD= yes
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf+= ${FONTDIR}
-INSTALLATION_DIRS= lib/X11/fonts/TTF
+INSTALLATION_DIRS= share/fonts/X11/TTF
do-install:
${INSTALL_DATA} ${WRKSRC}/bengali/lohit_bn.ttf ${DESTDIR}${FONTDIR}/
diff --git a/fonts/lohit-fonts/PLIST b/fonts/lohit-fonts/PLIST
index 817bdd6aaf9..2714f302e06 100644
--- a/fonts/lohit-fonts/PLIST
+++ b/fonts/lohit-fonts/PLIST
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/10/20 20:32:11 ghen Exp $
-lib/X11/fonts/TTF/lohit_bn.ttf
-lib/X11/fonts/TTF/lohit_gu.ttf
-lib/X11/fonts/TTF/lohit_hi.ttf
-lib/X11/fonts/TTF/lohit_kn.ttf
-lib/X11/fonts/TTF/lohit_kok.ttf
-lib/X11/fonts/TTF/lohit_ks.ttf
-lib/X11/fonts/TTF/lohit_mai.ttf
-lib/X11/fonts/TTF/lohit_ml.ttf
-lib/X11/fonts/TTF/lohit_mr.ttf
-lib/X11/fonts/TTF/lohit_ne.ttf
-lib/X11/fonts/TTF/lohit_or.ttf
-lib/X11/fonts/TTF/lohit_pa.ttf
-lib/X11/fonts/TTF/lohit_sd.ttf
-lib/X11/fonts/TTF/lohit_ta.ttf
-lib/X11/fonts/TTF/lohit_te.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:36 wiz Exp $
+share/fonts/X11/TTF/lohit_bn.ttf
+share/fonts/X11/TTF/lohit_gu.ttf
+share/fonts/X11/TTF/lohit_hi.ttf
+share/fonts/X11/TTF/lohit_kn.ttf
+share/fonts/X11/TTF/lohit_kok.ttf
+share/fonts/X11/TTF/lohit_ks.ttf
+share/fonts/X11/TTF/lohit_mai.ttf
+share/fonts/X11/TTF/lohit_ml.ttf
+share/fonts/X11/TTF/lohit_mr.ttf
+share/fonts/X11/TTF/lohit_ne.ttf
+share/fonts/X11/TTF/lohit_or.ttf
+share/fonts/X11/TTF/lohit_pa.ttf
+share/fonts/X11/TTF/lohit_sd.ttf
+share/fonts/X11/TTF/lohit_ta.ttf
+share/fonts/X11/TTF/lohit_te.ttf
diff --git a/fonts/migu-ttf/Makefile b/fonts/migu-ttf/Makefile
index a3beabd2157..d5b03da6796 100644
--- a/fonts/migu-ttf/Makefile
+++ b/fonts/migu-ttf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2012/11/25 16:48:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:36 wiz Exp $
#
DISTNAME= # empty
PKGNAME= migu-ttf-${VERSION}
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=mix-mplus-ipa/57240/}
DISTFILES= migu-1p-${VERSION}.zip \
@@ -21,7 +22,7 @@ NO_BUILD= yes
VERSION= 20121030
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
INSTALLATION_DIRS= ${FONTDIR} ${DOCDIR}
diff --git a/fonts/migu-ttf/PLIST b/fonts/migu-ttf/PLIST
index 6b9e0c0ca5a..852db1d581c 100644
--- a/fonts/migu-ttf/PLIST
+++ b/fonts/migu-ttf/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2012/11/25 16:48:17 ryoon Exp $
-lib/X11/fonts/TTF/migu-1c-bold.ttf
-lib/X11/fonts/TTF/migu-1c-regular.ttf
-lib/X11/fonts/TTF/migu-1m-bold.ttf
-lib/X11/fonts/TTF/migu-1m-regular.ttf
-lib/X11/fonts/TTF/migu-1p-bold.ttf
-lib/X11/fonts/TTF/migu-1p-regular.ttf
-lib/X11/fonts/TTF/migu-2m-bold.ttf
-lib/X11/fonts/TTF/migu-2m-regular.ttf
+@comment $NetBSD: PLIST,v 1.5 2014/06/01 16:35:36 wiz Exp $
+share/fonts/X11/TTF/migu-1c-bold.ttf
+share/fonts/X11/TTF/migu-1c-regular.ttf
+share/fonts/X11/TTF/migu-1m-bold.ttf
+share/fonts/X11/TTF/migu-1m-regular.ttf
+share/fonts/X11/TTF/migu-1p-bold.ttf
+share/fonts/X11/TTF/migu-1p-regular.ttf
+share/fonts/X11/TTF/migu-2m-bold.ttf
+share/fonts/X11/TTF/migu-2m-regular.ttf
share/doc/migu-ttf/IPA_Font_License_Agreement_v1.0.txt
share/doc/migu-ttf/migu-README.txt
diff --git a/fonts/misaki-fonts/Makefile b/fonts/misaki-fonts/Makefile
index 103aa969281..c35934e0ed1 100644
--- a/fonts/misaki-fonts/Makefile
+++ b/fonts/misaki-fonts/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2013/07/27 11:58:08 tsutsui Exp $
+# $NetBSD: Makefile,v 1.8 2014/06/01 16:35:36 wiz Exp $
DISTNAME= misaki_bdf_2012-06-03
PKGNAME= ${DISTNAME:S/-//g:S/misaki_bdf_/misaki-fonts-1.0./}
+PKGREVISION= 1
CATEGORIES= fonts x11 japanese
MASTER_SITES= http://www.geocities.jp/littlimi/arc/misaki/
@@ -16,10 +17,10 @@ NO_CONFIGURE= YES
USE_TOOLS+= bdftopcf gzip
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
-FONTDIR= ${PREFIX}/lib/X11/fonts/local
+FONTDIR= ${PREFIX}/share/fonts/X11/local
FONTS_DIRS.x11= ${FONTDIR}
-INSTALLATION_DIRS= lib/X11/fonts/local \
+INSTALLATION_DIRS= share/fonts/X11/local \
${DOCSDIR}
INSTALL_FONTS= misaki_gothic.bdf \
diff --git a/fonts/misaki-fonts/PLIST b/fonts/misaki-fonts/PLIST
index 8540c7e466e..4e4a3c742c8 100644
--- a/fonts/misaki-fonts/PLIST
+++ b/fonts/misaki-fonts/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2012/10/01 11:02:05 ryoon Exp $
-lib/X11/fonts/local/misaki_4x8_iso8859.pcf.gz
-lib/X11/fonts/local/misaki_4x8_jisx0201.pcf.gz
-lib/X11/fonts/local/misaki_gothic.pcf.gz
-lib/X11/fonts/local/misaki_mincho.pcf.gz
+@comment $NetBSD: PLIST,v 1.3 2014/06/01 16:35:36 wiz Exp $
+share/fonts/X11/local/misaki_4x8_iso8859.pcf.gz
+share/fonts/X11/local/misaki_4x8_jisx0201.pcf.gz
+share/fonts/X11/local/misaki_gothic.pcf.gz
+share/fonts/X11/local/misaki_mincho.pcf.gz
share/doc/misaki-fonts/misaki.txt
share/doc/misaki-fonts/readme.txt
diff --git a/fonts/monafonts-ttf/Makefile b/fonts/monafonts-ttf/Makefile
index 12bc1262da1..556337292b2 100644
--- a/fonts/monafonts-ttf/Makefile
+++ b/fonts/monafonts-ttf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 18:28:28 asau Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:36 wiz Exp $
# $FreeBSD: ports/japanese/monafonts-ttf/Makefile,v 1.1 2003/10/14 13:35:38 nobutaka Exp $
DISTNAME= monafont-ttf-2.90
PKGNAME= ${DISTNAME:S/font/fonts/}
+PKGREVISION= 1
CATEGORIES= fonts japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=monafont/}
EXTRACT_SUFX= .zip
@@ -15,7 +16,7 @@ USE_X11BASE= YES
NO_BUILD= YES
NO_CONFIGURE= YES
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf+= ${FONTDIR}
do-install:
diff --git a/fonts/monafonts-ttf/PLIST b/fonts/monafonts-ttf/PLIST
index 4012ed7ef0a..0873b5969e4 100644
--- a/fonts/monafonts-ttf/PLIST
+++ b/fonts/monafonts-ttf/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/12/11 13:16:29 obache Exp $
-lib/X11/fonts/TTF/mona.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:36 wiz Exp $
+share/fonts/X11/TTF/mona.ttf
diff --git a/fonts/monafonts/Makefile b/fonts/monafonts/Makefile
index 05bc4cd5333..82f990de5fe 100644
--- a/fonts/monafonts/Makefile
+++ b/fonts/monafonts/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2014/05/29 23:36:34 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2014/06/01 16:35:36 wiz Exp $
DISTNAME= monafont-2.90
PKGNAME= ${DISTNAME:S/font/fonts/}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= fonts japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=monafont/}
EXTRACT_SUFX= .tar.bz2
@@ -19,7 +19,7 @@ MAKE_FLAGS+= SED_CMD=${SED:Q}
MAKE_FLAGS+= PERL_CMD=${PERL5:Q}
MAKE_FLAGS+= GZIP_CMD=${GZIP_CMD:Q}
-FONTS_SUBDIR= lib/X11/fonts/local
+FONTS_SUBDIR= share/fonts/X11/local
FONTS_DIRS.x11= ${FONTS_SUBDIR}
pre-build:
diff --git a/fonts/monafonts/PLIST b/fonts/monafonts/PLIST
index 2efec726b0d..e68cf2d1fb7 100644
--- a/fonts/monafonts/PLIST
+++ b/fonts/monafonts/PLIST
@@ -1,49 +1,49 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/23 12:52:29 toshii Exp $
-lib/X11/fonts/local/mona6x12a.pcf.gz
-lib/X11/fonts/local/mona6x12aB.pcf.gz
-lib/X11/fonts/local/mona6x12aBI.pcf.gz
-lib/X11/fonts/local/mona6x12aI.pcf.gz
-lib/X11/fonts/local/mona6x12r.pcf.gz
-lib/X11/fonts/local/mona6x12rB.pcf.gz
-lib/X11/fonts/local/mona6x12rBI.pcf.gz
-lib/X11/fonts/local/mona6x12rI.pcf.gz
-lib/X11/fonts/local/mona7x14a.pcf.gz
-lib/X11/fonts/local/mona7x14aB.pcf.gz
-lib/X11/fonts/local/mona7x14aBI.pcf.gz
-lib/X11/fonts/local/mona7x14aI.pcf.gz
-lib/X11/fonts/local/mona7x14r.pcf.gz
-lib/X11/fonts/local/mona7x14rB.pcf.gz
-lib/X11/fonts/local/mona7x14rBI.pcf.gz
-lib/X11/fonts/local/mona7x14rI.pcf.gz
-lib/X11/fonts/local/mona8x16a.pcf.gz
-lib/X11/fonts/local/mona8x16aB.pcf.gz
-lib/X11/fonts/local/mona8x16aBI.pcf.gz
-lib/X11/fonts/local/mona8x16aI.pcf.gz
-lib/X11/fonts/local/mona8x16r.pcf.gz
-lib/X11/fonts/local/mona8x16rB.pcf.gz
-lib/X11/fonts/local/mona8x16rBI.pcf.gz
-lib/X11/fonts/local/mona8x16rI.pcf.gz
-lib/X11/fonts/local/monak12.pcf.gz
-lib/X11/fonts/local/monak12B.pcf.gz
-lib/X11/fonts/local/monak12BI.pcf.gz
-lib/X11/fonts/local/monak12I.pcf.gz
-lib/X11/fonts/local/monak14.pcf.gz
-lib/X11/fonts/local/monak14B.pcf.gz
-lib/X11/fonts/local/monak14BI.pcf.gz
-lib/X11/fonts/local/monak14I.pcf.gz
-lib/X11/fonts/local/monak16.pcf.gz
-lib/X11/fonts/local/monak16B.pcf.gz
-lib/X11/fonts/local/monak16BI.pcf.gz
-lib/X11/fonts/local/monak16I.pcf.gz
-lib/X11/fonts/local/monau12.pcf.gz
-lib/X11/fonts/local/monau12B.pcf.gz
-lib/X11/fonts/local/monau12BI.pcf.gz
-lib/X11/fonts/local/monau12I.pcf.gz
-lib/X11/fonts/local/monau14.pcf.gz
-lib/X11/fonts/local/monau14B.pcf.gz
-lib/X11/fonts/local/monau14BI.pcf.gz
-lib/X11/fonts/local/monau14I.pcf.gz
-lib/X11/fonts/local/monau16.pcf.gz
-lib/X11/fonts/local/monau16B.pcf.gz
-lib/X11/fonts/local/monau16BI.pcf.gz
-lib/X11/fonts/local/monau16I.pcf.gz
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:36 wiz Exp $
+share/fonts/X11/local/mona6x12a.pcf.gz
+share/fonts/X11/local/mona6x12aB.pcf.gz
+share/fonts/X11/local/mona6x12aBI.pcf.gz
+share/fonts/X11/local/mona6x12aI.pcf.gz
+share/fonts/X11/local/mona6x12r.pcf.gz
+share/fonts/X11/local/mona6x12rB.pcf.gz
+share/fonts/X11/local/mona6x12rBI.pcf.gz
+share/fonts/X11/local/mona6x12rI.pcf.gz
+share/fonts/X11/local/mona7x14a.pcf.gz
+share/fonts/X11/local/mona7x14aB.pcf.gz
+share/fonts/X11/local/mona7x14aBI.pcf.gz
+share/fonts/X11/local/mona7x14aI.pcf.gz
+share/fonts/X11/local/mona7x14r.pcf.gz
+share/fonts/X11/local/mona7x14rB.pcf.gz
+share/fonts/X11/local/mona7x14rBI.pcf.gz
+share/fonts/X11/local/mona7x14rI.pcf.gz
+share/fonts/X11/local/mona8x16a.pcf.gz
+share/fonts/X11/local/mona8x16aB.pcf.gz
+share/fonts/X11/local/mona8x16aBI.pcf.gz
+share/fonts/X11/local/mona8x16aI.pcf.gz
+share/fonts/X11/local/mona8x16r.pcf.gz
+share/fonts/X11/local/mona8x16rB.pcf.gz
+share/fonts/X11/local/mona8x16rBI.pcf.gz
+share/fonts/X11/local/mona8x16rI.pcf.gz
+share/fonts/X11/local/monak12.pcf.gz
+share/fonts/X11/local/monak12B.pcf.gz
+share/fonts/X11/local/monak12BI.pcf.gz
+share/fonts/X11/local/monak12I.pcf.gz
+share/fonts/X11/local/monak14.pcf.gz
+share/fonts/X11/local/monak14B.pcf.gz
+share/fonts/X11/local/monak14BI.pcf.gz
+share/fonts/X11/local/monak14I.pcf.gz
+share/fonts/X11/local/monak16.pcf.gz
+share/fonts/X11/local/monak16B.pcf.gz
+share/fonts/X11/local/monak16BI.pcf.gz
+share/fonts/X11/local/monak16I.pcf.gz
+share/fonts/X11/local/monau12.pcf.gz
+share/fonts/X11/local/monau12B.pcf.gz
+share/fonts/X11/local/monau12BI.pcf.gz
+share/fonts/X11/local/monau12I.pcf.gz
+share/fonts/X11/local/monau14.pcf.gz
+share/fonts/X11/local/monau14B.pcf.gz
+share/fonts/X11/local/monau14BI.pcf.gz
+share/fonts/X11/local/monau14I.pcf.gz
+share/fonts/X11/local/monau16.pcf.gz
+share/fonts/X11/local/monau16B.pcf.gz
+share/fonts/X11/local/monau16BI.pcf.gz
+share/fonts/X11/local/monau16I.pcf.gz
diff --git a/fonts/mothanna-ttf/Makefile b/fonts/mothanna-ttf/Makefile
index 6e98273e023..00d8ceb3f58 100644
--- a/fonts/mothanna-ttf/Makefile
+++ b/fonts/mothanna-ttf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 18:28:28 asau Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:36 wiz Exp $
#
DISTNAME= Mothanna-0.02
PKGNAME= ${DISTNAME:S/M/m/:S/-0.02//}-ttf-0.02
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=arabeyes/}
@@ -16,7 +17,7 @@ NO_CONFIGURE= yes
NO_BUILD= yes
USE_LANGUAGES= # none
-FONTS_DIRS.ttf= lib/X11/fonts/TTF
+FONTS_DIRS.ttf= share/fonts/X11/TTF
INSTALLATION_DIRS+= share/doc/mothanna-ttf ${FONTS_DIRS.ttf}
diff --git a/fonts/mothanna-ttf/PLIST b/fonts/mothanna-ttf/PLIST
index ea9085affbf..6da6ccf40bc 100644
--- a/fonts/mothanna-ttf/PLIST
+++ b/fonts/mothanna-ttf/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/09/04 10:38:24 wiz Exp $
-lib/X11/fonts/TTF/Mothanna-Bold-Oblique.ttf
-lib/X11/fonts/TTF/Mothanna-Bold.ttf
-lib/X11/fonts/TTF/Mothanna-Oblique.ttf
-lib/X11/fonts/TTF/Mothanna.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:36 wiz Exp $
+share/fonts/X11/TTF/Mothanna-Bold-Oblique.ttf
+share/fonts/X11/TTF/Mothanna-Bold.ttf
+share/fonts/X11/TTF/Mothanna-Oblique.ttf
+share/fonts/X11/TTF/Mothanna.ttf
share/doc/mothanna-ttf/README
diff --git a/fonts/motoya-fonts/Makefile b/fonts/motoya-fonts/Makefile
index 467f6ff87cc..8d46355a68c 100644
--- a/fonts/motoya-fonts/Makefile
+++ b/fonts/motoya-fonts/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2012/10/03 18:28:28 asau Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/01 16:35:36 wiz Exp $
#
DISTNAME= motoya-fonts-20111115
+PKGREVISION= 1
CATEGORIES= fonts japanese
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tar.bz2
@@ -15,12 +16,12 @@ USE_LANGUAGES= # none
USE_X11BASE= YES
NO_BUILD= YES
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
-INSTALLATION_DIRS= lib/X11/fonts/TTF \
+INSTALLATION_DIRS= share/fonts/X11/TTF \
${DOCDIR}
INSTALL_FONTS= MTLc3m.ttf \
diff --git a/fonts/motoya-fonts/PLIST b/fonts/motoya-fonts/PLIST
index 4f4b5ca7f52..d59f4f62ee8 100644
--- a/fonts/motoya-fonts/PLIST
+++ b/fonts/motoya-fonts/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/11/17 20:47:13 ryoon Exp $
-lib/X11/fonts/TTF/MTLc3m.ttf
-lib/X11/fonts/TTF/MTLmr3m.ttf
+@comment $NetBSD: PLIST,v 1.3 2014/06/01 16:35:36 wiz Exp $
+share/fonts/X11/TTF/MTLc3m.ttf
+share/fonts/X11/TTF/MTLmr3m.ttf
share/doc/motoya-fonts/NOTICE
diff --git a/fonts/mozilla-fonts/MESSAGE b/fonts/mozilla-fonts/MESSAGE
index fa5074d92ed..2f29cfa0e98 100644
--- a/fonts/mozilla-fonts/MESSAGE
+++ b/fonts/mozilla-fonts/MESSAGE
@@ -1,10 +1,10 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2002/04/09 13:17:24 wiz Exp $
+$NetBSD: MESSAGE,v 1.2 2014/06/01 16:35:36 wiz Exp $
Once the files are in place, they need to be added to the font database.
This can be accomplished with one of the following commands:
- xset fp+ ${PREFIX}/lib/X11/fonts/Mozilla
+ xset fp+ ${PREFIX}/share/fonts/X11/Mozilla
Note that the above will only make the fonts available for the duration of
your current X session. If they are to be installed and usable
diff --git a/fonts/mozilla-fonts/Makefile b/fonts/mozilla-fonts/Makefile
index a4a930f8372..75fcc9e01c5 100644
--- a/fonts/mozilla-fonts/Makefile
+++ b/fonts/mozilla-fonts/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2012/10/03 18:28:28 asau Exp $
+# $NetBSD: Makefile,v 1.11 2014/06/01 16:35:36 wiz Exp $
DISTNAME= mozilla-fonts-1.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= fonts www
#MASTER_SITES= http://www.myrddin.demon.co.uk/dist/
@@ -10,8 +10,8 @@ MAINTAINER= rxg@NetBSD.org
COMMENT= Optimized fonts for Netscape/Mozilla
USE_TOOLS+= bdftopcf gzip
-FONTS_DIRS.x11+= ${PREFIX}/lib/X11/fonts/Mozilla
-REQD_DIRS+= ${PREFIX}/lib/X11/fonts/Mozilla
+FONTS_DIRS.x11+= ${PREFIX}/share/fonts/X11/Mozilla
+REQD_DIRS+= ${PREFIX}/share/fonts/X11/Mozilla
INSTALLATION_DIRS= share/doc/mozilla-fonts
diff --git a/fonts/mozilla-fonts/PLIST b/fonts/mozilla-fonts/PLIST
index 0aa440fdb78..88966b00a17 100644
--- a/fonts/mozilla-fonts/PLIST
+++ b/fonts/mozilla-fonts/PLIST
@@ -1,88 +1,88 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:54:15 joerg Exp $
-lib/X11/fonts/Mozilla/cour1.pcf.gz
-lib/X11/fonts/Mozilla/cour2.pcf.gz
-lib/X11/fonts/Mozilla/cour3.pcf.gz
-lib/X11/fonts/Mozilla/cour4.pcf.gz
-lib/X11/fonts/Mozilla/cour5.pcf.gz
-lib/X11/fonts/Mozilla/cour6.pcf.gz
-lib/X11/fonts/Mozilla/cour7.pcf.gz
-lib/X11/fonts/Mozilla/courb1.pcf.gz
-lib/X11/fonts/Mozilla/courb2.pcf.gz
-lib/X11/fonts/Mozilla/courb3.pcf.gz
-lib/X11/fonts/Mozilla/courb4.pcf.gz
-lib/X11/fonts/Mozilla/courb5.pcf.gz
-lib/X11/fonts/Mozilla/courb6.pcf.gz
-lib/X11/fonts/Mozilla/courb7.pcf.gz
-lib/X11/fonts/Mozilla/courbi1.pcf.gz
-lib/X11/fonts/Mozilla/courbi2.pcf.gz
-lib/X11/fonts/Mozilla/courbi3.pcf.gz
-lib/X11/fonts/Mozilla/courbi4.pcf.gz
-lib/X11/fonts/Mozilla/courbi5.pcf.gz
-lib/X11/fonts/Mozilla/courbi6.pcf.gz
-lib/X11/fonts/Mozilla/courbi7.pcf.gz
-lib/X11/fonts/Mozilla/couri1.pcf.gz
-lib/X11/fonts/Mozilla/couri2.pcf.gz
-lib/X11/fonts/Mozilla/couri3.pcf.gz
-lib/X11/fonts/Mozilla/couri4.pcf.gz
-lib/X11/fonts/Mozilla/couri5.pcf.gz
-lib/X11/fonts/Mozilla/couri6.pcf.gz
-lib/X11/fonts/Mozilla/couri7.pcf.gz
-lib/X11/fonts/Mozilla/fonts.alias
-lib/X11/fonts/Mozilla/helv0.pcf.gz
-lib/X11/fonts/Mozilla/helv1.pcf.gz
-lib/X11/fonts/Mozilla/helv2.pcf.gz
-lib/X11/fonts/Mozilla/helv3.pcf.gz
-lib/X11/fonts/Mozilla/helv4.pcf.gz
-lib/X11/fonts/Mozilla/helv5.pcf.gz
-lib/X11/fonts/Mozilla/helv6.pcf.gz
-lib/X11/fonts/Mozilla/helv7.pcf.gz
-lib/X11/fonts/Mozilla/helvb1.pcf.gz
-lib/X11/fonts/Mozilla/helvb2.pcf.gz
-lib/X11/fonts/Mozilla/helvb3.pcf.gz
-lib/X11/fonts/Mozilla/helvb4.pcf.gz
-lib/X11/fonts/Mozilla/helvb5.pcf.gz
-lib/X11/fonts/Mozilla/helvb6.pcf.gz
-lib/X11/fonts/Mozilla/helvb7.pcf.gz
-lib/X11/fonts/Mozilla/helvbi1.pcf.gz
-lib/X11/fonts/Mozilla/helvbi2.pcf.gz
-lib/X11/fonts/Mozilla/helvbi3.pcf.gz
-lib/X11/fonts/Mozilla/helvbi4.pcf.gz
-lib/X11/fonts/Mozilla/helvbi5.pcf.gz
-lib/X11/fonts/Mozilla/helvbi6.pcf.gz
-lib/X11/fonts/Mozilla/helvbi7.pcf.gz
-lib/X11/fonts/Mozilla/helvi1.pcf.gz
-lib/X11/fonts/Mozilla/helvi2.pcf.gz
-lib/X11/fonts/Mozilla/helvi3.pcf.gz
-lib/X11/fonts/Mozilla/helvi4.pcf.gz
-lib/X11/fonts/Mozilla/helvi5.pcf.gz
-lib/X11/fonts/Mozilla/helvi6.pcf.gz
-lib/X11/fonts/Mozilla/helvi7.pcf.gz
-lib/X11/fonts/Mozilla/times1.pcf.gz
-lib/X11/fonts/Mozilla/times2.pcf.gz
-lib/X11/fonts/Mozilla/times3.pcf.gz
-lib/X11/fonts/Mozilla/times4.pcf.gz
-lib/X11/fonts/Mozilla/times5.pcf.gz
-lib/X11/fonts/Mozilla/times6.pcf.gz
-lib/X11/fonts/Mozilla/times7.pcf.gz
-lib/X11/fonts/Mozilla/timesb1.pcf.gz
-lib/X11/fonts/Mozilla/timesb2.pcf.gz
-lib/X11/fonts/Mozilla/timesb3.pcf.gz
-lib/X11/fonts/Mozilla/timesb4.pcf.gz
-lib/X11/fonts/Mozilla/timesb5.pcf.gz
-lib/X11/fonts/Mozilla/timesb6.pcf.gz
-lib/X11/fonts/Mozilla/timesb7.pcf.gz
-lib/X11/fonts/Mozilla/timesbi1.pcf.gz
-lib/X11/fonts/Mozilla/timesbi2.pcf.gz
-lib/X11/fonts/Mozilla/timesbi3.pcf.gz
-lib/X11/fonts/Mozilla/timesbi4.pcf.gz
-lib/X11/fonts/Mozilla/timesbi5.pcf.gz
-lib/X11/fonts/Mozilla/timesbi6.pcf.gz
-lib/X11/fonts/Mozilla/timesbi7.pcf.gz
-lib/X11/fonts/Mozilla/timesi1.pcf.gz
-lib/X11/fonts/Mozilla/timesi2.pcf.gz
-lib/X11/fonts/Mozilla/timesi3.pcf.gz
-lib/X11/fonts/Mozilla/timesi4.pcf.gz
-lib/X11/fonts/Mozilla/timesi5.pcf.gz
-lib/X11/fonts/Mozilla/timesi6.pcf.gz
-lib/X11/fonts/Mozilla/timesi7.pcf.gz
+@comment $NetBSD: PLIST,v 1.5 2014/06/01 16:35:36 wiz Exp $
+share/fonts/X11/Mozilla/cour1.pcf.gz
+share/fonts/X11/Mozilla/cour2.pcf.gz
+share/fonts/X11/Mozilla/cour3.pcf.gz
+share/fonts/X11/Mozilla/cour4.pcf.gz
+share/fonts/X11/Mozilla/cour5.pcf.gz
+share/fonts/X11/Mozilla/cour6.pcf.gz
+share/fonts/X11/Mozilla/cour7.pcf.gz
+share/fonts/X11/Mozilla/courb1.pcf.gz
+share/fonts/X11/Mozilla/courb2.pcf.gz
+share/fonts/X11/Mozilla/courb3.pcf.gz
+share/fonts/X11/Mozilla/courb4.pcf.gz
+share/fonts/X11/Mozilla/courb5.pcf.gz
+share/fonts/X11/Mozilla/courb6.pcf.gz
+share/fonts/X11/Mozilla/courb7.pcf.gz
+share/fonts/X11/Mozilla/courbi1.pcf.gz
+share/fonts/X11/Mozilla/courbi2.pcf.gz
+share/fonts/X11/Mozilla/courbi3.pcf.gz
+share/fonts/X11/Mozilla/courbi4.pcf.gz
+share/fonts/X11/Mozilla/courbi5.pcf.gz
+share/fonts/X11/Mozilla/courbi6.pcf.gz
+share/fonts/X11/Mozilla/courbi7.pcf.gz
+share/fonts/X11/Mozilla/couri1.pcf.gz
+share/fonts/X11/Mozilla/couri2.pcf.gz
+share/fonts/X11/Mozilla/couri3.pcf.gz
+share/fonts/X11/Mozilla/couri4.pcf.gz
+share/fonts/X11/Mozilla/couri5.pcf.gz
+share/fonts/X11/Mozilla/couri6.pcf.gz
+share/fonts/X11/Mozilla/couri7.pcf.gz
+share/fonts/X11/Mozilla/fonts.alias
+share/fonts/X11/Mozilla/helv0.pcf.gz
+share/fonts/X11/Mozilla/helv1.pcf.gz
+share/fonts/X11/Mozilla/helv2.pcf.gz
+share/fonts/X11/Mozilla/helv3.pcf.gz
+share/fonts/X11/Mozilla/helv4.pcf.gz
+share/fonts/X11/Mozilla/helv5.pcf.gz
+share/fonts/X11/Mozilla/helv6.pcf.gz
+share/fonts/X11/Mozilla/helv7.pcf.gz
+share/fonts/X11/Mozilla/helvb1.pcf.gz
+share/fonts/X11/Mozilla/helvb2.pcf.gz
+share/fonts/X11/Mozilla/helvb3.pcf.gz
+share/fonts/X11/Mozilla/helvb4.pcf.gz
+share/fonts/X11/Mozilla/helvb5.pcf.gz
+share/fonts/X11/Mozilla/helvb6.pcf.gz
+share/fonts/X11/Mozilla/helvb7.pcf.gz
+share/fonts/X11/Mozilla/helvbi1.pcf.gz
+share/fonts/X11/Mozilla/helvbi2.pcf.gz
+share/fonts/X11/Mozilla/helvbi3.pcf.gz
+share/fonts/X11/Mozilla/helvbi4.pcf.gz
+share/fonts/X11/Mozilla/helvbi5.pcf.gz
+share/fonts/X11/Mozilla/helvbi6.pcf.gz
+share/fonts/X11/Mozilla/helvbi7.pcf.gz
+share/fonts/X11/Mozilla/helvi1.pcf.gz
+share/fonts/X11/Mozilla/helvi2.pcf.gz
+share/fonts/X11/Mozilla/helvi3.pcf.gz
+share/fonts/X11/Mozilla/helvi4.pcf.gz
+share/fonts/X11/Mozilla/helvi5.pcf.gz
+share/fonts/X11/Mozilla/helvi6.pcf.gz
+share/fonts/X11/Mozilla/helvi7.pcf.gz
+share/fonts/X11/Mozilla/times1.pcf.gz
+share/fonts/X11/Mozilla/times2.pcf.gz
+share/fonts/X11/Mozilla/times3.pcf.gz
+share/fonts/X11/Mozilla/times4.pcf.gz
+share/fonts/X11/Mozilla/times5.pcf.gz
+share/fonts/X11/Mozilla/times6.pcf.gz
+share/fonts/X11/Mozilla/times7.pcf.gz
+share/fonts/X11/Mozilla/timesb1.pcf.gz
+share/fonts/X11/Mozilla/timesb2.pcf.gz
+share/fonts/X11/Mozilla/timesb3.pcf.gz
+share/fonts/X11/Mozilla/timesb4.pcf.gz
+share/fonts/X11/Mozilla/timesb5.pcf.gz
+share/fonts/X11/Mozilla/timesb6.pcf.gz
+share/fonts/X11/Mozilla/timesb7.pcf.gz
+share/fonts/X11/Mozilla/timesbi1.pcf.gz
+share/fonts/X11/Mozilla/timesbi2.pcf.gz
+share/fonts/X11/Mozilla/timesbi3.pcf.gz
+share/fonts/X11/Mozilla/timesbi4.pcf.gz
+share/fonts/X11/Mozilla/timesbi5.pcf.gz
+share/fonts/X11/Mozilla/timesbi6.pcf.gz
+share/fonts/X11/Mozilla/timesbi7.pcf.gz
+share/fonts/X11/Mozilla/timesi1.pcf.gz
+share/fonts/X11/Mozilla/timesi2.pcf.gz
+share/fonts/X11/Mozilla/timesi3.pcf.gz
+share/fonts/X11/Mozilla/timesi4.pcf.gz
+share/fonts/X11/Mozilla/timesi5.pcf.gz
+share/fonts/X11/Mozilla/timesi6.pcf.gz
+share/fonts/X11/Mozilla/timesi7.pcf.gz
share/doc/mozilla-fonts/README
diff --git a/fonts/mozilla-fonts/distinfo b/fonts/mozilla-fonts/distinfo
index be460222649..1eea64b9fbb 100644
--- a/fonts/mozilla-fonts/distinfo
+++ b/fonts/mozilla-fonts/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2009/07/08 16:57:05 joerg Exp $
+$NetBSD: distinfo,v 1.5 2014/06/01 16:35:36 wiz Exp $
SHA1 (mozilla-fonts-1.0.tar.gz) = 78bdf7d984f4d3fb63f1ab2ae6313be5adf297a0
RMD160 (mozilla-fonts-1.0.tar.gz) = acc0875c52a9e37318775188980d7e9a4bda5a41
Size (mozilla-fonts-1.0.tar.gz) = 646850 bytes
-SHA1 (patch-aa) = 6da124dc3abaa3eab7240c5f2251b78373bd2545
+SHA1 (patch-aa) = 24a3c1674098e3c23ea510dc3fac60ab58e90986
diff --git a/fonts/mozilla-fonts/patches/patch-aa b/fonts/mozilla-fonts/patches/patch-aa
index efb1a6ef3ed..7828cf51ccc 100644
--- a/fonts/mozilla-fonts/patches/patch-aa
+++ b/fonts/mozilla-fonts/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2009/07/08 16:57:05 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2014/06/01 16:35:36 wiz Exp $
--- Makefile.orig 2000-09-24 04:57:57.000000000 +0200
+++ Makefile
@@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.3 2009/07/08 16:57:05 joerg Exp $
# Makefile for mozilla-fonts
-DESTDIR = /usr/local/lib/X11/fonts/Mozilla
-+DEST = $(PREFIX)/lib/X11/fonts/Mozilla
++DEST = $(PREFIX)/share/fonts/X11/Mozilla
INSTALL = install
diff --git a/fonts/ms-ttf/MESSAGE b/fonts/ms-ttf/MESSAGE
index 28a31831e70..9263951bad3 100644
--- a/fonts/ms-ttf/MESSAGE
+++ b/fonts/ms-ttf/MESSAGE
@@ -1,13 +1,13 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.3 2011/11/22 18:02:07 shattered Exp $
+$NetBSD: MESSAGE,v 1.4 2014/06/01 16:35:36 wiz Exp $
You must configure your X server to use the new fonts. Add
these to your /etc/X11/XF86Config. Make sure the TTF and Type1
font settings are the first FontPath lines.
Section "Files"
- FontPath "${PREFIX}/lib/X11/fonts/TTF/"
- FontPath "${X11BASE}/lib/X11/fonts/Type1/"
+ FontPath "${PREFIX}/share/fonts/X11/TTF/"
+ FontPath "${X11BASE}/share/fonts/X11/Type1/"
...
EndSection
diff --git a/fonts/ms-ttf/Makefile b/fonts/ms-ttf/Makefile
index b90566a0063..3eee9ff9582 100644
--- a/fonts/ms-ttf/Makefile
+++ b/fonts/ms-ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2013/04/06 14:58:18 rodent Exp $
+# $NetBSD: Makefile,v 1.21 2014/06/01 16:35:36 wiz Exp $
DISTNAME= # empty
PKGNAME= ms-ttf-20020306
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=corefonts/}
DISTFILES= andale32.exe webdin32.exe trebuc32.exe georgi32.exe \
@@ -30,7 +30,7 @@ DIST_SUBDIR= ms-ttf
EVAL_PREFIX+= CABEXTRACT_PREFIX=cabextract
CABEXTRACT_PREFIX_DEFAULT=${LOCALBASE}
EXTRACT_CMD= ${CABEXTRACT_PREFIX}/bin/cabextract -q $${extract_file}
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
DOCDIR= ${PREFIX}/share/doc/ms-ttf
FONTS_DIRS.ttf= ${FONTDIR}
diff --git a/fonts/ms-ttf/PLIST b/fonts/ms-ttf/PLIST
index 42b3ead6298..0326a2e8ad4 100644
--- a/fonts/ms-ttf/PLIST
+++ b/fonts/ms-ttf/PLIST
@@ -1,32 +1,32 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:54:15 joerg Exp $
-lib/X11/fonts/TTF/AndaleMo.ttf
-lib/X11/fonts/TTF/AriBlk.ttf
-lib/X11/fonts/TTF/Arial.ttf
-lib/X11/fonts/TTF/Arialbd.ttf
-lib/X11/fonts/TTF/Arialbi.ttf
-lib/X11/fonts/TTF/Ariali.ttf
-lib/X11/fonts/TTF/Comic.ttf
-lib/X11/fonts/TTF/Comicbd.ttf
-lib/X11/fonts/TTF/Georgia.ttf
-lib/X11/fonts/TTF/Georgiab.ttf
-lib/X11/fonts/TTF/Georgiai.ttf
-lib/X11/fonts/TTF/Georgiaz.ttf
-lib/X11/fonts/TTF/Impact.ttf
-lib/X11/fonts/TTF/Times.ttf
-lib/X11/fonts/TTF/Timesbd.ttf
-lib/X11/fonts/TTF/Timesbi.ttf
-lib/X11/fonts/TTF/Timesi.ttf
-lib/X11/fonts/TTF/Trebucbd.ttf
-lib/X11/fonts/TTF/Verdana.ttf
-lib/X11/fonts/TTF/Verdanab.ttf
-lib/X11/fonts/TTF/Verdanai.ttf
-lib/X11/fonts/TTF/Verdanaz.ttf
-lib/X11/fonts/TTF/Webdings.ttf
-lib/X11/fonts/TTF/cour.ttf
-lib/X11/fonts/TTF/courbd.ttf
-lib/X11/fonts/TTF/courbi.ttf
-lib/X11/fonts/TTF/couri.ttf
-lib/X11/fonts/TTF/trebuc.ttf
-lib/X11/fonts/TTF/trebucbi.ttf
-lib/X11/fonts/TTF/trebucit.ttf
+@comment $NetBSD: PLIST,v 1.7 2014/06/01 16:35:36 wiz Exp $
+share/fonts/X11/TTF/AndaleMo.ttf
+share/fonts/X11/TTF/AriBlk.ttf
+share/fonts/X11/TTF/Arial.ttf
+share/fonts/X11/TTF/Arialbd.ttf
+share/fonts/X11/TTF/Arialbi.ttf
+share/fonts/X11/TTF/Ariali.ttf
+share/fonts/X11/TTF/Comic.ttf
+share/fonts/X11/TTF/Comicbd.ttf
+share/fonts/X11/TTF/Georgia.ttf
+share/fonts/X11/TTF/Georgiab.ttf
+share/fonts/X11/TTF/Georgiai.ttf
+share/fonts/X11/TTF/Georgiaz.ttf
+share/fonts/X11/TTF/Impact.ttf
+share/fonts/X11/TTF/Times.ttf
+share/fonts/X11/TTF/Timesbd.ttf
+share/fonts/X11/TTF/Timesbi.ttf
+share/fonts/X11/TTF/Timesi.ttf
+share/fonts/X11/TTF/Trebucbd.ttf
+share/fonts/X11/TTF/Verdana.ttf
+share/fonts/X11/TTF/Verdanab.ttf
+share/fonts/X11/TTF/Verdanai.ttf
+share/fonts/X11/TTF/Verdanaz.ttf
+share/fonts/X11/TTF/Webdings.ttf
+share/fonts/X11/TTF/cour.ttf
+share/fonts/X11/TTF/courbd.ttf
+share/fonts/X11/TTF/courbi.ttf
+share/fonts/X11/TTF/couri.ttf
+share/fonts/X11/TTF/trebuc.ttf
+share/fonts/X11/TTF/trebucbi.ttf
+share/fonts/X11/TTF/trebucit.ttf
share/doc/ms-ttf/ms-ttf-license
diff --git a/fonts/nanum-ttf/Makefile b/fonts/nanum-ttf/Makefile
index 33157c5556f..6b9187b42fa 100644
--- a/fonts/nanum-ttf/Makefile
+++ b/fonts/nanum-ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2013/04/08 01:42:40 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/01 16:35:36 wiz Exp $
DISTNAME= NanumFont_TTF_ALL
PKGNAME= nanum-ttf-3.0
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://cdn.naver.com/naver/NanumFont/fontfiles/
EXTRACT_SUFX= .zip
@@ -15,9 +16,9 @@ NO_CONFIGURE= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}
-FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
-INSTALLATION_DIRS= lib/X11/fonts/TTF
+INSTALLATION_DIRS= share/fonts/X11/TTF
do-install:
${INSTALL_DATA} ${WRKSRC}/*.ttf ${DESTDIR}${FONTS_DIRS.ttf}
diff --git a/fonts/nanum-ttf/PLIST b/fonts/nanum-ttf/PLIST
index c2ffe85288c..20b4d1708cd 100644
--- a/fonts/nanum-ttf/PLIST
+++ b/fonts/nanum-ttf/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/08/08 23:26:31 minskim Exp $
-lib/X11/fonts/TTF/NanumBrush.ttf
-lib/X11/fonts/TTF/NanumGothic.ttf
-lib/X11/fonts/TTF/NanumGothicBold.ttf
-lib/X11/fonts/TTF/NanumGothicExtraBold.ttf
-lib/X11/fonts/TTF/NanumMyeongjo.ttf
-lib/X11/fonts/TTF/NanumMyeongjoBold.ttf
-lib/X11/fonts/TTF/NanumMyeongjoExtraBold.ttf
-lib/X11/fonts/TTF/NanumPen.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:36 wiz Exp $
+share/fonts/X11/TTF/NanumBrush.ttf
+share/fonts/X11/TTF/NanumGothic.ttf
+share/fonts/X11/TTF/NanumGothicBold.ttf
+share/fonts/X11/TTF/NanumGothicExtraBold.ttf
+share/fonts/X11/TTF/NanumMyeongjo.ttf
+share/fonts/X11/TTF/NanumMyeongjoBold.ttf
+share/fonts/X11/TTF/NanumMyeongjoExtraBold.ttf
+share/fonts/X11/TTF/NanumPen.ttf
diff --git a/fonts/pixel-sagas-startrek/Makefile b/fonts/pixel-sagas-startrek/Makefile
index d611de03f0b..d952bd520fc 100644
--- a/fonts/pixel-sagas-startrek/Makefile
+++ b/fonts/pixel-sagas-startrek/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2014/04/02 21:26:29 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/01 16:35:36 wiz Exp $
DISTNAME= pixels-sagas-startrek-201404
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://www.pixelsagas.com/files/
DISTFILES+= PS_Font_Fontana.zip
@@ -24,8 +25,8 @@ NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
WRKSRC= ${WRKDIR}
-OTFPATH= lib/X11/fonts/OTF
-TTFPATH= lib/X11/fonts/TTF
+OTFPATH= share/fonts/X11/OTF
+TTFPATH= share/fonts/X11/TTF
FONTS_DIRS.otf+= ${PREFIX}/${OTFPATH:Q}
FONTS_DIRS.ttf+= ${PREFIX}/${TTFPATH:Q}
INSTALLATION_DIRS= ${OTFPATH:Q} ${TTFPATH:Q}
diff --git a/fonts/pixel-sagas-startrek/PLIST b/fonts/pixel-sagas-startrek/PLIST
index d6b1633c89c..eb43bde7dd7 100644
--- a/fonts/pixel-sagas-startrek/PLIST
+++ b/fonts/pixel-sagas-startrek/PLIST
@@ -1,32 +1,32 @@
-@comment $NetBSD: PLIST,v 1.3 2014/04/02 21:26:29 wiz Exp $
-lib/X11/fonts/OTF/Okuda Bold Italic.otf
-lib/X11/fonts/OTF/Okuda Bold.otf
-lib/X11/fonts/OTF/Okuda Italic.otf
-lib/X11/fonts/OTF/Okuda.otf
-lib/X11/fonts/OTF/Probert Black Italic.otf
-lib/X11/fonts/OTF/Probert Black.otf
-lib/X11/fonts/OTF/Probert Bold Italic.otf
-lib/X11/fonts/OTF/Probert Bold.otf
-lib/X11/fonts/OTF/Probert Italic.otf
-lib/X11/fonts/OTF/Probert.otf
-lib/X11/fonts/TTF/Fontana Bold Italic.ttf
-lib/X11/fonts/TTF/Fontana Bold.ttf
-lib/X11/fonts/TTF/Fontana Italic.ttf
-lib/X11/fonts/TTF/Fontana.ttf
-lib/X11/fonts/TTF/Jefferies Bold Italic.ttf
-lib/X11/fonts/TTF/Jefferies Bold.ttf
-lib/X11/fonts/TTF/Jefferies Italic.ttf
-lib/X11/fonts/TTF/Jefferies.ttf
-lib/X11/fonts/TTF/Montalban Condensed Italic.ttf
-lib/X11/fonts/TTF/Montalban Condensed.ttf
-lib/X11/fonts/TTF/Montalban Italic.ttf
-lib/X11/fonts/TTF/Montalban.ttf
-lib/X11/fonts/TTF/Roddenberry Italic.ttf
-lib/X11/fonts/TTF/Roddenberry.ttf
-lib/X11/fonts/TTF/Sternbach Italic.ttf
-lib/X11/fonts/TTF/Sternbach Outline Italic.ttf
-lib/X11/fonts/TTF/Sternbach Outline.ttf
-lib/X11/fonts/TTF/Sternbach.ttf
-lib/X11/fonts/TTF/Tellarite.ttf
-lib/X11/fonts/TTF/Trek Arrowcaps.ttf
-lib/X11/fonts/TTF/Trek Arrowheads.ttf
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:36 wiz Exp $
+share/fonts/X11/OTF/Okuda Bold Italic.otf
+share/fonts/X11/OTF/Okuda Bold.otf
+share/fonts/X11/OTF/Okuda Italic.otf
+share/fonts/X11/OTF/Okuda.otf
+share/fonts/X11/OTF/Probert Black Italic.otf
+share/fonts/X11/OTF/Probert Black.otf
+share/fonts/X11/OTF/Probert Bold Italic.otf
+share/fonts/X11/OTF/Probert Bold.otf
+share/fonts/X11/OTF/Probert Italic.otf
+share/fonts/X11/OTF/Probert.otf
+share/fonts/X11/TTF/Fontana Bold Italic.ttf
+share/fonts/X11/TTF/Fontana Bold.ttf
+share/fonts/X11/TTF/Fontana Italic.ttf
+share/fonts/X11/TTF/Fontana.ttf
+share/fonts/X11/TTF/Jefferies Bold Italic.ttf
+share/fonts/X11/TTF/Jefferies Bold.ttf
+share/fonts/X11/TTF/Jefferies Italic.ttf
+share/fonts/X11/TTF/Jefferies.ttf
+share/fonts/X11/TTF/Montalban Condensed Italic.ttf
+share/fonts/X11/TTF/Montalban Condensed.ttf
+share/fonts/X11/TTF/Montalban Italic.ttf
+share/fonts/X11/TTF/Montalban.ttf
+share/fonts/X11/TTF/Roddenberry Italic.ttf
+share/fonts/X11/TTF/Roddenberry.ttf
+share/fonts/X11/TTF/Sternbach Italic.ttf
+share/fonts/X11/TTF/Sternbach Outline Italic.ttf
+share/fonts/X11/TTF/Sternbach Outline.ttf
+share/fonts/X11/TTF/Sternbach.ttf
+share/fonts/X11/TTF/Tellarite.ttf
+share/fonts/X11/TTF/Trek Arrowcaps.ttf
+share/fonts/X11/TTF/Trek Arrowheads.ttf
diff --git a/fonts/profont/MESSAGE b/fonts/profont/MESSAGE
index be32a7ae593..06eb4971896 100644
--- a/fonts/profont/MESSAGE
+++ b/fonts/profont/MESSAGE
@@ -1,8 +1,8 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1 2003/12/20 00:28:12 perry Exp $
+$NetBSD: MESSAGE,v 1.2 2014/06/01 16:35:36 wiz Exp $
You may need to add the following to your /etc/X11/XF86Config:
- FontPath "${PREFIX}/lib/X11/fonts/misc/"
+ FontPath "${PREFIX}/share/fonts/X11/misc/"
===========================================================================
diff --git a/fonts/profont/Makefile b/fonts/profont/Makefile
index 4b893387b68..0b28de21869 100644
--- a/fonts/profont/Makefile
+++ b/fonts/profont/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2012/10/03 18:28:29 asau Exp $
+# $NetBSD: Makefile,v 1.11 2014/06/01 16:35:36 wiz Exp $
#
DISTNAME= profontlinux
PKGNAME= profont-1.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= fonts
MASTER_SITES= http://www.tobiasjung.net/dl/
EXTRACT_SUFX= .zip
@@ -16,8 +16,8 @@ NO_BUILD= yes
NO_CONFIGURE= yes
USE_X11BASE= yes
-FONTS_DIRS.x11= ${PREFIX}/lib/X11/fonts/misc
-INSTALLATION_DIRS= lib/X11/fonts/misc
+FONTS_DIRS.x11= ${PREFIX}/share/fonts/X11/misc
+INSTALLATION_DIRS= share/fonts/X11/misc
do-install:
for i in ${WRKDIR}/*.pcf; do \
diff --git a/fonts/profont/PLIST b/fonts/profont/PLIST
index 5450b12018f..b42273fb1a6 100644
--- a/fonts/profont/PLIST
+++ b/fonts/profont/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2003/12/20 00:28:12 perry Exp $
-lib/X11/fonts/misc/ProFontWindows_r400-10.pcf
-lib/X11/fonts/misc/ProFontWindows_r400-11.pcf
-lib/X11/fonts/misc/ProFontWindows_r400-12.pcf
-lib/X11/fonts/misc/ProFontWindows_r400-15.pcf
-lib/X11/fonts/misc/ProFontWindows_r400-17.pcf
-lib/X11/fonts/misc/ProFontWindows_r400-22.pcf
-lib/X11/fonts/misc/ProFontWindows_r400-29.pcf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:36 wiz Exp $
+share/fonts/X11/misc/ProFontWindows_r400-10.pcf
+share/fonts/X11/misc/ProFontWindows_r400-11.pcf
+share/fonts/X11/misc/ProFontWindows_r400-12.pcf
+share/fonts/X11/misc/ProFontWindows_r400-15.pcf
+share/fonts/X11/misc/ProFontWindows_r400-17.pcf
+share/fonts/X11/misc/ProFontWindows_r400-22.pcf
+share/fonts/X11/misc/ProFontWindows_r400-29.pcf
diff --git a/fonts/proggy-fonts/Makefile b/fonts/proggy-fonts/Makefile
index c33ce54f349..2a247427915 100644
--- a/fonts/proggy-fonts/Makefile
+++ b/fonts/proggy-fonts/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 18:28:29 asau Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:36 wiz Exp $
DISTNAME= proggy-fonts-1
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://dl.liveforge.org/fonts/
EXTRACT_SUFX= .tar.bz2
@@ -15,8 +16,8 @@ NO_BUILD= yes
NO_CONFIGURE= yes
USE_X11BASE= yes
-FONTS_DIRS.x11= ${PREFIX}/lib/X11/fonts/misc
-INSTALLATION_DIRS= lib/X11/fonts/misc
+FONTS_DIRS.x11= ${PREFIX}/share/fonts/X11/misc
+INSTALLATION_DIRS= share/fonts/X11/misc
INSTALLATION_DIRS+= share/doc/proggy-fonts
do-install:
diff --git a/fonts/proggy-fonts/PLIST b/fonts/proggy-fonts/PLIST
index a467330efad..9171a0b96e9 100644
--- a/fonts/proggy-fonts/PLIST
+++ b/fonts/proggy-fonts/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/16 13:48:10 wiz Exp $
-lib/X11/fonts/misc/ProggyClean.pcf.gz
-lib/X11/fonts/misc/ProggyCleanCP.pcf.gz
-lib/X11/fonts/misc/ProggyCleanSZ.pcf.gz
-lib/X11/fonts/misc/ProggyCleanSZBP.pcf.gz
-lib/X11/fonts/misc/ProggyCleanSZCP.pcf.gz
-lib/X11/fonts/misc/ProggySmall.pcf.gz
-lib/X11/fonts/misc/ProggySquare.pcf.gz
-lib/X11/fonts/misc/ProggySquareSZ.pcf.gz
-lib/X11/fonts/misc/ProggyTiny.pcf.gz
-lib/X11/fonts/misc/ProggyTinyBold.pcf.gz
-lib/X11/fonts/misc/ProggyTinySZ.pcf.gz
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:36 wiz Exp $
+share/fonts/X11/misc/ProggyClean.pcf.gz
+share/fonts/X11/misc/ProggyCleanCP.pcf.gz
+share/fonts/X11/misc/ProggyCleanSZ.pcf.gz
+share/fonts/X11/misc/ProggyCleanSZBP.pcf.gz
+share/fonts/X11/misc/ProggyCleanSZCP.pcf.gz
+share/fonts/X11/misc/ProggySmall.pcf.gz
+share/fonts/X11/misc/ProggySquare.pcf.gz
+share/fonts/X11/misc/ProggySquareSZ.pcf.gz
+share/fonts/X11/misc/ProggyTiny.pcf.gz
+share/fonts/X11/misc/ProggyTinyBold.pcf.gz
+share/fonts/X11/misc/ProggyTinySZ.pcf.gz
share/doc/proggy-fonts/Licence.txt
diff --git a/fonts/ricty-ttf/Makefile b/fonts/ricty-ttf/Makefile
index b43038a591b..6fed0a7e21c 100644
--- a/fonts/ricty-ttf/Makefile
+++ b/fonts/ricty-ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2014/01/27 18:41:13 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2014/06/01 16:35:37 wiz Exp $
DISTNAME= Ricty-3.2.1
PKGNAME= ricty-ttf-3.2.1
+PKGREVISION= 1
CATEGORIES= fonts japanese
MASTER_SITES= -https://github.com/yascentur/Ricty/archive/3.2.1.zip
EXTRACT_SUFX= .zip
@@ -25,9 +26,9 @@ NO_BIN_ON_FTP= ${RESTRICTED}
USE_X11BASE= YES
NO_CONFIGURE= YES
-INSTALLATION_DIRS= lib/X11/fonts/TTF
+INSTALLATION_DIRS= share/fonts/X11/TTF
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
INSTALL_FONTS= Ricty-Bold.ttf \
@@ -45,9 +46,9 @@ do-build:
set -e; \
cd ${WRKSRC}; \
./ricty_generator.sh \
- ${INCONSOLATADIR}/lib/X11/fonts/TTF/Inconsolata.otf \
- ${MIGUDIR}/lib/X11/fonts/TTF/migu-1m-regular.ttf \
- ${MIGUDIR}/lib/X11/fonts/TTF/migu-1m-bold.ttf
+ ${INCONSOLATADIR}/share/fonts/X11/TTF/Inconsolata.otf \
+ ${MIGUDIR}/share/fonts/X11/TTF/migu-1m-regular.ttf \
+ ${MIGUDIR}/share/fonts/X11/TTF/migu-1m-bold.ttf
post-build:
set -e; \
diff --git a/fonts/ricty-ttf/PLIST b/fonts/ricty-ttf/PLIST
index 4fc378083f5..54c689e4f66 100644
--- a/fonts/ricty-ttf/PLIST
+++ b/fonts/ricty-ttf/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2011/05/28 11:15:25 ryoon Exp $
-lib/X11/fonts/TTF/Ricty-Bold.ttf
-lib/X11/fonts/TTF/Ricty-Regular.ttf
-lib/X11/fonts/TTF/RictyDiscord-Bold.ttf
-lib/X11/fonts/TTF/RictyDiscord-Regular.ttf
+@comment $NetBSD: PLIST,v 1.3 2014/06/01 16:35:37 wiz Exp $
+share/fonts/X11/TTF/Ricty-Bold.ttf
+share/fonts/X11/TTF/Ricty-Regular.ttf
+share/fonts/X11/TTF/RictyDiscord-Bold.ttf
+share/fonts/X11/TTF/RictyDiscord-Regular.ttf
@pkgdir share/doc/ricty-ttf
diff --git a/fonts/roboto-fonts/Makefile b/fonts/roboto-fonts/Makefile
index fef97fa95f7..34ceb0f5772 100644
--- a/fonts/roboto-fonts/Makefile
+++ b/fonts/roboto-fonts/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2012/10/03 18:28:30 asau Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/01 16:35:37 wiz Exp $
#
DISTNAME= roboto-fonts-20111115a
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tar.bz2
@@ -15,10 +16,10 @@ USE_LANGUAGES= # none
USE_X11BASE= yes
NO_BUILD= yes
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
-INSTALLATION_DIRS= lib/X11/fonts/TTF \
+INSTALLATION_DIRS= share/fonts/X11/TTF \
${PREFIX}/share/doc/${PKGBASE}
INSTALL_FONTS= Roboto-Bold.ttf \
diff --git a/fonts/roboto-fonts/PLIST b/fonts/roboto-fonts/PLIST
index e81d4a41fa4..120123c1559 100644
--- a/fonts/roboto-fonts/PLIST
+++ b/fonts/roboto-fonts/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2011/11/17 19:26:42 ryoon Exp $
-lib/X11/fonts/TTF/Roboto-Bold.ttf
-lib/X11/fonts/TTF/Roboto-BoldCondensed.ttf
-lib/X11/fonts/TTF/Roboto-BoldCondensedItalic.ttf
-lib/X11/fonts/TTF/Roboto-BoldItalic.ttf
-lib/X11/fonts/TTF/Roboto-Condensed.ttf
-lib/X11/fonts/TTF/Roboto-CondensedItalic.ttf
-lib/X11/fonts/TTF/Roboto-Italic.ttf
-lib/X11/fonts/TTF/Roboto-Regular.ttf
+@comment $NetBSD: PLIST,v 1.3 2014/06/01 16:35:37 wiz Exp $
+share/fonts/X11/TTF/Roboto-Bold.ttf
+share/fonts/X11/TTF/Roboto-BoldCondensed.ttf
+share/fonts/X11/TTF/Roboto-BoldCondensedItalic.ttf
+share/fonts/X11/TTF/Roboto-BoldItalic.ttf
+share/fonts/X11/TTF/Roboto-Condensed.ttf
+share/fonts/X11/TTF/Roboto-CondensedItalic.ttf
+share/fonts/X11/TTF/Roboto-Italic.ttf
+share/fonts/X11/TTF/Roboto-Regular.ttf
share/doc/roboto-fonts/NOTICE
diff --git a/fonts/sgi-fonts/Makefile b/fonts/sgi-fonts/Makefile
index 9d91ba2712e..a7c8e01508f 100644
--- a/fonts/sgi-fonts/Makefile
+++ b/fonts/sgi-fonts/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2012/12/26 21:24:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.18 2014/06/01 16:35:37 wiz Exp $
#
DISTNAME= sgi-fonts-1.0-457.src
PKGNAME= sgi-fonts-1.0.457
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= fonts
MASTER_SITES= http://public.planetmirror.com/pub/suse/i386/8.2/suse/src/
EXTRACT_SUFX= .rpm
@@ -16,20 +16,20 @@ WRKSRC= ${WRKDIR}/sgi-fonts
USE_LANGUAGES= c
USE_X11BASE= yes
-FONTS_DIRS.x11= ${PREFIX}/lib/X11/fonts/misc/sgi
+FONTS_DIRS.x11= ${PREFIX}/share/fonts/X11/misc/sgi
USE_IMAKE= yes
USE_TOOLS+= bdftopcf bzcat tar pax
-INSTALLATION_DIRS= lib/X11/fonts/misc/sgi
+INSTALLATION_DIRS= share/fonts/X11/misc/sgi
post-extract:
cd ${WRKDIR} && bzcat sgi-fonts.tar.bz2 | tar xf -
do-install:
cd ${WRKSRC} && pax -rw -pm *pcf.gz \
- ${DESTDIR}${PREFIX}/lib/X11/fonts/misc/sgi
+ ${DESTDIR}${PREFIX}/share/fonts/X11/misc/sgi
${INSTALL_DATA} ${WRKSRC}/Scr15.pcf \
- ${DESTDIR}${PREFIX}/lib/X11/fonts/misc/sgi
+ ${DESTDIR}${PREFIX}/share/fonts/X11/misc/sgi
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/sgi-fonts/PLIST b/fonts/sgi-fonts/PLIST
index da16effcbd1..4818f20599a 100644
--- a/fonts/sgi-fonts/PLIST
+++ b/fonts/sgi-fonts/PLIST
@@ -1,37 +1,37 @@
-@comment $NetBSD: PLIST,v 1.4 2011/09/29 12:50:23 ryoon Exp $
-lib/X11/fonts/misc/sgi/Scr10.pcf.gz
-lib/X11/fonts/misc/sgi/Scr11.pcf.gz
-lib/X11/fonts/misc/sgi/Scr12.pcf.gz
-lib/X11/fonts/misc/sgi/Scr13.pcf.gz
-lib/X11/fonts/misc/sgi/Scr14.pcf.gz
-lib/X11/fonts/misc/sgi/Scr15.pcf
-lib/X11/fonts/misc/sgi/Scr16.pcf.gz
-lib/X11/fonts/misc/sgi/Scr18.pcf.gz
-lib/X11/fonts/misc/sgi/Scr7.pcf.gz
-lib/X11/fonts/misc/sgi/Scr8.pcf.gz
-lib/X11/fonts/misc/sgi/Scr9.pcf.gz
-lib/X11/fonts/misc/sgi/ScrB10.pcf.gz
-lib/X11/fonts/misc/sgi/ScrB11.pcf.gz
-lib/X11/fonts/misc/sgi/ScrB12.pcf.gz
-lib/X11/fonts/misc/sgi/ScrB13.pcf.gz
-lib/X11/fonts/misc/sgi/ScrB14.pcf.gz
-lib/X11/fonts/misc/sgi/ScrB15.pcf.gz
-lib/X11/fonts/misc/sgi/ScrB16.pcf.gz
-lib/X11/fonts/misc/sgi/ScrB18.pcf.gz
-lib/X11/fonts/misc/sgi/ScrB7.pcf.gz
-lib/X11/fonts/misc/sgi/ScrB8.pcf.gz
-lib/X11/fonts/misc/sgi/ScrB9.pcf.gz
-lib/X11/fonts/misc/sgi/haeberli12.pcf.gz
-lib/X11/fonts/misc/sgi/haeberli24.pcf.gz
-lib/X11/fonts/misc/sgi/haeberli36.pcf.gz
-lib/X11/fonts/misc/sgi/haebfix15.pcf.gz
-lib/X11/fonts/misc/sgi/intl15.pcf.gz
-lib/X11/fonts/misc/sgi/iris10.pcf.gz
-lib/X11/fonts/misc/sgi/iris12.pcf.gz
-lib/X11/fonts/misc/sgi/iris13.pcf.gz
-lib/X11/fonts/misc/sgi/rock12.pcf.gz
-lib/X11/fonts/misc/sgi/rock18.pcf.gz
-lib/X11/fonts/misc/sgi/rock24.pcf.gz
-lib/X11/fonts/misc/sgi/rock36.pcf.gz
-lib/X11/fonts/misc/sgi/space10.pcf.gz
-lib/X11/fonts/misc/sgi/type13.pcf.gz
+@comment $NetBSD: PLIST,v 1.5 2014/06/01 16:35:37 wiz Exp $
+share/fonts/X11/misc/sgi/Scr10.pcf.gz
+share/fonts/X11/misc/sgi/Scr11.pcf.gz
+share/fonts/X11/misc/sgi/Scr12.pcf.gz
+share/fonts/X11/misc/sgi/Scr13.pcf.gz
+share/fonts/X11/misc/sgi/Scr14.pcf.gz
+share/fonts/X11/misc/sgi/Scr15.pcf
+share/fonts/X11/misc/sgi/Scr16.pcf.gz
+share/fonts/X11/misc/sgi/Scr18.pcf.gz
+share/fonts/X11/misc/sgi/Scr7.pcf.gz
+share/fonts/X11/misc/sgi/Scr8.pcf.gz
+share/fonts/X11/misc/sgi/Scr9.pcf.gz
+share/fonts/X11/misc/sgi/ScrB10.pcf.gz
+share/fonts/X11/misc/sgi/ScrB11.pcf.gz
+share/fonts/X11/misc/sgi/ScrB12.pcf.gz
+share/fonts/X11/misc/sgi/ScrB13.pcf.gz
+share/fonts/X11/misc/sgi/ScrB14.pcf.gz
+share/fonts/X11/misc/sgi/ScrB15.pcf.gz
+share/fonts/X11/misc/sgi/ScrB16.pcf.gz
+share/fonts/X11/misc/sgi/ScrB18.pcf.gz
+share/fonts/X11/misc/sgi/ScrB7.pcf.gz
+share/fonts/X11/misc/sgi/ScrB8.pcf.gz
+share/fonts/X11/misc/sgi/ScrB9.pcf.gz
+share/fonts/X11/misc/sgi/haeberli12.pcf.gz
+share/fonts/X11/misc/sgi/haeberli24.pcf.gz
+share/fonts/X11/misc/sgi/haeberli36.pcf.gz
+share/fonts/X11/misc/sgi/haebfix15.pcf.gz
+share/fonts/X11/misc/sgi/intl15.pcf.gz
+share/fonts/X11/misc/sgi/iris10.pcf.gz
+share/fonts/X11/misc/sgi/iris12.pcf.gz
+share/fonts/X11/misc/sgi/iris13.pcf.gz
+share/fonts/X11/misc/sgi/rock12.pcf.gz
+share/fonts/X11/misc/sgi/rock18.pcf.gz
+share/fonts/X11/misc/sgi/rock24.pcf.gz
+share/fonts/X11/misc/sgi/rock36.pcf.gz
+share/fonts/X11/misc/sgi/space10.pcf.gz
+share/fonts/X11/misc/sgi/type13.pcf.gz
diff --git a/fonts/takao-fonts-ttf/Makefile b/fonts/takao-fonts-ttf/Makefile
index 3f6e4b98f0f..caebc77c15a 100644
--- a/fonts/takao-fonts-ttf/Makefile
+++ b/fonts/takao-fonts-ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2012/10/03 18:28:30 asau Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:37 wiz Exp $
#
DISTNAME= takao-fonts-ttf-003.02.01
+PKGREVISION= 1
CATEGORIES= fonts japanese
MASTER_SITES= http://launchpad.net/takao-fonts/003.02/003.02.01/+download/
@@ -16,10 +17,10 @@ NO_BUILD= YES
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
-INSTALLATION_DIRS= lib/X11/fonts/TTF \
+INSTALLATION_DIRS= share/fonts/X11/TTF \
${DOCSDIR}
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
INSTALL_FONTS= TakaoExGothic.ttf \
diff --git a/fonts/takao-fonts-ttf/PLIST b/fonts/takao-fonts-ttf/PLIST
index 9914059ac53..53770a3ae56 100644
--- a/fonts/takao-fonts-ttf/PLIST
+++ b/fonts/takao-fonts-ttf/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/04/17 09:20:56 obache Exp $
-lib/X11/fonts/TTF/TakaoExGothic.ttf
-lib/X11/fonts/TTF/TakaoExMincho.ttf
-lib/X11/fonts/TTF/TakaoGothic.ttf
-lib/X11/fonts/TTF/TakaoMincho.ttf
-lib/X11/fonts/TTF/TakaoPGothic.ttf
-lib/X11/fonts/TTF/TakaoPMincho.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:37 wiz Exp $
+share/fonts/X11/TTF/TakaoExGothic.ttf
+share/fonts/X11/TTF/TakaoExMincho.ttf
+share/fonts/X11/TTF/TakaoGothic.ttf
+share/fonts/X11/TTF/TakaoMincho.ttf
+share/fonts/X11/TTF/TakaoPGothic.ttf
+share/fonts/X11/TTF/TakaoPMincho.ttf
share/doc/${PKGBASE}/ChangeLog
share/doc/${PKGBASE}/IPA_Font_License_Agreement_v1.0.txt
share/doc/${PKGBASE}/README
diff --git a/fonts/tamsyn-font/Makefile b/fonts/tamsyn-font/Makefile
index b38fd609c88..aabe9739eea 100644
--- a/fonts/tamsyn-font/Makefile
+++ b/fonts/tamsyn-font/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2012/10/03 18:28:31 asau Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:37 wiz Exp $
#
DISTNAME= tamsyn-font-1.9
+PKGREVISION= 1
CATEGORIES= fonts x11
MASTER_SITES= http://www.fial.com/~scott/tamsyn-font/download/
@@ -11,7 +12,7 @@ COMMENT= Monospaced programming font
# even less restrictions than that
LICENSE= isc
-FONTDIR= ${PREFIX}/lib/X11/fonts/tamsyn-font
+FONTDIR= ${PREFIX}/share/fonts/X11/tamsyn-font
FONTS_DIRS.x11+= ${FONTDIR}
INSTALLATION_DIRS= ${FONTDIR} share/doc/tamsyn-font
diff --git a/fonts/tamsyn-font/PLIST b/fonts/tamsyn-font/PLIST
index 312be4480e4..b2bce34ac34 100644
--- a/fonts/tamsyn-font/PLIST
+++ b/fonts/tamsyn-font/PLIST
@@ -1,27 +1,27 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/20 15:00:12 wiz Exp $
-lib/X11/fonts/tamsyn-font/Tamsyn10x20b.pcf
-lib/X11/fonts/tamsyn-font/Tamsyn10x20b.psf.gz
-lib/X11/fonts/tamsyn-font/Tamsyn10x20r.pcf
-lib/X11/fonts/tamsyn-font/Tamsyn10x20r.psf.gz
-lib/X11/fonts/tamsyn-font/Tamsyn5x9b.pcf
-lib/X11/fonts/tamsyn-font/Tamsyn5x9b.psf.gz
-lib/X11/fonts/tamsyn-font/Tamsyn5x9r.pcf
-lib/X11/fonts/tamsyn-font/Tamsyn5x9r.psf.gz
-lib/X11/fonts/tamsyn-font/Tamsyn6x12b.pcf
-lib/X11/fonts/tamsyn-font/Tamsyn6x12b.psf.gz
-lib/X11/fonts/tamsyn-font/Tamsyn6x12r.pcf
-lib/X11/fonts/tamsyn-font/Tamsyn6x12r.psf.gz
-lib/X11/fonts/tamsyn-font/Tamsyn7x14b.pcf
-lib/X11/fonts/tamsyn-font/Tamsyn7x14b.psf.gz
-lib/X11/fonts/tamsyn-font/Tamsyn7x14r.pcf
-lib/X11/fonts/tamsyn-font/Tamsyn7x14r.psf.gz
-lib/X11/fonts/tamsyn-font/Tamsyn8x15b.pcf
-lib/X11/fonts/tamsyn-font/Tamsyn8x15b.psf.gz
-lib/X11/fonts/tamsyn-font/Tamsyn8x15r.pcf
-lib/X11/fonts/tamsyn-font/Tamsyn8x15r.psf.gz
-lib/X11/fonts/tamsyn-font/Tamsyn8x17b.pcf
-lib/X11/fonts/tamsyn-font/Tamsyn8x17b.psf.gz
-lib/X11/fonts/tamsyn-font/Tamsyn8x17r.pcf
-lib/X11/fonts/tamsyn-font/Tamsyn8x17r.psf.gz
+@comment $NetBSD: PLIST,v 1.3 2014/06/01 16:35:37 wiz Exp $
+share/fonts/X11/tamsyn-font/Tamsyn10x20b.pcf
+share/fonts/X11/tamsyn-font/Tamsyn10x20b.psf.gz
+share/fonts/X11/tamsyn-font/Tamsyn10x20r.pcf
+share/fonts/X11/tamsyn-font/Tamsyn10x20r.psf.gz
+share/fonts/X11/tamsyn-font/Tamsyn5x9b.pcf
+share/fonts/X11/tamsyn-font/Tamsyn5x9b.psf.gz
+share/fonts/X11/tamsyn-font/Tamsyn5x9r.pcf
+share/fonts/X11/tamsyn-font/Tamsyn5x9r.psf.gz
+share/fonts/X11/tamsyn-font/Tamsyn6x12b.pcf
+share/fonts/X11/tamsyn-font/Tamsyn6x12b.psf.gz
+share/fonts/X11/tamsyn-font/Tamsyn6x12r.pcf
+share/fonts/X11/tamsyn-font/Tamsyn6x12r.psf.gz
+share/fonts/X11/tamsyn-font/Tamsyn7x14b.pcf
+share/fonts/X11/tamsyn-font/Tamsyn7x14b.psf.gz
+share/fonts/X11/tamsyn-font/Tamsyn7x14r.pcf
+share/fonts/X11/tamsyn-font/Tamsyn7x14r.psf.gz
+share/fonts/X11/tamsyn-font/Tamsyn8x15b.pcf
+share/fonts/X11/tamsyn-font/Tamsyn8x15b.psf.gz
+share/fonts/X11/tamsyn-font/Tamsyn8x15r.pcf
+share/fonts/X11/tamsyn-font/Tamsyn8x15r.psf.gz
+share/fonts/X11/tamsyn-font/Tamsyn8x17b.pcf
+share/fonts/X11/tamsyn-font/Tamsyn8x17b.psf.gz
+share/fonts/X11/tamsyn-font/Tamsyn8x17r.pcf
+share/fonts/X11/tamsyn-font/Tamsyn8x17r.psf.gz
share/doc/tamsyn-font/LICENSE
share/doc/tamsyn-font/README
diff --git a/fonts/terminus-font/Makefile b/fonts/terminus-font/Makefile
index a8757caa30b..de618ed4a23 100644
--- a/fonts/terminus-font/Makefile
+++ b/fonts/terminus-font/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2014/05/29 23:36:35 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2014/06/01 16:35:37 wiz Exp $
#
DISTNAME= terminus-font-4.38
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=terminus-font/}
@@ -13,13 +13,13 @@ LICENSE= ofl-v1.1
USE_TOOLS+= bdftopcf gmake gzip perl
HAS_CONFIGURE= yes
-CONFIGURE_ARGS+= --x11dir=${PREFIX}/lib/X11/fonts/misc
+CONFIGURE_ARGS+= --x11dir=${PREFIX}/share/fonts/X11/misc
BUILD_TARGET= pcf
INSTALL_TARGET= install-pcf
-FONTS_DIRS.x11= ${PREFIX}/lib/X11/fonts/misc
-REQD_DIRS+= ${PREFIX}/lib/X11/fonts/misc
+FONTS_DIRS.x11= ${PREFIX}/share/fonts/X11/misc
+REQD_DIRS+= ${PREFIX}/share/fonts/X11/misc
USE_LANGUAGES= # none
diff --git a/fonts/terminus-font/PLIST b/fonts/terminus-font/PLIST
index 81136df16da..0b8842d9910 100644
--- a/fonts/terminus-font/PLIST
+++ b/fonts/terminus-font/PLIST
@@ -1,238 +1,238 @@
-@comment $NetBSD: PLIST,v 1.4 2012/10/21 12:52:14 cheusov Exp $
-lib/X11/fonts/misc/ter-112b.pcf.gz
-lib/X11/fonts/misc/ter-112n.pcf.gz
-lib/X11/fonts/misc/ter-114b.pcf.gz
-lib/X11/fonts/misc/ter-114n.pcf.gz
-lib/X11/fonts/misc/ter-116b.pcf.gz
-lib/X11/fonts/misc/ter-116n.pcf.gz
-lib/X11/fonts/misc/ter-118b.pcf.gz
-lib/X11/fonts/misc/ter-118n.pcf.gz
-lib/X11/fonts/misc/ter-120b.pcf.gz
-lib/X11/fonts/misc/ter-120n.pcf.gz
-lib/X11/fonts/misc/ter-122b.pcf.gz
-lib/X11/fonts/misc/ter-122n.pcf.gz
-lib/X11/fonts/misc/ter-124b.pcf.gz
-lib/X11/fonts/misc/ter-124n.pcf.gz
-lib/X11/fonts/misc/ter-128b.pcf.gz
-lib/X11/fonts/misc/ter-128n.pcf.gz
-lib/X11/fonts/misc/ter-132b.pcf.gz
-lib/X11/fonts/misc/ter-132n.pcf.gz
-lib/X11/fonts/misc/ter-212b.pcf.gz
-lib/X11/fonts/misc/ter-212n.pcf.gz
-lib/X11/fonts/misc/ter-214b.pcf.gz
-lib/X11/fonts/misc/ter-214n.pcf.gz
-lib/X11/fonts/misc/ter-216b.pcf.gz
-lib/X11/fonts/misc/ter-216n.pcf.gz
-lib/X11/fonts/misc/ter-218b.pcf.gz
-lib/X11/fonts/misc/ter-218n.pcf.gz
-lib/X11/fonts/misc/ter-220b.pcf.gz
-lib/X11/fonts/misc/ter-220n.pcf.gz
-lib/X11/fonts/misc/ter-222b.pcf.gz
-lib/X11/fonts/misc/ter-222n.pcf.gz
-lib/X11/fonts/misc/ter-224b.pcf.gz
-lib/X11/fonts/misc/ter-224n.pcf.gz
-lib/X11/fonts/misc/ter-228b.pcf.gz
-lib/X11/fonts/misc/ter-228n.pcf.gz
-lib/X11/fonts/misc/ter-232b.pcf.gz
-lib/X11/fonts/misc/ter-232n.pcf.gz
-lib/X11/fonts/misc/ter-512b.pcf.gz
-lib/X11/fonts/misc/ter-512n.pcf.gz
-lib/X11/fonts/misc/ter-514b.pcf.gz
-lib/X11/fonts/misc/ter-514n.pcf.gz
-lib/X11/fonts/misc/ter-516b.pcf.gz
-lib/X11/fonts/misc/ter-516n.pcf.gz
-lib/X11/fonts/misc/ter-518b.pcf.gz
-lib/X11/fonts/misc/ter-518n.pcf.gz
-lib/X11/fonts/misc/ter-520b.pcf.gz
-lib/X11/fonts/misc/ter-520n.pcf.gz
-lib/X11/fonts/misc/ter-522b.pcf.gz
-lib/X11/fonts/misc/ter-522n.pcf.gz
-lib/X11/fonts/misc/ter-524b.pcf.gz
-lib/X11/fonts/misc/ter-524n.pcf.gz
-lib/X11/fonts/misc/ter-528b.pcf.gz
-lib/X11/fonts/misc/ter-528n.pcf.gz
-lib/X11/fonts/misc/ter-532b.pcf.gz
-lib/X11/fonts/misc/ter-532n.pcf.gz
-lib/X11/fonts/misc/ter-712b.pcf.gz
-lib/X11/fonts/misc/ter-712n.pcf.gz
-lib/X11/fonts/misc/ter-714b.pcf.gz
-lib/X11/fonts/misc/ter-714n.pcf.gz
-lib/X11/fonts/misc/ter-716b.pcf.gz
-lib/X11/fonts/misc/ter-716n.pcf.gz
-lib/X11/fonts/misc/ter-718b.pcf.gz
-lib/X11/fonts/misc/ter-718n.pcf.gz
-lib/X11/fonts/misc/ter-720b.pcf.gz
-lib/X11/fonts/misc/ter-720n.pcf.gz
-lib/X11/fonts/misc/ter-722b.pcf.gz
-lib/X11/fonts/misc/ter-722n.pcf.gz
-lib/X11/fonts/misc/ter-724b.pcf.gz
-lib/X11/fonts/misc/ter-724n.pcf.gz
-lib/X11/fonts/misc/ter-728b.pcf.gz
-lib/X11/fonts/misc/ter-728n.pcf.gz
-lib/X11/fonts/misc/ter-732b.pcf.gz
-lib/X11/fonts/misc/ter-732n.pcf.gz
-lib/X11/fonts/misc/ter-912b.pcf.gz
-lib/X11/fonts/misc/ter-912n.pcf.gz
-lib/X11/fonts/misc/ter-914b.pcf.gz
-lib/X11/fonts/misc/ter-914n.pcf.gz
-lib/X11/fonts/misc/ter-916b.pcf.gz
-lib/X11/fonts/misc/ter-916n.pcf.gz
-lib/X11/fonts/misc/ter-918b.pcf.gz
-lib/X11/fonts/misc/ter-918n.pcf.gz
-lib/X11/fonts/misc/ter-920b.pcf.gz
-lib/X11/fonts/misc/ter-920n.pcf.gz
-lib/X11/fonts/misc/ter-922b.pcf.gz
-lib/X11/fonts/misc/ter-922n.pcf.gz
-lib/X11/fonts/misc/ter-924b.pcf.gz
-lib/X11/fonts/misc/ter-924n.pcf.gz
-lib/X11/fonts/misc/ter-928b.pcf.gz
-lib/X11/fonts/misc/ter-928n.pcf.gz
-lib/X11/fonts/misc/ter-932b.pcf.gz
-lib/X11/fonts/misc/ter-932n.pcf.gz
-lib/X11/fonts/misc/ter-c12b.pcf.gz
-lib/X11/fonts/misc/ter-c12n.pcf.gz
-lib/X11/fonts/misc/ter-c14b.pcf.gz
-lib/X11/fonts/misc/ter-c14n.pcf.gz
-lib/X11/fonts/misc/ter-c16b.pcf.gz
-lib/X11/fonts/misc/ter-c16n.pcf.gz
-lib/X11/fonts/misc/ter-c18b.pcf.gz
-lib/X11/fonts/misc/ter-c18n.pcf.gz
-lib/X11/fonts/misc/ter-c20b.pcf.gz
-lib/X11/fonts/misc/ter-c20n.pcf.gz
-lib/X11/fonts/misc/ter-c22b.pcf.gz
-lib/X11/fonts/misc/ter-c22n.pcf.gz
-lib/X11/fonts/misc/ter-c24b.pcf.gz
-lib/X11/fonts/misc/ter-c24n.pcf.gz
-lib/X11/fonts/misc/ter-c28b.pcf.gz
-lib/X11/fonts/misc/ter-c28n.pcf.gz
-lib/X11/fonts/misc/ter-c32b.pcf.gz
-lib/X11/fonts/misc/ter-c32n.pcf.gz
-lib/X11/fonts/misc/ter-d12b.pcf.gz
-lib/X11/fonts/misc/ter-d12n.pcf.gz
-lib/X11/fonts/misc/ter-d14b.pcf.gz
-lib/X11/fonts/misc/ter-d14n.pcf.gz
-lib/X11/fonts/misc/ter-d16b.pcf.gz
-lib/X11/fonts/misc/ter-d16n.pcf.gz
-lib/X11/fonts/misc/ter-d18b.pcf.gz
-lib/X11/fonts/misc/ter-d18n.pcf.gz
-lib/X11/fonts/misc/ter-d20b.pcf.gz
-lib/X11/fonts/misc/ter-d20n.pcf.gz
-lib/X11/fonts/misc/ter-d22b.pcf.gz
-lib/X11/fonts/misc/ter-d22n.pcf.gz
-lib/X11/fonts/misc/ter-d24b.pcf.gz
-lib/X11/fonts/misc/ter-d24n.pcf.gz
-lib/X11/fonts/misc/ter-d28b.pcf.gz
-lib/X11/fonts/misc/ter-d28n.pcf.gz
-lib/X11/fonts/misc/ter-d32b.pcf.gz
-lib/X11/fonts/misc/ter-d32n.pcf.gz
-lib/X11/fonts/misc/ter-f12b.pcf.gz
-lib/X11/fonts/misc/ter-f12n.pcf.gz
-lib/X11/fonts/misc/ter-f14b.pcf.gz
-lib/X11/fonts/misc/ter-f14n.pcf.gz
-lib/X11/fonts/misc/ter-f16b.pcf.gz
-lib/X11/fonts/misc/ter-f16n.pcf.gz
-lib/X11/fonts/misc/ter-f18b.pcf.gz
-lib/X11/fonts/misc/ter-f18n.pcf.gz
-lib/X11/fonts/misc/ter-f20b.pcf.gz
-lib/X11/fonts/misc/ter-f20n.pcf.gz
-lib/X11/fonts/misc/ter-f22b.pcf.gz
-lib/X11/fonts/misc/ter-f22n.pcf.gz
-lib/X11/fonts/misc/ter-f24b.pcf.gz
-lib/X11/fonts/misc/ter-f24n.pcf.gz
-lib/X11/fonts/misc/ter-f28b.pcf.gz
-lib/X11/fonts/misc/ter-f28n.pcf.gz
-lib/X11/fonts/misc/ter-f32b.pcf.gz
-lib/X11/fonts/misc/ter-f32n.pcf.gz
-lib/X11/fonts/misc/ter-g12b.pcf.gz
-lib/X11/fonts/misc/ter-g12n.pcf.gz
-lib/X11/fonts/misc/ter-g14b.pcf.gz
-lib/X11/fonts/misc/ter-g14n.pcf.gz
-lib/X11/fonts/misc/ter-g16b.pcf.gz
-lib/X11/fonts/misc/ter-g16n.pcf.gz
-lib/X11/fonts/misc/ter-g18b.pcf.gz
-lib/X11/fonts/misc/ter-g18n.pcf.gz
-lib/X11/fonts/misc/ter-g20b.pcf.gz
-lib/X11/fonts/misc/ter-g20n.pcf.gz
-lib/X11/fonts/misc/ter-g22b.pcf.gz
-lib/X11/fonts/misc/ter-g22n.pcf.gz
-lib/X11/fonts/misc/ter-g24b.pcf.gz
-lib/X11/fonts/misc/ter-g24n.pcf.gz
-lib/X11/fonts/misc/ter-g28b.pcf.gz
-lib/X11/fonts/misc/ter-g28n.pcf.gz
-lib/X11/fonts/misc/ter-g32b.pcf.gz
-lib/X11/fonts/misc/ter-g32n.pcf.gz
-lib/X11/fonts/misc/ter-k12b.pcf.gz
-lib/X11/fonts/misc/ter-k12n.pcf.gz
-lib/X11/fonts/misc/ter-k14b.pcf.gz
-lib/X11/fonts/misc/ter-k14n.pcf.gz
-lib/X11/fonts/misc/ter-k16b.pcf.gz
-lib/X11/fonts/misc/ter-k16n.pcf.gz
-lib/X11/fonts/misc/ter-k18b.pcf.gz
-lib/X11/fonts/misc/ter-k18n.pcf.gz
-lib/X11/fonts/misc/ter-k20b.pcf.gz
-lib/X11/fonts/misc/ter-k20n.pcf.gz
-lib/X11/fonts/misc/ter-k22b.pcf.gz
-lib/X11/fonts/misc/ter-k22n.pcf.gz
-lib/X11/fonts/misc/ter-k24b.pcf.gz
-lib/X11/fonts/misc/ter-k24n.pcf.gz
-lib/X11/fonts/misc/ter-k28b.pcf.gz
-lib/X11/fonts/misc/ter-k28n.pcf.gz
-lib/X11/fonts/misc/ter-k32b.pcf.gz
-lib/X11/fonts/misc/ter-k32n.pcf.gz
-lib/X11/fonts/misc/ter-p12b.pcf.gz
-lib/X11/fonts/misc/ter-p12n.pcf.gz
-lib/X11/fonts/misc/ter-p14b.pcf.gz
-lib/X11/fonts/misc/ter-p14n.pcf.gz
-lib/X11/fonts/misc/ter-p16b.pcf.gz
-lib/X11/fonts/misc/ter-p16n.pcf.gz
-lib/X11/fonts/misc/ter-p18b.pcf.gz
-lib/X11/fonts/misc/ter-p18n.pcf.gz
-lib/X11/fonts/misc/ter-p20b.pcf.gz
-lib/X11/fonts/misc/ter-p20n.pcf.gz
-lib/X11/fonts/misc/ter-p22b.pcf.gz
-lib/X11/fonts/misc/ter-p22n.pcf.gz
-lib/X11/fonts/misc/ter-p24b.pcf.gz
-lib/X11/fonts/misc/ter-p24n.pcf.gz
-lib/X11/fonts/misc/ter-p28b.pcf.gz
-lib/X11/fonts/misc/ter-p28n.pcf.gz
-lib/X11/fonts/misc/ter-p32b.pcf.gz
-lib/X11/fonts/misc/ter-p32n.pcf.gz
-lib/X11/fonts/misc/ter-u12b.pcf.gz
-lib/X11/fonts/misc/ter-u12n.pcf.gz
-lib/X11/fonts/misc/ter-u14b.pcf.gz
-lib/X11/fonts/misc/ter-u14n.pcf.gz
-lib/X11/fonts/misc/ter-u16b.pcf.gz
-lib/X11/fonts/misc/ter-u16n.pcf.gz
-lib/X11/fonts/misc/ter-u18b.pcf.gz
-lib/X11/fonts/misc/ter-u18n.pcf.gz
-lib/X11/fonts/misc/ter-u20b.pcf.gz
-lib/X11/fonts/misc/ter-u20n.pcf.gz
-lib/X11/fonts/misc/ter-u22b.pcf.gz
-lib/X11/fonts/misc/ter-u22n.pcf.gz
-lib/X11/fonts/misc/ter-u24b.pcf.gz
-lib/X11/fonts/misc/ter-u24n.pcf.gz
-lib/X11/fonts/misc/ter-u28b.pcf.gz
-lib/X11/fonts/misc/ter-u28n.pcf.gz
-lib/X11/fonts/misc/ter-u32b.pcf.gz
-lib/X11/fonts/misc/ter-u32n.pcf.gz
-lib/X11/fonts/misc/ter-x12b.pcf.gz
-lib/X11/fonts/misc/ter-x12n.pcf.gz
-lib/X11/fonts/misc/ter-x14b.pcf.gz
-lib/X11/fonts/misc/ter-x14n.pcf.gz
-lib/X11/fonts/misc/ter-x16b.pcf.gz
-lib/X11/fonts/misc/ter-x16n.pcf.gz
-lib/X11/fonts/misc/ter-x18b.pcf.gz
-lib/X11/fonts/misc/ter-x18n.pcf.gz
-lib/X11/fonts/misc/ter-x20b.pcf.gz
-lib/X11/fonts/misc/ter-x20n.pcf.gz
-lib/X11/fonts/misc/ter-x22b.pcf.gz
-lib/X11/fonts/misc/ter-x22n.pcf.gz
-lib/X11/fonts/misc/ter-x24b.pcf.gz
-lib/X11/fonts/misc/ter-x24n.pcf.gz
-lib/X11/fonts/misc/ter-x28b.pcf.gz
-lib/X11/fonts/misc/ter-x28n.pcf.gz
-lib/X11/fonts/misc/ter-x32b.pcf.gz
-lib/X11/fonts/misc/ter-x32n.pcf.gz
+@comment $NetBSD: PLIST,v 1.5 2014/06/01 16:35:37 wiz Exp $
+share/fonts/X11/misc/ter-112b.pcf.gz
+share/fonts/X11/misc/ter-112n.pcf.gz
+share/fonts/X11/misc/ter-114b.pcf.gz
+share/fonts/X11/misc/ter-114n.pcf.gz
+share/fonts/X11/misc/ter-116b.pcf.gz
+share/fonts/X11/misc/ter-116n.pcf.gz
+share/fonts/X11/misc/ter-118b.pcf.gz
+share/fonts/X11/misc/ter-118n.pcf.gz
+share/fonts/X11/misc/ter-120b.pcf.gz
+share/fonts/X11/misc/ter-120n.pcf.gz
+share/fonts/X11/misc/ter-122b.pcf.gz
+share/fonts/X11/misc/ter-122n.pcf.gz
+share/fonts/X11/misc/ter-124b.pcf.gz
+share/fonts/X11/misc/ter-124n.pcf.gz
+share/fonts/X11/misc/ter-128b.pcf.gz
+share/fonts/X11/misc/ter-128n.pcf.gz
+share/fonts/X11/misc/ter-132b.pcf.gz
+share/fonts/X11/misc/ter-132n.pcf.gz
+share/fonts/X11/misc/ter-212b.pcf.gz
+share/fonts/X11/misc/ter-212n.pcf.gz
+share/fonts/X11/misc/ter-214b.pcf.gz
+share/fonts/X11/misc/ter-214n.pcf.gz
+share/fonts/X11/misc/ter-216b.pcf.gz
+share/fonts/X11/misc/ter-216n.pcf.gz
+share/fonts/X11/misc/ter-218b.pcf.gz
+share/fonts/X11/misc/ter-218n.pcf.gz
+share/fonts/X11/misc/ter-220b.pcf.gz
+share/fonts/X11/misc/ter-220n.pcf.gz
+share/fonts/X11/misc/ter-222b.pcf.gz
+share/fonts/X11/misc/ter-222n.pcf.gz
+share/fonts/X11/misc/ter-224b.pcf.gz
+share/fonts/X11/misc/ter-224n.pcf.gz
+share/fonts/X11/misc/ter-228b.pcf.gz
+share/fonts/X11/misc/ter-228n.pcf.gz
+share/fonts/X11/misc/ter-232b.pcf.gz
+share/fonts/X11/misc/ter-232n.pcf.gz
+share/fonts/X11/misc/ter-512b.pcf.gz
+share/fonts/X11/misc/ter-512n.pcf.gz
+share/fonts/X11/misc/ter-514b.pcf.gz
+share/fonts/X11/misc/ter-514n.pcf.gz
+share/fonts/X11/misc/ter-516b.pcf.gz
+share/fonts/X11/misc/ter-516n.pcf.gz
+share/fonts/X11/misc/ter-518b.pcf.gz
+share/fonts/X11/misc/ter-518n.pcf.gz
+share/fonts/X11/misc/ter-520b.pcf.gz
+share/fonts/X11/misc/ter-520n.pcf.gz
+share/fonts/X11/misc/ter-522b.pcf.gz
+share/fonts/X11/misc/ter-522n.pcf.gz
+share/fonts/X11/misc/ter-524b.pcf.gz
+share/fonts/X11/misc/ter-524n.pcf.gz
+share/fonts/X11/misc/ter-528b.pcf.gz
+share/fonts/X11/misc/ter-528n.pcf.gz
+share/fonts/X11/misc/ter-532b.pcf.gz
+share/fonts/X11/misc/ter-532n.pcf.gz
+share/fonts/X11/misc/ter-712b.pcf.gz
+share/fonts/X11/misc/ter-712n.pcf.gz
+share/fonts/X11/misc/ter-714b.pcf.gz
+share/fonts/X11/misc/ter-714n.pcf.gz
+share/fonts/X11/misc/ter-716b.pcf.gz
+share/fonts/X11/misc/ter-716n.pcf.gz
+share/fonts/X11/misc/ter-718b.pcf.gz
+share/fonts/X11/misc/ter-718n.pcf.gz
+share/fonts/X11/misc/ter-720b.pcf.gz
+share/fonts/X11/misc/ter-720n.pcf.gz
+share/fonts/X11/misc/ter-722b.pcf.gz
+share/fonts/X11/misc/ter-722n.pcf.gz
+share/fonts/X11/misc/ter-724b.pcf.gz
+share/fonts/X11/misc/ter-724n.pcf.gz
+share/fonts/X11/misc/ter-728b.pcf.gz
+share/fonts/X11/misc/ter-728n.pcf.gz
+share/fonts/X11/misc/ter-732b.pcf.gz
+share/fonts/X11/misc/ter-732n.pcf.gz
+share/fonts/X11/misc/ter-912b.pcf.gz
+share/fonts/X11/misc/ter-912n.pcf.gz
+share/fonts/X11/misc/ter-914b.pcf.gz
+share/fonts/X11/misc/ter-914n.pcf.gz
+share/fonts/X11/misc/ter-916b.pcf.gz
+share/fonts/X11/misc/ter-916n.pcf.gz
+share/fonts/X11/misc/ter-918b.pcf.gz
+share/fonts/X11/misc/ter-918n.pcf.gz
+share/fonts/X11/misc/ter-920b.pcf.gz
+share/fonts/X11/misc/ter-920n.pcf.gz
+share/fonts/X11/misc/ter-922b.pcf.gz
+share/fonts/X11/misc/ter-922n.pcf.gz
+share/fonts/X11/misc/ter-924b.pcf.gz
+share/fonts/X11/misc/ter-924n.pcf.gz
+share/fonts/X11/misc/ter-928b.pcf.gz
+share/fonts/X11/misc/ter-928n.pcf.gz
+share/fonts/X11/misc/ter-932b.pcf.gz
+share/fonts/X11/misc/ter-932n.pcf.gz
+share/fonts/X11/misc/ter-c12b.pcf.gz
+share/fonts/X11/misc/ter-c12n.pcf.gz
+share/fonts/X11/misc/ter-c14b.pcf.gz
+share/fonts/X11/misc/ter-c14n.pcf.gz
+share/fonts/X11/misc/ter-c16b.pcf.gz
+share/fonts/X11/misc/ter-c16n.pcf.gz
+share/fonts/X11/misc/ter-c18b.pcf.gz
+share/fonts/X11/misc/ter-c18n.pcf.gz
+share/fonts/X11/misc/ter-c20b.pcf.gz
+share/fonts/X11/misc/ter-c20n.pcf.gz
+share/fonts/X11/misc/ter-c22b.pcf.gz
+share/fonts/X11/misc/ter-c22n.pcf.gz
+share/fonts/X11/misc/ter-c24b.pcf.gz
+share/fonts/X11/misc/ter-c24n.pcf.gz
+share/fonts/X11/misc/ter-c28b.pcf.gz
+share/fonts/X11/misc/ter-c28n.pcf.gz
+share/fonts/X11/misc/ter-c32b.pcf.gz
+share/fonts/X11/misc/ter-c32n.pcf.gz
+share/fonts/X11/misc/ter-d12b.pcf.gz
+share/fonts/X11/misc/ter-d12n.pcf.gz
+share/fonts/X11/misc/ter-d14b.pcf.gz
+share/fonts/X11/misc/ter-d14n.pcf.gz
+share/fonts/X11/misc/ter-d16b.pcf.gz
+share/fonts/X11/misc/ter-d16n.pcf.gz
+share/fonts/X11/misc/ter-d18b.pcf.gz
+share/fonts/X11/misc/ter-d18n.pcf.gz
+share/fonts/X11/misc/ter-d20b.pcf.gz
+share/fonts/X11/misc/ter-d20n.pcf.gz
+share/fonts/X11/misc/ter-d22b.pcf.gz
+share/fonts/X11/misc/ter-d22n.pcf.gz
+share/fonts/X11/misc/ter-d24b.pcf.gz
+share/fonts/X11/misc/ter-d24n.pcf.gz
+share/fonts/X11/misc/ter-d28b.pcf.gz
+share/fonts/X11/misc/ter-d28n.pcf.gz
+share/fonts/X11/misc/ter-d32b.pcf.gz
+share/fonts/X11/misc/ter-d32n.pcf.gz
+share/fonts/X11/misc/ter-f12b.pcf.gz
+share/fonts/X11/misc/ter-f12n.pcf.gz
+share/fonts/X11/misc/ter-f14b.pcf.gz
+share/fonts/X11/misc/ter-f14n.pcf.gz
+share/fonts/X11/misc/ter-f16b.pcf.gz
+share/fonts/X11/misc/ter-f16n.pcf.gz
+share/fonts/X11/misc/ter-f18b.pcf.gz
+share/fonts/X11/misc/ter-f18n.pcf.gz
+share/fonts/X11/misc/ter-f20b.pcf.gz
+share/fonts/X11/misc/ter-f20n.pcf.gz
+share/fonts/X11/misc/ter-f22b.pcf.gz
+share/fonts/X11/misc/ter-f22n.pcf.gz
+share/fonts/X11/misc/ter-f24b.pcf.gz
+share/fonts/X11/misc/ter-f24n.pcf.gz
+share/fonts/X11/misc/ter-f28b.pcf.gz
+share/fonts/X11/misc/ter-f28n.pcf.gz
+share/fonts/X11/misc/ter-f32b.pcf.gz
+share/fonts/X11/misc/ter-f32n.pcf.gz
+share/fonts/X11/misc/ter-g12b.pcf.gz
+share/fonts/X11/misc/ter-g12n.pcf.gz
+share/fonts/X11/misc/ter-g14b.pcf.gz
+share/fonts/X11/misc/ter-g14n.pcf.gz
+share/fonts/X11/misc/ter-g16b.pcf.gz
+share/fonts/X11/misc/ter-g16n.pcf.gz
+share/fonts/X11/misc/ter-g18b.pcf.gz
+share/fonts/X11/misc/ter-g18n.pcf.gz
+share/fonts/X11/misc/ter-g20b.pcf.gz
+share/fonts/X11/misc/ter-g20n.pcf.gz
+share/fonts/X11/misc/ter-g22b.pcf.gz
+share/fonts/X11/misc/ter-g22n.pcf.gz
+share/fonts/X11/misc/ter-g24b.pcf.gz
+share/fonts/X11/misc/ter-g24n.pcf.gz
+share/fonts/X11/misc/ter-g28b.pcf.gz
+share/fonts/X11/misc/ter-g28n.pcf.gz
+share/fonts/X11/misc/ter-g32b.pcf.gz
+share/fonts/X11/misc/ter-g32n.pcf.gz
+share/fonts/X11/misc/ter-k12b.pcf.gz
+share/fonts/X11/misc/ter-k12n.pcf.gz
+share/fonts/X11/misc/ter-k14b.pcf.gz
+share/fonts/X11/misc/ter-k14n.pcf.gz
+share/fonts/X11/misc/ter-k16b.pcf.gz
+share/fonts/X11/misc/ter-k16n.pcf.gz
+share/fonts/X11/misc/ter-k18b.pcf.gz
+share/fonts/X11/misc/ter-k18n.pcf.gz
+share/fonts/X11/misc/ter-k20b.pcf.gz
+share/fonts/X11/misc/ter-k20n.pcf.gz
+share/fonts/X11/misc/ter-k22b.pcf.gz
+share/fonts/X11/misc/ter-k22n.pcf.gz
+share/fonts/X11/misc/ter-k24b.pcf.gz
+share/fonts/X11/misc/ter-k24n.pcf.gz
+share/fonts/X11/misc/ter-k28b.pcf.gz
+share/fonts/X11/misc/ter-k28n.pcf.gz
+share/fonts/X11/misc/ter-k32b.pcf.gz
+share/fonts/X11/misc/ter-k32n.pcf.gz
+share/fonts/X11/misc/ter-p12b.pcf.gz
+share/fonts/X11/misc/ter-p12n.pcf.gz
+share/fonts/X11/misc/ter-p14b.pcf.gz
+share/fonts/X11/misc/ter-p14n.pcf.gz
+share/fonts/X11/misc/ter-p16b.pcf.gz
+share/fonts/X11/misc/ter-p16n.pcf.gz
+share/fonts/X11/misc/ter-p18b.pcf.gz
+share/fonts/X11/misc/ter-p18n.pcf.gz
+share/fonts/X11/misc/ter-p20b.pcf.gz
+share/fonts/X11/misc/ter-p20n.pcf.gz
+share/fonts/X11/misc/ter-p22b.pcf.gz
+share/fonts/X11/misc/ter-p22n.pcf.gz
+share/fonts/X11/misc/ter-p24b.pcf.gz
+share/fonts/X11/misc/ter-p24n.pcf.gz
+share/fonts/X11/misc/ter-p28b.pcf.gz
+share/fonts/X11/misc/ter-p28n.pcf.gz
+share/fonts/X11/misc/ter-p32b.pcf.gz
+share/fonts/X11/misc/ter-p32n.pcf.gz
+share/fonts/X11/misc/ter-u12b.pcf.gz
+share/fonts/X11/misc/ter-u12n.pcf.gz
+share/fonts/X11/misc/ter-u14b.pcf.gz
+share/fonts/X11/misc/ter-u14n.pcf.gz
+share/fonts/X11/misc/ter-u16b.pcf.gz
+share/fonts/X11/misc/ter-u16n.pcf.gz
+share/fonts/X11/misc/ter-u18b.pcf.gz
+share/fonts/X11/misc/ter-u18n.pcf.gz
+share/fonts/X11/misc/ter-u20b.pcf.gz
+share/fonts/X11/misc/ter-u20n.pcf.gz
+share/fonts/X11/misc/ter-u22b.pcf.gz
+share/fonts/X11/misc/ter-u22n.pcf.gz
+share/fonts/X11/misc/ter-u24b.pcf.gz
+share/fonts/X11/misc/ter-u24n.pcf.gz
+share/fonts/X11/misc/ter-u28b.pcf.gz
+share/fonts/X11/misc/ter-u28n.pcf.gz
+share/fonts/X11/misc/ter-u32b.pcf.gz
+share/fonts/X11/misc/ter-u32n.pcf.gz
+share/fonts/X11/misc/ter-x12b.pcf.gz
+share/fonts/X11/misc/ter-x12n.pcf.gz
+share/fonts/X11/misc/ter-x14b.pcf.gz
+share/fonts/X11/misc/ter-x14n.pcf.gz
+share/fonts/X11/misc/ter-x16b.pcf.gz
+share/fonts/X11/misc/ter-x16n.pcf.gz
+share/fonts/X11/misc/ter-x18b.pcf.gz
+share/fonts/X11/misc/ter-x18n.pcf.gz
+share/fonts/X11/misc/ter-x20b.pcf.gz
+share/fonts/X11/misc/ter-x20n.pcf.gz
+share/fonts/X11/misc/ter-x22b.pcf.gz
+share/fonts/X11/misc/ter-x22n.pcf.gz
+share/fonts/X11/misc/ter-x24b.pcf.gz
+share/fonts/X11/misc/ter-x24n.pcf.gz
+share/fonts/X11/misc/ter-x28b.pcf.gz
+share/fonts/X11/misc/ter-x28n.pcf.gz
+share/fonts/X11/misc/ter-x32b.pcf.gz
+share/fonts/X11/misc/ter-x32n.pcf.gz
share/doc/terminus-font/AUTHORS
share/doc/terminus-font/CHANGES
share/doc/terminus-font/OFL.TXT
diff --git a/fonts/thaixfonts/MESSAGE b/fonts/thaixfonts/MESSAGE
index 9d48a425b1b..e32b6656bed 100644
--- a/fonts/thaixfonts/MESSAGE
+++ b/fonts/thaixfonts/MESSAGE
@@ -1,15 +1,15 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2007/11/03 15:33:12 rillig Exp $
+$NetBSD: MESSAGE,v 1.2 2014/06/01 16:35:37 wiz Exp $
To use the fonts you have just installed, add
the line:
- FontPath ${PREFIX}/lib/X11/fonts/thaixfonts
+ FontPath ${PREFIX}/share/fonts/X11/thaixfonts
to your X window configuration file, or run the
following command:
- xset +fp ${PREFIX}/lib/X11/fonts/thaixfonts
+ xset +fp ${PREFIX}/share/fonts/X11/thaixfonts
xset fp rehash
===========================================================================
diff --git a/fonts/thaixfonts/Makefile b/fonts/thaixfonts/Makefile
index b7d81fea729..d498b3f93b7 100644
--- a/fonts/thaixfonts/Makefile
+++ b/fonts/thaixfonts/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2012/10/03 18:28:31 asau Exp $
+# $NetBSD: Makefile,v 1.9 2014/06/01 16:35:37 wiz Exp $
#
DISTNAME= thaixfonts-1.2.5
+PKGREVISION= 1
CATEGORIES= fonts x11
MASTER_SITES= http://linux.thai.net/pub/thailinux/software/thaixfonts/
@@ -14,7 +15,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-fontdir=${FONTDIR}
-FONTDIR= ${PREFIX}/lib/X11/fonts/thaixfonts
+FONTDIR= ${PREFIX}/share/fonts/X11/thaixfonts
FONTS_DIRS.x11+= ${FONTDIR}
INSTALLATION_DIRS= ${FONTDIR}
diff --git a/fonts/thaixfonts/PLIST b/fonts/thaixfonts/PLIST
index a01f91f0545..dc1f240201c 100644
--- a/fonts/thaixfonts/PLIST
+++ b/fonts/thaixfonts/PLIST
@@ -1,30 +1,30 @@
-@comment $NetBSD: PLIST,v 1.3 2010/08/05 13:13:32 obache Exp $
-lib/X11/fonts/thaixfonts/etl14-thai.pcf.gz
-lib/X11/fonts/thaixfonts/etl16-thai.pcf.gz
-lib/X11/fonts/thaixfonts/etl24-thai.pcf.gz
-lib/X11/fonts/thaixfonts/fonts.alias
-lib/X11/fonts/thaixfonts/pvemacs_20b.pcf.gz
-lib/X11/fonts/thaixfonts/pvemacs_20bi.pcf.gz
-lib/X11/fonts/thaixfonts/pvemacs_20i.pcf.gz
-lib/X11/fonts/thaixfonts/pvemacs_20r.pcf.gz
-lib/X11/fonts/thaixfonts/pvemacs_8r.pcf.gz
-lib/X11/fonts/thaixfonts/pvfixed_20b.pcf.gz
-lib/X11/fonts/thaixfonts/pvfixed_20bi.pcf.gz
-lib/X11/fonts/thaixfonts/pvfixed_20i.pcf.gz
-lib/X11/fonts/thaixfonts/pvfixed_20r.pcf.gz
-lib/X11/fonts/thaixfonts/pvfixed_8r.pcf.gz
-lib/X11/fonts/thaixfonts/thai.alias
-lib/X11/fonts/thaixfonts/thai18.pcf.gz
-lib/X11/fonts/thaixfonts/thai18_emacs.pcf.gz
-lib/X11/fonts/thaixfonts/thai18b.pcf.gz
-lib/X11/fonts/thaixfonts/thai18b_emacs.pcf.gz
-lib/X11/fonts/thaixfonts/thai18bi.pcf.gz
-lib/X11/fonts/thaixfonts/thai18bi_emacs.pcf.gz
-lib/X11/fonts/thaixfonts/thai18i.pcf.gz
-lib/X11/fonts/thaixfonts/thai18i_emacs.pcf.gz
-lib/X11/fonts/thaixfonts/thai6x14.pcf.gz
-lib/X11/fonts/thaixfonts/thai7x18.pcf.gz
-lib/X11/fonts/thaixfonts/thai8x13.pcf.gz
-lib/X11/fonts/thaixfonts/thai8x16.pcf.gz
-lib/X11/fonts/thaixfonts/thai8x20.pcf.gz
-lib/X11/fonts/thaixfonts/thai9x13.pcf.gz
+@comment $NetBSD: PLIST,v 1.4 2014/06/01 16:35:37 wiz Exp $
+share/fonts/X11/thaixfonts/etl14-thai.pcf.gz
+share/fonts/X11/thaixfonts/etl16-thai.pcf.gz
+share/fonts/X11/thaixfonts/etl24-thai.pcf.gz
+share/fonts/X11/thaixfonts/fonts.alias
+share/fonts/X11/thaixfonts/pvemacs_20b.pcf.gz
+share/fonts/X11/thaixfonts/pvemacs_20bi.pcf.gz
+share/fonts/X11/thaixfonts/pvemacs_20i.pcf.gz
+share/fonts/X11/thaixfonts/pvemacs_20r.pcf.gz
+share/fonts/X11/thaixfonts/pvemacs_8r.pcf.gz
+share/fonts/X11/thaixfonts/pvfixed_20b.pcf.gz
+share/fonts/X11/thaixfonts/pvfixed_20bi.pcf.gz
+share/fonts/X11/thaixfonts/pvfixed_20i.pcf.gz
+share/fonts/X11/thaixfonts/pvfixed_20r.pcf.gz
+share/fonts/X11/thaixfonts/pvfixed_8r.pcf.gz
+share/fonts/X11/thaixfonts/thai.alias
+share/fonts/X11/thaixfonts/thai18.pcf.gz
+share/fonts/X11/thaixfonts/thai18_emacs.pcf.gz
+share/fonts/X11/thaixfonts/thai18b.pcf.gz
+share/fonts/X11/thaixfonts/thai18b_emacs.pcf.gz
+share/fonts/X11/thaixfonts/thai18bi.pcf.gz
+share/fonts/X11/thaixfonts/thai18bi_emacs.pcf.gz
+share/fonts/X11/thaixfonts/thai18i.pcf.gz
+share/fonts/X11/thaixfonts/thai18i_emacs.pcf.gz
+share/fonts/X11/thaixfonts/thai6x14.pcf.gz
+share/fonts/X11/thaixfonts/thai7x18.pcf.gz
+share/fonts/X11/thaixfonts/thai8x13.pcf.gz
+share/fonts/X11/thaixfonts/thai8x16.pcf.gz
+share/fonts/X11/thaixfonts/thai8x20.pcf.gz
+share/fonts/X11/thaixfonts/thai9x13.pcf.gz
diff --git a/fonts/ttf-tlwg/Makefile b/fonts/ttf-tlwg/Makefile
index 1867826e79d..f28f121c0a9 100644
--- a/fonts/ttf-tlwg/Makefile
+++ b/fonts/ttf-tlwg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2014/03/31 08:11:14 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/01 16:35:37 wiz Exp $
DISTNAME= ttf-tlwg-0.6.0
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= ftp://linux.thai.net/pub/thailinux/software/thai-ttf/
EXTRACT_SUFX= .tar.xz
@@ -12,7 +13,7 @@ COMMENT= Thai fonts in TTF format
USE_LANGUAGES= # none
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
PKG_SYSCONFSUBDIR= fontconfig
CONF_FILES= ${PREFIX}/share/fontconfig/conf.avail/64-ttf-thai-tlwg.conf \
diff --git a/fonts/ttf-tlwg/PLIST b/fonts/ttf-tlwg/PLIST
index b1d367711f7..6c628a02998 100644
--- a/fonts/ttf-tlwg/PLIST
+++ b/fonts/ttf-tlwg/PLIST
@@ -1,57 +1,57 @@
-@comment $NetBSD: PLIST,v 1.1 2014/03/31 08:11:14 wiz Exp $
-lib/X11/fonts/TTF/Garuda-Bold.ttf
-lib/X11/fonts/TTF/Garuda-BoldOblique.ttf
-lib/X11/fonts/TTF/Garuda-Oblique.ttf
-lib/X11/fonts/TTF/Garuda.ttf
-lib/X11/fonts/TTF/Kinnari-Bold.ttf
-lib/X11/fonts/TTF/Kinnari-BoldItalic.ttf
-lib/X11/fonts/TTF/Kinnari-BoldOblique.ttf
-lib/X11/fonts/TTF/Kinnari-Italic.ttf
-lib/X11/fonts/TTF/Kinnari-Oblique.ttf
-lib/X11/fonts/TTF/Kinnari.ttf
-lib/X11/fonts/TTF/Loma-Bold.ttf
-lib/X11/fonts/TTF/Loma-BoldOblique.ttf
-lib/X11/fonts/TTF/Loma-Oblique.ttf
-lib/X11/fonts/TTF/Loma.ttf
-lib/X11/fonts/TTF/Norasi-Bold.ttf
-lib/X11/fonts/TTF/Norasi-BoldItalic.ttf
-lib/X11/fonts/TTF/Norasi-BoldOblique.ttf
-lib/X11/fonts/TTF/Norasi-Italic.ttf
-lib/X11/fonts/TTF/Norasi-Oblique.ttf
-lib/X11/fonts/TTF/Norasi.ttf
-lib/X11/fonts/TTF/Purisa-Bold.ttf
-lib/X11/fonts/TTF/Purisa-BoldOblique.ttf
-lib/X11/fonts/TTF/Purisa-Oblique.ttf
-lib/X11/fonts/TTF/Purisa.ttf
-lib/X11/fonts/TTF/Sawasdee-Bold.ttf
-lib/X11/fonts/TTF/Sawasdee-BoldOblique.ttf
-lib/X11/fonts/TTF/Sawasdee-Oblique.ttf
-lib/X11/fonts/TTF/Sawasdee.ttf
-lib/X11/fonts/TTF/TlwgMono-Bold.ttf
-lib/X11/fonts/TTF/TlwgMono-BoldOblique.ttf
-lib/X11/fonts/TTF/TlwgMono-Oblique.ttf
-lib/X11/fonts/TTF/TlwgMono.ttf
-lib/X11/fonts/TTF/TlwgTypewriter-Bold.ttf
-lib/X11/fonts/TTF/TlwgTypewriter-BoldOblique.ttf
-lib/X11/fonts/TTF/TlwgTypewriter-Oblique.ttf
-lib/X11/fonts/TTF/TlwgTypewriter.ttf
-lib/X11/fonts/TTF/TlwgTypist-Bold.ttf
-lib/X11/fonts/TTF/TlwgTypist-BoldOblique.ttf
-lib/X11/fonts/TTF/TlwgTypist-Oblique.ttf
-lib/X11/fonts/TTF/TlwgTypist.ttf
-lib/X11/fonts/TTF/TlwgTypo-Bold.ttf
-lib/X11/fonts/TTF/TlwgTypo-BoldOblique.ttf
-lib/X11/fonts/TTF/TlwgTypo-Oblique.ttf
-lib/X11/fonts/TTF/TlwgTypo.ttf
-lib/X11/fonts/TTF/Umpush-Bold.ttf
-lib/X11/fonts/TTF/Umpush-BoldOblique.ttf
-lib/X11/fonts/TTF/Umpush-Light.ttf
-lib/X11/fonts/TTF/Umpush-LightOblique.ttf
-lib/X11/fonts/TTF/Umpush-Oblique.ttf
-lib/X11/fonts/TTF/Umpush.ttf
-lib/X11/fonts/TTF/Waree-Bold.ttf
-lib/X11/fonts/TTF/Waree-BoldOblique.ttf
-lib/X11/fonts/TTF/Waree-Oblique.ttf
-lib/X11/fonts/TTF/Waree.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:37 wiz Exp $
+share/fonts/X11/TTF/Garuda-Bold.ttf
+share/fonts/X11/TTF/Garuda-BoldOblique.ttf
+share/fonts/X11/TTF/Garuda-Oblique.ttf
+share/fonts/X11/TTF/Garuda.ttf
+share/fonts/X11/TTF/Kinnari-Bold.ttf
+share/fonts/X11/TTF/Kinnari-BoldItalic.ttf
+share/fonts/X11/TTF/Kinnari-BoldOblique.ttf
+share/fonts/X11/TTF/Kinnari-Italic.ttf
+share/fonts/X11/TTF/Kinnari-Oblique.ttf
+share/fonts/X11/TTF/Kinnari.ttf
+share/fonts/X11/TTF/Loma-Bold.ttf
+share/fonts/X11/TTF/Loma-BoldOblique.ttf
+share/fonts/X11/TTF/Loma-Oblique.ttf
+share/fonts/X11/TTF/Loma.ttf
+share/fonts/X11/TTF/Norasi-Bold.ttf
+share/fonts/X11/TTF/Norasi-BoldItalic.ttf
+share/fonts/X11/TTF/Norasi-BoldOblique.ttf
+share/fonts/X11/TTF/Norasi-Italic.ttf
+share/fonts/X11/TTF/Norasi-Oblique.ttf
+share/fonts/X11/TTF/Norasi.ttf
+share/fonts/X11/TTF/Purisa-Bold.ttf
+share/fonts/X11/TTF/Purisa-BoldOblique.ttf
+share/fonts/X11/TTF/Purisa-Oblique.ttf
+share/fonts/X11/TTF/Purisa.ttf
+share/fonts/X11/TTF/Sawasdee-Bold.ttf
+share/fonts/X11/TTF/Sawasdee-BoldOblique.ttf
+share/fonts/X11/TTF/Sawasdee-Oblique.ttf
+share/fonts/X11/TTF/Sawasdee.ttf
+share/fonts/X11/TTF/TlwgMono-Bold.ttf
+share/fonts/X11/TTF/TlwgMono-BoldOblique.ttf
+share/fonts/X11/TTF/TlwgMono-Oblique.ttf
+share/fonts/X11/TTF/TlwgMono.ttf
+share/fonts/X11/TTF/TlwgTypewriter-Bold.ttf
+share/fonts/X11/TTF/TlwgTypewriter-BoldOblique.ttf
+share/fonts/X11/TTF/TlwgTypewriter-Oblique.ttf
+share/fonts/X11/TTF/TlwgTypewriter.ttf
+share/fonts/X11/TTF/TlwgTypist-Bold.ttf
+share/fonts/X11/TTF/TlwgTypist-BoldOblique.ttf
+share/fonts/X11/TTF/TlwgTypist-Oblique.ttf
+share/fonts/X11/TTF/TlwgTypist.ttf
+share/fonts/X11/TTF/TlwgTypo-Bold.ttf
+share/fonts/X11/TTF/TlwgTypo-BoldOblique.ttf
+share/fonts/X11/TTF/TlwgTypo-Oblique.ttf
+share/fonts/X11/TTF/TlwgTypo.ttf
+share/fonts/X11/TTF/Umpush-Bold.ttf
+share/fonts/X11/TTF/Umpush-BoldOblique.ttf
+share/fonts/X11/TTF/Umpush-Light.ttf
+share/fonts/X11/TTF/Umpush-LightOblique.ttf
+share/fonts/X11/TTF/Umpush-Oblique.ttf
+share/fonts/X11/TTF/Umpush.ttf
+share/fonts/X11/TTF/Waree-Bold.ttf
+share/fonts/X11/TTF/Waree-BoldOblique.ttf
+share/fonts/X11/TTF/Waree-Oblique.ttf
+share/fonts/X11/TTF/Waree.ttf
share/fontconfig/conf.avail/64-ttf-thai-tlwg.conf
share/fontconfig/conf.avail/89-ttf-thai-tlwg-synthetic.conf
diff --git a/fonts/ubuntu-fonts/Makefile b/fonts/ubuntu-fonts/Makefile
index 6753c2ad214..0eda3f116c8 100644
--- a/fonts/ubuntu-fonts/Makefile
+++ b/fonts/ubuntu-fonts/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2013/04/15 17:22:40 uwe Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/01 16:35:37 wiz Exp $
VERSION= 0.80
PKGNAME= ubuntu-fonts-${VERSION}
+PKGREVISION= 1
CATEGORIES= fonts
DISTNAME= ubuntu-font-family-${VERSION}
EXTRACT_SUFX= .zip
@@ -17,7 +18,7 @@ NO_CONFIGURE= yes
NO_BUILD= yes
DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
INSTALLATION_DIRS= ${DOCDIR} ${FONTDIR}
diff --git a/fonts/ubuntu-fonts/PLIST b/fonts/ubuntu-fonts/PLIST
index 2943b6c4ae2..f268c53a23e 100644
--- a/fonts/ubuntu-fonts/PLIST
+++ b/fonts/ubuntu-fonts/PLIST
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1 2013/04/15 17:22:40 uwe Exp $
-lib/X11/fonts/TTF/Ubuntu-B.ttf
-lib/X11/fonts/TTF/Ubuntu-BI.ttf
-lib/X11/fonts/TTF/Ubuntu-C.ttf
-lib/X11/fonts/TTF/Ubuntu-L.ttf
-lib/X11/fonts/TTF/Ubuntu-LI.ttf
-lib/X11/fonts/TTF/Ubuntu-M.ttf
-lib/X11/fonts/TTF/Ubuntu-MI.ttf
-lib/X11/fonts/TTF/Ubuntu-R.ttf
-lib/X11/fonts/TTF/Ubuntu-RI.ttf
-lib/X11/fonts/TTF/UbuntuMono-B.ttf
-lib/X11/fonts/TTF/UbuntuMono-BI.ttf
-lib/X11/fonts/TTF/UbuntuMono-R.ttf
-lib/X11/fonts/TTF/UbuntuMono-RI.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:37 wiz Exp $
+share/fonts/X11/TTF/Ubuntu-B.ttf
+share/fonts/X11/TTF/Ubuntu-BI.ttf
+share/fonts/X11/TTF/Ubuntu-C.ttf
+share/fonts/X11/TTF/Ubuntu-L.ttf
+share/fonts/X11/TTF/Ubuntu-LI.ttf
+share/fonts/X11/TTF/Ubuntu-M.ttf
+share/fonts/X11/TTF/Ubuntu-MI.ttf
+share/fonts/X11/TTF/Ubuntu-R.ttf
+share/fonts/X11/TTF/Ubuntu-RI.ttf
+share/fonts/X11/TTF/UbuntuMono-B.ttf
+share/fonts/X11/TTF/UbuntuMono-BI.ttf
+share/fonts/X11/TTF/UbuntuMono-R.ttf
+share/fonts/X11/TTF/UbuntuMono-RI.ttf
share/doc/ubuntu-fonts/CONTRIBUTING.txt
share/doc/ubuntu-fonts/FONTLOG.txt
share/doc/ubuntu-fonts/LICENCE-FAQ.txt
diff --git a/fonts/umefont-ttf/Makefile b/fonts/umefont-ttf/Makefile
index 31e819210f0..2c60c7c65c9 100644
--- a/fonts/umefont-ttf/Makefile
+++ b/fonts/umefont-ttf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2014/04/08 21:03:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.42 2014/06/01 16:35:37 wiz Exp $
#
DISTNAME= umefont_462
PKGNAME= ${DISTNAME:S/_/-ttf-0./}
+PKGREVISION= 1
CATEGORIES= fonts japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=ume-font/22212/}
EXTRACT_SUFX= .tar.xz
@@ -23,10 +24,10 @@ NO_BUILD= YES
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
-INSTALLATION_DIRS= lib/X11/fonts/TTF \
+INSTALLATION_DIRS= share/fonts/X11/TTF \
${DOCSDIR}
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf= ${FONTDIR}
INSTALL_FONTS= ume-pgc4.ttf \
diff --git a/fonts/umefont-ttf/PLIST b/fonts/umefont-ttf/PLIST
index cadf3da4f95..6f1d04b2bfa 100644
--- a/fonts/umefont-ttf/PLIST
+++ b/fonts/umefont-ttf/PLIST
@@ -1,20 +1,20 @@
-@comment $NetBSD: PLIST,v 1.2 2010/12/12 13:11:52 ryoon Exp $
-lib/X11/fonts/TTF/ume-pgc4.ttf
-lib/X11/fonts/TTF/ume-pgc5.ttf
-lib/X11/fonts/TTF/ume-pgo4.ttf
-lib/X11/fonts/TTF/ume-pgo5.ttf
-lib/X11/fonts/TTF/ume-pgs4.ttf
-lib/X11/fonts/TTF/ume-pgs5.ttf
-lib/X11/fonts/TTF/ume-pmo3.ttf
-lib/X11/fonts/TTF/ume-pms3.ttf
-lib/X11/fonts/TTF/ume-tgc4.ttf
-lib/X11/fonts/TTF/ume-tgc5.ttf
-lib/X11/fonts/TTF/ume-tgo4.ttf
-lib/X11/fonts/TTF/ume-tgo5.ttf
-lib/X11/fonts/TTF/ume-tgs4.ttf
-lib/X11/fonts/TTF/ume-tgs5.ttf
-lib/X11/fonts/TTF/ume-tmo3.ttf
-lib/X11/fonts/TTF/ume-tms3.ttf
-lib/X11/fonts/TTF/ume-ugo4.ttf
-lib/X11/fonts/TTF/ume-ugo5.ttf
+@comment $NetBSD: PLIST,v 1.3 2014/06/01 16:35:37 wiz Exp $
+share/fonts/X11/TTF/ume-pgc4.ttf
+share/fonts/X11/TTF/ume-pgc5.ttf
+share/fonts/X11/TTF/ume-pgo4.ttf
+share/fonts/X11/TTF/ume-pgo5.ttf
+share/fonts/X11/TTF/ume-pgs4.ttf
+share/fonts/X11/TTF/ume-pgs5.ttf
+share/fonts/X11/TTF/ume-pmo3.ttf
+share/fonts/X11/TTF/ume-pms3.ttf
+share/fonts/X11/TTF/ume-tgc4.ttf
+share/fonts/X11/TTF/ume-tgc5.ttf
+share/fonts/X11/TTF/ume-tgo4.ttf
+share/fonts/X11/TTF/ume-tgo5.ttf
+share/fonts/X11/TTF/ume-tgs4.ttf
+share/fonts/X11/TTF/ume-tgs5.ttf
+share/fonts/X11/TTF/ume-tmo3.ttf
+share/fonts/X11/TTF/ume-tms3.ttf
+share/fonts/X11/TTF/ume-ugo4.ttf
+share/fonts/X11/TTF/ume-ugo5.ttf
share/doc/umefont-ttf/license.html
diff --git a/fonts/un-core-ttf/Makefile b/fonts/un-core-ttf/Makefile
index e649fa35cd5..1b5fcf07651 100644
--- a/fonts/un-core-ttf/Makefile
+++ b/fonts/un-core-ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2012/10/03 18:28:32 asau Exp $
+# $NetBSD: Makefile,v 1.8 2014/06/01 16:35:37 wiz Exp $
DISTNAME= un-fonts-core-1.0.2-080608
PKGNAME= ${DISTNAME:S/fonts-core/core-ttf/:S/-0/.200/}
+PKGREVISION= 1
CATEGORIES= fonts korean
MASTER_SITES= http://kldp.net/frs/download.php/4695/
@@ -16,7 +17,7 @@ USE_X11BASE= yes
NO_CONFIGURE= yes
NO_BUILD= yes
-FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf}
diff --git a/fonts/un-core-ttf/PLIST b/fonts/un-core-ttf/PLIST
index 3ba460255dc..bdcd2d1dbe9 100644
--- a/fonts/un-core-ttf/PLIST
+++ b/fonts/un-core-ttf/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2008/12/21 00:25:00 minskim Exp $
-lib/X11/fonts/TTF/UnBatang.ttf
-lib/X11/fonts/TTF/UnBatangBold.ttf
-lib/X11/fonts/TTF/UnDinaru.ttf
-lib/X11/fonts/TTF/UnDinaruBold.ttf
-lib/X11/fonts/TTF/UnDinaruLight.ttf
-lib/X11/fonts/TTF/UnDotum.ttf
-lib/X11/fonts/TTF/UnDotumBold.ttf
-lib/X11/fonts/TTF/UnGraphic.ttf
-lib/X11/fonts/TTF/UnGraphicBold.ttf
-lib/X11/fonts/TTF/UnGungseo.ttf
-lib/X11/fonts/TTF/UnPilgi.ttf
-lib/X11/fonts/TTF/UnPilgiBold.ttf
+@comment $NetBSD: PLIST,v 1.3 2014/06/01 16:35:37 wiz Exp $
+share/fonts/X11/TTF/UnBatang.ttf
+share/fonts/X11/TTF/UnBatangBold.ttf
+share/fonts/X11/TTF/UnDinaru.ttf
+share/fonts/X11/TTF/UnDinaruBold.ttf
+share/fonts/X11/TTF/UnDinaruLight.ttf
+share/fonts/X11/TTF/UnDotum.ttf
+share/fonts/X11/TTF/UnDotumBold.ttf
+share/fonts/X11/TTF/UnGraphic.ttf
+share/fonts/X11/TTF/UnGraphicBold.ttf
+share/fonts/X11/TTF/UnGungseo.ttf
+share/fonts/X11/TTF/UnPilgi.ttf
+share/fonts/X11/TTF/UnPilgiBold.ttf
diff --git a/fonts/un-extra-ttf/Makefile b/fonts/un-extra-ttf/Makefile
index 61c9e8ecc2f..69f64f5ab31 100644
--- a/fonts/un-extra-ttf/Makefile
+++ b/fonts/un-extra-ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2012/10/03 18:28:32 asau Exp $
+# $NetBSD: Makefile,v 1.8 2014/06/01 16:35:37 wiz Exp $
DISTNAME= un-fonts-extra-1.0.2-080608
PKGNAME= ${DISTNAME:S/fonts-extra/extra-ttf/:S/-0/.200/}
+PKGREVISION= 1
CATEGORIES= fonts korean
MASTER_SITES= http://kldp.net/frs/download.php/4696/
@@ -16,7 +17,7 @@ USE_X11BASE= YES
NO_CONFIGURE= YES
NO_BUILD= YES
-FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf}
diff --git a/fonts/un-extra-ttf/PLIST b/fonts/un-extra-ttf/PLIST
index 85fac0c1e27..3e0623fbed1 100644
--- a/fonts/un-extra-ttf/PLIST
+++ b/fonts/un-extra-ttf/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2008/12/21 00:26:11 minskim Exp $
-lib/X11/fonts/TTF/UnBom.ttf
-lib/X11/fonts/TTF/UnJamoBatang.ttf
-lib/X11/fonts/TTF/UnJamoDotum.ttf
-lib/X11/fonts/TTF/UnJamoNovel.ttf
-lib/X11/fonts/TTF/UnJamoSora.ttf
-lib/X11/fonts/TTF/UnPen.ttf
-lib/X11/fonts/TTF/UnPenheulim.ttf
-lib/X11/fonts/TTF/UnPilgia.ttf
-lib/X11/fonts/TTF/UnShinmun.ttf
-lib/X11/fonts/TTF/UnTaza.ttf
-lib/X11/fonts/TTF/UnVada.ttf
-lib/X11/fonts/TTF/UnYetgul.ttf
+@comment $NetBSD: PLIST,v 1.3 2014/06/01 16:35:37 wiz Exp $
+share/fonts/X11/TTF/UnBom.ttf
+share/fonts/X11/TTF/UnJamoBatang.ttf
+share/fonts/X11/TTF/UnJamoDotum.ttf
+share/fonts/X11/TTF/UnJamoNovel.ttf
+share/fonts/X11/TTF/UnJamoSora.ttf
+share/fonts/X11/TTF/UnPen.ttf
+share/fonts/X11/TTF/UnPenheulim.ttf
+share/fonts/X11/TTF/UnPilgia.ttf
+share/fonts/X11/TTF/UnShinmun.ttf
+share/fonts/X11/TTF/UnTaza.ttf
+share/fonts/X11/TTF/UnVada.ttf
+share/fonts/X11/TTF/UnYetgul.ttf
diff --git a/fonts/uni-vga/MESSAGE b/fonts/uni-vga/MESSAGE
index 2ad7dd17140..e44dcd7bb85 100644
--- a/fonts/uni-vga/MESSAGE
+++ b/fonts/uni-vga/MESSAGE
@@ -1,10 +1,10 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2011/10/20 11:28:42 wiz Exp $
+$NetBSD: MESSAGE,v 1.2 2014/06/01 16:35:37 wiz Exp $
Once the files are in place, they need to be added to the font database.
This can be accomplished with one of the following commands:
- xset fp+ ${PREFIX}/lib/X11/fonts/uni-vga
+ xset fp+ ${PREFIX}/share/fonts/X11/uni-vga
Note that the above will only make the fonts available for the duration of
your current X session. If they are to be installed and usable
diff --git a/fonts/uni-vga/Makefile b/fonts/uni-vga/Makefile
index 8f72fd7c2d1..bcf23fd99b4 100644
--- a/fonts/uni-vga/Makefile
+++ b/fonts/uni-vga/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2013/07/27 11:58:08 tsutsui Exp $
+# $NetBSD: Makefile,v 1.6 2014/06/01 16:35:37 wiz Exp $
#
DISTNAME= uni-vga
PKGNAME= ${DISTNAME}-1
+PKGREVISION= 1
CATEGORIES= fonts x11
MASTER_SITES= http://www.inp.nsk.su/~bolkhov/files/fonts/univga/
EXTRACT_SUFX= .tgz
@@ -14,7 +15,7 @@ LICENSE= mit
USE_TOOLS+= bdftopcf gzip
-FONTDIR= ${PREFIX}/lib/X11/fonts/uni-vga
+FONTDIR= ${PREFIX}/share/fonts/X11/uni-vga
FONTS_DIRS.x11+= ${FONTDIR}
WRKSRC= ${WRKDIR}/uni_vga
diff --git a/fonts/uni-vga/PLIST b/fonts/uni-vga/PLIST
index ca6fb07460e..6d2d2e18e15 100644
--- a/fonts/uni-vga/PLIST
+++ b/fonts/uni-vga/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/10/20 11:28:42 wiz Exp $
-lib/X11/fonts/uni-vga/u_vga16.pcf.gz
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:37 wiz Exp $
+share/fonts/X11/uni-vga/u_vga16.pcf.gz
diff --git a/fonts/uralic-ttf/Makefile b/fonts/uralic-ttf/Makefile
index 13141c18485..f2fdc6185e1 100644
--- a/fonts/uralic-ttf/Makefile
+++ b/fonts/uralic-ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 18:28:32 asau Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:37 wiz Exp $
#
DISTNAME= uralic-ttf-0.0.20040603
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://www.peoples.org.ru/font/
DISTFILES= BookmanUralic.zip ChanceryUralic.zip GothicUralic.zip \
@@ -16,7 +17,7 @@ LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}
USE_LANGUAGES= # none
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf+= ${FONTDIR}
INSTALLATION_DIRS+= ${FONTDIR}
diff --git a/fonts/uralic-ttf/PLIST b/fonts/uralic-ttf/PLIST
index 11d805b31e4..2798fd6ec6e 100644
--- a/fonts/uralic-ttf/PLIST
+++ b/fonts/uralic-ttf/PLIST
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/09/01 21:04:31 wiz Exp $
-lib/X11/fonts/TTF/BOOKUB__.TTF
-lib/X11/fonts/TTF/BOOKUI__.TTF
-lib/X11/fonts/TTF/BOOKU___.TTF
-lib/X11/fonts/TTF/CHANUI__.TTF
-lib/X11/fonts/TTF/GOTHUB__.TTF
-lib/X11/fonts/TTF/GOTHU___.TTF
-lib/X11/fonts/TTF/MONOU___.TTF
-lib/X11/fonts/TTF/PALLUB__.TTF
-lib/X11/fonts/TTF/PALLUI__.TTF
-lib/X11/fonts/TTF/PALLU___.TTF
-lib/X11/fonts/TTF/ROMAUB__.TTF
-lib/X11/fonts/TTF/ROMAUI__.TTF
-lib/X11/fonts/TTF/ROMAU___.TTF
-lib/X11/fonts/TTF/SANSCUB_.TTF
-lib/X11/fonts/TTF/SANSCU__.TTF
-lib/X11/fonts/TTF/SANSUBI_.TTF
-lib/X11/fonts/TTF/SANSUB__.TTF
-lib/X11/fonts/TTF/SANSUI__.TTF
-lib/X11/fonts/TTF/SANSU___.TTF
-lib/X11/fonts/TTF/SCHOUB__.TTF
-lib/X11/fonts/TTF/SCHOUI__.TTF
-lib/X11/fonts/TTF/SCHOU___.TTF
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:37 wiz Exp $
+share/fonts/X11/TTF/BOOKUB__.TTF
+share/fonts/X11/TTF/BOOKUI__.TTF
+share/fonts/X11/TTF/BOOKU___.TTF
+share/fonts/X11/TTF/CHANUI__.TTF
+share/fonts/X11/TTF/GOTHUB__.TTF
+share/fonts/X11/TTF/GOTHU___.TTF
+share/fonts/X11/TTF/MONOU___.TTF
+share/fonts/X11/TTF/PALLUB__.TTF
+share/fonts/X11/TTF/PALLUI__.TTF
+share/fonts/X11/TTF/PALLU___.TTF
+share/fonts/X11/TTF/ROMAUB__.TTF
+share/fonts/X11/TTF/ROMAUI__.TTF
+share/fonts/X11/TTF/ROMAU___.TTF
+share/fonts/X11/TTF/SANSCUB_.TTF
+share/fonts/X11/TTF/SANSCU__.TTF
+share/fonts/X11/TTF/SANSUBI_.TTF
+share/fonts/X11/TTF/SANSUB__.TTF
+share/fonts/X11/TTF/SANSUI__.TTF
+share/fonts/X11/TTF/SANSU___.TTF
+share/fonts/X11/TTF/SCHOUB__.TTF
+share/fonts/X11/TTF/SCHOUI__.TTF
+share/fonts/X11/TTF/SCHOU___.TTF
diff --git a/fonts/urbanrenewal-ttf/Makefile b/fonts/urbanrenewal-ttf/Makefile
index de80b9f5fa7..e33a150a33b 100644
--- a/fonts/urbanrenewal-ttf/Makefile
+++ b/fonts/urbanrenewal-ttf/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 18:28:32 asau Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:37 wiz Exp $
#
DISTNAME= urbanrenewal
VERSION= 201102
PKGNAME= ${DISTNAME}-ttf-${VERSION}
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= http://www.kreativekorp.com/swdownload/fonts/urban/
EXTRACT_SUFX= .zip
@@ -16,7 +17,7 @@ LICENSE= kreativekorp-free-license
WRKSRC= ${WRKDIR}
DIST_SUBDIR= ${PKGNAME_NOREV}
-TTFPATH= lib/X11/fonts/TTF
+TTFPATH= share/fonts/X11/TTF
FONTS_DIRS.ttf+= ${PREFIX}/${TTFPATH}
INSTALLATION_DIRS= ${TTFPATH}
INSTALLATION_DIRS+= share/doc/${PKGBASE}
diff --git a/fonts/urbanrenewal-ttf/PLIST b/fonts/urbanrenewal-ttf/PLIST
index 6cdd99fe9fb..db563e33193 100644
--- a/fonts/urbanrenewal-ttf/PLIST
+++ b/fonts/urbanrenewal-ttf/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2011/03/01 15:16:07 wiz Exp $
-lib/X11/fonts/TTF/Athene.ttf
-lib/X11/fonts/TTF/Liverpool.ttf
-lib/X11/fonts/TTF/Los Altos.ttf
-lib/X11/fonts/TTF/Parc Place.ttf
-lib/X11/fonts/TTF/Sanfrisco.ttf
-lib/X11/fonts/TTF/Torrance.ttf
-lib/X11/fonts/TTF/Valencia.ttf
+@comment $NetBSD: PLIST,v 1.3 2014/06/01 16:35:37 wiz Exp $
+share/fonts/X11/TTF/Athene.ttf
+share/fonts/X11/TTF/Liverpool.ttf
+share/fonts/X11/TTF/Los Altos.ttf
+share/fonts/X11/TTF/Parc Place.ttf
+share/fonts/X11/TTF/Sanfrisco.ttf
+share/fonts/X11/TTF/Torrance.ttf
+share/fonts/X11/TTF/Valencia.ttf
share/doc/urbanrenewal-ttf/FreeLicense.txt
share/doc/urbanrenewal-ttf/ReadMe.pdf
diff --git a/fonts/vera-ttf/Makefile b/fonts/vera-ttf/Makefile
index b7b6cf126ac..08658d7251f 100644
--- a/fonts/vera-ttf/Makefile
+++ b/fonts/vera-ttf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2012/10/03 18:28:32 asau Exp $
+# $NetBSD: Makefile,v 1.15 2014/06/01 16:35:37 wiz Exp $
#
DISTNAME= ttf-bitstream-vera-1.10
PKGNAME= vera-ttf-1.10
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ttf-bitstream-vera/1.10/}
EXTRACT_SUFX= .tar.bz2
@@ -18,9 +18,9 @@ NO_BUILD= YES
USE_TOOLS+= pax
-INSTALLATION_DIRS= lib/X11/fonts/TTF \
+INSTALLATION_DIRS= share/fonts/X11/TTF \
share/doc/vera-ttf share/examples/vera-ttf
-FONTS_DIRS.ttf= ${PREFIX}/lib/X11/fonts/TTF
+FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
do-install:
cd ${WRKSRC} && pax -rw -pm *.ttf ${DESTDIR}${FONTS_DIRS.ttf}
diff --git a/fonts/vera-ttf/PLIST b/fonts/vera-ttf/PLIST
index 85745046786..166e98935f2 100644
--- a/fonts/vera-ttf/PLIST
+++ b/fonts/vera-ttf/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:54:16 joerg Exp $
-lib/X11/fonts/TTF/Vera.ttf
-lib/X11/fonts/TTF/VeraBI.ttf
-lib/X11/fonts/TTF/VeraBd.ttf
-lib/X11/fonts/TTF/VeraIt.ttf
-lib/X11/fonts/TTF/VeraMoBI.ttf
-lib/X11/fonts/TTF/VeraMoBd.ttf
-lib/X11/fonts/TTF/VeraMoIt.ttf
-lib/X11/fonts/TTF/VeraMono.ttf
-lib/X11/fonts/TTF/VeraSe.ttf
-lib/X11/fonts/TTF/VeraSeBd.ttf
+@comment $NetBSD: PLIST,v 1.6 2014/06/01 16:35:37 wiz Exp $
+share/fonts/X11/TTF/Vera.ttf
+share/fonts/X11/TTF/VeraBI.ttf
+share/fonts/X11/TTF/VeraBd.ttf
+share/fonts/X11/TTF/VeraIt.ttf
+share/fonts/X11/TTF/VeraMoBI.ttf
+share/fonts/X11/TTF/VeraMoBd.ttf
+share/fonts/X11/TTF/VeraMoIt.ttf
+share/fonts/X11/TTF/VeraMono.ttf
+share/fonts/X11/TTF/VeraSe.ttf
+share/fonts/X11/TTF/VeraSeBd.ttf
share/doc/vera-ttf/COPYRIGHT.TXT
share/doc/vera-ttf/README.TXT
share/doc/vera-ttf/RELEASENOTES.TXT
diff --git a/fonts/vlgothic-ttf/Makefile b/fonts/vlgothic-ttf/Makefile
index 34dfee17fd2..80f29d5b99a 100644
--- a/fonts/vlgothic-ttf/Makefile
+++ b/fonts/vlgothic-ttf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2013/08/03 04:26:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.24 2014/06/01 16:35:38 wiz Exp $
#
DISTNAME= VLGothic-20130607
PKGNAME= ${DISTNAME:tl:S/-/-ttf-/}
+PKGREVISION= 1
CATEGORIES= fonts japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=vlgothic/58961/}
EXTRACT_SUFX= .tar.bz2
@@ -16,7 +17,7 @@ USE_X11BASE= YES
NO_BUILD= YES
NO_CONFIGURE= YES
-FONTDIR= ${PREFIX}/lib/X11/fonts/TTF
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
FONTS_DIRS.ttf+=${FONTDIR}
WRKSRC= ${WRKDIR}/${DISTNAME:C/-[^-]*$//}
diff --git a/fonts/vlgothic-ttf/PLIST b/fonts/vlgothic-ttf/PLIST
index b0c95d1abc3..74b90ef844c 100644
--- a/fonts/vlgothic-ttf/PLIST
+++ b/fonts/vlgothic-ttf/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/12/11 12:52:06 obache Exp $
-lib/X11/fonts/TTF/VL-Gothic-Regular.ttf
-lib/X11/fonts/TTF/VL-PGothic-Regular.ttf
+@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:38 wiz Exp $
+share/fonts/X11/TTF/VL-Gothic-Regular.ttf
+share/fonts/X11/TTF/VL-PGothic-Regular.ttf