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

As discussed on tech-pkg.

Bump PKGREVISION.

2 files changed, 58 insertions, 57 deletions

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