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

As discussed on tech-pkg.

Bump PKGREVISION.

5 files changed, 97 insertions, 97 deletions

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