3 files changed, 66 insertions, 1 deletions

diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile
index 8b3bd05f583b..483a2e2ff937 100644
--- a/japanese/kappa20/Makefile
+++ b/japanese/kappa20/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kappa20
 PORTVERSION=	0.394
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://kappa.allnet.ne.jp/20dot.fonts/
 DISTNAME=	Kappa20-${PORTVERSION}
@@ -16,17 +17,24 @@ MAINTAINER=	ginga@athena.club.ne.jp
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 
+BUILD_DEPENDS=	mkitalic:${PORTSDIR}/x11-fonts/mkitalic
+
 .include <bsd.port.pre.mk>
 
 .if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS+=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 .endif
 
 FONTSDIR=	lib/X11/fonts/local
 MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ARGS=	TARGETDIR="${PREFIX}/${FONTSDIR}"
+MAKE_ARGS=	FONTSDIR="${FONTSDIR}"
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
+post-extract:
+	(cd ${WRKSRC} ; ${MV} Makefile Makefile.dist)
+	${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
+
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGREQ} ${PKGNAME} INSTALL
diff --git a/japanese/kappa20/pkg-plist b/japanese/kappa20/pkg-plist
index f309df974a7c..567e6131bb41 100644
--- a/japanese/kappa20/pkg-plist
+++ b/japanese/kappa20/pkg-plist
@@ -1,20 +1,37 @@
 %%FONTSDIR%%/10x20L2b.pcf.gz
+%%FONTSDIR%%/10x20L2bi.pcf.gz
 %%FONTSDIR%%/10x20L2m.pcf.gz
+%%FONTSDIR%%/10x20L2mi.pcf.gz
 %%FONTSDIR%%/10x20L3b.pcf.gz
+%%FONTSDIR%%/10x20L3bi.pcf.gz
 %%FONTSDIR%%/10x20L3m.pcf.gz
+%%FONTSDIR%%/10x20L3mi.pcf.gz
 %%FONTSDIR%%/10x20L9b.pcf.gz
+%%FONTSDIR%%/10x20L9bi.pcf.gz
 %%FONTSDIR%%/10x20L9m.pcf.gz
+%%FONTSDIR%%/10x20L9mi.pcf.gz
 %%FONTSDIR%%/10x20b.pcf.gz
+%%FONTSDIR%%/10x20bi.pcf.gz
 %%FONTSDIR%%/10x20m.pcf.gz
+%%FONTSDIR%%/10x20mi.pcf.gz
 %%FONTSDIR%%/10x20rkb.pcf.gz
+%%FONTSDIR%%/10x20rkbi.pcf.gz
 %%FONTSDIR%%/10x20rkm.pcf.gz
+%%FONTSDIR%%/10x20rkmi.pcf.gz
 %%FONTSDIR%%/ipa-10x20b.pcf.gz
+%%FONTSDIR%%/ipa-10x20bi.pcf.gz
 %%FONTSDIR%%/ipa-10x20m.pcf.gz
+%%FONTSDIR%%/ipa-10x20mi.pcf.gz
 %%FONTSDIR%%/k20b.pcf.gz
+%%FONTSDIR%%/k20bi.pcf.gz
 %%FONTSDIR%%/k20m.pcf.gz
+%%FONTSDIR%%/k20mi.pcf.gz
 %%FONTSDIR%%/nk20b-1.pcf.gz
+%%FONTSDIR%%/nk20bi-1.pcf.gz
 %%FONTSDIR%%/vk20b.pcf.gz
+%%FONTSDIR%%/vk20bi.pcf.gz
 %%FONTSDIR%%/vk20m.pcf.gz
+%%FONTSDIR%%/vk20mi.pcf.gz
 %%PORTDOCS%%share/doc/ja/kappa20/README.euc-jp
 %%PORTDOCS%%@dirrm share/doc/ja/kappa20
 @exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
diff --git a/japanese/kappa20/pkg-req b/japanese/kappa20/pkg-req
index 6d154393351e..9b2e106e3734 100644
--- a/japanese/kappa20/pkg-req
+++ b/japanese/kappa20/pkg-req
@@ -23,45 +23,85 @@ fi
 TMPFILE=/tmp/install-fonts-alias-$$
 cat << EOF > ${TMPFILE}
 -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-fixed-bold-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-fixed-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-fixed-bold-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 -kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-fixed-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-fixed-medium-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-fixed-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-fixed-medium-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 -kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-fixed-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 -kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-minchou-bold-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-minchou-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-minchou-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-minchou-bold-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 -kappa-minchou-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-minchou-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 -kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-minchou-medium-i-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+-kappa-minchou-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 -kappa-minchou-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-minchou-medium-i-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 -kappa-minchou-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+-kappa-minchou-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 10x20L2b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-2
+10x20L2bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-2
 10x20L2m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-2
+10x20L2mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-2
 10x20L3b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-3
+10x20L3bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-3
 10x20L3m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-3
+10x20L3mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-3
 10x20L9b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-15
+10x20L9bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-15
 10x20L9m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-15
+10x20L9mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-15
 10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1
+10x20bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-1
 10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1
+10x20mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-1
 10x20rkb -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0
+10x20rkbi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-jisx0201.1976-0
 10x20rkm -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
+10x20rkmi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-jisx0201.1976-0
 a20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1
+a20bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-iso8859-1
 a20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1
+a20mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-iso8859-1
 ipa-10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-muleipa-1
+ipa-10x20bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-muleipa-1
 ipa-10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-muleipa-1
+ipa-10x20mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-muleipa-1
 k20b -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+k20bi -kappa-fixed-bold-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 k20m -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0
+k20mi -kappa-fixed-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0
 r20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0
+r20bi -kappa-fixed-bold-i-normal--20-190-75-75-c-100-jisx0201.1976-0
 r20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
+r20mi -kappa-fixed-medium-i-normal--20-190-75-75-c-100-jisx0201.1976-0
 vk20b -kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+vk20bi -kappa-fixed-bold-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 vk20m -kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0
+vk20mi -kappa-fixed-medium-i-normal--20-190-75-75-vc-200-jisx0208.1990-0
 EOF
 
 echo "Updating ${FONTDIR}/fonts.alias"