make build of EXTRA_FONTS conditional by NO_EXTRA_FONTS (default: build all).

generate PLIST dynamically.
pointed out by: tron@zhadum.de (Matthias Scheler)

3 files changed, 24 insertions, 15 deletions

diff --git a/fonts/intlfonts/Makefile b/fonts/intlfonts/Makefile
index 32b42a3db89..af86acd521f 100644
--- a/fonts/intlfonts/Makefile
+++ b/fonts/intlfonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/04/20 16:57:21 itojun Exp $
+# $NetBSD: Makefile,v 1.5 2000/05/09 17:16:18 itojun Exp $
 
 DISTNAME=	intlfonts-1.2
 CATEGORIES=	x11
@@ -40,6 +40,15 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-fontdir=${PREFIX}/lib/X11/fonts/intlfonts \
 		--without-bdf --enable-compress=gzip
 
+.if !defined(NO_EXTRA_FONTS)
+FONT_SETS+=	${EXTRA_FONTS}
+PLIST_SRC=	${WRKDIR}/PLIST
+
+# 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:
 .for FILE in ${MISC_FILES}
 	${CP} ${_DISTDIR}/${FILE} ${WRKSRC}
diff --git a/fonts/intlfonts/pkg/PLIST b/fonts/intlfonts/pkg/PLIST
index ff61d51ac1e..2d2256d7a32 100644
--- a/fonts/intlfonts/pkg/PLIST
+++ b/fonts/intlfonts/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/05/09 16:34:50 itojun Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/05/09 17:16:18 itojun Exp $
 @comment lib/X11/fonts/intlfonts/TrueType/lt1-b-omega-serif.ttf
 @comment lib/X11/fonts/intlfonts/TrueType/lt1-bi-omega-serif.ttf
 @comment lib/X11/fonts/intlfonts/TrueType/lt1-i-omega-serif.ttf
@@ -102,29 +102,20 @@ lib/X11/fonts/intlfonts/arab24-0-etl.pcf.gz
 lib/X11/fonts/intlfonts/arab24-1-etl.pcf.gz
 lib/X11/fonts/intlfonts/arab24-2-etl.pcf.gz
 lib/X11/fonts/intlfonts/bmp16-etl.pcf.gz
-lib/X11/fonts/intlfonts/cc40s.pcf.gz
-lib/X11/fonts/intlfonts/cc48s.pcf.gz
 lib/X11/fonts/intlfonts/cns1-16.pcf.gz
 lib/X11/fonts/intlfonts/cns1-24.pcf.gz
-lib/X11/fonts/intlfonts/cns1-40.pcf.gz
 lib/X11/fonts/intlfonts/cns2-16.pcf.gz
 lib/X11/fonts/intlfonts/cns2-24.pcf.gz
-lib/X11/fonts/intlfonts/cns2-40.pcf.gz
 lib/X11/fonts/intlfonts/cns3-16.pcf.gz
 lib/X11/fonts/intlfonts/cns3-24.pcf.gz
-lib/X11/fonts/intlfonts/cns3-40.pcf.gz
 lib/X11/fonts/intlfonts/cns4-16.pcf.gz
 lib/X11/fonts/intlfonts/cns4-24.pcf.gz
-lib/X11/fonts/intlfonts/cns4-40.pcf.gz
 lib/X11/fonts/intlfonts/cns5-16.pcf.gz
 lib/X11/fonts/intlfonts/cns5-24.pcf.gz
-lib/X11/fonts/intlfonts/cns5-40.pcf.gz
 lib/X11/fonts/intlfonts/cns6-16.pcf.gz
 lib/X11/fonts/intlfonts/cns6-24.pcf.gz
-lib/X11/fonts/intlfonts/cns6-40.pcf.gz
 lib/X11/fonts/intlfonts/cns7-16.pcf.gz
 lib/X11/fonts/intlfonts/cns7-24.pcf.gz
-lib/X11/fonts/intlfonts/cns7-40.pcf.gz
 lib/X11/fonts/intlfonts/cyr14-etl.pcf.gz
 lib/X11/fonts/intlfonts/cyr16-etl.pcf.gz
 lib/X11/fonts/intlfonts/cyr24-etl.pcf.gz
@@ -154,12 +145,9 @@ lib/X11/fonts/intlfonts/j78-16.pcf.gz
 lib/X11/fonts/intlfonts/j83-18.pcf.gz
 lib/X11/fonts/intlfonts/j83-18b.pcf.gz
 lib/X11/fonts/intlfonts/j83-18i.pcf.gz
-lib/X11/fonts/intlfonts/j83-32.pcf.gz
-lib/X11/fonts/intlfonts/j83-48.pcf.gz
 lib/X11/fonts/intlfonts/j90-16.pcf.gz
 lib/X11/fonts/intlfonts/jksp16.pcf.gz
 lib/X11/fonts/intlfonts/jksp24.pcf.gz
-lib/X11/fonts/intlfonts/jksp40.pcf.gz
 lib/X11/fonts/intlfonts/koi14-etl.pcf.gz
 lib/X11/fonts/intlfonts/koi16-etl.pcf.gz
 lib/X11/fonts/intlfonts/koi24-etl.pcf.gz
@@ -183,7 +171,6 @@ lib/X11/fonts/intlfonts/lt1-24-etl.pcf.gz
 lib/X11/fonts/intlfonts/lt1-24b-etl.pcf.gz
 lib/X11/fonts/intlfonts/lt1-24bi-etl.pcf.gz
 lib/X11/fonts/intlfonts/lt1-24i-etl.pcf.gz
-lib/X11/fonts/intlfonts/lt1-40-etl.pcf.gz
 lib/X11/fonts/intlfonts/lt2-14-etl.pcf.gz
 lib/X11/fonts/intlfonts/lt2-16-etl.pcf.gz
 lib/X11/fonts/intlfonts/lt2-24-etl.pcf.gz
diff --git a/fonts/intlfonts/pkg/PLIST.extrafonts b/fonts/intlfonts/pkg/PLIST.extrafonts
new file mode 100644
index 00000000000..009bd25fe15
--- /dev/null
+++ b/fonts/intlfonts/pkg/PLIST.extrafonts
@@ -0,0 +1,13 @@
+lib/X11/fonts/intlfonts/cc40s.pcf.gz
+lib/X11/fonts/intlfonts/cc48s.pcf.gz
+lib/X11/fonts/intlfonts/cns1-40.pcf.gz
+lib/X11/fonts/intlfonts/cns2-40.pcf.gz
+lib/X11/fonts/intlfonts/cns3-40.pcf.gz
+lib/X11/fonts/intlfonts/cns4-40.pcf.gz
+lib/X11/fonts/intlfonts/cns5-40.pcf.gz
+lib/X11/fonts/intlfonts/cns6-40.pcf.gz
+lib/X11/fonts/intlfonts/cns7-40.pcf.gz
+lib/X11/fonts/intlfonts/j83-32.pcf.gz
+lib/X11/fonts/intlfonts/j83-48.pcf.gz
+lib/X11/fonts/intlfonts/jksp40.pcf.gz
+lib/X11/fonts/intlfonts/lt1-40-etl.pcf.gz