From 4937e1129ba147715303f6039d969dca32b6ad65 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sun, 1 Jun 2014 16:35:31 +0000
Subject: Move fonts from lib/X11/fonts to share/fonts/X11.

As discussed on tech-pkg.

Bump PKGREVISION.
---
 fonts/ricty-ttf/Makefile | 13 +++++++------
 fonts/ricty-ttf/PLIST    | 10 +++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'fonts/ricty-ttf')

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
-- 
cgit v1.2.3