Add bold|italic style using mkbold|mkitalic scripts (x11-fonts/mkbold|mkitalic)

Submitted by:	KOMATSU Shinichiro <koma2@jiro.c.u-tokyo.ac.jp> [ports-jp 12152]

4 files changed, 87 insertions, 40 deletions

diff --git a/japanese/jisx0213-fonts/Makefile b/japanese/jisx0213-fonts/Makefile
index 7a46665b0149..450cd379bc02 100644
--- a/japanese/jisx0213-fonts/Makefile
+++ b/japanese/jisx0213-fonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jisx0213-fonts
 PORTVERSION=	1.03
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://www.mars.sphere.ne.jp/imamura/
 DISTFILES=	jiskan16-2000-1.bdf.gz jiskan16-2000-2.bdf.gz \
@@ -15,6 +15,9 @@ DISTFILES=	jiskan16-2000-1.bdf.gz jiskan16-2000-2.bdf.gz \
 
 MAINTAINER=	yoichi@eken.phys.nagoya-u.ac.jp
 
+BUILD_DEPENDS=	mkbold:${PORTSDIR}/x11-fonts/mkbold \
+		mkitalic:${PORTSDIR}/x11-fonts/mkitalic
+
 NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
 FONTSDIR=	lib/X11/fonts/local
@@ -26,29 +29,22 @@ BUILD_DEPENDS+=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 .endif
 
-FONTNAMES=	jiskan16-2000-1 jiskan16-2000-2 \
-		K14-1 K14-2 K12-1 K12-2
-PLIST_SUB=	FONTSDIR=${FONTSDIR}
-
-do-extract:
-	@${MKDIR} ${WRKDIR}
+EXTRACT_CMD=		${CP}
+EXTRACT_BEFORE_ARGS=	-p
+EXTRACT_AFTER_ARGS=	${WRKDIR}
 
-do-build:
-.for i in ${FONTNAMES}
-	(cd ${WRKSRC} ; \
-	${GZCAT} ${DISTDIR}/${i}.bdf.gz | bdftopcf -o ${i}.pcf ; \
-	${GZIP_CMD} ${i}.pcf)
-.endfor
+MAKE_ENV=	FONTSDIR=${FONTSDIR}
+PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
-do-install:
-	${MKDIR} ${PREFIX}/${FONTSDIR}
-.for i in ${FONTNAMES}
-	(cd ${WRKSRC} ; ${INSTALL_DATA} ${i}.pcf.gz ${PREFIX}/${FONTSDIR})
-.endfor
-	mkfontdir ${PREFIX}/${FONTSDIR}
+post-extract:
+	@${CP} ${FILESDIR}/Makefile.in ${WRKDIR}/Makefile
+	@(cd ${WRKDIR}; ${GUNZIP_CMD} *.gz)
 
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGREQ} ${PKGNAME} INSTALL
 
+post-install:
+	@(cd ${PREFIX}/${FONTSDIR}; mkfontdir)
+
 .include <bsd.port.post.mk>
diff --git a/japanese/jisx0213-fonts/files/Makefile.in b/japanese/jisx0213-fonts/files/Makefile.in
new file mode 100644
index 000000000000..18115641b1b1
--- /dev/null
+++ b/japanese/jisx0213-fonts/files/Makefile.in
@@ -0,0 +1,33 @@
+GZIP_CMD?=	gzip
+MKBOLD_CMD?=	mkbold
+MKITALIC_CMD?=	mkitalic
+
+DIST_ALL=	K12-1.bdf K12-2.bdf K14-1.bdf K14-2.bdf \
+		jiskan16-2000-1.bdf jiskan16-2000-2.bdf
+
+DIST_NOBOLD=	${DIST_ALL}
+MADE_BOLD=	${DIST_NOBOLD:S/.bdf/b.bdf/g}
+
+DIST_NOITALIC=	${DIST_ALL} ${MADE_BOLD}
+MADE_ITALIC=	${DIST_NOITALIC:S/.bdf/i.bdf/g}
+
+BDF_ALL=	${DIST_ALL} ${MADE_BOLD} ${MADE_ITALIC}
+PCF_ALL=	${BDF_ALL:S/.bdf/.pcf.gz/g}
+
+all: ${PCF_ALL}
+
+${MADE_BOLD}: ${.TARGET:S/b.bdf/.bdf/}
+	${MKBOLD_CMD} $> > $@
+
+${MADE_ITALIC}: ${.TARGET:S/i.bdf/.bdf/}
+	${MKITALIC_CMD} $> > $@
+
+${PCF_ALL}: ${.TARGET:S/.pcf.gz/.bdf/}
+	bdftopcf $> | ${GZIP_CMD} -c > $@
+
+install:
+	mkdir -p ${PREFIX}/${FONTSDIR}
+	${BSD_INSTALL_DATA} ${PCF_ALL} ${PREFIX}/${FONTSDIR}
+
+clean::
+	rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL}
diff --git a/japanese/jisx0213-fonts/pkg-plist b/japanese/jisx0213-fonts/pkg-plist
index 60eef16658d0..b0d2a725d236 100644
--- a/japanese/jisx0213-fonts/pkg-plist
+++ b/japanese/jisx0213-fonts/pkg-plist
@@ -1,9 +1,27 @@
-%%FONTSDIR%%/jiskan16-2000-1.pcf.gz
-%%FONTSDIR%%/jiskan16-2000-2.pcf.gz
-%%FONTSDIR%%/K14-1.pcf.gz
-%%FONTSDIR%%/K14-2.pcf.gz
 %%FONTSDIR%%/K12-1.pcf.gz
+%%FONTSDIR%%/K12-1b.pcf.gz
+%%FONTSDIR%%/K12-1bi.pcf.gz
+%%FONTSDIR%%/K12-1i.pcf.gz
 %%FONTSDIR%%/K12-2.pcf.gz
+%%FONTSDIR%%/K12-2b.pcf.gz
+%%FONTSDIR%%/K12-2bi.pcf.gz
+%%FONTSDIR%%/K12-2i.pcf.gz
+%%FONTSDIR%%/K14-1.pcf.gz
+%%FONTSDIR%%/K14-1b.pcf.gz
+%%FONTSDIR%%/K14-1bi.pcf.gz
+%%FONTSDIR%%/K14-1i.pcf.gz
+%%FONTSDIR%%/K14-2.pcf.gz
+%%FONTSDIR%%/K14-2b.pcf.gz
+%%FONTSDIR%%/K14-2bi.pcf.gz
+%%FONTSDIR%%/K14-2i.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-1.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-1b.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-1bi.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-1i.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-2.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-2b.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-2bi.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-2i.pcf.gz
 @exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
 @unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
 @unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
diff --git a/japanese/jisx0213-fonts/pkg-req b/japanese/jisx0213-fonts/pkg-req
index ab31d6979d77..c27be5ed829b 100644
--- a/japanese/jisx0213-fonts/pkg-req
+++ b/japanese/jisx0213-fonts/pkg-req
@@ -19,23 +19,23 @@ if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
 	mkdir ${FONTDIR}
 fi
 
-# font alias entry here!
-TMPFILE=/tmp/install-fonts-alias-$$
-cat << EOF > ${TMPFILE}
--netscape-fixed-medium-r-normal--16-156-75-75-c-160-jisx0212.1990-0 -misc-fixed-medium-r-normal--16-150-75-75-c-160-jisx0213.2000-1
-EOF
-
-echo "Updating ${FONTDIR}/fonts.alias"
-cd ${FONTDIR}
-touch fonts.alias
-cp fonts.alias fonts.alias.orig
-if [ "$2" = "INSTALL" ] ; then
-	(grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig ; \
-	 cat ${TMPFILE}) > fonts.alias
-elif [ "$2" = "DEINSTALL" ] ; then
-	grep -v -- "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias
-fi
-rm -f fonts.alias.orig ${TMPFILE}
+## font alias entry here!
+#TMPFILE=/tmp/install-fonts-alias-$$
+#cat << EOF > ${TMPFILE}
+#-netscape-fixed-medium-r-normal--16-156-75-75-c-160-jisx0212.1990-0 -misc-fixed-medium-r-normal--16-150-75-75-c-160-jisx0213.2000-1
+#EOF
+#
+#echo "Updating ${FONTDIR}/fonts.alias"
+#cd ${FONTDIR}
+#touch fonts.alias
+#cp fonts.alias fonts.alias.orig
+#if [ "$2" = "INSTALL" ] ; then
+#	(grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig ; \
+#	 cat ${TMPFILE}) > fonts.alias
+#elif [ "$2" = "DEINSTALL" ] ; then
+#	grep -v -- "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias
+#fi
+#rm -f fonts.alias.orig ${TMPFILE}
 
 echo "**********************************************************"
 echo "You should restart X server or do 'xset fp rehash' command"