Fix font handling. Install TrueType and Type1 fonts too.

Simplify PLIST handling. Bump PKGREVISION.

4 files changed, 117 insertions, 17 deletions

diff --git a/fonts/intlfonts/Makefile b/fonts/intlfonts/Makefile
index f482c71164f..b7a0a6fb0b9 100644
--- a/fonts/intlfonts/Makefile
+++ b/fonts/intlfonts/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:09:09 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/02/17 19:33:44 wiz Exp $
 
 DISTNAME=	intlfonts-1.2.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	fonts x11
 MASTER_SITES=	${MASTER_SITE_GNU:=intlfonts/intlfonts-1.2.1-split/}
 DISTFILES=	${FONT_SETS:S/$/${EXTRACT_SUFX}/} ${MISC_FILES}
@@ -32,31 +32,34 @@ EXTRA_FONTS=	Chinese.BIG	\
 # Type1/TrueType fonts for Latin1, Thai and Vietnamese
 # XXX need "fonts.scale" for them
 #
-#EXTRA_FONTS+=	Type1		\
-#		TrueType
-#CONFIGURE_ARGS+=--with-type1 --with-truetype
+EXTRA_FONTS+=	Type1		\
+		TrueType
+CONFIGURE_ARGS+=	--with-type1 --with-truetype
 
 MISC_FILES=	README.split
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 EXTRACT_ONLY=	${FONT_SETS:S/$/${EXTRACT_SUFX}/}
-USE_X11BASE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-fontdir=${PREFIX}/lib/X11/fonts/intlfonts \
 		--enable-compress=gzip
 
+FONTS_DIRS.x11+=	${PREFIX}/lib/X11/fonts/intlfonts
+FONTS_DIRS.x11+=	${PREFIX}/lib/X11/fonts/intlfonts/bdf
+FONTS_DIRS.type1+=	${PREFIX}/lib/X11/fonts/intlfonts/Type1
+FONTS_DIRS.ttf+=	${PREFIX}/lib/X11/fonts/intlfonts/TrueType
+REQD_DIRS+=		${PREFIX}/lib/X11/fonts/intlfonts
+REQD_DIRS+=		${PREFIX}/lib/X11/fonts/intlfonts/bdf
+REQD_DIRS+=		${PREFIX}/lib/X11/fonts/intlfonts/Type1
+REQD_DIRS+=		${PREFIX}/lib/X11/fonts/intlfonts/TrueType
+
 .include "../../mk/bsd.prefs.mk"
 
 .if !defined(NO_EXTRA_FONTS)
 FONT_SETS+=	${EXTRA_FONTS}
-PLIST_SRC=	${WRKDIR}/PLIST
-
+PLIST_SRC=	PLIST PLIST.extrafonts
 .include "../../mk/x11.buildlink3.mk"
-
-# the order may look strange, but we need to make "@dirrm" the last item.
-post-patch:
-	${CAT} ${PKGDIR}/PLIST.extrafonts ${PKGDIR}/PLIST > ${PLIST_SRC}
 .endif
 
 post-extract:
diff --git a/fonts/intlfonts/PLIST b/fonts/intlfonts/PLIST
index 9e1032a5fc5..7329bb04046 100644
--- a/fonts/intlfonts/PLIST
+++ b/fonts/intlfonts/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/07/28 15:07:37 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/02/17 19:33:44 wiz Exp $
 lib/X11/fonts/intlfonts/a18rk.pcf.gz
 lib/X11/fonts/intlfonts/a18rkb.pcf.gz
 lib/X11/fonts/intlfonts/a18rki.pcf.gz
@@ -233,5 +233,3 @@ lib/X11/fonts/intlfonts/visc18i-etl.pcf.gz
 lib/X11/fonts/intlfonts/visc24-etl.pcf.gz
 lib/X11/fonts/intlfonts/xtis18.pcf.gz
 lib/X11/fonts/intlfonts/xtis24.pcf.gz
-@dirrm lib/X11/fonts/intlfonts/bdf
-@dirrm lib/X11/fonts/intlfonts
diff --git a/fonts/intlfonts/PLIST.extrafonts b/fonts/intlfonts/PLIST.extrafonts
index 5f5d2bf997d..eb1b3f91aa8 100644
--- a/fonts/intlfonts/PLIST.extrafonts
+++ b/fonts/intlfonts/PLIST.extrafonts
@@ -1,4 +1,97 @@
-@comment $NetBSD: PLIST.extrafonts,v 1.3 2003/07/19 21:18:01 wiz Exp $
+@comment $NetBSD: PLIST.extrafonts,v 1.4 2006/02/17 19:33:44 wiz Exp $
+lib/X11/fonts/intlfonts/TrueType/lt1-b-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt1-bi-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt1-i-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt1-r-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt2-b-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt2-bi-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt2-i-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt2-r-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt3-b-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt3-bi-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt3-i-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt3-r-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt4-b-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt4-bi-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt4-i-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt4-r-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt5-b-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt5-bi-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt5-i-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/lt5-r-omega-serif.ttf
+lib/X11/fonts/intlfonts/TrueType/viscii-omega-serif.ttf
+lib/X11/fonts/intlfonts/Type1/lt1-b-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt1-b-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt1-b-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt1-bi-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt1-bi-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt1-bi-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt1-i-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt1-i-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt1-i-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt1-r-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt1-r-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt1-r-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt2-b-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt2-b-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt2-b-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt2-bi-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt2-bi-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt2-bi-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt2-i-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt2-i-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt2-i-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt2-r-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt2-r-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt2-r-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt3-b-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt3-b-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt3-b-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt3-bi-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt3-bi-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt3-bi-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt3-i-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt3-i-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt3-i-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt3-r-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt3-r-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt3-r-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt4-b-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt4-b-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt4-b-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt4-bi-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt4-bi-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt4-bi-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt4-i-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt4-i-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt4-i-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt4-r-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt4-r-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt4-r-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt5-b-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt5-b-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt5-b-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt5-bi-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt5-bi-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt5-bi-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt5-i-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt5-i-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt5-i-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/lt5-r-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/lt5-r-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/lt5-r-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/nf3.afm
+lib/X11/fonts/intlfonts/Type1/nf3.pfa
+lib/X11/fonts/intlfonts/Type1/nf3.pfb
+lib/X11/fonts/intlfonts/Type1/nf3i.afm
+lib/X11/fonts/intlfonts/Type1/nf3i.pfa
+lib/X11/fonts/intlfonts/Type1/nf3i.pfb
+lib/X11/fonts/intlfonts/Type1/tis620-r-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/tis620-r-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/tis620-r-omega-serif.pfb
+lib/X11/fonts/intlfonts/Type1/viscii-r-omega-serif.afm
+lib/X11/fonts/intlfonts/Type1/viscii-r-omega-serif.pfa
+lib/X11/fonts/intlfonts/Type1/viscii-r-omega-serif.pfb
 lib/X11/fonts/intlfonts/bdf/cc40s.bdf
 lib/X11/fonts/intlfonts/bdf/cc48s.bdf
 lib/X11/fonts/intlfonts/bdf/cns1-40.bdf
diff --git a/fonts/intlfonts/distinfo b/fonts/intlfonts/distinfo
index 5578afb8541..52e0378a27d 100644
--- a/fonts/intlfonts/distinfo
+++ b/fonts/intlfonts/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2005/05/25 09:17:47 wiz Exp $
+$NetBSD: distinfo,v 1.13 2006/02/17 19:33:44 wiz Exp $
 
 SHA1 (intlfonts-1.2.1/Asian.tar.gz) = 93aade50bbd0e12fd56ff424be939cc586b1a435
 RMD160 (intlfonts-1.2.1/Asian.tar.gz) = 5bbc765bf38fd376b40e4fc80e6741b8436a906b
@@ -30,6 +30,12 @@ Size (intlfonts-1.2.1/European.BIG.tar.gz) = 27106 bytes
 SHA1 (intlfonts-1.2.1/Japanese.BIG.tar.gz) = 7bfd84337543c15c42c04915f495e604fd8a1d98
 RMD160 (intlfonts-1.2.1/Japanese.BIG.tar.gz) = 6d11155ebc3b1b37320242f12693cacfdf6d23cd
 Size (intlfonts-1.2.1/Japanese.BIG.tar.gz) = 1696222 bytes
+SHA1 (intlfonts-1.2.1/Type1.tar.gz) = f213c29e5561a136d9d6df703108d002622ac943
+RMD160 (intlfonts-1.2.1/Type1.tar.gz) = 65a712a4133f73e47f8ff5aabc49a802c9c39cfb
+Size (intlfonts-1.2.1/Type1.tar.gz) = 1914956 bytes
+SHA1 (intlfonts-1.2.1/TrueType.tar.gz) = 79deb8d09e9377c535aec395fb5bfad0c64ec9e3
+RMD160 (intlfonts-1.2.1/TrueType.tar.gz) = 24bcaee39242e8165809adc3d0c6fda420071069
+Size (intlfonts-1.2.1/TrueType.tar.gz) = 552749 bytes
 SHA1 (intlfonts-1.2.1/README.split) = 8054d92e2c38353eb4b0b86279ec1289eb06f5c2
 RMD160 (intlfonts-1.2.1/README.split) = 30f0e37692361be5224f99878169009c8a295ef5
 Size (intlfonts-1.2.1/README.split) = 2088 bytes