Install into TTF instead of TrueType subdir. PKGREVISION=2.

4 files changed, 84 insertions, 86 deletions

diff --git a/fonts/dbz-ttf/Makefile b/fonts/dbz-ttf/Makefile
index c8008763dbb..6f4e137839e 100644
--- a/fonts/dbz-ttf/Makefile
+++ b/fonts/dbz-ttf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:37:00 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/25 20:30:50 wiz Exp $
 #
 
 DISTNAME=	dbz
 PKGNAME=	dbz-ttf-20020507
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.andrew.cmu.edu/~twm/fonts/
 EXTRACT_SUFX=	.zip
@@ -23,7 +23,7 @@ USE_X11BASE=	YES
 NO_BUILD=	YES
 NO_CONFIGURE=	YES
 
-FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TrueType
+FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=		${PREFIX}/share/doc/dbz-ttf
 
 do-install:
diff --git a/fonts/dbz-ttf/PLIST b/fonts/dbz-ttf/PLIST
index a2f31ff308b..b15bd8012d3 100644
--- a/fonts/dbz-ttf/PLIST
+++ b/fonts/dbz-ttf/PLIST
@@ -1,78 +1,77 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/09 16:01:23 tron Exp $
-lib/X11/fonts/TrueType/32768no.ttf
-lib/X11/fonts/TrueType/7hours.ttf
-lib/X11/fonts/TrueType/actionj.ttf
-lib/X11/fonts/TrueType/angstrom.ttf
-lib/X11/fonts/TrueType/antelope.ttf
-lib/X11/fonts/TrueType/antiblue.ttf
-lib/X11/fonts/TrueType/bboron.ttf
-lib/X11/fonts/TrueType/bttsoief.ttf
-lib/X11/fonts/TrueType/codon.ttf
-lib/X11/fonts/TrueType/colophon.ttf
-lib/X11/fonts/TrueType/constant.ttf
-lib/X11/fonts/TrueType/cosinek.ttf
-lib/X11/fonts/TrueType/cwisdom.ttf
-lib/X11/fonts/TrueType/davis.ttf
-lib/X11/fonts/TrueType/dis.ttf
-lib/X11/fonts/TrueType/dnahand.ttf
-lib/X11/fonts/TrueType/doctoraz.ttf
-lib/X11/fonts/TrueType/donner.ttf
-lib/X11/fonts/TrueType/doves.ttf
-lib/X11/fonts/TrueType/dyspro.ttf
-lib/X11/fonts/TrueType/epilog.ttf
-lib/X11/fonts/TrueType/faraday.ttf
-lib/X11/fonts/TrueType/fresnel.ttf
-lib/X11/fonts/TrueType/gauss.ttf
-lib/X11/fonts/TrueType/geodesic.ttf
-lib/X11/fonts/TrueType/germs.ttf
-lib/X11/fonts/TrueType/gmt.ttf
-lib/X11/fonts/TrueType/guildof.ttf
-lib/X11/fonts/TrueType/headache.ttf
-lib/X11/fonts/TrueType/hydrogen.ttf
-lib/X11/fonts/TrueType/initial.ttf
-lib/X11/fonts/TrueType/levity.ttf
-lib/X11/fonts/TrueType/lexo.ttf
-lib/X11/fonts/TrueType/linear.ttf
-lib/X11/fonts/TrueType/mayqueen.ttf
-lib/X11/fonts/TrueType/melanie.ttf
-lib/X11/fonts/TrueType/metalang.ttf
-lib/X11/fonts/TrueType/musicdbz.ttf
-lib/X11/fonts/TrueType/natlog.ttf
-lib/X11/fonts/TrueType/nonblock.ttf
-lib/X11/fonts/TrueType/nullp.ttf
-lib/X11/fonts/TrueType/opticbot.ttf
-lib/X11/fonts/TrueType/pinball.ttf
-lib/X11/fonts/TrueType/prefix.ttf
-lib/X11/fonts/TrueType/progbot.ttf
-lib/X11/fonts/TrueType/proteron.ttf
-lib/X11/fonts/TrueType/px10.ttf
-lib/X11/fonts/TrueType/ransom.ttf
-lib/X11/fonts/TrueType/resurgen.ttf
-lib/X11/fonts/TrueType/robot.ttf
-lib/X11/fonts/TrueType/scandal.ttf
-lib/X11/fonts/TrueType/secret.ttf
-lib/X11/fonts/TrueType/signal.ttf
-lib/X11/fonts/TrueType/submergd.ttf
-lib/X11/fonts/TrueType/suckgolf.ttf
-lib/X11/fonts/TrueType/technet.ttf
-lib/X11/fonts/TrueType/tetanus.ttf
-lib/X11/fonts/TrueType/thisprty.ttf
-lib/X11/fonts/TrueType/toast.ttf
-lib/X11/fonts/TrueType/tombats1.ttf
-lib/X11/fonts/TrueType/tombats3.ttf
-lib/X11/fonts/TrueType/tombats4.ttf
-lib/X11/fonts/TrueType/tombats6.ttf
-lib/X11/fonts/TrueType/tombats7.ttf
-lib/X11/fonts/TrueType/tombots.ttf
-lib/X11/fonts/TrueType/tomhand.ttf
-lib/X11/fonts/TrueType/tommys.ttf
-lib/X11/fonts/TrueType/tomnr.ttf
-lib/X11/fonts/TrueType/tsmiles.ttf
-lib/X11/fonts/TrueType/tuesday.ttf
-lib/X11/fonts/TrueType/valium.ttf
-lib/X11/fonts/TrueType/wolves.ttf
-lib/X11/fonts/TrueType/yikatu.ttf
-lib/X11/fonts/TrueType/zincboom.ttf
+@comment $NetBSD: PLIST,v 1.3 2004/01/25 20:30:50 wiz Exp $
+lib/X11/fonts/TTF/32768no.ttf
+lib/X11/fonts/TTF/7hours.ttf
+lib/X11/fonts/TTF/actionj.ttf
+lib/X11/fonts/TTF/angstrom.ttf
+lib/X11/fonts/TTF/antelope.ttf
+lib/X11/fonts/TTF/antiblue.ttf
+lib/X11/fonts/TTF/bboron.ttf
+lib/X11/fonts/TTF/bttsoief.ttf
+lib/X11/fonts/TTF/codon.ttf
+lib/X11/fonts/TTF/colophon.ttf
+lib/X11/fonts/TTF/constant.ttf
+lib/X11/fonts/TTF/cosinek.ttf
+lib/X11/fonts/TTF/cwisdom.ttf
+lib/X11/fonts/TTF/davis.ttf
+lib/X11/fonts/TTF/dis.ttf
+lib/X11/fonts/TTF/dnahand.ttf
+lib/X11/fonts/TTF/doctoraz.ttf
+lib/X11/fonts/TTF/donner.ttf
+lib/X11/fonts/TTF/doves.ttf
+lib/X11/fonts/TTF/dyspro.ttf
+lib/X11/fonts/TTF/epilog.ttf
+lib/X11/fonts/TTF/faraday.ttf
+lib/X11/fonts/TTF/fresnel.ttf
+lib/X11/fonts/TTF/gauss.ttf
+lib/X11/fonts/TTF/geodesic.ttf
+lib/X11/fonts/TTF/germs.ttf
+lib/X11/fonts/TTF/gmt.ttf
+lib/X11/fonts/TTF/guildof.ttf
+lib/X11/fonts/TTF/headache.ttf
+lib/X11/fonts/TTF/hydrogen.ttf
+lib/X11/fonts/TTF/initial.ttf
+lib/X11/fonts/TTF/levity.ttf
+lib/X11/fonts/TTF/lexo.ttf
+lib/X11/fonts/TTF/linear.ttf
+lib/X11/fonts/TTF/mayqueen.ttf
+lib/X11/fonts/TTF/melanie.ttf
+lib/X11/fonts/TTF/metalang.ttf
+lib/X11/fonts/TTF/musicdbz.ttf
+lib/X11/fonts/TTF/natlog.ttf
+lib/X11/fonts/TTF/nonblock.ttf
+lib/X11/fonts/TTF/nullp.ttf
+lib/X11/fonts/TTF/opticbot.ttf
+lib/X11/fonts/TTF/pinball.ttf
+lib/X11/fonts/TTF/prefix.ttf
+lib/X11/fonts/TTF/progbot.ttf
+lib/X11/fonts/TTF/proteron.ttf
+lib/X11/fonts/TTF/px10.ttf
+lib/X11/fonts/TTF/ransom.ttf
+lib/X11/fonts/TTF/resurgen.ttf
+lib/X11/fonts/TTF/robot.ttf
+lib/X11/fonts/TTF/scandal.ttf
+lib/X11/fonts/TTF/secret.ttf
+lib/X11/fonts/TTF/signal.ttf
+lib/X11/fonts/TTF/submergd.ttf
+lib/X11/fonts/TTF/suckgolf.ttf
+lib/X11/fonts/TTF/technet.ttf
+lib/X11/fonts/TTF/tetanus.ttf
+lib/X11/fonts/TTF/thisprty.ttf
+lib/X11/fonts/TTF/toast.ttf
+lib/X11/fonts/TTF/tombats1.ttf
+lib/X11/fonts/TTF/tombats3.ttf
+lib/X11/fonts/TTF/tombats4.ttf
+lib/X11/fonts/TTF/tombats6.ttf
+lib/X11/fonts/TTF/tombats7.ttf
+lib/X11/fonts/TTF/tombots.ttf
+lib/X11/fonts/TTF/tomhand.ttf
+lib/X11/fonts/TTF/tommys.ttf
+lib/X11/fonts/TTF/tomnr.ttf
+lib/X11/fonts/TTF/tsmiles.ttf
+lib/X11/fonts/TTF/tuesday.ttf
+lib/X11/fonts/TTF/valium.ttf
+lib/X11/fonts/TTF/wolves.ttf
+lib/X11/fonts/TTF/yikatu.ttf
+lib/X11/fonts/TTF/zincboom.ttf
 share/doc/dbz-ttf/readme.txt
 @dirrm share/doc/dbz-ttf
-@unexec ${RMDIR} -p %D/lib/X11/fonts/TrueType 2> /dev/null || ${TRUE}
diff --git a/fonts/geoslab703-ttf/Makefile b/fonts/geoslab703-ttf/Makefile
index 78af1f02fb8..ff24be618f8 100644
--- a/fonts/geoslab703-ttf/Makefile
+++ b/fonts/geoslab703-ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:37:03 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/25 20:31:59 wiz Exp $
 #
 
 DISTNAME=	geoslab703-ttf-20010522
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.will-harris.com/fonts/
 DISTFILES=	geo703l.ttf geo703li.ttf
@@ -18,7 +18,7 @@ USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
-FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TrueType
+FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TTF
 
 do-install:
 	${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS}
diff --git a/fonts/geoslab703-ttf/PLIST b/fonts/geoslab703-ttf/PLIST
index 22cb9fdd35e..ca26479f74b 100644
--- a/fonts/geoslab703-ttf/PLIST
+++ b/fonts/geoslab703-ttf/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/09 16:01:23 tron Exp $
-lib/X11/fonts/TrueType/geo703l.ttf
-lib/X11/fonts/TrueType/geo703li.ttf
-@unexec ${RMDIR} -p %D/lib/X11/fonts/TrueType 2> /dev/null || ${TRUE}
+@comment $NetBSD: PLIST,v 1.3 2004/01/25 20:31:59 wiz Exp $
+lib/X11/fonts/TTF/geo703l.ttf
+lib/X11/fonts/TTF/geo703li.ttf