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]

6 files changed, 56 insertions, 28 deletions

diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile
index 417dc4808927..28768270b1b9 100644
--- a/japanese/k10/Makefile
+++ b/japanese/k10/Makefile
@@ -7,18 +7,22 @@
 
 PORTNAME=	naga10
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA013391/fonts/
 DISTNAME=	knj10-${PORTVERSION}
 
 MAINTAINER=	usagi@clave.gr.jp
 
+BUILD_DEPENDS=	mkbold:${PORTSDIR}/x11-fonts/mkbold \
+		mkitalic:${PORTSDIR}/x11-fonts/mkitalic
+
 USE_X_PREFIX=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS+=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 .endif
 
@@ -26,6 +30,9 @@ FONTSDIR=	lib/X11/fonts/local
 MAKE_ENV=	FONTSDIR=${FONTSDIR}
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
+post-extract:
+	${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
+
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGREQ} ${PKGNAME} INSTALL
diff --git a/japanese/k10/files/Makefile.in b/japanese/k10/files/Makefile.in
new file mode 100644
index 000000000000..c5d32ecf30be
--- /dev/null
+++ b/japanese/k10/files/Makefile.in
@@ -0,0 +1,32 @@
+GZIP_CMD?=	gzip
+MKBOLD_CMD?=	mkbold
+MKITALIC_CMD?=	mkitalic
+
+DIST_ALL=	5x10B.bdf 5x10a.bdf 5x10rk.bdf knj10.bdf knj10B.bdf
+
+DIST_NOBOLD=	5x10rk.bdf
+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/k10/files/patch-aa b/japanese/k10/files/patch-aa
deleted file mode 100644
index c11e4993979d..000000000000
--- a/japanese/k10/files/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
---- /dev/null	Fri Jan  7 00:00:00 2000
-+++ Makefile	Fri Jan  7 00:00:00 2000
-@@ -0,0 +1,14 @@
-+all:
-+	bdftopcf 5x10B.bdf  | gzip -c > 5x10B.pcf.gz
-+	bdftopcf 5x10a.bdf  | gzip -c > 5x10a.pcf.gz
-+	bdftopcf 5x10rk.bdf | gzip -c > 5x10rk.pcf.gz
-+	bdftopcf knj10.bdf  | gzip -c > knj10.pcf.gz
-+	bdftopcf knj10B.bdf | gzip -c > knj10B.pcf.gz
-+
-+install:
-+	mkdir -p ${PREFIX}/lib/X11/fonts/misc
-+	${BSD_INSTALL_DATA} 5x10B.pcf.gz  ${PREFIX}/${FONTSDIR}
-+	${BSD_INSTALL_DATA} 5x10a.pcf.gz  ${PREFIX}/${FONTSDIR}
-+	${BSD_INSTALL_DATA} 5x10rk.pcf.gz ${PREFIX}/${FONTSDIR}
-+	${BSD_INSTALL_DATA} knj10.pcf.gz  ${PREFIX}/${FONTSDIR}
-+	${BSD_INSTALL_DATA} knj10B.pcf.gz ${PREFIX}/${FONTSDIR}
diff --git a/japanese/k10/files/patch-ab b/japanese/k10/files/patch-ab
deleted file mode 100644
index 9dd2d4a044ce..000000000000
--- a/japanese/k10/files/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
---- /dev/null	Wed Feb 25 11:48:19 1998
-+++ fonts.alias.naga10	Wed Feb 25 11:48:16 1998
-@@ -0,0 +1,5 @@
-+k10    -misc-fixed-medium-r-normal--10-90-75-75-c-100-jisx0208.1983-0
-+k10b   -misc-fixed-bold-r-normal--10-90-75-75-c-100-jisx0208.1983-0
-+a10    -misc-fixed-medium-r-normal--10-90-75-75-c-50-iso8859-1
-+a10b   -misc-fixed-bold-r-normal--10-90-75-75-c-50-iso8859-1
-+r10    -misc-fixed-medium-r-normal--10-90-75-75-c-50-jisx0201.1976-0
diff --git a/japanese/k10/pkg-plist b/japanese/k10/pkg-plist
index 1e08bfe96a3f..939cbc0c4d31 100644
--- a/japanese/k10/pkg-plist
+++ b/japanese/k10/pkg-plist
@@ -3,9 +3,16 @@
 %%FONTSDIR%%/5x10rk.pcf.gz
 %%FONTSDIR%%/knj10.pcf.gz
 %%FONTSDIR%%/knj10B.pcf.gz
-share/doc/naga10/README
+%%FONTSDIR%%/5x10rkb.pcf.gz
+%%FONTSDIR%%/5x10Bi.pcf.gz
+%%FONTSDIR%%/5x10ai.pcf.gz
+%%FONTSDIR%%/5x10rki.pcf.gz
+%%FONTSDIR%%/knj10i.pcf.gz
+%%FONTSDIR%%/knj10Bi.pcf.gz
+%%FONTSDIR%%/5x10rkbi.pcf.gz
+%%PORTDOCS%%share/doc/naga10/README
+%%PORTDOCS%%@dirrm share/doc/naga10
 @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
 @unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
-@dirrm share/doc/naga10
diff --git a/japanese/k10/pkg-req b/japanese/k10/pkg-req
index 74130b3ca77e..d94579b83c54 100644
--- a/japanese/k10/pkg-req
+++ b/japanese/k10/pkg-req
@@ -23,10 +23,17 @@ fi
 TMPFILE=/tmp/install-fonts-alias-$$
 cat << EOF > ${TMPFILE}
 k10  -misc-fixed-medium-r-normal--10-90-75-75-c-100-jisx0208.1983-0
+k10i -misc-fixed-medium-i-normal--10-90-75-75-c-100-jisx0208.1983-0
 k10b -misc-fixed-bold-r-normal--10-90-75-75-c-100-jisx0208.1983-0
+k10bi -misc-fixed-bold-i-normal--10-90-75-75-c-100-jisx0208.1983-0
 a10  -misc-fixed-medium-r-normal--10-90-75-75-c-50-iso8859-1
+a10i -misc-fixed-medium-i-normal--10-90-75-75-c-50-iso8859-1
 a10b -misc-fixed-bold-r-normal--10-90-75-75-c-50-iso8859-1
+a10bi -misc-fixed-bold-i-normal--10-90-75-75-c-50-iso8859-1
 r10  -misc-fixed-medium-r-normal--10-90-75-75-c-50-jisx0201.1976-0
+r10b -misc-fixed-bold-r-normal--10-90-75-75-c-50-jisx0201.1976-0
+r10i -misc-fixed-medium-i-normal--10-90-75-75-c-50-jisx0201.1976-0
+r10bi -misc-fixed-bold-i-normal--10-90-75-75-c-50-jisx0201.1976-0
 EOF
 
 echo "Updating ${FONTDIR}/fonts.alias"