ports/112437: [maintainer-update] port: chinese/auto-cn-l10n fix a few bugs

[liu_yinghong at yahoo.com.cn]

>Number:         112437
>Category:       ports
>Synopsis:       [maintainer-update] port: chinese/auto-cn-l10n fix a few bugs
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 05 08:10:05 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Yinghong.Liu
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD relaxbsd.org 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Fri Jan 12 10:40:27 UTC 2007 root at dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
* Change with gnome2's PREFIX.
* Add support wqy bitmap fonts.
* Change with scim's PREFIX.
* Replaces cdialog with /usr/bin/dialog.
	
>How-To-Repeat:
	
>Fix:

	

--- auto-cn-l10n.diff begins here ---
diff -uNr auto-cn-l10n.orig/Makefile auto-cn-l10n/Makefile
--- auto-cn-l10n.orig/Makefile	Sat May  5 11:09:45 2007
+++ auto-cn-l10n/Makefile	Sat May  5 14:55:49 2007
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/chinese/auto-cn-l10n/Makefile,v 1.1 2006/06/03 17:16:48 clive Exp $
 
 PORTNAME=	auto-cn-l10n
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	chinese
 MASTER_SITES=	ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
 DISTNAME=	zh-${PORTNAME}-${PORTVERSION}
@@ -15,25 +15,32 @@
 
 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
 .endif
 
 .if defined(WITH_MINICHINPUT)
@@ -43,6 +50,10 @@
 .if !defined(WITHOUT_RELAXCONF)
 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
diff -uNr auto-cn-l10n.orig/distinfo auto-cn-l10n/distinfo
--- auto-cn-l10n.orig/distinfo	Sat May  5 11:09:45 2007
+++ auto-cn-l10n/distinfo	Sat May  5 15:08:26 2007
@@ -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 -uNr auto-cn-l10n.orig/pkg-plist auto-cn-l10n/pkg-plist
--- auto-cn-l10n.orig/pkg-plist	Sat May  5 11:09:45 2007
+++ auto-cn-l10n/pkg-plist	Sat May  5 15:06:13 2007
@@ -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
--- auto-cn-l10n.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: