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

4 files changed, 16 insertions, 18 deletions

diff --git a/fonts/arphic-ttf/Makefile b/fonts/arphic-ttf/Makefile
index 5d0b33bbcab..37cb6f8969b 100644
--- a/fonts/arphic-ttf/Makefile
+++ b/fonts/arphic-ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:36:55 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/25 20:26:22 wiz Exp $
 #
 
 DISTNAME=	arphic-ttf-2.11
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	fonts
 MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/${DIST_SUBDIR}/
 DISTFILES=	${FONT_FILES} ${MISC_FILES}
@@ -22,7 +22,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
 DOCDIR=		${PREFIX}/share/doc/arphic-ttf
 
 do-install:
diff --git a/fonts/arphic-ttf/PLIST b/fonts/arphic-ttf/PLIST
index cbb395dfcb4..d544ffb3d71 100644
--- a/fonts/arphic-ttf/PLIST
+++ b/fonts/arphic-ttf/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/09 16:01:21 tron Exp $
-lib/X11/fonts/TrueType/bkai00mp.ttf
-lib/X11/fonts/TrueType/bsmi00lp.ttf
-lib/X11/fonts/TrueType/gbsn00lp.ttf
-lib/X11/fonts/TrueType/gkai00mp.ttf
+@comment $NetBSD: PLIST,v 1.3 2004/01/25 20:26:22 wiz Exp $
+lib/X11/fonts/TTF/bkai00mp.ttf
+lib/X11/fonts/TTF/bsmi00lp.ttf
+lib/X11/fonts/TTF/gbsn00lp.ttf
+lib/X11/fonts/TTF/gkai00mp.ttf
 share/doc/arphic-ttf/ARPHICPL.TXT
 share/doc/arphic-ttf/logo.gif
 share/doc/arphic-ttf/release.txt
 @dirrm share/doc/arphic-ttf
-@unexec ${RMDIR} -p %D/lib/X11/fonts/TrueType 2> /dev/null || ${TRUE}
diff --git a/fonts/baekmuk-ttf/Makefile b/fonts/baekmuk-ttf/Makefile
index f29323039b4..d7b52826f2c 100644
--- a/fonts/baekmuk-ttf/Makefile
+++ b/fonts/baekmuk-ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:36:56 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/25 20:27:40 wiz Exp $
 #
 
 DISTNAME=	baekmuk-ttf-2.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	fonts korean
 MASTER_SITES=	ftp://ftp.mizi.com/pub/baekmuk/
 
@@ -14,7 +14,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
 DOCDIR=		${PREFIX}/share/doc/baekmuk-ttf
 
 do-install:
diff --git a/fonts/baekmuk-ttf/PLIST b/fonts/baekmuk-ttf/PLIST
index 48bb88e1223..d66fe376a65 100644
--- a/fonts/baekmuk-ttf/PLIST
+++ b/fonts/baekmuk-ttf/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/09 16:01:22 tron Exp $
-lib/X11/fonts/TrueType/batang.ttf
-lib/X11/fonts/TrueType/dotum.ttf
-lib/X11/fonts/TrueType/gulim.ttf
-lib/X11/fonts/TrueType/hline.ttf
+@comment $NetBSD: PLIST,v 1.3 2004/01/25 20:27:40 wiz Exp $
+lib/X11/fonts/TTF/batang.ttf
+lib/X11/fonts/TTF/dotum.ttf
+lib/X11/fonts/TTF/gulim.ttf
+lib/X11/fonts/TTF/hline.ttf
 share/doc/baekmuk-ttf/COPYRIGHT
 @dirrm share/doc/baekmuk-ttf
-@unexec ${RMDIR} -p %D/lib/X11/fonts/TrueType 2> /dev/null || ${TRUE}