Index: head/x11-fonts/wqy/Makefile
===================================================================
--- head/x11-fonts/wqy/Makefile	(revision 332901)
+++ head/x11-fonts/wqy/Makefile	(revision 332902)
@@ -1,117 +1,117 @@
 # Created by: Dryice Liu <dryice@liu.com.cn>
 # $FreeBSD$
 
 PORTNAME=	wqy-fonts
 PORTVERSION=	20100803
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF/wqy/wqy-bitmapfont/1.0.0-RC1:bitmapfont \
 		SF/wqy/wqy-unibit/1.1.0:unibit \
 		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.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
 
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
 		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 USE_XORG=	x11
 USES=		perl5
 USE_PERL5=	build
 
 FONTSDIR=	lib/X11/fonts/wqy
 CONFDDIR=	etc/fonts/conf.d
 CONFAVAILDIR=	etc/fonts/conf.avail
 
 PLIST_SUB=	FONTSDIR=${FONTSDIR} \
 		CONFDDIR=${CONFDDIR} \
 		CONFAVAILDIR=${CONFAVAILDIR}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	FONTSDIR=${PREFIX}/${FONTSDIR}
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if !defined(NOPORTDOCS)
 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-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-bitmapsong/*.pcf ${PREFIX}/${FONTSDIR}
 # WQY Bitmap Song
 	${INSTALL_DATA} ${WRKDIR}/wqy-unibit/wqy-unibit.pcf ${PREFIX}/${FONTSDIR}
 # 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
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} \
 		${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
 
 post-install:
 	@${RM} -f ${PREFIX}/${FONTSDIR}/fonts.dir
 	@${RM} -f ${PREFIX}/${FONTSDIR}/fonts.scale
 	@command mkfontscale -b ${PREFIX}/${FONTSDIR}
 	@command fc-cache -fv
 
 	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
Index: head/x11-fonts/wqy/files/85-wqy.conf
===================================================================
--- head/x11-fonts/wqy/files/85-wqy.conf	(revision 332901)
+++ head/x11-fonts/wqy/files/85-wqy.conf	(revision 332902)
@@ -1,72 +1,141 @@
 <?xml version="1.0"?>
 <!-- $FreeBSD$ -->
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+	<!-- Editing properties for all WenQuanYi fonts -->
 	<match target="font">
-		<test name="family" equal="any" compare="eq">
-			<string>WenQuanYi Bitmap Song</string>
-			<string>Unibit</string>
-	                <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>
+		<or>
+			<test name="family" compare="eq">
+				<string>WenQuanYi Bitmap Song</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>Unibit</string>
+			</test>
+			<test name="family" compare="eq">
+		                <string>WenQuanYi Zen Hei</string>
+			</test>
+			<test name="family" compare="eq">
+        		        <string>文泉驿正黑</string>
+			</test>
+			<test name="family" compare="eq">
+                		<string>文泉驛正黑</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>文泉驿点阵正黑</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>文泉驛點陣正黑</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>WenQuanYi Zen Hei Sharp</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>文泉驿等宽正黑</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>文泉驛等寬正黑</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>WenQuanYi Zen Hei Mono</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>文泉驿等宽微米黑</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>文泉驛等寬微米黑</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>WenQuanYi Micro Hei Mono Light</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>文泉驿等宽微米黑</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>文泉驛等寬微米黑</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>WenQuanYi Micro Hei Mono</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>文泉驿微米黑</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>文泉驛微米黑</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>WenQuanYi Micro Hei</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>WenQuanYi Micro Hei Light</string>
+			</test>
+		</or>
 		<edit name="antialias"><bool>true</bool></edit>
 		<edit name="hinting"><bool>true</bool></edit>
 		<edit name="autohint"><bool>false</bool></edit>
 		<edit name="embeddedbitmap"><bool>true</bool></edit>
 		<edit name="spacing"><const>proportional</const></edit>
 		<edit name="globaladvance"><bool>false</bool></edit>
         </match>
 
+	<!-- Editing properties for bitmap fonts to avoid fuzzy display -->
         <match target="font">
-		<test name="family" equal="any" compare="eq">
-			<string>WenQuanYi Bitmap Song</string>
-			<string>Unibit</string>
-	                <string>WenQuanYi Zen Hei</string>
-        	        <string>文泉驿正黑</string>
-                	<string>文泉驛正黑</string>
-		</test>
+		<or>
+			<test name="family" compare="eq">
+				<string>WenQuanYi Bitmap Song</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>Unibit</string>
+			</test>
+			<test name="family" compare="eq">
+		                <string>WenQuanYi Zen Hei</string>
+			</test>
+			<test name="family" compare="eq">
+	        	        <string>文泉驿正黑</string>
+			</test>
+			<test name="family" compare="eq">
+	                	<string>文泉驛正黑</string>
+			</test>
+		</or>
                 <test name="size" compare="less_eq"><int>16</int></test>
                 <edit name="antialias" mode="assign"><bool>false</bool></edit>
         </match>
 
+	<!-- Prior use WenQuanYi Bitmap Song for Chinese Han -->
 	<match target="pattern">
-		<test name="family" equal="any" compare="eq">
-			<string>serif</string>
-			<string>sans-serif</string>
-			<string>monospace</string>
-		</test>
-		<test equal="any" compare="eq" name="lang">
-			<string>zh-cn</string>
-			<string>zh-tw</string>
-			<string>zh-hk</string>
-			<string>zh-sg</string>
-		</test>
+		<or>
+			<test name="family" compare="eq">
+				<string>serif</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>sans-serif</string>
+			</test>
+			<test name="family" compare="eq">
+				<string>monospace</string>
+			</test>
+		</or>
+		<or>
+			<test compare="eq" name="lang">
+				<string>zh-cn</string>
+			</test>
+			<test compare="eq" name="lang">
+				<string>zh-tw</string>
+			</test>
+			<test compare="eq" name="lang">
+				<string>zh-hk</string>
+			</test>
+			<test compare="eq" name="lang">
+				<string>zh-sg</string>
+			</test>
+		</or>
 		<test compare="more_eq" name="pixelsize">
 			<double>12</double>
 		</test>
 		<test compare="less_eq" name="pixelsize">
 			<double>16</double>
 		</test>
 		<edit name="family" mode="prepend_first">
 			<string>WenQuanYi Bitmap Song</string>
 		</edit>
 	</match>
 
 </fontconfig>