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

As discussed on tech-pkg.

Bump PKGREVISION.

3 files changed, 37 insertions, 37 deletions

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