1 files changed, 36 insertions, 18 deletions

diff --git a/japanese/ipa-ttfonts/Makefile b/japanese/ipa-ttfonts/Makefile
index dcd6e74f142d..9266b5598dbc 100644
--- a/japanese/ipa-ttfonts/Makefile
+++ b/japanese/ipa-ttfonts/Makefile
@@ -6,50 +6,68 @@
 #
 
 PORTNAME=	ipa-ttfonts
-PORTVERSION=	1.0.20040814
-PORTREVISION=	1
+PORTVERSION=	1.0.20060520
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	# empty
-DISTFILES=	# empty
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
+MASTER_SITE_SUBDIR=	mix-mplus-ipa/20216
+DISTNAME=	mixfont-mplus-ipa-TrueType-20060520
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	Japanese TrueType fonts distributed by IPA
+COMMENT=	IPA Japanese TrueType fonts with M-plus outline font
 
-RUN_DEPENDS=	${LOCALBASE}/${GRASS_FONTSDIR}/ipam.ttf:${PORTSDIR}/databases/grass-i18n \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
+USE_BZIP2=	yes
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}/mixfont-mplus-ipa-TrueType-20060520
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 
 SUB_FILES=	pkg-install
 SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
 
-LOCAL_FONTSDIR=	share/fonts
+LOCAL_FONTSDIR=	share/fonts/TrueType
 X_FONTSDIR=	lib/X11/fonts/TrueType
-GRASS_FONTSDIR=	grass5/fonts
+DATADIR=	${LOCALBASE}/share/${PORTNAME}
 
 USE_X_PREFIX=	yes
 
-PLIST_SUB=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR} \
-		FONTSDIR_EXTRA=${PREFIX}/${X_FONTSDIR}/fonts.dir.ipa \
-		LOCAL_FONTSDIR=${LOCALBASE}/${LOCAL_FONTSDIR} \
-		GRASS_FONTSDIR=${LOCALBASE}/${GRASS_FONTSDIR}
+PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
+		FONTSDIR_EXTRA=${X_FONTSDIR}/fonts.dir.ipa \
+		LOCAL_FONTSDIR=${LOCAL_FONTSDIR} \
+		DATADIR=share/${PORTNAME}
+
+PORTDOCS=	Bitstream-COPYRIGHT.txt Mplus-LICENSE_E.txt \
+		Mplus-LICENSE_J.txt README.txt
 
 do-install:
-	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType
+	${MKDIR} ${DATADIR}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
+	${CP} -R ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus/* \
+		${DATADIR}
+	${MKDIR} ${LOCALBASE}/${LOCAL_FONTSDIR}/
+	${LN} -s -f \
+		${DATADIR}/fonts/ipa*.ttf \
+		${LOCALBASE}/${LOCAL_FONTSDIR}/
+	${LN} -s -f \
+		${DATADIR}/fonts/M+*.ttf \
+		${LOCALBASE}/${LOCAL_FONTSDIR}/
 	${MKDIR} ${PREFIX}/${X_FONTSDIR}
 	${LN} -s -f \
-		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
-		${LOCALBASE}/${LOCAL_FONTSDIR}/TrueType/
+		${DATADIR}/fonts/ipa*.ttf \
+		${PREFIX}/${X_FONTSDIR}/
 	${LN} -s -f \
-		${LOCALBASE}/${GRASS_FONTSDIR}/ipa*.ttf \
+		${DATADIR}/fonts/M+*.ttf \
 		${PREFIX}/${X_FONTSDIR}/
 	${MKDIR} ${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/2.ipa-ttfonts.conf \
 		${PREFIX}/etc/fonts/conf.d
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+.endif
 
 post-install:
 	${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}