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

As discussed on tech-pkg.

Bump PKGREVISION.

2 files changed, 38 insertions, 37 deletions

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