Update to 0.7.0 (the version goes backward since the old version

number is from where the fontset is derived from).

Submitted by:	Dryice Liu <dryice dryice name> (maintainer)
PR:		ports/97779

4 files changed, 40 insertions, 26 deletions

diff --git a/x11-fonts/wqy/Makefile b/x11-fonts/wqy/Makefile
index 9eafa9b76528..34327ac8ea5a 100644
--- a/x11-fonts/wqy/Makefile
+++ b/x11-fonts/wqy/Makefile
@@ -6,32 +6,37 @@
 #
 
 PORTNAME=	wqy
-PORTVERSION=	1.1.0
+PORTVERSION=	0.7.0
+PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://dryice.name/computer/FreeBSD/distfiles/
 MASTER_SITE_SUBDIR=	wqy
-DISTNAME=	${PORTNAME}-yhunifont-bdf-${PORTVERSION}
+DISTNAME=	${PORTNAME}-bitmapfont-pcf-${PORTVERSION}-4
 
 MAINTAINER=	dryice@dryice.name
 COMMENT=	A font which includes all the CJK characters covered by Unicode 4.0
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-yhunifont
+WRKSRC=		${WRKDIR}/${PORTNAME}-bitmapfont
 NO_BUILD=	yes
 USE_X_PREFIX=	yes
 FONTSDIR=	lib/X11/fonts/wqy
 
-PLIST_FILES=	${FONTSDIR}/fonts.dir ${FONTSDIR}/yhunifont.bdf
-PLIST_DIRS=	${FONTSDIR}
+PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	AUTHORS ChangeLog COPYING INSTALL README.yhunifont
+PORTDOCS=	ChangeLog CREDIT GPL.txt INSTALL INSTALL.zh.gb2312 LOGO.png PLEASE_HELP_TO_IMPROVE README STAT
 .endif
 
 do-install:
 	@${MKDIR} ${PREFIX}/${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts.dir ${PREFIX}/${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/yhunifont.bdf ${PREFIX}/${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.pcf ${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(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/x11-fonts/wqy/distinfo b/x11-fonts/wqy/distinfo
index b658fbf3163f..a64bbbf66067 100644
--- a/x11-fonts/wqy/distinfo
+++ b/x11-fonts/wqy/distinfo
@@ -1,3 +1,3 @@
-MD5 (wqy-yhunifont-bdf-1.1.0.tar.gz) = 930b6f9f1c86c4672cc596d655b4cfe8
-SHA256 (wqy-yhunifont-bdf-1.1.0.tar.gz) = 46187c458b7d2da2b60dd7e98e5f3da2840b17ad07725156ba74f5a37eb633e5
-SIZE (wqy-yhunifont-bdf-1.1.0.tar.gz) = 981317
+MD5 (wqy-bitmapfont-pcf-0.7.0-4.tar.gz) = bb577c26c530a28eab46d944d7391ed7
+SHA256 (wqy-bitmapfont-pcf-0.7.0-4.tar.gz) = e3b7c858d13f359fadce659eeb5ee6d1351451d7e3a340ee95feb4fa6bd82b56
+SIZE (wqy-bitmapfont-pcf-0.7.0-4.tar.gz) = 5428710
diff --git a/x11-fonts/wqy/pkg-descr b/x11-fonts/wqy/pkg-descr
index b1374de601bc..5ee18f3f9180 100644
--- a/x11-fonts/wqy/pkg-descr
+++ b/x11-fonts/wqy/pkg-descr
@@ -1,18 +1,15 @@
-The wqy font includes all the CJK characters covered by the Unicode
-Standard 4.0.
-
-This font is created by merging GNU Unifont (by Roman Czyborra
-<roman@czyborra.com> and David Starner <dvdeug@debian.org>) with GBK 16 font
-from yh-3.1 (Yan Huang Chinese Platform, Redflag Linux,
-http://www.redflag-linux.com/).
-
-The CJK Unified Ideographs (U+4E00~U+9FA5) are now complete, and the quality
-of the bitmaps has improved significantly.
-
-This release is part of an ongoing effort from the WenQuanYi Project to
-create high-quality open-source bitmap Chinese fonts.
-
-Currently only bitmap fonts are available. TTF fonts are in progress.
+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).
 
 WWW: http://wqy.sourceforge.net/en/
 WWW: http://sitaphi.com/pub/song_jian_biao/
diff --git a/x11-fonts/wqy/pkg-plist b/x11-fonts/wqy/pkg-plist
new file mode 100644
index 000000000000..1492ea50ec2e
--- /dev/null
+++ b/x11-fonts/wqy/pkg-plist
@@ -0,0 +1,12 @@
+%%FONTSDIR%%/fonts.cache-1
+%%FONTSDIR%%/fonts.dir
+%%FONTSDIR%%/fonts.scale
+%%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_9pt.pcf
+%%FONTSDIR%%/wenquanyi_9ptb.pcf
+@dirrm %%FONTSDIR%%