Update to 20130430 and add style clean-ups.

3 files changed, 32 insertions, 28 deletions

diff --git a/japanese/font-migmix/Makefile b/japanese/font-migmix/Makefile
index 601418ac71a3..9f0ea4629ef1 100644
--- a/japanese/font-migmix/Makefile
+++ b/japanese/font-migmix/Makefile
@@ -1,15 +1,14 @@
 # $FreeBSD$
 
 PORTNAME=	migmix
-PORTVERSION=	1.0.20121030
+PORTVERSION=	1.0.20130430
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	mix-mplus-ipa/57239
+MASTER_SITES=	SFJP/mix-mplus-ipa/58721
 PKGNAMEPREFIX=	ja-font-
-DISTFILES=	migmix-1m-20121030${EXTRACT_SUFX} \
-		migmix-2m-20121030${EXTRACT_SUFX} \
-		migmix-1p-20121030${EXTRACT_SUFX} \
-		migmix-2p-20121030${EXTRACT_SUFX}
+DISTFILES=	${PORTNAME}-1m-${PORTVERSION:E}${EXTRACT_SUFX} \
+		${PORTNAME}-2m-${PORTVERSION:E}${EXTRACT_SUFX} \
+		${PORTNAME}-1p-${PORTVERSION:E}${EXTRACT_SUFX} \
+		${PORTNAME}-2p-${PORTVERSION:E}${EXTRACT_SUFX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Mixed Japanese font with IPA Gothic and M-plus outline
@@ -24,22 +23,27 @@ SUB_FILES=	pkg-install
 SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
 PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
 		LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
+DATADIR=	${PREFIX}/share/font-${PORTNAME}
 PORTDOCS=	IPA_Font_License_Agreement_v1.0.txt Readme_ipag00303.txt \
 		migmix-README.txt
 LOCAL_FONTSDIR=	share/fonts
 X_FONTSDIR=	lib/X11/fonts
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 do-install:
-	cd ${WRKDIR}/migmix-1m-20121030/ && \
+	cd ${WRKDIR}/${PORTNAME}-1m-${PORTVERSION:E}/ && \
 		${INSTALL_DATA} ipag00303/*.txt \
 			migmix-README.txt \
 			${WRKDIR}
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} \
-		${WRKDIR}/migmix-1m-20121030/*.ttf \
-		${WRKDIR}/migmix-2m-20121030/*.ttf \
-		${WRKDIR}/migmix-1p-20121030/*.ttf \
-		${WRKDIR}/migmix-2p-20121030/*.ttf \
+		${WRKDIR}/${PORTNAME}-1m-${PORTVERSION:E}/*.ttf \
+		${WRKDIR}/${PORTNAME}-2m-${PORTVERSION:E}/*.ttf \
+		${WRKDIR}/${PORTNAME}-1p-${PORTVERSION:E}/*.ttf \
+		${WRKDIR}/${PORTNAME}-2p-${PORTVERSION:E}/*.ttf \
 		${DATADIR}
 	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
 	${LN} -s -f ${DATADIR}/migmix*.ttf \
@@ -47,14 +51,14 @@ do-install:
 	${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF
 	${LN} -s -f ${DATADIR}/migmix*.ttf \
 		${PREFIX}/${X_FONTSDIR}/TTF/
-	${INSTALL_DATA} ${FILESDIR}/20-unhint-migmix.conf \
-		${FILESDIR}/62-fonts-migmix.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-migmix.conf \
-		${PREFIX}/etc/fonts/conf.d/20-unhint-migmix.conf
-	${LN} -s -f ../conf.avail/62-fonts-migmix.conf \
-		${PREFIX}/etc/fonts/conf.d/62-fonts-migmix.conf
-.if !defined(NOPORTDOCS)
+	${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
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
diff --git a/japanese/font-migmix/distinfo b/japanese/font-migmix/distinfo
index 2338c914e45d..5329f249377e 100644
--- a/japanese/font-migmix/distinfo
+++ b/japanese/font-migmix/distinfo
@@ -1,8 +1,8 @@
-SHA256 (migmix-1m-20121030.zip) = 619fe7c382d68a7fe8f051e4633a8b4eec705b44cde3bea665052181ea51d30d
-SIZE (migmix-1m-20121030.zip) = 4223506
-SHA256 (migmix-2m-20121030.zip) = 58e1789e886b89ae39fd862983b85118c1b5837b7c723956ce01f0388bff6562
-SIZE (migmix-2m-20121030.zip) = 4222034
-SHA256 (migmix-1p-20121030.zip) = e7d23173ba8e64ad028dd5c0a3f5a2fc61b87bea9d93c5d7332d3a8169ef0ea2
-SIZE (migmix-1p-20121030.zip) = 4327973
-SHA256 (migmix-2p-20121030.zip) = db8a0df9ef7d36b312a48709fdfc7c04025a2dcd7a71572f292d966e4712fd82
-SIZE (migmix-2p-20121030.zip) = 4328749
+SHA256 (migmix-1m-20130430.zip) = 8371ad7d2c4cd4af2fe7df30645c06dc073a5d31cfd730777fdb45f26272b594
+SIZE (migmix-1m-20130430.zip) = 4269390
+SHA256 (migmix-2m-20130430.zip) = fcee3ef2781e82637fc412a7c1678140f4cd30401a0ebf7eb71e0903af2c9d38
+SIZE (migmix-2m-20130430.zip) = 4267709
+SHA256 (migmix-1p-20130430.zip) = a9913aebad7f7ed6326749cefa5f73a26c59fc3ecd7b744eef15e1ce3d35a5c7
+SIZE (migmix-1p-20130430.zip) = 4372856
+SHA256 (migmix-2p-20130430.zip) = 3aadef411cb9d993b294907b671806fb567a8a6d278a9fb5735295e30d3fae3f
+SIZE (migmix-2p-20130430.zip) = 4373751
diff --git a/japanese/font-migmix/pkg-descr b/japanese/font-migmix/pkg-descr
index 80295faac111..f869aad529c5 100644
--- a/japanese/font-migmix/pkg-descr
+++ b/japanese/font-migmix/pkg-descr
@@ -2,4 +2,4 @@ This package includes a mixed font consisting of Japanese TrueType
 fonts distributed by Infomation-technology Promotion Agency (IPA)
 Japan and M+ outline font.
 
-WWW:	http://mix-mplus-ipa.sourceforge.jp/migmix/
+WWW: http://mix-mplus-ipa.sourceforge.jp/migmix/