7 files changed, 153 insertions, 53 deletions

diff --git a/x11-fonts/wqy/Makefile b/x11-fonts/wqy/Makefile
index dc6971a6dfb3..c651b0806fe5 100644
--- a/x11-fonts/wqy/Makefile
+++ b/x11-fonts/wqy/Makefile
@@ -5,22 +5,27 @@
 # $FreeBSD$
 #
 
-PORTNAME=	wqy
-PORTVERSION=	0.8.0
-PORTREVISION=	4
+PORTNAME=	wqy-fonts
+PORTVERSION=	20081102
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF \
 		http://dryice.name/computer/FreeBSD/distfiles/
 MASTER_SITE_SUBDIR=	wqy
-DISTNAME=	${PORTNAME}-bitmapfont-pcf-${PORTVERSION}-6
+DISTFILES=	wqy-bitmapfont-pcf-0.9.9-0.tar.gz \
+		wqy-unibit-bdf-1.1.0-1.tar.gz \
+		wqy-zenhei-0.8.34-cvs20081027.tar.gz
 
 MAINTAINER=	intron@intron.ac
-COMMENT=	A font which includes all the CJK characters covered by Unicode 4.0
+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
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-bitmapfont
-NO_BUILD=	yes
 USE_XORG=	x11
+USE_PERL5=	yes
+
 FONTSDIR=	lib/X11/fonts/wqy
 CONFDDIR=	etc/fonts/conf.d
 CONFAVAILDIR=	etc/fonts/conf.avail
@@ -29,45 +34,60 @@ PLIST_SUB=	FONTSDIR=${FONTSDIR} \
 		CONFDDIR=${CONFDDIR} \
 		CONFAVAILDIR=${CONFAVAILDIR}
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-OPTIONS=	ALIAS	"Install fonts.alias" off
+SUB_FILES=	pkg-message
+SUB_LIST=	FONTSDIR=${PREFIX}/${FONTSDIR}
 
 .include <bsd.port.pre.mk>
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	AUTHORS ChangeLog COPYING INSTALL INSTALL.zh.gb2312 LOGO.png README
+PORTDOCS=	AUTHORS.bitmap AUTHORS.truetype \
+		ChangeLog.bitmap ChangeLog.truetype \
+		README.bitmap README.truetype \
+		COPYING LOGO.png
 .endif
 
-.if defined(WITH_ALIAS)
-PLIST_SUB+=	WITHALIAS=""
-.else
-PLIST_SUB+=	WITHALIAS="@comment "
-.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
 
 do-install:
-	@${MKDIR} ${PREFIX}/${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.pcf ${PREFIX}/${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/85-wqy-bitmapsong.conf ${PREFIX}/${CONFAVAILDIR}
-	${LN} -s ${PREFIX}/${CONFAVAILDIR}/85-wqy-bitmapsong.conf ${PREFIX}/${CONFDDIR}/85-wqy-bitmapsong.conf
+	${MKDIR} ${PREFIX}/${FONTSDIR} ${PREFIX}/${CONFDDIR} ${PREFIX}/${CONFAVAILDIR}
+# WQY Bitmap Song
+	${INSTALL_DATA} ${WRKDIR}/wqy-bitmapfont/*.pcf ${PREFIX}/${FONTSDIR}
+# WQY Bitmap Song
+	${INSTALL_DATA} ${WRKDIR}/wqy-unibit/wqy-unibit.pcf ${PREFIX}/${FONTSDIR}
+# WQY TrueType
+	${INSTALL_DATA} ${WRKDIR}/wqy-zenhei/wqy-zenhei.ttc ${PREFIX}/${FONTSDIR}
 
-post-install:
-	@${RM} ${PREFIX}/${FONTSDIR}/fonts* >/dev/null 2>&1 || true
-	@command mkfontdir ${PREFIX}/${FONTSDIR} || true
-	@${CP} ${PREFIX}/${FONTSDIR}/fonts.dir ${PREFIX}/${FONTSDIR}/fonts.scale || true
-	@command fc-cache -v ${PREFIX}/${FONTSDIR} || true
-.if defined(WITH_ALIAS)
-	${INSTALL_DATA} ${WRKSRC}/fonts.alias ${PREFIX}/${FONTSDIR}
-.endif
+	${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}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
+	${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 \
+			${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 ${PREFIX}/${FONTSDIR}
+
+	${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/wqy/distinfo b/x11-fonts/wqy/distinfo
index b43d9c7ef906..6c513c5dfd5d 100644
--- a/x11-fonts/wqy/distinfo
+++ b/x11-fonts/wqy/distinfo
@@ -1,3 +1,9 @@
-MD5 (wqy-bitmapfont-pcf-0.8.0-6.tar.gz) = 2a4549aecc56a5e40e824d8ea75d209b
-SHA256 (wqy-bitmapfont-pcf-0.8.0-6.tar.gz) = 5772728cd0e137c9d9e8c227aecedca0143171e765216048d51b2f0b5da0a04b
-SIZE (wqy-bitmapfont-pcf-0.8.0-6.tar.gz) = 5338688
+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-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
diff --git a/x11-fonts/wqy/files/85-wqy.conf b/x11-fonts/wqy/files/85-wqy.conf
new file mode 100644
index 000000000000..c919e2f5003f
--- /dev/null
+++ b/x11-fonts/wqy/files/85-wqy.conf
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<!-- $FreeBSD$ -->
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<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>
+		<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>
+
+        <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>
+                <test name="size" compare="less_eq"><int>16</int></test>
+                <edit name="antialias" mode="assign"><bool>false</bool></edit>
+        </match>
+
+	<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>
+		<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>
diff --git a/x11-fonts/wqy/files/pkg-message.in b/x11-fonts/wqy/files/pkg-message.in
new file mode 100644
index 000000000000..fa512f770cc2
--- /dev/null
+++ b/x11-fonts/wqy/files/pkg-message.in
@@ -0,0 +1,17 @@
+**************************************************************************
+Please add %%FONTSDIR%% for your X server by either:
+
+# xset fp+ %%FONTSDIR%%
+# xset fp rehash
+
+or by adding the following line to the section "Files" of
+your X-server configuration file (usually /etc/X11/xorg.conf)
+and restarting the X-server:
+
+Section "Files"
+...
+    FontPath   "%%FONTSDIR%%"
+...
+EndSection
+
+**************************************************************************
diff --git a/x11-fonts/wqy/pkg-deinstall b/x11-fonts/wqy/pkg-deinstall
new file mode 100644
index 000000000000..99d41f7c2be2
--- /dev/null
+++ b/x11-fonts/wqy/pkg-deinstall
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+fc-cache -fv
diff --git a/x11-fonts/wqy/pkg-descr b/x11-fonts/wqy/pkg-descr
index ee520d105021..c3de71298566 100644
--- a/x11-fonts/wqy/pkg-descr
+++ b/x11-fonts/wqy/pkg-descr
@@ -1,14 +1,12 @@
-The Wen Quan Yi bitmap font includes complete CJK Unified 
-Ideograph (U4E00 - U9FA5) glyphs at four different sizes 
-(9pt-12X12 pixel, 10pt-13X13 pixel, 11pt-15X15 pixel, 
-12pt-16x16 pixel) and two weights (medium and bold). 
-Use of this bitmap font for on-screen display of Chinese 
-(traditional and simplified) in web pages and elsewhere 
-eliminates the annoying "blurring" problems caused by 
-the high stroke density of many Chinese characters and 
-insufficient "hinting" of anti-aliased Chinese fonts. 
-This font also provides bitmap glyphs for Japanese 
-Hiragana (U3040 - U309F), Katakana (U30A0 - U30FF) 
-and for Korean Hangul (UAC00 - UD7A3).
+WenQuanYi Bitmap Song:
+
+     WenQuanYi bitmap Chinese font, sizing 12, 13, 15, 16 pixels.
+
+WenQuanYi Unibit:
+     WenQuanYi bitmap Chinese font + GNU Unifont, in order to cover Unicode
+     code table as completely as possible, sizing 16 pixels only.
+
+WenQuanYi Zen Hei:
+     WenQuanYi TrueType Chinese font, black type.
 
 WWW: http://wqy.sourceforge.net/en/
diff --git a/x11-fonts/wqy/pkg-plist b/x11-fonts/wqy/pkg-plist
index fc47e0b50055..996764c88c64 100644
--- a/x11-fonts/wqy/pkg-plist
+++ b/x11-fonts/wqy/pkg-plist
@@ -1,8 +1,6 @@
-%%CONFAVAILDIR%%/85-wqy-bitmapsong.conf
-%%CONFDDIR%%/85-wqy-bitmapsong.conf
-%%WITHALIAS%%%%FONTSDIR%%/fonts.alias
+%%CONFAVAILDIR%%/85-wqy.conf
+%%CONFDDIR%%/85-wqy.conf
 %%FONTSDIR%%/fonts.dir
-%%FONTSDIR%%/fonts.scale
 %%FONTSDIR%%/wenquanyi_10pt.pcf
 %%FONTSDIR%%/wenquanyi_10ptb.pcf
 %%FONTSDIR%%/wenquanyi_11pt.pcf
@@ -11,4 +9,6 @@
 %%FONTSDIR%%/wenquanyi_12ptb.pcf
 %%FONTSDIR%%/wenquanyi_9pt.pcf
 %%FONTSDIR%%/wenquanyi_9ptb.pcf
+%%FONTSDIR%%/wqy-unibit.pcf
+%%FONTSDIR%%/wqy-zenhei.ttc
 @dirrm %%FONTSDIR%%