add shinonome font. (hrs-t@hh.iij4u.or.jp)

do not install non-rectangular font by default.
split PLIST to make it easier to install part of the collections.

12 files changed, 95 insertions, 40 deletions

diff --git a/fonts/jisx0208fonts/Makefile b/fonts/jisx0208fonts/Makefile
index e50c2b63a2a..0741bbc3049 100644
--- a/fonts/jisx0208fonts/Makefile
+++ b/fonts/jisx0208fonts/Makefile
@@ -1,54 +1,95 @@
-# $NetBSD: Makefile,v 1.6 2000/10/15 14:26:00 itojun Exp $
+# $NetBSD: Makefile,v 1.7 2001/01/12 15:00:09 itojun Exp $
 #
 
-DISTNAME=	jisx0208fonts-20000904
+DISTNAME=	jisx0208fonts-20010112
 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}
+		${K12X10} ${SHINONOME12}
 
-MAINTAINER=	itojun@itojun.org
+MAINTAINER=	tech-pkg-ja@jp.netbsd.org
+
+USE_NON_RECTANGULAR?= NO
+USE_SHINONOME?=	YES
+USE_KANAME?=	YES
 
 USE_X11BASE=	yes
 EXTRACT_ONLY=	# empty
 
 MAKE_ENV+=	FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}"
+FONTDIR=${PREFIX}/lib/X11/fonts/local
 
-# fonts
+.if ${USE_NON_RECTANGULAR} == 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
+.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="${LOCALBASE}/bin/perl"
+SHINONOME_CONFIGURE_ARGS=${CONFIGURE_ARGS} --with-fontdir=${FONTDIR} --disable-progressbar
+
+BUILD_DEPEND+=	perl:../../lang/perl5
+BUILD_DEPEND+=	gmake:../../devel/gmake
+.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
 
-#MASTER_SITES+=	http://www.softclub.co.jp/~zoro/k12x10/
-#K12X10=		k12x10bdf.tar.gz
-#EXTRACT_ONLY+=	k12x10bdf.tar.gz
+.if ${USE_NON_RECTANGULAR} == 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
 
-FONTDIR=${PREFIX}/lib/X11/fonts/local
+PLIST_SRC+=	${PKGDIR}/PLIST.end
 
 post-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/clR5x8.bdf ${WRKDIR}
 	${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)
+.endif
 	(cd ${WRKSRC}; ${MAKE} prepare)
 
+# for do-patch
+.if ${USE_KANAME} != YES
+PATCHDIR=	${.CURDIR}/NO-EXIST
+.endif
+
 pre-install:
 	[ -d ${FONTDIR} ] || ${MKDIR} -p ${FONTDIR}
 
diff --git a/fonts/jisx0208fonts/files/Makefile b/fonts/jisx0208fonts/files/Makefile
index 556e63e6fee..8d01e5e3260 100644
--- a/fonts/jisx0208fonts/files/Makefile
+++ b/fonts/jisx0208fonts/files/Makefile
@@ -11,7 +11,7 @@ all: ${PCF}
 
 prepare::
 	for i in ${BDF0}; do \
-		ln -s $$i; \
+		ln -sf $$i; \
 	done
 
 install::
diff --git a/fonts/jisx0208fonts/files/md5 b/fonts/jisx0208fonts/files/md5
index e6d8f114148..82fb7388c55 100644
--- a/fonts/jisx0208fonts/files/md5
+++ b/fonts/jisx0208fonts/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.2 2000/06/14 13:29:51 itojun Exp $
+$NetBSD: md5,v 1.3 2001/01/12 15:00:09 itojun Exp $
 
 MD5 (elisau10.tgz) = e14defd8b1f310241576686b6a2887a6
 MD5 (clR5x8.bdf) = 7c9c28f5a68a977e49f40f3f17044c35
@@ -8,3 +8,4 @@ MD5 (Kappa20-0.3.tar.gz) = 0fb4dec59deb0a01dd65e6d26d47126a
 MD5 (knj10-1.1.tar.gz) = 5836501841546f41406092b10858fd17
 MD5 (6x12.tar.gz) = de7bbe307e3fd646942275cddf77e62b
 MD5 (k12x10bdf.tar.gz) = 37c9fecb9f57f82b423ecca212f9049a
+MD5 (shinonome12-1.0.8.tar.bz2) = b2aa5bf8ef7c78462d5fede98e9a4d12
diff --git a/fonts/jisx0208fonts/pkg/PLIST b/fonts/jisx0208fonts/pkg/PLIST
deleted file mode 100644
index e70c1f30305..00000000000
--- a/fonts/jisx0208fonts/pkg/PLIST
+++ /dev/null
@@ -1,29 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2000/12/15 22:59:44 wiz 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/5x10B.pcf.gz
-lib/X11/fonts/local/5x10a.pcf.gz
-lib/X11/fonts/local/5x10rk.pcf.gz
-lib/X11/fonts/local/6x12B.pcf.gz
-lib/X11/fonts/local/6x12a.pcf.gz
-lib/X11/fonts/local/6x12rk.pcf.gz
-lib/X11/fonts/local/clR5x8.pcf.gz
-lib/X11/fonts/local/elisat10.pcf.gz
-lib/X11/fonts/local/elisau10.pcf.gz
-lib/X11/fonts/local/ipa-10x20b.pcf.gz
-lib/X11/fonts/local/ipa-10x20m.pcf.gz
-lib/X11/fonts/local/jpnhn4-iso.pcf.gz
-lib/X11/fonts/local/jpnhn4-jis.pcf.gz
-lib/X11/fonts/local/k20b.pcf.gz
-lib/X11/fonts/local/k20m.pcf.gz
-lib/X11/fonts/local/knj10.pcf.gz
-lib/X11/fonts/local/knj10B.pcf.gz
-lib/X11/fonts/local/knmhn12x.pcf.gz
-lib/X11/fonts/local/knmzn12x.pcf.gz
-share/doc/jisx0208fonts/README.naga10-1.1
-share/doc/jisx0208fonts/README.kappa20
-@dirrm share/doc/jisx0208fonts
-@exec %D/bin/mkfontdir %D/lib/X11/fonts/local
-@unexec %D/bin/mkfontdir %D/lib/X11/fonts/local
diff --git a/fonts/jisx0208fonts/pkg/PLIST.elisat b/fonts/jisx0208fonts/pkg/PLIST.elisat
new file mode 100644
index 00000000000..2b29b1cfadb
--- /dev/null
+++ b/fonts/jisx0208fonts/pkg/PLIST.elisat
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.elisat,v 1.1 2001/01/12 15:00:10 itojun 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/pkg/PLIST.elisau b/fonts/jisx0208fonts/pkg/PLIST.elisau
new file mode 100644
index 00000000000..76475e47a39
--- /dev/null
+++ b/fonts/jisx0208fonts/pkg/PLIST.elisau
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.elisau,v 1.1 2001/01/12 15:00:10 itojun Exp $
+lib/X11/fonts/local/elisau10.pcf.gz
+lib/X11/fonts/local/clR5x8.pcf.gz
diff --git a/fonts/jisx0208fonts/pkg/PLIST.end b/fonts/jisx0208fonts/pkg/PLIST.end
new file mode 100644
index 00000000000..d23bf389f34
--- /dev/null
+++ b/fonts/jisx0208fonts/pkg/PLIST.end
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.end,v 1.1 2001/01/12 15:00:10 itojun Exp $
+@dirrm share/doc/jisx0208fonts
+@exec %D/bin/mkfontdir %D/lib/X11/fonts/local
+@unexec %D/bin/mkfontdir %D/lib/X11/fonts/local
diff --git a/fonts/jisx0208fonts/pkg/PLIST.k12x10 b/fonts/jisx0208fonts/pkg/PLIST.k12x10
new file mode 100644
index 00000000000..e45ae04222c
--- /dev/null
+++ b/fonts/jisx0208fonts/pkg/PLIST.k12x10
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.k12x10,v 1.1 2001/01/12 15:00:10 itojun Exp $
+lib/X11/fonts/local/k6x10.pcf.gz
+lib/X11/fonts/local/k12x10.pcf.gz
diff --git a/fonts/jisx0208fonts/pkg/PLIST.kaname b/fonts/jisx0208fonts/pkg/PLIST.kaname
new file mode 100644
index 00000000000..2c2e6033242
--- /dev/null
+++ b/fonts/jisx0208fonts/pkg/PLIST.kaname
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.kaname,v 1.1 2001/01/12 15:00:10 itojun Exp $
+lib/X11/fonts/local/knmhn12x.pcf.gz
+lib/X11/fonts/local/knmzn12x.pcf.gz
diff --git a/fonts/jisx0208fonts/pkg/PLIST.kappa b/fonts/jisx0208fonts/pkg/PLIST.kappa
new file mode 100644
index 00000000000..b96e5430858
--- /dev/null
+++ b/fonts/jisx0208fonts/pkg/PLIST.kappa
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST.kappa,v 1.1 2001/01/12 15:00:10 itojun 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/pkg/PLIST.naga10 b/fonts/jisx0208fonts/pkg/PLIST.naga10
new file mode 100644
index 00000000000..e73d47b0382
--- /dev/null
+++ b/fonts/jisx0208fonts/pkg/PLIST.naga10
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST.naga10,v 1.1 2001/01/12 15:00:10 itojun 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/pkg/PLIST.shinonome b/fonts/jisx0208fonts/pkg/PLIST.shinonome
new file mode 100644
index 00000000000..ac45eb309cb
--- /dev/null
+++ b/fonts/jisx0208fonts/pkg/PLIST.shinonome
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.shinonome,v 1.1 2001/01/12 15:00:10 itojun 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