- 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

PR:		ports/62596
Submitted by:	maintainer

4 files changed, 31 insertions, 5 deletions

diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index eb0c70e49c34..865ea7620793 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -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 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	dryice@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 --git a/chinese/fcitx/distinfo b/chinese/fcitx/distinfo
index d6631327703d..873cf4d97c4c 100644
--- a/chinese/fcitx/distinfo
+++ b/chinese/fcitx/distinfo
@@ -1 +1,2 @@
 MD5 (fcitx-2.0.1.tar.bz2) = 2f1c710d60e25364ed36223adfc9e7d2
+SIZE (fcitx-2.0.1.tar.bz2) = 1133775
diff --git a/chinese/fcitx/pkg-message b/chinese/fcitx/pkg-message
index 541c5ff2a1bf..b262d95ae338 100644
--- a/chinese/fcitx/pkg-message
+++ b/chinese/fcitx/pkg-message
@@ -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 --git a/chinese/fcitx/pkg-plist b/chinese/fcitx/pkg-plist
index 9f19e21232f0..1036410d38c6 100644
--- a/chinese/fcitx/pkg-plist
+++ b/chinese/fcitx/pkg-plist
@@ -4,3 +4,8 @@ share/fcitx/pybase.mb
 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%%