- Update to 1.1

* Change with gnome2's PREFIX.
* Add support wqy bitmap fonts.
* Change with scim's PREFIX.
* Replaces cdialog with /usr/bin/dialog.

PR:		ports/112437
Submitted by:	maintainer (liu_yinghong_AT_yahoo dot com dot cn)

3 files changed, 22 insertions, 14 deletions

diff --git a/chinese/auto-cn-l10n/Makefile b/chinese/auto-cn-l10n/Makefile
index 6de6d48b0118..450b2abcf306 100644
--- a/chinese/auto-cn-l10n/Makefile
+++ b/chinese/auto-cn-l10n/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	auto-cn-l10n
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.1
 CATEGORIES=	chinese
 MASTER_SITES=	ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
 DISTNAME=	zh-${PORTNAME}-${PORTVERSION}
@@ -16,25 +15,32 @@ COMMENT=	The automatic localization for Simplified Chinese zh_CN.eucCN locale
 
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
+REINPLACE_ARGS=	-i ""
 
-OPTIONS=	FIREFLYTTF	"Firefly TrueType Font"			on \
-		FCITX		"GBK Chinese XIM server"		on \
-		SCIM 		"Smart Common Input Method platform"	off \
+OPTIONS=	WQY		"WenQuanYi Bitmap Song Font"		on \
+		FIREFLYTTF	"Firefly TrueType Font"			off \
+		FCITX		"GBK Chinese XIM server"		off \
+		SCIM 		"Smart Common Input Method platform"	on \
 		MINICHINPUT 	"A tiny version of Chinput"		off \
 		RELAXCONF	"A set of utilities for FreeBSD LiveCD"	on
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_FIREFLYTTF)
+.if !defined(WITHOUT_WQY)
+RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/wqy/wenquanyi_10pt.pcf:${PORTSDIR}/x11-fonts/wqy
+.endif
+
+.if defined(WITH_FIREFLYTTF)
 RUN_DEPENDS+=	${LOCALBASE}/share/fonts/TrueType/fireflysung.ttf:${PORTSDIR}/chinese/fireflyttf
 .endif
 
-.if !defined(WITHOUT_FCITX)
+.if defined(WITH_FCITX)
 RUN_DEPENDS+=	fcitx:${PORTSDIR}/chinese/fcitx
 .endif
 
-.if defined(WITH_SCIM)
-RUN_DEPENDS+=	scim:${PORTSDIR}/textproc/scim
+.if !defined(WITHOUT_SCIM)
+RUN_DEPENDS+=	${LOCALBASE}/share/scim/tables/Wubi.bin:${PORTSDIR}/chinese/scim-tables
+RUN_DEPENDS+=	${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/pinyin.so:${PORTSDIR}/chinese/scim-pinyin
 .endif
 
 .if defined(WITH_MINICHINPUT)
@@ -45,6 +51,10 @@ RUN_DEPENDS+=	chinput:${PORTSDIR}/chinese/miniChinput
 RUN_DEPENDS+=	relaxconf:${PORTSDIR}/sysutils/relaxconf
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|g; \
+		s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/dot.xselector ${WRKSRC}/dot.xinitrc
+
 do-install:
 	${MKDIR} ${PREFIX}/share/skel/zh_CN.eucCN
 	${CP} ${WRKSRC}/* ${PREFIX}/share/skel/zh_CN.eucCN
diff --git a/chinese/auto-cn-l10n/distinfo b/chinese/auto-cn-l10n/distinfo
index d178efd62466..776b34339b3f 100644
--- a/chinese/auto-cn-l10n/distinfo
+++ b/chinese/auto-cn-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (zh-auto-cn-l10n-1.0.tar.gz) = 7915264582b2754ccba233fe1971722c
-SHA256 (zh-auto-cn-l10n-1.0.tar.gz) = e6b7eb2b32fe570aa3726b48cdd968b572ee02cdf8ea837995fd3a0aaf8dad29
-SIZE (zh-auto-cn-l10n-1.0.tar.gz) = 7310
+MD5 (zh-auto-cn-l10n-1.1.tar.gz) = 3850b7737cf0c4062deb7ac0b96d2c28
+SHA256 (zh-auto-cn-l10n-1.1.tar.gz) = 998308cde197a1cbfe23e32a99b1b4b0aa81270013a9249ae2b2170b64c035c2
+SIZE (zh-auto-cn-l10n-1.1.tar.gz) = 6666
diff --git a/chinese/auto-cn-l10n/pkg-plist b/chinese/auto-cn-l10n/pkg-plist
index bfaef057dda6..19c3a835d696 100644
--- a/chinese/auto-cn-l10n/pkg-plist
+++ b/chinese/auto-cn-l10n/pkg-plist
@@ -1,10 +1,8 @@
 share/skel/zh_CN.eucCN/dot.Xdefaults
 share/skel/zh_CN.eucCN/dot.cshrc
 share/skel/zh_CN.eucCN/dot.emacs
-share/skel/zh_CN.eucCN/dot.fonts.conf
 share/skel/zh_CN.eucCN/dot.gtkrc.mine
 share/skel/zh_CN.eucCN/dot.inputrc
-share/skel/zh_CN.eucCN/dot.muttrc
 share/skel/zh_CN.eucCN/dot.profile
 share/skel/zh_CN.eucCN/dot.vimrc
 share/skel/zh_CN.eucCN/dot.xinitrc