[pkgsrc/trunk]: pkgsrc/fonts Install into TTF subdir instead of TrueType. PKG...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd3ed5b69fe1
branches:  trunk
changeset: 467039:cd3ed5b69fe1
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jan 25 20:29:30 2004 +0000

description:
Install into TTF subdir instead of TrueType. PKGREVISION=3.

diffstat:

 fonts/cyberbase-ttf/Makefile       |  4 ++--
 fonts/cyberbase-ttf/PLIST          |  5 ++---
 fonts/cyberbit-ttf/Makefile        |  4 ++--
 fonts/cyberbit-ttf/Makefile.common |  4 ++--
 fonts/cyberbit-ttf/PLIST           |  5 ++---
 5 files changed, 10 insertions(+), 12 deletions(-)

diffs (68 lines):

diff -r b9ddb2575978 -r cd3ed5b69fe1 fonts/cyberbase-ttf/Makefile
--- a/fonts/cyberbase-ttf/Makefile      Sun Jan 25 20:26:22 2004 +0000
+++ b/fonts/cyberbase-ttf/Makefile      Sun Jan 25 20:29:30 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/04/22 09:44:57 salo Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/25 20:29:30 wiz Exp $
 #
 
 PKGNAME=       cyberbase-ttf-2.0
-PKGREVISION=   2
+PKGREVISION=   3
 FONT_FILE=     Cyberbase.ZIP
 
 COMMENT=       Cyberbit minus CJK subset, for ISO-8859-x languages
diff -r b9ddb2575978 -r cd3ed5b69fe1 fonts/cyberbase-ttf/PLIST
--- a/fonts/cyberbase-ttf/PLIST Sun Jan 25 20:26:22 2004 +0000
+++ b/fonts/cyberbase-ttf/PLIST Sun Jan 25 20:29:30 2004 +0000
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/04/22 09:44:58 salo Exp $
-lib/X11/fonts/TrueType/cyberbas.ttf
+@comment $NetBSD: PLIST,v 1.4 2004/01/25 20:29:30 wiz Exp $
+lib/X11/fonts/TTF/cyberbas.ttf
 share/doc/html/cyberbit-ttf/ReadMe.htm
 @dirrm share/doc/html/cyberbit-ttf
-@unexec ${RMDIR} -p %D/lib/X11/fonts/TrueType 2> /dev/null || ${TRUE}
diff -r b9ddb2575978 -r cd3ed5b69fe1 fonts/cyberbit-ttf/Makefile
--- a/fonts/cyberbit-ttf/Makefile       Sun Jan 25 20:26:22 2004 +0000
+++ b/fonts/cyberbit-ttf/Makefile       Sun Jan 25 20:29:30 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 16:47:07 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/25 20:29:30 wiz Exp $
 #
 
 PKGNAME=       cyberbit-ttf-2.0
-PKGREVISION=   2
+PKGREVISION=   3
 FONT_FILE=     Cyberbit.ZIP
 
 COMMENT=       Multilingual TrueType font from Bitstream
diff -r b9ddb2575978 -r cd3ed5b69fe1 fonts/cyberbit-ttf/Makefile.common
--- a/fonts/cyberbit-ttf/Makefile.common        Sun Jan 25 20:26:22 2004 +0000
+++ b/fonts/cyberbit-ttf/Makefile.common        Sun Jan 25 20:29:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2003/07/17 21:36:59 grant Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/01/25 20:29:30 wiz Exp $
 #
 
 DISTNAME=      # empty
@@ -32,7 +32,7 @@
 NO_CONFIGURE=  YES
 NO_BUILD=      YES
 
-FONTS_TTF_DIRS=        ${PREFIX}/lib/X11/fonts/TrueType
+FONTS_TTF_DIRS=        ${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=                ${PREFIX}/share/doc/html/cyberbit-ttf
 
 do-install:
diff -r b9ddb2575978 -r cd3ed5b69fe1 fonts/cyberbit-ttf/PLIST
--- a/fonts/cyberbit-ttf/PLIST  Sun Jan 25 20:26:22 2004 +0000
+++ b/fonts/cyberbit-ttf/PLIST  Sun Jan 25 20:29:30 2004 +0000
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/04/22 09:44:59 salo Exp $
-lib/X11/fonts/TrueType/cyberbit.ttf
+@comment $NetBSD: PLIST,v 1.4 2004/01/25 20:29:30 wiz Exp $
+lib/X11/fonts/TTF/cyberbit.ttf
 share/doc/html/cyberbit-ttf/ReadMe.htm
 @dirrm share/doc/html/cyberbit-ttf
-@unexec ${RMDIR} -p %D/lib/X11/fonts/TrueType 2> /dev/null || ${TRUE}