3 files changed, 31 insertions, 29 deletions

diff --git a/japanese/font-mplus/Makefile b/japanese/font-mplus/Makefile
index c2197e2477dd..eb0786e0f468 100644
--- a/japanese/font-mplus/Makefile
+++ b/japanese/font-mplus/Makefile
@@ -1,17 +1,14 @@
-# New ports collection makefile for:	M+ Fonts
-# Date created:		July 17 2002
-# Whom:			The 244th namelessness at 2ch.net
-#
+# Created by: The 244th namelessness at 2ch.net
 # $FreeBSD$
-#
 
-PORTNAME=	font-mplus
-PORTVERSION=	2.2.4.041
+PORTNAME=	mplus
+PORTVERSION=	2.2.4.055
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	mplus-fonts/5030 mplus-fonts/6650
-DISTFILES=	mplus_bitmap_fonts-2.2.4${EXTRACT_SUFX} \
-		mplus-TESTFLIGHT-041${EXTRACT_SUFX}
+MASTER_SITES=	SFJP/${PORTNAME}-fonts/5030:bitmap \
+		SFJP/${PORTNAME}-fonts/6650:outline
+PKGNAMEPREFIX=	ja-font-
+DISTFILES=	${PORTNAME}_bitmap_fonts-2.2.4.tar.gz:bitmap \
+		${PORTNAME}-TESTFLIGHT-055.tar.xz:outline
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	M+ Bitmap and Outline Fonts
@@ -21,6 +18,7 @@ RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
 		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
+USE_XZ=		yes
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
@@ -29,7 +27,7 @@ SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR} \
 		FONTSALIAS=${DATADIR}/bitmap/fonts.alias
 PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
 		LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
-PATCH_WRKSRC=	${WRKDIR}/mplus_bitmap_fonts-2.2.4
+PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4
 
 PORTDOCS=	INSTALL_E.bitmap LICENSE_E.bitmap README_E.bitmap \
 		INSTALL_J.bitmap LICENSE_J.bitmap README_J.bitmap \
@@ -39,8 +37,12 @@ PORTDOCS=	INSTALL_E.bitmap LICENSE_E.bitmap README_E.bitmap \
 LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-extract:
-	cd ${WRKDIR}/mplus_bitmap_fonts-2.2.4 && \
+	cd ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4 && \
 		${CAT} fonts_e/fonts.alias fonts_e/euro/fonts.alias \
 		fonts_j/fonts.alias | ${SORT} -r > ${WRKDIR}/fonts.alias
 
@@ -50,38 +52,38 @@ pre-su-install:
 do-install: do-install-bitmap do-install-outline
 
 do-install-bitmap:
-	cd ${WRKDIR}/mplus_bitmap_fonts-2.2.4 && \
+	cd ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4 && \
 		${SETENV} DESTDIR="${DATADIR}/bitmap" \
-		${SH} ${WRKDIR}/mplus_bitmap_fonts-2.2.4/install_mplus_fonts
+		${SH} ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4/install_mplus_fonts
 	${INSTALL_DATA} ${WRKDIR}/fonts.alias ${DATADIR}/bitmap
 	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/mplus
-	${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${PREFIX}/${LOCAL_FONTSDIR}/mplus/
+	${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${PREFIX}/${LOCAL_FONTSDIR}/${PORTNAME}/
 	${MKDIR} ${PREFIX}/${X_FONTSDIR}/misc
 	${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${PREFIX}/${X_FONTSDIR}/misc/
 
 do-install-outline:
-	${INSTALL_DATA} ${WRKDIR}/mplus-TESTFLIGHT-041/*.ttf ${DATADIR}/TTF
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-TESTFLIGHT-055/*.ttf ${DATADIR}/TTF
 	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
 	${LN} -s -f ${DATADIR}/TTF/*.ttf ${PREFIX}/${LOCAL_FONTSDIR}/TTF/
 	${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF
 	${LN} -s -f ${DATADIR}/TTF/*.ttf ${PREFIX}/${X_FONTSDIR}/TTF/
-	${INSTALL_DATA} ${FILESDIR}/20-unhint-mplus.conf \
-		${FILESDIR}/62-fonts-mplus.conf \
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
+		${FILESDIR}/62-fonts-${PORTNAME}.conf \
 		${PREFIX}/etc/fonts/conf.avail
-	${LN} -s -f ../conf.avail/20-unhint-mplus.conf \
-		${PREFIX}/etc/fonts/conf.d/20-unhint-mplus.conf
-	${LN} -s -f ../conf.avail/62-fonts-mplus.conf \
-		${PREFIX}/etc/fonts/conf.d/62-fonts-mplus.conf
+	${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \
+		${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
+	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
+		${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
 
 post-install:
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	for F in ${PORTDOCS:M*.bitmap:S,.bitmap$,,}; do \
-		${INSTALL_DATA} ${WRKDIR}/mplus_bitmap_fonts-2.2.4/$${F} ${DOCSDIR}/$${F}.bitmap; \
+		${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_bitmap_fonts-2.2.4/$${F} ${DOCSDIR}/$${F}.bitmap; \
 	done
 	for F in ${PORTDOCS:M*.outline:S,.outline$,,}; do \
-		${INSTALL_DATA} ${WRKDIR}/mplus-TESTFLIGHT-041/$${F} ${DOCSDIR}/$${F}.outline; \
+		${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-TESTFLIGHT-055/$${F} ${DOCSDIR}/$${F}.outline; \
 	done
 .endif
 
diff --git a/japanese/font-mplus/distinfo b/japanese/font-mplus/distinfo
index 6ea180a6f2d3..a122b50f6f40 100644
--- a/japanese/font-mplus/distinfo
+++ b/japanese/font-mplus/distinfo
@@ -1,4 +1,4 @@
 SHA256 (mplus_bitmap_fonts-2.2.4.tar.gz) = b16cf416b7fcf89f56a82feb43259aea9b979c3a660579f5a8e906c93414f1e2
 SIZE (mplus_bitmap_fonts-2.2.4.tar.gz) = 382574
-SHA256 (mplus-TESTFLIGHT-041.tar.gz) = 3fa1c36caa4e23c229859d312e1a99a892e4054f72351aa052efd6d68895293f
-SIZE (mplus-TESTFLIGHT-041.tar.gz) = 25398353
+SHA256 (mplus-TESTFLIGHT-055.tar.xz) = 19b2139d69c7bf4397920767affa01d2bad200610147abbcd1e2d91b10017f4d
+SIZE (mplus-TESTFLIGHT-055.tar.xz) = 8853404
diff --git a/japanese/font-mplus/pkg-descr b/japanese/font-mplus/pkg-descr
index 612008f0e232..c02dbb6b5819 100644
--- a/japanese/font-mplus/pkg-descr
+++ b/japanese/font-mplus/pkg-descr
@@ -1,4 +1,4 @@
 M+ bitmap fonts is a bitmap font set aimed for simple and readable design.
 This font set includes Japanese and Latin fonts, and they're 10 and 12 dots.
 
-WWW:	http://mplus-fonts.sourceforge.jp/
+WWW: http://mplus-fonts.sourceforge.jp/