- bump PORTREVISION (also fix BROKEN)

- After chinese/libchewing updated to 0.3.0, which is API/ABI incompatible
  with older releases 0.2.x, oxim can not build with libchewing 0.3.0.

  This is addressed in the added patch. Thanks clsung@ for initial patch
  and testing. If there are any problems with this patch, please contact
  the maintainer, instead of the author of oxim.

- 2 OPTIONS added to enable/disable Chewing/Unicode input module. Leave
  them as default on since they are default on in package.

PR:		ports/97561
Submitted by:	maintainer (Rong-En Fan)

3 files changed, 489 insertions, 16 deletions

diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile
index 4dfe6d530f9f..65095c97131d 100644
--- a/chinese/oxim/Makefile
+++ b/chinese/oxim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	oxim
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	chinese textproc
 MASTER_SITES=	ftp://apt.nc.hcc.edu.tw/pub/mirror/opendesktop.org.tw/OXIM/Source/ \
 		ftp://ftp4.tnc.edu.tw/pub3/opendesktop-tw/odp/ \
@@ -15,15 +16,12 @@ MASTER_SITES=	ftp://apt.nc.hcc.edu.tw/pub/mirror/opendesktop.org.tw/OXIM/Source/
 MAINTAINER=	rafan@infor.org
 COMMENT=	Open X Input Method server
 
-# make sure we have the required libchewing
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-BUILD_DEPENDS=	zh-libchewing>=0.2.6:${PORTSDIR}/chinese/libchewing
-RUN_DEPENDS=	zh-libchewing>=0.2.6:${PORTSDIR}/chinese/libchewing \
-		zh-fireflyttf>=0:${PORTSDIR}/chinese/fireflyttf
-
-BROKEN=		Does not compile
+RUN_DEPENDS=	zh-fireflyttf>=0:${PORTSDIR}/chinese/fireflyttf
 
-OPTIONS=	GTK2 "Enable GTK2 input method module" On
+OPTIONS=	GTK2 "Enable GTK2 input method module" On \
+		CHEWING "Enable Chewing input module" On \
+		UNICODE "Enable Unicode input module" On
 
 USE_GCC=	3.2+
 USE_ICONV=	yes
@@ -34,9 +32,7 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
-CONFIGURE_ENV+=	CONFIG_SHELL=${SH} \
-		CHEWING_CFLAGS=-I${LOCALBASE}/include \
-		CPPFLAGS="${CPPFLAGS}" \
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--disable-bimsphone-module \
 		--disable-static \
@@ -53,12 +49,32 @@ CONFIGURE_ARGS+=	--enable-gtk-immodule
 PLIST_SUB+=	GTK2=""
 .endif
 
+.if !defined(WITHOUT_CHEWING)
+# make sure we have the required libchewing
+BUILD_DEPENDS+=	zh-libchewing>=0.3.0_1:${PORTSDIR}/chinese/libchewing
+RUN_DEPENDS+=	zh-libchewing>=0.3.0_1:${PORTSDIR}/chinese/libchewing
+
+CONFIGURE_ARGS+=	--enable-chewing-module
+CONFIGURE_ENV+=	CHEWING_CFLAGS=-I${LOCALBASE}/include
+PLIST_SUB+=	CHEWING=""
+.else
+CONFIGURE_ARGS+=	--disable-chewing-module
+PLIST_SUB+=	CHEWING="@comment "
+.endif
+
+.if !defined(WITHOUT_UNICODE)
+CONFIGURE_ARGS+=	--enable-unicode-module
+PLIST_SUB+=	UNICODE=""
+.else
+CONFIGURE_ARGS+=	--disable-unicode-module
+PLIST_SUB+=	UNICODE="@comment "
+.endif
+
 # TODO WITHOUT_NLS knob
 #.if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -lintl"
 PLIST_SUB+=	NLS=""
-LDFLAGS+=	-lintl
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 #.else
 #CONFIGURE_ARGS+=--disable-nls
 #PLIST_SUB+=	NLS="@comment "
diff --git a/chinese/oxim/files/patch-src-modules-chewing-chewing.c b/chinese/oxim/files/patch-src-modules-chewing-chewing.c
new file mode 100644
index 000000000000..f481d76cd687
--- /dev/null
+++ b/chinese/oxim/files/patch-src-modules-chewing-chewing.c
@@ -0,0 +1,457 @@
+--- src/modules/chewing/chewing.c.orig	Sun Apr 23 06:11:30 2006
++++ src/modules/chewing/chewing.c	Sat May 20 22:09:19 2006
+@@ -14,7 +14,9 @@
+ #include "oximtool.h"
+ #include "module.h"
+ 
++#if 0
+ #include <iconv.h>
++#endif
+ 
+ /* the following keystate masks are defined by oxim */
+ #define CAPS_MASK (2)
+@@ -24,18 +26,20 @@
+ #define OXIM_BYTE_UTF8 		3
+ 
+ static int chewing_codeset;
++#if 0
+ void preconvert(char *input, char *output, int n_char);
+ wchar_t convert(wchar_t input);
++#endif
+ 
+ static char selKey_define[11] = "1234567890\0"; /* Default */
+ static int bAddPhraseForward = 0;
+ static uch_t etymon_list[N_KEYCODE];
+ 
+-int MakeInpinfo(inpinfo_t *inpinfo, ChewingOutput *pgo);
++int MakeInpinfo(inpinfo_t *inpinfo);
+ 
+-int CallSetConfig(inpinfo_t *inpinfo, ChewingData *pgdata)
++int CallSetConfig(inpinfo_t *inpinfo, ChewingContext *ctx)
+ {
+-    ConfigData config;
++    ChewingConfigData config;
+     int i;
+ 
+     config.selectAreaLen = 100;
+@@ -45,15 +49,15 @@
+     for (i = 0; i < 10;i++)
+         config.selKey[i] = selKey_define[i];
+ 
+-    SetConfig(pgdata, &config);
++    chewing_Configure(ctx, &config);
+     return 0;
+ }
+ 
+ static int
+-ChewingInit(void *conf, char *objname, oxim_rc_t *xc)
++ChewingInit(void *context, char *objname, oxim_rc_t *xc)
+ {
+     char *cmd[2], kb_type_str[256];
+-    ChewingConf *cf = (ChewingConf *)conf ;
++    ChewingContext *ctx = (ChewingContext *)context ;
+ 
+     /* TODO : 這裡要改為偵測新酷音詞庫存放路徑 */
+     char *prefix = CHEWING_DATA_DIR;
+@@ -68,7 +72,6 @@
+     cmd[1] = "KB_TYPE" ;
+     kb_type_str[0] = '\0';
+     get_resource(xc, cmd, kb_type_str, 200, 2);
+-    cf->kb_type = KBStr2Num(kb_type_str);
+     //cf->kb_type = KBStr2Num("KB_HANYU_PINYING");
+ 
+     /* Support selection key definitions */
+@@ -90,17 +93,6 @@
+         }
+     }
+ 
+-    if (cf->kb_type == KB_HANYU_PINYING)
+-    {
+-	cf->inp_cname = "漢語拼音";
+-	cf->inp_ename = "HanYu";
+-    }
+-    else
+-    {
+-	cf->inp_cname = "新酷音";
+-	cf->inp_ename = "Chewing";
+-    }
+-
+     char *pho_key = "1qaz2wsxedcrfv5tgbyhnujm8ik,9ol.0p;/-7634";
+     char *pho_name[41] = {"ㄅ","ㄆ","ㄇ","ㄈ","ㄉ","ㄊ","ㄋ","ㄌ","ㄍ","ㄎ","ㄏ","ㄐ","ㄑ","ㄒ","ㄓ","ㄔ","ㄕ","ㄖ","ㄗ","ㄘ","ㄙ","ㄧ","ㄨ","ㄩ","ㄚ","ㄛ","ㄜ","ㄝ","ㄞ","ㄟ","ㄠ","ㄡ","ㄢ","ㄣ","ㄤ","ㄥ","ㄦ","˙","ˊ","ˇ","ˋ"};
+     int keylen = strlen(pho_key), i, idx;
+@@ -112,10 +104,7 @@
+     }
+ 
+     /* Initialize Chewing */
+-    ReadTree(prefix);
+-    InitChar(prefix);
+-    InitDict(prefix);
+-    ReadHash(prefix);
++    chewing_Init(prefix, prefix);
+ 
+     return True;
+ }
+@@ -124,21 +113,22 @@
+ ChewingXimInit(void *conf, inpinfo_t *inpinfo)
+ {
+     static char cchBuffer[MAX_PHONE_SEQ_LEN];
+-    ChewingConf *cf = (ChewingConf *) conf;
++    ChewingContext *ctx = (ChewingContext *) conf;
+     int i;
+ 
+-    inpinfo->iccf = (ChewingData *) calloc(1, sizeof(ChewingData));
+-    inpinfo->etymon_list = (cf->kb_type == KB_HANYU_PINYING) ? NULL : etymon_list;
++    inpinfo->iccf = chewing_new();
+ 
+-    InitChewing(inpinfo->iccf, cf);
+-    CallSetConfig(inpinfo, (ChewingData *) inpinfo->iccf);
++    CallSetConfig(inpinfo, (ChewingContext *) inpinfo->iccf);
+ 
++    chewing_set_KBType( inpinfo->iccf, chewing_KBStr2Num( "KB_DEFAULT" ) );
+     inpinfo->lcch = (uch_t *) calloc(MAX_PHONE_SEQ_LEN, sizeof(uch_t));
+     inpinfo->lcch_grouping = (ubyte_t *) calloc(MAX_PHONE_SEQ_LEN, sizeof(ubyte_t));
+     inpinfo->cch = cchBuffer;
+ 
+-    inpinfo->inp_cname = cf->inp_cname;
+-    inpinfo->inp_ename = cf->inp_ename;
++    inpinfo->inp_cname = "新酷音";
++    inpinfo->inp_ename = "Chewing";
++    inpinfo->etymon_list = etymon_list;
++
+     inpinfo->guimode = GUIMOD_LISTCHAR | GUIMOD_SELKEYSPOT;
+     inpinfo->keystroke_len = 0;
+     inpinfo->s_keystroke = (uch_t *) calloc(3 + MAX_PHRASE_LEN, sizeof(uch_t));
+@@ -162,33 +152,29 @@
+     return True;
+ }
+ 
+-void CommitString(inpinfo_t *inpinfo, ChewingOutput *pgo)
++void CommitString(inpinfo_t *inpinfo)
+ {
+     int i ;
+     char *str;
+-    char *output;
++    ChewingOutput *pgo = ((ChewingContext *) inpinfo->iccf)->output;
+     bzero(inpinfo->cch, sizeof(char)*MAX_PHONE_SEQ_LEN);
+     str = (char *) calloc(MAX_PHONE_SEQ_LEN,sizeof(char));
+-    output = (char *) calloc(MAX_PHONE_SEQ_LEN / 2 * chewing_codeset, sizeof(char));
+     for (i = 0; i < pgo->nCommitStr; i++)
+         strcat(str, (const char *) pgo->commitStr[i].s);
+-    preconvert(str, output, strlen(str));
+-    strcpy(inpinfo->cch, output);
++    strcpy(inpinfo->cch, str);
+     free(str);
+-    free(output);
+ }
+ 
+ static unsigned int 
+ ChewingXimEnd(void *conf, inpinfo_t *inpinfo)
+ {
+-    ChewingOutput gOut ;
+     int rtn ;
+ 
+     /* if preedit exists, commit the string */
+-    OnKeyEnter(inpinfo->iccf, &gOut);
++    chewing_handle_Enter(inpinfo->iccf);
+ 
+-    rtn = MakeInpinfo(inpinfo, &gOut);
+-    free(inpinfo->iccf);
++    rtn = MakeInpinfo(inpinfo);
++    chewing_free((ChewingContext*) inpinfo->iccf);
+     free(inpinfo->s_keystroke);
+     free(inpinfo->lcch);
+     free(inpinfo->mcch);
+@@ -201,7 +187,7 @@
+     return rtn ;
+ }      
+ 
+-void ShowChoose(inpinfo_t *inpinfo, ChoiceInfo *pci, ChewingOutput *pgo)
++void ShowChoose(inpinfo_t *inpinfo, ChoiceInfo *pci)
+ {
+     int i,no,k,len, kk;
+     char *output;
+@@ -217,16 +203,12 @@
+         // in the last page, no will exceed nTotalChoice
+         if( no >= pci->nTotalChoice ) 
+             break;
+-        output = (char *) calloc(
+-                        strlen(pci->totalChoiceStr[no]) * chewing_codeset + 1, 
+-                        sizeof(char));
+-        preconvert(pci->totalChoiceStr[no], output, strlen(pci->totalChoiceStr[no]));
++	output = pci->totalChoiceStr[no];
+         // for each char in the phrase, copy to mcch
+         for (k = 0, kk = 0; output[k] != '\0'; k += chewing_codeset, kk++)
+ 	{
+ 	    memcpy(inpinfo->mcch[len++].s, &(output[k]), chewing_codeset) ;
+ 	}
+-        free(output);
+         // set grouping to the length of the phrase
+         inpinfo->mcch_grouping[i+1] = kk;
+ 
+@@ -250,22 +232,23 @@
+     inpinfo->n_mcch = len ;
+ }
+ 
+-void ShowText(inpinfo_t *inpinfo, ChewingOutput *pgo)
++void ShowText(inpinfo_t *inpinfo)
+ {
+     int i;
++    ChewingOutput *pgo = ((ChewingContext *) inpinfo->iccf)->output;
+     bzero(inpinfo->lcch, sizeof(uch_t)*MAX_PHONE_SEQ_LEN) ;
+     for (i = 0; i < pgo->chiSymbolBufLen; i++)
+     {
+-	pgo->chiSymbolBuf[i].wch = convert(pgo->chiSymbolBuf[i].wch);
+ 	strcpy((char *)inpinfo->lcch[i].s, (char *)pgo->chiSymbolBuf[i].s);
+     }
+     inpinfo->n_lcch = pgo->chiSymbolBufLen ;
+ }
+ 
+-void ShowInterval(inpinfo_t *inpinfo, ChewingOutput *pgo)
++void ShowInterval(inpinfo_t *inpinfo)
+ {
+     int i, k, begin, len, count, nGroup ;
+     int label[MAX_PHONE_SEQ_LEN] ;
++    ChewingOutput *pgo = ((ChewingContext *) inpinfo->iccf)->output;
+ 
+     if( pgo->chiSymbolBufLen == 0) {
+         inpinfo->lcch_grouping[0] = 0 ;
+@@ -304,34 +287,35 @@
+         inpinfo->lcch_grouping[0] = nGroup ;
+ }
+ 
+-void ShowStateAndZuin(inpinfo_t *inpinfo, ChewingOutput *pgo)
++void ShowStateAndZuin(inpinfo_t *inpinfo)
+ {
+     int i, a , len = 0;
++    ChewingOutput *pgo = ((ChewingContext *) inpinfo->iccf)->output;
+ 
+     bzero( inpinfo->s_keystroke, sizeof(uch_t)*(3 + MAX_PHRASE_LEN));
+-    ChewingData *iccf = inpinfo->iccf;	
++    ChewingContext *iccf = inpinfo->iccf;	
+ 
+     if(pgo->bShowMsg)
+     {
+         for(i = 0; i < pgo->showMsgLen; i++)
+ 	{
+-	    inpinfo->s_keystroke[i].uch = (uchar_t)convert(pgo->showMsg[i].wch);
++	    inpinfo->s_keystroke[i].uch = (uchar_t)(pgo->showMsg[i].wch);
+ 	}
+ 	inpinfo->keystroke_len = pgo->showMsgLen ;
+     }
+     else
+     {
+ 	// 漢語拼音 
+-	if (iccf->zuinData.kbtype == KB_HANYU_PINYING)
++	if (iccf->data->zuinData.kbtype == KB_HANYU_PINYIN)
+ 	{
+-	   for (i=0 ; i < PINYING_SIZE; i++)
++	   for (i=0 ; i < PINYIN_SIZE; i++)
+ 	   {
+-		if (iccf->zuinData.pinYingData.keySeq[i] != '\0')
++		if (iccf->data->zuinData.pinYinData.keySeq[i] != '\0')
+ 		{
+-		    inpinfo->s_keystroke[i].uch = iccf->zuinData.pinYingData.keySeq[i];
++		    inpinfo->s_keystroke[i].uch = iccf->data->zuinData.pinYinData.keySeq[i];
+ 		}
+ 	   } 
+-	   inpinfo->keystroke_len = strlen(iccf->zuinData.pinYingData.keySeq);
++	   inpinfo->keystroke_len = strlen(iccf->data->zuinData.pinYinData.keySeq);
+ 	}
+ 	else
+ 	{
+@@ -339,7 +323,7 @@
+ 	    {
+ 		if(pgo->zuinBuf[i].s[0] != '\0')
+ 		{
+-		    inpinfo->s_keystroke[a++].uch = (uchar_t)convert(pgo->zuinBuf[i].wch);
++		    inpinfo->s_keystroke[a++].uch = (uchar_t)(pgo->zuinBuf[i].wch);
+ 		    ++ len;
+ 		}
+ 	    }
+@@ -348,13 +332,15 @@
+     }
+ }
+ 
+-void SetCursor(inpinfo_t *inpinfo, ChewingOutput *pgo)
++void SetCursor(inpinfo_t *inpinfo)
+ {
++    ChewingOutput *pgo = ((ChewingContext *) inpinfo->iccf)->output;
+     inpinfo->edit_pos = pgo->chiSymbolCursor;
+ }
+ 
+-int MakeInpinfo(inpinfo_t *inpinfo, ChewingOutput *pgo)
++int MakeInpinfo(inpinfo_t *inpinfo)
+ {
++    ChewingOutput *pgo = ((ChewingContext *) inpinfo->iccf)->output;
+     int rtnValue = 0 ;
+ 
+     if(pgo->keystrokeRtn & KEYSTROKE_ABSORB)
+@@ -365,20 +351,20 @@
+         rtnValue |= IMKEY_BELL;
+     if(pgo->keystrokeRtn & KEYSTROKE_COMMIT) {
+         rtnValue |= IMKEY_COMMIT;
+-        CommitString(inpinfo, pgo);
++        CommitString(inpinfo);
+     }
+ 
+     if(pgo->pci->nPage != 0) { // in selection mode
+-        ShowChoose(inpinfo,pgo->pci,pgo);
++        ShowChoose(inpinfo,pgo->pci);
+         inpinfo->guimode &= ~GUIMOD_LISTCHAR; 
+     }
+     else { // not in selection mode
+-        ShowText(inpinfo, pgo);
+-        ShowInterval(inpinfo, pgo);
++        ShowText(inpinfo);
++        ShowInterval(inpinfo);
+         inpinfo->guimode |= GUIMOD_LISTCHAR;
+     }
+-    ShowStateAndZuin(inpinfo, pgo);
+-    SetCursor(inpinfo, pgo);
++    ShowStateAndZuin(inpinfo);
++    SetCursor(inpinfo);
+     return rtnValue;
+ }
+ 
+@@ -386,67 +372,63 @@
+ ChewingKeystroke(void *conf, inpinfo_t *inpinfo, keyinfo_t *keyinfo)
+ {
+     KeySym keysym = keyinfo->keysym;
+-    ChewingOutput gOut ;
+     int rtn ;
+     static KeySym last_key = 0;
+ 
+     // set Chinese / English mode by keystate
+     if( keyinfo->keystate & CAPS_MASK ) { // uppercase
+-            SetChiEngMode( inpinfo->iccf, SYMBOL_MODE);
++            chewing_set_ChiEngMode( inpinfo->iccf, SYMBOL_MODE);
+     }
+     else {  // lower case 
+-            SetChiEngMode( inpinfo->iccf, CHINESE_MODE);
++            chewing_set_ChiEngMode( inpinfo->iccf, CHINESE_MODE);
+     }
+ 
+     // check no ctrl key was pressed
+     if(keyinfo->keystate >= 0 && !(keyinfo->keystate & CTRL_MASK ) && !(keyinfo->keystate & ShiftMask) ) {
+         switch(keysym) {
+             case XK_Escape:
+-                OnKeyEsc(inpinfo->iccf, &gOut) ;
++                chewing_handle_Esc(inpinfo->iccf) ;
+                 inpinfo->n_mcch = 0;
+                 break ;
+             case XK_Return:
+-                OnKeyEnter(inpinfo->iccf, &gOut) ;
++                chewing_handle_Enter(inpinfo->iccf) ;
+                 inpinfo->n_mcch = 0;
+                 break ;
+             case XK_Delete:
+-                OnKeyDel(inpinfo->iccf, &gOut) ;
++                chewing_handle_Del(inpinfo->iccf) ;
+ 		break ;
+             case XK_BackSpace:
+-                OnKeyBackspace(inpinfo->iccf, &gOut) ;
++                chewing_handle_Backspace(inpinfo->iccf) ;
+                 break ;
+             case XK_Up:
+-                OnKeyUp(inpinfo->iccf, &gOut);
++                chewing_handle_Up(inpinfo->iccf);
+                 break ;
+             case XK_Down:
+-                OnKeyDown(inpinfo->iccf, &gOut) ;
++                chewing_handle_Down(inpinfo->iccf) ;
+                 break ;
+             case XK_Left:
+-                OnKeyLeft(inpinfo->iccf, &gOut) ;
++                chewing_handle_Left(inpinfo->iccf) ;
+                 break ;
+             case XK_Right:
+-                OnKeyRight(inpinfo->iccf, &gOut) ;
++                chewing_handle_Right(inpinfo->iccf) ;
+                 break ;
+             case XK_Home:
+-                OnKeyHome(inpinfo->iccf, &gOut);
++                chewing_handle_Home(inpinfo->iccf);
+ 		break;
+ 	    case XK_End:
+-                OnKeyEnd(inpinfo->iccf, &gOut);
++                chewing_handle_End(inpinfo->iccf);
+                 break;
+             case XK_Tab:
+-                if (last_key == XK_Tab) // double click TAB
+-                    OnKeyDblTab(inpinfo->iccf, &gOut);
+-                else
+-                    OnKeyTab(inpinfo->iccf, &gOut);
++                chewing_handle_Tab(inpinfo->iccf);
+                 break;
+             case XK_Caps_Lock:
+-                OnKeyCapslock(inpinfo->iccf, &gOut);
++                chewing_handle_Capslock(inpinfo->iccf);
+                 break;
+             case ' ': /* Space */
+-                OnKeySpace(inpinfo->iccf, &gOut);
++                chewing_handle_Space(inpinfo->iccf);
+                 break;
+             default:
+-                OnKeyDefault(inpinfo->iccf, keysym, &gOut);
++                chewing_handle_Default(inpinfo->iccf, (char) keysym );
+                 inpinfo->n_mcch = 0;
+                 break;
+         }
+@@ -454,26 +436,26 @@
+     else if (keyinfo->keystate & ShiftMask) {
+ 	switch ( keysym ) {
+ 	    case XK_Left:
+-		OnKeyShiftLeft(inpinfo->iccf, &gOut) ;
++		chewing_handle_ShiftLeft(inpinfo->iccf) ;
+                 break ;
+             case XK_Right:
+-                OnKeyShiftRight(inpinfo->iccf, &gOut) ;
++                chewing_handle_ShiftRight(inpinfo->iccf) ;
+                 break;
+             default:
+-                OnKeyDefault(inpinfo->iccf, keysym, &gOut);
++                chewing_handle_Default(inpinfo->iccf, (char) keysym);
+                 inpinfo->n_mcch = 0;
+             }
+     }
+     else if (keyinfo->keystate & CTRL_MASK) {  // Ctrl-key Mask
+ 	// We need to fill the 'gOut' variable for output.
+ 	    if (keysym <= '9' && keysym >= '0') 
+-		OnKeyCtrlNum(inpinfo->iccf,keysym,&gOut);
++		chewing_handle_CtrlNum(inpinfo->iccf, (char) keysym);
+             else 
+-                OnKeyCtrlOption(inpinfo->iccf, keysym - 'a' + 1, &gOut);
++                chewing_handle_CtrlOption(inpinfo->iccf, keysym - 'a' + 1);
+     }
+ 
+     last_key = keysym;
+-    rtn = MakeInpinfo(inpinfo, &gOut);
++    rtn = MakeInpinfo(inpinfo);
+     return rtn ;
+ }
+ 
+@@ -484,6 +466,7 @@
+     return False;
+ }                              
+ 
++#if 0
+ /* UTF-8 support */
+ void
+ preconvert(char *input, char *output, int n_char)
+@@ -519,6 +502,7 @@
+     iconv_close(cd);
+     return output.wch;
+ }
++#endif
+ 
+ static char zh_chewing_comments[] = 
+     "Chewing : a smart phonetic input method module for OXIM.\n"
+@@ -535,7 +519,7 @@
+         zh_chewing_comments 
+     },					/* comments */
+     zh_chewing_valid_objname,		/* valid_objname */
+-    sizeof(ChewingConf),		/* conf_size */
++    sizeof(ChewingConfigData),		/* conf_size */
+     ChewingInit,			/* init */
+     ChewingXimInit,			/* xim_init */
+     ChewingXimEnd,			/* xim_end */
diff --git a/chinese/oxim/pkg-plist b/chinese/oxim/pkg-plist
index a2c977469bd2..4cff7e4efe26 100644
--- a/chinese/oxim/pkg-plist
+++ b/chinese/oxim/pkg-plist
@@ -7,12 +7,12 @@ lib/liboxim.so
 lib/liboxim.so.0
 %%GTK2%%lib/gtk-2.0/immodules/gtk-im-oxim.la
 %%GTK2%%lib/gtk-2.0/immodules/gtk-im-oxim.so
-lib/oxim/modules/chewing.la
-lib/oxim/modules/chewing.so
+%%CHEWING%%lib/oxim/modules/chewing.la
+%%CHEWING%%lib/oxim/modules/chewing.so
 lib/oxim/modules/gen-inp.la
 lib/oxim/modules/gen-inp.so
-lib/oxim/modules/unicode.la
-lib/oxim/modules/unicode.so
+%%UNICODE%%lib/oxim/modules/unicode.la
+%%UNICODE%%lib/oxim/modules/unicode.so
 lib/oxim/panels/defaultkeyboard.conf
 lib/oxim/panels/defaultkeyboard.xpm
 lib/oxim/tables/array30.tab