12 files changed, 223 insertions, 199 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 22c7d6e9cf4b..27ec2c1c3fa3 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -77,6 +77,7 @@
     SUBDIR += font-ipa
     SUBDIR += font-ipa-uigothic
     SUBDIR += font-ipaex
+    SUBDIR += font-jisx0213
     SUBDIR += font-kochi
     SUBDIR += font-migmix
     SUBDIR += font-migu
@@ -123,7 +124,6 @@
     SUBDIR += jd
     SUBDIR += jed
     SUBDIR += jishyo
-    SUBDIR += jisx0213-fonts
     SUBDIR += jls
     SUBDIR += jmode
     SUBDIR += jmode-skk
diff --git a/japanese/alias-fonts/Makefile b/japanese/alias-fonts/Makefile
index c60eeba0ca21..1e7a2feb6c23 100644
--- a/japanese/alias-fonts/Makefile
+++ b/japanese/alias-fonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	alias-fonts
 PORTVERSION=	1.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -22,7 +22,7 @@ RUN_DEPENDS=	\
 		${FONTSDIR}/kanji18.pcf.gz:${PORTSDIR}/japanese/kanji18 \
 		${FONTSDIR}/k20b.pcf.gz:${PORTSDIR}/japanese/kappa20 \
 		${FONTSDIR}/kanji26.pcf.gz:${PORTSDIR}/japanese/kanji26 \
-		${FONTSDIR}/K12-1.pcf.gz:${PORTSDIR}/japanese/jisx0213-fonts
+		${LOCALBASE}/lib/X11/fonts/jisx0213/K12-1.pcf.gz:${PORTSDIR}/japanese/font-jisx0213
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
diff --git a/japanese/font-jisx0213/Makefile b/japanese/font-jisx0213/Makefile
new file mode 100644
index 000000000000..942175454a3b
--- /dev/null
+++ b/japanese/font-jisx0213/Makefile
@@ -0,0 +1,50 @@
+# Created by: Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
+# $FreeBSD$
+
+PORTNAME=	jisx0213
+PORTVERSION=	20040425
+PORTREVISION=	3
+CATEGORIES=	japanese x11-fonts
+MASTER_SITES=	http://www12.ocn.ne.jp/~imamura/ \
+		LOCAL/hrs:yagi
+PKGNAMEPREFIX=	ja-font-
+DISTFILES=	jiskan16-2004-1.bdf.gz jiskan16-2000-1.bdf.gz \
+		jiskan16-2000-2.bdf.gz K14-2004-1.bdf.gz \
+		K14-2000-1.bdf.gz K14-2000-2.bdf.gz \
+		K12-1.bdf.gz K12-2.bdf.gz \
+		jiskan24-2000-1.bdf.gz:yagi jiskan24-2000-2.bdf.gz:yagi
+
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	Japanese jisx0213 fonts
+
+BUILD_DEPENDS=	mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
+		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+
+USE_XORG=	fontutil
+XORG_CAT=	font
+NO_WRKSUBDIR=	yes
+EXTRACT_CMD=		${GZCAT}
+EXTRACT_BEFORE_ARGS=
+EXTRACT_AFTER_ARGS=	> ${WRKDIR}/$${file%.gz}
+MAKE_JOBS_SAFE=	yes
+MAKE_ENV=	FONTDIR=${LOCALFONTDIR}
+PLIST_SUB=	FONTDIR=${LOCALFONTDIR} XFONTDIR=lib/X11/fonts/${FONTDIR}
+SUB_FILES=	Makefile
+
+LOCALFONTDIR=	share/font-${PORTNAME}
+
+pre-build: apply-slist
+
+do-configure:
+	@${DO_NADA}
+
+post-install-fontdir:
+	${MKDIR} ${PREFIX}/lib/X11/fonts/${FONTDIR}
+	cd ${PREFIX}/lib/X11/fonts/${FONTDIR} && \
+		${LN} -s -f ${PREFIX}/${LOCALFONTDIR}/*.pcf.gz .
+	${LOCALBASE}/bin/mkfontscale ${PREFIX}/lib/X11/fonts/${FONTDIR}
+	${LOCALBASE}/bin/mkfontdir ${PREFIX}/lib/X11/fonts/${FONTDIR}
+
+post-install: post-install-fontdir
+
+.include <bsd.port.mk>
diff --git a/japanese/font-jisx0213/distinfo b/japanese/font-jisx0213/distinfo
new file mode 100644
index 000000000000..99137a7bf98c
--- /dev/null
+++ b/japanese/font-jisx0213/distinfo
@@ -0,0 +1,20 @@
+SHA256 (xorg/font/jiskan16-2004-1.bdf.gz) = d79a57b81d3626414cb207eafec8d7b94fc2e7efabb5dce9d3ae58416e82ea3d
+SIZE (xorg/font/jiskan16-2004-1.bdf.gz) = 303930
+SHA256 (xorg/font/jiskan16-2000-1.bdf.gz) = 34e05cb59ae562d53b4b8fa5620454e9a060208f76da915c7da844f581e94830
+SIZE (xorg/font/jiskan16-2000-1.bdf.gz) = 303401
+SHA256 (xorg/font/jiskan16-2000-2.bdf.gz) = 14d5db8001d4f289df98ce1371f782e81add21281bf4b7f8cd7041cb1c6306cd
+SIZE (xorg/font/jiskan16-2000-2.bdf.gz) = 92122
+SHA256 (xorg/font/K14-2004-1.bdf.gz) = 3b5a49ebc3673d672cef3353110c8ee7ba277173c967c69b2b6e406aeae5309f
+SIZE (xorg/font/K14-2004-1.bdf.gz) = 256459
+SHA256 (xorg/font/K14-2000-1.bdf.gz) = ceaa15568961fba5b86734b1aa86ebfeee641e2f43c55bde4a419e373bb5bdf9
+SIZE (xorg/font/K14-2000-1.bdf.gz) = 255684
+SHA256 (xorg/font/K14-2000-2.bdf.gz) = 05f1f7729a167b01e9d28d704fdf5cb83a20e69a659acae69e1f08e45eb036a9
+SIZE (xorg/font/K14-2000-2.bdf.gz) = 75139
+SHA256 (xorg/font/K12-1.bdf.gz) = 6095fcca99d24dd0dd749a83f99663f24c2a6972e7848844185ba52afbbdab00
+SIZE (xorg/font/K12-1.bdf.gz) = 212803
+SHA256 (xorg/font/K12-2.bdf.gz) = 5cd4f41095a7c4c2d89bcf85a0a467066cd3824ed80ca4434e02a3968bde0376
+SIZE (xorg/font/K12-2.bdf.gz) = 64099
+SHA256 (xorg/font/jiskan24-2000-1.bdf.gz) = 8de41ed35156ccd77d9930ee91322819bc568d468be99a8e59f905e4bdc5821b
+SIZE (xorg/font/jiskan24-2000-1.bdf.gz) = 516369
+SHA256 (xorg/font/jiskan24-2000-2.bdf.gz) = fe6412ffa9feb11eccad206417864c81bb880b477b9f5693d438d028958cdb1b
+SIZE (xorg/font/jiskan24-2000-2.bdf.gz) = 155750
diff --git a/japanese/font-jisx0213/files/Makefile.in b/japanese/font-jisx0213/files/Makefile.in
new file mode 100644
index 000000000000..ec76f1a4328a
--- /dev/null
+++ b/japanese/font-jisx0213/files/Makefile.in
@@ -0,0 +1,68 @@
+# $FreeBSD$
+.SUFFIXES:
+.SUFFIXES: .bdf .pcf
+
+LOCALBASE?=	/usr/local
+GZIP_CMD?=	/usr/bin/gzip
+MKBOLD_CMD?=	${LOCALBASE}/bin/mkbold
+MKITALIC_CMD?=	${LOCALBASE}/bin/mkitalic
+BDFTOPCF_CMD?=	${LOCALBASE}/bin/bdftopcf
+
+SRCS=	K12-1.bdf K12-2.bdf \
+	K14-2004-1.bdf K14-2000-1.bdf K14-2000-2.bdf \
+	jiskan16-2004-1.bdf jiskan16-2000-1.bdf jiskan16-2000-2.bdf \
+	jiskan24-2000-1.bdf jiskan24-2000-2.bdf
+
+TARGETS=${SRCS:S/.bdf/.pcf.gz/} \
+	${SRCS:S/.bdf/b.pcf.gz/} \
+	${SRCS:S/.bdf/i.pcf.gz/} \
+	${SRCS:S/.bdf/bi.pcf.gz/} 
+
+all: ${TARGETS}
+
+.bdf.pcf:
+	${BDFTOPCF_CMD} $> > $@
+CLEANFILES+=	${SRCS:S/.bdf/.pcf/}
+.for B in ${SRCS:S/.bdf//}
+${B}.pcf.gz: ${B}.pcf
+	${GZIP_CMD} -c $> > $@
+CLEANFILES+=	${B}.pcf.gz
+.endfor
+
+# bold
+.for B in ${SRCS:S/.bdf//}
+${B}b.bdf: ${B}.bdf
+	${MKBOLD_CMD} $> > $@
+${B}b.pcf: ${B}b.bdf
+	${BDFTOPCF_CMD} $> > $@
+${B}b.pcf.gz: ${B}b.pcf
+	${GZIP_CMD} -c $> > $@
+CLEANFILES+=	${B}b.bdf ${B}b.pcf ${B}b.pcf.gz
+.endfor
+
+# italic
+.for B in ${SRCS:S/.bdf//}
+${B}i.bdf: ${B}.bdf
+	${MKITALIC_CMD} $> > $@
+${B}i.pcf: ${B}i.bdf
+	${BDFTOPCF_CMD} $> > $@
+${B}i.pcf.gz: ${B}i.pcf
+	${GZIP_CMD} -c $> > $@
+
+${B}bi.bdf: ${B}b.bdf
+	${MKITALIC_CMD} $> > $@
+${B}bi.pcf: ${B}bi.bdf
+	${BDFTOPCF_CMD} $> > $@
+${B}bi.pcf.gz: ${B}bi.pcf
+	${GZIP_CMD} -c $> > $@
+CLEANFILES+=	${B}i.bdf ${B}bi.bdf \
+		${B}i.pcf ${B}bi.pcf \
+		${B}i.pcf.gz ${B}bi.pcf.gz
+.endfor
+
+install::
+	mkdir -p ${PREFIX}/${FONTDIR}
+	${BSD_INSTALL_DATA} ${TARGETS} ${PREFIX}/${FONTDIR}
+
+clean::
+	rm -f ${TARGETS} ${CLEANFILES}
diff --git a/japanese/jisx0213-fonts/pkg-descr b/japanese/font-jisx0213/pkg-descr
index c1c04500fd5c..abcca514eec5 100644
--- a/japanese/jisx0213-fonts/pkg-descr
+++ b/japanese/font-jisx0213/pkg-descr
@@ -1,4 +1,3 @@
 Japanese jisx0213 public domain fonts
 
 WWW: http://www12.ocn.ne.jp/~imamura/jisx0213.html
-WWW: http://gitatsu.hp.infoseek.co.jp/bdf/index.shtml
diff --git a/japanese/font-jisx0213/pkg-plist b/japanese/font-jisx0213/pkg-plist
new file mode 100644
index 000000000000..5bc0801eefa0
--- /dev/null
+++ b/japanese/font-jisx0213/pkg-plist
@@ -0,0 +1,82 @@
+@comment $FreeBSD$
+%%FONTDIR%%/K12-1.pcf.gz
+%%FONTDIR%%/K12-1b.pcf.gz
+%%FONTDIR%%/K12-1bi.pcf.gz
+%%FONTDIR%%/K12-1i.pcf.gz
+%%FONTDIR%%/K12-2.pcf.gz
+%%FONTDIR%%/K12-2b.pcf.gz
+%%FONTDIR%%/K12-2bi.pcf.gz
+%%FONTDIR%%/K12-2i.pcf.gz
+%%FONTDIR%%/K14-2000-1.pcf.gz
+%%FONTDIR%%/K14-2000-1b.pcf.gz
+%%FONTDIR%%/K14-2000-1bi.pcf.gz
+%%FONTDIR%%/K14-2000-1i.pcf.gz
+%%FONTDIR%%/K14-2000-2.pcf.gz
+%%FONTDIR%%/K14-2000-2b.pcf.gz
+%%FONTDIR%%/K14-2000-2bi.pcf.gz
+%%FONTDIR%%/K14-2000-2i.pcf.gz
+%%FONTDIR%%/K14-2004-1.pcf.gz
+%%FONTDIR%%/K14-2004-1b.pcf.gz
+%%FONTDIR%%/K14-2004-1bi.pcf.gz
+%%FONTDIR%%/K14-2004-1i.pcf.gz
+%%FONTDIR%%/jiskan16-2000-1.pcf.gz
+%%FONTDIR%%/jiskan16-2000-1b.pcf.gz
+%%FONTDIR%%/jiskan16-2000-1bi.pcf.gz
+%%FONTDIR%%/jiskan16-2000-1i.pcf.gz
+%%FONTDIR%%/jiskan16-2000-2.pcf.gz
+%%FONTDIR%%/jiskan16-2000-2b.pcf.gz
+%%FONTDIR%%/jiskan16-2000-2bi.pcf.gz
+%%FONTDIR%%/jiskan16-2000-2i.pcf.gz
+%%FONTDIR%%/jiskan16-2004-1.pcf.gz
+%%FONTDIR%%/jiskan16-2004-1b.pcf.gz
+%%FONTDIR%%/jiskan16-2004-1bi.pcf.gz
+%%FONTDIR%%/jiskan16-2004-1i.pcf.gz
+%%FONTDIR%%/jiskan24-2000-1.pcf.gz
+%%FONTDIR%%/jiskan24-2000-1b.pcf.gz
+%%FONTDIR%%/jiskan24-2000-1bi.pcf.gz
+%%FONTDIR%%/jiskan24-2000-1i.pcf.gz
+%%FONTDIR%%/jiskan24-2000-2.pcf.gz
+%%FONTDIR%%/jiskan24-2000-2b.pcf.gz
+%%FONTDIR%%/jiskan24-2000-2bi.pcf.gz
+%%FONTDIR%%/jiskan24-2000-2i.pcf.gz
+@dirrm %%FONTDIR%%
+%%XFONTDIR%%/K12-1.pcf.gz
+%%XFONTDIR%%/K12-1b.pcf.gz
+%%XFONTDIR%%/K12-1bi.pcf.gz
+%%XFONTDIR%%/K12-1i.pcf.gz
+%%XFONTDIR%%/K12-2.pcf.gz
+%%XFONTDIR%%/K12-2b.pcf.gz
+%%XFONTDIR%%/K12-2bi.pcf.gz
+%%XFONTDIR%%/K12-2i.pcf.gz
+%%XFONTDIR%%/K14-2000-1.pcf.gz
+%%XFONTDIR%%/K14-2000-1b.pcf.gz
+%%XFONTDIR%%/K14-2000-1bi.pcf.gz
+%%XFONTDIR%%/K14-2000-1i.pcf.gz
+%%XFONTDIR%%/K14-2000-2.pcf.gz
+%%XFONTDIR%%/K14-2000-2b.pcf.gz
+%%XFONTDIR%%/K14-2000-2bi.pcf.gz
+%%XFONTDIR%%/K14-2000-2i.pcf.gz
+%%XFONTDIR%%/K14-2004-1.pcf.gz
+%%XFONTDIR%%/K14-2004-1b.pcf.gz
+%%XFONTDIR%%/K14-2004-1bi.pcf.gz
+%%XFONTDIR%%/K14-2004-1i.pcf.gz
+%%XFONTDIR%%/jiskan16-2000-1.pcf.gz
+%%XFONTDIR%%/jiskan16-2000-1b.pcf.gz
+%%XFONTDIR%%/jiskan16-2000-1bi.pcf.gz
+%%XFONTDIR%%/jiskan16-2000-1i.pcf.gz
+%%XFONTDIR%%/jiskan16-2000-2.pcf.gz
+%%XFONTDIR%%/jiskan16-2000-2b.pcf.gz
+%%XFONTDIR%%/jiskan16-2000-2bi.pcf.gz
+%%XFONTDIR%%/jiskan16-2000-2i.pcf.gz
+%%XFONTDIR%%/jiskan16-2004-1.pcf.gz
+%%XFONTDIR%%/jiskan16-2004-1b.pcf.gz
+%%XFONTDIR%%/jiskan16-2004-1bi.pcf.gz
+%%XFONTDIR%%/jiskan16-2004-1i.pcf.gz
+%%XFONTDIR%%/jiskan24-2000-1.pcf.gz
+%%XFONTDIR%%/jiskan24-2000-1b.pcf.gz
+%%XFONTDIR%%/jiskan24-2000-1bi.pcf.gz
+%%XFONTDIR%%/jiskan24-2000-1i.pcf.gz
+%%XFONTDIR%%/jiskan24-2000-2.pcf.gz
+%%XFONTDIR%%/jiskan24-2000-2b.pcf.gz
+%%XFONTDIR%%/jiskan24-2000-2bi.pcf.gz
+%%XFONTDIR%%/jiskan24-2000-2i.pcf.gz
diff --git a/japanese/jisx0213-fonts/Makefile b/japanese/jisx0213-fonts/Makefile
deleted file mode 100644
index e9e85510bcd2..000000000000
--- a/japanese/jisx0213-fonts/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# New ports collection makefile for: jisx0213-fonts
-# Date created:		Jun 1 2001
-# Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	jisx0213-fonts
-PORTVERSION=	20040425
-PORTREVISION=	2
-CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	http://www12.ocn.ne.jp/~imamura/ \
-		http://gitatsu.hp.infoseek.co.jp/bdf/:yagi
-DISTFILES=	jiskan16-2004-1.bdf.gz jiskan16-2000-1.bdf.gz \
-		jiskan16-2000-2.bdf.gz K14-2004-1.bdf.gz \
-		K14-2000-1.bdf.gz K14-2000-2.bdf.gz \
-		K12-1.bdf.gz K12-2.bdf.gz \
-		jiskan24-2000-1.bdf.gz:yagi jiskan24-2000-2.bdf.gz:yagi
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Japanese jisx0213 fonts
-
-BUILD_DEPENDS=	mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
-		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
-NO_WRKSUBDIR=	yes
-FONTSDIR=	lib/X11/fonts/local
-
-EXTRACT_CMD=		${CP}
-EXTRACT_BEFORE_ARGS=	-p
-EXTRACT_AFTER_ARGS=	${WRKDIR}
-
-MAKE_ENV=	FONTSDIR=${FONTSDIR}
-PLIST_SUB=	FONTSDIR=${FONTSDIR}
-
-post-extract:
-	@${CP} ${FILESDIR}/Makefile.in ${WRKDIR}/Makefile
-	@(cd ${WRKDIR}; ${GUNZIP_CMD} *.gz)
-
-pre-su-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGREQ} ${PKGNAME} INSTALL
-
-post-install:
-	@(cd ${PREFIX}/${FONTSDIR}; mkfontdir)
-
-.include <bsd.port.mk>
diff --git a/japanese/jisx0213-fonts/distinfo b/japanese/jisx0213-fonts/distinfo
deleted file mode 100644
index 44d1608f8d86..000000000000
--- a/japanese/jisx0213-fonts/distinfo
+++ /dev/null
@@ -1,20 +0,0 @@
-SHA256 (jiskan16-2004-1.bdf.gz) = d79a57b81d3626414cb207eafec8d7b94fc2e7efabb5dce9d3ae58416e82ea3d
-SIZE (jiskan16-2004-1.bdf.gz) = 303930
-SHA256 (jiskan16-2000-1.bdf.gz) = 34e05cb59ae562d53b4b8fa5620454e9a060208f76da915c7da844f581e94830
-SIZE (jiskan16-2000-1.bdf.gz) = 303401
-SHA256 (jiskan16-2000-2.bdf.gz) = 14d5db8001d4f289df98ce1371f782e81add21281bf4b7f8cd7041cb1c6306cd
-SIZE (jiskan16-2000-2.bdf.gz) = 92122
-SHA256 (K14-2004-1.bdf.gz) = 3b5a49ebc3673d672cef3353110c8ee7ba277173c967c69b2b6e406aeae5309f
-SIZE (K14-2004-1.bdf.gz) = 256459
-SHA256 (K14-2000-1.bdf.gz) = ceaa15568961fba5b86734b1aa86ebfeee641e2f43c55bde4a419e373bb5bdf9
-SIZE (K14-2000-1.bdf.gz) = 255684
-SHA256 (K14-2000-2.bdf.gz) = 05f1f7729a167b01e9d28d704fdf5cb83a20e69a659acae69e1f08e45eb036a9
-SIZE (K14-2000-2.bdf.gz) = 75139
-SHA256 (K12-1.bdf.gz) = 6095fcca99d24dd0dd749a83f99663f24c2a6972e7848844185ba52afbbdab00
-SIZE (K12-1.bdf.gz) = 212803
-SHA256 (K12-2.bdf.gz) = 5cd4f41095a7c4c2d89bcf85a0a467066cd3824ed80ca4434e02a3968bde0376
-SIZE (K12-2.bdf.gz) = 64099
-SHA256 (jiskan24-2000-1.bdf.gz) = 8de41ed35156ccd77d9930ee91322819bc568d468be99a8e59f905e4bdc5821b
-SIZE (jiskan24-2000-1.bdf.gz) = 516369
-SHA256 (jiskan24-2000-2.bdf.gz) = fe6412ffa9feb11eccad206417864c81bb880b477b9f5693d438d028958cdb1b
-SIZE (jiskan24-2000-2.bdf.gz) = 155750
diff --git a/japanese/jisx0213-fonts/files/Makefile.in b/japanese/jisx0213-fonts/files/Makefile.in
deleted file mode 100644
index f3c5fcae22d1..000000000000
--- a/japanese/jisx0213-fonts/files/Makefile.in
+++ /dev/null
@@ -1,37 +0,0 @@
-# $FreeBSD$
-
-GZIP_CMD?=	gzip
-MKBOLD_CMD?=	mkbold
-MKITALIC_CMD?=	mkitalic
-
-DIST_ALL=	K12-1.bdf K12-2.bdf \
-		K14-2004-1.bdf K14-2000-1.bdf K14-2000-2.bdf \
-		jiskan16-2004-1.bdf jiskan16-2000-1.bdf jiskan16-2000-2.bdf \
-		jiskan24-2000-1.bdf jiskan24-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
deleted file mode 100644
index 68879909d252..000000000000
--- a/japanese/jisx0213-fonts/pkg-plist
+++ /dev/null
@@ -1,44 +0,0 @@
-%%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-2000-1.pcf.gz
-%%FONTSDIR%%/K14-2000-1b.pcf.gz
-%%FONTSDIR%%/K14-2000-1bi.pcf.gz
-%%FONTSDIR%%/K14-2000-1i.pcf.gz
-%%FONTSDIR%%/K14-2000-2.pcf.gz
-%%FONTSDIR%%/K14-2000-2b.pcf.gz
-%%FONTSDIR%%/K14-2000-2bi.pcf.gz
-%%FONTSDIR%%/K14-2000-2i.pcf.gz
-%%FONTSDIR%%/K14-2004-1.pcf.gz
-%%FONTSDIR%%/K14-2004-1b.pcf.gz
-%%FONTSDIR%%/K14-2004-1bi.pcf.gz
-%%FONTSDIR%%/K14-2004-1i.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
-%%FONTSDIR%%/jiskan16-2004-1.pcf.gz
-%%FONTSDIR%%/jiskan16-2004-1b.pcf.gz
-%%FONTSDIR%%/jiskan16-2004-1bi.pcf.gz
-%%FONTSDIR%%/jiskan16-2004-1i.pcf.gz
-%%FONTSDIR%%/jiskan24-2000-1.pcf.gz
-%%FONTSDIR%%/jiskan24-2000-1b.pcf.gz
-%%FONTSDIR%%/jiskan24-2000-1bi.pcf.gz
-%%FONTSDIR%%/jiskan24-2000-1i.pcf.gz
-%%FONTSDIR%%/jiskan24-2000-2.pcf.gz
-%%FONTSDIR%%/jiskan24-2000-2b.pcf.gz
-%%FONTSDIR%%/jiskan24-2000-2bi.pcf.gz
-%%FONTSDIR%%/jiskan24-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
-@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
diff --git a/japanese/jisx0213-fonts/pkg-req b/japanese/jisx0213-fonts/pkg-req
deleted file mode 100644
index c27be5ed829b..000000000000
--- a/japanese/jisx0213-fonts/pkg-req
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-if [ "x$1" = "x" ]; then
-	exit 1;
-fi
-if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then
-	exit 1;
-fi
-
-export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
-
-if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
-	echo '**********************************************************************'
-	echo "****** ${FONTDIR}/ doesn't exist."
-	echo "****** Creating ${FONTDIR}/"
-	echo '****** Please upgrade your XFree86 to 3.3.3 or upper,'
-	echo "****** or add this directory to your /etc/XF86Config's FontPath entry."
-	echo '**********************************************************************'
-	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}
-
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
-exit 0;