4 files changed, 82 insertions, 36 deletions

diff --git a/x11-fonts/wqy/Makefile b/x11-fonts/wqy/Makefile
index ef5277a2b966..5b64136d1330 100644
--- a/x11-fonts/wqy/Makefile
+++ b/x11-fonts/wqy/Makefile
@@ -6,16 +6,20 @@
 #
 
 PORTNAME=	wqy-fonts
-PORTVERSION=	20081102
+PORTVERSION=	20100803
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
-MASTER_SITES=	SF/wqy/wqy-bitmapfont/0.9.9:bitmapfont \
+MASTER_SITES=	SF/wqy/wqy-bitmapfont/1.0.0-RC1:bitmapfont \
 		SF/wqy/wqy-unibit/1.1.0:unibit \
-		SF/wqy/wqy-zenhei/0.8.34-cvs20081027:zenhei
-DISTFILES=	wqy-bitmapfont-pcf-0.9.9-0.tar.gz:bitmapfont \
+		SF/wqy/wqy-zenhei/0.9.45%20%28Fighting-state%20RC1%29:zenhei \
+		SF/wqy/wqy-microhei-lite/0.2.0-beta:microheilite \
+		SF/wqy/wqy-microhei/0.2.0-beta:microhei
+DISTFILES=	wqy-bitmapsong-pcf-1.0.0-RC1.tar.gz:bitmapfont \
 		wqy-unibit-bdf-1.1.0-1.tar.gz:unibit \
-		wqy-zenhei-0.8.34-cvs20081027.tar.gz:zenhei
+		wqy-zenhei-0.9.45.tar.gz:zenhei \
+		wqy-microhei-lite-0.2.0-beta.tar.gz:microheilite \
+		wqy-microhei-0.2.0-beta.tar.gz:microhei
 
 MAINTAINER=	intron@intron.ac
 COMMENT=	GNU GPL-licensed font set covering CJK and other Unicode characters
@@ -41,30 +45,43 @@ SUB_LIST=	FONTSDIR=${PREFIX}/${FONTSDIR}
 .include <bsd.port.pre.mk>
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	AUTHORS.bitmap AUTHORS.truetype \
-		ChangeLog.bitmap ChangeLog.truetype \
-		README.bitmap README.truetype \
-		COPYING LOGO.png
+PORTDOCS=	AUTHORS.bitmap ChangeLog.bitmap README.bitmap COPYING.bitmap \
+		LOGO.png \
+		AUTHORS.zenhei ChangeLog.zenhei README.zenhei \
+		AUTHORS.microheilite README.microheilite ChangeLog.microheilite \
+		AUTHORS.microhei README.microhei ChangeLog.microhei \
+		LICENSE_Apache2.txt LICENSE_GPLv3.txt
 .endif
 
 do-build:
 	${PERL} ${WRKDIR}/wqy-unibit/bdfmerge.pl 0x0--0xFFFF ${WRKDIR}/wqy-unibit/wqy-unibit.bdf > ${WRKDIR}/wqy-unibit/wqy-unibit_cjk.bdf
 	bdftopcf ${WRKDIR}/wqy-unibit/wqy-unibit_cjk.bdf > ${WRKDIR}/wqy-unibit/wqy-unibit.pcf
-	${CP} ${WRKDIR}/wqy-bitmapfont/AUTHORS ${WRKDIR}/wqy-bitmapfont/AUTHORS.bitmap
-	${CP} ${WRKDIR}/wqy-bitmapfont/ChangeLog ${WRKDIR}/wqy-bitmapfont/ChangeLog.bitmap
-	${CP} ${WRKDIR}/wqy-bitmapfont/README ${WRKDIR}/wqy-bitmapfont/README.bitmap
-	${CP} ${WRKDIR}/wqy-zenhei/AUTHORS ${WRKDIR}/wqy-zenhei/AUTHORS.truetype
-	${CP} ${WRKDIR}/wqy-zenhei/ChangeLog ${WRKDIR}/wqy-zenhei/ChangeLog.truetype
-	${CP} ${WRKDIR}/wqy-zenhei/README ${WRKDIR}/wqy-zenhei/README.truetype
+	${CP} ${WRKDIR}/wqy-bitmapsong/AUTHORS ${WRKDIR}/wqy-bitmapsong/AUTHORS.bitmap
+	${CP} ${WRKDIR}/wqy-bitmapsong/ChangeLog ${WRKDIR}/wqy-bitmapsong/ChangeLog.bitmap
+	${CP} ${WRKDIR}/wqy-bitmapsong/README ${WRKDIR}/wqy-bitmapsong/README.bitmap
+	${CP} ${WRKDIR}/wqy-bitmapsong/COPYING ${WRKDIR}/wqy-bitmapsong/COPYING.bitmap
+	${CP} ${WRKDIR}/wqy-zenhei/AUTHORS ${WRKDIR}/wqy-zenhei/AUTHORS.zenhei
+	${CP} ${WRKDIR}/wqy-zenhei/ChangeLog ${WRKDIR}/wqy-zenhei/ChangeLog.zenhei
+	${CP} ${WRKDIR}/wqy-zenhei/README ${WRKDIR}/wqy-zenhei/README.zenhei
+	${CP} ${WRKDIR}/wqy-microhei-lite/AUTHORS.txt ${WRKDIR}/wqy-microhei-lite/AUTHORS.microheilite
+	${CP} ${WRKDIR}/wqy-microhei-lite/ChangeLog.txt ${WRKDIR}/wqy-microhei-lite/ChangeLog.microheilite
+	${CP} ${WRKDIR}/wqy-microhei-lite/README.txt ${WRKDIR}/wqy-microhei-lite/README.microheilite
+	${CP} ${WRKDIR}/wqy-microhei/AUTHORS.txt ${WRKDIR}/wqy-microhei/AUTHORS.microhei
+	${CP} ${WRKDIR}/wqy-microhei/ChangeLog.txt ${WRKDIR}/wqy-microhei/ChangeLog.microhei
+	${CP} ${WRKDIR}/wqy-microhei/README.txt ${WRKDIR}/wqy-microhei/README.microhei
 
 do-install:
 	${MKDIR} ${PREFIX}/${FONTSDIR} ${PREFIX}/${CONFDDIR} ${PREFIX}/${CONFAVAILDIR}
 # WQY Bitmap Song
-	${INSTALL_DATA} ${WRKDIR}/wqy-bitmapfont/*.pcf ${PREFIX}/${FONTSDIR}
+	${INSTALL_DATA} ${WRKDIR}/wqy-bitmapsong/*.pcf ${PREFIX}/${FONTSDIR}
 # WQY Bitmap Song
 	${INSTALL_DATA} ${WRKDIR}/wqy-unibit/wqy-unibit.pcf ${PREFIX}/${FONTSDIR}
-# WQY TrueType
+# WQY TrueType Zenhei
 	${INSTALL_DATA} ${WRKDIR}/wqy-zenhei/wqy-zenhei.ttc ${PREFIX}/${FONTSDIR}
+# WQY TrueType MicroHei Lite
+	${INSTALL_DATA} ${WRKDIR}/wqy-microhei-lite/wqy-microhei-lite.ttc ${PREFIX}/${FONTSDIR}
+# WQY TrueType MicroHei
+	${INSTALL_DATA} ${WRKDIR}/wqy-microhei/wqy-microhei.ttc ${PREFIX}/${FONTSDIR}
 
 	${INSTALL_DATA} ${FILESDIR}/85-wqy.conf ${PREFIX}/${CONFAVAILDIR}
 	${LN} -sf ${PREFIX}/${CONFAVAILDIR}/85-wqy.conf ${PREFIX}/${CONFDDIR}/85-wqy.conf
@@ -72,14 +89,22 @@ do-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} \
-		${WRKDIR}/wqy-bitmapfont/AUTHORS.bitmap \
-		${WRKDIR}/wqy-bitmapfont/ChangeLog.bitmap \
-		${WRKDIR}/wqy-bitmapfont/README.bitmap \
-		${WRKDIR}/wqy-bitmapfont/COPYING \
-		${WRKDIR}/wqy-bitmapfont/LOGO.png \
-		${WRKDIR}/wqy-zenhei/AUTHORS.truetype \
-		${WRKDIR}/wqy-zenhei/ChangeLog.truetype \
-		${WRKDIR}/wqy-zenhei/README.truetype \
+		${WRKDIR}/wqy-bitmapsong/AUTHORS.bitmap \
+		${WRKDIR}/wqy-bitmapsong/ChangeLog.bitmap \
+		${WRKDIR}/wqy-bitmapsong/README.bitmap \
+		${WRKDIR}/wqy-bitmapsong/COPYING.bitmap \
+		${WRKDIR}/wqy-bitmapsong/LOGO.png \
+		${WRKDIR}/wqy-zenhei/AUTHORS.zenhei \
+		${WRKDIR}/wqy-zenhei/ChangeLog.zenhei \
+		${WRKDIR}/wqy-zenhei/README.zenhei \
+		${WRKDIR}/wqy-microhei-lite/AUTHORS.microheilite \
+		${WRKDIR}/wqy-microhei-lite/ChangeLog.microheilite \
+		${WRKDIR}/wqy-microhei-lite/README.microheilite \
+		${WRKDIR}/wqy-microhei/AUTHORS.microhei \
+		${WRKDIR}/wqy-microhei/ChangeLog.microhei \
+		${WRKDIR}/wqy-microhei/README.microhei \
+		${WRKDIR}/wqy-microhei/LICENSE_Apache2.txt \
+		${WRKDIR}/wqy-microhei/LICENSE_GPLv3.txt \
 			${DOCSDIR}
 .endif
 
@@ -87,7 +112,7 @@ post-install:
 	@${RM} -f ${PREFIX}/${FONTSDIR}/fonts.dir
 	@${RM} -f ${PREFIX}/${FONTSDIR}/fonts.scale
 	@command mkfontscale -b ${PREFIX}/${FONTSDIR}
-	@command fc-cache -fv ${PREFIX}/${FONTSDIR}
+	@command fc-cache -fv
 
 	${CAT} ${PKGMESSAGE}
 
diff --git a/x11-fonts/wqy/distinfo b/x11-fonts/wqy/distinfo
index 6c513c5dfd5d..c3cbd21e3aae 100644
--- a/x11-fonts/wqy/distinfo
+++ b/x11-fonts/wqy/distinfo
@@ -1,9 +1,15 @@
-MD5 (wqy-bitmapfont-pcf-0.9.9-0.tar.gz) = 76b9702fa7e6e4b9287bbeff927a1546
-SHA256 (wqy-bitmapfont-pcf-0.9.9-0.tar.gz) = 8c51a5286863b44a24dcc68074c65b1a25ce42893da01edcbe4db3b8eca9e143
-SIZE (wqy-bitmapfont-pcf-0.9.9-0.tar.gz) = 6539821
+MD5 (wqy-bitmapsong-pcf-1.0.0-RC1.tar.gz) = 11205e41f7876b016041523c55f0c8af
+SHA256 (wqy-bitmapsong-pcf-1.0.0-RC1.tar.gz) = d2ebf091151bbc9d2b7a64e794ff1d12546368155dea2ba435805313f0933bbb
+SIZE (wqy-bitmapsong-pcf-1.0.0-RC1.tar.gz) = 4041184
 MD5 (wqy-unibit-bdf-1.1.0-1.tar.gz) = 751dacd1326cd49b44486b45c592cfa6
 SHA256 (wqy-unibit-bdf-1.1.0-1.tar.gz) = 93189626cc0a1ae4f432ee0e0bb3c26e80f94b8ee8a6a20e16c55e9dcfd60624
 SIZE (wqy-unibit-bdf-1.1.0-1.tar.gz) = 1168200
-MD5 (wqy-zenhei-0.8.34-cvs20081027.tar.gz) = 6f1eb1bc6cc334c79c4dc4314593cd04
-SHA256 (wqy-zenhei-0.8.34-cvs20081027.tar.gz) = e05260cdbb9766d40f367e99e47eee9059681ecdf8f4da234bbd2b1b8b764172
-SIZE (wqy-zenhei-0.8.34-cvs20081027.tar.gz) = 6570970
+MD5 (wqy-zenhei-0.9.45.tar.gz) = 4c6c3f4e902dd5ee0a121e8c41d040bd
+SHA256 (wqy-zenhei-0.9.45.tar.gz) = e4b7e306475bf9427d1757578f0e4528930c84c44eaa3f167d4c42f110ee75d6
+SIZE (wqy-zenhei-0.9.45.tar.gz) = 9247393
+MD5 (wqy-microhei-lite-0.2.0-beta.tar.gz) = 5b20c27e21ae4a838d3cbfe90ce1030f
+SHA256 (wqy-microhei-lite-0.2.0-beta.tar.gz) = bf67c2a38ef9919489afae2364496d2eeba2e6799823292d9290f857f3e78abc
+SIZE (wqy-microhei-lite-0.2.0-beta.tar.gz) = 3019406
+MD5 (wqy-microhei-0.2.0-beta.tar.gz) = a124c5c6606f4f3b733d3477380e9d2f
+SHA256 (wqy-microhei-0.2.0-beta.tar.gz) = 2802ac8023aa36a66ea6e7445854e3a078d377ffff42169341bd237871f7213e
+SIZE (wqy-microhei-0.2.0-beta.tar.gz) = 2418536
diff --git a/x11-fonts/wqy/files/85-wqy.conf b/x11-fonts/wqy/files/85-wqy.conf
index c919e2f5003f..25776bcac168 100644
--- a/x11-fonts/wqy/files/85-wqy.conf
+++ b/x11-fonts/wqy/files/85-wqy.conf
@@ -9,6 +9,22 @@
 	                <string>WenQuanYi Zen Hei</string>
         	        <string>文泉驿正黑</string>
                 	<string>文泉驛正黑</string>
+			<string>文泉驿点阵正黑</string>
+			<string>文泉驛點陣正黑</string>
+			<string>WenQuanYi Zen Hei Sharp</string>
+			<string>文泉驿等宽正黑</string>
+			<string>文泉驛等寬正黑</string>
+			<string>WenQuanYi Zen Hei Mono</string>
+			<string>文泉驿等宽微米黑</string>
+			<string>文泉驛等寬微米黑</string>
+			<string>WenQuanYi Micro Hei Mono Light</string>
+			<string>文泉驿等宽微米黑</string>
+			<string>文泉驛等寬微米黑</string>
+			<string>WenQuanYi Micro Hei Mono</string>
+			<string>文泉驿微米黑</string>
+			<string>文泉驛微米黑</string>
+			<string>WenQuanYi Micro Hei</string>
+			<string>WenQuanYi Micro Hei Light</string>
 		</test>
 		<edit name="antialias"><bool>true</bool></edit>
 		<edit name="hinting"><bool>true</bool></edit>
diff --git a/x11-fonts/wqy/pkg-plist b/x11-fonts/wqy/pkg-plist
index 996764c88c64..19ee03ee53e7 100644
--- a/x11-fonts/wqy/pkg-plist
+++ b/x11-fonts/wqy/pkg-plist
@@ -2,13 +2,12 @@
 %%CONFDDIR%%/85-wqy.conf
 %%FONTSDIR%%/fonts.dir
 %%FONTSDIR%%/wenquanyi_10pt.pcf
-%%FONTSDIR%%/wenquanyi_10ptb.pcf
 %%FONTSDIR%%/wenquanyi_11pt.pcf
-%%FONTSDIR%%/wenquanyi_11ptb.pcf
 %%FONTSDIR%%/wenquanyi_12pt.pcf
-%%FONTSDIR%%/wenquanyi_12ptb.pcf
+%%FONTSDIR%%/wenquanyi_13px.pcf
 %%FONTSDIR%%/wenquanyi_9pt.pcf
-%%FONTSDIR%%/wenquanyi_9ptb.pcf
 %%FONTSDIR%%/wqy-unibit.pcf
 %%FONTSDIR%%/wqy-zenhei.ttc
+%%FONTSDIR%%/wqy-microhei-lite.ttc
+%%FONTSDIR%%/wqy-microhei.ttc
 @dirrm %%FONTSDIR%%