ports/62596: [maintainer update] chinese/fcitx: changing locale and more

[Dryice Liu]

>Number:         62596
>Category:       ports
>Synopsis:       [maintainer update] chinese/fcitx: changing locale and more
>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:   Mon Feb 09 09:30:21 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Dryice Liu
>Release:        FreeBSD 5.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD dryice.3322.org 5.2-RELEASE FreeBSD 5.2-RELEASE #0: Sat Jan 17 16:15:25 CST 2004 ddliu at dryice.3322.org:/usr/obj/usr/src/sys/SERVER i386


>Description:
	Changes:
	- change locale from zh_CN.EUC to zh_CN.eucCN for FreeBSD 5.2 and above
	- adding document
	- use SIZE in distinfo file
	- utilize USE_ICONV
	- add an option to change the hot key
	- bump PORTREVERSION
>How-To-Repeat:
	N/A
>Fix:


--- fcitx.diff begins here ---
diff -ruN fcitx.orig/Makefile fcitx/Makefile
--- fcitx.orig/Makefile	Mon Feb  2 21:06:32 2004
+++ fcitx/Makefile	Tue Feb 10 00:33:57 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	fcitx
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	chinese x11
 MASTER_SITES=	http://www.fcitx.org/download/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,24 +15,43 @@
 MAINTAINER=	dryice at liu.com.cn
 COMMENT=	A simple and fast GBK Chinese XIM server
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		Xft.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 
 USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_REINPLACE=	yes
+USE_ICONV=	yes
 
 post-extract:
 	cd ${BUILD_WRKSRC}; ${MAKE} clean
 
+pre-patch::
+	@${ECHO_MSG}
+.if !defined(FCITX_WITH_CTRL_RSHIFT)
+	@${ECHO_MSG} "If you don't want to use CTRL+SPACE to active/deactive fcitx,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make FCITX_WITH_CTRL_RSHIFT=yes\"."
+	@${ECHO_MSG} "Then you can use CTRL+RIGHT_SHIFT to active/deactive fcitx."
+	@${ECHO_MSG}
+.endif
+	@${ECHO_MSG}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#usr/share#${LOCALBASE}/share#g' ${WRKSRC}/Makefile ${WRKSRC}/ime.h
 	@${REINPLACE_CMD} -e 's#usr/bin#${LOCALBASE}/bin#g' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's#zh_CN.GB2312#zh_CN.EUC#g' ${WRKSRC}/ui.c
-	@${REINPLACE_CMD} -e 's#zh_CN.gb2312#zh_CN.EUC#g' ${WRKSRC}/xim.c
+	@${REINPLACE_CMD} -e 's#zh_CN.GB2312#zh_CN.eucCN#g' ${WRKSRC}/ui.c
+	@${REINPLACE_CMD} -e 's#zh_CN.gb2312#zh_CN.eucCN#g' ${WRKSRC}/xim.c
 	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' ${WRKSRC}/IMdkit/lib/IMConn.c ${WRKSRC}/ui.c
+.if defined(FCITX_WITH_CTRL_RSHIFT)
+	@${REINPLACE_CMD} -e 's/XK_space/XK_Shift_R/g' ${WRKSRC}/xim.c
+.endif
 
 post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for i in cjkvinput.txt hf_wb98.txt readme.html wb_fh.htm
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
+.endfor
+.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -ruN fcitx.orig/distinfo fcitx/distinfo
--- fcitx.orig/distinfo	Sat Jan 10 11:34:27 2004
+++ fcitx/distinfo	Mon Feb  9 23:44:35 2004
@@ -1 +1,2 @@
 MD5 (fcitx-2.0.1.tar.bz2) = 2f1c710d60e25364ed36223adfc9e7d2
+SIZE (fcitx-2.0.1.tar.bz2) = 1133775
diff -ruN fcitx.orig/pkg-message fcitx/pkg-message
--- fcitx.orig/pkg-message	Wed Mar 26 18:29:08 2003
+++ fcitx/pkg-message	Mon Feb  9 23:40:36 2004
@@ -2,5 +2,5 @@
 Remember to set environment varible XMODIFIERS:
  csh/tcsh: setenv XMODIFIERS @im=fcitx
  sh/bash:  export XMODIFIERS='@im=fcitx'
-and set LANG, LC_CTYPE to zh_CN.EUC.
+and set LANG, LC_CTYPE to zh_CN.eucCN.
 -----------------------------------------------
diff -ruN fcitx.orig/pkg-plist fcitx/pkg-plist
--- fcitx.orig/pkg-plist	Sat Jan 10 11:34:34 2004
+++ fcitx/pkg-plist	Mon Feb  9 23:57:28 2004
@@ -4,3 +4,8 @@
 share/fcitx/pyphrase.mb
 share/fcitx/wbx.mb
 @dirrm share/fcitx
+%%PORTDOCS%%%%DOCSDIR%%/cjkvinput.txt
+%%PORTDOCS%%%%DOCSDIR%%/hf_wb98.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme.html
+%%PORTDOCS%%%%DOCSDIR%%/wb_fh.htm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- fcitx.diff ends here ---



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