PR: ports/11468

Submitted by:	Keith Jang <jtjang@gcn.net.tw>
Update xcin to xcin-2.5.1 after repo copied. Old xcin will be dropped out
after few months.

xcin is a Chinese INput application in X, well support in both Traditional
Chinese(Big5) and Simplified Chinese(GB) charsets. New version of xcin support
standard XIM too. You can activate one xcin-XIM server, meanwhile, use
different locale configuration to input Big5/GB words at the different
sessions. This port is current version of xcin, code rewritten by
Tung-Han Hsieh <thhsieh@linux.org.tw>.

WWW: http://xcin.linux.org.tw/

Porting to FreeBSD by Yung-Jen Hung <winard@ms11.url.com.tw>
& Keith Jang <jtjang@gcn.net.tw>.

4 files changed, 45 insertions, 91 deletions

diff --git a/chinese/xcin25/files/patch-aa b/chinese/xcin25/files/patch-aa
index 4c39229..21adbc0 100644
--- a/chinese/xcin25/files/patch-aa
+++ b/chinese/xcin25/files/patch-aa
@@ -1,62 +1,13 @@
---- script/config.status.orig	Fri Dec 11 09:36:32 1998
-+++ script/config.status	Sun Jan 17 14:42:51 1999
-@@ -14,8 +14,8 @@
- PATH_XCIN_DIR=/usr/local/lib/xcin
- PATH_XCIN_MAN=/usr/local/man
- 
--OPT_XCIN_CFONT=-twmoe-kai-medium-r-normal--24-240-75-75-c-240-big5-1
--OPT_XCIN_EFONT=12x24
-+OPT_XCIN_CFONT=kc15f
-+OPT_XCIN_EFONT=kc8x15
- OPT_UTIL_CIN2TAB=yes
- OPT_UTIL_TSINTOOLS=yes
- OPT_INPTAB_SRC=yes
---- script/configure.makefile.orig	Fri Dec 11 09:18:08 1998
-+++ script/configure.makefile	Sun Jan 17 14:34:16 1999
-@@ -78,7 +78,7 @@
-           : # AIX
-         else
-           INSTALL="$dir/install -c"
--          INSTALL_PROGRAM='$(INSTALL)'
-+          INSTALL_PROGRAM='$(INSTALL) -s'
-           INSTALL_DATA='$(INSTALL) -m 644'
-           INSTALL_DIR='$(INSTALL) -d'
-           break
---- script/configure.menu.orig	Fri Dec 11 09:49:43 1998
-+++ script/configure.menu	Sun Jan 17 14:40:11 1999
-@@ -266,7 +266,7 @@
- {
-     PATH_XCIN_PREFIX=$1
-     PATH_XCIN_BIN=$PATH_XCIN_PREFIX/bin
--    PATH_XCIN_DIR=$PATH_XCIN_PREFIX/lib/xcin
-+    PATH_XCIN_DIR=$PATH_XCIN_PREFIX/lib/X11/xcin
-     PATH_XCIN_MAN=$PATH_XCIN_PREFIX/man
- }
- 
---- src/Makefile.in.orig	Wed Dec  9 22:26:36 1998
-+++ src/Makefile.in	Sun Jan 17 14:34:16 1999
-@@ -149,7 +149,7 @@
- 
- install_xcin: xcin $(KBMS) $(INPUT0) tsintab
- 	if [ ! -d $(PATH_XCIN_BIN) ]; then $(INSTALL_DIR) $(PATH_XCIN_BIN); fi
--	$(INSTALL) xcin $(PATH_XCIN_BIN)
-+	$(INSTALL_PROGRAM) xcin $(PATH_XCIN_BIN)
- 	echo $(PATH_XCIN_BIN)/xcin >> filelist
- 
- 	if [ ! -d $(PATH_XCIN_DIR) ]; then $(INSTALL_DIR) $(PATH_XCIN_DIR); fi
-@@ -159,13 +159,13 @@
- 
- install_cin2tab: cin2tab
- 	if [ ! -d $(PATH_XCIN_DIR) ]; then $(INSTALL_DIR) $(PATH_XCIN_DIR); fi
--	$(INSTALL) cin2tab $(PATH_XCIN_DIR)
-+	$(INSTALL_PROGRAM) cin2tab $(PATH_XCIN_DIR)
- 	echo $(PATH_XCIN_DIR)/cin2tab >> filelist
- 
- install_tsintools: tsintools
- 	if [ ! -d $(PATH_XCIN_DIR) ]; then $(INSTALL_DIR) $(PATH_XCIN_DIR); fi
- 	for f in $(TSINTOOLS); do\
--            $(INSTALL) $$f $(PATH_XCIN_DIR); echo $(PATH_XCIN_DIR)/$$f >> filelist;\
-+            $(INSTALL_PROGRAM) $$f $(PATH_XCIN_DIR); echo $(PATH_XCIN_DIR)/$$f >> filelist;\
- 	done
- 
- install_tsintabsrc:
+--- src/util/cin2tab/Makefile.in.orig	Sun Aug 15 00:03:26 1999
++++ src/util/cin2tab/Makefile.in	Sun Aug 15 00:13:01 1999
+@@ -58,7 +58,8 @@
+ distclean: clean
+ 	rm -f Makefile .depend
+ install: $(BIN)
+-	if [ -f $(xcin_binp)/$(BIN) ]; then mv $(xcin_binp)/$(BIN) $(xcin_binp)/$(BIN).old; fi
+-	$(INSTALL_PROGRAM) $(BIN) $(xcin_binp)
++	if [ ! -d $(xcin_libp)/bin ]; then mkdir -p $(xcin_libp)/bin; fi
++	if [ -f $(xcin_libp)/bin/$(BIN) ]; then mv $(xcin_libp)/bin/$(BIN) $(xcin_libp)/bin/$(BIN).old; fi
++	$(INSTALL_PROGRAM) $(BIN) $(xcin_libp)/bin
+ 
+ include .depend
diff --git a/chinese/xcin25/files/patch-ab b/chinese/xcin25/files/patch-ab
index d4c3ca5..eaeec77 100644
--- a/chinese/xcin25/files/patch-ab
+++ b/chinese/xcin25/files/patch-ab
@@ -1,29 +1,8 @@
---- src/xi.c.orig       Wed Dec  9 22:43:13 1998
-+++ src/xi.c    Thu Jul 22 12:34:14 1999
-@@ -1056,19 +1056,25 @@
-
- void switch_active_client( InmdState *state, Window cli_win )
- {
-+  int refresh = 1;
-   last_win = cli_win;
-
-   if ( ignore_cli_stat )
-       ignore_cli_stat = 0;
-   else
-      if ( state->_CurInMethod )
--      memcpy( &inmdstate, state, sizeof( inmdstate ) );
-+       if(memcmp(&inmdstate, state, sizeof( inmdstate)))
-+           memcpy( &inmdstate, state, sizeof( inmdstate ) );
-+       else
-+           refresh = 0;
-
-   if ( hide_xcin && ( EngChi || HalfFull ) )
-      Show_Xcin();
-   else if ( hide_xcin && !EngChi && !HalfFull )
-      XUnmapWindow( display, main_win );
-
-+  if(!refresh)
-+    return;
-   gotoxy( 0, MROW - 1 );
-
-   ClrShowArea( 0 );
+--- src/lib/Makefile.in.orig	Sun Aug 15 00:23:04 1999
++++ src/lib/Makefile.in	Sun Aug 15 00:23:24 1999
+@@ -30,3 +30,5 @@
+ 	rm -f Makefile
+ 	for d in $(SUBSYS); do ( cd $$d; $(MAKE) distclean ); done
+ 	( cd IMdkit; $(MAKE) clean )
++
++install:
diff --git a/chinese/xcin25/files/patch-ad b/chinese/xcin25/files/patch-ad
new file mode 100644
index 0000000..b76a7a1
--- /dev/null
+++ b/chinese/xcin25/files/patch-ad
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Sun Aug 15 00:34:38 1999
++++ src/Makefile.in	Sun Aug 15 00:35:31 1999
+@@ -45,7 +45,7 @@
+ LIB = -lm ${x_libraries} ${extra_lib} ${locale_lib} ${dl_lib} ${intl_lib} \
+       ${xcinlib} -lXimd -lim_comm -lxcintool -lsiod 
+ 
+-BIN    = xcin
++BIN    = xcin2.5
+ SRC    = xcin_main.c module.c gui.c xim.c xim_IC.c fkey.c
+ OBJ    = xcin_main.o module.o gui.o xim.o xim_IC.o fkey.o
+ SUBSYS = lib Cinput
diff --git a/chinese/xcin25/files/patch-ae b/chinese/xcin25/files/patch-ae
new file mode 100644
index 0000000..b4611ff
--- /dev/null
+++ b/chinese/xcin25/files/patch-ae
@@ -0,0 +1,13 @@
+--- src/xcinrc.in.orig	Fri Sep  3 01:17:52 1999
++++ src/xcinrc.in	Fri Sep  3 01:18:29 1999
+@@ -86,8 +86,8 @@
+ (define bimsphone
+ 	'((SETKEY	6)
+ 	  (MODULE	"bimsphone")
+-	  (TSI_FNAME    "tsi.db")
+-	  (YIN_FNAME    "yin.db")
++	  (TSI_FNAME    "/usr/local/share/tabe/tsiyin/tsi.db")
++	  (YIN_FNAME    "/usr/local/share/tabe/tsiyin/yin.db")
+ 	  (KEYMAP	0)))		; 0: ¹s³ü, 1: ­Ê¤Ñ, 2: ³\¤ó
+ 
+ (define cj