Add DragonFly support. Handle the different locale names in PLIST.

Based on patch from Jeffrey Hsu in private mail.

7 files changed, 299 insertions, 17 deletions

diff --git a/inputmethod/xcin/Makefile b/inputmethod/xcin/Makefile
index 7312305f22e..c98ac9eef9e 100644
--- a/inputmethod/xcin/Makefile
+++ b/inputmethod/xcin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/04/13 18:23:34 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/28 18:12:29 joerg Exp $
 #
 
 DISTNAME=	xcin-2.5.3.pre2
@@ -29,6 +29,17 @@ INSTALLATION_DIRS=	share/doc/xcin
 EGDIR=			${PREFIX}/share/examples/xcin
 CONF_FILES=		${EGDIR}/xcinrc ${PKG_SYSCONFDIR}/xcinrc
 
+.if ${OPSYS} == "NetBSD"
+EUC_LOCALE=	euccn
+.else
+EUC_LOCALE=	euc
+.endif
+
+PLIST_SUBST+=	EUC_LOCALE=${EUC_LOCALE}
+
+post-extract:
+	${CP} ${FILESDIR}/xcinrc.DRAGONFLY ${WRKSRC}/etc
+
 post-install:
 	cd ${WRKSRC}/doc && ${PAX} -rw	\
 		-s ',^\./man$$,,' -s ',^\./man/.*,,'	\
diff --git a/inputmethod/xcin/PLIST b/inputmethod/xcin/PLIST
index 329ad79b840..41c58fc7a20 100644
--- a/inputmethod/xcin/PLIST
+++ b/inputmethod/xcin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:23 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/28 18:12:29 joerg Exp $
 bin/cin2tab
 bin/xcin
 lib/libxcin.la
@@ -17,13 +17,13 @@ lib/xcin/tab/big5/pinyin0.tab
 lib/xcin/tab/big5/simplex.tab
 lib/xcin/tab/big5/sys.tab
 lib/xcin/tab/big5/telecode.tab
-lib/xcin/tab/euccn/default.phr
-lib/xcin/tab/euccn/jtcj_gb.tab
-lib/xcin/tab/euccn/phonegb2.tab
-lib/xcin/tab/euccn/pinyin.tab
-lib/xcin/tab/euccn/shuangpin.tab
-lib/xcin/tab/euccn/sys.tab
-lib/xcin/tab/euccn/wubizixing.tab
+lib/xcin/tab/${EUC_LOCALE}/default.phr
+lib/xcin/tab/${EUC_LOCALE}/jtcj_gb.tab
+lib/xcin/tab/${EUC_LOCALE}/phonegb2.tab
+lib/xcin/tab/${EUC_LOCALE}/pinyin.tab
+lib/xcin/tab/${EUC_LOCALE}/shuangpin.tab
+lib/xcin/tab/${EUC_LOCALE}/sys.tab
+lib/xcin/tab/${EUC_LOCALE}/wubizixing.tab
 lib/xcin/zh_hex.la
 man/man1/xcin.1
 share/doc/xcin/Bugs
@@ -63,7 +63,7 @@ share/locale/zh_TW/LC_MESSAGES/xcin.mo
 @dirrm share/doc/xcin/En/internal
 @dirrm share/doc/xcin/En
 @dirrm share/doc/xcin
-@dirrm lib/xcin/tab/euccn
+@dirrm lib/xcin/tab/${EUC_LOCALE}
 @dirrm lib/xcin/tab/big5
 @dirrm lib/xcin/tab
 @dirrm lib/xcin
diff --git a/inputmethod/xcin/distinfo b/inputmethod/xcin/distinfo
index 0c6b51d8856..0734b44ead9 100644
--- a/inputmethod/xcin/distinfo
+++ b/inputmethod/xcin/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.5 2006/03/14 15:11:54 rxg Exp $
+$NetBSD: distinfo,v 1.6 2006/04/28 18:12:29 joerg Exp $
 
 SHA1 (xcin-2.5.3.pre2.tar.gz) = 27e4c47e09c44e92e3a3afc9e08134e1485f6795
 RMD160 (xcin-2.5.3.pre2.tar.gz) = f1fb83d1e21a0f5dbb80c5eafdaa6c7f313ea865
 Size (xcin-2.5.3.pre2.tar.gz) = 1433915 bytes
 SHA1 (patch-aa) = f08a273843fd6dc50f71c815f0cd9c8c8c0cdc40
-SHA1 (patch-ac) = a1bccd9d946d287eedf26bba4aebb89be8ee7e70
+SHA1 (patch-ab) = cf899acb6f5502175c9cbfd45da119cd6f6ddb5a
+SHA1 (patch-ac) = 63ad86449dd44ddf3db2ed661de2e290c894131f
 SHA1 (patch-ad) = 6e59d32f5e3f8f06f8b4bcbb32e221678db74018
 SHA1 (patch-ae) = 13985687af55de0a6727150d41d2d6333d103689
 SHA1 (patch-af) = 23dde43647de72fb6492a51016379db88f37cdd2
 SHA1 (patch-ag) = 009aff61710ad0da4492e366f35fa565b0abc32c
 SHA1 (patch-ah) = 0bc13a5e03157cc788228162d7f212d5741c29bf
+SHA1 (patch-ai) = 324cd99f69bd226846dc65f100c523c056fc13c6
diff --git a/inputmethod/xcin/files/xcinrc.DRAGONFLY b/inputmethod/xcin/files/xcinrc.DRAGONFLY
new file mode 100644
index 00000000000..4d263cf850b
--- /dev/null
+++ b/inputmethod/xcin/files/xcinrc.DRAGONFLY
@@ -0,0 +1,207 @@
+;
+;  Xcin resource file for DragonFlyBSD system.
+;
+;  By T.H.Hsieh.
+
+;
+;  Directories.
+;
+(define XCIN_DEFAULT_DIR      "%xcin_dir%")
+(define XCIN_USER_DIR         ".xcin")
+
+;
+;  This defines GUI attribute.
+;
+(define INDEX_FONT  		"-sony-*-16-*-iso8859-1")
+(define FG_COLOR    		"white")
+(define BG_COLOR    		"blue")
+(define M_FG_COLOR  		"yellow")
+(define M_BG_COLOR  		"darkred")
+(define ULINE_COLOR		"cyan")
+(define GRID_COLOR		"white")
+(define X_GEOMETRY  		"45x2+200-1")
+(define START_MAINWIN2		"NO")
+(define MAINWIN2_GEOMETRY	"27x1+200-1")
+(define XCIN_HIDE   		"NO")
+(define XKILL_DISABLE		"NO")
+(define SINGLE_IM_CONTEXT	"NO")
+(define IM_FOCUS_ON		"NO")
+(define KEEP_POSITION_ON	"NO")
+(define DISABLE_WM_CTRL		"NO")
+(define DIFF_BEEP		"YES")
+(define KEYBOARD_TRANSLATE	"NO")
+
+;
+;  XIM Input Style Adjustments.
+;
+(define INPUT_STYLE		'(Root OverTheSpot))
+(define OVERSPOT_USE_USRCOLOR	"YES")
+(define OVERSPOT_USE_USRFONTSET "YES")
+(define OVERSPOT_WINDOW_ONLY	"NO")
+
+(define LOCALE  '(zh_TW.Big5 zh_CN.eucCN))
+
+;
+;  Special Trigger Keys.
+;
+;(define FKEY_ZHEN		"ctrl space")
+;(define FKEY_2BSB		"shift space")
+;(define FKEY_CIRIM		"ctrl shift")
+;(define FKEY_CIRRIM		"shift ctrl")
+;(define FKEY_CHREP		"ctrl alt r")
+;(define FKEY_SIMD		"ctrl alt i")
+;(define FKEY_IMFOCUS		"ctrl alt f")
+;(define FKEY_IMN		"ctrl alt")
+;(define FKEY_QPHRASE		"shift alt")
+
+;
+;  IM module default resources.
+;
+(define gen_inp_default
+        '((AUTO_COMPOSE         YES)
+          (AUTO_UPCHAR          YES)
+          (AUTO_FULLUP          NO)
+          (SPACE_AUTOUP         NO)
+          (SELKEY_SHIFT         NO)
+          (SPACE_IGNORE         NO)
+          (SPACE_RESET          YES)
+          (AUTO_RESET           NO)
+          (WILD_ENABLE          YES)
+          (SINMD_IN_LINE1       NO)
+          (END_KEY              NO)
+          (QPHRASE_MODE         0)      ; 1:shift, 2:ctrl, 4:alt, 8:fallback
+          (DISABLE_SEL_LIST     "NONE")
+	  (KEYSTROKE_REMAP	"NONE")
+          (BEEP_WRONG           YES)
+          (BEEP_DUPCHAR         NO)
+          (TSI_FNAME            "%tabe_data%tsi.db")
+	  (HINT_SELECT		NO)
+	  (HINT_TSI		NO)))
+
+(define bimsphone_default
+        '((N_SELECTION_KEY      9)
+          (SELECTION_KEYS       0)      ; 0: "1234567890", 1: "asdfgjkl;"
+          (PAGE_KEYS            5)      ; 1:<> 2:,. 4:(Rt)(Lt)
+          (QPHRASE_MODE         1)      ; 1:shift, 2:ctrl, 4:alt, 8:fallback
+        ;
+        ; This is only valid for "bimsphone*" IM name.
+          (AUTO_SELECTION       YES)
+          (KEYMAP               0)      ; 0:zozy, 1:et, 2:et26, 3:hsu
+        ;
+        ; This is only valid for "bimspinyin*" IM name.
+          (PINPHO_MAP           "bims_pinyin")
+        ;
+        ; The following has effect only when AUTO_SELECTION is YES
+          (TSI_FNAME            "%tabe_data%tsi.db")
+          (YIN_FNAME            "%tabe_data%yin.db")
+          (SPACE_SELECTION      NO)
+          (PHRASE_SELECTION     YES)
+          (N_SELECTION_PHR      4)
+        ;
+        ; The following has effect only when AUTO_SELECTION is NO
+          (AUTO_UPCHAR          YES)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+;  This is the global configuration of the zh_TW.Big5 locale 
+;
+(define zh_TW.Big5 
+  '((DEFAULT_IM		"cj")
+    (DEFAULT_IM_MODULE	"gen_inp")
+    (DEFAULT_IM_SINMD	"DEFAULT")
+    (PHRASE		"default.phr")
+    (CINPUT		(cj simplex phone bimspinyin bimsphone jyutping
+			 array30 jyutping0 chewing zh_hex))
+    (FONTSET		"-sony-*-24-*-iso8859-1,-*-medium-r-*-24-*-big5-0")
+    (OVERSPOT_FONTSET	"-sony-*-16-*-iso8859-1,-*-medium-r-*-16-*-big5-0")))
+;
+;  Here are detailed configuration of each IM (for zh_TW.Big5 locale).
+;
+(define cj@big5
+	'((SETKEY		1)))
+
+(define simplex@big5
+	'((SETKEY		2)))
+
+(define phone@big5
+	'((SETKEY		3)
+	  (END_KEY		YES)
+	  (BEEP_DUPCHAR		YES)))
+
+(define jyutping@big5
+	'((SETKEY		4)
+	  (END_KEY		YES)
+	  (BEEP_DUPCHAR		YES)))
+
+(define bimsphone@big5
+	'((SETKEY		6)
+	  (MODULE		"bimsphone")))
+
+(define bimspinyin@big5
+	'((SETKEY		7)
+	  (MODULE		"bimsphone")))
+
+(define array30@big5
+	'((SETKEY		8)
+      	  (BEEP_DUPCHAR		YES)
+	  (DISABLE_SEL_LIST	"w")
+	  (KEYSTROKE_REMAP	"t:0xaaba;T:0xaaba;")))
+
+(define jyutping0@big5
+	'((SETKEY		9)
+	  (BEEP_DUPCHAR		YES)))
+
+(define chewing@big5
+	'((SETKEY		10)
+	  (MODULE		"chewing")))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+;  This is the global configuration of the zh_CN.eucCN locale 
+;
+(define zh_CN.eucCN
+  '((DEFAULT_IM		"pinyin")
+    (DEFAULT_IM_MODULE	"gen_inp")
+    (DEFAULT_IM_SINMD	"DEFAULT")
+    (PHRASE		"default.phr")
+    (CINPUT		(pinyin shuangpin jtcj_gb wubizixing phonegb2
+			 zh_hex))
+    (FONTSET		"-sony-*-24-*-iso8859-1,-*-medium-r-*-24-*-gb2312.1980-0")
+    (OVERSPOT_FONTSET	"-sony-*-16-*-iso8859-1,-*-medium-r-*-16-*-gb2312.1980-0")))
+;
+;  Here are detailed configuration of each IM (for zh_CN.eucCN locale).
+;
+(define pinyin@euccn
+	'((SETKEY		1)
+	  (BEEP_DUPCHAR		YES)))
+
+(define shuangpin@euccn
+	'((SETKEY		2)
+	  (BEEP_DUPCHAR 	YES)))
+
+(define jtcj_gb@euccn
+	'((SETKEY		3)))
+
+(define phonegb2@euccn
+	'((SETKEY		4)
+	  (END_KEY		YES)
+	  (BEEP_DUPCHAR		YES)))
+
+(define wubizixing@euccn
+	'((SETKEY		5)))
+
+
+
+;
+;  The zh_hex module (zh_hex input method) is a special IM, which can be
+;  used in many different encodings.
+;
+(define zh_hex 
+	'((SETKEY		0)
+	  (MODULE		zh_hex)
+	  (INP_CNAME_big5	"0xa4ba+0xbd58")
+	  (INP_CNAME_euccn	"0xc4da+0xc2eb")
+	  (BEEP_WRONG		YES)))
+
diff --git a/inputmethod/xcin/patches/patch-ab b/inputmethod/xcin/patches/patch-ab
new file mode 100644
index 00000000000..9cf413f7659
--- /dev/null
+++ b/inputmethod/xcin/patches/patch-ab
@@ -0,0 +1,24 @@
+$NetBSD: patch-ab,v 1.3 2006/04/28 18:12:29 joerg Exp $
+
+--- cin/big5/Makefile.in.orig	2001-09-06 15:41:32.000000000 +0000
++++ cin/big5/Makefile.in
+@@ -11,6 +11,9 @@ all: all-$(OS_TYPE)
+ all-LINUX:
+ 	( BIG5ENC=big5 BIG5HKENC=big5hkscs make -f Rules make-big5 make-big5hkscs )
+ 
++all-DRAGONFLY:
++	( BIG5ENC=big5 make -f Rules make-big5 )
++
+ all-FREEBSD:
+ 	( BIG5ENC=big5 make -f Rules make-big5 )
+ 
+@@ -32,6 +35,9 @@ install: all install-$(OS_TYPE)
+ install-LINUX:
+ 	( BIG5ENC=big5 BIG5HKENC=big5hkscs make -f Rules install_big5 install_big5hkscs )
+ 
++install-DRAGONFLY:
++	( BIG5ENC=big5 make -f Rules install_big5 )
++
+ install-FREEBSD:
+ 	( BIG5ENC=big5 make -f Rules install_big5 )
+ 
diff --git a/inputmethod/xcin/patches/patch-ac b/inputmethod/xcin/patches/patch-ac
index 7b3f0d55c87..0fb47897a36 100644
--- a/inputmethod/xcin/patches/patch-ac
+++ b/inputmethod/xcin/patches/patch-ac
@@ -1,8 +1,22 @@
-$NetBSD: patch-ac,v 1.3 2006/01/28 03:03:11 rxg Exp $
+$NetBSD: patch-ac,v 1.4 2006/04/28 18:12:29 joerg Exp $
 
---- configure.orig	2001-11-27 22:21:17.000000000 +0800
+--- configure.orig	2001-11-27 14:21:17.000000000 +0000
 +++ configure
-@@ -7666,7 +7666,7 @@ found=n 
+@@ -5170,6 +5170,13 @@ EOF
+ EOF
+ 
+ 	;;
++    dragonfly*)
++	os_type=DRAGONFLY
++        cat >> confdefs.h <<\EOF
++#define DRAGONFLY 1
++EOF
++
++	;;
+     hp*)
+ 	os_type=HPUX
+         cat >> confdefs.h <<\EOF
+@@ -7666,7 +7673,7 @@ found=n 
  fi
  done
  
@@ -11,7 +25,7 @@ $NetBSD: patch-ac,v 1.3 2006/01/28 03:03:11 rxg Exp $
  	echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
  echo "configure:7672: checking for gettext in -lintl" >&5
  ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
-@@ -8619,7 +8619,7 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g
+@@ -8619,7 +8628,7 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g
  $ac_vpsub
  $extrasub
  s%@SHELL@%$SHELL%g
@@ -20,7 +34,7 @@ $NetBSD: patch-ac,v 1.3 2006/01/28 03:03:11 rxg Exp $
  s%@CPPFLAGS@%$CPPFLAGS%g
  s%@CXXFLAGS@%$CXXFLAGS%g
  s%@FFLAGS@%$FFLAGS%g
-@@ -8751,6 +8751,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile:s
+@@ -8751,6 +8760,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile:s
  	src/Cinput/zh_hex/Makefile \
  	src/Cinput/gen_inp/Makefile \
  	src/Cinput/bimsphone/Makefile \
diff --git a/inputmethod/xcin/patches/patch-ai b/inputmethod/xcin/patches/patch-ai
new file mode 100644
index 00000000000..570cdd8f27a
--- /dev/null
+++ b/inputmethod/xcin/patches/patch-ai
@@ -0,0 +1,24 @@
+$NetBSD: patch-ai,v 1.1 2006/04/28 18:12:29 joerg Exp $
+
+--- cin/gb/Makefile.in.orig	2001-09-06 15:41:33.000000000 +0000
++++ cin/gb/Makefile.in
+@@ -11,6 +11,9 @@ all: all-$(OS_TYPE)
+ all-LINUX:
+ 	( GB2312ENC=gb2312 GBKENC=gbk make -f Rules make-gb2312 make-gbk )
+ 
++all-DRAGONFLY:
++	( GB2312ENC=euc make -f Rules make-gb2312 )
++
+ all-FREEBSD:
+ 	( GB2312ENC=euc make -f Rules make-gb2312 )
+ 
+@@ -32,6 +35,9 @@ install: all install-$(OS_TYPE)
+ install-LINUX:
+ 	( GB2312ENC=gb2312 GBKENC=gbk make -f Rules install_gb2312 install_gbk )
+ 
++install-DRAGONFLY:
++	( GB2312ENC=euc make -f Rules install_gb2312 )
++
+ install-FREEBSD:
+ 	( GB2312ENC=euc make -f Rules install_gb2312 )
+