5 files changed, 98 insertions, 39 deletions

diff --git a/japanese/marumoji-fonts/Makefile b/japanese/marumoji-fonts/Makefile
index ad3847fda8e0..653308d6abfb 100644
--- a/japanese/marumoji-fonts/Makefile
+++ b/japanese/marumoji-fonts/Makefile
@@ -7,18 +7,24 @@
 
 PORTNAME=	marumoji-fonts
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://mlnews.com/marumoji/src/ \
 		${MASTER_SITE_LOCAL} \
 		ftp://ftp.lavender.org/pub/x11/fonts/
 MASTER_SITE_SUBDIR=	yoichi
-DISTFILES=	maru14.pcf.gz maru16.pcf.gz maru18.pcf.gz \
+DISTFILES=	maru14.bdf.v13.gz maru18.bdf.v10.gz \
 		7x14maru.bdf.gz 7x14rkmaru.bdf.gz \
+		m18to16.sed \
 		8x16maru.bdf.gz 8x16rkmr.bdf.gz \
 		9x18maru.bdf.gz 9x18rkmr.bdf.gz
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	yoichi@FreeBSD.org
 
+BUILD_DEPENDS=	mkbold:${PORTSDIR}/x11-fonts/mkbold \
+		mkitalic:${PORTSDIR}/x11-fonts/mkitalic
+
 NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
 FONTSDIR=	lib/X11/fonts/local
@@ -30,38 +36,28 @@ BUILD_DEPENDS+=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 .endif
 
-BDFFONTS=	7x14maru.bdf.gz 7x14rkmaru.bdf.gz 8x16maru.bdf.gz \
-		8x16rkmr.bdf.gz 9x18maru.bdf.gz 9x18rkmr.bdf.gz
-FONTSIZE=	7x14 8x16 9x18
-PLIST_SUB=	FONTSDIR=${FONTSDIR}
+EXTRACT_CMD=		${CP}
+EXTRACT_BEFORE_ARGS=	-p
+EXTRACT_AFTER_ARGS=	${WRKDIR}
 
-do-extract:
-	@${MKDIR} ${WRKDIR}
-.for i in ${BDFFONTS}
-	@${CP} ${DISTDIR}/${i} ${WRKDIR}
-	@${GUNZIP_CMD} ${WRKDIR}/${i}
-.endfor
-	@${MV} ${WRKDIR}/7x14rkmaru.bdf ${WRKDIR}/7x14rkmr.bdf
+MAKE_ENV=	FONTSDIR=${FONTSDIR}
+PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
-do-build:
-.for i in ${FONTSIZE}
-	(cd ${WRKSRC} ; \
-	bdftopcf ${i}maru.bdf > ${i}maru.pcf ; ${GZIP_CMD} ${i}maru.pcf; \
-	bdftopcf ${i}rkmr.bdf > ${i}rkmr.pcf ; ${GZIP_CMD} ${i}rkmr.pcf )
-.endfor
-
-do-install:
-	${MKDIR} ${PREFIX}/${FONTSDIR}
-	(cd ${DISTDIR} ; ${INSTALL_DATA} maru14.pcf.gz maru16.pcf.gz maru18.pcf.gz ${PREFIX}/${FONTSDIR})
-.for i in ${FONTSIZE}
-	(cd ${WRKSRC} ; ${INSTALL_DATA} ${i}maru.pcf.gz ${i}rkmr.pcf.gz ${PREFIX}/${FONTSDIR})
-.endfor
-	mkfontdir ${PREFIX}/${FONTSDIR}
-	${MKDIR} ${PREFIX}/share/doc/marumoji-fonts
-	${INSTALL_DATA} ${FILESDIR}/LICENSE ${PREFIX}/share/doc/marumoji-fonts
+post-extract:
+	@${MV} ${WRKDIR}/maru14.bdf.v13.gz ${WRKDIR}/maru14.bdf.gz
+	@${MV} ${WRKDIR}/maru18.bdf.v10.gz ${WRKDIR}/maru18.bdf.gz
+	@${CP} ${FILESDIR}/Makefile.in ${WRKDIR}/Makefile
+	@(cd ${WRKDIR}; ${GUNZIP_CMD} *.gz)
 
+pre-build:
+	@(cd ${WRKDIR}; ${SED} -f m18to16.sed < maru18.bdf > maru16.bdf)
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGREQ} ${PKGNAME} INSTALL
 
+post-install:
+	@(cd ${PREFIX}/${FONTSDIR}; mkfontdir)
+	${MKDIR} ${PREFIX}/share/doc/marumoji-fonts
+	${INSTALL_DATA} ${FILESDIR}/LICENSE ${PREFIX}/share/doc/marumoji-fonts
+
 .include <bsd.port.post.mk>
diff --git a/japanese/marumoji-fonts/distinfo b/japanese/marumoji-fonts/distinfo
index 6029dec51dd5..36e9a92eb63a 100644
--- a/japanese/marumoji-fonts/distinfo
+++ b/japanese/marumoji-fonts/distinfo
@@ -1,9 +1,9 @@
-MD5 (maru14.pcf.gz) = a7bfe676ad69ed8dde8807ecbe7c1758
-MD5 (maru16.pcf.gz) = 274dcd0aebd762fca01cc51f61009909
-MD5 (maru18.pcf.gz) = 70ae5db4e9d54f046c66eb2a03989bc0
-MD5 (7x14maru.bdf.gz) = 39b80c415e06440ffbe94d00e07f9a09
-MD5 (7x14rkmaru.bdf.gz) = 43eee9a0657ef93639523011827542b6
-MD5 (8x16maru.bdf.gz) = 3b547083854a6ddf99c754e1ab712b57
-MD5 (8x16rkmr.bdf.gz) = d31f451485d37c4485d9386fac791b95
-MD5 (9x18maru.bdf.gz) = 54d410840e7af5ff53647b2312ade144
-MD5 (9x18rkmr.bdf.gz) = 824e77fcfcc5aa4aded277e5cdb4202d
+MD5 (marumoji-fonts/maru14.bdf.v13.gz) = a543824c3f903d7f3a3d68d9198b6e88
+MD5 (marumoji-fonts/maru18.bdf.v10.gz) = 26d493fb964373cce1a69d59c9a99274
+MD5 (marumoji-fonts/7x14maru.bdf.gz) = 39b80c415e06440ffbe94d00e07f9a09
+MD5 (marumoji-fonts/7x14rkmaru.bdf.gz) = 43eee9a0657ef93639523011827542b6
+MD5 (marumoji-fonts/m18to16.sed) = dee64b57d927feae4233452d521efbcf
+MD5 (marumoji-fonts/8x16maru.bdf.gz) = 3b547083854a6ddf99c754e1ab712b57
+MD5 (marumoji-fonts/8x16rkmr.bdf.gz) = d31f451485d37c4485d9386fac791b95
+MD5 (marumoji-fonts/9x18maru.bdf.gz) = 54d410840e7af5ff53647b2312ade144
+MD5 (marumoji-fonts/9x18rkmr.bdf.gz) = 824e77fcfcc5aa4aded277e5cdb4202d
diff --git a/japanese/marumoji-fonts/files/Makefile.in b/japanese/marumoji-fonts/files/Makefile.in
new file mode 100644
index 000000000000..7c6a7023c57f
--- /dev/null
+++ b/japanese/marumoji-fonts/files/Makefile.in
@@ -0,0 +1,36 @@
+# $FreeBSD$
+
+GZIP_CMD?=	gzip
+MKBOLD_CMD?=	mkbold
+MKITALIC_CMD?=	mkitalic
+
+DIST_ALL=	7x14maru.bdf 7x14rkmaru.bdf 8x16maru.bdf \
+		8x16rkmr.bdf 9x18maru.bdf 9x18rkmr.bdf \
+		maru14.bdf maru16.bdf maru18.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/marumoji-fonts/pkg-plist b/japanese/marumoji-fonts/pkg-plist
index 4948b44922af..6e998096e511 100644
--- a/japanese/marumoji-fonts/pkg-plist
+++ b/japanese/marumoji-fonts/pkg-plist
@@ -1,12 +1,39 @@
 %%FONTSDIR%%/7x14maru.pcf.gz
-%%FONTSDIR%%/7x14rkmr.pcf.gz
+%%FONTSDIR%%/7x14marub.pcf.gz
+%%FONTSDIR%%/7x14marubi.pcf.gz
+%%FONTSDIR%%/7x14marui.pcf.gz
+%%FONTSDIR%%/7x14rkmaru.pcf.gz
+%%FONTSDIR%%/7x14rkmarub.pcf.gz
+%%FONTSDIR%%/7x14rkmarubi.pcf.gz
+%%FONTSDIR%%/7x14rkmarui.pcf.gz
 %%FONTSDIR%%/8x16maru.pcf.gz
+%%FONTSDIR%%/8x16marub.pcf.gz
+%%FONTSDIR%%/8x16marubi.pcf.gz
+%%FONTSDIR%%/8x16marui.pcf.gz
 %%FONTSDIR%%/8x16rkmr.pcf.gz
+%%FONTSDIR%%/8x16rkmrb.pcf.gz
+%%FONTSDIR%%/8x16rkmrbi.pcf.gz
+%%FONTSDIR%%/8x16rkmri.pcf.gz
 %%FONTSDIR%%/9x18maru.pcf.gz
+%%FONTSDIR%%/9x18marub.pcf.gz
+%%FONTSDIR%%/9x18marubi.pcf.gz
+%%FONTSDIR%%/9x18marui.pcf.gz
 %%FONTSDIR%%/9x18rkmr.pcf.gz
+%%FONTSDIR%%/9x18rkmrb.pcf.gz
+%%FONTSDIR%%/9x18rkmrbi.pcf.gz
+%%FONTSDIR%%/9x18rkmri.pcf.gz
 %%FONTSDIR%%/maru14.pcf.gz
+%%FONTSDIR%%/maru14b.pcf.gz
+%%FONTSDIR%%/maru14bi.pcf.gz
+%%FONTSDIR%%/maru14i.pcf.gz
 %%FONTSDIR%%/maru16.pcf.gz
+%%FONTSDIR%%/maru16b.pcf.gz
+%%FONTSDIR%%/maru16bi.pcf.gz
+%%FONTSDIR%%/maru16i.pcf.gz
 %%FONTSDIR%%/maru18.pcf.gz
+%%FONTSDIR%%/maru18b.pcf.gz
+%%FONTSDIR%%/maru18bi.pcf.gz
+%%FONTSDIR%%/maru18i.pcf.gz
 share/doc/marumoji-fonts/LICENSE
 @dirrm share/doc/marumoji-fonts
 @exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
diff --git a/japanese/marumoji-fonts/pkg-req b/japanese/marumoji-fonts/pkg-req
index 9b8d752b2a78..dfaf8fbcef94 100644
--- a/japanese/marumoji-fonts/pkg-req
+++ b/japanese/marumoji-fonts/pkg-req
@@ -25,7 +25,7 @@ cat << EOF > ${TMPFILE}
 maru14 -misc-marumoji-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0
 maru16 -misc-marumoji-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0
 maru18 -misc-marumoji-medium-r-normal--18-170-75-75-c-180-jisx0208.1983-0
-7x14rkmr -misc-marumoji-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0
+7x14rkmaru -misc-marumoji-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0
 7x14maru -misc-marumoji-medium-r-normal--14-130-75-75-c-70-iso8859-1
 8x16rkmr -misc-marumoji-medium-r-normal--16-150-75-75-c-80-jisx0201.1976-0
 8x16maru -misc-marumoji-medium-r-normal--16-150-75-75-c-80-iso8859-1