finished the splitting jisx0208fonts package to multiple packages.

16 files changed, 43 insertions, 219 deletions

diff --git a/fonts/jisx0208fonts/DESCR b/fonts/jisx0208fonts/DESCR
index 509385e6a5a..1052e49954e 100644
--- a/fonts/jisx0208fonts/DESCR
+++ b/fonts/jisx0208fonts/DESCR
@@ -1 +1,16 @@
-The pkgsrc installs X11 fonts for JIS X0208 standard.
+This package installs X11 fonts for JIS X0208 standard.
+
+it includes several fonts such as:
+  - ELISA Fonts (8x8 dots)
+  - naga10 Fonts (10x10 dots)
+  - Shinonome Fonts (12x12, 14x14, 16x16 dots)
+  - Kappa20 Fonts (20x20 dots)
+
+and additionally,
+  - ELISA Fonts (8x10 dots)
+    if you want to use this, add USE_NON_SQUARE=YES to /etc/mk.conf.
+  - KANAME Fonts (12x12 dots)
+    if you want to use this, add USE_KANAME=YES to /etc/mk.conf.
+
+All of the above have thier 1-byte charset counterpart of the 2-byte one
+and some of them have Latin 2/3/9 as well as Latin 1.
diff --git a/fonts/jisx0208fonts/MESSAGE b/fonts/jisx0208fonts/MESSAGE
new file mode 100644
index 00000000000..a7631ce0947
--- /dev/null
+++ b/fonts/jisx0208fonts/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2003/03/16 01:46:05 kei Exp $
+
+You can install the fonts/intlfonts package as well to use 18 dots
+Japanese bdf font.
+
+===========================================================================
diff --git a/fonts/jisx0208fonts/Makefile b/fonts/jisx0208fonts/Makefile
index e7fb800f559..33669f4acd4 100644
--- a/fonts/jisx0208fonts/Makefile
+++ b/fonts/jisx0208fonts/Makefile
@@ -1,113 +1,36 @@
-# $NetBSD: Makefile,v 1.24 2002/09/24 14:21:43 taca Exp $
+# $NetBSD: Makefile,v 1.25 2003/03/16 01:46:05 kei Exp $
 #
 
-DISTNAME=	jisx0208fonts-20010112
+DISTNAME=	jisx0208fonts-20301316
 CATEGORIES=	fonts x11 japanese
-MASTER_SITES=   ftp://ftp.iij.ad.jp/pub/X/X11R6.4/xc/fonts/bdf/misc/ \
-		ftp://ftp.eu.net/X11/R6.4/xc/fonts/bdf/misc/
-DISTFILES=	${ELISA10X8} ${ELISA8X8} ${KANAME12} ${KAPPA20} ${NAGA10} \
-		${K12X10} ${SHINONOME12}
+MASTER_SITES=   # empty
+DISTFILES=	# empty
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
-COMMENT=	X11 fonts for JIS X0208 standard
+COMMENT=	meta-package including X11 BDF fonts for JIS X0208 standard and more
 
 .include "../../mk/bsd.prefs.mk"
 
 USE_NON_SQUARE?= NO
-USE_SHINONOME?=	YES
-USE_KANAME?=	YES
-
-.if ${USE_SHINONOME} == YES
-# use gmake only post-extract with USE_SHINONOME == YES
-BUILD_DEPENDS+=	gmake>=3.79.1:../../devel/gmake
-.endif
-
-USE_X11BASE=	yes
-EXTRACT_ONLY=	# empty
-
-MAKE_ENV+=	FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}"
-FONTDIR=${PREFIX}/lib/X11/fonts/local
+USE_KANAME?= NO
 
+DEPENDS+=	ja-elisat>=1.0:../../fonts/ja-elisat
+DEPENDS+=	ja-kappa20>=0.394:../../fonts/ja-kappa20
+DEPENDS+=	ja-naga10>=1.1:../../fonts/ja-naga10
+DEPENDS+=	ja-shinonome>=0.9.9:../../fonts/ja-shinonome
 .if ${USE_NON_SQUARE} == YES
-MASTER_SITES+=	http://hp.vector.co.jp/authors/VA004814/freesoft/ \
-		ftp://ftp.jp.netbsd.org/pub/NetBSD-jp/tut-jp/fonts/
-ELISA10X8=	elisau10.tgz clR5x8.bdf
-EXTRACT_ONLY+=	elisau10.tgz
-PLIST_SRC+=	${PKGDIR}/PLIST.elisau
+DEPENDS+=	ja-elisau>=1.0:../../fonts/ja-elisau
 .endif
-
-MASTER_SITES+=	http://www.tea.forus.or.jp/toshi/exhibition/
-ELISA8X8=	elisat10.tar.gz
-EXTRACT_ONLY+=	elisat10.tar.gz
-PLIST_SRC+=	${PKGDIR}/PLIST.elisat
-
 .if ${USE_KANAME} == YES
-MASTER_SITES+=	http://www.din.or.jp/~storm/fonts/
-KANAME12=	kaname_k12_bdf.tar.gz
-EXTRACT_ONLY+=	kaname_k12_bdf.tar.gz
-PLIST_SRC+=	${PKGDIR}/PLIST.kaname
-.endif
-
-.if ${USE_SHINONOME} == YES
-MASTER_SITES+=	http://www.on.ics.keio.ac.jp/~yasu/linux/fonts/
-SHINONOME12=	shinonome12-1.0.8.tar.bz2
-EXTRACT_ONLY+=	shinonome12-1.0.8.tar.bz2
-PLIST_SRC+=	${PKGDIR}/PLIST.shinonome
-
-SHINONOME_CONFIGURE_ENV=${CONFIGURE_ENV} PERL="${PERL5}"
-SHINONOME_CONFIGURE_ARGS=${CONFIGURE_ARGS} --with-fontdir=${FONTDIR} --disable-progressbar
-
-USE_PERL5=	build
-.endif
-
-MASTER_SITES+=	ftp://ftp.jaist.ac.jp/pub/misc/character/fonts/kappa/
-KAPPA20=	Kappa20-0.3.tar.gz
-EXTRACT_ONLY+=	Kappa20-0.3.tar.gz
-PLIST_SRC+=	${PKGDIR}/PLIST.kappa
-
-MASTER_SITES+=	http://hp.vector.co.jp/authors/VA013391/fonts/
-NAGA10=		knj10-1.1.tar.gz 6x12.tar.gz
-EXTRACT_ONLY+=	knj10-1.1.tar.gz 6x12.tar.gz
-PLIST_SRC+=	${PKGDIR}/PLIST.naga10
-
-.if ${USE_NON_SQUARE} == YES
-MASTER_SITES+=	http://www.softclub.co.jp/~zoro/k12x10/
-K12X10=		k12x10bdf.tar.gz
-EXTRACT_ONLY+=	k12x10bdf.tar.gz
-PLIST_SRC+=	${PKGDIR}/PLIST.k12x10
-.endif
-
-PLIST_SRC+=	${PKGDIR}/PLIST.end
-
-post-extract:
-	${MKDIR} ${WRKSRC}
-.if ${USE_NON_SQUARE} == YES
-	${CP} ${DISTDIR}/clR5x8.bdf ${WRKDIR}
-.endif
-	${CP} ${FILESDIR}/Makefile ${WRKSRC}
-.if ${USE_SHINONOME} == YES
-	@(cd ${WRKDIR}/shinonome12-1.0.8 ; \
-	${SETENV} ${SHINONOME_CONFIGURE_ENV} ${CONFIGURE_SCRIPT} \
-		${SHINONOME_CONFIGURE_ARGS} ; \
-	${SETENV} ${MAKE_ENV} ${GMAKE} bdf; \
-	${RM} hankaku/*.bdf latin1/*.bdf)
+DEPENDS+=	ja-kaname>=0.0.0.20030112:../../fonts/ja-kaname
 .endif
-	(cd ${WRKSRC}; ${MAKE} prepare)
 
-# for do-patch
-.if ${USE_KANAME} != YES
-NO_PATCH=	YES
-.endif
-
-pre-install:
-	[ -d ${FONTDIR} ] || ${INSTALL_DATA_DIR} ${FONTDIR}
+USE_X11BASE=	YES
+EXTRACT_ONLY=	# empty
+NO_CHECKSUM=	YES
+NO_CONFIGURE=	YES
+NO_BUILD=	YES
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jisx0208fonts
-	${INSTALL_DATA} ${WRKDIR}/knj10-1.1/README \
-		${PREFIX}/share/doc/jisx0208fonts/README.naga10-1.1
-	${INSTALL_DATA} ${FILESDIR}/README.kappa20 \
-		${PREFIX}/share/doc/jisx0208fonts
-	(cd ${FONTDIR}; mkfontdir)
+do-install:	# do nothing
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/jisx0208fonts/PLIST b/fonts/jisx0208fonts/PLIST
new file mode 100644
index 00000000000..d6612be32ff
--- /dev/null
+++ b/fonts/jisx0208fonts/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2003/03/16 01:46:05 kei Exp $
+@comment this plist intentionally left empty
diff --git a/fonts/jisx0208fonts/PLIST.elisat b/fonts/jisx0208fonts/PLIST.elisat
deleted file mode 100644
index 8b91df993ea..00000000000
--- a/fonts/jisx0208fonts/PLIST.elisat
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.elisat,v 1.1 2001/10/31 22:54:14 zuntum Exp $
-lib/X11/fonts/local/jpnhn4-iso.pcf.gz
-lib/X11/fonts/local/jpnhn4-jis.pcf.gz
-lib/X11/fonts/local/elisat10.pcf.gz
diff --git a/fonts/jisx0208fonts/PLIST.elisau b/fonts/jisx0208fonts/PLIST.elisau
deleted file mode 100644
index ff7dc0d50e5..00000000000
--- a/fonts/jisx0208fonts/PLIST.elisau
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.elisau,v 1.1 2001/10/31 22:54:14 zuntum Exp $
-lib/X11/fonts/local/elisau10.pcf.gz
-lib/X11/fonts/local/clR5x8.pcf.gz
diff --git a/fonts/jisx0208fonts/PLIST.end b/fonts/jisx0208fonts/PLIST.end
deleted file mode 100644
index 7f4be213d87..00000000000
--- a/fonts/jisx0208fonts/PLIST.end
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.end,v 1.1 2001/10/31 22:54:15 zuntum Exp $
-@dirrm share/doc/jisx0208fonts
-@exec mkfontdir %D/lib/X11/fonts/local
-@unexec mkfontdir %D/lib/X11/fonts/local
diff --git a/fonts/jisx0208fonts/PLIST.k12x10 b/fonts/jisx0208fonts/PLIST.k12x10
deleted file mode 100644
index fce930b08e3..00000000000
--- a/fonts/jisx0208fonts/PLIST.k12x10
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.k12x10,v 1.1 2001/10/31 22:54:15 zuntum Exp $
-lib/X11/fonts/local/k6x10.pcf.gz
-lib/X11/fonts/local/k12x10.pcf.gz
diff --git a/fonts/jisx0208fonts/PLIST.kaname b/fonts/jisx0208fonts/PLIST.kaname
deleted file mode 100644
index ce4cd3bf697..00000000000
--- a/fonts/jisx0208fonts/PLIST.kaname
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.kaname,v 1.1 2001/10/31 22:54:15 zuntum Exp $
-lib/X11/fonts/local/knmhn12x.pcf.gz
-lib/X11/fonts/local/knmzn12x.pcf.gz
diff --git a/fonts/jisx0208fonts/PLIST.kappa b/fonts/jisx0208fonts/PLIST.kappa
deleted file mode 100644
index dfb4bf867e7..00000000000
--- a/fonts/jisx0208fonts/PLIST.kappa
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST.kappa,v 1.1 2001/10/31 22:54:15 zuntum Exp $
-lib/X11/fonts/local/10x20b.pcf.gz
-lib/X11/fonts/local/10x20m.pcf.gz
-lib/X11/fonts/local/10x20rkb.pcf.gz
-lib/X11/fonts/local/10x20rkm.pcf.gz
-lib/X11/fonts/local/ipa-10x20b.pcf.gz
-lib/X11/fonts/local/ipa-10x20m.pcf.gz
-lib/X11/fonts/local/k20b.pcf.gz
-lib/X11/fonts/local/k20m.pcf.gz
-share/doc/jisx0208fonts/README.kappa20
diff --git a/fonts/jisx0208fonts/PLIST.naga10 b/fonts/jisx0208fonts/PLIST.naga10
deleted file mode 100644
index ca8de544e0a..00000000000
--- a/fonts/jisx0208fonts/PLIST.naga10
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST.naga10,v 1.1 2001/10/31 22:54:16 zuntum Exp $
-lib/X11/fonts/local/5x10B.pcf.gz
-lib/X11/fonts/local/5x10a.pcf.gz
-lib/X11/fonts/local/5x10rk.pcf.gz
-lib/X11/fonts/local/knj10.pcf.gz
-lib/X11/fonts/local/knj10B.pcf.gz
-lib/X11/fonts/local/6x12B.pcf.gz
-lib/X11/fonts/local/6x12a.pcf.gz
-lib/X11/fonts/local/6x12rk.pcf.gz
-share/doc/jisx0208fonts/README.naga10-1.1
diff --git a/fonts/jisx0208fonts/PLIST.shinonome b/fonts/jisx0208fonts/PLIST.shinonome
deleted file mode 100644
index 8af8fd01b60..00000000000
--- a/fonts/jisx0208fonts/PLIST.shinonome
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.shinonome,v 1.1 2001/10/31 22:54:16 zuntum Exp $
-lib/X11/fonts/local/shnmk12.pcf.gz
-lib/X11/fonts/local/shnmk12p.pcf.gz
-lib/X11/fonts/local/shnmk12min.pcf.gz
-lib/X11/fonts/local/shnmk12maru.pcf.gz
diff --git a/fonts/jisx0208fonts/distinfo b/fonts/jisx0208fonts/distinfo
deleted file mode 100644
index 82479d684f9..00000000000
--- a/fonts/jisx0208fonts/distinfo
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: distinfo,v 1.3 2002/09/23 13:23:34 taca Exp $
-
-SHA1 (elisau10.tgz) = 308efb58fc2f8fe1d4a8bea67a0df579a8d144f7
-Size (elisau10.tgz) = 125292 bytes
-SHA1 (clR5x8.bdf) = 2377fc33d2a9bac1bde7b862eae4298fcd92e131
-Size (clR5x8.bdf) = 14416 bytes
-SHA1 (elisat10.tar.gz) = 7ea5b06d227c1286e82eef528fe476564ada3e30
-Size (elisat10.tar.gz) = 125435 bytes
-SHA1 (kaname_k12_bdf.tar.gz) = 06b610c7cc417d9fbd2db1e09160bed349b00c47
-Size (kaname_k12_bdf.tar.gz) = 196704 bytes
-SHA1 (Kappa20-0.3.tar.gz) = 7e3aa2916a05a3f5d3feaae2a4026d6cdf85be81
-Size (Kappa20-0.3.tar.gz) = 715041 bytes
-SHA1 (knj10-1.1.tar.gz) = 7aaf20d3ca0fd9f989a078f1bf02b2d4a7ec1991
-Size (knj10-1.1.tar.gz) = 301108 bytes
-SHA1 (6x12.tar.gz) = c5d729220452d7d3a7c606471296a1872e33e0e7
-Size (6x12.tar.gz) = 7759 bytes
-SHA1 (k12x10bdf.tar.gz) = 471754d86b0d5765b94f72b0832b3243376621fc
-Size (k12x10bdf.tar.gz) = 154796 bytes
-SHA1 (shinonome12-1.0.8.tar.bz2) = 9b3b61938f5067f243418022090e521fc746466b
-Size (shinonome12-1.0.8.tar.bz2) = 209323 bytes
-SHA1 (patch-aa) = a301b1e478adbc9bedaeec44acdcf3f5e0c3cc75
diff --git a/fonts/jisx0208fonts/files/Makefile b/fonts/jisx0208fonts/files/Makefile
deleted file mode 100644
index 8d01e5e3260..00000000000
--- a/fonts/jisx0208fonts/files/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-BDF0!=	find .. -type f -a -name \*.bdf -print
-BDF=	${BDF0:C/.*\///}
-PCF=	${BDF:C/bdf$/pcf/}
-
-.SUFFIXES:	.bdf .pcf
-
-.bdf.pcf:
-	bdftopcf -o $@ $<
-
-all: ${PCF}
-
-prepare::
-	for i in ${BDF0}; do \
-		ln -sf $$i; \
-	done
-
-install::
-	for i in ${PCF}; do \
-		${BSD_INSTALL_DATA} $$i ${FONTDIR}; \
-		${GZIP_CMD} ${FONTDIR}/$$i; \
-	done
-
-clean:
-	rm -f *.bdf *.pcf
diff --git a/fonts/jisx0208fonts/files/README.kappa20 b/fonts/jisx0208fonts/files/README.kappa20
deleted file mode 100644
index 5b047485eee..00000000000
--- a/fonts/jisx0208fonts/files/README.kappa20
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: README.kappa20,v 1.1.1.1 2000/04/09 15:20:48 itojun Exp $
-NetBSD binary package "jisx0208fonts" includes Kappa20 font, converted
-into pcf format.
diff --git a/fonts/jisx0208fonts/patches/patch-aa b/fonts/jisx0208fonts/patches/patch-aa
deleted file mode 100644
index 3c5be837e89..00000000000
--- a/fonts/jisx0208fonts/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2000/09/05 02:52:28 itojun Exp $
-
---- knmzn12x.bdf.orig	Tue Sep  5 00:50:19 2000
-+++ knmzn12x.bdf	Tue Sep  5 00:53:08 2000
-@@ -47001,17 +47001,17 @@
- DWIDTH 12 0
- BBX 12 12 0 -2
- BITMAP
--07e0
--8420
--67e0
--0420
--07e0
--e400
--2530
--2540
--2480
--2e70
--3000
-+1c60
-+8780
-+68a0
-+0940
-+0880
-+ed20
-+3bf0
-+2890
-+2aa0
-+2a90
-+3c90
- cff0
- ENDCHAR
- STARTCHAR 423e