From dd8bf91b4fec4f3945e3b8b73dc16902814b9291 Mon Sep 17 00:00:00 2001
From: Foxfair Hu <foxfair@FreeBSD.org>
Date: Thu, 9 Sep 1999 10:08:30 +0000
Subject: Make xcin-2.3 installation success again after repo copied.

Point out by: bento.
---
 chinese/xcin/files/patch-aa | 62 ---------------------------------------------
 chinese/xcin/files/patch-ab | 28 ++++++++++----------
 2 files changed, 14 insertions(+), 76 deletions(-)
 delete mode 100644 chinese/xcin/files/patch-aa

(limited to 'chinese')

diff --git a/chinese/xcin/files/patch-aa b/chinese/xcin/files/patch-aa
deleted file mode 100644
index 4c392291d306..000000000000
--- a/chinese/xcin/files/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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:
diff --git a/chinese/xcin/files/patch-ab b/chinese/xcin/files/patch-ab
index d4c3ca5a1e48..c134175205f8 100644
--- a/chinese/xcin/files/patch-ab
+++ b/chinese/xcin/files/patch-ab
@@ -1,29 +1,29 @@
---- src/xi.c.orig       Wed Dec  9 22:43:13 1998
-+++ src/xi.c    Thu Jul 22 12:34:14 1999
+--- src/xi.c.org	Thu Sep  9 17:14:05 1999
++++ src/xi.c	Thu Sep  9 17:15:53 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;
+ 	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;
-
+-	memcpy( &inmdstate, state, sizeof( inmdstate ) );
++	if(memcpy( &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;
++     return;
    gotoxy( 0, MROW - 1 );
-
+ 
    ClrShowArea( 0 );
-- 
cgit v1.2.3